diff --git a/.clang-tidy b/.clang-tidy
index 95710ddfbe0..e1032aaa5f3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,9 +1,84 @@
 ---
-Checks:          '*,-abseil-*,-altera-*,-android-*,-boost-*,-cert-*,-cppcoreguidelines-*,-darwin-*,-fuchsia-*,-google-*,-hicpp-*,-linuxkernel-*,-llvm-*,-llvmlibc-*,-mpi-*,-objc-*,-openmp-*,-zircon-*,google-explicit-constructor,-readability-braces-around-statements,-readability-magic-numbers,-bugprone-macro-parentheses,-readability-isolate-declaration,-readability-function-size,-modernize-use-trailing-return-type,-readability-implicit-bool-conversion,-readability-uppercase-literal-suffix,-modernize-use-auto,-modernize-use-default-member-init,-readability-redundant-member-init,-modernize-avoid-c-arrays,-modernize-use-equals-default,-readability-container-size-empty,-bugprone-branch-clone,-bugprone-narrowing-conversions,-modernize-raw-string-literal,-readability-convert-member-functions-to-static,-modernize-loop-convert,-readability-const-return-type,-modernize-return-braced-init-list,-performance-inefficient-string-concatenation,-misc-throw-by-value-catch-by-reference,-readability-avoid-const-params-in-decls,-misc-non-private-member-variables-in-classes,-clang-analyzer-*,-bugprone-signed-char-misuse,-misc-no-recursion,-readability-use-anyofallof,-performance-no-automatic-move,-readability-function-cognitive-complexity,-readability-redundant-access-specifiers,-concurrency-mt-unsafe,-bugprone-easily-swappable-parameters,-readability-suspicious-call-argument,-readability-identifier-length,-readability-container-data-pointer,-bugprone-assignment-in-if-condition,-misc-const-correctness,-portability-std-allocator-const,-modernize-deprecated-ios-base-aliases,-bugprone-unchecked-optional-access,-modernize-replace-auto-ptr,-readability-identifier-naming,-portability-simd-intrinsics,-misc-use-anonymous-namespace,cert-err34-c'
+Checks: >
+        *,
+        -abseil-*,
+        -altera-*,
+        -android-*,
+        -boost-*,
+        -cert-*,
+        -cppcoreguidelines-*,
+        -darwin-*,
+        -fuchsia-*,
+        -google-*,
+        -hicpp-*,
+        -linuxkernel-*,
+        -llvm-*,
+        -llvmlibc-*,
+        -mpi-*,
+        -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-easily-swappable-parameters,
+        -bugprone-empty-catch,
+        -bugprone-macro-parentheses,
+        -bugprone-narrowing-conversions,
+        -bugprone-signed-char-misuse,
+        -bugprone-switch-missing-default-case,
+        -bugprone-unchecked-optional-access,
+        -clang-analyzer-*,
+        -concurrency-mt-unsafe,
+        -misc-const-correctness,
+        -misc-no-recursion,
+        -misc-non-private-member-variables-in-classes,
+        -misc-throw-by-value-catch-by-reference,
+        -misc-use-anonymous-namespace,
+        -modernize-avoid-c-arrays,
+        -modernize-deprecated-ios-base-aliases,
+        -misc-include-cleaner,
+        -misc-unused-using-decls,
+        -modernize-loop-convert,
+        -modernize-macro-to-enum,
+        -modernize-raw-string-literal,
+        -modernize-replace-auto-ptr,
+        -modernize-return-braced-init-list,
+        -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,
+        -readability-braces-around-statements,
+        -readability-container-data-pointer,
+        -readability-enum-initial-value,
+        -readability-function-cognitive-complexity,
+        -readability-function-size,
+        -readability-identifier-length,
+        -readability-identifier-naming,
+        -readability-implicit-bool-conversion,
+        -readability-isolate-declaration,
+        -readability-magic-numbers,
+        -readability-suspicious-call-argument,
+        -readability-uppercase-literal-suffix,
+        -readability-use-concise-preprocessor-directives
 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
diff --git a/.github/workflows/CI-cygwin.yml b/.github/workflows/CI-cygwin.yml
index 31557ecbcc7..445c0953eb5 100644
--- a/.github/workflows/CI-cygwin.yml
+++ b/.github/workflows/CI-cygwin.yml
@@ -1,10 +1,16 @@
-# Some convenient links:
-# - https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
-#
-
+# 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: CI-cygwin
 
-on: [push,pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -14,11 +20,13 @@ defaults:
     shell: cmd
 
 jobs:
+  # TODO: add CMake build
   build_cygwin:
     strategy:
       matrix:
-        os: [windows-2022]
-        arch: [x64]
+        # only use the latest windows-* as the installed toolchain is identical
+        os: [windows-2025]
+        platform: [x86_64]
         include:
           - platform: 'x86_64'
             packages: |
@@ -29,18 +37,20 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Set up Cygwin
         uses: cygwin/cygwin-install-action@master
         with:
-          platform: ${{ matrix.arch }}
+          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 -j2 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 152e84902c2..1b0cf3e5672 100644
--- a/.github/workflows/CI-mingw.yml
+++ b/.github/workflows/CI-mingw.yml
@@ -1,37 +1,75 @@
-# Some convenient links:
-# - https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
-#
-
+# 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: CI-mingw
 
-on: [push,pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
 
 defaults:
   run:
-    shell: cmd
+    shell: msys2 {0}
 
 jobs:
+  # TODO: add CMake build
   build_mingw:
     strategy:
       matrix:
-        os: [windows-2019] # fails to download with "windows-2022"
-        arch: [x64] # TODO: fix x86 build?
+        # 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@v3
+      - uses: actions/checkout@v4
+        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
+            mingw-w64-x86_64-ccache
+            make
+            mingw-w64-x86_64-gcc
 
-      - name: Set up MinGW
-        uses: egor-tensin/setup-mingw@v2
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
         with:
-          platform: ${{ matrix.arch }}
+          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
+
+      - name: Build cppcheck
+        run: |
+          export PATH="/mingw64/lib/ccache/bin:$PATH"
+          # set RDYNAMIC to work around broken MinGW detection
+          # 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
+          # use lld for faster linking
+          make VERBOSE=1 RDYNAMIC=-lshlwapi LDOPTS=-fuse-ld=lld -j$(nproc) CXXOPTS="-Werror" testrunner
 
-      # MinGW 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
+      - name: Run test
         run: |
-          mingw32-make VERBOSE=1 -j2 check
+          export PATH="/mingw64/lib/ccache/bin:$PATH"
+          # set RDYNAMIC to work around broken MinGW detection
+          # 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 f8dd4bb75fe..4df9b4e9340 100644
--- a/.github/workflows/CI-unixish-docker.yml
+++ b/.github/workflows/CI-unixish-docker.yml
@@ -2,17 +2,29 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: CI-unixish-docker
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
-
+  
 jobs:
   build_cmake:
 
     strategy:
       matrix:
-        image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:23.04"]
+        image: ["ubuntu:24.04"]
+        include:
+          - build_gui: false
+          - image: "ubuntu:24.04"
+            build_gui: true
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -26,14 +38,9 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install missing software on CentOS 7
-        if: matrix.image == 'centos:7'
-        run: |
-          yum install -y cmake gcc-c++ make pcre-devel
-          yum --enablerepo=extras install -y epel-release
-          yum install -y ccache
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Install missing software on ubuntu
         if: contains(matrix.image, 'ubuntu')
@@ -41,49 +48,33 @@ jobs:
           apt-get update
           apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
 
-      # required so a default Qt installation is configured
-      - name: Install missing software on ubuntu 18.04
-        if: false # matrix.os == 'ubuntu-18.04'
+      - name: Install missing software (gui) on latest ubuntu
+        if: matrix.build_gui
         run: |
-          sudo apt-get install qt5-default
+          apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
 
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
-      # - it doesn't support centos
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
-      # tests require CMake 3.9 - no ccache available
-      - name: CMake build (no tests / no ccache)
-        if: matrix.image == 'ubuntu:14.04'
-        run: |
-          mkdir cmake.output
-          cd cmake.output
-          cmake -G "Unix Makefiles" -DHAVE_RULES=On ..
-          cmake --build . -- -j$(nproc)
-
-      # tests require CMake 3.9 - ccache available
-      - name: CMake build (no tests)
-        if: matrix.image == 'centos:7' || matrix.image == 'ubuntu:16.04'
+      - name: CMake build
+        if: ${{ !matrix.build_gui }}
         run: |
           mkdir cmake.output
           cd cmake.output
-          cmake -G "Unix Makefiles" -DHAVE_RULES=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
+          cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
           cmake --build . -- -j$(nproc)
 
-      - name: CMake build
-        if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04'
+      - name: CMake build (with GUI)
+        if: matrix.build_gui
         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 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake --build cmake.output -- -j$(nproc)
 
       - name: Run CMake test
-        if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04'
         run: |
           cmake --build cmake.output --target check -- -j$(nproc)
 
@@ -91,7 +82,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ["centos:7", "ubuntu:14.04", "ubuntu:16.04", "ubuntu:18.04", "ubuntu:22.10"]
+        image: ["ubuntu:24.04"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
@@ -100,14 +91,9 @@ jobs:
       image: ${{ matrix.image }}
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install missing software on CentOS 7
-        if: matrix.image == 'centos:7'
-        run: |
-          yum install -y gcc-c++ make which python3 pcre-devel
-          yum --enablerepo=extras install -y epel-release
-          yum install -y ccache
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Install missing software on ubuntu
         if: contains(matrix.image, 'ubuntu')
@@ -117,33 +103,29 @@ jobs:
 
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
-      # - it doesn't support centos
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
-        if: matrix.image != 'ubuntu:14.04' # no support for --set-config
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
       - name: Build cppcheck
         run: |
-          # "/usr/lib64" for centos / "/usr/lib" for ubuntu
-          export PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) HAVE_RULES=yes
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          make -j$(nproc) HAVE_RULES=yes CXXOPTS="-Werror"
 
       - name: Build test
         run: |
-          # "/usr/lib64" for centos / "/usr/lib" for ubuntu
-          export PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) testrunner HAVE_RULES=yes
+          export PATH="/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
         run: |
-          tools/generate_and_run_more_tests.sh
+          test/scripts/generate_and_run_more_tests.sh
 
       # requires which
       - name: Validate
@@ -154,10 +136,3 @@ jobs:
         run: |
           ./cppcheck --addon=threadsafety addons/test/threadsafety
           ./cppcheck --addon=threadsafety --std=c++03 addons/test/threadsafety
-
-      - name: Generate Qt help file on ubuntu 18.04
-        if: false # matrix.os == 'ubuntu-18.04'
-        run: |
-          pushd gui/help
-          qcollectiongenerator online-help.qhcp -o online-help.qhc
-
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 902417375a8..e37d88767ec 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: CI-unixish
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -12,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -22,7 +30,9 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -33,25 +43,28 @@ jobs:
         if: contains(matrix.os, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get install libxml2-utils libtinyxml2-dev qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
+          sudo apt-get install libxml2-utils libtinyxml2-dev
+          # 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@5 tinyxml2 pcre
+          brew install coreutils qt@6 tinyxml2 pcre
 
       - 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 -DWITH_QCHART=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 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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 -DWITH_QCHART=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt5_DIR=$(brew --prefix qt@5)/lib/cmake/Qt5
+          cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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)
@@ -62,7 +75,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
@@ -72,48 +85,57 @@ jobs:
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v3
+      - 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: Install missing software on ubuntu
-        if: contains(matrix.os, 'ubuntu')
-        run: |
-          sudo apt-get update
-          sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
-
+      # 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
-        if: matrix.os == 'ubuntu-22.04'
+        if: false  # matrix.os == 'ubuntu-22.04'
         with:
           version: 13
           platform: x64
 
       - name: Select compiler
+        if: false  # matrix.os == 'ubuntu-22.04'
         run: |
           echo "CXX=g++-13" >> $GITHUB_ENV
-        if: matrix.os == 'ubuntu-22.04'
+
+      - 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@5 pcre
+          brew install coreutils qt@6 pcre
 
-      - name: CMake build on ubuntu (with GUI)
+      - 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 -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          cmake --build cmake.output -- -j$(nproc)
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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: CMake build on macos (with GUI)
+      - 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 -DWITH_QCHART=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DQt5_DIR=$(brew --prefix qt@5)/lib/cmake/Qt5
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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: |
           cmake --build cmake.output -- -j$(nproc)
 
       - name: Run CMake test
@@ -125,17 +147,126 @@ jobs:
           pushd cmake.output
           ctest --output-on-failure -j$(nproc)
 
+      - name: Run CMake install
+        run: |
+          cmake --build cmake.output --target install
+
+      - name: Run CMake on ubuntu (no CLI)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          cmake -S . -B cmake.output_nocli -G "Unix Makefiles" -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 -G "Unix Makefiles" -DBUILD_TESTS=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 -G "Unix Makefiles" -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 -G "Unix Makefiles" -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 -G "Unix Makefiles" -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 -G "Unix Makefiles" -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@v4
+        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 -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=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 -G "Unix Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DHAVE_RULES=On -DBUILD_TESTS=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-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -151,23 +282,25 @@ 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-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -183,23 +316,25 @@ 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-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-22.04, macos-15]
       fail-fast: false # Prefer quick result
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       # coreutils contains "g++" (default is "c++") and "nproc"
       - name: Install missing software on macos
@@ -209,100 +344,87 @@ 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_qmake:
+  build_cmake_boost:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
+        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@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
-      - name: Install missing software on ubuntu
-        if: contains(matrix.os, 'ubuntu')
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
+
+      - name: Run CMake on macOS (force Boost)
         run: |
-          sudo apt-get update
-          sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
+          # 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 -G "Unix Makefiles" -DUSE_BOOST=On; then
+            exit 1
+          else
+            exit 0
+          fi
 
       # coreutils contains "nproc"
-      - name: Install missing software on macos
-        if: contains(matrix.os, 'macos')
+      - name: Install missing software on macOS
         run: |
-          brew install coreutils qt@5
-          # expose qmake
-          brew link qt@5 --force
+          brew install coreutils boost
 
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
+      - name: Run CMake on macOS (force Boost)
+        run: |
+          cmake -S . -B cmake.output.boost-force -G "Unix Makefiles" -DUSE_BOOST=On
 
-      - name: Build GUI
+      - name: Run CMake on macOS (no Boost)
         run: |
-          export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          pushd gui
-          qmake CONFIG+=debug  CONFIG+=ccache HAVE_QCHART=yes
-          make -j$(nproc)
+          # make sure Boost is not used when disabled even though it is available
+          cmake -S . -B cmake.output.boost-no -G "Unix Makefiles" -DUSE_BOOST=Off
+          if grep -q '\-DHAVE_BOOST' ./cmake.output.boost-no/compile_commands.json; then
+            exit 1
+          else
+            exit 0
+          fi
 
-      # TODO: binaries are in a different location on macos
-      - name: Build and Run GUI tests
-        if: contains(matrix.os, 'ubuntu')
+      - name: Run CMake on macOS (with Boost)
         run: |
-          export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          pushd gui/test/cppchecklibrarydata
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-cppchecklibrarydata
-          popd
-          pushd gui/test/filelist
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-filelist
-          popd
-          pushd gui/test/projectfile
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-projectfile
-          popd
-          pushd gui/test/translationhandler
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          # TODO: requires X session because of QApplication dependency in translationhandler.cpp
-          #./test-translationhandler
-          popd
-          pushd gui/test/xmlreportv2
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
-          ./test-xmlreportv2
-
-      - name: Generate Qt help file
-        run: |
-          pushd gui/help
-          qhelpgenerator online-help.qhcp -o online-help.qhc
-
-      - name: Build triage
-        run: |
-          export PATH="$(brew --prefix)/opt/ccache/libexec:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          pushd tools/triage
-          qmake CONFIG+=debug CONFIG+=ccache
-          make -j$(nproc)
+          cmake -S . -B cmake.output.boost -G "Unix Makefiles" -DBUILD_TESTS=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:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
+        os: [ubuntu-22.04, macos-15]
+        include:
+          - xdist_n: auto
+          # 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@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -319,48 +441,95 @@ jobs:
       - name: Install missing software on ubuntu 22.04 (cfg)
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-dev
+          sudo apt-get install libcairo2-dev libcurl4-openssl-dev liblua5.3-dev libssl-dev libsqlite3-dev libcppunit-dev libsigc++-2.0-dev libgtk-3-dev libboost-all-dev libselinux-dev libwxgtk3.0-gtk3-dev xmlstarlet qtbase5-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 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
+          python3 -m pip install pytest-timeout
+          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
         run: |
-          tools/generate_and_run_more_tests.sh
+          test/scripts/generate_and_run_more_tests.sh
 
-      # do not use pushd in this step since we go below the working directory
       - name: Run test/cli
         run: |
-          cd test/cli
-          python3 -m pytest test-*.py
-          cd ../../..
+          python3 -m pytest -Werror --strict-markers -vv -n ${{ matrix.xdist_n }} test/cli
+
+      # TODO: use the step below instead
+      # do not use pushd in this step since we go below the working directory
+      - name: Run test/cli (symlink)
+        run: |
+          cd ..
           ln -s cppcheck 'cpp check'
           cd 'cpp check/test/cli'
-          python3 -m pytest test-*.py
+          python3 -m pytest -Werror --strict-markers -vv -n ${{ matrix.xdist_n }}
+
+      # FIXME: proj2_test.py fails because of the relative path cleanups in ImportProject::setRelativePaths()
+      # It fails because the application path used as base path has its symlink resolved by getcwd().
+      - name: Run test/cli (symlink)
+        if: false
+        run: |
+          ln -s . 'cpp check'
+          python3 -m pytest -Werror --strict-markers -vv -n ${{ matrix.xdist_n }} 'cpp check/test/cli'
+
+      - name: Run test/cli (-j2)
+        run: |
+          python3 -m pytest -Werror --strict-markers -vv -n ${{ matrix.xdist_n }} test/cli
+        env:
+          TEST_CPPCHECK_INJECT_J: 2
+
+      - name: Run test/cli (--clang)
+        if: false
+        run: |
+          python3 -m pytest -Werror --strict-markers -vv -n ${{ matrix.xdist_n }} test/cli
+        env:
+          TEST_CPPCHECK_INJECT_CLANG: clang
+
+      - name: Run test/cli (--cppcheck-build-dir)
+        run: |
+          python3 -m pytest -Werror --strict-markers -vv -n ${{ matrix.xdist_n }} test/cli
+        env:
+          TEST_CPPCHECK_INJECT_BUILDDIR: injected
 
       - name: Run cfg tests
         if: matrix.os != 'ubuntu-22.04'
@@ -374,10 +543,6 @@ jobs:
         env:
           STRICT: 1
 
-      - name: Run showtimetop5 tests
-        run: |
-          ./tools/test_showtimetop5.sh
-
       - name: Run --dump test
         run: |
           ./cppcheck test/testpreprocessor.cpp --dump
@@ -387,18 +552,50 @@ jobs:
         run: |
           make -j$(nproc) checkCWEEntries validateXML
 
+      - name: Test install
+        run: |
+          # this is only to test the "install" target - since we did not build with FILESDIR it would not work as intended
+          make DESTDIR=cppcheck-make-install FILESDIR=/share/Cppcheck install
+          rm -rf cppcheck-make-install
+
+      - name: Test Signalhandler
+        run: |
+          cmake -S . -B build.cmake.signal -G "Unix Makefiles" -DBUILD_TESTS=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* .
+          python3 -m pytest -Werror --strict-markers -vv test/signal/test-signalhandler.py
+          rm test-signalhandler
+
+      # no unix backtrace support on MacOs
+      - name: Test Stacktrace
+        if: contains(matrix.os, 'ubuntu')
+        run: |
+          cmake -S . -B build.cmake.stack -G "Unix Makefiles" -DBUILD_TESTS=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* .
+          python3 -m pytest -Werror --strict-markers -vv test/signal/test-stacktrace.py
+          rm test-stacktrace
+
       # TODO: move to scriptcheck.yml so these are tested with all Python versions?
       - name: Test addons
         run: |
+          set -x
           ./cppcheck --error-exitcode=1 --inline-suppr --addon=threadsafety addons/test/threadsafety
           ./cppcheck --error-exitcode=1 --inline-suppr --addon=threadsafety --std=c++03 addons/test/threadsafety
           ./cppcheck --error-exitcode=1 --inline-suppr --addon=misra addons/test/misra/crash*.c
+          ./cppcheck --error-exitcode=1 --inline-suppr --addon=misra --enable=information addons/test/misra/config*.c
+
           ./cppcheck --addon=misra --enable=style --inline-suppr --enable=information --error-exitcode=1 addons/test/misra/misra-ctu-*-test.c
           pushd addons/test
           # We'll force C89 standard to enable an additional verification for
           # rules 5.4 and 5.5 which have standard-dependent options.
           ../../cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test.c --std=c89 --platform=unix64 
           python3 ../misra.py -verify misra/misra-test.c.dump
+          # Test slight MISRA differences in C11 standard
+          ../../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
           # TODO: do we need to verify something here?
           ../../cppcheck --dump -DDUMMY --suppress=uninitvar --suppress=uninitStructMember --std=c89 misra/misra-test.h
           ../../cppcheck --dump misra/misra-test.cpp 
@@ -413,8 +610,23 @@ jobs:
           python3 ../naming.py --var='[a-z].*' --function='[a-z].*' naming_test.c.dump
           ../../cppcheck --dump naming_test.cpp 
           python3 ../naming.py --var='[a-z].*' --function='[a-z].*' naming_test.cpp.dump
-          ../../cppcheck --dump namingng_test.c 
-          python3 ../namingng.py --configfile ../naming.json --verify namingng_test.c.dump
+
+      # TODO: run with "-n auto" when misra_test.py can be run in parallel
+      - name: test addons (Python)
+        if: matrix.os != 'ubuntu-22.04'
+        run: |
+          python3 -m pytest -Werror --strict-markers -vv -n 1 addons/test
+        env:
+          PYTHONPATH: ./addons
+
+      # TODO: run with "-n auto" when misra_test.py can be run in parallel
+      # we cannot specify -Werror since xml/etree/ElementTree.py in Python 3.10 contains an unclosed file
+      - name: test addons (Python)
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          python3 -m pytest --strict-markers -vv -n 1 addons/test
+        env:
+          PYTHONPATH: ./addons
 
       - name: Build democlient
         if: matrix.os == 'ubuntu-22.04'
@@ -422,13 +634,35 @@ 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: Show all ignored files
+        if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
+        run: |
+          git ls-files --others --ignored --exclude-standard
+
+      - name: Check for changed and unversioned files
+        run: |
+          # TODO: how to do this with a single command?
+          git status --ignored=no
+          git status --ignored=no | grep -q 'working tree clean'
+
   selfcheck:
     needs: build # wait for all tests to be successful first
 
     runs-on: ubuntu-22.04 # run on the latest image only
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -438,44 +672,54 @@ jobs:
       - name: Install missing software on ubuntu
         run: |
           sudo apt-get update
-          sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev libboost-container-dev
+          # 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
+          sudo apt-get install libboost-container-dev
 
       - name: Self check (build)
         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 -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
+          make -j$(nproc) CXXOPTS="-Werror -g -O2" CPPOPTS="-DCHECK_INTERNAL -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
 
-      - name: Generate UI files
+      - name: CMake
         run: |
-          pushd gui
-          qmake CONFIG+=debug HAVE_QCHART=yes
-          make -j$(nproc) compiler_uic_make_all mocables
+          cmake -S . -B cmake.output -DHAVE_RULES=On -DBUILD_TESTS=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 triage UI files
+      - name: Generate dependencies
         run: |
-          pushd tools/triage
-          qmake CONFIG+=debug
-          make -j$(nproc) compiler_uic_make_all mocables
+          # make sure auto-generated GUI files exist
+          make -C cmake.output autogen
+          make -C cmake.output gui-build-deps triage-build-ui-deps
 
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings --check-level=exhaustive"
+          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"
+          cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
+          gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
           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-build-dir=b1 --addon=naming.json -DCHECK_INTERNAL cli lib || ec=1
+          ./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json frontend || ec=1
+          ./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json -Ifrontend 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-build-dir=b2 -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Igui/temp -Igui gui/*.cpp gui/temp/*.cpp || ec=1
+          ./cppcheck $selfcheck_options $cppcheck_options $gui_options --cppcheck-build-dir=b2 --addon=naming.json --suppress=simplifyUsing:*/moc_*.cpp -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
           # self check test and tools
-          ./cppcheck $selfcheck_options -Icli test/*.cpp tools/*.cpp || ec=1
+          ./cppcheck $selfcheck_options $cppcheck_options -Ifrontend -Icli test/*.cpp  || ec=1
+          ./cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
           # triage
-          ./cppcheck $selfcheck_options -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt -Itools/triage/temp -Igui tools/triage/*.cpp tools/triage/temp/*.cpp || ec=1
+          ./cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
           exit $ec
diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
index 4da98719ded..2b08f18bbf5 100644
--- a/.github/workflows/CI-windows.yml
+++ b/.github/workflows/CI-windows.yml
@@ -1,10 +1,16 @@
-# Some convenient links:
-# - https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
-#
-
+# 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: CI-windows
 
-on: [push,pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -18,56 +24,85 @@ jobs:
   build_qt:
     strategy:
       matrix:
-        os: [windows-2019, windows-2022]
-        qt_ver: [5.15.2, 6.2.4, 6.5.0]
+        os: [windows-2022, windows-2025]
+        qt_ver: [6.10.0]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Set up Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
         with:
-          arch: x64 # no 32-bit Qt available
+          arch: x64
 
       - name: Install Qt ${{ matrix.qt_ver }}
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt_ver }}
           modules: 'qtcharts'
+          setup-python: 'false'
           cache: true
+          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
 
-      - name: Build GUI release (qmake)
-        if: startsWith(matrix.qt_ver, '5')
+      - name: Run CMake
         run: |
-          cd gui || exit /b !errorlevel!
-          qmake HAVE_QCHART=yes || exit /b !errorlevel!
-          nmake release || exit /b !errorlevel!
-        env:
-          CL: /MP
+          rem TODO: enable rules?
+          rem 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 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+
+      - name: Build GUI release
+        run: |
+          cmake --build build --target cppcheck-gui --config Release || exit /b !errorlevel!
 
       - name: Deploy GUI
-        if: startsWith(matrix.qt_ver, '5')
         run: |
-          windeployqt Build\gui || exit /b !errorlevel!
-          del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel!
-          del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel!
+          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!
 
-      - name: Build GUI release (CMake)
-        if: startsWith(matrix.qt_ver, '6')
+      # TODO: run GUI tests
+
+      - name: Run CMake install
         run: |
-          cmake -S . -B build -DBUILD_GUI=On -DWITH_QCHART=On -DUSE_QT6=On || exit /b !errorlevel!
-          cmake --build build --target cppcheck-gui || exit /b !errorlevel!
+          cmake --build build --target install
 
-      # TODO: deploy with CMake/Qt6
+  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@v4
+        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 -G "Visual Studio 17 2022" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cxxstd }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+
+      - name: Build
+        run: |
+          cmake --build build.cxxstd --config Debug || exit /b !errorlevel!
 
   build:
     strategy:
       matrix:
-        os: [windows-2019, windows-2022]
-        arch: [x64, x86]
+        os: [windows-2022, windows-2025]
+        config: [debug, release]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -77,28 +112,31 @@ jobs:
       PCRE_VERSION: 8.45
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        if: matrix.config == 'release'
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
           check-latest: true
 
       - name: Set up Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
         with:
-          arch: ${{ matrix.arch }}
+          arch: x64
 
       - name: Cache PCRE
         id: cache-pcre
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             externals\pcre.h
             externals\pcre.lib
             externals\pcre64.lib
-          key: pcre-${{ env.PCRE_VERSION }}-${{ matrix.arch }}-bin-win
+          key: pcre-${{ env.PCRE_VERSION }}-x64-bin-win
 
       - name: Download PCRE
         if: steps.cache-pcre.outputs.cache-hit != 'true'
@@ -108,75 +146,101 @@ jobs:
       - name: Install PCRE
         if: steps.cache-pcre.outputs.cache-hit != 'true'
         run: |
+          @echo on
           7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
           cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
-          cmake . -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPCRE_BUILD_PCRECPP=Off -DPCRE_BUILD_TESTS=Off -DPCRE_BUILD_PCREGREP=Off || 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 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
           nmake || exit /b !errorlevel!
           copy pcre.h ..\externals || exit /b !errorlevel!
-          if "${{ matrix.arch }}" == "x86" (
-            copy pcre.lib ..\externals\pcre.lib || exit /b !errorlevel!
-          ) else (
-            copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
-          )
+          copy pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
         env:
           CL: /MP
 
       - name: Install missing Python packages
+        if: matrix.config == 'release'
         run: |
           python -m pip install pip --upgrade || exit /b !errorlevel!
           python -m pip install pytest || exit /b !errorlevel!
           python -m pip install pytest-custom_exit_code || exit /b !errorlevel!
-
-      - name: Run CMake
-        if: false # TODO: enable
-        run: |
-          set ARCH=${{ matrix.arch }}
-          if "${{ matrix.arch }}" == "x86" (
-            set ARCH=Win32
-          )
-          cmake -S . -B build -DBUILD_TESTS=On || exit /b !errorlevel!
+          python -m pip install pytest-timeout || exit /b !errorlevel!
+          python -m pip install pytest-xdist || exit /b !errorlevel!
+          python -m pip install psutil || exit /b !errorlevel!
 
       - name: Build CLI debug configuration using MSBuild
+        if: matrix.config == 'debug'
         run: |
-          set ARCH=${{ matrix.arch }}
-          if "${{ matrix.arch }}" == "x86" (
-            set ARCH=Win32
-          )
           :: cmake --build build --target check --config Debug || exit /b !errorlevel!
-          msbuild -m cppcheck.sln /p:Configuration=Debug-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel!
+          msbuild -m cppcheck.sln /p:Configuration=Debug-PCRE;Platform=x64 -maxcpucount || exit /b !errorlevel!
+        env:
+          _CL_: /WX
 
       - name: Run Debug test
+        if: matrix.config == 'debug'
         run: .\bin\debug\testrunner.exe || exit /b !errorlevel!
 
       - name: Build CLI release configuration using MSBuild
+        if: matrix.config == 'release'
         run: |
-          set ARCH=${{ matrix.arch }}
-          if "${{ matrix.arch }}" == "x86" (
-            set ARCH=Win32
-          )
           :: cmake --build build --target check --config Release || exit /b !errorlevel!
-          msbuild -m cppcheck.sln /p:Configuration=Release-PCRE;Platform=%ARCH% -maxcpucount || exit /b !errorlevel!
+          msbuild -m cppcheck.sln /p:Configuration=Release-PCRE;Platform=x64 -maxcpucount || exit /b !errorlevel!
+        env:
+          _CL_: /WX
 
       - name: Run Release test
+        if: matrix.config == 'release'
         run: .\bin\testrunner.exe || exit /b !errorlevel!
 
-      - name: Run test/cli
+      - name: Prepare test/cli
+        if: matrix.config == 'release'
         run: |
           :: since FILESDIR is not set copy the binary to the root so the addons are found
           :: copy .\build\bin\Release\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel!
           copy .\bin\cppcheck.exe .\cppcheck.exe || exit /b !errorlevel!
           copy .\bin\cppcheck-core.dll .\cppcheck-core.dll || exit /b !errorlevel!
-          cd test/cli || exit /b !errorlevel!
-          :: python -m pytest --suppress-no-test-exit-code test-clang-import.py || exit /b !errorlevel!
-          python -m pytest test-helloworld.py || exit /b !errorlevel!
-          python -m pytest test-inline-suppress.py || exit /b !errorlevel!
-          python -m pytest test-more-projects.py || exit /b !errorlevel!
-          python -m pytest test-other.py || exit /b !errorlevel!
-          python -m pytest test-proj2.py || exit /b !errorlevel!
-          python -m pytest test-suppress-syntaxError.py || exit /b !errorlevel!
+
+      - name: Run test/cli
+        if: matrix.config == 'release'
+        run: |
+          python -m pytest -Werror --strict-markers -vv -n auto test/cli || exit /b !errorlevel!
+
+      - name: Run test/cli (-j2)
+        if: matrix.config == 'release'
+        run: |
+          python -m pytest -Werror --strict-markers -vv -n auto test/cli || exit /b !errorlevel!
+        env:
+          TEST_CPPCHECK_INJECT_J: 2
+
+      # TODO: install clang
+      - name: Run test/cli (--clang)
+        if: false # matrix.config == 'release'
+        run: |
+          python -m pytest -Werror --strict-markers -vv -n auto test/cli || exit /b !errorlevel!
+        env:
+          TEST_CPPCHECK_INJECT_CLANG: clang
+
+      - name: Run test/cli (--cppcheck-build-dir)
+        if: matrix.config == 'release'
+        run: |
+          python -m pytest -Werror --strict-markers -vv -n auto test/cli || exit /b !errorlevel!
+        env:
+          TEST_CPPCHECK_INJECT_BUILDDIR: injected
+
+      # TODO: test with Release configuration?
+      - name: Test SEH wrapper
+        if: matrix.config == 'release'
+        run: |
+          cmake -S . -B build.cmake.seh -DBUILD_TESTS=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!
+          python3 -m pytest -Werror --strict-markers -vv test/seh/test-sehwrapper.py || exit /b !errorlevel!
+          del test-sehwrapper.exe || exit /b !errorlevel!
 
       - name: Test addons
+        if: matrix.config == 'release'
         run: |
+          echo on
           .\cppcheck --addon=threadsafety addons\test\threadsafety || exit /b !errorlevel!
           .\cppcheck --addon=threadsafety --std=c++03 addons\test\threadsafety || exit /b !errorlevel!
           .\cppcheck --addon=misra --enable=style --inline-suppr --enable=information --error-exitcode=1 addons\test\misra\misra-ctu-*-test.c || exit /b !errorlevel!
@@ -185,6 +249,9 @@ jobs:
           rem rules 5.4 and 5.5 which have standard-dependent options.
           ..\..\cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra\misra-test.c --std=c89 --platform=unix64 || exit /b !errorlevel!
           python3 ..\misra.py -verify misra\misra-test.c.dump || exit /b !errorlevel!
+          rem Test slight MISRA differences in C11 standard
+          ..\..\cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra\misra-test-c11.c --std=c11 --platform=unix64 || exit /b !errorlevel!
+          python3 ..\misra.py -verify misra\misra-test-c11.c.dump || exit /b !errorlevel!
           rem TODO: do we need to verify something here?
           ..\..\cppcheck --dump -DDUMMY --suppress=uninitvar --suppress=uninitStructMember --std=c89 misra\misra-test.h || exit /b !errorlevel!
           ..\..\cppcheck --dump misra\misra-test.cpp || exit /b !errorlevel!
@@ -200,6 +267,30 @@ jobs:
           rem python3 ..\naming.py --var='[a-z].*' --function='[a-z].*' naming_test.c.dump || exit /b !errorlevel!
           ..\..\cppcheck --dump naming_test.cpp || exit /b !errorlevel!
           python3 ..\naming.py --var='[a-z].*' --function='[a-z].*' naming_test.cpp.dump || exit /b !errorlevel!
-          ..\..\cppcheck --dump namingng_test.c || exit /b !errorlevel!
-          python3 ..\namingng.py --configfile ..\naming.json --verify namingng_test.c.dump || exit /b !errorlevel!
 
+      # TODO: run with "-n auto" when misra_test.py can be run in parallel
+      - name: test addons (Python)
+        if: matrix.config == 'release'
+        run: |
+          python -m pytest -Werror --strict-markers -vv -n 1 addons/test || exit /b !errorlevel!
+        env:
+          PYTHONPATH: ./addons
+
+      - name: Check Windows test syntax
+        if: matrix.config == 'debug'
+        run: |
+          cd test\cfg
+          cl.exe windows.cpp -DUNICODE=1 -D_UNICODE=1 /Zs || exit /b !errorlevel!
+          cl.exe mfc.cpp /EHsc /Zs || exit /b !errorlevel!
+
+      - name: Show all ignored files
+        if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
+        run: |
+          git ls-files --others --ignored --exclude-standard || exit /b !errorlevel!
+
+      - name: Check for changed and unversioned files
+        run: |
+          :: TODO: how to do this with a single command?
+          git status --ignored=no
+          :: TODO: make this work
+          :: git status --ignored=no | grep -q 'working tree clean'
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
index df2cb0534d4..70b3a30f0ae 100644
--- a/.github/workflows/asan.yml
+++ b/.github/workflows/asan.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: address sanitizer
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -13,50 +21,63 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 5.15.2
+      QT_VERSION: 6.10.0
       ASAN_OPTIONS: detect_stack_use_after_return=1
+      LSAN_OPTIONS: suppressions=lsan-suppr.txt:print_suppressions=0
       # TODO: figure out why there are cache misses with PCH enabled
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     steps:
-      - uses: actions/checkout@v3
+      - 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.11
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
           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
+          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 16
+          sudo ./llvm.sh 21
 
       - name: Install Qt ${{ env.QT_VERSION }}
-        if: false
-        uses: jurplel/install-qt-action@v3
+        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=Off -DWITH_QCHART=Off -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=Off -DDISABLE_DMAKE=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=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_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         env:
-          CC: clang-16
-          CXX: clang++-16
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Build cppcheck
         run: |
@@ -66,9 +87,49 @@ jobs:
         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: |
+          cp lsan-suppr.txt cmake.output/bin
+          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: |
@@ -81,10 +142,17 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          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"
+          cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
+          gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
+          gui_options="$gui_options --suppress=autoNoType:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
           ec=0
-          ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json cli lib || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -Icli test/*.cpp tools/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json frontend || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json -Ifrontend 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 $gui_options --addon=naming.json --suppress=constVariablePointer:*/moc_*.cpp -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli -Ifrontend test/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
           exit $ec
diff --git a/.github/workflows/buildman.yml b/.github/workflows/buildman.yml
index 4bbdf779661..b0b399dd851 100644
--- a/.github/workflows/buildman.yml
+++ b/.github/workflows/buildman.yml
@@ -1,28 +1,65 @@
+# 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: Build manual
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
 
 jobs:
   convert_via_pandoc:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - run: |
           mkdir output
 
-      - uses: docker://pandoc/latex:2.9
+      - uses: docker://pandoc/latex:3.6.3
         with:
           args: --output=output/manual.html man/manual.md
-             
-      - uses: docker://pandoc/latex:2.9
+
+      - uses: docker://pandoc/latex:3.6.3
         with:
-          args: --output=output/manual.pdf man/manual.md  
-  
-      - uses: actions/upload-artifact@v3
+          args: --output=output/manual.pdf man/manual.md
+
+      - uses: docker://pandoc/latex:3.6.3
+        with:
+          args: --output=output/manual-premium.pdf man/manual-premium.md
+
+      - uses: actions/upload-artifact@v4
         with:
           name: output
           path: output
+
+  manpage:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Install missing software on ubuntu
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y xsltproc docbook-xsl
+
+      - name: build manpage
+        run: |
+          make man
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cppcheck.1
+          path: cppcheck.1
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 19c40de61c9..7b462c688f0 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -1,8 +1,16 @@
+# 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: CIFuzz
+
 on: [pull_request]
+
+permissions:
+  contents: read
+
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'danmar' }}
     steps:
     - name: Build Fuzzers
       id: build
@@ -19,7 +27,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 5352c28118a..7b2c4f4e2c7 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -2,7 +2,18 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: clang-tidy
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -13,53 +24,70 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 5.15.2
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Install missing software
         run: |
           sudo apt-get update
           sudo apt-get install -y cmake make
           sudo apt-get install -y libpcre3-dev
-          sudo apt-get install -y libffi7 # work around missing dependency for Qt install step
+          sudo apt-get install -y libgl-dev  # fixes missing dependency for Qt in CMake
 
       - 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 16
-          sudo apt-get install -y clang-tidy-16
+          sudo ./llvm.sh 21
+          sudo apt-get install -y clang-tidy-21
 
       - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
+          install-deps: false
           cache: true
 
       - name: Verify clang-tidy configuration
         run: |
-          clang-tidy-16 --verify-config
+          clang-tidy-21 --verify-config
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCPPCHK_GLIBCXX_DEBUG=Off
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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 -DWARNINGS_ARE_ERRORS=On
         env:
-          CC: clang-16
-          CXX: clang++-16
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Prepare CMake dependencies
         run: |
+          # make sure the auto-generated GUI sources exist
+          make -C cmake.output autogen
           # make sure the precompiled headers exist
           make -C cmake.output/cli cmake_pch.hxx.pch
           make -C cmake.output/gui cmake_pch.hxx.pch
           make -C cmake.output/lib cmake_pch.hxx.pch
           make -C cmake.output/test cmake_pch.hxx.pch
-          # make sure the auto-generated GUI sources exist
-          make -C cmake.output autogen
 
       - name: Clang-Tidy
+        if: ${{ github.event.schedule == '' && github.event_name != 'workflow_dispatch' }}
         run: |
           cmake --build cmake.output --target run-clang-tidy 2> /dev/null
+
+      - name: Clang Static Analyzer
+        if: ${{ github.event.schedule != '' || github.event_name == 'workflow_dispatch' }}
+        run: |
+          cmake --build cmake.output --target run-clang-tidy-csa 2> /dev/null
+
+      - uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: Compilation Database
+          path: ./cmake.output/compile_commands.json
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 12d15855527..12e758d2c9e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,15 +1,26 @@
+# 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: "CodeQL"
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
-  security-events: write
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-22.04
+    permissions:
+      security-events: write
 
     strategy:
       fail-fast: false
@@ -22,26 +33,20 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+      with:
+        persist-credentials: false
       
-    - name: Install missing software on ubuntu
-      run: |
-         sudo apt-get update
-         sudo apt-get install libxml2-utils
-
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-        setup-python-dependencies: false 
 
-    - run: |
-         make -j$(nproc) HAVE_RULES=yes cppcheck
+    - name: Build cppcheck
+      if: matrix.language == 'cpp'
+      run: |
+         make -j$(nproc) CXXOPTS="-Werror" HAVE_RULES=yes CPPCHK_GLIBCXX_DEBUG= cppcheck
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index b07c15811cd..13f56172a80 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: Coverage
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -13,7 +21,9 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -33,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: |
@@ -47,14 +57,14 @@ 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@v3
+      - uses: actions/upload-artifact@v4
         with:
          name: Coverage results
          path: coverage_report
          
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
-          # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+          token: ${{ secrets.CODECOV_TOKEN }}
           # file: ./coverage.xml # optional
           flags: unittests # optional
           name: ${{ github.repository }} # optional
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
new file mode 100644
index 00000000000..3c07b61d7c7
--- /dev/null
+++ b/.github/workflows/coverity.yml
@@ -0,0 +1,41 @@
+# 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: Coverity
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+permissions:
+  contents: read
+
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'danmar' }}
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - name: Install missing software on ubuntu
+      run: |
+        sudo apt-get update
+        sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev libboost-container-dev
+    - name: Download Coverity build tool
+      run: |
+        wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=cppcheck" -O coverity_tool.tar.gz
+        mkdir coverity_tool
+        tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool
+    - name: Build with Coverity build tool
+      run: |
+        export PATH=`pwd`/coverity_tool/bin:$PATH
+        cov-build --dir cov-int make CPPCHK_GLIBCXX_DEBUG=
+    - name: Submit build result to Coverity Scan
+      run: |
+        tar czvf cov.tar.gz cov-int
+        curl --form token=${{ secrets.COVERITY_SCAN_TOKEN }} \
+          --form email=daniel.marjamaki@gmail.com \
+          --form file=@cov.tar.gz \
+          --form version="Commit $GITHUB_SHA" \
+          --form description="Development" \
+          https://scan.coverity.com/builds?project=cppcheck
diff --git a/.github/workflows/cppcheck-premium.yml b/.github/workflows/cppcheck-premium.yml
new file mode 100644
index 00000000000..5cb63ca4d5e
--- /dev/null
+++ b/.github/workflows/cppcheck-premium.yml
@@ -0,0 +1,72 @@
+# 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: cppcheck-premium
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      premium_version:
+        description: 'Cppcheck Premium version'
+
+permissions:
+  contents: read
+  security-events: write
+
+jobs:
+
+  build:
+    runs-on: ubuntu-24.04 # run on the latest image only
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Download cppcheckpremium release
+        run: |
+          premium_version=${{ inputs.premium_version }}
+          if [ -z $premium_version ]; then
+            premium_version=25.8.3
+            #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
+            wget https://files.cppchecksolutions.com/$premium_version/ubuntu-24.04/cppcheckpremium-$premium_version-amd64.tar.gz -O cppcheckpremium.tar.gz
+          fi
+          tar xzf cppcheckpremium.tar.gz
+          mv cppcheckpremium-$premium_version cppcheckpremium
+
+      - name: Generate a license file
+        run: |
+          echo cppcheck > cppcheck.lic
+          echo 261231 >> cppcheck.lic
+          echo 80000 >> 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 --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@v4
+        with:
+          name: results
+          path: results.sarif
+
+      - name: Upload report
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: results.sarif
+          category: cppcheckpremium
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index ff3134b7ed5..fd491c0ec0e 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: format
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -12,29 +20,36 @@ jobs:
 
     runs-on: ubuntu-22.04
 
+    env:
+      UNCRUSTIFY_VERSION: 0.80.1
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Cache uncrustify
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-uncrustify
         with:
           path: |
             ~/uncrustify
-          key: ${{ runner.os }}-uncrustify
+          key: ${{ runner.os }}-uncrustify-${{ env.UNCRUSTIFY_VERSION }}
 
       - name: build uncrustify
         if: steps.cache-uncrustify.outputs.cache-hit != 'true'
         run: |
-          wget https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-0.72.0.tar.gz
-          tar xzvf uncrustify-0.72.0.tar.gz && cd uncrustify-uncrustify-0.72.0 
+          set -x
+          wget https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-${{ env.UNCRUSTIFY_VERSION }}.tar.gz
+          tar xzvf uncrustify-${{ env.UNCRUSTIFY_VERSION }}.tar.gz
+          cd uncrustify-uncrustify-${{ env.UNCRUSTIFY_VERSION }}
           cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
           cmake --build build -- -j$(nproc) -s
           mkdir ~/uncrustify 
-          cd build && cp uncrustify ~/uncrustify/
+          cp build/uncrustify ~/uncrustify/
 
       - 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/iwyu.yml b/.github/workflows/iwyu.yml
index 01c705b9da5..649991f9373 100644
--- a/.github/workflows/iwyu.yml
+++ b/.github/workflows/iwyu.yml
@@ -2,7 +2,10 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: include-what-you-use
 
-on: workflow_dispatch
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -10,32 +13,57 @@ permissions:
 jobs:
   iwyu:
 
-    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        # "opensuse/tumbleweed:latest" / "fedora:latest" / "debian:unstable" / "archlinux:latest"
+        include:
+          - os: ubuntu-22.04
+            image: "fedora:latest"
+            stdlib: libstdc++
+            clang_inc: '-isystem/usr/lib/clang/20/include'
+          # TODO: disable because it currently fails with "error: <cstddef> tried including <stddef.h> but didn't find libc++'s <stddef.h> header."
+          #- os: ubuntu-22.04
+          #  image: "fedora:latest"
+          #  stdlib: libc++
+          #  clang_inc: '-isystem/usr/lib/clang/20/include'
+          - os: macos-13
+            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' }}
 
     container:
-      image: "archlinux:latest"
+      image: ${{ matrix.image }}
+
+    env:
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
-      # TODO: the necessary packages are excessive - mostly because of Qt - use a pre-built image
       - name: Install missing software on debian/ubuntu
-        if: false
+        if: contains(matrix.image, 'debian')
         run: |
           apt-get update
-          apt-get install -y cmake g++ make libpcre3-dev
-          apt-get install -y qtbase5-dev qttools5-dev libqt5charts5-dev
-          apt-get install -y wget iwyu
-          ln -s ../x86_64-linux-gnu/qt5 /usr/include/qt
+          apt-get install -y cmake clang make libpcre3-dev
+          apt-get install -y libgl-dev  # fixes missing dependency for Qt in CMake
+          apt-get install -y iwyu
 
       - name: Install missing software on archlinux
+        if: contains(matrix.image, 'archlinux')
         run: |
           set -x
           pacman -Sy
-          pacman -S cmake make gcc qt5-base qt5-tools qt5-charts pcre wget --noconfirm
+          pacman -S cmake make clang pcre --noconfirm
+          pacman -S libglvnd --noconfirm  # fixes missing dependency for Qt in CMake
           pacman-key --init
-          pacman-key --recv-key FBA220DFC880C036 --keyserver keyserver.ubuntu.com
-          pacman-key --lsign-key FBA220DFC880C036
+          pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+          pacman-key --lsign-key 3056513887B78AEB 
           pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' --noconfirm
           echo "[chaotic-aur]" >> /etc/pacman.conf
           echo "Include = /etc/pacman.d/chaotic-mirrorlist" >> /etc/pacman.conf
@@ -43,107 +71,198 @@ jobs:
           pacman -S include-what-you-use --noconfirm
           ln -s iwyu-tool /usr/sbin/iwyu_tool
 
+      - name: Install missing software on Fedora
+        if: contains(matrix.image, 'fedora')
+        run: |
+          dnf install -y cmake clang pcre-devel
+          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
+
+      - name: Install missing software on Fedora (libc++)
+        if: contains(matrix.image, 'fedora') && matrix.stdlib == 'libc++'
+        run: |
+          dnf install -y libcxx-devel
+
+      - name: Install missing software on OpenSUSE
+        if: contains(matrix.image, 'opensuse')
+        run: |
+          zypper install -y cmake clang pcre-devel
+          zypper install -y include-what-you-use-tools
+          ln -s iwyu_tool.py /usr/bin/iwyu_tool
+
+      # coreutils contains "nproc"
+      - name: Install missing software on macOS
+        if: contains(matrix.os, 'macos')
+        run: |
+          brew install include-what-you-use pcre coreutils
+          ln -s 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
+      - name: Install Qt ${{ env.QT_VERSION }}
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: ${{ env.QT_VERSION }}
+          modules: 'qtcharts'
+          setup-python: 'false'
+          install-deps: false
+          cache: true
+
+      - name: Generate macOS mappings
+        if: contains(matrix.os, 'macos')
+        run: |
+          set -x
+
+          wget https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/master/mapgen/iwyu-mapgen-apple-libc.py
+          python3 iwyu-mapgen-apple-libc.py $(xcrun --show-sdk-path)/usr/include > macos.imp
+
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=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++
 
+      # Fails on Debian:
+      # /__w/cppcheck/Qt/6.7.0/gcc_64/libexec/rcc: error while loading shared libraries: libglib-2.0.so.0: cannot open shared object file: No such file or directory
       - name: Prepare CMake dependencies
         run: |
+          # make sure the auto-generated GUI sources exist
+          make -C cmake.output autogen
           # make sure the precompiled headers exist
           #make -C cmake.output/cli cmake_pch.hxx.pch
           #make -C cmake.output/gui cmake_pch.hxx.pch
           #make -C cmake.output/lib cmake_pch.hxx.pch
           #make -C cmake.output/test cmake_pch.hxx.pch
-          # make sure the auto-generated GUI sources exist
-          make -C cmake.output autogen
           # make sure the auto-generated GUI dependencies exist
           make -C cmake.output gui-build-deps
           make -C cmake.output triage-build-ui-deps
 
-      - name: Build Qt mappings
+      - name: iwyu_tool
         run: |
-          wget https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/master/mapgen/iwyu-mapgen-qt.py
-          python3 iwyu-mapgen-qt.py /usr/include/qt/ > qt5.imp
+          # 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 }} ${{ matrix.clang_inc }} > iwyu.log
 
-      - name: iwyu_tool
+      # TODO: run with all configurations
+      - name: test/cfg
+        if: matrix.stdlib == 'libstdc++'
         run: |
-          PWD=$(pwd)
-          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --mapping_file=$PWD/qt5.imp > iwyu.log
+          # TODO: redirect to log
+          ./test/cfg/runtests.sh
+        env:
+          IWYU: include-what-you-use
+          IWYU_CLANG_INC: ${{ matrix.clang_inc }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
-          name: Compilation Database
+          name: Compilation Database (include-what-you-use - ${{ matrix.os }} ${{ matrix.stdlib }})
           path: ./cmake.output/compile_commands.json
 
-      - uses: actions/upload-artifact@v3
-        if: success() || failure()
+      - uses: actions/upload-artifact@v4
+        if: ${{ contains(matrix.os, 'macos') && (success() || failure()) }}
         with:
-          name: Qt Mappings
-          path: ./qt5.imp
+          name: macOS Mappings
+          path: |
+            ./iwyu-mapgen-apple-libc.py
+            ./macos.imp
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
-          name: Logs (include-what-you-use)
+          name: Logs (include-what-you-use - ${{ matrix.os }} ${{ matrix.stdlib }})
           path: ./*.log
 
   clang-include-cleaner:
 
+    strategy:
+      matrix:
+        stdlib: [libstdc++, libc++]
+        include:
+          - stdlib: libstdc++
+            use_libcxx: Off
+          - stdlib: libc++
+            use_libcxx: On
+      fail-fast: false
+
     runs-on: ubuntu-22.04
+    if: ${{ github.repository_owner == 'danmar' }}
 
     env:
-      QT_VERSION: 5.15.2
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Install missing software
         run: |
           sudo apt-get update
-          sudo apt-get install -y cmake make
-          sudo apt-get install -y libpcre3-dev
-          sudo apt-get install -y libffi7 # work around missing dependency for Qt install step
+          sudo apt-get install -y cmake make libpcre3-dev
+          sudo apt-get install -y libgl-dev  # missing dependency for using Qt in CMake
 
       - 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 17
-          sudo apt-get install -y clang-tools-17
+          sudo ./llvm.sh 21
+          sudo apt-get install -y clang-tools-21
+
+      - name: Install libc++
+        if: matrix.stdlib == 'libc++'
+        run: |
+          sudo apt-get install -y libc++-21-dev
 
       - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
+          install-deps: false
           cache: true
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DBUILD_TESTS=On -DBUILD_GUI=On -DWITH_QCHART=On -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCPPCHK_GLIBCXX_DEBUG=Off -DUSE_MATCHCOMPILER=Off
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DHAVE_RULES=On -DBUILD_TESTS=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-17
-          CXX: clang++-17
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Prepare CMake dependencies
         run: |
+          # make sure the auto-generated GUI sources exist
+          make -C cmake.output autogen
           # make sure the precompiled headers exist
           #make -C cmake.output/cli cmake_pch.hxx.pch
           #make -C cmake.output/gui cmake_pch.hxx.pch
           #make -C cmake.output/lib cmake_pch.hxx.pch
           #make -C cmake.output/test cmake_pch.hxx.pch
-          # make sure the auto-generated GUI sources exist
-          make -C cmake.output autogen
           # make sure the auto-generated GUI dependencies exist
           make -C cmake.output gui-build-deps
 
       - name: clang-include-cleaner
         run: |
           # TODO: run multi-threaded
-          find $PWD/cli $PWD/lib $PWD/test -maxdepth 1 -name "*.cpp" | xargs -t -n 1 clang-include-cleaner-17 --print=changes --extra-arg=-w -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-21 --print=changes --extra-arg=-w --extra-arg=-stdlib=${{ matrix.stdlib }} -p cmake.output > clang-include-cleaner.log 2>&1
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
+        if: success() || failure()
         with:
-          name: Logs (clang-include-cleaner)
-          path: ./*.log
\ No newline at end of file
+          name: Compilation Database (clang-include-cleaner - ${{ matrix.stdlib }})
+          path: ./cmake.output/compile_commands.json
+
+      - uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: Logs (clang-include-cleaner - ${{ matrix.stdlib }})
+          path: ./*.log
diff --git a/.github/workflows/release-windows-mingw.yml b/.github/workflows/release-windows-mingw.yml
new file mode 100644
index 00000000000..3b9b836347f
--- /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@v4
+        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@v4
+        with:
+          name: cppcheck-mingw
+          path: cppcheck-mingw
diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
index ab6836c9559..2836000acc5 100644
--- a/.github/workflows/release-windows.yml
+++ b/.github/workflows/release-windows.yml
@@ -1,7 +1,5 @@
-# Some convenient links:
-# - https://github.com/actions/virtual-environments/blob/master/images/win/Windows2019-Readme.md
-#
-
+# 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
 
 on:
@@ -23,123 +21,189 @@ jobs:
 
   build:
 
-    runs-on: windows-2022
+    runs-on: windows-2025
+    if: ${{ github.repository_owner == 'danmar' }}
 
     env:
       # see https://www.pcre.org/original/changelog.txt
       PCRE_VERSION: 8.45
-      QT_VERSION: 5.15.2
+      QT_VERSION: 6.10.0
+      BOOST_MINOR_VERSION: 89
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: Set up Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Cache PCRE
-        id: cache-pcre
-        uses: actions/cache@v3
-        with:
-          path: |
-            externals\pcre.h
-            externals\pcre64.lib
-          key: pcre-${{ env.PCRE_VERSION }}-bin-x64-win-release-job
-
       - name: Download PCRE
-        if: steps.cache-pcre.outputs.cache-hit != 'true'
         run: |
           curl -fsSL https://github.com/pfultz2/pcre/archive/refs/tags/%PCRE_VERSION%.zip -o pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
 
       - name: Install PCRE
-        if: steps.cache-pcre.outputs.cache-hit != 'true'
         run: |
+          @echo on
           7z x pcre-%PCRE_VERSION%.zip || exit /b !errorlevel!
           cd pcre-%PCRE_VERSION% || exit /b !errorlevel!
-          cmake . -G "Visual Studio 17 2022" -A x64 -DPCRE_BUILD_PCRECPP=OFF -DPCRE_BUILD_PCREGREP=OFF -DPCRE_BUILD_TESTS=OFF || 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 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
           msbuild -m PCRE.sln -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 }}
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
-          tools: 'tools_openssl_x64,qt.tools.openssl.win_x64'
-          cache: true
+          setup-python: 'false'
+          tools: 'tools_opensslv3_x64'
+          aqtversion: '==3.1.*'  # TODO: remove when aqtinstall 3.2.2 is available
 
-      - name: Create .qm
+      # TODO: build with multiple threads
+      - name: Build x64 release GUI
         run: |
-          cd gui || exit /b !errorlevel!
-          lupdate gui.pro -no-obsolete || exit /b !errorlevel!
-          lrelease gui.pro -removeidentical || exit /b !errorlevel!
+          :: TODO: enable rules?
+          :: specify Release build so matchcompiler is used
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -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
+      - name: Deploy app
+        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!
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: deploy
+          path: build\bin\Release
 
       - name: Matchcompiler
         run: python tools\matchcompiler.py --write-dir lib || exit /b !errorlevel!
 
-      - name: Build x64 release GUI
-        run: |
-          cd gui || exit /b !errorlevel!
-          qmake HAVE_QCHART=yes || exit /b !errorlevel!
-          nmake release || exit /b !errorlevel!
+      # TODO: build with multiple threads
+      - name: Build CLI x64 release configuration using MSBuild
+        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: /MP
+          _CL_: /WX
 
-      - name: Deploy app
-        run: |
-          windeployqt Build\gui || exit /b !errorlevel!
-          del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel!
-          del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel!
+      - uses: actions/upload-artifact@v4
+        with:
+          name: bin
+          path: bin
 
-      # 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!
+      - name: Install missing Python packages
+        run: |
+          pip install -U pyinstaller || exit /b !errorlevel!
 
+      # TODO: include in installer?
       - name: Compile misra.py executable
         run: |
-          pip install -U pyinstaller || exit /b !errorlevel!
           cd addons || exit /b !errorlevel!
           pyinstaller --hidden-import xml --hidden-import xml.etree --hidden-import xml.etree.ElementTree misra.py || exit /b !errorlevel!
           del *.spec || exit /b !errorlevel!
 
+      # TODO: include in installer?
+      - name: Compile cppcheck-htmlreport executable
+        run: |
+          cd htmlreport || exit /b !errorlevel!
+          pyinstaller cppcheck-htmlreport || exit /b !errorlevel!
+          del *.spec || exit /b !errorlevel!
+
+      # TODO: test the compiled Python files
+
       - name: Collect files
         run: |
-          move Build\gui win_installer\files || exit /b !errorlevel!
-          mkdir win_installer\files\addons || exit /b !errorlevel!
-          copy addons\*.* win_installer\files\addons || exit /b !errorlevel!
+          @echo on
+          move build\bin\Release win_installer\files || exit /b !errorlevel!
+          copy AUTHORS win_installer\files\authors.txt || 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!
+          copy externals\tinyxml2\LICENSE win_installer\files\tinyxml2-license.txt || exit /b !errorlevel!
           copy addons\dist\misra\*.* win_installer\files\addons || exit /b !errorlevel!
-          mkdir win_installer\files\cfg || exit /b !errorlevel!
-          copy cfg\*.cfg win_installer\files\cfg || exit /b !errorlevel!
-          :: "platforms" is a folder used by Qt as well so it already exists
-          :: mkdir win_installer\files\platforms || exit /b !errorlevel!
-          copy platforms\*.xml win_installer\files\platforms || exit /b !errorlevel!
           copy bin\cppcheck.exe win_installer\files || exit /b !errorlevel!
           copy bin\cppcheck-core.dll win_installer\files || exit /b !errorlevel!
-          mkdir win_installer\files\help || exit /b !errorlevel!
+          :: mkdir win_installer\files\help || exit /b !errorlevel!
           xcopy /s gui\help win_installer\files\help || exit /b !errorlevel!
+          copy gui\help\online-help.qhc win_installer\files\ || exit /b !errorlevel!
+          copy gui\help\online-help.qch win_installer\files\ || exit /b !errorlevel!
+          del win_installer\files\cfg\*.rng || exit /b !errorlevel!
+          del win_installer\files\platforms\*.rng || exit /b !errorlevel!
           del win_installer\files\translations\*.qm || exit /b !errorlevel!
-          move gui\*.qm win_installer\files\translations || exit /b !errorlevel!
-          :: copy libcrypto-1_1-x64.dll and libssl-1_1-x64.dll
-          copy %RUNNER_WORKSPACE%\Qt\Tools\OpenSSL\Win_x64\bin\lib*.dll win_installer\files || exit /b !errorlevel!
+          move build\gui\*.qm win_installer\files\translations || exit /b !errorlevel!
+          copy htmlreport\dist\cppcheck-htmlreport\*.* win_installer\files || exit /b !errorlevel!
+          :: 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
+        with:
+          name: collect
+          path: win_installer\files
 
       - name: Build Installer
         run: |
           cd win_installer || exit /b !errorlevel!
-          REM Read ProductVersion
+          :: Read ProductVersion
           for /f "tokens=4 delims= " %%a in ('find "ProductVersion" productInfo.wxi') do set PRODUCTVER=%%a
-          REM Remove double quotes
+          :: Remove double quotes
           set PRODUCTVER=%PRODUCTVER:"=%
-          echo ProductVersion="%PRODUCTVER%" || exit /b !errorlevel!
+          @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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: installer
           path: win_installer/Build/
 
-      - uses: actions/upload-artifact@v3
+      - name: Clean up deploy
+        run: |
+          @echo on
+          :: del win_installer\files\addons\*.dll || exit /b !errorlevel!
+          del win_installer\files\addons\*.doxyfile || exit /b !errorlevel!
+          del win_installer\files\addons\*.md || exit /b !errorlevel!
+          :: del win_installer\files\addons\*.pyd || exit /b !errorlevel!
+          :: del win_installer\files\addons\base_library.zip || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\addons\test || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\addons\doc || exit /b !errorlevel!
+          :: rmdir /s /q win_installer\files\bearer || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\generic || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\help || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\iconengines || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\imageformats || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\networkinformation || exit /b !errorlevel!
+          :: rmdir /s /q win_installer\files\printsupport || exit /b !errorlevel!
+          rmdir /s /q win_installer\files\sqldrivers || exit /b !errorlevel!      
+          rmdir /s /q win_installer\files\tls || exit /b !errorlevel!
+          ren win_installer\files\translations lang || exit /b !errorlevel!
+          del win_installer\files\d3dcompiler_47.dll || exit /b !errorlevel!
+          del win_installer\files\dxcompiler.dll || exit /b !errorlevel!
+          del win_installer\files\dxil.dll || exit /b !errorlevel!
+          del win_installer\files\dmake.exe || exit /b !errorlevel!
+          del win_installer\files\dmake.pdb || exit /b !errorlevel!
+          :: del win_installer\files\libEGL.dll || exit /b !errorlevel!
+          :: del win_installer\files\libGLESv2.dll || exit /b !errorlevel!
+          del win_installer\files\opengl32sw.dll || exit /b !errorlevel!
+          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
         with:
-          name: deploy
+          name: portable
           path: win_installer\files
diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml
index 13b87c37ff5..844b1d5c2f3 100644
--- a/.github/workflows/scriptcheck.yml
+++ b/.github/workflows/scriptcheck.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: scriptcheck
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -10,11 +18,12 @@ permissions:
 jobs:
   build:
 
-    # 'ubuntu-22.04' removes Python 2.7, 3.6 and 3.6 so keep the previous LTS version
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -22,7 +31,7 @@ jobs:
           key: ${{ github.workflow }}-${{ runner.os }}
 
       - name: Cache Cppcheck
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: cppcheck
           key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
@@ -30,32 +39,36 @@ jobs:
       - name: build cppcheck
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          make -j$(nproc) -s
+          make -j$(nproc) CXXOPTS="-Werror"
           strip -s ./cppcheck
 
   scriptcheck:
 
     needs: build
-    # 'ubuntu-22.04' removes Python 2.7, 3.5 and 3.6 so keep the previous LTS version
-    runs-on: ubuntu-20.04
-        container:
-            image: python:2.7.18-buster
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13', '3.14']
+        include:
+          - python-version: '3.14'
+            python-latest: true
+
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
+      # TODO: bailout on error
       - name: Restore Cppcheck
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: cppcheck
           key: ${{ runner.os }}-scriptcheck-cppcheck-${{ github.sha }}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -65,16 +78,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install tidy libxml2-utils
 
-      - name: Install missing software on ubuntu (Python 2)
-        if: matrix.python-version == '2.7'
-        run: |
-          python -m pip install pip --upgrade
-          python -m pip install pathlib
-          python -m pip install pytest
-          python -m pip install pygments
-
       - name: Install missing software on ubuntu (Python 3)
-        if: matrix.python-version != '2.7'
         run: |
           # shellcheck cannot be installed via pip
           # ERROR: Could not find a version that satisfies the requirement shellcheck (from versions: none)
@@ -83,43 +87,44 @@ jobs:
           python -m pip install pip --upgrade
           python -m pip install natsort
           python -m pip install pexpect
-          python -m pip install pylint
+          python -m pip install 'pylint<4.1.0'
           python -m pip install unittest2
           python -m pip install pytest
+          python -m pip install pytest-xdist
           python -m pip install pygments
           python -m pip install requests
           python -m pip install psutil
+          python -m pip install setuptools
 
       - name: run Shellcheck
-        if: matrix.python-version == '3.11'
+        if: matrix.python-latest
         run: |
           find . -name "*.sh" | xargs shellcheck --exclude SC2002,SC2013,SC2034,SC2035,SC2043,SC2046,SC2086,SC2089,SC2090,SC2129,SC2211,SC2231
 
       - name: run pylint
-        if: matrix.python-version == '3.11'
+        if: matrix.python-latest
         run: |
-          echo "FIXME pylint is disabled for now because it fails to import files:"
-          echo "FIXME addons/runaddon.py:1:0: E0401: Unable to import 'cppcheckdata' (import-error)"
-          echo "FIXME addons/runaddon.py:1:0: E0401: Unable to import 'cppcheck' (import-error)"
-          # pylint --rcfile=pylintrc_travis --jobs $(nproc) addons/*.py htmlreport/cppcheck-htmlreport htmlreport/*.py tools/*.py
+          shopt -s globstar
+          pylint --jobs $(nproc) --py-version 3.7 addons/**/*.py htmlreport/cppcheck-htmlreport htmlreport/**/*.py test/**/*.py tools/**/*.py
 
       - name: check .json files
-        if: matrix.python-version == '3.11'
+        if: matrix.python-latest
         run: |
           find . -name '*.json' | xargs -n 1 python -m json.tool > /dev/null
 
       - name: Validate
-        if: matrix.python-version == '3.11'
+        if: matrix.python-latest
         run: |
           make -j$(nproc) validateCFG validatePlatforms validateRules
 
       - name: check python syntax
-        if: matrix.python-version != '2.7'
         run: |
-          python -m py_compile addons/*.py
+          shopt -s globstar
+          python -m py_compile addons/**/*.py
           python -m py_compile htmlreport/cppcheck-htmlreport
-          python -m py_compile htmlreport/*.py
-          python -m py_compile tools/*.py
+          python -m py_compile htmlreport/**/*.py
+          python -m py_compile test/**/*.py
+          python -m py_compile tools/**/*.py
 
       - name: compile addons
         run: |
@@ -127,42 +132,91 @@ jobs:
 
       - name: test matchcompiler
         run: |
-          python tools/test_matchcompiler.py
+          python test/tools/test_matchcompiler.py
+        env:
+          PYTHONPATH: ./tools
+
+      # TODO: run with "-n auto" when misra_test.py can be run in parallel
+      # we cannot specify -Werror since xml/etree/ElementTree.py in Python 3.9/3.10 contains an unclosed file
+      - name: test addons
+        if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
+        run: |
+          python -m pytest --strict-markers -vv -n 1 addons/test
+        env:
+          PYTHONPATH: ./addons
 
+      # TODO: run with "-n auto" when misra_test.py can be run in parallel
       - name: test addons
+        if: matrix.python-version != '3.9' && matrix.python-version != '3.10'
         run: |
-          python -m pytest -v addons/test/test-*.py
+          python -m pytest -Werror --strict-markers -vv -n 1 addons/test
         env:
           PYTHONPATH: ./addons
 
-      - name: test htmlreport
+      - name: test htmlreport (standalone)
         run: |
-          htmlreport/test_htmlreport.py
-          cd htmlreport
-          ./check.sh
+          test/tools/htmlreport/test_htmlreport.py
+          test/tools/htmlreport/check.sh
+
+      - name: test htmlreport (pip)
+        run: |
+          python -m venv venv
+          source venv/bin/activate
+          python -m pip install -U pip
+          pip install ./htmlreport/
+          which cppcheck-htmlreport
+          PIP_PACKAGE_TEST=1 test/tools/htmlreport/test_htmlreport.py
+          # TODO: does not test the pip binary
+          test/tools/htmlreport/check.sh
 
       - name: test reduce
         run: |
-          python -m pytest -v tools/test_reduce.py
+          python -m pytest -Werror --strict-markers -vv test/tools/reduce_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_lib
-        if: matrix.python-version != '2.7'
         run: |
-          python -m pytest -v tools/test_donate_cpu_lib.py
+          python -m pytest -Werror --strict-markers -vv test/tools/donate_cpu_lib_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_server
-        if: matrix.python-version != '2.7'
         run: |
-          python -m pytest -v tools/test_donate_cpu_server.py
+          python -m pytest -Werror --strict-markers -vv test/tools/donate_cpu_server_test.py
+          # TODO: why is this file generated? also should be in a temporary folder if possible
+          rm -f test/tools/donate-cpu-server.log
         env:
           PYTHONPATH: ./tools
 
-      - name: dmake
-        if: matrix.python-version == '3.11'
+      - name: Show all ignored files
+        if: false  # TODO: currently lists all the contents of ignored folders - we only need what actually matched
+        run: |
+          git ls-files --others --ignored --exclude-standard
+
+      - name: Check for changed and unversioned files
+        run: |
+          # TODO: how to do this with a single command?
+          git status --ignored=no
+          git status --ignored=no | grep -q 'working tree clean'
+
+  dmake:
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, macos-15, windows-2025]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: run dmake
+        run: |
+          make -j3 CXXOPTS="-Werror" run-dmake
+
+      - name: check diff
         run: |
-          make -j$(nproc) run-dmake
           git diff --exit-code
diff --git a/.github/workflows/selfcheck.yml b/.github/workflows/selfcheck.yml
index 8cd028f9af9..3a2fd2fffc0 100644
--- a/.github/workflows/selfcheck.yml
+++ b/.github/workflows/selfcheck.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: selfcheck
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -13,15 +21,12 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 5.15.2
+      QT_VERSION: 6.10.0
 
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install missing software
-        run: |
-          sudo apt-get update
-          sudo apt-get install libboost-container-dev
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -31,13 +36,18 @@ jobs:
       - name: Install missing software
         run: |
           sudo apt-get update
-          sudo apt-get install clang-14 valgrind
+          sudo apt-get install clang-14
+          sudo apt-get install libboost-container-dev
+          sudo apt-get install valgrind
+          sudo apt-get install -y libgl-dev  # fixes missing dependency for Qt in CMake
 
       - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.QT_VERSION }}
           modules: 'qtcharts'
+          setup-python: 'false'
+          install-deps: false
           cache: true
 
       # TODO: cache this - perform same build as for the other self check
@@ -46,53 +56,119 @@ 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
 
+      # unusedFunction - start
       - name: CMake
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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: |
+          # make sure auto-generated GUI files exist
+          make -C cmake.output autogen
           # make sure the precompiled headers exist
           make -C cmake.output lib/CMakeFiles/cppcheck-core.dir/cmake_pch.hxx.cxx
           make -C cmake.output test/CMakeFiles/testrunner.dir/cmake_pch.hxx.cxx
-          # make sure auto-generated GUI files exist
-          make -C cmake.output autogen
+          # 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=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --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
+      # unusedFunction - end
 
       # the following steps are duplicated from above since setting up the build node in a parallel step takes longer than the actual steps
+
+      # 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 -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
+          cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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: |
-          # make sure the precompiled headers exist
-          make -C cmake.output.notest lib/CMakeFiles/cppcheck-core.dir/cmake_pch.hxx.cxx
           # make sure auto-generated GUI files exist
           make -C cmake.output.notest autogen
+          # make sure the precompiled headers exist
+          make -C cmake.output.notest lib/CMakeFiles/cppcheck-core.dir/cmake_pch.hxx.cxx
+          # 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=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --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
+      # unusedFunction notest - end
+
+      # 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 -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
+
+      - name: Self check (unusedFunction / no test / no gui)
+        run: |
+          supprs="--suppress=unusedFunction:lib/errorlogger.h:196 --suppress=unusedFunction:lib/importproject.cpp:1516 --suppress=unusedFunction:lib/importproject.cpp:1540"
+          ./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 $supprs
         env:
           DISABLE_VALUEFLOW: 1
           UNUSEDFUNCTION_ONLY: 1
+      # unusedFunction notest nogui - end
+
+      # 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 -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: |
+          # make sure auto-generated GUI files exist
+          make -C cmake.output.notest_nocli autogen
+          # make sure the precompiled headers exist
+          make -C cmake.output.notest_nocli lib/CMakeFiles/cppcheck-core.dir/cmake_pch.hxx.cxx
+          # make sure the auto-generated GUI dependencies exist
+          make -C cmake.output.notest_nocli gui-build-deps
+
+      - 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,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 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=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: |
@@ -101,28 +177,28 @@ jobs:
 
       - 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 -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
+          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 -DDISABLE_DMAKE=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
       - name: Generate dependencies (corpus)
         run: |
-          # make sure the precompiled headers exist
-          make -C cmake.output.notest lib/CMakeFiles/cppcheck-core.dir/cmake_pch.hxx.cxx
           # make sure auto-generated GUI files exist
           make -C cmake.output.corpus autogen
+          # make sure the precompiled headers exist
+          make -C cmake.output.corpus lib/CMakeFiles/lib_objs.dir/cmake_pch.hxx.cxx
+          # 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=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: Callgrind Output
           path: ./callgrind.*
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
index fc3af112481..27ed6606386 100644
--- a/.github/workflows/tsan.yml
+++ b/.github/workflows/tsan.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: thread sanitizer
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -13,50 +21,62 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 5.15.2
+      QT_VERSION: 6.10.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@v3
+      - 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.11
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
           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
+          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 16
+          sudo ./llvm.sh 21
 
       - name: Install Qt ${{ env.QT_VERSION }}
-        if: false
-        uses: jurplel/install-qt-action@v3
+        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=Off -DWITH_QCHART=Off -DUSE_MATCHCOMPILER=Verify -DANALYZE_THREAD=On -DUSE_THREADS=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 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=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_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         env:
-          CC: clang-16
-          CXX: clang++-16
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Build cppcheck
         run: |
@@ -66,9 +86,51 @@ jobs:
         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: |
@@ -81,10 +143,18 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=0 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          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,information --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"
+          gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
+          gui_options="$gui_options --suppress=autoNoType:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
           ec=0
-          ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json -DCHECK_INTERNAL cli lib || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -Icli test/*.cpp tools/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json frontend || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json -Ifrontend 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 $gui_options --addon=naming.json --suppress=constVariablePointer:*/moc_*.cpp -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli -Ifrontend test/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
           exit $ec
diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml
index 1de89f66ff5..64eb02a4b25 100644
--- a/.github/workflows/ubsan.yml
+++ b/.github/workflows/ubsan.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: undefined behaviour sanitizers
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -13,49 +21,62 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      QT_VERSION: 5.15.2
+      QT_VERSION: 6.10.0
       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@v3
+      - 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.11
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
           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
+          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 16
+          sudo ./llvm.sh 21
 
       - name: Install Qt ${{ env.QT_VERSION }}
-        uses: jurplel/install-qt-action@v3
+        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 -DWITH_QCHART=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 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=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_COMPILE_WARNING_AS_ERROR=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         env:
-          CC: clang-16
-          CXX: clang++-16
+          CC: clang-21
+          CXX: clang++-21
 
       - name: Build cppcheck
         run: |
@@ -65,9 +86,48 @@ jobs:
         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
         run: |
           # make sure auto-generated GUI files exist
@@ -77,10 +137,17 @@ 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
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          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"
+          cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
+          gui_options="-DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=69 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt"
+          gui_options="$gui_options --suppress=autoNoType:*/moc_*.cpp --suppress=symbolDatabaseWarning:*/moc_*.cpp"
           ec=0
-          ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json cli lib || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -Icli test/*.cpp tools/*.cpp || ec=1
-          ./cmake.output/bin/cppcheck $selfcheck_options -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options externals || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json frontend || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json -Ifrontend 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 $gui_options --addon=naming.json --suppress=constVariablePointer:*/moc_*.cpp -Icmake.output/gui -Ifrontend -Igui gui/*.cpp cmake.output/gui || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli -Ifrontend test/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli tools/dmake/*.cpp || ec=1
+          ./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options $gui_options -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage || ec=1
           exit $ec
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
index 1753e6f0acd..9a6026aa25b 100644
--- a/.github/workflows/valgrind.yml
+++ b/.github/workflows/valgrind.yml
@@ -2,7 +2,15 @@
 # Environment reference https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
 name: valgrind
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+      - '2.*'
+    tags:
+      - '2.*'
+  pull_request:
 
 permissions:
   contents: read
@@ -13,7 +21,9 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -31,12 +41,12 @@ jobs:
       - name: Build cppcheck
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          CXXFLAGS="-O1 -g -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 -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: |
@@ -44,10 +54,11 @@ jobs:
           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
           cat memcheck.log
           exit $ec
-        env:
-          DEBUGINFOD_URLS: https://debuginfod.ubuntu.com
+        # 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@v3
+      - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
           name: Logs
diff --git a/.gitignore b/.gitignore
index af691695934..434203fe2a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.bak
 *.gcno
+*.gch
 *.o
 *.pyc
 /cppcheck
@@ -13,9 +14,9 @@ tags
 /testrunner
 /testrunner.exe
 tools/daca2*.html
-tools/dmake
 tools/errmsg
 tools/extracttests
+.DS_Store
 
 # dump files generated by Cppcheck
 *.*.dump
@@ -51,42 +52,13 @@ ipch/
 *.pbxuser
 build/
 
-# GUI build folders
-/gui/debug/
-/gui/release/
-/gui/temp/
-/triage/temp
-
 # Other (generated) GUI files
-/gui/*.qm
-/gui/cppcheck-gui
-/gui/cppcheck-gui.exe
-/gui/gui.sln
-/gui/gui.vcproj
 /gui/help/online-help.qch
 /gui/help/online-help.qhc
-/gui/Makefile
-/gui/Makefile.debug
-/gui/Makefile.release
-/gui/qrc_gui.cpp
-/gui/test/Makefile
-/gui/test/*/Makefile
-/gui/test/*/*/Makefile
-/gui/test/benchmark/simple/benchmark-simple
-/gui/test/cppchecklibrarydata/qrc_resources.cpp
-/gui/test/cppchecklibrarydata/test-cppchecklibrarydata
-/gui/test/filelist/test-filelist
-/gui/test/projectfile/test-projectfile
-/gui/test/translationhandler/test-translationhandler
-/gui/test/xmlreportv2/test-xmlreportv2
 
 # Doxygen output folder
 doxyoutput/
 
-# qmake generated
-htmlreport/.tox/
-htmlreport/MANIFEST
-
 # Backup files and stuff from patches
 *.rej
 *~
@@ -121,12 +93,38 @@ stage
 /.run
 
 # clang tooling temporary files
-.clangd/
-.cache/
-compile_commands.json
-
-# qmake
-.qmake.stash
+/.clangd/
+/.cache/
+/compile_commands.json
 
 #vs code
 /.vscode
+
+# fuzzing output
+/oss-fuzz/corpus
+/oss-fuzz/corpus_
+/oss-fuzz/samples
+
+# Python
+/.venv/
+/venv/
+**/*.egg-info/
+
+# cppcheck-htmlreport auto files
+/htmlreport/cppcheck_htmlreport/run.py
+
+# GDB configuration
+.gdbinit
+
+# pyinstaller output
+/addons/dist
+/addons/misra.spec
+/htmlreport/cppcheck-htmlreport.spec
+/htmlreport/dist
+
+# ccache folder in CI
+/.ccache
+
+# PCRE Windows files
+/externals/pcre.h
+/externals/pcre64.lib
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 00000000000..0ca3480c06f
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,65 @@
+[MESSAGES CONTROL]
+disable=
+        # W start
+        redefined-builtin,
+        broad-exception-caught,
+        fixme,
+        bare-except,
+        redefined-outer-name,
+        attribute-defined-outside-init,
+        unspecified-encoding,
+        global-statement,
+        protected-access,
+        broad-exception-raised,
+        subprocess-popen-preexec-fn,
+        logging-not-lazy,
+        unknown-option-value,
+        unused-wildcard-import,
+        wildcard-import,
+        unused-argument,
+        pointless-string-statement,
+        arguments-renamed,
+        duplicate-string-formatting-argument,
+        # C start
+        consider-using-f-string,
+        invalid-name,
+        line-too-long,
+        missing-module-docstring,
+        missing-function-docstring,
+        import-outside-toplevel,
+        missing-class-docstring,
+        superfluous-parens,
+        too-many-lines,
+        trailing-newlines,
+        missing-final-newline,
+        use-implicit-booleaness-not-len,
+        wrong-import-order,
+        use-implicit-booleaness-not-comparison,
+        consider-using-enumerate,
+        unnecessary-lambda-assignment,
+        consider-using-dict-items,
+        consider-iterating-dictionary,
+        # R start
+        duplicate-code,
+        consider-using-with,
+        too-many-statements,
+        too-many-branches,
+        too-many-locals,
+        too-many-arguments,
+        too-few-public-methods,
+        too-many-return-statements,
+        consider-using-in,
+        too-many-nested-blocks,
+        too-many-public-methods,
+        chained-comparison,
+        too-many-instance-attributes,
+        too-many-boolean-expressions,
+        use-a-generator,
+        too-many-positional-arguments
+[REPORTS]
+reports=no
+[TYPECHECK]
+# See https://stackoverflow.com/questions/10300082/how-to-prevent-python-pylint-complaining-about-socket-class-sendall-method
+ignored-classes=SQLObject,_socketobject
+[MASTER]
+init-hook='import sys; sys.path.append("./addons")'
diff --git a/.selfcheck_suppressions b/.selfcheck_suppressions
index 1f9a8d9aa0d..7728225cd44 100644
--- a/.selfcheck_suppressions
+++ b/.selfcheck_suppressions
@@ -1,26 +1,44 @@
 missingIncludeSystem
-shadowFunction
-bitwiseOnBoolean
-
-# temporary suppressions - fix the warnings!
-simplifyUsing:lib/valueptr.h
-varid0:gui/projectfile.cpp
-templateInstantiation
+# should not be reported - see #13387
+checkersReport
+# false positive - see #14308
+nullPointerRedundantCheck:externals/simplecpp/simplecpp.cpp:3246
 
 # warnings in Qt generated code we cannot fix
-symbolDatabaseWarning:gui/temp/moc_*.cpp
-simplifyUsing:gui/temp/moc_*.cpp
-funcArgNamesDifferent:gui/temp/moc_*.cpp
-symbolDatabaseWarning:tools/triage/temp/moc_*.cpp
-naming-varname:gui/temp/ui_*.h
-naming-varname:cmake.output/gui/ui_*.h
-functionStatic:gui/temp/ui_fileview.h
-functionStatic:cmake.output/gui/ui_fileview.h
+funcArgNamesDifferent:*/moc_checkthread.cpp
+funcArgNamesDifferent:*/moc_codeeditstylecontrols.cpp
+funcArgNamesDifferent:*/moc_resultstree.cpp
+funcArgNamesDifferent:*/moc_resultsview.cpp
+funcArgNamesDifferent:*/moc_threadhandler.cpp
+funcArgNamesDifferent:*/moc_threadresult.cpp
+naming-varname:*/gui/ui_*.h
+functionStatic:*/ui_fileview.h
 
 # --debug-warnings suppressions
 valueFlowBailout
 valueFlowBailoutIncompleteVar
-autoNoType
-bailoutUninitVar
+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
 
-*:externals/*/*
+# TODO: these warnings need to be addressed upstream
+uninitMemberVar:externals/tinyxml2/tinyxml2.h
+noExplicitConstructor:externals/tinyxml2/tinyxml2.h
+missingOverride:externals/tinyxml2/tinyxml2.h
+invalidPrintfArgType_sint:externals/tinyxml2/tinyxml2.h
+naming-privateMemberVariable:externals/tinyxml2/tinyxml2.h
+functionStatic:externals/tinyxml2/tinyxml2.cpp
+funcArgNamesDifferent:externals/tinyxml2/tinyxml2.cpp
+nullPointerRedundantCheck:externals/tinyxml2/tinyxml2.cpp
+useStlAlgorithm:externals/simplecpp/simplecpp.cpp
+missingMemberCopy:externals/simplecpp/simplecpp.h
diff --git a/.selfcheck_unused_suppressions b/.selfcheck_unused_suppressions
index f66bcc905c0..5da7c225dfa 100644
--- a/.selfcheck_unused_suppressions
+++ b/.selfcheck_unused_suppressions
@@ -1,13 +1,8 @@
+# should not be reported - see #13387
+checkersReport
+
 # we are not using all methods of their interfaces
-unusedFunction:externals/tinyxml2/tinyxml2.cpp
-unusedFunction:externals/simplecpp/simplecpp.cpp
+unusedFunction:externals/*/*
 
-# TODO: fix these
-# false positive - # 10660
-unusedFunction:gui/mainwindow.cpp
-unusedFunction:gui/resultstree.cpp
-unusedFunction:gui/codeeditor.cpp
-# usage is disabled
-unusedFunction:lib/symboldatabase.cpp
-# false positive - #10661
-unusedFunction:oss-fuzz/main.cpp
\ No newline at end of file
+# Q_OBJECT functions which are not called in our code
+unusedFunction:cmake.output.notest/gui/cppcheck-gui_autogen/*/moc_aboutdialog.cpp
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 46b471c0aff..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-language: cpp
-dist: xenial
-
-compiler:
-  - gcc
-  - clang
-
-env:
-  global:
-    - ORIGINAL_CXXFLAGS="-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 -D_GLIBCXX_DEBUG -g"
-#   unfortunately we need this to stay within 50min timelimit given by travis.
-    - CXXFLAGS="${ORIGINAL_CXXFLAGS} -O2 -march=native -Wstrict-aliasing=2 -Werror=strict-aliasing"
-    - CPPCHECK=${TRAVIS_BUILD_DIR}/cppcheck
-  matrix:
-    - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL"
-    - CXXFLAGS="${CXXFLAGS} -DCHECK_INTERNAL" MAKEFLAGS="HAVE_RULES=yes" MATCHCOMPILER=yes VERIFY=1
-
-before_install:
-# install needed deps
- - travis_retry sudo apt-get update -qq
- - travis_retry sudo apt-get install -qq libxml2-utils libpcre3 gdb unzip wx-common xmlstarlet liblua5.3-dev libcurl3 libcairo2-dev libsigc++-2.0-dev tidy libopencv-dev
-
-matrix:
-# do notify immediately about it when a job of a build fails.
-  fast_finish: true
-# defined extra jobs that run besides what is configured in the build matrix
-  include:
-
-# check a lot of stuff that only needs to be checked in a single configuration
-    - name: "misc"
-      compiler: clang
-      script:
-        - make -j$(nproc) -s
-# check if DESTDIR works  TODO: actually execute this
-        - mkdir install_test
-        - echo $CXXFLAGS
-        - make -s DESTDIR=install_test FILESDIR=/usr/share/cppcheck install
-# rm everything
-        - git clean -dfx
-# check what happens if we want to install it to some other dir,
-        - echo $CXXFLAGS
-        - make -s MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck -j$(nproc)
-        - sudo make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck install
diff --git a/.uncrustify.cfg b/.uncrustify.cfg
index 074811b05b7..81722ff7249 100644
--- a/.uncrustify.cfg
+++ b/.uncrustify.cfg
@@ -1,13 +1,4 @@
-# Uncrustify-0.72.0_f
-
-#
-# General options
-#
-
-# The type of line endings.
-#
-# Default: auto
-newlines                        = auto     # lf/crlf/cr/auto
+# Uncrustify-0.80.1_f
 
 # The original size of tabs in the input.
 #
@@ -19,274 +10,36 @@ input_tab_size                  = 4        # unsigned number
 # Default: 8
 output_tab_size                 = 4        # unsigned number
 
-# The ASCII value of the string escape char, usually 92 (\) or (Pawn) 94 (^).
-#
-# Default: 92
-string_escape_char              = 92       # unsigned number
-
-# Alternate string escape char (usually only used for Pawn).
-# Only works right before the quote char.
-string_escape_char2             = 0        # unsigned number
-
-# Replace tab characters found in string literals with the escape sequence \t
-# instead.
-string_replace_tab_chars        = false    # true/false
-
-# Allow interpreting '>=' and '>>=' as part of a template in code like
-# 'void f(list<list<B>>=val);'. If true, 'assert(x<0 && y>=3)' will be broken.
-# Improvements to template detection may make this option obsolete.
-tok_split_gte                   = false    # true/false
-
-# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
-disable_processing_nl_cont      = false    # true/false
-
-# Specify the marker used in comments to disable processing of part of the
-# file.
-# The comment should be used alone in one line.
-#
-# Default:  *INDENT-OFF*
-disable_processing_cmt          = " *INDENT-OFF*"      # string
-
-# Specify the marker used in comments to (re)enable processing in a file.
-# The comment should be used alone in one line.
-#
-# Default:  *INDENT-ON*
-enable_processing_cmt           = " *INDENT-ON*"     # string
-
-# Enable parsing of digraphs.
-enable_digraphs                 = false    # true/false
-
-# Add or remove the UTF-8 BOM (recommend 'remove').
-utf8_bom                        = ignore   # ignore/add/remove/force
-
-# If the file contains bytes with values between 128 and 255, but is not
-# UTF-8, then output as UTF-8.
-utf8_byte                       = false    # true/false
-
-# Force the output encoding to UTF-8.
-utf8_force                      = false    # true/false
-
-# Add or remove space between 'do' and '{'.
-sp_do_brace_open                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'while'.
-sp_brace_close_while            = ignore   # ignore/add/remove/force
-
 # Add or remove space between 'while' and '('.
 sp_while_paren_open             = add   # ignore/add/remove/force
 
-#
-# Spacing options
-#
-
-# Add or remove space around non-assignment symbolic operators ('+', '/', '%',
-# '<<', and so forth).
-sp_arith                        = ignore   # ignore/add/remove/force
-
-# Add or remove space around arithmetic operators '+' and '-'.
-#
-# Overrides sp_arith.
-sp_arith_additive               = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=', '+=', etc.
-sp_assign                       = ignore   # ignore/add/remove/force
-
-# Add or remove space around '=' in C++11 lambda capture specifications.
-#
-# Overrides sp_assign.
-sp_cpp_lambda_assign            = ignore   # ignore/add/remove/force
-
-# Add or remove space after the capture specification of a C++11 lambda when
-# an argument list is present, as in '[] <here> (int x){ ... }'.
-sp_cpp_lambda_square_paren      = ignore   # ignore/add/remove/force
-
-# Add or remove space after the capture specification of a C++11 lambda with
-# no argument list is present, as in '[] <here> { ... }'.
-sp_cpp_lambda_square_brace      = ignore   # ignore/add/remove/force
-
-# Add or remove space after the argument list of a C++11 lambda, as in
-# '[](int x) <here> { ... }'.
-sp_cpp_lambda_paren_brace       = ignore   # ignore/add/remove/force
-
-# Add or remove space between a lambda body and its call operator of an
-# immediately invoked lambda, as in '[]( ... ){ ... } <here> ( ... )'.
-sp_cpp_lambda_fparen            = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment operator '=' in a prototype.
-#
-# If set to ignore, use sp_assign.
-sp_assign_default               = ignore   # ignore/add/remove/force
-
-# Add or remove space before assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_before_assign                = ignore   # ignore/add/remove/force
-
-# Add or remove space after assignment operator '=', '+=', etc.
-#
-# Overrides sp_assign.
-sp_after_assign                 = ignore   # ignore/add/remove/force
-
-# Add or remove space in 'NS_ENUM ('.
-sp_enum_paren                   = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment '=' in enum.
-sp_enum_assign                  = ignore   # ignore/add/remove/force
-
-# Add or remove space before assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_before_assign           = ignore   # ignore/add/remove/force
-
-# Add or remove space after assignment '=' in enum.
-#
-# Overrides sp_enum_assign.
-sp_enum_after_assign            = ignore   # ignore/add/remove/force
-
-# Add or remove space around assignment ':' in enum.
-sp_enum_colon                   = ignore   # ignore/add/remove/force
-
-# Add or remove space around preprocessor '##' concatenation operator.
-#
-# Default: add
-sp_pp_concat                    = add      # ignore/add/remove/force
-
-# Add or remove space after preprocessor '#' stringify operator.
-# Also affects the '#@' charizing operator.
-sp_pp_stringify                 = ignore   # ignore/add/remove/force
-
-# Add or remove space before preprocessor '#' stringify operator
-# as in '#define x(y) L#y'.
-sp_before_pp_stringify          = ignore   # ignore/add/remove/force
-
 # Add or remove space around boolean operators '&&' and '||'.
 sp_bool                         = force    # ignore/add/remove/force
 
-# Add or remove space around compare operator '<', '>', '==', etc.
-sp_compare                      = ignore   # ignore/add/remove/force
-
 # Add or remove space inside '(' and ')'.
 sp_inside_paren                 = remove   # ignore/add/remove/force
 
 # Add or remove space between nested parentheses, i.e. '((' vs. ') )'.
 sp_paren_paren                  = remove   # ignore/add/remove/force
 
-# Add or remove space between back-to-back parentheses, i.e. ')(' vs. ') ('.
-sp_cparen_oparen                = ignore   # ignore/add/remove/force
-
-# Whether to balance spaces inside nested parentheses.
-sp_balance_nested_parens        = false    # true/false
-
 # Add or remove space between ')' and '{'.
 sp_paren_brace                  = force    # ignore/add/remove/force
 
-# Add or remove space between nested braces, i.e. '{{' vs '{ {'.
-sp_brace_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove space before pointer star '*'.
-sp_before_ptr_star              = ignore   # ignore/add/remove/force
-
-# Add or remove space before pointer star '*' that isn't followed by a
-# variable name. If set to ignore, sp_before_ptr_star is used instead.
-sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
-
 # Add or remove space between pointer stars '*'.
 sp_between_ptr_star             = remove   # ignore/add/remove/force
 
-# Add or remove space after pointer star '*', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_ptr_star               = ignore   # ignore/add/remove/force
-
-# Add or remove space after pointer caret '^', if followed by a word.
-sp_after_ptr_block_caret        = ignore   # ignore/add/remove/force
-
-# Add or remove space after pointer star '*', if followed by a qualifier.
-sp_after_ptr_star_qualifier     = ignore   # ignore/add/remove/force
-
-# Add or remove space after a pointer star '*', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_ptr_star and sp_type_func.
-sp_after_ptr_star_func          = ignore   # ignore/add/remove/force
-
-# Add or remove space after a pointer star '*', if followed by an open
-# parenthesis, as in 'void* (*)().
-sp_ptr_star_paren               = ignore   # ignore/add/remove/force
-
-# Add or remove space before a pointer star '*', if followed by a function
-# prototype or function definition.
-sp_before_ptr_star_func         = ignore   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&'.
-sp_before_byref                 = ignore   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&' that isn't followed by a
-# variable name. If set to ignore, sp_before_byref is used instead.
-sp_before_unnamed_byref         = ignore   # ignore/add/remove/force
-
-# Add or remove space after reference sign '&', if followed by a word.
-#
-# Overrides sp_type_func.
-sp_after_byref                  = ignore   # ignore/add/remove/force
-
-# Add or remove space after a reference sign '&', if followed by a function
-# prototype or function definition.
-#
-# Overrides sp_after_byref and sp_type_func.
-sp_after_byref_func             = ignore   # ignore/add/remove/force
-
-# Add or remove space before a reference sign '&', if followed by a function
-# prototype or function definition.
-sp_before_byref_func            = ignore   # ignore/add/remove/force
-
-# Add or remove space between type and word. In cases where total removal of
-# whitespace would be a syntax error, a value of 'remove' is treated the same
-# as 'force'.
-#
-# This also affects some other instances of space following a type that are
-# not covered by other options; for example, between the return type and
-# parenthesis of a function type template argument, between the type and
-# parenthesis of an array parameter, or between 'decltype(...)' and the
-# following word.
-#
-# Default: force
-sp_after_type                   = force    # ignore/add/remove/force
-
-# Add or remove space between 'decltype(...)' and word.
-#
-# Overrides sp_after_type.
-sp_after_decltype               = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space before the parenthesis in the D constructs
-# 'template Foo(' and 'class Foo('.
-sp_before_template_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'template' and '<'.
-# If set to ignore, sp_before_angle is used.
-sp_template_angle               = ignore   # ignore/add/remove/force
-
 # Add or remove space before '<'.
 sp_before_angle                 = remove   # ignore/add/remove/force
 
 # Add or remove space inside '<' and '>'.
 sp_inside_angle                 = remove   # ignore/add/remove/force
 
-# Add or remove space inside '<>'.
-sp_inside_angle_empty           = ignore   # ignore/add/remove/force
-
-# Add or remove space between '>' and ':'.
-sp_angle_colon                  = ignore   # ignore/add/remove/force
-
 # Add or remove space after '>'.
 sp_after_angle                  = add   # ignore/add/remove/force
 
 # Add or remove space between '>' and '(' as found in 'new List<byte>(foo);'.
 sp_angle_paren                  = remove   # ignore/add/remove/force
 
-# Add or remove space between '>' and '()' as found in 'new List<byte>();'.
-sp_angle_paren_empty            = ignore   # ignore/add/remove/force
-
 # Add or remove space between '>' and a word as in 'List<byte> m;' or
 # 'template <typename T> static ...'.
 sp_angle_word                   = add   # ignore/add/remove/force
@@ -307,67 +60,19 @@ sp_before_sparen                = force    # ignore/add/remove/force
 # Add or remove space inside '(' and ')' of control statements.
 sp_inside_sparen                = remove   # ignore/add/remove/force
 
-# Add or remove space after '(' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_open           = ignore   # ignore/add/remove/force
-
-# Add or remove space before ')' of control statements.
-#
-# Overrides sp_inside_sparen.
-sp_inside_sparen_close          = ignore   # ignore/add/remove/force
-
 # Add or remove space after ')' of control statements.
 sp_after_sparen                 = force    # ignore/add/remove/force
 
 # Add or remove space between ')' and '{' of of control statements.
 sp_sparen_brace                 = force    # ignore/add/remove/force
 
-# (D) Add or remove space between 'invariant' and '('.
-sp_invariant_paren              = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space after the ')' in 'invariant (C) c'.
-sp_after_invariant_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space before empty statement ';' on 'if', 'for' and 'while'.
-sp_special_semi                 = ignore   # ignore/add/remove/force
-
-# Add or remove space before ';'.
-#
-# Default: remove
-sp_before_semi                  = remove   # ignore/add/remove/force
-
 # Add or remove space before ';' in non-empty 'for' statements.
 sp_before_semi_for              = remove   # ignore/add/remove/force
 
-# Add or remove space before a semicolon of an empty part of a for statement.
-sp_before_semi_for_empty        = ignore   # ignore/add/remove/force
-
-# Add or remove space after ';', except when followed by a comment.
-#
-# Default: add
-sp_after_semi                   = add      # ignore/add/remove/force
-
-# Add or remove space after ';' in non-empty 'for' statements.
-#
-# Default: force
-sp_after_semi_for               = force    # ignore/add/remove/force
-
 # Add or remove space after the final semicolon of an empty part of a for
 # statement, as in 'for ( ; ; <here> )'.
 sp_after_semi_for_empty         = remove   # ignore/add/remove/force
 
-# Add or remove space before '[' (except '[]').
-sp_before_square                = ignore   # ignore/add/remove/force
-
-# Add or remove space before '[' for a variable definition.
-#
-# Default: remove
-sp_before_vardef_square         = remove   # ignore/add/remove/force
-
-# Add or remove space before '[' for asm block.
-sp_before_square_asm_block      = ignore   # ignore/add/remove/force
-
 # Add or remove space before '[]'.
 sp_before_squares               = remove   # ignore/add/remove/force
 
@@ -377,2752 +82,89 @@ sp_cpp_before_struct_binding    = ignore   # ignore/add/remove/force
 # Add or remove space inside a non-empty '[' and ']'.
 sp_inside_square                = remove   # ignore/add/remove/force
 
-# Add or remove space inside '[]'.
-sp_inside_square_empty          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space inside a non-empty Objective-C boxed array '@[' and
-# ']'. If set to ignore, sp_inside_square is used.
-sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
-
-# Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
-
-# Add or remove space before ','.
-#
-# Default: remove
-sp_before_comma                 = remove   # ignore/add/remove/force
-
-# (C#) Add or remove space between ',' and ']' in multidimensional array type
-# like 'int[,,]'.
-sp_after_mdatype_commas         = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove space between '[' and ',' in multidimensional array type
-# like 'int[,,]'.
-sp_before_mdatype_commas        = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove space between ',' in multidimensional array type
-# like 'int[,,]'.
-sp_between_mdatype_commas       = ignore   # ignore/add/remove/force
-
-# Add or remove space between an open parenthesis and comma,
-# i.e. '(,' vs. '( ,'.
-#
-# Default: force
-sp_paren_comma                  = force    # ignore/add/remove/force
-
-# Add or remove space before the variadic '...' when preceded by a
-# non-punctuator.
-sp_before_ellipsis              = ignore   # ignore/add/remove/force
-
-# Add or remove space between a type and '...'.
-sp_type_ellipsis                = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '...'.
-sp_paren_ellipsis               = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and a qualifier such as 'const'.
-sp_paren_qualifier              = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and 'noexcept'.
-sp_paren_noexcept               = ignore   # ignore/add/remove/force
-
 # Add or remove space after class ':'.
 sp_after_class_colon            = force    # ignore/add/remove/force
 
 # Add or remove space before class ':'.
 sp_before_class_colon           = force    # ignore/add/remove/force
 
-# Add or remove space after class constructor ':'.
-sp_after_constr_colon           = ignore   # ignore/add/remove/force
-
-# Add or remove space before class constructor ':'.
-sp_before_constr_colon          = ignore   # ignore/add/remove/force
-
-# Add or remove space before case ':'.
-#
-# Default: remove
-sp_before_case_colon            = remove   # ignore/add/remove/force
-
-# Add or remove space between 'operator' and operator sign.
-sp_after_operator               = ignore   # ignore/add/remove/force
-
-# Add or remove space between the operator symbol and the open parenthesis, as
-# in 'operator ++('.
-sp_after_operator_sym           = ignore   # ignore/add/remove/force
-
-# Overrides sp_after_operator_sym when the operator has no arguments, as in
-# 'operator *()'.
-sp_after_operator_sym_empty     = ignore   # ignore/add/remove/force
-
-# Add or remove space after C/D cast, i.e. 'cast(int)a' vs. 'cast(int) a' or
-# '(int)a' vs. '(int) a'.
-sp_after_cast                   = ignore   # ignore/add/remove/force
-
-# Add or remove spaces inside cast parentheses.
-sp_inside_paren_cast            = ignore   # ignore/add/remove/force
-
-# Add or remove space between the type and open parenthesis in a C++ cast,
-# i.e. 'int(exp)' vs. 'int (exp)'.
-sp_cpp_cast_paren               = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof' and '('.
-sp_sizeof_paren                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof' and '...'.
-sp_sizeof_ellipsis              = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'sizeof...' and '('.
-sp_sizeof_ellipsis_paren        = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'decltype' and '('.
-sp_decltype_paren               = ignore   # ignore/add/remove/force
-
-# (Pawn) Add or remove space after the tag keyword.
-sp_after_tag                    = ignore   # ignore/add/remove/force
-
-# Add or remove space inside enum '{' and '}'.
-sp_inside_braces_enum           = ignore   # ignore/add/remove/force
-
-# Add or remove space inside struct/union '{' and '}'.
-sp_inside_braces_struct         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space inside Objective-C boxed dictionary '{' and '}'
-sp_inside_braces_oc_dict        = ignore   # ignore/add/remove/force
-
-# Add or remove space after open brace in an unnamed temporary
-# direct-list-initialization.
-sp_after_type_brace_init_lst_open = ignore   # ignore/add/remove/force
-
-# Add or remove space before close brace in an unnamed temporary
-# direct-list-initialization.
-sp_before_type_brace_init_lst_close = ignore   # ignore/add/remove/force
-
-# Add or remove space inside an unnamed temporary direct-list-initialization.
-sp_inside_type_brace_init_lst   = ignore   # ignore/add/remove/force
-
-# Add or remove space inside '{' and '}'.
-sp_inside_braces                = ignore   # ignore/add/remove/force
-
 # Add or remove space inside '{}'.
 sp_inside_braces_empty          = remove   # ignore/add/remove/force
 
-# Add or remove space around trailing return operator '->'.
-sp_trailing_return              = ignore   # ignore/add/remove/force
-
-# Add or remove space between return type and function name. A minimum of 1
-# is forced except for pointer return types.
-sp_type_func                    = ignore   # ignore/add/remove/force
-
-# Add or remove space between type and open brace of an unnamed temporary
-# direct-list-initialization.
-sp_type_brace_init_lst          = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function declaration.
-sp_func_proto_paren             = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '()' on function declaration
-# without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
-
-# Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '()' on function definition
-# without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
-
-# Add or remove space inside empty function '()'.
-# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
-
-# Add or remove space inside function '(' and ')'.
-sp_inside_fparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space inside the first parentheses in a function type, as in
-# 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space between the ')' and '(' in a function type, as in
-# 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force
-
-# Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of function.
-sp_fparen_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and '{' of a function call in object
-# initialization.
-#
-# Overrides sp_fparen_brace.
-sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
-
-# (Java) Add or remove space between ')' and '{{' of double brace initializer.
-sp_fparen_dbrace                = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
-
-# Add or remove space between function name and '()' on function calls without
-# parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force
-
-# Add or remove space between the user function name and '(' on function
-# calls. You need to set a keyword to be a user function in the config file,
-# like:
-#   set func_call_user tr _ i18n
-sp_func_call_user_paren         = ignore   # ignore/add/remove/force
-
-# Add or remove space inside user function '(' and ')'.
-sp_func_call_user_inside_fparen = ignore   # ignore/add/remove/force
-
-# Add or remove space between nested parentheses with user functions,
-# i.e. '((' vs. '( ('.
-sp_func_call_user_paren_paren   = ignore   # ignore/add/remove/force
-
-# Add or remove space between a constructor/destructor and the open
-# parenthesis.
-sp_func_class_paren             = ignore   # ignore/add/remove/force
-
-# Add or remove space between a constructor without parameters or destructor
-# and '()'.
-sp_func_class_paren_empty       = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'return' and '('.
-sp_return_paren                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'return' and '{'.
-sp_return_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between '__attribute__' and '('.
-sp_attribute_paren              = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'defined' and '(' in '#if defined (FOO)'.
-sp_defined_paren                = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'throw' and '(' in 'throw (something)'.
-sp_throw_paren                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'throw' and anything other than '(' as in
-# '@throw [...];'.
-sp_after_throw                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'catch' and '(' in 'catch (something) { }'.
-# If set to ignore, sp_before_sparen is used.
-sp_catch_paren                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '@catch' and '('
-# in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
-sp_oc_catch_paren               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before Objective-C protocol list
-# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
-sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between class name and '('
-# in '@interface className(categoryName)<ProtocolName>:BaseClass'
-sp_oc_classname_paren           = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between 'version' and '('
-# in 'version (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_version_paren                = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between 'scope' and '('
-# in 'scope (something) { }'. If set to ignore, sp_before_sparen is used.
-sp_scope_paren                  = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'super' and '(' in 'super (something)'.
-#
-# Default: remove
-sp_super_paren                  = remove   # ignore/add/remove/force
-
-# Add or remove space between 'this' and '(' in 'this (something)'.
-#
-# Default: remove
-sp_this_paren                   = remove   # ignore/add/remove/force
-
-# Add or remove space between a macro name and its definition.
-sp_macro                        = ignore   # ignore/add/remove/force
-
-# Add or remove space between a macro function ')' and its definition.
-sp_macro_func                   = ignore   # ignore/add/remove/force
-
 # Add or remove space between 'else' and '{' if on the same line.
 sp_else_brace                   = force    # ignore/add/remove/force
 
 # Add or remove space between '}' and 'else' if on the same line.
 sp_brace_else                   = force    # ignore/add/remove/force
 
-# Add or remove space between '}' and the name of a typedef on the same line.
-sp_brace_typedef                = ignore   # ignore/add/remove/force
-
 # Add or remove space before the '{' of a 'catch' statement, if the '{' and
 # 'catch' are on the same line, as in 'catch (decl) <here> {'.
 sp_catch_brace                  = force    # ignore/add/remove/force
 
-# (OC) Add or remove space before the '{' of a '@catch' statement, if the '{'
-# and '@catch' are on the same line, as in '@catch (decl) <here> {'.
-# If set to ignore, sp_catch_brace is used.
-sp_oc_catch_brace               = ignore   # ignore/add/remove/force
-
 # Add or remove space between '}' and 'catch' if on the same line.
 sp_brace_catch                  = force    # ignore/add/remove/force
 
-# (OC) Add or remove space between '}' and '@catch' if on the same line.
-# If set to ignore, sp_brace_catch is used.
-sp_oc_brace_catch               = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'finally' and '{' if on the same line.
-sp_finally_brace                = ignore   # ignore/add/remove/force
-
-# Add or remove space between '}' and 'finally' if on the same line.
-sp_brace_finally                = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'try' and '{' if on the same line.
-sp_try_brace                    = ignore   # ignore/add/remove/force
-
-# Add or remove space between get/set and '{' if on the same line.
-sp_getset_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
-
-# Add or remove space between a variable and '{' for a namespace.
-#
-# Default: add
-sp_word_brace_ns                = add      # ignore/add/remove/force
-
-# Add or remove space before the '::' operator.
-sp_before_dc                    = ignore   # ignore/add/remove/force
-
-# Add or remove space after the '::' operator.
-sp_after_dc                     = ignore   # ignore/add/remove/force
-
-# (D) Add or remove around the D named array initializer ':' operator.
-sp_d_array_colon                = ignore   # ignore/add/remove/force
-
-# Add or remove space after the '!' (not) unary operator.
-#
-# Default: remove
-sp_not                          = remove   # ignore/add/remove/force
-
-# Add or remove space after the '~' (invert) unary operator.
+# The number of columns to indent per level. Usually 2, 3, 4, or 8.
 #
-# Default: remove
-sp_inv                          = remove   # ignore/add/remove/force
+# Default: 8
+indent_columns                  = 4        # unsigned number
 
-# Add or remove space after the '&' (address-of) unary operator. This does not
-# affect the spacing after a '&' that is part of a type.
+# How to use tabs when indenting code.
 #
-# Default: remove
-sp_addr                         = remove   # ignore/add/remove/force
-
-# Add or remove space around the '.' or '->' operators.
+# 0: Spaces only
+# 1: Indent with tabs to brace level, align with spaces (default)
+# 2: Indent and align with tabs, using spaces when not on a tabstop
 #
-# Default: remove
-sp_member                       = remove   # ignore/add/remove/force
+# Default: 1
+indent_with_tabs                = 0        # unsigned number
 
-# Add or remove space after the '*' (dereference) unary operator. This does
-# not affect the spacing after a '*' that is part of a type.
-#
-# Default: remove
-sp_deref                        = remove   # ignore/add/remove/force
+# Whether to indent the body of a 'namespace'.
+indent_namespace                = true    # true/false
 
-# Add or remove space after '+' or '-', as in 'x = -5' or 'y = +7'.
-#
-# Default: remove
-sp_sign                         = remove   # ignore/add/remove/force
+# Whether the 'class' body is indented.
+indent_class                    = true    # true/false
 
-# Add or remove space between '++' and '--' the word to which it is being
-# applied, as in '(--x)' or 'y++;'.
+# How to indent access specifiers that are followed by a
+# colon.
 #
-# Default: remove
-sp_incdec                       = remove   # ignore/add/remove/force
-
-# Add or remove space before a backslash-newline at the end of a line.
+#  >0: Absolute column where 1 is the leftmost column
+# <=0: Subtract from brace indent
 #
-# Default: add
-sp_before_nl_cont               = add      # ignore/add/remove/force
-
-# (OC) Add or remove space after the scope '+' or '-', as in '-(void) foo;'
-# or '+(int) bar;'.
-sp_after_oc_scope               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '-(int) f:(int) x;' vs. '-(int) f: (int) x;'.
-sp_after_oc_colon               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '-(int) f: (int) x;' vs. '-(int) f : (int) x;'.
-sp_before_oc_colon              = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_after_oc_dict_colon          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before the colon in immutable dictionary expression
-# 'NSDictionary *test = @{@"foo" :@"bar"};'.
-sp_before_oc_dict_colon         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue: 1];'.
-sp_after_send_oc_colon          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before the colon in message specs,
-# i.e. '[object setValue:1];' vs. '[object setValue :1];'.
-sp_before_send_oc_colon         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the (type) in message specs,
-# i.e. '-(int)f: (int) x;' vs. '-(int)f: (int)x;'.
-sp_after_oc_type                = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after the first (type) in message specs,
-# i.e. '-(int) f:(int)x;' vs. '-(int)f:(int)x;'.
-sp_after_oc_return_type         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '@selector' and '(',
-# i.e. '@selector(msgName)' vs. '@selector (msgName)'.
-# Also applies to '@protocol()' constructs.
-sp_after_oc_at_sel              = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between '@selector(x)' and the following word,
-# i.e. '@selector(foo) a:' vs. '@selector(foo)a:'.
-sp_after_oc_at_sel_parens       = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space inside '@selector' parentheses,
-# i.e. '@selector(foo)' vs. '@selector( foo )'.
-# Also applies to '@protocol()' constructs.
-sp_inside_oc_at_sel_parens      = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space before a block pointer caret,
-# i.e. '^int (int arg){...}' vs. ' ^int (int arg){...}'.
-sp_before_oc_block_caret        = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after a block pointer caret,
-# i.e. '^int (int arg){...}' vs. '^ int (int arg){...}'.
-sp_after_oc_block_caret         = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space between the receiver and selector in a message,
-# as in '[receiver selector ...]'.
-sp_after_oc_msg_receiver        = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove space after '@property'.
-sp_after_oc_property            = ignore   # ignore/add/remove/force
+# Default: 1
+indent_access_spec              = -4        # number
 
-# (OC) Add or remove space between '@synchronized' and the open parenthesis,
-# i.e. '@synchronized(foo)' vs. '@synchronized (foo)'.
-sp_after_oc_synchronized        = ignore   # ignore/add/remove/force
+# Whether to collapse empty blocks between '{' and '}' except for functions.
+# Use nl_collapse_empty_body_functions to specify how empty function braces
+# should be formatted.
+nl_collapse_empty_body          = true    # true/false
 
-# Add or remove space around the ':' in 'b ? t : f'.
-sp_cond_colon                   = ignore   # ignore/add/remove/force
+# Whether to collapse empty blocks between '{' and '}' for functions only.
+# If true, overrides nl_inside_empty_func.
+nl_collapse_empty_body_functions = true    # true/false
 
-# Add or remove space before the ':' in 'b ? t : f'.
-#
-# Overrides sp_cond_colon.
-sp_cond_colon_before            = ignore   # ignore/add/remove/force
+# Whether to convert all tabs to spaces in comments. If false, tabs in
+# comments are left alone, unless used for indenting.
+cmt_convert_tab_to_spaces       = true    # true/false
 
-# Add or remove space after the ':' in 'b ? t : f'.
+# An offset value that controls the indentation of the body of a multiline #define.
+# 'body' refers to all the lines of a multiline #define except the first line.
+# Requires 'pp_ignore_define_body = false'.
 #
-# Overrides sp_cond_colon.
-sp_cond_colon_after             = ignore   # ignore/add/remove/force
-
-# Add or remove space around the '?' in 'b ? t : f'.
-sp_cond_question                = ignore   # ignore/add/remove/force
-
-# Add or remove space before the '?' in 'b ? t : f'.
+#  <0: Absolute column: the body indentation starts off at the specified column
+#      (ex. -3 ==> the body is indented starting from column 3)
+# >=0: Relative to the column of the '#' of '#define'
+#      (ex.  3 ==> the body is indented starting 3 columns at the right of '#')
 #
-# Overrides sp_cond_question.
-sp_cond_question_before         = ignore   # ignore/add/remove/force
+# Default: 8
+pp_multiline_define_body_indent = 4        # number
 
-# Add or remove space after the '?' in 'b ? t : f'.
+# The value might be used twice:
+# - at the assignment
+# - at the opening brace
 #
-# Overrides sp_cond_question.
-sp_cond_question_after          = ignore   # ignore/add/remove/force
-
-# In the abbreviated ternary form '(a ?: b)', add or remove space between '?'
-# and ':'.
-#
-# Overrides all other sp_cond_* options.
-sp_cond_ternary_short           = ignore   # ignore/add/remove/force
-
-# Fix the spacing between 'case' and the label. Only 'ignore' and 'force' make
-# sense here.
-sp_case_label                   = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space around the D '..' operator.
-sp_range                        = ignore   # ignore/add/remove/force
-
-# Add or remove space after ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
-sp_after_for_colon              = ignore   # ignore/add/remove/force
-
-# Add or remove space before ':' in a Java/C++11 range-based 'for',
-# as in 'for (Type var : expr)'.
-sp_before_for_colon             = ignore   # ignore/add/remove/force
-
-# (D) Add or remove space between 'extern' and '(' as in 'extern (C)'.
-sp_extern_paren                 = ignore   # ignore/add/remove/force
-
-# Add or remove space after the opening of a C++ comment,
-# i.e. '// A' vs. '//A'.
-sp_cmt_cpp_start                = ignore   # ignore/add/remove/force
-
-# If true, space is added with sp_cmt_cpp_start will be added after doxygen
-# sequences like '///', '///<', '//!' and '//!<'.
-sp_cmt_cpp_doxygen              = false    # true/false
-
-# If true, space is added with sp_cmt_cpp_start will be added after Qt
-# translator or meta-data comments like '//:', '//=', and '//~'.
-sp_cmt_cpp_qttr                 = false    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
-
-# Add or remove space after 'new', 'delete' and 'delete[]'.
-sp_after_new                    = ignore   # ignore/add/remove/force
-
-# Add or remove space between 'new' and '(' in 'new()'.
-sp_between_new_paren            = ignore   # ignore/add/remove/force
-
-# Add or remove space between ')' and type in 'new(foo) BAR'.
-sp_after_newop_paren            = ignore   # ignore/add/remove/force
-
-# Add or remove space inside parenthesis of the new operator
-# as in 'new(foo) BAR'.
-sp_inside_newop_paren           = ignore   # ignore/add/remove/force
-
-# Add or remove space after the open parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_open      = ignore   # ignore/add/remove/force
-
-# Add or remove space before the close parenthesis of the new operator,
-# as in 'new(foo) BAR'.
-#
-# Overrides sp_inside_newop_paren.
-sp_inside_newop_paren_close     = ignore   # ignore/add/remove/force
-
-# Add or remove space before a trailing or embedded comment.
-sp_before_tr_emb_cmt            = ignore   # ignore/add/remove/force
-
-# Number of spaces before a trailing or embedded comment.
-sp_num_before_tr_emb_cmt        = 0        # unsigned number
-
-# (Java) Add or remove space between an annotation and the open parenthesis.
-sp_annotation_paren             = ignore   # ignore/add/remove/force
-
-# If true, vbrace tokens are dropped to the previous token and skipped.
-sp_skip_vbrace_tokens           = false    # true/false
-
-# Add or remove space after 'noexcept'.
-sp_after_noexcept               = ignore   # ignore/add/remove/force
-
-# Add or remove space after '_'.
-sp_vala_after_translation       = ignore   # ignore/add/remove/force
-
-# If true, a <TAB> is inserted after #define.
-force_tab_after_define          = false    # true/false
-
-#
-# Indenting options
-#
-
-# The number of columns to indent per level. Usually 2, 3, 4, or 8.
-#
-# Default: 8
-indent_columns                  = 4        # unsigned number
-
-# The continuation indent. If non-zero, this overrides the indent of '(', '['
-# and '=' continuation indents. Negative values are OK; negative value is
-# absolute and not increased for each '(' or '[' level.
-#
-# For FreeBSD, this is set to 4.
-indent_continue                 = 0        # number
-
-# The continuation indent, only for class header line(s). If non-zero, this
-# overrides the indent of 'class' continuation indents.
-indent_continue_class_head      = 0        # unsigned number
-
-# Whether to indent empty lines (i.e. lines which contain only spaces before
-# the newline character).
-indent_single_newlines          = false    # true/false
-
-# The continuation indent for func_*_param if they are true. If non-zero, this
-# overrides the indent.
-indent_param                    = 0        # unsigned number
-
-# How to use tabs when indenting code.
-#
-# 0: Spaces only
-# 1: Indent with tabs to brace level, align with spaces (default)
-# 2: Indent and align with tabs, using spaces when not on a tabstop
-#
-# Default: 1
-indent_with_tabs                = 0        # unsigned number
-
-# Whether to indent comments that are not at a brace level with tabs on a
-# tabstop. Requires indent_with_tabs=2. If false, will use spaces.
-indent_cmt_with_tabs            = false    # true/false
-
-# Whether to indent strings broken by '\' so that they line up.
-indent_align_string             = false    # true/false
-
-# The number of spaces to indent multi-line XML strings.
-# Requires indent_align_string=true.
-indent_xml_string               = 0        # unsigned number
-
-# Spaces to indent '{' from level.
-indent_brace                    = 0        # unsigned number
-
-# Whether braces are indented to the body level.
-indent_braces                   = false    # true/false
-
-# Whether to disable indenting function braces if indent_braces=true.
-indent_braces_no_func           = false    # true/false
-
-# Whether to disable indenting class braces if indent_braces=true.
-indent_braces_no_class          = false    # true/false
-
-# Whether to disable indenting struct braces if indent_braces=true.
-indent_braces_no_struct         = false    # true/false
-
-# Whether to indent based on the size of the brace parent,
-# i.e. 'if' => 3 spaces, 'for' => 4 spaces, etc.
-indent_brace_parent             = false    # true/false
-
-# Whether to indent based on the open parenthesis instead of the open brace
-# in '({\n'.
-indent_paren_open_brace         = false    # true/false
-
-# (C#) Whether to indent the brace of a C# delegate by another level.
-indent_cs_delegate_brace        = false    # true/false
-
-# (C#) Whether to indent a C# delegate (to handle delegates with no brace) by
-# another level.
-indent_cs_delegate_body         = false    # true/false
-
-# Whether to indent the body of a 'namespace'.
-indent_namespace                = true    # true/false
-
-# Whether to indent only the first namespace, and not any nested namespaces.
-# Requires indent_namespace=true.
-indent_namespace_single_indent  = false    # true/false
-
-# The number of spaces to indent a namespace block.
-# If set to zero, use the value indent_columns
-indent_namespace_level          = 0        # unsigned number
-
-# If the body of the namespace is longer than this number, it won't be
-# indented. Requires indent_namespace=true. 0 means no limit.
-indent_namespace_limit          = 0        # unsigned number
-
-# Whether the 'extern "C"' body is indented.
-indent_extern                   = false    # true/false
-
-# Whether the 'class' body is indented.
-indent_class                    = true    # true/false
-
-# Whether to indent the stuff after a leading base class colon.
-indent_class_colon              = false    # true/false
-
-# Whether to indent based on a class colon instead of the stuff after the
-# colon. Requires indent_class_colon=true.
-indent_class_on_colon           = false    # true/false
-
-# Whether to indent the stuff after a leading class initializer colon.
-indent_constr_colon             = false    # true/false
-
-# Virtual indent from the ':' for member initializers.
-#
-# Default: 2
-indent_ctor_init_leading        = 2        # unsigned number
-
-# Additional indent for constructor initializer list.
-# Negative values decrease indent down to the first column.
-indent_ctor_init                = 0        # number
-
-# Whether to indent 'if' following 'else' as a new block under the 'else'.
-# If false, 'else\nif' is treated as 'else if' for indenting purposes.
-indent_else_if                  = false    # true/false
-
-# Amount to indent variable declarations after a open brace.
-#
-#  <0: Relative
-# >=0: Absolute
-indent_var_def_blk              = 0        # number
-
-# Whether to indent continued variable declarations instead of aligning.
-indent_var_def_cont             = false    # true/false
-
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
-
-# Whether to force indentation of function definitions to start in column 1.
-indent_func_def_force_col1      = false    # true/false
-
-# Whether to indent continued function call parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_call_param          = false    # true/false
-
-# Whether to indent continued function definition parameters one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_def_param           = false    # true/false
-
-# for function definitions, only if indent_func_def_param is false
-# Allows to align params when appropriate and indent them when not
-# behave as if it was true if paren position is more than this value
-# if paren position is more than the option value
-indent_func_def_param_paren_pos_threshold = 0        # unsigned number
-
-# Whether to indent continued function call prototype one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_proto_param         = false    # true/false
-
-# Whether to indent continued function call declaration one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_class_param         = false    # true/false
-
-# Whether to indent continued class variable constructors one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_func_ctor_var_param      = false    # true/false
-
-# Whether to indent continued template parameter list one indent level,
-# rather than aligning parameters under the open parenthesis.
-indent_template_param           = false    # true/false
-
-# Double the indent for indent_func_xxx_param options.
-# Use both values of the options indent_columns and indent_param.
-indent_func_param_double        = false    # true/false
-
-# Indentation column for standalone 'const' qualifier on a function
-# prototype.
-indent_func_const               = 0        # unsigned number
-
-# Indentation column for standalone 'throw' qualifier on a function
-# prototype.
-indent_func_throw               = 0        # unsigned number
-
-# How to indent within a macro followed by a brace on the same line
-# This allows reducing the indent in macros that have (for example)
-# `do { ... } while (0)` blocks bracketing them.
-#
-# true:  add an indent for the brace on the same line as the macro
-# false: do not add an indent for the brace on the same line as the macro
-#
-# Default: true
-indent_macro_brace              = true     # true/false
-
-# The number of spaces to indent a continued '->' or '.'.
-# Usually set to 0, 1, or indent_columns.
-indent_member                   = 0        # unsigned number
-
-# Whether lines broken at '.' or '->' should be indented by a single indent.
-# The indent_member option will not be effective if this is set to true.
-indent_member_single            = false    # true/false
-
-# Spaces to indent single line ('//') comments on lines before code.
-indent_sing_line_comments       = 0        # unsigned number
-
-# When opening a paren for a control statement (if, for, while, etc), increase
-# the indent level by this value. Negative values decrease the indent level.
-indent_sparen_extra             = 0        # number
-
-# Whether to indent trailing single line ('//') comments relative to the code
-# instead of trying to keep the same absolute column.
-indent_relative_single_line_comments = false    # true/false
-
-# Spaces to indent 'case' from 'switch'. Usually 0 or indent_columns.
-indent_switch_case              = 0        # unsigned number
-
-# indent 'break' with 'case' from 'switch'.
-indent_switch_break_with_case   = false    # true/false
-
-# Whether to indent preprocessor statements inside of switch statements.
-#
-# Default: true
-indent_switch_pp                = true     # true/false
-
-# Spaces to shift the 'case' line, without affecting any other lines.
-# Usually 0.
-indent_case_shift               = 0        # unsigned number
-
-# Spaces to indent '{' from 'case'. By default, the brace will appear under
-# the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
-indent_case_brace               = 0        # number
-
-# Whether to indent comments found in first column.
-indent_col1_comment             = false    # true/false
-
-# Whether to indent multi string literal in first column.
-indent_col1_multi_string_literal = false    # true/false
-
-# How to indent goto labels.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_label                    = 1        # number
-
-# How to indent access specifiers that are followed by a
-# colon.
-#
-#  >0: Absolute column where 1 is the leftmost column
-# <=0: Subtract from brace indent
-#
-# Default: 1
-indent_access_spec              = -4        # number
-
-# Whether to indent the code after an access specifier by one level.
-# If true, this option forces 'indent_access_spec=0'.
-indent_access_spec_body         = false    # true/false
-
-# If an open parenthesis is followed by a newline, whether to indent the next
-# line so that it lines up after the open parenthesis (not recommended).
-indent_paren_nl                 = false    # true/false
-
-# How to indent a close parenthesis after a newline.
-#
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
-
-# Whether to indent the open parenthesis of a function definition,
-# if the parenthesis is on its own line.
-indent_paren_after_func_def     = false    # true/false
-
-# Whether to indent the open parenthesis of a function declaration,
-# if the parenthesis is on its own line.
-indent_paren_after_func_decl    = false    # true/false
-
-# Whether to indent the open parenthesis of a function call,
-# if the parenthesis is on its own line.
-indent_paren_after_func_call    = false    # true/false
-
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
-
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
-
-# Whether to indent a semicolon when inside a for parenthesis.
-# If true, aligns under the open for parenthesis.
-indent_semicolon_for_paren      = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_bool_paren=true.
-indent_first_bool_expr          = false    # true/false
-
-# Whether to align the first expression to following ones
-# if indent_semicolon_for_paren=true.
-indent_first_for_expr           = false    # true/false
-
-# If an open square is followed by a newline, whether to indent the next line
-# so that it lines up after the open square (not recommended).
-indent_square_nl                = false    # true/false
-
-# (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
-indent_preserve_sql             = false    # true/false
-
-# Whether to align continued statements at the '='. If false or if the '=' is
-# followed by a newline, the next line is indent one tab.
-#
-# Default: true
-indent_align_assign             = true     # true/false
-
-# If true, the indentation of the chunks after a '=' sequence will be set at
-# LHS token indentation column before '='.
-indent_off_after_assign         = false    # true/false
-
-# Whether to align continued statements at the '('. If false or the '(' is
-# followed by a newline, the next line indent is one tab.
-#
-# Default: true
-indent_align_paren              = true     # true/false
-
-# (OC) Whether to indent Objective-C code inside message selectors.
-indent_oc_inside_msg_sel        = false    # true/false
-
-# (OC) Whether to indent Objective-C blocks at brace level instead of usual
-# rules.
-indent_oc_block                 = false    # true/false
-
-# (OC) Indent for Objective-C blocks in a message relative to the parameter
-# name.
-#
-# =0: Use indent_oc_block rules
-# >0: Use specified number of spaces to indent
-indent_oc_block_msg             = 0        # unsigned number
-
-# (OC) Minimum indent for subsequent parameters
-indent_oc_msg_colon             = 0        # unsigned number
-
-# (OC) Whether to prioritize aligning with initial colon (and stripping spaces
-# from lines, if necessary).
-#
-# Default: true
-indent_oc_msg_prioritize_first_colon = true     # true/false
-
-# (OC) Whether to indent blocks the way that Xcode does by default
-# (from the keyword if the parameter is on its own line; otherwise, from the
-# previous indentation level). Requires indent_oc_block_msg=true.
-indent_oc_block_msg_xcode_style = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a
-# message keyword. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_keyword = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace is, relative to a message
-# colon. Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_colon  = false    # true/false
-
-# (OC) Whether to indent blocks from where the block caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_caret  = false    # true/false
-
-# (OC) Whether to indent blocks from where the brace caret is.
-# Requires indent_oc_block_msg=true.
-indent_oc_block_msg_from_brace  = false    # true/false
-
-# When indenting after virtual brace open and newline add further spaces to
-# reach this minimum indent.
-indent_min_vbrace_open          = 0        # unsigned number
-
-# Whether to add further spaces after regular indent to reach next tabstop
-# when indenting after virtual brace open and newline.
-indent_vbrace_open_on_tabstop   = false    # true/false
-
-# How to indent after a brace followed by another token (not a newline).
-# true:  indent all contained lines to match the token
-# false: indent all contained lines to match the brace
-#
-# Default: true
-indent_token_after_brace        = true     # true/false
-
-# Whether to indent the body of a C++11 lambda.
-indent_cpp_lambda_body          = false    # true/false
-
-# How to indent compound literals that are being returned.
-# true: add both the indent from return & the compound literal open brace (ie:
-#       2 indent levels)
-# false: only indent 1 level, don't add the indent for the open brace, only add
-#        the indent for the return.
-#
-# Default: true
-indent_compound_literal_return  = true     # true/false
-
-# (C#) Whether to indent a 'using' block if no braces are used.
-#
-# Default: true
-indent_using_block              = true     # true/false
-
-# How to indent the continuation of ternary operator.
-#
-# 0: Off (default)
-# 1: When the `if_false` is a continuation, indent it under `if_false`
-# 2: When the `:` is a continuation, indent it under `?`
-indent_ternary_operator         = 0        # unsigned number
-
-# Whether to indent the statments inside ternary operator.
-indent_inside_ternary_operator  = false    # true/false
-
-# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
-indent_off_after_return         = false    # true/false
-
-# If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
-indent_off_after_return_new     = false    # true/false
-
-# If true, the tokens after return are indented with regular single indentation. By default (false) the indentation is after the return token.
-indent_single_after_return      = false    # true/false
-
-# Whether to ignore indent and alignment for 'asm' blocks (i.e. assume they
-# have their own indentation).
-indent_ignore_asm_block         = false    # true/false
-
-# Don't indent the close parenthesis of a function definition,
-# if the parenthesis is on its own line.
-donot_indent_func_def_close_paren = false    # true/false
-
-#
-# Newline adding and removing options
-#
-
-# Whether to collapse empty blocks between '{' and '}'.
-# If true, overrides nl_inside_empty_func
-nl_collapse_empty_body          = true    # true/false
-
-# Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'.
-nl_assign_leave_one_liners      = false    # true/false
-
-# Don't split one-line braced statements inside a 'class xx { }' body.
-nl_class_leave_one_liners       = false    # true/false
-
-# Don't split one-line enums, as in 'enum foo { BAR = 15 };'
-nl_enum_leave_one_liners        = false    # true/false
-
-# Don't split one-line get or set functions.
-nl_getset_leave_one_liners      = false    # true/false
-
-# (C#) Don't split one-line property get or set functions.
-nl_cs_property_leave_one_liners = false    # true/false
-
-# Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# might modify nl_func_type_name
-nl_func_leave_one_liners        = false    # true/false
-
-# Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
-nl_cpp_lambda_leave_one_liners  = false    # true/false
-
-# Don't split one-line if/else statements, as in 'if(...) b++;'.
-nl_if_leave_one_liners          = false    # true/false
-
-# Don't split one-line while statements, as in 'while(...) b++;'.
-nl_while_leave_one_liners       = false    # true/false
-
-# Don't split one-line for statements, as in 'for(...) b++;'.
-nl_for_leave_one_liners         = false    # true/false
-
-# (OC) Don't split one-line Objective-C messages.
-nl_oc_msg_leave_one_liner       = false    # true/false
-
-# (OC) Add or remove newline between method declaration and '{'.
-nl_oc_mdef_brace                = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between Objective-C block signature and '{'.
-nl_oc_block_brace               = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove blank line before '@interface' statement.
-nl_oc_before_interface          = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove blank line before '@implementation' statement.
-nl_oc_before_implementation     = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove blank line before '@end' statement.
-nl_oc_before_end                = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between '@interface' and '{'.
-nl_oc_interface_brace           = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between '@implementation' and '{'.
-nl_oc_implementation_brace      = ignore   # ignore/add/remove/force
-
-# Add or remove newlines at the start of the file.
-nl_start_of_file                = ignore   # ignore/add/remove/force
-
-# The minimum number of newlines at the start of the file (only used if
-# nl_start_of_file is 'add' or 'force').
-nl_start_of_file_min            = 0        # unsigned number
-
-# Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
-
-# The minimum number of newlines at the end of the file (only used if
-# nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
-
-# Add or remove newline between '=' and '{'.
-nl_assign_brace                 = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between '=' and '['.
-nl_assign_square                = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '[]' and '{'.
-nl_tsquare_brace                = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline after '= ['. Will also affect the newline before
-# the ']'.
-nl_after_square_assign          = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function call's ')' and '{', as in
-# 'list_for_each(item, &list) { }'.
-nl_fcall_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum' and '{'.
-nl_enum_brace                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum' and 'class'.
-nl_enum_class                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum class' and the identifier.
-nl_enum_class_identifier        = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum class' type and ':'.
-nl_enum_identifier_colon        = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'enum class identifier :' and type.
-nl_enum_colon_type              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'struct and '{'.
-nl_struct_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'union' and '{'.
-nl_union_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'if' and '{'.
-nl_if_brace                     = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'else'.
-nl_brace_else                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'else if' and '{'. If set to ignore,
-# nl_if_brace is used instead.
-nl_elseif_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'else' and '{'.
-nl_else_brace                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'else' and 'if'.
-nl_else_if                      = ignore   # ignore/add/remove/force
-
-# Add or remove newline before '{' opening brace
-nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
-
-# Add or remove newline before 'if'/'else if' closing parenthesis.
-nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'finally'.
-nl_brace_finally                = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'finally' and '{'.
-nl_finally_brace                = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'try' and '{'.
-nl_try_brace                    = ignore   # ignore/add/remove/force
-
-# Add or remove newline between get/set and '{'.
-nl_getset_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'for' and '{'.
-nl_for_brace                    = ignore   # ignore/add/remove/force
-
-# Add or remove newline before the '{' of a 'catch' statement, as in
-# 'catch (decl) <here> {'.
-nl_catch_brace                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline before the '{' of a '@catch' statement, as in
-# '@catch (decl) <here> {'. If set to ignore, nl_catch_brace is used.
-nl_oc_catch_brace               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'catch'.
-nl_brace_catch                  = ignore   # ignore/add/remove/force
-
-# (OC) Add or remove newline between '}' and '@catch'. If set to ignore,
-# nl_brace_catch is used.
-nl_oc_brace_catch               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ']'.
-nl_brace_square                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and ')' in a function invocation.
-nl_brace_fparen                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'while' and '{'.
-nl_while_brace                  = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between 'scope (x)' and '{'.
-nl_scope_brace                  = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between 'unittest' and '{'.
-nl_unittest_brace               = ignore   # ignore/add/remove/force
-
-# (D) Add or remove newline between 'version (x)' and '{'.
-nl_version_brace                = ignore   # ignore/add/remove/force
-
-# (C#) Add or remove newline between 'using' and '{'.
-nl_using_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between two open or close braces. Due to general
-# newline/brace handling, REMOVE may not work.
-nl_brace_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'do' and '{'.
-nl_do_brace                     = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '}' and 'while' of 'do' statement.
-nl_brace_while                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'switch' and '{'.
-nl_switch_brace                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'synchronized' and '{'.
-nl_synchronized_brace           = ignore   # ignore/add/remove/force
-
-# Add a newline between ')' and '{' if the ')' is on a different line than the
-# if/for/etc.
-#
-# Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and
-# nl_catch_brace.
-nl_multi_line_cond              = false    # true/false
-
-# Add a newline after '(' if an if/for/while/switch condition spans multiple
-# lines
-nl_multi_line_sparen_open       = ignore   # ignore/add/remove/force
-
-# Add a newline before ')' if an if/for/while/switch condition spans multiple
-# lines. Overrides nl_before_if_closing_paren if both are specified.
-nl_multi_line_sparen_close      = ignore   # ignore/add/remove/force
-
-# Force a newline in a define after the macro name for multi-line defines.
-nl_multi_line_define            = false    # true/false
-
-# Whether to add a newline before 'case', and a blank line before a 'case'
-# statement that follows a ';' or '}'.
-nl_before_case                  = false    # true/false
-
-# Whether to add a newline after a 'case' statement.
-nl_after_case                   = false    # true/false
-
-# Add or remove newline between a case ':' and '{'.
-#
-# Overrides nl_after_case.
-nl_case_colon_brace             = ignore   # ignore/add/remove/force
-
-# Add or remove newline between ')' and 'throw'.
-nl_before_throw                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'namespace' and '{'.
-nl_namespace_brace              = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template class.
-nl_template_class               = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template class declaration.
-#
-# Overrides nl_template_class.
-nl_template_class_decl          = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized class declaration.
-#
-# Overrides nl_template_class_decl.
-nl_template_class_decl_special  = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template class definition.
-#
-# Overrides nl_template_class.
-nl_template_class_def           = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized class definition.
-#
-# Overrides nl_template_class_def.
-nl_template_class_def_special   = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template function.
-nl_template_func                = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template function
-# declaration.
-#
-# Overrides nl_template_func.
-nl_template_func_decl           = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized function
-# declaration.
-#
-# Overrides nl_template_func_decl.
-nl_template_func_decl_special   = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template function
-# definition.
-#
-# Overrides nl_template_func.
-nl_template_func_def            = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<>' of a specialized function
-# definition.
-#
-# Overrides nl_template_func_def.
-nl_template_func_def_special    = ignore   # ignore/add/remove/force
-
-# Add or remove newline after 'template<...>' of a template variable.
-nl_template_var                 = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'template<...>' and 'using' of a templated
-# type alias.
-nl_template_using               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'class' and '{'.
-nl_class_brace                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline before or after (depending on pos_class_comma,
-# may not be IGNORE) each',' in the base class list.
-nl_class_init_args              = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in the constructor member
-# initialization. Related to nl_constr_colon, pos_constr_colon and
-# pos_constr_comma.
-nl_constr_init_args             = ignore   # ignore/add/remove/force
-
-# Add or remove newline before first element, after comma, and after last
-# element, in 'enum'.
-nl_enum_own_lines               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name in a function
-# definition.
-# might be modified by nl_func_leave_one_liners
-nl_func_type_name               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name inside a class
-# definition. If set to ignore, nl_func_type_name or nl_func_proto_type_name
-# is used instead.
-nl_func_type_name_class         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between class specification and '::'
-# in 'void A::f() { }'. Only appears in separate member implementation (does
-# not appear with in-line implementation).
-nl_func_class_scope             = ignore   # ignore/add/remove/force
-
-# Add or remove newline between function scope and name, as in
-# 'void A :: <here> f() { }'.
-nl_func_scope_name              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between return type and function name in a prototype.
-nl_func_proto_type_name         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the
-# declaration.
-nl_func_paren                   = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_paren for functions with no parameters.
-nl_func_paren_empty             = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the
-# definition.
-nl_func_def_paren               = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_paren for functions with no parameters.
-nl_func_def_paren_empty         = ignore   # ignore/add/remove/force
-
-# Add or remove newline between a function name and the opening '(' in the
-# call.
-nl_func_call_paren              = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_call_paren for functions with no parameters.
-nl_func_call_paren_empty        = ignore   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function declaration.
-nl_func_decl_start              = ignore   # ignore/add/remove/force
-
-# Add or remove newline after '(' in a function definition.
-nl_func_def_start               = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_decl_start when there is only one parameter.
-nl_func_decl_start_single       = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_start when there is only one parameter.
-nl_func_def_start_single        = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '(' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_start is used instead.
-nl_func_decl_start_multi_line   = false    # true/false
-
-# Whether to add a newline after '(' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_start is used instead.
-nl_func_def_start_multi_line    = false    # true/false
-
-# Add or remove newline after each ',' in a function declaration.
-nl_func_decl_args               = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function definition.
-nl_func_def_args                = ignore   # ignore/add/remove/force
-
-# Add or remove newline after each ',' in a function call.
-nl_func_call_args               = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after each ',' in a function declaration if '('
-# and ')' are in different lines. If false, nl_func_decl_args is used instead.
-nl_func_decl_args_multi_line    = false    # true/false
-
-# Whether to add a newline after each ',' in a function definition if '('
-# and ')' are in different lines. If false, nl_func_def_args is used instead.
-nl_func_def_args_multi_line     = false    # true/false
-
-# Add or remove newline before the ')' in a function declaration.
-nl_func_decl_end                = ignore   # ignore/add/remove/force
-
-# Add or remove newline before the ')' in a function definition.
-nl_func_def_end                 = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_decl_end when there is only one parameter.
-nl_func_decl_end_single         = ignore   # ignore/add/remove/force
-
-# Overrides nl_func_def_end when there is only one parameter.
-nl_func_def_end_single          = ignore   # ignore/add/remove/force
-
-# Whether to add a newline before ')' in a function declaration if '(' and ')'
-# are in different lines. If false, nl_func_decl_end is used instead.
-nl_func_decl_end_multi_line     = false    # true/false
-
-# Whether to add a newline before ')' in a function definition if '(' and ')'
-# are in different lines. If false, nl_func_def_end is used instead.
-nl_func_def_end_multi_line      = false    # true/false
-
-# Add or remove newline between '()' in a function declaration.
-nl_func_decl_empty              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function definition.
-nl_func_def_empty               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between '()' in a function call.
-nl_func_call_empty              = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '(' in a function call,
-# has preference over nl_func_call_start_multi_line.
-nl_func_call_start              = ignore   # ignore/add/remove/force
-
-# Whether to add a newline before ')' in a function call.
-nl_func_call_end                = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '(' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_start_multi_line   = false    # true/false
-
-# Whether to add a newline after each ',' in a function call if '(' and ')'
-# are in different lines.
-nl_func_call_args_multi_line    = false    # true/false
-
-# Whether to add a newline before ')' in a function call if '(' and ')' are in
-# different lines.
-nl_func_call_end_multi_line     = false    # true/false
-
-# Whether to respect nl_func_call_XXX option incase of closure args.
-nl_func_call_args_multi_line_ignore_closures = false    # true/false
-
-# Whether to add a newline after '<' of a template parameter list.
-nl_template_start               = false    # true/false
-
-# Whether to add a newline after each ',' in a template parameter list.
-nl_template_args                = false    # true/false
-
-# Whether to add a newline before '>' of a template parameter list.
-nl_template_end                 = false    # true/false
-
-# (OC) Whether to put each Objective-C message parameter on a separate line.
-# See nl_oc_msg_leave_one_liner.
-nl_oc_msg_args                  = false    # true/false
-
-# Add or remove newline between function signature and '{'.
-nl_fdef_brace                   = ignore   # ignore/add/remove/force
-
-# Add or remove newline between function signature and '{',
-# if signature ends with ')'. Overrides nl_fdef_brace.
-nl_fdef_brace_cond              = ignore   # ignore/add/remove/force
-
-# Add or remove newline between C++11 lambda signature and '{'.
-nl_cpp_ldef_brace               = ignore   # ignore/add/remove/force
-
-# Add or remove newline between 'return' and the return expression.
-nl_return_expr                  = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after semicolons, except in 'for' statements.
-nl_after_semicolon              = false    # true/false
-
-# (Java) Add or remove newline between the ')' and '{{' of the double brace
-# initializer.
-nl_paren_dbrace_open            = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst          = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after the open brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_open     = ignore   # ignore/add/remove/force
-
-# Whether to add a newline before the close brace in an unnamed temporary
-# direct-list-initialization.
-nl_type_brace_init_lst_close    = ignore   # ignore/add/remove/force
-
-# Whether to add a newline after '{'. This also adds a newline before the
-# matching '}'.
-nl_after_brace_open             = false    # true/false
-
-# Whether to add a newline between the open brace and a trailing single-line
-# comment. Requires nl_after_brace_open=true.
-nl_after_brace_open_cmt         = false    # true/false
-
-# Whether to add a newline after a virtual brace open with a non-empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open            = false    # true/false
-
-# Whether to add a newline after a virtual brace open with an empty body.
-# These occur in un-braced if/while/do/for statement bodies.
-nl_after_vbrace_open_empty      = false    # true/false
-
-# Whether to add a newline after '}'. Does not apply if followed by a
-# necessary ';'.
-nl_after_brace_close            = false    # true/false
-
-# Whether to add a newline after a virtual brace close,
-# as in 'if (foo) a++; <here> return;'.
-nl_after_vbrace_close           = false    # true/false
-
-# Add or remove newline between the close brace and identifier,
-# as in 'struct { int a; } <here> b;'. Affects enumerations, unions and
-# structures. If set to ignore, uses nl_after_brace_close.
-nl_brace_struct_var             = ignore   # ignore/add/remove/force
-
-# Whether to alter newlines in '#define' macros.
-nl_define_macro                 = false    # true/false
-
-# Whether to alter newlines between consecutive parenthesis closes. The number
-# of closing parentheses in a line will depend on respective open parenthesis
-# lines.
-nl_squeeze_paren_close          = false    # true/false
-
-# Whether to remove blanks after '#ifxx' and '#elxx', or before '#elxx' and
-# '#endif'. Does not affect top-level #ifdefs.
-nl_squeeze_ifdef                = false    # true/false
-
-# Makes the nl_squeeze_ifdef option affect the top-level #ifdefs as well.
-nl_squeeze_ifdef_top_level      = false    # true/false
-
-# Add or remove blank line before 'if'.
-nl_before_if                    = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'if' statement. Add/Force work only if the
-# next token is not a closing brace.
-nl_after_if                     = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'for'.
-nl_before_for                   = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'for' statement.
-nl_after_for                    = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'while'.
-nl_before_while                 = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'while' statement.
-nl_after_while                  = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'switch'.
-nl_before_switch                = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'switch' statement.
-nl_after_switch                 = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'synchronized'.
-nl_before_synchronized          = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'synchronized' statement.
-nl_after_synchronized           = ignore   # ignore/add/remove/force
-
-# Add or remove blank line before 'do'.
-nl_before_do                    = ignore   # ignore/add/remove/force
-
-# Add or remove blank line after 'do/while' statement.
-nl_after_do                     = ignore   # ignore/add/remove/force
-
-# Whether to put a blank line before 'return' statements, unless after an open
-# brace.
-nl_before_return                = false    # true/false
-
-# Whether to put a blank line after 'return' statements, unless followed by a
-# close brace.
-nl_after_return                 = false    # true/false
-
-# Whether to put a blank line before a member '.' or '->' operators.
-nl_before_member                = ignore   # ignore/add/remove/force
-
-# (Java) Whether to put a blank line after a member '.' or '->' operators.
-nl_after_member                 = ignore   # ignore/add/remove/force
-
-# Whether to double-space commented-entries in 'struct'/'union'/'enum'.
-nl_ds_struct_enum_cmt           = false    # true/false
-
-# Whether to force a newline before '}' of a 'struct'/'union'/'enum'.
-# (Lower priority than eat_blanks_before_close_brace.)
-nl_ds_struct_enum_close_brace   = false    # true/false
-
-# Add or remove newline before or after (depending on pos_class_colon) a class
-# colon, as in 'class Foo <here> : <or here> public Bar'.
-nl_class_colon                  = ignore   # ignore/add/remove/force
-
-# Add or remove newline around a class constructor colon. The exact position
-# depends on nl_constr_init_args, pos_constr_colon and pos_constr_comma.
-nl_constr_colon                 = ignore   # ignore/add/remove/force
-
-# Whether to collapse a two-line namespace, like 'namespace foo\n{ decl; }'
-# into a single line. If true, prevents other brace newline rules from turning
-# such code into four lines.
-nl_namespace_two_to_one_liner   = false    # true/false
-
-# Whether to remove a newline in simple unbraced if statements, turning them
-# into one-liners, as in 'if(b)\n i++;' => 'if(b) i++;'.
-nl_create_if_one_liner          = false    # true/false
-
-# Whether to remove a newline in simple unbraced for statements, turning them
-# into one-liners, as in 'for (...)\n stmt;' => 'for (...) stmt;'.
-nl_create_for_one_liner         = false    # true/false
-
-# Whether to remove a newline in simple unbraced while statements, turning
-# them into one-liners, as in 'while (expr)\n stmt;' => 'while (expr) stmt;'.
-nl_create_while_one_liner       = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_func_def_one_liner    = false    # true/false
-
-# Whether to collapse a function definition whose body (not counting braces)
-# is only one line so that the entire definition (prototype, braces, body) is
-# a single line.
-nl_create_list_one_liner        = false    # true/false
-
-# Whether to split one-line simple unbraced if statements into two lines by
-# adding a newline, as in 'if(b) <here> i++;'.
-nl_split_if_one_liner           = false    # true/false
-
-# Whether to split one-line simple unbraced for statements into two lines by
-# adding a newline, as in 'for (...) <here> stmt;'.
-nl_split_for_one_liner          = false    # true/false
-
-# Whether to split one-line simple unbraced while statements into two lines by
-# adding a newline, as in 'while (expr) <here> stmt;'.
-nl_split_while_one_liner        = false    # true/false
-
-# Don't add a newline before a cpp-comment in a parameter list of a function
-# call.
-donot_add_nl_before_cpp_comment = false    # true/false
-
-#
-# Blank line options
-#
-
-# The maximum number of consecutive newlines (3 = 2 blank lines).
-nl_max                          = 0        # unsigned number
-
-# The maximum number of consecutive newlines in a function.
-nl_max_blank_in_func            = 0        # unsigned number
-
-# The number of newlines inside an empty function body.
-# This option is overridden by nl_collapse_empty_body=true
-nl_inside_empty_func            = 0        # unsigned number
-
-# The number of newlines before a function prototype.
-nl_before_func_body_proto       = 0        # unsigned number
-
-# The number of newlines before a multi-line function definition.
-nl_before_func_body_def         = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor prototype.
-nl_before_func_class_proto      = 0        # unsigned number
-
-# The number of newlines before a class constructor/destructor definition.
-nl_before_func_class_def        = 0        # unsigned number
-
-# The number of newlines after a function prototype.
-nl_after_func_proto             = 0        # unsigned number
-
-# The number of newlines after a function prototype, if not followed by
-# another function prototype.
-nl_after_func_proto_group       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype.
-nl_after_func_class_proto       = 0        # unsigned number
-
-# The number of newlines after a class constructor/destructor prototype,
-# if not followed by another constructor/destructor prototype.
-nl_after_func_class_proto_group = 0        # unsigned number
-
-# Whether one-line method definitions inside a class body should be treated
-# as if they were prototypes for the purposes of adding newlines.
-#
-# Requires nl_class_leave_one_liners=true. Overrides nl_before_func_body_def
-# and nl_before_func_class_def for one-liners.
-nl_class_leave_one_liner_groups = false    # true/false
-
-# The number of newlines after '}' of a multi-line function body.
-nl_after_func_body              = 0        # unsigned number
-
-# The number of newlines after '}' of a multi-line function body in a class
-# declaration. Also affects class constructors/destructors.
-#
-# Overrides nl_after_func_body.
-nl_after_func_body_class        = 0        # unsigned number
-
-# The number of newlines after '}' of a single line function body. Also
-# affects class constructors/destructors.
-#
-# Overrides nl_after_func_body and nl_after_func_body_class.
-nl_after_func_body_one_liner    = 0        # unsigned number
-
-# The number of blank lines after a block of variable definitions at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_func_var_def_blk             = 0        # unsigned number
-
-# The number of newlines before a block of typedefs. If nl_after_access_spec
-# is non-zero, that option takes precedence.
-#
-# 0: No change (default).
-nl_typedef_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of typedefs.
-#
-# 0: No change (default).
-nl_typedef_blk_in               = 0        # unsigned number
-
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
-#
-# 0: No change (default).
-nl_var_def_blk_start            = 0        # unsigned number
-
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
-#
-# 0: No change (default).
-nl_var_def_blk_end              = 0        # unsigned number
-
-# The maximum number of consecutive newlines within a block of variable
-# definitions.
-#
-# 0: No change (default).
-nl_var_def_blk_in               = 0        # unsigned number
-
-# The minimum number of newlines before a multi-line comment.
-# Doesn't apply if after a brace open or another multi-line comment.
-nl_before_block_comment         = 0        # unsigned number
-
-# The minimum number of newlines before a single-line C comment.
-# Doesn't apply if after a brace open or other single-line C comments.
-nl_before_c_comment             = 0        # unsigned number
-
-# The minimum number of newlines before a CPP comment.
-# Doesn't apply if after a brace open or other CPP comments.
-nl_before_cpp_comment           = 0        # unsigned number
-
-# Whether to force a newline after a multi-line comment.
-nl_after_multiline_comment      = false    # true/false
-
-# Whether to force a newline after a label's colon.
-nl_after_label_colon            = false    # true/false
-
-# The number of newlines after '}' or ';' of a struct/enum/union definition.
-nl_after_struct                 = 0        # unsigned number
-
-# The number of newlines before a class definition.
-nl_before_class                 = 0        # unsigned number
-
-# The number of newlines after '}' or ';' of a class definition.
-nl_after_class                  = 0        # unsigned number
-
-# The number of newlines before a namespace.
-nl_before_namespace             = 0        # unsigned number
-
-# The number of newlines after '{' of a namespace. This also adds newlines
-# before the matching '}'.
-#
-# 0: Apply eat_blanks_after_open_brace or eat_blanks_before_close_brace if
-#     applicable, otherwise no change.
-#
-# Overrides eat_blanks_after_open_brace and eat_blanks_before_close_brace.
-nl_inside_namespace             = 0        # unsigned number
-
-# The number of newlines after '}' of a namespace.
-nl_after_namespace              = 0        # unsigned number
-
-# The number of newlines before an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-nl_before_access_spec           = 0        # unsigned number
-
-# The number of newlines after an access specifier label. This also includes
-# the Qt-specific 'signals:' and 'slots:'. Will not change the newline count
-# if after a brace open.
-#
-# 0: No change (default).
-#
-# Overrides nl_typedef_blk_start and nl_var_def_blk_start.
-nl_after_access_spec            = 0        # unsigned number
-
-# The number of newlines between a function definition and the function
-# comment, as in '// comment\n <here> void foo() {...}'.
-#
-# 0: No change (default).
-nl_comment_func_def             = 0        # unsigned number
-
-# The number of newlines after a try-catch-finally block that isn't followed
-# by a brace close.
-#
-# 0: No change (default).
-nl_after_try_catch_finally      = 0        # unsigned number
-
-# (C#) The number of newlines before and after a property, indexer or event
-# declaration.
-#
-# 0: No change (default).
-nl_around_cs_property           = 0        # unsigned number
-
-# (C#) The number of newlines between the get/set/add/remove handlers.
-#
-# 0: No change (default).
-nl_between_get_set              = 0        # unsigned number
-
-# (C#) Add or remove newline between property and the '{'.
-nl_property_brace               = ignore   # ignore/add/remove/force
-
-# Whether to remove blank lines after '{'.
-eat_blanks_after_open_brace     = false    # true/false
-
-# Whether to remove blank lines before '}'.
-eat_blanks_before_close_brace   = false    # true/false
-
-# How aggressively to remove extra newlines not in preprocessor.
-#
-# 0: No change (default)
-# 1: Remove most newlines not handled by other config
-# 2: Remove all newlines and reformat completely by config
-nl_remove_extra_newlines        = 0        # unsigned number
-
-# (Java) Add or remove newline after an annotation statement. Only affects
-# annotations that are after a newline.
-nl_after_annotation             = ignore   # ignore/add/remove/force
-
-# (Java) Add or remove newline between two annotations.
-nl_between_annotation           = ignore   # ignore/add/remove/force
-
-# The number of newlines before a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_before_whole_file_ifdef      = 0        # unsigned number
-
-# The number of newlines after a whole-file #ifdef.
-#
-# 0: No change (default).
-nl_after_whole_file_ifdef       = 0        # unsigned number
-
-# The number of newlines before a whole-file #endif.
-#
-# 0: No change (default).
-nl_before_whole_file_endif      = 0        # unsigned number
-
-# The number of newlines after a whole-file #endif.
-#
-# 0: No change (default).
-nl_after_whole_file_endif       = 0        # unsigned number
-
-#
-# Positioning options
-#
-
-# The position of arithmetic operators in wrapped expressions.
-pos_arith                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of assignment in wrapped expressions. Do not affect '='
-# followed by '{'.
-pos_assign                      = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of Boolean operators in wrapped expressions.
-pos_bool                        = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of comparison operators in wrapped expressions.
-pos_compare                     = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of conditional operators, as in the '?' and ':' of
-# 'expr ? stmt : stmt', in wrapped expressions.
-pos_conditional                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in wrapped expressions.
-pos_comma                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in enum entries.
-pos_enum_comma                  = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the base class list if there is more than one
-# line. Affects nl_class_init_args.
-pos_class_comma                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of the comma in the constructor initialization list.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_colon.
-pos_constr_comma                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of trailing/leading class colon, between class and base class
-# list. Affects nl_class_colon.
-pos_class_colon                 = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of colons between constructor and member initialization.
-# Related to nl_constr_colon, nl_constr_init_args and pos_constr_comma.
-pos_constr_colon                = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-# The position of shift operators in wrapped expressions.
-pos_shift                       = ignore   # ignore/break/force/lead/trail/join/lead_break/lead_force/trail_break/trail_force
-
-#
-# Line splitting options
-#
-
-# Try to limit code width to N columns.
-code_width                      = 0        # unsigned number
-
-# Whether to fully split long 'for' statements at semi-colons.
-ls_for_split_full               = false    # true/false
-
-# Whether to fully split long function prototypes/calls at commas.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_func_split_full              = false    # true/false
-
-# Whether to split lines as close to code_width as possible and ignore some
-# groupings.
-# The option ls_code_width has priority over the option ls_func_split_full.
-ls_code_width                   = false    # true/false
-
-#
-# Code alignment options (not left column spaces/tabs)
-#
-
-# Whether to keep non-indenting tabs.
-align_keep_tabs                 = false    # true/false
-
-# Whether to use tabs for aligning.
-align_with_tabs                 = false    # true/false
-
-# Whether to bump out to the next tab when aligning.
-align_on_tabstop                = false    # true/false
-
-# Whether to right-align numbers.
-align_number_right              = false    # true/false
-
-# Whether to keep whitespace not required for alignment.
-align_keep_extra_space          = false    # true/false
-
-# Whether to align variable definitions in prototypes and functions.
-align_func_params               = false    # true/false
-
-# The span for aligning parameter definitions in function on parameter name.
-#
-# 0: Don't align (default).
-align_func_params_span          = 0        # unsigned number
-
-# The threshold for aligning function parameter definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_params_thresh        = 0        # number
-
-# The gap for aligning function parameter definitions.
-align_func_params_gap           = 0        # unsigned number
-
-# The span for aligning constructor value.
-#
-# 0: Don't align (default).
-align_constr_value_span         = 0        # unsigned number
-
-# The threshold for aligning constructor value.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_constr_value_thresh       = 0        # number
-
-# The gap for aligning constructor value.
-align_constr_value_gap          = 0        # unsigned number
-
-# Whether to align parameters in single-line functions that have the same
-# name. The function names must already be aligned with each other.
-align_same_func_call_params     = false    # true/false
-
-# The span for aligning function-call parameters for single line functions.
-#
-# 0: Don't align (default).
-align_same_func_call_params_span = 0        # unsigned number
-
-# The threshold for aligning function-call parameters for single line
-# functions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_same_func_call_params_thresh = 0        # number
-
-# The span for aligning variable definitions.
-#
-# 0: Don't align (default).
-align_var_def_span              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of variable definitions.
-#
-# 0: Part of the type     'void *   foo;' (default)
-# 1: Part of the variable 'void     *foo;'
-# 2: Dangling             'void    *foo;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_var_def_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of variable definitions.
-#
-# 0: Part of the type     'long &   foo;' (default)
-# 1: Part of the variable 'long     &foo;'
-# 2: Dangling             'long    &foo;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_var_def_amp_style         = 0        # unsigned number
-
-# The threshold for aligning variable definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_def_thresh            = 0        # number
-
-# The gap for aligning variable definitions.
-align_var_def_gap               = 0        # unsigned number
-
-# Whether to align the colon in struct bit fields.
-align_var_def_colon             = false    # true/false
-
-# The gap for aligning the colon in struct bit fields.
-align_var_def_colon_gap         = 0        # unsigned number
-
-# Whether to align any attribute after the variable name.
-align_var_def_attribute         = false    # true/false
-
-# Whether to align inline struct/enum/union variable definitions.
-align_var_def_inline            = false    # true/false
-
-# The span for aligning on '=' in assignments.
-#
-# 0: Don't align (default).
-align_assign_span               = 0        # unsigned number
-
-# The span for aligning on '=' in function prototype modifier.
-#
-# 0: Don't align (default).
-align_assign_func_proto_span    = 0        # unsigned number
-
-# The threshold for aligning on '=' in assignments.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_assign_thresh             = 0        # number
-
-# How to apply align_assign_span to function declaration "assignments", i.e.
-# 'virtual void foo() = 0' or '~foo() = {default|delete}'.
-#
-# 0: Align with other assignments (default)
-# 1: Align with each other, ignoring regular assignments
-# 2: Don't align
-align_assign_decl_func          = 0        # unsigned number
-
-# The span for aligning on '=' in enums.
-#
-# 0: Don't align (default).
-align_enum_equ_span             = 0        # unsigned number
-
-# The threshold for aligning on '=' in enums.
-# Use a negative number for absolute thresholds.
-#
-# 0: no limit (default).
-align_enum_equ_thresh           = 0        # number
-
-# The span for aligning class member definitions.
-#
-# 0: Don't align (default).
-align_var_class_span            = 0        # unsigned number
-
-# The threshold for aligning class member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_class_thresh          = 0        # number
-
-# The gap for aligning class member definitions.
-align_var_class_gap             = 0        # unsigned number
-
-# The span for aligning struct/union member definitions.
-#
-# 0: Don't align (default).
-align_var_struct_span           = 0        # unsigned number
-
-# The threshold for aligning struct/union member definitions.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_var_struct_thresh         = 0        # number
-
-# The gap for aligning struct/union member definitions.
-align_var_struct_gap            = 0        # unsigned number
-
-# The span for aligning struct initializer values.
-#
-# 0: Don't align (default).
-align_struct_init_span          = 0        # unsigned number
-
-# The span for aligning single-line typedefs.
-#
-# 0: Don't align (default).
-align_typedef_span              = 0        # unsigned number
-
-# The minimum space between the type and the synonym of a typedef.
-align_typedef_gap               = 0        # unsigned number
-
-# How to align typedef'd functions with other typedefs.
-#
-# 0: Don't mix them at all (default)
-# 1: Align the open parenthesis with the types
-# 2: Align the function type name with the other type names
-align_typedef_func              = 0        # unsigned number
-
-# How to consider (or treat) the '*' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int * pint;' (default)
-# 1: Part of type name:        'typedef int   *pint;'
-# 2: Dangling:                 'typedef int  *pint;'
-# Dangling: the '*' will not be taken into account when aligning.
-align_typedef_star_style        = 0        # unsigned number
-
-# How to consider (or treat) the '&' in the alignment of typedefs.
-#
-# 0: Part of the typedef type, 'typedef int & intref;' (default)
-# 1: Part of type name:        'typedef int   &intref;'
-# 2: Dangling:                 'typedef int  &intref;'
-# Dangling: the '&' will not be taken into account when aligning.
-align_typedef_amp_style         = 0        # unsigned number
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 0        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 0        # unsigned number
-
-# If aligning comments, whether to mix with comments after '}' and #endif with
-# less than three spaces before the comment.
-align_right_cmt_mix             = false    # true/false
-
-# Whether to only align trailing comments that are at the same brace level.
-align_right_cmt_same_level      = false    # true/false
-
-# Minimum column at which to align trailing comments. Comments which are
-# aligned beyond this column, but which can be aligned in a lesser column,
-# may be "pulled in".
-#
-# 0: Ignore (default).
-align_right_cmt_at_col          = 0        # unsigned number
-
-# The span for aligning function prototypes.
-#
-# 0: Don't align (default).
-align_func_proto_span           = 0        # unsigned number
-
-# The threshold for aligning function prototypes.
-# Use a negative number for absolute thresholds.
-#
-# 0: No limit (default).
-align_func_proto_thresh         = 0        # number
-
-# Minimum gap between the return type and the function name.
-align_func_proto_gap            = 0        # unsigned number
-
-# Whether to align function prototypes on the 'operator' keyword instead of
-# what follows.
-align_on_operator               = false    # true/false
-
-# Whether to mix aligning prototype and variable declarations. If true,
-# align_var_def_XXX options are used instead of align_func_proto_XXX options.
-align_mix_var_proto             = false    # true/false
-
-# Whether to align single-line functions with function prototypes.
-# Uses align_func_proto_span.
-align_single_line_func          = false    # true/false
-
-# Whether to align the open brace of single-line functions.
-# Requires align_single_line_func=true. Uses align_func_proto_span.
-align_single_line_brace         = false    # true/false
-
-# Gap for align_single_line_brace.
-align_single_line_brace_gap     = 0        # unsigned number
-
-# (OC) The span for aligning Objective-C message specifications.
-#
-# 0: Don't align (default).
-align_oc_msg_spec_span          = 0        # unsigned number
-
-# Whether to align macros wrapped with a backslash and a newline. This will
-# not work right if the macro contains a multi-line comment.
-align_nl_cont                   = false    # true/false
-
-# Whether to align macro functions and variables together.
-align_pp_define_together        = false    # true/false
-
-# The span for aligning on '#define' bodies.
-#
-# =0: Don't align (default)
-# >0: Number of lines (including comments) between blocks
-align_pp_define_span            = 0        # unsigned number
-
-# The minimum space between label and value of a preprocessor define.
-align_pp_define_gap             = 0        # unsigned number
-
-# Whether to align lines that start with '<<' with previous '<<'.
-#
-# Default: true
-align_left_shift                = true     # true/false
-
-# Whether to align comma-separated statements following '<<' (as used to
-# initialize Eigen matrices).
-align_eigen_comma_init          = false    # true/false
-
-# Whether to align text after 'asm volatile ()' colons.
-align_asm_colon                 = false    # true/false
-
-# (OC) Span for aligning parameters in an Objective-C message call
-# on the ':'.
-#
-# 0: Don't align.
-align_oc_msg_colon_span         = 0        # unsigned number
-
-# (OC) Whether to always align with the first parameter, even if it is too
-# short.
-align_oc_msg_colon_first        = false    # true/false
-
-# (OC) Whether to align parameters in an Objective-C '+' or '-' declaration
-# on the ':'.
-align_oc_decl_colon             = false    # true/false
-
-# (OC) Whether to not align parameters in an Objectve-C message call if first
-# colon is not on next line of the message call (the same way Xcode does
-# aligment)
-align_oc_msg_colon_xcode_like   = false    # true/false
-
-#
-# Comment modification options
-#
-
-# Try to wrap comments at N columns.
-cmt_width                       = 0        # unsigned number
-
-# How to reflow comments.
-#
-# 0: No reflowing (apart from the line wrapping due to cmt_width) (default)
-# 1: No touching at all
-# 2: Full reflow
-cmt_reflow_mode                 = 0        # unsigned number
-
-# Whether to convert all tabs to spaces in comments. If false, tabs in
-# comments are left alone, unless used for indenting.
-cmt_convert_tab_to_spaces       = true    # true/false
-
-# Whether to apply changes to multi-line comments, including cmt_width,
-# keyword substitution and leading chars.
-#
-# Default: true
-cmt_indent_multi                = true     # true/false
-
-# Whether to group c-comments that look like they are in a block.
-cmt_c_group                     = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined c-comment.
-cmt_c_nl_start                  = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined c-comment.
-cmt_c_nl_end                    = false    # true/false
-
-# Whether to change cpp-comments into c-comments.
-cmt_cpp_to_c                    = false    # true/false
-
-# Whether to group cpp-comments that look like they are in a block. Only
-# meaningful if cmt_cpp_to_c=true.
-cmt_cpp_group                   = false    # true/false
-
-# Whether to put an empty '/*' on the first line of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_start                = false    # true/false
-
-# Whether to add a newline before the closing '*/' of the combined cpp-comment
-# when converting to a c-comment.
-#
-# Requires cmt_cpp_to_c=true and cmt_cpp_group=true.
-cmt_cpp_nl_end                  = false    # true/false
-
-# Whether to put a star on subsequent comment lines.
-cmt_star_cont                   = false    # true/false
-
-# The number of spaces to insert at the start of subsequent comment lines.
-cmt_sp_before_star_cont         = 0        # unsigned number
-
-# The number of spaces to insert after the star on subsequent comment lines.
-cmt_sp_after_star_cont          = 0        # unsigned number
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length.
-#
-# Default: true
-cmt_multi_check_last            = true     # true/false
-
-# For multi-line comments with a '*' lead, remove leading spaces if the first
-# and last lines of the comment are the same length AND if the length is
-# bigger as the first_len minimum.
-#
-# Default: 4
-cmt_multi_first_len_minimum     = 4        # unsigned number
-
-# Path to a file that contains text to insert at the beginning of a file if
-# the file doesn't start with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_header          = ""         # string
-
-# Path to a file that contains text to insert at the end of a file if the
-# file doesn't end with a C/C++ comment. If the inserted text contains
-# '$(filename)', that will be replaced with the current file's name.
-cmt_insert_file_footer          = ""         # string
-
-# Path to a file that contains text to insert before a function definition if
-# the function isn't preceded by a C/C++ comment. If the inserted text
-# contains '$(function)', '$(javaparam)' or '$(fclass)', these will be
-# replaced with, respectively, the name of the function, the javadoc '@param'
-# and '@return' stuff, or the name of the class to which the member function
-# belongs.
-cmt_insert_func_header          = ""         # string
-
-# Path to a file that contains text to insert before a class if the class
-# isn't preceded by a C/C++ comment. If the inserted text contains '$(class)',
-# that will be replaced with the class name.
-cmt_insert_class_header         = ""         # string
-
-# Path to a file that contains text to insert before an Objective-C message
-# specification, if the method isn't preceded by a C/C++ comment. If the
-# inserted text contains '$(message)' or '$(javaparam)', these will be
-# replaced with, respectively, the name of the function, or the javadoc
-# '@param' and '@return' stuff.
-cmt_insert_oc_msg_header        = ""         # string
-
-# Whether a comment should be inserted if a preprocessor is encountered when
-# stepping backwards from a function name.
-#
-# Applies to cmt_insert_oc_msg_header, cmt_insert_func_header and
-# cmt_insert_class_header.
-cmt_insert_before_preproc       = false    # true/false
-
-# Whether a comment should be inserted if a function is declared inline to a
-# class definition.
-#
-# Applies to cmt_insert_func_header.
-#
-# Default: true
-cmt_insert_before_inlines       = true     # true/false
-
-# Whether a comment should be inserted if the function is a class constructor
-# or destructor.
-#
-# Applies to cmt_insert_func_header.
-cmt_insert_before_ctor_dtor     = false    # true/false
-
-#
-# Code modifying options (non-whitespace)
-#
-
-# Add or remove braces on a single-line 'do' statement.
-mod_full_brace_do               = ignore   # ignore/add/remove/force
-
-# Add or remove braces on a single-line 'for' statement.
-mod_full_brace_for              = ignore   # ignore/add/remove/force
-
-# (Pawn) Add or remove braces on a single-line function definition.
-mod_full_brace_function         = ignore   # ignore/add/remove/force
-
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if               = ignore   # ignore/add/remove/force
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
-
-# Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
-# If true, mod_full_brace_if_chain will only remove braces from an 'if' that
-# does not have an 'else if' or 'else'.
-mod_full_brace_if_chain_only    = false    # true/false
-
-# Add or remove braces on single-line 'while' statement.
-mod_full_brace_while            = ignore   # ignore/add/remove/force
-
-# Add or remove braces on single-line 'using ()' statement.
-mod_full_brace_using            = ignore   # ignore/add/remove/force
-
-# Don't remove braces around statements that span N newlines
-mod_full_brace_nl               = 0        # unsigned number
-
-# Whether to prevent removal of braces from 'if'/'for'/'while'/etc. blocks
-# which span multiple lines.
-#
-# Affects:
-#   mod_full_brace_for
-#   mod_full_brace_if
-#   mod_full_brace_if_chain
-#   mod_full_brace_if_chain_only
-#   mod_full_brace_while
-#   mod_full_brace_using
-#
-# Does not affect:
-#   mod_full_brace_do
-#   mod_full_brace_function
-mod_full_brace_nl_block_rem_mlcond = false    # true/false
-
-# Add or remove unnecessary parenthesis on 'return' statement.
-mod_paren_on_return             = ignore   # ignore/add/remove/force
-
-# (Pawn) Whether to change optional semicolons to real semicolons.
-mod_pawn_semicolon              = false    # true/false
-
-# Whether to fully parenthesize Boolean expressions in 'while' and 'if'
-# statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
-mod_full_paren_if_bool          = false    # true/false
-
-# Whether to remove superfluous semicolons.
-mod_remove_extra_semicolon      = false    # true/false
-
-# If a function body exceeds the specified number of newlines and doesn't have
-# a comment after the close brace, a comment will be added.
-mod_add_long_function_closebrace_comment = 0        # unsigned number
-
-# If a namespace body exceeds the specified number of newlines and doesn't
-# have a comment after the close brace, a comment will be added.
-mod_add_long_namespace_closebrace_comment = 0        # unsigned number
-
-# If a class body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_class_closebrace_comment = 0        # unsigned number
-
-# If a switch body exceeds the specified number of newlines and doesn't have a
-# comment after the close brace, a comment will be added.
-mod_add_long_switch_closebrace_comment = 0        # unsigned number
-
-# If an #ifdef body exceeds the specified number of newlines and doesn't have
-# a comment after the #endif, a comment will be added.
-mod_add_long_ifdef_endif_comment = 0        # unsigned number
-
-# If an #ifdef or #else body exceeds the specified number of newlines and
-# doesn't have a comment after the #else, a comment will be added.
-mod_add_long_ifdef_else_comment = 0        # unsigned number
-
-# Whether to take care of the case by the mod_sort_xx options.
-mod_sort_case_sensitive         = false    # true/false
-
-# Whether to sort consecutive single-line 'import' statements.
-mod_sort_import                 = false    # true/false
-
-# (C#) Whether to sort consecutive single-line 'using' statements.
-mod_sort_using                  = false    # true/false
-
-# Whether to sort consecutive single-line '#include' statements (C/C++) and
-# '#import' statements (Objective-C). Be aware that this has the potential to
-# break your code if your includes/imports have ordering dependencies.
-mod_sort_include                = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# filename without extension when sorting is enabled.
-mod_sort_incl_import_prioritize_filename = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that does not
-# contain extensions when sorting is enabled.
-mod_sort_incl_import_prioritize_extensionless = false    # true/false
-
-# Whether to prioritize '#include' and '#import' statements that contain
-# angle over quotes when sorting is enabled.
-mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
-
-# Whether to ignore file extension in '#include' and '#import' statements
-# for sorting comparison.
-mod_sort_incl_import_ignore_extension = false    # true/false
-
-# Whether to group '#include' and '#import' statements when sorting is enabled.
-mod_sort_incl_import_grouping_enabled = false    # true/false
-
-# Whether to move a 'break' that appears after a fully braced 'case' before
-# the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
-mod_move_case_break             = false    # true/false
-
-# Add or remove braces around a fully braced case statement. Will only remove
-# braces if there are no variable declarations in the block.
-mod_case_brace                  = ignore   # ignore/add/remove/force
-
-# Whether to remove a void 'return;' that appears as the last statement in a
-# function.
-mod_remove_empty_return         = false    # true/false
-
-# Add or remove the comma after the last value of an enumeration.
-mod_enum_last_comma             = ignore   # ignore/add/remove/force
-
-# (OC) Whether to organize the properties. If true, properties will be
-# rearranged according to the mod_sort_oc_property_*_weight factors.
-mod_sort_oc_properties          = false    # true/false
-
-# (OC) Weight of a class property modifier.
-mod_sort_oc_property_class_weight = 0        # number
-
-# (OC) Weight of 'atomic' and 'nonatomic'.
-mod_sort_oc_property_thread_safe_weight = 0        # number
-
-# (OC) Weight of 'readwrite' when organizing properties.
-mod_sort_oc_property_readwrite_weight = 0        # number
-
-# (OC) Weight of a reference type specifier ('retain', 'copy', 'assign',
-# 'weak', 'strong') when organizing properties.
-mod_sort_oc_property_reference_weight = 0        # number
-
-# (OC) Weight of getter type ('getter=') when organizing properties.
-mod_sort_oc_property_getter_weight = 0        # number
-
-# (OC) Weight of setter type ('setter=') when organizing properties.
-mod_sort_oc_property_setter_weight = 0        # number
-
-# (OC) Weight of nullability type ('nullable', 'nonnull', 'null_unspecified',
-# 'null_resettable') when organizing properties.
-mod_sort_oc_property_nullability_weight = 0        # number
-
-#
-# Preprocessor options
-#
-
-# Add or remove indentation of preprocessor directives inside #if blocks
-# at brace level 0 (file-level).
-pp_indent                       = ignore   # ignore/add/remove/force
-
-# Whether to indent #if/#else/#endif at the brace level. If false, these are
-# indented from column 1.
-pp_indent_at_level              = false    # true/false
-
-# Specifies the number of columns to indent preprocessors per level
-# at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
-# the number of columns to indent preprocessors per level
-# at brace level > 0 (function-level).
-#
-# Default: 1
-pp_indent_count                 = 1        # unsigned number
-
-# Add or remove space after # based on pp_level of #if blocks.
-pp_space                        = ignore   # ignore/add/remove/force
-
-# Sets the number of spaces per level added with pp_space.
-pp_space_count                  = 0        # unsigned number
-
-# The indent for '#region' and '#endregion' in C# and '#pragma region' in
-# C/C++. Negative values decrease indent down to the first column.
-pp_indent_region                = 0        # number
-
-# Whether to indent the code between #region and #endregion.
-pp_region_indent_code           = false    # true/false
-
-# If pp_indent_at_level=true, sets the indent for #if, #else and #endif when
-# not at file-level. Negative values decrease indent down to the first column.
-#
-# =0: Indent preprocessors using output_tab_size
-# >0: Column at which all preprocessors will be indented
-pp_indent_if                    = 0        # number
-
-# Whether to indent the code between #if, #else and #endif.
-pp_if_indent_code               = false    # true/false
-
-# Whether to indent '#define' at the brace level. If false, these are
-# indented from column 1.
-pp_define_at_level              = false    # true/false
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = false    # true/false
-
-# Whether to indent case statements between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the case statements
-# directly inside of.
-#
-# Default: true
-pp_indent_case                  = true     # true/false
-
-# Whether to indent whole function definitions between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the function definition
-# is directly inside of.
-#
-# Default: true
-pp_indent_func_def              = true     # true/false
-
-# Whether to indent extern C blocks between #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the extern block is
-# directly inside of.
-#
-# Default: true
-pp_indent_extern                = true     # true/false
-
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
-#
-# Default: true
-pp_indent_brace                 = true     # true/false
-
-#
-# Sort includes options
-#
-
-# The regex for include category with priority 0.
-include_category_0              = ""         # string
-
-# The regex for include category with priority 1.
-include_category_1              = ""         # string
-
-# The regex for include category with priority 2.
-include_category_2              = ""         # string
-
-#
-# Use or Do not Use options
-#
-
-# true:  indent_func_call_param will be used (default)
-# false: indent_func_call_param will NOT be used
-#
-# Default: true
-use_indent_func_call_param      = true     # true/false
-
-# The value of the indentation for a continuation line is calculated
-# differently if the statement is:
-# - a declaration: your case with QString fileName ...
-# - an assignment: your case with pSettings = new QSettings( ...
-#
-# At the second case the indentation value might be used twice:
-# - at the assignment
-# - at the function call (if present)
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
-#
-# true:  indent_continue will be used only once
-# false: indent_continue will be used every time (default)
-use_indent_continue_only_once   = false    # true/false
-
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
+# To prevent the double use of the indentation value, use this option with the
+# value 'true'.
 #
 # true:  indentation will be used only once
 # false: indentation will be used every time (default)
 indent_cpp_lambda_only_once     = true    # true/false
-
-# Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
-# historic behavior, but is probably not the desired behavior, so this is off
-# by default.
-use_sp_after_angle_always       = false    # true/false
-
-# Whether to apply special formatting for Qt SIGNAL/SLOT macros. Essentially,
-# this tries to format these so that they match Qt's normalized form (i.e. the
-# result of QMetaObject::normalizedSignature), which can slightly improve the
-# performance of the QObject::connect call, rather than how they would
-# otherwise be formatted.
-#
-# See options_for_QT.cpp for details.
-#
-# Default: true
-use_options_overriding_for_qt_macros = true     # true/false
-
-# If true: the form feed character is removed from the list
-# of whitespace characters.
-# See https://en.cppreference.com/w/cpp/string/byte/isspace
-use_form_feed_no_more_as_whitespace_character = false    # true/false
-
-#
-# Warn levels - 1: error, 2: warning (default), 3: note
-#
-
-# (C#) Warning is given if doing tab-to-\t replacement and we have found one
-# in a C# verbatim string literal.
-#
-# Default: 2
-warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
-
-# Limit the number of loops.
-# Used by uncrustify.cpp to exit from infinite loop.
-# 0: no limit.
-debug_max_number_of_loops       = 0        # number
-
-# Set the number of the line to protocol;
-# Used in the function prot_the_line if the 2. parameter is zero.
-# 0: nothing protocol.
-debug_line_number_to_protocol   = 0        # number
-
-# Set the number of second(s) before terminating formatting the current file,
-# 0: no timeout.
-# only for linux
-debug_timeout                   = 0        # number
-
-# Meaning of the settings:
-#   Ignore - do not do any changes
-#   Add    - makes sure there is 1 or more space/brace/newline/etc
-#   Force  - makes sure there is exactly 1 space/brace/newline/etc,
-#            behaves like Add in some contexts
-#   Remove - removes space/brace/newline/etc
-#
-#
-# - Token(s) can be treated as specific type(s) with the 'set' option:
-#     `set tokenType tokenString [tokenString...]`
-#
-#     Example:
-#       `set BOOL __AND__ __OR__`
-#
-#     tokenTypes are defined in src/token_enum.h, use them without the
-#     'CT_' prefix: 'CT_BOOL' => 'BOOL'
-#
-#
-# - Token(s) can be treated as type(s) with the 'type' option.
-#     `type tokenString [tokenString...]`
-#
-#     Example:
-#       `type int c_uint_8 Rectangle`
-#
-#     This can also be achieved with `set TYPE int c_uint_8 Rectangle`
-#
-#
-# To embed whitespace in tokenStrings use the '\' escape character, or quote
-# the tokenStrings. These quotes are supported: "'`
-#
-#
-# - Support for the auto detection of languages through the file ending can be
-#   added using the 'file_ext' command.
-#     `file_ext langType langString [langString..]`
-#
-#     Example:
-#       `file_ext CPP .ch .cxx .cpp.in`
-#
-#     langTypes are defined in uncrusify_types.h in the lang_flag_e enum, use
-#     them without the 'LANG_' prefix: 'LANG_CPP' => 'CPP'
-#
-#
-# - Custom macro-based indentation can be set up using 'macro-open',
-#   'macro-else' and 'macro-close'.
-#     `(macro-open | macro-else | macro-close) tokenString`
-#
-#     Example:
-#       `macro-open  BEGIN_TEMPLATE_MESSAGE_MAP`
-#       `macro-open  BEGIN_MESSAGE_MAP`
-#       `macro-close END_MESSAGE_MAP`
-#
-#
-# option(s) with 'not default' value: 24
-#
diff --git a/AUTHORS b/AUTHORS
index e3610324298..be41c3c525c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 The cppcheck team, in alphabetical order:
 
+0x41head
 Abhijit Sawant
 Abhishek Bharadwaj
 Abigail Buccaneer
@@ -21,12 +22,14 @@ Alexey Eryomenko
 Alexey Zhikhartsev
 Alfi Maulana
 Ali Can Demiralp
+Allen Winter
 Alon Alexander
 Alon Liberman
 Ameen Ali
 Andreas Bacher
 Andreas Bießmann
 Andreas Grob
+Andreas Lutsch
 Andreas Pokorny
 Andreas Rönnquist
 Andreas Vollenweider
@@ -36,13 +39,16 @@ Andrew C. Martin
 Andrew D. Bancroft
 Andy Holmes
 Andy Maloney
+Andy Mac Gregor
 Aneesh Azhakesan S
 Ankita Gupta
+anoymouserver
 Anton Lindqvist
 Antti Tuppurainen
 Anurag Garg
 Armin Müller
 Arpit Chaudhary
+Artemis Meursault Gerrard
 August Sodora
 Ayaz Salikhov
 Balázs Tóth
@@ -60,6 +66,7 @@ Ben T
 Bernd Buschinski
 Bill Egert
 Björge Dijkstra
+Björn Blissing
 booga
 Boris Barbulovski
 Boris Egorov
@@ -71,11 +78,15 @@ Carl Morgan
 Carlo Marcelo Arenas Belón
 Carlos Gomes Martinho
 Carl-Oskar Larsson
+Cary Converse
 Cary R
+Caspar Kielwein
 Changkyoon Kim
 Chris Lalancette
 Christian Ehrlicher
 Christian Franke
+Christian Göttsche
+Christoph Grüninger
 Christoph Schmidt
 Christoph Strehle
 Chuck Larson
@@ -92,17 +103,21 @@ David Korth
 Dávid Slivka
 Debrard Sebastien
 Deepak Gupta
+Degen's Regens
 dencat
 Diego de las Heras
 Dirk Jagdmann
+Dirk Mueller
 Dmitriy
 Dmitry Marakasov
 Dmitry-Me
+dsamo
 Duraffort
 Edoardo Prezioso
 Eivind Tagseth
 Elbert Pol
 Emmanuel Blot
+Eric Lemanissier
 Eric Malenfant
 Eric Sesterhenn
 Erik Hovland
@@ -110,12 +125,17 @@ Erik Lax
 Ettl Martin
 Even Rouault
 Evgeny Mandrikov
+feelamee
 Felipe Pena
+Felix Faber
 Felix Geyer
 Felix Passenberg
 Felix Wolff
 Florin Iucha
+flovent
 Francesc Elies
+François Berder
+Frank Winklmeier
 Frank Zingsheim
 Frederik Schwarzer
 fu7mu4
@@ -132,6 +152,7 @@ Gerik Rhoden
 Gianfranco Costamagna
 Gianluca Scacco
 Gleydson Soares
+Goncalo Mao-Cheia
 Goran Džaferi
 Graham Whitted
 Greg Hewgill
@@ -150,6 +171,7 @@ He Yuqi
 Hoang Tuan Su
 Igor Rondarev
 Igor Zhukov
+Ilya Shipitsin
 Ivan Maidanski
 Iván Matellanes
 Ivan Ryabov
@@ -168,6 +190,8 @@ Jesse Boswell
 Jim Kuhn
 Jim Zhou
 jlguardi
+Joel Johnson
+Johan Bertrand
 Johan Samuelson
 John Marshall
 John-Paul Ore
@@ -188,12 +212,14 @@ Jussi Lehtola
 Jørgen Kvalsvik
 Kamil Dudka
 Kartik Bajaj
+Kefu Chai
 keinflue
 Ken-Patrick Lehrmann
 Ketil Skjerve
 Kevin Christian
 Kevin Kendzia
 Kimmo Varis
+Kitsios Konstantinos
 Kleber Tarcísio
 Konrad Grochowski
 Konrad Windszus
@@ -204,6 +230,7 @@ Lars Even Almaas
 larudwer
 Lau bakman
 Lauri Nurmi
+Leander Schulten
 Leandro Lisboa Penz
 Leila F. Rahman
 Lena Herscheid
@@ -212,11 +239,15 @@ Lieven de Cock
 lioncash
 Lionel Gimbert
 Lucas Manuel Rodriguez
+Ludvig Gunne Lindström
 Luis Díaz Más
+Luís Pereira
 Lukas Grützmacher
+Lukas Hiesmayr
 Lukasz Czajczyk
 Łukasz Jankowski
 Luxon Jean-Pierre
+Maarten van der Schrieck
 Maksim Derbasov
 Malcolm Parsons
 Marc-Antoine Perennou
@@ -225,6 +256,7 @@ Marco Trevisan
 Marek Zmysłowski
 Marian Klymov
 Mark de Wever
+Mark Hermeling
 Markus Elfring
 Martin Delille
 Martin Ettl
@@ -235,6 +267,7 @@ Márton Csordás
 Masafumi Koba
 Massimo Paladin
 Mateusz Michalak
+Mateusz Patyk
 Mateusz Pusz
 Mathias De Maré
 Mathias Schmid
@@ -244,6 +277,7 @@ Matthias Schmieder
 Matt Johnson
 Maurice Gilden
 Mavik
+Melroy van den Berg
 Michael Drake
 Michael Løiten
 Miika-Petteri Matikainen
@@ -266,6 +300,8 @@ Nicolás Alvarez
 Nicolas Le Cam
 Nilesh Kumar
 Ogawa KenIchi
+Ola Söder
+Oleksandr Labetskyi
 Oleksandr Redko
 Oliver Schode
 Oliver Stöneberg
@@ -283,8 +319,10 @@ Pavol Misik
 Pete Johns
 Peter Pentchev
 Peter Schops
+Philip Chimento
 Philipp Kloke
 Pierre Schweitzer
+Pieter Duchi
 Pino Toscano
 Pranav Khanna
 Radek Jarecki
@@ -293,6 +331,7 @@ Ramzan Bekbulatov
 Raphael Geissert
 Razvan Ioan Alexe
 Reijo Tomperi
+Reshma V Kumar
 Rainer Wiesenfarth
 Riccardo Ghetta
 Richard A. Smith
@@ -304,6 +343,7 @@ Robert Habrich
 Robert Morin
 Roberto Martelloni
 Robert Reif
+Robin Getz
 rofl0r
 Roman Zaytsev Borisovich
 Ronald Hiemstra
@@ -311,13 +351,17 @@ root
 Rosen Penev
 Rudi Danner
 Rudolf Grauberger
+Ryan M. Lederman
 Ryan Pavlik
 Samir Aguiar
 Sam Truscott
 Samuel Degrande
+Samuel Poláček
 Sandeep Dutta
 Savvas Etairidis
+Scott Ehlert
 Scott Furry
+Seafarix Ltd.
 Sebastian Held
 Sebastian Matuschka
 Sébastien Debrard
@@ -325,6 +369,7 @@ Sergei Chernykh
 Sergei Trofimovich
 Sergey Burgsdorf
 Shane Tapp
+Shohei YOSHIDA
 Simon Cornell
 Simon Kagstrom
 Simon Large
@@ -343,35 +388,47 @@ Steve Duan
 Steve Mokris
 Steven Cook
 Steven Myint
+Sune Stolborg Vuorela
 Susi Lehtola
+Sven Wienand
 Swasti Shrivastava
 Sylvain Joubert
 Tam Do Thanh
 Teddy Didé
+Temuri Doghonadze
 Thomas Arnhold
+Tomasz Edward Posluszny
 Thomas Jarosch
 Thomas Niederberger
 Thomas Otto
 Thomas P. K. Healy
 Thomas Sondergaard
 Thorsten Sick
+Tim Blume
 Tim Gerundt
 tititiou36
+Tobias Weber
 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
 Veli-Matti Visuri
-WenChung Chiu
 Vesa Pikki
 Ville-Pekka Vahteala
 Ville Skyttä
 Vincent Le Garrec
+Vladimir Petrigo
+Wang Haoyu
+Wang Yang
+WenChung Chiu
 Wolfgang Stöggl
 x29a
 XhmikosR
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b76fbf81dd..3595154f7ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,31 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(Cppcheck)
+cmake_minimum_required(VERSION 3.13)
+project(Cppcheck VERSION 2.18.99 LANGUAGES CXX)
+
+include(cmake/options.cmake)
 
 include(cmake/cxx11.cmake)
 use_cxx11()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include(GNUInstallDirs)
 
-include(cmake/ccache.cmake)
 include(cmake/compilerCheck.cmake)
 include(cmake/versions.cmake)
-include(cmake/options.cmake)
 include(cmake/findDependencies.cmake)
 include(cmake/compileroptions.cmake)
 include(cmake/compilerDefinitions.cmake)
 include(cmake/buildFiles.cmake)
-include(cmake/printInfo.cmake)
 if(BUILD_GUI)
     include(cmake/qtCompat.cmake)
 endif()
+include(cmake/printInfo.cmake)
 
 
-file(GLOB addons "addons/*.py")
+file(GLOB addons_py "addons/*.py")
+file(GLOB addons_json "addons/*.json")
 file(GLOB cfgs "cfg/*.cfg")
 file(GLOB platforms "platforms/*.xml")
 
@@ -44,16 +47,18 @@ 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)
 
-    if(PYTHON_EXECUTABLE)
-        add_custom_target(checkCWEEntries ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/listErrorsWithoutCWE.py -F ${CMAKE_BINARY_DIR}/errorlist.xml
+    if(Python_EXECUTABLE)
+        add_custom_target(checkCWEEntries ${Python_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/listErrorsWithoutCWE.py -F ${CMAKE_BINARY_DIR}/errorlist.xml
                 DEPENDS errorlist-xml)
     endif()
 
@@ -66,6 +71,12 @@ if(LIBXML2_XMLLINT_EXECUTABLE)
     add_custom_target(validateRules ${LIBXML2_XMLLINT_EXECUTABLE} --noout ${CMAKE_SOURCE_DIR}/rules/*.xml)
 endif()
 
+# TODO: add the following Makefile features:
+# - "man/cppcheck.1" target
+# - "tags" target
+# - Cygwin handling
+# - MinGW handling
+
 if(BUILD_TESTS)
     enable_testing()
 endif()
@@ -75,14 +86,22 @@ add_custom_target(copy_cfg ALL
         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/cfg"
     COMMENT "Copying cfg files to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
 
+# TODO: copy *.py and *.json only
 add_custom_target(copy_addons ALL
     ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/addons"
         "${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)
@@ -90,11 +109,13 @@ 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
-add_subdirectory(tools/triage)   # Triage tool
 add_subdirectory(tools)
+add_subdirectory(man)
 
 include(cmake/clang_tidy.cmake)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000..715a913b6fc
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,67 @@
+# Contributing To Cppcheck
+
+These are some guidelines *any* contributor should follow. They will help to make for better contributions which will most likely allow for them to be processed.
+
+(TODO: move daca@home section here?)
+
+## Code Changes
+
+Code contributions are handled via GitHub pull requests: https://github.com/danmar/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.
+
+Any kind of contribution is welcome but we might reject it. In that case we usually provide an explanation for the reasons but everything is always open to discussion.
+
+Changes in the `externals` folder need to be submitted to the respective upstream projects and will be pulled downstream with their next stable release (`picojson` is an exception because it is no longer maintained - the handling of such changes is not yet determined - see also https://trac.cppcheck.net/ticket/12233).
+
+Also after you filed a pull request please be ready to reply to questions and feedback. If you just "dump and leave" it might lower the chances of your change being accepted. This also applies after the PR was successfully merged as it might cause issues which were not exposed by the CI.
+
+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.
+
+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`.
+
+The CI is already doing a lot of work but there are certain parts it cannot ensure.
+
+(TODO: mention test_pr.py)
+
+The CI has an "always green" approach which means that failing tests are not allowed. Flakey tests might be acceptable depending on the frequency of their failures but they should be accompanied by ticket so they are being tracked. If introduce a test which is expected to fail you should use the `TODO_*` macros (C++) or `@pytest.mark.xfail(strict=False)` annotations.
+
+Note: Usually you can run the CI on your own fork to verify that it passes before even open an PR. Unfortunately some changes to avoid duplicated builds in our CI disabled this (TODO: file a ticket about this).
+
+### Targets
+
+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.
+
+[Detection Regressions](https://trac.cppcheck.net/query?status=accepted&status=assigned&status=new&status=reopened&keywords=~regression&component=Improve+check&col=id&col=summary&col=status&col=type&col=priority&col=milestone&col=component&order=priority)
+
+Changes might lead to fewer findings being reported. In very few cases this might be intentional but we should not regress in what findings are being reported. 
+
+[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/danmar/simplecpp) with its own [bug tracker](https://github.com/danmar/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`.
+
+Several of these are not complete or might be out-of-date so contributions are welcome. We will also accept additional languages but such contributions should be complete.
+
+(TODO: provide more details)
diff --git a/Makefile b/Makefile
index 81e18beca52..d5e3f74f6d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,13 @@
-# This file is generated by tools/dmake, do not edit.
+# This file is generated by dmake, do not edit.
 
 ifndef VERBOSE
     VERBOSE=
 endif
 # To compile with rules, use 'make HAVE_RULES=yes'
 ifndef HAVE_RULES
-    HAVE_RULES=no
+    HAVE_RULES=
 endif
 
-ifdef SRCDIR
-    $(error Usage of SRCDIR to activate match compiler has been removed. Use MATCHCOMPILER=yes instead.)
-endif
 ifndef MATCHCOMPILER
     MATCHCOMPILER=
 endif
@@ -32,8 +29,10 @@ ifeq ($(MATCHCOMPILER),yes)
         matchcompiler_S := $(shell $(PYTHON_INTERPRETER) tools/matchcompiler.py)
     endif
     libcppdir:=build
-else
+else ifeq ($(MATCHCOMPILER),)
     libcppdir:=lib
+else
+    $(error invalid MATCHCOMPILER value '$(MATCHCOMPILER)')
 endif
 
 ifndef CPPFLAGS
@@ -41,10 +40,10 @@ ifndef CPPFLAGS
 endif
 
 ifdef FILESDIR
-    CPPFLAGS+=-DFILESDIR=\"$(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
@@ -121,10 +120,6 @@ ifdef CYGWIN
         $(info CYGWIN found)
     endif
 
-    # Set the flag to address compile time warnings
-    # with tinyxml2 and Cygwin.
-    CPPFLAGS+=-U__STRICT_ANSI__
-    
     # Increase stack size for Cygwin builds to avoid segmentation fault in limited recursive tests.
     CXXFLAGS+=-Wl,--stack,8388608
 endif # CYGWIN
@@ -137,32 +132,33 @@ ifeq (clang++, $(findstring clang++,$(CXX)))
     CPPCHK_GLIBCXX_DEBUG=
 endif
 ifndef CXXFLAGS
-    CXXFLAGS=-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 $(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)))
-    override CXXFLAGS += -std=gnu++0x -pipe
-else ifeq (clang++, $(findstring clang++,$(CXX)))
-    override CXXFLAGS += -std=c++0x
-else ifeq ($(CXX), c++)
-    ifeq ($(shell uname -s), Darwin)
-        override CXXFLAGS += -std=c++0x
-    endif
+    override CXXFLAGS += -pipe
 endif
-
+override CXXFLAGS += -std=c++11
 ifeq ($(HAVE_RULES),yes)
     PCRE_CONFIG = $(shell which pcre-config)
     ifeq ($(PCRE_CONFIG),)
         $(error Did not find pcre-config)
     endif
-    override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell $(PCRE_CONFIG) --cflags)
+    override CXXFLAGS += $(shell $(PCRE_CONFIG) --cflags)
+    override CPPFLAGS += -DHAVE_RULES
     ifdef LIBS
         LIBS += $(shell $(PCRE_CONFIG) --libs)
     else
         LIBS=$(shell $(PCRE_CONFIG) --libs)
     endif
+else ifneq ($(HAVE_RULES),)
+    $(error invalid HAVE_RULES value '$(HAVE_RULES)')
 endif
 
+override CXXFLAGS += $(CXXOPTS)
+override CPPFLAGS += $(CPPOPTS)
+override LDFLAGS += $(LDOPTS)
+
 ifndef PREFIX
     PREFIX=/usr
 endif
@@ -171,12 +167,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/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
@@ -189,17 +193,23 @@ MAN_SOURCE=man/cppcheck.1.xml
 
 ###### Object Files
 
-LIBOBJ =      $(libcppdir)/analyzerinfo.o \
+LIBOBJ =      $(libcppdir)/valueflow.o \
+              $(libcppdir)/tokenize.o \
+              $(libcppdir)/symboldatabase.o \
+              $(libcppdir)/addoninfo.o \
+              $(libcppdir)/analyzerinfo.o \
               $(libcppdir)/astutils.o \
               $(libcppdir)/check.o \
               $(libcppdir)/check64bit.o \
               $(libcppdir)/checkassert.o \
               $(libcppdir)/checkautovariables.o \
               $(libcppdir)/checkbool.o \
-              $(libcppdir)/checkboost.o \
               $(libcppdir)/checkbufferoverrun.o \
               $(libcppdir)/checkclass.o \
               $(libcppdir)/checkcondition.o \
+              $(libcppdir)/checkers.o \
+              $(libcppdir)/checkersidmapping.o \
+              $(libcppdir)/checkersreport.o \
               $(libcppdir)/checkexceptionsafety.o \
               $(libcppdir)/checkfunctions.o \
               $(libcppdir)/checkinternal.o \
@@ -223,6 +233,7 @@ LIBOBJ =      $(libcppdir)/analyzerinfo.o \
               $(libcppdir)/ctu.o \
               $(libcppdir)/errorlogger.o \
               $(libcppdir)/errortypes.o \
+              $(libcppdir)/findtoken.o \
               $(libcppdir)/forwardanalyzer.o \
               $(libcppdir)/fwdanalysis.o \
               $(libcppdir)/importproject.o \
@@ -236,31 +247,36 @@ LIBOBJ =      $(libcppdir)/analyzerinfo.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 \
               $(libcppdir)/suppressions.o \
-              $(libcppdir)/symboldatabase.o \
               $(libcppdir)/templatesimplifier.o \
               $(libcppdir)/timer.o \
               $(libcppdir)/token.o \
-              $(libcppdir)/tokenize.o \
               $(libcppdir)/tokenlist.o \
               $(libcppdir)/utils.o \
-              $(libcppdir)/valueflow.o \
+              $(libcppdir)/vf_analyzers.o \
+              $(libcppdir)/vf_common.o \
+              $(libcppdir)/vf_settokenvalue.o \
               $(libcppdir)/vfvalue.o
 
 EXTOBJ =      externals/simplecpp/simplecpp.o \
               externals/tinyxml2/tinyxml2.o
 
+FEOBJ =       frontend/frontend.o
+
 CLIOBJ =      cli/cmdlineparser.o \
               cli/cppcheckexecutor.o \
-              cli/cppcheckexecutorseh.o \
-              cli/cppcheckexecutorsig.o \
               cli/executor.o \
               cli/filelister.o \
               cli/main.o \
               cli/processexecutor.o \
+              cli/sehwrapper.o \
+              cli/signalhandler.o \
               cli/singleexecutor.o \
               cli/stacktrace.o \
               cli/threadexecutor.o
@@ -275,9 +291,9 @@ TESTOBJ =     test/fixture.o \
               test/testastutils.o \
               test/testautovariables.o \
               test/testbool.o \
-              test/testboost.o \
               test/testbufferoverrun.o \
               test/testcharvar.o \
+              test/testcheck.o \
               test/testclangimport.o \
               test/testclass.o \
               test/testcmdlineparser.o \
@@ -287,7 +303,10 @@ TESTOBJ =     test/fixture.o \
               test/testcppcheck.o \
               test/testerrorlogger.o \
               test/testexceptionsafety.o \
+              test/testexecutor.o \
               test/testfilelister.o \
+              test/testfilesettings.o \
+              test/testfrontend.o \
               test/testfunctions.o \
               test/testgarbage.o \
               test/testimportproject.o \
@@ -307,6 +326,9 @@ TESTOBJ =     test/fixture.o \
               test/testpostfixoperator.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 \
@@ -314,6 +336,7 @@ TESTOBJ =     test/fixture.o \
               test/testsimplifyusing.o \
               test/testsingleexecutor.o \
               test/testsizeof.o \
+              test/teststandards.o \
               test/teststl.o \
               test/teststring.o \
               test/testsummaries.o \
@@ -333,20 +356,21 @@ TESTOBJ =     test/fixture.o \
               test/testutils.o \
               test/testvaarg.o \
               test/testvalueflow.o \
-              test/testvarid.o
+              test/testvarid.o \
+              test/testvfvalue.o
 
 .PHONY: run-dmake tags
 
 
 ###### Targets
 
-cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
+cppcheck: $(EXTOBJ) $(LIBOBJ) $(FEOBJ) $(CLIOBJ)
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
 
 all:	cppcheck testrunner
 
-testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/executor.o cli/processexecutor.o cli/singleexecutor.o cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/cppcheckexecutorseh.o cli/cppcheckexecutorsig.o cli/stacktrace.o cli/filelister.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
@@ -357,14 +381,14 @@ check:	all
 checkcfg:	cppcheck validateCFG
 	./test/cfg/runtests.sh
 
-dmake:	tools/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path.o $(libcppdir)/utils.o externals/simplecpp/simplecpp.o
+dmake:	tools/dmake/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path.o $(libcppdir)/utils.o externals/simplecpp/simplecpp.o
 	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 
 run-dmake: dmake
 	./dmake
 
 clean:
-	rm -f build/*.cpp build/*.o lib/*.o cli/*.o test/*.o tools/*.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
 
@@ -382,6 +406,7 @@ install: cppcheck
 ifdef FILESDIR
 	install -d ${DESTDIR}${FILESDIR}
 	install -d ${DESTDIR}${FILESDIR}/addons
+	install -m 644 addons/*.json ${DESTDIR}${FILESDIR}/addons
 	install -m 644 addons/*.py ${DESTDIR}${FILESDIR}/addons
 	install -d ${DESTDIR}${FILESDIR}/cfg
 	install -m 644 cfg/*.cfg ${DESTDIR}${FILESDIR}/cfg
@@ -403,16 +428,6 @@ ifdef FILESDIR
 	  rm -rf ${DESTDIR}${FILESDIR}; \
 	fi
 endif
-ifdef CFGDIR 
-	@if test -d ${DESTDIR}${CFGDIR}; then \
-	  files="`cd cfg 2>/dev/null && ls`"; \
-	  if test -n "$$files"; then \
-	    echo '(' cd ${DESTDIR}${CFGDIR} '&&' rm -f $$files ')'; \
-	    ( cd ${DESTDIR}${CFGDIR} && rm -f $$files ); \
-	  fi; \
-	fi
-endif
-
 # Validation of library files:
 ConfigFiles := $(wildcard cfg/*.cfg)
 ConfigFilesCHECKED := $(patsubst %.cfg,%.checked,$(ConfigFiles))
@@ -451,435 +466,495 @@ 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)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/path.h lib/platform.h lib/suppressions.h lib/utils.h
+$(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
+	$(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
+	$(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
+	$(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
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/addoninfo.cpp
+
+$(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/astutils.h lib/check.h lib/checkclass.h lib/config.h lib/errortypes.h lib/importproject.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/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/astutils.cpp
 
-$(libcppdir)/check.o: lib/check.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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
+$(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/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)/check.cpp
 
-$(libcppdir)/check64bit.o: lib/check64bit.cpp lib/check.h lib/check64bit.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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/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/check.h lib/checkassert.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkassert.cpp
 
-$(libcppdir)/checkautovariables.o: lib/checkautovariables.cpp lib/astutils.h lib/check.h lib/checkautovariables.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkautovariables.cpp
 
-$(libcppdir)/checkbool.o: lib/checkbool.cpp lib/astutils.h lib/check.h lib/checkbool.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbool.cpp
 
-$(libcppdir)/checkboost.o: lib/checkboost.cpp lib/check.h lib/checkboost.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.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)/checkboost.cpp
-
-$(libcppdir)/checkbufferoverrun.o: lib/checkbufferoverrun.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkbufferoverrun.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkbufferoverrun.cpp
 
-$(libcppdir)/checkclass.o: lib/checkclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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/vfvalue.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkclass.cpp
 
-$(libcppdir)/checkcondition.o: lib/checkcondition.cpp lib/astutils.h lib/check.h lib/checkcondition.h lib/checkother.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkcondition.cpp
 
-$(libcppdir)/checkexceptionsafety.o: lib/checkexceptionsafety.cpp lib/check.h lib/checkexceptionsafety.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkers.o: lib/checkers.cpp lib/checkers.h lib/config.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkers.cpp
+
+$(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
+	$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkexceptionsafety.cpp
 
-$(libcppdir)/checkfunctions.o: lib/checkfunctions.cpp lib/astutils.h lib/check.h lib/checkfunctions.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkfunctions.cpp
 
-$(libcppdir)/checkinternal.o: lib/checkinternal.cpp lib/astutils.h lib/check.h lib/checkinternal.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkinternal.cpp
 
-$(libcppdir)/checkio.o: lib/checkio.cpp lib/check.h lib/checkio.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkio.cpp
 
-$(libcppdir)/checkleakautovar.o: lib/checkleakautovar.cpp lib/astutils.h lib/check.h lib/checkleakautovar.h lib/checkmemoryleak.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkleakautovar.cpp
 
-$(libcppdir)/checkmemoryleak.o: lib/checkmemoryleak.cpp lib/astutils.h lib/check.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkmemoryleak.cpp
 
-$(libcppdir)/checknullpointer.o: lib/checknullpointer.cpp lib/astutils.h lib/check.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checknullpointer.cpp
 
-$(libcppdir)/checkother.o: lib/checkother.cpp lib/astutils.h lib/check.h lib/checkother.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkother.cpp
 
-$(libcppdir)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/check.h lib/checkpostfixoperator.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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/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/check.h lib/checksizeof.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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/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/astutils.h lib/check.h lib/checknullpointer.h lib/checkstl.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.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/suppressions.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/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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstl.cpp
 
-$(libcppdir)/checkstring.o: lib/checkstring.cpp lib/astutils.h lib/check.h lib/checkstring.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkstring.cpp
 
-$(libcppdir)/checktype.o: lib/checktype.cpp lib/check.h lib/checktype.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checktype.cpp
 
-$(libcppdir)/checkuninitvar.o: lib/checkuninitvar.cpp lib/astutils.h lib/check.h lib/checknullpointer.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkuninitvar.cpp
 
-$(libcppdir)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/checkunusedfunctions.o: lib/checkunusedfunctions.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.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 externals/simplecpp/simplecpp.h lib/astutils.h lib/check.h lib/checkunusedvar.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.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/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkunusedvar.cpp
 
-$(libcppdir)/checkvaarg.o: lib/checkvaarg.cpp lib/astutils.h lib/check.h lib/checkvaarg.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkvaarg.cpp
 
-$(libcppdir)/clangimport.o: lib/clangimport.cpp lib/clangimport.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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/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/analyzerinfo.h lib/check.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/importproject.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
+$(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/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/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/astutils.h lib/check.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.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/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.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/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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/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)/errorlogger.cpp
 
-$(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h
+$(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errortypes.cpp
 
-$(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/library.h lib/mathlib.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/utils.h lib/valueptr.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp
 
-$(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/fwdanalysis.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/utils.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/config.h lib/errortypes.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/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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/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/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/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/valueflow.h lib/vfvalue.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/utils.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/utils.h
+$(libcppdir)/path.o: lib/path.cpp externals/simplecpp/simplecpp.h lib/config.h lib/path.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/path.cpp
 
 $(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/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/path.h lib/platform.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/xml.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/platform.cpp
 
-$(libcppdir)/preprocessor.o: lib/preprocessor.cpp externals/simplecpp/simplecpp.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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/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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/preprocessor.cpp
 
-$(libcppdir)/programmemory.o: lib/programmemory.cpp lib/astutils.h lib/calculate.h lib/config.h lib/errortypes.h lib/importproject.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/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/programmemory.cpp
 
-$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.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/suppressions.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/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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
 
-$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/config.h lib/errortypes.h lib/importproject.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/timer.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/sarifreport.o: lib/sarifreport.cpp externals/picojson/picojson.h lib/addoninfo.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/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)/summaries.o: lib/summaries.cpp lib/analyzerinfo.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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/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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/mathlib.h lib/path.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(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/pathmatch.h lib/platform.h lib/smallvector.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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
 
-$(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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/suppressions.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)/templatesimplifier.o: lib/templatesimplifier.cpp lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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
+$(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/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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/timer.cpp
 
-$(libcppdir)/token.o: lib/token.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenrange.h lib/utils.h lib/valueflow.h lib/vfvalue.h
+$(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
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/token.cpp
 
-$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.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/vfvalue.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenize.cpp
-
-$(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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/suppressions.h lib/symboldatabase.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/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
 	$(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)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.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
+	$(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/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
+	$(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/cmdlineparser.h cli/cppcheckexecutor.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/timer.h lib/utils.h
+frontend/frontend.o: frontend/frontend.cpp frontend/frontend.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/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/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/settings.h lib/standards.h lib/suppressions.h lib/timer.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/cmdlineparser.h cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h cli/cppcheckexecutorsig.h cli/executor.h cli/filelister.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/analyzerinfo.h lib/check.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.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/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/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/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/cppcheckexecutorseh.o: cli/cppcheckexecutorseh.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/suppressions.h lib/utils.h
-	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutorseh.cpp
-
-cli/cppcheckexecutorsig.o: cli/cppcheckexecutorsig.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorsig.h cli/stacktrace.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/suppressions.h
-	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutorsig.cpp
-
-cli/executor.o: cli/executor.cpp cli/executor.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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/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
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/executor.cpp
 
-cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/path.h lib/pathmatch.h lib/utils.h
+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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/suppressions.h
+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
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/main.cpp
 
-cli/processexecutor.o: cli/processexecutor.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+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
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/processexecutor.cpp
 
-cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+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
+	$(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
 	$(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/cppcheckexecutor.h cli/executor.h cli/threadexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+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
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/threadexecutor.cpp
 
-test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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/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/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 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 externals/simplecpp/simplecpp.h lib/config.h lib/errortypes.h lib/importproject.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/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/helpers.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/helpers.cpp
 
-test/main.o: test/main.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/options.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/main.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/main.cpp
 
 test/options.o: test/options.cpp test/options.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/options.cpp
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/options.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.cpp
+
+test/testanalyzerinformation.o: test/testanalyzerinformation.cpp externals/tinyxml2/tinyxml2.h 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 lib/xml.h test/fixture.h
+	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testanalyzerinformation.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testassert.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testastutils.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testautovariables.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbool.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbufferoverrun.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcharvar.cpp
 
-test/test64bit.o: test/test64bit.cpp lib/check.h lib/check64bit.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheck.cpp
 
-test/testanalyzerinformation.o: test/testanalyzerinformation.cpp lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testanalyzerinformation.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/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/testassert.o: test/testassert.cpp lib/check.h lib/checkassert.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testassert.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
 
-test/testastutils.o: test/testastutils.cpp lib/astutils.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testastutils.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
 
-test/testautovariables.o: test/testautovariables.cpp lib/check.h lib/checkautovariables.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testautovariables.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcolor.cpp
 
-test/testbool.o: test/testbool.cpp lib/check.h lib/checkbool.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testbool.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcondition.cpp
 
-test/testboost.o: test/testboost.cpp lib/check.h lib/checkboost.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testboost.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testconstructors.cpp
 
-test/testbufferoverrun.o: test/testbufferoverrun.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkbufferoverrun.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/testbufferoverrun.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/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/testcharvar.o: test/testcharvar.cpp lib/check.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcharvar.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/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/testclangimport.o: test/testclangimport.cpp lib/check.h lib/clangimport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexceptionsafety.cpp
 
-test/testclass.o: test/testclass.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/testclass.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexecutor.cpp
 
-test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlineparser.h cli/cppcheckexecutor.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/fixture.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.cpp
 
-test/testcolor.o: test/testcolor.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcolor.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilesettings.cpp
 
-test/testcondition.o: test/testcondition.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkcondition.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcondition.cpp
+test/testfrontend.o: test/testfrontend.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfrontend.cpp
 
-test/testconstructors.o: test/testconstructors.cpp lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/testconstructors.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfunctions.cpp
 
-test/testcppcheck.o: test/testcppcheck.cpp lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcppcheck.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/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/testerrorlogger.o: test/testerrorlogger.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testerrorlogger.cpp
+test/testimportproject.o: test/testimportproject.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/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/testexceptionsafety.o: test/testexceptionsafety.cpp lib/check.h lib/checkexceptionsafety.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexceptionsafety.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testincompletestatement.cpp
 
-test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testinternal.cpp
 
-test/testfunctions.o: test/testfunctions.cpp lib/check.h lib/checkfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfunctions.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.cpp
 
-test/testgarbage.o: test/testgarbage.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testgarbage.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testleakautovar.cpp
 
-test/testimportproject.o: test/testimportproject.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testimportproject.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/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/testincompletestatement.o: test/testincompletestatement.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testincompletestatement.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/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/testinternal.o: test/testinternal.cpp lib/check.h lib/checkinternal.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testinternal.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/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/testio.o: test/testio.cpp lib/check.h lib/checkio.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testio.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/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/testleakautovar.o: test/testleakautovar.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkleakautovar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testleakautovar.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testoptions.cpp
 
-test/testlibrary.o: test/testlibrary.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testlibrary.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testother.cpp
 
-test/testmathlib.o: test/testmathlib.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testmathlib.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpath.cpp
 
-test/testmemleak.o: test/testmemleak.cpp lib/check.h lib/checkmemoryleak.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/testmemleak.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/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/testnullpointer.o: test/testnullpointer.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checknullpointer.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testnullpointer.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testplatform.cpp
 
-test/testoptions.o: test/testoptions.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h test/options.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testoptions.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpostfixoperator.cpp
 
-test/testother.o: test/testother.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkother.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testother.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpreprocessor.cpp
 
-test/testpath.o: test/testpath.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.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
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpath.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprocessexecutor.cpp
 
-test/testpathmatch.o: test/testpathmatch.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpathmatch.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/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/testplatform.o: test/testplatform.cpp externals/tinyxml2/tinyxml2.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testplatform.cpp
+test/testregex.o: test/testregex.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/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/testpostfixoperator.o: test/testpostfixoperator.cpp lib/check.h lib/checkpostfixoperator.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testpostfixoperator.cpp
+test/testsarifreport.o: test/testsarifreport.cpp externals/picojson/picojson.h lib/addoninfo.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/testpreprocessor.o: test/testpreprocessor.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.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/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/testpreprocessor.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp
 
-test/testprocessexecutor.o: test/testprocessexecutor.cpp cli/executor.h cli/processexecutor.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.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/vfvalue.h test/fixture.h test/helpers.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprocessexecutor.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/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/testsettings.o: test/testsettings.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.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/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/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytemplate.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/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/testsimplifytokens.o: test/testsimplifytokens.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytokens.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/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/testsimplifytypedef.o: test/testsimplifytypedef.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytypedef.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsingleexecutor.cpp
 
-test/testsimplifyusing.o: test/testsimplifyusing.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifyusing.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.cpp
 
-test/testsingleexecutor.o: test/testsingleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.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/vfvalue.h test/fixture.h test/helpers.h test/redirect.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsingleexecutor.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststandards.cpp
 
-test/testsizeof.o: test/testsizeof.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checksizeof.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsizeof.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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststl.cpp
 
-test/teststl.o: test/teststl.cpp lib/check.h lib/checkstl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/teststring.cpp
 
-test/teststring.o: test/teststring.cpp lib/check.h lib/checkstring.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsummaries.cpp
 
-test/testsummaries.o: test/testsummaries.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.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/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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsuppressions.cpp
 
-test/testsuppressions.o: test/testsuppressions.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_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/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/testsymboldatabase.o: test/testsymboldatabase.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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} ${CFLAGS_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/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.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/vfvalue.h test/fixture.h test/helpers.h test/redirect.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtimer.cpp
 
-test/testtimer.o: test/testtimer.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/fixture.h
-	$(CXX) ${INCLUDE_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/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/testtoken.o: test/testtoken.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_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/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/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.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 test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_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/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/testtokenlist.o: test/testtokenlist.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.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 test/fixture.h
-	$(CXX) ${INCLUDE_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/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/testtokenrange.o: test/testtokenrange.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtype.cpp
 
-test/testtype.o: test/testtype.cpp lib/check.h lib/checktype.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testuninitvar.cpp
 
-test/testuninitvar.o: test/testuninitvar.cpp lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedfunctions.cpp
 
-test/testunusedfunctions.o: test/testunusedfunctions.cpp lib/check.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedprivfunc.cpp
 
-test/testunusedprivfunc.o: test/testunusedprivfunc.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.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/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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testunusedvar.cpp
 
-test/testunusedvar.o: test/testunusedvar.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkunusedvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testutils.cpp
 
-test/testutils.o: test/testutils.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h test/helpers.h
-	$(CXX) ${INCLUDE_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} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testvaarg.cpp
 
-test/testvaarg.o: test/testvaarg.cpp lib/check.h lib/checkvaarg.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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/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/testvalueflow.o: test/testvalueflow.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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/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/testvarid.o: test/testvarid.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.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 test/fixture.h
-	$(CXX) ${INCLUDE_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} ${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
 
 externals/tinyxml2/tinyxml2.o: externals/tinyxml2/tinyxml2.cpp externals/tinyxml2/tinyxml2.h
-	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ externals/tinyxml2/tinyxml2.cpp
+	$(CXX)  $(CPPFLAGS) $(CXXFLAGS) -w -D_LARGEFILE_SOURCE -c -o $@ externals/tinyxml2/tinyxml2.cpp
 
-tools/dmake.o: tools/dmake.cpp cli/filelister.h lib/config.h lib/pathmatch.h lib/utils.h
-	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ tools/dmake.cpp
+tools/dmake/dmake.o: tools/dmake/dmake.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_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ tools/dmake/dmake.cpp
 
diff --git a/TUNING.md b/TUNING.md
new file mode 100644
index 00000000000..4643e7d506a
--- /dev/null
+++ b/TUNING.md
@@ -0,0 +1,171 @@
+# Tuning Cppcheck Analysis
+
+There are several ways you can potentially improve the runtime of a Cppcheck analysis.
+
+Note: Most of these suggestions highly depend on your code base so they need to be evaluated before being applied. They might also depend the code of Cppcheck itself and your environment. So you might want to evaluate these on a regular basis.
+
+## Collecting Information
+
+To see the time each file took to analyze just specify the `--showtime=file-total` CLI option.
+
+## Tuning At Build-Level
+
+It is most likely that a pre-built binary is being used - either an official one or one provided by the packaging manager of my operating system.
+
+But if you build your own binary it is possible to apply several steps to potentially improve the performance.
+
+Note: Recently more distribution have opted to use more advanced optimization for their packages so several of the following suggestions might have already been applied.
+Please refer to the documentation of your distribution for more insight on this.
+
+### Use Matchcompiler
+
+(TODO: document how to use it when using the in-tree Visual Studio project)
+(TODO: check with a CMake generated Visual Studio project)
+
+### Use Boost
+
+Boost.Container (https://www.boost.org/doc/libs/release/libs/container) is being used for some containers which have a smaller overhead.
+
+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 always using this.
+
+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
+
+Analyzing our own code base has shown that using a different compiler might lead to slightly better performance.
+
+In our case Clang is mostly faster than GCC. See https://trac.cppcheck.net/ticket/10778 for some details.
+
+### 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.
+
+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.
+
+Needs to be evaluated. (TODO: file tickets)
+
+### Use LTO
+
+Needs to be evaluated. See https://trac.cppcheck.net/ticket/11671.
+
+### Use profile-guided optimizations (PGO/BOLT/AutoFDO/Propeller)
+
+Needs to be evaluated. See https://trac.cppcheck.net/ticket/11672.
+
+## Tuning At Analysis-Level
+
+### Use A More Performant Platform
+
+It seems people assume that you need to run the analysis on the same system you build your code on/for. That is not necessary as the analysis is system-agnostic.
+As system headers are not required for analyzing your code you only need to specify the configuration which matches the system you run your code on.
+
+In case you are using a project as input which can only be generated on the build/target system you can just transfer that to a different system and still run the analysis.
+
+### Specify A Build Dir
+
+Using the `--cppcheck-build-dir` allows you to perform incremental runs which omit files which have not been changed.
+
+Important: As this is currently seriously lacking in testing coverage it might have shortcomings and need to be used with care. (TODO: file ticket)
+
+### Exclude Static/Generated Files
+
+If your code base contains files which rarely change (e.g. local copies of external dependencies) or you have generated files (e.g. `moc_*.cpp` for Qt projects) you might consider excluding these from the analysis.
+This can be done by using the `-i` option on the CLI, `<ignore>` in GUI projects or by including them to begin with into the files passed to the analysis.
+
+Depending on your setup you might also consider to scan these files in a less frequent run (e.g. only when the files have changed or Cppcheck was updated).
+
+This could also be handled using `--cppcheck-build-dir` (see above).
+
+### Exclude System Headers
+
+System headers are not necessary to perform the analysis. So you might consider not providing those to the analysis and specify a library configuration via `--library` instead.
+
+`pkg-config` for instance will always provide non-system includes.
+
+(TODO: file ticket about ignoring all braced includes)
+
+### Limit The Configuration
+
+By default configuration to analyze will be determined automatically for each file based on the code. The maximum amount is limited and can be controlled by CLI options.
+
+Depending on your setup you might want to limit it to specific configuration by using `-D` (CLI) or `--project-configuration=` (Visual Studio project).
+When you are using a compilation database generated by CMake it is already using a fixed configuration.
+
+### Use Multiple Jobs
+
+By default only a single process/thread is being used. You might to scale this up using the `-j` CLI option. Please note that specifying a value that will max out your systems resources might have a detrimental effect.
+
+### Use A Different Threading Model
+
+When using multiple job for the analysis (see above) on Linux it will default to using processes. This is done so the analysis is not aborted prematurely aborted in case of a crash. 
+Unfortunately it has overhead because of a suboptimal implementation and the fact that data needs to be transferred from the child processes to the main process.
+So if you do not require the additional safety you might want to switch to the usage of thread instead using `--executor=thread`.
+
+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
+
+Files which take longer to analyze should be processed at first so they might not extended the run time. As the order how the files provided on the CLI or via the project are being honored it is as simple as that.
+
+### Adjust Thresholds
+
+There are lots of internal thresholds which limit the work which is put into parts of the analysis. The defaults were chosen as a compromise of time being spent vs. issues being detected but not might not be a good fit in all cases.
+
+These thresholds are currently neither exposed nor documented so they cannot be changed without the modifying the source which is *highly discouraged*.
+
+They are being utilized internally by `-check-level` though (see below).
+
+(TODO: file ticket about providing all bailouts)
+(TODO: file ticket about expose these)
+(TODO: file ticket about specifying these per file)
+
+Note: As these will lead to less data being collected for the analysis it might lead to false negatives *and* false positives.
+
+### Adjust Check Level
+
+There are several check levels which are basically a collection of different threshold values (see above). This can be adjusted by the CLI option `--check-level`.
+
+Note: The current default is the lowest available check level.
+
+Note: As these will lead to less data being collected for the analysis it might lead to false negatives *and* false positives.
+
+## Reporting Issues
+
+If you encounter a file which has an unreasonable slow analysis please consider reporting this as an issue.
+
+Also consider reporting major upticks in the runtime of the analysis after updating to a newer version. Some of these might be expected as the analysis is constantly improved but out-of-the-box we still need aim for reasonable times.
+
+In all cases please try to provide a small reproducer if possible.
+
+Note: There might even be cases the analysis will never finish because it is stuck in a cycle. This is quite uncommon but there are still several unresolved known cases so it is possible to encounter this.
+
+### Known Issues
+
+https://trac.cppcheck.net/ticket/10663
+https://trac.cppcheck.net/ticket/10765
+https://trac.cppcheck.net/ticket/10778
+https://trac.cppcheck.net/ticket/11262
+https://trac.cppcheck.net/ticket/12528
+https://trac.cppcheck.net/ticket/13698
\ No newline at end of file
diff --git a/addons/README.md b/addons/README.md
index b441b22b19f..8df8229b970 100644
--- a/addons/README.md
+++ b/addons/README.md
@@ -7,9 +7,40 @@ Addons are scripts that analyses Cppcheck dump files to check compatibility with
 + [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).
+  Checks code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety. See complete description [here](https://github.com/danmar/cppcheck/blob/main/addons/doc/y2038.md).
 + [threadsafety.py](https://github.com/danmar/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)
+  Enforces naming conventions across the code.
++ [namingng.py](https://github.com/danmar/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)
+  Locates casts in the code.
++ [misc.py](https://github.com/danmar/cppcheck/blob/main/addons/misc.py)
+  Performs miscellaneous checks.
+
+### Other files
+
+- doc
+  Additional files for documentation generation.
+- tests
+  Contains various unit tests for the addons.
+- cppcheck.py
+  Internal helper used by Cppcheck binary to run the addons.
+- cppcheckdata.doxyfile
+  Configuration file for documentation generation.
+- cppcheckdata.py
+  Helper class for reading Cppcheck dump files within an addon.
+- misra_9.py
+  Implementation of the MISRA 9.x rules used by `misra` addon. 
+- namingng.config.json
+  Example configuration for `namingng` addon. 
+- namingng.json
+  Example JSON file that can be used using --addon=namingng.json, referring to namingng.py and namingng.config.json
+- ROS_naming.json
+  Example configuration for the `namingng` addon enforcing the [ROS naming convention for C++ ](http://wiki.ros.org/CppStyleGuide#Files).
+- runaddon.py
+  Internal helper used by Cppcheck binary to run the addons.
 
 ## Usage
 
@@ -19,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
diff --git a/addons/ROS_naming.json b/addons/ROS_naming.json
index 82c0131cf0a..0262d69c09b 100644
--- a/addons/ROS_naming.json
+++ b/addons/ROS_naming.json
@@ -1,5 +1,5 @@
 {
-    "RE_FILE": {".*[A-Z]": [true, "under_scored"]},
+    "RE_FILE": [".*[A-Z]"],
     "RE_NAMESPACE": {".*[A-Z]": [true, "under_scored"],
     				 ".*\\_$": [true, "under_scored"]},
     "RE_FUNCTIONNAME": {".*\\_": [true, "camelCase"],
diff --git a/addons/cppcheck.py b/addons/cppcheck.py
index 1649815e070..735269d32c5 100644
--- a/addons/cppcheck.py
+++ b/addons/cppcheck.py
@@ -1,5 +1,7 @@
 
-import cppcheckdata, sys, os
+import cppcheckdata
+import sys
+import os
 
 __checkers__ = []
 
diff --git a/addons/cppcheckdata.py b/addons/cppcheckdata.py
index 550d2ea7174..dbe36d56a57 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')
@@ -254,6 +255,7 @@ class Token:
         isCast
         externLang
         isExpandedMacro    Is this token a expanded macro token
+        macroName          Macro name that this token is expanded from
         isRemovedVoidParameter  Has void parameter been removed?
         isSplittedVarDeclComma  Is this a comma changed to semicolon in a split variable declaration ('int a,b;' => 'int a; int b;')
         isSplittedVarDeclEq     Is this a '=' changed to semicolon in a split variable declaration ('int a=5;' => 'int a; a=5;')
@@ -261,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.
@@ -313,6 +316,7 @@ class Token:
     isCast = False
     isUnsigned = False
     isSigned = False
+    macroName = None
     isExpandedMacro = False
     isRemovedVoidParameter = False
     isSplittedVarDeclComma = False
@@ -321,6 +325,7 @@ class Token:
     isComplex = False
     isRestrict = False
     isAttributeExport = False
+    isAnonymous = False
     exprId = None
     varId = None
     variableId = None
@@ -334,6 +339,7 @@ class Token:
 
     typeScopeId = None
     typeScope = None
+    type = None
 
     astParentId = None
     astParent = None
@@ -353,27 +359,27 @@ def __init__(self, element):
         self.previous = None
         self.scopeId = element.get('scope')
         self.scope = None
-        type = element.get('type')
-        if type == 'name':
+        self.type = element.get('type')
+        if self.type == 'name':
             self.isName = True
             if element.get('isUnsigned'):
                 self.isUnsigned = True
             if element.get('isSigned'):
                 self.isSigned = True
-        elif type == 'number':
+        elif self.type == 'number':
             self.isNumber = True
             if element.get('isInt'):
                 self.isInt = True
             elif element.get('isFloat'):
                 self.isFloat = True
-        elif type == 'string':
+        elif self.type == 'string':
             self.isString = True
             self.strlen = int(element.get('strlen'))
-        elif type == 'char':
+        elif self.type == 'char':
             self.isChar = True
-        elif type == 'boolean':
+        elif self.type == 'boolean':
             self.isBoolean = True
-        elif type == 'op':
+        elif self.type == 'op':
             self.isOp = True
             if element.get('isArithmeticalOp'):
                 self.isArithmeticalOp = True
@@ -386,7 +392,8 @@ def __init__(self, element):
         if element.get('isCast'):
             self.isCast = True
         self.externLang = element.get('externLang')
-        if element.get('isExpandedMacro'):
+        self.macroName = element.get('macroName')
+        if self.macroName or element.get('isExpandedMacro'):
             self.isExpandedMacro = True
         if element.get('isRemovedVoidParameter'):
             self.isRemovedVoidParameter = True
@@ -402,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'):
@@ -435,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"]
@@ -528,6 +537,7 @@ def tokAt(self, n):
         for i, t in enumerate(tl):
             if i == n:
                 return t
+        return None
 
     def linkAt(self, n):
         token = self.tokAt(n)
@@ -566,6 +576,7 @@ class Scope:
     function = None
     nestedInId = None
     nestedIn = None
+    nestedList = None
     type = None
     isExecutable = None
     varlistId = None
@@ -583,13 +594,14 @@ def __init__(self, element):
         self.bodyEnd = None
         self.nestedInId = element.get('nestedIn')
         self.nestedIn = None
+        self.nestedList = []
         self.type = element.get('type')
         self.definedType = element.get('definedType')
         self.isExecutable = (self.type in ('Function', 'If', 'Else', 'For', 'While', 'Do',
                                            'Switch', 'Try', 'Catch', 'Unconditional', 'Lambda'))
 
-        self.varlistId = list()
-        self.varlist = list()
+        self.varlistId = []
+        self.varlist = []
 
     def __repr__(self):
         attrs = ["Id", "className", "functionId", "bodyStartId", "bodyEndId",
@@ -603,6 +615,8 @@ def setId(self, IdMap):
         self.bodyStart = IdMap[self.bodyStartId]
         self.bodyEnd = IdMap[self.bodyEndId]
         self.nestedIn = IdMap[self.nestedInId]
+        if self.nestedIn:
+            self.nestedIn.nestedList.append(self)
         self.function = IdMap[self.functionId]
         for v in self.varlistId:
             value = IdMap.get(v)
@@ -669,7 +683,7 @@ def __init__(self, element, nestedIn):
         self.argumentId = {}
 
     def __repr__(self):
-        attrs = ["Id", "tokenId", "tokenDefId", "name", "type", "hasVirtualSpecifier", 
+        attrs = ["Id", "tokenId", "tokenDefId", "name", "type", "hasVirtualSpecifier",
                  "isImplicitlyVirtual", "access", "isInlineKeyword", "isStatic", 
                  "isAttributeNoreturn", "overriddenFunction", "nestedIn", "argumentId"]
         return "{}({})".format(
@@ -823,7 +837,7 @@ class Value:
         intvalue         integer value
         tokvalue         token value
         floatvalue       float value
-        movedValue
+        movedvalue
         uninit
         containerSize    container size
         bufferSize       buffer size
@@ -893,7 +907,7 @@ def setId(self, IdMap):
         self.symbolic = IdMap.get(self._symbolicId)
 
     def __repr__(self):
-        attrs = ["intvalue", "tokvalue", "floatvalue", "movedValue", "uninit", 
+        attrs = ["intvalue", "tokvalue", "floatvalue", "movedvalue", "uninit",
                  "bufferSize", "containerSize", "condition", "valueKind"]
         return "{}({})".format(
             "Value",
@@ -938,29 +952,60 @@ class Suppression:
       fileName    The name of the file to suppress warnings for, can include wildcards
       lineNumber  The number of the line to suppress warnings from, can be 0 to represent any line
       symbolName  The name of the symbol to match warnings for, can include wildcards
+      lineBegin   The first line to suppress warnings from
+      lineEnd     The last line to suppress warnings from
+      suppressionType   The type of suppression which is applied (unique = None (default), file, block, blockBegin, blockEnd, macro)
     """
 
     errorId = None
     fileName = None
     lineNumber = None
     symbolName = None
+    lineBegin = None
+    lineEnd = None
+    suppressionType = None
 
     def __init__(self, element):
         self.errorId = element.get('errorId')
         self.fileName = element.get('fileName')
         self.lineNumber = element.get('lineNumber')
         self.symbolName = element.get('symbolName')
+        self.lineBegin = element.get('lineBegin')
+        self.lineEnd = element.get('lineEnd')
+        self.suppressionType = element.get('type')
 
     def __repr__(self):
-        attrs = ['errorId' , "fileName", "lineNumber", "symbolName"]
+        attrs = ["errorId", "fileName", "lineNumber", "symbolName", "lineBegin", "lineEnd","suppressionType"]
         return "{}({})".format(
             "Suppression",
             ", ".join(("{}={}".format(a, repr(getattr(self, a))) for a in attrs))
         )
 
     def isMatch(self, file, line, message, errorId):
+        # Line Suppression
+        if ((self.fileName is None or fnmatch(file, self.fileName))
+                and (self.suppressionType is None) # Verify use of default suppression type (None = unique)
+                and (self.lineNumber is not None and int(line) == int(self.lineNumber))
+                and (self.symbolName is None or fnmatch(message, '*'+self.symbolName+'*'))
+                and fnmatch(errorId, self.errorId)):
+            return True
+        # File Suppression
+        if ((self.fileName is None or fnmatch(file, self.fileName))
+                and (self.suppressionType is not None and self.suppressionType == "file") # Verify use of file (global) suppression type
+                and (self.symbolName is None or fnmatch(message, '*'+self.symbolName+'*'))
+                and fnmatch(errorId, self.errorId)):
+            return True
+        # Block Suppression Mode
+        if ((self.fileName is None or fnmatch(file, self.fileName))
+                and (self.suppressionType is not None and self.suppressionType == "block") # Type for Block suppression
+                and (self.lineBegin is not None and int(line) > int(self.lineBegin)) # Code Match is between the Block suppression
+                and (self.lineEnd is not None and int(line) < int(self.lineEnd)) # Code Match is between the Block suppression
+                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)
         if ((self.fileName is None or fnmatch(file, self.fileName))
-                and (self.lineNumber is None or int(line) == int(self.lineNumber))
+                and (self.suppressionType is None)
                 and (self.symbolName is None or fnmatch(message, '*'+self.symbolName+'*'))
                 and fnmatch(errorId, self.errorId)):
             return True
@@ -1178,6 +1223,7 @@ def __init__(self, filename):
         """
         :param filename: Path to Cppcheck dump file
         """
+        self.language = None
         self.filename = filename
         self.rawTokens = []
         self.platform = None
@@ -1194,6 +1240,8 @@ def __init__(self, filename):
         for event, node in ElementTree.iterparse(self.filename, events=('start', 'end')):
             if platform_done and rawtokens_done and suppressions_done:
                 break
+            if node.tag == 'dumps':
+                self.language = node.get('language')
             if node.tag == 'platform' and event == 'start':
                 self.platform = Platform(node)
                 platform_done = True
@@ -1242,6 +1290,9 @@ def iterconfigurations(self):
         # Iterating <typedef-info>
         iter_typedef_info = False
 
+        # Iterating <directive>
+        iter_directive = False
+
         # Use iterable objects to traverse XML tree for dump files incrementally.
         # Iterative approach is required to avoid large memory consumption.
         # Calling .clear() is necessary to let the element be garbage collected.
@@ -1251,7 +1302,7 @@ def iterconfigurations(self):
                 if event == 'start':
                     cfg = Configuration(node.get('cfg'))
                     continue
-                elif event == 'end':
+                if event == 'end':
                     cfg.setIdMap(cfg_arguments)
                     yield cfg
                     cfg = None
@@ -1273,8 +1324,12 @@ def iterconfigurations(self):
                 cfg.standards.set_posix(node)
 
             # Parse directives list
-            elif node.tag == 'directive' and event == 'start':
-                cfg.directives.append(Directive(node))
+            elif node.tag == 'directive':
+                if event == 'start':
+                    cfg.directives.append(Directive(node))
+                    iter_directive = True
+                elif event == 'end':
+                    iter_directive = False
             # Parse macro usage
             elif node.tag == 'macro' and event == 'start':
                 cfg.macro_usage.append(MacroUsage(node))
@@ -1286,7 +1341,7 @@ def iterconfigurations(self):
             # Parse tokens
             elif node.tag == 'tokenlist' and event == 'start':
                 continue
-            elif node.tag == 'token' and event == 'start':
+            elif node.tag == 'token' and event == 'start' and not iter_directive and not iter_typedef_info:
                 cfg.tokenlist.append(Token(node))
 
             # Parse scopes
@@ -1307,7 +1362,7 @@ def iterconfigurations(self):
                 if event == 'start':
                     cfg_function = Function(node, cfg.scopes[-1])
                     continue
-                elif event == 'end':
+                if event == 'end':
                     cfg.functions.append(cfg_function)
                     cfg_function = None
 
@@ -1351,7 +1406,7 @@ def iterconfigurations(self):
                 if event == 'start':
                     cfg_valueflow = ValueFlow(node)
                     continue
-                elif event == 'end':
+                if event == 'end':
                     cfg.valueflow.append(cfg_valueflow)
                     cfg_valueflow = None
 
@@ -1547,8 +1602,7 @@ def __nonzero__(self):
     def __getattr__(self, k):
         if k in self._keys:
             return None
-        else:
-            raise AttributeError
+        raise AttributeError
 
 def bind_split(s):
     if '@' in s:
@@ -1612,11 +1666,19 @@ def is_suppressed(location, message, errorId):
             return True
     return False
 
-def reportError(location, severity, message, addon, errorId, extra=''):
+def log_checker(message, addon):
+    if '--cli' in sys.argv:
+        msg = { 'addon': addon,
+                'severity': 'none',
+                'message': message,
+                'errorId': 'logChecker'}
+        sys.stdout.write(json.dumps(msg) + '\n')
+
+def reportError(location, severity, message, addon, errorId, extra='', columnOverride=None):
     if '--cli' in sys.argv:
         msg = { 'file': location.file,
                 'linenr': location.linenr,
-                'column': location.column,
+                'column': location.column if columnOverride is None else columnOverride,
                 'severity': severity,
                 'message': message,
                 'addon': addon,
@@ -1634,11 +1696,14 @@ def reportError(location, severity, message, addon, errorId, extra=''):
         EXIT_CODE = 1
 
 def reportSummary(dumpfile, summary_type, summary_data):
-    # dumpfile ends with ".dump"
-    ctu_info_file = dumpfile[:-4] + "ctu-info"
-    with open(ctu_info_file, 'at') as f:
-        msg = {'summary': summary_type, 'data': summary_data}
-        f.write(json.dumps(msg) + '\n')
+    msg = {'summary': summary_type, 'data': summary_data}
+    if '--cli' in sys.argv:
+        sys.stdout.write(json.dumps(msg) + '\n')
+    else:
+        # dumpfile ends with ".dump"
+        ctu_info_file = dumpfile[:-4] + "ctu-info"
+        with open(ctu_info_file, 'at') as f:
+            f.write(json.dumps(msg) + '\n')
 
 
 def get_path_premium_addon():
@@ -1654,8 +1719,9 @@ def get_path_premium_addon():
 
 def cmd_output(cmd):
     with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) as p:
-        comm = p.communicate()
-        out = comm[0]
-        if p.returncode == 1 and len(comm[1]) > 2:
-            out = comm[1]
-        return out.decode(encoding='utf-8', errors='ignore')
+        stdout, stderr = p.communicate()
+        rc = p.returncode
+    out = stdout
+    if rc == 1 and len(stderr) > 2:
+        out = stderr
+    return out.decode(encoding='utf-8', errors='ignore')
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/findcasts.py b/addons/findcasts.py
index 41fbf2d9b77..d4842b229a6 100755
--- a/addons/findcasts.py
+++ b/addons/findcasts.py
@@ -4,7 +4,6 @@
 #
 
 import cppcheck
-import sys
 
 @cppcheck.checker
 def cast(cfg, data):
diff --git a/addons/misc.py b/addons/misc.py
index 15a742c28f9..670d6152ff5 100644
--- a/addons/misc.py
+++ b/addons/misc.py
@@ -16,7 +16,7 @@
 VERIFY_ACTUAL = []
 
 def reportError(token, severity, msg, id):
-    if id == 'debug' and DEBUG == False:
+    if id == 'debug' and not DEBUG:
         return
     if VERIFY:
         VERIFY_ACTUAL.append(str(token.linenr) + ':' + id)
diff --git a/addons/misra.py b/addons/misra.py
index eaea81dfb9d..cea5596d47d 100755
--- a/addons/misra.py
+++ b/addons/misra.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 #
-# MISRA C 2012 checkers
-# Partially reused for "MISRA C++ 2008" checking
+# MISRA C 2012 checkers (including amendment 1 and 2)
 #
 # Example usage of this addon (scan a sourcefile main.cpp)
 # cppcheck --dump main.cpp
 # python misra.py --rule-texts=<path-to-rule-texts> main.cpp.dump
 #
-# Limitations: This addon is released as open source. Rule texts can't be freely
-# distributed. https://www.misra.org.uk/forum/viewtopic.php?f=56&t=1189
+# Limitations: This addon is released as open source. We are not allowed by
+# MISRA to distribute rule texts openly.
 #
 # The MISRA standard documents may be obtained from https://www.misra.org.uk
 #
@@ -23,7 +22,6 @@
 import re
 import os
 import argparse
-import codecs
 import string
 import copy
 
@@ -46,7 +44,28 @@ def grouped(iterable, n):
         ['int', 'uint', 'int_least', 'uint_least', 'int_fast', 'uint_fast'],
         [8, 16, 32, 64])]
 
+STDINT_H_DEFINES_MIN = ['%s%d_MIN' % (n, v) for n, v in itertools.product(
+        ['INT', 'INT_LEAST', 'INT_FAST',],
+        [8, 16, 32, 64])]
+
+STDINT_H_DEFINES_MAX = ['%s%d_MAX' % (n, v) for n, v in itertools.product(
+        ['INT', 'UINT','INT_LEAST','UINT_LEAST', 'INT_FAST', 'UINT_FAST',],
+        [8, 16, 32, 64])]
+
+STDINT_H_DEFINES_C = ['%s%d_C' % (n, v) for n, v in itertools.product(
+        ['INT', 'UINT'],
+        [8, 16, 32, 64])]
+
 
+INTTYPES_H_DEFINES = ['%s%d' % (n, v) for n, v in itertools.product(
+        ['PRId', 'PRIi', 'PRIo', 'PRIu', 'PRIx', 'PRIX', 'SCNd',
+         'SCNi', 'SCNo', 'SCNu', 'SCNx', 'PRIdLEAST', 'PRIiLEAST',
+         'PRIoLEAST', 'PRIuLEAST', 'PRIxLEAST', 'PRIXLEAST',
+         'SCNdLEAST', 'SCNiLEAST', 'SCNoLEAST', 'SCNuLEAST', 
+         'SCNxLEAST', 'PRIdFAST', 'PRIiFAST', 'PRIoFAST', 'PRIuFAST', 
+         'PRIxFAST', 'PRIXFAST', 'SCNdFAST', 'SCNiFAST', 'SCNoFAST', 
+         'SCNuFAST', 'SCNxFAST', ],
+        [8, 16, 32, 64])]
 typeBits = {
     'CHAR': None,
     'SHORT': None,
@@ -170,7 +189,8 @@ def rawlink(rawtoken):
 
 
 # Identifiers described in Section 7 "Library" of C99 Standard
-# Based on ISO/IEC 9899 WF14/N1256 Annex B -- Library summary
+# Based on ISO/IEC 9899:1999 (E) Annex B -- Library summary
+# (https://www.dii.uchile.cl/~daespino/files/Iso_C_1999_definition.pdf)
 C99_STDLIB_IDENTIFIERS = {
     # B.1 Diagnostics
     'assert.h': C90_STDLIB_IDENTIFIERS['assert.h'],
@@ -221,9 +241,13 @@ def rawlink(rawtoken):
     'float.h': C90_STDLIB_IDENTIFIERS['float.h'] + ['FLT_EVAL_METHOD'],
     # B.7 Format conversion of integer types
     'inttypes.h': [
+        'PRIdMAX', 'PRIiMAX', 'PRIoMAX', 'PRIuMAX', 'PRIxMAX', 'PRIXMAX',
+        'SCNdMAX', 'SCNiMAX', 'SCNoMAX', 'SCNuMAX', 'SCNxMAX', 'PRIdPTR', 
+        'PRIiPTR', 'PRIoPTR', 'PRIuPTR', 'PRIxPTR', 'PRIXPTR', 'SCNdPTR', 
+        'SCNiPTR', 'SCNoPTR', 'SCNuPTR', 'SCNxPTR', 
         'imaxdiv_t', 'imaxabs', 'imaxdiv', 'strtoimax',
         'strtoumax', 'wcstoimax', 'wcstoumax',
-    ],
+    ] + INTTYPES_H_DEFINES,
     # B.8 Alternative spellings
     'iso646.h': [
         'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not', 'not_eq',
@@ -247,11 +271,12 @@ def rawlink(rawtoken):
         'acoshl', 'asinh', 'asinhf', 'asinhl', 'atanh', 'atanhf', 'atanhl',
         'cosh', 'coshf', 'coshl', 'sinh', 'sinhf', 'sinhl', 'tanh', 'tanhf',
         'tanhl', 'expf', 'expl', 'exp2', 'exp2f', 'exp2l', 'expm1', 'expm1f',
-        'expm1l', 'frexpf', 'frexpl', 'ilogb', 'ilogbf', 'ilogbl', 'float',
+        'expm1l', 'frexpf', 'frexpl', 'ilogb', 'ilogbf', 'ilogbl', 'ldexpf',
         'ldexpl', 'logf', 'logl', 'log10f', 'log10l', 'log1p', 'log1pf',
         'log1pl', 'log2', 'log2f', 'log2l', 'logb', 'logbf', 'logbl', 'modff',
         'modfl', 'scalbn', 'scalbnf', 'scalbnl', 'scalbln', 'scalblnf',
-        'scalblnl', 'hypotl', 'powf', 'powl', 'sqrtf', 'sqrtl', 'erf', 'erff',
+        'scalblnl','cbrt', 'cbrtf','cbrtl', 'fabs', 'fabsf', 'fabsl',
+        'hypotl', 'hypotf', 'powf', 'powl', 'sqrtf', 'sqrtl', 'erf', 'erff',
         'erfl', 'erfc', 'erfcf', 'erfcl', 'lgamma', 'lgammaf', 'lgammal',
         'tgamma', 'tgammaf', 'tgammal', 'ceilf', 'ceill', 'floorf', 'floorl',
         'nearbyint', 'nearbyintf', 'nearbyintl', 'rint', 'rintf', 'rintl',
@@ -262,7 +287,7 @@ def rawlink(rawtoken):
         'remquol', 'copysign', 'copysignf', 'copysignl', 'nan', 'nanf',
         'nanl', 'nextafter', 'nextafterf', 'nextafterl', 'nexttoward',
         'nexttowardf', 'nexttowardl', 'fdim', 'fdimf', 'fdiml', 'fmax',
-        'fmaxf', 'fmaxl', 'fmin', 'fminf', 'fminl', 'fmal', 'isgreater',
+        'fmaxf', 'fmaxl', 'fmin', 'fminf', 'fminl', 'fmaf','fmal', 'isgreater',
         'isgreaterequal', 'isless', 'islessequal', 'islessgreater',
         'isunordered',
     ],
@@ -285,11 +310,11 @@ def rawlink(rawtoken):
         'UINTMAX_MAX', 'PTRDIFF_MIN', 'PTRDIFF_MAX', 'SIG_ATOMIC_MIN',
         'SIG_ATOMIC_MAX', 'SIZE_MAX', 'WCHAR_MIN', 'WCHAR_MAX', 'WINT_MIN',
         'WINT_MAX', 'INTN_C', 'UINTN_C', 'INTMAX_C', 'UINTMAX_C',
-    ] + STDINT_TYPES,
+    ] + STDINT_TYPES + STDINT_H_DEFINES_MIN + STDINT_H_DEFINES_MAX + STDINT_H_DEFINES_C,
     # B.18 Input/output
     'stdio.h': C90_STDLIB_IDENTIFIERS['stdio.h'] + [
         'mode', 'restrict', 'snprintf', 'vfscanf', 'vscanf',
-        'vsnprintf', 'vsscanf',
+        'vsnprintf', 'vsscanf','ftell'
     ],
     # B.19 General utilities
     'stdlib.h': C90_STDLIB_IDENTIFIERS['stdlib.h'] + [
@@ -318,28 +343,154 @@ def rawlink(rawtoken):
         'vfwprintf', 'vfwscanf', 'vswprintf', 'vswscanf', 'vwprintf',
         'vwscanf', 'wprintf', 'wscanf', 'fgetwc', 'fgetws', 'fputwc', 'fputws',
         'fwide', 'getwc', 'getwchar', 'putwc', 'putwchar', 'ungetwc', 'wcstod',
-        'wcstof', 'double', 'int', 'long', 'long', 'long', 'wcscpy', 'wcsncpy',
-        'wmemcpy', 'wmemmove', 'wcscat', 'wcsncat', 'wcscmp', 'wcscoll',
+        'wcstof', 'wcstold', 'wcstol', 'wcstoll', 'wcstoul', 'wcstoull', 'wcscpy', 
+        'wcsncpy', 'wmemcpy', 'wmemmove', 'wcscat', 'wcsncat', 'wcscmp', 'wcscoll',
         'wcsncmp', 'wcsxfrm', 'wmemcmp', 'wcschr', 'wcscspn', 'wcspbrk',
         'wcsrchr', 'wcsspn', 'wcsstr', 'wcstok', 'wmemchr', 'wcslen',
         'wmemset', 'wcsftime', 'btowc', 'wctob', 'mbsinit', 'mbrlen',
         'mbrtowc', 'wcrtomb', 'mbsrtowcs', 'wcsrtombs',
     ],
+    # B.24 Wide character classification and mapping utilities
+    'wctype.h': ['wint_t', 'wctrans_t', 'wctype_t', 'WEOF',
+        'iswalnum', 'iswalpha', 'iswblank', 'iswcntrl', 'iswdigit',
+        'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace', 'iswupper',
+        'iswxdigit', 'iswctype', 'wctype', 'towlower', 'towupper', 'towctrans',
+        'wctrans'],
+}
+
+# Identifiers described in Section 7 "Library" of C11 Standard
+# Based on ISO/IEC 9899:201x N1570 (Draft 12.04.2011) Annex B -- Library summary
+# (https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf)
+C11_STDLIB_IDENTIFIERS = {
+    # B.1 Diagnostics
+    'assert.h': C99_STDLIB_IDENTIFIERS['assert.h']+ ['static_assert'],
+    # B.2 Complex
+    'complex.h': C99_STDLIB_IDENTIFIERS['complex.h']+['__STDC_NO_COMPLEX__','CMPLX','CMPLXF','CMPLXL'],
+    # B.3 Character handling
+    'ctype.h': C99_STDLIB_IDENTIFIERS['ctype.h'],
+    # B.4 Errors
+    'errno.h': C99_STDLIB_IDENTIFIERS['errno.h']+['__STDC_WANT_LIB_EXT1__', 'errno_t'],
+    # B.5 Floating-point environment
+    'fenv.h': C99_STDLIB_IDENTIFIERS['fenv.h'],
+    # B.6 Characteristics of floating types
+    'float.h': C99_STDLIB_IDENTIFIERS['float.h']+[
+        'FLT_HAS_SUBNORM','DBL_HAS_SUBNORM','LDBL_HAS_SUBNORM',
+        'FLT_DECIMAL_DIG','DBL_DECIMAL_DIG','LDBL_DECIMAL_DIG',
+        'FLT_TRUE_MIN','DBL_TRUE_MIN','LDBL_TRUE_MIN'],
+    # B.7 Format conversion of integer types
+    'inttypes.h': C99_STDLIB_IDENTIFIERS["inttypes.h"],
+    # B.8 Alternative spellings
+    'iso646.h': C99_STDLIB_IDENTIFIERS["iso646.h"],
+    # B.9 Size of integer types
+    'limits.h': C99_STDLIB_IDENTIFIERS['limits.h'],
+    # B.10 Localization
+    'locale.h': C99_STDLIB_IDENTIFIERS['locale.h'],
+    # B.11 Mathematics
+    'math.h': C99_STDLIB_IDENTIFIERS['math.h'],
+    # B.12 Nonlocal jumps
+    'setjmp.h': C99_STDLIB_IDENTIFIERS['setjmp.h'],
+    # B.13 Signal handling
+    'signal.h': C99_STDLIB_IDENTIFIERS['signal.h'],
+    # B.14 Alignment
+    'stdalign.h': ['alignas','__alignas_is_defined'],
+    # B.15 Variable arguments
+    'stdarg.h': C99_STDLIB_IDENTIFIERS['stdarg.h'],
+    # B.16 Atomics
+    'stdatomic.h': ['ATOMIC_BOOL_LOCK_FREE', 'ATOMIC_CHAR_LOCK_FREE',
+        'ATOMIC_CHAR16_T_LOCK_FREE', 'ATOMIC_CHAR32_T_LOCK_FREE', 'ATOMIC_WCHAR_T_LOCK_FREE', 
+        'ATOMIC_SHORT_LOCK_FREE', 'ATOMIC_INT_LOCK_FREE', 'ATOMIC_LONG_LOCK_FREE', 
+        'ATOMIC_LLONG_LOCK_FREE', 'ATOMIC_POINTER_LOCK_FREE', 'ATOMIC_FLAG_INIT', 
+        'memory_order', 'atomic_flag', 'memory_order_relaxed', 'memory_order_consume', 
+        'memory_order_acquire', 'memory_order_release', 'memory_order_acq_rel', 'memory_order_seq_cst',
+        'atomic_bool', 'atomic_char', 'atomic_schar', 'atomic_uchar', 'atomic_short', 'atomic_ushort', 
+        'atomic_int', 'atomic_uint', 'atomic_long', 'atomic_ulong', 'atomic_llong', 'atomic_ullong', 
+        'atomic_char16_t', 'atomic_char32_t', 'atomic_wchar_t', 'atomic_int_least8_t',
+        'atomic_uint_least8_t', 'atomic_int_least16_t', 'atomic_uint_least16_t', 
+        'atomic_int_least32_t', 'atomic_uint_least32_t', 'atomic_int_least64_t', 
+        'atomic_uint_least64_t', 'atomic_int_fast8_t', 'atomic_uint_fast8_t', 
+        'atomic_int_fast16_t', 'atomic_uint_fast16_t', 'atomic_int_fast32_t', 
+        'atomic_uint_fast32_t', 'atomic_int_fast64_t', 'atomic_uint_fast64_t', 
+        'atomic_intptr_t', 'atomic_uintptr_t', 'atomic_size_t', 'atomic_ptrdiff_t', 
+        'atomic_intmax_t', 'atomic_uintmax_t', 'ATOMIC_VAR_INIT', 'type kill_dependency',
+        'atomic_thread_fence', 'atomic_signal_fence', 'atomic_is_lock_free', 
+        'atomic_store', 'atomic_store_explicit', 'atomic_load', 'atomic_load_explicit',
+        'atomic_exchange', 'atomic_exchange_explicit', 'atomic_compare_exchange_strong',
+        'atomic_compare_exchange_strong_explicit', 'atomic_compare_exchange_weak',
+        'atomic_compare_exchange_weak_explicit', 'atomic_fetch_key', 'atomic_fetch_key_explicit', 
+        'atomic_flag_test_and_set', 'atomic_flag_test_and_set_explicit',
+        'atomic_flag_clear', 'atomic_flag_clear_explicit', ],
+    # B.17 Boolean type and values
+    'stdbool.h': C99_STDLIB_IDENTIFIERS['stdbool.h'],
+    # B.18 Common definitions
+    'stddef.h': C99_STDLIB_IDENTIFIERS['stddef.h'] +
+        ['max_align_t','__STDC_WANT_LIB_EXT1__', 'rsize_t'],
+    # B.19 Integer types
+    'stdint.h': C99_STDLIB_IDENTIFIERS['stdint.h']+
+        ['__STDC_WANT_LIB_EXT1__', 'RSIZE_MAX'],
+    # B.20 Input/output
+    'stdio.h': C99_STDLIB_IDENTIFIERS['stdio.h'] + 
+        ['__STDC_WANT_LIB_EXT1__', 'L_tmpnam_s', 'TMP_MAX_S', 'errno_t', 'rsize_t',
+        'tmpfile_s', 'tmpnam_s', 'fopen_s', 'freopen_s', 'fprintf_s', 'fscanf_s',
+        'printf_s','scanf_s','snprintf_s','sprintf_s','sscanf_s','vfprintf_s',
+        'vfscanf_s', 'vsprintf_s', 'vsscanf_s', 'gets_s'
+        ],
+    # B.21 General utilities
+    'stdlib.h': C99_STDLIB_IDENTIFIERS['stdlib.h'] + 
+    ['constraint_handler_t', 'set_constraint_handler_s', 'abort_handler_s',
+     'ignore_handler_s', 'getenv_s', 'bsearch_s', 'qsort_s', 'wctomb_s',
+     'mbstowcs_s', 'wcstombs_s'],
+    # B.22 Noretrun
+    'stdnoreturn.h': ['noreturn'],
+    # B.23 String handling
+    'string.h': C99_STDLIB_IDENTIFIERS['string.h'] + 
+    ['memcpy_s', 'memmoce_s', 'strcpy_s', 'strncpy_s','strcat_s',
+     'strtok_s', 'memset_s', 'strerror_s', 'strerrorlen_s', 'strnlen_s'],
+    # B.24 Type-generic math
+    'tgmath.h': C99_STDLIB_IDENTIFIERS['tgmath.h'],
+    # B.25 Threads
+    'threads.h': ['thread_local', 'ONCE_FLAG_INIT', 'TSS_DTOR_ITERATIONS',
+        'cnd_t', 'thrd_t', 'tss_t', 'mtx_t', 'tss_dtor_t', 'thrd_start_t', 
+        'once_flag', 'mtx_plain', 'mtx_recursive', 'mtx_timed', 'thrd_timedout',
+        'thrd_success', 'thrd_busy', 'thrd_error', 'thrd_nomem', 'call_once',
+        'cnd_broadcast', 'cnd_destroy','cnd_init', 'cnd_signal', 'cnd_timedwait',
+        'cnd_wait','mtx_destroy', 'mtx_init', 'mtx_lock', 'mtx_timedlock',
+        'mtx_trylock', 'mtx_unlock', 'thrd_create', 'thrd_current',
+        'thrd_detach', 'thrd_equal', 'thrd_exit', 'thrd_join', 'thrd_sleep',
+        'thrd_yield', 'tss_create', 'tss_delete', 'tss_get', 'tss_set' ],
+    # B.26 Date and time
+    'time.h': C99_STDLIB_IDENTIFIERS['time.h'] + [
+        'asctime_s', 'ctime_s', 'gmtime_s', 'localtime_s'
+        ],
+    # B.27 Unicode utilities
+    'uchar.h': ['mbstate_t', 'size_t', 'char16_t', 'char32_t',
+        'mbrtoc16', 'c16rtomb', 'mbrtoc32', 'c32rtomb'
+        ],
+    # B.28 Extended multibyte/wide character utilities
+    'wchar.h': C99_STDLIB_IDENTIFIERS["wchar.h"]+[
+        'fwprintf_s', 'fwscanf_s', 'snwprintf_s', 'swprintf_s', 'swscanf_s', 
+        'vfwprintf_s', 'vfwscanf_s', 'vsnwprintf_s', 'vswprintf_s', 'vswscanf_s', 
+        'vwprintf_s', 'vwscanf_s', 'wprintf_s', 'wscanf_s', 'wcscpy_s', 'wcsncpy_s', 
+        'wmemcpy_s', 'wmemmove_s', 'wcscat_s', 'wcsncat_s', 'wcstok_s', 'wcsnlen_s', 
+        'wcrtomb_s', 'mbsrtowcs_s', 'wcsrtombs_s', 
+    ],
+    # B.29 Wide character classification and mapping utilities
+    'wctype.h': C99_STDLIB_IDENTIFIERS['wctype.h'],
 }
 
+def getStdLib(standard):
+    if standard == 'c89':
+        return C90_STDLIB_IDENTIFIERS
+    if standard == 'c99':
+        return C99_STDLIB_IDENTIFIERS
+    return C11_STDLIB_IDENTIFIERS
 
 def isStdLibId(id_, standard='c99'):
-    id_lists = []
-    if standard == 'c89':
-        id_lists = C90_STDLIB_IDENTIFIERS.values()
-    elif standard in ('c99', 'c11'):
-        id_lists = C99_STDLIB_IDENTIFIERS.values()
+    id_lists = getStdLib(standard).values()
     for l in id_lists:
         if id_ in l:
             return True
     return False
 
-
 # Reserved keywords defined in ISO/IEC9899:1990 -- ch 6.1.1
 C90_KEYWORDS = {
     'auto', 'break', 'case', 'char', 'const', 'continue', 'default', 'do',
@@ -350,16 +501,23 @@ def isStdLibId(id_, standard='c99'):
 }
 
 
-# Reserved keywords defined in ISO/IEC 9899 WF14/N1256 -- ch. 6.4.1
+# Reserved keywords defined in Section 6.4.1 "Language" of C99 Standard
+# Based on ISO/IEC 9899:1999 (E) 6.4.1 Keywords
+# Adding the expanding macros from Section 7 too
+# (https://www.dii.uchile.cl/~daespino/files/Iso_C_1999_definition.pdf)
 C99_ADDED_KEYWORDS = {
     'inline', 'restrict', '_Bool', '_Complex', '_Imaginary',
     'bool', 'complex', 'imaginary'
 }
 
+# Reserved keywords defined in Section 6.4.1 "Language" of C11 Standard
+# Based on ISO/IEC 9899:201x N1570 (Draft 12.04.2011) 6.4.1 Keywords
+# Adding the expanding macros from Section 7 too
+# (https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf)
 C11_ADDED_KEYWORDS = {
     '_Alignas', '_Alignof', '_Atomic', '_Generic', '_Noreturn',
-    '_Statis_assert', '_Thread_local' ,
-    'alignas', 'alignof', 'noreturn', 'static_assert'
+    '_Static_assert', '_Thread_local' ,
+    'alignas', 'alignof', 'noreturn', 'static_assert','thread_local'
 }
 
 def isKeyword(keyword, standard='c99'):
@@ -430,11 +588,11 @@ def is_composite_expr(expr, composite_operator=False):
         return False
 
     if not composite_operator:
-        if (expr.str in ('+', '-', '*', '/', '%', '&', '|', '^', '>>', "<<", "?", ":", '~')):
-            return is_composite_expr(expr.astOperand1,True) or is_composite_expr(expr.astOperand2, True)
         if expr.str == '?' and simpleMatch(expr.astOperand2, ':'):
             colon = expr.astOperand2
             return is_composite_expr(colon.astOperand1,True) or is_composite_expr(colon.astOperand2, True)
+        if (expr.str in ('+', '-', '*', '/', '%', '&', '|', '^', '>>', "<<", "?", ":", '~')):
+            return is_composite_expr(expr.astOperand1,True) or is_composite_expr(expr.astOperand2, True)
         return False
 
     # non constant expression?
@@ -466,9 +624,15 @@ def getEssentialTypeCategory(expr):
             return expr.valueType.sign
     if expr.valueType and expr.valueType.typeScope and expr.valueType.typeScope.className:
         return "enum<" + expr.valueType.typeScope.className + ">"
+    # Unwrap membership, dereferences and array indexing
     vartok = expr
-    while simpleMatch(vartok, '[') or (vartok and vartok.str == '*' and vartok.astOperand2 is None):
-        vartok = vartok.astOperand1
+    while True:
+        if simpleMatch(vartok, '[') or (vartok and vartok.str == '*' and vartok.astOperand2 is None):
+            vartok = vartok.astOperand1
+        elif simpleMatch(vartok, '.'):
+            vartok = vartok.astOperand2
+        else:
+            break
     if vartok and vartok.variable:
         typeToken = vartok.variable.typeStartToken
         while typeToken and typeToken.isName:
@@ -489,6 +653,13 @@ def getEssentialTypeCategory(expr):
             return 'char'
         return expr.valueType.sign
 
+    if (expr.isCast and expr.str == "("):
+        castTok = expr.next
+        while castTok.isName or castTok.str == "*":
+            if castTok.str == 'char' and not castTok.isSigned and not castTok.isUnsigned:
+                return 'char'
+            castTok = castTok.next
+
     if expr.valueType:
         return expr.valueType.sign
     return None
@@ -588,8 +759,7 @@ def getEssentialType(expr):
                     return e
         if bitsOfEssentialType(e2) >= bitsOfEssentialType(e1):
             return e2
-        else:
-            return e1
+        return e1
 
     elif expr.str == "~":
         e1 = getEssentialType(expr.astOperand1)
@@ -622,7 +792,6 @@ def bitsOfEssentialType(ty):
 
 def get_function_pointer_type(tok):
     ret = ''
-    par = 0
     while tok and (tok.isName or tok.str == '*'):
         ret += ' ' + tok.str
         tok = tok.next
@@ -634,7 +803,8 @@ def get_function_pointer_type(tok):
     ret += '('
     tok = tok.next.next
     while tok and (tok.str not in '()'):
-        ret += ' ' + tok.str
+        if tok.varId is None:
+            ret += ' ' + tok.str
         tok = tok.next
     if (tok is None) or tok.str != ')':
         return None
@@ -700,7 +870,28 @@ def getForLoopExpressions(forToken):
             lpar.astOperand2.astOperand2.astOperand2]
 
 
-def getForLoopCounterVariables(forToken):
+def get_function_scope(cfg, func):
+    if func:
+        for scope in cfg.scopes:
+            if scope.function == func:
+                return scope
+    return None
+
+
+def is_variable_changed(start_token, end_token, var):
+    """Check if variable is updated between body_start and body_end"""
+    tok = start_token
+    while tok != end_token:
+        if tok.isAssignmentOp:
+            vartok = tok.astOperand1
+            while vartok.astOperand1:
+                vartok = vartok.astOperand1
+            if vartok and vartok.variable == var:
+                return True
+        tok = tok.next
+    return False
+
+def getForLoopCounterVariables(forToken, cfg):
     """ Return a set of Variable objects defined in ``for`` statement and
     satisfy requirements to loop counter term from section 8.14 of MISRA
     document.
@@ -726,9 +917,43 @@ def getForLoopCounterVariables(forToken):
                 if tn.next and countSideEffectsRecursive(tn.next) > 0:
                     vars_modified.add(tn.variable)
                 elif tn.previous and tn.previous.str in ('++', '--'):
-                    vars_modified.add(tn.variable)
-        if cur_clause == 1 and tn.isAssignmentOp and tn.astOperand1.variable:
-            vars_initialized.add(tn.astOperand1.variable)
+                    tn_ast = tn.astParent
+                    if tn_ast and tn_ast == tn.previous:
+                        vars_modified.add(tn.variable)
+                    elif tn_ast and tn_ast.str == '.' and tn_ast.astOperand2 and tn_ast.astOperand2.variable:
+                        vars_modified.add(tn_ast.astOperand2.variable)
+        if cur_clause == 1 and tn.isAssignmentOp:
+            var_token = tn.astOperand1
+            while var_token and var_token.str == '.':
+                var_token = var_token.astOperand2
+            if var_token and var_token.variable:
+                vars_initialized.add(var_token.variable)
+        if cur_clause == 1 and tn.isName and tn.next.str == '(':
+            function_args_in_init = getArguments(tn.next)
+            function_scope = get_function_scope(cfg, tn.function)
+            for arg_nr in range(len(function_args_in_init)):
+                init_arg = function_args_in_init[arg_nr]
+                if init_arg is None or not init_arg.isUnaryOp('&'):
+                    continue
+                var_token = init_arg.astOperand1
+                while var_token and var_token.str == '.':
+                    var_token = var_token.astOperand2
+                if var_token is None or var_token.variable is None:
+                    continue
+                changed = False
+                if function_scope is None:
+                    changed = True
+                elif tn.function is None:
+                    changed = True
+                else:
+                    function_body_start = function_scope.bodyStart
+                    function_body_end = function_scope.bodyEnd
+                    args = tn.function.argument[arg_nr + 1]
+                    if function_scope is None or is_variable_changed(function_body_start, function_body_end, args):
+                        changed = True
+                if changed:
+                    vars_initialized.add(var_token.variable)
+
         if tn.str == ';':
             cur_clause += 1
         tn = tn.next
@@ -762,6 +987,7 @@ def isFloatCounterInWhileLoop(whileToken):
     lpar = whileToken.next
     rpar = lpar.link
     counterTokens = findCounterTokens(lpar.astOperand2)
+    tok_varid = tuple(tok.varId for tok in counterTokens if tok.varId)
     whileBodyStart = None
     if simpleMatch(rpar, ') {'):
         whileBodyStart = rpar.next
@@ -772,13 +998,21 @@ def isFloatCounterInWhileLoop(whileToken):
     token = whileBodyStart
     while token != whileBodyStart.link:
         token = token.next
-        for counterToken in counterTokens:
-            if not counterToken.valueType or not counterToken.valueType.isFloat():
-                continue
-            if token.isAssignmentOp and token.astOperand1.str == counterToken.str:
+        if not token.varId:
+            continue
+        if token.varId not in tok_varid:
+            continue
+        if not token.astParent or not token.valueType or not token.valueType.isFloat():
+            continue
+        parent = token.astParent
+        if parent.str in ('++', '--'):
+            return True
+        while parent:
+            if parent.isAssignmentOp and parent.str != "=" and parent.astOperand1 == token:
                 return True
-            if token.str == counterToken.str and token.astParent and token.astParent.str in ('++', '--'):
+            if parent.str == "=" and parent.astOperand1.str == token.str and parent.astOperand1 != token:
                 return True
+            parent = parent.astParent
     return False
 
 
@@ -829,6 +1063,14 @@ def isConstantExpression(expr):
         return False
     return True
 
+def isUnknownConstantExpression(expr):
+    if expr.isName and not isEnumConstant(expr) and expr.variable is None:
+        return True
+    if expr.astOperand1 and isUnknownConstantExpression(expr.astOperand1):
+        return True
+    if expr.astOperand2 and isUnknownConstantExpression(expr.astOperand2):
+        return True
+    return False
 
 def isUnsignedInt(expr):
     return expr and expr.valueType and expr.valueType.type in ('short', 'int') and expr.valueType.sign == 'unsigned'
@@ -1100,11 +1342,12 @@ def getAddonRules():
     """Returns dict of MISRA rules handled by this addon."""
     addon_rules = []
     compiled = re.compile(r'.*def[ ]+misra_([0-9]+)_([0-9]+)[(].*')
-    for line in open(__file__):
-        res = compiled.match(line)
-        if res is None:
-            continue
-        addon_rules.append(res.group(1) + '.' + res.group(2))
+    with open(__file__) as f:
+        for line in f:
+            res = compiled.match(line)
+            if res is None:
+                continue
+            addon_rules.append(res.group(1) + '.' + res.group(2))
     return addon_rules
 
 
@@ -1207,7 +1450,7 @@ def remove_file_prefix(file_path, prefix):
     return result
 
 
-class Rule(object):
+class Rule():
     """Class to keep rule text and metadata"""
 
     MISRA_SEVERITY_LEVELS = ['Required', 'Mandatory', 'Advisory']
@@ -1241,7 +1484,7 @@ def __repr__(self):
         return "%d.%d (%s)" % (self.num1, self.num2, self.misra_severity)
 
 
-class MisraSettings(object):
+class MisraSettings():
     """Hold settings for misra.py script."""
 
     __slots__ = ["verify", "quiet", "show_summary"]
@@ -1282,17 +1525,17 @@ def __init__(self, settings, stdversion="c89"):
         self.settings = settings
 
         # Test validation rules lists
-        self.verify_expected = list()
-        self.verify_actual = list()
+        self.verify_expected = []
+        self.verify_actual = []
 
         # List of formatted violation messages
-        self.violations = dict()
+        self.violations = {}
 
         # if --rule-texts is specified this dictionary
         # is loaded with descriptions of each rule
         # by rule number (in hundreds).
         # ie rule 1.2 becomes 102
-        self.ruleTexts = dict()
+        self.ruleTexts = {}
         self.ruleText_filename = None
 
         # Dictionary of dictionaries for rules to suppress
@@ -1303,13 +1546,13 @@ def __init__(self, settings, stdversion="c89"):
         # or an item of None which indicates suppress rule for the entire file.
         # The line and symbol name tuple may have None as either of its elements but
         # should not be None for both.
-        self.suppressedRules = dict()
+        self.suppressedRules = {}
 
         # Prefix to ignore when matching suppression files.
         self.filePrefix = None
 
         # Number of all violations suppressed per rule
-        self.suppressionStats = dict()
+        self.suppressionStats = {}
 
         self.stdversion = stdversion
 
@@ -1336,8 +1579,7 @@ def __repr__(self):
     def get_num_significant_naming_chars(self, cfg):
         if cfg.standards and cfg.standards.c == "c89":
             return 31
-        else:
-            return 63
+        return 63
 
     def _save_ctu_summary_typedefs(self, dumpfile, typedef_info):
         if self._ctu_summary_typedefs:
@@ -1438,7 +1680,7 @@ def _save_ctu_summary_usage(self, dumpfile, cfg):
         for token in cfg.tokenlist:
             if not token.isName:
                 continue
-            if token.function and token.scope.isExecutable:
+            if token.function and token != token.function.tokenDef:
                 if (not token.function.isStatic) and (token.str not in names):
                     names.append({'name': token.str, 'file': token.file})
             elif token.variable:
@@ -1451,11 +1693,20 @@ def _save_ctu_summary_usage(self, dumpfile, cfg):
             cppcheckdata.reportSummary(dumpfile, 'MisraUsage', names)
 
 
+    def misra_1_2(self, cfg):
+        # gcc language extensions: https://gcc.gnu.org/onlinedocs/gcc/C-Extensions.html
+        for token in cfg.tokenlist:
+            if simpleMatch(token, '? :'):
+                self.reportError(token, 1, 2)
+            elif simpleMatch(token, '( {') and simpleMatch(token.next.link.previous, '; } )'):
+                self.reportError(token, 1, 2)
+
+
     def misra_1_4(self, cfg):
         for token in cfg.tokenlist:
             if token.str in ('_Atomic', '_Noreturn', '_Generic', '_Thread_local', '_Alignas', '_Alignof'):
                 self.reportError(token, 1, 4)
-            if token.str.endswith('_s') and isFunctionCall(token.next):
+            if token.str.endswith('_s') and isFunctionCall(token.next, cfg.standards.c):
                 # See C specification C11 - Annex K, page 578
                 if token.str in ('tmpfile_s', 'tmpnam_s', 'fopen_s', 'freopen_s', 'fprintf_s', 'fscanf_s', 'printf_s', 'scanf_s',
                                  'snprintf_s', 'sprintf_s', 'sscanf_s', 'vfprintf_s', 'vfscanf_s', 'vprintf_s', 'vscanf_s',
@@ -1495,17 +1746,29 @@ def misra_2_4(self, dumpfile, cfg):
         self._save_ctu_summary_tagnames(dumpfile, cfg)
 
     def misra_2_5(self, dumpfile, cfg):
-        used_macros = list()
+        used_macros = []
+        unused_macro = {}
         for m in cfg.macro_usage:
             used_macros.append(m.name)
-        summary = []
         for directive in cfg.directives:
-            res = re.match(r'#define[ \t]+([a-zA-Z_][a-zA-Z_0-9]*).*', directive.str)
-            if res:
-                macro_name = res.group(1)
-                summary.append({'name': macro_name, 'used': (macro_name in used_macros), 'file': directive.file, 'line': directive.linenr, 'column': directive.column})
-        if len(summary) > 0:
-            cppcheckdata.reportSummary(dumpfile, 'MisraMacro', summary)
+            res_define = re.match(r'#define[ \t]+([a-zA-Z_][a-zA-Z_0-9]*).*', directive.str)
+            res_undef = re.match(r'#undef[ \t]+([a-zA-Z_][a-zA-Z_0-9]*).*', directive.str)
+            if res_define:
+                macro_name = res_define.group(1)
+                unused_macro[macro_name] = {'name': macro_name, 'used': (macro_name in used_macros),
+                                            'file': directive.file, 'line': directive.linenr, 'column': directive.column}
+            elif res_undef:
+                macro_name = res_undef.group(1)
+                # assuming that if we have #undef, we also have #define somewhere
+                if macro_name in unused_macro:
+                    unused_macro[macro_name]['used'] = True
+                else:
+                    unused_macro[macro_name] = {'name': macro_name, 'used': True, 'file': directive.file,
+                                                'line': directive.linenr, 'column': directive.column}
+                    used_macros.append(macro_name)
+
+        if unused_macro:
+            cppcheckdata.reportSummary(dumpfile, 'MisraMacro', list(unused_macro.values()))
 
     def misra_2_7(self, data):
         for func in data.functions:
@@ -1513,7 +1776,7 @@ def misra_2_7(self, data):
             if len(func.argument) == 0:
                 continue
             # Setup list of function parameters
-            func_param_list = list()
+            func_param_list = []
             for arg in func.argument:
                 func_arg = func.argument[arg]
                 if func_arg.typeStartToken and func_arg.typeStartToken.str == '...':
@@ -1559,20 +1822,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] != '\''):
@@ -1599,8 +1848,7 @@ def misra_4_1(self, rawTokens):
                 if (isHexEscapeSequence(sequence) or isOctalEscapeSequence(sequence) or
                         isSimpleEscapeSequence(sequence)):
                     continue
-                else:
-                    self.reportError(token, 4, 1)
+                self.reportError(token, 4, 1)
 
     def misra_4_2(self, rawTokens):
         for token in rawTokens:
@@ -1754,7 +2002,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
@@ -1766,7 +2014,7 @@ def misra_6_1(self, data):
             if data.standards.c == 'c89':
                 if token.valueType.type != 'int' and  not isUnsignedType(token.variable.typeStartToken.str):
                     self.reportError(token, 6, 1)
-            elif data.standards.c == 'c99':
+            elif data.standards.c in ('c99', 'c11', 'c17', 'c18'):
                 if token.valueType.type == 'bool':
                     continue
 
@@ -1811,7 +2059,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)
@@ -1839,7 +2089,7 @@ def reportErrorIfVariableIsNotConst(variable, stringLiteral):
                         self.reportError(token, 7, 4)
 
             # Check use as function parameter
-            if isFunctionCall(token) and token.astOperand1 and token.astOperand1.function:
+            if isFunctionCall(token, data.standards.c) and token.astOperand1 and token.astOperand1.function:
                 functionDeclaration = token.astOperand1.function
 
                 if functionDeclaration.tokenDef:
@@ -1985,7 +2235,10 @@ def checkDefinitionArgumentsViolations(func, startCall, endCall):
                     rawTokensFollowingPtr[2].str == ')'):
                 self.reportError(var.nameToken, 8, 2)
 
-
+    def insert_in_dict(self, dict_name,key, value):
+        if key not in dict_name:
+            dict_name[key] = []
+        dict_name[key].append(value)
     def misra_8_4(self, cfg):
         for func in cfg.functions:
             if func.isStatic:
@@ -1999,10 +2252,8 @@ def misra_8_4(self, cfg):
             if func.tokenDef.str == 'main':
                 continue
             self.reportError(func.tokenDef, 8, 4)
-
-        extern_vars = []
-        var_defs = []
-
+        extern_var_with_def = {}
+        extern_var_without_def = {}
         for var in cfg.variables:
             if not var.isGlobal:
                 continue
@@ -2010,13 +2261,30 @@ def misra_8_4(self, cfg):
                 continue
             if var.nameToken is None:
                 continue
-            if var.isExtern:
-                extern_vars.append(var.nameToken.str)
+            tok = var.nameToken
+            if tok.next.str == ";":
+                if tok.next.isSplittedVarDeclEq:
+                    self.insert_in_dict(extern_var_with_def, tok.str, tok)
+                else:
+                    self.insert_in_dict(extern_var_without_def, tok.str, tok)
             else:
-                var_defs.append(var.nameToken)
-        for vartok in var_defs:
-            if vartok.str not in extern_vars:
-                self.reportError(vartok, 8, 4)
+                self.insert_in_dict(extern_var_without_def, var.nameToken.str, var.nameToken)
+
+        for var in extern_var_with_def:
+            if var not in extern_var_without_def:
+                for t in extern_var_with_def[var]:
+                    self.reportError(t, 8, 4)
+
+        for var_str, var_tok in extern_var_without_def.items():
+            warn = True
+            if var_str not in extern_var_with_def:
+                for t in var_tok:
+                    if t.variable.isExtern:
+                        warn = False
+                        break
+                if warn:
+                    for t in var_tok:
+                        self.reportError(t, 8, 4)
 
     def misra_8_5(self, dumpfile, cfg):
         self._save_ctu_summary_identifiers(dumpfile, cfg)
@@ -2204,10 +2472,9 @@ def get_category(essential_type):
                 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):
+                if bitsOfEssentialType(lhs) < bitsOfEssentialType(rhs) and (lhs != "bool" or tok.astOperand2.str not in ('0','1')):
                     self.reportError(tok, 10, 3)
 
-
     def misra_10_4(self, data):
         op = {'+', '-', '*', '/', '%', '&', '|', '^', '+=', '-=', ':'}
         for token in data.tokenlist:
@@ -2301,6 +2568,9 @@ def misra_10_6(self, data):
                     e = getEssentialType(token.astOperand2)
                 if not e:
                     continue
+                if e == "char" and vt1.type == "int":
+                    # When arithmetic operations are performed on char values, they are usually promoted to int
+                    continue
                 lhsbits = vt1.bits if vt1.bits else bitsOfEssentialType(vt1.type)
                 if lhsbits > bitsOfEssentialType(e):
                     self.reportError(token, 10, 6)
@@ -2430,6 +2700,20 @@ def misra_11_3(self, data):
                 self.reportError(token, 11, 3)
 
     def misra_11_4(self, data):
+        # Get list of macro definitions
+        macros = {}
+        for directive in data.directives:
+            #define X ((peripheral_t *)0x40000U)
+            res = re.match(r'#define ([A-Za-z0-9_]+).*', directive.str)
+            if res:
+                if res.group(1) in macros:
+                    macros[res.group(1)].append(directive)
+                else:
+                    macros[res.group(1)] = [directive]
+
+        # If macro definition is non-compliant then warn about the macro definition instead of
+        # the macro usages. To reduce diagnostics for a non-compliant macro.
+        bad_macros = []
         for token in data.tokenlist:
             if not isCast(token):
                 continue
@@ -2440,6 +2724,17 @@ def misra_11_4(self, data):
             if vt2.pointer > 0 and vt1.pointer == 0 and (vt1.isIntegral() or vt1.isEnum()) and vt2.type != 'void':
                 self.reportError(token, 11, 4)
             elif vt1.pointer > 0 and vt2.pointer == 0 and (vt2.isIntegral() or vt2.isEnum()) and vt1.type != 'void':
+                if token.macroName is not None and \
+                   token.macroName == token.astOperand1.macroName and \
+                   token.astOperand1.isInt and \
+                   token.link.previous.str == '*' and \
+                   token.macroName == token.link.previous.macroName and \
+                   token.macroName in macros and \
+                   len(macros[token.macroName]) == 1:
+                    if token.macroName not in bad_macros:
+                        bad_macros.append(token.macroName)
+                        self.reportError(macros[token.macroName][0], 11, 4)
+                    continue
                 self.reportError(token, 11, 4)
 
     def misra_11_5(self, data):
@@ -2467,13 +2762,11 @@ def misra_11_6(self, data):
         for token in data.tokenlist:
             if not isCast(token):
                 continue
-            if token.astOperand1.astOperand1:
-                continue
             vt1 = token.valueType
             vt2 = token.astOperand1.valueType
             if not vt1 or not vt2:
                 continue
-            if vt1.pointer == 1 and vt1.type == 'void' and vt2.pointer == 0 and token.astOperand1.str != "0":
+            if vt1.pointer == 1 and vt1.type == 'void' and vt2.pointer == 0 and token.astOperand1.getKnownIntValue() != 0:
                 self.reportError(token, 11, 6)
             elif vt1.pointer == 0 and vt1.type != 'void' and vt2.pointer == 1 and vt2.type == 'void':
                 self.reportError(token, 11, 6)
@@ -2621,42 +2914,61 @@ def misra_12_3(self, data):
                     if prev.str == ';':
                         self.reportError(token, 12, 3)
                         break
-                    elif prev.str in ')}]':
-                        prev = prev.link
-                    elif prev.str in '({[':
+                    if prev.str in '({[':
                         break
+                    if prev.str in ')}]':
+                        prev = prev.link
                     prev = prev.previous
 
+    def misra_12_4_check_expr(self, expr):
+        if not expr.astOperand2 or not expr.astOperand1:
+            return
+        if expr.valueType is None:
+            return
+        if expr.valueType.sign is None or expr.valueType.sign != 'unsigned':
+            return
+        if expr.valueType.pointer > 0:
+            return
+        if not expr.valueType.isIntegral():
+            return
+        op1 = expr.astOperand1.getKnownIntValue()
+        if op1 is None:
+            return
+        op2 = expr.astOperand2.getKnownIntValue()
+        if op2 is None:
+            return
+        bits = bitsOfEssentialType('unsigned ' + expr.valueType.type)
+        if bits <= 0 or bits >= 64:
+            return
+        max_value = (1 << bits) - 1
+        if not is_constant_integer_expression(expr):
+            return
+        if expr.str == '+' and op1 + op2 > max_value:
+            self.reportError(expr, 12, 4)
+        elif expr.str == '-' and op1 - op2 < 0:
+            self.reportError(expr, 12, 4)
+        elif expr.str == '*' and op1 * op2 > max_value:
+            self.reportError(expr, 12, 4)
     def misra_12_4(self, cfg):
-        for expr in cfg.tokenlist:
-            if not expr.astOperand2 or not expr.astOperand1:
-                continue
-            if expr.valueType is None:
-                continue
-            if expr.valueType.sign is None or expr.valueType.sign != 'unsigned':
-                continue
-            if expr.valueType.pointer > 0:
-                continue
-            if not expr.valueType.isIntegral():
-                continue
-            op1 = expr.astOperand1.getKnownIntValue()
-            if op1 is None:
-                continue
-            op2 = expr.astOperand2.getKnownIntValue()
-            if op2 is None:
-                continue
-            bits = bitsOfEssentialType('unsigned ' + expr.valueType.type)
-            if bits <= 0 or bits >= 64:
-                continue
-            max_value = (1 << bits) - 1
-            if not is_constant_integer_expression(expr):
-                continue
-            if expr.str == '+' and op1 + op2 > max_value:
-                self.reportError(expr, 12, 4)
-            elif expr.str == '-' and op1 - op2 < 0:
-                self.reportError(expr, 12, 4)
-            elif expr.str == '*' and op1 * op2 > max_value:
-                self.reportError(expr, 12, 4)
+        if not cfg.tokenlist:
+            return
+        expr = cfg.tokenlist[0]
+        while expr.next:
+            expr = expr.next
+            if expr.str == "?" and expr.astOperand2.str == ":":
+                known_value = expr.astOperand1.getKnownIntValue()
+                if known_value == 1:
+                    tok = expr
+                    while tok != expr.astOperand2:
+                        self.misra_12_4_check_expr(tok)
+                        tok = tok.next
+                    expr = tok
+                    while expr.str not in (";", "{", "}"):
+                        expr = expr.next
+                    continue
+                if known_value == 0:
+                    expr = expr.astOperand2
+            self.misra_12_4_check_expr(expr)
 
 
     def misra_13_1(self, data):
@@ -2677,8 +2989,7 @@ def misra_13_1(self, data):
                     if tn and tn.next and tn.next.str == '=':
                         tn = tn.next.next
                         continue
-                    else:
-                        break
+                    break
                 if tn.str == '.' and tn.next and tn.next.isName:
                     tn = tn.next
                     if tn.next and tn.next.str == '=':
@@ -2741,13 +3052,14 @@ def misra_14_2(self, data):
                 if not expressions:
                     continue
                 if expressions[0] and not expressions[0].isAssignmentOp:
-                    self.reportError(token, 14, 2)
+                    if expressions[0].str != "(" or not expressions[0].previous.isName:
+                        self.reportError(token, 14, 2)
                 if countSideEffectsRecursive(expressions[1]) > 0:
                     self.reportError(token, 14, 2)
                 if countSideEffectsRecursive(expressions[2]) > 1:
                     self.reportError(token, 14, 2)
 
-                counter_vars_first_clause, counter_vars_exit_modified = getForLoopCounterVariables(token)
+                counter_vars_first_clause, counter_vars_exit_modified = getForLoopCounterVariables(token, data)
                 if len(counter_vars_exit_modified) == 0:
                     # if it's not possible to identify a loop counter, all 3 clauses must be empty
                     for idx in range(len(expressions)):
@@ -2782,7 +3094,9 @@ def misra_14_4(self, data):
                 continue
             if not token.astOperand1 or not (token.astOperand1.str in ['if', 'while']):
                 continue
-            if not isBoolExpression(token.astOperand2):
+            if isBoolExpression(token.astOperand2):
+                continue
+            if token.astOperand2.valueType:
                 self.reportError(token, 14, 4)
 
     def misra_15_1(self, data):
@@ -2990,15 +3304,15 @@ def misra_16_3(self, rawTokens):
         STATE_OK = 2  # a case/default is allowed (we have seen 'break;'/'comment'/'{'/attribute)
         STATE_SWITCH = 3  # walking through switch statement scope
 
-        define = None
+        directive = None
         state = STATE_NONE
         end_switch_token = None  # end '}' for the switch scope
         for token in rawTokens:
-            if simpleMatch(token, '# define'):
-                define = token
-            if define:
-                if token.linenr != define.linenr:
-                    define = None
+            if simpleMatch(token, '# define') or simpleMatch(token, '# pragma'):
+                directive = token
+            if directive:
+                if token.linenr != directive.linenr:
+                    directive = None
                 else:
                     continue
 
@@ -3064,7 +3378,7 @@ def misra_16_5(self, data):
         for token in data.tokenlist:
             if token.str != 'default':
                 continue
-            if token.previous and token.previous.str == '{':
+            if token.previous and (token.previous.str == '{'):
                 continue
             tok2 = token
             while tok2:
@@ -3102,7 +3416,7 @@ def misra_16_7(self, data):
 
     def misra_17_1(self, data):
         for token in data.tokenlist:
-            if isFunctionCall(token) and token.astOperand1.str in (
+            if isFunctionCall(token, data.standards.c) and token.astOperand1.str in (
             'va_list', 'va_arg', 'va_start', 'va_end', 'va_copy'):
                 self.reportError(token, 17, 1)
             elif token.str == 'va_list':
@@ -3159,10 +3473,80 @@ def find_recursive_call(search_for_function, direct_call, calls_map, visited=Non
                         tok = tok.next
 
     def misra_17_3(self, cfg):
+        # Check for Clang warnings related to implicit function declarations
         for w in cfg.clang_warnings:
             if w['message'].endswith('[-Wimplicit-function-declaration]'):
                 self.reportError(cppcheckdata.Location(w), 17, 3)
 
+        # 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.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 :
+                        # this is a function pointer definition the tokens look like this int16_t ( * misra_8_2_p_a ) ()
+                        # and the int16_t causes the detection as the '(' follows
+                        continue
+                    if not isKeyword(token.str,cfg.standards.c) and not isStdLibId(token.str,cfg.standards.c):
+                        self.reportError(token, 17, 3)
+
+    def misra_config(self, data):
+        for var in data.variables:
+            if not var.isArray or var.nameToken is None or not cppcheckdata.simpleMatch(var.nameToken.next, '['):
+                continue
+            tok = var.nameToken.next
+            while tok.str == '[':
+                sz = tok.astOperand2
+                if sz and sz.getKnownIntValue() is None:
+                    has_var = False
+                    unknown_constant = False
+                    tokens = [sz]
+                    while len(tokens) > 0:
+                        t = tokens[-1]
+                        tokens = tokens[:-1]
+                        if t:
+                            if t.isName and t.getKnownIntValue() is None:
+                                if t.varId or t.variable:
+                                    has_var = True
+                                    continue
+                                unknown_constant = True
+                                self.report_config_error(tok, 'Unknown constant {}, please review configuration'.format(t.str))
+                            if t.isArithmeticalOp:
+                                tokens += [t.astOperand1, t.astOperand2]
+                    if not unknown_constant and not has_var:
+                        self.report_config_error(tok, 'Unknown array size, please review configuration')
+                tok = tok.link.next
+
+        for token in data.tokenlist:
+            if token.str not in ("while", "if"):
+                continue
+            tok = token.next
+            if token is None or tok.str != "(":
+                continue
+            end_token = tok.link
+            while tok != end_token:
+                tok = tok.next
+                if tok.str == 'sizeof' and tok.next.str == '(':
+                    tok = tok.next.link
+                    continue
+                if tok.str == "(" and tok.isCast:
+                    tok = tok.link
+                    continue
+                if not tok.isName:
+                    continue
+                if tok.function or tok.variable or tok.varId or tok.valueType or tok.typeScope:
+                    continue
+                if tok.next.str == "(" or tok.str in ["EOF"]:
+                    continue
+                if isKeyword(tok.str, data.standards.c) or isStdLibId(tok.str, data.standards.c):
+                    continue
+                if tok.astParent is None:
+                    continue
+                if tok.astParent.str == "." and tok.astParent.valueType:
+                    continue
+                self.report_config_error(tok, "Variable '%s' is unknown" % tok.str)
+
     def misra_17_6(self, rawTokens):
         for token in rawTokens:
             if simpleMatch(token, '[ static'):
@@ -3174,7 +3558,9 @@ def misra_17_7(self, data):
                 continue
             if token.str != '(' or token.astParent:
                 continue
-            if not token.previous.isName or token.previous.varId:
+            if token.astOperand1 is None or not token.astOperand1.isName:
+                continue
+            if token.astOperand1.varId and (token.astOperand1.variable is None or get_function_pointer_type(token.astOperand1.variable.typeStartToken) is None):
                 continue
             if token.valueType is None:
                 continue
@@ -3231,7 +3617,10 @@ def misra_18_7(self, data):
                 if token.str == '{':
                     token = token.link
 
-                if cppcheckdata.simpleMatch(token, "[ ]"):
+                # skip function pointer parameter types
+                if token.astOperand1 is None:
+                    pass
+                elif cppcheckdata.simpleMatch(token, "[ ]"):
                     self.reportError(token, 18, 7)
                     break
                 token = token.next
@@ -3247,7 +3636,7 @@ def misra_18_8(self, data):
             # Unknown define or syntax error
             if not typetok.astOperand2:
                 continue
-            if not isConstantExpression(typetok.astOperand2):
+            if not isConstantExpression(typetok.astOperand2) and not isUnknownConstantExpression(typetok.astOperand2):
                 self.reportError(var.nameToken, 18, 8)
 
     def misra_19_2(self, data):
@@ -3415,7 +3804,7 @@ def misra_20_9(self, cfg):
                     break
             for s in cond.E.split(' '):
                 if (s[0] >= 'A' and s[0] <= 'Z') or (s[0] >= 'a' and s[0] <= 'z'):
-                    if isKeyword(s):
+                    if isKeyword(s, cfg.standards.c):
                         continue
                     if s in defined:
                         continue
@@ -3549,7 +3938,7 @@ def misra_21_2(self, cfg):
 
     def misra_21_3(self, data):
         for token in data.tokenlist:
-            if isFunctionCall(token) and (token.astOperand1.str in ('malloc', 'calloc', 'realloc', 'free')):
+            if isFunctionCall(token, data.standards.c) and (token.astOperand1.str in ('malloc', 'calloc', 'realloc', 'free')):
                 self.reportError(token, 21, 3)
 
     def misra_21_4(self, data):
@@ -3563,21 +3952,22 @@ def misra_21_5(self, data):
             self.reportError(directive, 21, 5)
 
     def misra_21_6(self, data):
-        dir_stdio = findInclude(data.directives, '<stdio.h>')
-        dir_wchar = findInclude(data.directives, '<wchar.h>')
-        if dir_stdio:
-            self.reportError(dir_stdio, 21, 6)
-        if dir_wchar:
-            self.reportError(dir_wchar, 21, 6)
+        for token in data.tokenlist:
+            if not isFunctionCall(token) or token.previous.function:
+                continue
+            standard_id = getStdLib(data.standards.c)
+            funcname = token.previous.str
+            if funcname in standard_id.get("stdio.h", []) or funcname in standard_id.get("wchar.h", []):
+                self.reportError(token, 21, 6)
 
     def misra_21_7(self, data):
         for token in data.tokenlist:
-            if isFunctionCall(token) and (token.astOperand1.str in ('atof', 'atoi', 'atol', 'atoll')):
+            if isFunctionCall(token, data.standards.c) and (token.astOperand1.str in ('atof', 'atoi', 'atol', 'atoll')):
                 self.reportError(token, 21, 7)
 
     def misra_21_8(self, data):
         for token in data.tokenlist:
-            if isFunctionCall(token) and (token.astOperand1.str in ('abort', 'exit', 'getenv')):
+            if isFunctionCall(token, data.standards.c) and (token.astOperand1.str in ('abort', 'exit', 'getenv')):
                 self.reportError(token, 21, 8)
 
     def misra_21_9(self, data):
@@ -3604,7 +3994,7 @@ def misra_21_12(self, data):
             for token in data.tokenlist:
                 if token.str == 'fexcept_t' and token.isName:
                     self.reportError(token, 21, 12)
-                if isFunctionCall(token) and (token.astOperand1.str in (
+                if isFunctionCall(token, data.standards.c) and (token.astOperand1.str in (
                         'feclearexcept',
                         'fegetexceptflag',
                         'feraiseexcept',
@@ -3616,7 +4006,7 @@ def misra_21_14(self, data):
         # buffers used in strcpy/strlen/etc function calls
         string_buffers = []
         for token in data.tokenlist:
-            if token.str[0] == 's' and isFunctionCall(token.next):
+            if token.str[0] == 's' and isFunctionCall(token.next, data.standards.c):
                 name, args = cppcheckdata.get_function_call_name_args(token)
                 if name is None:
                     continue
@@ -3687,7 +4077,7 @@ def misra_21_16(self, cfg):
                     continue
                 if arg.valueType.pointer > 1:
                     continue
-                if arg.valueType.sign in ('unsigned', 'signed'):
+                if getEssentialTypeCategory(arg) in ('unsigned', 'signed', 'bool'):
                     continue
                 if arg.valueType.isEnum():
                     continue
@@ -3739,7 +4129,7 @@ def misra_21_20(self, cfg):
 
             # Calling dangerous function
             if token.str in ('asctime', 'ctime', 'gmtime', 'localtime', 'localeconv', 'getenv', 'setlocale', 'strerror'):
-                name, args = cppcheckdata.get_function_call_name_args(token)
+                name, _ = cppcheckdata.get_function_call_name_args(token)
                 if name and name == token.str:
                     # make assigned pointers invalid
                     for varId in assigned.get(name, ()):
@@ -3813,7 +4203,7 @@ def misra_22_9(self, cfg):
         errno_is_set = False
         for token in cfg.tokenlist:
             if token.str == '(' and not simpleMatch(token.link, ') {'):
-                name, args = cppcheckdata.get_function_call_name_args(token.previous)
+                name, _ = cppcheckdata.get_function_call_name_args(token.previous)
                 if name is None:
                     continue
                 errno_is_set = is_errno_setting_function(name)
@@ -3830,8 +4220,8 @@ def misra_22_9(self, cfg):
     def misra_22_10(self, cfg):
         last_function_call = None
         for token in cfg.tokenlist:
-            if token.str == '(' and not simpleMatch(token.link, ') {'):
-                name, args = cppcheckdata.get_function_call_name_args(token.previous)
+            if token.isName and token.next and token.next.str == '(' and not simpleMatch(token.next.link, ') {'):
+                name, _ = cppcheckdata.get_function_call_name_args(token)
                 last_function_call = name
             if token.str == '}':
                 last_function_call = None
@@ -3854,8 +4244,7 @@ def get_violations(self, violation_type=None):
         """Return the list of violations for a normal checker run"""
         if violation_type is None:
             return self.violations.items()
-        else:
-            return self.violations[violation_type]
+        return self.violations[violation_type]
 
     def get_violation_types(self):
         """Return the list of violations for a normal checker run"""
@@ -3895,10 +4284,10 @@ def addSuppressedRule(self, ruleNum,
 
         # If the rule is not in the dict already then add it
         if ruleNum not in self.suppressedRules:
-            ruleItemList = list()
+            ruleItemList = []
             ruleItemList.append(line_symbol)
 
-            fileDict = dict()
+            fileDict = {}
             fileDict[normalized_filename] = ruleItemList
 
             self.suppressedRules[ruleNum] = fileDict
@@ -3914,7 +4303,7 @@ def addSuppressedRule(self, ruleNum,
 
         # If the filename is not in the dict already add it
         if normalized_filename not in fileDict:
-            ruleItemList = list()
+            ruleItemList = []
             ruleItemList.append(line_symbol)
 
             fileDict[normalized_filename] = ruleItemList
@@ -4018,7 +4407,7 @@ def showSuppressedRules(self):
         Print out rules in suppression list sorted by Rule Number
         """
         print("Suppressed Rules List:")
-        outlist = list()
+        outlist = []
 
         for ruleNum in self.suppressedRules:
             fileDict = self.suppressedRules[ruleNum]
@@ -4067,6 +4456,15 @@ def setSuppressionList(self, suppressionlist):
 
                 self.addSuppressedRule(ruleNum)
 
+    def report_config_error(self, location, errmsg):
+        errmsg = 'Because of missing configuration, misra checking is incomplete. There can be false negatives! ' + errmsg
+        cppcheck_severity = 'error'
+        error_id = 'config'
+        if self.settings.verify:
+            self.verify_actual.append('%s:%d %s' % (location.file, location.linenr, error_id))
+        else:
+            cppcheckdata.reportError(location, cppcheck_severity, errmsg, 'misra', error_id)
+
     def reportError(self, location, num1, num2):
         ruleNum = num1 * 100 + num2
 
@@ -4094,11 +4492,6 @@ def reportError(self, location, num1, num2):
                     errmsg = 'misra violation (use --rule-texts=<file> to get proper output)'
                 else:
                     errmsg = 'misra violation (rule-texts-file not found: ' + self.ruleText_filename + ')'
-                if self.path_premium_addon:
-                    for line in cppcheckdata.cmd_output([self.path_premium_addon, '--cli', '--get-rule-text=' + errorId]).split('\n'):
-                        if len(line) > 1 and not line.startswith('{'):
-                            errmsg = line.strip()
-                            break
             else:
                 errmsg = 'misra violation %s with no text in the supplied rule-texts-file' % (ruleNum)
 
@@ -4121,10 +4514,8 @@ def loadRuleTexts(self, filename):
         num1 = 0
         num2 = 0
         appendixA = False
-        ruleText = False
-        expect_more = False
 
-        Rule_pattern = re.compile(r'^Rule ([0-9]+).([0-9]+)')
+        Rule_pattern = re.compile(r'^Rule ([0-9]+)\.([0-9]+)')
         severity_pattern = re.compile(r'.*[ ]*(Advisory|Required|Mandatory)$')
         xA_Z_pattern = re.compile(r'^[#A-Z].*')
         a_z_pattern = re.compile(r'^[a-z].*')
@@ -4133,10 +4524,11 @@ 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:
+                file_stream.close()
                 file_stream = None
             else:
                 break
@@ -4151,12 +4543,13 @@ def loadRuleTexts(self, filename):
                 file_stream = open(filename, 'rt')
 
         rule = None
-        have_severity = False
-        severity_loc = 0
+        rule_line_number = 0
 
         for line in file_stream:
 
-            line = line.replace('\r', '').replace('\n', '')
+            line = line.strip()
+            if len(line) == 0:
+                continue
 
             if not appendixA:
                 if line.find('Appendix A') >= 0 and line.find('Summary of guidelines') >= 10:
@@ -4164,57 +4557,50 @@ def loadRuleTexts(self, filename):
                 continue
             if line.find('Appendix B') >= 0:
                 break
-            if len(line) == 0:
-                continue
 
             # Parse rule declaration.
             res = Rule_pattern.match(line)
 
             if res:
-                have_severity = False
-                expect_more = False
-                severity_loc = 0
+                rule_line_number = 0
                 num1 = int(res.group(1))
                 num2 = int(res.group(2))
                 rule = Rule(num1, num2)
 
-            if not have_severity and rule is not None:
                 res = severity_pattern.match(line)
-
                 if res:
                     rule.misra_severity = res.group(1)
-                    have_severity = True
-                else:
-                    severity_loc += 1
-
-                # Only look for severity on the Rule line
-                # or the next non-blank line after
-                # If it's not in either of those locations then
-                # assume a severity was not provided.
-
-                if severity_loc < 2:
-                    continue
-                else:
-                    rule.misra_severity = ''
-                    have_severity = True
+                    rule_line_number = 1
+                continue
 
             if rule is None:
                 continue
 
-            # Parse continuing of rule text.
-            if expect_more:
-                if a_z_pattern.match(line):
-                    self.ruleTexts[rule.num].text += ' ' + line
+            rule_line_number += 1
+
+            if rule_line_number == 1:
+                res = severity_pattern.match(line)
+
+                if res:
+                    rule.misra_severity = res.group(1)
                     continue
 
-                expect_more = False
-                continue
+                rule_line_number = 2
 
             # Parse beginning of rule text.
-            if xA_Z_pattern.match(line):
-                rule.text = line
+            if not rule.text and xA_Z_pattern.match(line):
+                rule.text = line.strip()
                 self.ruleTexts[rule.num] = rule
-                expect_more = True
+                continue
+
+            # Parse continuing of rule text.
+            if a_z_pattern.match(line):
+                self.ruleTexts[rule.num].text += ' ' + line.strip()
+                continue
+
+            rule = None
+
+        file_stream.close()
 
     def verifyRuleTexts(self):
         """Prints rule numbers without rule text."""
@@ -4256,6 +4642,10 @@ def executeCheck(self, rule_num, check_function, *args):
                 1901) # misra-c2012-19.1 : misra c++2008 2-13-3
 
             if (not self.is_cpp) or rule_num in misra_cpp:
+                # log checker
+                errmsg = 'Misra C: %i.%i' % (rule_num // 100, rule_num % 100)
+                cppcheckdata.log_checker(errmsg, 'misra')
+
                 check_function(*args)
 
     def parseDump(self, dumpfile, path_premium_addon=None):
@@ -4264,7 +4654,7 @@ def fillVerifyExpected(verify_expected, tok):
             rule_re = re.compile(r'[0-9]+\.[0-9]+')
             if tok.str.startswith('//') and 'TODO' not in tok.str:
                 for word in tok.str[2:].split(' '):
-                    if rule_re.match(word):
+                    if rule_re.match(word) or word == "config":
                         verify_expected.append('%s:%d %s' % (tok.file, tok.linenr, word))
 
         data = cppcheckdata.parsedump(dumpfile)
@@ -4296,12 +4686,13 @@ def fillVerifyExpected(verify_expected, tok):
         else:
             self.printStatus('Checking ' + dumpfile + '...')
 
-        self.is_cpp = data.files and data.files[0].endswith('.cpp')
+        self.is_cpp = data.language == 'cpp'
 
         for cfgNumber, cfg in enumerate(data.iterconfigurations()):
             if not self.settings.quiet:
                 self.printStatus('Checking %s, config %s...' % (dumpfile, cfg.name))
 
+            self.executeCheck(102, self.misra_1_2, cfg)
             if not path_premium_addon:
                 self.executeCheck(104, self.misra_1_4, cfg)
             self.executeCheck(202, self.misra_2_2, cfg)
@@ -4312,7 +4703,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)
@@ -4401,6 +4792,7 @@ def fillVerifyExpected(verify_expected, tok):
             self.executeCheck(1701, self.misra_17_1, cfg)
             self.executeCheck(1702, self.misra_17_2, cfg)
             self.executeCheck(1703, self.misra_17_3, cfg)
+            self.misra_config(cfg)
             if cfgNumber == 0:
                 self.executeCheck(1706, self.misra_17_6, data.rawTokens)
             self.executeCheck(1707, self.misra_17_7, cfg)
@@ -4448,6 +4840,19 @@ def fillVerifyExpected(verify_expected, tok):
             self.executeCheck(2209, self.misra_22_9, cfg)
             self.executeCheck(2210, self.misra_22_10, cfg)
 
+    def read_ctu_info_line(self, line):
+        if not line.startswith('{'):
+            return None
+        try:
+            ctu_info = json.loads(line)
+        except json.decoder.JSONDecodeError:
+            return None
+        if 'summary' not in ctu_info:
+            return None
+        if 'data' not in ctu_info:
+            return None
+        return ctu_info
+
     def analyse_ctu_info(self, ctu_info_files):
         all_typedef_info = {}
         all_tagname_info = {}
@@ -4463,15 +4868,17 @@ def analyse_ctu_info(self, ctu_info_files):
         def is_different_location(loc1, loc2):
             return loc1['file'] != loc2['file'] or loc1['line'] != loc2['line']
 
+        def is_different_file(loc1, loc2):
+            return loc1['file'] != loc2['file']
+
         try:
             for filename in ctu_info_files:
                 for line in open(filename, 'rt'):
-                    if not line.startswith('{'):
+                    s = self.read_ctu_info_line(line)
+                    if s is None:
                         continue
-
-                    s = json.loads(line)
-                    summary_type = s['summary']
-                    summary_data = s['data']
+                    summary_type = s.get('summary', '')
+                    summary_data = s.get('data', None)
 
                     if summary_type == 'MisraTypedefInfo':
                         for new_typedef_info in summary_data:
@@ -4509,7 +4916,7 @@ def is_different_location(loc1, loc2):
                                 all_macro_info[key] = new_macro
 
                     if summary_type == 'MisraExternalIdentifiers':
-                        for s in summary_data:
+                        for s in sorted(summary_data, key=lambda d: "%s %s %s" %(d['file'],d['line'], d['column'] )):
                             is_declaration = s['decl']
                             if is_declaration:
                                 all_external_identifiers = all_external_identifiers_decl
@@ -4517,10 +4924,13 @@ def is_different_location(loc1, loc2):
                                 all_external_identifiers = all_external_identifiers_def
 
                             name = s['name']
-                            if name in all_external_identifiers and is_different_location(s, all_external_identifiers[name]):
-                                num = 5 if is_declaration else 6
-                                self.reportError(Location(s), 8, num)
-                                self.reportError(Location(all_external_identifiers[name]), 8, num)
+                            if name in all_external_identifiers:
+                                if is_declaration and is_different_location(s, all_external_identifiers[name]):
+                                    self.reportError(Location(s), 8, 5)
+                                    self.reportError(Location(all_external_identifiers[name]), 8, 5)
+                                elif is_different_file(s, all_external_identifiers[name]):
+                                    self.reportError(Location(s), 8, 6)
+                                    self.reportError(Location(all_external_identifiers[name]), 8, 6)
                             all_external_identifiers[name] = s
 
                     if summary_type == 'MisraInternalIdentifiers':
@@ -4721,7 +5131,7 @@ def main():
                 for misra_id in ids:
                     rules_violated[misra_id] = rules_violated.get(misra_id, 0) + 1
             print("MISRA rules violated:")
-            convert = lambda text: int(text) if text.isdigit() else text
+            convert = lambda text: int(text) if text.isdigit() else 0
             misra_sort = lambda key: [convert(c) for c in re.split(r'[\.-]([0-9]*)', key)]
             for misra_id in sorted(rules_violated.keys(), key=misra_sort):
                 res = re.match(r'misra-c2012-([0-9]+)\\.([0-9]+)', misra_id)
diff --git a/addons/misra_9.py b/addons/misra_9.py
index 220bf7a13dc..1ca1b7ce3e0 100644
--- a/addons/misra_9.py
+++ b/addons/misra_9.py
@@ -1,5 +1,3 @@
-import cppcheckdata
-
 # Holds information about an array, struct or union's element definition.
 class ElementDef:
     def __init__(self, elementType, name, valueType, dimensions = None):
@@ -140,8 +138,7 @@ def getChildByValueElement(self, ed):
     def getEffectiveLevel(self):
         if self.parent and self.parent.elementType == "array":
             return self.parent.getEffectiveLevel() + 1
-        else:
-            return 0
+        return 0
 
     def setInitialized(self, designated=False, positional=False):
         if designated:
@@ -203,11 +200,10 @@ def isMisra93Compliant(self):
                   self.isOnlyDesignated()) and
                  all([not (child.isDesignated or child.isPositional) or child.isMisra93Compliant() for child in self.children]))
             return result
-        elif self.elementType == 'record':
+        if self.elementType == 'record':
             result = all([child.isMisra93Compliant() for child in self.children])
             return result
-        else:
-            return True
+        return True
 
     def isMisra94Compliant(self):
         return self.numInits <= 1 and all([child.isMisra94Compliant() for child in self.children])
@@ -255,7 +251,7 @@ def parseInitializer(self, root, token):
                 isFirstElement = False
                 isDesignated = True
 
-            elif self.token.isString and self.ed.isArray:
+            elif self.token.isString and self.ed and self.ed.isArray:
                 self.ed.setInitialized(isDesignated)
                 if self.token == self.token.astParent.astOperand1 and self.token.astParent.astOperand2:
                     self.token = self.token.astParent.astOperand2
@@ -293,7 +289,7 @@ def parseInitializer(self, root, token):
                         # Fake dummy as nextChild (of current root)
                         nextChild = dummyRoot
 
-                if self.token.astOperand1:
+                if nextChild and self.token.astOperand1:
                     self.root = nextChild
                     self.token = self.token.astOperand1
                     isFirstElement = True
@@ -311,7 +307,6 @@ def parseInitializer(self, root, token):
                 if self.ed and self.ed.isValue:
                     if not isDesignated and len(self.rootStack) > 0 and self.rootStack[-1][1] == self.root:
                         self.rootStack[-1][0].markStuctureViolation(self.token)
-
                     if isFirstElement and self.token.str == '0' and self.token.next.str == '}':
                         # Zero initializer causes recursive initialization
                         self.root.initializeChildren()
@@ -328,7 +323,7 @@ def parseInitializer(self, root, token):
                             self.ed.parent.initializeChildren()
 
                     else:
-                        if self.ed.parent != self.root:
+                        if self.root is not None and self.ed.parent != self.root:
                             # Check if token is correct value type for self.root.children[?]
                             child = self.root.getChildByValueElement(self.ed)
                             if self.token.valueType:
@@ -346,15 +341,9 @@ def parseInitializer(self, root, token):
                         parent = parent.parent
                     isDesignated = False
 
-                if self.token.isString:
-                    if self.token == self.token.astParent.astOperand1 and self.token.astParent.astOperand2:
-                        self.token = self.token.astParent.astOperand2
-                        self.ed.markAsCurrent()
-                        self.ed = self.root.getNextChild()
-                    else:
-                        self.unwindAndContinue()
-                else:
-                    self.unwindAndContinue()
+                    if self.token.isString and self.ed.parent.isArray:
+                        self.ed = self.ed.parent
+                self.unwindAndContinue()
 
     def pushToRootStackAndMarkAsDesignated(self):
         new = self.ed.parent
@@ -379,61 +368,32 @@ def unwindAndContinue(self):
         while self.token:
             if self.token.astParent.astOperand1 == self.token and self.token.astParent.astOperand2:
                 if self.ed:
-                    self.ed.markAsCurrent()
-                    self.ed = self.ed.getNextValueElement(self.root)
+                    if self.token.astParent.astOperand2.str == "{" and self.ed.isDesignated:
+                        self.popFromStackIfExitElement()
+                    else:
+                        self.ed.markAsCurrent()
+                        self.ed = self.ed.getNextValueElement(self.root)
 
                 self.token = self.token.astParent.astOperand2
                 break
-            else:
-                self.token = self.token.astParent
-                if self.token.str == '{':
-                    if self.root:
-                        self.ed = self.root.getLastValueElement()
-                        self.ed.markAsCurrent()
 
-                        # Cleanup if root is dummy node representing excess levels in initializer
-                        if self.root.name == '<-':
-                            self.root.children[0].parent = self.root.parent
+            self.token = self.token.astParent
+            if self.token.str == '{':
+                if self.root:
+                    self.ed = self.root.getLastValueElement()
+                    self.ed.markAsCurrent()
 
-                        self.root = self.root.parent
+                    # Cleanup if root is dummy node representing excess levels in initializer
+                    if self.root.name == '<-':
+                        self.root.children[0].parent = self.root.parent
 
-                if self.token.astParent is None:
-                    self.token = None
-                    break
+                    self.root = self.root.parent
+
+            if self.token.astParent is None:
+                self.token = None
+                break
 
 def misra_9_x(self, data, rule, rawTokens = None):
-    # If there are arrays with unknown size constants then we need to warn about missing configuration
-    # and bailout
-    has_config_errors = False
-    for var in data.variables:
-        if not var.isArray or var.nameToken is None or not cppcheckdata.simpleMatch(var.nameToken.next,'['):
-            continue
-        tok = var.nameToken.next
-        while tok.str == '[':
-            sz = tok.astOperand2
-            if sz and sz.getKnownIntValue() is None:
-                has_var = False
-                unknown_constant = False
-                tokens = [sz]
-                while len(tokens) > 0:
-                    t = tokens[-1]
-                    tokens = tokens[:-1]
-                    if t:
-                        if t.isName and t.getKnownIntValue() is None:
-                            if t.varId or t.variable:
-                                has_var = True
-                                continue
-                            unknown_constant = True
-                            cppcheckdata.reportError(sz, 'error', f'Unknown constant {t.str}, please review configuration', 'misra', 'config')
-                            has_config_errors = True
-                        if t.isArithmeticalOp:
-                            tokens += [t.astOperand1, t.astOperand2]
-                if not unknown_constant and not has_var:
-                    cppcheckdata.reportError(sz, 'error', 'Unknown array size, please review configuration', 'misra', 'config')
-                    has_config_errors = True
-            tok = tok.link.next
-    if has_config_errors:
-        return
 
     parser = InitializerParser()
 
@@ -464,7 +424,6 @@ def misra_9_x(self, data, rule, rawTokens = None):
             # without it.
             if ed.valueType is None and not variable.isArray:
                 continue
-
             parser.parseInitializer(ed, eq.astOperand2)
             # print(rule, nameToken.str + '=', ed.getInitDump())
             if rule == 902 and not ed.isMisra92Compliant():
@@ -539,11 +498,29 @@ def createRecordChildrenDefs(ed, var):
         child = ElementDef("pointer", var.nameToken, var.nameToken.valueType)
         ed.addChild(child)
         return
+    child_dict = {}
     for variable in valueType.typeScope.varlist:
         if variable is var:
             continue
         child = getElementDef(variable.nameToken)
-        ed.addChild(child)
+        child_dict[variable.nameToken] = child
+    for scopes in valueType.typeScope.nestedList:
+        varscope = False
+        if scopes.nestedIn == valueType.typeScope:
+            for variable in valueType.typeScope.varlist:
+                if variable.nameToken and variable.nameToken.valueType and variable.nameToken.valueType.typeScope == scopes:
+                    varscope = True
+                    break
+            if not varscope:
+                ed1 = ElementDef("record", scopes.Id, valueType)
+                for variable in scopes.varlist:
+                    child = getElementDef(variable.nameToken)
+                    ed1.addChild(child)
+                child_dict[scopes.bodyStart] = ed1
+    sorted_keys = sorted(list(child_dict.keys()), key=lambda k: (k.file, k.linenr, k.column))
+    for _key in sorted_keys:
+        ed.addChild(child_dict[_key])
+
 
 def getElementByDesignator(ed, token):
     if not token.str in [ '.', '[' ]:
diff --git a/addons/naming.py b/addons/naming.py
index 948f158b6f4..2893779f2e0 100755
--- a/addons/naming.py
+++ b/addons/naming.py
@@ -17,7 +17,7 @@ def validate_regex(expr):
         re.compile(expr)
     except re.error:
         print('Error: "{}" is not a valid regular expression.'.format(expr))
-        exit(1)
+        sys.exit(1)
 
 
 RE_VARNAME = None
@@ -37,6 +37,7 @@ def validate_regex(expr):
     elif arg[:11] == '--function=':
         RE_FUNCTIONNAME = arg[11:]
         validate_regex(RE_FUNCTIONNAME)
+    # TODO: bail out on unknown parameter
 
 
 def reportError(token, severity, msg, errorId):
diff --git a/addons/naming.json b/addons/namingng.config.json
similarity index 61%
rename from addons/naming.json
rename to addons/namingng.config.json
index 26cb4bbce7a..0abba4f15ac 100644
--- a/addons/naming.json
+++ b/addons/namingng.config.json
@@ -2,6 +2,15 @@
     "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
     "RE_PRIVATE_MEMBER_VARIABLE": null,
     "RE_FUNCTIONNAME": ["[a-z0-9A-Z]*\\Z"],
+    "include_guard": {
+        "input": "path",
+        "prefix": "",
+        "suffix": "",
+        "case": "upper",
+        "max_linenr": 5,
+        "RE_HEADERFILE": "[^/].*\\.h\\Z",
+        "required": true
+    },
     "var_prefixes": {"uint32_t": "ui32",
                      "int*": "intp"},
     "function_prefixes": {"uint16_t": "ui16",
diff --git a/addons/namingng.json b/addons/namingng.json
new file mode 100644
index 00000000000..83f9a5a55d8
--- /dev/null
+++ b/addons/namingng.json
@@ -0,0 +1,6 @@
+{
+    "script":"namingng.py",
+    "args":[
+        "--configfile=namingng.config.json"
+    ]
+}
diff --git a/addons/namingng.py b/addons/namingng.py
index 73f1b08ec08..9da177321ef 100755
--- a/addons/namingng.py
+++ b/addons/namingng.py
@@ -3,6 +3,7 @@
 # cppcheck addon for naming conventions
 # An enhanced version. Configuration is taken from a json file
 # It supports to check for type-based prefixes in function or variable names.
+# Aside from include guard naming, include guard presence can also be tested.
 #
 # Example usage (variable name must start with lowercase, function name must start with uppercase):
 # $ cppcheck --dump path-to-src/
@@ -11,9 +12,18 @@
 # JSON format:
 #
 # {
-#    "RE_VARNAME": "[a-z]*[a-zA-Z0-9_]*\\Z",
+#    "RE_VARNAME": ["[a-z]*[a-zA-Z0-9_]*\\Z"],
 #    "RE_PRIVATE_MEMBER_VARIABLE": null,
-#    "RE_FUNCTIONNAME": "[a-z0-9A-Z]*\\Z",
+#    "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"}
@@ -24,230 +34,387 @@
 
 import cppcheckdata
 import sys
+import os
 import re
-import argparse
 import json
 
-
 # Auxiliary class
 class DataStruct:
-    def __init__(self, file, linenr, string):
+    def __init__(self, file, linenr, string, column=0):
         self.file = file
         self.linenr = linenr
         self.str = string
+        self.column = column
+
+def reportNamingError(location,message,errorId='namingConvention',severity='style',extra='',column=None):
+    cppcheckdata.reportError(location,severity,message,'namingng',errorId,extra,columnOverride=column)
 
+def configError(error,fatal=True):
+    print('config error: %s'%error)
+    if fatal:
+        sys.exit(1)
 
-def reportError(filename, linenr, severity, msg):
-    message = "[{filename}:{linenr}] ( {severity} ) naming.py: {msg}\n".format(
-        filename=filename,
-        linenr=linenr,
-        severity=severity,
-        msg=msg
-    )
-    sys.stderr.write(message)
-    return message
+def validateConfigREs(list_or_dict,json_key):
+    have_error = False
+    for item in list_or_dict:
+        try:
+            re.compile(item)
+        except re.error as err:
+            configError("item '%s' of '%s' is not a valid regular expression: %s"%(item,json_key,err),fatal=False)
+            have_error = True
+            continue
+        if not isinstance(list_or_dict,dict):
+            continue
+        # item is actually a dict key; check value
+        value = list_or_dict[item]
+        if (not isinstance(value,list) or len(value) != 2
+                or not isinstance(value[0],bool) or not isinstance(value[1],str)):
+            configError("item '%s' of '%s' must be an array [bool,string]"%(item,json_key),fatal=False)
+            have_error = True
 
+    return have_error
 
 def loadConfig(configfile):
-    with open(configfile) as fh:
-        data = json.load(fh)
-    return data
+    if not os.path.exists(configfile):
+        configError("cannot find config file '%s'"%configfile)
+
+    try:
+        with open(configfile) as fh:
+            data = json.load(fh)
+    except json.JSONDecodeError as e:
+        configError("error parsing config file as JSON at line %d: %s"%(e.lineno,e.msg))
+    except Exception as e:
+        configError("error opening config file '%s': %s"%(configfile,e))
+
+    if not isinstance(data, dict):
+        configError('config file must contain a JSON object at the top level')
+
+    # All errors are emitted before bailing out, to make the unit test more
+    # effective.
+    have_error = False
+
+    # Put config items in a class, so that settings can be accessed using
+    # config.feature
+    class Config:
+        pass
+    config = Config()
+
+    mapping = {
+        'file':                     ('RE_FILE', (list,)),
+        'namespace':                ('RE_NAMESPACE', (list,dict)),
+        'include_guard':            ('include_guard', (dict,)),
+        'variable':                 ('RE_VARNAME', (list,dict)),
+        'variable_prefixes':        ('var_prefixes', (dict,), {}),
+        'private_member':           ('RE_PRIVATE_MEMBER_VARIABLE', (list,dict)),
+        'public_member':            ('RE_PUBLIC_MEMBER_VARIABLE', (list,dict)),
+        'global_variable':          ('RE_GLOBAL_VARNAME', (list,dict)),
+        'function_name':            ('RE_FUNCTIONNAME', (list,dict)),
+        'function_prefixes':        ('function_prefixes', (dict,), {}),
+        'class_name':               ('RE_CLASS_NAME', (list,dict)),
+        'skip_one_char_variables':  ('skip_one_char_variables', (bool,)),
+    }
+
+    # parse defined keys and store as members of config object
+    for key,opts in mapping.items():
+        json_key = opts[0]
+        req_type = opts[1]
+        default = None if len(opts)<3 else opts[2]
+
+        value = data.pop(json_key,default)
+        if value is not None and type(value) not in req_type:
+            req_typename = ' or '.join([tp.__name__ for tp in req_type])
+            got_typename = type(value).__name__
+            configError('%s must be %s (not %s), or not set'%(json_key,req_typename,got_typename),fatal=False)
+            have_error = True
+            continue
 
+        # type list implies that this is either a list of REs or a dict with RE keys
+        if list in req_type and value is not None:
+            re_error = validateConfigREs(value,json_key)
+            if re_error:
+                have_error = True
 
-def checkTrueRegex(data, expr, msg, errors):
-    res = re.match(expr, data.str)
-    if res:
-        errors.append(reportError(data.file, data.linenr, 'style', msg))
+        setattr(config,key,value)
 
+    # check remaining keys, only accept underscore-prefixed comments
+    for key,value in data.items():
+        if key == '' or key[0] != '_':
+            configError("unknown config key '%s'"%key,fatal=False)
+            have_error = True
 
-def checkFalseRegex(data, expr, msg, errors):
-    res = re.match(expr, data.str)
-    if not res:
-        errors.append(reportError(data.file, data.linenr, 'style', msg))
+    if have_error:
+        sys.exit(1)
+
+    # pylint: disable-next=no-member - TODO: fix this
+    if config.include_guard:
+        # pylint: disable-next=no-member - TODO: fix this
+        config.include_guard_header_re = config.include_guard.get('RE_HEADERFILE',"[^/].*\\.h\\Z")
+
+    return config
 
 
-def evalExpr(conf, exp, mockToken, msgType, errors):
+def evalExpr(conf, exp, mockToken, msgType):
+    report_as_error = False
+    msg = msgType + ' ' + mockToken.str + ' violates naming convention'
+
     if isinstance(conf, dict):
-        if conf[exp][0]:
-            msg = msgType + ' ' + mockToken.str + ' violates naming convention : ' + conf[exp][1]
-            checkTrueRegex(mockToken, exp, msg, errors)
-        elif ~conf[exp][0]:
-            msg = msgType + ' ' + mockToken.str + ' violates naming convention : ' + conf[exp][1]
-            checkFalseRegex(mockToken, exp, msg, errors)
-        else:
-            msg = msgType + ' ' + mockToken.str + ' violates naming convention : ' + conf[exp][0]
-            checkFalseRegex(mockToken, exp, msg, errors)
+        report_as_error = conf[exp][0]
+        msg += ': ' + conf[exp][1]
+
+    res = re.match(exp,mockToken.str)
+    if bool(res) == report_as_error:
+        reportNamingError(mockToken,msg)
+
+def check_include_guard_name(conf,directive):
+    parts = directive.str.split()
+    if len(parts) != 2:
+        msg = 'syntax error'
+        reportNamingError(directive,msg,'syntax')
+        return None,None
+    guard_name = parts[1]
+    guard_column = 1+directive.str.find(guard_name)
+
+    filename = directive.file
+    if conf.include_guard.get('input','path') == 'basename':
+        filename = os.path.basename(filename)
+    use_case = conf.include_guard.get('case','upper')
+    if use_case == 'upper':
+        filename = filename.upper()
+    elif use_case == 'lower':
+        filename = filename.lower()
+    elif use_case == 'keep':
+        pass # keep filename case as-is
     else:
-        msg = msgType + ' ' + mockToken.str + ' violates naming convention'
-        checkFalseRegex(mockToken, exp, msg, errors)
-
+        print("invalid config value for 'case': '%s'"%use_case,file=sys.stderr)
+        sys.exit(1)
 
-def process(dumpfiles, configfile, debugprint=False):
+    barename = re.sub('[^A-Za-z0-9]','_',filename).strip('_')
+    expect_guard_name = conf.include_guard.get('prefix','') + barename + conf.include_guard.get('suffix','')
+    if expect_guard_name != guard_name:
+        msg = 'include guard naming violation; %s != %s'%(guard_name,expect_guard_name)
+        reportNamingError(directive,msg,'includeGuardName',column=guard_column)
+
+    return guard_name,guard_column
+
+def check_include_guards(conf,cfg,unguarded_include_files):
+    # Scan for '#ifndef FILE_H' as the first directive, in the first N lines.
+    # Then test whether the next directive #defines the found name.
+    # Various tests are done:
+    # - check include guards for their naming and consistency
+    # - test whether include guards are in place
+    max_linenr = conf.include_guard.get('max_linenr', 5)
+
+    def report(directive,msg,errorId,severity='style',column=0):
+        reportNamingError(directive,msg,errorId,severity=severity,column=column)
+
+    def report_pending_ifndef(directive,column):
+        report(directive,'include guard #ifndef is not followed by #define','includeGuardIncomplete',column=column)
+
+    last_fn = None
+    pending_ifndef = None
+    guard_column = None
+    phase = 0
+    for directive in cfg.directives:
+        if last_fn != directive.file:
+            if pending_ifndef:
+                report_pending_ifndef(pending_ifndef,guard_column)
+                pending_ifndef = None
+            last_fn = directive.file
+            phase = 0
+        if phase == -1:
+            # ignore (the remainder of) this file
+            continue
+        if not re.match(conf.include_guard_header_re,directive.file):
+            phase = -1
+            continue
 
-    errors = []
+        if directive.linenr > max_linenr:
+            if phase == 0 and conf.include_guard.get('required',1):
+                report(directive,'include guard not found before line %d'%max_linenr,'includeGuardMissing')
+            phase = -1
+            continue
 
+        if phase == 0:
+            # looking for '#ifndef FILE_H'
+            if not directive.str.startswith('#ifndef'):
+                if conf.include_guard.get('required',1):
+                    report(directive,'first preprocessor directive should be include guard #ifndef','includeGuardMissing')
+                phase = -1
+                continue
+            guard_name,guard_column = check_include_guard_name(conf,directive)
+            if guard_name is None:
+                phase = -1
+                continue
+            pending_ifndef = directive
+            phase = 1
+        elif phase == 1:
+            pending_ifndef = None
+            # looking for '#define FILE_H'
+            if not directive.str.startswith('#define'):
+                report(directive,'second preprocessor directive should be include guard #define','includeGuardIncomplete')
+                phase = -1
+                continue
+            parts = directive.str.split()
+            if len(parts) == 1:
+                report(directive,'syntax error','syntax')
+                phase = -1
+                continue
+            if guard_name != parts[1]:
+                report(directive,'include guard does not guard; %s != %s'%(guard_name,parts[1]),'includeGuardAwayFromDuty',severity='warning',column=guard_column)
+
+            unguarded_include_files.remove(directive.file)
+
+            phase = -1
+    if pending_ifndef:
+        report_pending_ifndef(pending_ifndef,guard_column)
+
+def process(dumpfiles, configfile, cli, debugprint):
     conf = loadConfig(configfile)
 
     for afile in dumpfiles:
         if not afile[-5:] == '.dump':
             continue
-        print('Checking ' + afile + '...')
+        if not cli:
+            print('Checking ' + afile + '...')
         data = cppcheckdata.CppcheckData(afile)
+        process_data(conf,data,cli,debugprint)
+
+def check_file_naming(conf,data):
+    for source_file in data.files:
+        basename = os.path.basename(source_file)
+        good = False
+        for exp in conf.file:
+            good |= bool(re.match(exp, source_file))
+            good |= bool(re.match(exp, basename))
+        if not good:
+            mockToken = DataStruct(source_file, 0, basename)
+            reportNamingError(mockToken, 'File name ' + basename + ' violates naming convention')
+
+def check_namespace_naming(conf,data):
+    for tk in data.rawTokens:
+        if tk.str != 'namespace':
+            continue
+        mockToken = DataStruct(tk.next.file, tk.next.linenr, tk.next.str, tk.next.column)
+        for exp in conf.namespace:
+            evalExpr(conf.namespace, exp, mockToken, 'Namespace')
 
-        # Check File naming
-        if "RE_FILE" in conf and conf["RE_FILE"]:
-            mockToken = DataStruct(afile[:-5], "0", afile[afile.rfind('/') + 1:-5])
-            msgType = 'File name'
-            for exp in conf["RE_FILE"]:
-                evalExpr(conf["RE_FILE"], exp, mockToken, msgType, errors)
-
-        # Check Namespace naming
-        if "RE_NAMESPACE" in conf and conf["RE_NAMESPACE"]:
-            for tk in data.rawTokens:
-                if tk.str == 'namespace':
-                    mockToken = DataStruct(tk.next.file, tk.next.linenr, tk.next.str)
-                    msgType = 'Namespace'
-                    for exp in conf["RE_NAMESPACE"]:
-                        evalExpr(conf["RE_NAMESPACE"], exp, mockToken, msgType, errors)
-
-        for cfg in data.configurations:
-            print('Checking %s, config %s...' % (afile, cfg.name))
-            if "RE_VARNAME" in conf and conf["RE_VARNAME"]:
-                for var in cfg.variables:
-                    if var.nameToken and var.access != 'Global' and var.access != 'Public' and var.access != 'Private':
-                        prev = var.nameToken.previous
-                        varType = prev.str
-                        while "*" in varType and len(varType.replace("*", "")) == 0:
-                            prev = prev.previous
-                            varType = prev.str + varType
-
-                        if debugprint:
-                            print("Variable Name: " + str(var.nameToken.str))
-                            print("original Type Name: " + str(var.nameToken.valueType.originalTypeName))
-                            print("Type Name: " + var.nameToken.valueType.type)
-                            print("Sign: " + str(var.nameToken.valueType.sign))
-                            print("variable type: " + varType)
-                            print("\n")
-                            print("\t-- {} {}".format(varType, str(var.nameToken.str)))
-
-                        if conf["skip_one_char_variables"] and len(var.nameToken.str) == 1:
-                            continue
-                        if varType in conf["var_prefixes"]:
-                            if not var.nameToken.str.startswith(conf["var_prefixes"][varType]):
-                                errors.append(reportError(
-                                                    var.typeStartToken.file,
-                                                    var.typeStartToken.linenr,
-                                                    'style',
-                                                    'Variable ' +
-                                                    var.nameToken.str +
-                                                    ' violates naming convention'))
-
-                        mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-                        msgType = 'Variable'
-                        for exp in conf["RE_VARNAME"]:
-                            evalExpr(conf["RE_VARNAME"], exp, mockToken, msgType, errors)
-
-            # Check Private Variable naming
-            if "RE_PRIVATE_MEMBER_VARIABLE" in conf and conf["RE_PRIVATE_MEMBER_VARIABLE"]:
-                # TODO: Not converted yet
-                for var in cfg.variables:
-                    if (var.access is None) or var.access != 'Private':
-                        continue
-                    mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-                    msgType = 'Private member variable'
-                    for exp in conf["RE_PRIVATE_MEMBER_VARIABLE"]:
-                        evalExpr(conf["RE_PRIVATE_MEMBER_VARIABLE"], exp, mockToken, msgType, errors)
-
-            # Check Public Member Variable naming
-            if "RE_PUBLIC_MEMBER_VARIABLE" in conf and conf["RE_PUBLIC_MEMBER_VARIABLE"]:
-                for var in cfg.variables:
-                    if (var.access is None) or var.access != 'Public':
-                        continue
-                    mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-                    msgType = 'Public member variable'
-                    for exp in conf["RE_PUBLIC_MEMBER_VARIABLE"]:
-                        evalExpr(conf["RE_PUBLIC_MEMBER_VARIABLE"], exp, mockToken, msgType, errors)
-
-            # Check Global Variable naming
-            if "RE_GLOBAL_VARNAME" in conf and conf["RE_GLOBAL_VARNAME"]:
-                for var in cfg.variables:
-                    if (var.access is None) or var.access != 'Global':
-                        continue
-                    mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str)
-                    msgType = 'Public member variable'
-                    for exp in conf["RE_GLOBAL_VARNAME"]:
-                        evalExpr(conf["RE_GLOBAL_VARNAME"], exp, mockToken, msgType, errors)
-
-            # Check Functions naming
-            if "RE_FUNCTIONNAME" in conf and conf["RE_FUNCTIONNAME"]:
-                for token in cfg.tokenlist:
-                    if token.function:
-                        if token.function.type in ('Constructor', 'Destructor', 'CopyConstructor', 'MoveConstructor'):
-                            continue
-                        retval = token.previous.str
-                        prev = token.previous
-                        while "*" in retval and len(retval.replace("*", "")) == 0:
-                            prev = prev.previous
-                            retval = prev.str + retval
-                        if debugprint:
-                            print("\t:: {} {}".format(retval, token.function.name))
-
-                        if retval and retval in conf["function_prefixes"]:
-                            if not token.function.name.startswith(conf["function_prefixes"][retval]):
-                                errors.append(reportError(
-                                    token.file, token.linenr, 'style', 'Function ' + token.function.name + ' violates naming convention'))
-                        mockToken = DataStruct(token.file, token.linenr, token.function.name)
-                        msgType = 'Function'
-                        for exp in conf["RE_FUNCTIONNAME"]:
-                            evalExpr(conf["RE_FUNCTIONNAME"], exp, mockToken, msgType, errors)
-
-            # Check Class naming
-            if "RE_CLASS_NAME" in conf and conf["RE_CLASS_NAME"]:
-                for fnc in cfg.functions:
-                    # Check if it is Constructor/Destructor
-                    if fnc.type == 'Constructor' or fnc.type == 'Destructor':
-                        mockToken = DataStruct(fnc.tokenDef.file, fnc.tokenDef.linenr, fnc.name)
-                        msgType = 'Class ' + fnc.type
-                        for exp in conf["RE_CLASS_NAME"]:
-                            evalExpr(conf["RE_CLASS_NAME"], exp, mockToken, msgType, errors)
-    return errors
+def check_variable_naming(conf,cfg,debugprint):
+    for var in cfg.variables:
+        if not var.nameToken:
+            continue
+        if var.access in ('Global','Public','Private'):
+            continue
+        prev = var.nameToken.previous
+        varType = prev.str
+        while "*" in varType and len(varType.replace("*", "")) == 0:
+            prev = prev.previous
+            varType = prev.str + varType
+
+        if debugprint:
+            print("Variable Name: " + str(var.nameToken.str))
+            print("original Type Name: " + str(var.nameToken.valueType.originalTypeName))
+            print("Type Name: " + var.nameToken.valueType.type)
+            print("Sign: " + str(var.nameToken.valueType.sign))
+            print("variable type: " + varType)
+            print("\n")
+            print("\t-- {} {}".format(varType, str(var.nameToken.str)))
+
+        if conf.skip_one_char_variables and len(var.nameToken.str) == 1:
+            continue
+        if varType in conf.variable_prefixes:
+            prefix = conf.variable_prefixes[varType]
+            if not var.nameToken.str.startswith(prefix):
+                reportNamingError(var.typeStartToken,
+                                    'Variable ' +
+                                    var.nameToken.str +
+                                    ' violates naming convention',
+                                    column=var.nameToken.column)
+
+        mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str, var.nameToken.column)
+        for exp in conf.variable:
+            evalExpr(conf.variable, exp, mockToken, 'Variable')
+
+# Naming check for Global, Private and Public member variables
+def check_gpp_naming(conf_list,cfg,access,message):
+    for var in cfg.variables:
+        if var.access != access:
+            continue
+        mockToken = DataStruct(var.typeStartToken.file, var.typeStartToken.linenr, var.nameToken.str, var.nameToken.column)
+        for exp in conf_list:
+            evalExpr(conf_list, exp, mockToken, message)
 
+def check_function_naming(conf,cfg,debugprint):
+    for token in cfg.tokenlist:
+        if not token.function:
+            continue
+        if token.function.type in ('Constructor', 'Destructor', 'CopyConstructor', 'MoveConstructor'):
+            continue
+        retval = token.previous.str
+        prev = token.previous
+        while "*" in retval and len(retval.replace("*", "")) == 0:
+            prev = prev.previous
+            retval = prev.str + retval
+        if debugprint:
+            print("\t:: {} {}".format(retval, token.function.name))
+
+        if retval and retval in conf.function_prefixes:
+            if not token.function.name.startswith(conf.function_prefixes[retval]):
+                reportNamingError(token, 'Function ' + token.function.name + ' violates naming convention', column=token.column)
+        mockToken = DataStruct(token.file, token.linenr, token.function.name, token.column)
+        msgType = 'Function'
+        for exp in conf.function_name:
+            evalExpr(conf.function_name, exp, mockToken, msgType)
+
+def check_class_naming(conf,cfg):
+    for fnc in cfg.functions:
+        if fnc.type not in ('Constructor','Destructor'):
+            continue
+        mockToken = DataStruct(fnc.tokenDef.file, fnc.tokenDef.linenr, fnc.name, fnc.tokenDef.column)
+        msgType = 'Class ' + fnc.type
+        for exp in conf.class_name:
+            evalExpr(conf.class_name, exp, mockToken, msgType)
+
+def process_data(conf,data,cli,debugprint):
+    if conf.file:
+        check_file_naming(conf,data)
+
+    if conf.namespace:
+        check_namespace_naming(conf,data)
+
+    unguarded_include_files = []
+    if conf.include_guard and conf.include_guard.get('required',1):
+        unguarded_include_files = [fn for fn in data.files if re.match(conf.include_guard_header_re,fn)]
+
+    for cfg in data.configurations:
+        if not cli:
+            print('Checking config %s...' % cfg.name)
+        if conf.variable:
+            check_variable_naming(conf,cfg,debugprint)
+        if conf.private_member:
+            check_gpp_naming(conf.private_member,cfg,'Private','Private member variable')
+        if conf.public_member:
+            check_gpp_naming(conf.public_member,cfg,'Public','Public member variable')
+        if conf.global_variable:
+            check_gpp_naming(conf.global_variable,cfg,'Global','Global variable')
+        if conf.function_name:
+            check_function_naming(conf,cfg,debugprint)
+        if conf.class_name:
+            check_class_naming(conf,cfg)
+        if conf.include_guard:
+            check_include_guards(conf,cfg,unguarded_include_files)
+
+    for fn in unguarded_include_files:
+        mockToken = DataStruct(fn,0,os.path.basename(fn))
+        reportNamingError(mockToken,'Missing include guard','includeGuardMissing')
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Naming verification')
-    parser.add_argument('dumpfiles', type=str, nargs='+',
-                        help='A set of dumpfiles to process')
+    parser = cppcheckdata.ArgumentParser()
     parser.add_argument("--debugprint", action="store_true", default=False,
                         help="Add debug prints")
-    parser.add_argument("--configfile", type=str, default="naming.json",
+    parser.add_argument("--configfile", type=str, default="namingng.config.json",
                         help="Naming check config file")
-    parser.add_argument("--verify", action="store_true", default=False,
-                        help="verify this script. Must be executed in test folder !")
 
     args = parser.parse_args()
-    errors = process(args.dumpfiles, args.configfile, args.debugprint)
-
-    if args.verify:
-        print(errors)
-        if len(errors) < 6:
-            print("Not enough errors found")
-            sys.exit(1)
-        target = [
-         '[namingng_test.c:8] ( style ) naming.py: Variable badui32 violates naming convention\n',
-         '[namingng_test.c:11] ( style ) naming.py: Variable a violates naming convention\n',
-         '[namingng_test.c:29] ( style ) naming.py: Variable badui32 violates naming convention\n',
-         '[namingng_test.c:20] ( style ) naming.py: Function ui16bad_underscore violates naming convention\n',
-         '[namingng_test.c:25] ( style ) naming.py: Function u32Bad violates naming convention\n',
-         '[namingng_test.c:37] ( style ) naming.py: Function Badui16 violates naming convention\n']
-        diff = set(errors) - set(target)
-        if len(diff):
-            print("Not the right errors found {}".format(str(diff)))
-            sys.exit(1)
-        print("Verification done\n")
-        sys.exit(0)
-
-    if len(errors):
-        print('Found errors: {}'.format(len(errors)))
-        sys.exit(1)
+    process(args.dumpfile, args.configfile, args.cli, args.debugprint)
 
     sys.exit(0)
diff --git a/addons/runaddon.py b/addons/runaddon.py
index 536abe864f7..26ad7e9fa73 100644
--- a/addons/runaddon.py
+++ b/addons/runaddon.py
@@ -1,4 +1,8 @@
-import cppcheckdata, cppcheck, runpy, sys, os
+import cppcheckdata
+import cppcheck
+import runpy
+import sys
+import os
 
 if __name__ == '__main__':
     addon = sys.argv[1]
diff --git a/addons/test/misra/config1.c b/addons/test/misra/config1.c
new file mode 100644
index 00000000000..31aa2a4d6b5
--- /dev/null
+++ b/addons/test/misra/config1.c
@@ -0,0 +1,10 @@
+
+struct S {
+    uint32_t some[100];
+};
+
+void foo( void )
+{
+    if (((S *)0x8000)->some[0] != 0U) { }
+}
+
diff --git a/addons/test/misra/crash10.c b/addons/test/misra/crash10.c
new file mode 100644
index 00000000000..455d86e57ec
--- /dev/null
+++ b/addons/test/misra/crash10.c
@@ -0,0 +1,12 @@
+//#12267
+
+extern uint32_t end;
+
+//#define KEEP // if uncomment this then wont crash
+
+KEEP static const int32_t ptr_to_end = &end;
+
+void foo(void)
+{
+    (void)ptr_to_end;
+}
diff --git a/addons/test/misra/crash11.c b/addons/test/misra/crash11.c
new file mode 100644
index 00000000000..b758e69f31e
--- /dev/null
+++ b/addons/test/misra/crash11.c
@@ -0,0 +1,2 @@
+// #12651
+__arm__
diff --git a/addons/test/misra/crash12.c b/addons/test/misra/crash12.c
new file mode 100644
index 00000000000..b16198ea2e7
--- /dev/null
+++ b/addons/test/misra/crash12.c
@@ -0,0 +1,33 @@
+// 13140
+#line 78 "tmp.h"
+typedef struct
+{
+int vara [30] ;
+int varb [5] ;
+} S0 ;
+
+
+
+typedef struct
+{
+bool var1 ;
+S2 var2 ;
+S2 var3 ;
+S2 var4 ;
+short var5 ;
+short var6 ;
+S1 var7 ;
+S1 var8 ;
+S1 var9 ;
+S1 var10 ;
+S1 var11 ;
+float var12 ;
+short var13 [ 3 ] ;
+} S3 ;
+
+#line 33 "tmp.c"
+static const S3 s3 =
+{
+0 ,
+{ 0, 0 } ,
+} ;
\ No newline at end of file
diff --git a/addons/test/misra/crash7.c b/addons/test/misra/crash7.c
new file mode 100644
index 00000000000..210cfeb4df8
--- /dev/null
+++ b/addons/test/misra/crash7.c
@@ -0,0 +1,8 @@
+
+
+static const struct id3_frametype wordlist[] =
+{
+  {0, "Encryption method registration"},
+  {1, "Popularimeter"},
+};
+
diff --git a/addons/test/misra/crash8.c b/addons/test/misra/crash8.c
new file mode 100644
index 00000000000..970d72540f0
--- /dev/null
+++ b/addons/test/misra/crash8.c
@@ -0,0 +1,10 @@
+
+struct three_d_filter_t {
+  char   name[16];
+  double elem[2];
+};
+
+static three_d_filter_t base_filters[] = {
+  {"Identity", { 1.0, 0.0 } },
+  {"Echo", { 0.4, 0.0 } }
+};
diff --git a/addons/test/misra/crash9.c b/addons/test/misra/crash9.c
new file mode 100644
index 00000000000..5abf2b8ad02
--- /dev/null
+++ b/addons/test/misra/crash9.c
@@ -0,0 +1,3 @@
+
+#line 3 "<stdout>"
+typedef int8_t flex_int8_t;
diff --git a/addons/test/misra/crash_misra9_parseInitializer.c b/addons/test/misra/crash_misra9_parseInitializer.c
new file mode 100644
index 00000000000..8e3dcfd5757
--- /dev/null
+++ b/addons/test/misra/crash_misra9_parseInitializer.c
@@ -0,0 +1,18 @@
+union {
+	struct {
+		uint8_t a;
+		uint8_t b;
+	} a;
+} bar;
+
+struct foo {
+	uint8_t a;
+	union bar w;
+	uint8_t b;
+};
+
+struct foo asdf = {
+	0,
+	{{0,0}},
+	1
+};
diff --git a/addons/test/misra/misra-ctu-1-test.c b/addons/test/misra/misra-ctu-1-test.c
index 3b708af5c20..a003e66ae01 100644
--- a/addons/test/misra/misra-ctu-1-test.c
+++ b/addons/test/misra/misra-ctu-1-test.c
@@ -1,5 +1,5 @@
 // Test with command:
-// ./cppcheck --enable=information --addon=misra --inline-suppr addons/test/misra/misra-ctu-*-test.c
+// ./cppcheck --enable=information --enable=style --addon=misra --inline-suppr addons/test/misra/misra-ctu-*-test.c
 
 #include "misra-ctu-test.h"
 
@@ -7,6 +7,9 @@ extern MISRA_2_3_A  misra_2_3_a;
 
 x = MISRA_2_5_OK_1;
 
+// cppcheck-suppress misra-c2012-20.5
+#undef MISRA_2_5_OK_3
+
 // cppcheck-suppress misra-c2012-2.3
 // cppcheck-suppress misra-c2012-5.6
 typedef int MISRA_5_6_VIOLATION;
@@ -46,3 +49,7 @@ extern int misra_8_5;
 int32_t misra_8_6 = 1;
 
 void misra_8_7_external(void) {}
+
+// #12362
+void misra_8_7_compliant( void ){}
+static void misra_8_7_call(void) { misra_8_7_compliant(); }
\ No newline at end of file
diff --git a/addons/test/misra/misra-ctu-2-test.c b/addons/test/misra/misra-ctu-2-test.c
index cae9ea82b7b..e08bd6d04a7 100644
--- a/addons/test/misra/misra-ctu-2-test.c
+++ b/addons/test/misra/misra-ctu-2-test.c
@@ -1,5 +1,5 @@
 // Test with command:
-// ./cppcheck --enable=information --addon=misra --inline-suppr addons/test/misra/misra-ctu-*-test.c
+// ./cppcheck --enable=information --enable=style --addon=misra --inline-suppr addons/test/misra/misra-ctu-*-test.c
 
 #include "misra-ctu-test.h"
 
@@ -43,7 +43,9 @@ extern int misra_8_5;
 // cppcheck-suppress misra-c2012-8.4
 // cppcheck-suppress misra-c2012-8.6
 int32_t misra_8_6 = 2;
-
+int32_t misra_8_6_1;
+// cppcheck-suppress misra-c2012-8.7
+int32_t misra_8_6_1 = 2;
 // cppcheck-suppress misra-c2012-8.4
 // cppcheck-suppress misra-c2012-8.7
 void misra_8_7(void) {}
@@ -52,3 +54,6 @@ static void misra_8_7_caller(void) {
     misra_8_7_external();
 }
 
+// #12362
+typedef void(*misra_8_7_func_ptr)( void );
+static const misra_8_7_func_ptr ptrs[] = { misra_8_7_compliant, NULL };
\ No newline at end of file
diff --git a/addons/test/misra/misra-ctu-test.h b/addons/test/misra/misra-ctu-test.h
index c9d2a7ba8a0..803e850b1f2 100644
--- a/addons/test/misra/misra-ctu-test.h
+++ b/addons/test/misra/misra-ctu-test.h
@@ -18,4 +18,7 @@ void misra_8_7_external(void);
 // cppcheck-suppress misra-c2012-2.5
 #define MISRA_2_5_VIOLATION 0
 
+// #12362
+extern void misra_8_7_compliant( void );
 
+#define MISRA_2_5_OK_3 This
\ No newline at end of file
diff --git a/addons/test/misra/misra-suppressions1-test.c b/addons/test/misra/misra-suppressions1-test.c
index 6c86495ced3..403d71f73ea 100644
--- a/addons/test/misra/misra-suppressions1-test.c
+++ b/addons/test/misra/misra-suppressions1-test.c
@@ -4,6 +4,7 @@
 
 // This needs to stay at line number 7 to make the test pass
 // If it is changed update suppressions.txt with the new line number
+// cppcheck-suppress-file misra-c2012-5.2
 #include <stdio.h> //21.6
 
 extern int misra_5_2_var_hides_var______31x;//8.4
@@ -13,6 +14,8 @@ static void misra_5_2_function_hides_var_31y(void) {}//5.2
 static void foo(void)
 {
   int i;
+  // cppcheck-suppress-begin misra-c2012-16.4
+  // cppcheck-suppress misra-c2012-16.6
   switch(misra_5_2_func1()) //16.4 16.6
   {
     case 1:
@@ -21,13 +24,14 @@ static void foo(void)
       {
         for(i = 0; i < 10; i++)
         {
-          if(misra_5_2_func3()) //14.4
+          if(misra_5_2_func3()) //17.3
           {
             int misra_5_2_var_hides_var_1____31x;
             int misra_5_2_var_hides_var_1____31y;//5.2
           }
         }
-      } while(misra_5_2_func2()); //14.4
+      } while(misra_5_2_func2()); //17.3
     }
   }
+  // cppcheck-suppress-end misra-c2012-16.4
 }
diff --git a/addons/test/misra/misra-suppressions2-test.c b/addons/test/misra/misra-suppressions2-test.c
index e32e2ab9781..79d3f68191e 100644
--- a/addons/test/misra/misra-suppressions2-test.c
+++ b/addons/test/misra/misra-suppressions2-test.c
@@ -2,6 +2,7 @@
 // ../../cppcheck --suppressions-list=suppressions.txt --dump misra-suppressions*-test.c && python ../misra.py misra-suppressions*-test.c.dump
 // There should be no violations reported
 
+// cppcheck-suppress-file misra-c2012-5.2
 union misra_5_2_field_hides_field__63x { //19.2
 int misra_5_2_field_hides_field__31x;
 int misra_5_2_field_hides_field__31y;//5.2
diff --git a/addons/test/misra/misra-test-avr8.c b/addons/test/misra/misra-test-avr8.c
index e5ba751d496..faa6eb6b615 100644
--- a/addons/test/misra/misra-test-avr8.c
+++ b/addons/test/misra/misra-test-avr8.c
@@ -1,12 +1,26 @@
 // To test:
-// ~/cppcheck/cppcheck --addon=misra --platform=avr8 misra-test-avr8.c
+// ~/cppcheck/cppcheck--dump -DDUMMY --suppress=uninitvar misra/misra-test-avr8.c --std=c89 --platform=avr8 && python3 ../misra.py -verify misra/misra-test-avr8.c.dump
 
 static void misra_10_4(void)
 {
     // #10480
-    const char buf[1] = {'f'};
+    const char buf1[1] = {a};
     const char c = '0';
-    x = buf[0] - c;
+    x = buf1[0] - c;
+
+    const char buf2[2] = {x,y};
+    x = 'a' == buf2[0]; // no-warning
+
+    typedef struct  {
+      int t;
+      char buf[2];
+    } foo_t;
+    const foo_t cmd = {0};
+    x = 'b' == cmd.buf[0]; // no-warning
+
+    const foo_t * pcmd = &cmd;
+    x='c' == pcmd->buf[0]; // no-warning
+    (void)cmd.t;
 }
 
 static void misra_12_2(void) {
diff --git a/addons/test/misra/misra-test-c11.c b/addons/test/misra/misra-test-c11.c
new file mode 100644
index 00000000000..031bc361e5f
--- /dev/null
+++ b/addons/test/misra/misra-test-c11.c
@@ -0,0 +1,25 @@
+// To test:
+// ~/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 <stdint.h>
+
+typedef unsigned int UINT_TYPEDEF;
+struct struct_with_bitfields
+{
+  unsigned int a:2; // Compliant
+  signed int   b:2; // Compliant
+  UINT_TYPEDEF c:2; // Compliant
+  int          d:2; // 6.1 - plain int not compliant
+  signed long  f:2; // Compliant in c99 or later - explicitly signed integer type
+  unsigned int g:1; // Compliant
+  signed int   h:1; // 6.2 - signed int with size 1 is not compliant
+  uint16_t     i:1; // Compliant
+  bool         j:1; // Compliant in C99 or later
+};
+
+static void misra6_1_fn(void) {
+    // "Use" occurrence should not generate warnings
+    struct_with_bitfields s;
+    s.h = 61;
+}
diff --git a/addons/test/misra/misra-test.c b/addons/test/misra/misra-test.c
index 2fd30c7e707..743637117a5 100644
--- a/addons/test/misra/misra-test.c
+++ b/addons/test/misra/misra-test.c
@@ -2,6 +2,8 @@
 // ~/cppcheck/cppcheck --dump misra/misra-test.h --std=c89
 // ~/cppcheck/cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test.c --std=c89 --platform=unix64 && python3 ../misra.py -verify misra/misra-test.c.dump
 
+#pragma ghs section rodata=default // no warning
+
 #include "path\file.h" // 20.2
 #include "file//.h" // 20.2
 #include "file/*.h" // 20.2
@@ -35,8 +37,8 @@
 
 #include <setjmp.h> // 21.4
 #include <signal.h> // 21.5
-#include <stdio.h> //21.6
-#include <wchar.h> //21.6
+#include <stdio.h>
+#include <wchar.h>
 #include <time.h> // 21.10
 #include <tgmath.h> // 21.11
 #include <fenv.h>
@@ -58,11 +60,17 @@ typedef unsigned int       u32;
 typedef signed int         s32;
 typedef unsigned long long u64;
 
+static void misra_1_2(bool expr)
+{
+    (void)(condition ? : 0); // 1.2
+    a = 1 + ({if (!expr) {code;} 1;}); // 1.2
+}
+
 static _Atomic int misra_1_4_var; // 1.4
 static _Noreturn void misra_1_4_func(void) // 1.4
 {
-    if (0 != _Generic(misra_1_4_var)) {} // 1.4
-    printf_s("hello"); // 1.4
+    if (0 != _Generic(misra_1_4_var)) {} // 1.4 17.3
+    printf_s("hello"); // 1.4 17.3
 }
 
 #define MISRA_2_2 (1*60)
@@ -113,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);
-}
-
 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
@@ -146,7 +138,7 @@ static void misra_5_2_function_hides_var_31y(void) {}//5.2
 static void foo(void)
 {
   int i;
-  switch(misra_5_2_func1()) //16.4 16.6
+  switch(misra_5_2_func1()) //16.4 16.6 17.3
   {
     case 1:
     {
@@ -154,13 +146,13 @@ static void foo(void)
       {
         for(i = 0; i < 10; i++)
         {
-          if(misra_5_2_func3()) //14.4
+          if(misra_5_2_func3()) //17.3
           {
             int misra_5_2_var_hides_var_1____31x;
             int misra_5_2_var_hides_var_1____31y;//5.2
           }
         }
-      } while(misra_5_2_func2()); //14.4
+      } while(misra_5_2_func2()); //17.3
     }
     break;
   }
@@ -201,9 +193,9 @@ int c41_15         = 'a'; // 10.3 8.4
 
 static void misra_4_1(void)
 {
-    (void)printf("\x41g"); // 4.1
-    (void)printf("\x41\x42");
-    (void)printf("\x41" "g");
+    (void)printf("\x41g"); // 4.1 21.6
+    (void)printf("\x41\x42"); //21.6
+    (void)printf("\x41" "g"); //21.6
 }
 
 const char *s42_1 = "String containing trigraphs ??-??-??";   // 4.2 8.4
@@ -212,8 +204,8 @@ const char *s42_3 = "No trigraph?(?'?)"; // 8.4
 
 static void misra_4_2(void)
 {
-    (void)printf("??=Trigraph\n");   // 4.2
-    (void)printf("No?/Trigraph\n");
+    (void)printf("??=Trigraph\n");   // 4.2 21.6
+    (void)printf("No?/Trigraph\n"); //21.6
 }
 
 #define misra_5_4_macro_hides_macro__31x 1
@@ -240,17 +232,17 @@ int x;
 };
 static void misra_5_5_func1(void)
 {
-  switch(misra_5_5_func2()) //16.4 16.6
+  switch(misra_5_5_func2()) //16.4 16.6 17.3
   {
     case 1:
     {
       do
       {
-        if(misra_5_5_func3()) //14.4
+        if(misra_5_5_func3()) //17.3
         {
           int misra_5_5_hides_macro________31y; //5.5
         }
-      } while(misra_5_5_func2()); //14.4
+      } while(misra_5_5_func2()); //17.3
     }
     break;
   }
@@ -267,6 +259,7 @@ struct struct_with_bitfields
   unsigned int g:1; // Compliant
   signed int   h:1; // 6.2 - signed int with size 1 is not compliant
   uint16_t     i:1; // Compliant
+  bool         j:1; // 6.1 - bool not legal until c99
 };
 
 static void misra6_1_fn(void) {
@@ -293,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) {
@@ -352,7 +359,7 @@ static int misra_8_2_g ( /* comment */ ); // 8.2
 static int misra_8_2_h ( /* comment 1 */ /* comment 2 */ ); // 8.2
 static int misra_8_2_i ( /* comment */ void);
 static int misra_8_2_j ( /* comment */ void /* comment */);
-static int misra_8_2_k ( // 
+static int misra_8_2_k ( //
  void);
 static int misra_8_2_l ( // 8.2
 );
@@ -389,6 +396,13 @@ uint8_t misra_8_4_buf2[24]; // 8.4
 typedef struct { uint16_t a; uint16_t b; } misra_8_4_struct;
 extern misra_8_4_struct bar[42];
 misra_8_4_struct bar[42]; // compliant
+extern uint16_t misra_8_4_speed = 6000u; //8.4
+uint8_t misra_8_4_pressure = 101u; //8.4
+int32_t misra_8_4_ext_val2;
+int32_t misra_8_4_ext_val2 = 3; // compliant
+int32_t misra_8_4_ext_val4; //8.4
+// #12978
+const stError_t * m8_4_pubTestPointer; //compliant
 
 static int32_t misra_8_8 = 123;
 extern int32_t misra_8_8; // 8.8
@@ -412,6 +426,21 @@ static void misra_8_14(char * restrict str) {(void)str;} // 8.14
 struct S_9_3 { struct S_9_3* p; int x; };
 struct S_9_3* s_9_3_array[] = { x, NULL }; // 8.4
 
+// #10854
+struct Entry_9_2{
+    union{ // 19.2
+        const int *p;
+        int x;
+    };
+    int y;
+};
+
+static void misra_9_2_10854(void){
+    struct Entry_9_2 e1[] =
+    {
+        {{ .x = 1 }, .y = 2 }
+    };
+}
 static void misra_9_empty_or_zero_initializers(void) {
     int a[2]    = {};                          // 9.2
     int b[2][2] = {};                          // 9.2
@@ -420,6 +449,10 @@ static void misra_9_empty_or_zero_initializers(void) {
     int e[2][2] = { { 1 , 2 }, {} };           // 9.2
 
     int f[5]    = { 0 };
+    int f1[5]   = { 0u };                     // 9.3
+    unsigned int f1[ 3 ][ 2 ] = { 0U };       // 9.3 9.2
+    unsigned int f2[ 3 ] = { 0U };            // 9.3
+    float f3[ 3 ][ 2 ]  = { 0.0F };           // 9.3 9.2
     int g[5][2] = { 0 };
     int h[2][2] = { { 0 } };                   // 9.3
     int i[2][2] = { { 0 }, { 0 } };
@@ -476,6 +509,7 @@ static void misra_9_array_initializers_with_designators(void) {
     char    c[2][2]     = { [0] = {1, 2, 3} };
     char    d[1][2]     = { [0] = 1 };                                      // 9.2
     char    e[2][2]     = { { 1, 2 }, [1][0] = {3, 4} };                    // 9.2
+    int     e1[2][2]    = { [ 0 ][ 1 ] = 0, { 5, 6 } };                     // no warning #12419
     char    f[2]        = { [0] = 1, 2 };
     char    g[2]        = { [1] = 2, [0] = 1 };
     char    h[2][2]     = { { 1, 2 }, [1] = { 3 } };                        // 9.3
@@ -572,13 +606,13 @@ static void misra_9_struct_initializers(void) {
     // Struct with fields of unknown type
     struct_with_unknown_fields ufa       = { 1, { 1, 2 }, { 1, 2 } };
     struct_with_unknown_fields ufb       = { 1, 1, 2 };                     // 9.2
-    struct_with_unknown_fields[2] ufc    = { {1, { 1, 2 }, { 1, 2 } },
+    struct_with_unknown_fields ufc[2]    = { {1, { 1, 2 }, { 1, 2 } },
                                              { 2, { 1, 2 }, { 1, 2 } } };
-    struct_with_unknown_fields[2][2] ufd = { {1, { 1, 2 }, { 1, 2 } },
+    struct_with_unknown_fields ufd[2][2] = { {1, { 1, 2 }, { 1, 2 } },      // 9.2 9.3
                                              { 2, { 1, 2 }, { 1, 2 } } };
-    struct_with_unknown_fields[2] ufe    = { 1, { 1, 2 }, { 1, 2 },         // TODO: 9.2
+    struct_with_unknown_fields ufe[2]    = { 1, { 1, 2 }, { 1, 2 },         // 9.2 9.3
                                              2, { 1, 2 }, { 1, 2 } };
-    struct_with_unknown_fields[3] uff    = { { 1, { 1, 2 }, { 1, 2 }},      // TODO: 9.3 9.4
+    struct_with_unknown_fields uff[3]    = { { 1, { 1, 2 }, { 1, 2 }},      // 9.3 9.4
                                              {2, { 1, 2 }, { 1, 2 }},
                                              [1] = { 2, { 1, 2 }, { 1, 2 }} };
 
@@ -644,21 +678,21 @@ static void misra_10_1_ternary(void)
     int16_t i16;
 
     a = ui16 << ui16; // 10.6
-    a = ui16 << (get_bool(42) ? ui16 : ui16);
-    a = ui16 << (get_bool(42) ? ui16 : (get_bool(34) ? ui16 : ui16)); // 10.4
-    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : ui16); // 10.4
-    a = ui16 << (get_bool(42) ? i16 : (get_bool(34) ? ui16 : ui16)); // 10.1
-    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : i16) : ui16); // 10.1 10.4
-    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : i16); // 10.1
-    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8); // 10.4
-    a = ui16 << (get_bool(42) ? (get_bool(34) ? i16 : ui8) : ui8); // 10.1 10.4
-    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8) << ui16; // 10.4
-    a = (get_bool(42) ? (get_bool(34) ? i16 : ui8) : ui8) << ui16; // 10.1 10.4
-    a = (get_bool(42) ? (get_bool(34) ? ui16 : i8) : ui8) << ui16; // 10.1 10.4
-    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : i8) << ui16; // 10.1
-    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8) << (get_bool(19) ? ui16 : ui8); // 10.4
-    a = (get_bool(42) ? (get_bool(34) ? i16 : ui8) : ui8) << (get_bool(19) ? ui16 : ui8); // 10.1 10.4
-    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8) << (get_bool(19) ? i16 : ui8); // 10.1 10.4
+    a = ui16 << (get_bool(42) ? ui16 : ui16); // 17.3
+    a = ui16 << (get_bool(42) ? ui16 : (get_bool(34) ? ui16 : ui16)); // 17.3
+    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : ui16); // 17.3
+    a = ui16 << (get_bool(42) ? i16 : (get_bool(34) ? ui16 : ui16)); // 10.1 10.4 17.3
+    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : i16) : ui16); // 10.1 10.4 17.3
+    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : i16); // 10.1 10.4 17.3
+    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8); // 10.4 17.3
+    a = ui16 << (get_bool(42) ? (get_bool(34) ? i16 : ui8) : ui8); // 10.1 10.4 17.3
+    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8) << ui16; // 10.4 17.3
+    a = (get_bool(42) ? (get_bool(34) ? i16 : ui8) : ui8) << ui16; // 10.1 10.4 17.3
+    a = (get_bool(42) ? (get_bool(34) ? ui16 : i8) : ui8) << ui16; // 10.1 10.4 17.3
+    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : i8) << ui16; // 10.1 17.3
+    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8) << (get_bool(19) ? ui16 : ui8); // 10.4 17.3
+    a = (get_bool(42) ? (get_bool(34) ? i16 : ui8) : ui8) << (get_bool(19) ? ui16 : ui8); // 10.1 10.4 17.3
+    a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8) << (get_bool(19) ? i16 : ui8); // 10.1 10.4 17.3
 }
 
 static void misra_10_2(void) {
@@ -690,6 +724,8 @@ static void misra_10_3(uint32_t u32a, uint32_t u32b) {
     res = 2U + 3U; // no warning, utlr=unsigned char
     res = 0.1f; // 10.3
     const char c = '0'; // no-warning
+    bool b = true; // no-warning
+    uint32_t u = UINT32_C(10); // no-warning
 }
 
 static void misra_10_4(u32 x, s32 y) {
@@ -703,12 +739,26 @@ static void misra_10_4(u32 x, s32 y) {
   z = x + y; //10.4
   z = (a == misra_10_4_A3) ? x : y; //10.4
   z = (a == misra_10_4_A3) ? y : y; // no-warning
-  
+
   // #10499
   const char buf[10] = {0};
   if ('0' == buf[x]) // no-warning
   {
   }
+
+  const struct foo_s{
+    int t;
+    char buf[2];
+  } cmd = {0};
+  if ('\0' == cmd.buf[0]) //no-warning
+  {
+  }
+
+  // #10652
+  char c;
+  if ((char)'1' == c) {}            // no warning
+  if ((unsigned char)'1' == c) {}   //10.4
+  if ((signed char)'1' == c) {}     //10.4
 }
 
 static void misra_10_5(uint16_t x) {
@@ -727,8 +777,9 @@ struct misra_10_6_s {
 static void misra_10_6(u8 x, char c1, char c2) {
   u16 y1 = x+x; // 10.6
   u16 y2 = (0x100u - 0x80u); // rhs is not a composite expression because it's a constant expression
+  int b = (y2 == y2) ? 0 : 1; // no-warning
   u16 z = ~u8 x ;//10.6
-  s32 i = c1 - c2; // 10.3 FIXME: False positive for 10.6 (this is compliant). Trac #9488
+  s32 i = c1 - c2; // 10.3
   struct misra_10_6_s s;
   s.a = x & 1U; // no-warning (#10487)
 }
@@ -746,7 +797,7 @@ static void misra_10_7(uint16_t u16a, uint16_t u16b) {
     res = u32a * (u16a + u16b); // 10.7
     u32a *= u16a + u16b; // 10.7
     u32a = ((uint32_t)4 * (uint32_t)2 * (uint32_t)4 ); // no-warning (#10488)
-    dostuff(&t, (2*60*1000)); // no-warning
+    dostuff(&t, (2*60*1000)); // 17.3 no-warning
 }
 
 static void misra_10_8(u8 x, s32 a, s32 b) {
@@ -758,6 +809,13 @@ static void misra_10_8(u8 x, s32 a, s32 b) {
 int (*misra_11_1_p)(void); // 8.4
 void *misra_11_1_bad1 = (void*)misra_11_1_p; // 11.1 8.4
 
+// #12172
+typedef void (*pfFunc_11_1)(uint32_t some);
+extern pfFunc_11_1 data_11_1[10];
+void func_11_1(pfFunc_11_1 ptr){ //8.4
+    data_11_1[index] = ptr; // no-warning
+}
+
 struct misra_11_2_s;
 struct misra_11_2_t;
 
@@ -770,12 +828,15 @@ static void misra_11_3(u8* p, struct Fred *fred) {
   struct Wilma *wilma = (struct Wilma *)fred; // 11.3
 }
 
+typedef struct { uint32_t something; } struct_11_4;
+#define A_11_4 ((struct_11_4 *)0x40000U)  // 11.4
+
 static void misra_11_4(u8*p) {
   u64 y = (u64)p; // 11.4
   u8 *misra_11_4_A = ( u8 * ) 0x0005;// 11.4
   s32 misra_11_4_B;
   u8 *q = ( u8 * ) misra_11_4_B; // 11.4
-
+  dummy = A_11_4->something; // no-warning
 }
 
 static void misra_11_5(void *p) {
@@ -784,12 +845,21 @@ static void misra_11_5(void *p) {
   p16 = p;     // 11.5
 }
 
+static intptr_t get_intptr_constant(void) { return 456; }
 static void misra_11_6(void) {
   void *p;
+  struct {
+    int i;
+  } s = { .i = 7 };
   p = (void*)123;  // 11.6
   x = (u64)p;      // 11.6
+  p = (void*)(1+1);// 11.6
+  p = (void*)get_intptr_constant(); // 11.6
+  p = (void*)s.i;  // 11.6
   p = ( void * )0; // no-warning
   (void)p;         // no-warning
+  // # 12184
+  p = (void*)0U;   // no-warning
 }
 
 
@@ -893,9 +963,9 @@ void misra_12_3(int a, int b, int c) {
   int a41 = MISRA_12_3_FN3_2(a34, a35), a42; // 12.3
   int a43, a44 = MISRA_12_3_FN3_2(a34, a35); // 12.3
 
-  MISRA_12_3_FN3_2_MSG(fprintf(stderr, "test\n")); // 12.3
-
-  f((1,2),3); // TODO
+  MISRA_12_3_FN3_2_MSG(fprintf(stderr, "test\n")); // 12.3 21.6
+  // TODO
+  f((1,2),3);  // 17.3
 
   // third clause: 2 persistent side effects instead of 1 (14.2)
   for (i=0; i<10; i++, j++){} // 12.3 14.2
@@ -909,8 +979,8 @@ void misra_12_3(int a, int b, int c) {
   misra_12_3_fn4(misra_12_3_fn7(&a1, 32), &a1);
   misra_12_3_fn6(misra_12_3_fn5(&a1, 32), &a1);
   misra_12_3_fn6(misra_12_3_fn7(&a1, 32), &a1);
-  misra_12_3_fn7(maxlen, fn(va, unsigned long), false);
-  misra_12_3_fn8(maxlen, (unsigned long)((uintptr_t)fn(va, void*)), false);
+  misra_12_3_fn7(maxlen, fn(va, unsigned long), false); // 17.3 
+  misra_12_3_fn8(maxlen, (unsigned long)((uintptr_t)fn(va, void*)), false); // 17.3
 
   const struct fun_t
   {
@@ -930,6 +1000,9 @@ static void misra_12_4(uint8_t t) {
   x = MISRA12_4a + MISRA12_4b; // 12.4
   x = 0u - 1u; // 12.4
   x = t ? 0u : (0u-1u); // 12.4
+  x = (0u==0u) ? 0u : (0u-1u);
+  x = (0u!=0u) ? 0u : (0u-1u); // 12.4
+  x = (0u==0u) ? 0u : (2*(0u-1u)); // 10.4
 }
 
 struct misra_13_1_t { int a; int b; };
@@ -1122,12 +1195,15 @@ static s13_4_t s13_4 =
     .string = STRING_DEF_13_4 // no-warning
 };
 
-static void misra_13_4(void) {
+static void misra_13_4(int x, int z) {
+  int y;
   if (x != (y = z)) {} // 13.4
   else {}
 }
 
 static void misra_13_5(void) {
+  int x = 0;
+  int y = 0;
   if (x && (y++ < 123)){} // 13.5
   if (x || ((y += 19) > 33)){} // 13.5
   if (x || ((y = 25) > 33)){} // 13.5 13.4
@@ -1155,13 +1231,42 @@ static void misra_14_1(void) {
   } while ( a < 10.0f );  // no-warning
 
 }
+//13143
+static bool misra_14_1_is_increasing (const double* const x, const size_t n)
+{
+    double last = -INFINITY;
+    size_t i = ((size_t) 0);
+    while ((i < n) && isfinite(x[i]) && (x[i] > last)) { //no-warning for 14_1
+       last = x[i];
+       i++;
+    }
+    return i == n;
+}
+
+static void misra_14_1_compliant1_foo(float x){
+    int i = 0;
+    while(i < x){ // 10.4
+        i += x + x; // 10.3 10.4 no-warning for 14_1
+    }
+}
 
+static void misra_14_1_compliant2_foo(void){
+    int i = 0;
+    float f = 0f;
+    while (f < 10 && i < 10) { //10.4 12.1
+        float f = 0f;
+        f = f + i; // 10.3 10.4 no warning for 14_1
+        i++;
+    }
+}
 static void misra_14_2_init_value(int32_t *var) {
     *var = 0;
 }
+static void misra_14_2_init_value_1(int32_t *var);
+
 static void misra_14_2_fn1(bool b) {
   for (;i++<10;) {} // 14.2
-  for (;i<10;dostuff()) {} // 14.2
+  for (;i<10;dostuff()) {} // 14.2 17.3
   int32_t g = 0;
   int g_arr[42];
   g += 2; // no-warning
@@ -1171,12 +1276,15 @@ static void misra_14_2_fn1(bool b) {
     g += 2;
     i2 ^= 2; // 14.2
     if (i2 == 2) {
-      g += g_arr[i2];
+      g += g_arr[i2]; // cppcheck-suppress legacyUninitvar
     }
     misra_14_2_init_value(&i2); // TODO: Fix false negative in function call
   }
-
-  for (misra_14_2_init_value(&i); i < 10; ++i) {} // no-warning FIXME: False positive for 14.2 Trac #9491
+  int i1;
+  int i2;
+  for (misra_14_2_init_value(&i1); i1 < 10; ++i1) {} // no-warning
+  for (misra_14_2_init_value_1(&i2); i2 < 10; ++i2) {} // no-warning
+  for (misra_14_2_init_value_2(&i2); i2 < 10; ++i2) {} // 17.3 no-warning
 
   bool abort = false;
   for (i = 0; (i < 10) && !abort; ++i) { // 14.2 as 'i' is not a variable
@@ -1226,6 +1334,17 @@ static void misra_14_2_fn1(bool b) {
           }
       }
   }
+
+  static struct
+  {
+    uint16_t block;
+    bool readSuccessful;
+    int32_t i;
+  }
+  opState;
+  for (opState.block = 0U; opState.block < 10U; opState.block++) {;} //no-warning
+
+  for (misra_14_2_init_value(&opState.i); opState.i < 10; ++opState.i) {} //no-warning
 }
 static void misra_14_2_fn2(void)
 {
@@ -1276,13 +1395,26 @@ struct {
   unsigned int y:1;
 } r14_4_struct; // 8.4
 static void misra_14_4(bool b) {
-  if (x+4){} // 14.4
+  if (x+4){} //config
   else {}
 
   if (b) {}
   else {}
 
   if (r14_4_struct.x) {}
+
+  // #12079
+  if (z) {} //config
+}
+
+// #12417
+struct bar_12417{ int a; };
+static int foo_12417(void){
+    int ret = 1;
+    if (sizeof(struct bar_12417) == 0U){ // no warning for misra-config
+        ret = 0;
+    }
+    return ret;
 }
 
 static void misra_15_1(void) {
@@ -1295,7 +1427,9 @@ static void misra_15_2(void) {
   goto label; // 15.2 15.1
 }
 
-static void misra_15_3(void) {
+static void misra_15_3(int a) {
+  int x = 0;
+  int y;
   if (x!=0) {
     goto L1; // 15.3 15.1
     if (y!=0) {
@@ -1410,14 +1544,14 @@ static void misra_15_4(void) {
   }
 }
 
-static int misra_15_5(void) {
+static int misra_15_5(int x) {
   if (x!=0) {
     return 1; // 15.5
   } else {}
   return 2;
 }
 
-static void misra_15_6(void) {
+static void misra_15_6(int x) {
   if (x!=0); // 15.6
   else{}
 
@@ -1449,7 +1583,7 @@ static void misra_15_6_fp(void)
 #if defined(M_20_9) && M_20_9 > 1 // no-warning (#10380)
 #endif
 
-static void misra_15_7(void) {
+static void misra_15_7(int x, int a, int b) {
   uint32_t var = 0;
   uint32_t var2 = 0;
 
@@ -1485,7 +1619,7 @@ static void misra_16_1(int32_t i) {
   }
 }
 
-static void misra_16_2(void) {
+static void misra_16_2(int y) {
   switch (x) {
     default:
       break;
@@ -1497,7 +1631,8 @@ static void misra_16_2(void) {
   }
 }
 
-static void misra_16_3(void) {
+static void misra_16_3(int b) {
+  int a;
   switch (x) {
     case 1:
     case 2:
@@ -1639,7 +1774,7 @@ static void misra_17_1(void) {
   va_arg(); // 17.1
   va_start(); // 17.1
   va_end(); // 17.1
-  va_copy(); // 17.1
+  va_copy(); // 17.1 17.3
 }
 
 static void misra_17_2_ok_1(void) { ; }
@@ -1669,11 +1804,31 @@ static void misra_17_2_5(void) {
   misra_17_2_1(); // no-warning
 }
 
+bool (*dostuff)(); //8.2 8.4
+struct s173{
+  int a;
+  int b;
+}
+static void misra_17_3(void) {
+  if (dostuff()) {} // no-warning
+  bool a = dostuff(); // no-warning
+  dostuff2(); // 17.3
+  s173 ( *misra_8_2_p_a ) (void); // no-warning
+}
+
+static void misra_config(const char* str) {
+    if (strlen(str) > 3){} //10.4
+    if (sizeof(int) > 1){} //10.4
+}
+
 static void misra_17_6(int x[static 20]) {(void)x;} // 17.6
 
 static int calculation(int x) { return x + 1; }
 static void misra_17_7(void) {
   calculation(123); // 17.7
+  int (*calc_ptr)(int) = &calculation;
+  calc_ptr(123); // 17.7
+  int y = calc_ptr(123);
 }
 
 static void misra_17_8(int x) {
@@ -1713,6 +1868,7 @@ struct {
 } r18_7_struct; // 8.4
 struct {
   uint16_t len;
+  int (*array_param_func_ptr)(char const *argv[], int argc); // no-warning
   uint8_t data_1[ 19 ];
   uint8_t data_2[   ]; // 18.7
 } r18_7_struct; // 8.4
@@ -1726,6 +1882,8 @@ static void misra_18_8(int x) {
   int buf1[10];
   int buf2[sizeof(int)];
   int vla[x]; // 18.8
+  // #9498
+  int vlb[y]; // config
   static const unsigned char arr18_8_1[] = UNDEFINED_ID;
   static uint32_t enum_test_0[R18_8_ENUM_CONSTANT_0] = {0};
 }
@@ -1801,7 +1959,7 @@ static int misra_21_1(void) {
     int _a = 42; // no warning: only directives affected
     errno = EINVAL; // no warning
     _a ++; // no warning
-    _exit(1); // no warning
+    _exit(1); // 17.3 no warning
     return _a; // no warning
 }
 static int _misra_21_1_2(void); // no warning
@@ -1865,6 +2023,24 @@ static void misra_21_16_f1(struct misra_21_16_S *s1, struct misra_21_16_S *s2) {
 static void misra_21_16_f2(char *x, char *y) {
     (void)memcmp(x, y, 10); // 21.16
 }
+typedef enum { R21_16_A, R21_16_B} r21_16_enum;
+static void misra_21_16_f3(void) {
+    int const a[2] = {0};
+    int const b[2] = {0};
+    (void)memcmp(a, b, 2); // no-warning
+    uint8_t const c[2] = {0};
+    uint8_t const d[2] = {0};
+    (void)memcmp(c, d, 2); // no-warning
+    bool const e[2] = {0};
+    bool const f[2] = {0};
+    (void)memcmp(e, f, 2); // no-warning
+    r21_16_enum const g[2] = {0};
+    r21_16_enum const h[2] = {0};
+    (void)memcmp(g, h, 2); // no-warning
+    char const i[2] = {0};
+    char const j[2] = {0};
+    (void)memcmp(i, j, 2); // 21.16
+}
 
 static void misra_21_19(void) {
     char *s = setlocale(LC_ALL,0); // 21.19
@@ -1913,4 +2089,23 @@ static void misra_22_10(void)
   errno = 0;
   f = strtod ( "A.12", NULL );
   if ( 0 == errno ) {}
+
+  // #10855
+  f = strtol(numbuf, 0, (formatHex == 0U) ? 0 : 16);
+  if (errno != 0) {}
+
+  // #11752
+  #define NULL_PTR  ((void*)0)
+  f = strtod(inStr, NULL_PTR);
+  if(errno != 0) {}
+}
+
+// #12448
+static void check_misra_config(void)
+{
+    if (sizeof(struct bar) == 0U) {} //no warning
+    if (sizeof(int abc) == 0U) {} //no warning
+    if (sizeof(xyz) == 0U) {} //no warning
+    if (sizeof(const pqr) == 0U) {} //no warning
+    if (sizeof(const int* const pqrs) == 0U) {} //no-warning
 }
diff --git a/addons/test/misra/misra-test.h b/addons/test/misra/misra-test.h
index fe5cbf5c380..b455134893c 100644
--- a/addons/test/misra/misra-test.h
+++ b/addons/test/misra/misra-test.h
@@ -4,4 +4,10 @@ struct misra_h_s { int foo; };
 bool test(char *a); // OK
 int misra_8_2_no_fp(int a);
 void misra_8_4_bar(void);
+// #12978
+typedef struct m8_4_stErrorDef
+{
+    uint8_t ubReturnVal;
+} m8_4_stErrorDef;
+extern const m8_4_stErrorDef * m8_4_pubTestPointer;
 #endif // MISRA_TEST_H
diff --git a/addons/test/misra/misra_rules_structure.txt b/addons/test/misra/misra_rules_structure.txt
index 41d2d456f85..a8223fde948 100644
--- a/addons/test/misra/misra_rules_structure.txt
+++ b/addons/test/misra/misra_rules_structure.txt
@@ -11,7 +11,10 @@ Here we go:
 Appendix A Summary of guidelines
 
 Rule 1.2
-Rule text.
+ Rule text.
+
+Rule 2.1
+Rule text for 2.1.
 
 Stop parsing after this line:
 Appendix B
diff --git a/addons/test/misra/suppressions.txt b/addons/test/misra/suppressions.txt
index 81493ae6a45..139e088552e 100644
--- a/addons/test/misra/suppressions.txt
+++ b/addons/test/misra/suppressions.txt
@@ -1,9 +1,6 @@
 misra-c2012-21.6:*/misra-suppressions1-test.c:7
-misra-c2012-14.4
-misra-c2012-5.2
+misra-c2012-17.3
 misra-c2012-8.4:*/misra-suppressions1-test.c
-misra-c2012-16.4:*/misra-suppressions1-test.c
-misra-c2012-16.6:*/misra-suppressions1-test.c
 misra-c2012-4.1:*/misra-suppressions2-test.c
 misra-c2012-8.4:*/misra-suppressions2-test.c
 misra-c2012-19.2:*/misra-suppressions2-test.c
diff --git a/addons/test/test-misra.py b/addons/test/misra_test.py
similarity index 53%
rename from addons/test/test-misra.py
rename to addons/test/misra_test.py
index ba1dbaae74a..55a24cb4b27 100644
--- a/addons/test/test-misra.py
+++ b/addons/test/misra_test.py
@@ -1,30 +1,24 @@
-# Running the test with Python 2:
-# Be sure to install pytest version 4.6.4 (newer should also work)
-# Command in cppcheck directory:
-# python -m pytest addons/test/test-misra.py
-#
 # Running the test with Python 3:
 # Command in cppcheck directory:
-# PYTHONPATH=./addons python3 -m pytest addons/test/test-misra.py
+# PYTHONPATH=./addons python3 -m pytest addons/test/misra_test.py
 
 import pytest
 import re
 import sys
+import os
 
 from .util import dump_create, dump_remove, convert_json_output
+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')]
 
-TEST_SOURCE_FILES = ['./addons/test/misra/misra-test.c']
 
-
-def setup_module(module):
-    for f in TEST_SOURCE_FILES:
-        dump_create(f)
-
-
-def teardown_module(module):
-    for f in TEST_SOURCE_FILES:
-        dump_remove(f)
+def remove_misra_config(s:str):
+    ret = ''
+    for line in s.splitlines():
+        if '[misra-config]' not in line:
+            ret += line + '\n'
+    return ret
 
 
 @pytest.fixture(scope="function")
@@ -36,11 +30,23 @@ def checker():
     return MisraChecker(settings)
 
 
+# FIXME: files are generates in the source tree so it will cause issues if tests are run with xdist.
+@pytest.fixture
+def test_files():
+    for f in TEST_SOURCE_FILES:
+        dump_create(f)
+    yield
+    for f in TEST_SOURCE_FILES:
+        dump_remove(f)
+
+
 def test_loadRuleTexts_structure(checker):
     checker.loadRuleTexts("./addons/test/misra/misra_rules_structure.txt")
     assert(checker.ruleTexts.get(101, None) is None)
     assert(checker.ruleTexts[102].text == "Rule text.")
     assert(checker.ruleTexts.get(103, None) is None)
+    assert(checker.ruleTexts[201].text == "Rule text for 2.1.")
+    assert(checker.ruleTexts.get(202, None) is None)
 
 
 def test_loadRuleTexts_empty_lines(checker):
@@ -55,7 +61,7 @@ def test_loadRuleTexts_mutiple_lines(checker):
     assert(checker.ruleTexts[102].text == "Multiple lines text.")
     assert(checker.ruleTexts[103].text == "Multiple lines text.")
     assert(checker.ruleTexts[104].text == "Should")
-    assert(checker.ruleTexts[105].text == "Should")
+    assert(checker.ruleTexts[105].text == "Should starts from lowercase letter.")
     assert(checker.ruleTexts[106].text == "Can contain empty lines.")
 
 
@@ -75,7 +81,7 @@ def test_rules_misra_severity(checker):
     assert(checker.ruleTexts[2104].misra_severity == '')
 
 
-def test_json_out(checker, capsys):
+def test_json_out(checker, capsys, test_files):
     sys.argv.append("--cli")
     checker.loadRuleTexts("./addons/test/misra/misra_rules_dummy.txt")
     checker.parseDump("./addons/test/misra/misra-test.c.dump")
@@ -88,20 +94,20 @@ def test_json_out(checker, capsys):
     assert("Advisory" in json_output['c2012-20.1'][0]['extra'])
 
 
-def test_rules_cppcheck_severity(checker, capsys):
+def test_rules_cppcheck_severity(checker, capsys, test_files):
     checker.loadRuleTexts("./addons/test/misra/misra_rules_dummy.txt")
     checker.parseDump("./addons/test/misra/misra-test.c.dump")
     captured = capsys.readouterr().err
-    assert("(error)" not in captured)
+    assert("(error)" not in remove_misra_config(captured))
     assert("(warning)" not in captured)
     assert("(style)" in captured)
 
-def test_rules_cppcheck_severity_custom(checker, capsys):
+def test_rules_cppcheck_severity_custom(checker, capsys, test_files):
     checker.loadRuleTexts("./addons/test/misra/misra_rules_dummy.txt")
     checker.setSeverity("custom-severity")
     checker.parseDump("./addons/test/misra/misra-test.c.dump")
     captured = capsys.readouterr().err
-    assert("(error)" not in captured)
+    assert("(error)" not in remove_misra_config(captured))
     assert("(warning)" not in captured)
     assert("(style)" not in captured)
     assert("(custom-severity)" in captured)
@@ -112,15 +118,13 @@ def test_rules_suppression(checker, capsys):
 
     for src in test_sources:
         re_suppressed= r"\[%s\:[0-9]+\]" % src
-        dump_remove(src)
-        dump_create(src, "--suppressions-list=addons/test/misra/suppressions.txt")
+        dump_create(src, "--suppressions-list=addons/test/misra/suppressions.txt","--inline-suppr")
         checker.parseDump(src + ".dump")
         captured = capsys.readouterr().err
         found = re.search(re_suppressed, captured)
         assert found is None, 'Unexptected output:\n' + captured
         dump_remove(src)
 
-
 def test_arguments_regression():
     args_ok = ["-generate-table",
                "--rule-texts=./addons/test/assets/misra_rules_multiple_lines.txt",
@@ -160,3 +164,81 @@ def test_arguments_regression():
             sys.argv.remove(arg)
     finally:
         sys.argv = sys_argv_old
+
+
+def test_read_ctu_info_line(checker):
+    assert checker.read_ctu_info_line('{') is None
+    assert checker.read_ctu_info_line('{"summary":"123"}') is None
+    assert checker.read_ctu_info_line('{"data":123}') is None
+    assert checker.read_ctu_info_line('{"summary":"123","data":123}') is not None
+
+def test_platform(checker):
+    test_file = os.path.join('addons','test','misra','misra-test.c')
+    dump_create(test_file, "--language=c++")
+    checker.parseDump(test_file + ".dump")
+    assert checker.is_cpp is True
+
+    dump_create(test_file, "--language=c")
+    checker.parseDump(test_file + ".dump")
+    assert checker.is_cpp is False
+
+def test_std99_identifiers():
+    for headerfile in C90_STDLIB_IDENTIFIERS:
+        for identifier in C90_STDLIB_IDENTIFIERS[headerfile]:
+            assert identifier in C99_STDLIB_IDENTIFIERS[headerfile], f"{identifier} of C90 not found in C99_STDLIB_IDENTIFIERS"
+
+def test_stdC11_identifiers():
+    for headerfile in C90_STDLIB_IDENTIFIERS:
+        for identifier in C90_STDLIB_IDENTIFIERS[headerfile]:
+            assert identifier in C99_STDLIB_IDENTIFIERS[headerfile], f"{identifier} of C90 not found in C11_STDLIB_IDENTIFIERS"
+    for headerfile in C99_STDLIB_IDENTIFIERS:
+        for identifier in C99_STDLIB_IDENTIFIERS[headerfile]:
+            assert identifier in C11_STDLIB_IDENTIFIERS[headerfile], f"{identifier} of C99 not found in C11_STDLIB_IDENTIFIERS"
+
+def test_isStdLibId():
+    # Check that Identifiers from C90 are correctly classified
+    assert isStdLibId("assert", 'c89') is True
+    assert isStdLibId("assert", 'c99') is True
+    assert isStdLibId("assert", 'c11') is True
+    assert isStdLibId("assert", 'c23') is True
+
+    # Check that Identifiers from C99 are correctly classified
+    assert isStdLibId("UINT32_C", 'c89') is False
+    assert isStdLibId("UINT32_C", 'c99') is True
+    assert isStdLibId("UINT32_C", 'c11') is True
+    assert isStdLibId("UINT32_C", 'c23') is True
+
+    # Check that Identifiers from C11 are correctly classified
+    assert isStdLibId("sprintf_s", 'c89') is False
+    assert isStdLibId("sprintf_s", 'c99') is False
+    assert isStdLibId("sprintf_s", 'c11') is True
+    assert isStdLibId("sprintf_s", 'c23') is True
+
+    # Function Defaulting to C99
+    assert isStdLibId("assert") is True
+    assert isStdLibId("UINT32_C") is True
+    assert isStdLibId("sprintf_s") is False
+
+def test_isKeyword():
+    # Check that Keywords from C90 are correctly classified
+    assert isKeyword("if", 'c89') is True
+    assert isKeyword("if", 'c99') is True
+    assert isKeyword("if", 'c11') is True
+    assert isKeyword("if", 'c23') is True
+
+    # Check that Keywords from C99 are correctly classified
+    assert isKeyword("inline", 'c89') is False
+    assert isKeyword("inline", 'c99') is True
+    assert isKeyword("inline", 'c11') is True
+    assert isKeyword("inline", 'c23') is True
+
+    # Check that Keywords from C11 are correctly classified
+    assert isKeyword("static_assert", 'c89') is False
+    assert isKeyword("static_assert", 'c99') is False
+    assert isKeyword("static_assert", 'c11') is True
+    assert isKeyword("static_assert", 'c23') is True
+
+    # Function Defaulting to C99
+    assert isKeyword("if") is True
+    assert isKeyword("inline") is True
+    assert isKeyword("static_assert") is False
diff --git a/addons/test/namingng_test.c b/addons/test/namingng_test.c
deleted file mode 100644
index 2eaf3899666..00000000000
--- a/addons/test/namingng_test.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <stddef.h>
-#include <stdint.h>
-
-uint32_t ui32Good (int abc)
-{
-    uint32_t ui32good;
-    int32_t i32good;
-    uint32_t badui32;
-    int32_t badi32;
-
-    uint32_t a;  // Short
-    return 5;
-}
-
-uint16_t ui16Good (int a)
-{
-    return 5;
-}
-
-uint16_t ui16bad_underscore (int a)
-{
-    return 5;
-}
-
-uint32_t u32Bad (int a)
-{
-    uint32_t ui32good;
-    int32_t i32good;
-    uint32_t badui32;
-    int32_t badi32;
-    int * intpointer=NULL;
-    int ** intppointer=NULL;
-    int *** intpppointer=NULL;
-    return 5;
-}
-
-uint16_t Badui16 (int a)
-{
-    return 5;
-}
-
-void * Pointer()
-{
-    return NULL;
-}
-
-void ** PPointer()
-{
-    return NULL;
-}
diff --git a/addons/test/util.py b/addons/test/util.py
index 9413a2d0c5e..0f99534edc6 100644
--- a/addons/test/util.py
+++ b/addons/test/util.py
@@ -21,21 +21,22 @@ def find_cppcheck_binary():
 def dump_create(fpath, *argv):
     cppcheck_binary = find_cppcheck_binary()
     cmd = [cppcheck_binary, "--dump", "-DDUMMY", "--quiet", fpath] + list(argv)
-    p = subprocess.Popen(cmd)
-    p.communicate()
-    if p.returncode != 0:
-        raise OSError("cppcheck returns error code: %d" % p.returncode)
-    subprocess.Popen(["sync"])
+    with subprocess.Popen(cmd) as p:
+        p.communicate()
+        if p.returncode != 0:
+            raise OSError("cppcheck returns error code: %d" % p.returncode)
 
 
 def dump_remove(fpath):
-    subprocess.Popen(["rm", "-f", fpath + ".dump"])
+    os.remove(fpath + ".dump")
 
 
 def convert_json_output(raw_json_strings):
     """Convert raw stdout/stderr cppcheck JSON output to python dict."""
     json_output = {}
     for line in raw_json_strings:
+        if line.startswith('{"summary":'):
+            continue
         try:
             json_line = json.loads(line)
             #  json_output[json_line['errorId']] = json_line
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/test-y2038.py b/addons/test/y2038_test.py
similarity index 63%
rename from addons/test/test-y2038.py
rename to addons/test/y2038_test.py
index f76a87613e7..861b006d8bf 100644
--- a/addons/test/test-y2038.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)
@@ -81,6 +91,7 @@ def test_3_no_use_time_bits(capsys):
 
 
 def test_4_good(capsys):
+    # pylint: disable-next=unused-variable - FIXME
     is_safe = check_y2038_safe('./addons/test/y2038/y2038-test-4-good.c.dump', quiet=True)
     # assert(is_safe is True) # FIXME: This should be a "good" example returning "True" instead of "False"
     captured = capsys.readouterr()
@@ -106,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",
@@ -136,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/y2038.py b/addons/y2038.py
index 2c3856c5d23..b17d41dd330 100755
--- a/addons/y2038.py
+++ b/addons/y2038.py
@@ -2,30 +2,58 @@
 #
 # 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
 
 import cppcheckdata
 import sys
-import os
 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+.*$')
@@ -39,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
 # --------------------------------
@@ -58,7 +114,6 @@
     'timeval',
     'utimbuf',
     'itimerspec',
-    'stat',
     'clnt_ops',
     'elf_prstatus',
     'itimerval',
@@ -149,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))
@@ -164,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/build-pcre.txt b/build-pcre.txt
index 3dad4274c92..9f4e8e06e29 100644
--- a/build-pcre.txt
+++ b/build-pcre.txt
@@ -2,19 +2,6 @@ PCRE is a library that is used by the optional "rules" feature for the command
 line version of cppcheck. It is readily available on Linux and Mac OS X, but
 must be obtained separately for Windows.
 
-If you're using qmake to generate makefiles, the following behavior applies:
-
-- If you're not on Windows, it assumes by default that you have PCRE and want
-  to enable rules support. You can disable rules support (removing the PCRE
-  dependency) by passing HAVE_RULES=no to qmake.
-
-- If you are on Windows, but have PCRE available, you can enable rules support
-  by passing HAVE_RULES=yes to qmake.
-
-  - Note: This includes using build.bat since it calls qmake - to use PCRE and
-    build.bat, you need to run set HAVE_RULES=yes before each run of build.bat
-
-
 Build instructions
 ------------------
 
diff --git a/cfg/avr.cfg b/cfg/avr.cfg
index 0efb2d5c75b..bb21afac352 100644
--- a/cfg/avr.cfg
+++ b/cfg/avr.cfg
@@ -3,8 +3,6 @@
 <def format="2">
   <!-- stdint.h -->
   <define name="__USING_MINT8" value="0"/>
-  <define name="__CONCATenate(left, right)" value="left ## right"/>
-  <define name="__CONCAT(left, right)" value="__CONCATenate(left, right)"/>
   <!-- Integer types capable of holding object pointers -->
   <podtype name="intptr_t" sign="s" size="2"/>
   <podtype name="uintptr_t" sign="u" size="2"/>
@@ -86,32 +84,8 @@
   <define name="SIG_ATOMIC_MAX" value="INT8_MAX"/>
   <define name="SIG_ATOMIC_MIN" value="INT8_MIN"/>
   <define name="SIZE_MAX" value="(__CONCAT(INT16_MAX, U))"/>
-  <!-- Macros for integer constants -->
-  <define name="INT8_C(value)" value="((int8_t) value)"/>
-  <define name="UINT8_C(value)" value="((uint8_t) __CONCAT(value, U))"/>
-  <define name="INT16_C(value)" value="value"/>
-  <define name="UINT16_C(value)" value="__CONCAT(value, U)"/>
-  <define name="INT32_C(value)" value="__CONCAT(value, L)"/>
-  <define name="UINT32_C(value)" value="__CONCAT(value, UL)"/>
-  <define name="INT64_C(value)" value="__CONCAT(value, LL)"/>
-  <define name="UINT64_C(value)" value="__CONCAT(value, ULL)"/>
-  <define name="INTMAX_C(value)" value="__CONCAT(value, LL)"/>
-  <define name="UINTMAX_C(value)" value="__CONCAT(value, ULL)"/>
   <!-- FIXME: add macros for printf and scanf format specifiers,e.g. PRId8 -->
   <!-- math.h -->
-  <define name="M_E" value="2.7182818284590452354"/>
-  <define name="M_LOG2E" value="1.4426950408889634074"/>
-  <define name="M_LOG10E" value="0.43429448190325182765"/>
-  <define name="M_LN2" value="0.69314718055994530942"/>
-  <define name="M_LN10" value="2.30258509299404568402"/>
-  <define name="M_PI" value="3.14159265358979323846"/>
-  <define name="M_PI_2" value="1.57079632679489661923"/>
-  <define name="M_PI_4" value="0.78539816339744830962"/>
-  <define name="M_1_PI" value="0.31830988618379067154"/>
-  <define name="M_2_PI" value="0.63661977236758134308"/>
-  <define name="M_2_SQRTPI" value="1.12837916709551257390"/>
-  <define name="M_SQRT2" value="1.41421356237309504880"/>
-  <define name="M_SQRT1_2" value="0.70710678118654752440"/>
   <define name="powf" value="pow"/>
   <define name="roundf" value="round"/>
   <define name="signbitf" value="signbit"/>
@@ -137,9 +111,6 @@
   <define name="putchar(__c)" value="fputc(__c, stdout)"/>
   <define name="getc(__stream)" value="fgetc(__stream)"/>
   <define name="getchar()" value="fgetc(stdin)"/>
-  <define name="SEEK_SET" value="0"/>
-  <define name="SEEK_CUR" value="1"/>
-  <define name="SEEK_END" value="2"/>
   <function name="vfprintf_P">
     <noreturn>false</noreturn>
     <leak-ignore/>
diff --git a/cfg/boost.cfg b/cfg/boost.cfg
index 0702bad74d7..d181860f0bc 100644
--- a/cfg/boost.cfg
+++ b/cfg/boost.cfg
@@ -28,15 +28,14 @@
   <define name="BOOST_UNLIKELY(X)" value="(X)"/>
   <define name="BOOST_FIXTURE_TEST_SUITE(name, fixture, ...)" value="struct name : fixture {" />
   <define name="BOOST_FIXTURE_TEST_SUITE_END()" value="};"/>
-  <define name="BOOST_TEST_GLOBAL_FIXTURE(name)" value=""/>
   <define name="BOOST_PYTHON_FUNCTION_OVERLOADS(foo_overloads, foo, x, y)" value=""/>
   <define name="BOOST_AUTO_TEST_SUITE(name, ...)" value="namespace name {" />
   <define name="BOOST_AUTO_TEST_SUITE_END()" value="}" />
   <define name="BOOST_ASSERT(condition)" value="assert(condition)"/>
   <define name="BOOST_TEST(condition, ...)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition))" />
-  <define name="BOOST_TEST_REQUIRE(condition, ...)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition))" />
+  <define name="BOOST_TEST_REQUIRE(condition, ...)" value='do { if (!(condition)) { throw false; }} while(0)' />
   <define name="BOOST_WARN(condition)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition))" />
-  <define name="BOOST_WARN_MESSAGE(condition, msg)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition)); std::string(msg)" />
+  <define name="BOOST_WARN_MESSAGE(condition, msg)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition)); static_cast&lt;void&gt;(msg)" />
   <define name="BOOST_WARN_EQUAL(a, b)" value="static_cast&lt;void&gt;((a) == (b))" />
   <define name="BOOST_WARN_NE(a, b)" value="static_cast&lt;void&gt;((a) != (b))" />
   <define name="BOOST_WARN_GT(a, b)" value="static_cast&lt;void&gt;((a) &gt; (b))" />
@@ -44,15 +43,15 @@
   <define name="BOOST_WARN_LT(a, b)" value="static_cast&lt;void&gt;((a) &lt; (b))" />
   <define name="BOOST_WARN_LE(a, b)" value="static_cast&lt;void&gt;((a) &lt;= (b))" />
   <define name="BOOST_CHECK(condition)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition))" />
-  <define name="BOOST_CHECK_MESSAGE(condition, msg)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition)); std::string(msg)" />
+  <define name="BOOST_CHECK_MESSAGE(condition, msg)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition)); static_cast&lt;void&gt;(msg)" />
   <define name="BOOST_CHECK_EQUAL(a, b)" value="static_cast&lt;void&gt;((a) == (b))" />
   <define name="BOOST_CHECK_NE(a, b)" value="static_cast&lt;void&gt;((a) != (b))" />
   <define name="BOOST_CHECK_GT(a, b)" value="static_cast&lt;void&gt;((a) &gt; (b))" />
   <define name="BOOST_CHECK_GE(a, b)" value="static_cast&lt;void&gt;((a) &gt;= (b))" />
   <define name="BOOST_CHECK_LT(a, b)" value="static_cast&lt;void&gt;((a) &lt; (b))" />
   <define name="BOOST_CHECK_LE(a, b)" value="static_cast&lt;void&gt;((a) &lt;= (b))" />
-  <define name="BOOST_REQUIRE(condition)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition))" />
-  <define name="BOOST_REQUIRE_MESSAGE(condition, msg)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;(condition)); std::string(msg)" />
+  <define name="BOOST_REQUIRE(condition)" value='do { if (!(condition)) { throw false; }} while(0)' />
+  <define name="BOOST_REQUIRE_MESSAGE(condition, msg)" value='do { if (!(condition)) { throw false; }} while(0); static_cast&lt;void&gt;(msg)' />
   <define name="BOOST_REQUIRE_EQUAL(a, b)" value="static_cast&lt;void&gt;(static_cast&lt;bool&gt;((a) == (b)))" />
   <define name="BOOST_REQUIRE_NE(a, b)" value="static_cast&lt;void&gt;((a) != (b))" />
   <define name="BOOST_REQUIRE_GT(a, b)" value="static_cast&lt;void&gt;((a) &gt; (b))" />
@@ -85,6 +84,7 @@
   <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_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__)"/>
@@ -93,12 +93,11 @@
   <define name="BOOST_SCOPED_ENUM_DECLARE_BEGIN(x)" value=""/>
   <define name="BOOST_SCOPED_ENUM_DECLARE_END(x)" value=""/>
   <define name="BOOST_TTI_HAS_TYPE(x)" value=""/>
-  <define name="BOOST_TTI_HAS_TYPE(x)" value=""/>
   <define name="BOOST_TTI_MEMBER_TYPE(x)" value=""/>
   <define name="BOOST_TTI_HAS_STATIC_MEMBER_FUNCTION(x)" value=""/>
   <!-- ########## Boost containers ########## -->
   <!-- boost containers that are similar to std containers -->
-  <container id="boostArray" startPattern="boost :: array|scoped_array &lt;" inherits="stdArray"/>
+  <container id="boostArray" startPattern="boost :: array &lt;" inherits="stdArray"/>
   <container id="boostCircularBuffer" startPattern="boost :: circular_buffer &lt;" inherits="stdContainer"/>
   <container id="boostList" startPattern="boost :: list|slist &lt;" inherits="stdList"/>
   <container id="boostMultiMap" startPattern="boost :: flat_multimap|multimap|unordered_multimap &lt;" inherits="stdMultiMap"/>
@@ -114,7 +113,7 @@
   <smart-pointer class-name="boost::scoped_ptr">
     <unique/>
   </smart-pointer>
-  <!-- <smart-pointer class-name="boost::scoped_array"/> Already configured as container -->
+  <smart-pointer class-name="boost::scoped_array"/>
   <smart-pointer class-name="boost::shared_ptr"/>
   <smart-pointer class-name="boost::weak_ptr"/>
   <smart-pointer class-name="boost::intrusive_ptr"/>
@@ -1269,4 +1268,17 @@
       <not-uninit/>
     </arg>
   </function>
+  <type-checks>
+    <unusedvar>
+      <checkFiniteLifetime>boost::lock_guard</checkFiniteLifetime>
+      <checkFiniteLifetime>boost::mutex::scoped_lock</checkFiniteLifetime>
+      <checkFiniteLifetime>boost::recursive_mutex::scoped_lock</checkFiniteLifetime>
+      <checkFiniteLifetime>boost::unique_lock</checkFiniteLifetime>
+      <checkFiniteLifetime>boost::shared_lock</checkFiniteLifetime>
+    </unusedvar>
+    <operatorEqVarError>
+      <suppress>boost::mutex</suppress>
+      <suppress>boost::recursive_mutex</suppress>
+    </operatorEqVarError>
+  </type-checks>
 </def>
diff --git a/cfg/bsd.cfg b/cfg/bsd.cfg
index 751bb03c00e..158d7a8a885 100644
--- a/cfg/bsd.cfg
+++ b/cfg/bsd.cfg
@@ -518,6 +518,27 @@
     </arg>
     <arg nr="4"/>
   </function>
+  <!-- void *reallocarray(void *ptr, size_t nmemb, size_t size); -->
+  <function name="reallocarray">
+    <returnValue type="void *"/>
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+  </function>
+  <memory>
+    <realloc init="false" buffer-size="calloc:2,3">reallocarray</realloc>
+    <dealloc>free</dealloc>
+  </memory>
   <podtype name="FTS"/>
   <podtype name="FTSENT"/>
   <!-- This type definitions refer to https://mandoc.bsd.lv/includes/sys/types.h.html -->
diff --git a/cfg/cairo.cfg b/cfg/cairo.cfg
index 85c2a8e0946..e077c2fc40d 100644
--- a/cfg/cairo.cfg
+++ b/cfg/cairo.cfg
@@ -6,6 +6,7 @@
   <define name="cairo_bool_t" value="int"/>
   <!-- TODO: Configure cairo_status_t as an enum when this is implemented in Cppcheck -->
   <podtype name="cairo_status_t"/>
+  <define name="CAIRO_STATUS_READ_ERROR" value="10"/>
   <!-- ########## cairo Macros / Defines ########## -->
   <define name="CAIRO_HAS_MIME_SURFACE" value="1"/>
   <define name="CAIRO_MIME_TYPE_CCITT_FAX" value="&quot;image/g3fax&quot;"/>
diff --git a/cfg/cppcheck-cfg.rng b/cfg/cppcheck-cfg.rng
index 004e931b418..a54c967aaac 100644
--- a/cfg/cppcheck-cfg.rng
+++ b/cfg/cppcheck-cfg.rng
@@ -26,6 +26,9 @@
               <ref name="DATA-EXTNAME"/>
             </element>
             <element name="alloc">
+              <optional>
+                <attribute name="no-fail"><ref name="DATA-BOOL"/></attribute>
+              </optional>
               <optional>
                 <attribute name="init"><ref name="DATA-BOOL"/></attribute>
               </optional>
@@ -35,9 +38,12 @@
               <optional>
                 <attribute name="buffer-size"><ref name="DATA-BUFFER-SIZE"/></attribute>
               </optional>
-              <ref name="DATA-EXTNAME-SINGLE"/>
+              <ref name="DATA-EXTNAME"/>
             </element>
             <element name="realloc">
+              <optional>
+                <attribute name="no-fail"><ref name="DATA-BOOL"/></attribute>
+              </optional>
               <optional>
                 <attribute name="init"><ref name="DATA-BOOL"/></attribute>
               </optional>
@@ -50,7 +56,7 @@
               <optional>
                 <attribute name="realloc-arg"><ref name="ARGNO"/></attribute>
               </optional>
-              <ref name="DATA-EXTNAME-SINGLE"/>
+              <ref name="DATA-EXTNAME"/>
             </element>
             <element name="use"><ref name="DATA-EXTNAME"/></element>
           </choice>
@@ -69,15 +75,21 @@
               <ref name="DATA-EXTNAME"/>
             </element>
             <element name="alloc">
+              <optional>
+                <attribute name="no-fail"><ref name="DATA-BOOL"/></attribute>
+              </optional>
               <optional>
                 <attribute name="init"><ref name="DATA-BOOL"/></attribute>
               </optional>
               <optional>
                 <attribute name="arg"><ref name="ARGNO"/></attribute>
               </optional>
-              <ref name="DATA-EXTNAME-SINGLE"/>
+              <ref name="DATA-EXTNAME"/>
             </element>
             <element name="realloc">
+              <optional>
+                <attribute name="no-fail"><ref name="DATA-BOOL"/></attribute>
+              </optional>
               <optional>
                 <attribute name="init"><ref name="DATA-BOOL"/></attribute>
               </optional>
@@ -87,7 +99,7 @@
               <optional>
                 <attribute name="realloc-arg"><ref name="ARGNO"/></attribute>
               </optional>
-              <ref name="DATA-EXTNAME-SINGLE"/>
+              <ref name="DATA-EXTNAME"/>
             </element>
             <element name="use"><ref name="DATA-EXTNAME"/></element>
           </choice>
@@ -122,7 +134,7 @@
                 </attribute>
               </optional>
               <empty/>
-            </element>            
+            </element>
           </optional>
           <optional>
             <element name="pure"><empty/></element>
@@ -194,6 +206,9 @@
               <optional>
                 <attribute name="strlen-arg"><data type="positiveInteger"/></attribute>
               </optional>
+              <optional>
+                <attribute name="count-arg"><data type="positiveInteger"/></attribute>
+              </optional>
               <empty/>
             </element>
           </optional>
@@ -249,6 +264,11 @@
                   <ref name="ARG-DIRECTION"/>
                 </attribute>
               </optional>
+              <optional>
+                <attribute name="indirect">
+                  <ref name="INDIRECT"/>
+                </attribute>
+              </optional>
 
               <interleave>
                 <optional>
@@ -573,7 +593,7 @@
                 </element>
               </choice>
             </zeroOrMore>
-          </element>          
+          </element>
         </optional>
       </element>
 
@@ -651,7 +671,7 @@
       <param name="maxInclusive">2</param>
     </data>
   </define>
-  
+
   <define name="ARG-DIRECTION">
     <choice>
       <value>in</value>
@@ -698,8 +718,10 @@
       <value>push</value>
       <value>pop</value>
       <value>find</value>
+      <value>find-const</value>
       <value>insert</value>
       <value>erase</value>
+      <value>append</value>
       <value>change-content</value>
       <value>change-internal</value>
       <value>change</value>
@@ -719,7 +741,7 @@
       <value>empty</value>
     </choice>
   </define>
-  
+
   <define name="MINSIZE-VALUE">
     <data type="unsignedLong">
       <param name="minInclusive">1</param>
diff --git a/cfg/daca.cfg b/cfg/daca.cfg
deleted file mode 100644
index b2c21d66494..00000000000
--- a/cfg/daca.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<def format="2">
-  <!-- This configuration is used in daca@home and contains some common practice macros and functions which are helpful for daca analysis. -->
-  <!-- see gnu.cfg -->
-  <define name="ASSERT(expr)" value="assert (expr)"/>
-  <define name="BE(expr, val)" value="__builtin_expect (expr, val)"/>
-  <function name="MIN">
-    <use-retval/>
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <returnValue>arg1&lt;arg2?arg1:arg2</returnValue>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-    </arg>
-  </function>
-  <function name="MAX">
-    <use-retval/>
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <returnValue>arg1&gt;arg2?arg1:arg2</returnValue>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-    </arg>
-  </function>
-</def>
diff --git a/cfg/emscripten.cfg b/cfg/emscripten.cfg
index 75f02f23f05..7a5c5903cf5 100644
--- a/cfg/emscripten.cfg
+++ b/cfg/emscripten.cfg
@@ -1,7 +1,108 @@
 <?xml version="1.0"?>
 <def format="2">
-  <define name="EM_ASM(...)" value=""/>
-  <define name="EM_JS(...)" value=""/>
-  <define name="MAIN_THREAD_EM_ASM(...)" value=""/>
-  <define name="EMSCRIPTEN_BINDINGS(...)" value=""/>
+  <function name="emscripten_asm_const_int">
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="variadic" direction="in" />
+    <use-retval/>
+    <returnValue type="int" unknownValues="all"/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="emscripten_asm_const_double">
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="variadic" direction="in" />
+    <use-retval/>
+    <returnValue type="double" unknownValues="all"/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="emscripten_asm_const_ptr">
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="variadic" direction="in" />
+    <use-retval/>
+    <returnValue type="void*" unknownValues="all"/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="emscripten_asm_const_async_on_main_thread">
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="variadic" direction="in" />
+    <returnValue type="void" unknownValues="all"/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="emscripten_asm_const_int_sync_on_main_thread">
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="variadic" direction="in" />
+    <use-retval/>
+    <returnValue type="int" unknownValues="all"/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="emscripten_asm_const_double_sync_on_main_thread">
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="variadic" direction="in" />
+    <use-retval/>
+    <returnValue type="int" unknownValues="all"/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="emscripten_asm_const_ptr_sync_on_main_thread">
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="variadic" direction="in" />
+    <use-retval/>
+    <returnValue type="void*" unknownValues="all"/>
+    <noreturn>false</noreturn>
+  </function>
+  <resource>
+    <alloc init="true">emscripten_asm_const_ptr</alloc>
+    <alloc init="true">emscripten_asm_const_ptr_sync_on_main_thread</alloc>
+    <dealloc>free</dealloc>
+  </resource>
+
+  <!-- macros from em_asm.h -->
+  <define name="EM_ASM(code, ...)" value="((void)emscripten_asm_const_int(#code, __VA_ARGS__))"/>
+  <define name="EM_ASM_DOUBLE(code, ...)" value="emscripten_asm_const_double(#code, __VA_ARGS__)"/>
+  <define name="EM_ASM_INT(code, ...)" value="emscripten_asm_const_int(#code, __VA_ARGS__)"/>
+  <define name="EM_ASM_PTR(code, ...)" value="emscripten_asm_const_ptr(#code, __VA_ARGS__)"/>
+  <define name="MAIN_THREAD_ASYNC_EM_ASM(code, ...)" value="emscripten_asm_const_async_on_main_thread(#code, __VA_ARGS__)"/>
+  <define name="MAIN_THREAD_EM_ASM(code, ...)" value="((void)emscripten_asm_const_int_sync_on_main_thread(#code, __VA_ARGS__))"/>
+  <define name="MAIN_THREAD_EM_ASM_DOUBLE(code, ...)" value="emscripten_asm_const_double_sync_on_main_thread(#code, __VA_ARGS__)"/>
+  <define name="MAIN_THREAD_EM_ASM_INT(code, ...)" value="emscripten_asm_const_int_sync_on_main_thread(#code, __VA_ARGS__)"/>
+  <define name="MAIN_THREAD_EM_ASM_PTR(code, ...)" value="emscripten_asm_const_ptr_sync_on_main_thread(#code, __VA_ARGS__)"/>
+
+  <!-- macros from bind.h -->
+  <define name="EMSCRIPTEN_BINDINGS(name)" value=""/>
+
+  <!-- macros from em_js.h -->
+  <define name="EM_JS(return_type, function_name, arguments, code)" value="return_type function_name(arguments)"/>
 </def>
diff --git a/cfg/gnu.cfg b/cfg/gnu.cfg
index 23aaf657071..1c8d1597a7f 100644
--- a/cfg/gnu.cfg
+++ b/cfg/gnu.cfg
@@ -64,6 +64,7 @@
       <not-bool/>
     </arg>
   </function>
+  <define name="__builtin_bit_cast(type,value)" value="std::bit_cast&lt;type&gt;(value)"/>
   <define name="__bswap_constant_64(x)" value="bswap_64(x)"/>
   <define name="__builtin_bswap64(x)" value="bswap_64(x)"/>
   <define name="__bswap_64(x)" value="bswap_64(x)"/>
@@ -75,7 +76,6 @@
   <define name="__builtin_nan(str)" value="nan(str)"/>
   <define name="__builtin_nanf(str)" value="nanf(str)"/>
   <define name="__builtin_nanl(str)" value="nanl(str)"/>
-  <define name="__builtin_signbit(value)" value="signbit(value)"/>
   <define name="__extension__" value=""/>
   <define name="__typeof__(T)" value="typeof(T)"/>
   <define name="__glibc_unlikely(x)" value="(x)"/>
@@ -182,6 +182,25 @@
       <strz/>
     </arg>
   </function>
+  <!-- see https://www.man7.org/linux/man-pages/man3/dlmopen.3.html -->
+  <!-- void *dlmopen(Lmid_t lmid, const char *filename, int flags); -->
+  <function name="dlmopen">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="void*"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- https://gcc.gnu.org/onlinedocs/gcc-6.2.0/gcc/Alignment.html -->
   <!-- __alignof__ is used like sizeof -->
   <!-- Declaration for this GNU compiler extension could look like this: -->
@@ -193,26 +212,6 @@
     <leak-ignore/>
     <arg nr="1" direction="in"/>
   </function>
-  <!-- int timerisset(struct timeval *tvp); -->
-  <function name="timerisset">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <use-retval/>
-    <returnValue type="int"/>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-      <not-null/>
-    </arg>
-  </function>
-  <!-- void timerclear(struct timeval *tvp); -->
-  <function name="timerclear">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <returnValue type="void"/>
-    <arg nr="1" direction="inout">
-      <not-null/>
-    </arg>
-  </function>
   <!-- https://man7.org/linux/man-pages/man3/getpw.3.html -->
   <!-- int getpw(uid_t uid, char *buf); -->
     <function name="getpw">
@@ -228,26 +227,6 @@
     </arg>
     <warn severity="style" reason="Obsolescent" alternatives="getpwnam"/>
   </function>
-  <!-- void timeradd(struct timeval *a, struct timeval *b, struct timeval *res);-->
-  <!-- void timersub(struct timeval *a, struct timeval *b, struct timeval *res);-->
-  <function name="timeradd,timersub">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <returnValue type="void"/>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-      <not-null/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-      <not-null/>
-    </arg>
-    <arg nr="3" direction="out">
-      <not-null/>
-    </arg>
-  </function>
-  <!-- int timercmp(struct timeval *a, struct timeval *b, CMP)-->
-  <define name="timercmp(a,b,CMP)" value="(((a)-&gt;tv_sec == (b)-&gt;tv_sec) ? ((a)-&gt;tv_usec CMP (b)-&gt;tv_usec) : ((a)-&gt;tv_sec CMP (b)-&gt;tv_sec))"/>
   <!-- int __builtin_types_compatible_p (type1, type2) -->
   <function name="__builtin_types_compatible_p">
     <noreturn>false</noreturn>
@@ -258,7 +237,8 @@
     <arg nr="2"/>
   </function>
   <!-- void __builtin_trap (void) -->
-  <function name="__builtin_trap">
+  <!-- void __builtin_unreachable (void) -->
+  <function name="__builtin_trap,__builtin_unreachable">
     <noreturn>true</noreturn>
   </function>
   <!-- int __builtin_popcount (unsigned int x) -->
@@ -637,7 +617,7 @@
       <not-null/>
       <not-uninit/>
     </arg>
-  </function>  
+  </function>
   <!-- https://www.gnu.org/software/libc/manual/html_node/Getopt-Long-Options.html#Getopt-Long-Options -->
   <!-- int getopt_long(int argc, char * const argv[],
            const char *optstring,
@@ -749,6 +729,7 @@
   <function name="backtrace">
     <returnValue type="int"/>
     <noreturn>false</noreturn>
+    <leak-ignore/>
     <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="2"/>
@@ -1205,7 +1186,7 @@
     </arg>
   </function>
   <!-- https://linux.die.net/man/3/mkostemp -->
-  <!-- int mkostemp(char *template, int flags); 
+  <!-- int mkostemp(char *template, int flags);
        int mkstemps(char *template, int suffixlen);-->
   <function name="mkostemp,mkstemps">
     <returnValue type="int"/>
@@ -1326,9 +1307,9 @@
       <not-null/>
       <not-bool/>
     </arg>
-  </function>  
+  </function>
   <!-- http://man7.org/linux/man-pages/man3/ffs.3.html -->
-  <!-- int ffsl(long int i); 
+  <!-- int ffsl(long int i);
        int ffsll(long long int i); -->
   <function name="ffsl,ffsll">
     <use-retval/>
@@ -1580,11 +1561,6 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html -->
-  <!-- void __builtin_trap (void) -->
-  <function name="__builtin_trap">
-    <noreturn>true</noreturn>
-  </function>
   <!-- int __builtin_constant_p (exp) -->
   <function name="__builtin_constant_p">
     <noreturn>false</noreturn>
@@ -1693,6 +1669,32 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- https://man7.org/linux/man-pages/man3/dlsym.3.html -->
+  <!-- void *dlvsym(void *restrict handle, const char *restrict symbol, const char *restrict version); -->
+  <function name="dlvsym">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <returnValue type="void*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man2/getcwd.2.html -->
+  <!-- char *get_current_dir_name(void); -->
+  <function name="get_current_dir_name">
+    <returnValue type="char *"/>
+    <use-retval/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- https://man7.org/linux/man-pages/man3/error.3.html -->
   <!-- void error(int status, int errnum, const char *format, ...); -->
   <!-- void error_at_line(int status, int errnum, const char *filename, unsigned int linenum, const char *format, ...); -->
diff --git a/cfg/googletest.cfg b/cfg/googletest.cfg
index c93862d64f6..c32eef7274b 100644
--- a/cfg/googletest.cfg
+++ b/cfg/googletest.cfg
@@ -29,9 +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="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 d5c55b2ca14..722efb6b76b 100644
--- a/cfg/gtk.cfg
+++ b/cfg/gtk.cfg
@@ -2,10 +2,12 @@
 <!-- This file once has been generated automatically. See https://github.com/scriptum/cppcheck-libs -->
 <!-- Now it is maintained and extended manually. -->
 <def format="2">
-  <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="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_CALLBACK(cb)" value="cb"/>
   <define name="GTK_SIGNAL_FUNC(f)" value="G_CALLBACK(f)"/>
   <!-- https://developer.gnome.org/glib/stable/glib-Miscellaneous-Macros.html -->
@@ -49,6 +51,7 @@
   <define name="G_DEFINE_DYNAMIC_TYPE_EXTENDED(TN, t_n, T_P, _f_, _C_)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE(TypeName,type_name,copy_func,free_func)" value=""/>
   <define name="G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName,type_name,copy_func,free_func,_C_)" value=""/>
+  <define name="G_DEFINE_QUARK(QN,q_n)" value=""/>
   <define name="G_BEGIN_DECLS" value=""/>
   <define name="G_END_DECLS" value=""/>
   <define name="G_ADD_PRIVATE(TypeName)" value=""/>
@@ -177,11 +180,14 @@
   <define name="g_assert(expr)" value="assert(expr)"/>
   <define name="g_assert_not_reached()" value="assert(NULL)"/>
   <define name="g_assert_true(expr)" value="g_assert(expr)"/>
+  <define name="g_assert_false(expr)" value="g_assert(!(expr))"/>
   <define name="g_assert_cmpstr(s1, cmp, s2)" value="g_assert_true(g_strcmp0 ((s1), (s2)) cmp 0)"/>
   <define name="g_assert_cmpint(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
   <define name="g_assert_cmpuint(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
   <define name="g_assert_cmphex(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
   <define name="g_assert_cmpfloat(n1, cmp, n2)" value="g_assert_true((n1) cmp (n2))"/>
+  <define name="g_assert_null(expr)" value="g_assert_true((expr) == NULL)"/>
+  <define name="g_assert_nonnull(expr)" value="g_assert_true((expr) != NULL)"/>
   <define name="g_signal_connect(instance, detailed_signal, c_handler, data)" value="g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)"/>
   <define name="g_signal_connect_after(instance, detailed_signal, c_handler, data)" value="g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_AFTER)"/>
   <define name="g_signal_connect_swapped(instance, detailed_signal, c_handler, data)" value="g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, G_CONNECT_SWAPPED)"/>
@@ -199,690 +205,724 @@
   <define name="g_ptr_array_index(array,index_)" value="((array)-&gt;pdata)[index_]"/>
   <define name="g_slist_next(slist)" value="((slist) ? (((GSList *)(slist))-&gt;next) : NULL)"/>
   <define name="g_strstrip(string)" value="g_strchomp (g_strchug (string))"/>
+  <!-- https://docs.gtk.org/glib/struct.VariantType.html -->
+  <define name="G_VARIANT_TYPE_BOOLEAN" value="((const GVariantType *) &quot;b&quot;)"/>
+  <define name="G_VARIANT_TYPE_BYTE" value="((const GVariantType *) &quot;y&quot;)"/>
+  <define name="G_VARIANT_TYPE_INT16" value="((const GVariantType *) &quot;n&quot;)"/>
+  <define name="G_VARIANT_TYPE_UINT16" value="((const GVariantType *) &quot;q&quot;)"/>
+  <define name="G_VARIANT_TYPE_INT32" value="((const GVariantType *) &quot;i&quot;)"/>
+  <define name="G_VARIANT_TYPE_UINT32" value="((const GVariantType *) &quot;u&quot;)"/>
+  <define name="G_VARIANT_TYPE_INT64" value="((const GVariantType *) &quot;x&quot;)"/>
+  <define name="G_VARIANT_TYPE_UINT64" value="((const GVariantType *) &quot;t&quot;)"/>
+  <define name="G_VARIANT_TYPE_DOUBLE" value="((const GVariantType *) &quot;d&quot;)"/>
+  <define name="G_VARIANT_TYPE_STRING" value="((const GVariantType *) &quot;s&quot;)"/>
+  <define name="G_VARIANT_TYPE_OBJECT_PATH" value="((const GVariantType *) &quot;o&quot;)"/>
+  <define name="G_VARIANT_TYPE_SIGNATURE" value="((const GVariantType *) &quot;g&quot;)"/>
+  <define name="G_VARIANT_TYPE_VARIANT" value="((const GVariantType *) &quot;v&quot;)"/>
+  <define name="G_VARIANT_TYPE_HANDLE" value="((const GVariantType *) &quot;h&quot;)"/>
+  <define name="G_VARIANT_TYPE_UNIT" value="((const GVariantType *) &quot;()&quot;)"/>
+  <define name="G_VARIANT_TYPE_ANY" value="((const GVariantType *) &quot;*&quot;)"/>
+  <define name="G_VARIANT_TYPE_BASIC" value="((const GVariantType *) &quot;?&quot;)"/>
+  <define name="G_VARIANT_TYPE_MAYBE" value="((const GVariantType *) &quot;m*&quot;)"/>
+  <define name="G_VARIANT_TYPE_ARRAY" value="((const GVariantType *) &quot;a*&quot;)"/>
+  <define name="G_VARIANT_TYPE_TUPLE" value="((const GVariantType *) &quot;r&quot;)"/>
+  <define name="G_VARIANT_TYPE_DICT_ENTRY" value="((const GVariantType *) &quot;{?*}&quot;)"/>
+  <define name="G_VARIANT_TYPE_DICTIONARY" value="((const GVariantType *) &quot;a{?*}&quot;)"/>
+  <define name="G_VARIANT_TYPE_STRING_ARRAY" value="((const GVariantType *) &quot;as&quot;)"/>
+  <define name="G_VARIANT_TYPE_OBJECT_PATH_ARRAY" value="((const GVariantType *) &quot;ao&quot;)"/>
+  <define name="G_VARIANT_TYPE_BYTESTRING" value="((const GVariantType *) &quot;ay&quot;)"/>
+  <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))"/>
   <memory>
-    <alloc init="true">g_thread_new</alloc>
-    <alloc init="true">g_thread_try_new</alloc>
+    <alloc init="true" no-fail="true">g_thread_new</alloc>
+    <alloc init="true" no-fail="false">g_thread_try_new</alloc>
     <use>g_thread_ref</use>
     <dealloc>g_thread_unref</dealloc>
     <dealloc>g_thread_join</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_variant_iter_copy</alloc>
-    <alloc init="true">g_variant_iter_new</alloc>
+    <alloc init="true" no-fail="true">g_variant_iter_copy</alloc>
+    <alloc init="true" no-fail="true">g_variant_iter_new</alloc>
     <dealloc>g_variant_iter_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_source_new</alloc>
-    <alloc init="true">g_idle_source_new</alloc>
-    <alloc init="true">g_timeout_source_new</alloc>
-    <alloc init="true">g_timeout_source_new_seconds</alloc>
-    <alloc init="true">g_child_watch_source_new</alloc>
-    <alloc init="true">g_cancellable_source_new</alloc>
-    <alloc init="true">g_io_create_watch</alloc>
+    <alloc init="true" no-fail="true">g_source_new</alloc>
+    <alloc init="true" no-fail="true">g_idle_source_new</alloc>
+    <alloc init="true" no-fail="true">g_timeout_source_new</alloc>
+    <alloc init="true" no-fail="true">g_timeout_source_new_seconds</alloc>
+    <alloc init="true" no-fail="true">g_child_watch_source_new</alloc>
+    <alloc init="true" no-fail="true">g_cancellable_source_new</alloc>
+    <alloc init="true" no-fail="true">g_io_create_watch</alloc>
     <use>g_source_ref</use>
     <dealloc>g_source_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_date_time_new</alloc>
-    <alloc init="true">g_date_time_new_now</alloc>
-    <alloc init="true">g_date_time_new_now_local</alloc>
-    <alloc init="true">g_date_time_new_now_utc</alloc>
-    <alloc init="true">g_date_time_new_from_unix_local</alloc>
-    <alloc init="true">g_date_time_new_from_unix_utc</alloc>
-    <alloc init="true">g_date_time_new_from_timeval_local</alloc>
-    <alloc init="true">g_date_time_new_from_timeval_utc</alloc>
-    <alloc init="true">g_date_time_new_local</alloc>
-    <alloc init="true">g_date_time_new_utc</alloc>
-    <alloc init="true">g_date_time_add</alloc>
-    <alloc init="true">g_date_time_add_years</alloc>
-    <alloc init="true">g_date_time_add_months</alloc>
-    <alloc init="true">g_date_time_add_weeks</alloc>
-    <alloc init="true">g_date_time_add_days</alloc>
-    <alloc init="true">g_date_time_add_hours</alloc>
-    <alloc init="true">g_date_time_add_minutes</alloc>
-    <alloc init="true">g_date_time_add_seconds</alloc>
-    <alloc init="true">g_date_time_add_full</alloc>
-    <alloc init="true">g_date_time_to_timezone</alloc>
-    <alloc init="true">g_date_time_to_local</alloc>
-    <alloc init="true">g_date_time_to_utc</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_now</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_now_local</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_now_utc</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_from_unix_local</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_from_unix_utc</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_from_timeval_local</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_from_timeval_utc</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_local</alloc>
+    <alloc init="true" no-fail="true">g_date_time_new_utc</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_years</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_months</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_weeks</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_days</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_hours</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_minutes</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_seconds</alloc>
+    <alloc init="true" no-fail="true">g_date_time_add_full</alloc>
+    <alloc init="true" no-fail="true">g_date_time_to_timezone</alloc>
+    <alloc init="true" no-fail="true">g_date_time_to_local</alloc>
+    <alloc init="true" no-fail="true">g_date_time_to_utc</alloc>
     <use>g_date_time_ref</use>
     <dealloc>g_date_time_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_dir_open</alloc>
+    <alloc init="true" no-fail="false">g_dir_open</alloc>
     <alloc init="true">g_dir_rewind</alloc>
     <dealloc>g_dir_close</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_timer_new</alloc>
+    <alloc init="true" no-fail="true">g_timer_new</alloc>
     <dealloc>g_timer_destroy</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_file_attribute_info_list_new</alloc>
-    <alloc init="true">g_file_attribute_info_list_dup</alloc>
+    <alloc init="true" no-fail="true">g_file_attribute_info_list_new</alloc>
+    <alloc init="true" no-fail="true">g_file_attribute_info_list_dup</alloc>
     <use>g_file_attribute_info_list_ref</use>
     <dealloc>g_file_attribute_info_list_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_slist_alloc</alloc>
-    <alloc init="true">g_slist_copy</alloc>
-    <alloc init="true">g_slist_copy_deep</alloc>
+    <alloc init="true" no-fail="true">g_slist_alloc</alloc>
+    <alloc init="true" no-fail="true">g_slist_copy</alloc>
+    <alloc init="true" no-fail="true">g_slist_copy_deep</alloc>
     <dealloc>g_slist_free</dealloc>
     <dealloc>g_slist_free_1</dealloc>
     <dealloc>g_slist_free_full</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_variant_new</alloc>
-    <alloc init="true">g_variant_new_va</alloc>
-    <alloc init="true">g_variant_new_boolean</alloc>
-    <alloc init="true">g_variant_new_byte</alloc>
-    <alloc init="true">g_variant_new_int16</alloc>
-    <alloc init="true">g_variant_new_uint16</alloc>
-    <alloc init="true">g_variant_new_int32</alloc>
-    <alloc init="true">g_variant_new_uint32</alloc>
-    <alloc init="true">g_variant_new_int64</alloc>
-    <alloc init="true">g_variant_new_uint64</alloc>
-    <alloc init="true">g_variant_new_handle</alloc>
-    <alloc init="true">g_variant_new_double</alloc>
-    <alloc init="true">g_variant_new_string</alloc>
-    <alloc init="true">g_variant_new_take_string</alloc>
-    <alloc init="true">g_variant_new_printf</alloc>
-    <alloc init="true">g_variant_new_signature</alloc>
-    <alloc init="true">g_variant_new_object_path</alloc>
-    <alloc init="true">g_variant_new_variant</alloc>
-    <alloc init="true">g_variant_new_objv</alloc>
-    <alloc init="true">g_variant_new_strv</alloc>
-    <alloc init="true">g_variant_new_bytestring</alloc>
-    <alloc init="true">g_variant_new_bytestring_array</alloc>
-    <alloc init="true">g_variant_new_maybe</alloc>
-    <alloc init="true">g_variant_new_array</alloc>
-    <alloc init="true">g_variant_new_tuple</alloc>
-    <alloc init="true">g_variant_new_dict_entry</alloc>
-    <alloc init="true">g_variant_new_fixed_array</alloc>
-    <alloc init="true">g_variant_new_from_data</alloc>
-    <alloc init="true">g_variant_new_from_bytes</alloc>
-    <alloc init="true">g_variant_builder_end</alloc>
-    <alloc init="true">g_variant_new_parsed_va</alloc>
-    <alloc init="true">g_variant_new_parsed</alloc>
-    <alloc init="true">g_variant_byteswap</alloc>
-    <alloc init="true">g_variant_get_child_value</alloc>
-    <alloc init="true">g_variant_get_normal_form</alloc>
-    <alloc init="true">g_variant_parse</alloc>
+    <alloc init="true" no-fail="true">g_variant_new</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_va</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_boolean</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_byte</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_int16</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_uint16</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_int32</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_uint32</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_int64</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_uint64</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_handle</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_double</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_string</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_take_string</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_printf</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_signature</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_object_path</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_variant</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_objv</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_strv</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_bytestring</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_bytestring_array</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_maybe</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_array</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_tuple</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_dict_entry</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_fixed_array</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_from_data</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_from_bytes</alloc>
+    <alloc init="true" no-fail="true">g_variant_builder_end</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_parsed_va</alloc>
+    <alloc init="true" no-fail="true">g_variant_new_parsed</alloc>
+    <alloc init="true" no-fail="true">g_variant_byteswap</alloc>
+    <alloc init="true" no-fail="true">g_variant_get_child_value</alloc>
+    <alloc init="true" no-fail="true">g_variant_get_normal_form</alloc>
+    <alloc init="true" no-fail="true">g_variant_parse</alloc>
     <use>g_variant_ref</use>
     <use>g_variant_take_ref</use>
+    <use>g_variant_builder_add</use>
+    <use>g_variant_builder_add_value</use>
+    <use>g_variant_builder_add_parsed</use>
     <use>g_variant_ref_sink</use>
     <dealloc>g_variant_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_variant_iter_new</alloc>
+    <alloc init="true" no-fail="true">g_variant_iter_new</alloc>
     <dealloc>g_variant_iter_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_variant_type_new</alloc>
-    <alloc init="true">g_variant_type_copy</alloc>
-    <alloc init="true">g_variant_type_new_array</alloc>
-    <alloc init="true">g_variant_type_new_dict_entry</alloc>
-    <alloc init="true">g_variant_type_new_maybe</alloc>
-    <alloc init="true">g_variant_type_new_tuple</alloc>
+    <alloc init="true" no-fail="true">g_variant_type_new</alloc>
+    <alloc init="true" no-fail="true">g_variant_type_copy</alloc>
+    <alloc init="true" no-fail="true">g_variant_type_new_array</alloc>
+    <alloc init="true" no-fail="true">g_variant_type_new_dict_entry</alloc>
+    <alloc init="true" no-fail="true">g_variant_type_new_maybe</alloc>
+    <alloc init="true" no-fail="true">g_variant_type_new_tuple</alloc>
     <dealloc>g_variant_type_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_allocator_new</alloc>
+    <alloc init="true" no-fail="true">g_allocator_new</alloc>
     <dealloc>g_allocator_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_bookmark_file_new</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_new</alloc>
     <dealloc>g_bookmark_file_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_srv_target_new</alloc>
+    <alloc init="true" no-fail="true">g_srv_target_new</alloc>
     <dealloc>g_srv_target_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_string_chunk_new</alloc>
+    <alloc init="true" no-fail="true">g_string_chunk_new</alloc>
     <dealloc>g_string_chunk_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_test_log_buffer_new</alloc>
+    <alloc init="true" no-fail="true">g_test_log_buffer_new</alloc>
     <dealloc>g_test_log_buffer_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_value_array_new</alloc>
+    <alloc init="true" no-fail="true">g_value_array_new</alloc>
     <dealloc>g_value_array_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_cache_new</alloc>
+    <alloc init="true" no-fail="true">g_cache_new</alloc>
     <dealloc>g_cache_destroy</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_cclosure_new</alloc>
-    <alloc init="true">g_cclosure_new_swap</alloc>
-    <alloc init="true">g_cclosure_new_object</alloc>
-    <alloc init="true">g_cclosure_new_object_swap</alloc>
-    <alloc init="true">g_closure_new_object</alloc>
-    <alloc init="true">g_closure_new_simple</alloc>
+    <alloc init="true" no-fail="true">g_cclosure_new</alloc>
+    <alloc init="true" no-fail="true">g_cclosure_new_swap</alloc>
+    <alloc init="true" no-fail="true">g_cclosure_new_object</alloc>
+    <alloc init="true" no-fail="true">g_cclosure_new_object_swap</alloc>
+    <alloc init="true" no-fail="true">g_closure_new_object</alloc>
+    <alloc init="true" no-fail="true">g_closure_new_simple</alloc>
     <use>g_closure_ref</use>
     <dealloc>g_closure_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_array_new</alloc>
-    <alloc init="true">g_array_sized_new</alloc>
+    <alloc init="true" no-fail="true">g_array_new</alloc>
+    <alloc init="true" no-fail="true">g_array_sized_new</alloc>
     <use>g_array_ref</use>
     <dealloc>g_array_free</dealloc>
     <dealloc>g_array_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_async_queue_new</alloc>
-    <alloc init="true">g_async_queue_new_full</alloc>
+    <alloc init="true" no-fail="true">g_async_queue_new</alloc>
+    <alloc init="true" no-fail="true">g_async_queue_new_full</alloc>
     <use>g_async_queue_ref</use>
     <dealloc>g_async_queue_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_byte_array_new</alloc>
-    <alloc init="true">g_byte_array_sized_new</alloc>
-    <alloc init="true">g_byte_array_new_take</alloc>
-    <alloc init="true">g_byte_array_sized_new</alloc>
-    <alloc init="true">g_bytes_unref_to_array</alloc>
+    <alloc init="true" no-fail="true">g_byte_array_new</alloc>
+    <alloc init="true" no-fail="true">g_byte_array_sized_new</alloc>
+    <alloc init="true" no-fail="true">g_byte_array_new_take</alloc>
+    <alloc init="true" no-fail="true">g_byte_array_sized_new</alloc>
+    <alloc init="true" no-fail="true">g_bytes_unref_to_array</alloc>
     <use>g_byte_array_ref</use>
     <dealloc>g_byte_array_free</dealloc>
     <dealloc>g_byte_array_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_checksum_new</alloc>
-    <alloc init="true">g_checksum_copy</alloc>
+    <alloc init="true" no-fail="true">g_checksum_new</alloc>
+    <alloc init="true" no-fail="true">g_checksum_copy</alloc>
     <dealloc>g_checksum_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_main_loop_new</alloc>
-    <alloc init="true">g_main_new</alloc>
+    <alloc init="true" no-fail="true">g_main_loop_new</alloc>
+    <alloc init="true" no-fail="true">g_main_new</alloc>
     <use>g_main_loop_ref</use>
     <dealloc>g_main_loop_unref</dealloc>
     <dealloc>g_main_destroy</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_main_context_new</alloc>
+    <alloc init="true" no-fail="true">g_main_context_new</alloc>
     <use>g_main_context_ref</use>
     <dealloc>g_main_context_unref</dealloc>
     <dealloc>g_main_destroy</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_thread_pool_new</alloc>
+    <alloc init="true" no-fail="true">g_thread_pool_new</alloc>
     <dealloc>g_thread_pool_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_error_copy</alloc>
-    <alloc init="true">g_error_new_valist</alloc>
-    <alloc init="true">g_error_new_literal</alloc>
-    <alloc init="true">g_error_new</alloc>
+    <alloc init="true" no-fail="true">g_error_copy</alloc>
+    <alloc init="true" no-fail="true">g_error_new_valist</alloc>
+    <alloc init="true" no-fail="true">g_error_new_literal</alloc>
+    <alloc init="true" no-fail="true">g_error_new</alloc>
     <dealloc>g_error_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_string_new</alloc>
-    <alloc init="true">g_string_new_len</alloc>
-    <alloc init="true">g_string_sized_new</alloc>
-    <alloc init="true">g_variant_print_string</alloc>
+    <alloc init="true" no-fail="true">g_string_new</alloc>
+    <alloc init="true" no-fail="true">g_string_new_len</alloc>
+    <alloc init="true" no-fail="true">g_string_sized_new</alloc>
+    <alloc init="true" no-fail="true">g_variant_print_string</alloc>
     <dealloc>g_string_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_ptr_array_new</alloc>
-    <alloc init="true">g_ptr_array_new_full</alloc>
-    <alloc init="true">g_ptr_array_new_with_free_func</alloc>
+    <alloc init="true" no-fail="true">g_ptr_array_new</alloc>
+    <alloc init="true" no-fail="true">g_ptr_array_new_full</alloc>
+    <alloc init="true" no-fail="true">g_ptr_array_new_with_free_func</alloc>
     <use>g_ptr_array_ref</use>
     <dealloc>g_ptr_array_free</dealloc>
     <dealloc>g_ptr_array_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_pattern_spec_new</alloc>
+    <alloc init="true" no-fail="true">g_pattern_spec_new</alloc>
     <dealloc>g_pattern_spec_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_key_file_new</alloc>
+    <alloc init="true" no-fail="true">g_key_file_new</alloc>
     <use>g_key_file_ref</use>
     <dealloc>g_key_file_free</dealloc>
     <dealloc>g_key_file_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_io_module_scope_new</alloc>
+    <alloc init="true" no-fail="true">g_io_module_scope_new</alloc>
     <dealloc>g_io_module_scope_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_ascii_strdown</alloc>
-    <alloc init="true">g_ascii_strup</alloc>
-    <alloc init="true">g_base64_decode</alloc>
-    <alloc init="true">g_base64_encode</alloc>
-    <alloc init="true">g_bookmark_file_get_description</alloc>
-    <alloc init="true">g_bookmark_file_get_mime_type</alloc>
-    <alloc init="true">g_bookmark_file_get_title</alloc>
-    <alloc init="true">g_bookmark_file_to_data</alloc>
-    <alloc init="true">g_build_filename</alloc>
-    <alloc init="true">g_build_filenamev</alloc>
-    <alloc init="true">g_build_path</alloc>
-    <alloc init="true">g_build_pathv</alloc>
-    <alloc init="true">g_bytes_unref_to_data</alloc>
-    <alloc init="true">g_compute_checksum_for_bytes</alloc>
-    <alloc init="true">g_compute_checksum_for_data</alloc>
-    <alloc init="true">g_compute_checksum_for_string</alloc>
-    <alloc init="true">g_compute_hmac_for_data</alloc>
-    <alloc init="true">g_compute_hmac_for_string</alloc>
-    <alloc init="true">g_convert</alloc>
-    <alloc init="true">g_convert_with_fallback</alloc>
-    <alloc init="true">g_convert_with_iconv</alloc>
-    <alloc init="true">g_credentials_to_string</alloc>
-    <alloc init="true">g_date_time_format</alloc>
-    <alloc init="true">g_filename_display_basename</alloc>
-    <alloc init="true">g_filename_display_name</alloc>
-    <alloc init="true">g_filename_from_uri</alloc>
-    <alloc init="true">g_filename_to_uri</alloc>
-    <alloc init="true">g_get_codeset</alloc>
-    <alloc init="true">g_get_current_dir</alloc>
-    <alloc init="true">g_get_locale_variants</alloc>
-    <alloc init="true">g_key_file_get_start_group</alloc>
-    <alloc init="true">g_key_file_to_data</alloc>
-    <alloc buffer-size="malloc">g_malloc</alloc>
-    <realloc buffer-size="malloc:2">g_realloc</realloc>
-    <alloc init="true" buffer-size="malloc">g_malloc0</alloc>
-    <alloc init="true" buffer-size="calloc">g_malloc0_n</alloc>
-    <alloc buffer-size="calloc">g_malloc_n</alloc>
-    <realloc buffer-size="calloc:2,3">g_realloc_n</realloc>
-    <alloc init="true">g_memdup</alloc>
-    <alloc init="true">g_path_get_basename</alloc>
-    <alloc init="true">g_path_get_dirname</alloc>
-    <alloc>g_slice_alloc</alloc>
-    <alloc init="true">g_slice_alloc0</alloc>
-    <alloc init="true">g_slice_copy</alloc>
-    <alloc init="true">g_strcompress</alloc>
-    <alloc init="true">g_strconcat</alloc>
-    <alloc init="true" buffer-size="strdup">g_strdup</alloc>
-    <alloc init="true">g_strdup_printf</alloc>
-    <alloc init="true">g_strdup_vprintf</alloc>
-    <alloc init="true">g_strescape</alloc>
-    <alloc init="true">g_strjoin</alloc>
-    <alloc init="true">g_strjoinv</alloc>
-    <alloc init="true">g_strndup</alloc>
-    <alloc init="true">g_strnfill</alloc>
-    <alloc init="true">g_time_val_to_iso8601</alloc>
-    <alloc buffer-size="malloc">g_try_malloc</alloc>
-    <realloc buffer-size="malloc:2">g_try_realloc</realloc>
-    <alloc init="true" buffer-size="malloc">g_try_malloc0</alloc>
-    <alloc init="true" buffer-size="calloc">g_try_malloc0_n</alloc>
-    <alloc buffer-size="calloc">g_try_malloc_n</alloc>
-    <realloc buffer-size="calloc:2,3">g_try_realloc_n</realloc>
-    <alloc init="true">g_ucs4_to_utf16</alloc>
-    <alloc init="true">g_ucs4_to_utf8</alloc>
-    <alloc init="true">g_unicode_canonical_decomposition</alloc>
-    <alloc init="true">g_utf16_to_ucs4</alloc>
-    <alloc init="true">g_utf16_to_utf8</alloc>
-    <alloc init="true">g_utf8_casefold</alloc>
-    <alloc init="true">g_utf8_collate_key</alloc>
-    <alloc init="true">g_utf8_collate_key_for_filename</alloc>
-    <alloc init="true">g_utf8_normalize</alloc>
-    <alloc init="true">g_utf8_strdown</alloc>
-    <alloc init="true">g_utf8_strreverse</alloc>
-    <alloc init="true">g_utf8_strup</alloc>
-    <alloc init="true">g_utf8_substring</alloc>
-    <alloc init="true">g_utf8_to_ucs4</alloc>
-    <alloc init="true">g_utf8_to_ucs4_fast</alloc>
-    <alloc init="true">g_utf8_to_ucs4_fast</alloc>
-    <alloc init="true">g_utf8_to_utf16</alloc>
-    <alloc init="true">g_key_file_get_locale_string</alloc>
-    <alloc init="true">g_key_file_get_value</alloc>
-    <alloc init="true">g_key_file_get_string</alloc>
-    <alloc init="true">g_key_file_get_boolean_list</alloc>
-    <alloc init="true">g_key_file_get_integer_list</alloc>
-    <alloc init="true">g_key_file_get_double_list</alloc>
-    <alloc init="true">g_key_file_get_comment</alloc>
-    <alloc init="true">g_dbus_proxy_get_name_owner</alloc>
-    <alloc init="true">g_file_info_get_attribute_as_string</alloc>
-    <alloc init="true">g_file_attribute_matcher_to_string</alloc>
-    <alloc init="true">g_app_launch_context_get_environment</alloc>
-    <alloc init="true">g_app_launch_context_get_startup_notify_id</alloc>
-    <alloc init="true">g_filename_completer_get_completion_suffix</alloc>
-    <alloc init="true">g_inet_address_mask_to_string</alloc>
-    <alloc init="true">g_variant_dup_string</alloc>
-    <alloc init="true">g_variant_dup_bytestring</alloc>
-    <alloc init="true">g_variant_get_objv</alloc>
-    <alloc init="true">g_variant_get_strv</alloc>
-    <alloc init="true">g_variant_print</alloc>
-    <alloc init="true">g_datalist_id_dup_data</alloc>
-    <alloc init="true">g_dir_make_tmp</alloc>
-    <alloc init="true">g_filename_from_utf8</alloc>
-    <alloc init="true">g_filename_to_utf8</alloc>
-    <alloc init="true">g_file_read_link</alloc>
-    <alloc init="true">g_find_program_in_path</alloc>
-    <alloc init="true">g_format_size</alloc>
-    <alloc init="true">g_format_size_for_display</alloc>
-    <alloc init="true">g_format_size_full</alloc>
-    <alloc init="true">g_hostname_to_ascii</alloc>
-    <alloc init="true">g_hostname_to_unicode</alloc>
-    <alloc init="true">g_locale_from_utf8</alloc>
-    <alloc init="true">g_locale_to_utf8</alloc>
-    <alloc init="true">g_markup_escape_text</alloc>
-    <alloc init="true">g_markup_printf_escaped</alloc>
-    <alloc init="true">g_markup_vprintf_escaped</alloc>
-    <alloc init="true">g_match_info_expand_references</alloc>
-    <alloc init="true">g_match_info_fetch</alloc>
-    <alloc init="true">g_match_info_fetch_named</alloc>
-    <alloc init="true">g_option_context_get_help</alloc>
-    <alloc init="true">g_regex_escape_nul</alloc>
-    <alloc init="true">g_regex_escape_string</alloc>
-    <alloc init="true">g_regex_replace</alloc>
-    <alloc init="true">g_regex_replace_eval</alloc>
-    <alloc init="true">g_regex_replace_literal</alloc>
-    <alloc init="true">g_shell_quote</alloc>
-    <alloc init="true">g_shell_unquote</alloc>
-    <alloc init="true">g_uri_escape_string</alloc>
-    <alloc init="true">g_uri_parse_scheme</alloc>
-    <alloc init="true">g_uri_unescape_segment</alloc>
-    <alloc init="true">g_uri_unescape_string</alloc>
-    <alloc init="true">g_variant_type_dup_string</alloc>
-    <alloc init="true">g_value_dup_string</alloc>
+    <alloc init="true" no-fail="true">g_ascii_strdown</alloc>
+    <alloc init="true" no-fail="true">g_ascii_strup</alloc>
+    <alloc init="true" no-fail="true">g_base64_decode</alloc>
+    <alloc init="true" no-fail="true">g_base64_encode</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_get_description</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_get_mime_type</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_get_title</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_to_data</alloc>
+    <alloc init="true" no-fail="true">g_build_filename</alloc>
+    <alloc init="true" no-fail="true">g_build_filenamev</alloc>
+    <alloc init="true" no-fail="true">g_build_path</alloc>
+    <alloc init="true" no-fail="true">g_build_pathv</alloc>
+    <alloc init="true" no-fail="true">g_bytes_unref_to_data</alloc>
+    <alloc init="true" no-fail="true">g_compute_checksum_for_bytes</alloc>
+    <alloc init="true" no-fail="true">g_compute_checksum_for_data</alloc>
+    <alloc init="true" no-fail="true">g_compute_checksum_for_string</alloc>
+    <alloc init="true" no-fail="true">g_compute_hmac_for_data</alloc>
+    <alloc init="true" no-fail="true">g_compute_hmac_for_string</alloc>
+    <alloc init="true" no-fail="true">g_convert</alloc>
+    <alloc init="true" no-fail="true">g_convert_with_fallback</alloc>
+    <alloc init="true" no-fail="true">g_convert_with_iconv</alloc>
+    <alloc init="true" no-fail="true">g_credentials_to_string</alloc>
+    <alloc init="true" no-fail="true">g_date_time_format</alloc>
+    <alloc init="true" no-fail="true">g_filename_display_basename</alloc>
+    <alloc init="true" no-fail="true">g_filename_display_name</alloc>
+    <alloc init="true" no-fail="true">g_filename_from_uri</alloc>
+    <alloc init="true" no-fail="true">g_filename_to_uri</alloc>
+    <alloc init="true" no-fail="true">g_get_codeset</alloc>
+    <alloc init="true" no-fail="true">g_get_current_dir</alloc>
+    <alloc init="true" no-fail="true">g_get_locale_variants</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_start_group</alloc>
+    <alloc init="true" no-fail="true">g_key_file_to_data</alloc>
+    <alloc buffer-size="malloc" no-fail="true">g_malloc</alloc>
+    <realloc buffer-size="malloc:2" no-fail="true">g_realloc</realloc>
+    <alloc init="true" buffer-size="malloc" no-fail="true">g_malloc0</alloc>
+    <alloc init="true" buffer-size="calloc" no-fail="true">g_malloc0_n</alloc>
+    <alloc buffer-size="calloc" no-fail="true">g_malloc_n</alloc>
+    <realloc buffer-size="calloc:2,3" no-fail="true">g_realloc_n</realloc>
+    <alloc init="true" no-fail="true">g_memdup</alloc>
+    <alloc init="true" no-fail="true">g_path_get_basename</alloc>
+    <alloc init="true" no-fail="true">g_path_get_dirname</alloc>
+    <alloc no-fail="true">g_slice_alloc</alloc>
+    <alloc init="true" no-fail="true">g_slice_alloc0</alloc>
+    <alloc init="true" no-fail="true">g_slice_copy</alloc>
+    <alloc init="true" no-fail="true">g_strcompress</alloc>
+    <alloc init="true" no-fail="true">g_strconcat</alloc>
+    <alloc init="true" buffer-size="strdup" no-fail="true">g_strdup</alloc>
+    <alloc init="true" no-fail="true">g_strdup_printf</alloc>
+    <alloc init="true" no-fail="true">g_strdup_vprintf</alloc>
+    <alloc init="true" no-fail="true">g_strescape</alloc>
+    <alloc init="true" no-fail="true">g_strjoin</alloc>
+    <alloc init="true" no-fail="true">g_strjoinv</alloc>
+    <alloc init="true" no-fail="true">g_strndup</alloc>
+    <alloc init="true" no-fail="true">g_strnfill</alloc>
+    <alloc init="true" no-fail="true">g_time_val_to_iso8601</alloc>
+    <alloc buffer-size="malloc" no-fail="false">g_try_malloc</alloc>
+    <realloc buffer-size="malloc:2" no-fail="false">g_try_realloc</realloc>
+    <alloc init="true" buffer-size="malloc" no-fail="false">g_try_malloc0</alloc>
+    <alloc init="true" buffer-size="calloc" no-fail="false">g_try_malloc0_n</alloc>
+    <alloc buffer-size="calloc" no-fail="false">g_try_malloc_n</alloc>
+    <realloc buffer-size="calloc:2,3" no-fail="false">g_try_realloc_n</realloc>
+    <alloc init="true" no-fail="true">g_ucs4_to_utf16</alloc>
+    <alloc init="true" no-fail="true">g_ucs4_to_utf8</alloc>
+    <alloc init="true" no-fail="true">g_unicode_canonical_decomposition</alloc>
+    <alloc init="true" no-fail="true">g_utf16_to_ucs4</alloc>
+    <alloc init="true" no-fail="true">g_utf16_to_utf8</alloc>
+    <alloc init="true" no-fail="true">g_utf8_casefold</alloc>
+    <alloc init="true" no-fail="true">g_utf8_collate_key</alloc>
+    <alloc init="true" no-fail="true">g_utf8_collate_key_for_filename</alloc>
+    <alloc init="true" no-fail="true">g_utf8_normalize</alloc>
+    <alloc init="true" no-fail="true">g_utf8_strdown</alloc>
+    <alloc init="true" no-fail="true">g_utf8_strreverse</alloc>
+    <alloc init="true" no-fail="true">g_utf8_strup</alloc>
+    <alloc init="true" no-fail="true">g_utf8_substring</alloc>
+    <alloc init="true" no-fail="true">g_utf8_to_ucs4</alloc>
+    <alloc init="true" no-fail="true">g_utf8_to_ucs4_fast</alloc>
+    <alloc init="true" no-fail="true">g_utf8_to_ucs4_fast</alloc>
+    <alloc init="true" no-fail="true">g_utf8_to_utf16</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_locale_string</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_value</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_string</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_boolean_list</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_integer_list</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_double_list</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_comment</alloc>
+    <alloc init="true" no-fail="true">g_dbus_proxy_get_name_owner</alloc>
+    <alloc init="true" no-fail="true">g_file_info_get_attribute_as_string</alloc>
+    <alloc init="true" no-fail="true">g_file_attribute_matcher_to_string</alloc>
+    <alloc init="true" no-fail="true">g_app_launch_context_get_environment</alloc>
+    <alloc init="true" no-fail="true">g_app_launch_context_get_startup_notify_id</alloc>
+    <alloc init="true" no-fail="true">g_filename_completer_get_completion_suffix</alloc>
+    <alloc init="true" no-fail="true">g_inet_address_mask_to_string</alloc>
+    <alloc init="true" no-fail="true">g_variant_dup_string</alloc>
+    <alloc init="true" no-fail="true">g_variant_dup_bytestring</alloc>
+    <alloc init="true" no-fail="true">g_variant_get_objv</alloc>
+    <alloc init="true" no-fail="true">g_variant_get_strv</alloc>
+    <alloc init="true" no-fail="true">g_variant_print</alloc>
+    <alloc init="true" no-fail="true">g_datalist_id_dup_data</alloc>
+    <alloc init="true" no-fail="true">g_dir_make_tmp</alloc>
+    <alloc init="true" no-fail="true">g_filename_from_utf8</alloc>
+    <alloc init="true" no-fail="true">g_filename_to_utf8</alloc>
+    <alloc init="true" no-fail="true">g_file_read_link</alloc>
+    <alloc init="true" no-fail="true">g_find_program_in_path</alloc>
+    <alloc init="true" no-fail="true">g_format_size</alloc>
+    <alloc init="true" no-fail="true">g_format_size_for_display</alloc>
+    <alloc init="true" no-fail="true">g_format_size_full</alloc>
+    <alloc init="true" no-fail="true">g_hostname_to_ascii</alloc>
+    <alloc init="true" no-fail="true">g_hostname_to_unicode</alloc>
+    <alloc init="true" no-fail="true">g_locale_from_utf8</alloc>
+    <alloc init="true" no-fail="true">g_locale_to_utf8</alloc>
+    <alloc init="true" no-fail="true">g_markup_escape_text</alloc>
+    <alloc init="true" no-fail="true">g_markup_printf_escaped</alloc>
+    <alloc init="true" no-fail="true">g_markup_vprintf_escaped</alloc>
+    <alloc init="true" no-fail="true">g_match_info_expand_references</alloc>
+    <alloc init="true" no-fail="true">g_match_info_fetch</alloc>
+    <alloc init="true" no-fail="true">g_match_info_fetch_named</alloc>
+    <alloc init="true" no-fail="true">g_option_context_get_help</alloc>
+    <alloc init="true" no-fail="true">g_regex_escape_nul</alloc>
+    <alloc init="true" no-fail="true">g_regex_escape_string</alloc>
+    <alloc init="true" no-fail="true">g_regex_replace</alloc>
+    <alloc init="true" no-fail="true">g_regex_replace_eval</alloc>
+    <alloc init="true" no-fail="true">g_regex_replace_literal</alloc>
+    <alloc init="true" no-fail="true">g_shell_quote</alloc>
+    <alloc init="true" no-fail="true">g_shell_unquote</alloc>
+    <alloc init="true" no-fail="true">g_uri_escape_string</alloc>
+    <alloc init="true" no-fail="true">g_uri_parse_scheme</alloc>
+    <alloc init="true" no-fail="true">g_uri_unescape_segment</alloc>
+    <alloc init="true" no-fail="true">g_uri_unescape_string</alloc>
+    <alloc init="true" no-fail="true">g_variant_type_dup_string</alloc>
+    <alloc init="true" no-fail="true">g_value_dup_string</alloc>
     <use>g_register_data</use>
     <dealloc>g_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_hash_table_new_full</alloc>
-    <alloc init="true">g_hash_table_new</alloc>
+    <alloc init="true" no-fail="true">g_hash_table_new_full</alloc>
+    <alloc init="true" no-fail="true">g_hash_table_new</alloc>
     <use>g_hash_table_ref</use>
     <dealloc>g_hash_table_destroy</dealloc>
     <dealloc>g_hash_table_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_io_channel_unix_new</alloc>
-    <alloc init="true">g_io_channel_win32_new_fd</alloc>
-    <alloc init="true">g_io_channel_win32_new_socket</alloc>
-    <alloc init="true">g_io_channel_win32_new_messages</alloc>
-    <alloc init="true">g_io_channel_new_file</alloc>
+    <alloc init="true" no-fail="true">g_io_channel_unix_new</alloc>
+    <alloc init="true" no-fail="true">g_io_channel_win32_new_fd</alloc>
+    <alloc init="true" no-fail="true">g_io_channel_win32_new_socket</alloc>
+    <alloc init="true" no-fail="true">g_io_channel_win32_new_messages</alloc>
+    <alloc init="true" no-fail="true">g_io_channel_new_file</alloc>
     <use>g_io_channel_ref</use>
     <dealloc>g_io_channel_close</dealloc>
     <dealloc>g_io_channel_shutdown</dealloc>
     <dealloc>g_io_channel_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_emblemed_icon_get_emblems</alloc>
-    <alloc init="true">g_list_alloc</alloc>
-    <alloc init="true">g_list_copy</alloc>
-    <alloc init="true">g_list_copy_deep</alloc>
-    <alloc init="true">g_app_info_get_all</alloc>
-    <alloc init="true">g_app_info_get_all_for_type</alloc>
-    <alloc init="true">g_app_info_get_fallback_for_type</alloc>
-    <alloc init="true">g_app_info_get_recommended_for_type</alloc>
-    <alloc init="true">g_io_modules_load_all_in_directory</alloc>
-    <alloc init="true">g_io_modules_load_all_in_directory_with_scope</alloc>
-    <alloc init="true">g_hash_table_get_keys</alloc>
-    <alloc init="true">g_hash_table_get_values</alloc>
+    <alloc init="true" no-fail="true">g_emblemed_icon_get_emblems</alloc>
+    <alloc init="true" no-fail="true">g_list_alloc</alloc>
+    <alloc init="true" no-fail="true">g_list_copy</alloc>
+    <alloc init="true" no-fail="true">g_list_copy_deep</alloc>
+    <alloc init="true" no-fail="true">g_app_info_get_all</alloc>
+    <alloc init="true" no-fail="true">g_app_info_get_all_for_type</alloc>
+    <alloc init="true" no-fail="true">g_app_info_get_fallback_for_type</alloc>
+    <alloc init="true" no-fail="true">g_app_info_get_recommended_for_type</alloc>
+    <alloc init="true" no-fail="true">g_io_modules_load_all_in_directory</alloc>
+    <alloc init="true" no-fail="true">g_io_modules_load_all_in_directory_with_scope</alloc>
+    <alloc init="true" no-fail="true">g_hash_table_get_keys</alloc>
+    <alloc init="true" no-fail="true">g_hash_table_get_values</alloc>
     <dealloc>g_list_free</dealloc>
     <dealloc>g_list_free_1</dealloc>
     <dealloc>g_list_free_full</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_regex_new</alloc>
+    <alloc init="true" no-fail="true">g_regex_new</alloc>
     <use>g_regex_ref</use>
     <dealloc>g_regex_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_node_new</alloc>
-    <alloc init="true">g_node_copy</alloc>
-    <alloc init="true">g_node_copy_deep</alloc>
+    <alloc init="true" no-fail="true">g_node_new</alloc>
+    <alloc init="true" no-fail="true">g_node_copy</alloc>
+    <alloc init="true" no-fail="true">g_node_copy_deep</alloc>
     <dealloc>g_node_destroy</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_time_zone_new</alloc>
-    <alloc init="true">g_time_zone_new_local</alloc>
-    <alloc init="true">g_time_zone_new_utc</alloc>
+    <alloc init="true" no-fail="true">g_time_zone_new</alloc>
+    <alloc init="true" no-fail="true">g_time_zone_new_local</alloc>
+    <alloc init="true" no-fail="true">g_time_zone_new_utc</alloc>
     <use>g_time_zone_ref</use>
     <dealloc>g_time_zone_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_markup_parse_context_new</alloc>
+    <alloc init="true" no-fail="true">g_markup_parse_context_new</alloc>
     <dealloc>g_markup_parse_context_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_mapped_file_new</alloc>
-    <alloc init="true">g_mapped_file_new_from_fd</alloc>
+    <alloc init="true" no-fail="true">g_mapped_file_new</alloc>
+    <alloc init="true" no-fail="true">g_mapped_file_new_from_fd</alloc>
     <use>g_mapped_file_ref</use>
     <dealloc>g_mapped_file_free</dealloc>
     <dealloc>g_mapped_file_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_mutex_new</alloc>
+    <alloc init="true" no-fail="true">g_mutex_new</alloc>
     <dealloc>g_mutex_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_mem_chunk_new</alloc>
+    <alloc init="true" no-fail="true">g_mem_chunk_new</alloc>
     <dealloc>g_mem_chunk_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_option_group_new</alloc>
+    <alloc init="true" no-fail="true">g_option_group_new</alloc>
     <dealloc>g_option_group_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_option_context_new</alloc>
+    <alloc init="true" no-fail="true">g_option_context_new</alloc>
     <dealloc>g_option_context_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_rand_new</alloc>
-    <alloc init="true">g_rand_copy</alloc>
-    <alloc init="true">g_rand_new_with_seed</alloc>
-    <alloc init="true">g_rand_new_with_seed_array</alloc>
+    <alloc init="true" no-fail="true">g_rand_new</alloc>
+    <alloc init="true" no-fail="true">g_rand_copy</alloc>
+    <alloc init="true" no-fail="true">g_rand_new_with_seed</alloc>
+    <alloc init="true" no-fail="true">g_rand_new_with_seed_array</alloc>
     <dealloc>g_rand_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_queue_new</alloc>
-    <alloc init="true">g_queue_copy</alloc>
+    <alloc init="true" no-fail="true">g_queue_new</alloc>
+    <alloc init="true" no-fail="true">g_queue_copy</alloc>
     <dealloc>g_queue_free</dealloc>
+    <dealloc>g_queue_free_full</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_slice_new</alloc>
+    <alloc init="true" no-fail="true">g_slice_new</alloc>
     <dealloc>g_slice_free</dealloc>
     <dealloc>g_slice_free1</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_sequence_new</alloc>
+    <alloc init="true" no-fail="true">g_sequence_new</alloc>
     <dealloc>g_sequence_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_completion_new</alloc>
+    <alloc init="true" no-fail="true">g_completion_new</alloc>
     <dealloc>g_completion_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_chunk_new</alloc>
+    <alloc init="true" no-fail="true">g_chunk_new</alloc>
     <dealloc>g_chunk_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_bytes_new</alloc>
-    <alloc init="true">g_bytes_new_take</alloc>
-    <alloc init="true">g_bytes_new_static</alloc>
-    <alloc init="true">g_bytes_new_with_free_func</alloc>
-    <alloc init="true">g_bytes_new_from_bytes</alloc>
-    <alloc init="true">g_byte_array_free_to_bytes</alloc>
-    <alloc init="true">g_memory_output_stream_steal_as_bytes</alloc>
-    <alloc init="true">g_variant_get_data_as_bytes</alloc>
-    <alloc init="true">g_mapped_file_get_bytes</alloc>
+    <alloc init="true" no-fail="true">g_bytes_new</alloc>
+    <alloc init="true" no-fail="true">g_bytes_new_take</alloc>
+    <alloc init="true" no-fail="true">g_bytes_new_static</alloc>
+    <alloc init="true" no-fail="true">g_bytes_new_with_free_func</alloc>
+    <alloc init="true" no-fail="true">g_bytes_new_from_bytes</alloc>
+    <alloc init="true" no-fail="true">g_byte_array_free_to_bytes</alloc>
+    <alloc init="true" no-fail="true">g_memory_output_stream_steal_as_bytes</alloc>
+    <alloc init="true" no-fail="true">g_variant_get_data_as_bytes</alloc>
+    <alloc init="true" no-fail="true">g_mapped_file_get_bytes</alloc>
     <use>g_bytes_ref</use>
     <dealloc>g_bytes_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_bookmark_file_get_uris</alloc>
-    <alloc init="true">g_bookmark_file_get_groups</alloc>
-    <alloc init="true">g_bookmark_file_get_applications</alloc>
-    <alloc init="true">g_key_file_get_groups</alloc>
-    <alloc init="true">g_key_file_get_keys</alloc>
-    <alloc init="true">g_strdupv</alloc>
-    <alloc init="true">g_strsplit</alloc>
-    <alloc init="true">g_strsplit_set</alloc>
-    <alloc init="true">g_uri_list_extract_uris</alloc>
-    <alloc init="true">g_key_file_get_string_list</alloc>
-    <alloc init="true">g_key_file_get_locale_string_list</alloc>
-    <alloc init="true">g_file_info_list_attributes</alloc>
-    <alloc init="true">g_file_info_get_attribute_stringv</alloc>
-    <alloc init="true">g_app_launch_context_get_environment</alloc>
-    <alloc init="true">g_filename_completer_get_completions</alloc>
-    <alloc init="true">g_io_module_query</alloc>
-    <alloc init="true">g_variant_dup_objv</alloc>
-    <alloc init="true">g_variant_dup_bytestring_array</alloc>
-    <alloc init="true">g_environ_setenv</alloc>
-    <alloc init="true">g_environ_unsetenv</alloc>
-    <alloc init="true">g_get_environ</alloc>
-    <alloc init="true">g_listenv</alloc>
-    <alloc init="true">g_match_info_fetch_all</alloc>
-    <alloc init="true">g_regex_split</alloc>
-    <alloc init="true">g_regex_split_full</alloc>
-    <alloc init="true">g_regex_split_simple</alloc>
-    <alloc init="true">g_regex_split_simple</alloc>
-    <alloc init="true">g_variant_dup_strv</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_get_uris</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_get_groups</alloc>
+    <alloc init="true" no-fail="true">g_bookmark_file_get_applications</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_groups</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_keys</alloc>
+    <alloc init="true" no-fail="true">g_strdupv</alloc>
+    <alloc init="true" no-fail="true">g_strsplit</alloc>
+    <alloc init="true" no-fail="true">g_strsplit_set</alloc>
+    <alloc init="true" no-fail="true">g_uri_list_extract_uris</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_string_list</alloc>
+    <alloc init="true" no-fail="true">g_key_file_get_locale_string_list</alloc>
+    <alloc init="true" no-fail="true">g_file_info_list_attributes</alloc>
+    <alloc init="true" no-fail="true">g_file_info_get_attribute_stringv</alloc>
+    <alloc init="true" no-fail="true">g_app_launch_context_get_environment</alloc>
+    <alloc init="true" no-fail="true">g_filename_completer_get_completions</alloc>
+    <alloc init="true" no-fail="true">g_io_module_query</alloc>
+    <alloc init="true" no-fail="true">g_variant_dup_objv</alloc>
+    <alloc init="true" no-fail="true">g_variant_dup_bytestring_array</alloc>
+    <alloc init="true" no-fail="true">g_environ_setenv</alloc>
+    <alloc init="true" no-fail="true">g_environ_unsetenv</alloc>
+    <alloc init="true" no-fail="true">g_get_environ</alloc>
+    <alloc init="true" no-fail="true">g_listenv</alloc>
+    <alloc init="true" no-fail="true">g_match_info_fetch_all</alloc>
+    <alloc init="true" no-fail="true">g_regex_split</alloc>
+    <alloc init="true" no-fail="true">g_regex_split_full</alloc>
+    <alloc init="true" no-fail="true">g_regex_split_simple</alloc>
+    <alloc init="true" no-fail="true">g_regex_split_simple</alloc>
+    <alloc init="true" no-fail="true">g_variant_dup_strv</alloc>
     <dealloc>g_strfreev</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_hmac_new</alloc>
-    <alloc init="true">g_hmac_copy</alloc>
+    <alloc init="true" no-fail="true">g_hmac_new</alloc>
+    <alloc init="true" no-fail="true">g_hmac_copy</alloc>
     <use>g_hmac_ref</use>
     <dealloc>g_hmac_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_hook_alloc</alloc>
+    <alloc init="true" no-fail="true">g_hook_alloc</alloc>
     <use>g_hook_ref</use>
     <dealloc>g_hook_unref</dealloc>
     <dealloc>g_hook_destroy</dealloc>
     <dealloc>g_hook_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_date_new</alloc>
-    <alloc init="true">g_date_new_dmy</alloc>
-    <alloc init="true">g_date_new_julian</alloc>
+    <alloc init="true" no-fail="true">g_date_new</alloc>
+    <alloc init="true" no-fail="true">g_date_new_dmy</alloc>
+    <alloc init="true" no-fail="true">g_date_new_julian</alloc>
     <dealloc>g_date_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_variant_builder_new</alloc>
+    <alloc init="true" no-fail="true">g_variant_builder_new</alloc>
     <use>g_variant_builder_ref</use>
     <dealloc>g_variant_builder_unref</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_cond_new</alloc>
+    <alloc init="true" no-fail="true">g_cond_new</alloc>
     <dealloc>g_cond_free</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_app_launch_context_new</alloc>
-    <alloc init="true">g_app_info_create_from_commandline</alloc>
-    <alloc init="true">g_app_info_dup</alloc>
-    <alloc init="true">g_app_info_get_default_for_type</alloc>
-    <alloc init="true">g_app_info_get_default_for_uri_scheme</alloc>
-    <alloc init="true">g_application_new</alloc>
-    <alloc init="true">g_application_get_dbus_connection</alloc>
-    <alloc init="true">g_application_get_default</alloc>
-    <alloc init="true">g_buffered_input_stream_new</alloc>
-    <alloc init="true">g_buffered_output_stream_new</alloc>
-    <alloc init="true">g_cancellable_new</alloc>
-    <alloc init="true">g_charset_converter_new</alloc>
-    <alloc init="true">g_converter_input_stream_new</alloc>
-    <alloc init="true">g_converter_output_stream_new</alloc>
-    <alloc init="true">g_credentials_new</alloc>
-    <alloc init="true">g_data_input_stream_new</alloc>
-    <alloc init="true">g_data_output_stream_new</alloc>
-    <alloc init="true">g_dbus_auth_observer_new</alloc>
-    <alloc init="true">g_dbus_connection_new_finish</alloc>
-    <alloc init="true">g_dbus_connection_new_sync</alloc>
-    <alloc init="true">g_dbus_connection_new_for_address_finish</alloc>
-    <alloc init="true">g_dbus_connection_new_for_address_sync</alloc>
-    <alloc init="true">g_dbus_message_new</alloc>
-    <alloc init="true">g_dbus_message_new_signal</alloc>
-    <alloc init="true">g_dbus_message_new_method_call</alloc>
-    <alloc init="true">g_dbus_message_new_method_reply</alloc>
-    <alloc init="true">g_dbus_message_new_method_error</alloc>
-    <alloc init="true">g_dbus_message_new_method_error_valist</alloc>
-    <alloc init="true">g_dbus_message_new_method_error_literal</alloc>
-    <alloc init="true">g_dbus_object_manager_client_new_finish</alloc>
-    <alloc init="true">g_dbus_object_manager_client_new_sync</alloc>
-    <alloc init="true">g_dbus_object_manager_client_new_for_bus_finish</alloc>
-    <alloc init="true">g_dbus_object_manager_client_new_for_bus_sync</alloc>
-    <alloc init="true">g_dbus_object_manager_server_new</alloc>
-    <alloc init="true">g_dbus_object_manager_server_get_connection</alloc>
-    <alloc init="true">g_dbus_object_proxy_new</alloc>
-    <alloc init="true">g_dbus_object_skeleton_new</alloc>
-    <alloc init="true">g_dbus_proxy_new_finish</alloc>
-    <alloc init="true">g_dbus_proxy_new_sync</alloc>
-    <alloc init="true">g_dbus_proxy_new_for_bus_finish</alloc>
-    <alloc init="true">g_dbus_proxy_new_for_bus_sync</alloc>
-    <alloc init="true">g_emblemed_icon_new</alloc>
-    <alloc init="true">g_emblem_new</alloc>
-    <alloc init="true">g_emblem_new_with_origin</alloc>
-    <alloc init="true">g_file_icon_new</alloc>
-    <alloc init="true">g_file_icon_get_file</alloc>
-    <alloc init="true">g_file_info_new</alloc>
-    <alloc init="true">g_file_info_dup</alloc>
-    <alloc init="true">g_file_info_get_icon</alloc>
-    <alloc init="true">g_file_info_get_symbolic_icon</alloc>
-    <alloc init="true">g_file_info_get_attribute_object</alloc>
-    <alloc init="true">g_file_info_get_deletion_date</alloc>
-    <alloc init="true">g_filename_completer_new</alloc>
-    <alloc init="true">g_inet_address_mask_new</alloc>
-    <alloc init="true">g_inet_address_mask_new_from_string</alloc>
-    <alloc init="true">g_inet_address_mask_get_address</alloc>
-    <alloc init="true">g_inet_socket_address_new</alloc>
-    <alloc init="true">g_inet_socket_address_get_address</alloc>
-    <alloc init="true">g_initable_new</alloc>
-    <alloc init="true">g_initable_new_valist</alloc>
-    <alloc init="true">g_initable_newv</alloc>
-    <alloc init="true">g_io_module_new</alloc>
-    <alloc init="true">g_io_module_scope_new</alloc>
-    <alloc init="true">g_keyfile_settings_backend_new</alloc>
-    <alloc init="true">g_memory_input_stream_new</alloc>
-    <alloc init="true">g_memory_input_stream_new_from_data</alloc>
-    <alloc init="true">g_memory_input_stream_new_from_bytes</alloc>
-    <alloc init="true">g_memory_output_stream_new</alloc>
-    <alloc init="true">g_memory_output_stream_new_resizable</alloc>
-    <alloc init="true">g_memory_settings_backend_new</alloc>
-    <alloc init="true">g_null_settings_backend_new</alloc>
-    <alloc init="true">g_menu_item_new</alloc>
-    <alloc init="true">g_menu_item_new_section</alloc>
-    <alloc init="true">g_menu_item_new_submenu</alloc>
-    <alloc init="true">g_menu_item_new_from_model</alloc>
-    <alloc init="true">g_menu_new</alloc>
-    <alloc init="true">g_mount_operation_new</alloc>
-    <alloc init="true">g_network_address_new</alloc>
-    <alloc init="true">g_network_service_new</alloc>
-    <alloc init="true">g_object_new</alloc>
-    <alloc init="true">g_param_spec_pool_new</alloc>
-    <alloc init="true">g_pollable_source_new</alloc>
-    <alloc init="true">g_private_new</alloc>
-    <alloc init="true">g_proxy_address_new</alloc>
-    <alloc init="true">g_ptr_array_sized_new</alloc>
-    <alloc init="true">g_relation_new</alloc>
-    <alloc init="true">g_scanner_new</alloc>
-    <alloc init="true">g_settings_new</alloc>
-    <alloc init="true">g_signal_type_cclosure_new</alloc>
-    <alloc init="true">g_simple_action_group_new</alloc>
-    <alloc init="true">g_simple_action_new</alloc>
-    <alloc init="true">g_simple_async_result_new</alloc>
-    <alloc init="true">g_simple_permission_new</alloc>
-    <alloc init="true">g_socket_client_new</alloc>
-    <alloc init="true">g_socket_listener_new</alloc>
-    <alloc init="true">g_socket_new</alloc>
-    <alloc init="true">g_socket_service_new</alloc>
-    <alloc init="true">g_tcp_wrapper_connection_new</alloc>
-    <alloc init="true">g_test_dbus_new</alloc>
-    <alloc init="true">g_themed_icon_new</alloc>
-    <alloc init="true">g_threaded_socket_service_new</alloc>
-    <alloc init="true">g_tls_client_connection_new</alloc>
-    <alloc init="true">g_tls_file_database_new</alloc>
-    <alloc init="true">g_tls_password_new</alloc>
-    <alloc init="true">g_tls_server_connection_new</alloc>
-    <alloc init="true">g_unix_signal_source_new</alloc>
-    <alloc init="true">g_zlib_compressor_new</alloc>
-    <alloc init="true">g_zlib_decompressor_new</alloc>
+    <alloc init="true" no-fail="true">g_app_launch_context_new</alloc>
+    <alloc init="true" no-fail="true">g_app_info_create_from_commandline</alloc>
+    <alloc init="true" no-fail="true">g_app_info_dup</alloc>
+    <alloc init="true" no-fail="true">g_app_info_get_default_for_type</alloc>
+    <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>
+    <alloc init="true" no-fail="true">g_charset_converter_new</alloc>
+    <alloc init="true" no-fail="true">g_converter_input_stream_new</alloc>
+    <alloc init="true" no-fail="true">g_converter_output_stream_new</alloc>
+    <alloc init="true" no-fail="true">g_credentials_new</alloc>
+    <alloc init="true" no-fail="true">g_data_input_stream_new</alloc>
+    <alloc init="true" no-fail="true">g_data_output_stream_new</alloc>
+    <alloc init="true" no-fail="true">g_dbus_auth_observer_new</alloc>
+    <alloc init="true" no-fail="true">g_dbus_connection_new_finish</alloc>
+    <alloc init="true" no-fail="true">g_dbus_connection_new_sync</alloc>
+    <alloc init="true" no-fail="true">g_dbus_connection_new_for_address_finish</alloc>
+    <alloc init="true" no-fail="true">g_dbus_connection_new_for_address_sync</alloc>
+    <alloc init="true" no-fail="true">g_dbus_message_new</alloc>
+    <alloc init="true" no-fail="true">g_dbus_message_new_signal</alloc>
+    <alloc init="true" no-fail="true">g_dbus_message_new_method_call</alloc>
+    <alloc init="true" no-fail="true">g_dbus_message_new_method_reply</alloc>
+    <alloc init="true" no-fail="true">g_dbus_message_new_method_error</alloc>
+    <alloc init="true" no-fail="true">g_dbus_message_new_method_error_valist</alloc>
+    <alloc init="true" no-fail="true">g_dbus_message_new_method_error_literal</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_manager_client_new_finish</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_manager_client_new_sync</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_manager_client_new_for_bus_finish</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_manager_client_new_for_bus_sync</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_manager_server_new</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_manager_server_get_connection</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_proxy_new</alloc>
+    <alloc init="true" no-fail="true">g_dbus_object_skeleton_new</alloc>
+    <alloc init="true" no-fail="true">g_dbus_proxy_new_finish</alloc>
+    <alloc init="true" no-fail="true">g_dbus_proxy_new_sync</alloc>
+    <alloc init="true" no-fail="true">g_dbus_proxy_new_for_bus_finish</alloc>
+    <alloc init="true" no-fail="true">g_dbus_proxy_new_for_bus_sync</alloc>
+    <alloc init="true" no-fail="true">g_emblemed_icon_new</alloc>
+    <alloc init="true" no-fail="true">g_emblem_new</alloc>
+    <alloc init="true" no-fail="true">g_emblem_new_with_origin</alloc>
+    <alloc init="true" no-fail="true">g_file_icon_new</alloc>
+    <alloc init="true" no-fail="true">g_file_icon_get_file</alloc>
+    <alloc init="true" no-fail="true">g_file_info_new</alloc>
+    <alloc init="true" no-fail="true">g_file_info_dup</alloc>
+    <alloc init="true" no-fail="true">g_file_info_get_icon</alloc>
+    <alloc init="true" no-fail="true">g_file_info_get_symbolic_icon</alloc>
+    <alloc init="true" no-fail="true">g_file_info_get_attribute_object</alloc>
+    <alloc init="true" no-fail="true">g_file_info_get_deletion_date</alloc>
+    <alloc init="true" no-fail="true">g_filename_completer_new</alloc>
+    <alloc init="true" no-fail="true">g_inet_address_mask_new</alloc>
+    <alloc init="true" no-fail="true">g_inet_address_mask_new_from_string</alloc>
+    <alloc init="true" no-fail="true">g_inet_address_mask_get_address</alloc>
+    <alloc init="true" no-fail="true">g_inet_socket_address_new</alloc>
+    <alloc init="true" no-fail="true">g_inet_socket_address_get_address</alloc>
+    <alloc init="true" no-fail="true">g_initable_new</alloc>
+    <alloc init="true" no-fail="true">g_initable_new_valist</alloc>
+    <alloc init="true" no-fail="true">g_initable_newv</alloc>
+    <alloc init="true" no-fail="true">g_io_module_new</alloc>
+    <alloc init="true" no-fail="true">g_io_module_scope_new</alloc>
+    <alloc init="true" no-fail="true">g_keyfile_settings_backend_new</alloc>
+    <alloc init="true" no-fail="true">g_memory_input_stream_new</alloc>
+    <alloc init="true" no-fail="true">g_memory_input_stream_new_from_data</alloc>
+    <alloc init="true" no-fail="true">g_memory_input_stream_new_from_bytes</alloc>
+    <alloc init="true" no-fail="true">g_memory_output_stream_new</alloc>
+    <alloc init="true" no-fail="true">g_memory_output_stream_new_resizable</alloc>
+    <alloc init="true" no-fail="true">g_memory_settings_backend_new</alloc>
+    <alloc init="true" no-fail="true">g_null_settings_backend_new</alloc>
+    <alloc init="true" no-fail="true">g_menu_item_new</alloc>
+    <alloc init="true" no-fail="true">g_menu_item_new_section</alloc>
+    <alloc init="true" no-fail="true">g_menu_item_new_submenu</alloc>
+    <alloc init="true" no-fail="true">g_menu_item_new_from_model</alloc>
+    <alloc init="true" no-fail="true">g_menu_new</alloc>
+    <alloc init="true" no-fail="true">g_mount_operation_new</alloc>
+    <alloc init="true" no-fail="true">g_network_address_new</alloc>
+    <alloc init="true" no-fail="true">g_network_service_new</alloc>
+    <alloc init="true" no-fail="true">g_object_new</alloc>
+    <alloc init="true" no-fail="true">g_param_spec_pool_new</alloc>
+    <alloc init="true" no-fail="true">g_pollable_source_new</alloc>
+    <alloc init="true" no-fail="true">g_private_new</alloc>
+    <alloc init="true" no-fail="true">g_proxy_address_new</alloc>
+    <alloc init="true" no-fail="true">g_ptr_array_sized_new</alloc>
+    <alloc init="true" no-fail="true">g_relation_new</alloc>
+    <alloc init="true" no-fail="true">g_scanner_new</alloc>
+    <alloc init="true" no-fail="true">g_settings_new</alloc>
+    <alloc init="true" no-fail="true">g_signal_type_cclosure_new</alloc>
+    <alloc init="true" no-fail="true">g_simple_action_group_new</alloc>
+    <alloc init="true" no-fail="true">g_simple_action_new</alloc>
+    <alloc init="true" no-fail="true">g_simple_async_result_new</alloc>
+    <alloc init="true" no-fail="true">g_simple_permission_new</alloc>
+    <alloc init="true" no-fail="true">g_socket_client_new</alloc>
+    <alloc init="true" no-fail="true">g_socket_listener_new</alloc>
+    <alloc init="true" no-fail="true">g_socket_new</alloc>
+    <alloc init="true" no-fail="true">g_socket_service_new</alloc>
+    <alloc init="true" no-fail="true">g_tcp_wrapper_connection_new</alloc>
+    <alloc init="true" no-fail="true">g_test_dbus_new</alloc>
+    <alloc init="true" no-fail="true">g_themed_icon_new</alloc>
+    <alloc init="true" no-fail="true">g_threaded_socket_service_new</alloc>
+    <alloc init="true" no-fail="true">g_tls_client_connection_new</alloc>
+    <alloc init="true" no-fail="true">g_tls_file_database_new</alloc>
+    <alloc init="true" no-fail="true">g_tls_password_new</alloc>
+    <alloc init="true" no-fail="true">g_tls_server_connection_new</alloc>
+    <alloc init="true" no-fail="true">g_unix_signal_source_new</alloc>
+    <alloc init="true" no-fail="true">g_zlib_compressor_new</alloc>
+    <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">g_tree_new</alloc>
-    <alloc init="true">g_tree_new_full</alloc>
-    <alloc init="true">g_tree_new_with_data</alloc>
+    <alloc init="true" no-fail="true">g_tree_new</alloc>
+    <alloc init="true" no-fail="true">g_tree_new_full</alloc>
+    <alloc init="true" no-fail="true">g_tree_new_with_data</alloc>
     <use>g_tree_ref</use>
     <dealloc>g_tree_unref</dealloc>
+    <dealloc>g_tree_destroy</dealloc>
   </memory>
   <memory>
-    <alloc init="true">g_file_attribute_matcher_new</alloc>
-    <alloc init="true">g_file_attribute_matcher_subtract</alloc>
+    <alloc init="true" no-fail="true">g_file_attribute_matcher_new</alloc>
+    <alloc init="true" no-fail="true">g_file_attribute_matcher_subtract</alloc>
     <use>g_file_attribute_matcher_ref</use>
     <dealloc>g_file_attribute_matcher_unref</dealloc>
   </memory>
@@ -896,31 +936,39 @@
   <!-- gboolean g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value); -->
   <function name="g_hash_table_insert">
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
     <arg nr="1" direction="inout">
       <not-uninit/>
+      <not-null/>
     </arg>
     <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
   <!-- gboolean g_hash_table_replace (GHashTable *hash_table, gpointer key, gpointer value); -->
   <function name="g_hash_table_replace">
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
     <arg nr="1" direction="inout">
       <not-uninit/>
+      <not-null/>
     </arg>
     <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
+  <!-- GList * g_list_alloc (void); -->
+  <function name="g_list_alloc">
+    <noreturn>false</noreturn>
+    <returnValue type="GList *"/>
+    <use-retval/>
+  </function>
   <!-- GList * g_list_append (GList *list, gpointer data); -->
   <function name="g_list_append">
     <noreturn>false</noreturn>
@@ -930,18 +978,17 @@
     </arg>
     <arg nr="2">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
+  <!-- GList * g_list_last (GList *list); -->
   <!-- GList * g_list_first (GList *list); -->
-  <function name="g_list_first">
+  <function name="g_list_first,g_list_last">
     <noreturn>false</noreturn>
     <returnValue type="GList *"/>
     <use-retval/>
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
   <!-- void g_list_free (GList *list); -->
@@ -950,7 +997,6 @@
     <returnValue type="void"/>
     <arg nr="1">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
   <!-- void g_list_free_1 (GList *list); -->
@@ -959,7 +1005,6 @@
     <returnValue type="void"/>
     <arg nr="1">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
   <!-- void g_list_free_full (GList *list, GDestroyNotify free_func); -->
@@ -970,23 +1015,80 @@
       <not-uninit/>
     </arg>
     <arg nr="2">
-      <not-bool/>
+      <not-null/>
     </arg>
   </function>
+  <!-- GList* g_list_insert_before (GList* list, GList* sibling, gpointer data); -->
   <function name="g_list_insert_before">
     <noreturn>false</noreturn>
+    <returnValue type="GList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GList* g_list_insert(GList* list, gpointer data, gint position); -->
   <function name="g_list_insert">
     <noreturn>false</noreturn>
+    <returnValue type="GList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- GList* g_list_insert_sorted(GList* list, gpointer data, GCompareFunc func); -->
   <function name="g_list_insert_sorted">
     <noreturn>false</noreturn>
+    <returnValue type="GList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
   </function>
+  <!-- GList* g_list_insert_sorted_with_data(GList* list, gpointer data, GCompareDataFunc func, gpointer user_data); -->
   <function name="g_list_insert_sorted_with_data">
     <noreturn>false</noreturn>
+    <returnValue type="GList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GList* g_list_prepend(GList* list, gpointer data); -->
   <function name="g_list_prepend">
     <noreturn>false</noreturn>
+    <returnValue type="GList *"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_node_insert_after">
     <noreturn>false</noreturn>
@@ -1000,26 +1102,77 @@
   <function name="g_node_prepend">
     <noreturn>false</noreturn>
   </function>
+  <!-- void g_ptr_array_add(GPtrArray* array, gpointer data); -->
   <function name="g_ptr_array_add">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_queue_push_head_link">
+  <!-- void g_queue_push_head_link (GQueue* queue, GList* link_); -->
+  <!-- void g_queue_push_tail_link(GQueue* queue, GList* link_); -->
+  <function name="g_queue_push_head_link,g_queue_push_tail_link">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_queue_push_head">
+  <!-- void g_queue_push_tail (GQueue* queue, gpointer data); -->
+  <!-- void g_queue_push_head (GQueue* queue, gpointer data); -->
+  <function name="g_queue_push_head,g_queue_push_tail">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- void g_queue_push_nth_link (GQueue* queue, gint n, GList* link_); -->
   <function name="g_queue_push_nth_link">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_queue_push_nth (GQueue* queue, gpointer data, gint n); -->
   <function name="g_queue_push_nth">
     <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_push_tail_link">
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_push_tail">
-    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
   <function name="g_sequence_append">
     <noreturn>false</noreturn>
@@ -1036,20 +1189,31 @@
   <function name="g_sequence_prepend">
     <noreturn>false</noreturn>
   </function>
+  <!-- GSList * g_slist_alloc (void); -->
   <function name="g_slist_alloc">
     <noreturn>false</noreturn>
+    <returnValue type="GSList *"/>
+    <use-retval/>
   </function>
+  <!-- GList * g_slist_append (GSList *list, gpointer data); -->
   <function name="g_slist_append">
     <noreturn>false</noreturn>
+    <returnValue type="GSList *"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- GSList * g_slist_copy (GSList *list); -->
   <function name="g_slist_copy">
     <noreturn>false</noreturn>
     <returnValue type="GSList *"/>
     <use-retval/>
+    <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
   <!-- void g_slist_free (GSList *list); -->
@@ -1057,35 +1221,87 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <arg nr="1">
-      <not-bool/>
+      <not-uninit/>
     </arg>
   </function>
   <!-- void g_slist_free_full (GSList *list, GDestroyNotify free_func); -->
   <function name="g_slist_free_full">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1"/>
-    <arg nr="2"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
   <!-- void g_slist_free_1 (GSList *list); -->
   <function name="g_slist_free_1">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <arg nr="1">
-      <not-bool/>
+      <not-uninit/>
     </arg>
   </function>
+  <!-- GSList* g_slist_insert_before (GSList* list, GSList* sibling, gpointer data); -->
   <function name="g_slist_insert_before">
     <noreturn>false</noreturn>
+    <returnValue type="GSList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList* g_slist_insert(GSList* list, gpointer data, gint position); -->
   <function name="g_slist_insert">
     <noreturn>false</noreturn>
+    <returnValue type="GSList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- GSList* g_slist_insert_sorted(GSList* list, gpointer data, GCompareFunc func); -->
   <function name="g_slist_insert_sorted">
     <noreturn>false</noreturn>
+    <returnValue type="GSList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
   </function>
+  <!-- GSList* g_slist_insert_sorted_with_data(GSList* list, gpointer data, GCompareDataFunc func, gpointer user_data); -->
   <function name="g_slist_insert_sorted_with_data">
     <noreturn>false</noreturn>
+    <returnValue type="GSList *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- GSList * g_slist_prepend (GSList *list, gpointer data); -->
   <function name="g_slist_prepend">
@@ -1095,7 +1311,9 @@
     <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2"/>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- void gtk_list_store_set (GtkListStore *list_store,
                                 GtkTreeIter *iter,
@@ -1157,9 +1375,6 @@
   <function name="gtk_tree_view_column_pack_start">
     <noreturn>false</noreturn>
   </function>
-  <function name="g_variant_builder_add_value">
-    <noreturn>false</noreturn>
-  </function>
   <function name="gtk_box_set_child_packing">
     <noreturn>false</noreturn>
   </function>
@@ -1184,15 +1399,20 @@
   <function name="gtk_notebook_append_page">
     <noreturn>false</noreturn>
   </function>
+  <!-- void g_object_ref (gpointer object); -->
   <function name="g_object_ref">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-null/>
+    </arg>
   </function>
   <!-- void g_object_unref (gpointer object); -->
   <function name="g_object_unref">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <arg nr="1">
-      <not-bool/>
+      <not-null/>
     </arg>
   </function>
   <!-- #define G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec) -->
@@ -1204,197 +1424,623 @@
     <arg nr="2" direction="in"/>
     <arg nr="3" direction="in"/>
   </function>
+  <!-- GArray* g_array_append_vals ( GArray* array, gconstpointer data, guint len); -->
   <function name="g_array_append_vals">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- guint g_array_get_element_size  ( GArray* array); -->
   <function name="g_array_get_element_size">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="guint"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- GArray* g_array_insert_vals ( GArray* array, guint index_, gconstpointer data, guint len); -->
   <function name="g_array_insert_vals">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- GArray* g_array_prepend_vals ( GArray* array, gconstpointer data, guint len); -->
   <function name="g_array_prepend_vals">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
-  <function name="g_array_remove_index">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_array_remove_index_fast">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_array_remove_range">
+  <!-- GArray* g_array_remove_index ( GArray* array, guint index_); -->
+  <!-- GArray* g_array_remove_index_fast ( GArray* array, guint index_); -->
+  <function name="g_array_remove_index,g_array_remove_index_fast">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+  </function>
+  <!-- GArray* g_array_remove_range ( GArray* array, guint index_, guint length); -->
+  <function name="g_array_remove_range">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <returnValue type="GArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- void g_array_set_clear_func ( GArray* array, GDestroyNotify clear_func); -->
   <function name="g_array_set_clear_func">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- GArray* g_array_set_size ( GArray* array, guint length); -->
   <function name="g_array_set_size">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- void g_array_sort  ( GArray* array, GCompareFunc compare_func); -->
   <function name="g_array_sort">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_array_sort_with_data   ( GArray* array, GCompareFunc compare_func, gpointer user_data); -->
   <function name="g_array_sort_with_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3"/>
   </function>
-  <function name="g_bookmark_file_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
+  <!-- GByteArray * g_byte_array_append ( GByteArray * array, const guint8* data, guint len); -->
   <function name="g_byte_array_append">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GByteArray *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-bool/>
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- GByteArray * g_byte_array_prepend ( GByteArray * array, const guint8* data, guint len); -->
   <function name="g_byte_array_prepend">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GByteArray *"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-bool/>
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
   </function>
-  <function name="g_byte_array_remove_index">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_byte_array_remove_index_fast">
+  <!-- GByteArray* g_byte_array_remove_index ( GByteArray* array, guint index_); -->
+  <!-- GByteArray* g_byte_array_remove_index_fast ( GByteArray* array, guint index_); -->
+  <function name="g_byte_array_remove_index,g_byte_array_remove_index_fast">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GByteArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- GByteArray* g_byte_array_remove_range ( GByteArray* array, guint index_, guint length); -->
   <function name="g_byte_array_remove_range">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GByteArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- GByteArray* g_byte_array_set_size ( GByteArray* array, guint length); -->
   <function name="g_byte_array_set_size">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GByteArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- void g_byte_array_sort  ( GByteArray* array, GCompareFunc compare_func); -->
   <function name="g_byte_array_sort">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_byte_array_sort_with_data   ( GByteArray* array, GCompareFunc compare_func, gpointer user_data); -->
   <function name="g_byte_array_sort_with_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3"/>
   </function>
+  <!-- gssize g_checksum_type_get_length    ( GChecksumType checksum_type); -->
   <function name="g_checksum_type_get_length">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gssize"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- guint8 get_days_in_month    ( GDateMonth month, GDateYear year); -->
   <function name="g_date_get_days_in_month">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint8"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- guint8 g_date_get_monday_weeks_in_year    (  GDateYear year); -->
   <function name="g_date_get_monday_weeks_in_year">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint8"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- guint8 g_date_get_sunday_weeks_in_year    (  GDateYear year); -->
   <function name="g_date_get_sunday_weeks_in_year">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint8"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gboolean g_date_get_sunday_weeks_in_year    (  GDateYear year); -->
   <function name="g_date_is_leap_year">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gsize g_date_strftime   (gchar* s, gsize slen, const gchar* format, const GDate* date); -->
   <function name="g_date_strftime">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gsize"/>
+    <arg nr="1">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <formatstr/>
+    <arg nr="3">
+      <not-uninit/>
+      <strz/>
+      <formatstr/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gboolean g_date_valid_day    (  GDateDay day); -->
   <function name="g_date_valid_day">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gboolean g_date_valid_dmy    (  GDateDay day, GDateMonth month, GDateYear year); -->
   <function name="g_date_valid_dmy">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gboolean g_date_valid_julian  (guint32 julian_date); -->
   <function name="g_date_valid_julian">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- gboolean g_date_valid_month  (GDateMonth month); -->
   <function name="g_date_valid_month">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gboolean g_date_valid_weekday  (GDateWeekday weekday); -->
   <function name="g_date_valid_weekday">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gboolean g_date_valid_year  (GDateYear year); -->
   <function name="g_date_valid_year">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- gint g_date_time_compare  (gconstpointer dt1, gconstpointer dt2); -->
   <function name="g_date_time_compare">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- gint g_date_time_equal  (gconstpointer dt1, gconstpointer dt2); -->
   <function name="g_date_time_equal">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- guint g_date_time_hash   (gconstpointer datetime); -->
   <function name="g_date_time_hash">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gboolean g_hash_table_add (GHashTable *hash_table, gpointer key); -->
   <function name="g_hash_table_add">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gboolean g_hash_table_contains (GHashTable *hash_table, gpointer key); -->
   <function name="g_hash_table_contains">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gpointer g_hash_table_find (GHashTable *hash_table, GHRFunc predicate, gpointer user_data); -->
   <function name="g_hash_table_find">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- void g_hash_table_foreach  (GHashTable *hash_table, GHRFunc func, gpointer user_data); -->
   <function name="g_hash_table_foreach">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_hash_table_foreach_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_foreach_steal">
+  <!-- guint g_hash_table_foreach_remove  (GHashTable *hash_table, GHRFunc func, gpointer user_data); -->
+  <!-- guint g_hash_table_foreach_steal  (GHashTable *hash_table, GHRFunc func, gpointer user_data); -->
+  <function name="g_hash_table_foreach_remove,g_hash_table_foreach_steal">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gpointer g_hash_table_lookup (GHashTable *hash_table, gconstpointer key); -->
   <function name="g_hash_table_lookup">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gboolean g_hash_table_lookup_extended (GHashTable *hash_table, gconstpointer key, gpointer* orig_key, gpointer* value); -->
   <function name="g_hash_table_lookup_extended">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out"/>
+    <arg nr="4" direction="out"/>
   </function>
-  <function name="g_hash_table_remove">
+  <!-- gboolean g_hash_table_remove (GHashTable *hash_table, gconstpointer key); -->
+  <!-- gboolean g_hash_table_steal (GHashTable *hash_table, gconstpointer key); -->
+  <function name="g_hash_table_remove,g_hash_table_steal">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_hash_table_remove_all">
+  <!-- void g_hash_table_remove_all (GHashTable *hash_table); -->
+  <!-- void g_hash_table_steal_all (GHashTable *hash_table); -->
+  <function name="g_hash_table_remove_all,g_hash_table_steal_all">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- guint g_hash_table_size (GHashTable *hash_table); -->
   <function name="g_hash_table_size">
     <leak-ignore/>
     <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_steal">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_steal_all">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
   <function name="g_hook_destroy_link">
     <leak-ignore/>
@@ -1444,21 +2090,40 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- GIOChannelError g_io_channel_error_from_errno ( gint en) -->
   <function name="g_io_channel_error_from_errno">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GIOChannelError"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
-  <function name="g_io_channel_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_key_file_error_quark">
+  <!-- GQuark g_io_channel_error_quark (void) -->
+  <!-- GQuark g_key_file_error_quark (void) -->
+  <!-- GQuark g_regex_error_quark (void) -->
+  <!-- GQuark g_thread_error_quark (void) -->
+  <!-- GQuark g_variant_parser_get_error_quark (void) -->
+  <!-- GQuark g_bookmark_file_error_quark (void) -->
+  <function name="g_io_channel_error_quark,g_key_file_error_quark,g_regex_error_quark,g_thread_error_quark,g_variant_parser_get_error_quark,g_bookmark_file_error_quark">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GQuark"/>
   </function>
+  <!-- GList * g_list_concat  (GList *list1, GList* list2); -->
   <function name="g_list_concat">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- GList * g_list_copy (GList *list); -->
   <function name="g_list_copy">
@@ -1467,99 +2132,202 @@
     <use-retval/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
+  <!-- GList * g_list_delete_link (GList *list, GList* link_); -->
   <function name="g_list_delete_link">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GList * g_list_find (GList *list, gconstpointer data); -->
   <function name="g_list_find">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GList * g_list_find_custom (GList *list, gconstpointer data, GCompareFunc func); -->
   <function name="g_list_find_custom">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_list_first">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
+  <!-- void g_list_foreach  (GList *list, GFunc func, gpointer user_data); -->
   <function name="g_list_foreach">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_list_index">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_list_last">
+  <!-- gint g_list_index (GList *list, gconstpointer data); -->
+  <function name="g_list_index">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- guint g_list_length (GList *list); -->
   <function name="g_list_length">
+    <pure/>
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="guint"/>
     <use-retval/>
     <arg nr="1" direction="in">
       <not-uninit/>
-      <not-bool/>
     </arg>
   </function>
-  <function name="g_list_nth">
+  <!-- GList* g_list_nth  (GList *list, guint n); -->
+  <!-- GList* g_list_nth_prev  (GList *list, guint n); -->
+  <function name="g_list_nth,g_list_nth_prev">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- gpointer g_list_nth_data  (GList *list, guint n); -->
   <function name="g_list_nth_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
-  <function name="g_list_nth_prev">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
+  <!-- gint g_list_position  (GList *list, GList *llink); -->
   <function name="g_list_position">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_list_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_list_remove_all">
+  <!-- GList* g_list_remove (GList *list, gconstpointer data); -->
+  <!-- GList* g_list_remove_all (GList *list, gconstpointer data); -->
+  <function name="g_list_remove,g_list_remove_all">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GList* g_list_remove_link  (GList *list, GList *llink); -->
   <function name="g_list_remove_link">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GList* g_list_reverse (GList *list); -->
   <function name="g_list_reverse">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GList* g_list_sort  (GList *list, GCompareFunc compare_func); -->
   <function name="g_list_sort">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- GList* g_list_sort_with_data  (GList *list, GCompareFunc compare_func, gpointer user_data); -->
   <function name="g_list_sort_with_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_main_context_default">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_main_context_get_thread_default">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_main_context_ref_thread_default">
+  <!--GMainContext* g_main_context_default (void) -->
+  <!--GMainContext* g_main_context_get_thread_default (void) -->
+  <!--GMainContext* g_main_context_ref_thread_default (void) -->
+  <function name="g_main_context_default,g_main_context_get_thread_default,g_main_context_ref_thread_default">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GMainContext*"/>
+    <use-retval/>
   </function>
   <function name="g_once_init_enter">
     <leak-ignore/>
@@ -1569,73 +2337,215 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- void g_ptr_array_foreach(GPtrArray* array, GFunc func, gpointer user_data); -->
   <function name="g_ptr_array_foreach">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_ptr_array_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_ptr_array_remove_fast">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_ptr_array_remove_index">
+  <!-- gboolean g_ptr_array_remove ( GPtrArray* array, gpointer data); -->
+  <!-- gboolean g_ptr_array_remove_fast ( GPtrArray* array, gpointer data); -->
+  <function name="g_ptr_array_remove,g_ptr_array_remove_fast">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+      <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_ptr_array_remove_index_fast">
+  <!-- gpointer g_ptr_array_remove_index ( GPtrArray* array, guint index_); -->
+  <!-- gpointer g_ptr_array_remove_index_fast ( GPtrArray* array, guint index_); -->
+  <function name="g_ptr_array_remove_index,g_ptr_array_remove_index_fast">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- GPtrArray* g_ptr_array_remove_range ( GPtrArray* array, guint index_, guint length); -->
   <function name="g_ptr_array_remove_range">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GPtrArray *"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- void g_ptr_array_set_free_func ( GPtrArray* array, GDestroyNotify element_free_func); -->
   <function name="g_ptr_array_set_free_func">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_ptr_array_set_size ( GPtrArray* array, gint length); -->
   <function name="g_ptr_array_set_size">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- void g_ptr_array_sort  ( GPtrArray* array, GCompareFunc compare_func); -->
   <function name="g_ptr_array_sort">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_ptr_array_sort_with_data   ( GPtrArray* array, GCompareFunc compare_func, gpointer user_data); -->
   <function name="g_ptr_array_sort_with_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3"/>
   </function>
+  <!-- gboolean g_regex_check_replacement    ( const gchar* replacement, gboolean* has_references, GError** error); -->
   <function name="g_regex_check_replacement">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out"/>
+    <arg nr="3" direction="out"/>
   </function>
-  <function name="g_regex_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
+  <!-- gboolean g_regex_match_simple     ( const gchar* pattern, const gchar* string, GRegexCompileFlags compile_options, GRegexMatchFlags match_options); -->
   <function name="g_regex_match_simple">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList * g_slist_concat  (GSList *list1, GSList* list2); -->
   <function name="g_slist_concat">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList * g_slist_delete_link (GSList *list, GSList* link_); -->
   <function name="g_slist_delete_link">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList * g_slist_find (GSList *list, gconstpointer data); -->
   <function name="g_slist_find">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList * g_slist_find_custom (GSList *list, gconstpointer data, GCompareFunc func); -->
   <function name="g_slist_find_custom">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
   </function>
   <!-- void g_slist_foreach (GSList *list, GFunc func, gpointer user_data); -->
   <function name="g_slist_foreach">
@@ -1645,8 +2555,12 @@
     <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2"/>
-    <arg nr="3"/>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- gint g_slist_index (GSList *list, gconstpointer data); -->
   <function name="g_slist_index">
@@ -1673,6 +2587,7 @@
   </function>
   <!-- guint g_slist_length (GSList *list); -->
   <function name="g_slist_length">
+    <pure/>
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="guint"/>
@@ -1681,41 +2596,110 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- GSList* g_slist_nth  (GSList *list, guint n); -->
   <function name="g_slist_nth">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList*"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- gpointer g_slist_nth_data  (GSList *list, guint n); -->
   <function name="g_slist_nth_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
-  <function name="g_slist_position">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_slist_remove">
+  <!-- gint g_slist_position  (GSList *list, GSList *llink); -->
+  <function name="g_slist_position">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_slist_remove_all">
+  <!-- GSList* g_slist_remove (GSList *list, gconstpointer data); -->
+  <!-- GSList* g_slist_remove_all (GSList *list, gconstpointer data); -->
+  <function name="g_slist_remove,g_slist_remove_all">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList*"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList* g_slist_remove_link  (GSList *list, GSList *llink); -->
   <function name="g_slist_remove_link">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList* g_slist_reverse (GSList *list); -->
   <function name="g_slist_reverse">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GSList* g_slist_sort  (GSList *list, GCompareFunc compare_func); -->
   <function name="g_slist_sort">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- GSList* g_slist_sort_with_data  (GSList *list, GCompareFunc compare_func, gpointer user_data); -->
   <function name="g_slist_sort_with_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GSList*"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_sequence_foreach_range">
     <leak-ignore/>
@@ -1761,33 +2745,20 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_source_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_source_remove_by_funcs_user_data">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_source_remove_by_user_data">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_source_set_name_by_id">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
+  <!-- void g_thread_exit (gpointer retval) -->
   <function name="g_thread_exit">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- GThread* g_thread_self (void) -->
   <function name="g_thread_self">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GThread*"/>
   </function>
   <function name="g_thread_yield">
     <leak-ignore/>
@@ -2126,31 +3097,52 @@
       <not-bool/>
     </arg>
   </function>
-  <function name="g_variant_is_object_path">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_variant_is_signature">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_variant_parser_get_error_quark">
+  <!-- gboolean g_variant_is_object_path (const gchar* string) -->
+  <!-- gboolean g_variant_is_signature  (const gchar* string) -->
+  <!-- gboolean g_variant_type_string_is_valid  (const gchar* type_string) -->
+  <function name="g_variant_is_object_path,g_variant_is_signature,g_variant_type_string_is_valid">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
   </function>
+  <!-- const GVariantType* g_variant_is_signature  (const gchar* arg0) -->
   <function name="g_variant_type_checked_">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="const GVariantType*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
   </function>
-  <function name="g_variant_type_string_is_valid">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
+  <!-- gboolean g_variant_type_string_scan  (const gchar* string, const gchar* limit, const gchar** endptr) -->
   <function name="g_variant_type_string_scan">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <strz/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out">
+      <strz/>
+    </arg>
   </function>
-  <!-- void g_variant_unref (GVariant *value); -->
+  <!-- void g_variant_unref (GVariant* value); -->
   <function name="g_variant_unref">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
@@ -2163,14 +3155,6 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_array_get_element_size">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_array_set_clear_func">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <!-- gint g_ascii_digit_value(gchar c); -->
   <function name="g_ascii_digit_value">
     <noreturn>false</noreturn>
@@ -2188,9 +3172,31 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gchar* g_ascii_formatd (  gchar* buffer,  gint buf_len,  const gchar* format,  gdouble d)-->
   <function name="g_ascii_formatd">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gchar*"/>
+    <arg nr="1" direction="out">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-bool/>
+      <not-uninit/>
+    </arg>
+    <formatstr/>
+    <arg nr="3" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+      <formatstr/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-bool/>
+      <not-uninit/>
+    </arg>
   </function>
   <!-- gboolean g_ascii_isalnum(gchar c); -->
   <function name="g_ascii_isalnum">
@@ -2345,11 +3351,13 @@
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
       <not-uninit/>
       <not-bool/>
+      <strz/>
     </arg>
   </function>
   <!-- gchar * g_ascii_strdown(const gchar *str, gssize len); -->
@@ -2359,6 +3367,7 @@
     <use-retval/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
@@ -2374,9 +3383,11 @@
     <const/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
+      <strz/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -2507,21 +3518,47 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gint g_atomic_int_add (volatile gint* atomic, gint val) -->
   <function name="g_atomic_int_add">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
+  <!-- guint g_atomic_int_and (volatile gint* atomic, guint val) -->
   <function name="g_atomic_int_and">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
   <function name="g_atomic_int_compare_and_exchange">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gboolean g_atomic_int_dec_and_test (volatile gint* atomic) -->
   <function name="g_atomic_int_dec_and_test">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
   <function name="g_atomic_int_exchange_and_add">
     <leak-ignore/>
@@ -2530,10 +3567,21 @@
   <function name="g_atomic_int_get">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_atomic_int_inc (volatile gint* atomic) -->
   <function name="g_atomic_int_inc">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
   <function name="g_atomic_int_or">
     <leak-ignore/>
@@ -2628,10 +3676,6 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_bookmark_file_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="g_chdir">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -2640,151 +3684,130 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_checksum_type_get_length">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
+  <!-- guint g_child_watch_add (  GPid pid,  GChildWatchFunc function,  gpointer data) -->
   <function name="g_child_watch_add">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- guint g_child_watch_add_full ( gint priority, GPid pid,  GChildWatchFunc function,  gpointer data, GDestoryNotify notify) -->
   <function name="g_child_watch_add_full">
     <leak-ignore/>
     <noreturn>false</noreturn>
-  </function>
-  <!-- void g_clear_error (GError **err); -->
-  <function name="g_clear_error">
-    <noreturn>false</noreturn>
-    <returnValue type="void"/>
-    <arg nr="1">
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
       <not-bool/>
     </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="5" direction="in"/>
   </function>
-  <function name="g_clear_pointer">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_convert_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_clear">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_foreach">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_get_data">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_get_flags">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_id_get_data">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_id_remove_no_notify">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_id_replace_data">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_id_set_data_full">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_init">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_set_flags">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_datalist_unset_flags">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_dataset_destroy">
-    <leak-ignore/>
+  <!-- void g_clear_error (GError **err); -->
+  <function name="g_clear_error">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-bool/>
+    </arg>
   </function>
-  <function name="g_dataset_foreach">
+  <!-- void g_clear_pointer (gpointer* pp, GDestroyNotify destroy); -->
+  <function name="g_clear_pointer">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_dataset_id_get_data">
+  <function name="g_convert_error_quark">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_dataset_id_remove_no_notify">
+  <function name="g_datalist_clear">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_dataset_id_set_data_full">
+  <function name="g_datalist_foreach">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_get_days_in_month">
+  <function name="g_datalist_get_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_get_monday_weeks_in_year">
+  <function name="g_datalist_get_flags">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_get_sunday_weeks_in_year">
+  <function name="g_datalist_id_get_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_is_leap_year">
+  <function name="g_datalist_id_remove_no_notify">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_strftime">
+  <function name="g_datalist_id_replace_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_time_compare">
+  <function name="g_datalist_id_set_data_full">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_time_equal">
+  <function name="g_datalist_init">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_time_hash">
+  <function name="g_datalist_set_flags">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_valid_day">
+  <function name="g_datalist_unset_flags">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_valid_dmy">
+  <function name="g_dataset_destroy">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_valid_julian">
+  <function name="g_dataset_foreach">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_valid_month">
+  <function name="g_dataset_id_get_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_valid_weekday">
+  <function name="g_dataset_id_remove_no_notify">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_date_valid_year">
+  <function name="g_dataset_id_set_data_full">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
@@ -2806,13 +3829,28 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- gboolean g_direct_equal ( gconstpointer v1, gconstpointer v2) -->
   <function name="g_direct_equal">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- guint g_direct_hash ( gconstpointer v1, gconstpointer v2) -->
   <function name="g_direct_hash">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- gchar * g_dirname (const gchar *file_name); -->
   <function name="g_dirname">
@@ -2872,21 +3910,85 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gboolean g_file_get_contents (const gchar* filename, gchar** contents, gsize* length, GError** error) -->
   <function name="g_file_get_contents">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out"/>
+    <arg nr="3" direction="out"/>
+    <arg nr="4" direction="out"/>
   </function>
+  <!-- gint g_file_open_tmp (const gchar* tmpl, gchar** name_used, GError** error) -->
   <function name="g_file_open_tmp">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out"/>
   </function>
+  <!-- gboolean g_file_set_contents (const gchar* filename, const gchar* contents, gssize length, GError** error) -->
   <function name="g_file_set_contents">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out"/>
   </function>
+  <!-- gboolean g_file_test (const gchar* filename, GFileTest test) -->
   <function name="g_file_test">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <function name="g_file_info_get_attribute_object">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="g_file_info_get_icon">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+  </function>
+  <function name="g_file_info_get_symbolic_icon">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
   </function>
   <!-- gint g_fprintf (FILE *file, gchar const *format, ...); -->
   <function name="g_fprintf">
@@ -2929,29 +4031,29 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_get_host_name">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="g_get_language_names">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_get_monotonic_time">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_get_prgname">
+  <!-- const gchar* g_get_prgname (void) -->
+  <!-- const gchar* g_get_host_name (void) -->
+  <function name="g_get_prgname,g_get_host_name">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="const gchar *"/>
+    <use-retval/>
   </function>
   <function name="g_get_real_name">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_get_real_time">
+  <!-- gint64 g_get_real_time (void) -->
+  <!-- gint64 g_get_monotonic_time (void) -->
+  <function name="g_get_real_time,g_get_monotonic_time">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint64"/>
+    <use-retval/>
   </function>
   <!-- const gchar * const * g_get_system_config_dirs (void); -->
   <function name="g_get_system_config_dirs">
@@ -3010,50 +4112,6 @@
       <not-bool/>
     </arg>
   </function>
-  <function name="g_hash_table_add">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_contains">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_lookup_extended">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_remove_all">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_size">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_steal">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hash_table_steal_all">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hook_destroy_link">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hook_insert_before">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_hook_prepend">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="g_hostname_is_ascii_encoded">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -3066,17 +4124,45 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!--guint g_idle_add (GSourceFunc function, gpointer data); -->
   <function name="g_idle_add">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
+  <!--guint g_idle_add_full (gint priority, GSourceFunc function, gpointer data, GDestroyNotify notify); -->
   <function name="g_idle_add_full">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
   </function>
+  <!--gboolean g_idle_remove_by_data (gpointer data); -->
   <function name="g_idle_remove_by_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_int64_equal">
     <leak-ignore/>
@@ -3102,13 +4188,54 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- guint g_io_add_watch ( GIOChannel* channel, GIOCondition condition, GIOFunc func, gpointer user_data) -->
   <function name="g_io_add_watch">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- guint g_io_add_watch_full ( GIOChannel* channel, gint priority, GIOCondition condition, GIOFunc func, gpointer user_data, GDestroyNotify notify) -->
   <function name="g_io_add_watch_full">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="5" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="6" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_io_channel_error_from_errno">
     <leak-ignore/>
@@ -3118,10 +4245,6 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_key_file_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="g_log">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -3677,29 +4800,9 @@
       <not-uninit/>
     </arg>
     <formatstr/>
-    <arg nr="3" direction="in">
-      <formatstr/>
-    </arg>
-  </function>
-  <function name="g_ptr_array_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_ptr_array_remove_fast">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_ptr_array_remove_range">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_ptr_array_set_free_func">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_ptr_array_set_size">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
+    <arg nr="3" direction="in">
+      <formatstr/>
+    </arg>
   </function>
   <function name="g_qsort_with_data">
     <leak-ignore/>
@@ -3733,9 +4836,19 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gint32 g_random_int_range(gint32 begin, gint32 end) -->
   <function name="g_random_int_range">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint32"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
   <function name="g_random_set_seed">
     <leak-ignore/>
@@ -3767,18 +4880,6 @@
       <valid>0:</valid>
     </arg>
   </function>
-  <function name="g_regex_check_replacement">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_regex_error_quark">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_regex_match_simple">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="g_reload_user_special_dirs_cache">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -3791,30 +4892,6 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_sequence_move">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_sequence_move_range">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_sequence_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_sequence_remove_range">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_sequence_set">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_sequence_swap">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="g_set_application_name">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -3919,7 +4996,7 @@
     <noreturn>false</noreturn>
   </function>
   <function name="g_snprintf">
-    <returnValue type="int"/>
+    <returnValue type="gint"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
@@ -4021,6 +5098,7 @@
   </function>
   <!-- gboolean g_str_equal (gconstpointer v1, gconstpointer v2); -->
   <function name="g_str_equal">
+    <pure/>
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="gboolean"/>
@@ -4034,13 +5112,23 @@
       <not-uninit/>
     </arg>
   </function>
-  <function name="g_str_has_prefix">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_str_has_suffix">
+  <!-- gboolean g_str_has_prefix (const gchar* str, const gchar* prefix); -->
+  <!-- gboolean g_str_has_suffix (const gchar* str, const gchar* prefix); -->
+  <function name="g_str_has_prefix,g_str_has_suffix">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
   </function>
   <function name="g_str_hash">
     <leak-ignore/>
@@ -4094,6 +5182,7 @@
   <!-- int g_strcmp0 (const char *str1, const char *str2); -->
   <function name="g_strcmp0">
     <leak-ignore/>
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
@@ -4217,17 +5306,53 @@
       <valid>0:</valid>
     </arg>
   </function>
+  <!-- gchar * g_strreverse (gchar *string); -->
   <function name="g_strreverse">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gchar*"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
   </function>
+  <!-- gchar * g_strrstr (const gchar *haystack, const gchar* needle); -->
   <function name="g_strrstr">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gchar*"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
   </function>
-  <function name="g_strrstr_len">
+  <!-- gchar * g_strrstr_len (const gchar *haystack, gssize haystack_len, const gchar* needle); -->
+  <!-- gchar * g_strstr_len (const gchar *haystack, gssize haystack_len, const gchar* needle); -->
+  <function name="g_strrstr_len,g_strstr_len">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gchar*"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-bool/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
   </function>
   <function name="g_strsignal">
     <leak-ignore/>
@@ -4251,10 +5376,6 @@
       <not-bool/>
     </arg>
   </function>
-  <function name="g_strstr_len">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
   <function name="g_strtod">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -4267,9 +5388,17 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- guint g_strv_length (gchar** str_array) -->
   <function name="g_strv_length">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
   </function>
   <function name="g_test_add_data_func">
     <leak-ignore/>
@@ -4407,65 +5536,47 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_thread_exit">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_pool_get_max_idle_time">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_pool_get_max_unused_threads">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_pool_get_num_unused_threads">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_pool_set_max_idle_time">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_pool_set_max_unused_threads">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_pool_stop_unused_threads">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_thread_yield">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_time_val_from_iso8601">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_timeout_add">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_timeout_add_full">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_timeout_add_seconds">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_timeout_add_seconds_full">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_trash_stack_height">
+  <!-- guint g_timeout_add ( guint interval, GSourceFunc function, gpointer data) -->
+  <!-- guint g_timeout_add_seconds ( guint interval, GSourceFunc function, gpointer data) -->
+  <function name="g_timeout_add,g_timeout_add_seconds">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_trash_stack_push">
+  <!-- guint g_timeout_add_full (gint priority, guint interval, GSourceFunc function, gpointer data, GDestroyNotify notify) -->
+  <function name="g_timeout_add_full,g_timeout_add_seconds_full">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="5" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
   <!-- gpointer g_try_malloc (gsize n_bytes); -->
   <!-- gpointer g_try_malloc0 (gsize n_bytes); -->
@@ -4667,224 +5778,243 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_unix_open_pipe">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_unix_set_fd_nonblocking">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_unix_signal_add">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_unix_signal_add_full">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_unlink">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <!-- void g_unsetenv (const gchar *variable); -->
-  <function name="g_unsetenv">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-    <returnValue type="void"/>
-    <arg nr="1" direction="in">
-      <not-null/>
-      <not-uninit/>
-      <not-bool/>
-    </arg>
-  </function>
-  <function name="g_usleep">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_collate">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_find_next_char">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_find_prev_char">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_get_char">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_get_char_validated">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_offset_to_pointer">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_pointer_to_offset">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_prev_char">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_strchr">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_utf8_strlen">
+  <function name="g_unix_open_pipe">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_utf8_strncpy">
+  <function name="g_unix_set_fd_nonblocking">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_utf8_strrchr">
+  <function name="g_unix_signal_add">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_utf8_validate">
+  <function name="g_unix_signal_add_full">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_variant_get_gtype">
+  <function name="g_unlink">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_variant_is_object_path">
+  <!-- void g_unsetenv (const gchar *variable); -->
+  <function name="g_unsetenv">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <not-bool/>
+    </arg>
   </function>
-  <function name="g_variant_is_signature">
+  <function name="g_usleep">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_variant_parser_get_error_quark">
+  <function name="g_utf8_collate">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_variant_type_checked_">
+  <function name="g_utf8_find_next_char">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_variant_type_string_is_valid">
+  <function name="g_utf8_find_prev_char">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_variant_type_string_scan">
+  <function name="g_utf8_get_char">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_vasprintf">
+  <function name="g_utf8_get_char_validated">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_vfprintf">
+  <function name="g_utf8_offset_to_pointer">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_vprintf">
+  <function name="g_utf8_pointer_to_offset">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_vsnprintf">
+  <function name="g_utf8_prev_char">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_vsprintf">
+  <function name="g_utf8_strchr">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_warn_message">
+  <function name="g_utf8_strlen">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_length">
+  <function name="g_utf8_strncpy">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_length_unlocked">
+  <function name="g_utf8_strrchr">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_lock">
+  <function name="g_utf8_validate">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_pop">
+  <function name="g_variant_get_gtype">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_pop_unlocked">
+  <function name="g_vasprintf">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_push">
+  <function name="g_vfprintf">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_push_sorted">
+  <function name="g_vprintf">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_push_sorted_unlocked">
+  <function name="g_vsnprintf">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_push_unlocked">
+  <function name="g_vsprintf">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_ref_unlocked">
+  <function name="g_warn_message">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_async_queue_sort">
+  <!-- gint g_async_queue_length (GAsyncQueue  *queue); -->
+  <!-- gint g_async_queue_length_unlocked (GAsyncQueue  *queue); -->
+  <function name="g_async_queue_length,g_async_queue_length_unlocked">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_async_queue_sort_unlocked">
+  <!-- void g_async_queue_lock (GAsyncQueue  *queue); -->
+  <!-- void g_async_queue_unlock (GAsyncQueue  *queue); -->
+  <function name="g_async_queue_lock,g_async_queue_unlock">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_async_queue_timed_pop">
+  <!-- gpointer g_async_queue_pop (GAsyncQueue  *queue); -->
+  <!-- gpointer g_async_queue_pop_unlocked (GAsyncQueue  *queue); -->
+  <!-- gpointer g_async_queue_try_pop (GAsyncQueue  *queue); -->
+  <!-- gpointer g_async_queue_try_pop_unlocked (GAsyncQueue  *queue); -->
+  <function name="g_async_queue_pop,g_async_queue_pop_unlocked,g_async_queue_try_pop,g_async_queue_try_pop_unlocked">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_async_queue_timed_pop_unlocked">
-    <leak-ignore/>
+  <!-- void g_async_queue_push (GAsyncQueue* queue, gpointer data); -->
+  <!-- void g_async_queue_push_unlocked (GAsyncQueue* queue, gpointer data); -->
+  <function name="g_async_queue_push,g_async_queue_push_unlocked">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_async_queue_timeout_pop">
-    <leak-ignore/>
+  <!-- void g_async_queue_push_sorted (GAsyncQueue* queue, gpointer data, GCompareDataFunc func, gpointer user_data); -->
+  <!-- void g_async_queue_push_sorted_unlocked (GAsyncQueue* queue, gpointer data, GCompareDataFunc func, gpointer user_data); -->
+  <function name="g_async_queue_push_sorted,g_async_queue_push_sorted_unlocked">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_async_queue_timeout_pop_unlocked">
-    <leak-ignore/>
+  <!-- gpointer g_async_queue_ref (GAsyncQueue  *queue); -->
+  <!-- gpointer g_async_queue_ref_unlocked (GAsyncQueue  *queue); -->
+  <function name="g_async_queue_ref,g_async_queue_ref_unlocked">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_async_queue_try_pop">
+  <!-- void g_async_queue_sort (GAsyncQueue* queue, GCompareDataFunc func, gpointer user_data); -->
+  <!-- void g_async_queue_sort_unlocked (GAsyncQueue* queue, GCompareDataFunc func, gpointer user_data); -->
+  <function name="g_async_queue_sort,g_async_queue_sort_unlocked">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_async_queue_try_pop_unlocked">
+  <function name="g_async_queue_timed_pop,g_async_queue_timed_pop_unlocked">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <warn severity="style" reason="Obsolete" alternatives="g_async_queue_timeout_pop,g_async_queue_timeout_pop_unlocked">g_async_queue_timed_pop_unlocked is deprecated and should not be used in newly-written code.use g_async_queue_timeout_pop_unlocked().</warn>
   </function>
-  <function name="g_async_queue_unlock">
+  <!-- gpointer g_async_queue_timeout_pop (GAsyncQueue  *queue, guint64 timeout); -->
+  <!-- gpointer g_async_queue_timeout_pop_unlocked (GAsyncQueue  *queue, guint64 timeout); -->
+  <function name="g_async_queue_timeout_pop,g_async_queue_timeout_pop_unlocked">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
   </function>
   <function name="g_async_queue_unref_and_unlock">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <warn severity="style" reason="Obsolete" alternatives="g_async_queue_unref">g_async_queue_unref_and_unlock has been deprecated since version 2.8 and should not be used in newly-written code. Reference counting is done atomically. so g_async_queue_unref() can be used regardless of the queues lock.</warn>
   </function>
   <function name="g_bookmark_file_add_application">
     <leak-ignore/>
@@ -5018,25 +6148,70 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- gint g_bytes_compare (gconstpointer bytes1, gconstpointer bytes2) -->
   <function name="g_bytes_compare">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gboolean g_bytes_equal(gconstpointer bytes1, gconstpointer bytes2) -->
   <function name="g_bytes_equal">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gconstpointer g_bytes_get_data(GBytes* bytes, gsize* size) -->
   <function name="g_bytes_get_data">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="out">
+    </arg>
   </function>
+  <!-- gsize g_bytes_get_size(GBytes* bytes) -->
   <function name="g_bytes_get_size">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gsize"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- guint g_bytes_hash (gconstpointer bytes) -->
   <function name="g_bytes_hash">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_checksum_get_digest">
     <leak-ignore/>
@@ -5210,65 +6385,57 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- GTimeSpan g_date_time_difference (GDateTime* end, GDateTime* begin) -->
   <function name="g_date_time_difference">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GTimeSpan"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_date_time_get_day_of_month">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_day_of_week">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_day_of_year">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_hour">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_microsecond">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_minute">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_month">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_second">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_seconds">
+  <!-- gint g_date_time_get_microsecond (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_hour (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_minute (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_month (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_second (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_seconds (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_day_of_year (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_day_of_week (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_day_of_month (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_week_of_year (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_year (GDateTime* datetime) -->
+  <!-- gint g_date_time_get_week_numbering_year (GDateTime* datetime) -->
+  <function name="g_date_time_get_week_numbering_year,g_date_time_get_microsecond,g_date_time_get_hour,g_date_time_get_day_of_year,g_date_time_get_week_of_year,g_date_time_get_year,g_date_time_get_day_of_week,g_date_time_get_day_of_month,g_date_time_get_second,g_date_time_get_seconds">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_date_time_get_timezone_abbreviation">
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- GTimeSpan g_date_time_to_unix (GDateTime* datetime) -->
   <function name="g_date_time_get_utc_offset">
     <leak-ignore/>
     <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_week_numbering_year">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_week_of_year">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_date_time_get_year">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
+    <returnValue type="GTimeSpan"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_date_time_get_ymd">
     <leak-ignore/>
@@ -5282,9 +6449,16 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- gint64 g_date_time_to_unix (GDateTime* datetime) -->
   <function name="g_date_time_to_unix">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint64"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_dir_read_name">
     <leak-ignore/>
@@ -6098,129 +7272,344 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
-  <function name="g_queue_clear">
+  <!-- void g_queue_clear (GQueue* queue) -->
+  <function name="g_queue_clear">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <!-- void g_queue_clear_full (GQueue* queue, GDestoryNotify free_func) -->
+  <function name="g_queue_clear_full">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" />
+  </function>
+  <!-- void g_queue_delete_link (GQueue *queue, GList* link_); -->
+  <function name="g_queue_delete_link">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- GList * g_queue_find (GQueue *queue, gconstpointer data); -->
+  <function name="g_queue_find">
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <returnValue type="GList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- GList * g_queue_find_custom (GQueue *queue, gconstpointer data, GCompareFunc func); -->
+  <function name="g_queue_find_custom">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_queue_delete_link">
+  <!-- void g_queue_foreach  (GQueue *queue, GFunc func, gpointer user_data); -->
+  <function name="g_queue_foreach">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_queue_find">
-    <leak-ignore/>
+  <!-- GQueue* g_queue_new(void); -->
+  <function name="g_queue_new">
     <noreturn>false</noreturn>
+    <returnValue type="GQueue*"/>
+    <use-retval/>
   </function>
-  <function name="g_queue_find_custom">
-    <leak-ignore/>
+  <!-- GQueue* g_queue_copy(GQueue* queue); -->
+  <function name="g_queue_copy">
     <noreturn>false</noreturn>
+    <returnValue type="GQueue*"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_queue_foreach">
-    <leak-ignore/>
+  <!-- void g_queue_free  (GQueue *queue); -->
+  <function name="g_queue_free">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_queue_free_full  (GQueue *queue, GDestroyNotify free_func); -->
   <function name="g_queue_free_full">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
   </function>
+  <!-- guint g_queue_get_length (GQueue *queue); -->
   <function name="g_queue_get_length">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- gint g_queue_index (GQueue *queue, gconstpointer data); -->
   <function name="g_queue_index">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- void g_queue_init (GQueue* queue) -->
   <function name="g_queue_init">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_queue_insert_after">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_insert_before">
+  <!-- void g_queue_insert_after (GQueue* queue, GList *sibling, gpointer data) -->
+  <!-- void g_queue_insert_before (GQueue* queue, GList *sibling, gpointer data) -->
+  <function name="g_queue_insert_after,g_queue_insert_before">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- void g_queue_insert_sorted  (GQueue* queue, gpointer data, GCompareDataFunc func, gpointer user_data) -->
   <function name="g_queue_insert_sorted">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gboolean g_queue_is_empty   (GQueue* queue) -->
   <function name="g_queue_is_empty">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- gint g_queue_link_index  (GQueue* queue) -->
   <function name="g_queue_link_index">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_queue_peek_head">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_peek_head_link">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_peek_nth">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_peek_nth_link">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_peek_tail">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_peek_tail_link">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_pop_head">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_pop_head_link">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_queue_pop_nth">
+  <!-- gpointer g_queue_peek_head  (GQueue* queue) -->
+  <!-- gpointer g_queue_peek_tail  (GQueue* queue) -->
+  <!-- gpointer g_queue_pop_head  (GQueue* queue) -->
+  <!-- gpointer g_queue_pop_tail  (GQueue* queue) -->
+  <function name="g_queue_peek_head,g_queue_peek_tail,g_queue_pop_head,g_queue_pop_tail">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_queue_pop_nth_link">
+  <!-- GList* g_queue_peek_head_link  (GQueue* queue) -->
+  <!-- GList* g_queue_peek_tail_link  (GQueue* queue) -->
+  <!-- GList* g_queue_pop_head_link  (GQueue* queue) -->
+  <!-- GList* g_queue_pop_tail_link  (GQueue* queue) -->
+  <function name="g_queue_peek_head_link,g_queue_peek_tail_link,g_queue_pop_head_link,g_queue_pop_tail_link">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
-  <function name="g_queue_pop_tail">
+  <!-- gpointer g_queue_peek_nth  (GQueue* queue, guint n) -->
+  <!-- gpointer g_queue_pop_nth  (GQueue* queue, guint n) -->
+  <function name="g_queue_peek_nth,g_queue_pop_nth">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
-  <function name="g_queue_pop_tail_link">
+  <!-- GList* g_queue_peek_nth_link  (GQueue* queue, guint n) -->
+  <!-- GList* g_queue_pop_nth_link  (GQueue* queue, guint n) -->
+  <function name="g_queue_peek_nth_link,g_queue_pop_nth_link">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GList*"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
   </function>
+  <!-- gpointer g_queue_remove   (GQueue* queue, gconstpointer data); -->
   <function name="g_queue_remove">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- gpointer g_queue_remove_all   (GQueue* queue, gconstpointer data); -->
   <function name="g_queue_remove_all">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="guint"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_queue_reverse (GQueue* queue) -->
   <function name="g_queue_reverse">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_queue_sort  (GQueue* queue, GCompareDataFunc func, gpointer user_data) -->
   <function name="g_queue_sort">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- void g_queue_unlink (GQueue* queue, GList *link_) -->
   <function name="g_queue_unlink">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
   <function name="g_rw_lock_clear">
     <leak-ignore/>
@@ -6954,53 +8343,158 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- GTree* g_tree_new(GCompareFunc key_compare_func); -->
+  <function name="g_tree_new">
+    <noreturn>false</noreturn>
+    <returnValue type="GTree*"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <!-- void g_tree_destroy (GTree *tree); -->
   <function name="g_tree_destroy">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- void g_tree_foreach  (GTree *tree, GTraverseFunc func, gpointer user_data); -->
   <function name="g_tree_foreach">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_tree_height">
+  <!-- gint g_tree_node_key  (GTree *tree); -->
+  <!-- gint g_tree_node_value(GTree *tree); -->
+  <function name="g_tree_node_key,g_tree_node_value">
     <leak-ignore/>
+    <returnValue type="gpointer"/>
+    <use-retval/>
     <noreturn>false</noreturn>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_tree_insert">
+  <!-- gint g_tree_height  (GTree *tree); -->
+  <!-- gint g_tree_nnodes  (GTree *tree); -->
+  <function name="g_tree_height,g_tree_nnodes">
     <leak-ignore/>
+    <returnValue type="gint"/>
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <!-- void g_tree_insert (GTree *tree, gpointer key, gpointer value); -->
+  <!-- void g_tree_replace (GTree *tree, gpointer key, gpointer value); -->
+  <function name="g_tree_insert,g_tree_replace">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
+   <!-- gpointer g_tree_lookup (GTree *tree, gconstpointer key); -->
   <function name="g_tree_lookup">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- gboolean g_tree_lookup_extended (GTree *tree, gconstpointer key, gpointer* orig_key, gpointer* value); -->
   <function name="g_tree_lookup_extended">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out"/>
+    <arg nr="4" direction="out"/>
   </function>
-  <function name="g_tree_nnodes">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_tree_remove">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-  </function>
-  <function name="g_tree_replace">
+  <!-- gboolean g_tree_remove (GTree *tree, gconstpointer key); -->
+  <!-- gboolean g_tree_steal (GTree *tree, gconstpointer key); -->
+  <function name="g_tree_remove,g_tree_steal">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gboolean"/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
+  <!-- void g_tree_search  (GTree *tree, GCompareFunc func, gconstpointer user_data); -->
   <function name="g_tree_search">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="gpointer"/>
+    <arg nr="1">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_tree_steal">
+  <!-- GTreeNode* g_tree_lower_bound (GTree *tree, gconstpointer key); -->
+  <!-- GTreeNode* g_tree_upper_bound (GTree *tree, gconstpointer key); -->
+  <function name="g_tree_lower_bound,g_tree_upper_bound">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="GTreeNode*"/>
+    <use-retval/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+    </arg>
   </function>
   <function name="g_tree_traverse">
     <leak-ignore/>
     <noreturn>false</noreturn>
+    <warn severity="style" reason="Obsolete" alternatives="g_tree_foreach">g_tree_traverse has been deprecated since version 2.2 and should not be used in newly-written code. The order of a balanced tree is somewhat arbitrary. If you just want to visit all nodes in sorted order, use g_tree_foreach() instead. If you really need to visit nodes in a different order, consider using an n-ary tree.</warn>
   </function>
   <!-- GLIB_AVAILABLE_IN_ALL gboolean g_type_check_class_is_a (GTypeClass *g_class, GType is_a_type) G_GNUC_PURE; -->
   <!-- GLIB_AVAILABLE_IN_ALL gboolean g_type_check_instance_is_a (GTypeInstance *instance, GType iface_type) G_GNUC_PURE; -->
@@ -7210,29 +8704,91 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- void g_variant_builder_add (GVariantBuilder* builder,const gchar* format_string, ...) -->
   <function name="g_variant_builder_add">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="variadic" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_variant_builder_add_parsed">
-    <leak-ignore/>
+  <!-- void g_variant_builder_add_value ( GVariantBuilder* builder, GVariant* value) -->
+  <function name="g_variant_builder_add_value">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_variant_builder_clear">
-    <leak-ignore/>
+  <!-- void g_variant_builder_add_parsed ( GVariantBuilder* builder, const gchar* format, ...) -->
+  <function name="g_variant_builder_add_parsed">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="variadic" direction="in">
+      <not-uninit/>
+    </arg>
   </function>
-  <function name="g_variant_builder_close">
-    <leak-ignore/>
+  <!-- void g_variant_builder_clear ( GVariantBuilder* builder) -->
+  <!-- void g_variant_builder_close( GVariantBuilder* builder) -->
+  <function name="g_variant_builder_clear,g_variant_builder_close">
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_variant_builder_init ( GVariantBuilder* builder, const GVariantType* type) -->
   <function name="g_variant_builder_init">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
   </function>
+  <!-- void g_variant_builder_open ( GVariantBuilder* builder, const GVariantType* type) -->
   <function name="g_variant_builder_open">
-    <leak-ignore/>
     <noreturn>false</noreturn>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_builder_end ( GVariantBuilder* builder) -->
+  <function name="g_variant_builder_end">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+    </arg>
   </function>
   <function name="g_variant_iter_init">
     <leak-ignore/>
@@ -7330,6 +8886,174 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
   </function>
+  <!-- GVariant* g_variant_new(const gchar *format_string, ...); -->
+  <function name="g_variant_new">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <not-bool/>
+      <strz/>
+    </arg>
+    <arg nr="variadic" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_parsed (const gchar *format, ...) -->
+  <function name="g_variant_new_parsed">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <not-bool/>
+      <strz/>
+    </arg>
+    <arg nr="variadic" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_string (const gchar *string) -->
+  <function name="g_variant_new_string">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_take_string(gchar* string) -->
+  <function name="g_variant_new_take_string">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_printf (const gchar *format_string, ...) -->
+  <function name="g_variant_new_printf">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+      <formatstr/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_byte (guint8 value) -->
+  <function name="g_variant_new_byte">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_int16 (gint16 value) -->
+  <function name="g_variant_new_int16">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_int32 (gint32 value) -->
+  <function name="g_variant_new_int32">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_int64 (gint64 value) -->
+  <function name="g_variant_new_int64">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_uint16 (guint16 value) -->
+  <function name="g_variant_new_uint16">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_uint32 (guint32 value) -->
+  <function name="g_variant_new_uint32">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_uint64 (guint64 value) -->
+  <function name="g_variant_new_uint64">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_double (gdouble value) -->
+  <function name="g_variant_new_double">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_new_boolean (gboolean value) -->
+  <function name="g_variant_new_boolean">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- GVariant* g_variant_parse(const GVariantType* type,const gchar* text,const gchar* limit,const gchar** endptr,GError** error) -->
+  <function name="g_variant_parse">
+    <noreturn>false</noreturn>
+    <returnValue type="GVariant*"/>
+    <use-retval/>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in"/>
+    <arg nr="4" direction="out"/>
+    <arg nr="5" direction="out"/>
+  </function>
   <!-- void g_message (const gchar *format, ...) -->
   <!-- void g_critical (const gchar *format, ...) -->
   <!-- void g_warning (const gchar *format, ...) -->
@@ -20442,7 +22166,7 @@
     <use-retval/>
     <arg nr="1">
       <not-uninit/>
-      <not-bool/>
+      <strz/>
     </arg>
   </function>
   <!-- gchar * g_strdup_printf (const gchar *format, ...); -->
@@ -20454,6 +22178,17 @@
       <formatstr/>
       <not-null/>
       <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- gchar ** g_strdupv (gchar** str_array);-->
+  <function name="g_strdupv">
+    <noreturn>false</noreturn>
+    <returnValue type="gchar **"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+      <strz/>
     </arg>
   </function>
   <!-- gulong g_signal_connect_data (gpointer instance, const gchar *detailed_signal,
@@ -20473,7 +22208,9 @@
     <arg nr="3">
       <not-uninit/>
     </arg>
-    <arg nr="4"/>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
     <arg nr="5"/>
     <arg nr="6">
       <not-uninit/>
@@ -20493,6 +22230,7 @@
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
+      <valid>0:</valid>
     </arg>
     <arg nr="3">
       <not-uninit/>
@@ -20553,6 +22291,7 @@
     </arg>
     <arg nr="9" direction="in">
       <not-uninit/>
+      <valid>0:</valid>
     </arg>
     <arg nr="variadic"/>
   </function>
@@ -20583,4 +22322,761 @@
   <podtype name="gintptr" sign="s"/>
   <podtype name="guintptr" sign="u"/>
   <podtype name="GType" sign="u"/>
+  <podtype name="GTimeSpan" sign="s" size="8"/>
+  <!-- gdk/gdkdevicetool.h -->
+  <define name="GDK_IS_DEVICE_TOOL(o)" value="(G_TYPE_CHECK_INSTANCE_TYPE((o),GDK_TYPE_DEVICE_TOOL))"/>
+  <define name="GDK_DEVICE_TOOL(o)" value="(G_TYPE_CHECK_INSTANCE_CAST((o),GDK_TYPE_DEVICE_TOOL,GdkDeviceTool))"/>
+  <define name="GDK_TYPE_DEVICE_TOOL" value="(gdk_device_tool_get_type())"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_UNKNOWN" value="0"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_PEN" value="1"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_ERASER" value="2"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_BRUSH" value="3"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_PENCIL" value="4"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_AIRBRUSH" value="5"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_MOUSE" value="6"/>
+  <define name="GDK_DEVICE_TOOL_TYPE_LENS" value="7"/>
+  <!-- gdk/gdkcairocontext.h -->
+  <define name="GDK_CAIRO_ERROR" value="(gdk_cairo_error_quark())"/>
+  <define name="GDK_IS_CAIRO_CONTEXT(obj)" value="(G_TYPE_CHECK_INSTANCE_TYPE((obj),GDK_TYPE_CAIRO_CONTEXT))"/>
+  <define name="GDK_CAIRO_CONTEXT(obj)" value="(G_TYPE_CHECK_INSTANCE_CAST((obj),GDK_TYPE_CAIRO_CONTEXT,GdkCairoContext))"/>
+  <define name="GDK_TYPE_CAIRO_CONTEXT" value="(gdk_cairo_context_get_type())"/>
+  <!-- gtk/gtkaboutdialog.h -->
+  <define name="GTK_LICENSE_UNKNOWN" value="0"/>
+  <define name="GTK_LICENSE_CUSTOM" value="1"/>
+  <define name="GTK_LICENSE_GPL_2_0" value="2"/>
+  <define name="GTK_LICENSE_GPL_3_0" value="3"/>
+  <define name="GTK_LICENSE_LGPL_2_1" value="4"/>
+  <define name="GTK_LICENSE_LGPL_3_0" value="5"/>
+  <define name="GTK_LICENSE_BSD" value="6"/>
+  <define name="GTK_LICENSE_MIT_X11" value="7"/>
+  <define name="GTK_LICENSE_ARTISTIC" value="8"/>
+  <define name="GTK_LICENSE_GPL_2_0_ONLY" value="9"/>
+  <define name="GTK_LICENSE_GPL_3_0_ONLY" value="10"/>
+  <define name="GTK_LICENSE_LGPL_2_1_ONLY" value="11"/>
+  <define name="GTK_LICENSE_LGPL_3_0_ONLY" value="12"/>
+  <define name="GTK_LICENSE_AGPL_3_0" value="13"/>
+  <define name="GTK_LICENSE_AGPL_3_0_ONLY" value="14"/>
+  <define name="GTK_LICENSE_BSD_3" value="15"/>
+  <define name="GTK_LICENSE_APACHE_2_0" value="16"/>
+  <define name="GTK_LICENSE_MPL_2_0" value="17"/>
+  <define name="GTK_LICENSE_0BSD" value="18"/>
+  <!-- gtk/gtkaccessible.h -->
+  <define name="GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSABLE" value="0"/>
+  <define name="GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED" value="1"/>
+  <define name="GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE" value="2"/>
+  <!-- gtk/gtkaccessibleprivate.h -->
+  <define name="GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSABLE" value="1&lt;&lt;GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSABLE"/>
+  <define name="GTK_ACCESSIBLE_PLATFORM_CHANGE_FOCUSED" value="1&lt;&lt;GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED"/>
+  <define name="GTK_ACCESSIBLE_PLATFORM_CHANGE_ACTIVE" value="1&lt;&lt;GTK_ACCESSIBLE_PLATFORM_STATE_ACTIVE"/>
+  <define name="GTK_ACCESSIBLE_CHILD_STATE_ADDED" value="0"/>
+  <define name="GTK_ACCESSIBLE_CHILD_STATE_REMOVED" value="1"/>
+  <define name="GTK_ACCESSIBLE_CHILD_CHANGE_ADDED" value="1&lt;&lt;GTK_ACCESSIBLE_CHILD_STATE_ADDED"/>
+  <define name="GTK_ACCESSIBLE_CHILD_CHANGE_REMOVED" value="1&lt;&lt;GTK_ACCESSIBLE_CHILD_STATE_REMOVED"/>
+  <define name="GTK_ACCESSIBLE_NAME_ALLOWED" value="0"/>
+  <define name="GTK_ACCESSIBLE_NAME_PROHIBITED" value="1"/>
+  <define name="GTK_ACCESSIBLE_NAME_REQUIRED" value="2"/>
+  <define name="GTK_ACCESSIBLE_NAME_RECOMMENDED" value="3"/>
+  <define name="GTK_ACCESSIBLE_NAME_NOT_RECOMMENDED" value="4"/>
+  <!-- gtk/gtkaccessibletext.h -->
+  <define name="GTK_ACCESSIBLE_TEXT_GRANULARITY_CHARACTER" value="0"/>
+  <define name="GTK_ACCESSIBLE_TEXT_GRANULARITY_WORD" value="1"/>
+  <define name="GTK_ACCESSIBLE_TEXT_GRANULARITY_SENTENCE" value="2"/>
+  <define name="GTK_ACCESSIBLE_TEXT_GRANULARITY_LINE" value="3"/>
+  <define name="GTK_ACCESSIBLE_TEXT_GRANULARITY_PARAGRAPH" value="4"/>
+  <define name="GTK_ACCESSIBLE_TEXT_CONTENT_CHANGE_INSERT" value="0"/>
+  <define name="GTK_ACCESSIBLE_TEXT_CONTENT_CHANGE_REMOVE" value="1"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_UNDERLINE_ERROR" value="&quot;error&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_UNDERLINE_DOUBLE" value="&quot;double&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_UNDERLINE_SINGLE" value="&quot;single&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_UNDERLINE_NONE" value="&quot;none&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STYLE_NORMAL" value="&quot;normal&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH" value="&quot;stretch&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRIKETHROUGH" value="&quot;strikethrough&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STYLE" value="&quot;style&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_OVERLINE_NONE" value="&quot;none&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_CONDENSED" value="&quot;condensed&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_UNDERLINE" value="&quot;underline&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_EXTRA_EXPANDED" value="&quot;extra_expanded&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_WEIGHT" value="&quot;weight&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_BACKGROUND" value="&quot;bg-color&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_FAMILY" value="&quot;family-name&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_OVERLINE" value="&quot;overline&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_SIZE" value="&quot;size&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_VARIANT" value="&quot;variant&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_FOREGROUND" value="&quot;fg-color&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STYLE_OBLIQUE" value="&quot;oblique&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_EXPANDED" value="&quot;expanded&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_VARIANT_TITLE_CAPS" value="&quot;title-caps&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STYLE_ITALIC" value="&quot;italic&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_VARIANT_SMALL_CAPS" value="&quot;small-caps&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_VARIANT_ALL_PETITE_CAPS" value="&quot;all-petite-caps&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_VARIANT_ALL_SMALL_CAPS" value="&quot;all-small-caps&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_NORMAL" value="&quot;normal&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_VARIANT_PETITE_CAPS" value="&quot;petite-caps&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_OVERLINE_SINGLE" value="&quot;single&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_SEMI_EXPANDED" value="&quot;semi_expanded&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_VARIANT_UNICASE" value="&quot;unicase&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_ULTRA_CONDENSED" value="&quot;ultra_condensed&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_EXTRA_CONDENSED" value="&quot;extra_condensed&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_ULTRA_EXPANDED" value="&quot;ultra_expanded&quot;"/>
+  <define name="GTK_ACCESSIBLE_ATTRIBUTE_STRETCH_SEMI_CONDENSED" value="&quot;semi_condensed&quot;"/>
+  <!-- gtk/gtkaccessiblevalueprivate.h -->
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_UNDEFINED" value="0"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_BOOLEAN" value="1"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_TRISTATE" value="2"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_TOKEN" value="3"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_INTEGER" value="4"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_NUMBER" value="5"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_STRING" value="6"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_REFERENCE" value="7"/>
+  <define name="GTK_ACCESSIBLE_VALUE_TYPE_REFERENCE_LIST" value="8"/>
+  <!-- gtk/gtkactionbar.h -->
+  <define name="GTK_IS_ACTION_BAR(obj)" value="(G_TYPE_CHECK_INSTANCE_TYPE((obj),GTK_TYPE_ACTION_BAR))"/>
+  <define name="GTK_ACTION_BAR(obj)" value="(G_TYPE_CHECK_INSTANCE_CAST((obj),GTK_TYPE_ACTION_BAR,GtkActionBar))"/>
+  <define name="GTK_TYPE_ACTION_BAR" value="(gtk_action_bar_get_type())"/>
+  <!-- gtk/gtkadjustment.h -->
+  <define name="GTK_IS_ADJUSTMENT_CLASS(klass)" value="(G_TYPE_CHECK_CLASS_TYPE((klass),GTK_TYPE_ADJUSTMENT))"/>
+  <define name="GTK_ADJUSTMENT_GET_CLASS(obj)" value="(G_TYPE_INSTANCE_GET_CLASS((obj),GTK_TYPE_ADJUSTMENT,GtkAdjustmentClass))"/>
+  <define name="GTK_IS_ADJUSTMENT(obj)" value="(G_TYPE_CHECK_INSTANCE_TYPE((obj),GTK_TYPE_ADJUSTMENT))"/>
+  <define name="GTK_ADJUSTMENT_CLASS(klass)" value="(G_TYPE_CHECK_CLASS_CAST((klass),GTK_TYPE_ADJUSTMENT,GtkAdjustmentClass))"/>
+  <define name="GTK_ADJUSTMENT(obj)" value="(G_TYPE_CHECK_INSTANCE_CAST((obj),GTK_TYPE_ADJUSTMENT,GtkAdjustment))"/>
+  <define name="GTK_TYPE_ADJUSTMENT" value="(gtk_adjustment_get_type())"/>
+  <!-- gtk/gtkapplication.h -->
+  <define name="GTK_APPLICATION_GET_CLASS(obj)" value="(G_TYPE_INSTANCE_GET_CLASS((obj),GTK_TYPE_APPLICATION,GtkApplicationClass))"/>
+  <define name="GTK_IS_APPLICATION_CLASS(klass)" value="(G_TYPE_CHECK_CLASS_TYPE((klass),GTK_TYPE_APPLICATION))"/>
+  <define name="GTK_IS_APPLICATION(obj)" value="(G_TYPE_CHECK_INSTANCE_TYPE((obj),GTK_TYPE_APPLICATION))"/>
+  <define name="GTK_APPLICATION_CLASS(klass)" value="(G_TYPE_CHECK_CLASS_CAST((klass),GTK_TYPE_APPLICATION,GtkApplicationClass))"/>
+  <define name="GTK_APPLICATION(obj)" value="(G_TYPE_CHECK_INSTANCE_CAST((obj),GTK_TYPE_APPLICATION,GtkApplication))"/>
+  <define name="GTK_TYPE_APPLICATION" value="(gtk_application_get_type())"/>
+  <define name="GTK_APPLICATION_INHIBIT_LOGOUT" value="(1&lt;&lt;0)"/>
+  <define name="GTK_APPLICATION_INHIBIT_SWITCH" value="(1&lt;&lt;1)"/>
+  <define name="GTK_APPLICATION_INHIBIT_SUSPEND" value="(1&lt;&lt;2)"/>
+  <define name="GTK_APPLICATION_INHIBIT_IDLE" value="(1&lt;&lt;3)"/>
+  <!-- gtk/gtkbuilder.h -->
+  <define name="GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION" value="0"/>
+  <define name="GTK_BUILDER_ERROR_UNHANDLED_TAG" value="1"/>
+  <define name="GTK_BUILDER_ERROR_MISSING_ATTRIBUTE" value="2"/>
+  <define name="GTK_BUILDER_ERROR_INVALID_ATTRIBUTE" value="3"/>
+  <define name="GTK_BUILDER_ERROR_INVALID_TAG" value="4"/>
+  <define name="GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE" value="5"/>
+  <define name="GTK_BUILDER_ERROR_INVALID_VALUE" value="6"/>
+  <define name="GTK_BUILDER_ERROR_VERSION_MISMATCH" value="7"/>
+  <define name="GTK_BUILDER_ERROR_DUPLICATE_ID" value="8"/>
+  <define name="GTK_BUILDER_ERROR_OBJECT_TYPE_REFUSED" value="9"/>
+  <define name="GTK_BUILDER_ERROR_TEMPLATE_MISMATCH" value="10"/>
+  <define name="GTK_BUILDER_ERROR_INVALID_PROPERTY" value="11"/>
+  <define name="GTK_BUILDER_ERROR_INVALID_SIGNAL" value="12"/>
+  <define name="GTK_BUILDER_ERROR_INVALID_ID" value="13"/>
+  <define name="GTK_BUILDER_ERROR_INVALID_FUNCTION" value="14"/>
+  <!-- gtk/gtkbuilderscope.h -->
+  <define name="GTK_BUILDER_CLOSURE_SWAPPED" value="(1&lt;&lt;0)"/>
+  <!-- gtk/gtkdebug.h -->
+  <define name="GTK_DEBUG_TEXT" value="1&lt;&lt;0"/>
+  <define name="GTK_DEBUG_TREE" value="1&lt;&lt;1"/>
+  <define name="GTK_DEBUG_KEYBINDINGS" value="1&lt;&lt;2"/>
+  <define name="GTK_DEBUG_MODULES" value="1&lt;&lt;3"/>
+  <define name="GTK_DEBUG_GEOMETRY" value="1&lt;&lt;4"/>
+  <define name="GTK_DEBUG_ICONTHEME" value="1&lt;&lt;5"/>
+  <define name="GTK_DEBUG_PRINTING" value="1&lt;&lt;6"/>
+  <define name="GTK_DEBUG_BUILDER" value="1&lt;&lt;7"/>
+  <define name="GTK_DEBUG_SIZE_REQUEST" value="1&lt;&lt;8"/>
+  <define name="GTK_DEBUG_NO_CSS_CACHE" value="1&lt;&lt;9"/>
+  <define name="GTK_DEBUG_INTERACTIVE" value="1&lt;&lt;10"/>
+  <define name="GTK_DEBUG_ACTIONS" value="1&lt;&lt;12"/>
+  <define name="GTK_DEBUG_LAYOUT" value="1&lt;&lt;13"/>
+  <define name="GTK_DEBUG_SNAPSHOT" value="1&lt;&lt;14"/>
+  <define name="GTK_DEBUG_CONSTRAINTS" value="1&lt;&lt;15"/>
+  <define name="GTK_DEBUG_BUILDER_OBJECTS" value="1&lt;&lt;16"/>
+  <define name="GTK_DEBUG_A11Y" value="1&lt;&lt;17"/>
+  <define name="GTK_DEBUG_ICONFALLBACK" value="1&lt;&lt;18"/>
+  <define name="GTK_DEBUG_INVERT_TEXT_DIR" value="1&lt;&lt;19"/>
+  <!-- gtk/gtkdialogerror.h -->
+  <define name="GTK_DIALOG_ERROR_FAILED" value="0"/>
+  <define name="GTK_DIALOG_ERROR_CANCELLED" value="1"/>
+  <define name="GTK_DIALOG_ERROR_DISMISSED" value="2"/>
+  <!-- gtk/gtkeditable.h -->
+  <define name="GTK_EDITABLE_PROP_TEXT" value="0"/>
+  <define name="GTK_EDITABLE_PROP_CURSOR_POSITION" value="1"/>
+  <define name="GTK_EDITABLE_PROP_SELECTION_BOUND" value="2"/>
+  <define name="GTK_EDITABLE_PROP_EDITABLE" value="3"/>
+  <define name="GTK_EDITABLE_PROP_WIDTH_CHARS" value="4"/>
+  <define name="GTK_EDITABLE_PROP_MAX_WIDTH_CHARS" value="5"/>
+  <define name="GTK_EDITABLE_PROP_XALIGN" value="6"/>
+  <define name="GTK_EDITABLE_PROP_ENABLE_UNDO" value="7"/>
+  <define name="GTK_EDITABLE_NUM_PROPERTIES" value="8"/>
+  <!-- gtk/gtkentry.h -->
+  <define name="GTK_ENTRY_ICON_PRIMARY" value="0"/>
+  <define name="GTK_ENTRY_ICON_SECONDARY" value="1"/>
+  <!-- gtk/gtkenums.h -->
+  <define name="GTK_ARROW_UP" value="0"/>
+  <define name="GTK_ARROW_DOWN" value="1"/>
+  <define name="GTK_ARROW_LEFT" value="2"/>
+  <define name="GTK_ARROW_RIGHT" value="3"/>
+  <define name="GTK_ARROW_NONE" value="4"/>
+  <define name="GTK_BASELINE_POSITION_TOP" value="0"/>
+  <define name="GTK_BASELINE_POSITION_CENTER" value="1"/>
+  <define name="GTK_BASELINE_POSITION_BOTTOM" value="2"/>
+  <define name="GTK_CONTENT_FIT_FILL" value="0"/>
+  <define name="GTK_CONTENT_FIT_CONTAIN" value="1"/>
+  <define name="GTK_CONTENT_FIT_COVER" value="2"/>
+  <define name="GTK_CONTENT_FIT_SCALE_DOWN" value="3"/>
+  <define name="GTK_DELETE_CHARS" value="0"/>
+  <define name="GTK_DELETE_WORD_ENDS" value="1"/>
+  <define name="GTK_DELETE_WORDS" value="2"/>
+  <define name="GTK_DELETE_DISPLAY_LINES" value="3"/>
+  <define name="GTK_DELETE_DISPLAY_LINE_ENDS" value="4"/>
+  <define name="GTK_DELETE_PARAGRAPH_ENDS" value="5"/>
+  <define name="GTK_DELETE_PARAGRAPHS" value="6"/>
+  <define name="GTK_DELETE_WHITESPACE" value="7"/>
+  <define name="GTK_DIR_TAB_FORWARD" value="0"/>
+  <define name="GTK_DIR_TAB_BACKWARD" value="1"/>
+  <define name="GTK_DIR_UP" value="2"/>
+  <define name="GTK_DIR_DOWN" value="3"/>
+  <define name="GTK_DIR_LEFT" value="4"/>
+  <define name="GTK_DIR_RIGHT" value="5"/>
+  <define name="GTK_ICON_SIZE_INHERIT" value="0"/>
+  <define name="GTK_ICON_SIZE_NORMAL" value="1"/>
+  <define name="GTK_ICON_SIZE_LARGE" value="2"/>
+  <define name="GTK_SENSITIVITY_AUTO" value="0"/>
+  <define name="GTK_SENSITIVITY_ON" value="1"/>
+  <define name="GTK_SENSITIVITY_OFF" value="2"/>
+  <define name="GTK_TEXT_DIR_NONE" value="0"/>
+  <define name="GTK_TEXT_DIR_LTR" value="1"/>
+  <define name="GTK_TEXT_DIR_RTL" value="2"/>
+  <define name="GTK_JUSTIFY_LEFT" value="0"/>
+  <define name="GTK_JUSTIFY_RIGHT" value="1"/>
+  <define name="GTK_JUSTIFY_CENTER" value="2"/>
+  <define name="GTK_JUSTIFY_FILL" value="3"/>
+  <define name="GTK_LIST_TAB_ALL" value="0"/>
+  <define name="GTK_LIST_TAB_ITEM" value="1"/>
+  <define name="GTK_LIST_TAB_CELL" value="2"/>
+  <define name="GTK_LIST_SCROLL_NONE" value="0"/>
+  <define name="GTK_LIST_SCROLL_FOCUS" value="1&lt;&lt;0"/>
+  <define name="GTK_LIST_SCROLL_SELECT" value="1&lt;&lt;1"/>
+  <define name="GTK_MESSAGE_INFO" value="0"/>
+  <define name="GTK_MESSAGE_WARNING" value="1"/>
+  <define name="GTK_MESSAGE_QUESTION" value="2"/>
+  <define name="GTK_MESSAGE_ERROR" value="3"/>
+  <define name="GTK_MESSAGE_OTHER" value="4"/>
+  <define name="GTK_MOVEMENT_LOGICAL_POSITIONS" value="0"/>
+  <define name="GTK_MOVEMENT_VISUAL_POSITIONS" value="1"/>
+  <define name="GTK_MOVEMENT_WORDS" value="2"/>
+  <define name="GTK_MOVEMENT_DISPLAY_LINES" value="3"/>
+  <define name="GTK_MOVEMENT_DISPLAY_LINE_ENDS" value="4"/>
+  <define name="GTK_MOVEMENT_PARAGRAPHS" value="5"/>
+  <define name="GTK_MOVEMENT_PARAGRAPH_ENDS" value="6"/>
+  <define name="GTK_MOVEMENT_PAGES" value="7"/>
+  <define name="GTK_MOVEMENT_BUFFER_ENDS" value="8"/>
+  <define name="GTK_MOVEMENT_HORIZONTAL_PAGES" value="9"/>
+  <define name="GTK_NATURAL_WRAP_INHERIT" value="0"/>
+  <define name="GTK_NATURAL_WRAP_NONE" value="1"/>
+  <define name="GTK_NATURAL_WRAP_WORD" value="2"/>
+  <define name="GTK_SCROLL_STEPS" value="0"/>
+  <define name="GTK_SCROLL_PAGES" value="1"/>
+  <define name="GTK_SCROLL_ENDS" value="2"/>
+  <define name="GTK_SCROLL_HORIZONTAL_STEPS" value="3"/>
+  <define name="GTK_SCROLL_HORIZONTAL_PAGES" value="4"/>
+  <define name="GTK_SCROLL_HORIZONTAL_ENDS" value="5"/>
+  <define name="GTK_ORIENTATION_HORIZONTAL" value="0"/>
+  <define name="GTK_ORIENTATION_VERTICAL" value="1"/>
+  <define name="GTK_OVERFLOW_VISIBLE" value="0"/>
+  <define name="GTK_OVERFLOW_HIDDEN" value="1"/>
+  <define name="GTK_PACK_START" value="0"/>
+  <define name="GTK_PACK_END" value="1"/>
+  <define name="GTK_POS_LEFT" value="0"/>
+  <define name="GTK_POS_RIGHT" value="1"/>
+  <define name="GTK_POS_TOP" value="2"/>
+  <define name="GTK_POS_BOTTOM" value="3"/>
+  <define name="GTK_SCROLL_NONE" value="0"/>
+  <define name="GTK_SCROLL_JUMP" value="1"/>
+  <define name="GTK_SCROLL_STEP_BACKWARD" value="2"/>
+  <define name="GTK_SCROLL_STEP_FORWARD" value="3"/>
+  <define name="GTK_SCROLL_PAGE_BACKWARD" value="4"/>
+  <define name="GTK_SCROLL_PAGE_FORWARD" value="5"/>
+  <define name="GTK_SCROLL_STEP_UP" value="6"/>
+  <define name="GTK_SCROLL_STEP_DOWN" value="7"/>
+  <define name="GTK_SCROLL_PAGE_UP" value="8"/>
+  <define name="GTK_SCROLL_PAGE_DOWN" value="9"/>
+  <define name="GTK_SCROLL_STEP_LEFT" value="10"/>
+  <define name="GTK_SCROLL_STEP_RIGHT" value="11"/>
+  <define name="GTK_SCROLL_PAGE_LEFT" value="12"/>
+  <define name="GTK_SCROLL_PAGE_RIGHT" value="13"/>
+  <define name="GTK_SCROLL_START" value="14"/>
+  <define name="GTK_SCROLL_END" value="15"/>
+  <define name="GTK_SELECTION_NONE" value="0"/>
+  <define name="GTK_SELECTION_SINGLE" value="1"/>
+  <define name="GTK_SELECTION_BROWSE" value="2"/>
+  <define name="GTK_SELECTION_MULTIPLE" value="3"/>
+  <define name="GTK_WRAP_NONE" value="0"/>
+  <define name="GTK_WRAP_CHAR" value="1"/>
+  <define name="GTK_WRAP_WORD" value="2"/>
+  <define name="GTK_WRAP_WORD_CHAR" value="3"/>
+  <define name="GTK_SORT_ASCENDING" value="0"/>
+  <define name="GTK_SORT_DESCENDING" value="1"/>
+  <define name="GTK_PRINT_PAGES_ALL" value="0"/>
+  <define name="GTK_PRINT_PAGES_CURRENT" value="1"/>
+  <define name="GTK_PRINT_PAGES_RANGES" value="2"/>
+  <define name="GTK_PRINT_PAGES_SELECTION" value="3"/>
+  <define name="GTK_PAGE_SET_ALL" value="0"/>
+  <define name="GTK_PAGE_SET_EVEN" value="1"/>
+  <define name="GTK_PAGE_SET_ODD" value="2"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM" value="0"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_BOTTOM_TO_TOP" value="1"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_TOP_TO_BOTTOM" value="2"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_RIGHT_TO_LEFT_BOTTOM_TO_TOP" value="3"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_LEFT_TO_RIGHT" value="4"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_TOP_TO_BOTTOM_RIGHT_TO_LEFT" value="5"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_LEFT_TO_RIGHT" value="6"/>
+  <define name="GTK_NUMBER_UP_LAYOUT_BOTTOM_TO_TOP_RIGHT_TO_LEFT" value="7"/>
+  <define name="GTK_ORDERING_SMALLER" value="-1"/>
+  <define name="GTK_ORDERING_EQUAL" value="0"/>
+  <define name="GTK_ORDERING_LARGER" value="1"/>
+  <define name="GTK_PAGE_ORIENTATION_PORTRAIT" value="0"/>
+  <define name="GTK_PAGE_ORIENTATION_LANDSCAPE" value="1"/>
+  <define name="GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT" value="2"/>
+  <define name="GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE" value="3"/>
+  <define name="GTK_PRINT_QUALITY_LOW" value="0"/>
+  <define name="GTK_PRINT_QUALITY_NORMAL" value="1"/>
+  <define name="GTK_PRINT_QUALITY_HIGH" value="2"/>
+  <define name="GTK_PRINT_QUALITY_DRAFT" value="3"/>
+  <define name="GTK_PRINT_DUPLEX_SIMPLEX" value="0"/>
+  <define name="GTK_PRINT_DUPLEX_HORIZONTAL" value="1"/>
+  <define name="GTK_PRINT_DUPLEX_VERTICAL" value="2"/>
+  <define name="GTK_UNIT_NONE" value="0"/>
+  <define name="GTK_UNIT_POINTS" value="1"/>
+  <define name="GTK_UNIT_INCH" value="2"/>
+  <define name="GTK_UNIT_MM" value="3"/>
+  <define name="GTK_TREE_VIEW_GRID_LINES_NONE" value="0"/>
+  <define name="GTK_TREE_VIEW_GRID_LINES_HORIZONTAL" value="1"/>
+  <define name="GTK_TREE_VIEW_GRID_LINES_VERTICAL" value="2"/>
+  <define name="GTK_TREE_VIEW_GRID_LINES_BOTH" value="3"/>
+  <define name="GTK_SIZE_GROUP_NONE" value="0"/>
+  <define name="GTK_SIZE_GROUP_HORIZONTAL" value="1"/>
+  <define name="GTK_SIZE_GROUP_VERTICAL" value="2"/>
+  <define name="GTK_SIZE_GROUP_BOTH" value="3"/>
+  <define name="GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" value="0"/>
+  <define name="GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT" value="1"/>
+  <define name="GTK_SIZE_REQUEST_CONSTANT_SIZE" value="2"/>
+  <define name="GTK_SCROLL_MINIMUM" value="0"/>
+  <define name="GTK_SCROLL_NATURAL" value="1"/>
+  <define name="GTK_STATE_FLAG_NORMAL" value="0"/>
+  <define name="GTK_STATE_FLAG_ACTIVE" value="1&lt;&lt;0"/>
+  <define name="GTK_STATE_FLAG_PRELIGHT" value="1&lt;&lt;1"/>
+  <define name="GTK_STATE_FLAG_SELECTED" value="1&lt;&lt;2"/>
+  <define name="GTK_STATE_FLAG_INSENSITIVE" value="1&lt;&lt;3"/>
+  <define name="GTK_STATE_FLAG_INCONSISTENT" value="1&lt;&lt;4"/>
+  <define name="GTK_STATE_FLAG_FOCUSED" value="1&lt;&lt;5"/>
+  <define name="GTK_STATE_FLAG_BACKDROP" value="1&lt;&lt;6"/>
+  <define name="GTK_STATE_FLAG_DIR_LTR" value="1&lt;&lt;7"/>
+  <define name="GTK_STATE_FLAG_DIR_RTL" value="1&lt;&lt;8"/>
+  <define name="GTK_STATE_FLAG_LINK" value="1&lt;&lt;9"/>
+  <define name="GTK_STATE_FLAG_VISITED" value="1&lt;&lt;10"/>
+  <define name="GTK_STATE_FLAG_CHECKED" value="1&lt;&lt;11"/>
+  <define name="GTK_STATE_FLAG_DROP_ACTIVE" value="1&lt;&lt;12"/>
+  <define name="GTK_STATE_FLAG_FOCUS_VISIBLE" value="1&lt;&lt;13"/>
+  <define name="GTK_STATE_FLAG_FOCUS_WITHIN" value="1&lt;&lt;14"/>
+  <define name="GTK_BORDER_STYLE_NONE" value="0"/>
+  <define name="GTK_BORDER_STYLE_HIDDEN" value="1"/>
+  <define name="GTK_BORDER_STYLE_SOLID" value="2"/>
+  <define name="GTK_BORDER_STYLE_INSET" value="3"/>
+  <define name="GTK_BORDER_STYLE_OUTSET" value="4"/>
+  <define name="GTK_BORDER_STYLE_DOTTED" value="5"/>
+  <define name="GTK_BORDER_STYLE_DASHED" value="6"/>
+  <define name="GTK_BORDER_STYLE_DOUBLE" value="7"/>
+  <define name="GTK_BORDER_STYLE_GROOVE" value="8"/>
+  <define name="GTK_BORDER_STYLE_RIDGE" value="9"/>
+  <define name="GTK_LEVEL_BAR_MODE_CONTINUOUS" value="0"/>
+  <define name="GTK_LEVEL_BAR_MODE_DISCRETE" value="1"/>
+  <define name="GTK_INPUT_PURPOSE_FREE_FORM" value="0"/>
+  <define name="GTK_INPUT_PURPOSE_ALPHA" value="1"/>
+  <define name="GTK_INPUT_PURPOSE_DIGITS" value="2"/>
+  <define name="GTK_INPUT_PURPOSE_NUMBER" value="3"/>
+  <define name="GTK_INPUT_PURPOSE_PHONE" value="4"/>
+  <define name="GTK_INPUT_PURPOSE_URL" value="5"/>
+  <define name="GTK_INPUT_PURPOSE_EMAIL" value="6"/>
+  <define name="GTK_INPUT_PURPOSE_NAME" value="7"/>
+  <define name="GTK_INPUT_PURPOSE_PASSWORD" value="8"/>
+  <define name="GTK_INPUT_PURPOSE_PIN" value="9"/>
+  <define name="GTK_INPUT_PURPOSE_TERMINAL" value="10"/>
+  <define name="GTK_INPUT_HINT_NONE" value="0"/>
+  <define name="GTK_INPUT_HINT_SPELLCHECK" value="1&lt;&lt;0"/>
+  <define name="GTK_INPUT_HINT_NO_SPELLCHECK" value="1&lt;&lt;1"/>
+  <define name="GTK_INPUT_HINT_WORD_COMPLETION" value="1&lt;&lt;2"/>
+  <define name="GTK_INPUT_HINT_LOWERCASE" value="1&lt;&lt;3"/>
+  <define name="GTK_INPUT_HINT_UPPERCASE_CHARS" value="1&lt;&lt;4"/>
+  <define name="GTK_INPUT_HINT_UPPERCASE_WORDS" value="1&lt;&lt;5"/>
+  <define name="GTK_INPUT_HINT_UPPERCASE_SENTENCES" value="1&lt;&lt;6"/>
+  <define name="GTK_INPUT_HINT_INHIBIT_OSK" value="1&lt;&lt;7"/>
+  <define name="GTK_INPUT_HINT_VERTICAL_WRITING" value="1&lt;&lt;8"/>
+  <define name="GTK_INPUT_HINT_EMOJI" value="1&lt;&lt;9"/>
+  <define name="GTK_INPUT_HINT_NO_EMOJI" value="1&lt;&lt;10"/>
+  <define name="GTK_INPUT_HINT_PRIVATE" value="1&lt;&lt;11"/>
+  <define name="GTK_PHASE_NONE" value="0"/>
+  <define name="GTK_PHASE_CAPTURE" value="1"/>
+  <define name="GTK_PHASE_BUBBLE" value="2"/>
+  <define name="GTK_PHASE_TARGET" value="3"/>
+  <define name="GTK_LIMIT_NONE" value="0"/>
+  <define name="GTK_LIMIT_SAME_NATIVE" value="1"/>
+  <define name="GTK_EVENT_SEQUENCE_NONE" value="0"/>
+  <define name="GTK_EVENT_SEQUENCE_CLAIMED" value="1"/>
+  <define name="GTK_EVENT_SEQUENCE_DENIED" value="2"/>
+  <define name="GTK_PAN_DIRECTION_LEFT" value="0"/>
+  <define name="GTK_PAN_DIRECTION_RIGHT" value="1"/>
+  <define name="GTK_PAN_DIRECTION_UP" value="2"/>
+  <define name="GTK_PAN_DIRECTION_DOWN" value="3"/>
+  <define name="GTK_SHORTCUT_SCOPE_LOCAL" value="0"/>
+  <define name="GTK_SHORTCUT_SCOPE_MANAGED" value="1"/>
+  <define name="GTK_SHORTCUT_SCOPE_GLOBAL" value="2"/>
+  <define name="GTK_PICK_DEFAULT" value="0"/>
+  <define name="GTK_PICK_INSENSITIVE" value="1&lt;&lt;0"/>
+  <define name="GTK_PICK_NON_TARGETABLE" value="1&lt;&lt;1"/>
+  <define name="GTK_CONSTRAINT_RELATION_LE" value="-1"/>
+  <define name="GTK_CONSTRAINT_RELATION_EQ" value="0"/>
+  <define name="GTK_CONSTRAINT_RELATION_GE" value="1"/>
+  <define name="GTK_CONSTRAINT_STRENGTH_REQUIRED" value="1001001000"/>
+  <define name="GTK_CONSTRAINT_STRENGTH_STRONG" value="1000000000"/>
+  <define name="GTK_CONSTRAINT_STRENGTH_MEDIUM" value="1000"/>
+  <define name="GTK_CONSTRAINT_STRENGTH_WEAK" value="1"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_NONE" value="0"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_LEFT" value="1"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_RIGHT" value="2"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_TOP" value="3"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_BOTTOM" value="4"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_START" value="5"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_END" value="6"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_WIDTH" value="7"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_HEIGHT" value="8"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_CENTER_X" value="9"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y" value="10"/>
+  <define name="GTK_CONSTRAINT_ATTRIBUTE_BASELINE" value="11"/>
+  <define name="GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_SYMBOL" value="0"/>
+  <define name="GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_ATTRIBUTE" value="1"/>
+  <define name="GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_VIEW" value="2"/>
+  <define name="GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_METRIC" value="3"/>
+  <define name="GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_PRIORITY" value="4"/>
+  <define name="GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_RELATION" value="5"/>
+  <define name="GTK_SYSTEM_SETTING_DPI" value="0"/>
+  <define name="GTK_SYSTEM_SETTING_FONT_NAME" value="1"/>
+  <define name="GTK_SYSTEM_SETTING_FONT_CONFIG" value="2"/>
+  <define name="GTK_SYSTEM_SETTING_DISPLAY" value="3"/>
+  <define name="GTK_SYSTEM_SETTING_ICON_THEME" value="4"/>
+  <define name="GTK_SYMBOLIC_COLOR_FOREGROUND" value="0"/>
+  <define name="GTK_SYMBOLIC_COLOR_ERROR" value="1"/>
+  <define name="GTK_SYMBOLIC_COLOR_WARNING" value="2"/>
+  <define name="GTK_SYMBOLIC_COLOR_SUCCESS" value="3"/>
+  <define name="GTK_ACCESSIBLE_STATE_BUSY" value="0"/>
+  <define name="GTK_ACCESSIBLE_STATE_CHECKED" value="1"/>
+  <define name="GTK_ACCESSIBLE_STATE_DISABLED" value="2"/>
+  <define name="GTK_ACCESSIBLE_STATE_EXPANDED" value="3"/>
+  <define name="GTK_ACCESSIBLE_STATE_HIDDEN" value="4"/>
+  <define name="GTK_ACCESSIBLE_STATE_INVALID" value="5"/>
+  <define name="GTK_ACCESSIBLE_STATE_PRESSED" value="6"/>
+  <define name="GTK_ACCESSIBLE_STATE_SELECTED" value="7"/>
+  <define name="GTK_ACCESSIBLE_STATE_VISITED" value="8"/>
+  <define name="GTK_ACCESSIBLE_ROLE_ALERT" value="0"/>
+  <define name="GTK_ACCESSIBLE_ROLE_ALERT_DIALOG" value="1"/>
+  <define name="GTK_ACCESSIBLE_ROLE_BANNER" value="2"/>
+  <define name="GTK_ACCESSIBLE_ROLE_BUTTON" value="3"/>
+  <define name="GTK_ACCESSIBLE_ROLE_CAPTION" value="4"/>
+  <define name="GTK_ACCESSIBLE_ROLE_CELL" value="5"/>
+  <define name="GTK_ACCESSIBLE_ROLE_CHECKBOX" value="6"/>
+  <define name="GTK_ACCESSIBLE_ROLE_COLUMN_HEADER" value="7"/>
+  <define name="GTK_ACCESSIBLE_ROLE_COMBO_BOX" value="8"/>
+  <define name="GTK_ACCESSIBLE_ROLE_COMMAND" value="9"/>
+  <define name="GTK_ACCESSIBLE_ROLE_COMPOSITE" value="10"/>
+  <define name="GTK_ACCESSIBLE_ROLE_DIALOG" value="11"/>
+  <define name="GTK_ACCESSIBLE_ROLE_DOCUMENT" value="12"/>
+  <define name="GTK_ACCESSIBLE_ROLE_FEED" value="13"/>
+  <define name="GTK_ACCESSIBLE_ROLE_FORM" value="14"/>
+  <define name="GTK_ACCESSIBLE_ROLE_GENERIC" value="15"/>
+  <define name="GTK_ACCESSIBLE_ROLE_GRID" value="16"/>
+  <define name="GTK_ACCESSIBLE_ROLE_GRID_CELL" value="17"/>
+  <define name="GTK_ACCESSIBLE_ROLE_GROUP" value="18"/>
+  <define name="GTK_ACCESSIBLE_ROLE_HEADING" value="19"/>
+  <define name="GTK_ACCESSIBLE_ROLE_IMG" value="20"/>
+  <define name="GTK_ACCESSIBLE_ROLE_INPUT" value="21"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LABEL" value="22"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LANDMARK" value="23"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LEGEND" value="24"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LINK" value="25"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LIST" value="26"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LIST_BOX" value="27"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LIST_ITEM" value="28"/>
+  <define name="GTK_ACCESSIBLE_ROLE_LOG" value="29"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MAIN" value="30"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MARQUEE" value="31"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MATH" value="32"/>
+  <define name="GTK_ACCESSIBLE_ROLE_METER" value="33"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MENU" value="34"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MENU_BAR" value="35"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MENU_ITEM" value="36"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MENU_ITEM_CHECKBOX" value="37"/>
+  <define name="GTK_ACCESSIBLE_ROLE_MENU_ITEM_RADIO" value="38"/>
+  <define name="GTK_ACCESSIBLE_ROLE_NAVIGATION" value="39"/>
+  <define name="GTK_ACCESSIBLE_ROLE_NONE" value="40"/>
+  <define name="GTK_ACCESSIBLE_ROLE_NOTE" value="41"/>
+  <define name="GTK_ACCESSIBLE_ROLE_OPTION" value="42"/>
+  <define name="GTK_ACCESSIBLE_ROLE_PRESENTATION" value="43"/>
+  <define name="GTK_ACCESSIBLE_ROLE_PROGRESS_BAR" value="44"/>
+  <define name="GTK_ACCESSIBLE_ROLE_RADIO" value="45"/>
+  <define name="GTK_ACCESSIBLE_ROLE_RADIO_GROUP" value="46"/>
+  <define name="GTK_ACCESSIBLE_ROLE_RANGE" value="47"/>
+  <define name="GTK_ACCESSIBLE_ROLE_REGION" value="48"/>
+  <define name="GTK_ACCESSIBLE_ROLE_ROW" value="49"/>
+  <define name="GTK_ACCESSIBLE_ROLE_ROW_GROUP" value="50"/>
+  <define name="GTK_ACCESSIBLE_ROLE_ROW_HEADER" value="51"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SCROLLBAR" value="52"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SEARCH" value="53"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SEARCH_BOX" value="54"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SECTION" value="55"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SECTION_HEAD" value="56"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SELECT" value="57"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SEPARATOR" value="58"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SLIDER" value="59"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SPIN_BUTTON" value="60"/>
+  <define name="GTK_ACCESSIBLE_ROLE_STATUS" value="61"/>
+  <define name="GTK_ACCESSIBLE_ROLE_STRUCTURE" value="62"/>
+  <define name="GTK_ACCESSIBLE_ROLE_SWITCH" value="63"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TAB" value="64"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TABLE" value="65"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TAB_LIST" value="66"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TAB_PANEL" value="67"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TEXT_BOX" value="68"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TIME" value="69"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TIMER" value="70"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TOOLBAR" value="71"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TOOLTIP" value="72"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TREE" value="73"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TREE_GRID" value="74"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TREE_ITEM" value="75"/>
+  <define name="GTK_ACCESSIBLE_ROLE_WIDGET" value="76"/>
+  <define name="GTK_ACCESSIBLE_ROLE_WINDOW" value="77"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TOGGLE_BUTTON" value="78"/>
+  <define name="GTK_ACCESSIBLE_ROLE_APPLICATION" value="79"/>
+  <define name="GTK_ACCESSIBLE_ROLE_PARAGRAPH" value="80"/>
+  <define name="GTK_ACCESSIBLE_ROLE_BLOCK_QUOTE" value="81"/>
+  <define name="GTK_ACCESSIBLE_ROLE_ARTICLE" value="82"/>
+  <define name="GTK_ACCESSIBLE_ROLE_COMMENT" value="83"/>
+  <define name="GTK_ACCESSIBLE_ROLE_TERMINAL" value="84"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE" value="0"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_DESCRIPTION" value="1"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_HAS_POPUP" value="2"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_KEY_SHORTCUTS" value="3"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_LABEL" value="4"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_LEVEL" value="5"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_MODAL" value="6"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_MULTI_LINE" value="7"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE" value="8"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_ORIENTATION" value="9"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_PLACEHOLDER" value="10"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_READ_ONLY" value="11"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_REQUIRED" value="12"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_ROLE_DESCRIPTION" value="13"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_SORT" value="14"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_VALUE_MAX" value="15"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_VALUE_MIN" value="16"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_VALUE_NOW" value="17"/>
+  <define name="GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT" value="18"/>
+  <define name="GTK_ACCESSIBLE_RELATION_ACTIVE_DESCENDANT" value="0"/>
+  <define name="GTK_ACCESSIBLE_RELATION_COL_COUNT" value="1"/>
+  <define name="GTK_ACCESSIBLE_RELATION_COL_INDEX" value="2"/>
+  <define name="GTK_ACCESSIBLE_RELATION_COL_INDEX_TEXT" value="3"/>
+  <define name="GTK_ACCESSIBLE_RELATION_COL_SPAN" value="4"/>
+  <define name="GTK_ACCESSIBLE_RELATION_CONTROLS" value="5"/>
+  <define name="GTK_ACCESSIBLE_RELATION_DESCRIBED_BY" value="6"/>
+  <define name="GTK_ACCESSIBLE_RELATION_DETAILS" value="7"/>
+  <define name="GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE" value="8"/>
+  <define name="GTK_ACCESSIBLE_RELATION_FLOW_TO" value="9"/>
+  <define name="GTK_ACCESSIBLE_RELATION_LABELLED_BY" value="10"/>
+  <define name="GTK_ACCESSIBLE_RELATION_OWNS" value="11"/>
+  <define name="GTK_ACCESSIBLE_RELATION_POS_IN_SET" value="12"/>
+  <define name="GTK_ACCESSIBLE_RELATION_ROW_COUNT" value="13"/>
+  <define name="GTK_ACCESSIBLE_RELATION_ROW_INDEX" value="14"/>
+  <define name="GTK_ACCESSIBLE_RELATION_ROW_INDEX_TEXT" value="15"/>
+  <define name="GTK_ACCESSIBLE_RELATION_ROW_SPAN" value="16"/>
+  <define name="GTK_ACCESSIBLE_RELATION_SET_SIZE" value="17"/>
+  <define name="GTK_ACCESSIBLE_TRISTATE_FALSE" value="0"/>
+  <define name="GTK_ACCESSIBLE_TRISTATE_TRUE" value="1"/>
+  <define name="GTK_ACCESSIBLE_TRISTATE_MIXED" value="2"/>
+  <define name="GTK_ACCESSIBLE_INVALID_FALSE" value="0"/>
+  <define name="GTK_ACCESSIBLE_INVALID_TRUE" value="1"/>
+  <define name="GTK_ACCESSIBLE_INVALID_GRAMMAR" value="2"/>
+  <define name="GTK_ACCESSIBLE_INVALID_SPELLING" value="3"/>
+  <define name="GTK_ACCESSIBLE_AUTOCOMPLETE_NONE" value="0"/>
+  <define name="GTK_ACCESSIBLE_AUTOCOMPLETE_INLINE" value="1"/>
+  <define name="GTK_ACCESSIBLE_AUTOCOMPLETE_LIST" value="2"/>
+  <define name="GTK_ACCESSIBLE_AUTOCOMPLETE_BOTH" value="3"/>
+  <define name="GTK_ACCESSIBLE_SORT_NONE" value="0"/>
+  <define name="GTK_ACCESSIBLE_SORT_ASCENDING" value="1"/>
+  <define name="GTK_ACCESSIBLE_SORT_DESCENDING" value="2"/>
+  <define name="GTK_ACCESSIBLE_SORT_OTHER" value="3"/>
+  <define name="GTK_ACCESSIBLE_ANNOUNCEMENT_PRIORITY_LOW" value="0"/>
+  <define name="GTK_ACCESSIBLE_ANNOUNCEMENT_PRIORITY_MEDIUM" value="1"/>
+  <define name="GTK_ACCESSIBLE_ANNOUNCEMENT_PRIORITY_HIGH" value="2"/>
+  <define name="GTK_POPOVER_MENU_SLIDING" value="0"/>
+  <define name="GTK_POPOVER_MENU_NESTED" value="1&lt;&lt;0"/>
+  <!-- gtk/gtkeventcontrollerscroll.h -->
+  <define name="GTK_EVENT_CONTROLLER_SCROLL_NONE" value="0"/>
+  <define name="GTK_EVENT_CONTROLLER_SCROLL_VERTICAL" value="1&lt;&lt;0"/>
+  <define name="GTK_EVENT_CONTROLLER_SCROLL_HORIZONTAL" value="1&lt;&lt;1"/>
+  <define name="GTK_EVENT_CONTROLLER_SCROLL_DISCRETE" value="1&lt;&lt;2"/>
+  <define name="GTK_EVENT_CONTROLLER_SCROLL_KINETIC" value="1&lt;&lt;3"/>
+  <define name="GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES" value="(GTK_EVENT_CONTROLLER_SCROLL_VERTICAL|GTK_EVENT_CONTROLLER_SCROLL_HORIZONTAL)"/>
+  <!-- gtk/gtkfilechooserutils.h -->
+  <define name="GTK_FILE_CHOOSER_PROP_FIRST" value="0x1000"/>
+  <define name="GTK_FILE_CHOOSER_PROP_ACTION" value="0x1000"/>
+  <define name="GTK_FILE_CHOOSER_PROP_FILTER" value="4097"/>
+  <define name="GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE" value="4098"/>
+  <define name="GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS" value="4099"/>
+  <define name="GTK_FILE_CHOOSER_PROP_FILTERS" value="4100"/>
+  <define name="GTK_FILE_CHOOSER_PROP_SHORTCUT_FOLDERS" value="4101"/>
+  <define name="GTK_FILE_CHOOSER_PROP_LAST" value="4101"/>
+  <!-- gtk/gtkfilter.h -->
+  <define name="GTK_FILTER_MATCH_SOME" value="0"/>
+  <define name="GTK_FILTER_MATCH_NONE" value="1"/>
+  <define name="GTK_FILTER_MATCH_ALL" value="2"/>
+  <define name="GTK_FILTER_CHANGE_DIFFERENT" value="0"/>
+  <define name="GTK_FILTER_CHANGE_LESS_STRICT" value="1"/>
+  <define name="GTK_FILTER_CHANGE_MORE_STRICT" value="2"/>
+  <!-- gtk/gtkfontchooserutils.h -->
+  <define name="GTK_FONT_CHOOSER_PROP_FIRST" value="0x4000"/>
+  <define name="GTK_FONT_CHOOSER_PROP_FONT" value="16385"/>
+  <define name="GTK_FONT_CHOOSER_PROP_FONT_DESC" value="16386"/>
+  <define name="GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT" value="16387"/>
+  <define name="GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY" value="16388"/>
+  <define name="GTK_FONT_CHOOSER_PROP_LEVEL" value="16389"/>
+  <define name="GTK_FONT_CHOOSER_PROP_FONT_FEATURES" value="16390"/>
+  <define name="GTK_FONT_CHOOSER_PROP_LANGUAGE" value="16391"/>
+  <define name="GTK_FONT_CHOOSER_PROP_LAST" value="16392"/>
+  <!-- gtk/gtkfontdialogbutton.h -->
+  <define name="GTK_FONT_LEVEL_FAMILY" value="0"/>
+  <define name="GTK_FONT_LEVEL_FACE" value="1"/>
+  <define name="GTK_FONT_LEVEL_FONT" value="2"/>
+  <define name="GTK_FONT_LEVEL_FEATURES" value="3"/>
+  <!-- gtk/gtkgraphicsoffload.h -->
+  <define name="GTK_GRAPHICS_OFFLOAD_ENABLED" value="0"/>
+  <define name="GTK_GRAPHICS_OFFLOAD_DISABLED" value="1"/>
+  <!-- gtk/gtkicontheme.h -->
+  <define name="GTK_ICON_LOOKUP_FORCE_REGULAR" value="1&lt;&lt;0"/>
+  <define name="GTK_ICON_LOOKUP_FORCE_SYMBOLIC" value="1&lt;&lt;1"/>
+  <define name="GTK_ICON_LOOKUP_PRELOAD" value="1&lt;&lt;2"/>
+  <define name="GTK_ICON_THEME_NOT_FOUND" value="0"/>
+  <define name="GTK_ICON_THEME_FAILED" value="1"/>
+  <!-- gtk/gtkimage.h -->
+  <define name="GTK_IMAGE_EMPTY" value="0"/>
+  <define name="GTK_IMAGE_ICON_NAME" value="1"/>
+  <define name="GTK_IMAGE_GICON" value="2"/>
+  <define name="GTK_IMAGE_PAINTABLE" value="3"/>
+  <!-- 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;"/>
+  <define name="GTK_STOCK_ZOOM_100" value="&quot;gtk-zoom-100&quot;"/>
+  <define name="GTK_STOCK_UNINDENT" value="&quot;gtk-unindent&quot;"/>
+  <define name="GTK_STOCK_UNDERLINE" value="&quot;gtk-underline&quot;"/>
+  <define name="GTK_STOCK_UNDELETE" value="&quot;gtk-undelete&quot;"/>
+  <define name="GTK_STOCK_SELECT_FONT" value="&quot;gtk-select-font&quot;"/>
+  <define name="GTK_STOCK_SELECT_ALL" value="&quot;gtk-select-all&quot;"/>
+  <define name="GTK_STOCK_SAVE" value="&quot;gtk-save&quot;"/>
+  <define name="GTK_STOCK_REMOVE" value="&quot;gtk-remove&quot;"/>
+  <define name="GTK_STOCK_REDO" value="&quot;gtk-redo&quot;"/>
+  <define name="GTK_STOCK_SORT_DESCENDING" value="&quot;gtk-sort-descending&quot;"/>
+  <define name="GTK_STOCK_PROPERTIES" value="&quot;gtk-properties&quot;"/>
+  <define name="GTK_STOCK_PRINT_REPORT" value="&quot;gtk-print-report&quot;"/>
+  <define name="GTK_STOCK_PRINT_PREVIEW" value="&quot;gtk-print-preview&quot;"/>
+  <define name="GTK_STOCK_PRINT_ERROR" value="&quot;gtk-print-error&quot;"/>
+  <define name="GTK_STOCK_UNDO" value="&quot;gtk-undo&quot;"/>
+  <define name="GTK_STOCK_REFRESH" value="&quot;gtk-refresh&quot;"/>
+  <define name="GTK_STOCK_PRINT" value="&quot;gtk-print&quot;"/>
+  <define name="GTK_STOCK_PREFERENCES" value="&quot;gtk-preferences&quot;"/>
+  <define name="GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT" value="&quot;gtk-orientation-reverse-portrait&quot;"/>
+  <define name="GTK_STOCK_QUIT" value="&quot;gtk-quit&quot;"/>
+  <define name="GTK_STOCK_ORIENTATION_PORTRAIT" value="&quot;gtk-orientation-portrait&quot;"/>
+  <define name="GTK_STOCK_OPEN" value="&quot;gtk-open&quot;"/>
+  <define name="GTK_STOCK_STRIKETHROUGH" value="&quot;gtk-strikethrough&quot;"/>
+  <define name="GTK_STOCK_REVERT_TO_SAVED" value="&quot;gtk-revert-to-saved&quot;"/>
+  <define name="GTK_STOCK_PAGE_SETUP" value="&quot;gtk-page-setup&quot;"/>
+  <define name="GTK_STOCK_OK" value="&quot;gtk-ok&quot;"/>
+  <define name="GTK_STOCK_NO" value="&quot;gtk-no&quot;"/>
+  <define name="GTK_STOCK_NEW" value="&quot;gtk-new&quot;"/>
+  <define name="GTK_STOCK_MISSING_IMAGE" value="&quot;gtk-missing-image&quot;"/>
+  <define name="GTK_STOCK_MEDIA_STOP" value="&quot;gtk-media-stop&quot;"/>
+  <define name="GTK_STOCK_FIND" value="&quot;gtk-find&quot;"/>
+  <define name="GTK_STOCK_ORIENTATION_LANDSCAPE" value="&quot;gtk-orientation-landscape&quot;"/>
+  <define name="GTK_STOCK_DISCARD" value="&quot;gtk-discard&quot;"/>
+  <define name="GTK_STOCK_ADD" value="&quot;gtk-add&quot;"/>
+  <define name="GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE" value="&quot;gtk-orientation-reverse-landscape&quot;"/>
+  <define name="GTK_STOCK_FILE" value="&quot;gtk-file&quot;"/>
+  <define name="GTK_STOCK_DELETE" value="&quot;gtk-delete&quot;"/>
+  <define name="GTK_STOCK_EDIT" value="&quot;gtk-edit&quot;"/>
+  <define name="GTK_STOCK_DISCONNECT" value="&quot;gtk-disconnect&quot;"/>
+  <define name="GTK_STOCK_COPY" value="&quot;gtk-copy&quot;"/>
+  <define name="GTK_STOCK_PRINT_WARNING" value="&quot;gtk-print-warning&quot;"/>
+  <define name="GTK_STOCK_MEDIA_REWIND" value="&quot;gtk-media-rewind&quot;"/>
+  <define name="GTK_STOCK_EXECUTE" value="&quot;gtk-execute&quot;"/>
+  <define name="GTK_STOCK_GO_FORWARD" value="&quot;gtk-go-forward&quot;"/>
+  <define name="GTK_STOCK_DIALOG_WARNING" value="&quot;gtk-dialog-warning&quot;"/>
+  <define name="GTK_STOCK_SELECT_COLOR" value="&quot;gtk-select-color&quot;"/>
+  <define name="GTK_STOCK_CLEAR" value="&quot;gtk-clear&quot;"/>
+  <define name="GTK_STOCK_CAPS_LOCK_WARNING" value="&quot;gtk-caps-lock-warning&quot;"/>
+  <define name="GTK_STOCK_SAVE_AS" value="&quot;gtk-save-as&quot;"/>
+  <define name="GTK_STOCK_CUT" value="&quot;gtk-cut&quot;"/>
+  <define name="GTK_STOCK_PASTE" value="&quot;gtk-paste&quot;"/>
+  <define name="GTK_STOCK_CONVERT" value="&quot;gtk-convert&quot;"/>
+  <define name="GTK_STOCK_GO_UP" value="&quot;gtk-go-up&quot;"/>
+  <define name="GTK_STOCK_DIRECTORY" value="&quot;gtk-directory&quot;"/>
+  <define name="GTK_STOCK_HARDDISK" value="&quot;gtk-harddisk&quot;"/>
+  <define name="GTK_STOCK_MEDIA_PREVIOUS" value="&quot;gtk-media-previous&quot;"/>
+  <define name="GTK_STOCK_BOLD" value="&quot;gtk-bold&quot;"/>
+  <define name="GTK_STOCK_CDROM" value="&quot;gtk-cdrom&quot;"/>
+  <define name="GTK_STOCK_JUSTIFY_LEFT" value="&quot;gtk-justify-left&quot;"/>
+  <define name="GTK_STOCK_NETWORK" value="&quot;gtk-network&quot;"/>
+  <define name="GTK_STOCK_DIALOG_AUTHENTICATION" value="&quot;gtk-dialog-authentication&quot;"/>
+  <define name="GTK_STOCK_PRINT_PAUSED" value="&quot;gtk-print-paused&quot;"/>
+  <define name="GTK_STOCK_DND" value="&quot;gtk-dnd&quot;"/>
+  <define name="GTK_STOCK_FIND_AND_REPLACE" value="&quot;gtk-find-and-replace&quot;"/>
+  <define name="GTK_STOCK_SORT_ASCENDING" value="&quot;gtk-sort-ascending&quot;"/>
+  <define name="GTK_STOCK_MEDIA_PLAY" value="&quot;gtk-media-play&quot;"/>
+  <define name="GTK_STOCK_INDEX" value="&quot;gtk-index&quot;"/>
+  <define name="GTK_STOCK_CONNECT" value="&quot;gtk-connect&quot;"/>
+  <define name="GTK_STOCK_STOP" value="&quot;gtk-stop&quot;"/>
+  <define name="GTK_STOCK_CANCEL" value="&quot;gtk-cancel&quot;"/>
+  <define name="GTK_STOCK_DIALOG_INFO" value="&quot;gtk-dialog-info&quot;"/>
+  <define name="GTK_STOCK_APPLY" value="&quot;gtk-apply&quot;"/>
+  <define name="GTK_STOCK_DIALOG_QUESTION" value="&quot;gtk-dialog-question&quot;"/>
+  <define name="GTK_STOCK_MEDIA_RECORD" value="&quot;gtk-media-record&quot;"/>
+  <define name="GTK_STOCK_COLOR_PICKER" value="&quot;gtk-color-picker&quot;"/>
+  <define name="GTK_STOCK_DIALOG_ERROR" value="&quot;gtk-dialog-error&quot;"/>
+  <define name="GTK_STOCK_GOTO_TOP" value="&quot;gtk-goto-top&quot;"/>
+  <define name="GTK_STOCK_FLOPPY" value="&quot;gtk-floppy&quot;"/>
+  <define name="GTK_STOCK_GOTO_BOTTOM" value="&quot;gtk-goto-bottom&quot;"/>
+  <define name="GTK_STOCK_JUMP_TO" value="&quot;gtk-jump-to&quot;"/>
+  <define name="GTK_STOCK_JUSTIFY_CENTER" value="&quot;gtk-justify-center&quot;"/>
+  <define name="GTK_STOCK_YES" value="&quot;gtk-yes&quot;"/>
+  <define name="GTK_STOCK_SPELL_CHECK" value="&quot;gtk-spell-check&quot;"/>
+  <define name="GTK_STOCK_MEDIA_NEXT" value="&quot;gtk-media-next&quot;"/>
+  <define name="GTK_STOCK_GOTO_FIRST" value="&quot;gtk-goto-first&quot;"/>
+  <define name="GTK_STOCK_JUSTIFY_FILL" value="&quot;gtk-justify-fill&quot;"/>
+  <define name="GTK_STOCK_GOTO_LAST" value="&quot;gtk-goto-last&quot;"/>
+  <define name="GTK_STOCK_GO_BACK" value="&quot;gtk-go-back&quot;"/>
+  <define name="GTK_STOCK_FULLSCREEN" value="&quot;gtk-fullscreen&quot;"/>
+  <define name="GTK_STOCK_HOME" value="&quot;gtk-home&quot;"/>
+  <define name="GTK_STOCK_GO_DOWN" value="&quot;gtk-go-down&quot;"/>
+  <define name="GTK_STOCK_INFO" value="&quot;gtk-info&quot;"/>
+  <define name="GTK_STOCK_ZOOM_OUT" value="&quot;gtk-zoom-out&quot;"/>
+  <define name="GTK_STOCK_ABOUT" value="&quot;gtk-about&quot;"/>
+  <define name="GTK_STOCK_LEAVE_FULLSCREEN" value="&quot;gtk-leave-fullscreen&quot;"/>
+  <define name="GTK_STOCK_HELP" value="&quot;gtk-help&quot;"/>
+  <define name="GTK_STOCK_DND_MULTIPLE" value="&quot;gtk-dnd-multiple&quot;"/>
+  <define name="GTK_STOCK_ITALIC" value="&quot;gtk-italic&quot;"/>
+  <define name="GTK_STOCK_JUSTIFY_RIGHT" value="&quot;gtk-justify-right&quot;"/>
+  <define name="GTK_STOCK_MEDIA_FORWARD" value="&quot;gtk-media-forward&quot;"/>
+  <define name="GTK_STOCK_CLOSE" value="&quot;gtk-close&quot;"/>
+  <define name="GTK_STOCK_INDENT" value="&quot;gtk-indent&quot;"/>
+  <define name="GTK_STOCK_MEDIA_PAUSE" value="&quot;gtk-media-pause&quot;"/>
+  <define name="GTK_PRIORITY_LOW" value="G_PRIORITY_LOW"/>
+  <define name="GTK_PRIORITY_DEFAULT" value="G_PRIORITY_DEFAULT_IDLE"/>
+  <define name="GTK_PRIORITY_INTERNAL" value="GTK_PRIORITY_REDRAW"/>
+  <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)"/>
 </def>
diff --git a/cfg/icu.cfg b/cfg/icu.cfg
index 9932716f2d1..5e1f9163fd0 100644
--- a/cfg/icu.cfg
+++ b/cfg/icu.cfg
@@ -1,6 +1,221 @@
 <?xml version="1.0"?>
 <def format="2">
   <!-- This library contains configuration of ICU-project (http://userguide.icu-project.org/) -->
+  <!-- https://unicode-org.github.io/icu-docs/apidoc/dev/icu4c/utypes_8h.html -->
   <define name="U_SUCCESS(x)" value="((x)&lt;=0)"/>
   <define name="U_FAILURE(x)" value="((x)&gt;0)"/>
+  <define name="U_STANDARD_CPP_NAMESPACE" value=""/>
+  <define name="U_IO_API" value=""/>
+  <define name="U_EXPORT" value=""/>
+  <define name="U_EXPORT2" value=""/>
+  <define name="U_IMPORT" value=""/>
+  <define name="U_HIDDEN" value=""/>
+  <define name="U_LAYOUT_API" value=""/>
+  <define name="U_I18N_API" value=""/>
+  <define name="U_LAYOUTEX_API" value=""/>
+  <define name="U_DATA_API" value=""/>
+  <define name="U_SHOW_CPLUSPLUS_API" value="0"/>
+  <define name="U_ICUDATA_TYPE_LITLETTER" value="l"/>
+  <define name="U_ICUDATA_NAME" value="&quot;icudt&quot;U_ICU_VERSION_SHORTU_ICUDATA_TYPE_LETTER"/>
+  <define name="U_TOOLUTIL_API" value=""/>
+  <define name="U_DATE_MIN" value="-U_DATE_MAX"/>
+  <define name="U_MILLIS_PER_SECOND" value="(1000)"/>
+  <define name="U_ICUDATA_ENTRY_POINT" value="U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM,U_LIB_SUFFIX_C_NAME)"/>
+  <define name="U_MILLIS_PER_MINUTE" value="(60000)"/>
+  <define name="U_MILLIS_PER_HOUR" value="(3600000)"/>
+  <define name="U_COMMON_API" value=""/>
+  <define name="U_MILLIS_PER_DAY" value="(86400000)"/>
+  <define name="U_ICUDATA_TYPE_LETTER" value="&quot;l&quot;"/>
+  <define name="U_DATE_MAX" value="DBL_MAX"/>
+  <define name="U_COMBINED_IMPLEMENTATION" value="1"/>
+  <define name="U_HIDE_INTERNAL_API" value="1"/>
+  <define name="U_HIDE_DRAFT_API" value="1"/>
+  <!-- enum UErrorCode -->
+  <define name="U_USING_FALLBACK_WARNING" value="-128"/>
+  <define name="U_ERROR_WARNING_START" value="-128"/>
+  <define name="U_USING_DEFAULT_WARNING" value="-127"/>
+  <define name="U_SAFECLONE_ALLOCATED_WARNING" value="-126"/>
+  <define name="U_STATE_OLD_WARNING" value="-125"/>
+  <define name="U_STRING_NOT_TERMINATED_WARNING" value="-124"/>
+  <define name="U_SORT_KEY_TOO_SHORT_WARNING" value="-123"/>
+  <define name="U_AMBIGUOUS_ALIAS_WARNING" value="-122"/>
+  <define name="U_DIFFERENT_UCA_VERSION" value="-121"/>
+  <define name="U_PLUGIN_CHANGED_LEVEL_WARNING" value="-120"/>
+  <define name="U_ERROR_WARNING_LIMIT" value="-119"/>
+  <define name="U_ZERO_ERROR" value="0"/>
+  <define name="U_ILLEGAL_ARGUMENT_ERROR" value="1"/>
+  <define name="U_MISSING_RESOURCE_ERROR" value="2"/>
+  <define name="U_INVALID_FORMAT_ERROR" value="3"/>
+  <define name="U_FILE_ACCESS_ERROR" value="4"/>
+  <define name="U_INTERNAL_PROGRAM_ERROR" value="5"/>
+  <define name="U_MESSAGE_PARSE_ERROR" value="6"/>
+  <define name="U_MEMORY_ALLOCATION_ERROR" value="7"/>
+  <define name="U_INDEX_OUTOFBOUNDS_ERROR" value="8"/>
+  <define name="U_PARSE_ERROR" value="9"/>
+  <define name="U_INVALID_CHAR_FOUND" value="10"/>
+  <define name="U_TRUNCATED_CHAR_FOUND" value="11"/>
+  <define name="U_ILLEGAL_CHAR_FOUND" value="12"/>
+  <define name="U_INVALID_TABLE_FORMAT" value="13"/>
+  <define name="U_INVALID_TABLE_FILE" value="14"/>
+  <define name="U_BUFFER_OVERFLOW_ERROR" value="15"/>
+  <define name="U_UNSUPPORTED_ERROR" value="16"/>
+  <define name="U_RESOURCE_TYPE_MISMATCH" value="17"/>
+  <define name="U_ILLEGAL_ESCAPE_SEQUENCE" value="18"/>
+  <define name="U_UNSUPPORTED_ESCAPE_SEQUENCE" value="19"/>
+  <define name="U_NO_SPACE_AVAILABLE" value="20"/>
+  <define name="U_CE_NOT_FOUND_ERROR" value="21"/>
+  <define name="U_PRIMARY_TOO_LONG_ERROR" value="22"/>
+  <define name="U_STATE_TOO_OLD_ERROR" value="23"/>
+  <define name="U_TOO_MANY_ALIASES_ERROR" value="24"/>
+  <define name="U_ENUM_OUT_OF_SYNC_ERROR" value="25"/>
+  <define name="U_INVARIANT_CONVERSION_ERROR" value="26"/>
+  <define name="U_INVALID_STATE_ERROR" value="27"/>
+  <define name="U_COLLATOR_VERSION_MISMATCH" value="28"/>
+  <define name="U_USELESS_COLLATOR_ERROR" value="29"/>
+  <define name="U_NO_WRITE_PERMISSION" value="30"/>
+  <define name="U_INPUT_TOO_LONG_ERROR" value="31"/>
+  <define name="U_STANDARD_ERROR_LIMIT" value="32"/>
+  <define name="U_BAD_VARIABLE_DEFINITION" value="0x10000"/>
+  <define name="U_PARSE_ERROR_START" value="0x10000"/>
+  <define name="U_MALFORMED_RULE" value="65537"/>
+  <define name="U_MALFORMED_SET" value="65538"/>
+  <define name="U_MALFORMED_SYMBOL_REFERENCE" value="65539"/>
+  <define name="U_MALFORMED_UNICODE_ESCAPE" value="65540"/>
+  <define name="U_MALFORMED_VARIABLE_DEFINITION" value="65541"/>
+  <define name="U_MALFORMED_VARIABLE_REFERENCE" value="65542"/>
+  <define name="U_MISMATCHED_SEGMENT_DELIMITERS" value="65543"/>
+  <define name="U_MISPLACED_ANCHOR_START" value="65544"/>
+  <define name="U_MISPLACED_CURSOR_OFFSET" value="65545"/>
+  <define name="U_MISPLACED_QUANTIFIER" value="65546"/>
+  <define name="U_MISSING_OPERATOR" value="65547"/>
+  <define name="U_MISSING_SEGMENT_CLOSE" value="65548"/>
+  <define name="U_MULTIPLE_ANTE_CONTEXTS" value="65549"/>
+  <define name="U_MULTIPLE_CURSORS" value="65550"/>
+  <define name="U_MULTIPLE_POST_CONTEXTS" value="65551"/>
+  <define name="U_TRAILING_BACKSLASH" value="65552"/>
+  <define name="U_UNDEFINED_SEGMENT_REFERENCE" value="65553"/>
+  <define name="U_UNDEFINED_VARIABLE" value="65554"/>
+  <define name="U_UNQUOTED_SPECIAL" value="65555"/>
+  <define name="U_UNTERMINATED_QUOTE" value="65556"/>
+  <define name="U_RULE_MASK_ERROR" value="65557"/>
+  <define name="U_MISPLACED_COMPOUND_FILTER" value="65558"/>
+  <define name="U_MULTIPLE_COMPOUND_FILTERS" value="65559"/>
+  <define name="U_INVALID_RBT_SYNTAX" value="65560"/>
+  <define name="U_INVALID_PROPERTY_PATTERN" value="65561"/>
+  <define name="U_MALFORMED_PRAGMA" value="65562"/>
+  <define name="U_UNCLOSED_SEGMENT" value="65563"/>
+  <define name="U_ILLEGAL_CHAR_IN_SEGMENT" value="65564"/>
+  <define name="U_VARIABLE_RANGE_EXHAUSTED" value="65565"/>
+  <define name="U_VARIABLE_RANGE_OVERLAP" value="65566"/>
+  <define name="U_ILLEGAL_CHARACTER" value="65567"/>
+  <define name="U_INTERNAL_TRANSLITERATOR_ERROR" value="65568"/>
+  <define name="U_INVALID_ID" value="65569"/>
+  <define name="U_INVALID_FUNCTION" value="65570"/>
+  <define name="U_PARSE_ERROR_LIMIT" value="65571"/>
+  <define name="U_UNEXPECTED_TOKEN" value="0x10100"/>
+  <define name="U_FMT_PARSE_ERROR_START" value="0x10100"/>
+  <define name="U_MULTIPLE_DECIMAL_SEPARATORS" value="65793"/>
+  <define name="U_MULTIPLE_DECIMAL_SEPERATORS" value="65793"/>
+  <define name="U_MULTIPLE_EXPONENTIAL_SYMBOLS" value="65794"/>
+  <define name="U_MALFORMED_EXPONENTIAL_PATTERN" value="65795"/>
+  <define name="U_MULTIPLE_PERCENT_SYMBOLS" value="65796"/>
+  <define name="U_MULTIPLE_PERMILL_SYMBOLS" value="65797"/>
+  <define name="U_MULTIPLE_PAD_SPECIFIERS" value="65798"/>
+  <define name="U_PATTERN_SYNTAX_ERROR" value="65799"/>
+  <define name="U_ILLEGAL_PAD_POSITION" value="65800"/>
+  <define name="U_UNMATCHED_BRACES" value="65801"/>
+  <define name="U_UNSUPPORTED_PROPERTY" value="65802"/>
+  <define name="U_UNSUPPORTED_ATTRIBUTE" value="65803"/>
+  <define name="U_ARGUMENT_TYPE_MISMATCH" value="65804"/>
+  <define name="U_DUPLICATE_KEYWORD" value="65805"/>
+  <define name="U_UNDEFINED_KEYWORD" value="65806"/>
+  <define name="U_DEFAULT_KEYWORD_MISSING" value="65807"/>
+  <define name="U_DECIMAL_NUMBER_SYNTAX_ERROR" value="65808"/>
+  <define name="U_FORMAT_INEXACT_ERROR" value="65809"/>
+  <define name="U_NUMBER_ARG_OUTOFBOUNDS_ERROR" value="65810"/>
+  <define name="U_NUMBER_SKELETON_SYNTAX_ERROR" value="65811"/>
+  <define name="U_MF_UNRESOLVED_VARIABLE_ERROR" value="65812"/>
+  <define name="U_MF_SYNTAX_ERROR" value="65813"/>
+  <define name="U_MF_UNKNOWN_FUNCTION_ERROR" value="65814"/>
+  <define name="U_MF_VARIANT_KEY_MISMATCH_ERROR" value="65815"/>
+  <define name="U_MF_FORMATTING_ERROR" value="65816"/>
+  <define name="U_MF_NONEXHAUSTIVE_PATTERN_ERROR" value="65817"/>
+  <define name="U_MF_DUPLICATE_OPTION_NAME_ERROR" value="65818"/>
+  <define name="U_MF_SELECTOR_ERROR" value="65819"/>
+  <define name="U_MF_MISSING_SELECTOR_ANNOTATION_ERROR" value="65820"/>
+  <define name="U_MF_DUPLICATE_DECLARATION_ERROR" value="65821"/>
+  <define name="U_MF_OPERAND_MISMATCH_ERROR" value="65822"/>
+  <define name="U_MF_UNSUPPORTED_STATEMENT_ERROR" value="65823"/>
+  <define name="U_MF_UNSUPPORTED_EXPRESSION_ERROR" value="65824"/>
+  <define name="U_FMT_PARSE_ERROR_LIMIT" value="0x10121"/>
+  <define name="U_BRK_INTERNAL_ERROR" value="0x10200"/>
+  <define name="U_BRK_ERROR_START" value="0x10200"/>
+  <define name="U_BRK_HEX_DIGITS_EXPECTED" value="66049"/>
+  <define name="U_BRK_SEMICOLON_EXPECTED" value="66050"/>
+  <define name="U_BRK_RULE_SYNTAX" value="66051"/>
+  <define name="U_BRK_UNCLOSED_SET" value="66052"/>
+  <define name="U_BRK_ASSIGN_ERROR" value="66053"/>
+  <define name="U_BRK_VARIABLE_REDFINITION" value="66054"/>
+  <define name="U_BRK_MISMATCHED_PAREN" value="66055"/>
+  <define name="U_BRK_NEW_LINE_IN_QUOTED_STRING" value="66056"/>
+  <define name="U_BRK_UNDEFINED_VARIABLE" value="66057"/>
+  <define name="U_BRK_INIT_ERROR" value="66058"/>
+  <define name="U_BRK_RULE_EMPTY_SET" value="66059"/>
+  <define name="U_BRK_UNRECOGNIZED_OPTION" value="66060"/>
+  <define name="U_BRK_MALFORMED_RULE_TAG" value="66061"/>
+  <define name="U_BRK_ERROR_LIMIT" value="66062"/>
+  <define name="U_REGEX_INTERNAL_ERROR" value="0x10300"/>
+  <define name="U_REGEX_ERROR_START" value="0x10300"/>
+  <define name="U_REGEX_RULE_SYNTAX" value="66305"/>
+  <define name="U_REGEX_INVALID_STATE" value="66306"/>
+  <define name="U_REGEX_BAD_ESCAPE_SEQUENCE" value="66307"/>
+  <define name="U_REGEX_PROPERTY_SYNTAX" value="66308"/>
+  <define name="U_REGEX_UNIMPLEMENTED" value="66309"/>
+  <define name="U_REGEX_MISMATCHED_PAREN" value="66310"/>
+  <define name="U_REGEX_NUMBER_TOO_BIG" value="66311"/>
+  <define name="U_REGEX_BAD_INTERVAL" value="66312"/>
+  <define name="U_REGEX_MAX_LT_MIN" value="66313"/>
+  <define name="U_REGEX_INVALID_BACK_REF" value="66314"/>
+  <define name="U_REGEX_INVALID_FLAG" value="66315"/>
+  <define name="U_REGEX_LOOK_BEHIND_LIMIT" value="66316"/>
+  <define name="U_REGEX_SET_CONTAINS_STRING" value="66317"/>
+  <define name="U_REGEX_OCTAL_TOO_BIG" value="66318"/>
+  <define name="U_REGEX_MISSING_CLOSE_BRACKET" value="U_REGEX_SET_CONTAINS_STRING+2"/>
+  <define name="U_REGEX_INVALID_RANGE" value="66319"/>
+  <define name="U_REGEX_STACK_OVERFLOW" value="66320"/>
+  <define name="U_REGEX_TIME_OUT" value="66321"/>
+  <define name="U_REGEX_STOPPED_BY_CALLER" value="66322"/>
+  <define name="U_REGEX_PATTERN_TOO_BIG" value="66323"/>
+  <define name="U_REGEX_INVALID_CAPTURE_GROUP_NAME" value="66324"/>
+  <define name="U_REGEX_ERROR_LIMIT" value="U_REGEX_STOPPED_BY_CALLER+3"/>
+  <define name="U_IDNA_PROHIBITED_ERROR" value="0x10400"/>
+  <define name="U_IDNA_ERROR_START" value="0x10400"/>
+  <define name="U_IDNA_UNASSIGNED_ERROR" value="66561"/>
+  <define name="U_IDNA_CHECK_BIDI_ERROR" value="66562"/>
+  <define name="U_IDNA_STD3_ASCII_RULES_ERROR" value="66563"/>
+  <define name="U_IDNA_ACE_PREFIX_ERROR" value="66564"/>
+  <define name="U_IDNA_VERIFICATION_ERROR" value="66565"/>
+  <define name="U_IDNA_LABEL_TOO_LONG_ERROR" value="66566"/>
+  <define name="U_IDNA_ZERO_LENGTH_LABEL_ERROR" value="66567"/>
+  <define name="U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR" value="66568"/>
+  <define name="U_IDNA_ERROR_LIMIT" value="66569"/>
+  <define name="U_STRINGPREP_PROHIBITED_ERROR" value="0x10400"/>
+  <define name="U_STRINGPREP_UNASSIGNED_ERROR" value="66561"/>
+  <define name="U_STRINGPREP_CHECK_BIDI_ERROR" value="66562"/>
+  <define name="U_PLUGIN_ERROR_START" value="0x10500"/>
+  <define name="U_PLUGIN_TOO_HIGH" value="0x10500"/>
+  <define name="U_PLUGIN_DIDNT_SET_LEVEL" value="66817"/>
+  <define name="U_PLUGIN_ERROR_LIMIT" value="66818"/>
+  <define name="U_ERROR_LIMIT" value="66818"/>
+  <!-- utf8.h -->
+  <!-- https://unicode-org.github.io/icu-docs/apidoc/dev/icu4c/utf_8h.html#a7d794df2276384e748f2836b25b58f7d -->
+  <define name="U_IS_SURROGATE_TRAIL(c)" value="(((c)&amp;0x400)!=0)"/>
+  <define name="U_IS_SURROGATE(c)" value="(((c)&amp;0xfffff800)==0xd800)"/>
+  <define name="U_IS_TRAIL(c)" value="(((c)&amp;0xfffffc00)==0xdc00)"/>
+  <define name="U_IS_SURROGATE_LEAD(c)" value="(((c)&amp;0x400)==0)"/>
+  <define name="U_IS_LEAD(c)" value="(((c)&amp;0xfffffc00)==0xd800)"/>
+  <define name="U_IS_SUPPLEMENTARY(c)" value="((uint32_t)((c)-0x10000)&lt;=0xfffff)"/>
+  <define name="U_IS_BMP(c)" value="((uint32_t)(c)&lt;=0xffff)"/>
+  <define name="U_IS_UNICODE_CHAR(c)" value="((uint32_t)(c)&lt;0xd800||(0xdfff&lt;(c)&amp;&amp;(c)&lt;=0x10ffff&amp;&amp;!U_IS_UNICODE_NONCHAR(c))"/>
+  <define name="U_IS_UNICODE_NONCHAR(c)" value="((c)&gt;=0xfdd0&amp;&amp;((c)&lt;=0xfdef||((c)&amp;0xfffe)==0xfffe)&amp;&amp;(c)&lt;=0x10ffff)"/> 
 </def>
diff --git a/cfg/kde.cfg b/cfg/kde.cfg
index 5973916fd60..1131d5e0c50 100644
--- a/cfg/kde.cfg
+++ b/cfg/kde.cfg
@@ -20,6 +20,11 @@
   <define name="KDE_PACKED" value=""/>
   <define name="KDE_VERSION" value="KDE_MAKE_VERSION(KDE_VERSION_MAJOR,KDE_VERSION_MINOR,KDE_VERSION_RELEASE)"/>
   <define name="KDE_WEAK_SYMBOL" value=""/>
+  <define name="K_PLUGIN_CLASS_WITH_JSON(class_name, json_name)" value=""/>
+  <define name="K_PLUGIN_CLASS(class_name)" value=""/>
+  <define name="K_PLUGIN_FACTORY(class_name, ...)" value=""/>
+  <define name="K_PLUGIN_FACTORY_WITH_JSON(class_name, json_name, ...)" value=""/>
+  <define name="EXPORT_KONTACT_PLUGIN_WITH_JSON(class_name, json_name)" value=""/>
   <!-- ########## KDE Allocation / Deallocation ########## -->
   <!-- ########## KDE Functions ########## -->
   <!-- template<typename T > T KConfigGroup::readEntry ( const QString & key, const T & aDefault ) const -->
@@ -48,4 +53,40 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- QString i18n(const char*) -->
+  <!-- QString xi18n(const char*) -->
+  <function name="i18n,xi18n">
+    <noreturn>false</noreturn>
+    <pure/>
+    <leak-ignore/>
+    <returnValue type="QString"/>
+    <arg nr="1" direction="in"/>
+  </function>
+  <!-- KLocalizedString ki18n(const char*) -->
+  <function name="ki18n">
+    <noreturn>false</noreturn>
+    <pure/>
+    <leak-ignore/>
+    <returnValue type="KLocalizedString"/>
+    <arg nr="1" direction="in"/>
+  </function>
+  <!-- QString i18nc(const char*, const char*) -->
+  <!-- QString xi18nc(const char*, const char*) -->
+  <function name="i18nc,xi18nc">
+    <noreturn>false</noreturn>
+    <pure/>
+    <leak-ignore/>
+    <returnValue type="QString"/>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in"/>
+  </function>
+  <!-- KLocalizedString ki18nc(const char*, const char*) -->
+  <function name="ki18nc">
+    <noreturn>false</noreturn>
+    <pure/>
+    <leak-ignore/>
+    <returnValue type="KLocalizedString"/>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in"/>
+  </function>
 </def>
diff --git a/cfg/libcerror.cfg b/cfg/libcerror.cfg
index 0bdd0874eb8..ce621e99d44 100644
--- a/cfg/libcerror.cfg
+++ b/cfg/libcerror.cfg
@@ -125,4 +125,79 @@
       <strz/>
     </arg>
   </function>
+  <!-- enum LIBCERROR_ERROR_DOMAINS: -->
+  <define name="LIBCERROR_ERROR_DOMAIN_ARGUMENTS" value="(int)&apos;a&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_CONVERSION" value="(int)&apos;c&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_COMPRESSION" value="(int)&apos;C&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_ENCRYPTION" value="(int)&apos;E&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_IO" value="(int)&apos;I&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_INPUT" value="(int)&apos;i&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_MEMORY" value="(int)&apos;m&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_OUTPUT" value="(int)&apos;o&apos;"/>
+  <define name="LIBCERROR_ERROR_DOMAIN_RUNTIME" value="(int)&apos;r&apos;"/>
+  <!-- enum LIBCERROR_ARGUMENT_ERROR: -->
+  <define name="LIBCERROR_ARGUMENT_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_INVALID_VALUE" value="1"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_VALUE_LESS_THAN_ZERO" value="2"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_VALUE_ZERO_OR_LESS" value="3"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_VALUE_EXCEEDS_MAXIMUM" value="4"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_VALUE_TOO_SMALL" value="5"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_VALUE_TOO_LARGE" value="6"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_VALUE_OUT_OF_BOUNDS" value="7"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_UNSUPPORTED_VALUE" value="8"/>
+  <define name="LIBCERROR_ARGUMENT_ERROR_CONFLICTING_VALUE" value="9"/>
+  <!-- enum LIBCERROR_CONVERSION_ERROR: -->
+  <define name="LIBCERROR_CONVERSION_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_CONVERSION_ERROR_INPUT_FAILED" value="1"/>
+  <define name="LIBCERROR_CONVERSION_ERROR_OUTPUT_FAILED" value="2"/>
+  <!-- enum LIBCERROR_COMPRESSION_ERROR: -->
+  <define name="LIBCERROR_COMPRESSION_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_COMPRESSION_ERROR_COMPRESS_FAILED" value="1"/>
+  <define name="LIBCERROR_COMPRESSION_ERROR_DECOMPRESS_FAILED" value="2"/>
+  <!-- enum LIBCERROR_ENCRYPTION_ERROR: -->
+  <define name="LIBCERROR_ENCRYPTION_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_ENCRYPTION_ERROR_ENCRYPT_FAILED" value="1"/>
+  <define name="LIBCERROR_ENCRYPTION_ERROR_DECRYPT_FAILED" value="2"/>
+  <!-- enum LIBCERROR_IO_ERROR: -->
+  <define name="LIBCERROR_IO_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_IO_ERROR_OPEN_FAILED" value="1"/>
+  <define name="LIBCERROR_IO_ERROR_CLOSE_FAILED" value="2"/>
+  <define name="LIBCERROR_IO_ERROR_SEEK_FAILED" value="3"/>
+  <define name="LIBCERROR_IO_ERROR_READ_FAILED" value="4"/>
+  <define name="LIBCERROR_IO_ERROR_WRITE_FAILED" value="5"/>
+  <define name="LIBCERROR_IO_ERROR_ACCESS_DENIED" value="6"/>
+  <define name="LIBCERROR_IO_ERROR_INVALID_RESOURCE" value="7"/>
+  <define name="LIBCERROR_IO_ERROR_IOCTL_FAILED" value="8"/>
+  <define name="LIBCERROR_IO_ERROR_UNLINK_FAILED" value="9"/>
+  <!-- enum LIBCERROR_INPUT_ERROR: -->
+  <define name="LIBCERROR_INPUT_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_INPUT_ERROR_INVALID_DATA" value="1"/>
+  <define name="LIBCERROR_INPUT_ERROR_SIGNATURE_MISMATCH" value="2"/>
+  <define name="LIBCERROR_INPUT_ERROR_CHECKSUM_MISMATCH" value="3"/>
+  <define name="LIBCERROR_INPUT_ERROR_VALUE_MISMATCH" value="4"/>
+  <!-- enum LIBCERROR_MEMORY_ERROR: -->
+  <define name="LIBCERROR_MEMORY_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_MEMORY_ERROR_INSUFFICIENT" value="1"/>
+  <define name="LIBCERROR_MEMORY_ERROR_COPY_FAILED" value="2"/>
+  <define name="LIBCERROR_MEMORY_ERROR_SET_FAILED" value="3"/>
+  <!-- enum LIBCERROR_OUTPUT_ERROR: -->
+  <define name="LIBCERROR_OUTPUT_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_OUTPUT_ERROR_INSUFFICIENT_SPACE" value="1"/>
+  <!-- enum LIBCERROR_RUNTIME_ERROR: -->
+  <define name="LIBCERROR_RUNTIME_ERROR_GENERIC" value="0"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_VALUE_MISSING" value="1"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_VALUE_ALREADY_SET" value="2"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_INITIALIZE_FAILED" value="3"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_RESIZE_FAILED" value="4"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_FINALIZE_FAILED" value="5"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_GET_FAILED" value="6"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_SET_FAILED" value="7"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_APPEND_FAILED" value="8"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_COPY_FAILED" value="9"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_REMOVE_FAILED" value="10"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_PRINT_FAILED" value="11"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_VALUE_OUT_OF_BOUNDS" value="12"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_VALUE_EXCEEDS_MAXIMUM" value="13"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_UNSUPPORTED_VALUE" value="14"/>
+  <define name="LIBCERROR_RUNTIME_ERROR_ABORT_REQUESTED" value="15"/>
 </def>
diff --git a/cfg/microsoft_sal.cfg b/cfg/microsoft_sal.cfg
index 3cdb8299cd4..36371a3610b 100644
--- a/cfg/microsoft_sal.cfg
+++ b/cfg/microsoft_sal.cfg
@@ -338,7 +338,6 @@
   <define name="__blocksOn(resource)" value=""/>
   <define name="__callback" value=""/>
   <define name="__checkReturn" value=""/>
-  <define name="__format_string" value=""/>
   <define name="__in_awcount(expr,size)" value=""/>
   <define name="__nullnullterminated" value=""/>
   <define name="__nullterminated" value=""/>
diff --git a/cfg/opencv2.cfg b/cfg/opencv2.cfg
index 797035c1e57..80b51ad7a08 100644
--- a/cfg/opencv2.cfg
+++ b/cfg/opencv2.cfg
@@ -69,7 +69,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <arg nr="1">
-      <not-uninit indirect="1"/>
+      <not-uninit/>
     </arg>
   </function>
   <!-- void * cv::fastMalloc (size_t bufSize) -->
diff --git a/cfg/opengl.cfg b/cfg/opengl.cfg
index 72dcaddb961..ec37abf5516 100644
--- a/cfg/opengl.cfg
+++ b/cfg/opengl.cfg
@@ -211,6 +211,7 @@
   <!-- https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glIsEnabled.xml -->
   <!-- GLboolean glIsEnabled( GLenum cap ); -->
   <function name="glIsEnabled">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="GLboolean"/>
     <use-retval/>
diff --git a/cfg/posix.cfg b/cfg/posix.cfg
index f07f8fe8b44..751142bacc1 100644
--- a/cfg/posix.cfg
+++ b/cfg/posix.cfg
@@ -511,6 +511,13 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- see https://www.man7.org/linux/man-pages/man3/dlerror.3.html -->
+  <!-- char *dlerror(void); -->
+  <function name="dlerror">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="char*"/>
+  </function>
   <!-- see http://pubs.opengroup.org/onlinepubs/9699919799/functions/dlopen.html -->
   <!-- void *dlopen(const char *file, int mode); -->
   <function name="dlopen">
@@ -1942,6 +1949,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <arg nr="1">
       <not-uninit/>
       <not-bool/>
+      <valid>-20:19</valid>
     </arg>
   </function>
   <!-- int pause(void); -->
@@ -2197,7 +2205,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <leak-ignore/>
     <use-retval/>
     <returnValue type="long int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -2209,7 +2217,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <leak-ignore/>
     <use-retval/>
     <returnValue type="long int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -2221,7 +2229,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <leak-ignore/>
     <use-retval/>
     <returnValue type="double"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -3362,7 +3370,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <use-retval/>
     <returnValue type="int"/>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4054,6 +4062,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <noreturn>false</noreturn>
     <returnValue type="struct tm *"/>
     <leak-ignore/>
+    <use-retval/>
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
@@ -4086,7 +4095,6 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
       <not-uninit/>
       <not-bool/>
     </arg>
-    <warn severity="portability">Non reentrant function 'readdir' called. For threadsafe applications it is recommended to use the reentrant replacement function 'readdir_r'.</warn>
   </function>
   <!-- int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result); -->
   <function name="readdir_r">
@@ -4178,6 +4186,30 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
       <valid>0:</valid>
     </arg>
   </function>
+  <!-- https://pubs.opengroup.org/onlinepubs/9699919799/functions/strxfrm_l.html -->
+  <!-- size_t strxfrm_l(char *restrict s1, const char *restrict s2, size_t n, locale_t locale) -->
+  <function name="strxfrm_l">
+    <returnValue type="size_t"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <!-- In case the 3rd argument is 0, the 1st argument is permitted to be a null pointer. (#6306) -->
+    <arg nr="1" direction="out">
+      <minsize type="argvalue" arg="3"/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+      <minsize type="argvalue" arg="3"/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>  
   <!-- https://pubs.opengroup.org/onlinepubs/9699919799/functions/asctime.html -->
   <!-- char *asctime_r(const struct tm *tm, char *buf); -->
   <function name="asctime_r">
@@ -5212,7 +5244,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <arg nr="2" direction="inout">
       <not-null/>
     </arg>
-    <arg nr="3" direction="in">
+    <arg nr="3" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -5234,7 +5266,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
       <not-uninit/>
       <valid>0:255</valid>
     </arg>
-    <arg nr="4" direction="in">
+    <arg nr="4" direction="inout">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -5606,7 +5638,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3" baseType="wchar_t"/>
@@ -6267,6 +6299,7 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
     <alloc init="true">openat</alloc>
     <alloc init="true">socket</alloc>
     <dealloc>close</dealloc>
+    <dealloc>fdopen</dealloc>
   </resource>
   <resource>
     <alloc init="true">opendir</alloc>
diff --git a/cfg/protobuf.cfg b/cfg/protobuf.cfg
new file mode 100644
index 00000000000..8ff5570c952
--- /dev/null
+++ b/cfg/protobuf.cfg
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<def format="2">
+  <define name="PROTOBUF_PRAGMA_INIT_SEG" value=""/>
+  <define name="PROTOBUF_VERSION" value="9999999"/>
+  <define name="PROTOBUF_MIN_PROTOC_VERSION" value="0"/>
+  <define name="PROTOBUF_NAMESPACE_OPEN" value=""/>
+  <define name="PROTOBUF_NAMESPACE_CLOSE" value=""/>
+  <define name="PROTOBUF_SECTION_VARIABLE(SECTION)" value=""/>
+  <define name="GOOGLE_PROTOBUF_RUNTIME_DEPRECATED(MSG)" value=""/>
+</def>
diff --git a/cfg/qt.cfg b/cfg/qt.cfg
index 13d96ecb611..00cb66c1909 100644
--- a/cfg/qt.cfg
+++ b/cfg/qt.cfg
@@ -59,10 +59,11 @@
   <reflection>
     <call arg="2">invokeMethod</call>
   </reflection>
-  <define name="SIGNAL(X)" value="#X"/>
-  <define name="SLOT(X)" value="#X"/>
+  <define name="SIGNAL(X)" value="X"/>
+  <define name="SLOT(X)" value="X"/>
   <!-- T qAbs(const T &t) -->
   <function name="qAbs">
+    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <arg nr="1" direction="in">
@@ -72,6 +73,7 @@
   </function>
   <!-- const T &qBound(const T &min, const T &val, const T &max) -->
   <function name="qBound">
+    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <arg nr="1" direction="in">
@@ -100,6 +102,7 @@
   <!-- quint32 qFloatDistance(float a, float b) -->
   <!-- quint64 qFloatDistance(double a, double b) -->
   <function name="qFloatDistance">
+    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
@@ -131,6 +134,7 @@
   <!-- bool qFuzzyCompare(double p1, double p2) -->
   <!-- bool qFuzzyCompare(float p1, float p2) -->
   <function name="qFuzzyCompare">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -146,6 +150,7 @@
   <!-- bool qFuzzyIsNull(double d) -->
   <!-- bool qFuzzyIsNull(float f) -->
   <function name="qFuzzyIsNull">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -176,6 +181,7 @@
   <!-- bool	qIsFinite(double d) -->
   <!-- bool qIsFinite(float f) -->
   <function name="qIsFinite">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -188,6 +194,7 @@
   <!-- bool qIsInf(double d) -->
   <!-- bool qIsInf(float f) -->
   <function name="qIsInf">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -200,6 +207,7 @@
   <!-- bool qIsNaN(double d) -->
   <!-- bool qIsNaN(float f) -->
   <function name="qIsNaN">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -266,6 +274,7 @@
   <!-- int qRound(double d) -->
   <!-- int qRound(float d) -->
   <function name="qRound">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
@@ -277,6 +286,7 @@
   <!-- qint64 qRound64(double d) -->
   <!-- qint64 qRound64(float d) -->
   <function name="qRound64">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="qint64"/>
     <use-retval/>
@@ -381,9 +391,9 @@
   <!-- QMetaObject::Connection QObject::connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type = Qt::AutoConnection) // static -->
   <!-- QMetaObject::Connection QObject::connect(const QObject *sender, PointerToMemberFunction signal, Functor functor) // static -->
   <!-- QMetaObject::Connection QObject::connect(const QObject *sender, PointerToMemberFunction signal, const QObject *context, Functor functor, Qt::ConnectionType type = Qt::AutoConnection) // static -->
-  <function name="connect,QObject::connect">
+  <function name="QObject::connect">
     <noreturn>false</noreturn>
-    <leak-ignore/>	  
+    <leak-ignore/>
     <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
@@ -444,11 +454,12 @@
   <!-- QAction *QMenu::addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method, const QKeySequence &shortcut = ...) -->
   <!-- QAction *QMenu::addAction(const QIcon &icon, const QString &text, Functor functor, const QKeySequence &shortcut = ...) -->
   <!-- QAction *QMenu::addAction(const QIcon &icon, const QString &text, const QObject *context, Functor functor, const QKeySequence &shortcut = 0) -->
+  <!-- void QWidget::addAction(QAction *action) -->
   <function name="QMenu::addAction">
     <noreturn>false</noreturn>
     <returnValue type="QAction *"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -747,6 +758,19 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- bool QString::isEmpty() const -->
+  <!-- bool QString::isLower() const -->
+  <!-- bool QString::isUpper() const -->
+  <!-- bool QString::isNull() const -->
+  <!-- bool QString::isRightToLeft() const -->
+  <!-- bool QString::isValidUtf16() const -->
+  <function name="QString::isEmpty,QString::isLower,QString::isNull,QString::isRightToLeft,QString::isUpper,QString::isValidUtf16">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <use-retval/>
+    <leak-ignore/>
+    <const/>
+  </function>
   <!-- QString & QString::sprintf(const char * cformat, ...); -->
   <function name="QString::sprintf">
     <noreturn>false</noreturn>
@@ -765,7 +789,7 @@
   <function name="QList::append,QStringList::append">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -954,6 +978,25 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- template <typename AT> qsizetype QSignalSpy::count(const AT &value) const -->
+  <!-- template <typename AT> qsizetype QSignalSpy::count() const -->
+  <!-- template <typename AT> qsizetype QSignalSpy::size() const -->
+  <function name="QSignalSpy::count,QSignalSpy::size">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="qsize"/>
+    <const/>
+    <arg nr="1" direction="in" default="">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- QIcon QIcon::fromTheme(const QString &name)-->
+  <function name="QIcon::fromTheme">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="QIcon"/>
+    <arg nr="1" direction="in"/>
+  </function>
   <!-- ##### QMap https://doc.qt.io/qt-5/qmap.html ##### -->
   <!-- QMap::const_iterator QMap::constFind(const Key &key) const -->
   <function name="QMap::constFind">
@@ -1371,13 +1414,6 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- bool QString::isRightToLeft() const -->
-  <function name="QString::isRightToLeft">
-    <noreturn>false</noreturn>
-    <returnValue type="bool"/>
-    <use-retval/>
-    <const/>
-  </function>
   <!-- int QList::lastIndexOf(const T &value, int from = -1) const -->
   <!-- int QStringList::lastIndexOf(const QString &value, int from = -1) const -->
   <function name="QList::lastIndexOf,QStringList::lastIndexOf">
@@ -1418,6 +1454,30 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- qsizetype QString::length() const -->
+  <function name="QString::length">
+    <noreturn>false</noreturn>
+    <returnValue type="qsizetype"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- int QImage::width() const -->
+  <!-- int QImage::height() const -->
+  <!-- int QImage::dotsPerMeterX() const -->
+  <!-- int QImage::dotsPerMeterY() const -->
+  <function name="QImage::width,QImage::height,QImage::dotsPerMeterX,QImage::dotsPerMeterY">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!-- QSize QImage::size() const -->
+  <function name="QImage::size">
+    <noreturn>false</noreturn>
+    <returnValue type="QSize"/>
+    <use-retval/>
+    <const/>
+  </function>
   <!-- QString QString::leftJustified(int width, QChar fill = QLatin1Char(' '), bool truncate = false) const -->
   <function name="QString::leftJustified">
     <noreturn>false</noreturn>
@@ -1553,7 +1613,7 @@
   <function name="QList::prepend,QStringList::prepend">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -1577,7 +1637,7 @@
   <function name="QList::push_back,QStringList::push_back">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -1595,7 +1655,7 @@
   <function name="QList::push_front,QStringList::push_front">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -1658,7 +1718,7 @@
   <function name="QList::removeAll,QStringList::removeAll">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -2279,7 +2339,7 @@
     </arg>
   </function>
   <!-- bool QDir::cdUp() -->
-  <function name="QDir::cd">
+  <function name="QDir::cdUp">
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval type="error-code"/>
@@ -2297,7 +2357,7 @@
     </arg>
   </function>
   <!-- uint QDir::count() const -->
-  <function name="QDir::cd">
+  <function name="QDir::count">
     <noreturn>false</noreturn>
     <returnValue type="uint"/>
     <use-retval/>
@@ -2548,7 +2608,7 @@
   <function name="QBoxLayout::addWidget,QVBoxLayout::addWidget,QHBoxLayout::addWidget">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" default="0" direction="in">
@@ -2677,6 +2737,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">
@@ -2733,6 +2794,14 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- int QModelIndex::column() const -->
+  <!-- int QModelIndex::row() const -->
+  <function name="QModelIndex::row,QModelIndex::column">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <use-retval/>
+    <const/>
+  </function>
   <!-- int QDate::year() const -->
   <function name="QDate::year">
     <noreturn>false</noreturn>
@@ -2764,6 +2833,156 @@
     <use-retval/>
     <const/>
   </function>
+  <!--qreal QRectF::bottom () const -->
+  <!--qreal QRectF::height () const -->
+  <!--qreal QRectF::width () const -->
+  <!--qreal QRectF::left () const -->
+  <!--qreal QRectF::right () const -->
+  <!--qreal QRectF::top () const -->
+  <!--qreal QRectF::x () const -->
+  <!--qreal QRectF::y () const -->
+  <function name="QRectF::bottom,QRectF::height,QRectF::left,QRectF::right,QRectF::top,QRectF::width,QRectF::x,QRectF::y">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="qreal"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--QSizeF QRectF::size () const -->
+  <function name="QRectF::size">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="QSizeF"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--bool QRectF::isEmpty () const -->
+  <!--bool QRectF::isNull () const -->
+  <!--bool QRectF::isValid () const -->
+  <!--bool QModelIndex::isValid () const -->
+  <function name="QRectF::isEmpty,QRectF::isNull,QRectF::isValid,QModelIndex::isValid">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="bool"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--QPointF QRectF::topLeft () const -->
+  <!--QPointF QRectF::topRight () const -->
+  <!--QPointF QRectF::bottomLeft () const -->
+  <!--QPointF QRectF::bottomRight () const -->
+  <!--QPointF QRectF::center () const -->
+  <function name="QRectF::topLeft,QRectF::topRight,QRectF::bottomLeft,QRectF::bottomRight,QRectF::center">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="QPointF"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--qreal QPointF::x () const -->
+  <!--qreal QPointF::y () const -->
+  <!--qreal QPointF::manhattanLength () const -->
+  <function name="QPointF::x,QPointF::y,QPointF::manhattanLength">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="qreal"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--qreal& QPointF::rx () const -->
+  <!--qreal& QPointF::ry () const -->
+  <function name="QPointF::rx,QPointF::ry">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="qreal &amp;"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--int QRect::bottom () const -->
+  <!--int QRect::height () const -->
+  <!--int QRect::width () const -->
+  <!--int QRect::left () const -->
+  <!--int QRect::right () const -->
+  <!--int QRect::top () const -->
+  <!--int QRect::x () const -->
+  <!--int QRect::y () const -->
+  <!--int QSize::width () const -->
+  <!--int QSize::height () const -->
+  <function name="QRect::bottom,QRect::height,QRect::left,QRect::right,QRect::top,QRect::width,QRect::x,QRect::y,QSize::width,QSize::height">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="int"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--QSize QRect::size () const -->
+  <function name="QRect::size">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="QSize"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--bool QRect::isEmpty () const -->
+  <!--bool QRect::isNull () const -->
+  <!--bool QRect::isValid () const -->
+  <!--bool QSize::isValid () const -->
+  <!--bool QSize::isEmpty () const -->
+  <!--bool QSize::isNull () const -->
+  <function name="QRect::isEmpty,QRect::isNull,QRect::isValid,QSize::isValid,QSize::isEmpty,QSize::isNull">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="bool"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--QPoint QRect::topLeft () const -->
+  <!--QPoint QRect::topRight () const -->
+  <!--QPoint QRect::bottomLeft () const -->
+  <!--QPoint QRect::bottomRight () const -->
+  <!--QPoint QRect::center () const -->
+  <function name="QRect::topLeft,QRect::topRight,QRect::bottomLeft,QRect::bottomRight,QRect::center">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="QPoint"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--int QPoint::x() const -->
+  <!--int QPoint::y() const -->
+  <!--int QPoint::manhattanLength() const -->
+  <function name="QPoint::x,QPoint::y,QPoint::manhattanLength">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="int"/>
+    <use-retval/>
+    <const/>
+  </function>
+  <!--bool QPoint::isNull() const -->
+  <!--bool QPointF::isNull() const -->
+  <function name="QPoint::isNull,QPointF::isNull">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="bool"/>
+    <use-retval/>
+     <const/>
+  </function>
+  <!--void QRect::setHeight(int h) -->
+  <!--void QRect::setWidth(int w) -->
+  <!--void QSize::setHeight(int h) -->
+  <!--void QSize::setWidth(int w) -->
+  <!--void QPoint::setX(int x) -->
+  <!--void QPoint::setY(int y) -->
+  <!--void QPointF::setX(qreal x) -->
+  <!--void QPointF::setY(qreal y) -->
+  <function name="QRect::setHeight,QRect::setWidth,QSize::setHeight,QSize::setWidth,QPoint::setX,QPoint::setY,QPointF::setX,QPointF::setY">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="void"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- void QPainter::drawEllipse(const QRectF &rectangle) -->
   <!-- void QPainter::drawEllipse(const QRect &rectangle) -->
   <!-- void QPainter::drawEllipse(int x, int y, int width, int height) -->
@@ -3075,7 +3294,7 @@
     <returnValue type="bool"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -3086,7 +3305,7 @@
     <returnValue type="int"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in" default="">
+    <arg nr="1" default="">
       <not-uninit/>
     </arg>
   </function>
@@ -3102,7 +3321,7 @@
   <function name="QHash::find">
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -3110,10 +3329,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>
@@ -3150,10 +3369,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>
@@ -3163,13 +3382,13 @@
     <noreturn>false</noreturn>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in" default="">
+    <arg nr="1" default="">
       <not-uninit/>
     </arg>
   </function>
   <!-- QXmlStreamWriter https://doc.qt.io/qt-5/qxmlstreamwriter.html -->
   <!-- bool	QXmlStreamWriter::autoFormatting() const -->
-  <function name="QXmlStreamWriter::autoFormattingIndent">
+  <function name="QXmlStreamWriter::autoFormatting">
     <noreturn>false</noreturn>
     <returnValue type="bool"/>
     <use-retval/>
@@ -3193,7 +3412,7 @@
     <const/>
   </function>
   <!-- QIODevice *QXmlStreamWriter::device() const -->
-  <function name="QXmlStreamWriter::codec">
+  <function name="QXmlStreamWriter::device">
     <noreturn>false</noreturn>
     <returnValue type="QIODevice *"/>
     <use-retval/>
@@ -3246,7 +3465,7 @@
     </arg>
   </function>
   <!-- void QXmlStreamWriter::writeAttributes(const QXmlStreamAttributes &attributes) -->
-  <function name="QXmlStreamWriter::writeAttribute">
+  <function name="QXmlStreamWriter::writeAttributes">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
@@ -3801,7 +4020,7 @@
     </arg>
   </function>
   <!-- void QLabel::setWordWrap(bool on) -->
-  <function name="QLabel::setText">
+  <function name="QLabel::setWordWrap">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
@@ -3976,7 +4195,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -3998,7 +4217,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4020,14 +4239,14 @@
     <returnValue type="bool"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
   <!-- QVector<T> &QVector::fill(const T &value, int size = ...) -->
   <function name="QVector::fill,QStack::fill">
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="-1">
@@ -4042,7 +4261,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="">
@@ -4055,13 +4274,13 @@
   <function name="QVector::insert,QStack::insert">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3" direction="in">
+    <arg nr="3" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4072,7 +4291,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in" default="-1">
@@ -4086,7 +4305,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4108,7 +4327,7 @@
   <function name="QVector::removeAll,QStack::removeAll">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4128,7 +4347,7 @@
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4167,7 +4386,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4228,7 +4447,7 @@
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4239,7 +4458,7 @@
     <returnValue type="int"/>
     <use-retval/>
     <const/>
-    <arg nr="1" direction="in" default="">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4250,7 +4469,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4279,7 +4498,7 @@
     <use-retval/>
     <leak-ignore/>
     <const/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -4990,6 +5209,23 @@
       <function name="reserve" action="change-internal"/>
       <function name="chop" action="change"/>
       <function name="remove" action="change"/>
+      <function name="append" action="append"/>
+    </size>
+    <access indexOperator="array-like">
+      <function name="at" yields="at_index"/>
+      <function name="front" yields="item"/>
+      <function name="back" yields="item"/>
+      <function name="rbegin" yields="start-iterator"/>
+      <function name="crbegin" yields="start-iterator"/>
+      <function name="rend" yields="end-iterator"/>
+      <function name="crend" yields="end-iterator"/>
+    </access>
+  </container>
+  <container id="qtLatin1String" startPattern="QLatin1String" endPattern="" inherits="qtContainer" opLessAllowed="true" itEndPattern=":: const_iterator|const_reverse_iterator">
+    <type string="std-like"/>
+    <size>
+      <function name="isNull" yields="empty"/>
+      <function name="chop" action="change"/>
     </size>
     <access indexOperator="array-like">
       <function name="at" yields="at_index"/>
@@ -5024,24 +5260,63 @@
       <function name="crend" yields="end-iterator"/>
     </access>
   </container>
+  <container id="qtMap" startPattern="QMap|QMultiMap|QHash &lt;" inherits="qtContainer">
+    <type templateParameter="1" associative="std-like"/>
+    <rangeItemRecordType>
+      <member name="first" templateParameter="0"/>
+      <member name="second" templateParameter="1"/>
+    </rangeItemRecordType>
+    <access>
+      <function name="count" action="find"/>
+      <function name="find" action="find" yields="iterator"/>
+      <function name="insert" action="push"/>
+      <function name="lower_bound" yields="iterator"/>
+      <function name="upper_bound" yields="iterator"/>
+    </access>
+  </container>
+  <container id="qtSet" startPattern="QSet &lt;" inherits="qtContainer">
+    <access>
+      <function name="count" action="find"/>
+      <function name="find" action="find" yields="iterator"/>
+      <function name="insert" action="push"/>
+    </access>
+  </container>
+  <container id="qtQueue" startPattern="QQueue &lt;" inherits="qtContainer">
+    <access>
+      <function name="at" yields="at_index"/>
+      <function name="emplace" action="push" yields="item"/>
+      <function name="push_front" action="push"/>
+      <function name="push_back" action="push"/>
+      <function name="pop_back" action="pop"/>
+      <function name="pop_front" action="pop"/>
+      <function name="front" yields="item"/>
+      <function name="back" yields="item"/>
+    </access>
+  </container>
   <type-checks>
     <unusedvar>
       <suppress>QApplication</suppress>
-      <suppress>QMutexLocker</suppress>      
+      <suppress>QMutexLocker</suppress>
+      <check>QRect</check>
+      <check>QRectF</check>
+      <check>QSize</check>
+      <check>QSizeF</check>
+      <check>QPoint</check>
+      <check>QPointF</check>
+      <check>QRegion</check>
+      <check>QTransform</check>
     </unusedvar>
     <operatorEqVarError>
-      <suppress>QMutex</suppress>      
-      <suppress>QRecursiveMutex</suppress>      
-      <suppress>QSemaphore</suppress>      
-      <suppress>QReadWriteLock</suppress>      
+      <suppress>QMutex</suppress>
+      <suppress>QRecursiveMutex</suppress>
+      <suppress>QSemaphore</suppress>
+      <suppress>QReadWriteLock</suppress>
     </operatorEqVarError>
   </type-checks>
   <!-- Treat QStringList as QList<QString> since we can't remove the template parameter when we inherit. -->
   <define name="QStringList" value="QList&lt;QString&gt;"/>
   <define name="Q_ARG(type, data)" value="QArgument&lt;type &gt;(#type, data)"/>
-  <!-- TODO: Enable when ticket 8479 got fixed
   <define name="Q_D(Class)" value="Class##Private * const d = d_func()"/>
-  -->
   <define name="Q_CLASSINFO(Name, Value)" value=""/>
   <define name="Q_EXPORT_PLUGIN(ClassName)" value=""/>
   <define name="Q_EXPORT_PLUGIN2(a,ClassName)" value=""/>
@@ -5052,6 +5327,8 @@
   <define name="Q_NAMESPACE_EXPORT" value=""/>
   <define name="Q_DECL_EXPORT" value=""/>
   <define name="Q_DECL_IMPORT" value=""/>
+  <define name="Q_DECL_DEPRECATED" value=""/>
+  <define name="Q_DECL_DEPRECATED_X(text)" value=""/>
   <define name="QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context)" value="static inline QString trUtf8(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); }"/>
   <define name="Q_DECLARE_FLAGS(x,y)" value=""/>
   <define name="Q_DECLARE_SEQUENTIAL_ITERATOR(C)" value=""/>
@@ -5061,13 +5338,18 @@
   <define name="Q_DECLARE_INTERFACE(ClassName,Identifier)" value=""/>
   <define name="Q_DECLARE_LOGGING_CATEGORY(name)" value="extern const QLoggingCategory &amp;name();"/>
   <define name="Q_DECLARE_OPERATORS_FOR_FLAGS(x)" value=""/>
-  <define name="Q_DECLARE_METATYPE(x)" value=""/>
+  <define name="Q_DECLARE_ASSOCIATIVE_CONTAINER_METATYPE(Container)" value=""/>
+  <define name="Q_DECLARE_METATYPE(Type)" value=""/>
+  <define name="Q_DECLARE_OPAQUE_POINTER(PointerType)" value="QT_BEGIN_NAMESPACE namespace QtPrivate { template &lt;&gt; struct IsPointerDeclaredOpaque&lt;PointerType&gt;: std::true_type {};} QT_END_NAMESPACE"/>
+  <define name="Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(Container)" value=""/>
+  <define name="Q_DECLARE_SMART_POINTER_METATYPE(SmartPointer)" value=""/>
   <define name="Q_DECLARE_BUILTIN_METATYPE(TYPE, NAME)" value=""/>
   <define name="Q_DECLARE_PRIVATE(Class)" value="inline Class##Private* d_func() { return reinterpret_cast&lt;Class##Private*&gt;(qGetPtrHelper(d_ptr)); } inline const Class##Private d_func() const { return reinterpret_cast&lt;const Class##Private *&gt;(qGetPtrHelper(d_ptr)); } friend class Class##Private;"/>
   <define name="Q_DECLARE_PRIVATE_D(Dptr, Class)" value="inline Class##Private* d_func() { return reinterpret_cast&lt;Class##Private *&gt;(qGetPtrHelper(Dptr)); } inline const Class##Private* d_func() const { return reinterpret_cast&lt;const Class##Private *&gt;(qGetPtrHelper(Dptr)); } friend class Class##Private;"/>
   <define name="Q_DECLARE_PUBLIC(Class)" value="inline Class##Public* d_func() { return reinterpret_cast&lt;Class##Public*&gt;(qGetPtrHelper(d_ptr)); } inline const Class##Public d_func() const { return reinterpret_cast&lt;const Class##Public *&gt;(qGetPtrHelper(d_ptr)); } friend class Class##Public;"/>
   <define name="Q_DECLARE_TR_FUNCTIONS(context)" value="public: static inline QString tr(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) private:"/>
-  <define name="Q_DISABLE_COPY(C)" value="C(C&amp;);C&amp; operator=(const C&amp;);"/>
+  <define name="Q_DISABLE_COPY(Class)" value="Class(Class&amp;);Class&amp; operator=(const Class&amp;);"/>
+  <define name="Q_DISABLE_COPY_MOVE(Class)" value="Class(Class&amp;);Class&amp; operator=(const Class&amp;);Class(C&amp;&amp;);Class&amp; operator=(Class&amp;&amp;);"/>
   <define name="Q_EMIT" value=""/>
   <define name="Q_ENUM(X)" value=""/>
   <define name="Q_ENUMS(X)" value=""/>
@@ -5080,22 +5362,36 @@
   <define name="Q_LIKELY(expr)" value="expr"/>
   <define name="Q_NAMESPACE" value=""/>
   <define name="Q_NULLPTR" value="NULL"/>
-  <define name="Q_OBJECT" value=""/>
+  <define name="Q_OBJECT" value="static void qt_static_metacall(QObject*,QMetaObject::Call,int,void**);virtual const MetaObject* metaObject() const;virtual void* qt_metacast(const char*);virtual int qt_metacall(QMetaObject::Call,int,void**);"/>
   <define name="Q_PRIVATE_SLOT(d, signature)" value=""/>
   <define name="Q_SLOTS" value=""/>
-  <define name="Q_PROPERTY(X)" value=""/>
+  <!-- Treat as variadic macro to avoid preprocessorErrorDirective -->
+  <define name="Q_PROPERTY(...)" value=""/>
   <define name="Q_Q(Class)" value="Class * const q = q_func()"/>
   <define name="Q_RETURN_ARG(type, data)" value="QReturnArgument&lt;type &gt;(#type, data)"/>
   <define name="Q_UNLIKELY(expr)" value="expr"/>
   <define name="Q_UNUSED(X)" value="(void)(X);"/>
+  <define name="QT_USE_NAMESPACE" value=""/>
   <define name="QT_BEGIN_NAMESPACE" value=""/>
   <define name="QT_END_NAMESPACE" value=""/>
+  <define name="QT_BEGIN_MOC_NAMESPACE" value=""/>
+  <define name="QT_END_MOC_NAMESPACE" value=""/>
+  <define name="QT_BEGIN_HEADER" value=""/>
+  <define name="QT_END_HEADER" value=""/>
   <define name="QT_TR_NOOP(x)" value="x"/>
   <define name="QT_TR_NOOP_UTF8(x)" value="x"/>
   <define name="QT_TRANSLATE_NOOP(scope, x)" value="x"/>
   <define name="QT_TRANSLATE_NOOP_UTF8(scope, x)" value="x"/>
   <define name="QT_TRANSLATE_NOOP3(scope, x, comment)" value="{x, comment}"/>
   <define name="QT_TRANSLATE_NOOP3_UTF8(scope, x, comment)" value="{x, comment}"/>
+  <define name="QT_WARNING_PUSH" value=""/>
+  <define name="QT_WARNING_POP" value=""/>
+  <define name="QT_WARNING_DISABLE_MSVC(number)" value=""/>
+  <define name="QT_WARNING_DISABLE_INTEL(number)" value=""/>
+  <define name="QT_WARNING_DISABLE_CLANG(text)" value=""/>
+  <define name="QT_WARNING_DISABLE_GCC(text)" value=""/>
+  <define name="QT_WARNING_DISABLE_DEPRECATED" value=""/>
+  <define name="QT_STRINGIFY(x)" value="#x"/>
   <define name="QCOMPARE(actual, expected)" value="(void)((actual)==(expected))"/>
   <define name="QVERIFY(condition)" value="(void)(condition)"/>
   <define name="QVERIFY2(condition, message)" value="(void)(condition),(void)(message)"/>
@@ -5129,12 +5425,40 @@
   <define name="QTC_ASSERT(cond," value="action) if (Q_LIKELY(cond)) {} else { QTC_ASSERT_STRING(#cond); action; } do {} while (0)"/>
   <define name="QTC_CHECK(cond)" value="if (Q_LIKELY(cond)) {} else { QTC_ASSERT_STRING(#cond); } do {} while (0)"/>
   <define name="QTC_GUARD(cond)" value="((Q_LIKELY(cond)) ? true : (QTC_ASSERT_STRING(#cond), false))"/>
-  <define name="QTC_ASSERT(cond, action)" value="if (Q_LIKELY(cond)) {} else { QTC_ASSERT_STRING(#cond); action; } do {} while (0)"/>
-  <define name="QTC_CHECK(cond)" value="if (Q_LIKELY(cond)) {} else { QTC_ASSERT_STRING(#cond); } do {} while (0)"/>
-  <define name="QTC_GUARD(cond)" value="((Q_LIKELY(cond)) ? true : (QTC_ASSERT_STRING(#cond), false))"/>
   <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=""/>
+  <define name="QML_ATTACHED(ATTACHED_TYPE)" value=""/>
+  <define name="QML_CONSTRUCTIBLE_VALUE" value=""/>
+  <define name="QML_ELEMENT" value=""/>
+  <define name="QML_EXTENDED(EXTENDED_TYPE)" value=""/>
+  <define name="QML_EXTENDED_NAMESPACE(EXTENSION_NAMESPACE)" value=""/>
+  <define name="QML_EXTRA_VERSION(MAJOR, MINOR)" value=""/>
+  <define name="QML_FOREIGN(FOREIGN_TYPE)" value=""/>
+  <define name="QML_FOREIGN_NAMESPACE(FOREIGN_NAMESPACE)" value=""/>
+  <define name="QML_IMPLEMENTS_INTERFACES(interfaces)" value=""/>
+  <define name="QML_INTERFACE" value=""/>
+  <define name="QML_NAMED_ELEMENT(name)" value=""/>
+  <define name="QML_REMOVED_IN_VERSION(MAJOR, MINOR)" value=""/>
+  <define name="QML_SEQUENTIAL_CONTAINER(VALUE_TYPE)" value=""/>
+  <define name="QML_SINGLETON" value=""/>
+  <define name="QML_STRUCTURED_VALUE" value=""/>
+  <define name="QML_UNAVAILABLE" value=""/>
+  <define name="QML_UNCREATABLE(reason)" value=""/>
+  <define name="QML_VALUE_TYPE(name)" value=""/>
+  <!-- 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
new file mode 100644
index 00000000000..e2d7ac34dc3
--- /dev/null
+++ b/cfg/selinux.cfg
@@ -0,0 +1,3621 @@
+<?xml version="1.0"?>
+<def format="2">
+  <!-- <selinux/restorecon.h> -->
+  <!-- https://man7.org/linux/man-pages/man3/selinux_restorecon.3.html -->
+  <!-- int selinux_restorecon(const char *pathname, unsigned int restorecon_flags); -->
+  <function name="selinux_restorecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- int selinux_restorecon_parallel(const char *pathname, unsigned int restorecon_flags, size_t nthreads); -->
+  <function name="selinux_restorecon_parallel">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <define name="SELINUX_RESTORECON_IGNORE_DIGEST" value="0x00001"/>
+  <define name="SELINUX_RESTORECON_NOCHANGE" value="0x00002"/>
+  <define name="SELINUX_RESTORECON_SET_SPECFILE_CTX" value="0x00004"/>
+  <define name="SELINUX_RESTORECON_RECURSE" value="0x00008"/>
+  <define name="SELINUX_RESTORECON_VERBOSE" value="0x00010"/>
+  <define name="SELINUX_RESTORECON_PROGRESS" value="0x00020"/>
+  <define name="SELINUX_RESTORECON_REALPATH" value="0x00040"/>
+  <define name="SELINUX_RESTORECON_XDEV" value="0x00080"/>
+  <define name="SELINUX_RESTORECON_ADD_ASSOC" value="0x00100"/>
+  <define name="SELINUX_RESTORECON_ABORT_ON_ERROR" value="0x00200"/>
+  <define name="SELINUX_RESTORECON_SYSLOG_CHANGES" value="0x00400"/>
+  <define name="SELINUX_RESTORECON_LOG_MATCHES" value="0x00800"/>
+  <define name="SELINUX_RESTORECON_IGNORE_NOENTRY" value="0x01000"/>
+  <define name="SELINUX_RESTORECON_IGNORE_MOUNTS" value="0x02000"/>
+  <define name="SELINUX_RESTORECON_MASS_RELABEL" value="0x04000"/>
+  <define name="SELINUX_RESTORECON_SKIP_DIGEST" value="0x08000"/>
+  <define name="SELINUX_RESTORECON_CONFLICT_ERROR" value="0x10000"/>
+  <define name="SELINUX_RESTORECON_COUNT_ERRORS" value="0x20000"/>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_restorecon_set_sehandle.3.html -->
+  <!-- void selinux_restorecon_set_sehandle(struct selabel_handle *hndl); -->
+  <function name="selinux_restorecon_set_sehandle">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_restorecon_default_handle.3.html -->
+  <!-- struct selabel_handle *selinux_restorecon_default_handle(void); -->
+  <function name="selinux_restorecon_default_handle">
+    <returnValue type="struct selabel_handle *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_restorecon_set_exclude_list.3.html -->
+  <!-- void selinux_restorecon_set_exclude_list(const char **exclude_list); -->
+  <function name="selinux_restorecon_set_exclude_list">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_restorecon_set_alt_rootpath.3.html -->
+  <!-- int selinux_restorecon_set_alt_rootpath(const char *alt_rootpath); -->
+  <function name="selinux_restorecon_set_alt_rootpath">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_restorecon_get_skipped_errors.3.html -->
+  <!-- long unsigned selinux_restorecon_get_skipped_errors(void); -->
+  <function name="selinux_restorecon_get_skipped_errors">
+    <returnValue type="unsigned long"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_restorecon_xattr.3.html -->
+  <!-- int selinux_restorecon_xattr(const char *pathname, unsigned int xattr_flags, struct dir_xattr ***xattr_list); -->
+  <function name="selinux_restorecon_xattr">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <define name="SELINUX_RESTORECON_XATTR_RECURSE" value="0x0001"/>
+  <define name="SELINUX_RESTORECON_XATTR_DELETE_NONMATCH_DIGESTS" value="0x0002"/>
+  <define name="SELINUX_RESTORECON_XATTR_DELETE_ALL_DIGESTS" value="0x0004"/>
+  <define name="SELINUX_RESTORECON_XATTR_IGNORE_MOUNTS" value="0x0008"/>
+  <!-- <selinux/get_default_type.h> -->
+  <!-- https://man7.org/linux/man-pages/man3/selinux_binary_policy_path.3.html -->
+  <!-- const char *selinux_default_type_path(void); -->
+  <function name="selinux_default_type_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/get_ordered_context_list.3.html -->
+  <!-- int get_default_type(const char *role, char **type); -->
+  <function name="get_default_type">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">get_default_type</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- <selinux/label.h> -->
+  <!-- https://man7.org/linux/man-pages/man3/selabel_open.3.html -->
+  <podtype name="selabel_handle"/>
+  <!-- struct selabel_handle *selabel_open(unsigned int backend, const struct selinux_opt *opts, unsigned nopts); -->
+  <function name="selabel_open">
+    <returnValue type="struct selabel_handle *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:5</valid>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <minsize type="argvalue" arg="3"/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <define name="SELABEL_CTX_FILE" value="0"/>
+  <define name="SELABEL_CTX_MEDIA" value="1"/>
+  <define name="SELABEL_CTX_X" value="2"/>
+  <define name="SELABEL_CTX_DB" value="3"/>
+  <define name="SELABEL_CTX_ANDROID_PROP" value="4"/>
+  <define name="SELABEL_CTX_ANDROID_SERVICE" value="5"/>
+  <define name="SELABEL_OPT_UNUSED" value="0"/>
+  <define name="SELABEL_OPT_VALIDATE" value="1"/>
+  <define name="SELABEL_OPT_BASEONLY" value="2"/>
+  <define name="SELABEL_OPT_PATH" value="3"/>
+  <define name="SELABEL_OPT_SUBSET" value="4"/>
+  <define name="SELABEL_OPT_DIGEST" value="5"/>
+  <define name="SELABEL_NOPT" value="6"/>
+  <!-- void selabel_close(struct selabel_handle *handle); -->
+  <function name="selabel_close">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <resource>
+    <alloc init="true">selabel_open</alloc>
+    <dealloc>selabel_close</dealloc>
+  </resource>
+  <!-- https://man7.org/linux/man-pages/man3/selabel_lookup.3.html -->
+  <!-- int selabel_lookup(struct selabel_handle *handle, char **con, const char *key, int type); -->
+  <function name="selabel_lookup">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="inout">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">selabel_lookup</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int selabel_lookup_raw(struct selabel_handle *handle, char **con, const char *key, int type); -->
+  <function name="selabel_lookup_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">selabel_lookup_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/selabel_partial_match.3.html -->
+  <!-- bool selabel_partial_match(struct selabel_handle *handle, const char *key); -->
+  <function name="selabel_lookup_raw">
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selabel_get_digests_all_partial_matches.3.html -->
+  <!-- bool selabel_get_digests_all_partial_matches(struct selabel_handle *rec, const char *key, uint8_t **calculated_digest, uint8_t **xattr_digest, size_t *digest_len); -->
+  <function name="selabel_get_digests_all_partial_matches">
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="5" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">selabel_get_digests_all_partial_matches</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <memory>
+    <alloc init="true" arg="4">selabel_get_digests_all_partial_matches</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- bool selabel_hash_all_partial_matches(struct selabel_handle *rec, const char *key, uint8_t* digest); -->
+  <function name="selabel_hash_all_partial_matches">
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selabel_lookup_best_match.3.html -->
+  <!-- int selabel_lookup_best_match(struct selabel_handle *rec, char **con, const char *key, const char **aliases, int type); -->
+  <function name="selabel_lookup_best_match">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="5" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">selabel_lookup_best_match</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int selabel_lookup_best_match_raw(struct selabel_handle *rec, char **con, const char *key, const char **aliases, int type); -->
+  <function name="selabel_lookup_best_match_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="5" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">selabel_lookup_best_match_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/selabel_digest.3.html -->
+  <!-- int selabel_digest(struct selabel_handle *rec, unsigned char **digest, size_t *digest_len, char ***specfiles, size_t *num_specfiles); -->
+  <function name="selabel_digest">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="5" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- enum selabel_cmp_result selabel_cmp(const struct selabel_handle *h1, const struct selabel_handle *h2); -->
+  <function name="selabel_cmp">
+    <returnValue type="enum selabel_cmp_result"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selabel_stats.3.html -->
+  <!-- void selabel_stats(struct selabel_handle *handle); -->
+  <function name="selabel_stats">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man5/selabel_x.5.html -->
+  <define name="SELABEL_X_PROP" value="1"/>
+  <define name="SELABEL_X_EXT" value="2"/>
+  <define name="SELABEL_X_CLIENT" value="3"/>
+  <define name="SELABEL_X_EVENT" value="4"/>
+  <define name="SELABEL_X_SELN" value="5"/>
+  <define name="SELABEL_X_POLYPROP" value="6"/>
+  <define name="SELABEL_X_POLYSELN" value="7"/>
+  <!-- https://man7.org/linux/man-pages/man5/selabel_db.5.html -->
+  <define name="SELABEL_DB_DATABASE" value="1"/>
+  <define name="SELABEL_DB_SCHEMA" value="2"/>
+  <define name="SELABEL_DB_TABLE" value="3"/>
+  <define name="SELABEL_DB_COLUMN" value="4"/>
+  <define name="SELABEL_DB_SEQUENCE" value="5"/>
+  <define name="SELABEL_DB_VIEW" value="6"/>
+  <define name="SELABEL_DB_PROCEDURE" value="7"/>
+  <define name="SELABEL_DB_BLOB" value="8"/>
+  <define name="SELABEL_DB_TUPLE" value="9"/>
+  <define name="SELABEL_DB_LANGUAGE" value="10"/>
+  <define name="SELABEL_DB_EXCEPTION" value="11"/>
+  <define name="SELABEL_DB_DATATYPE" value="12"/>
+  <!-- <selinux/context.h> -->
+  <!-- https://man7.org/linux/man-pages/man3/context_new.3.html -->
+  <podtype name="context_t"/>
+  <!-- context_t context_new(const char *str); -->
+  <function name="context_new">
+    <returnValue type="context_new"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- const char *context_str(context_t con); -->
+  <function name="context_str">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- void context_free(context_t con); -->
+  <function name="context_free">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true">context_new</alloc>
+    <dealloc>context_free</dealloc>
+  </memory>
+  <!-- const char *context_type_get(context_t con); -->
+  <function name="context_type_get">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- const char *context_range_get(context_t con); -->
+  <function name="context_range_get">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- const char *context_role_get(context_t con); -->
+  <function name="context_role_get">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- const char *context_user_get(context_t con); -->
+  <function name="context_user_get">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- int context_type_set(context_t con, const char *type); -->
+  <function name="context_type_set">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="inout">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int context_range_set(context_t con, const char *type); -->
+  <function name="context_range_set">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="inout">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int context_role_set(context_t con, const char *type); -->
+  <function name="context_role_set">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="inout">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int context_user_set(context_t con, const char *type); -->
+  <function name="context_user_set">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="inout">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- <selinux/get_context_list.h> -->
+  <define name="SELINUX_DEFAULTUSER" value="&quot;user_u&quot;"/>
+  <!-- https://man7.org/linux/man-pages/man3/get_ordered_context_list.3.html -->
+  <!-- int get_ordered_context_list(const char *user, const char *fromcon, char *** list); -->
+  <function name="get_ordered_context_list">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">get_ordered_context_list</alloc>
+    <dealloc>freeconary</dealloc>
+  </memory>
+  <!-- int get_ordered_context_list_with_level(const char *user, const char *level, const char *fromcon, char *** list); -->
+  <function name="get_ordered_context_list_with_level">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">get_ordered_context_list_with_level</alloc>
+    <dealloc>freeconary</dealloc>
+  </memory>
+  <!-- int get_default_context(const char *user, const char *fromcon, char ** newcon); -->
+  <function name="get_default_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">get_default_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int get_default_context_with_level(const char *user, const char *level, const char *fromcon, char ** newcon); -->
+  <function name="get_default_context_with_level">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">get_default_context_with_level</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int get_default_context_with_role(const char *user, const char *role, const char *fromcon, char ** newcon); -->
+  <function name="get_default_context_with_role">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">get_default_context_with_role</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int get_default_context_with_rolelevel(const char *user, const char *role, const char *level, const char *fromcon, char ** newcon); -->
+  <function name="get_default_context_with_rolelevel">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="5" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="5">get_default_context_with_rolelevel</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int query_user_context(char ** list, char ** newcon); -->
+  <function name="query_user_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">query_user_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int manual_user_enter_context(const char *user, char ** newcon); -->
+  <function name="manual_user_enter_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">manual_user_enter_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- <selinux/avc.h> -->
+  <podtype name="security_id"/>
+  <define name="SECSID_WILD" value="NULL"/>
+  <define name="AVC_OPT_UNUSED" value="0"/>
+  <define name="AVC_OPT_SETENFORCE" value="1"/>
+  <define name="AVC_CALLBACK_GRANT" value="1"/>
+  <define name="AVC_CALLBACK_TRY_REVOKE" value="2"/>
+  <define name="AVC_CALLBACK_REVOKE" value="4"/>
+  <define name="AVC_CALLBACK_RESET" value="8"/>
+  <define name="AVC_CALLBACK_AUDITALLOW_ENABLE" value="16"/>
+  <define name="AVC_CALLBACK_AUDITALLOW_DISABLE" value="32"/>
+  <define name="AVC_CALLBACK_AUDITDENY_ENABLE" value="64"/>
+  <define name="AVC_CALLBACK_AUDITDENY_DISABLE" value="128"/>
+  <define name="AVC_CACHE_STATS" value="1"/>
+  <!-- https://man7.org/linux/man-pages/man3/avc_context_to_sid.3.html -->
+  <!-- int avc_sid_to_context(security_id_t sid, char ** ctx); -->
+  <function name="avc_sid_to_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">avc_sid_to_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int avc_sid_to_context_raw(security_id_t sid, char ** ctx); -->
+  <function name="avc_sid_to_context_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">avc_sid_to_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int avc_context_to_sid(const char * ctx, security_id_t * sid); -->
+  <function name="avc_context_to_sid">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- int avc_context_to_sid_raw(const char * ctx, security_id_t * sid); -->
+  <function name="avc_context_to_sid_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- int avc_get_initial_sid(const char *name, security_id_t * sid); -->
+  <function name="avc_get_initial_sid">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- int sidget(security_id_t sid); -->
+  <function name="sidget">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- int sidput(security_id_t sid); -->
+  <function name="sidput">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/avc_init.3.html -->
+  <!-- int avc_init(const char *msgprefix, const struct avc_memory_callback *mem_callbacks, const struct avc_log_callback *log_callbacks, const struct avc_thread_callback *thread_callbacks,
+  const struct avc_lock_callback *lock_callbacks) -->
+  <function name="avc_init">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/avc_open.3.html -->
+  <!-- int avc_open(struct selinux_opt *opts, unsigned nopts); -->
+  <function name="avc_open">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <minsize type="argvalue" arg="2"/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- void avc_cleanup(void); -->
+  <function name="avc_cleanup">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- int avc_reset(void); -->
+  <function name="avc_reset">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- void avc_destroy(void); -->
+  <function name="avc_destroy">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/avc_has_perm.3.html -->
+  <!-- int avc_has_perm_noaudit(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t requested, struct avc_entry_ref *aeref, struct av_decision *avd); -->
+  <function name="avc_has_perm_noaudit">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="inout">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="6" direction="inout">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- int avc_has_perm(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t requested, struct avc_entry_ref *aeref, void *auditdata); -->
+  <function name="avc_has_perm">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="inout">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="6" direction="inout">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- void avc_audit(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t requested, struct av_decision *avd, int result, void *auditdata); -->
+  <function name="avc_audit">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="inout">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="6" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="7" direction="inout">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/avc_compute_create.3.html -->
+  <!-- int avc_compute_create(security_id_t ssid, security_id_t tsid, security_class_t tclass, security_id_t * newsid); -->
+  <function name="avc_compute_create">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- int avc_compute_member(security_id_t ssid, security_id_t tsid, security_class_t tclass, security_id_t * newsid); -->
+  <function name="avc_compute_member">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/avc_add_callback.3.html -->
+  <!-- int avc_add_callback(int (*callback) (uint32_t event, security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, access_vector_t * out_retained), uint32_t events, security_id_t ssid, security_id_t tsid, security_class_t tclass,
+  access_vector_t perms); -->
+  <function name="avc_add_callback">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="6" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/avc_cache_stats.3.html -->
+  <!-- void avc_cache_stats(struct avc_cache_stats *stats); -->
+  <function name="avc_cache_stats">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- void avc_av_stats(void); -->
+  <function name="avc_av_stats">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- void avc_sid_stats(void); -->
+  <function name="avc_sid_stats">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/avc_netlink_loop.3.html -->
+  <!-- int avc_netlink_open(int blocking); -->
+  <function name="avc_netlink_open">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0,1</valid>
+    </arg>
+  </function>
+  <!-- void avc_netlink_loop(void); -->
+  <function name="avc_netlink_loop">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- void avc_netlink_close(void); -->
+  <function name="avc_netlink_close">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- int avc_netlink_acquire_fd(void); -->
+  <function name="avc_netlink_acquire_fd">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- void avc_netlink_release_fd(void); -->
+  <function name="avc_netlink_release_fd">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- int avc_netlink_check_nb(void); -->
+  <function name="avc_netlink_check_nb">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_status_open.3.html -->
+  <!-- int selinux_status_open(int fallback); -->
+  <function name="selinux_status_open">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0,1</valid>
+    </arg>
+  </function>
+  <!-- void selinux_status_close(void); -->
+  <function name="selinux_status_close">
+    <noreturn>false</noreturn>
+  </function>
+  <!-- TODO: somehow model hidden resource
+  <resource>
+    <alloc init="true">selinux_status_open</alloc>
+    <dealloc>selinux_status_close</dealloc>
+  </resource> -->
+  <!-- int selinux_status_updated(void); -->
+  <function name="selinux_status_updated">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int selinux_status_getenforce(void); -->
+  <function name="selinux_status_getenforce">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int selinux_status_policyload(void); -->
+  <function name="selinux_status_policyload">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int selinux_status_deny_unknown(void); -->
+  <function name="selinux_status_deny_unknown">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- <selinux/selinux.h> -->
+  <podtype name="security_context_t"/>
+  <podtype name="access_vector_t"/>
+  <podtype name="security_class_t"/>
+  <podtype name="av_decision"/>
+  <podtype name="selinux_opt"/>
+  <podtype name="selinux_callback"/>
+  <podtype name="SELboolean"/>
+  <podtype name="security_class_mapping"/>
+  <define name="SELINUX_AVD_FLAGS_PERMISSIVE" value="0x0001"/>
+  <define name="SELINUX_CB_LOG" value="0"/>
+  <define name="SELINUX_CB_AUDIT" value="1"/>
+  <define name="SELINUX_CB_VALIDATE" value="2"/>
+  <define name="SELINUX_CB_SETENFORCE" value="3"/>
+  <define name="SELINUX_CB_POLICYLOAD" value="4"/>
+  <define name="SELINUX_ERROR" value="0"/>
+  <define name="SELINUX_WARNING" value="1"/>
+  <define name="SELINUX_INFO" value="2"/>
+  <define name="SELINUX_AVC" value="3"/>
+  <define name="SELINUX_POLICYLOAD" value="4"/>
+  <define name="SELINUX_SETENFORCE" value="5"/>
+  <define name="SELINUX_TRANS_DIR" value="&quot;/var/run/setrans&quot;"/>
+  <define name="MATCHPATHCON_BASEONLY" value="1"/>
+  <define name="MATCHPATHCON_NOTRANS" value="2"/>
+  <define name="MATCHPATHCON_VALIDATE" value="4"/>
+  <!-- https://man7.org/linux/man-pages/man3/is_selinux_enabled.3.html -->
+  <!-- int is_selinux_enabled(void); -->
+  <function name="is_selinux_enabled">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int is_selinux_mls_enabled(void); -->
+  <function name="is_selinux_mls_enabled">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/getcon.3.html -->
+  <!-- void freecon(char * con); -->
+  <function name="freecon">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- void freeconary(char ** con); -->
+  <function name="freeconary">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- int getcon(char ** con); -->
+  <function name="getcon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getcon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getcon_raw(char ** con); -->
+  <function name="getcon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getcon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getprevcon(char ** con); -->
+  <function name="getprevcon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getprevcon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getprevcon_raw(char ** con); -->
+  <function name="getprevcon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getprevcon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getexeccon(char ** con); -->
+  <function name="getexeccon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getexeccon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getexeccon_raw(char ** con); -->
+  <function name="getexeccon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getexeccon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getpidcon(pid_t pid, char ** con); -->
+  <function name="getpidcon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getpidcon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getpidcon_raw(pid_t pid, char ** con); -->
+  <function name="getpidcon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getpidcon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getpidprevcon(pid_t pid, char ** con); -->
+  <function name="getpidprevcon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getpidprevcon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getpidprevcon_raw(pid_t pid, char ** con); -->
+  <function name="getpidprevcon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getpidprevcon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int setcon(const char * con); -->
+  <function name="setcon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setcon_raw(const char * con); -->
+  <function name="setcon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setexeccon(const char * con); -->
+  <function name="setexeccon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setexeccon_raw(const char * con); -->
+  <function name="setexeccon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setexecfilecon(const char *filename, const char *fallback_type); -->
+  <function name="setexecfilecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int getfscreatecon(char ** con); -->
+  <function name="getfscreatecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getfscreatecon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getfscreatecon_raw(char ** con); -->
+  <function name="getfscreatecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getfscreatecon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int setfscreatecon(const char * con); -->
+  <function name="setfscreatecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setfscreatecon_raw(const char * con); -->
+  <function name="setfscreatecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int getkeycreatecon(char ** con); -->
+  <function name="getkeycreatecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getkeycreatecon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getkeycreatecon_raw(char ** con); -->
+  <function name="getkeycreatecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getkeycreatecon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int setkeycreatecon(const char * con); -->
+  <function name="setkeycreatecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setkeycreatecon_raw(const char * con); -->
+  <function name="setkeycreatecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int getsockcreatecon(char ** con); -->
+  <function name="getsockcreatecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getsockcreatecon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getsockcreatecon_raw(char ** con); -->
+  <function name="getsockcreatecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">getsockcreatecon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int setsockcreatecon(const char * con); -->
+  <function name="setsockcreatecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setsockcreatecon_raw(const char * con); -->
+  <function name="setsockcreatecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int getpeercon(int fd, char ** con); -->
+  <function name="getpeercon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getpeercon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getpeercon_raw(int fd, char ** con); -->
+  <function name="getpeercon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getpeercon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/getfilecon.3.html -->
+  <!-- int getfilecon(const char *path, char ** con); -->
+  <function name="getfilecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getfilecon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int getfilecon_raw(const char *path, char ** con); -->
+  <function name="getfilecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getfilecon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int lgetfilecon(const char *path, char ** con); -->
+  <function name="lgetfilecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">lgetfilecon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int lgetfilecon_raw(const char *path, char ** con); -->
+  <function name="lgetfilecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">lgetfilecon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int fgetfilecon(int fd, char ** con); -->
+  <function name="fgetfilecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">fgetfilecon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int fgetfilecon_raw(int fd, char ** con); -->
+  <function name="fgetfilecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">fgetfilecon_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/setfilecon.3.html -->
+  <!-- int setfilecon(const char *path, const char * con); -->
+  <function name="setfilecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int setfilecon_raw(const char *path, const char * con); -->
+  <function name="setfilecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int lsetfilecon(const char *path, const char * con); -->
+  <function name="lsetfilecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int lsetfilecon_raw(const char *path, const char * con); -->
+  <function name="lsetfilecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int fsetfilecon(int fd, const char * con); -->
+  <function name="fsetfilecon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int fsetfilecon_raw(int fd, const char * con); -->
+  <function name="fsetfilecon_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- union selinux_callback selinux_get_callback(int type); -->
+  <function name="selinux_get_callback">
+    <returnValue type="union selinux_callback"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:4</valid>
+    </arg>
+  </function>
+  <!-- void selinux_set_callback(int type, union selinux_callback cb); -->
+  <function name="selinux_set_callback">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:4</valid>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/security_compute_av.3.html -->
+  <!-- int security_compute_av(const char * scon, const char * tcon, security_class_t tclass, access_vector_t requested, struct av_decision *avd); -->
+  <function name="security_compute_av">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="out">
+    </arg>
+  </function>
+  <!-- int security_compute_av_raw(const char * scon, const char * tcon, security_class_t tclass, access_vector_t requested, struct av_decision *avd); -->
+  <function name="security_compute_av_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="out">
+    </arg>
+  </function>
+  <!-- int security_compute_av_flags(const char * scon, const char * tcon, security_class_t tclass, access_vector_t requested, struct av_decision *avd); -->
+  <function name="security_compute_av_flags">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="out">
+    </arg>
+  </function>
+  <!-- int security_compute_av_flags_raw(const char * scon, const char * tcon, security_class_t tclass, access_vector_t requested, struct av_decision *avd); -->
+  <function name="security_compute_av_flags_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="5" direction="out">
+    </arg>
+  </function>
+  <!-- int security_compute_create(const char * scon, const char * tcon, security_class_t tclass, char ** newcon); -->
+  <function name="security_compute_create">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">security_compute_create</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_create_raw(const char * scon, const char * tcon, security_class_t tclass, char ** newcon); -->
+  <function name="security_compute_create_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">security_compute_create_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_create_name(const char * scon, const char * tcon, security_class_t tclass, const char *objname, char ** newcon); -->
+  <function name="security_compute_create_name">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="5" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="5">security_compute_create_name</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_create_name_raw(const char * scon, const char * tcon, security_class_t tclass, const char *objname, char ** newcon); -->
+  <function name="security_compute_create_name_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="5" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="5">security_compute_create_name_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_relabel(const char * scon, const char * tcon, security_class_t tclass, char ** newcon); -->
+  <function name="security_compute_relabel">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">security_compute_relabel</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_relabel_raw(const char * scon, const char * tcon, security_class_t tclass, char ** newcon); -->
+  <function name="security_compute_relabel_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">security_compute_relabel</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_member(const char * scon, const char * tcon, security_class_t tclass, char ** newcon); -->
+  <function name="security_compute_member">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">security_compute_member</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_member_raw(const char * scon, const char * tcon, security_class_t tclass, char ** newcon); -->
+  <function name="security_compute_member_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="4">security_compute_member_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_compute_user(const char * scon, const char *username, char *** con); -->
+  <function name="security_compute_user">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">security_compute_user</alloc>
+    <dealloc>freeconary</dealloc>
+  </memory>
+  <!-- int security_compute_user_raw(const char * scon, const char *username, char *** con); -->
+  <function name="security_compute_user_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">security_compute_user_raw</alloc>
+    <dealloc>freeconary</dealloc>
+  </memory>
+  <!-- int security_validatetrans(const char *scon, const char *tcon, security_class_t tclass, const char *newcon); -->
+  <function name="security_validatetrans">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int security_validatetrans_raw(const char *scon, const char *tcon, security_class_t tclass, const char *newcon); -->
+  <function name="security_validatetrans_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int selinux_check_access(const char * scon, const char * tcon, const char *tclass, const char *perm, void *auditdata); -->
+  <function name="selinux_check_access">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="5" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- int selinux_check_passwd_access(access_vector_t requested) -->
+  <function name="selinux_check_passwd_access">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- int checkPasswdAccess(access_vector_t requested) -->
+  <function name="checkPasswdAccess">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- int security_get_initial_context(const char *name, char ** con); -->
+  <function name="security_get_initial_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">security_get_initial_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_get_initial_context_raw(const char *name, char ** con); -->
+  <function name="security_get_initial_context_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">security_get_initial_context_raw</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/security_load_policy.3.html -->
+  <!-- int security_load_policy(const void *data, size_t len); -->
+  <function name="security_load_policy">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <minsize type="argvalue" arg="2"/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- int selinux_mkload_policy(int preservebools); -->
+  <function name="selinux_mkload_policy">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0,1</valid>
+    </arg>
+  </function>
+  <!-- int selinux_init_load_policy(int *enforce); -->
+  <function name="selinux_init_load_policy">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/security_load_booleans.3.html -->
+  <!-- int security_set_boolean_list(size_t boolcnt, SELboolean * boollist, int permanent); -->
+  <function name="security_set_boolean_list">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <minsize type="argvalue" arg="1"/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0</valid>
+    </arg>
+  </function>
+  <!-- int security_get_boolean_names(char ***names, int *len); -->
+  <function name="security_get_boolean_names">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">security_get_boolean_names</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- int security_get_boolean_pending(const char *name); -->
+  <function name="security_get_boolean_pending">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int security_get_boolean_active(const char *name); -->
+  <function name="security_get_boolean_active">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int security_set_boolean(const char *name, int value); -->
+  <function name="security_set_boolean">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <valid>0,1</valid>
+    </arg>
+  </function>
+  <!-- int security_commit_booleans(void); -->
+  <function name="security_commit_booleans">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int security_load_booleans(char *path) -->
+  <function name="security_load_booleans">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/security_check_context.3.html -->
+  <!-- int security_check_context(const char * con); -->
+  <function name="security_check_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int security_check_context_raw(const char * con); -->
+  <function name="security_check_context_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int security_canonicalize_context(const char * con, char ** canoncon); -->
+  <function name="security_canonicalize_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">security_canonicalize_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int security_canonicalize_context_raw(const char * con, char ** canoncon); -->
+  <function name="security_canonicalize_context_raw">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">security_canonicalize_context</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/security_getenforce.3.html -->
+  <!-- int security_getenforce(void); -->
+  <function name="security_getenforce">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int security_setenforce(int value); -->
+  <function name="security_setenforce">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <valid>0,1</valid>
+    </arg>
+  </function>
+  <!-- int security_reject_unknown(void); -->
+  <function name="security_reject_unknown">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int security_deny_unknown(void); -->
+  <function name="security_deny_unknown">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int security_get_checkreqprot(void); -->
+  <function name="security_get_checkreqprot">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/security_disable.3.html -->
+  <!-- int security_disable(void); -->
+  <function name="security_disable">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <warn severity="warning">Disabling SELinux at runtime is deprecated and may not be supported on modern Linux kernels.</warn>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/security_policyvers.3.html -->
+  <!-- int security_policyvers(void); -->
+  <function name="security_policyvers">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_set_mapping.3.html -->
+  <!-- int selinux_set_mapping(const struct security_class_mapping *map); -->
+  <function name="selinux_set_mapping">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/security_class_to_string.3.html -->
+  <!-- security_class_t mode_to_security_class(mode_t mode); -->
+  <function name="mode_to_security_class">
+    <returnValue type="security_class_t"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- security_class_t string_to_security_class(const char *name); -->
+  <function name="string_to_security_class">
+    <returnValue type="security_class_t"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- const char *security_class_to_string(security_class_t cls); -->
+  <function name="security_class_to_string">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- const char *security_av_perm_to_string(security_class_t tclass, access_vector_t perm); -->
+  <function name="security_av_perm_to_string">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- access_vector_t string_to_av_perm(security_class_t tclass, const char *name); -->
+  <function name="string_to_av_perm">
+    <returnValue type="access_vector_t"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int security_av_string(security_class_t tclass, access_vector_t av, char **result); -->
+  <function name="security_av_string">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">security_av_string</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- void print_access_vector(security_class_t tclass, access_vector_t av); -->
+  <function name="print_access_vector">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- void selinux_flush_class_cache(void); -->
+  <function name="selinux_flush_class_cache">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/set_matchpathcon_flags.3.html -->
+  <!-- void set_matchpathcon_printf(void (*f) (const char *fmt, ...)); -->
+  <function name="set_matchpathcon_printf">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- void set_matchpathcon_invalidcon(int (*f) (const char *path, unsigned lineno, char *context)); -->
+  <function name="set_matchpathcon_invalidcon">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- void set_matchpathcon_flags(unsigned int flags); -->
+  <function name="set_matchpathcon_flags">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+      <valid>0:7</valid>
+    </arg>
+  </function>
+  <!-- void set_matchpathcon_canoncon(int (*f) (const char *path, unsigned lineno, char **context)); -->
+  <function name="set_matchpathcon_canoncon">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/matchpathcon.3.html -->
+  <!-- int matchpathcon_init(const char *path) -->
+  <function name="matchpathcon_init">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int matchpathcon_init_prefix(const char *path, const char *prefix); -->
+  <function name="matchpathcon_init_prefix">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- void matchpathcon_fini(void) -->
+  <function name="matchpathcon_fini">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- int realpath_not_final(const char *name, char *resolved_path); -->
+  <function name="realpath_not_final">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+      <minsize type="value" value="4097" baseType="char"/>
+    </arg>
+  </function>
+  <!-- int matchpathcon(const char *path, mode_t mode, char ** con) -->
+  <function name="matchpathcon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">matchpathcon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- int matchpathcon_index(const char *path, mode_t mode, char ** con) -->
+  <function name="matchpathcon_index">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">matchpathcon_index</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/matchpathcon_checkmatches.3.html -->
+  <!-- int matchpathcon_filespec_add(ino_t ino, int specind, const char *file); -->
+  <function name="matchpathcon_filespec_add">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- void matchpathcon_filespec_destroy(void); -->
+  <function name="matchpathcon_filespec_destroy">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- void matchpathcon_filespec_eval(void); -->
+  <function name="matchpathcon_filespec_eval">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- void matchpathcon_checkmatches(char *str); -->
+  <function name="matchpathcon_checkmatches">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <!-- unused parameter -->
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/matchmediacon.3.html -->
+  <!-- int matchmediacon(const char *media, char ** con); -->
+  <function name="matchmediacon">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-uninit/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">matchmediacon</alloc>
+    <dealloc>freecon</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_getenforcemode.3.html -->
+  <!-- int selinux_getenforcemode(int *enforce); -->
+  <function name="selinux_getenforcemode">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_boolean_sub.3.html -->
+  <!-- char *selinux_boolean_sub(const char *boolean_name); -->
+  <function name="selinux_boolean_sub">
+    <returnValue type="char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true">selinux_boolean_sub</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_getpolicytype.3.html -->
+  <!-- int selinux_getpolicytype(char **policytype); -->
+  <function name="selinux_getpolicytype">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="1">selinux_getpolicytype</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_policy_root.3.html -->
+  <!-- const char *selinux_policy_root(void); -->
+  <function name="selinux_policy_root">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- int selinux_set_policy_root(const char *rootpath); -->
+  <function name="selinux_set_policy_root">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_binary_policy_path.3.html -->
+  <!-- const char *selinux_current_policy_path(void); -->
+  <function name="selinux_current_policy_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_binary_policy_path(void); -->
+  <function name="selinux_binary_policy_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_failsafe_context_path(void); -->
+  <function name="selinux_failsafe_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_removable_context_path(void); -->
+  <function name="selinux_removable_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_default_context_path(void); -->
+  <function name="selinux_default_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_user_contexts_path(void); -->
+  <function name="selinux_user_contexts_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_file_context_path(void); -->
+  <function name="selinux_file_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_file_context_homedir_path(void); -->
+  <function name="selinux_file_context_homedir_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_file_context_local_path(void); -->
+  <function name="selinux_file_context_local_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_file_context_subs_path(void); -->
+  <function name="selinux_file_context_subs_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_file_context_subs_dist_path(void); -->
+  <function name="selinux_file_context_subs_dist_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_homedir_context_path(void); -->
+  <function name="selinux_homedir_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_media_context_path(void); -->
+  <function name="selinux_media_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_virtual_domain_context_path(void); -->
+  <function name="selinux_virtual_domain_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_virtual_image_context_path(void); -->
+  <function name="selinux_virtual_image_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_lxc_contexts_path(void); -->
+  <function name="selinux_lxc_contexts_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_x_context_path(void); -->
+  <function name="selinux_x_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_sepgsql_context_path(void); -->
+  <function name="selinux_sepgsql_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_openrc_contexts_path(void); -->
+  <function name="selinux_openrc_contexts_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_openssh_contexts_path(void); -->
+  <function name="selinux_openssh_contexts_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_snapperd_contexts_path(void); -->
+  <function name="selinux_snapperd_contexts_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_systemd_contexts_path(void); -->
+  <function name="selinux_systemd_contexts_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_contexts_path(void); -->
+  <function name="selinux_contexts_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_securetty_types_path(void); -->
+  <function name="selinux_securetty_types_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_booleans_subs_path(void); -->
+  <function name="selinux_booleans_subs_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_booleans_path(void); -->
+  <function name="selinux_booleans_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_customizable_types_path(void); -->
+  <function name="selinux_customizable_types_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_users_path(void); -->
+  <function name="selinux_users_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_usersconf_path(void); -->
+  <function name="selinux_usersconf_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_translations_path(void); -->
+  <function name="selinux_translations_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_colors_path(void); -->
+  <function name="selinux_colors_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_netfilter_context_path(void); -->
+  <function name="selinux_netfilter_context_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- const char *selinux_path(void); -->
+  <function name="selinux_path">
+    <returnValue type="const char *"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_check_securetty_context.3.html -->
+  <!-- int selinux_check_securetty_context(const char * tty_context); -->
+  <function name="selinux_check_securetty_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/init_selinuxmnt.3.html -->
+  <!-- void set_selinuxmnt(const char *mnt); -->
+  <function name="set_selinuxmnt">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- void fini_selinuxmnt(void); -->
+  <function name="fini_selinuxmnt">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- int selinuxfs_exists(void); -->
+  <function name="selinuxfs_exists">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/is_context_customizable.3.html -->
+  <!-- int is_context_customizable(const char * scontext); -->
+  <function name="is_context_customizable">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_raw_context_to_color.3.html -->
+  <!-- int selinux_raw_context_to_color(const char * raw, char **color_str); -->
+  <function name="selinux_raw_context_to_color">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">selinux_raw_context_to_color</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- int selinux_trans_to_raw_context(const char * trans, char ** rawp); -->
+  <function name="selinux_trans_to_raw_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">selinux_trans_to_raw_context</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- int selinux_raw_to_trans_context(const char * raw, char ** transp); -->
+  <function name="selinux_raw_to_trans_context">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">selinux_raw_to_trans_context</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/getseuserbyname.3.html -->
+  <!-- int getseuserbyname(const char *linuxuser, char **seuser, char **level); -->
+  <function name="getseuserbyname">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="2">getseuserbyname</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <memory>
+    <alloc init="true" arg="3">getseuserbyname</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- int getseuser(const char *username, const char *service, char **r_seuser, char **r_level); -->
+  <function name="getseuser">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="3" direction="out">
+      <not-null/>
+    </arg>
+    <arg nr="4" direction="out">
+      <not-null/>
+    </arg>
+  </function>
+  <memory>
+    <alloc init="true" arg="3">getseuser</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <memory>
+    <alloc init="true" arg="4">getseuser</alloc>
+    <dealloc>free</dealloc>
+  </memory>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_file_context_cmp.3.html -->
+  <!-- int selinux_file_context_cmp(const char * a, const char * b); -->
+  <function name="selinux_file_context_cmp">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_file_context_verify.3.html -->
+  <!-- int selinux_file_context_verify(const char *path, mode_t mode); -->
+  <function name="selinux_file_context_verify">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://man7.org/linux/man-pages/man3/selinux_lsetfilecon_default.3.html -->
+  <!-- int selinux_lsetfilecon_default(const char *path); -->
+  <function name="selinux_lsetfilecon_default">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- void selinux_reset_config(void); -->
+  <function name="selinux_reset_config">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <warn severity="warning">This function is not thread safe. Be very sure that no other threads are calling into libselinux when this is called.</warn>
+  </function>
+</def>
diff --git a/cfg/sqlite3.cfg b/cfg/sqlite3.cfg
index 0b0a439b18c..6c5811f1f75 100644
--- a/cfg/sqlite3.cfg
+++ b/cfg/sqlite3.cfg
@@ -966,6 +966,7 @@
   <!-- https://www.sqlite.org/capi3ref.html#sqlite3_mutex_held -->
   <!-- int sqlite3_mutex_held(sqlite3_mutex*); -->
   <function name="sqlite3_mutex_held">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
@@ -988,6 +989,7 @@
   <!-- https://www.sqlite.org/capi3ref.html#sqlite3_mutex_held -->
   <!-- int sqlite3_mutex_notheld(sqlite3_mutex*); -->
   <function name="sqlite3_mutex_notheld">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
@@ -1025,6 +1027,48 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- https://www.sqlite.org/capi3ref.html#sqlite3_open -->
+  <!-- int sqlite3_open16(const void *filename,   /* Database filename (UTF-16) */
+                          sqlite3 **ppDb          /* OUT: SQLite db handle */); -->
+  <function name="sqlite3_open16">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+      <not-bool/>
+    </arg>
+  </function>
+  <!-- https://www.sqlite.org/capi3ref.html#sqlite3_open -->
+  <!-- int sqlite3_open_v2(const char *filename,   /* Database filename (UTF-8) */
+                           sqlite3 **ppDb,         /* OUT: SQLite db handle */
+                           int flags,              /* Flags */
+                           const char *zVfs        /* Name of VFS module to use */); -->
+  <function name="sqlite3_open_v2">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-null/>
+      <not-bool/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <arg nr="4" direction="in">
+      <not-uninit/>
+      <strz/>
+    </arg>
+  </function>
   <!-- https://www.sqlite.org/capi3ref.html#sqlite3_prepare -->
   <!-- int sqlite3_prepare(sqlite3 *db,            /* Database handle */
                            const char *zSql,       /* SQL statement, UTF-8 encoded */
diff --git a/cfg/std.cfg b/cfg/std.cfg
index 59eac426a45..dfb4acddcf4 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1,17 +1,18 @@
 <?xml version="1.0"?>
 <def format="2">
+  <!-- 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="INT64_MIN" value="(-9223372036854775807L-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="(-9223372036854775807L-1)"/>
+  <define name="INT_FAST32_MIN" value="(-9223372036854775807L-1)"/>
+  <define name="INT_FAST64_MIN" value="(-9223372036854775807L-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_LEAST64_MIN" value="(-9223372036854775807L-1)"/>
   <define name="INT8_MAX" value="127"/>
   <define name="INT16_MAX" value="32767"/>
   <define name="INT32_MAX" value="2147483647"/>
@@ -36,6 +37,7 @@
   <define name="UINT_LEAST16_MAX" value="65535U"/>
   <define name="UINT_LEAST32_MAX" value="4294967295U"/>
   <define name="UINT_LEAST64_MAX" value="18446744073709551615U"/>
+  <!-- math.h -->
   <define name="M_E" value="2.7182818284590452354"/>
   <define name="M_LOG2E" value="1.4426950408889634074"/>
   <define name="M_LOG10E" value="0.43429448190325182765"/>
@@ -52,12 +54,27 @@
   <define name="_IOFBF" value="0"/>
   <define name="_IOLBF" value="1"/>
   <define name="_IONBF" value="2"/>
+  <!-- https://en.cppreference.com/w/cpp/numeric/math/FP_categories -->
+  <define name="FP_NORMAL" value="1"/>
+  <define name="FP_SUBNORMAL" value="2"/>
+  <define name="FP_ZERO" value="3"/>
+  <define name="FP_INFINITE" value="4"/>
+  <define name="FP_NAN" value="5"/>
   <!-- errno_t is a typedef for int -->
   <define name="errno_t" value="int"/>
   <!-- void abort(void); -->
-  <function name="abort,std::abort">
+  <!--              void std::terminate();          (until C++11) -->
+  <!-- [[noreturn]] void std::terminate() noexcept; (since C++11) -->
+  <function name="abort,std::abort,std::terminate">
     <noreturn>true</noreturn>
   </function>
+  <!--              void unexpected(); (until C++11)          -->
+  <!-- [[noreturn]] void unexpected(); (since C++11)          -->
+  <!-- (deprecated)(removed in C++17)                         -->
+  <function name="std::unexpected">
+    <noreturn>true</noreturn>
+    <warn severity="style" alternatives="std::terminate" reason="Obsolete"/>
+  </function>
   <!-- int abs(int j); -->
   <function name="abs,std::abs">
     <use-retval/>
@@ -729,6 +746,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- https://en.cppreference.com/w/cpp/numeric/math/tgamma -->
   <!-- double tgamma(double x); -->
   <function name="tgamma,std::tgamma">
     <use-retval/>
@@ -738,8 +756,11 @@
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
+      <valid>!0.0:</valid>
     </arg>
   </function>
+  <!-- https://en.cppreference.com/w/cpp/numeric/math/tgamma -->
   <!-- float tgammaf(float x); -->
   <function name="tgammaf,std::tgammaf">
     <use-retval/>
@@ -749,8 +770,11 @@
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
+      <valid>!0.0:</valid>
     </arg>
   </function>
+  <!-- https://en.cppreference.com/w/cpp/numeric/math/tgamma -->
   <!-- long double tgammal(long double x); -->
   <function name="tgammal,std::tgammal">
     <use-retval/>
@@ -760,6 +784,8 @@
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
+      <valid>!0.0:</valid>
     </arg>
   </function>
   <!-- double trunc(double x); -->
@@ -948,7 +974,7 @@
     </arg>
   </function>
   <!-- void * calloc(size_t nitems, size_t size); -->
-  <function name="calloc">
+  <function name="calloc,std::calloc">
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="void *"/>
@@ -1254,6 +1280,8 @@
       <not-uninit/>
     </arg>
   </function>
+  <define name="EXIT_SUCCESS" value="0"/>
+  <define name="EXIT_FAILURE" value="1"/>
   <!-- double erf(double x); -->
   <function name="erf,std::erf">
     <use-retval/>
@@ -1584,7 +1612,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -1595,7 +1623,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -2290,7 +2318,7 @@
     <returnValue type="int"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3027,6 +3055,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- https://cplusplus.com/reference/cmath/lgamma/ -->
   <!-- double lgamma(double x); -->
   <function name="lgamma,std::lgamma">
     <use-retval/>
@@ -3036,8 +3065,11 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
+      <valid>!0.0:</valid>
     </arg>
   </function>
+  <!-- https://cplusplus.com/reference/cmath/lgamma/ -->
   <!-- float lgammaf(float x); -->
   <function name="lgammaf,std::lgammaf">
     <use-retval/>
@@ -3047,8 +3079,11 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
+      <valid>!0.0:</valid>
     </arg>
   </function>
+  <!-- https://cplusplus.com/reference/cmath/lgamma/ -->
   <!-- long double lgammal(long double x); -->
   <function name="lgammal,std::lgammal">
     <use-retval/>
@@ -3058,6 +3093,8 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <leak-ignore/>
     <arg nr="1" direction="in">
       <not-uninit/>
+      <!-- If x is zero or a negative integer for which the function is asymptotic, it may cause a pole error (depending on implementation).-->
+      <valid>!0.0:</valid>
     </arg>
   </function>
   <!-- double rint(double x); -->
@@ -3146,7 +3183,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- int rand(void); -->
-  <function name="rand">
+  <function name="rand,std::rand">
     <use-retval/>
     <returnValue type="int" unknownValues="all"/>
     <noreturn>false</noreturn>
@@ -3281,11 +3318,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- int isfinite(double x); -->
-  <!-- bool isfinite(float x); // since C++11 -->
-  <!-- bool isfinite(double x); // since C++11 -->
-  <!-- bool isfinite(long double x); // since C++11 -->
-  <!-- bool isfinite(Integral x); // since C++11 -->
-  <function name="isfinite,std::isfinite">
+  <function name="isfinite">
     <use-retval/>
     <pure/>
     <returnValue type="int"/>
@@ -3296,8 +3329,23 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-bool/>
     </arg>
   </function>
+  <!-- bool std::isfinite(float x); // since C++11 -->
+  <!-- bool std::isfinite(double x); // since C++11 -->
+  <!-- bool std::isfinite(long double x); // since C++11 -->
+  <!-- bool std::isfinite(Integral x); // since C++11 -->
+  <function name="std::isfinite">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- int isgreater(double x, double y); -->
-  <function name="isgreater,std::isgreater">
+  <function name="isgreater">
     <use-retval/>
     <pure/>
     <returnValue type="int">arg1&gt;arg2?1:0</returnValue>
@@ -3310,8 +3358,22 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- bool std::isgreater(double x, double y); -->
+  <function name="std::isgreater">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool">arg1&gt;arg2?1:0</returnValue>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- int isgreaterequal(double x, double y); -->
-  <function name="isgreaterequal,std::isgreaterequal">
+  <function name="isgreaterequal">
     <use-retval/>
     <pure/>
     <returnValue type="int">arg1 &gt;= arg2?1:0</returnValue>
@@ -3324,12 +3386,22 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- bool std::isgreaterequal(double x, double y); -->
+  <function name="std::isgreaterequal">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool">arg1 &gt;= arg2?1:0</returnValue>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- int isinf(double x); -->
-  <!-- bool isinf(float x); // since C++11 -->
-  <!-- bool isinf(double x); // since C++11 -->
-  <!-- bool isinf(long double x); // since C++11 -->
-  <!-- bool isinf(Integral x); // since C++11 -->
-  <function name="isinf,std::isinf">
+  <function name="isinf">
     <use-retval/>
     <pure/>
     <returnValue type="int"/>
@@ -3340,6 +3412,21 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-bool/>
     </arg>
   </function>
+  <!-- bool std::isinf(float x); // since C++11 -->
+  <!-- bool std::isinf(double x); // since C++11 -->
+  <!-- bool std::isinf(long double x); // since C++11 -->
+  <!-- bool std::isinf(Integral x); // since C++11 -->
+  <function name="std::isinf">
+    <use-retval/>
+    <pure/>
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- double logb(double x); -->
   <function name="logb,std::logb">
     <use-retval/>
@@ -3815,7 +3902,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="void *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
@@ -3838,7 +3925,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <minsize type="argvalue" arg="3"/>
@@ -3921,12 +4008,12 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- wchar_t * wmemcpy(wchar_t *ct, const wchar_t *cs, size_t n);-->
+  <!-- wchar_t* wmemcpy( wchar_t* dest, const wchar_t* src, std::size_t count ); -->
   <function name="wmemcpy,std::wmemcpy">
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="out">
       <not-null/>
       <minsize type="argvalue" arg="3"/>
@@ -4066,8 +4153,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- time_t mktime(struct tm *tp); -->
-  <!-- time_t mkxtime(struct tmx *tp); -->
-  <function name="mktime,std::mktime,mkxtime">
+  <function name="mktime,std::mktime">
     <returnValue type="time_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -4279,57 +4365,6 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>!0.0</valid>
     </arg>
   </function>
-  <!-- double remquo(double, x, double y, int *quo); -->
-  <function name="remquo,std::remquo">
-    <use-retval/>
-    <pure/>
-    <returnValue type="double"/>
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="3" direction="out">
-      <not-null/>
-    </arg>
-  </function>
-  <!-- float remquof(float x, float y, int *quo); -->
-  <function name="remquof,std::remquof">
-    <use-retval/>
-    <pure/>
-    <returnValue type="float"/>
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="3" direction="out">
-      <not-null/>
-    </arg>
-  </function>
-  <!-- long double remquol(long double x, long double y, int *quo); -->
-  <function name="remquol,std::remquol">
-    <use-retval/>
-    <pure/>
-    <returnValue type="long double"/>
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <arg nr="1" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-    </arg>
-    <arg nr="3" direction="out">
-      <not-null/>
-    </arg>
-  </function>
   <!-- int printf(const char *format, ...); -->
   <function name="printf,std::printf">
     <returnValue type="int"/>
@@ -4445,7 +4480,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
       <valid>0:</valid>
     </arg>
-    <arg nr="4" direction="in">
+    <arg nr="4">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -4546,23 +4581,6 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- void *reallocarray(void *ptr, size_t nmemb, size_t size); -->
-  <function name="reallocarray,std::reallocarray">
-    <returnValue type="void *"/>
-    <use-retval/>
-    <noreturn>false</noreturn>
-    <arg nr="1">
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-      <valid>0:</valid>
-    </arg>
-    <arg nr="3" direction="in">
-      <not-uninit/>
-      <valid>0:</valid>
-    </arg>
-  </function>
   <!-- int remove(const char *filename); -->
   <function name="remove,std::remove">
     <returnValue type="int"/>
@@ -4802,6 +4820,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
       <strz/>
+      <minsize type="strlen" arg="2"/>
     </arg>
     <arg nr="2" direction="in">
       <not-null/>
@@ -4837,6 +4856,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char * strchr(const char *cs, int c); -->
   <function name="strchr,std::strchr">
+    <pure/>
     <use-retval/>
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
@@ -4851,7 +4871,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:255</valid>
     </arg>
   </function>
-  <!-- wchar_t wcschr(const wchar_t *cs, wchar_t c); -->
+  <!-- wchar_t* wcschr(const wchar_t *cs, wchar_t c); -->
   <function name="wcschr,std::wcschr">
     <use-retval/>
     <returnValue type="wchar_t"/>
@@ -4936,8 +4956,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- size_t strftime(char *s, size_t max, const char *fmt, const struct tm *p); -->
-  <!-- size_t strfxtime(char *s, size_t max, const char *fmt, const struct tmx *p); -->
-  <function name="strftime,std::strftime,strfxtime">
+  <function name="strftime,std::strftime">
     <returnValue type="size_t"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -5011,6 +5030,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <minsize type="argvalue" arg="4"/>
       <strz/>
     </arg>
     <arg nr="4" direction="in">
@@ -5096,6 +5116,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="3" direction="in">
       <not-null/>
       <not-uninit/>
+      <minsize type="argvalue" arg="4"/>
       <strz/>
     </arg>
     <arg nr="4" direction="in">
@@ -5107,7 +5128,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <noreturn>false</noreturn>
     <returnValue type="wchar_t *"/>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1" direction="inout">
       <not-null/>
       <not-uninit/>
@@ -5148,11 +5169,12 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <!-- char* strstr(const char *s1, const char *s2); -->
   <function name="strstr,std::strstr">
+    <pure/>
     <use-retval/>
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -5170,7 +5192,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -5211,6 +5233,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-null/>
       <not-uninit/>
       <strz/>
+      <minsize type="argvalue" arg="3"/>
     </arg>
     <arg nr="3" direction="in">
       <not-uninit/>
@@ -5353,7 +5376,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" size-arg="3"/>
+    <not-overlapping-data ptr1-arg="1" ptr2-arg="2" count-arg="3"/>
     <arg nr="1">
       <not-null/>
       <minsize type="argvalue" arg="3" baseType="wchar_t"/>
@@ -5405,6 +5428,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- const char * strrchr(const char * str, int character);-->
   <!-- char * strrchr(char * str, int character); -->
   <function name="strrchr,std::strrchr">
+    <pure/>
     <use-retval/>
     <returnValue type="char *"/>
     <noreturn>false</noreturn>
@@ -5426,7 +5450,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="wchar_t *"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <strz/>
@@ -5646,8 +5670,16 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <returnValue type="FILE *"/>
     <noreturn>false</noreturn>
   </function>
+  <!-- FILE *std::tmpfile(void); -->
+  <!-- https://en.cppreference.com/w/cpp/io/c/tmpfile -->
+  <function name="std::tmpfile">
+    <use-retval/>
+    <returnValue type="std::FILE *"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- int tolower(int c); -->
   <function name="tolower,std::tolower">
+    <pure/>
     <use-retval/>
     <returnValue type="int">arg1 &lt; 'A' || arg1 &gt; 'Z' ? arg1 : arg1 + 32</returnValue>
     <noreturn>false</noreturn>
@@ -6310,8 +6342,59 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- template <class T> std::numeric_limits<T>::epsilon(void); -->
+  <function name="std::numeric_limits::epsilon">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <pure/>
+  </function>
+  <!-- static std::chrono::steady_clock::time_point std::chrono::high_resolution_clock::now() noexcept;-->
+  <function name="std::chrono::high_resolution_clock::now">
+    <use-retval/>
+    <returnValue type="std::chrono::steady_clock::time_point"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- static std::chrono::system_clock::time_point std::chrono::system_clock::now() noexcept;-->
+  <function name="std::chrono::system_clock::now">
+    <use-retval/>
+    <returnValue type="std::chrono::system_clock::time_point"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+  </function>
+  <!-- static std::time_t std::chrono::system_clock::to_time_t( const time_point& t ) noexcept;-->
+  <function name="std::chrono::system_clock::to_time_t">
+    <use-retval/>
+    <returnValue type="std::time_t"/>
+    <noreturn>false</noreturn>
+    <arg nr="1" direction="in"/>
+    <leak-ignore/>
+  </function>
+  <!-- template< class T >                constexpr const T& std::clamp( const T& v, const T& lo, const T& hi);                (since C++17) -->
+  <!-- template< class T, class Compare > constexpr const T& std::clamp( const T& v, const T& lo, const T& hi, Compare comp ); (since C++17) -->
+  <!-- https://en.cppreference.com/w/cpp/algorithm/clamp -->
+  <function name="std::clamp">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <pure/>
+    <returnValue>arg1&lt;arg2?arg2:arg1&gt;arg3?arg3:arg1</returnValue>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="4" direction="in" default="">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- template <class T> const T& min(const T& a, const T& b); -->
-  <function name="min,std::min">
+  <function name="std::min">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -6325,7 +6408,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     </arg>
   </function>
   <!-- template <class T> const T& max(const T& a, const T& b); -->
-  <function name="max,std::max">
+  <function name="std::max">
     <use-retval/>
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -6362,6 +6445,38 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- char std::ios::fill() const; -->
+  <!-- char std::ios::fill(char_type c); -->
+  <!-- char std::ostringstream::fill() const; -->
+  <!-- char std::ostringstream::fill(char_type c); -->
+  <function name="std::ios::fill,std::ostringstream::fill">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <arg nr="1" direction="in" default="">
+      <not-uninit/>
+    </arg>
+  </function>
+ <!-- std::ios_base::fmtflags std::ios_base::flags() const;                          -->
+ <!-- std::ios_base::fmtflags std::ios_base::flags( std::ios_base::fmtflags flags ); -->
+  <function name="std::ios_base::flags">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="std::ios_base::fmtflags"/>
+    <arg nr="1" direction="in" default="">
+      <not-uninit/>
+    </arg>
+  </function>
+ <!-- std::ostream::fmtflags std::ostream::flags() const;                          -->
+ <!-- std::ostream::fmtflags std::ostream::flags( std::ostream::fmtflags flags );  -->
+  <function name="std::ostream::flags">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="std::ostream::fmtflags"/>
+    <arg nr="1" direction="in" default="">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- std::ios_base::fmtflags std::ios_base::setf( std::ios_base::fmtflags flags ); -->
   <!-- std::ios_base::fmtflags std::ios_base::setf( std::ios_base::fmtflags flags, std::ios_base::fmtflags mask ); -->
   <!-- std::ios_base::fmtflags std::ostringstream::setf( std::ios_base::fmtflags flags ); -->
@@ -6410,45 +6525,29 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
                             std::istream& std::istream::get (char* s, streamsize n, char delim);
        stream buffer (3)    std::istream& std::istream::get (streambuf& sb);
                             std::istream& std::istream::get (streambuf& sb, char delim);-->
-  <!-- single character (1)                 int std::istringstream::get ();
-                            std::istringstream& std::istringstream::get (char& c);
-       c-string (2)         std::istringstream& std::istringstream::get (char* s, streamsize n);
-                            std::istringstream& std::istringstream::get (char* s, streamsize n, char delim);
-       stream buffer (3)    std::istringstream& std::istringstream::get (streambuf& sb);
-                            std::istringstream& std::istringstream::get (streambuf& sb, char delim);-->
-  <!-- There is currently no way to define this properly because Cppcheck lacks support for 
+  <!-- There is currently no way to define this properly because Cppcheck lacks support for
        overloaded functions.-->
-  <function name="std::istream::get,std::istringstream::get">
+  <function name="std::istream::get,std::istringstream::get,std::ifstream::get">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="any"/>
-  </function>
-  <!-- std::basic_string<CharT,Traits,Allocator> str() const; -->
-  <!-- void str( const std::basic_string<CharT,Traits,Allocator>& s ); -->
-  <function name="std::stringstream::str,std::istringstream::str,std::ostringstream::str">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <arg nr="any"/>
-  </function>
-  <!-- /*unspecified*/ setbase(int base); -->
-  <function name="setbase,std::setbase">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="out">
+      <not-null/>
+      <strz/>
+      <minsize type="argvalue" arg="2"/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <valid>0:</valid>
+    </arg>
+    <arg nr="3" default="'\n'" direction="in">
       <not-uninit/>
     </arg>
   </function>
-  <!-- struct tmx *zonetime(const time_t *tp, int zone); -->
-  <function name="zonetime">
-    <use-retval/>
-    <returnValue type="struct tmx *"/>
+  <!-- /*unspecified*/ setbase(int base); -->
+  <function name="setbase,std::setbase">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1" direction="in">
-      <not-null/>
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -6486,39 +6585,107 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- (1) (since C++17) bool std::filesystem::exists( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::exists( const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::exists( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_block_file( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_block_file( const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_block_file( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_character_file( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_character_file( const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_character_file( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_directory( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_directory( const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_directory( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_empty const std::filesystem::path& p ); -->
+  <!-- (2) (since C++17) bool std::filesystem::is_empty( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_fifo( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_fifo const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_fifo( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_other( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_other const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_other( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_regular_file( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_regular_file( const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_regular_file( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_socket( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_socket( const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_socket( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) bool std::filesystem::is_symlink( std::filesystem::file_status s ) noexcept; -->
+  <!-- (2) (since C++17) bool std::filesystem::is_symlink( const std::filesystem::path& p ); -->
+  <!-- (3) (since C++17) bool std::filesystem::is_symlink( const std::filesystem::path& p, std::error_code& ec ) noexcept; -->
+  <function name="std::filesystem::exists,std::filesystem::is_block_file,std::filesystem::is_character_file,std::filesystem::is_directory,std::filesystem::is_empty,std::filesystem::is_fifo,std::filesystem::is_other,std::filesystem::is_regular_file,std::filesystem::is_socket,std::filesystem::is_symlink">
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="out" default=""/>
+  </function>
+  <!-- https://en.cppreference.com/w/cpp/filesystem/create_symlink -->
+  <!-- (1) (since C++17) void create_symlink(const std::filesystem::path& target, const std::filesystem::path& link ); -->
+  <!-- (2) (since C++17) void create_symlink(const std::filesystem::path& target, const std::filesystem::path& link, std::error_code& ec ) noexcept; -->
+  <!-- (1) (since C++17) void create_directory_symlink(const std::filesystem::path& target, const std::filesystem::path& link ); -->
+  <!-- (2) (since C++17) void create_directory_symlink(const std::filesystem::path& target, const std::filesystem::path& link, std::error_code& ec ) noexcept; -->
+  <!-- https://en.cppreference.com/w/cpp/filesystem/create_hard_link -->
+  <!-- (1) (since C++17) void create_hard_link(const std::filesystem::path& target, const std::filesystem::path& link ); -->
+  <!-- (2) (since C++17) void create_hard_link(const std::filesystem::path& target, const std::filesystem::path& link, std::error_code& ec ) noexcept; -->
+  <function name="std::filesystem::create_symlink,std::filesystem::create_directory_symlink,std::filesystem::create_hard_link">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="out" default=""/>
+  </function>
   <!-- std::string std::ostringstream::str() const; -->
   <!-- std::string std::stringstream::str() const; -->
+  <!-- std::string std::basic_stringstream::str() const; -->
   <!-- @todo Implement the second version when function overloading is possible: -->
   <!--       void std::ostringstream::str(const string & s); -->
-  <function name="std::ostringstream::str,std::stringstream::str">
+  <function name="std::istringstream::str,std::ostringstream::str,std::stringstream::str,std::basic_stringstream::str">
     <use-retval/>
     <const/>
     <returnValue type="std::string"/>
     <noreturn>false</noreturn>
   </function>
+  <!-- std::ios::pos_type std::istream::tellg( void ); -->
+  <!-- std::ios::pos_type std::ifstream::tellg( void ); -->
+  <function name="std::istream::tellg,std::basic_istream::tellg,std::ifstream::tellg,std::basic_ifstream::tellg">
+    <use-retval/>
+    <returnValue type="std::ios::pos_type"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- bool good() const; -->
-  <function name="std::ios::good,std::ios_base::good,std::ostream::good,std::ofstream::good,std::ostringstream::good">
+  <function name="std::ios::good,std::wifstream::good,std::ios_base::good,std::ostream::good,std::ofstream::good,std::ostringstream::good,std::ifstream::good,std::istream::good,std::istringstream::good,std::wistringstream::good,std::basic_istringstream::good">
     <use-retval/>
     <const/>
     <returnValue type="bool"/>
     <noreturn>false</noreturn>
   </function>
   <!-- bool eof() const; -->
-  <function name="std::ios::eof,std::ios_base::eof,std::ostream::eof,std::ofstream::eof,std::ostringstream::eof">
+  <function name="std::ios::eof,std::ios_base::eof,std::ostream::eof,std::ofstream::eof,std::ostringstream::eof,std::istringstream::eof,std::wistringstream::eof,std::basic_istringstream::eof,std::istream::eof,std::ifstream::eof">
     <use-retval/>
     <const/>
     <returnValue type="bool"/>
     <noreturn>false</noreturn>
   </function>
   <!-- bool fail() const; -->
-  <function name="std::ios::fail,std::ios_base::fail,std::ostream::fail,std::ofstream::fail,std::ostringstream::fail">
+  <function name="std::ios::fail,std::ios_base::fail,std::ostream::fail,std::ofstream::fail,std::ostringstream::fail,std::ifstream::fail,std::istringstream::fail,std::wistringstream::fail,std::basic_istringstream::fail,std::istream::fail">
     <use-retval/>
     <const/>
     <returnValue type="bool"/>
     <noreturn>false</noreturn>
   </function>
   <!-- bool bad() const; -->
-  <function name="std::ios::bad,std::ios_base::bad,std::ostream::bad,std::ofstream::bad,std::ostringstream::bad">
+  <function name="std::ios::bad,std::wifstream::bad,std::ios_base::bad,std::ostream::bad,std::ofstream::bad,std::ostringstream::bad,std::ifstream::bad,std::istringstream::bad,std::wistringstream::bad,std::basic_istringstream::bad,std::istream::bad">
+    <use-retval/>
+    <const/>
+    <returnValue type="bool"/>
+    <noreturn>false</noreturn>
+  </function>
+  <!-- bool is_open() const; -->
+  <function name="std::basic_ifstream::is_open,std::ifstream::is_open,std::basic_ofstream::is_open,std::ofstream::is_open,std::wifstream::is_open">
     <use-retval/>
     <const/>
     <returnValue type="bool"/>
@@ -6554,6 +6721,31 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:</valid>
     </arg>
   </function>
+  <!--https://en.cppreference.com/w/cpp/io/manip/quoted -->
+  <!--template< class CharT >
+      /*unspecified*/ quoted( const CharT* s,
+                              CharT delim = CharT('"'), CharT escape = CharT('\\') ); (1)(since C++14)
+      template< class CharT, class Traits, class Allocator >
+      /*unspecified*/ quoted( const std::basic_string<CharT, Traits, Allocator>& s,
+                              CharT delim = CharT('"'), CharT escape = CharT('\\') ); (2)(since C++14)
+      template< class CharT, class Traits>
+      /*unspecified*/ quoted( std::basic_string_view<CharT, Traits> s,
+                              CharT delim = CharT('"'), CharT escape = CharT('\\') ); (3)(since C++17)
+      template< class CharT, class Traits, class Allocator >
+      /*unspecified*/ quoted( std::basic_string<CharT, Traits, Allocator>& s,
+                              CharT delim=CharT('"'), CharT escape=CharT('\\') ); (4)(since C++14) -->
+  <function name="std::quoted">
+    <!-- This function returns an object of unspecified type -->
+    <leak-ignore/>
+    <noreturn>false</noreturn>
+    <arg nr="1" direction="in"/>
+    <arg nr="2" direction="in" default="&apos;&quot;&apos;">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="in" default="&apos;\\&apos;">
+      <not-uninit/>
+    </arg>
+  </function>
   <!--std::ostream& std::ostream::write (const char* s, streamsize n);-->
   <function name="std::ostream::write">
     <returnValue type="std::ostream &amp;"/>
@@ -6593,7 +6785,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2" default="0">
+    <arg nr="2" default="0" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -6613,10 +6805,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- void std::stack::push( value_type&& value ); // since C++11 -->
   <!-- void std::vector::push_back( const T& value ); -->
   <!-- void std::vector::push_back( T&& value ); // since C++11 -->
-  <function name="std::deque::push_back,std::deque::push_front,std::list::push_back,std::list::push_front,std::forward_list::push_front,std::queue::push,std::stack::push,std::vector::push_back">
+  <function name="std::deque::push_back,std::deque::push_front,std::list::push_back,std::list::push_front,std::forward_list::push_front,std::queue::push,std::priority_queue::push,std::stack::push,std::vector::push_back">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1">
+    <arg nr="1" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
@@ -6642,22 +6834,21 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2" default="0">
+    <arg nr="2" default="0" direction="in" indirect="0">
       <not-uninit/>
     </arg>
-    <arg nr="3" default="0">
+    <arg nr="3" default="0" direction="in" indirect="0">
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::deque::emplace_back,std::deque::emplace_front,std::list::emplace_back,std::list::emplace_front,std::forward_list::emplace_front,std::queue::emplace,std::stack::emplace,std::vector::emplace_back,std::vector::emplace_front,std::unordered_set::emplace">
+  <function name="std::deque::emplace_back,std::deque::emplace_front,std::list::emplace_back,std::list::emplace_front,std::forward_list::emplace_front,std::queue::emplace,std::priority_queue::emplace,std::stack::emplace,std::vector::emplace_back,std::vector::emplace_front,std::unordered_set::emplace">
     <noreturn>false</noreturn>
     <arg nr="variadic">
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::list::find,std::map::find,std::set::find,std::vector::find,std::unordered_map::find,std::unordered_multimap::find,std::unordered_set::find,std::unordered_multiset::find,std::multiset::find,std::multimap::find">
+  <function name="std::map::find,std::set::find,std::unordered_map::find,std::unordered_multimap::find,std::unordered_set::find,std::unordered_multiset::find,std::multiset::find,std::multimap::find">
     <use-retval/>
-    <const/>
     <returnValue type="iterator"/>
     <noreturn>false</noreturn>
     <arg nr="1">
@@ -6678,14 +6869,21 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!--                     size_type std::multimap::count( const Key& key ) const; -->
   <function name="std::map::count,std::set::count,std::unordered_set::count,std::unordered_map::count,std::multimap::count">
     <noreturn>false</noreturn>
-    <returnValue type="size_t"/>
+    <returnValue type="std::size_t"/>
     <use-retval/>
     <const/>
     <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
-  <function name="std::vector::at,std::array::at,std::string::at,std::wstring::at,std::string_view::at,std::wstring_view::at">
+  <function name="std::string::size,std::string::length,std::string_view::size,std::string_view::length,std::wstring_view::size,std::wstring_view::length,std::wstring::size,std::wstring::length">
+    <noreturn>false</noreturn>
+    <returnValue type="std::size_t"/>
+    <use-retval/>
+    <const/>
+    <leak-ignore/>
+  </function>
+  <function name="std::vector::at,std::deque::at,std::array::at,std::string_view::at,std::wstring_view::at">
     <use-retval/>
     <noreturn>false</noreturn>
     <arg nr="1">
@@ -6764,7 +6962,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <function name="std::exchange">
     <leak-ignore/>
     <noreturn>false</noreturn>
-	<use-retval/>
+    <use-retval/>
     <returnValue>arg1</returnValue>
     <arg nr="1">
       <not-uninit/>
@@ -6783,10 +6981,10 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
     <arg nr="1">
     </arg>
   </function>
-  <function name="std::stack::pop,std::queue::pop">
+  <function name="std::stack::pop,std::queue::pop,std::priority_queue::pop">
     <noreturn>false</noreturn>
   </function>
-  <function name="std::stack::top">
+  <function name="std::stack::top,std::priority_queue::top">
     <use-retval/>
     <noreturn>false</noreturn>
   </function>
@@ -6859,7 +7057,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   <!-- template < class T > int compare( const T& t ) const; // since C++17 -->
   <!-- template < class T > int compare( size_type pos1, size_type count1, const T& t ) const; // since C++17 -->
   <!-- template < class T > int compare( size_type pos1, size_type count1, const T& t, size_type pos2, size_type count2 = npos) const; // since C++17 -->
-  <function name="std::string::compare,std::wstring::compare">
+  <function name="std::string::compare,std::string_view::compare,std::wstring_view::compare,std::wstring::compare">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
@@ -6881,6 +7079,18 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
+  <!-- constexpr bool std::string::starts_with( std::basic_string_view<CharT,Traits> sv ) const noexcept; // since C++20 -->
+  <!-- constexpr bool starts_with( CharT ch ) const noexcept; // since C++20 -->
+  <!-- constexpr bool starts_with( const CharT* s ) const; // since C++20 -->
+  <function name="std::string::starts_with,std::wstring::starts_with,std::string::ends_with,std::wstring::ends_with">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="bool"/>
+    <const/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- size_type std::string::copy( CharT* dest, size_type count, size_type pos = 0) const; -->
   <!-- size_type std::wstring::copy( CharT* dest, size_type count, size_type pos = 0) const; -->
   <function name="std::string::copy,std::wstring::copy">
@@ -6955,6 +7165,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <function name="std::string::substr">
     <use-retval/>
+    <const/>
     <returnValue type="std::string"/>
     <noreturn>false</noreturn>
     <arg nr="1" default="0" direction="in">
@@ -6968,6 +7179,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <function name="std::wstring::substr">
     <use-retval/>
+    <const/>
     <returnValue type="std::wstring"/>
     <noreturn>false</noreturn>
     <arg nr="1" default="0" direction="in">
@@ -6981,6 +7193,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
   </function>
   <function name="std::basic_string::substr">
     <use-retval/>
+    <const/>
     <returnValue type="std::basic_string"/>
     <noreturn>false</noreturn>
     <arg nr="1" default="0" direction="in">
@@ -6992,8 +7205,14 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <valid>0:</valid>
     </arg>
   </function>
+  <!-- int std::istream::peak();-->
+  <function name="std::istream::peek">
+    <use-retval/>
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+  </function>
   <!-- void std::ios::clear (std::ios::iostate state = std::ios::goodbit);-->
-  <function name="std::ios::clear,std::fstream::clear">
+  <function name="std::ios::clear,std::fstream::clear,std::istream::clear">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1" default="std::ios::goodbit">
@@ -7073,24 +7292,6 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
       <not-uninit/>
     </arg>
   </function>
-  <!-- istream& get (char* s, streamsize n ); -->
-  <!-- istream& get (char* s, streamsize n, char delim ); -->
-  <function name="std::istream::get,std::ifstream::get">
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <arg nr="1" direction="out">
-      <not-null/>
-      <strz/>
-      <minsize type="argvalue" arg="2"/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-      <valid>0:</valid>
-    </arg>
-    <arg nr="3" default="'\n'" direction="in">
-      <not-uninit/>
-    </arg>
-  </function>
   <!-- Not part of standard, but widely supported by runtime libraries. -->
   <!-- char * itoa (int value, char * str, int base); -->
   <function name="itoa">
@@ -7319,7 +7520,8 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <!-- void std::ifstream::close(); -->
   <!-- void std::ofstream::close(); -->
   <!-- void std::fstream::close(); -->
-  <function name="std::ifstream::close,std::ofstream::close,std::fstream::close">
+  <!-- void std::wifstream::close(); -->
+  <function name="std::ifstream::close,std::ofstream::close,std::fstream::close,std::wifstream::close">
     <noreturn>false</noreturn>
     <returnValue type="void"/>
   </function>
@@ -7461,15 +7663,15 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <function name="std::rotate">
     <returnValue type="iterator" container="1"/>
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="inout">
       <not-uninit/>
       <iterator container="1" type="first"/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2" direction="inout">
       <not-uninit/>
       <iterator container="1" type="middle"/>
     </arg>
-    <arg nr="3" direction="in">
+    <arg nr="3" direction="inout">
       <not-uninit/>
       <iterator container="1" type="last"/>
     </arg>
@@ -7510,6 +7712,23 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <not-uninit/>
     </arg>
   </function>
+  <!-- template< class BidirIt, class UnaryPred > BidirIt partition( BidirIt first, BidirIt last, UnaryPred p ); -->
+  <!-- template< class BidirIt, class UnaryPred > BidirIt stable_partition( BidirIt first, BidirIt last, UnaryPred p ); -->
+  <function name="std::partition,std::stable_partition">
+    <returnValue type="iterator" container="1"/>
+    <noreturn>false</noreturn>
+    <arg nr="1">
+      <not-uninit/>
+      <iterator container="1" type="first"/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <iterator container="1" type="last"/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- template< class InputIt, class OutputIt > OutputIt copy( InputIt first, InputIt last, OutputIt d_first ); -->
   <function name="std::copy">
     <returnValue type="iterator" container="2"/>
@@ -8010,6 +8229,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <!-- template< class T1, class T2 > std::pair<V1,V2> make_pair( T1&& t, T2&& u ); // since C++11 until C++14 -->
   <!-- template< class T1, class T2 > constexpr std::pair<V1,V2> make_pair( T1&& t, T2&& u ); // since C++14 -->
   <function name="std::make_pair">
+    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <arg nr="1"/>
@@ -8018,7 +8238,6 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <!-- template< class T >           typename std::remove_reference<T>::type&& move( T&& t ) noexcept; // (since C++11) -->
   <!-- template< class T > constexpr typename std::remove_reference<T>::type&& move( T&& t ) noexcept; // (until C++14) -->
   <function name="std::move">
-    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <arg nr="1">
@@ -8052,6 +8271,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   </function>
   <!--#define offsetof(type, member) /*implementation-defined*/-->
   <function name="offsetof">
+    <pure/>
     <noreturn>false</noreturn>
     <returnValue type="std::size_t"/>
     <use-retval/>
@@ -8076,6 +8296,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
+    <container yields="iterator"/>
     <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
@@ -8090,6 +8311,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
+    <container yields="iterator"/>
     <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
@@ -8098,6 +8320,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     </arg>
   </function>
   <function name="std::size">
+    <pure/>
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
@@ -8158,17 +8381,14 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <not-uninit/>
     </arg>
   </function>
-  <!--       T& std::deque::at( size_type pos );       -->
-  <!-- const T& std::deque::at( size_type pos ) const; -->
-  <!--       T& std::array::at( size_type pos );       -->
-  <!-- const T& std::array::at( size_type pos ) const; -->
-  <function name="std::deque::at,std::array::at">
+  <!-- (1) std::basic_streambuf<CharT, Traits>* std::ostringstream::rdbuf() const; -->
+  <!-- (2) std::basic_streambuf<CharT, Traits>* std::ostringstream::rdbuf( std::basic_streambuf<CharT, Traits>* sb ); -->
+  <function name="std::ostringstream::rdbuf">
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1" direction="in" default="nullptr">
       <not-uninit/>
-      <valid>0:</valid>
     </arg>
   </function>
   <!-- C Threads https://en.cppreference.com/w/c/thread -->
@@ -8260,7 +8480,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <noreturn>false</noreturn>
     <returnValue type="void"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
       <not-bool/>
@@ -8271,13 +8491,13 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <noreturn>false</noreturn>
     <returnValue type="char *"/>
     <use-retval/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <not-uninit/>
       <not-bool/>
       <strz/>
     </arg>
-  </function>  
+  </function>
   <!-- int mtx_init( mtx_t* mutex, int type ); // since C11 -->
   <function name="mtx_init">
     <noreturn>false</noreturn>
@@ -8475,7 +8695,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <returnValue type="bool"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -8530,37 +8750,69 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <use-retval/>
     <leak-ignore/>
     <noreturn>false</noreturn>
-    <returnValue type="void *"/>
   </function>
   <function name="std::auto_ptr::reset,std::shared_ptr::reset,std::unique_ptr::reset,std::weak_ptr::reset">
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in" default="0">
+    <arg nr="1" default="0">
       <not-uninit/>
     </arg>
-    <returnValue type="void *"/>
   </function>
   <function name="std::auto_ptr::release,std::unique_ptr::release">
     <use-retval/>
     <noreturn>false</noreturn>
-    <returnValue type="void *"/>
+  </function>
+  <function name="std::tie">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <arg nr="variadic">
+    </arg>
+  </function>
+  <function name="std::as_const">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <pure/>
+    <arg nr="1" direction="in"/>
+  </function>
+  <function name="std::exception::what,std::logic_error::what,std::invalid_argument::what,std::domain_error::what,std::length_error::what,std::out_of_range::what,std::future_error::what,std::runtime_error::what,std::range_error::what,std::overflow_error::what,std::underflow_error::what,std::regex_error::what,std::system_error::what,std::ios_base::failure::what,std::filesystem::filesystem_error::what,std::nonexistent_local_time::what,std::ambiguous_local_time::what,std::format_error::what,std::bad_typeid::what,std::bad_cast::what,std::bad_any_cast::what,std::bad_optional_access::what,std::bad_expected_access::what,std::bad_weak_ptr::what,std::bad_function_call::what,std::bad_alloc::what,std::bad_array_new_length::what,std::bad_exception::what,std::bad_variant_access::what">
+    <const/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <returnValue type="const char *"/>
+  </function>
+  <!-- https://en.cppreference.com/w/cpp/error/uncaught_exception -->
+  <!-- (until C++11):                                          bool std::uncaught_exception() throw();  -->
+  <!-- (since C++11) (deprecated in C++17) (removed in C++20): bool std::uncaught_exception() noexcept; -->
+  <function name="std::uncaught_exception">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- https://en.cppreference.com/w/cpp/error/uncaught_exception -->
+  <!-- (since C++17) (constexpr since C++26): int std::uncaught_exceptions() noexcept; -->
+  <function name="std::uncaught_exceptions">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <use-retval/>
+    <leak-ignore/>
   </function>
   <memory>
-    <alloc init="false" buffer-size="malloc">malloc</alloc>
-    <alloc init="true" buffer-size="calloc">calloc</alloc>
-    <alloc init="false" buffer-size="malloc:2">aligned_alloc</alloc>
-    <realloc init="false" buffer-size="malloc:2">realloc</realloc>
-    <realloc init="false" buffer-size="calloc:2,3">reallocarray</realloc>
-    <dealloc>free</dealloc>
+    <alloc init="false" buffer-size="malloc">malloc,std::malloc</alloc>
+    <alloc init="true" buffer-size="calloc">calloc,std::calloc</alloc>
+    <alloc init="false" buffer-size="malloc:2">aligned_alloc,std::aligned_alloc</alloc>
+    <realloc init="false" buffer-size="malloc:2">realloc,std::realloc</realloc>
+    <dealloc>free,std::free</dealloc>
   </memory>
   <memory>
-    <alloc init="true" buffer-size="strdup">strdup</alloc>
-    <dealloc>free</dealloc>
+    <alloc init="true" buffer-size="strdup">strdup,std::strdup</alloc>
+    <dealloc>free,std::free</dealloc>
   </memory>
   <resource>
-    <alloc init="true">fopen</alloc>
-    <alloc init="true">tmpfile</alloc>
-    <realloc init="true" realloc-arg="3">freopen</realloc>
-    <dealloc>fclose</dealloc>
+    <alloc init="true">fopen,std::fopen</alloc>
+    <alloc init="true">tmpfile,std::tmpfile</alloc>
+    <realloc init="true" realloc-arg="3">freopen,std::freopen</realloc>
+    <dealloc>fclose,std::fclose</dealloc>
   </resource>
   <container id="stdContainer" endPattern="&gt; !!::" opLessAllowed="false" itEndPattern="&gt; :: iterator|const_iterator|reverse_iterator|const_reverse_iterator" hasInitializerListConstructor="true">
     <type templateParameter="0"/>
@@ -8632,7 +8884,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <size templateParameter="0"/>
     <access indexOperator="array-like"/>
   </container>
-  <container id="stdQueue" startPattern="std :: queue|priority_queue &lt;" inherits="stdContainer">
+  <container id="stdQueue" startPattern="std :: queue &lt;" inherits="stdContainer">
     <access>
       <function name="emplace" action="push" yields="item"/>
       <function name="push" action="push"/>
@@ -8641,7 +8893,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <function name="back" yields="item"/>
     </access>
   </container>
-  <container id="stdStack" startPattern="std :: stack &lt;" inherits="stdContainer">
+  <container id="stdStack" startPattern="std :: stack|priority_queue &lt;" inherits="stdContainer">
     <access>
       <function name="emplace" action="push" yields="item"/>
       <function name="push" action="push"/>
@@ -8667,7 +8919,6 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <member name="second" templateParameter="1"/>
     </rangeItemRecordType>
     <access>
-      <function name="at" yields="at_index"/>
       <function name="count" action="find"/>
       <function name="find" action="find" yields="iterator"/>
       <function name="emplace_hint" action="push" yields="iterator"/>
@@ -8690,6 +8941,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <function name="emplace" action="push"/>
       <function name="try_emplace" action="push"/>
       <function name="insert_or_assign" action="push"/>
+      <function name="at" yields="at_index"/>
     </access>
   </container>
   <container id="stdList" startPattern="std :: list|forward_list &lt;" inherits="stdContainer">
@@ -8724,7 +8976,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <size>
       <function name="push_back" action="push"/>
       <function name="pop_back" action="pop"/>
-      <function name="append" action="change"/>
+      <function name="append" action="append"/>
       <function name="replace" action="change"/>
       <function name="reserve" action="change-internal"/>
       <function name="shrink_to_fit" action="change-internal"/>
@@ -8736,12 +8988,12 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <function name="back" yields="item"/>
       <function name="data" yields="buffer"/>
       <function name="c_str" yields="buffer-nt"/>
-      <function name="find" action="find"/>
-      <function name="rfind" action="find"/>
-      <function name="find_last_of" action="find"/>
-      <function name="find_last_not_of" action="find"/>
-      <function name="find_first_of" action="find"/>
-      <function name="find_first_not_of" action="find"/>
+      <function name="find" action="find-const"/>
+      <function name="rfind" action="find-const"/>
+      <function name="find_last_of" action="find-const"/>
+      <function name="find_last_not_of" action="find-const"/>
+      <function name="find_first_of" action="find-const"/>
+      <function name="find_first_not_of" action="find-const"/>
     </access>
   </container>
   <container id="stdBasicString" startPattern="std :: basic_string &lt;" inherits="stdAllString">
@@ -8757,6 +9009,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" />
@@ -8789,6 +9051,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <checkFiniteLifetime>std::unique_lock</checkFiniteLifetime>
       <checkFiniteLifetime>std::shared_lock</checkFiniteLifetime>
       <check>std::pair</check>
+      <check>std::complex</check>
       <check>std::exception</check>
       <check>std::logic_error</check>
       <check>std::domain_error</check>
@@ -8802,8 +9065,10 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <check>std::underflow_error</check>
       <check>std::regex_error</check>
       <check>std::system_error</check>
+      <check>std::format_error</check>
       <check>std::bad_typeid</check>
       <check>std::bad_cast</check>
+      <check>std::monostate</check>
       <check>std::bad_optional_access</check>
       <check>std::bad_expected_access</check>
       <check>std::bad_weak_ptr</check>
@@ -8815,6 +9080,12 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
       <check>std::filesystem::filesystem_error</check>
       <check>std::bad_variant_access</check>
       <check>std::span</check>
+      <check>std::stringstream</check>
+      <check>std::wstringstream</check>
+      <check>std::istringstream</check>
+      <check>std::wistringstream</check>
+      <check>std::ostringstream</check>
+      <check>std::wostringstream</check>
     </unusedvar>
     <operatorEqVarError>
       <suppress>std::mutex</suppress>
@@ -8923,7 +9194,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <podtype name="std::atomic_intmax_t"/>
   <podtype name="std::atomic_uintmax_t"/>
   <!-- https://en.cppreference.com/w/c/program/SIG_types
-		Values are in alignment with posix.cfg -->
+        Values are in alignment with posix.cfg -->
   <define name="SIGTERM" value="15"/>
   <define name="SIGSEGV" value="11"/>
   <define name="SIGINT" value="2"/>
diff --git a/cfg/tinyxml2.cfg b/cfg/tinyxml2.cfg
index 2fdee227bc6..e652fa9c11d 100644
--- a/cfg/tinyxml2.cfg
+++ b/cfg/tinyxml2.cfg
@@ -1,24 +1,5 @@
 <?xml version="1.0"?>
 <def format="2">
-  <define name="XML_SUCCESS" value="0"/>
-  <define name="XML_NO_ATTRIBUTE" value="1"/>
-  <define name="XML_WRONG_ATTRIBUTE_TYPE" value="2"/>
-  <define name="XML_ERROR_FILE_NOT_FOUND" value="3"/>
-  <define name="XML_ERROR_FILE_COULD_NOT_BE_OPENED" value="4"/>
-  <define name="XML_ERROR_FILE_READ_ERROR" value="5"/>
-  <define name="XML_ERROR_PARSING_ELEMENT" value="6"/>
-  <define name="XML_ERROR_PARSING_ATTRIBUTE" value="7"/>
-  <define name="XML_ERROR_PARSING_TEXT" value="8"/>
-  <define name="XML_ERROR_PARSING_COMMENT" value="9"/>
-  <define name="XML_ERROR_PARSING_DECLARATION" value="10"/>
-  <define name="XML_ERROR_PARSING_UNKNOWN" value="11"/>
-  <define name="XML_ERROR_EMPTY_DOCUMENT" value="12"/>
-  <define name="XML_ERROR_MISMATCHED_ELEMENT" value="13"/>
-  <define name="XML_ERROR_PARSING" value="14"/>
-  <define name="XML_CAN_NOT_CONVERT_TEXT" value="15"/>
-  <define name="XML_NO_TEXT_NODE" value="16"/>
-  <define name="XML_ELEMENT_DEPTH_EXCEEDED" value="17"/>
-  <define name="XML_ERROR_COUNT" value="18"/>
   <!-- tinyxml2::XMLError tinyxml2::XMLDocument::LoadFile( const char* filename ) -->
   <!-- tinyxml2::XMLError tinyxml2::XMLDocument::LoadFile( FILE* ) -->
   <function name="tinyxml2::XMLDocument::LoadFile">
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 8b4b19d6a71..343e12b3906 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1411,6 +1411,53 @@
     </arg>
     <warn severity="style" reason="Obsolete" alternatives="RtlFillMemory"/>
   </function>
+  <!-- unsigned int _get_output_format(); -->
+  <function name="_get_output_format">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <returnValue type="unsigned int"/>
+    <warn severity="style" reason="Obsolete" alternatives="No_alternatives_available"/>
+  </function>
+  <!-- int _heapadd(void *memblock, size_t size); -->
+  <function name="_heapadd">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="int"/>
+    <arg nr="1" direction="inout">
+      <not-null/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="No_alternatives_available"/>
+  </function>
+  <!-- char *_cgets(char *buffer); -->
+  <!-- template <size_t size> char *_cgets(char (&buffer)[size]); // C++ only -->
+  <function name="_cgets">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <returnValue type="char *"/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="_cgets_s"/>
+  </function>
+  <!-- wchar_t *_cgetws(wchar_t *buffer); -->
+  <!-- wchar_t *_getws(wchar_t *buffer); -->
+  <!-- template <size_t size> wchar_t *_cgetws(wchar_t (&buffer)[size]); // C++ only -->
+  <function name="_cgetws,_getws">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <returnValue type="wchar_t *"/>
+    <arg nr="1" direction="out">
+      <not-null/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="_cgetws_s,_getws_s"/>
+  </function>
   <!-- int _iswctype( wint_t wc, wctype_t desc ); -->
   <!-- int is_wctype( wint_t wc, wctype_t desc ); -->
   <function name="_iswctype,is_wctype">
@@ -1749,7 +1796,7 @@
   <function name="CloseHandle">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
   </function>
@@ -1877,6 +1924,26 @@
       <strz/>
     </arg>
   </function>
+  <!-- int _utime(const char *filename, struct _utimbuf *times); -->
+  <!-- int _utime32(const char *filename, struct __utimbuf32 *times); -->
+  <!-- int _utime64(const char *filename, struct __utimbuf64 *times); -->
+  <!-- int _wutime(const wchar_t *filename, struct _utimbuf *times); -->
+  <!-- int _wutime32(const wchar_t *filename, struct __utimbuf32 *times); -->
+  <!-- int _wutime64(const wchar_t *filename, struct __utimbuf64 *times); -->
+  <function name="_utime,_utime32,_utime64,_wutime,_wutime32,_wutime64">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="int"/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="out">
+      <not-uninit/>
+      <not-bool/>
+    </arg>
+  </function>
   <!-- BOOL GetCommState(HANDLE hFile, LPDCB  lpDCB); -->
   <function name="GetCommState">
     <noreturn>false</noreturn>
@@ -2176,7 +2243,7 @@
     <noreturn>false</noreturn>
     <returnValue type="HRESULT"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -2225,10 +2292,11 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- int _stricmp_l(const char *string1, const char *string2, _locale_t locale);  -->
-  <!-- int _wcsicmp_l(const wchar_t *string1, const wchar_t *string2, _locale_t locale); -->
-  <!-- int _mbsicmp_l(const wchar_t *string1, const wchar_t *string2, _locale_t locale); -->
-  <function name="_stricmp_l,_wcsicmp_l,_mbsicmp_l">
+  <!-- int _stricmp(const char *s1, const char *s2); -->
+  <!-- int _wcsicmp(const wchar_t *s1, const wchar_t *s2); -->
+  <!-- int _mbsicmp(const unsigned char *string1, const unsigned char *string2); -->
+  <!-- https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stricmp-wcsicmp-mbsicmp-stricmp-l-wcsicmp-l-mbsicmp-l?view=msvc-170  -->
+  <function name="_stricmp,_wcsicmp,_mbsicmp,_tcsicmp">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
@@ -2243,20 +2311,53 @@
       <not-null/>
       <strz/>
     </arg>
-    <arg nr="3" direction="in">
+  </function>
+  <!-- int stricmp(const char *s1, const char *s2); -->
+  <!-- https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stricmp-wcsicmp?view=msvc-170 -->
+  <function name="stricmp">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <leak-ignore/>
+    <use-retval/>
+    <warn severity="style" reason="Obsolescent" alternatives="_stricmp"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
       <not-uninit/>
+      <not-null/>
+      <strz/>
     </arg>
   </function>
-  <!-- int stricmp(const char *s1, const char *s2); -->
-  <!-- int _stricmp(const char *s1, const char *s2); -->
   <!-- int wcsicmp(const wchar_t *s1, const wchar_t *s2); -->
-  <!-- int _wcsicmp(const wchar_t *s1, const wchar_t *s2); -->
-  <!-- int _mbsicmp(const unsigned char *string1, const unsigned char *string2); -->
-  <function name="stricmp,_stricmp,wcsicmp,_wcsicmp,_mbsicmp,_tcsicmp">
+  <!-- https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/stricmp-wcsicmp?view=msvc-170 -->
+  <function name="wcsicmp">
+    <noreturn>false</noreturn>
+    <returnValue type="int"/>
+    <leak-ignore/>
+    <use-retval/>
+    <warn severity="style" reason="Obsolescent" alternatives="_wcsicmp"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+      <not-null/>
+      <strz/>
+    </arg>
+  </function>
+  <!-- int strcmpi(const char *s1, const char *s2); -->
+  <!-- https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/strcmpi?view=msvc-170  -->
+  <function name="strcmpi">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <leak-ignore/>
     <use-retval/>
+    <warn severity="style" alternatives="_stricmp" reason="Obsolete">It is recommend you use _stricmp instead.</warn>
     <arg nr="1" direction="in">
       <not-uninit/>
       <not-null/>
@@ -2328,7 +2429,7 @@
     implemented in Cppcheck. It can not (yet) be configured in the configuration
     file. See #8381 -->
   </function>
-  <!-- int _sprintf_s_l(char *buffer, size_t sizeOfBuffer, const char *format, locale_t locale, ... ); 
+  <!-- int _sprintf_s_l(char *buffer, size_t sizeOfBuffer, const char *format, locale_t locale, ... );
        int _swprintf_s_l(wchar_t *buffer, size_t sizeOfBuffer, const wchar_t *format, locale_t locale, ...);-->
   <function name="_sprintf_s_l,_swprintf_s_l">
     <noreturn>false</noreturn>
@@ -2378,7 +2479,7 @@
     <arg nr="7" direction="inout"/>
     <arg nr="8" direction="out"/>
   </function>
-  <!-- 
+  <!--
 HFONT CreateFont(
   _In_  int nHeight,
   _In_  int nWidth,
@@ -2455,8 +2556,8 @@ HFONT CreateFont(
     </arg>
     <arg nr="4"/>
   </function>
-  <!-- int _vsnprintf_l (char *buffer   , size_t count, const char *format, locale_t locale,  va_list argptr); 
-       int _vsnwprintf_l(wchar_t *buffer, size_t count, const wchar_t *format, locale_t locale, va_list argptr); 
+  <!-- int _vsnprintf_l (char *buffer   , size_t count, const char *format, locale_t locale,  va_list argptr);
+       int _vsnwprintf_l(wchar_t *buffer, size_t count, const wchar_t *format, locale_t locale, va_list argptr);
        int _vswprintf_l(wchar_t *buffer,  size_t count, const wchar_t *format, locale_t locale, va_list argptr);-->
   <function name="_vsnprintf_l,_vsnwprintf_l,_vswprintf_l">
     <noreturn>false</noreturn>
@@ -2480,7 +2581,7 @@ HFONT CreateFont(
     </arg>
     <arg nr="5"/>
   </function>
-  <!-- int vsnprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, va_list argptr); 
+  <!-- int vsnprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, va_list argptr);
        int _vsnprintf_s( char *buffer, size_t sizeOfBuffer, size_t count, const char *format, va_list argptr);
        int _vsnwprintf_s( wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format, va_list argptr); -->
   <function name="vsnprintf_s,_vsnprintf_s,_vsnwprintf_s">
@@ -2506,7 +2607,7 @@ HFONT CreateFont(
     </arg>
     <arg nr="5"/>
   </function>
-  <!-- int _vsnprintf_s_l(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, locale_t locale,  va_list argptr); 
+  <!-- int _vsnprintf_s_l(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, locale_t locale,  va_list argptr);
        int _vsnwprintf_s_l(wchar_t *buffer, size_t sizeOfBuffer, size_t count, const wchar_t *format, locale_t locale, va_list argptr); -->
   <function name="_vsnprintf_s_l,_vsnwprintf_s_l">
     <noreturn>false</noreturn>
@@ -2533,7 +2634,7 @@ HFONT CreateFont(
     </arg>
     <arg nr="6"/>
   </function>
-  <!-- int _vsprintf_l(char *buffer, const char *format, locale_t locale, va_list argptr); 
+  <!-- int _vsprintf_l(char *buffer, const char *format, locale_t locale, va_list argptr);
       int __vswprintf_l(wchar_t *buffer, const wchar_t *format, locale_t locale, va_list argptr);-->
   <function name="_vsprintf_l,__vswprintf_l">
     <noreturn>false</noreturn>
@@ -2550,18 +2651,6 @@ HFONT CreateFont(
     </arg>
     <arg nr="4"/>
   </function>
-  <!-- char *strdup(const char *s); -->
-  <function name="strdup">
-    <noreturn>false</noreturn>
-    <returnValue type="char *"/>
-    <use-retval/>
-    <warn severity="style" alternatives="_strdup" reason="Obsolete">These POSIX functions are deprecated. Use the ISO C++ conformant _strdup, _wcsdup, _mbsdup instead.</warn>
-    <arg nr="1">
-      <not-null/>
-      <not-uninit/>
-      <not-bool/>
-    </arg>
-  </function>
   <!-- wchar_t *wcsdup(const wchar_t *s); -->
   <function name="wcsdup">
     <noreturn>false</noreturn>
@@ -2585,7 +2674,7 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
-  <!-- char *_strdup_dbg(const char *strSource, int blockType, const char *filename, int linenumber );  
+  <!-- char *_strdup_dbg(const char *strSource, int blockType, const char *filename, int linenumber );
        wchar_t *_wcsdup_dbg(const wchar_t *strSource, int blockType, const char *filename, int linenumber);-->
   <function name="_strdup_dbg,_wcsdup_dbg,_tcsdup_dbg">
     <noreturn>false</noreturn>
@@ -2642,7 +2731,7 @@ HFONT CreateFont(
     </arg>
     <arg nr="3" direction="in"/>
   </function>
-  <!-- int _snprintf(char *s, size_t n, const char *format, ...); 
+  <!-- int _snprintf(char *s, size_t n, const char *format, ...);
        int _snwprintf(wchar_t *buffer, size_t count, const wchar_t *format, ...);-->
   <function name="_snprintf,_snwprintf,_sntprintf">
     <noreturn>false</noreturn>
@@ -2762,8 +2851,8 @@ HFONT CreateFont(
       <valid>0:2</valid>
     </arg>
   </function>
-  <!-- __int64 _ftelli64(FILE *stream); 
-         long _ftell_nolock(FILE *stream);  
+  <!-- __int64 _ftelli64(FILE *stream);
+         long _ftell_nolock(FILE *stream);
        __int64 _ftelli64_nolock(FILE *stream); -->
   <function name="_ftelli64,_ftell_nolock,_ftelli64_nolock">
     <noreturn>false</noreturn>
@@ -2960,7 +3049,7 @@ HFONT CreateFont(
     <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3" direction="in">
@@ -2985,7 +3074,7 @@ HFONT CreateFont(
     <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
     <arg nr="3" direction="in">
@@ -3023,7 +3112,7 @@ HFONT CreateFont(
   _In_ LPARAM lParam); -->
   <function name="SendMessage,SendMessageA,SendMessageW">
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3044,7 +3133,7 @@ HFONT CreateFont(
   _In_     LPARAM lParam); -->
   <function name="PostMessage,PostMessageA,PostMessageW">
     <noreturn>false</noreturn>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -3306,7 +3395,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="LPVOID"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
     </arg>
   </function>
@@ -3315,10 +3404,10 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="HGLOBAL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2">
       <not-uninit/>
     </arg>
   </function>
@@ -3327,7 +3416,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3339,32 +3428,12 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
-      <not-null/>
-      <not-uninit/>
-    </arg>
-    <arg nr="2" direction="in">
-      <not-uninit/>
-    </arg>
-  </function>
-  <!-- int _stricmp(const char *str1, const char *str2); -->
-  <!-- int _wcsicmp(const wchar_t *str1, const wchar_t *str2) -->
-  <!-- int _mbsicmp(const unsigned char *str1, const unsigned char *str2) -->
-  <function name="_stricmp,_wcsicmp,_mbsicmp,_tcsicmp">
-    <use-retval/>
-    <pure/>
-    <returnValue type="int"/>
-    <noreturn>false</noreturn>
-    <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
-      <strz/>
     </arg>
     <arg nr="2" direction="in">
-      <not-null/>
       <not-uninit/>
-      <strz/>
     </arg>
   </function>
   <!-- int _stricmp_l(const char *str1, const char *str2, _locale_t locale); -->
@@ -3432,7 +3501,7 @@ HFONT CreateFont(
     <arg nr="9" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="10" direction="in">
+    <arg nr="10">
       <not-uninit/>
     </arg>
     <arg nr="11" direction="in">
@@ -3487,7 +3556,7 @@ HFONT CreateFont(
     <arg nr="10" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="11" direction="in">
+    <arg nr="11">
       <not-uninit/>
     </arg>
     <arg nr="12" direction="in">
@@ -3501,7 +3570,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -3609,7 +3678,7 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
-  <!-- int _rmdir(const char *dirname); 
+  <!-- int _rmdir(const char *dirname);
        int _wrmdir(const wchar_t *dirname);-->
   <function name="_rmdir,_wrmdir">
     <noreturn>false</noreturn>
@@ -3699,7 +3768,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="DWORD"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -3715,7 +3784,7 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
-  <!-- FILE *_popen( const char *command, const char *mode ); 
+  <!-- FILE *_popen( const char *command, const char *mode );
        FILE *_wpopen(const wchar_t *command, const wchar_t *mode);-->
   <function name="_popen,_wpopen,_tpopen">
     <noreturn>false</noreturn>
@@ -3746,7 +3815,7 @@ HFONT CreateFont(
     <use-retval/>
     <noreturn>false</noreturn>
     <returnValue type="HRSRC"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -3901,7 +3970,7 @@ HFONT CreateFont(
       <not-uninit/>
       <not-null/>
     </arg>
-    <arg nr="4" direction="in">
+    <arg nr="4">
       <not-uninit/>
     </arg>
     <arg nr="5" direction="in">
@@ -4331,8 +4400,8 @@ HFONT CreateFont(
       <strz/>
     </arg>
   </function>
-  <!-- unsigned char *_mbsrchr_l(const unsigned char *str, unsigned int c, _locale_t locale ); // C only  
-       unsigned char *_mbsrchr_l(unsigned char *str, unsigned int c, _locale_t locale ); // C++ only  
+  <!-- unsigned char *_mbsrchr_l(const unsigned char *str, unsigned int c, _locale_t locale ); // C only
+       unsigned char *_mbsrchr_l(unsigned char *str, unsigned int c, _locale_t locale ); // C++ only
        const unsigned char *_mbsrchr_l(const unsigned char *str, unsigned int c, _locale_t locale ); // C++ only-->
   <function name="_mbsrchr_l">
     <use-retval/>
@@ -4365,8 +4434,8 @@ HFONT CreateFont(
       <not-uninit/>
     </arg>
   </function>
-  <!-- unsigned char *_mbsrchr(const unsigned char *str, unsigned int c); // C only  
-       unsigned char *_mbsrchr(unsigned char *str, unsigned int c); // C++ only  
+  <!-- unsigned char *_mbsrchr(const unsigned char *str, unsigned int c); // C only
+       unsigned char *_mbsrchr(unsigned char *str, unsigned int c); // C++ only
        const unsigned char *_mbsrchr(const unsigned char *str, unsigned int c); // C++ only-->
   <function name="_mbsrchr,_tcsrchr">
     <use-retval/>
@@ -4613,6 +4682,108 @@ HFONT CreateFont(
       <not-bool/>
     </arg>
   </function>
+  <!-- unsigned int _setsystime(struct tm * tp, unsigned int ms); -->
+  <function name="_setsystime">
+    <returnValue type="unsigned int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="SetLocalTime"/>
+  </function>
+  <!-- unsigned int _getsystime(struct tm * tp)-->
+  <function name="_getsystime">
+    <returnValue type="unsigned int"/>
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="GetLocalTime"/>
+  </function>
+  <!-- void _sleep(unsigned long ulTime); -->
+  <function name="_sleep">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="Sleep"/>
+  </function>
+  <!-- void _beep(unsigned nFreq, unsigned nDur); -->
+  <function name="_beep">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="Beep"/>
+  </function>
+  <!-- void _seterrormode (int mode); -->
+  <function name="_seterrormode">
+    <returnValue type="void"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-bool/>
+      <not-uninit/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="SetErrorMode"/>
+  </function>
+  <!-- intptr_t _loaddll (char *name); -->
+  <function name="_loaddll">
+    <returnValue type="intptr_t"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-bool/>
+      <not-null/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="LoadLibrary,LoadLibraryEx,LoadPackagedLibrary"/>
+  </function>
+  <!-- int _unloaddll(intptr_t handle); -->
+  <function name="_unloaddll">
+    <returnValue type="int"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-bool/>
+      <not-uninit/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="FreeLibrary"/>
+  </function>
+  <!-- FARPROC _getdllprocaddr (intptr_t hModule, char *lpProcName, intptr_t iOrdinal)-->
+  <function name="_getdllprocaddr">
+    <returnValue type="FARPROC"/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-bool/>
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-bool/>
+      <not-null/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-bool/>
+      <not-uninit/>
+    </arg>
+    <warn severity="style" reason="Obsolete" alternatives="GetProcAddress"/>
+  </function>
   <!-- BOOL WINAPI CreateDirectory(_In_ LPCTSTR lpPathName,
                                    _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes); -->
   <function name="CreateDirectory,CreateDirectoryA,CreateDirectoryW">
@@ -4726,7 +4897,7 @@ HFONT CreateFont(
     <returnValue type="HMODULE"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <strz/>
     </arg>
@@ -4772,7 +4943,7 @@ HFONT CreateFont(
   <function name="FreeLibrary">
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4791,7 +4962,7 @@ HFONT CreateFont(
   </function>
   <!--BOOL WINAPI FlushConsoleInputBuffer(_In_ HANDLE hConsoleInput);-->
   <function name="FlushConsoleInputBuffer">
-    <noreturn>true</noreturn>
+    <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
     <arg nr="1" direction="in">
@@ -4800,13 +4971,33 @@ HFONT CreateFont(
       <not-bool/>
     </arg>
   </function>
+  <!-- HANDLE OpenProcess([in] DWORD dwDesiredAccess,
+                          [in] BOOL  bInheritHandle,
+                          [in] DWORD dwProcessId); -->
+  <!-- HANDLE OpenThread ([in] DWORD dwDesiredAccess,
+                          [in] BOOL  bInheritHandle,
+                          [in] DWORD dwThreadId); -->
+  <function name="OpenProcess,OpenThread">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <returnValue type="HANDLE"/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="in">
+      <not-uninit/>
+    </arg>
+  </function>
   <!--VOID WINAPI FreeLibraryAndExitThread(
   _In_ HMODULE hModule,
   _In_ DWORD   dwExitCode);-->
   <function name="FreeLibraryAndExitThread">
     <noreturn>true</noreturn>
     <returnValue type="VOID"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4821,11 +5012,11 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="DWORD"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
     </arg>
-    <arg nr="2" direction="in">
+    <arg nr="2" direction="out">
       <not-uninit/>
       <strz/>
       <minsize type="argvalue" arg="3"/>
@@ -4884,7 +5075,7 @@ HFONT CreateFont(
     <returnValue type="FARPROC"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
       <not-null/>
@@ -4941,6 +5132,8 @@ HFONT CreateFont(
       <not-bool/>
     </arg>
   </function>
+  <define name="CREATE_EVENT_INITIAL_SET" value="0x00000002"/>
+  <define name="CREATE_EVENT_MANUAL_RESET" value="0x00000001"/>
   <!--HANDLE WINAPI OpenEvent(
   _In_ DWORD   dwDesiredAccess,
   _In_ BOOL    bInheritHandle,
@@ -4971,7 +5164,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -5364,7 +5557,7 @@ HFONT CreateFont(
     <returnValue type="BOOL"/>
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -5487,6 +5680,17 @@ HFONT CreateFont(
       <not-null/>
     </arg>
   </function>
+  <define name="SECURITY_NULL_SID_AUTHORITY" value="0"/>
+  <define name="SECURITY_WORLD_SID_AUTHORITY" value="1"/>
+  <define name="SECURITY_LOCAL_SID_AUTHORITY" value="2"/>
+  <define name="SECURITY_CREATOR_SID_AUTHORITY" value="3"/>
+  <define name="SECURITY_NT_AUTHORITY" value="5"/>
+  <define name="SECURITY_NULL_RID" value="0"/>
+  <define name="SECURITY_WORLD_RID" value="0"/>
+  <define name="SECURITY_LOCAL_RID" value="0"/>
+  <define name="SECURITY_LOCAL_LOGON_RID" value="1"/>
+  <define name="SECURITY_CREATOR_OWNER_RID" value="0"/>
+  <define name="SECURITY_CREATOR_GROUP_RID" value="1"/>
   <!--PVOID WINAPI FreeSid(_In_ PSID pSid);-->
   <function name="FreeSid">
     <noreturn>false</noreturn>
@@ -5646,7 +5850,7 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <leak-ignore/>
     <!-- The function does nothing (useful) if arg1 is nullptr or arg2 is nullptr or arg3 is 0 -->
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
     </arg>
     <arg nr="2" direction="out">
@@ -6324,7 +6528,7 @@ HFONT CreateFont(
   <function name="LocalFree">
     <noreturn>false</noreturn>
     <returnValue type="HLOCAL"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-bool/>
     </arg>
   </function>
@@ -6627,12 +6831,27 @@ HFONT CreateFont(
       <not-bool/>
     </arg>
   </function>
-  <!-- BOOL DeviceIoControl(
-  _In_ HANDLE hDevice,
-  _In_ DWORD dwIoControlCode,
-  _In_reads_bytes_opt_(nInBufferSize) LPVOID lpInBuffer,
-  _In_ DWORD nInBufferSize,
-  _Out_writes_bytes_to_opt_(nOutBufferSize, *lpBytesReturned) LPVOID lpOutBuffer,
+  <!-- ULONG UpdateTraceA(CONTROLTRACE_ID TraceId, LPCSTR  InstanceName, PEVENT_TRACE_PROPERTIES Properties); -->
+  <!-- ULONG UpdateTraceW(CONTROLTRACE_ID TraceId, LPCWSTR InstanceName, PEVENT_TRACE_PROPERTIES Properties); -->
+  <function name="UpdateTraceA,UpdateTraceW">
+    <noreturn>false</noreturn>
+    <returnValue type="ULONG"/>
+    <use-retval/>
+    <warn severity="style" alternatives="ControlTrace" reason="Obsolete">This function is obsolete. The ControlTrace function supersedes this function.</warn>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" direction="in">
+      <not-uninit/>
+    </arg>
+    <arg nr="3" direction="out"/>
+  </function>
+  <!-- BOOL DeviceIoControl(
+  _In_ HANDLE hDevice,
+  _In_ DWORD dwIoControlCode,
+  _In_reads_bytes_opt_(nInBufferSize) LPVOID lpInBuffer,
+  _In_ DWORD nInBufferSize,
+  _Out_writes_bytes_to_opt_(nOutBufferSize, *lpBytesReturned) LPVOID lpOutBuffer,
   _In_ DWORD nOutBufferSize,
   _Out_opt_ LPDWORD lpBytesReturned,
   _Inout_opt_ LPOVERLAPPED lpOverlapped); -->
@@ -6791,7 +7010,7 @@ HFONT CreateFont(
     <returnValue type="HWND"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -6887,25 +7106,6 @@ HFONT CreateFont(
       <not-bool/>
     </arg>
   </function>
-  <!-- VERSIONHELPERAPI is defined as "inline bool" in VersionHelpers.h -->
-  <!-- VERSIONHELPERAPI IsWindowsXPOrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindowsXPSP1OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindowsXPSP2OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindowsXPSP3OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindowsVistaOrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindowsVistaSP1OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindowsVistaSP2OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindows7OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindows7SP1OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindows8OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindows8Point1OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindows10OrGreater(); -->
-  <!-- VERSIONHELPERAPI IsWindowsServer(); -->
-  <function name="IsWindowsXPOrGreater,IsWindowsXPSP1OrGreater,IsWindowsXPSP2OrGreater,IsWindowsXPSP3OrGreater,IsWindowsVistaOrGreater,IsWindowsVistaSP1OrGreater,IsWindowsVistaSP2OrGreater,IsWindows7OrGreater,IsWindows7SP1OrGreater,IsWindows8OrGreater,IsWindows8Point1OrGreater,IsWindows10OrGreater,IsWindowsServer">
-    <noreturn>false</noreturn>
-    <returnValue type="bool"/>
-    <use-retval/>
-  </function>
   <!-- int _setmode (int fd, int mode); -->
   <function name="_setmode">
     <noreturn>false</noreturn>
@@ -6990,16 +7190,8 @@ HFONT CreateFont(
   <define name="afx_msg" value=""/>
   <define name="AFX_EXT_CLASS" value=""/>
   <define name="DEBUG_NEW" value="new"/>
-  <define name="DECLARE_MESSAGE_MAP()" value=""/>
-  <define name="DECLARE_DYNAMIC(x)" value=""/>
-  <define name="DECLARE_DYNAMIC_CLASS(x)" value=""/>
-  <define name="DECLARE_DYNCREATE(x)" value=""/>
-  <define name="DECLARE_SERIAL(x)" value=""/>
-  <define name="IMPLEMENT_DYNAMIC(name,base)" value=""/>
-  <define name="IMPLEMENT_DYNCREATE(name,base)" value=""/>
-  <define name="IMPLEMENT_SERIAL(name,base,schema)" value=""/>
-  <define name="INVALID_HANDLE_VALUE" value="0"/>
-  <define name="INVALID_SOCKET" value="0"/>
+  <define name="INVALID_HANDLE_VALUE" value="-1"/>
+  <define name="INVALID_SOCKET" value="~0"/>
   <define name="WINAPI" value="__stdcall"/>
   <define name="STDMETHODCALLTYPE" value="__stdcall"/>
   <define name="STDMETHODIMP" value="HRESULT STDMETHODCALLTYPE"/>
@@ -7010,6 +7202,10 @@ HFONT CreateFont(
   <define name="__pragma(x)" value=""/>
   <define name="_countof(_Array)" value="(sizeof(_Array) / sizeof(_Array[0]))"/>
   <define name="__wchar_t" value="wchar_t"/>
+  <define name="__try" value="try"/>
+  <define name="__except(x)" value="catch(...)"/>
+  <define name="__finally" value="__dummy_lbl:"/>
+  <define name="__leave" value="goto __dummy_lbl;"/>
   <define name="RtlEqualMemory(Destination,Source,Length)" value="(!memcmp((Destination),(Source),(Length)))"/>
   <define name="RtlMoveMemory(Destination,Source,Length)" value="memmove((Destination),(Source),(Length))"/>
   <define name="RtlCopyMemory(Destination,Source,Length)" value="memcpy((Destination),(Source),(Length))"/>
@@ -7685,11 +7881,6 @@ HFONT CreateFont(
   <define name="E_BLUETOOTH_ATT_UNSUPPORTED_GROUP_TYPE" value="0x80650010"/>
   <define name="E_BLUETOOTH_ATT_INSUFFICIENT_RESOURCES" value="0x80650011"/>
   <define name="E_BLUETOOTH_ATT_UNKNOWN_ERROR" value="0x80651000"/>
-  <!--RpcDce.h: Authorization Constants Ref.: https://msdn.microsoft.com/en-us/library/windows/desktop/ms690276(v=vs.85).aspx -->
-  <define name="RPC_C_AUTHZ_NONE" value="0"/>
-  <define name="RPC_C_AUTHZ_NAME" value="1"/>
-  <define name="RPC_C_AUTHZ_DCE" value="2"/>
-  <define name="RPC_C_AUTHZ_DEFAULT" value="0xffffffff"/>
   <!-- Winerror.h: COM Error Codes (COMADMIN, FILTER, GRAPHICS) Ref.: https://msdn.microsoft.com/en-us/library/windows/desktop/dd542647(v=vs.85).aspx -->
   <define name="COMADMIN_E_OBJECTERRORS" value="0x80110401"/>
   <define name="COMADMIN_E_OBJECTINVALID" value="0x80110402"/>
@@ -7788,15 +7979,6 @@ HFONT CreateFont(
   <define name="IO_REPARSE_TAG_SIS" value="0x80000007"/>
   <define name="IO_REPARSE_TAG_SYMLINK" value="0xA000000C"/>
   <define name="IO_REPARSE_TAG_WIM" value="0x80000008"/>
-  <define name="CREATE_PROCESS_DEBUG_EVENT" value="3"/>
-  <define name="CREATE_THREAD_DEBUG_EVENT" value="2"/>
-  <define name="EXCEPTION_DEBUG_EVENT" value="1"/>
-  <define name="EXIT_PROCESS_DEBUG_EVENT" value="5"/>
-  <define name="EXIT_THREAD_DEBUG_EVENT" value="4"/>
-  <define name="LOAD_DLL_DEBUG_EVENT" value="6"/>
-  <define name="OUTPUT_DEBUG_STRING_EVENT" value="8"/>
-  <define name="RIP_EVENT" value="9"/>
-  <define name="UNLOAD_DLL_DEBUG_EVENT" value="7"/>
   <define name="COMADMIN_E_OBJECT_PARENT_MISSING" value="0x80110808"/>
   <define name="COMADMIN_E_OBJECT_DOES_NOT_EXIST" value="0x80110809"/>
   <define name="COMADMIN_E_APP_NOT_RUNNING" value="0x8011080A"/>
@@ -8634,9 +8816,6 @@ HFONT CreateFont(
   <define name="CO_E_CANCEL_DISABLED" value="0x80010140"/>
   <define name="RPC_E_UNEXPECTED" value="0x8001FFFF"/>
   <define name="LHND" value="0x0042"/>
-  <define name="LMEM_FIXED" value="0x0000"/>
-  <define name="LMEM_MOVEABLE" value="0x0002"/>
-  <define name="LMEM_ZEROINIT" value="0x0040"/>
   <define name="LPTR" value="0x0040"/>
   <define name="NONZEROLHND" value="0x0002"/>
   <define name="NONZEROLPTR" value="0x0000"/>
@@ -12458,7 +12637,6 @@ HFONT CreateFont(
   <define name="WAIT_ABANDONED" value="(0x00000080L)"/>
   <define name="WAIT_ABANDONED_0" value="(0x00000080L)"/>
   <define name="WAIT_IO_COMPLETION" value="STATUS_USER_APC"/>
-  <define name="SecureZeroMemory" value="RtlSecureZeroMemory"/>
   <define name="CaptureStackBackTrace" value="RtlCaptureStackBackTrace"/>
   <define name="FILE_FLAG_WRITE_THROUGH" value="0x80000000"/>
   <define name="FILE_FLAG_OVERLAPPED" value="0x40000000"/>
@@ -13051,6 +13229,7 @@ HFONT CreateFont(
   <define name="ENCLAVE_TYPE_VBS" value="0x00000010"/>
   <define name="ENCLAVE_TYPE_SGX" value="0x00000001"/>
   <define name="ENCLAVE_TYPE_SGX2" value="0x00000002"/>
+  <define name="ENCLAVE_TYPE_VBS_BASIC" value="0x00000011"/>
   <define name="MEM_PRIVATE" value="0x00020000"/>
   <define name="MEM_MAPPED" value="0x00040000"/>
   <define name="MEM_IMAGE" value="0x01000000"/>
@@ -13852,10 +14031,6 @@ HFONT CreateFont(
   <define name="FAPPCOMMAND_KEY" value="0"/>
   <define name="FAPPCOMMAND_OEM" value="0x1000"/>
   <define name="FAPPCOMMAND_MASK" value="0xF000"/>
-  <define name="MoveMemory" value="RtlMoveMemory"/>
-  <define name="CopyMemory" value="RtlCopyMemory"/>
-  <define name="FillMemory" value="RtlFillMemory"/>
-  <define name="ZeroMemory" value="RtlZeroMemory"/>
   <define name="FIND_FIRST_EX_CASE_SENSITIVE" value="0x00000001"/>
   <define name="FIND_FIRST_EX_LARGE_FETCH" value="0x00000002"/>
   <define name="FIND_FIRST_EX_ON_DISK_ENTRIES_ONLY" value="0x00000004"/>
@@ -14078,6 +14253,10 @@ HFONT CreateFont(
   <define name="SIID_CLUSTEREDDRIVE" value="140"/>
   <define name="SIID_MAX_ICONS" value="181"/>
   <!-- constants from winnt.h -->
+  <define name="GENERIC_READ" value="0x80000000L" />
+  <define name="GENERIC_WRITE" value="0x40000000L" />
+  <define name="GENERIC_EXECUTE" value="0x20000000L" />
+  <define name="GENERIC_ALL" value="0x10000000L" />
   <define name="LANG_AFRIKAANS" value="0x36"/>
   <define name="LANG_ALBANIAN" value="0x1c"/>
   <define name="LANG_ALSATIAN" value="0x84"/>
@@ -14463,57 +14642,6 @@ HFONT CreateFont(
   <define name="SUBLANG_YORUBA_NIGERIA" value="0x01"/>
   <define name="SUBLANG_ZULU_SOUTH_AFRICA" value="0x01"/>
   <define name="FILE_ALL_ACCESS" value="(STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF)"/>
-  <define name="FILE_SHARE_READ" value="0x00000001"/>
-  <define name="FILE_SHARE_WRITE" value="0x00000002"/>
-  <define name="FILE_SHARE_DELETE" value="0x00000004"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_PRIVACY" value="0x00004000"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_INTEGRITY" value="0x00008000"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_GLOBAL" value="0x00000004"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_PINNED" value="0x00000002"/>
-  <define name="FILE_ATTRIBUTE_STRICTLY_SEQUENTIAL" value="0x20000000"/>
-  <define name="FILE_NOTIFY_CHANGE_FILE_NAME" value="0x00000001"/>
-  <define name="FILE_NOTIFY_CHANGE_DIR_NAME" value="0x00000002"/>
-  <define name="FILE_NOTIFY_CHANGE_ATTRIBUTES" value="0x00000004"/>
-  <define name="FILE_NOTIFY_CHANGE_SIZE" value="0x00000008"/>
-  <define name="FILE_NOTIFY_CHANGE_LAST_WRITE" value="0x00000010"/>
-  <define name="FILE_NOTIFY_CHANGE_LAST_ACCESS" value="0x00000020"/>
-  <define name="FILE_NOTIFY_CHANGE_CREATION" value="0x00000040"/>
-  <define name="FILE_NOTIFY_CHANGE_SECURITY" value="0x00000100"/>
-  <define name="FILE_ACTION_ADDED" value="0x00000001"/>
-  <define name="FILE_ACTION_REMOVED" value="0x00000002"/>
-  <define name="FILE_ACTION_MODIFIED" value="0x00000003"/>
-  <define name="FILE_ACTION_RENAMED_OLD_NAME" value="0x00000004"/>
-  <define name="FILE_ACTION_RENAMED_NEW_NAME" value="0x00000005"/>
-  <define name="MAILSLOT_NO_MESSAGE" value="((DWORD)-1)"/>
-  <define name="MAILSLOT_WAIT_FOREVER" value="((DWORD)-1)"/>
-  <define name="FILE_CASE_SENSITIVE_SEARCH" value="0x00000001"/>
-  <define name="FILE_CASE_PRESERVED_NAMES" value="0x00000002"/>
-  <define name="FILE_UNICODE_ON_DISK" value="0x00000004"/>
-  <define name="FILE_PERSISTENT_ACLS" value="0x00000008"/>
-  <define name="FILE_FILE_COMPRESSION" value="0x00000010"/>
-  <define name="FILE_VOLUME_QUOTAS" value="0x00000020"/>
-  <define name="FILE_SUPPORTS_SPARSE_FILES" value="0x00000040"/>
-  <define name="FILE_SUPPORTS_REPARSE_POINTS" value="0x00000080"/>
-  <define name="FILE_SUPPORTS_REMOTE_STORAGE" value="0x00000100"/>
-  <define name="FILE_RETURNS_CLEANUP_RESULT_INFO" value="0x00000200"/>
-  <define name="FILE_SUPPORTS_POSIX_UNLINK_RENAME" value="0x00000400"/>
-  <define name="FILE_VOLUME_IS_COMPRESSED" value="0x00008000"/>
-  <define name="FILE_SUPPORTS_OBJECT_IDS" value="0x00010000"/>
-  <define name="FILE_SUPPORTS_ENCRYPTION" value="0x00020000"/>
-  <define name="FILE_NAMED_STREAMS" value="0x00040000"/>
-  <define name="FILE_READ_ONLY_VOLUME" value="0x00080000"/>
-  <define name="FILE_SEQUENTIAL_WRITE_ONCE" value="0x00100000"/>
-  <define name="FILE_SUPPORTS_TRANSACTIONS" value="0x00200000"/>
-  <define name="FILE_SUPPORTS_HARD_LINKS" value="0x00400000"/>
-  <define name="FILE_SUPPORTS_EXTENDED_ATTRIBUTES" value="0x00800000"/>
-  <define name="FILE_SUPPORTS_OPEN_BY_FILE_ID" value="0x01000000"/>
-  <define name="FILE_SUPPORTS_USN_JOURNAL" value="0x02000000"/>
-  <define name="FILE_SUPPORTS_INTEGRITY_STREAMS" value="0x04000000"/>
-  <define name="FILE_SUPPORTS_BLOCK_REFCOUNTING" value="0x08000000"/>
-  <define name="FILE_SUPPORTS_SPARSE_VDL" value="0x10000000"/>
-  <define name="FILE_DAX_VOLUME" value="0x20000000"/>
-  <define name="FILE_SUPPORTS_GHOSTING" value="0x40000000"/>
-  <define name="FILE_INVALID_FILE_ID" value="((LONGLONG)-1LL)"/>
   <define name="MAXIMUM_WAIT_OBJECTS" value="64"/>
   <define name="MAXIMUM_SUSPEND_COUNT" value="0x7F"/>
   <define name="VBS_BASIC_PAGE_MEASURED_DATA" value="0x00000001"/>
@@ -14521,132 +14649,10 @@ HFONT CreateFont(
   <define name="VBS_BASIC_PAGE_ZERO_FILL" value="0x00000003"/>
   <define name="VBS_BASIC_PAGE_THREAD_DESCRIPTOR" value="0x00000004"/>
   <define name="VBS_BASIC_PAGE_SYSTEM_CALL" value="0x00000005"/>
-  <define name="ENCLAVE_VBS_FLAG_DEBUG" value="0x00000001"/>
-  <define name="ENCLAVE_TYPE_VBS_BASIC" value="0x00000011"/>
-  <define name="ENCLAVE_TYPE_VBS" value="0x00000010"/>
-  <define name="MEM_PRIVATE" value="0x00020000"/>
-  <define name="MEM_MAPPED" value="0x00040000"/>
-  <define name="MEM_IMAGE" value="0x01000000"/>
-  <define name="WRITE_WATCH_FLAG_RESET" value="0x01"/>
-  <define name="ENCLAVE_TYPE_SGX" value="0x00000001"/>
-  <define name="ENCLAVE_TYPE_SGX2" value="0x00000002"/>
-  <define name="SEC_PARTITION_OWNER_HANDLE" value="0x00040000"/>
-  <define name="SEC_64K_PAGES" value="0x00080000"/>
-  <define name="SEC_FILE" value="0x00800000"/>
-  <define name="SEC_IMAGE" value="0x01000000"/>
-  <define name="SEC_PROTECTED_IMAGE" value="0x02000000"/>
-  <define name="SEC_RESERVE" value="0x04000000"/>
-  <define name="SEC_COMMIT" value="0x08000000"/>
-  <define name="SEC_NOCACHE" value="0x10000000"/>
-  <define name="SEC_WRITECOMBINE" value="0x40000000"/>
-  <define name="SEC_LARGE_PAGES" value="0x80000000"/>
   <define name="MEM_EXTENDED_PARAMETER_NONPAGED" value="0x00000002"/>
   <define name="MEM_EXTENDED_PARAMETER_ZERO_PAGES_OPTIONAL" value="0x00000004"/>
   <define name="MEM_EXTENDED_PARAMETER_NONPAGED_LARGE" value="0x00000008"/>
   <define name="MEM_EXTENDED_PARAMETER_NONPAGED_HUGE" value="0x00000010"/>
-  <define name="PAGE_NOACCESS" value="0x01"/>
-  <define name="PAGE_READONLY" value="0x02"/>
-  <define name="PAGE_READWRITE" value="0x04"/>
-  <define name="PAGE_WRITECOPY" value="0x08"/>
-  <define name="PAGE_EXECUTE" value="0x10"/>
-  <define name="PAGE_EXECUTE_READ" value="0x20"/>
-  <define name="PAGE_EXECUTE_READWRITE" value="0x40"/>
-  <define name="PAGE_EXECUTE_WRITECOPY" value="0x80"/>
-  <define name="PAGE_GUARD" value="0x100"/>
-  <define name="PAGE_NOCACHE" value="0x200"/>
-  <define name="PAGE_WRITECOMBINE" value="0x400"/>
-  <define name="PAGE_GRAPHICS_NOACCESS" value="0x0800"/>
-  <define name="PAGE_GRAPHICS_READONLY" value="0x1000"/>
-  <define name="PAGE_GRAPHICS_READWRITE" value="0x2000"/>
-  <define name="PAGE_GRAPHICS_EXECUTE" value="0x4000"/>
-  <define name="PAGE_GRAPHICS_EXECUTE_READ" value="0x8000"/>
-  <define name="PAGE_GRAPHICS_EXECUTE_READWRITE" value="0x10000"/>
-  <define name="PAGE_GRAPHICS_COHERENT" value="0x20000"/>
-  <define name="PAGE_ENCLAVE_THREAD_CONTROL" value="0x80000000"/>
-  <define name="PAGE_REVERT_TO_FILE_MAP" value="0x80000000"/>
-  <define name="PAGE_TARGETS_NO_UPDATE" value="0x40000000"/>
-  <define name="PAGE_TARGETS_INVALID" value="0x40000000"/>
-  <define name="PAGE_ENCLAVE_UNVALIDATED" value="0x20000000"/>
-  <define name="PAGE_ENCLAVE_DECOMMIT" value="0x10000000"/>
-  <define name="MEM_COMMIT" value="0x00001000"/>
-  <define name="MEM_RESERVE" value="0x00002000"/>
-  <define name="MEM_REPLACE_PLACEHOLDER" value="0x00004000"/>
-  <define name="MEM_RESERVE_PLACEHOLDER" value="0x00040000"/>
-  <define name="MEM_RESET" value="0x00080000"/>
-  <define name="MEM_TOP_DOWN" value="0x00100000"/>
-  <define name="MEM_WRITE_WATCH" value="0x00200000"/>
-  <define name="MEM_PHYSICAL" value="0x00400000"/>
-  <define name="MEM_ROTATE" value="0x00800000"/>
-  <define name="MEM_DIFFERENT_IMAGE_BASE_OK" value="0x00800000"/>
-  <define name="MEM_RESET_UNDO" value="0x01000000"/>
-  <define name="MEM_LARGE_PAGES" value="0x20000000"/>
-  <define name="MEM_4MB_PAGES" value="0x80000000"/>
-  <define name="MEM_UNMAP_WITH_TRANSIENT_BOOST" value="0x00000001"/>
-  <define name="MEM_COALESCE_PLACEHOLDERS" value="0x00000001"/>
-  <define name="MEM_PRESERVE_PLACEHOLDER" value="0x00000002"/>
-  <define name="MEM_DECOMMIT" value="0x00004000"/>
-  <define name="MEM_RELEASE" value="0x00008000"/>
-  <define name="MEM_FREE" value="0x00010000"/>
-  <define name="FILE_SHARE_READ" value="0x00000001"/>
-  <define name="FILE_SHARE_WRITE" value="0x00000002"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_PRIVACY" value="0x00004000"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_INTEGRITY" value="0x00008000"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_GLOBAL" value="0x00000004"/>
-  <define name="TREE_CONNECT_ATTRIBUTE_PINNED" value="0x00000002"/>
-  <define name="FILE_ATTRIBUTE_STRICTLY_SEQUENTIAL" value="0x20000000"/>
-  <define name="FILE_NOTIFY_CHANGE_FILE_NAME" value="0x00000001"/>
-  <define name="FILE_NOTIFY_CHANGE_DIR_NAME" value="0x00000002"/>
-  <define name="FILE_NOTIFY_CHANGE_ATTRIBUTES" value="0x00000004"/>
-  <define name="FILE_NOTIFY_CHANGE_SIZE" value="0x00000008"/>
-  <define name="FILE_NOTIFY_CHANGE_LAST_WRITE" value="0x00000010"/>
-  <define name="FILE_NOTIFY_CHANGE_LAST_ACCESS" value="0x00000020"/>
-  <define name="FILE_NOTIFY_CHANGE_CREATION" value="0x00000040"/>
-  <define name="FILE_NOTIFY_CHANGE_SECURITY" value="0x00000100"/>
-  <define name="FILE_ACTION_ADDED" value="0x00000001"/>
-  <define name="FILE_ACTION_REMOVED" value="0x00000002"/>
-  <define name="FILE_ACTION_MODIFIED" value="0x00000003"/>
-  <define name="FILE_ACTION_RENAMED_OLD_NAME" value="0x00000004"/>
-  <define name="FILE_ACTION_RENAMED_NEW_NAME" value="0x00000005"/>
-  <define name="MAILSLOT_NO_MESSAGE" value="((DWORD)-1)"/>
-  <define name="MAILSLOT_WAIT_FOREVER" value="((DWORD)-1)"/>
-  <define name="FILE_CASE_SENSITIVE_SEARCH" value="0x00000001"/>
-  <define name="FILE_CASE_PRESERVED_NAMES" value="0x00000002"/>
-  <define name="FILE_UNICODE_ON_DISK" value="0x00000004"/>
-  <define name="FILE_PERSISTENT_ACLS" value="0x00000008"/>
-  <define name="FILE_FILE_COMPRESSION" value="0x00000010"/>
-  <define name="FILE_VOLUME_QUOTAS" value="0x00000020"/>
-  <define name="FILE_SUPPORTS_SPARSE_FILES" value="0x00000040"/>
-  <define name="FILE_SUPPORTS_REPARSE_POINTS" value="0x00000080"/>
-  <define name="FILE_SUPPORTS_REMOTE_STORAGE" value="0x00000100"/>
-  <define name="FILE_RETURNS_CLEANUP_RESULT_INFO" value="0x00000200"/>
-  <define name="FILE_SUPPORTS_POSIX_UNLINK_RENAME" value="0x00000400"/>
-  <define name="FILE_VOLUME_IS_COMPRESSED" value="0x00008000"/>
-  <define name="FILE_SUPPORTS_OBJECT_IDS" value="0x00010000"/>
-  <define name="FILE_SUPPORTS_ENCRYPTION" value="0x00020000"/>
-  <define name="FILE_NAMED_STREAMS" value="0x00040000"/>
-  <define name="FILE_READ_ONLY_VOLUME" value="0x00080000"/>
-  <define name="FILE_SEQUENTIAL_WRITE_ONCE" value="0x00100000"/>
-  <define name="FILE_SUPPORTS_TRANSACTIONS" value="0x00200000"/>
-  <define name="FILE_SUPPORTS_HARD_LINKS" value="0x00400000"/>
-  <define name="FILE_SUPPORTS_EXTENDED_ATTRIBUTES" value="0x00800000"/>
-  <define name="FILE_SUPPORTS_OPEN_BY_FILE_ID" value="0x01000000"/>
-  <define name="FILE_SUPPORTS_USN_JOURNAL" value="0x02000000"/>
-  <define name="FILE_SUPPORTS_INTEGRITY_STREAMS" value="0x04000000"/>
-  <define name="FILE_SUPPORTS_BLOCK_REFCOUNTING" value="0x08000000"/>
-  <define name="FILE_SUPPORTS_SPARSE_VDL" value="0x10000000"/>
-  <define name="FILE_DAX_VOLUME" value="0x20000000"/>
-  <define name="FILE_SUPPORTS_GHOSTING" value="0x40000000"/>
-  <define name="FILE_INVALID_FILE_ID" value="((LONGLONG)-1LL)"/>
-  <define name="SESSION_QUERY_ACCESS" value="0x0001"/>
-  <define name="SESSION_MODIFY_ACCESS" value="0x0002"/>
-  <define name="SECTION_QUERY" value="0x0001"/>
-  <define name="SECTION_MAP_WRITE" value="0x0002"/>
-  <define name="SECTION_MAP_READ" value="0x0004"/>
-  <define name="SECTION_MAP_EXECUTE" value="0x0008"/>
-  <define name="SECTION_EXTEND_SIZE" value="0x0010"/>
-  <define name="SECTION_MAP_EXECUTE_EXPLICIT" value="0x0020"/>
-  <define name="CFG_CALL_TARGET_VALID" value="(0x00000001)"/>
-  <define name="CFG_CALL_TARGET_PROCESSED" value="(0x00000002)"/>
   <!-- WinBase.h -->
   <define name="HasOverlappedIoCompleted(lpOverlapped)" value="(((DWORD)(lpOverlapped)-&gt;Internal)!=STATUS_PENDING)"/>
   <define name="PROCESS_DEP_ENABLE" value="0x00000001"/>
@@ -14706,147 +14712,6 @@ HFONT CreateFont(
   <define name="VOLUME_NAME_NONE" value="0x4"/>
   <define name="FILE_NAME_NORMALIZED" value="0x0"/>
   <define name="FILE_NAME_OPENED" value="0x8"/>
-  <define name="DRIVE_UNKNOWN" value="0"/>
-  <define name="DRIVE_NO_ROOT_DIR" value="1"/>
-  <define name="DRIVE_REMOVABLE" value="2"/>
-  <define name="DRIVE_FIXED" value="3"/>
-  <define name="DRIVE_REMOTE" value="4"/>
-  <define name="DRIVE_CDROM" value="5"/>
-  <define name="DRIVE_RAMDISK" value="6"/>
-  <define name="GetFreeSpace(w)" value="(0x100000L)"/>
-  <define name="FILE_TYPE_UNKNOWN" value="0x0000"/>
-  <define name="FILE_TYPE_DISK" value="0x0001"/>
-  <define name="FILE_TYPE_CHAR" value="0x0002"/>
-  <define name="FILE_TYPE_PIPE" value="0x0003"/>
-  <define name="FILE_TYPE_REMOTE" value="0x8000"/>
-  <define name="NOPARITY" value="0"/>
-  <define name="ODDPARITY" value="1"/>
-  <define name="EVENPARITY" value="2"/>
-  <define name="MARKPARITY" value="3"/>
-  <define name="SPACEPARITY" value="4"/>
-  <define name="ONESTOPBIT" value="0"/>
-  <define name="ONE5STOPBITS" value="1"/>
-  <define name="TWOSTOPBITS" value="2"/>
-  <define name="IGNORE" value="0"/>
-  <define name="INFINITE" value="0xFFFFFFFF"/>
-  <define name="CBR_110" value="110"/>
-  <define name="CBR_300" value="300"/>
-  <define name="CBR_600" value="600"/>
-  <define name="CBR_1200" value="1200"/>
-  <define name="CBR_2400" value="2400"/>
-  <define name="CBR_4800" value="4800"/>
-  <define name="CBR_9600" value="9600"/>
-  <define name="CBR_14400" value="14400"/>
-  <define name="CBR_19200" value="19200"/>
-  <define name="CBR_38400" value="38400"/>
-  <define name="CBR_56000" value="56000"/>
-  <define name="CBR_57600" value="57600"/>
-  <define name="CBR_115200" value="115200"/>
-  <define name="CBR_128000" value="128000"/>
-  <define name="CBR_256000" value="256000"/>
-  <define name="CE_RXOVER" value="0x0001"/>
-  <define name="CE_OVERRUN" value="0x0002"/>
-  <define name="CE_RXPARITY" value="0x0004"/>
-  <define name="CE_FRAME" value="0x0008"/>
-  <define name="CE_BREAK" value="0x0010"/>
-  <define name="CE_TXFULL" value="0x0100"/>
-  <define name="CE_PTO" value="0x0200"/>
-  <define name="CE_IOE" value="0x0400"/>
-  <define name="CE_DNS" value="0x0800"/>
-  <define name="CE_OOP" value="0x1000"/>
-  <define name="CE_MODE" value="0x8000"/>
-  <define name="IE_BADID" value="(-1)"/>
-  <define name="IE_OPEN" value="(-2)"/>
-  <define name="IE_NOPEN" value="(-3)"/>
-  <define name="IE_MEMORY" value="(-4)"/>
-  <define name="IE_DEFAULT" value="(-5)"/>
-  <define name="IE_HARDWARE" value="(-10)"/>
-  <define name="IE_BYTESIZE" value="(-11)"/>
-  <define name="IE_BAUDRATE" value="(-12)"/>
-  <define name="EV_RXCHAR" value="0x0001"/>
-  <define name="EV_RXFLAG" value="0x0002"/>
-  <define name="EV_TXEMPTY" value="0x0004"/>
-  <define name="EV_CTS" value="0x0008"/>
-  <define name="EV_DSR" value="0x0010"/>
-  <define name="EV_RLSD" value="0x0020"/>
-  <define name="EV_BREAK" value="0x0040"/>
-  <define name="EV_ERR" value="0x0080"/>
-  <define name="EV_RING" value="0x0100"/>
-  <define name="EV_PERR" value="0x0200"/>
-  <define name="EV_RX80FULL" value="0x0400"/>
-  <define name="EV_EVENT1" value="0x0800"/>
-  <define name="EV_EVENT2" value="0x1000"/>
-  <define name="SETXOFF" value="1"/>
-  <define name="SETXON" value="2"/>
-  <define name="SETRTS" value="3"/>
-  <define name="CLRRTS" value="4"/>
-  <define name="SETDTR" value="5"/>
-  <define name="CLRDTR" value="6"/>
-  <define name="RESETDEV" value="7"/>
-  <define name="SETBREAK" value="8"/>
-  <define name="CLRBREAK" value="9"/>
-  <define name="PURGE_TXABORT" value="0x0001"/>
-  <define name="PURGE_RXABORT" value="0x0002"/>
-  <define name="PURGE_TXCLEAR" value="0x0004"/>
-  <define name="PURGE_RXCLEAR" value="0x0008"/>
-  <define name="LPTx" value="0x80"/>
-  <define name="S_QUEUEEMPTY" value="0"/>
-  <define name="S_THRESHOLD" value="1"/>
-  <define name="S_ALLTHRESHOLD" value="2"/>
-  <define name="S_NORMAL" value="0"/>
-  <define name="S_LEGATO" value="1"/>
-  <define name="S_STACCATO" value="2"/>
-  <define name="S_PERIOD512" value="0"/>
-  <define name="S_PERIOD1024" value="1"/>
-  <define name="S_PERIOD2048" value="2"/>
-  <define name="S_PERIODVOICE" value="3"/>
-  <define name="S_WHITE512" value="4"/>
-  <define name="S_WHITE1024" value="5"/>
-  <define name="S_WHITE2048" value="6"/>
-  <define name="S_WHITEVOICE" value="7"/>
-  <define name="S_SERDVNA" value="(-1)"/>
-  <define name="S_SEROFM" value="(-2)"/>
-  <define name="S_SERMACT" value="(-3)"/>
-  <define name="S_SERQFUL" value="(-4)"/>
-  <define name="S_SERBDNT" value="(-5)"/>
-  <define name="S_SERDLN" value="(-6)"/>
-  <define name="S_SERDCC" value="(-7)"/>
-  <define name="S_SERDTP" value="(-8)"/>
-  <define name="S_SERDVL" value="(-9)"/>
-  <define name="S_SERDMD" value="(-10)"/>
-  <define name="S_SERDSH" value="(-11)"/>
-  <define name="S_SERDPT" value="(-12)"/>
-  <define name="S_SERDFQ" value="(-13)"/>
-  <define name="S_SERDDR" value="(-14)"/>
-  <define name="S_SERDSR" value="(-15)"/>
-  <define name="S_SERDST" value="(-16)"/>
-  <define name="NMPWAIT_WAIT_FOREVER" value="0xffffffff"/>
-  <define name="NMPWAIT_NOWAIT" value="0x00000001"/>
-  <define name="NMPWAIT_USE_DEFAULT_WAIT" value="0x00000000"/>
-  <define name="FS_CASE_IS_PRESERVED" value="FILE_CASE_PRESERVED_NAMES"/>
-  <define name="FS_CASE_SENSITIVE" value="FILE_CASE_SENSITIVE_SEARCH"/>
-  <define name="FS_UNICODE_STORED_ON_DISK" value="FILE_UNICODE_ON_DISK"/>
-  <define name="FS_PERSISTENT_ACLS" value="FILE_PERSISTENT_ACLS"/>
-  <define name="FS_VOL_IS_COMPRESSED" value="FILE_VOLUME_IS_COMPRESSED"/>
-  <define name="FS_FILE_COMPRESSION" value="FILE_FILE_COMPRESSION"/>
-  <define name="FS_FILE_ENCRYPTION" value="FILE_SUPPORTS_ENCRYPTION"/>
-  <define name="OF_READ" value="0x00000000"/>
-  <define name="OF_WRITE" value="0x00000001"/>
-  <define name="OF_READWRITE" value="0x00000002"/>
-  <define name="OF_SHARE_COMPAT" value="0x00000000"/>
-  <define name="OF_SHARE_EXCLUSIVE" value="0x00000010"/>
-  <define name="OF_SHARE_DENY_WRITE" value="0x00000020"/>
-  <define name="OF_SHARE_DENY_READ" value="0x00000030"/>
-  <define name="OF_SHARE_DENY_NONE" value="0x00000040"/>
-  <define name="OF_PARSE" value="0x00000100"/>
-  <define name="OF_DELETE" value="0x00000200"/>
-  <define name="OF_VERIFY" value="0x00000400"/>
-  <define name="OF_CANCEL" value="0x00000800"/>
-  <define name="OF_CREATE" value="0x00001000"/>
-  <define name="OF_PROMPT" value="0x00002000"/>
-  <define name="OF_EXIST" value="0x00004000"/>
-  <define name="OF_REOPEN" value="0x00008000"/>
-  <define name="OFS_MAXPATHNAME" value="128"/>
   <define name="FreeModule(hLibModule)" value="FreeLibrary((hLibModule))"/>
   <define name="MakeProcInstance(lpProc,hInstance)" value="(lpProc)"/>
   <define name="FreeProcInstance(lpProc)" value="(lpProc)"/>
@@ -16985,743 +16850,7 @@ HFONT CreateFont(
   <define name="RASAPIVERSION_600" value="3"/>
   <define name="RASAPIVERSION_601" value="4"/>
   <!-- Winerror.h: COM Error Codes (Security and Setup) -->
-  <define name="ERROR_AUDITING_DISABLED" value="0xC0090001"/>
-  <define name="ERROR_ALL_SIDS_FILTERED" value="0xC0090002"/>
-  <define name="ERROR_BIZRULES_NOT_ENABLED" value="0xC0090003"/>
-  <define name="APPX_E_PACKAGING_INTERNAL" value="0x80080200"/>
-  <define name="APPX_E_INTERLEAVING_NOT_ALLOWED" value="0x80080201"/>
-  <define name="APPX_E_RELATIONSHIPS_NOT_ALLOWED" value="0x80080202"/>
-  <define name="APPX_E_MISSING_REQUIRED_FILE" value="0x80080203"/>
-  <define name="APPX_E_INVALID_MANIFEST" value="0x80080204"/>
-  <define name="APPX_E_INVALID_BLOCKMAP" value="0x80080205"/>
-  <define name="APPX_E_CORRUPT_CONTENT" value="0x80080206"/>
-  <define name="APPX_E_BLOCK_HASH_INVALID" value="0x80080207"/>
-  <define name="APPX_E_REQUESTED_RANGE_TOO_LARGE" value="0x80080208"/>
-  <define name="APPX_E_INVALID_SIP_CLIENT_DATA" value="0x80080209"/>
-  <define name="E_APPLICATION_ACTIVATION_TIMED_OUT" value="0x8027025A"/>
-  <define name="E_APPLICATION_ACTIVATION_EXEC_FAILURE" value="0x8027025B"/>
-  <define name="E_APPLICATION_TEMPORARY_LICENSE_ERROR" value="0x8027025C"/>
-  <define name="NTE_BAD_UID" value="0x80090001"/>
-  <define name="NTE_BAD_HASH" value="0x80090002"/>
-  <define name="NTE_BAD_KEY" value="0x80090003"/>
-  <define name="NTE_BAD_LEN" value="0x80090004"/>
-  <define name="NTE_BAD_DATA" value="0x80090005"/>
-  <define name="NTE_BAD_SIGNATURE" value="0x80090006"/>
-  <define name="NTE_BAD_VER" value="0x80090007"/>
-  <define name="NTE_BAD_ALGID" value="0x80090008"/>
-  <define name="NTE_BAD_FLAGS" value="0x80090009"/>
-  <define name="NTE_BAD_TYPE" value="0x8009000A"/>
-  <define name="NTE_BAD_KEY_STATE" value="0x8009000B"/>
-  <define name="NTE_BAD_HASH_STATE" value="0x8009000C"/>
-  <define name="NTE_NO_KEY" value="0x8009000D"/>
-  <define name="NTE_NO_MEMORY" value="0x8009000E"/>
-  <define name="NTE_EXISTS" value="0x8009000F"/>
-  <define name="NTE_PERM" value="0x80090010"/>
-  <define name="NTE_NOT_FOUND" value="0x80090011"/>
-  <define name="NTE_DOUBLE_ENCRYPT" value="0x80090012"/>
-  <define name="NTE_BAD_PROVIDER" value="0x80090013"/>
-  <define name="NTE_BAD_PROV_TYPE" value="0x80090014"/>
-  <define name="NTE_BAD_PUBLIC_KEY" value="0x80090015"/>
-  <define name="NTE_BAD_KEYSET" value="0x80090016"/>
-  <define name="NTE_PROV_TYPE_NOT_DEF" value="0x80090017"/>
-  <define name="NTE_PROV_TYPE_ENTRY_BAD" value="0x80090018"/>
-  <define name="NTE_KEYSET_NOT_DEF" value="0x80090019"/>
-  <define name="NTE_KEYSET_ENTRY_BAD" value="0x8009001A"/>
-  <define name="NTE_PROV_TYPE_NO_MATCH" value="0x8009001B"/>
-  <define name="NTE_SIGNATURE_FILE_BAD" value="0x8009001C"/>
-  <define name="NTE_PROVIDER_DLL_FAIL" value="0x8009001D"/>
-  <define name="NTE_PROV_DLL_NOT_FOUND" value="0x8009001E"/>
-  <define name="NTE_BAD_KEYSET_PARAM" value="0x8009001F"/>
-  <define name="NTE_FAIL" value="0x80090020"/>
-  <define name="NTE_SYS_ERR" value="0x80090021"/>
-  <define name="NTE_SILENT_CONTEXT" value="0x80090022"/>
-  <define name="NTE_TOKEN_KEYSET_STORAGE_FULL" value="0x80090023"/>
-  <define name="NTE_TEMPORARY_PROFILE" value="0x80090024"/>
-  <define name="NTE_FIXEDPARAMETER" value="0x80090025"/>
-  <define name="NTE_INVALID_HANDLE" value="0x80090026"/>
-  <define name="NTE_INVALID_PARAMETER" value="0x80090027"/>
-  <define name="NTE_BUFFER_TOO_SMALL" value="0x80090028"/>
-  <define name="NTE_NOT_SUPPORTED" value="0x80090029"/>
-  <define name="NTE_NO_MORE_ITEMS" value="0x8009002A"/>
-  <define name="NTE_BUFFERS_OVERLAP" value="0x8009002B"/>
-  <define name="NTE_DECRYPTION_FAILURE" value="0x8009002C"/>
-  <define name="NTE_INTERNAL_ERROR" value="0x8009002D"/>
-  <define name="NTE_UI_REQUIRED" value="0x8009002E"/>
-  <define name="NTE_HMAC_NOT_SUPPORTED" value="0x8009002F"/>
-  <define name="NTE_DEVICE_NOT_READY" value="0x80090030"/>
-  <define name="NTE_AUTHENTICATION_IGNORED" value="0x80090031"/>
-  <define name="NTE_VALIDATION_FAILED" value="0x80090032"/>
-  <define name="NTE_INCORRECT_PASSWORD" value="0x80090033"/>
-  <define name="NTE_ENCRYPTION_FAILURE" value="0x80090034"/>
-  <define name="SEC_E_INSUFFICIENT_MEMORY" value="0x80090300"/>
-  <define name="SEC_E_INVALID_HANDLE" value="0x80090301"/>
-  <define name="SEC_E_UNSUPPORTED_FUNCTION" value="0x80090302"/>
-  <define name="SEC_E_TARGET_UNKNOWN" value="0x80090303"/>
-  <define name="SEC_E_INTERNAL_ERROR" value="0x80090304"/>
-  <define name="SEC_E_SECPKG_NOT_FOUND" value="0x80090305"/>
-  <define name="SEC_E_NOT_OWNER" value="0x80090306"/>
-  <define name="SEC_E_CANNOT_INSTALL" value="0x80090307"/>
-  <define name="SEC_E_INVALID_TOKEN" value="0x80090308"/>
-  <define name="SEC_E_CANNOT_PACK" value="0x80090309"/>
-  <define name="SEC_E_QOP_NOT_SUPPORTED" value="0x8009030A"/>
-  <define name="SEC_E_NO_IMPERSONATION" value="0x8009030B"/>
-  <define name="SEC_E_LOGON_DENIED" value="0x8009030C"/>
-  <define name="SEC_E_UNKNOWN_CREDENTIALS" value="0x8009030D"/>
-  <define name="SEC_E_NO_CREDENTIALS" value="0x8009030E"/>
-  <define name="SEC_E_MESSAGE_ALTERED" value="0x8009030F"/>
-  <define name="SEC_E_OUT_OF_SEQUENCE" value="0x80090310"/>
-  <define name="SEC_E_NO_AUTHENTICATING_AUTHORITY" value="0x80090311"/>
-  <define name="SEC_I_CONTINUE_NEEDED" value="0x00090312"/>
-  <define name="SEC_I_COMPLETE_NEEDED" value="0x00090313"/>
-  <define name="SEC_I_COMPLETE_AND_CONTINUE" value="0x00090314"/>
-  <define name="SEC_I_LOCAL_LOGON" value="0x00090315"/>
-  <define name="SEC_E_BAD_PKGID" value="0x80090316"/>
-  <define name="SEC_E_CONTEXT_EXPIRED" value="0x80090317"/>
-  <define name="SEC_I_CONTEXT_EXPIRED" value="0x00090317"/>
-  <define name="SEC_E_INCOMPLETE_MESSAGE" value="0x80090318"/>
-  <define name="SEC_E_INCOMPLETE_CREDENTIALS" value="0x80090320"/>
-  <define name="SEC_E_BUFFER_TOO_SMALL" value="0x80090321"/>
-  <define name="SEC_I_INCOMPLETE_CREDENTIALS" value="0x00090320"/>
-  <define name="SEC_I_RENEGOTIATE" value="0x00090321"/>
-  <define name="SEC_E_WRONG_PRINCIPAL" value="0x80090322"/>
-  <define name="SEC_I_NO_LSA_CONTEXT" value="0x00090323"/>
-  <define name="SEC_E_TIME_SKEW" value="0x80090324"/>
-  <define name="SEC_E_UNTRUSTED_ROOT" value="0x80090325"/>
-  <define name="SEC_E_ILLEGAL_MESSAGE" value="0x80090326"/>
-  <define name="SEC_E_CERT_UNKNOWN" value="0x80090327"/>
-  <define name="SEC_E_CERT_EXPIRED" value="0x80090328"/>
-  <define name="SEC_E_ENCRYPT_FAILURE" value="0x80090329"/>
-  <define name="SEC_E_DECRYPT_FAILURE" value="0x80090330"/>
-  <define name="SEC_E_ALGORITHM_MISMATCH" value="0x80090331"/>
-  <define name="SEC_E_SECURITY_QOS_FAILED" value="0x80090332"/>
-  <define name="SEC_E_UNFINISHED_CONTEXT_DELETED" value="0x80090333"/>
-  <define name="SEC_E_NO_TGT_REPLY" value="0x80090334"/>
-  <define name="SEC_E_NO_IP_ADDRESSES" value="0x80090335"/>
-  <define name="SEC_E_WRONG_CREDENTIAL_HANDLE" value="0x80090336"/>
-  <define name="SEC_E_CRYPTO_SYSTEM_INVALID" value="0x80090337"/>
-  <define name="SEC_E_MAX_REFERRALS_EXCEEDED" value="0x80090338"/>
-  <define name="SEC_E_MUST_BE_KDC" value="0x80090339"/>
-  <define name="SEC_E_STRONG_CRYPTO_NOT_SUPPORTED" value="0x8009033A"/>
-  <define name="SEC_E_TOO_MANY_PRINCIPALS" value="0x8009033B"/>
-  <define name="SEC_E_NO_PA_DATA" value="0x8009033C"/>
-  <define name="SEC_E_PKINIT_NAME_MISMATCH" value="0x8009033D"/>
-  <define name="SEC_E_SMARTCARD_LOGON_REQUIRED" value="0x8009033E"/>
-  <define name="SEC_E_SHUTDOWN_IN_PROGRESS" value="0x8009033F"/>
-  <define name="SEC_E_KDC_INVALID_REQUEST" value="0x80090340"/>
-  <define name="SEC_E_KDC_UNABLE_TO_REFER" value="0x80090341"/>
-  <define name="SEC_E_KDC_UNKNOWN_ETYPE" value="0x80090342"/>
-  <define name="SEC_E_UNSUPPORTED_PREAUTH" value="0x80090343"/>
-  <define name="SEC_E_DELEGATION_REQUIRED" value="0x80090345"/>
-  <define name="SEC_E_BAD_BINDINGS" value="0x80090346"/>
-  <define name="SEC_E_MULTIPLE_ACCOUNTS" value="0x80090347"/>
-  <define name="SEC_E_NO_KERB_KEY" value="0x80090348"/>
-  <define name="SEC_E_CERT_WRONG_USAGE" value="0x80090349"/>
-  <define name="SEC_E_DOWNGRADE_DETECTED" value="0x80090350"/>
-  <define name="SEC_E_SMARTCARD_CERT_REVOKED" value="0x80090351"/>
-  <define name="SEC_E_ISSUING_CA_UNTRUSTED" value="0x80090352"/>
-  <define name="SEC_E_REVOCATION_OFFLINE_C" value="0x80090353"/>
-  <define name="SEC_E_PKINIT_CLIENT_FAILURE" value="0x80090354"/>
-  <define name="SEC_E_SMARTCARD_CERT_EXPIRED" value="0x80090355"/>
-  <define name="SEC_E_NO_S4U_PROT_SUPPORT" value="0x80090356"/>
-  <define name="SEC_E_CROSSREALM_DELEGATION_FAILURE" value="0x80090357"/>
-  <define name="SEC_E_REVOCATION_OFFLINE_KDC" value="0x80090358"/>
-  <define name="SEC_E_ISSUING_CA_UNTRUSTED_KDC" value="0x80090359"/>
-  <define name="SEC_E_KDC_CERT_EXPIRED" value="0x8009035A"/>
-  <define name="SEC_E_KDC_CERT_REVOKED" value="0x8009035B"/>
-  <define name="SEC_I_SIGNATURE_NEEDED" value="0x0009035C"/>
-  <define name="SEC_E_INVALID_PARAMETER" value="0x8009035D"/>
-  <define name="SEC_E_DELEGATION_POLICY" value="0x8009035E"/>
-  <define name="SEC_E_POLICY_NLTM_ONLY" value="0x8009035F"/>
-  <define name="SEC_I_NO_RENEGOTIATION" value="0x00090360"/>
-  <define name="SEC_E_NO_CONTEXT" value="0x80090361"/>
-  <define name="SEC_E_PKU2U_CERT_FAILURE" value="0x80090362"/>
-  <define name="SEC_E_MUTUAL_AUTH_FAILED" value="0x80090363"/>
-  <define name="SEC_I_MESSAGE_FRAGMENT" value="0x00090364"/>
-  <define name="SEC_E_ONLY_HTTPS_ALLOWED" value="0x80090365"/>
-  <define name="SEC_I_CONTINUE_NEEDED_MESSAGE_OK" value="0x80090366"/>
-  <define name="CRYPT_E_MSG_ERROR" value="0x80091001"/>
-  <define name="CRYPT_E_UNKNOWN_ALGO" value="0x80091002"/>
-  <define name="CRYPT_E_OID_FORMAT" value="0x80091003"/>
-  <define name="CRYPT_E_INVALID_MSG_TYPE" value="0x80091004"/>
-  <define name="CRYPT_E_UNEXPECTED_ENCODING" value="0x80091005"/>
-  <define name="CRYPT_E_AUTH_ATTR_MISSING" value="0x80091006"/>
-  <define name="CRYPT_E_HASH_VALUE" value="0x80091007"/>
-  <define name="CRYPT_E_INVALID_INDEX" value="0x80091008"/>
-  <define name="CRYPT_E_ALREADY_DECRYPTED" value="0x80091009"/>
-  <define name="CRYPT_E_NOT_DECRYPTED" value="0x8009100A"/>
-  <define name="CRYPT_E_RECIPIENT_NOT_FOUND" value="0x8009100B"/>
-  <define name="CRYPT_E_CONTROL_TYPE" value="0x8009100C"/>
-  <define name="CRYPT_E_ISSUER_SERIALNUMBER" value="0x8009100D"/>
-  <define name="CRYPT_E_SIGNER_NOT_FOUND" value="0x8009100E"/>
-  <define name="CRYPT_E_ATTRIBUTES_MISSING" value="0x8009100F"/>
-  <define name="CRYPT_E_STREAM_MSG_NOT_READY" value="0x80091010"/>
-  <define name="CRYPT_E_STREAM_INSUFFICIENT_DATA" value="0x80091011"/>
-  <define name="CRYPT_I_NEW_PROTECTION_REQUIRED" value="0x00091012"/>
-  <define name="CRYPT_E_BAD_LEN" value="0x80092001"/>
-  <define name="CRYPT_E_BAD_ENCODE" value="0x80092002"/>
-  <define name="CRYPT_E_FILE_ERROR" value="0x80092003"/>
-  <define name="CRYPT_E_NOT_FOUND" value="0x80092004"/>
-  <define name="CRYPT_E_EXISTS" value="0x80092005"/>
-  <define name="CRYPT_E_NO_PROVIDER" value="0x80092006"/>
-  <define name="CRYPT_E_SELF_SIGNED" value="0x80092007"/>
-  <define name="CRYPT_E_DELETED_PREV" value="0x80092008"/>
-  <define name="CRYPT_E_NO_MATCH" value="0x80092009"/>
-  <define name="CRYPT_E_UNEXPECTED_MSG_TYPE" value="0x8009200A"/>
-  <define name="CRYPT_E_NO_KEY_PROPERTY" value="0x8009200B"/>
-  <define name="CRYPT_E_NO_DECRYPT_CERT" value="0x8009200C"/>
-  <define name="CRYPT_E_BAD_MSG" value="0x8009200D"/>
-  <define name="CRYPT_E_NO_SIGNER" value="0x8009200E"/>
-  <define name="CRYPT_E_PENDING_CLOSE" value="0x8009200F"/>
-  <define name="CRYPT_E_REVOKED" value="0x80092010"/>
-  <define name="CRYPT_E_NO_REVOCATION_DLL" value="0x80092011"/>
-  <define name="CRYPT_E_NO_REVOCATION_CHECK" value="0x80092012"/>
-  <define name="CRYPT_E_REVOCATION_OFFLINE" value="0x80092013"/>
-  <define name="CRYPT_E_NOT_IN_REVOCATION_DATABASE" value="0x80092014"/>
-  <define name="CRYPT_E_INVALID_NUMERIC_STRING" value="0x80092020"/>
-  <define name="CRYPT_E_INVALID_PRINTABLE_STRING" value="0x80092021"/>
-  <define name="CRYPT_E_INVALID_IA5_STRING" value="0x80092022"/>
-  <define name="CRYPT_E_INVALID_X500_STRING" value="0x80092023"/>
-  <define name="CRYPT_E_NOT_CHAR_STRING" value="0x80092024"/>
-  <define name="CRYPT_E_FILERESIZED" value="0x80092025"/>
-  <define name="CRYPT_E_SECURITY_SETTINGS" value="0x80092026"/>
-  <define name="CRYPT_E_NO_VERIFY_USAGE_DLL" value="0x80092027"/>
-  <define name="CRYPT_E_NO_VERIFY_USAGE_CHECK" value="0x80092028"/>
-  <define name="CRYPT_E_VERIFY_USAGE_OFFLINE" value="0x80092029"/>
-  <define name="CRYPT_E_NOT_IN_CTL" value="0x8009202A"/>
-  <define name="CRYPT_E_NO_TRUSTED_SIGNER" value="0x8009202B"/>
-  <define name="CRYPT_E_MISSING_PUBKEY_PARA" value="0x8009202C"/>
-  <define name="CRYPT_E_OBJECT_LOCATOR_NOT_FOUND" value="0x8009202d"/>
-  <define name="CRYPT_E_OSS_ERROR" value="0x80093000"/>
-  <define name="OSS_MORE_BUF" value="0x80093001"/>
-  <define name="OSS_NEGATIVE_UINTEGER" value="0x80093002"/>
-  <define name="OSS_PDU_RANGE" value="0x80093003"/>
-  <define name="OSS_MORE_INPUT" value="0x80093004"/>
-  <define name="OSS_DATA_ERROR" value="0x80093005"/>
-  <define name="OSS_BAD_ARG" value="0x80093006"/>
-  <define name="OSS_BAD_VERSION" value="0x80093007"/>
-  <define name="OSS_OUT_MEMORY" value="0x80093008"/>
-  <define name="OSS_PDU_MISMATCH" value="0x80093009"/>
-  <define name="OSS_LIMITED" value="0x8009300A"/>
-  <define name="OSS_BAD_PTR" value="0x8009300B"/>
-  <define name="OSS_BAD_TIME" value="0x8009300C"/>
-  <define name="OSS_INDEFINITE_NOT_SUPPORTED" value="0x8009300D"/>
-  <define name="OSS_MEM_ERROR" value="0x8009300E"/>
-  <define name="OSS_BAD_TABLE" value="0x8009300F"/>
-  <define name="OSS_TOO_LONG" value="0x80093010"/>
-  <define name="OSS_CONSTRAINT_VIOLATED" value="0x80093011"/>
-  <define name="OSS_FATAL_ERROR" value="0x80093012"/>
-  <define name="OSS_ACCESS_SERIALIZATION_ERROR" value="0x80093013"/>
-  <define name="OSS_NULL_TBL" value="0x80093014"/>
-  <define name="OSS_NULL_FCN" value="0x80093015"/>
-  <define name="OSS_BAD_ENCRULES" value="0x80093016"/>
-  <define name="OSS_UNAVAIL_ENCRULES" value="0x80093017"/>
-  <define name="OSS_CANT_OPEN_TRACE_WINDOW" value="0x80093018"/>
-  <define name="OSS_UNIMPLEMENTED" value="0x80093019"/>
-  <define name="OSS_OID_DLL_NOT_LINKED" value="0x8009301A"/>
-  <define name="OSS_CANT_OPEN_TRACE_FILE" value="0x8009301B"/>
-  <define name="OSS_TRACE_FILE_ALREADY_OPEN" value="0x8009301C"/>
-  <define name="OSS_TABLE_MISMATCH" value="0x8009301D"/>
-  <define name="OSS_TYPE_NOT_SUPPORTED" value="0x8009301E"/>
-  <define name="OSS_REAL_DLL_NOT_LINKED" value="0x8009301F"/>
-  <define name="OSS_REAL_CODE_NOT_LINKED" value="0x80093020"/>
-  <define name="OSS_OUT_OF_RANGE" value="0x80093021"/>
-  <define name="OSS_COPIER_DLL_NOT_LINKED" value="0x80093022"/>
-  <define name="OSS_CONSTRAINT_DLL_NOT_LINKED" value="0x80093023"/>
-  <define name="OSS_COMPARATOR_DLL_NOT_LINKED" value="0x80093024"/>
-  <define name="OSS_COMPARATOR_CODE_NOT_LINKED" value="0x80093025"/>
-  <define name="OSS_MEM_MGR_DLL_NOT_LINKED" value="0x80093026"/>
-  <define name="OSS_PDV_DLL_NOT_LINKED" value="0x80093027"/>
-  <define name="OSS_PDV_CODE_NOT_LINKED" value="0x80093028"/>
-  <define name="OSS_API_DLL_NOT_LINKED" value="0x80093029"/>
-  <define name="OSS_BERDER_DLL_NOT_LINKED" value="0x8009302A"/>
-  <define name="OSS_PER_DLL_NOT_LINKED" value="0x8009302B"/>
-  <define name="OSS_OPEN_TYPE_ERROR" value="0x8009302C"/>
-  <define name="OSS_MUTEX_NOT_CREATED" value="0x8009302D"/>
-  <define name="OSS_CANT_CLOSE_TRACE_FILE" value="0x8009302E"/>
-  <define name="CRYPT_E_ASN1_ERROR" value="0x80093100"/>
-  <define name="CRYPT_E_ASN1_INTERNAL" value="0x80093101"/>
-  <define name="CRYPT_E_ASN1_EOD" value="0x80093102"/>
-  <define name="CRYPT_E_ASN1_CORRUPT" value="0x80093103"/>
-  <define name="CRYPT_E_ASN1_LARGE" value="0x80093104"/>
-  <define name="CRYPT_E_ASN1_CONSTRAINT" value="0x80093105"/>
-  <define name="CRYPT_E_ASN1_MEMORY" value="0x80093106"/>
-  <define name="CRYPT_E_ASN1_OVERFLOW" value="0x80093107"/>
-  <define name="CRYPT_E_ASN1_BADPDU" value="0x80093108"/>
-  <define name="CRYPT_E_ASN1_BADARGS" value="0x80093109"/>
-  <define name="CRYPT_E_ASN1_BADREAL" value="0x8009310A"/>
-  <define name="CRYPT_E_ASN1_BADTAG" value="0x8009310B"/>
-  <define name="CRYPT_E_ASN1_CHOICE" value="0x8009310C"/>
-  <define name="CRYPT_E_ASN1_RULE" value="0x8009310D"/>
-  <define name="CRYPT_E_ASN1_UTF8" value="0x8009310E"/>
-  <define name="CRYPT_E_ASN1_PDU_TYPE" value="0x80093133"/>
-  <define name="CRYPT_E_ASN1_NYI" value="0x80093134"/>
-  <define name="CRYPT_E_ASN1_EXTENDED" value="0x80093201"/>
-  <define name="CRYPT_E_ASN1_NOEOD" value="0x80093202"/>
-  <define name="CERTSRV_E_BAD_REQUESTSUBJECT" value="0x80094001"/>
-  <define name="CERTSRV_E_NO_REQUEST" value="0x80094002"/>
-  <define name="CERTSRV_E_BAD_REQUESTSTATUS" value="0x80094003"/>
-  <define name="CERTSRV_E_PROPERTY_EMPTY" value="0x80094004"/>
-  <define name="CERTSRV_E_INVALID_CA_CERTIFICATE" value="0x80094005"/>
-  <define name="CERTSRV_E_SERVER_SUSPENDED" value="0x80094006"/>
-  <define name="CERTSRV_E_ENCODING_LENGTH" value="0x80094007"/>
-  <define name="CERTSRV_E_ROLECONFLICT" value="0x80094008"/>
-  <define name="CERTSRV_E_RESTRICTEDOFFICER" value="0x80094009"/>
-  <define name="CERTSRV_E_KEY_ARCHIVAL_NOT_CONFIGURED" value="0x8009400A"/>
-  <define name="CERTSRV_E_NO_VALID_KRA" value="0x8009400B"/>
-  <define name="CERTSRV_E_BAD_REQUEST_KEY_ARCHIVAL" value="0x8009400C"/>
-  <define name="CERTSRV_E_NO_CAADMIN_DEFINED" value="0x8009400D"/>
-  <define name="CERTSRV_E_BAD_RENEWAL_CERT_ATTRIBUTE" value="0x8009400E"/>
-  <define name="CERTSRV_E_NO_DB_SESSIONS" value="0x8009400F"/>
-  <define name="CERTSRV_E_ALIGNMENT_FAULT" value="0x80094010"/>
-  <define name="CERTSRV_E_ENROLL_DENIED" value="0x80094011"/>
-  <define name="CERTSRV_E_TEMPLATE_DENIED" value="0x80094012"/>
-  <define name="CERTSRV_E_DOWNLEVEL_DC_SSL_OR_UPGRADE" value="0x80094013"/>
-  <define name="CERTSRV_E_ADMIN_DENIED_REQUEST" value="0x80094014"/>
-  <define name="CERTSRV_E_NO_POLICY_SERVER" value="0x80094015"/>
-  <define name="CERTSRV_E_UNSUPPORTED_CERT_TYPE" value="0x80094800"/>
-  <define name="CERTSRV_E_NO_CERT_TYPE" value="0x80094801"/>
-  <define name="CERTSRV_E_TEMPLATE_CONFLICT" value="0x80094802"/>
-  <define name="CERTSRV_E_SUBJECT_ALT_NAME_REQUIRED" value="0x80094803"/>
-  <define name="CERTSRV_E_ARCHIVED_KEY_REQUIRED" value="0x80094804"/>
-  <define name="CERTSRV_E_SMIME_REQUIRED" value="0x80094805"/>
-  <define name="CERTSRV_E_BAD_RENEWAL_SUBJECT" value="0x80094806"/>
-  <define name="CERTSRV_E_BAD_TEMPLATE_VERSION" value="0x80094807"/>
-  <define name="CERTSRV_E_TEMPLATE_POLICY_REQUIRED" value="0x80094808"/>
-  <define name="CERTSRV_E_SIGNATURE_POLICY_REQUIRED" value="0x80094809"/>
-  <define name="CERTSRV_E_SIGNATURE_COUNT" value="0x8009480A"/>
-  <define name="CERTSRV_E_SIGNATURE_REJECTED" value="0x8009480B"/>
-  <define name="CERTSRV_E_ISSUANCE_POLICY_REQUIRED" value="0x8009480C"/>
-  <define name="CERTSRV_E_SUBJECT_UPN_REQUIRED" value="0x8009480D"/>
-  <define name="CERTSRV_E_SUBJECT_DIRECTORY_GUID_REQUIRED" value="0x8009480E"/>
-  <define name="CERTSRV_E_SUBJECT_DNS_REQUIRED" value="0x8009480F"/>
-  <define name="CERTSRV_E_ARCHIVED_KEY_UNEXPECTED" value="0x80094810"/>
-  <define name="CERTSRV_E_KEY_LENGTH" value="0x80094811"/>
-  <define name="CERTSRV_E_SUBJECT_EMAIL_REQUIRED" value="0x80094812"/>
-  <define name="CERTSRV_E_UNKNOWN_CERT_TYPE" value="0x80094813"/>
-  <define name="CERTSRV_E_CERT_TYPE_OVERLAP" value="0x80094814"/>
-  <define name="CERTSRV_E_TOO_MANY_SIGNATURES" value="0x80094815"/>
-  <define name="CERTSRV_E_RENEWAL_BAD_PUBLIC_KEY" value="0x80094816"/>
-  <define name="XENROLL_E_KEY_NOT_EXPORTABLE" value="0x80095000"/>
-  <define name="XENROLL_E_CANNOT_ADD_ROOT_CERT" value="0x80095001"/>
-  <define name="XENROLL_E_RESPONSE_KA_HASH_NOT_FOUND" value="0x80095002"/>
-  <define name="XENROLL_E_RESPONSE_UNEXPECTED_KA_HASH" value="0x80095003"/>
-  <define name="XENROLL_E_RESPONSE_KA_HASH_MISMATCH" value="0x80095004"/>
-  <define name="XENROLL_E_KEYSPEC_SMIME_MISMATCH" value="0x80095005"/>
-  <define name="TRUST_E_SYSTEM_ERROR" value="0x80096001"/>
-  <define name="TRUST_E_NO_SIGNER_CERT" value="0x80096002"/>
-  <define name="TRUST_E_COUNTER_SIGNER" value="0x80096003"/>
-  <define name="TRUST_E_CERT_SIGNATURE" value="0x80096004"/>
-  <define name="TRUST_E_TIME_STAMP" value="0x80096005"/>
-  <define name="TRUST_E_BAD_DIGEST" value="0x80096010"/>
-  <define name="TRUST_E_BASIC_CONSTRAINTS" value="0x80096019"/>
-  <define name="TRUST_E_FINANCIAL_CRITERIA" value="0x8009601E"/>
-  <define name="MSSIPOTF_E_OUTOFMEMRANGE" value="0x80097001"/>
-  <define name="MSSIPOTF_E_CANTGETOBJECT" value="0x80097002"/>
-  <define name="MSSIPOTF_E_NOHEADTABLE" value="0x80097003"/>
-  <define name="MSSIPOTF_E_BAD_MAGICNUMBER" value="0x80097004"/>
-  <define name="MSSIPOTF_E_BAD_OFFSET_TABLE" value="0x80097005"/>
-  <define name="MSSIPOTF_E_TABLE_TAGORDER" value="0x80097006"/>
-  <define name="MSSIPOTF_E_TABLE_LONGWORD" value="0x80097007"/>
-  <define name="MSSIPOTF_E_BAD_FIRST_TABLE_PLACEMENT" value="0x80097008"/>
-  <define name="MSSIPOTF_E_TABLES_OVERLAP" value="0x80097009"/>
-  <define name="MSSIPOTF_E_TABLE_PADBYTES" value="0x8009700A"/>
-  <define name="MSSIPOTF_E_FILETOOSMALL" value="0x8009700B"/>
-  <define name="MSSIPOTF_E_TABLE_CHECKSUM" value="0x8009700C"/>
-  <define name="MSSIPOTF_E_FILE_CHECKSUM" value="0x8009700D"/>
-  <define name="MSSIPOTF_E_FAILED_POLICY" value="0x80097010"/>
-  <define name="MSSIPOTF_E_FAILED_HINTS_CHECK" value="0x80097011"/>
-  <define name="MSSIPOTF_E_NOT_OPENTYPE" value="0x80097012"/>
-  <define name="MSSIPOTF_E_FILE" value="0x80097013"/>
-  <define name="MSSIPOTF_E_CRYPT" value="0x80097014"/>
-  <define name="MSSIPOTF_E_BADVERSION" value="0x80097015"/>
-  <define name="MSSIPOTF_E_DSIG_STRUCTURE" value="0x80097016"/>
-  <define name="MSSIPOTF_E_PCONST_CHECK" value="0x80097017"/>
-  <define name="MSSIPOTF_E_STRUCTURE" value="0x80097018"/>
-  <define name="ERROR_CRED_REQUIRES_CONFIRMATION" value="0x80097019"/>
-  <define name="TRUST_E_PROVIDER_UNKNOWN" value="0x800B0001"/>
-  <define name="TRUST_E_ACTION_UNKNOWN" value="0x800B0002"/>
-  <define name="TRUST_E_SUBJECT_FORM_UNKNOWN" value="0x800B0003"/>
-  <define name="TRUST_E_SUBJECT_NOT_TRUSTED" value="0x800B0004"/>
-  <define name="DIGSIG_E_ENCODE" value="0x800B0005"/>
-  <define name="DIGSIG_E_DECODE" value="0x800B0006"/>
-  <define name="DIGSIG_E_EXTENSIBILITY" value="0x800B0007"/>
-  <define name="DIGSIG_E_CRYPTO" value="0x800B0008"/>
-  <define name="PERSIST_E_SIZEDEFINITE" value="0x800B0009"/>
-  <define name="PERSIST_E_SIZEINDEFINITE" value="0x800B000A"/>
-  <define name="PERSIST_E_NOTSELFSIZING" value="0x800B000B"/>
-  <define name="TRUST_E_NOSIGNATURE" value="0x800B0100"/>
-  <define name="CERT_E_EXPIRED" value="0x800B0101"/>
-  <define name="CERT_E_VALIDITYPERIODNESTING" value="0x800B0102"/>
-  <define name="CERT_E_ROLE" value="0x800B0103"/>
-  <define name="CERT_E_PATHLENCONST" value="0x800B0104"/>
-  <define name="CERT_E_CRITICAL" value="0x800B0105"/>
-  <define name="CERT_E_PURPOSE" value="0x800B0106"/>
-  <define name="CERT_E_ISSUERCHAINING" value="0x800B0107"/>
-  <define name="CERT_E_MALFORMED" value="0x800B0108"/>
-  <define name="CERT_E_UNTRUSTEDROOT" value="0x800B0109"/>
-  <define name="CERT_E_CHAINING" value="0x800B010A"/>
-  <define name="TRUST_E_FAIL" value="0x800B010B"/>
-  <define name="CERT_E_REVOKED" value="0x800B010C"/>
-  <define name="CERT_E_UNTRUSTEDTESTROOT" value="0x800B010D"/>
-  <define name="CERT_E_REVOCATION_FAILURE" value="0x800B010E"/>
-  <define name="CERT_E_CN_NO_MATCH" value="0x800B010F"/>
-  <define name="CERT_E_WRONG_USAGE" value="0x800B0110"/>
-  <define name="TRUST_E_EXPLICIT_DISTRUST" value="0x800B0111"/>
-  <define name="CERT_E_UNTRUSTEDCA" value="0x800B0112"/>
-  <define name="CERT_E_INVALID_POLICY" value="0x800B0113"/>
-  <define name="CERT_E_INVALID_NAME" value="0x800B0114"/>
-  <define name="SPAPI_E_EXPECTED_SECTION_NAME" value="0x800F0000"/>
-  <define name="SPAPI_E_BAD_SECTION_NAME_LINE" value="0x800F0001"/>
-  <define name="SPAPI_E_SECTION_NAME_TOO_LONG" value="0x800F0002"/>
-  <define name="SPAPI_E_GENERAL_SYNTAX" value="0x800F0003"/>
-  <define name="SPAPI_E_WRONG_INF_STYLE" value="0x800F0100"/>
-  <define name="SPAPI_E_SECTION_NOT_FOUND" value="0x800F0101"/>
-  <define name="SPAPI_E_LINE_NOT_FOUND" value="0x800F0102"/>
-  <define name="SPAPI_E_NO_BACKUP" value="0x800F0103"/>
-  <define name="SPAPI_E_NO_ASSOCIATED_CLASS" value="0x800F0200"/>
-  <define name="SPAPI_E_CLASS_MISMATCH" value="0x800F0201"/>
-  <define name="SPAPI_E_DUPLICATE_FOUND" value="0x800F0202"/>
-  <define name="SPAPI_E_NO_DRIVER_SELECTED" value="0x800F0203"/>
-  <define name="SPAPI_E_KEY_DOES_NOT_EXIST" value="0x800F0204"/>
-  <define name="SPAPI_E_INVALID_DEVINST_NAME" value="0x800F0205"/>
-  <define name="SPAPI_E_INVALID_CLASS" value="0x800F0206"/>
-  <define name="SPAPI_E_DEVINST_ALREADY_EXISTS" value="0x800F0207"/>
-  <define name="SPAPI_E_DEVINFO_NOT_REGISTERED" value="0x800F0208"/>
-  <define name="SPAPI_E_INVALID_REG_PROPERTY" value="0x800F0209"/>
-  <define name="SPAPI_E_NO_INF" value="0x800F020A"/>
-  <define name="SPAPI_E_NO_SUCH_DEVINST" value="0x800F020B"/>
-  <define name="SPAPI_E_CANT_LOAD_CLASS_ICON" value="0x800F020C"/>
-  <define name="SPAPI_E_INVALID_CLASS_INSTALLER" value="0x800F020D"/>
-  <define name="SPAPI_E_DI_DO_DEFAULT" value="0x800F020E"/>
-  <define name="SPAPI_E_DI_NOFILECOPY" value="0x800F020F"/>
-  <define name="SPAPI_E_INVALID_HWPROFILE" value="0x800F0210"/>
-  <define name="SPAPI_E_NO_DEVICE_SELECTED" value="0x800F0211"/>
-  <define name="SPAPI_E_DEVINFO_LIST_LOCKED" value="0x800F0212"/>
-  <define name="SPAPI_E_DEVINFO_DATA_LOCKED" value="0x800F0213"/>
-  <define name="SPAPI_E_DI_BAD_PATH" value="0x800F0214"/>
-  <define name="SPAPI_E_NO_CLASSINSTALL_PARAMS" value="0x800F0215"/>
-  <define name="SPAPI_E_FILEQUEUE_LOCKED" value="0x800F0216"/>
-  <define name="SPAPI_E_BAD_SERVICE_INSTALLSECT" value="0x800F0217"/>
-  <define name="SPAPI_E_NO_CLASS_DRIVER_LIST" value="0x800F0218"/>
-  <define name="SPAPI_E_NO_ASSOCIATED_SERVICE" value="0x800F0219"/>
-  <define name="SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE" value="0x800F021A"/>
-  <define name="SPAPI_E_DEVICE_INTERFACE_ACTIVE" value="0x800F021B"/>
-  <define name="SPAPI_E_DEVICE_INTERFACE_REMOVED" value="0x800F021C"/>
-  <define name="SPAPI_E_BAD_INTERFACE_INSTALLSECT" value="0x800F021D"/>
-  <define name="SPAPI_E_NO_SUCH_INTERFACE_CLASS" value="0x800F021E"/>
-  <define name="SPAPI_E_INVALID_REFERENCE_STRING" value="0x800F021F"/>
-  <define name="SPAPI_E_INVALID_MACHINENAME" value="0x800F0220"/>
-  <define name="SPAPI_E_REMOTE_COMM_FAILURE" value="0x800F0221"/>
-  <define name="SPAPI_E_MACHINE_UNAVAILABLE" value="0x800F0222"/>
-  <define name="SPAPI_E_NO_CONFIGMGR_SERVICES" value="0x800F0223"/>
-  <define name="SPAPI_E_INVALID_PROPPAGE_PROVIDER" value="0x800F0224"/>
-  <define name="SPAPI_E_NO_SUCH_DEVICE_INTERFACE" value="0x800F0225"/>
-  <define name="SPAPI_E_DI_POSTPROCESSING_REQUIRED" value="0x800F0226"/>
-  <define name="SPAPI_E_INVALID_COINSTALLER" value="0x800F0227"/>
-  <define name="SPAPI_E_NO_COMPAT_DRIVERS" value="0x800F0228"/>
-  <define name="SPAPI_E_NO_DEVICE_ICON" value="0x800F0229"/>
-  <define name="SPAPI_E_INVALID_INF_LOGCONFIG" value="0x800F022A"/>
-  <define name="SPAPI_E_DI_DONT_INSTALL" value="0x800F022B"/>
-  <define name="SPAPI_E_INVALID_FILTER_DRIVER" value="0x800F022C"/>
-  <define name="SPAPI_E_NON_WINDOWS_NT_DRIVER" value="0x800F022D"/>
-  <define name="SPAPI_E_NON_WINDOWS_DRIVER" value="0x800F022E"/>
-  <define name="SPAPI_E_NO_CATALOG_FOR_OEM_INF" value="0x800F022F"/>
-  <define name="SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE" value="0x800F0230"/>
-  <define name="SPAPI_E_NOT_DISABLEABLE" value="0x800F0231"/>
-  <define name="SPAPI_E_CANT_REMOVE_DEVINST" value="0x800F0232"/>
-  <define name="SPAPI_E_INVALID_TARGET" value="0x800F0233"/>
-  <define name="SPAPI_E_DRIVER_NONNATIVE" value="0x800F0234"/>
-  <define name="SPAPI_E_IN_WOW64" value="0x800F0235"/>
-  <define name="SPAPI_E_SET_SYSTEM_RESTORE_POINT" value="0x800F0236"/>
-  <define name="SPAPI_E_INCORRECTLY_COPIED_INF" value="0x800F0237"/>
-  <define name="SPAPI_E_SCE_DISABLED" value="0x800F0238"/>
-  <define name="SPAPI_E_UNKNOWN_EXCEPTION" value="0x800F0239"/>
-  <define name="SPAPI_E_PNP_REGISTRY_ERROR" value="0x800F023A"/>
-  <define name="SPAPI_E_REMOTE_REQUEST_UNSUPPORTED" value="0x800F023B"/>
-  <define name="SPAPI_E_NOT_AN_INSTALLED_OEM_INF" value="0x800F023C"/>
-  <define name="SPAPI_E_INF_IN_USE_BY_DEVICES" value="0x800F023D"/>
-  <define name="SPAPI_E_DI_FUNCTION_OBSOLETE" value="0x800F023E"/>
-  <define name="SPAPI_E_NO_AUTHENTICODE_CATALOG" value="0x800F023F"/>
-  <define name="SPAPI_E_AUTHENTICODE_DISALLOWED" value="0x800F0240"/>
-  <define name="SPAPI_E_AUTHENTICODE_TRUSTED_PUBLISHER" value="0x800F0241"/>
-  <define name="SPAPI_E_AUTHENTICODE_TRUST_NOT_ESTABLISHED" value="0x800F0242"/>
-  <define name="SPAPI_E_AUTHENTICODE_PUBLISHER_NOT_TRUSTED" value="0x800F0243"/>
-  <define name="SPAPI_E_SIGNATURE_OSATTRIBUTE_MISMATCH" value="0x800F0244"/>
-  <define name="SPAPI_E_ONLY_VALIDATE_VIA_AUTHENTICODE" value="0x800F0245"/>
-  <define name="SPAPI_E_DEVICE_INSTALLER_NOT_READY" value="0x800F0246"/>
-  <define name="SPAPI_E_DRIVER_STORE_ADD_FAILED" value="0x800F0247"/>
-  <define name="SPAPI_E_DEVICE_INSTALL_BLOCKED" value="0x800F0248"/>
-  <define name="SPAPI_E_DRIVER_INSTALL_BLOCKED" value="0x800F0249"/>
-  <define name="SPAPI_E_WRONG_INF_TYPE" value="0x800F024A"/>
-  <define name="SPAPI_E_FILE_HASH_NOT_IN_CATALOG" value="0x800F024B"/>
-  <define name="SPAPI_E_DRIVER_STORE_DELETE_FAILED" value="0x800F024C"/>
-  <define name="SPAPI_E_UNRECOVERABLE_STACK_OVERFLOW" value="0x800F0300"/>
-  <define name="SPAPI_E_ERROR_NOT_INSTALLED" value="0x800F1000"/>
-  <define name="SCARD_F_INTERNAL_ERROR" value="0x80100001"/>
-  <define name="SCARD_E_CANCELLED" value="0x80100002"/>
-  <define name="SCARD_E_INVALID_HANDLE" value="0x80100003"/>
-  <define name="SCARD_E_INVALID_PARAMETER" value="0x80100004"/>
-  <define name="SCARD_E_INVALID_TARGET" value="0x80100005"/>
-  <define name="SCARD_E_NO_MEMORY" value="0x80100006"/>
-  <define name="SCARD_F_WAITED_TOO_LONG" value="0x80100007"/>
-  <define name="SCARD_E_INSUFFICIENT_BUFFER" value="0x80100008"/>
-  <define name="SCARD_E_UNKNOWN_READER" value="0x80100009"/>
-  <define name="SCARD_E_TIMEOUT" value="0x8010000A"/>
-  <define name="SCARD_E_SHARING_VIOLATION" value="0x8010000B"/>
-  <define name="SCARD_E_NO_SMARTCARD" value="0x8010000C"/>
-  <define name="SCARD_E_UNKNOWN_CARD" value="0x8010000D"/>
-  <define name="SCARD_E_CANT_DISPOSE" value="0x8010000E"/>
-  <define name="SCARD_E_PROTO_MISMATCH" value="0x8010000F"/>
-  <define name="SCARD_E_NOT_READY" value="0x80100010"/>
-  <define name="SCARD_E_INVALID_VALUE" value="0x80100011"/>
-  <define name="SCARD_E_SYSTEM_CANCELLED" value="0x80100012"/>
-  <define name="SCARD_F_COMM_ERROR" value="0x80100013"/>
-  <define name="SCARD_F_UNKNOWN_ERROR" value="0x80100014"/>
-  <define name="SCARD_E_INVALID_ATR" value="0x80100015"/>
-  <define name="SCARD_E_NOT_TRANSACTED" value="0x80100016"/>
-  <define name="SCARD_E_READER_UNAVAILABLE" value="0x80100017"/>
-  <define name="SCARD_P_SHUTDOWN" value="0x80100018"/>
-  <define name="SCARD_E_PCI_TOO_SMALL" value="0x80100019"/>
-  <define name="SCARD_E_READER_UNSUPPORTED" value="0x8010001A"/>
-  <define name="SCARD_E_DUPLICATE_READER" value="0x8010001B"/>
-  <define name="SCARD_E_CARD_UNSUPPORTED" value="0x8010001C"/>
-  <define name="SCARD_E_NO_SERVICE" value="0x8010001D"/>
-  <define name="SCARD_E_SERVICE_STOPPED" value="0x8010001E"/>
-  <define name="SCARD_E_UNEXPECTED" value="0x8010001F"/>
-  <define name="SCARD_E_ICC_INSTALLATION" value="0x80100020"/>
-  <define name="SCARD_E_ICC_CREATEORDER" value="0x80100021"/>
-  <define name="SCARD_E_UNSUPPORTED_FEATURE" value="0x80100022"/>
-  <define name="SCARD_E_DIR_NOT_FOUND" value="0x80100023"/>
-  <define name="SCARD_E_FILE_NOT_FOUND" value="0x80100024"/>
-  <define name="SCARD_E_NO_DIR" value="0x80100025"/>
-  <define name="SCARD_E_NO_FILE" value="0x80100026"/>
-  <define name="SCARD_E_NO_ACCESS" value="0x80100027"/>
-  <define name="SCARD_E_WRITE_TOO_MANY" value="0x80100028"/>
-  <define name="SCARD_E_BAD_SEEK" value="0x80100029"/>
-  <define name="SCARD_E_INVALID_CHV" value="0x8010002A"/>
-  <define name="SCARD_E_UNKNOWN_RES_MNG" value="0x8010002B"/>
-  <define name="SCARD_E_NO_SUCH_CERTIFICATE" value="0x8010002C"/>
-  <define name="SCARD_E_CERTIFICATE_UNAVAILABLE" value="0x8010002D"/>
-  <define name="SCARD_E_NO_READERS_AVAILABLE" value="0x8010002E"/>
-  <define name="SCARD_E_COMM_DATA_LOST" value="0x8010002F"/>
-  <define name="SCARD_E_NO_KEY_CONTAINER" value="0x80100030"/>
-  <define name="SCARD_E_SERVER_TOO_BUSY" value="0x80100031"/>
-  <define name="SCARD_E_PIN_CACHE_EXPIRED" value="0x80100032"/>
-  <define name="SCARD_E_NO_PIN_CACHE" value="0x80100033"/>
-  <define name="SCARD_E_READ_ONLY_CARD" value="0x80100034"/>
-  <define name="SCARD_W_UNSUPPORTED_CARD" value="0x80100065"/>
-  <define name="SCARD_W_UNRESPONSIVE_CARD" value="0x80100066"/>
-  <define name="SCARD_W_UNPOWERED_CARD" value="0x80100067"/>
-  <define name="SCARD_W_RESET_CARD" value="0x80100068"/>
-  <define name="SCARD_W_REMOVED_CARD" value="0x80100069"/>
-  <define name="SCARD_W_SECURITY_VIOLATION" value="0x8010006A"/>
-  <define name="SCARD_W_WRONG_CHV" value="0x8010006B"/>
-  <define name="SCARD_W_CHV_BLOCKED" value="0x8010006C"/>
-  <define name="SCARD_W_EOF" value="0x8010006D"/>
-  <define name="SCARD_W_CANCELLED_BY_USER" value="0x8010006E"/>
-  <define name="SCARD_W_CARD_NOT_AUTHENTICATED" value="0x8010006F"/>
-  <define name="SCARD_W_CACHE_ITEM_NOT_FOUND" value="0x80100070"/>
-  <define name="SCARD_W_CACHE_ITEM_STALE" value="0x80100071"/>
-  <define name="SCARD_W_CACHE_ITEM_TOO_BIG" value="0x80100072"/>
-  <define name="ONL_E_INVALID_AUTHENTICATION_TARGET" value="0x8A020001"/>
-  <define name="ONL_E_ACCESS_DENIED_BY_TOU" value="0x8A020002"/>
   <!-- Winerror.h: COM Error Codes (Generic) -->
-  <define name="E_UNEXPECTED" value="0x8000FFFF"/>
-  <define name="E_NOTIMPL" value="0x80004001"/>
-  <define name="E_OUTOFMEMORY" value="0x8007000E"/>
-  <define name="E_INVALIDARG" value="0x80070057"/>
-  <define name="E_NOINTERFACE" value="0x80004002"/>
-  <define name="E_POINTER" value="0x80004003"/>
-  <define name="E_HANDLE" value="0x80070006"/>
-  <define name="E_ABORT" value="0x80004004"/>
-  <define name="E_FAIL" value="0x80004005"/>
-  <define name="E_ACCESSDENIED" value="0x80070005"/>
-  <define name="E_PENDING" value="0x8000000A"/>
-  <define name="E_BOUNDS" value="0x8000000B"/>
-  <define name="E_CHANGED_STATE" value="0x8000000C"/>
-  <define name="E_ILLEGAL_STATE_CHANGE" value="0x8000000D"/>
-  <define name="E_ILLEGAL_METHOD_CALL" value="0x8000000E"/>
-  <define name="RO_E_METADATA_NAME_NOT_FOUND" value="0x8000000F"/>
-  <define name="RO_E_METADATA_NAME_IS_NAMESPACE" value="0x80000010"/>
-  <define name="RO_E_METADATA_INVALID_TYPE_FORMAT" value="0x80000011"/>
-  <define name="RO_E_INVALID_METADATA_FILE" value="0x80000012"/>
-  <define name="RO_E_CLOSED" value="0x80000013"/>
-  <define name="RO_E_EXCLUSIVE_WRITE" value="0x80000014"/>
-  <define name="RO_E_CHANGE_NOTIFICATION_IN_PROGRESS" value="0x80000015"/>
-  <define name="RO_E_ERROR_STRING_NOT_FOUND" value="0x80000016"/>
-  <define name="E_STRING_NOT_NULL_TERMINATED" value="0x80000017"/>
-  <define name="E_ILLEGAL_DELEGATE_ASSIGNMENT" value="0x80000018"/>
-  <define name="E_ASYNC_OPERATION_NOT_STARTED" value="0x80000019"/>
-  <define name="E_APPLICATION_EXITING" value="0x8000001A"/>
-  <define name="E_APPLICATION_VIEW_EXITING" value="0x8000001B"/>
-  <define name="RO_E_MUST_BE_AGILE" value="0x8000001C"/>
-  <define name="RO_E_UNSUPPORTED_FROM_MTA" value="0x8000001D"/>
-  <define name="RO_E_COMMITTED" value="0x8000001E"/>
-  <define name="CO_E_INIT_TLS" value="0x80004006"/>
-  <define name="CO_E_INIT_SHARED_ALLOCATOR" value="0x80004007"/>
-  <define name="CO_E_INIT_MEMORY_ALLOCATOR" value="0x80004008"/>
-  <define name="CO_E_INIT_CLASS_CACHE" value="0x80004009"/>
-  <define name="CO_E_INIT_RPC_CHANNEL" value="0x8000400A"/>
-  <define name="CO_E_INIT_TLS_SET_CHANNEL_CONTROL" value="0x8000400B"/>
-  <define name="CO_E_INIT_TLS_CHANNEL_CONTROL" value="0x8000400C"/>
-  <define name="CO_E_INIT_UNACCEPTED_USER_ALLOCATOR" value="0x8000400D"/>
-  <define name="CO_E_INIT_SCM_MUTEX_EXISTS" value="0x8000400E"/>
-  <define name="CO_E_INIT_SCM_FILE_MAPPING_EXISTS" value="0x8000400F"/>
-  <define name="CO_E_INIT_SCM_MAP_VIEW_OF_FILE" value="0x80004010"/>
-  <define name="CO_E_INIT_SCM_EXEC_FAILURE" value="0x80004011"/>
-  <define name="CO_E_INIT_ONLY_SINGLE_THREADED" value="0x80004012"/>
-  <define name="CO_E_CANT_REMOTE" value="0x80004013"/>
-  <define name="CO_E_BAD_SERVER_NAME" value="0x80004014"/>
-  <define name="CO_E_WRONG_SERVER_IDENTITY" value="0x80004015"/>
-  <define name="CO_E_OLE1DDE_DISABLED" value="0x80004016"/>
-  <define name="CO_E_RUNAS_SYNTAX" value="0x80004017"/>
-  <define name="CO_E_CREATEPROCESS_FAILURE" value="0x80004018"/>
-  <define name="CO_E_RUNAS_CREATEPROCESS_FAILURE" value="0x80004019"/>
-  <define name="CO_E_RUNAS_LOGON_FAILURE" value="0x8000401A"/>
-  <define name="CO_E_LAUNCH_PERMSSION_DENIED" value="0x8000401B"/>
-  <define name="CO_E_START_SERVICE_FAILURE" value="0x8000401C"/>
-  <define name="CO_E_REMOTE_COMMUNICATION_FAILURE" value="0x8000401D"/>
-  <define name="CO_E_SERVER_START_TIMEOUT" value="0x8000401E"/>
-  <define name="CO_E_CLSREG_INCONSISTENT" value="0x8000401F"/>
-  <define name="CO_E_IIDREG_INCONSISTENT" value="0x80004020"/>
-  <define name="CO_E_NOT_SUPPORTED" value="0x80004021"/>
-  <define name="CO_E_RELOAD_DLL" value="0x80004022"/>
-  <define name="CO_E_MSI_ERROR" value="0x80004023"/>
-  <define name="CO_E_ATTEMPT_TO_CREATE_OUTSIDE_CLIENT_CONTEXT" value="0x80004024"/>
-  <define name="CO_E_SERVER_PAUSED" value="0x80004025"/>
-  <define name="CO_E_SERVER_NOT_PAUSED" value="0x80004026"/>
-  <define name="CO_E_CLASS_DISABLED" value="0x80004027"/>
-  <define name="CO_E_CLRNOTAVAILABLE" value="0x80004028"/>
-  <define name="CO_E_ASYNC_WORK_REJECTED" value="0x80004029"/>
-  <define name="CO_E_SERVER_INIT_TIMEOUT" value="0x8000402A"/>
-  <define name="CO_E_NO_SECCTX_IN_ACTIVATE" value="0x8000402B"/>
-  <define name="CO_E_TRACKER_CONFIG" value="0x80004030"/>
-  <define name="CO_E_THREADPOOL_CONFIG" value="0x80004031"/>
-  <define name="CO_E_SXS_CONFIG" value="0x80004032"/>
-  <define name="CO_E_MALFORMED_SPN" value="0x80004033"/>
-  <define name="OLE_E_OLEVERB" value="0x80040000"/>
-  <define name="OLE_E_ADVF" value="0x80040001"/>
-  <define name="OLE_E_ENUM_NOMORE" value="0x80040002"/>
-  <define name="OLE_E_ADVISENOTSUPPORTED" value="0x80040003"/>
-  <define name="OLE_E_NOCONNECTION" value="0x80040004"/>
-  <define name="OLE_E_NOTRUNNING" value="0x80040005"/>
-  <define name="OLE_E_NOCACHE" value="0x80040006"/>
-  <define name="OLE_E_BLANK" value="0x80040007"/>
-  <define name="OLE_E_CLASSDIFF" value="0x80040008"/>
-  <define name="OLE_E_CANT_GETMONIKER" value="0x80040009"/>
-  <define name="OLE_E_CANT_BINDTOSOURCE" value="0x8004000A"/>
-  <define name="OLE_E_STATIC" value="0x8004000B"/>
-  <define name="OLE_E_PROMPTSAVECANCELLED" value="0x8004000C"/>
-  <define name="OLE_E_INVALIDRECT" value="0x8004000D"/>
-  <define name="OLE_E_WRONGCOMPOBJ" value="0x8004000E"/>
-  <define name="OLE_E_INVALIDHWND" value="0x8004000F"/>
-  <define name="OLE_E_NOT_INPLACEACTIVE" value="0x80040010"/>
-  <define name="OLE_E_CANTCONVERT" value="0x80040011"/>
-  <define name="OLE_E_NOSTORAGE" value="0x80040012"/>
-  <define name="DV_E_FORMATETC" value="0x80040064"/>
-  <define name="DV_E_DVTARGETDEVICE" value="0x80040065"/>
-  <define name="DV_E_STGMEDIUM" value="0x80040066"/>
-  <define name="DV_E_STATDATA" value="0x80040067"/>
-  <define name="DV_E_LINDEX" value="0x80040068"/>
-  <define name="DV_E_TYMED" value="0x80040069"/>
-  <define name="DV_E_CLIPFORMAT" value="0x8004006A"/>
-  <define name="DV_E_DVASPECT" value="0x8004006B"/>
-  <define name="DV_E_DVTARGETDEVICE_SIZE" value="0x8004006C"/>
-  <define name="DV_E_NOIVIEWOBJECT" value="0x8004006D"/>
-  <define name="DRAGDROP_E_NOTREGISTERED" value="0x80040100"/>
-  <define name="DRAGDROP_E_ALREADYREGISTERED" value="0x80040101"/>
-  <define name="DRAGDROP_E_INVALIDHWND" value="0x80040102"/>
-  <define name="CLASS_E_NOAGGREGATION" value="0x80040110"/>
-  <define name="CLASS_E_CLASSNOTAVAILABLE" value="0x80040111"/>
-  <define name="CLASS_E_NOTLICENSED" value="0x80040112"/>
-  <define name="VIEW_E_DRAW" value="0x80040140"/>
-  <define name="REGDB_E_READREGDB" value="0x80040150"/>
-  <define name="REGDB_E_WRITEREGDB" value="0x80040151"/>
-  <define name="REGDB_E_KEYMISSING" value="0x80040152"/>
-  <define name="REGDB_E_INVALIDVALUE" value="0x80040153"/>
-  <define name="REGDB_E_CLASSNOTREG" value="0x80040154"/>
-  <define name="REGDB_E_IIDNOTREG" value="0x80040155"/>
-  <define name="REGDB_E_BADTHREADINGMODEL" value="0x80040156"/>
-  <define name="CAT_E_CATIDNOEXIST" value="0x80040160"/>
-  <define name="CAT_E_NODESCRIPTION" value="0x80040161"/>
-  <define name="CS_E_PACKAGE_NOTFOUND" value="0x80040164"/>
-  <define name="CS_E_NOT_DELETABLE" value="0x80040165"/>
-  <define name="CS_E_CLASS_NOTFOUND" value="0x80040166"/>
-  <define name="CS_E_INVALID_VERSION" value="0x80040167"/>
-  <define name="CS_E_NO_CLASSSTORE" value="0x80040168"/>
-  <define name="CS_E_OBJECT_NOTFOUND" value="0x80040169"/>
-  <define name="CS_E_OBJECT_ALREADY_EXISTS" value="0x8004016A"/>
-  <define name="CS_E_INVALID_PATH" value="0x8004016B"/>
-  <define name="CS_E_NETWORK_ERROR" value="0x8004016C"/>
-  <define name="CS_E_ADMIN_LIMIT_EXCEEDED" value="0x8004016D"/>
-  <define name="CS_E_SCHEMA_MISMATCH" value="0x8004016E"/>
-  <define name="CS_E_INTERNAL_ERROR" value="0x8004016F"/>
-  <define name="CACHE_E_NOCACHE_UPDATED" value="0x80040170"/>
-  <define name="OLEOBJ_E_NOVERBS" value="0x80040180"/>
-  <define name="OLEOBJ_E_INVALIDVERB" value="0x80040181"/>
-  <define name="INPLACE_E_NOTUNDOABLE" value="0x800401A0"/>
-  <define name="INPLACE_E_NOTOOLSPACE" value="0x800401A1"/>
-  <define name="CONVERT10_E_OLESTREAM_GET" value="0x800401C0"/>
-  <define name="CONVERT10_E_OLESTREAM_PUT" value="0x800401C1"/>
-  <define name="CONVERT10_E_OLESTREAM_FMT" value="0x800401C2"/>
-  <define name="CONVERT10_E_OLESTREAM_BITMAP_TO_DIB" value="0x800401C3"/>
-  <define name="CONVERT10_E_STG_FMT" value="0x800401C4"/>
-  <define name="CONVERT10_E_STG_NO_STD_STREAM" value="0x800401C5"/>
-  <define name="CONVERT10_E_STG_DIB_TO_BITMAP" value="0x800401C6"/>
-  <define name="CLIPBRD_E_CANT_OPEN" value="0x800401D0"/>
-  <define name="CLIPBRD_E_CANT_EMPTY" value="0x800401D1"/>
-  <define name="CLIPBRD_E_CANT_SET" value="0x800401D2"/>
-  <define name="CLIPBRD_E_BAD_DATA" value="0x800401D3"/>
-  <define name="CLIPBRD_E_CANT_CLOSE" value="0x800401D4"/>
-  <define name="MK_E_CONNECTMANUALLY" value="0x800401E0"/>
-  <define name="MK_E_EXCEEDEDDEADLINE" value="0x800401E1"/>
-  <define name="MK_E_NEEDGENERIC" value="0x800401E2"/>
-  <define name="MK_E_UNAVAILABLE" value="0x800401E3"/>
-  <define name="MK_E_SYNTAX" value="0x800401E4"/>
-  <define name="MK_E_NOOBJECT" value="0x800401E5"/>
-  <define name="MK_E_INVALIDEXTENSION" value="0x800401E6"/>
-  <define name="MK_E_INTERMEDIATEINTERFACENOTSUPPORTED" value="0x800401E7"/>
-  <define name="MK_E_NOTBINDABLE" value="0x800401E8"/>
-  <define name="MK_E_NOTBOUND" value="0x800401E9"/>
-  <define name="MK_E_CANTOPENFILE" value="0x800401EA"/>
-  <define name="MK_E_MUSTBOTHERUSER" value="0x800401EB"/>
-  <define name="MK_E_NOINVERSE" value="0x800401EC"/>
-  <define name="MK_E_NOSTORAGE" value="0x800401ED"/>
-  <define name="MK_E_NOPREFIX" value="0x800401EE"/>
-  <define name="MK_E_ENUMERATION_FAILED" value="0x800401EF"/>
-  <define name="CO_E_NOTINITIALIZED" value="0x800401F0"/>
-  <define name="CO_E_ALREADYINITIALIZED" value="0x800401F1"/>
-  <define name="CO_E_CANTDETERMINECLASS" value="0x800401F2"/>
-  <define name="CO_E_CLASSSTRING" value="0x800401F3"/>
-  <define name="CO_E_IIDSTRING" value="0x800401F4"/>
-  <define name="CO_E_APPNOTFOUND" value="0x800401F5"/>
-  <define name="CO_E_APPSINGLEUSE" value="0x800401F6"/>
-  <define name="CO_E_ERRORINAPP" value="0x800401F7"/>
-  <define name="CO_E_DLLNOTFOUND" value="0x800401F8"/>
-  <define name="CO_E_ERRORINDLL" value="0x800401F9"/>
-  <define name="CO_E_WRONGOSFORAPP" value="0x800401FA"/>
-  <define name="CO_E_OBJNOTREG" value="0x800401FB"/>
-  <define name="CO_E_OBJISREG" value="0x800401FC"/>
-  <define name="CO_E_OBJNOTCONNECTED" value="0x800401FD"/>
-  <define name="CO_E_APPDIDNTREG" value="0x800401FE"/>
-  <define name="CO_E_RELEASED" value="0x800401FF"/>
-  <define name="EVENT_S_SOME_SUBSCRIBERS_FAILED" value="0x00040200"/>
-  <define name="EVENT_E_ALL_SUBSCRIBERS_FAILED" value="0x80040201"/>
-  <define name="EVENT_S_NOSUBSCRIBERS" value="0x00040202"/>
-  <define name="EVENT_E_QUERYSYNTAX" value="0x80040203"/>
-  <define name="EVENT_E_QUERYFIELD" value="0x80040204"/>
-  <define name="EVENT_E_INTERNALEXCEPTION" value="0x80040205"/>
-  <define name="EVENT_E_INTERNALERROR" value="0x80040206"/>
-  <define name="EVENT_E_INVALID_PER_USER_SID" value="0x80040207"/>
-  <define name="EVENT_E_USER_EXCEPTION" value="0x80040208"/>
-  <define name="EVENT_E_TOO_MANY_METHODS" value="0x80040209"/>
-  <define name="EVENT_E_MISSING_EVENTCLASS" value="0x8004020A"/>
-  <define name="EVENT_E_NOT_ALL_REMOVED" value="0x8004020B"/>
-  <define name="EVENT_E_COMPLUS_NOT_INSTALLED" value="0x8004020C"/>
-  <define name="EVENT_E_CANT_MODIFY_OR_DELETE_UNCONFIGURED_OBJECT" value="0x8004020D"/>
-  <define name="EVENT_E_CANT_MODIFY_OR_DELETE_CONFIGURED_OBJECT" value="0x8004020E"/>
-  <define name="EVENT_E_INVALID_EVENT_CLASS_PARTITION" value="0x8004020F"/>
-  <define name="EVENT_E_PER_USER_SID_NOT_LOGGED_ON" value="0x80040210"/>
   <!-- Winerror.h: COM Error Codes (XACT, SCHED, OLE) -->
   <define name="XACT_E_ALREADYOTHERSINGLEPHASE" value="0x8004D000"/>
   <define name="XACT_E_CANTRETAIN" value="0x8004D001"/>
@@ -17938,6 +17067,160 @@ HFONT CreateFont(
   <define name="UNREFERENCED_PARAMETER(P)" value="((void)(P))"/>
   <define name="DBG_UNREFERENCED_PARAMETER(P)" value="((void)(P))"/>
   <define name="DBG_UNREFERENCED_LOCAL_VARIABLE(P)" value="((void)(P))"/>
+  <!-- winreg.h -->
+  <define name="REG_OPTION_BACKUP_RESTORE" value="0x00000004L"/>
+  <define name="REG_OPTION_CREATE_LINK" value="0x00000002L"/>
+  <define name="REG_OPTION_NON_VOLATILE" value="0x00000000L"/>
+  <define name="REG_OPTION_VOLATILE" value="0x00000001L"/>
+  <define name="REG_CREATED_NEW_KEY" value="0x00000001L"/>
+  <define name="REG_OPENED_EXISTING_KEY" value="0x00000002L"/>
+  <define name="SHUTDOWN_FORCE_OTHERS" value="0x00000001"/>
+  <define name="SHUTDOWN_FORCE_SELF" value="0x00000002"/>
+  <define name="SHUTDOWN_GRACE_OVERRIDE" value="0x00000020"/>
+  <define name="SHUTDOWN_HYBRID" value="0x00000200"/>
+  <define name="SHUTDOWN_INSTALL_UPDATES" value="0x00000040"/>
+  <define name="SHUTDOWN_NOREBOOT" value="0x00000010"/>
+  <define name="SHUTDOWN_POWEROFF" value="0x00000008"/>
+  <define name="SHUTDOWN_RESTART" value="0x00000004"/>
+  <define name="SHUTDOWN_RESTARTAPPS" value="0x00000080"/>
+  <define name="RRF_RT_ANY" value="0x0000ffff"/>
+  <define name="RRF_RT_DWORD" value="0x00000018"/>
+  <define name="RRF_RT_QWORD" value="0x00000048"/>
+  <define name="RRF_RT_REG_BINARY" value="0x00000008"/>
+  <define name="RRF_RT_REG_DWORD" value="0x00000010"/>
+  <define name="RRF_RT_REG_EXPAND_SZ" value="0x00000004"/>
+  <define name="RRF_RT_REG_MULTI_SZ" value="0x00000020"/>
+  <define name="RRF_RT_REG_NONE" value="0x00000001"/>
+  <define name="RRF_RT_REG_QWORD" value="0x00000040"/>
+  <define name="RRF_RT_REG_SZ" value="0x00000002"/>
+  <define name="RRF_NOEXPAND" value="0x10000000"/>
+  <define name="RRF_ZEROONFAILURE" value="0x20000000"/>
+  <define name="RRF_SUBKEY_WOW6464KEY" value="0x00010000"/>
+  <define name="RRF_SUBKEY_WOW6432KEY" value="0x00020000"/>
+  <define name="REG_MUI_STRING_TRUNCATE" value="0x00000001"/>
+  <define name="REG_NOTIFY_CHANGE_NAME" value="0x00000001L"/>
+  <define name="REG_NOTIFY_CHANGE_ATTRIBUTES" value="0x00000002L"/>
+  <define name="REG_NOTIFY_CHANGE_LAST_SET" value="0x00000004L"/>
+  <define name="REG_NOTIFY_CHANGE_SECURITY" value="0x00000008L"/>
+  <define name="REG_NOTIFY_THREAD_AGNOSTIC" value="0x10000000L"/>
+  <define name="REG_WHOLE_HIVE_VOLATILE" value="0x00000001L"/>
+  <define name="DOCKINFO_DOCKED" value="0x2"/>
+  <define name="DOCKINFO_UNDOCKED" value="0x1"/>
+  <define name="DOCKINFO_USER_DOCKED" value="0x5"/>
+  <define name="DOCKINFO_USER_SUPPLIED" value="0x4"/>
+  <define name="DOCKINFO_USER_UNDOCKED" value="0x6"/>
+  <define name="FCIERR_ALLOC_FAIL" value="0x03"/>
+  <define name="FCIERR_CAB_FILE" value="0x06"/>
+  <define name="FCIERR_CAB_FORMAT_LIMIT" value="0x09"/>
+  <define name="FCIERR_MCI_FAIL" value="0x08"/>
+  <define name="FCIERR_NONE" value="0x00"/>
+  <define name="FCIERR_OPEN_SRC" value="0x01"/>
+  <define name="FCIERR_READ_SRC" value="0x02"/>
+  <define name="FCIERR_TEMP_FILE" value="0x04"/>
+  <define name="FCIERR_USER_ABORT" value="0x07"/>
+  <define name="FDIERROR_ALLOC_FAIL" value="0x05"/>
+  <define name="FDIERROR_BAD_COMPR_TYPE" value="0x06"/>
+  <define name="FDIERROR_CABINET_NOT_FOUND" value="0x01"/>
+  <define name="FDIERROR_CORRUPT_CABINET" value="0x04"/>
+  <define name="FDIERROR_MDI_FAIL" value="0x07"/>
+  <define name="FDIERROR_NONE" value="0x00"/>
+  <define name="FDIERROR_NOT_A_CABINET" value="0x02"/>
+  <define name="FDIERROR_RESERVE_MISMATCH" value="0x09"/>
+  <define name="FDIERROR_TARGET_FILE" value="0x08"/>
+  <define name="FDIERROR_UNKNOWN_CABINET_VERSION" value="0x03"/>
+  <define name="FDIERROR_USER_ABORT" value="0x0B"/>
+  <define name="FDIERROR_WRONG_CABINET" value="0x0A"/>
+  <define name="FH_STATE_DISABLED_BY_GP" value="0x02"/>
+  <define name="FH_STATE_FATAL_CONFIG_ERROR" value="0x03"/>
+  <define name="FH_STATE_NOT_TRACKED" value="0x00"/>
+  <define name="FH_STATE_NO_ERROR" value="0xFF"/>
+  <define name="FH_STATE_OFF" value="0x01"/>
+  <define name="FH_STATE_STAGING_FULL" value="0x12"/>
+  <define name="FH_STATE_TARGET_ABSENT" value="0x15"/>
+  <define name="FH_STATE_TARGET_ACCESS_DENIED" value="0x0E"/>
+  <define name="FH_STATE_TARGET_FULL" value="0x11"/>
+  <define name="FH_STATE_TARGET_FULL_RETENTION_MAX" value="0x10"/>
+  <define name="FH_STATE_TARGET_LOW_SPACE" value="0x14"/>
+  <define name="FH_STATE_TARGET_LOW_SPACE_RETENTION_MAX" value="0x13"/>
+  <define name="FH_STATE_TARGET_VOLUME_DIRTY" value="0x0F"/>
+  <define name="FH_STATE_TOO_MUCH_BEHIND" value="0x16"/>
+  <define name="ICW_ALREADYRUN" value="0x0004"/>
+  <define name="ICW_CHECKSTATUS" value="0x0001"/>
+  <define name="ICW_FULLPRESENT" value="0x0001"/>
+  <define name="ICW_FULL_SMARTSTART" value="0x800"/>
+  <define name="ICW_LAUNCHEDFULL" value="0x0100"/>
+  <define name="ICW_LAUNCHEDMANUAL" value="0x0200"/>
+  <define name="ICW_LAUNCHFULL" value="0x0100"/>
+  <define name="ICW_LAUNCHMANUAL" value="0x0200"/>
+  <define name="ICW_MANUALPRESENT" value="0x0002"/>
+  <define name="ICW_USE_SHELLNEXT" value="0x0400"/>
+  <define name="KEY_WOW64_32KEY" value="0x0200"/>
+  <define name="KEY_WOW64_64KEY" value="0x0100"/>
+  <define name="NETLOGON_CONTROL_CHANGE_PASSWORD" value="9"/>
+  <define name="NETLOGON_CONTROL_FORCE_DNS_REG" value="11"/>
+  <define name="NETLOGON_CONTROL_PDC_REPLICATE" value="4"/>
+  <define name="NETLOGON_CONTROL_QUERY" value="1"/>
+  <define name="NETLOGON_CONTROL_QUERY_DNS_REG" value="12"/>
+  <define name="NETLOGON_CONTROL_REDISCOVER" value="5"/>
+  <define name="NETLOGON_CONTROL_REPLICATE" value="2"/>
+  <define name="NETLOGON_CONTROL_SYNCHRONIZE" value="3"/>
+  <define name="NETLOGON_CONTROL_TC_QUERY" value="6"/>
+  <define name="NETLOGON_CONTROL_TC_VERIFY" value="10"/>
+  <define name="NETLOGON_DNS_UPDATE_FAILURE" value="0x00000040"/>
+  <define name="NETLOGON_FULL_SYNC_REPLICATION" value="0x00000004"/>
+  <define name="NETLOGON_HAS_IP" value="0x00000010"/>
+  <define name="NETLOGON_HAS_TIMESERV" value="0x00000020"/>
+  <define name="NETLOGON_REDO_NEEDED" value="0x00000008"/>
+  <define name="NETLOGON_REPLICATION_IN_PROGRESS" value="0x00000002"/>
+  <define name="NETLOGON_REPLICATION_NEEDED" value="0x00000001"/>
+  <define name="NETLOGON_VERIFY_STATUS_RETURNED" value="0x00000080"/>
+  <define name="REG_FORCE_RESTORE" value="0x00000008L"/>
+  <define name="REG_LATEST_FORMAT" value="2"/>
+  <define name="REG_NO_COMPRESSION" value="4"/>
+  <define name="REG_STANDARD_FORMAT" value="1"/>
+  <define name="SSRVACTION_EVENT" value="3"/>
+  <define name="SSRVACTION_QUERYCANCEL" value="2"/>
+  <define name="SSRVACTION_SIZE" value="5"/>
+  <define name="SSRVACTION_TRACE" value="1"/>
+  <define name="VARIABLE_ATTRIBUTE_APPEND_WRITE" value="0x00000040"/>
+  <define name="VARIABLE_ATTRIBUTE_AUTHENTICATED_WRITE_ACCESS" value="0x00000010"/>
+  <define name="VARIABLE_ATTRIBUTE_BOOTSERVICE_ACCESS" value="0x00000002"/>
+  <define name="VARIABLE_ATTRIBUTE_HARDWARE_ERROR_RECORD" value="0x00000008"/>
+  <define name="VARIABLE_ATTRIBUTE_NON_VOLATILE" value="0x00000001"/>
+  <define name="VARIABLE_ATTRIBUTE_RUNTIME_ACCESS" value="0x00000004"/>
+  <define name="VARIABLE_ATTRIBUTE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS" value="0x00000020"/>
+  <define name="VER_BUILDNUMBER" value="0x0000004"/>
+  <define name="VER_EQUAL" value="1"/>
+  <define name="VER_GREATER" value="2"/>
+  <define name="VER_GREATER_EQUAL" value="3"/>
+  <define name="VER_LESS" value="4"/>
+  <define name="VER_LESS_EQUAL" value="5"/>
+  <define name="VER_MAJORVERSION" value="0x0000002"/>
+  <define name="VER_MINORVERSION" value="0x0000001"/>
+  <define name="VER_NT_DOMAIN_CONTROLLER" value="0x0000002"/>
+  <define name="VER_NT_SERVER" value="0x0000003"/>
+  <define name="VER_NT_WORKSTATION" value="0x0000001"/>
+  <define name="VER_OR" value="7"/>
+  <define name="VER_PLATFORMID" value="0x0000008"/>
+  <define name="VER_PLATFORM_WIN32_NT" value="2"/>
+  <define name="VER_PRODUCT_TYPE" value="0x0000080"/>
+  <define name="VER_SERVICEPACKMAJOR" value="0x0000020"/>
+  <define name="VER_SERVICEPACKMINOR" value="0x0000010"/>
+  <define name="VER_SUITENAME" value="0x0000040"/>
+  <define name="VER_SUITE_BACKOFFICE" value="0x00000004"/>
+  <define name="VER_SUITE_BLADE" value="0x00000400"/>
+  <define name="VER_SUITE_COMPUTE_SERVER" value="0x00004000"/>
+  <define name="VER_SUITE_DATACENTER" value="0x00000080"/>
+  <define name="VER_SUITE_EMBEDDEDNT" value="0x00000040"/>
+  <define name="VER_SUITE_ENTERPRISE" value="0x00000002"/>
+  <define name="VER_SUITE_MULTIUSERTS" value="0x00020000"/>
+  <define name="VER_SUITE_PERSONAL" value="0x00000200"/>
+  <define name="VER_SUITE_SINGLEUSERTS" value="0x00000100"/>
+  <define name="VER_SUITE_SMALLBUSINESS" value="0x00000001"/>
+  <define name="VER_SUITE_SMALLBUSINESS_RESTRICTED" value="0x00000020"/>
+  <define name="VER_SUITE_STORAGE_SERVER" value="0x00002000"/>
+  <define name="VER_SUITE_TERMINAL" value="0x00000010"/>
+  <define name="VER_SUITE_WH_SERVER" value="0x00008000"/>
   <!-- https://learn.microsoft.com/en-us/cpp/build/reference/entry-entry-point-symbol -->
   <entrypoint name="mainCRTStartup"/>
   <entrypoint name="WinMain"/>
diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index 6d4051933aa..c1370373b54 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -1,5 +1,116 @@
 <?xml version="1.0"?>
 <def format="2">
+  <type-checks>
+    <unusedvar>
+      <check>wxAcceleratorEntry</check>
+      <check>wxAny</check>
+      <check>wxArchiveIterator</check>
+      <check>wxArrayDouble</check>
+      <check>wxArrayInt</check>
+      <check>wxArrayPtrVoid</check>
+      <check>wxArrayShort</check>
+      <check>wxArrayString</check>
+      <check>wxBitmap</check>
+      <check>wxBitmapBundle</check>
+      <check>wxBitmapHandler</check>
+      <check>wxBoxSizer</check>
+      <check>wxBrush</check>
+      <check>wxChar</check>
+      <check>wxUniChar</check>
+      <check>wxUniCharRef</check>
+      <check>wxColour</check>
+      <check>wxColourDatabase</check>
+      <check>wxCursor</check>
+      <check>wxDateSpan</check>
+      <check>wxDelegateRendererNative</check>
+      <check>wxHeaderButtonParams</check>
+      <check>wxRendererNative</check>
+      <check>wxRendererVersion</check>
+      <check>wxTextWrapper</check>
+      <check>wxDCClipper</check>
+      <check>wxDCBrushChanger</check>
+      <check>wxDCFontChanger</check>
+      <check>wxDCPenChanger</check>
+      <check>wxDCTextColourChanger</check>
+      <check>wxDCTextBgColourChanger</check>
+      <check>wxDCTextBgModeChanger</check>
+      <check>wxFileType</check>
+      <check>wxFont</check>
+      <check>wxFlexGridSizer</check>
+      <check>wxFontEnumerator</check>
+      <check>wxFontInfo</check>
+      <check>wxFontList</check>
+      <check>wxFontMetrics</check>
+      <check>wxGBPosition</check>
+      <check>wxGBSizerItem</check>
+      <check>wxGBSpan</check>
+      <check>wxGDIObject</check>
+      <check>wxGraphicsBrush</check>
+      <check>wxGraphicsFont</check>
+      <check>wxGraphicsGradientStop</check>
+      <check>wxGraphicsGradientStops</check>
+      <check>wxGraphicsMatrix</check>
+      <check>wxGraphicsPath</check>
+      <check>wxGridBagSizer</check>
+      <check>wxGridSizer</check>
+      <check>wxIcon</check>
+      <check>wxIconBundle</check>
+      <check>wxIconLocation</check>
+      <check>wxIFFHandler</check>
+      <check>wxImage</check>
+      <check>wxImageHandler</check>
+      <check>wxGIFHandler</check>
+      <check>wxJPEGHandler</check>
+      <check>wxPCXHandler</check>
+      <check>wxPNGHandler</check>
+      <check>wxPNMHandler</check>
+      <check>wxTGAHandler</check>
+      <check>wxTIFFHandler</check>
+      <check>wxXPMHandler</check>
+      <check>wxMask</check>
+      <check>wxMetafile</check>
+      <check>wxNativeFontInfo</check>
+      <check>wxPalette</check>
+      <check>wxPen</check>
+      <check>wxPenList</check>
+      <check>wxPoint</check>
+      <check>wxPoint2DDouble</check>
+      <check>wxPoint2DInt</check>
+      <check>wxPosition</check>
+      <check>wxRealPoint</check>
+      <check>wxRegion</check>
+      <check>wxRegionContain</check>
+      <check>wxRegionIterator</check>
+      <check>wxRegEx</check>
+      <check>wxRect</check>
+      <check>wxSize</check>
+      <check>wxSizer</check>
+      <check>wxSizerItem</check>
+      <check>wxSplitterRenderParams</check>
+      <check>wxStaticBoxSizer</check>
+      <check>wxStdDialogButtonSizer</check>
+      <check>wxSystemOptions</check>
+      <check>wxSystemSettings</check>
+      <check>wxTarEntry</check>
+      <check>wxTarInputStream</check>
+      <check>wxTimeSpan</check>
+      <check>wxUString</check>
+      <check>wxVariant</check>
+      <check>wxVariantData</check>
+      <check>wxVariantDataCurrency</check>
+      <check>wxVariantDataErrorCode</check>
+      <check>wxVariantDataSafeArray</check>
+      <check>wxVector</check>
+      <check>wxVersionInfo</check>
+      <check>wxWrapSizer</check>
+      <check>wxZipEntry</check>
+      <check>wxZipInputStream</check>
+    </unusedvar>
+    <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"/>
@@ -25,6 +136,7 @@
   <define name="wxVector" value="std::vector"/>
   <define name="wxArrayString" value="std::vector &lt; wxString &gt;"/>
   <define name="wxArrayInt" value="std::vector &lt; int &gt;"/>
+  <define name="wxLongLongFmtSpec" value="ll"/>
   <define name="wxColor" value="wxColour"/>
   <define name="wxOVERRIDE" value="override"/>
   <define name="wxEXPLICIT" value="explicit"/>
@@ -85,12 +197,13 @@
   <define name="EVT_RIBBONTOOLBAR_DROPDOWN_CLICKED(id,func)" value=""/>
   <define name="EVT_BOOKCTRL_PAGE_CHANGED(id,func)" value=""/>
   <define name="EVT_BOOKCTRL_PAGE_CHANGING(id,func)" value=""/>
+  <define name="EVT_SPLITTER_SASH_POS_RESIZE(id,func)" value=""/>
   <define name="EVT_SPLITTER_SASH_POS_CHANGING(id,func)" value=""/>
   <define name="EVT_SPLITTER_SASH_POS_CHANGED(id,func)" value=""/>
-  <define name="EVT_CHOICEBOOK_PAGE_CHANGED(id,func)" value=""/>
-  <define name="EVT_CHOICEBOOK_PAGE_CHANGING(id,func)" value=""/>
   <define name="EVT_SPLITTER_UNSPLIT(id,func)" value=""/>
   <define name="EVT_SPLITTER_DCLICK(id,func)" value=""/>
+  <define name="EVT_CHOICEBOOK_PAGE_CHANGED(id,func)" value=""/>
+  <define name="EVT_CHOICEBOOK_PAGE_CHANGING(id,func)" value=""/>
   <define name="EVT_MENU(id,func)" value=""/>
   <define name="EVT_MENU_RANGE(id1,id2,func)" value=""/>
   <define name="EVT_MENU_OPEN(func)" value=""/>
@@ -136,7 +249,6 @@
   <define name="EVT_SYS_COLOUR_CHANGED(func)" value=""/>
   <define name="EVT_HTML_CELL_HOVER(id,func)" value=""/>
   <define name="EVT_HTML_LINK_CLICKED(id,func)" value=""/>
-  <define name="EVT_MENU(id,func)" value=""/>
   <define name="EVT_BUTTON(id,func)" value=""/>
   <define name="EVT_UPDATE_UI(id,func)" value=""/>
   <define name="EVT_UPDATE_UI_RANGE(id1,id2,func)" value=""/>
@@ -205,7 +317,6 @@
   <define name="EVT_LISTBOX_DCLICK(id,func)" value=""/>
   <define name="EVT_COMMAND(id,event,func)" value=""/>
   <define name="EVT_COMMAND_RANGE(id1,id2,event,func)" value=""/>
-  <define name="EVT_COMMAND_SCROLL(id,func)" value=""/>
   <define name="EVT_TOOL_ENTER(id,func)" value=""/>
   <define name="EVT_TOOL_DROPDOWN(id,func)" value=""/>
   <define name="EVT_COMMAND_LEFT_CLICK(id,func)" value=""/>
@@ -256,7 +367,6 @@
   <define name="EVT_NOTIFY(event,id,func)" value=""/>
   <define name="EVT_CUSTOM_RANGE(event,id1,id2, func)" value=""/>
   <define name="EVT_NOTIFY_RANGE(event,id1,id2, func)" value=""/>
-  <define name="EVT_UPDATE_UI(id,func)" value=""/>
   <define name="EVT_CHOICE(id,func)" value=""/>
   <define name="EVT_PG_SELECTED(id,func)" value=""/>
   <define name="EVT_PG_CHANGING(id,func)" value=""/>
@@ -284,7 +394,6 @@
   <define name="EVT_GRID_CMD_SELECT_CELL(id,func)" value=""/>
   <define name="EVT_GRID_CMD_EDITOR_HIDDEN(id,func)" value=""/>
   <define name="EVT_GRID_CMD_EDITOR_SHOWN(id,func)" value=""/>
-  <define name="EVT_COLOURPICKER_CHANGED(id,func)" value=""/>
   <define name="EVT_COLOURPICKER_CURRENT_CHANGED(id,func)" value=""/>
   <define name="EVT_COLOURPICKER_DIALOG_CANCELLED(id,func)" value=""/>
   <define name="EVT_COLLAPSIBLEHEADER_CHANGED(id,func)" value=""/>
@@ -348,13 +457,11 @@
   <define name="EVT_RIGHT_DOWN(func)" value=""/>
   <define name="EVT_MOTION(func)" value=""/>
   <define name="EVT_MIDDLE_UP(func)" value=""/>
-  <define name="EVT_MOUSEWHEEL(func)" value=""/>
   <define name="EVT_MOUSE_CAPTURE_LOST(func)" value=""/>
   <define name="EVT_RIGHT_UP(func)" value=""/>
   <define name="EVT_KEY_DOWN(func)" value=""/>
   <define name="EVT_KEY_UP(func)" value=""/>
   <define name="EVT_LEFT_DCLICK(func)" value=""/>
-  <define name="EVT_MOTION(func)" value=""/>
   <define name="EVT_ENTER_WINDOW(func)" value=""/>
   <define name="EVT_LEAVE_WINDOW(func)" value=""/>
   <define name="EVT_MOUSEWHEEL(func)" value=""/>
@@ -398,7 +505,6 @@
   <define name="EVT_KILL_FOCUS(func)" value=""/>
   <define name="EVT_MOUSE_CAPTURE_CHANGED(func)" value=""/>
   <define name="EVT_PALETTE_CHANGED(func)" value=""/>
-  <define name="EVT_MOUSE_EVENTS(func)" value=""/>
   <define name="EVT_MIDDLE_DOWN(func)" value=""/>
   <define name="EVT_AUI_PANE_BUTTON(func)" value=""/>
   <define name="EVT_AUI_PANE_CLOSE(func)" value=""/>
@@ -407,7 +513,11 @@
   <define name="EVT_AUI_PANE_ACTIVATED(func)" value=""/>
   <define name="EVT_AUI_RENDER(func)" value=""/>
   <define name="EVT_GRID_COL_SORT(func)" value=""/>
+  <define name="EVT_GRID_RANGE_SELECTING(func)" value=""/>
   <define name="EVT_GRID_RANGE_SELECT(func)" value=""/>
+  <define name="EVT_GRID_RANGE_SELECTED(func)" value=""/>
+  <define name="EVT_GRID_CMD_RANGE_SELECTING(id,func)" value=""/>
+  <define name="EVT_GRID_CMD_RANGE_SELECTED(id,func)" value=""/>
   <define name="EVT_GRID_ROW_SIZE(func)" value=""/>
   <define name="EVT_GRID_COL_SIZE(func)" value=""/>
   <define name="EVT_GRID_COL_MOVE(func)" value=""/>
@@ -579,10 +689,7 @@
   <define name="BEGIN_DECLARE_EVENT_TYPES()" value=""/>
   <define name="END_DECLARE_EVENT_TYPES()" value=""/>
   <define name="DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value)" value=""/>
-  <define name="DECLARE_EVENT_TYPE(name, value)" value=""/>
-  <define name="DECLARE_LOCAL_EVENT_TYPE(name, value)" value=""/>
   <define name="DEFINE_EVENT_TYPE(name)" value="const wxEventType name = wxNewEventType();"/>
-  <define name="DEFINE_LOCAL_EVENT_TYPE(name)" value=""/>
   <define name="WX_DECLARE_STRING_HASH_MAP(name, value)" value=""/>
   <define name="DECLARE_LOCAL_EVENT_TYPE(name, value)" value=""/>
   <define name="DEFINE_LOCAL_EVENT_TYPE(name)" value=""/>
@@ -613,7 +720,6 @@
   <define name="wxDEFINE_EVENT_ALIAS( name, type, value )" value=""/>
   <define name="wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type )" value=""/>
   <define name="wxEND_EVENT_TABLE()" value=""/>
-  <define name="wxDECLARE_EVENT_TABLE_TERMINATOR()" value=""/>
   <!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__debug.html -->
   <!-- #define wxASSERT(condition) -->
   <define name="wxASSERT(condition)" value="assert(condition)"/>
@@ -676,32 +782,6 @@
   <define name="wxTextFileType_Os2" value="4"/>
   <define name="wxTextEntryDialogStyle" value="(wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)"/>
   <define name="wxWS_EX_VALIDATE_RECURSIVELY" value="1"/>
-  <define name="wxIMAGE_OPTION_BMP_FORMAT" value="wxString(&quot;wxBMP_FORMAT&quot;)"/>
-  <define name="wxIMAGE_OPTION_CUR_HOTSPOT_X" value="wxString(&quot;HotSpotX&quot;)"/>
-  <define name="wxIMAGE_OPTION_CUR_HOTSPOT_Y" value="wxString(&quot;HotSpotY&quot;)"/>
-  <define name="wxIMAGE_OPTION_FILENAME" value="wxString(&quot;FileName&quot;)"/>
-  <define name="wxIMAGE_OPTION_GIF_COMMENT" value="wxString(&quot;GifComment&quot;)"/>
-  <define name="wxIMAGE_OPTION_MAX_HEIGHT" value="wxString(&quot;MaxHeight&quot;)"/>
-  <define name="wxIMAGE_OPTION_MAX_WIDTH" value="wxString(&quot;MaxWidth&quot;)"/>
-  <define name="wxIMAGE_OPTION_ORIGINAL_HEIGHT" value="wxString(&quot;OriginalHeight&quot;)"/>
-  <define name="wxIMAGE_OPTION_ORIGINAL_WIDTH" value="wxString(&quot;OriginalWidth&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_BITDEPTH" value="wxString(&quot;PngBitDepth&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE" value="wxString(&quot;PngZB&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL" value="wxString(&quot;PngZL&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL" value="wxString(&quot;PngZM&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY" value="wxString(&quot;PngZS&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_FILTER" value="wxString(&quot;PngF&quot;)"/>
-  <define name="wxIMAGE_OPTION_PNG_FORMAT" value="wxString(&quot;PngFormat&quot;)"/>
-  <define name="wxIMAGE_OPTION_QUALITY" value="wxString(&quot;quality&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTION" value="wxString(&quot;Resolution&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTIONUNIT" value="wxString(&quot;ResolutionUnit&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTIONX" value="wxString(&quot;ResolutionX&quot;)"/>
-  <define name="wxIMAGE_OPTION_RESOLUTIONY" value="wxString(&quot;ResolutionY&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_BITSPERSAMPLE" value="wxString(&quot;BitsPerSample&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_COMPRESSION" value="wxString(&quot;Compression&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR" value="wxString(&quot;ImageDescriptor&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_PHOTOMETRIC" value="wxString(&quot;Photometric&quot;)"/>
-  <define name="wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL" value="wxString(&quot;SamplesPerPixel&quot;)"/>
   <define name="wxUPDATE_UI_PROCESS_ALL" value="0"/>
   <define name="wxUPDATE_UI_PROCESS_SPECIFIED" value="1"/>
   <define name="wxMOUSE_WHEEL_VERTICAL" value="0"/>
@@ -780,13 +860,6 @@
   <define name="wxDV_VERT_RULES" value="0x0008"/>
   <define name="wxDV_ROW_LINES" value="0x0010"/>
   <define name="wxDV_VARIABLE_LINE_HEIGHT" value="0x0020"/>
-  <define name="wxDATAVIEW_CELL_INERT" value="0"/>
-  <define name="wxDATAVIEW_CELL_ACTIVATABLE" value="1"/>
-  <define name="wxDATAVIEW_CELL_EDITABLE" value="2"/>
-  <define name="wxDATAVIEW_CELL_SELECTED" value="1"/>
-  <define name="wxDATAVIEW_CELL_PRELIT" value="2"/>
-  <define name="wxDATAVIEW_CELL_INSENSITIVE" value="4"/>
-  <define name="wxDATAVIEW_CELL_FOCUSED" value="8"/>
   <define name="wxDATAVIEW_COL_RESIZABLE" value="1"/>
   <define name="wxDATAVIEW_COL_SORTABLE" value="2"/>
   <define name="wxDATAVIEW_COL_REORDERABLE" value="4"/>
@@ -813,10 +886,6 @@
   <define name="wxFLP_FILE_MUST_EXIST" value="0x2000"/>
   <define name="wxFLP_CHANGE_DIR" value="0x4000"/>
   <define name="wxFLP_SMALL" value="0x8000"/>
-  <define name="wxGridSelectCells" value="0"/>
-  <define name="wxGridSelectRows" value="1"/>
-  <define name="wxGridSelectColumns" value="2"/>
-  <define name="wxGridSelectRowsOrColumns" value="3"/>
   <define name="wxANTIALIAS_NONE" value="0"/>
   <define name="wxANTIALIAS_DEFAULT" value="1"/>
   <define name="wxINTERPOLATION_DEFAULT" value="0"/>
@@ -1062,11 +1131,6 @@
   <define name="wxCHK_2STATE" value="0x4000"/>
   <define name="wxCHK_3STATE" value="0x1000"/>
   <define name="wxCHK_ALLOW_3RD_STATE_FOR_USER" value="0x2000"/>
-  <define name="wxSYS_OEM_FIXED_FONT" value="10"/>
-  <define name="wxSYS_ANSI_FIXED_FONT" value="11"/>
-  <define name="wxSYS_ANSI_VAR_FONT" value="12"/>
-  <define name="wxSYS_SYSTEM_FONT" value="13"/>
-  <define name="wxSYS_DEVICE_DEFAULT_FONT" value="14"/>
   <define name="wxSYS_DEFAULT_PALETTE" value="15"/>
   <define name="wxSYS_SYSTEM_FIXED_FONT" value="16"/>
   <define name="wxSYS_DEFAULT_GUI_FONT" value="17"/>
@@ -3282,9 +3346,6 @@
   <define name="wxSTC_EDI_UNA" value="6"/>
   <define name="wxSTC_EDI_UNH" value="7"/>
   <define name="wxSTC_EDI_BADSEGMENT" value="8"/>
-  <define name="wxANIMATION_TYPE_INVALID" value="0"/>
-  <define name="wxANIMATION_TYPE_GIF" value="1"/>
-  <define name="wxANIMATION_TYPE_ANI" value="2"/>
   <define name="wxANIMATION_TYPE_ANIY" value="3"/>
   <define name="wxANIM_UNSPECIFIED" value="-1"/>
   <define name="wxANIM_DONOTREMOVE" value="0"/>
@@ -3502,13 +3563,6 @@
   <define name="wxGRID_DRAW_DEFAULT" value="15"/>
   <define name="wxSafeIncRef(p)" value="if ( p ) (p)-&gt;IncRef()"/>
   <define name="wxSafeDecRef(p)" value="if ( p ) (p)-&gt;DecRef()"/>
-  <define name="wxDV_SINGLE" value="0x0000"/>
-  <define name="wxDV_MULTIPLE" value="0x0001"/>
-  <define name="wxDV_NO_HEADER" value="0x0002"/>
-  <define name="wxDV_HORIZ_RULES" value="0x0004"/>
-  <define name="wxDV_VERT_RULES" value="0x0008"/>
-  <define name="wxDV_ROW_LINES" value="0x0010"/>
-  <define name="wxDV_VARIABLE_LINE_HEIGHT" value="0x0020"/>
   <define name="wxGA_PROGRESS" value="0x0010"/>
   <define name="wxGA_SMOOTH" value="0x0020"/>
   <define name="wxGA_TEXT" value="0x0040"/>
@@ -3562,6 +3616,10 @@
   <define name="wxLAYOUT_LENGTH_X" value="0"/>
   <define name="wxLAYOUT_MRU_LENGTH" value="0x10"/>
   <define name="wxLAYOUT_QUERY" value="0x100"/>
+  <!-- enum wxRegionContain -->
+  <define name="wxOutRegion" value="0"/>
+  <define name="wxPartRegion" value="1"/>
+  <define name="wxInRegion" value="2"/>
   <define name="wxLOG_FatalError" value="0"/>
   <define name="wxLOG_Error" value="1"/>
   <define name="wxLOG_Warning" value="2"/>
@@ -3723,47 +3781,9 @@
   <define name="wxTB_RIGHT" value="0x4000"/>
   <define name="wxTB_DEFAULT_STYLE" value="0x0004"/>
   <!-- Start of standard button and menu IDs -->
-  <define name="wxSYS_COLOUR_SCROLLBAR" value="0"/>
-  <define name="wxSYS_COLOUR_DESKTOP" value="1"/>
-  <define name="wxSYS_COLOUR_ACTIVECAPTION" value="2"/>
-  <define name="wxSYS_COLOUR_INACTIVECAPTION" value="3"/>
-  <define name="wxSYS_COLOUR_MENU" value="4"/>
-  <define name="wxSYS_COLOUR_WINDOW" value="5"/>
-  <define name="wxSYS_COLOUR_WINDOWFRAME" value="6"/>
-  <define name="wxSYS_COLOUR_MENUTEXT" value="7"/>
-  <define name="wxSYS_COLOUR_WINDOWTEXT" value="8"/>
-  <define name="wxSYS_COLOUR_CAPTIONTEXT" value="9"/>
-  <define name="wxSYS_COLOUR_ACTIVEBORDER" value="10"/>
   <define name="wxSYS_COLOUR_INACTIVEBORDER" value="11"/>
-  <define name="wxSYS_COLOUR_APPWORKSPACE" value="12"/>
-  <define name="wxSYS_COLOUR_HIGHLIGHT" value="13"/>
-  <define name="wxSYS_COLOUR_HIGHLIGHTTEXT" value="14"/>
-  <define name="wxSYS_COLOUR_BTNFACE" value="15"/>
-  <define name="wxSYS_COLOUR_BTNSHADOW" value="16"/>
-  <define name="wxSYS_COLOUR_GRAYTEXT" value="17"/>
-  <define name="wxSYS_COLOUR_BTNTEXT" value="18"/>
-  <define name="wxSYS_COLOUR_INACTIVECAPTIONTEXT" value="19"/>
-  <define name="wxSYS_COLOUR_BTNHIGHLIGHT" value="20"/>
-  <define name="wxSYS_COLOUR_3DDKSHADOW" value="21"/>
-  <define name="wxSYS_COLOUR_3DLIGHT" value="22"/>
-  <define name="wxSYS_COLOUR_INFOTEXT" value="23"/>
-  <define name="wxSYS_COLOUR_INFOBK" value="24"/>
-  <define name="wxSYS_COLOUR_LISTBOX" value="25"/>
-  <define name="wxSYS_COLOUR_HOTLIGHT" value="26"/>
-  <define name="wxSYS_COLOUR_GRADIENTACTIVECAPTION" value="27"/>
-  <define name="wxSYS_COLOUR_GRADIENTINACTIVECAPTION" value="28"/>
-  <define name="wxSYS_COLOUR_MENUHILIGHT" value="29"/>
-  <define name="wxSYS_COLOUR_MENUBAR" value="30"/>
-  <define name="wxSYS_COLOUR_LISTBOXTEXT" value="31"/>
-  <define name="wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT" value="32"/>
   <define name="wxSYS_COLOUR_MAX" value="33"/>
   <define name="wxSYS_COLOUR_BACKGROUND" value="15"/>
-  <define name="wxSYS_COLOUR_3DFACE" value="15"/>
-  <define name="wxSYS_COLOUR_3DSHADOW" value="16"/>
-  <define name="wxSYS_COLOUR_BTNHILIGHT" value="20"/>
-  <define name="wxSYS_COLOUR_3DHIGHLIGHT" value="20"/>
-  <define name="wxSYS_COLOUR_3DHILIGHT" value="20"/>
-  <define name="wxSYS_COLOUR_FRAMEBK" value="15"/>
   <define name="wxID_OK" value="5100"/>
   <define name="wxID_CANCEL" value="5101"/>
   <define name="wxID_APPLY" value="5102"/>
@@ -3872,23 +3892,7 @@
   <define name="wxBK_HITTEST_ONLABEL" value="3"/>
   <define name="wxBK_HITTEST_ONITEM" value="4"/>
   <define name="wxBK_HITTEST_ONPAGE" value="5"/>
-  <define name="wxCMD_LINE_OPTION_MANDATORY" value="0x01"/>
-  <define name="wxCMD_LINE_PARAM_OPTIONAL" value="0x02"/>
-  <define name="wxCMD_LINE_PARAM_MULTIPLE" value="0x04"/>
-  <define name="wxCMD_LINE_OPTION_HELP" value="0x08"/>
-  <define name="wxCMD_LINE_NEEDS_SEPARATOR" value="0x10"/>
-  <define name="wxCMD_LINE_SWITCH_NEGATABLE" value="0x20"/>
   <define name="wxCMD_LINE_HIDDEN" value="0x40"/>
-  <define name="wxCMD_LINE_VAL_STRING" value="0"/>
-  <define name="wxCMD_LINE_VAL_NUMBER" value="1"/>
-  <define name="wxCMD_LINE_VAL_DATE" value="2"/>
-  <define name="wxCMD_LINE_VAL_DOUBLE" value="3"/>
-  <define name="wxCMD_LINE_VAL_NONE" value="4"/>
-  <define name="wxCMD_LINE_SWITCH" value="0"/>
-  <define name="wxCMD_LINE_OPTION" value="1"/>
-  <define name="wxCMD_LINE_PARAM" value="2"/>
-  <define name="wxCMD_LINE_USAGE_TEXT" value="3"/>
-  <define name="wxCMD_LINE_NONE" value="4"/>
   <define name="wxCMD_SWITCH_OFF" value="-1"/>
   <define name="wxCMD_SWITCH_NOT_FOUND" value="0"/>
   <define name="wxCMD_SWITCH_ON" value="1"/>
@@ -4075,14 +4079,6 @@
   <define name="wxPG_EX_WINDOW_PGMAN_STYLE_MASK" value="419471360"/>
   <define name="wxPG_EX_WINDOW_STYLE_MASK" value="528068608"/>
   <define name="wxPG_EX_DISABLE_TLP_TRACKING" value="0"/>
-  <define name="wxPG_VFB_STAY_IN_PROPERTY" value="0x01"/>
-  <define name="wxPG_VFB_BEEP" value="0x02"/>
-  <define name="wxPG_VFB_MARK_CELL" value="0x04"/>
-  <define name="wxPG_VFB_SHOW_MESSAGE" value="0x08"/>
-  <define name="wxPG_VFB_SHOW_MESSAGEBOX" value="0x10"/>
-  <define name="wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR" value="0x20"/>
-  <define name="wxPG_VFB_DEFAULT" value="20"/>
-  <define name="wxPG_VFB_UNDEFINED" value="0x80"/>
   <define name="wxPGVFBFlags" value="unsigned char"/>
   <define name="wxTL_SINGLE" value="0x0000"/>
   <define name="wxTL_MULTIPLE" value="0x0001"/>
@@ -5131,15 +5127,6 @@
   <define name="wxXMLDOC_NONE" value="0"/>
   <define name="wxXMLDOC_KEEP_WHITESPACE_NODES" value="1"/>
   <define name="wxInvalidOffset" value="-1"/>
-  <define name="wxPATH_NATIVE" value="0"/>
-  <define name="wxPATH_UNIX" value="1"/>
-  <define name="wxPATH_BEOS" value="1"/>
-  <define name="wxPATH_MAC" value="2"/>
-  <define name="wxPATH_DOS" value="3"/>
-  <define name="wxPATH_WIN" value="3"/>
-  <define name="wxPATH_OS2" value="3"/>
-  <define name="wxPATH_VMS" value="4"/>
-  <define name="wxPATH_MAX" value="5"/>
   <define name="wxEVENT_PROPAGATE_NONE" value="0"/>
   <define name="wxEVENT_PROPAGATE_MAX" value="INT_MAX"/>
   <define name="WXK_CATEGORY_ARROW" value="1"/>
@@ -5159,10 +5146,6 @@
   <define name="wxEVT_CATEGORY_CLIPBOARD" value="64"/>
   <define name="wxEVT_CATEGORY_NATIVE_EVENTS" value="3"/>
   <define name="wxEVT_CATEGORY_ALL" value="127"/>
-  <define name="wxSHUTDOWN_FORCE" value="1"/>
-  <define name="wxSHUTDOWN_POWEROFF" value="2"/>
-  <define name="wxSHUTDOWN_REBOOT" value="4"/>
-  <define name="wxSHUTDOWN_LOGOFF" value="8"/>
   <define name="wxStrip_Mnemonics" value="1"/>
   <define name="wxStrip_Accel" value="2"/>
   <define name="wxStrip_All" value="3"/>
@@ -5189,9 +5172,6 @@
   <define name="wxSIGPIPE" value="13"/>
   <define name="wxSIGALRM" value="14"/>
   <define name="wxSIGTERM" value="15"/>
-  <define name="wxStrip_Mnemonics" value="1"/>
-  <define name="wxStrip_Accel" value="2"/>
-  <define name="wxStrip_All" value="3"/>
   <!--  wxThread and wxProcess priorities -->
   <define name="wxPRIORITY_MIN" value="0"/>
   <define name="wxPRIORITY_DEFAULT" value="50"/>
@@ -5233,6 +5213,10 @@
   <!-- typedef unsigned short wxDateTime_t; -->
   <podtype name="wxDateTime_t" sign="u"/>
   <podtype name="wxLogLevel"/>
+  <!-- https://docs.wxwidgets.org/latest/classwx_icon_bundle.html -->
+  <define name="FALLBACK_NONE" value="0"/>
+  <define name="FALLBACK_SYSTEM" value="1"/>
+  <define name="FALLBACK_NEAREST_LARGER" value="2"/>
   <!-- https://docs.wxwidgets.org/trunk/group__group__class__smartpointers.html -->
   <smart-pointer class-name="wxObjectDataPtr"/>
   <smart-pointer class-name="wxScopedArray">
@@ -5430,20 +5414,22 @@
     </arg>
   </function>
   <!-- http://docs.wxwidgets.org/trunk/classwx_string.html#ace32756bab999f8aae9be0cf981fc449 -->
-  <!-- bool wxString::IsEmpty() -->
+  <!-- bool wxString::IsEmpty() const -->
   <function name="wxString::IsEmpty">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
     <use-retval/>
+    <const/>
   </function>
   <!-- http://docs.wxwidgets.org/trunk/classwx_string.html#ae0a2020695a6ecd9ee49c14fe7429176 -->
-  <!-- bool wxString::IsNull() -->
+  <!-- bool wxString::IsNull() const -->
   <function name="wxString::IsNull">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
     <use-retval/>
+    <const/>
     <warn severity="style">This is the same as 'wxString::IsEmpty' and is kept for wxWidgets 1.xx compatibility. You should not use it in new code.</warn>
   </function>
   <!-- bool wxString::Contains(const wxString & str) const-->
@@ -5494,7 +5480,8 @@
   </function>
   <!-- http://docs.wxwidgets.org/trunk/classwx_string.html#ab20a87ca731a52c36ec674dae2213ad8 -->
   <!-- size_t wxString::Length () const -->
-  <function name="wxString::Length">
+  <!-- size_t wxString::length () const -->
+  <function name="wxString::Length,wxString::length">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <const/>
@@ -5697,7 +5684,7 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_spin_ctrl.html#a1db15e6f350f71f2fcba821ce69a531c	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_spin_ctrl.html#a1db15e6f350f71f2fcba821ce69a531c -->
   <!-- int wxSpinCtrl::GetMax() const -->
   <!-- int wxSpinCtrl::GetMin() const -->
   <!-- int wxSpinCtrl::GetBase() const -->
@@ -5709,7 +5696,18 @@
     <const/>
     <returnValue type="int"/>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_spin_ctrl.html#a1db15e6f350f71f2fcba821ce69a531c	-->
+  <!-- virtual bool wxCheckBox::GetValue( void ) const -->
+  <!--         bool wxCheckBox::IsChecked( void ) const -->
+  <!--         bool wxCheckBox::Is3State( void ) const -->
+  <!--         bool wxCheckBox::Is3rdStateAllowedForUser( void ) const -->
+  <function name="wxCheckBox::GetValue,wxCheckBox::IsChecked,wxCheckBox::Is3State,wxCheckBox::Is3rdStateAllowedForUser">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <const/>
+    <returnValue type="bool"/>
+  </function>
+  <!-- http://docs.wxwidgets.org/trunk/classwx_spin_ctrl.html#a1db15e6f350f71f2fcba821ce69a531c -->
   <!-- bool wxSpinCtrl::SetBase (int base)-->
   <function name="wxSpinCtrl::SetBase">
     <noreturn>false</noreturn>
@@ -5722,6 +5720,14 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- const wxColour & wxGridCellAttr::GetTextColour( void ) const -->
+  <function name="wxGridCellAttr::GetTextColour">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxColour &amp;"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- void wxGrid::HideRow(int row)-->
   <!-- void wxGrid::ShowRow(int row)-->
   <!-- void wxGrid::HideCol(int col)-->
@@ -5737,6 +5743,14 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- wxGridTableBase * wxGrid::GetTable( void ) const -->
+  <function name="wxGrid::GetTable">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxGridTableBase *"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- void wxGrid::EnableCellEditControl(bool enable=true )-->
   <function name="wxGrid::EnableCellEditControl">
     <noreturn>false</noreturn>
@@ -5910,16 +5924,16 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_slider.html	-->
-  <!-- int wxSlider::GetLineSize () const	-->
-  <!-- int wxSlider::GetMax () const	-->
-  <!-- int wxSlider::GetMin () const	-->
-  <!-- int wxSlider::GetPageSize () const	-->
-  <!-- int wxSlider::GetSelEnd () const	-->
-  <!-- int wxSlider::GetSelStart () const	-->
-  <!-- int wxSlider::GetThumbLength () const	-->
-  <!-- int wxSlider::GetTickFreq () const	-->
-  <!-- int wxSlider::GetValue () const	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_slider.html  -->
+  <!-- int wxSlider::GetLineSize () const   -->
+  <!-- int wxSlider::GetMax () const    -->
+  <!-- int wxSlider::GetMin () const    -->
+  <!-- int wxSlider::GetPageSize () const   -->
+  <!-- int wxSlider::GetSelEnd () const -->
+  <!-- int wxSlider::GetSelStart () const   -->
+  <!-- int wxSlider::GetThumbLength () const    -->
+  <!-- int wxSlider::GetTickFreq () const   -->
+  <!-- int wxSlider::GetValue () const  -->
   <function name="wxSlider::GetLineSize,wxSlider::GetMax,wxSlider::GetMin,wxSlider::GetPageSize,wxSlider::GetSelEnd,wxSlider::GetSelStart,wxSlider::GetThumbLength,wxSlider::GetTickFreq,wxSlider::GetValue">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -5927,9 +5941,9 @@
     <const/>
     <returnValue type="int"/>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
-  <!-- int wxTimer::GetId () const	-->
-  <!-- int wxTimer::GetInterval () const	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
+  <!-- int wxTimer::GetId () const  -->
+  <!-- int wxTimer::GetInterval () const    -->
   <function name="wxTimer::GetId,wxTimer::GetInterval">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -5937,15 +5951,15 @@
     <const/>
     <returnValue type="int"/>
   </function>
-  <!-- static int wxLocale::GetSystemLanguage(void)	-->
+  <!-- static int wxLocale::GetSystemLanguage(void) -->
   <function name="wxLocale::GetSystemLanguage">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <use-retval/>
     <returnValue type="int"/>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
-  <!-- wxEvtHandler * GetOwner () const	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
+  <!-- wxEvtHandler * GetOwner () const -->
   <function name="wxTimer::GetOwner">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -5953,7 +5967,7 @@
     <use-retval/>
     <returnValue type="wxEvtHandler *"/>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
   <!-- bool wxTimer::IsOneShot () const -->
   <!-- bool wxTimer::IsRunning () const -->
   <function name="wxTimer::IsOneShot,wxTimer::IsRunning">
@@ -5963,13 +5977,13 @@
     <const/>
     <returnValue type="bool"/>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
   <!-- virtual void Notify ()-->
   <function name="wxTimer::Notify">
     <noreturn>false</noreturn>
     <leak-ignore/>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
   <!-- void SetOwner (wxEvtHandler *owner, int id=-1)-->
   <function name="wxTimer::SetOwner">
     <noreturn>false</noreturn>
@@ -5983,7 +5997,7 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
   <!-- virtual bool wxTimer::Start (int milliseconds=-1, bool oneShot=wxTIMER_CONTINUOUS) -->
   <function name="wxTimer::Start">
     <noreturn>false</noreturn>
@@ -5997,7 +6011,7 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
   <!-- bool wxTimer::StartOnce (int milliseconds=-1) -->
   <function name="wxTimer::StartOnce">
     <noreturn>false</noreturn>
@@ -6008,7 +6022,7 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html	-->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_timer.html   -->
   <!-- virtual void wxTimer::Stop () -->
   <function name="wxTimer::Stop">
     <noreturn>false</noreturn>
@@ -6229,6 +6243,29 @@
     <arg nr="2" direction="in" default="wxDEFAULT_DELIMITERS"/>
     <arg nr="3" direction="in" default="wxTOKEN_DEFAULT"/>
   </function>
+  <!-- wxStringTokenizerMode wxStringTokenizer::GetMode( void ) const -->
+  <function name="wxStringTokenizer::GetMode">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxStringTokenizerMode"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxString wxStringTokenizer::GetNextToken( void ) -->
+  <function name="wxStringTokenizer::GetNextToken">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxString"/>
+      <use-retval/>
+  </function>
+  <!-- size_t wxStringTokenizer::GetPosition( void ) const -->
+  <function name="wxStringTokenizer::GetPosition">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="size_t"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- virtual void wxTextEntry::SetSelection (long from, long to) -->
   <!-- virtual void wxTextEntry::SetSelection (int n) -->
   <!-- virtual void wxRadioBox::SetSelection (int n) -->
@@ -6248,6 +6285,22 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- wxTextPos wxTextCtrl::GetLastPosition( void ) const -->
+  <function name="wxTextCtrl::GetLastPosition">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxTextPos"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- bool wxTextCtrl::IsModified( void ) const -->
+  <function name="wxTextCtrl::IsModified">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- bool wxTextCtrl::SaveFile(const wxString & filename = wxEmptyString, int fileType = wxTEXT_TYPE_ANY )-->
   <function name="wxTextCtrl::SaveFile">
     <noreturn>false</noreturn>
@@ -6820,7 +6873,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="wxSizerItem*"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <!-- <not-null/> Deactivated due to FPs with overloaded function: wxSizerItem * Add (int width, int height, int proportion=0, int flag=0, int border=0, wxObject *userData=NULL) -->
       <not-uninit/>
     </arg>
@@ -7200,6 +7253,25 @@
     <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">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxString"/>
+      <const/>
+      <arg nr="1" default="wxPGPropValFormatFlags::Null" direction="in">
+      </arg>
+  </function>
   <!--        wxString wxPlatformInfo::GetArchName ( ) const  -->
   <!-- Not possible to configure both functions:
        static wxString wxPlatformInfo::GetArchName ( wxArchitecture  arch) -->
@@ -7238,7 +7310,7 @@
     <arg nr="4" direction="out"/>
     <warn severity="style">This function is deprecated, please use 'wxFileName::SplitPath()' instead.</warn>
   </function>
-  <!-- virtual void wxToolBar::OnRightClick(int toolId, long x, long y)	-->
+  <!-- virtual void wxToolBar::OnRightClick(int toolId, long x, long y) -->
   <function name="wxToolBar::OnRightClick">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -7309,7 +7381,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="void"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -7337,7 +7409,7 @@
     </arg>
     <warn severity="style">This function is deprecated. Construct a wxFileName with wxPATH_UNIX and then use wxFileName::GetFullPath(wxPATH_DOS) instead.</warn>
   </function>
-  <!-- void wxStyledTextCtrl::SetStyleBits(int bits	)-->
+  <!-- void wxStyledTextCtrl::SetStyleBits(int bits )-->
   <function name="wxStyledTextCtrl::SetStyleBits">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -7420,6 +7492,26 @@
     <returnValue type="wxString"/>
     <warn severity="style">Use 'wxStyledTextEvent::GetString()' instead.</warn>
   </function>
+  <!-- wxString wxToolbookEvent::GetString() const-->
+  <!-- wxString wxStyledTextEvent::GetString() const-->
+  <function name="wxStyledTextEvent::GetString,wxToolbookEvent::GetString">
+    <noreturn>false</noreturn>
+    <use-retval/>
+    <const/>
+    <leak-ignore/>
+    <returnValue type="wxString"/>
+  </function>
+  <!-- int wxToolbookEvent::GetOldSelection( void ) const -->
+  <!-- int wxToolbookEvent::GetSelection( void ) const -->
+  <!-- int wxBookCtrlEvent::GetOldSelection( void ) const -->
+  <!-- int wxBookCtrlEvent::GetSelection( void ) const -->
+  <function name="wxBookCtrlEvent::GetOldSelection,wxBookCtrlEvent::GetSelection,wxToolbookEvent::GetOldSelection,wxToolbookEvent::GetSelection">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- void wxStyledTextEvent::SetText(const wxString & t) -->
   <!-- void wxStyledTextEvent::SetDragText(const wxString & val) -->
   <function name="wxStyledTextEvent::SetText,wxStyledTextEvent::SetDragText">
@@ -7429,6 +7521,27 @@
     <arg nr="1" direction="in"/>
     <warn severity="style">This function is deprecated.</warn>
   </function>
+  <!-- int wxStyledTextEvent::GetFoldLevelNow( void ) const -->
+  <!-- int wxStyledTextEvent::GetFoldLevelPrev( void ) const -->
+  <!-- int wxStyledTextEvent::GetKey( void ) const -->
+  <!-- int wxStyledTextEvent::GetLParam( void ) const -->
+  <!-- int wxStyledTextEvent::GetLength( void ) const -->
+  <!-- int wxStyledTextEvent::GetLine( void ) const -->
+  <!-- int wxStyledTextEvent::GetLinesAdded( void ) const -->
+  <!-- int wxStyledTextEvent::GetListCompletionMethod( void ) const -->
+  <!-- int wxStyledTextEvent::GetListType( void ) const -->
+  <!-- int wxStyledTextEvent::GetMargin( void ) const -->
+  <!-- int wxStyledTextEvent::GetMessage( void ) const -->
+  <!-- int wxStyledTextEvent::GetModificationType( void ) const -->
+  <!-- int wxStyledTextEvent::GetModifiers( void ) const -->
+  <!-- int wxStyledTextEvent::GetPosition( void ) const -->
+  <function name="wxStyledTextEvent::GetFoldLevelNow,wxStyledTextEvent::GetFoldLevelPrev,wxStyledTextEvent::GetKey,wxStyledTextEvent::GetLParam,wxStyledTextEvent::GetLength,wxStyledTextEvent::GetLine,wxStyledTextEvent::GetLinesAdded,wxStyledTextEvent::GetListCompletionMethod,wxStyledTextEvent::GetListType,wxStyledTextEvent::GetMargin,wxStyledTextEvent::GetMessage,wxStyledTextEvent::GetModificationType,wxStyledTextEvent::GetModifiers,wxStyledTextEvent::GetPosition">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- void wxWindow::SetPalette(const wxPalette & pal) -->
   <function name="wxWindow::SetPalette">
     <noreturn>false</noreturn>
@@ -7443,9 +7556,18 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <use-retval/>
+    <const/>
     <returnValue type="wxCoord"/>
     <warn severity="style">This function is deprecated and kept mostly for backwards compatibility. Please override 'GetMargins()' method instead in any new code.</warn>
   </function>
+  <!-- wxPoint wxComboCtrl::GetMargins( ) const-->
+  <function name="wxComboCtrl::GetMargins">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <use-retval/>
+    <const/>
+    <returnValue type="wxPoint"/>
+  </function>
   <!-- http://docs.wxwidgets.org/trunk/classwx_combo_ctrl.html#ae38353a81954d02af302ba103e984cb7 -->
   <!-- void wxComboCtrl::HidePopup (bool generateEvent=false)-->
   <function name="wxComboCtrl::HidePopup">
@@ -7475,7 +7597,7 @@
     <warn severity="style">This function is deprecated and kept mostly for backwards compatibility. Please override 'SetMargins()' method instead in any new code.</warn>
   </function>
   <!-- http://docs.wxwidgets.org/trunk/classwx_data_view_custom_renderer.html#a242d0992df73be6830e66d74b211974d-->
-  <!-- virtual bool wxDataViewCustomRenderer::Activate (wxRect cell, wxDataViewModel * model, const wxDataViewItem & item, unsigned int col)	-->
+  <!-- virtual bool wxDataViewCustomRenderer::Activate (wxRect cell, wxDataViewModel * model, const wxDataViewItem & item, unsigned int col)    -->
   <function name="wxDataViewCustomRenderer::Activate">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -7583,6 +7705,15 @@
     </arg>
     <warn severity="style">This function is deprecated. Please use 'wxFileName::SplitPath()' instead.</warn>
   </function>
+  <!-- wxString wxFileName::GetFullPath( wxPathFormat format = wxPATH_NATIVE ) const -->
+  <function name="wxFileName::GetFullPath">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxString"/>
+      <const/>
+      <arg nr="1" default="wxPATH_NATIVE" direction="in">
+      </arg>
+  </function>
   <!-- bool wxControlBase::SetLabelMarkup( const wxString & markup ) -->
   <!-- bool wxStaticText::SetLabelMarkup( const wxString & markup ) -->
   <function name="wxControlBase::SetLabelMarkup,wxStaticText::SetLabelMarkup">
@@ -7906,7 +8037,7 @@
     </arg>
     <warn severity="style">This function is deprecated since version 3.1.2, dimensions and depth can only be set at construction time.</warn>
   </function>
-  <!-- virtual void wxWindow::SetExtraStyle	(long exStyle) -->
+  <!-- virtual void wxWindow::SetExtraStyle (long exStyle) -->
   <!-- virtual void wxPropertyGridManager::SetExtraStyle(long exStyle) -->
   <function name="wxWindow::SetExtraStyle,wxPropertyGridManager::SetExtraStyle">
     <noreturn>false</noreturn>
@@ -7916,7 +8047,7 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- wxPropertyGridPage* wxPropertyGridManager::AddPage(const wxString & label = wxEmptyString, const wxBitmap & 	bmp = wxPG_NULL_BITMAP, wxPropertyGridPage * pageObj = NULL) -->
+  <!-- wxPropertyGridPage* wxPropertyGridManager::AddPage(const wxString & label = wxEmptyString, const wxBitmap &  bmp = wxPG_NULL_BITMAP, wxPropertyGridPage * pageObj = NULL) -->
   <function name="wxPropertyGridManager::AddPage">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -8409,7 +8540,7 @@
     </arg>
     <arg nr="6" direction="in" default="wxScrolledWindow"/>
   </function>
-  <!-- bool wxCheckBox::Create(wxWindow * parent, wxWindowID id, const wxString & label, const wxPoint & pos = wxDefaultPosition, const wxSize & size = wxDefaultSize, long style = 0, const wxString & 	name = wxDialogNameStr) -->
+  <!-- bool wxCheckBox::Create(wxWindow * parent, wxWindowID id, const wxString & label, const wxPoint & pos = wxDefaultPosition, const wxSize & size = wxDefaultSize, long style = 0, const wxString &     name = wxDialogNameStr) -->
   <function name="wxCheckBox::Create">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -8450,7 +8581,7 @@
     </arg>
     <arg nr="7" direction="in" default="wxStaticTextNameStr"/>
   </function>
-  <!-- bool wxDialog::Create(wxWindow * parent, wxWindowID id, const wxString & title, const wxPoint & pos = wxDefaultPosition, const wxSize & size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString & 	name = wxDialogNameStr) -->
+  <!-- bool wxDialog::Create(wxWindow * parent, wxWindowID id, const wxString & title, const wxPoint & pos = wxDefaultPosition, const wxSize & size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString &  name = wxDialogNameStr) -->
   <function name="wxDialog::Create">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -8660,7 +8791,7 @@
     </arg>
     <warn severity="style">This function is deprecated. Please use 'SetDefaultCellTextColour(colour)' instead.</warn>
   </function>  -->
-  <!-- int wxEntry (HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,char * pCmdLine = NULL,int 	nCmdShow = SW_SHOWNORMAL) -->
+  <!-- int wxEntry (HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,char * pCmdLine = NULL,int  nCmdShow = SW_SHOWNORMAL) -->
   <function name="wxEntry">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -9488,9 +9619,9 @@
     <returnValue type="void"/>
     <arg nr="1" direction="in"/>
   </function>
-  <!-- void wxPropertyGridInterface::SetPropertyReadOnly(wxPGPropArg id, bool set = true, int flags = wxPG_RECURSE)	 -->
-  <!-- void wxPropertyGridPage::SetPropertyReadOnly(wxPGPropArg id, bool set = true, int flags = wxPG_RECURSE)	 -->
-  <!-- void wxPropertyGridManager::SetPropertyReadOnly(wxPGPropArg id, bool set = true, int flags = wxPG_RECURSE)	 -->
+  <!-- void wxPropertyGridInterface::SetPropertyReadOnly(wxPGPropArg id, bool set = true, int flags = wxPG_RECURSE)  -->
+  <!-- void wxPropertyGridPage::SetPropertyReadOnly(wxPGPropArg id, bool set = true, int flags = wxPG_RECURSE)   -->
+  <!-- void wxPropertyGridManager::SetPropertyReadOnly(wxPGPropArg id, bool set = true, int flags = wxPG_RECURSE)    -->
   <function name="wxPropertyGridInterface::SetPropertyReadOnly,wxPropertyGridPage::SetPropertyReadOnly,wxPropertyGridManager::SetPropertyReadOnly">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -9886,8 +10017,8 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- wxMenuItem* wxMenu::AppendCheckItem(int id, const wxString & item, const wxString & 	help = wxEmptyString)-->
-  <!-- wxMenuItem* wxMenu::AppendRadioItem(int id, const wxString & item, const wxString & 	help = wxEmptyString)-->
+  <!-- wxMenuItem* wxMenu::AppendCheckItem(int id, const wxString & item, const wxString &  help = wxEmptyString)-->
+  <!-- wxMenuItem* wxMenu::AppendRadioItem(int id, const wxString & item, const wxString &  help = wxEmptyString)-->
   <function name="wxMenu::AppendCheckItem,wxMenu::AppendRadioItem">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -10017,7 +10148,7 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- virtual bool SetFont (const wxFont &font) 
+  <!-- virtual bool SetFont (const wxFont &font)
        and derived classes -->
   <function name="wxToggleButton::SetFont,wxSpinCtrl::SetFont,wxGrid::SetFont,wxStyledTextCtrl::SetFont,wxStaticBox::SetFont,wxButton::SetFont,wxDataViewTreeCtrl::SetFont,wxTextCtrl::SetFont,wxWindow::SetFont,wxPropertyGridManager::SetFont,wxPaintDC::SetFont,wxStaticText::SetFont,wxBannerWindow::SetFont,wxControl::SetFont,wxGLCanvas::SetFont,wxHtmlHelpWindow::SetFont,wxMDIClientWindow::SetFont,wxMenuBar::SetFont,wxNativeWindow::SetFont,wxNonOwnedWindow::SetFont,wxPanel::SetFont,wxPGMultiButton::SetFont,wxSashWindow::SetFont,wxSplitterWindow::SetFont,wxTipWindow::SetFont,wxTreeListCtrl::SetFont,wxActiveXContainer::SetFont,wxActivityIndicator::SetFont,wxAnimationCtrl::SetFont,wxAnyButton::SetFont,wxAuiToolBar::SetFont,wxBookCtrlBase::SetFont,wxCalenderCtrl::SetFont,wxCheckBox::SetFont,wxChoice::SetFont,wxCollapsibleHeaderCtrl::SetFont,wxCollapsiblePane::SetFont,wxComboBox::SetFont,wxComboCtrl::SetFont,wxControlWithItems::SetFont,wxDataViewCtrl::SetFont,wxDatePickerCtrl::SetFont,wxFileCtrl::SetFont,wxGauge::SetFont,wxGenericDirCtrl::SetFont,wxHeaderCtrl::SetFont,wxHyperlinkCtrl::SetFont,wxInfoBar::SetFont,wxListBox::SetFont,wxListCtrl::SetFont,wxMediaCtrl::SetFont,wxPickerBase::SetFont,wxPropertyGrid::SetFont,wxRadioBox::SetFont,wxRadioButton::SetFont,wxRibbonCtrl::SetFont,wxRichTextCtrl::SetFont">
     <noreturn>false</noreturn>
@@ -10110,14 +10241,6 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- wxPoint wxRect::GetPosition() const -->
-  <function name="wxStaticText::GetPosition">
-    <noreturn>false</noreturn>
-    <returnValue type="wxPoint"/>
-    <leak-ignore/>
-    <const/>
-    <use-retval/>
-  </function>
   <!-- bool wxVariant::IsNull() const -->
   <function name="wxVariant::IsNull">
     <noreturn>false</noreturn>
@@ -10238,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>
@@ -10264,6 +10395,17 @@
       <not-bool/>
     </arg>
   </function>
+  <!-- int wxSize::GetHeight( void ) const -->
+  <!-- int wxSize::GetWidth( void ) const -->
+  <!-- int wxSize::GetX( void ) const -->
+  <!-- int wxSize::GetY( void ) const -->
+  <function name="wxSize::GetHeight,wxSize::GetWidth,wxSize::GetX,wxSize::GetY">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- virtual void wxBrush::SetColour(const wxColour & colour)-->
   <function name="wxBrush::SetColour">
     <noreturn>false</noreturn>
@@ -10639,7 +10781,7 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- bool wxFile::ReadAll(wxString * str, const wxMBConv & conv = wxConvAuto())	-->
+  <!-- bool wxFile::ReadAll(wxString * str, const wxMBConv & conv = wxConvAuto())   -->
   <function name="wxFile::ReadAll">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -10683,6 +10825,20 @@
     <const/>
     <leak-ignore/>
   </function>
+  <!-- void wxInitAllImageHandlers( void ) -->
+  <function name="wxInitAllImageHandlers">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="void"/>
+  </function>
+  <!-- wxAppDerivedClass& wxGetApp( void )-->
+  <function name="wxGetApp">
+    <noreturn>false</noreturn>
+    <returnValue type="wxAppDerivedClass &amp;"/>
+    <use-retval/>
+    <const/>
+    <leak-ignore/>
+  </function>
   <!-- virtual void wxTextCtrl::SetMaxLength(unsigned long len)-->
   <function name="wxTextEntry::SetMaxLength,wxTextCtrl::SetMaxLength">
     <noreturn>false</noreturn>
@@ -10872,7 +11028,7 @@
     <returnValue type="size_t"/>
     <use-retval/>
   </function>
-  <!--wxString& wxArrayString::Item	(size_t nIndex) -->
+  <!--wxString& wxArrayString::Item (size_t nIndex) -->
   <!--const wxString& wxArrayString::Item (size_t nIndex) const -->
   <function name="wxArrayString::Item,std::vector::Item">
     <noreturn>false</noreturn>
@@ -10885,7 +11041,7 @@
       <not-bool/>
     </arg>
   </function>
-  <!-- void wxArrayString::Insert(wxString lItem, size_t nIndex, size_t copies = 1)	-->
+  <!-- void wxArrayString::Insert(wxString lItem, size_t nIndex, size_t copies = 1) -->
   <function name="wxArrayString::Insert,std::vector::Insert">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -10929,14 +11085,16 @@
       <not-uninit/>
     </arg>
   </function>
-  <!-- bool wxArrayString::IsEmpty()-->
-  <function name="wxArrayString::IsEmpty,std::vector::IsEmpty">
+  <!-- bool wxArrayString::IsEmpty() const-->
+  <!-- bool wxRegion::IsEmpty() const -->
+  <function name="wxArrayString::IsEmpty,std::vector::IsEmpty,wxRegion::IsEmpty">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
     <use-retval/>
+    <const/>
   </function>
-  <!-- wxUniChar wxString::at(size_t n)const-->
+  <!-- wxUniChar wxString::at(size_t n) const-->
   <function name="wxArrayString::at">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -10983,7 +11141,7 @@
     </arg>
   </function>
   <!-- bool wxIsNullDouble (double x)-->
-  <!-- bool wxIsNaN	(double x)-->
+  <!-- bool wxIsNaN (double x)-->
   <!-- bool wxFinite (double x)-->
   <function name="wxIsNullDouble,wxIsNaN,wxFinite">
     <noreturn>false</noreturn>
@@ -11091,7 +11249,7 @@
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- virtual void wxStatusBar::PushStatusText	(const wxString & string, int field = 0) -->
+  <!-- virtual void wxStatusBar::PushStatusText (const wxString & string, int field = 0) -->
   <function name="wxStatusBar::PushStatusText">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -11103,7 +11261,7 @@
       <valid>0:</valid>
     </arg>
   </function>
-  <!-- virtual void wxStatusBar::SetFieldsCount	(int number = 1, const int * widths = NULL) -->
+  <!-- virtual void wxStatusBar::SetFieldsCount (int number = 1, const int * widths = NULL) -->
   <function name="wxStatusBar::SetFieldsCount">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -11243,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">
@@ -11509,6 +11673,44 @@
     <use-retval/>
     <arg nr="1" direction="in"/>
   </function>
+  <!-- wxSize wxBitmap::GetSize( void ) const -->
+  <!-- wxSize wxBitmap::GetLogicalSize( void ) const -->
+  <function name="wxBitmap::GetSize,wxBitmap::GetLogicalSize">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxSize"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxBitmap::GetWidth( void ) const -->
+  <!-- int wxBitmap::GetHeight( void ) const -->
+  <function name="wxBitmap::GetWidth,wxBitmap::GetHeight">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- double wxBitmap::GetLogicalHeight( void ) const -->
+  <!-- double wxBitmap::GetLogicalWidth( void ) const -->
+  <!-- double wxBitmap::GetScaleFactor( void ) const -->
+  <function name="wxBitmap::GetLogicalHeight,wxBitmap::GetLogicalWidth,wxBitmap::GetScaleFactor">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="double"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- bool wxBitmap::HasAlpha( void ) const -->
+  <!-- bool wxBitmap::IsOk( void ) const -->
+  <!-- bool wxTreeListItem::IsOk( void ) const -->
+  <function name="wxBitmap::HasAlpha,wxBitmap::IsOk,wxTreeListItem::IsOk">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- void wxGridCellAttr::GetAlignment( int * hAlign, int * vAlign ) -->
   <function name="wxGridCellAttr::GetAlignment">
     <leak-ignore/>
@@ -11517,6 +11719,30 @@
     <arg nr="1" direction="out"/>
     <arg nr="2" direction="out"/>
   </function>
+  <!-- unsigned int wxPGChoices::GetCount( void ) const -->
+  <function name="wxPGChoices::GetCount">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="unsigned int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxArrayString wxPGPropertyFlags::wxPGChoices::GetLabels( void ) const -->
+  <function name="wxPGPropertyFlags::wxPGChoices::GetLabels">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxArrayString"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- bool wxPGChoices::IsOk( void ) const -->
+  <function name="wxPGChoices::IsOk">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- virtual void wxGridCellRenderer::Draw(wxGrid &grid, wxGridCellAttr &attr, wxDC &dc, const wxRect &rect, int row, int col, bool isSelected) -->
   <!-- virtual void wxGridCellStringRenderer::Draw (wxGrid &grid, wxGridCellAttr &attr, wxDC &dc, const wxRect &rect, int row, int col, bool isSelected) -->
   <!-- virtual void wxGridCellBoolRenderer::Draw (wxGrid &grid, wxGridCellAttr &attr, wxDC &dc, const wxRect &rect, int row, int col, bool isSelected) -->
@@ -11588,6 +11814,105 @@
       <not-null/>
     </arg>
   </function>
+  <!-- wxGridCellEditorPtr wxGridCellAttr::GetEditorPtr( const wxGrid * grid, int row, int col ) const -->
+  <function name="wxGridCellAttr::GetEditorPtr">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxGridCellEditorPtr"/>
+      <const/>
+      <arg nr="1" direction="inout">
+      </arg>
+      <arg nr="2" direction="in">
+          <not-uninit/>
+      </arg>
+      <arg nr="3" direction="in">
+          <not-uninit/>
+      </arg>
+  </function>
+  <!-- wxGridFitMode wxGridCellAttr::GetFitMode( void ) const -->
+  <function name="wxGridCellAttr::GetFitMode">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxGridFitMode"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- const wxFont & wxGridCellAttr::GetFont( void ) const -->
+  <!-- const wxFont & wxPropertyGrid::GetFont( void ) const -->
+  <function name="wxGridCellAttr::GetFont,wxPropertyGrid::GetFont">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxFont &amp;"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxColour wxPropertyGrid::GetCellBackgroundColour( void ) const -->
+  <!-- wxColour wxPropertyGrid::GetCellDisabledTextColour( void ) const -->
+  <!-- wxColour wxPropertyGrid::GetCellTextColour( void ) const -->
+  <!-- wxColour wxPropertyGrid::GetSelectionBackgroundColour( void ) const -->
+  <function name="wxPropertyGrid::GetCellDisabledTextColour,wxPropertyGrid::GetCellTextColour,wxPropertyGrid::GetSelectionBackgroundColour,wxPropertyGrid::GetCellBackgroundColour">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxColour"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxAttrKind wxGridCellAttr::GetKind( void ) -->
+  <function name="wxGridCellAttr::GetKind">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxAttrKind"/>
+      <use-retval/>
+  </function>
+  <!-- void wxGridCellAttr::GetNonDefaultAlignment( int * hAlign, int * vAlign ) const -->
+  <function name="wxGridCellAttr::GetNonDefaultAlignment">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="void"/>
+      <const/>
+      <arg nr="1" direction="inout">
+      </arg>
+      <arg nr="2" direction="inout">
+      </arg>
+  </function>
+  <!-- bool wxGridCellAttr::GetOverflow( void ) const -->
+  <function name="wxGridCellAttr::GetOverflow">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxGridCellRenderer * wxGridCellAttr::GetRenderer( const wxGrid * grid, int row, int col ) const -->
+  <function name="wxGridCellAttr::GetRenderer">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxGridCellRenderer *"/>
+      <const/>
+      <arg nr="1" direction="inout">
+      </arg>
+      <arg nr="2" direction="in">
+          <not-uninit/>
+      </arg>
+      <arg nr="3" direction="in">
+          <not-uninit/>
+      </arg>
+  </function>
+  <!-- wxGridCellRendererPtr wxGridCellAttr::GetRendererPtr( const wxGrid * grid, int row, int col ) const -->
+  <function name="wxGridCellAttr::GetRendererPtr">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxGridCellRendererPtr"/>
+      <const/>
+      <arg nr="1" direction="inout">
+      </arg>
+      <arg nr="2" direction="in">
+          <not-uninit/>
+      </arg>
+      <arg nr="3" direction="in">
+          <not-uninit/>
+      </arg>
+  </function>
   <!-- virtual wxStatusBar* wxFrameBase::CreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, const wxString & name = wxStatusBarNameStr)-->
   <!-- virtual wxStatusBar* wxFrame::CreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE, wxWindowID id = 0, const wxString & name = wxStatusBarNameStr)-->
   <function name="wxFrameBase::CreateStatusBar,wxFrame::CreateStatusBar">
@@ -11738,6 +12063,24 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- const wxColour & wxGrid::GetBackgroundColour( void ) const -->
+  <!-- const wxColour & wxGridCellAttr::GetBackgroundColour( void ) const -->
+  <function name="wxGridCellAttr::GetBackgroundColour,wxGrid::GetBackgroundColour">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxColour &amp;"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxGridCellCoords::GetCol( void ) const -->
+  <!-- int wxGridCellCoords::GetRow( void ) const -->
+  <function name="wxGridCellCoords::GetCol,wxGridCellCoords::GetRow">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- wxColour wxGrid::GetCellBackgroundColour (int row, int col) const -->
   <!-- wxColour wxGrid::GetCellFont (int row, int col) const -->
   <function name="wxGrid::GetCellBackgroundColour,wxGrid::GetCellFont">
@@ -12184,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"/>
@@ -13751,7 +14095,7 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <noreturn>false</noreturn>
     <returnValue type="void"/>
   </function>
-  <!-- long wxStopWatch::Time(void)	const -->
+  <!-- long wxStopWatch::Time(void) const -->
   <function name="wxStopWatch::Time">
     <leak-ignore/>
     <noreturn>false</noreturn>
@@ -14095,10 +14439,76 @@ wxItemKind kind = wxITEM_NORMAL) -->
       <not-uninit/>
     </arg>
   </function>
+  <!-- wxCoord wxMouseEvent::GetX( void ) const -->
+  <!-- wxCoord wxMouseEvent::GetY( void ) const -->
+  <!-- wxCoord wxMouseState::GetX( void ) const -->
+  <!-- wxCoord wxMouseState::GetY( void ) const -->
+  <function name="wxMouseEvent::GetX,wxMouseEvent::GetY,wxMouseState::GetY,wxMouseState::GetX">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxCoord"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- virtual wxString wxComboCtrl::GetValue( void ) const -->
+  <!-- virtual wxString wxOwnerDrawnComboBox::GetValue( void ) const -->
+  <function name="wxComboCtrl::GetValue,wxOwnerDrawnComboBox::GetValue">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxString"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- bool wxGridCellAttr::CanOverflow( void ) const -->
+  <function name="wxGridCellAttr::CanOverflow">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxGridCellAttr * wxGridCellAttr::Clone( void ) const -->
+  <function name="wxGridCellAttr::Clone">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxGridCellAttr *"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxPropertyGrid * wxPGProperty::GetGrid( void ) const -->
+  <function name="wxPGProperty::GetGrid">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxPropertyGrid *"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxWithImages::GetImageCount( void ) const -->
+  <!-- int wxBookCtrlBase::GetImageCount( void ) const -->
+  <function name="wxWithImages::GetImageCount,wxBookCtrlBase::GetImageCount">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxImageList * wxWithImages::GetImageList( void ) const -->
+  <!-- wxImageList * wxBookCtrlBase::GetImageList( void ) const -->
+  <function name="wxWithImages::GetImageList,wxBookCtrlBase::GetImageList">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxImageList *"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- void wxFocusEvent::Skip(bool skip = true) -->
+  <!-- void wxSpinEvent::Skip(bool skip = true) -->
   <!-- void wxEvent::Skip(bool skip = true) -->
   <!-- void wxCommandEvent::Skip(bool skip = true) -->
   <!-- void wxKeyEvent::Skip(bool skip = true) -->
-  <function name="wxEvent::Skip,wxCommandEvent::Skip,wxKeyEvent::Skip">
+  <!-- void wxGridEvent::Skip(bool skip = true) -->
+  <!-- void wxMouseEvent::Skip(bool skip = true) -->
+  <function name="wxEvent::Skip,wxCommandEvent::Skip,wxKeyEvent::Skip,wxGridEvent::Skip,wxMouseEvent::Skip,wxFocusEvent::Skip,wxSpinEvent::Skip">
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="void"/>
@@ -14106,6 +14516,12 @@ wxItemKind kind = wxITEM_NORMAL) -->
       <not-uninit/>
     </arg>
   </function>
+  <!-- virtual void wxPopupTransientWindow::OnDismiss ( void ) -->
+  <function name="wxPopupTransientWindow::OnDismiss">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="void"/>
+  </function>
   <!-- void wxPropertyGridManager::SetColumnCount(int colCount, int page = -1) -->
   <function name="wxPropertyGridManager::SetColumnCount">
     <leak-ignore/>
@@ -14516,6 +14932,14 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <leak-ignore/>
     <arg nr="1" direction="in"/>
   </function>
+  <!-- bool wxTextCtrl::IsEmpty( void ) const -->
+  <function name="wxTextCtrl::IsEmpty">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- void wxSearchCtrl::SetDescriptiveText(const wxString & text)-->
   <function name="wxSearchCtrl::SetDescriptiveText">
     <noreturn>false</noreturn>
@@ -15147,6 +15571,45 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <use-retval/>
     <const/>
   </function>
+  <!-- virtual int wxNotebook::GetSelection( void ) const -->
+  <function name="wxNotebook::GetSelection">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxMenuItem* wxMenu::AppendSeparator(void) -->
+  <function name="wxMenu::AppendSeparator">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxMenuItem *"/>
+      <use-retval/>
+  </function>
+  <!-- const wxScopedCharBuffer wxString::ToUTF8( void ) const -->
+  <function name="wxString::ToUTF8">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxScopedCharBuffer"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- size_t wxNotebook::GetPageCount ( void ) const -->
+  <!-- size_t wxListbook::GetPageCount ( void ) const -->
+  <!-- size_t wxPropertyGridManager::GetPageCount ( void ) const -->
+  <!-- size_t wxToolbook::GetPageCount ( void ) const -->
+  <!-- size_t wxTreebook::GetPageCount ( void ) const -->
+  <!-- size_t wxSimplebook::GetPageCount ( void ) const -->
+  <!-- size_t wxRibbonBar::GetPageCount ( void ) const -->
+  <!-- size_t wxAuiTabContainer::GetPageCount ( void ) const -->
+  <!-- size_t wxBookCtrlBase::GetPageCount( void ) const -->
+  <function name="wxTreebook::GetPageCount,wxSimplebook::GetPageCount,wxAuiTabContainer::GetPageCount,wxRibbonBar::GetPageCount,wxToolbook::GetPageCount,wxPropertyGridManager::GetPageCount,wxListbook::GetPageCount,wxNotebook::GetPageCount,wxBookCtrlBase::GetPageCount">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="size_t"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- wxPageSetupDialogData * wxHtmlEasyPrinting::GetPageSetupData( void ) -->
   <function name="wxHtmlEasyPrinting::GetPageSetupData">
     <noreturn>false</noreturn>
@@ -15316,6 +15779,13 @@ wxItemKind kind = wxITEM_NORMAL) -->
       <not-uninit/>
     </arg>
   </function>
+  <!-- void wxWindow::SetFocus( void ) -->
+  <!-- void wxSpinCtrl::SetFocus( void ) -->
+  <function name="wxWindow::SetFocus,wxSpinCtrl::SetFocus">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="void"/>
+  </function>
   <!-- wxOperatingSystemId wxGetOsVersion(int * major = NULL, int * minor = NULL)-->
   <function name="wxGetOsVersion">
     <noreturn>false</noreturn>
@@ -15327,13 +15797,66 @@ wxItemKind kind = wxITEM_NORMAL) -->
   </function>
   <!-- int wxGrid::GetGridCursorRow() const  -->
   <!-- int wxGrid::GetGridCursorCol() const  -->
-  <function name="wxGrid::GetGridCursorRow,wxGrid::GetGridCursorCol">
+  <!-- int wxKeyEvent::GetKeyCode (void) const -->
+  <function name="wxGrid::GetGridCursorRow,wxGrid::GetGridCursorCol,wxKeyEvent::GetKeyCode">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
     <leak-ignore/>
     <const/>
   </function>
+  <!-- virtual const wxGridCornerHeaderRenderer & wxGridCellAttrProvider::GetCornerRenderer( void ) -->
+  <function name="wxGridCellAttrProvider::GetCornerRenderer">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxGridCornerHeaderRenderer &amp;"/>
+      <use-retval/>
+  </function>
+  <!-- virtual const wxGridColumnHeaderRenderer& wxGridCellAttrProvider::GetColumnHeaderRenderer( int col ) -->
+  <function name="wxGridCellAttrProvider::GetColumnHeaderRenderer">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxGridColumnHeaderRenderer &amp;"/>
+      <arg nr="1" direction="in">
+          <not-uninit/>
+      </arg>
+  </function>
+  <!-- virtual const wxGridRowHeaderRenderer & wxGridCellAttrProvider::GetRowHeaderRenderer( int row ) -->
+  <function name="wxGridCellAttrProvider::GetRowHeaderRenderer">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxGridRowHeaderRenderer &amp;"/>
+      <arg nr="1" direction="in">
+          <not-uninit/>
+      </arg>
+  </function>
+  <!-- bool wxColour::IsOk( void ) const -->
+  <!-- bool wxFont::IsOk( void ) const -->
+  <!-- bool wxIcon::IsOk( void ) const -->
+  <function name="wxColour::IsOk,wxFont::IsOk,wxIcon::IsOk">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- const wxFont & wxDC::GetFont( void ) const -->
+  <function name="wxDC::GetFont">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxFont &amp;"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxFont wxFont::Italic (void) const -->
+  <!-- wxFont wxFont::Larger (void) const -->
+  <function name="wxFont::Italic,wxFont::Larger">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxFont"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- wxColour wxGrid::GetGridLineColour() const  -->
   <function name="wxGrid::GetGridLineColour">
     <noreturn>false</noreturn>
@@ -15540,7 +16063,7 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <use-retval/>
     <arg nr="1" direction="in"/>
   </function>
-  <!--wxSizerFlags& wxSizerFlags::Align(int direction)	-->
+  <!--wxSizerFlags& wxSizerFlags::Align(int direction)  -->
   <function name="wxSizerFlags::Align">
     <noreturn>false</noreturn>
     <returnValue type="wxSizerFlags &amp;"/>
@@ -15551,7 +16074,7 @@ wxItemKind kind = wxITEM_NORMAL) -->
     </arg>
   </function>
   <!--wxSizerFlags& wxSizerFlags::Border(int direction = wxALL) -->
-  <!--wxSizerFlags& wxSizerFlags::Border(int direction, int borderinpixels)	-->
+  <!--wxSizerFlags& wxSizerFlags::Border(int direction, int borderinpixels) -->
   <function name="wxSizerFlags::Border">
     <noreturn>false</noreturn>
     <returnValue type="wxSizerFlags &amp;"/>
@@ -15593,13 +16116,37 @@ wxItemKind kind = wxITEM_NORMAL) -->
   <!-- int wxGrid::GetNumberFrozenRows() const -->
   <!-- int wxGrid::GetNumberFrozenCols() const -->
   <!-- int wxGrid::GetNumberCols() const -->
-  <function name="wxGrid::GetRowLabelSize,wxGrid::GetColLabelSize,wxGrid::GetRowMinimalAcceptableHeight,wxGrid::GetScrollLineX,wxGrid::GetScrollLineY,wxGrid::GetNumberRows,wxGrid::GetNumberFrozenRows,wxGrid::GetNumberFrozenCols,wxGrid::wxGrid::GetNumberCols">
+  <function name="wxGrid::GetRowLabelSize,wxGrid::GetColLabelSize,wxGrid::GetRowMinimalAcceptableHeight,wxGrid::GetScrollLineX,wxGrid::GetScrollLineY,wxGrid::GetNumberRows,wxGrid::GetNumberFrozenRows,wxGrid::GetNumberFrozenCols,wxGrid::GetNumberCols">
     <noreturn>false</noreturn>
     <returnValue type="int"/>
     <use-retval/>
     <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>
@@ -15608,6 +16155,25 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <leak-ignore/>
     <const/>
   </function>
+  <!-- int wxGridEvent::GetCol( void ) const -->
+  <!-- int wxGridEvent::GetRow( void ) const -->
+  <function name="wxGridEvent::GetCol,wxGridEvent::GetRow">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxPoint wxGridEvent::GetPosition( void ) const -->
+  <!-- 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"/>
+      <use-retval/>
+      <const/>
+  </function>
   <!-- wxColour wxGrid::GetLabelBackgroundColour() const -->
   <!-- wxColour wxGrid::GetLabelTextColour() const -->
   <function name="wxGrid::GetLabelTextColour,wxGrid::GetLabelBackgroundColour">
@@ -15913,12 +16479,12 @@ wxItemKind kind = wxITEM_NORMAL) -->
       <not-uninit/>
     </arg>
   </function>
-  <!-- wxString wxGetTextFromUser(const wxString &message, 
-                                   const wxString &caption=wxGetTextFromUserPromptStr, 
-                                   const wxString &default_value=wxEmptyString, 
-                                   wxWindow *parent=NULL, 
-                                   int x=wxDefaultCoord, 
-                                   int y=wxDefaultCoord, 
+  <!-- wxString wxGetTextFromUser(const wxString &message,
+                                   const wxString &caption=wxGetTextFromUserPromptStr,
+                                   const wxString &default_value=wxEmptyString,
+                                   wxWindow *parent=NULL,
+                                   int x=wxDefaultCoord,
+                                   int y=wxDefaultCoord,
                                    bool centre=true) -->
   <function name="wxGetTextFromUser">
     <noreturn>false</noreturn>
@@ -16168,7 +16734,8 @@ wxItemKind kind = wxITEM_NORMAL) -->
   <!-- virtual wxString wxTextEntry::GetValue ( ) const -->
   <!-- virtual wxString wxTextCtrl::GetStringSelection ( ) const -->
   <!-- virtual wxString wxTextCtrl::GetValue ( ) const -->
-  <function name="wxTextEntry::GetStringSelection,wxTextEntry::GetValue,wxTextCtrl::GetStringSelection,wxTextCtrl::GetValue">
+  <!-- virtual wxString wxComboBox::GetStringSelection ( ) const -->
+  <function name="wxTextEntry::GetStringSelection,wxTextEntry::GetValue,wxTextCtrl::GetStringSelection,wxTextCtrl::GetValue,wxComboBox::GetStringSelection">
     <noreturn>false</noreturn>
     <returnValue type="wxString"/>
     <use-retval/>
@@ -16351,13 +16918,13 @@ wxItemKind kind = wxITEM_NORMAL) -->
     <leak-ignore/>
     <arg nr="1" direction="in"/>
   </function>
-  <!-- wxFont* wxFontList::FindOrCreateFont(int point_size, 
+  <!-- wxFont* wxFontList::FindOrCreateFont(int point_size,
        wxFontFamily family,
        wxFontStyle style,
        wxFontWeight weight,
        bool underline = false,
        const wxString & facename = wxEmptyString,
-       wxFontEncoding encoding = wxFONTENCODING_DEFAULT 
+       wxFontEncoding encoding = wxFONTENCODING_DEFAULT
   )-->
   <function name="wxFontList::FindOrCreateFont,wxTheFontList::FindOrCreateFont">
     <noreturn>false</noreturn>
@@ -16376,7 +16943,7 @@ wxItemKind kind = wxITEM_NORMAL) -->
   <!-- void wxCmdLineParser::AddSwitch(const wxString & name,
             const wxString & lng = wxEmptyString,
             const wxString & desc = wxEmptyString,
-            int flags = 0 
+            int flags = 0
     )-->
   <function name="wxCmdLineParser::AddSwitch">
     <noreturn>false</noreturn>
@@ -16452,4 +17019,291 @@ wxItemKind kind = wxITEM_NORMAL) -->
       <valid>0:</valid>
     </arg>
   </function>
+  <!-- virtual bool wxApp::OnInit() -->
+  <!-- virtual bool wxAppConsole::OnInit() -->
+  <function name="wxApp::OnInit,wxAppConsole::OnInit">
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+    <use-retval/>
+    <leak-ignore/>
+  </function>
+  <!-- bool wxDC::IsOk( void ) const -->
+  <function name="wxDC::IsOk">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxRect::GetWidth( void ) const -->
+  <!-- int wxRect::GetHeight( void ) const -->
+  <!-- int wxRect::GetX( void ) const -->
+  <!-- int wxRect::GetY( void ) const -->
+  <!-- int wxRect::GetLeft(void ) const -->
+  <!-- int wxRect::GetRight( void ) const -->
+  <!-- int wxRect::GetTop( void ) const -->
+  <!-- int wxRect::GetBottom( void ) const -->
+  <function name="wxRect::GetWidth,wxRect::GetHeight,wxRect::GetX,wxRect::GetY,wxRect::GetLeft,wxRect::GetRight,wxRect::GetTop,wxRect::GetBottom">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxToolbookEvent::GetId( void ) const -->
+  <!-- int wxEvent::GetId( void ) const -->
+  <!-- int wxGrid::GetId( void ) const -->
+  <!-- int wxGridEvent::GetId( void ) const -->
+  <!-- int wxCommandEvent::GetId( void ) const -->
+  <!-- int wxBookCtrlEvent::GetId( void ) const -->
+  <!-- int wxTreeListEvent::GetId( void ) const -->
+  <!-- int wxDataViewItem::GetID( void ) const -->
+  <!-- int wxPropertyGridEvent::GetId( void ) const -->
+  <!-- int wxSpinEvent::GetId( void ) const -->
+  <!-- int wxMouseEvent::GetId( void ) const -->
+  <!-- int wxFileDirPickerEvent::GetId( void ) const -->
+  <!-- int wxTimerEvent::GetId( void ) const -->
+  <!-- int wxColourPickerEvent::GetId( void ) const -->
+  <!-- int wxScrollEvent::GetId( void ) const -->
+  <!-- int wxStyledTextEvent::GetId( void ) const -->
+  <!-- int wxSashEvent::GetId( void ) const -->
+  <function name="wxEvent::GetId,wxCommandEvent::GetId,wxToolbookEvent::GetId,wxGrid::GetId,wxGridEvent::GetId,wxBookCtrlEvent::GetId,wxTreeListEvent::GetId,wxDataViewItem::GetID,wxPropertyGridEvent::GetId,wxSpinEvent::GetId,wxMouseEvent::GetId,wxFileDirPickerEvent::GetId,wxTimerEvent::GetId,wxColourPickerEvent::GetId,wxScrollEvent::GetId,wxStyledTextEvent::GetId,wxSashEvent::GetId">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- bool wxFrame::Layout( void ) -->
+  <!-- bool wxWindow::Layout( void ) -->
+  <!-- bool wxWindowBase::Layout( void ) -->
+  <!-- bool wxGrid::Layout( void ) -->
+  <!-- bool wxPanel::Layout( void ) -->
+  <function name="wxWindow::Layout,wxWindowBase::Layout,wxFrame::Layout,wxGrid::Layout,wxPanel::Layout">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+  </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 ) -->
+  <!-- void wxRegion::Clear( void ) -->
+  <function name="wxTextCtrl::Clear,wxTextEntry::Clear,wxRegion::Clear">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="void"/>
+  </function>
+  <!-- static const wxString & wxLog::GetTimestamp( void ) -->
+  <function name="wxLog::GetTimestamp">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxString &amp;"/>
+      <use-retval/>
+      <pure/>
+  </function>
+  <!-- static void wxLog::FlushActive( void ) -->
+  <!-- static void wxLog::DisableTimestamp( void ) -->
+  <function name="wxLog::FlushActive,wxLog::DisableTimestamp">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="void"/>
+      <pure/>
+  </function>
+  <!-- static bool wxLog::GetVerbose( void ) -->
+  <!-- static bool wxLogGui::GetVerbose( void ) -->
+  <!-- static bool wxLog::IsEnabled( void ) -->
+  <!-- static bool wxLogGui::IsEnabled( void ) -->
+  <function name="wxLog::GetVerbose,wxLog::IsEnabled,wxLogGui::IsEnabled,wxLogGui::GetVerbose">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <pure/>
+  </function>
+  <!-- wxSize wxRect::GetSize( void ) const -->
+  <function name="wxRect::GetSize">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxSize"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxPoint wxRect::GetTopLeft( void ) const -->
+  <!-- wxPoint wxRect::GetTopRight( void ) const -->
+  <!-- wxPoint wxRect::GetBottomLeft( void ) const -->
+  <!-- wxPoint wxRect::GetBottomRight( void ) const -->
+  <!-- wxPoint wxRect::GetRightTop( void ) const -->
+  <!-- wxPoint wxRect::GetLeftTop( void ) const -->
+  <!-- wxPoint wxRect::GetPosition( void ) const -->
+  <!-- wxPoint wxStaticText::GetPosition( void ) const -->
+  <function name="wxRect::GetTopRight,wxRect::GetBottomLeft,wxRect::GetBottomRight,wxRect::GetTopLeft,wxRect::GetRightTop,wxRect::GetLeftTop,wxStaticText::GetPosition,wxRect::GetPosition">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxPoint"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxTextProofOptions wxTextProofOptions::Default( void ) -->
+  <function name="wxTextProofOptions::Default">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxTextProofOptions"/>
+      <use-retval/>
+      <pure/>
+  </function>
+  <!-- wxTextProofOptions wxTextProofOptions::Disable( void ) -->
+  <function name="wxTextProofOptions::Disable">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxTextProofOptions"/>
+      <use-retval/>
+      <pure/>
+  </function>
+  <!-- bool wxLogGui::EnableLogging( bool enable = true ) -->
+  <!-- bool wxLog::EnableLogging( bool enable = true ) -->
+  <function name="wxLog::EnableLogging,wxLogGui::EnableLogging">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <pure/>
+      <arg nr="1" default="true" direction="in">
+          <not-uninit/>
+      </arg>
+  </function>
+  <!-- wxRegionContain wxRegion::Contains(const wxPoint & pt) const -->
+  <function name="wxRegion::Contains">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxRegionContain"/>
+      <use-retval/>
+      <const/>
+      <arg nr="1" default="true" direction="in"/>
+  </function>
+  <!-- bool wxLog::IsLevelEnabled( wxLogLevel level, const wxString & component ) -->
+  <!-- bool wxLogGui::IsLevelEnabled( wxLogLevel level, const wxString & component ) -->
+  <function name="wxLog::IsLevelEnabled,wxLogGui::IsLevelEnabled">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <pure/>
+      <arg nr="1" direction="in">
+      </arg>
+      <arg nr="2" direction="in">
+      </arg>
+  </function>
+  <!-- bool wxVersionInfo::AtLeast( int major, int minor = 0, int micro = 0 ) const -->
+  <function name="wxVersionInfo::AtLeast">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <const/>
+      <arg nr="1" direction="in">
+          <not-uninit/>
+      </arg>
+      <arg nr="2" default="0" direction="in">
+          <not-uninit/>
+      </arg>
+      <arg nr="3" default="0" direction="in">
+          <not-uninit/>
+      </arg>
+  </function>
+  <!-- const wxString & wxVersionInfo::GetCopyright( void ) const -->
+  <function name="wxVersionInfo::GetCopyright">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxString &amp;"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- const wxString & wxVersionInfo::GetDescription( void ) const -->
+  <function name="wxVersionInfo::GetDescription">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxString &amp;"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxVersionInfo::GetMajor( void ) const -->
+  <function name="wxVersionInfo::GetMajor">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxVersionInfo::GetMicro( void ) const -->
+  <function name="wxVersionInfo::GetMicro">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxVersionInfo::GetMinor( void ) const -->
+  <function name="wxVersionInfo::GetMinor">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- const wxString & wxVersionInfo::GetName( void ) const -->
+  <function name="wxVersionInfo::GetName">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="const wxString &amp;"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- int wxVersionInfo::GetRevision( void ) const -->
+  <function name="wxVersionInfo::GetRevision">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="int"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxString wxVersionInfo::GetVersionString( void ) const -->
+  <function name="wxVersionInfo::GetVersionString">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxString"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- bool wxVersionInfo::HasCopyright( void ) const -->
+  <function name="wxVersionInfo::HasCopyright">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- bool wxVersionInfo::HasDescription( void ) const -->
+  <function name="wxVersionInfo::HasDescription">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="bool"/>
+      <use-retval/>
+      <const/>
+  </function>
+  <!-- wxString wxVersionInfo::ToString( void ) const -->
+  <function name="wxVersionInfo::ToString">
+      <noreturn>false</noreturn>
+      <leak-ignore/>
+      <returnValue type="wxString"/>
+      <use-retval/>
+      <const/>
+  </function>
 </def>
diff --git a/clang-tidy.md b/clang-tidy.md
index 8e6625081a6..72df0375ca1 100644
--- a/clang-tidy.md
+++ b/clang-tidy.md
@@ -8,158 +8,194 @@ We do not perform static analysis of the source of the external libraries. `simp
 
 ## Disabled Checks
 
-`abseil-*`<br>
-`altera-*`<br>
-`android-*`<br>
-`boost-*`<br>
-`darwin-*`<br>
-`fuchsia-*`<br>
-`linuxkernel-*`<br>
-`llvm-*`<br>
-`llvmlibc-*`<br>
-`mpi-*`<br>
-`objc-*`<br>
-`openmp-*`<br>
-`zircon-*`<br>
+`abseil-*`<br/>
+`altera-*`<br/>
+`android-*`<br/>
+`boost-*`<br/>
+`darwin-*`<br/>
+`fuchsia-*`<br/>
+`linuxkernel-*`<br/>
+`llvm-*`<br/>
+`llvmlibc-*`<br/>
+`mpi-*`<br/>
+`objc-*`<br/>
+`openmp-*`<br/>
+`zircon-*`<br/>
 
 These are disabled since the platforms/libraries in question are not targeted by us.
 
-`cert-*`<br>
-`cppcoreguidelines-*`<br>
-`google-*`<br>
-`hicpp-*`<br>
+`cert-*`<br/>
+`cppcoreguidelines-*`<br/>
+`google-*`<br/>
+`hicpp-*`<br/>
 
 These are coding guidelines we do not follow. Some of the checks might be explicitly enabled though.
 
-`readability-braces-around-statements`<br>
-`readability-isolate-declaration`<br>
-`modernize-use-trailing-return-type`<br>
-`modernize-use-auto`<br>
-`readability-uppercase-literal-suffix`<br>
-`readability-else-after-return`<br>
-`modernize-use-default-member-init`<br>
-`readability-identifier-length`<br>
+`readability-braces-around-statements`<br/>
+`readability-isolate-declaration`<br/>
+`readability-uppercase-literal-suffix`<br/>
+`readability-identifier-length`<br/>
 
-These do not relect the style we are (currently) enforcing.
+These do not reflect the style we are (currently) enforcing.
 
-`readability-function-size`<br>
-`readability-function-cognitive-complexity`<br>
+`readability-function-size`<br/>
+`readability-function-cognitive-complexity`<br/>
 
-We are not interesting in the size/complexity of a function.
+We are not interested in the size/complexity of a function.
 
-`readability-magic-numbers`<br>
-`readability-redundant-member-init`<br>
+`readability-magic-numbers`<br/>
 
 These do not (always) increase readability.
 
-`bugprone-macro-parentheses`<br>
+`bugprone-macro-parentheses`<br/>
 
 To be documented.
 
-`readability-implicit-bool-conversion`<br>
+`readability-implicit-bool-conversion`<br/>
 
-This does not appear not to be useful as it is reported on very common code.
+This does not appear to be useful as it is reported on very common code.
 
-`bugprone-narrowing-conversions`<br>
-`performance-no-automatic-move`<br>
+`bugprone-narrowing-conversions`<br/>
+`performance-no-automatic-move`<br/>
 
 It was decided not to apply these.
 
-`modernize-use-equals-default`<br>
-`modernize-loop-convert`<br>
+`modernize-loop-convert`<br/>
 
 These might change the behavior of code which might not be intended (need to file an upstream issue)
 
-`modernize-raw-string-literal`<br>
+`modernize-raw-string-literal`<br/>
 
 This leads to a mismatch of raw string literals and regular ones and does reduce the readability.
 
-`readability-convert-member-functions-to-static`<br>
+`-clang-analyzer-*`<br/>
 
-Disabled because of false positives with Qt `slot` methods (see https://github.com/llvm/llvm-project/issues/57520).
-
-`-clang-analyzer-*`<br>
+Disabled because of false positives (need to file upstream bug reports). The checks are also quite time consuming.
 
-Disabled because of false positives (needs to file an upstream bug report).
-
-`misc-non-private-member-variables-in-classes`<br>
+`misc-non-private-member-variables-in-classes`<br/>
 
 We intentionally use this.
 
-`misc-no-recursion`<br>
+`misc-no-recursion`<br/>
 
 Leads to lots of "false positives". This seem to enforce a coding guidelines of certain codebases.
 
-`readability-use-anyofallof`<br>
-
-We currently don't even apply our own `useStlAlgorithm` findings.
-
-`bugprone-easily-swappable-parameters`<br>
+`bugprone-easily-swappable-parameters`<br/>
 
 This produces a lot of noise and they are not fixable that easily.
 
-`readability-container-data-pointer`<br>
+`readability-container-data-pointer`<br/>
 
 Disable because of false positives and inconsistent warnings (need to file an upstream bug report).
 
-`misc-const-correctness`<br>
+`misc-const-correctness`<br/>
 
 Work in progress.
 
-`bugprone-assignment-in-if-condition`<br>
+`bugprone-assignment-in-if-condition`<br/>
 
 Is reported for valid patterns we are using.
 
-`readability-suspicious-call-argument`<br>
+`readability-suspicious-call-argument`<br/>
 
 Produces a lot of false positives since it is too vague in its analysis.
 
-`performance-inefficient-string-concatenation`<br>
+`performance-inefficient-string-concatenation`<br/>
 
 Produces warnings which might be considered false positives starting with C++11 - see https://github.com/llvm/llvm-project/issues/54526.
 
-`readability-redundant-access-specifiers`<br>
-
-Reports warning with the Qt `<access-specifier> slots:` syntax in class declarations - see https://github.com/llvm/llvm-project/issues/60055.
-
-`modernize-avoid-c-arrays`<br>
+`modernize-avoid-c-arrays`<br/>
 
 Produces warnings when `const char[]` is being used which is quite common in our code. Does not make sense to enable before C++17 when `std::string_view` becomes available.
 Also reports a false positive about templates which deduce the array length: https://github.com/llvm/llvm-project/issues/60053.
 
-`readability-container-size-empty`<br>
-`bugprone-branch-clone`<br>
-`readability-const-return-type`<br>
-`modernize-return-braced-init-list`<br>
-`misc-throw-by-value-catch-by-reference`<br>
-`readability-avoid-const-params-in-decls`<br>
-`bugprone-signed-char-misuse`<br>
-`readability-redundant-access-specifiers`<br>
-`concurrency-mt-unsafe`<br>
-`misc-use-anonymous-namespace`<br>
+`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.
+
+`readability-use-concise-preprocessor-directives`<br/>
+
+Does not improve the readability.
+
+`bugprone-branch-clone`<br/>
+`modernize-return-braced-init-list`<br/>
+`misc-throw-by-value-catch-by-reference`<br/>
+`bugprone-signed-char-misuse`<br/>
+`concurrency-mt-unsafe`<br/>
+`misc-use-anonymous-namespace`<br/>
+`performance-avoid-endl`<br/>
+`bugprone-switch-missing-default-case`<br/>
+`bugprone-empty-catch`<br/>
+`readability-avoid-nested-conditional-operator`<br/>
+`modernize-use-designated-initializers`<br/>
+`readability-enum-initial-value`<br/>
+`modernize-use-trailing-return-type`<br/>
+
+To be evaluated (need to remove exclusion).
+
+`cppcoreguidelines-missing-std-forward`<br/>
+`cppcoreguidelines-avoid-const-or-ref-data-members`<br/>
+`cppcoreguidelines-macro-usage`<br/>
+`cppcoreguidelines-pro-type-member-init`<br/>
+`cppcoreguidelines-prefer-member-initializer`<br/>
+`cppcoreguidelines-misleading-capture-default-by-value`<br/>
+`bugprone-argument-comment.CommentBoolLiterals`<br/>
+`cert-err33-c`<br/>
+`google-readability-namespace-comments`<br/>
+`cppcoreguidelines-special-member-functions`<br/>
+
+To be evaluated (need to enable explicitly).
 
-To be evaluated.
+`modernize-type-traits`<br/>
+`modernize-use-nodiscard`<br/>
+`modernize-use-scoped-lock`<br/>
 
-`portability-std-allocator-const`<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.
+
+### Disabled for performance reasons
+
+`portability-std-allocator-const`<br/>
 
 Only necessary for code which is exclusively compiled with `libc++`. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
 
-`modernize-deprecated-ios-base-aliases`<br>
+`modernize-deprecated-ios-base-aliases`<br/>
 
 Warns about aliases which are removed in C++20. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
 
-`bugprone-unchecked-optional-access`<br>
+`bugprone-unchecked-optional-access`<br/>
 
 We are not using any `optional` implementation. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
 
-`modernize-replace-auto-ptr`<br>
+`modernize-replace-auto-ptr`<br/>
 
 Still available until C++17. It is unlikely such code will ever be introduced. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
 
-`readability-identifier-naming`<br>
+`readability-identifier-naming`<br/>
 
 We are currently using our own `naming.json` to enforce naming schemes. Also disabled for performance reasons - see https://github.com/llvm/llvm-project/issues/57527#issuecomment-1237935132.
 
-`portability-simd-intrinsics`<br>
+`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.
+
+`modernize-macro-to-enum`<br/>
+
+It does not seem to produce any warnings for us (needs to be investigated) and it is one of the more expensive checks.
+
+`misc-unused-using-decls`<br/>
+
+This is the most expensive check for several files and it is providing much in terms of code quality. Reported upstream as https://github.com/llvm/llvm-project/issues/72300.
+
+### Disabled for GUI only
+
+`readability-convert-member-functions-to-static`<br/>
+
+Disabled because of false positives with Qt `slot` methods (see https://github.com/llvm/llvm-project/issues/57520).
+
+`readability-redundant-access-specifiers`<br/>
+
+Reports warning with the Qt `<access-specifier> slots:` syntax in class declarations - see https://github.com/llvm/llvm-project/issues/60055.
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 0221817d929..2664a29a65d 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -1,86 +1,67 @@
+
 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_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-else()
-    target_include_directories(cli_objs SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-endif()
-target_include_directories(cli_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
+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_objs PRIVATE precompiled.h)
-endif()
-if (BUILD_CORE_DLL)
-    target_compile_definitions(cli_objs PRIVATE CPPCHECKLIB_IMPORT TINYXML2_IMPORT)
+    target_precompile_headers(cli PRIVATE precompiled.h)
 endif()
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
-    # false positive warning in up to Clang 13 - caused by FD_ZERO macro
+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>)
+if (BUILD_CLI)
+    list(APPEND cppcheck_SOURCES ${hdrs} ${mainfile})
+    if (WIN32)
+        list(APPEND cppcheck_SOURCES version.rc)
     endif()
-endif()
-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_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-else()
-    target_include_directories(cppcheck SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-endif()
-target_include_directories(cppcheck PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
-if (HAVE_RULES)
-    target_link_libraries(cppcheck ${PCRE_LIBRARY})
-endif()
-if (WIN32 AND NOT BORLAND)
-    if(NOT MINGW)
-        target_link_libraries(cppcheck Shlwapi.lib)
-    else()
-        target_link_libraries(cppcheck shlwapi)
+    add_executable(cppcheck ${cppcheck_SOURCES})
+    target_link_libraries(cppcheck cppcheck-core cli tinyxml2 simplecpp)
+    if (WIN32 AND NOT BORLAND)
+        if(NOT MINGW)
+            target_link_libraries(cppcheck Shlwapi.lib)
+        else()
+            target_link_libraries(cppcheck shlwapi)
+        endif()
     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()
+    target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT})
 
-add_dependencies(cppcheck copy_cfg)
-add_dependencies(cppcheck copy_addons)
-add_dependencies(cppcheck copy_platforms)
-if (NOT DISABLE_DMAKE)
-    add_dependencies(cppcheck run-dmake)
-endif()
+    add_dependencies(cppcheck copy_cfg)
+    add_dependencies(cppcheck copy_addons)
+    add_dependencies(cppcheck copy_platforms)
+    if (NOT DISABLE_DMAKE)
+        add_dependencies(cppcheck run-dmake)
+    endif()
 
-install(TARGETS cppcheck
-    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
-    COMPONENT applications)
+    install(TARGETS cppcheck
+        RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+        COMPONENT applications)
 
-install(FILES ${addons}
-   DESTINATION ${FILESDIR}/addons
-   COMPONENT headers)
+    install(PROGRAMS ${CMAKE_SOURCE_DIR}/htmlreport/cppcheck-htmlreport
+        DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+        COMPONENT applications)
 
-install(FILES ${cfgs}
-   DESTINATION ${FILESDIR}/cfg
-   COMPONENT headers)
+    install(FILES ${addons_py}
+       DESTINATION ${FILESDIR_DEF}/addons
+       COMPONENT headers)
 
-install(FILES ${platforms}
-   DESTINATION ${FILESDIR}/platforms
-   COMPONENT headers)
+    install(FILES ${addons_json}
+       DESTINATION ${FILESDIR_DEF}/addons
+       COMPONENT headers)
 
+    install(FILES ${cfgs}
+       DESTINATION ${FILESDIR_DEF}/cfg
+       COMPONENT headers)
+
+    install(FILES ${platforms}
+       DESTINATION ${FILESDIR_DEF}/platforms
+       COMPONENT headers)
+
+endif()
diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj
index 6e642479a7d..05d1cf2916d 100644
--- a/cli/cli.vcxproj
+++ b/cli/cli.vcxproj
@@ -1,34 +1,18 @@
 <?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-PCRE|Win32">
-      <Configuration>Debug-PCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-PCRE|x64">
       <Configuration>Debug-PCRE</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-PCRE|Win32">
-      <Configuration>Release-PCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-PCRE|x64">
       <Configuration>Release-PCRE</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -40,18 +24,6 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -64,18 +36,6 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -90,24 +50,12 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
@@ -116,114 +64,35 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\debug\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">$(SolutionDir)bin\debug\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\debug\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">$(SolutionDir)bin\debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cppcheck</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">cppcheck</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cppcheck</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">cppcheck</TargetName>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">true</IgnoreImportLibrary>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">$(SolutionDir)bin\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cppcheck</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">cppcheck</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cppcheck</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">cppcheck</TargetName>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">true</IgnoreImportLibrary>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">true</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BrowseInformation>false</BrowseInformation>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BrowseInformation>false</BrowseInformation>
-      <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;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\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;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
@@ -245,14 +114,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\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;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
@@ -272,88 +141,12 @@
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\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;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\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>
@@ -362,7 +155,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <StringPooling>true</StringPooling>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -388,10 +181,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib;..\externals;..\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>
@@ -400,7 +193,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <StringPooling>true</StringPooling>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -430,14 +223,15 @@
   <ItemGroup Label="HeaderFiles">
     <ClInclude Include="cmdlineparser.h" />
     <ClInclude Include="cppcheckexecutor.h" />
-    <ClInclude Include="cppcheckexecutorseh.h" />
-    <ClInclude Include="cppcheckexecutorsig.h" />
     <ClInclude Include="executor.h" />
     <ClInclude Include="filelister.h" />
     <ClInclude Include="processexecutor.h" />
+    <ClInclude Include="sehwrapper.h" />
+    <ClInclude Include="signalhandler.h" />
     <ClInclude Include="singleexecutor.h" />
     <ClInclude Include="stacktrace.h" />
     <ClInclude Include="threadexecutor.h" />
+    <ClInclude Include="..\frontend\frontend.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\lib\cppcheck.vcxproj">
@@ -447,14 +241,8 @@
   <ItemGroup Label="SourceFiles">
     <ClCompile Include="cmdlineparser.cpp" />
     <ClCompile Include="cppcheckexecutor.cpp" />
-    <ClCompile Include="cppcheckexecutorseh.cpp" />
-    <ClCompile Include="cppcheckexecutorsig.cpp" />
     <ClCompile Include="executor.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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>
@@ -462,9 +250,12 @@
     <ClCompile Include="filelister.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="processexecutor.cpp" />
+    <ClCompile Include="sehwrapper.cpp" />
+    <ClCompile Include="signalhandler.cpp" />
     <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 e8385a6c84d..5d3bd1c86cc 100644
--- a/cli/cli.vcxproj.filters
+++ b/cli/cli.vcxproj.filters
@@ -14,9 +14,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup Label="HeaderFiles">
-    <ClInclude Include="..\lib\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="cmdlineparser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -26,10 +23,7 @@
     <ClInclude Include="cppcheckexecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="cppcheckexecutorseh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="cppcheckexecutorsig.h">
+    <ClInclude Include="signalhandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="executor.h">
@@ -44,6 +38,15 @@
     <ClInclude Include="stacktrace.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <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,10 +58,7 @@
     <ClCompile Include="cppcheckexecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="cppcheckexecutorseh.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cppcheckexecutorsig.cpp">
+    <ClCompile Include="signalhandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="executor.cpp">
@@ -76,6 +76,15 @@
     <ClCompile Include="stacktrace.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <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/cmdlinelogger.h b/cli/cmdlinelogger.h
new file mode 100644
index 00000000000..75981c028cd
--- /dev/null
+++ b/cli/cmdlinelogger.h
@@ -0,0 +1,37 @@
+/* -*- 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 CMD_LINE_LOGGER_H
+#define CMD_LINE_LOGGER_H
+
+#include <string>
+
+class CmdLineLogger
+{
+public:
+    virtual ~CmdLineLogger() = default;
+
+    /** print a regular message */
+    virtual void printMessage(const std::string &message) = 0;
+    /** print an error message */
+    virtual void printError(const std::string &message) = 0;
+    /** print to the output */
+    virtual void printRaw(const std::string &message) = 0;
+};
+
+#endif // CMD_LINE_LOGGER_H
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index d76edbf9114..48ac7e429d9 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-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
@@ -18,14 +18,20 @@
 
 #include "cmdlineparser.h"
 
+#include "addoninfo.h"
 #include "check.h"
+#include "checkers.h"
+#include "color.h"
 #include "config.h"
-#include "cppcheckexecutor.h"
+#include "cppcheck.h"
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "filelister.h"
+#include "filesettings.h"
 #include "importproject.h"
+#include "library.h"
 #include "path.h"
+#include "pathmatch.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
@@ -33,28 +39,28 @@
 #include "timer.h"
 #include "utils.h"
 
+#include "frontend.h"
+
 #include <algorithm>
-#include <climits>
+#include <cassert>
 #include <cstdio>
 #include <cstdlib> // EXIT_FAILURE
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <iterator>
 #include <list>
+#include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
-#include <stdexcept>
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 
 #ifdef HAVE_RULES
-// xml is used for rules
-#include <tinyxml2.h>
-#endif
+#include "regex.h"
 
-#ifdef __linux__
-#include <unistd.h>
+// xml is used for rules
+#include "xml.h"
 #endif
 
 static bool addFilesToList(const std::string& fileList, std::vector<std::string>& pathNames)
@@ -69,16 +75,15 @@ static bool addFilesToList(const std::string& fileList, std::vector<std::string>
             return false;
         files = &infile;
     }
-    if (files && *files) {
-        std::string fileName;
+    std::string fileName;
+    // cppcheck-suppress accessMoved - FP
+    while (std::getline(*files, fileName)) { // next line
         // cppcheck-suppress accessMoved - FP
-        while (std::getline(*files, fileName)) { // next line
-            // cppcheck-suppress accessMoved - FP
-            if (!fileName.empty()) {
-                pathNames.emplace_back(std::move(fileName));
-            }
+        if (!fileName.empty()) {
+            pathNames.emplace_back(std::move(fileName));
         }
     }
+
     return true;
 }
 
@@ -90,8 +95,8 @@ static bool addIncludePathsToList(const std::string& fileList, std::list<std::st
         // cppcheck-suppress accessMoved - FP
         while (std::getline(files, pathName)) { // next line
             if (!pathName.empty()) {
-                pathName = Path::removeQuotationMarks(pathName);
-                pathName = Path::fromNativeSeparators(pathName);
+                pathName = Path::removeQuotationMarks(std::move(pathName));
+                pathName = Path::fromNativeSeparators(std::move(pathName));
 
                 // If path doesn't end with / or \, add it
                 if (!endsWith(pathName, '/'))
@@ -114,901 +119,1464 @@ static bool addPathsToSet(const std::string& fileName, std::set<std::string>& se
     return true;
 }
 
-CmdLineParser::CmdLineParser(Settings &settings, Suppressions &suppressions, Suppressions &suppressionsNoFail)
-    : mSettings(settings)
+namespace {
+    class XMLErrorMessagesLogger : public ErrorLogger
+    {
+        void reportOut(const std::string & outmsg, Color /*c*/ = Color::Reset) override
+        {
+            std::cout << outmsg << std::endl;
+        }
+
+        void reportErr(const ErrorMessage &msg) override
+        {
+            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
+        {}
+    };
+}
+
+CmdLineParser::CmdLineParser(CmdLineLogger &logger, Settings &settings, Suppressions &suppressions)
+    : mLogger(logger)
+    , mSettings(settings)
     , mSuppressions(suppressions)
-    , mSuppressionsNoFail(suppressionsNoFail)
-    , mShowHelp(false)
-    , mShowVersion(false)
-    , mShowErrorMessages(false)
-    , mExitAfterPrint(false)
 {}
 
-void CmdLineParser::printMessage(const std::string &message)
+bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
 {
-    std::cout << "cppcheck: " << message << std::endl;
-}
+    const Result result = parseFromArgs(argc, argv);
 
-void CmdLineParser::printError(const std::string &message)
-{
-    printMessage("error: " + message);
-}
+    switch (result) {
+    case Result::Success:
+        break;
+    case Result::Exit:
+        Settings::terminate();
+        return true;
+    case Result::Fail:
+        return false;
+    }
 
-#if defined(_WIN64) || defined(_WIN32)
-bool CmdLineParser::SHOW_DEF_PLATFORM_MSG = true;
-#endif
+    // Libraries must be loaded before FileLister is executed to ensure markup files will be
+    // listed properly.
+    if (!loadLibraries(mSettings))
+        return false;
+
+    if (!loadAddons(mSettings))
+        return false;
+
+    // Check that all include paths exist
+    {
+        for (auto iter = mSettings.includePaths.cbegin();
+             iter != mSettings.includePaths.cend();
+             ) {
+            const std::string path(Path::toNativeSeparators(*iter));
+            if (Path::isDirectory(path))
+                ++iter;
+            else {
+                // TODO: this bypasses the template format and other settings
+                // If the include path is not found, warn user and remove the non-existing path from the list.
+                if (mSettings.severity.isEnabled(Severity::information))
+                    std::cout << "(information) Couldn't find path given by -I '" << path << '\'' << std::endl;
+                iter = mSettings.includePaths.erase(iter);
+            }
+        }
+    }
+
+    // Output a warning for the user if he tries to exclude headers
+    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);
+    });
+    if (warn) {
+        mLogger.printMessage("filename exclusion does not apply to header (.h and .hpp) files.");
+        mLogger.printMessage("Please use --suppress for ignoring results from the header files.");
+    }
+
+    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 filtermatcher.match(fs.filename());
+            });
+            if (fileSettings.empty()) {
+                for (const std::string& f: mSettings.fileFilters)
+                    mLogger.printError("could not find any files matching the filter:" + f);
+                return false;
+            }
+        }
+        else {
+            fileSettings = fileSettingsRef;
+        }
+
+        mFileSettings.clear();
+
+        frontend::applyLang(fileSettings, mSettings, mEnforcedLang);
+
+        // sort the markup last
+        std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) {
+            return !mSettings.library.markupFile(fs.filename()) || !mSettings.library.processMarkupAfterCode(fs.filename());
+        });
+
+        std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(mFileSettings), [&](const FileSettings &fs) {
+            return mSettings.library.markupFile(fs.filename()) && mSettings.library.processMarkupAfterCode(fs.filename());
+        });
+
+        if (mFileSettings.empty()) {
+            mLogger.printError("could not find or open any of the paths given.");
+            return false;
+        }
+    }
+
+    if (!pathnamesRef.empty()) {
+        std::list<FileWithDetails> filesResolved;
+        // Execute recursiveAddFiles() to each given file parameter
+        // TODO: verbose log which files were ignored?
+        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()) {
+                // TODO: bail out?
+                mLogger.printMessage(err);
+            }
+        }
+
+        if (filesResolved.empty()) {
+            mLogger.printError("could not find or open any of the paths given.");
+            // TODO: PathMatch should provide the information if files were ignored
+            if (!ignored.empty())
+                mLogger.printMessage("Maybe all paths were ignored?");
+            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()) {
+                for (const std::string& f: mSettings.fileFilters)
+                    mLogger.printError("could not find any files matching the filter:" + f);
+                return false;
+            }
+        }
+        else {
+            files = std::move(filesResolved);
+        }
+
+        frontend::applyLang(files, mSettings, mEnforcedLang);
+
+        // sort the markup last
+        std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) {
+            return !mSettings.library.markupFile(entry.path()) || !mSettings.library.processMarkupAfterCode(entry.path());
+        });
+
+        std::copy_if(files.cbegin(), files.cend(), std::inserter(mFiles, mFiles.end()), [&](const FileWithDetails& entry) {
+            return mSettings.library.markupFile(entry.path()) && mSettings.library.processMarkupAfterCode(entry.path());
+        });
+
+        if (mFiles.empty()) {
+            mLogger.printError("could not find or open any of the paths given.");
+            return false;
+        }
+    }
+
+    return true;
+}
 
 // TODO: normalize/simplify/native all path parameters
 // TODO: error out on all missing given files/paths
-bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
+CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const argv[])
 {
-#if defined(_WIN64) || defined(_WIN32)
-    bool default_platform = true;
-#endif
+    mSettings.exename = Path::getCurrentExecutablePath(argv[0]);
 
-    bool def = false;
-    bool maxconfigs = false;
+    bool xmlOptionProvided = false;
+    bool outputFormatOptionProvided = false;
 
-    mSettings.exename = Path::getCurrentExecutablePath(argv[0]);
+    // 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++) {
-        if (argv[i][0] == '-') {
-            // User define
-            if (std::strncmp(argv[i], "-D", 2) == 0) {
-                std::string define;
-
-                // "-D define"
-                if (std::strcmp(argv[i], "-D") == 0) {
-                    ++i;
-                    if (i >= argc || argv[i][0] == '-') {
-                        printError("argument to '-D' is missing.");
-                        return false;
-                    }
-
-                    define = argv[i];
-                }
-                // "-Ddefine"
-                else {
-                    define = 2 + argv[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;
+            }
+        }
+    }
 
-                // No "=", append a "=1"
-                if (define.find('=') == std::string::npos)
-                    define += "=1";
+    if (!loadCppcheckCfg())
+        return Result::Fail;
 
-                if (!mSettings.userDefines.empty())
-                    mSettings.userDefines += ";";
-                mSettings.userDefines += define;
+    if (argc <= 1) {
+        printHelp();
+        return Result::Exit;
+    }
 
-                def = true;
+    // check for exclusive options
+    for (int i = 1; i < argc; i++) {
+        // documentation..
+        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());
+                if (!name.empty() && !info.empty())
+                    doc << "## " << name << " ##\n"
+                        << info << "\n";
             }
 
-            // -E
-            else if (std::strcmp(argv[i], "-E") == 0) {
-                mSettings.preprocessOnly = true;
-                mSettings.quiet = true;
+            mLogger.printRaw(doc.str());
+            return Result::Exit;
+        }
+
+        // print all possible error messages..
+        if (std::strcmp(argv[i], "--errorlist") == 0) {
+            {
+                XMLErrorMessagesLogger xmlLogger;
+                std::cout << ErrorMessage::getXMLHeader(mSettings.cppcheckCfgProductName, 2);
+                CppCheck::getErrorMessages(xmlLogger);
+                std::cout << ErrorMessage::getXMLFooter(2) << std::endl;
             }
+            return Result::Exit;
+        }
 
-            // Include paths
-            else if (std::strncmp(argv[i], "-I", 2) == 0) {
-                std::string path;
+        // Print help
+        if (std::strcmp(argv[i], "-h") == 0 || std::strcmp(argv[i], "--help") == 0) {
+            printHelp();
+            return Result::Exit;
+        }
 
-                // "-I path/"
-                if (std::strcmp(argv[i], "-I") == 0) {
-                    ++i;
-                    if (i >= argc || argv[i][0] == '-') {
-                        printError("argument to '-I' is missing.");
-                        return false;
-                    }
-                    path = argv[i];
-                }
+        if (std::strcmp(argv[i], "--filesdir") == 0) {
+#ifdef FILESDIR
+            mLogger.printRaw(FILESDIR); // TODO: should not include newline
+#endif
+            return Result::Exit;
+        }
 
-                // "-Ipath/"
-                else {
-                    path = 2 + argv[i];
-                }
-                path = Path::removeQuotationMarks(path);
-                path = Path::fromNativeSeparators(path);
+        if (std::strcmp(argv[i], "--version") == 0) {
+            const std::string version = getVersion();
+            mLogger.printRaw(version); // TODO: should not include newline
+            return Result::Exit;
+        }
+    }
 
-                // If path doesn't end with / or \, add it
-                if (!endsWith(path,'/'))
-                    path += '/';
+    bool debug = false;
+    bool inputAsFilter = false; // set by: --file-filter=+
 
-                mSettings.includePaths.emplace_back(std::move(path));
-            }
+    ImportProject::Type projectType = ImportProject::Type::NONE;
+    ImportProject project;
+    std::string vsConfig;
 
-            // User undef
-            else if (std::strncmp(argv[i], "-U", 2) == 0) {
-                std::string undef;
+    std::string platform;
+    char defaultSign = '\0';
 
-                // "-U undef"
-                if (std::strcmp(argv[i], "-U") == 0) {
-                    ++i;
-                    if (i >= argc || argv[i][0] == '-') {
-                        printError("argument to '-U' is missing.");
-                        return false;
-                    }
+    std::vector<std::string> lookupPaths{
+        Path::getCurrentPath(), // TODO: do we want to look in CWD?
+        Path::getPathFromFilename(mSettings.exename),
+    };
 
-                    undef = argv[i];
-                }
-                // "-Uundef"
-                else {
-                    undef = 2 + argv[i];
+    bool executorAuto = true;
+
+    for (int i = 1; i < argc; i++) {
+        if (argv[i][0] != '-') {
+            mPathNames.emplace_back(Path::fromNativeSeparators(Path::removeQuotationMarks(argv[i])));
+        }
+
+        // User define
+        else if (std::strncmp(argv[i], "-D", 2) == 0) {
+            std::string define;
+
+            // "-D define"
+            if (std::strcmp(argv[i], "-D") == 0) {
+                ++i;
+                if (i >= argc || argv[i][0] == '-') {
+                    mLogger.printError("argument to '-D' is missing.");
+                    return Result::Fail;
                 }
 
-                mSettings.userUndefs.insert(std::move(undef));
+                define = argv[i];
+            }
+            // "-Ddefine"
+            else {
+                define = 2 + argv[i];
             }
 
-            else if (std::strncmp(argv[i], "--addon=", 8) == 0)
-                mSettings.addons.emplace(argv[i]+8);
-
-            else if (std::strncmp(argv[i],"--addon-python=", 15) == 0)
-                mSettings.addonPython.assign(argv[i]+15);
+            // No "=", append a "=1"
+            if (define.find('=') == std::string::npos)
+                define += "=1";
 
-            // Check configuration
-            else if (std::strcmp(argv[i], "--check-config") == 0)
-                mSettings.checkConfiguration = true;
+            if (!mSettings.userDefines.empty())
+                mSettings.userDefines += ";";
+            mSettings.userDefines += define;
+        }
 
-            // Check code exhaustively
-            else if (std::strcmp(argv[i], "--check-level=exhaustive") == 0)
-                mSettings.setCheckLevelExhaustive();
+        // -E
+        else if (std::strcmp(argv[i], "-E") == 0) {
+            mSettings.preprocessOnly = true;
+            mSettings.quiet = true;
+        }
 
-            // Check code with normal analysis
-            else if (std::strcmp(argv[i], "--check-level=normal") == 0)
-                mSettings.setCheckLevelNormal();
+        // Include paths
+        else if (std::strncmp(argv[i], "-I", 2) == 0) {
+            std::string path;
 
-            // Check library definitions
-            else if (std::strcmp(argv[i], "--check-library") == 0) {
-                mSettings.checkLibrary = true;
+            // "-I path/"
+            if (std::strcmp(argv[i], "-I") == 0) {
+                ++i;
+                if (i >= argc || argv[i][0] == '-') {
+                    mLogger.printError("argument to '-I' is missing.");
+                    return Result::Fail;
+                }
+                path = argv[i];
             }
 
-            else if (std::strncmp(argv[i], "--checks-max-time=", 18) == 0) {
-                if (!parseNumberArg(argv[i], 18, mSettings.checksMaxTime, true))
-                    return false;
+            // "-Ipath/"
+            else {
+                path = 2 + argv[i];
             }
+            path = Path::removeQuotationMarks(std::move(path));
+            path = Path::fromNativeSeparators(std::move(path));
 
-            else if (std::strcmp(argv[i], "--clang") == 0) {
-                mSettings.clang = true;
-            }
+            // If path doesn't end with / or \, add it
+            if (!endsWith(path,'/'))
+                path += '/';
 
-            else if (std::strncmp(argv[i], "--clang=", 8) == 0) {
-                mSettings.clang = true;
-                mSettings.clangExecutable = argv[i] + 8;
-            }
+            mSettings.includePaths.emplace_back(std::move(path));
+        }
 
-            else if (std::strncmp(argv[i], "--config-exclude=",17) ==0) {
-                mSettings.configExcludePaths.insert(Path::fromNativeSeparators(argv[i] + 17));
-            }
+        // User undef
+        else if (std::strncmp(argv[i], "-U", 2) == 0) {
+            std::string undef;
 
-            else if (std::strncmp(argv[i], "--config-excludes-file=", 23) == 0) {
-                // open this file and read every input file (1 file name per line)
-                const std::string cfgExcludesFile(23 + argv[i]);
-                if (!addPathsToSet(cfgExcludesFile, mSettings.configExcludePaths)) {
-                    printError("unable to open config excludes file at '" + cfgExcludesFile + "'");
-                    return false;
+            // "-U undef"
+            if (std::strcmp(argv[i], "-U") == 0) {
+                ++i;
+                if (i >= argc || argv[i][0] == '-') {
+                    mLogger.printError("argument to '-U' is missing.");
+                    return Result::Fail;
                 }
-            }
 
-            else if (std::strncmp(argv[i], "--cppcheck-build-dir=", 21) == 0) {
-                // TODO: bail out when the folder does not exist? will silently do nothing
-                mSettings.buildDir = Path::fromNativeSeparators(argv[i] + 21);
-                if (endsWith(mSettings.buildDir, '/'))
-                    mSettings.buildDir.pop_back();
+                undef = argv[i];
+            }
+            // "-Uundef"
+            else {
+                undef = 2 + argv[i];
             }
 
-            // 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;
+            mSettings.userUndefs.insert(std::move(undef));
+        }
 
-            // Flag used for various purposes during debugging
-            else if (std::strcmp(argv[i], "--debug-simplified") == 0)
-                mSettings.debugSimplified = true;
+        else if (std::strncmp(argv[i], "--addon=", 8) == 0)
+            mSettings.addons.emplace(argv[i]+8);
 
-            // Show template information
-            else if (std::strcmp(argv[i], "--debug-template") == 0)
-                mSettings.debugtemplate = true;
+        else if (std::strncmp(argv[i],"--addon-python=", 15) == 0)
+            mSettings.addonPython.assign(argv[i]+15);
 
-            // Show debug warnings
-            else if (std::strcmp(argv[i], "--debug-warnings") == 0)
-                mSettings.debugwarnings = true;
+        else if (std::strcmp(argv[i],"--analyze-all-vs-configs") == 0) {
+            mSettings.analyzeAllVsConfigs = true;
+            mAnalyzeAllVsConfigsSetOnCmdLine = true;
+        }
 
-            else if (std::strncmp(argv[i], "--disable=", 10) == 0) {
-                const std::string errmsg = mSettings.removeEnabled(argv[i] + 10);
-                if (!errmsg.empty()) {
-                    printError(errmsg);
-                    return false;
-                }
+        // Check configuration
+        else if (std::strcmp(argv[i], "--check-config") == 0)
+            mSettings.checkConfiguration = true;
+
+        else if (std::strcmp(argv[i], "--check-headers") == 0)
+            mSettings.checkHeaders = true;
+
+        // Check level
+        else if (std::strncmp(argv[i], "--check-level=", 14) == 0) {
+            Settings::CheckLevel level = Settings::CheckLevel::normal;
+            const std::string level_s(argv[i] + 14);
+            if (level_s == "reduced")
+                level = Settings::CheckLevel::reduced;
+            else if (level_s == "normal")
+                level = Settings::CheckLevel::normal;
+            else if (level_s == "exhaustive")
+                level = Settings::CheckLevel::exhaustive;
+            else {
+                mLogger.printError("unknown '--check-level' value '" + level_s + "'.");
+                return Result::Fail;
             }
 
-            // documentation..
-            else 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());
-                    if (!name.empty() && !info.empty())
-                        doc << "## " << name << " ##\n"
-                            << info << "\n";
-                }
+            mSettings.setCheckLevel(level);
+        }
+
+        // Check library definitions
+        else if (std::strcmp(argv[i], "--check-library") == 0) {
+            mSettings.checkLibrary = true;
+        }
 
-                std::cout << doc.str();
-                mExitAfterPrint = true;
-                return true;
+        else if (std::strcmp(argv[i], "--check-unused-templates") == 0)
+            mSettings.checkUnusedTemplates = true;
+
+        else if (std::strncmp(argv[i], "--check-version=", 16) == 0) {
+            if (!loadCppcheckCfg())
+                return Result::Fail;
+            const std::string actualVersion = getVersion();
+            const std::string wantedVersion = argv[i] + 16;
+            if (actualVersion != wantedVersion) {
+                mLogger.printError("--check-version check failed. Aborting.");
+                return Result::Fail;
             }
+        }
 
-            // dump cppcheck data
-            else if (std::strcmp(argv[i], "--dump") == 0)
-                mSettings.dump = true;
+        else if (std::strncmp(argv[i], "--checkers-report=", 18) == 0)
+            mSettings.checkersReportFilename = argv[i] + 18;
 
-            else if (std::strncmp(argv[i], "--enable=", 9) == 0) {
-                const std::string enable_arg = argv[i] + 9;
-                const std::string errmsg = mSettings.addEnabled(enable_arg);
-                if (!errmsg.empty()) {
-                    printError(errmsg);
-                    return false;
-                }
-                // when "style" is enabled, also enable "warning", "performance" and "portability"
-                if (enable_arg.find("style") != std::string::npos) {
-                    mSettings.addEnabled("warning");
-                    mSettings.addEnabled("performance");
-                    mSettings.addEnabled("portability");
-                }
-                if (enable_arg.find("information") != std::string::npos) {
-                    mSettings.addEnabled("missingInclude");
-                    printMessage("'--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.");
-                }
-            }
+        else if (std::strncmp(argv[i], "--checks-max-time=", 18) == 0) {
+            if (!parseNumberArg(argv[i], 18, mSettings.checksMaxTime, true))
+                return Result::Fail;
+        }
+
+        else if (std::strcmp(argv[i], "--clang") == 0) {
+            mSettings.clang = true;
+        }
+
+        else if (std::strncmp(argv[i], "--clang=", 8) == 0) {
+            mSettings.clang = true;
+            mSettings.clangExecutable = argv[i] + 8;
+        }
+
+        else if (std::strcmp(argv[i], "--clang-tidy") == 0) {
+            mSettings.clangTidy = true;
+        }
+
+        else if (std::strncmp(argv[i], "--clang-tidy=", 13) == 0) {
+            mSettings.clangTidy = true;
+            mSettings.clangTidyExecutable = argv[i] + 13;
+        }
+
+        else if (std::strncmp(argv[i], "--config-exclude=",17) ==0) {
+            mSettings.configExcludePaths.insert(Path::fromNativeSeparators(argv[i] + 17));
+        }
 
-            // print all possible error messages..
-            else if (std::strcmp(argv[i], "--errorlist") == 0) {
-                mShowErrorMessages = true;
-                mSettings.xml = true;
-                mExitAfterPrint = true;
+        else if (std::strncmp(argv[i], "--config-excludes-file=", 23) == 0) {
+            // open this file and read every input file (1 file name per line)
+            const std::string cfgExcludesFile(23 + argv[i]);
+            if (!addPathsToSet(cfgExcludesFile, mSettings.configExcludePaths)) {
+                mLogger.printError("unable to open config excludes file at '" + cfgExcludesFile + "'");
+                return Result::Fail;
             }
+        }
 
-            // --error-exitcode=1
-            else if (std::strncmp(argv[i], "--error-exitcode=", 17) == 0) {
-                if (!parseNumberArg(argv[i], 17, mSettings.exitCode))
-                    return false;
+        else if (std::strncmp(argv[i], "--cppcheck-build-dir=", 21) == 0) {
+            std::string path = Path::fromNativeSeparators(argv[i] + 21);
+            if (path.empty()) {
+                mLogger.printError("no path has been specified for --cppcheck-build-dir");
+                return Result::Fail;
             }
+            if (endsWith(path, '/'))
+                path.pop_back();
+            mSettings.buildDir = std::move(path);
+        }
+
+        else if (std::strcmp(argv[i], "--cpp-header-probe") == 0) {
+            mSettings.cppHeaderProbe = true;
+        }
+
+        else if (std::strcmp(argv[i], "--debug-ast") == 0)
+            mSettings.debugast = true;
+
+        // Show debug warnings for lookup for configuration files
+        else if (std::strcmp(argv[i], "--debug-clang-output") == 0)
+            mSettings.debugClangOutput = true;
+
+        // Show debug messages for ignored files
+        else if (std::strcmp(argv[i], "--debug-ignore") == 0)
+            mSettings.debugignore = true;
+
+        // Show --debug output after the first simplifications
+        else if (std::strcmp(argv[i], "--debug") == 0 ||
+                 std::strcmp(argv[i], "--debug-normal") == 0)
+            debug = true;
+
+        else if (std::strcmp(argv[i], "--debug-lookup") == 0)
+            continue; // already handled above
+
+        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)
+            mSettings.debugSimplified = true;
+
+        else if (std::strcmp(argv[i], "--debug-symdb") == 0)
+            mSettings.debugsymdb = true;
 
-            // Exception handling inside cppcheck client
-            else if (std::strcmp(argv[i], "--exception-handling") == 0) {
-                mSettings.exceptionHandling = true;
+        // Show template information
+        else if (std::strcmp(argv[i], "--debug-template") == 0)
+            mSettings.debugtemplate = true;
+
+        else if (std::strcmp(argv[i], "--debug-valueflow") == 0)
+            mSettings.debugvalueflow = true;
+
+        // Show debug warnings
+        else if (std::strcmp(argv[i], "--debug-warnings") == 0)
+            mSettings.debugwarnings = true;
+
+        else if (std::strncmp(argv[i], "--disable=", 10) == 0) {
+            const std::string errmsg = mSettings.removeEnabled(argv[i] + 10);
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
             }
+        }
 
-            // Exception handling inside cppcheck client
-            else if (std::strncmp(argv[i], "--exception-handling=", 21) == 0) {
-                const std::string exceptionOutfilename = argv[i] + 21;
-                if (exceptionOutfilename != "stderr" && exceptionOutfilename != "stdout") {
-                    printError("invalid '--exception-handling' argument");
-                    return false;
-                }
-                mSettings.exceptionHandling = true;
-                CppCheckExecutor::setExceptionOutput((exceptionOutfilename == "stderr") ? stderr : stdout);
+        // dump cppcheck data
+        else if (std::strcmp(argv[i], "--dump") == 0)
+            mSettings.dump = true;
+
+        else if (std::strcmp(argv[i], "--emit-duplicates") == 0)
+            mSettings.emitDuplicates = true;
+
+        else if (std::strncmp(argv[i], "--enable=", 9) == 0) {
+            const std::string enable_arg = argv[i] + 9;
+            const std::string errmsg = mSettings.addEnabled(enable_arg);
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
             }
+            // when "style" is enabled, also enable "warning", "performance" and "portability"
+            if (enable_arg.find("style") != std::string::npos) {
+                mSettings.addEnabled("warning");
+                mSettings.addEnabled("performance");
+                mSettings.addEnabled("portability");
+            }
+        }
 
-            // Filter errors
-            else if (std::strncmp(argv[i], "--exitcode-suppressions=", 24) == 0) {
-                // exitcode-suppressions=filename.txt
-                std::string filename = 24 + argv[i];
+        // --error-exitcode=1
+        else if (std::strncmp(argv[i], "--error-exitcode=", 17) == 0) {
+            if (!parseNumberArg(argv[i], 17, mSettings.exitCode))
+                return Result::Fail;
+        }
 
-                std::ifstream f(filename);
-                if (!f.is_open()) {
-                    printError("couldn't open the file: \"" + filename + "\".");
-                    return false;
-                }
-                const std::string errmsg(mSuppressionsNoFail.parseFile(f));
-                if (!errmsg.empty()) {
-                    printError(errmsg);
-                    return false;
-                }
+        // Exception handling inside cppcheck client
+        else if (std::strcmp(argv[i], "--exception-handling") == 0) {
+#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
+            mSettings.exceptionHandling = true;
+#else
+            mLogger.printError("Option --exception-handling is not supported since Cppcheck has not been built with any exception handling enabled.");
+            return Result::Fail;
+#endif
+        }
+
+        // Exception handling inside cppcheck client
+        else if (std::strncmp(argv[i], "--exception-handling=", 21) == 0) {
+#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
+            const std::string exceptionOutfilename = argv[i] + 21;
+            if (exceptionOutfilename != "stderr" && exceptionOutfilename != "stdout") {
+                mLogger.printError("invalid '--exception-handling' argument");
+                return Result::Fail;
             }
+            mSettings.exceptionHandling = true;
+            mSettings.exceptionOutput = (exceptionOutfilename == "stderr") ? stderr : stdout;
+#else
+            mLogger.printError("Option --exception-handling is not supported since Cppcheck has not been built with any exception handling enabled.");
+            return Result::Fail;
+#endif
+        }
 
-            // use a file filter
-            else if (std::strncmp(argv[i], "--file-filter=", 14) == 0)
-                mSettings.fileFilters.emplace_back(argv[i] + 14);
+        else if (std::strncmp(argv[i], "--executor=", 11) == 0) {
+            const std::string type = 11 + argv[i];
+            if (type == "auto") {
+                executorAuto = true;
+                mSettings.executor = Settings::defaultExecutor();
+            }
+            else if (type == "thread") {
+#if defined(HAS_THREADING_MODEL_THREAD)
+                executorAuto = false;
+                mSettings.executor = Settings::ExecutorType::Thread;
+#else
+                mLogger.printError("executor type 'thread' cannot be used as Cppcheck has not been built with a respective threading model.");
+                return Result::Fail;
+#endif
+            }
+            else if (type == "process") {
+#if defined(HAS_THREADING_MODEL_FORK)
+                executorAuto = false;
+                mSettings.executor = Settings::ExecutorType::Process;
+#else
+                mLogger.printError("executor type 'process' cannot be used as Cppcheck has not been built with a respective threading model.");
+                return Result::Fail;
+#endif
+            }
+            else {
+                mLogger.printError("unknown executor: '" + type + "'.");
+                return Result::Fail;
+            }
+        }
 
-            // file list specified
-            else if (std::strncmp(argv[i], "--file-list=", 12) == 0) {
-                // open this file and read every input file (1 file name per line)
-                const std::string fileList = argv[i] + 12;
-                if (!addFilesToList(fileList, mPathNames)) {
-                    printError("couldn't open the file: \"" + fileList + "\".");
-                    return false;
-                }
+        // Filter errors
+        else if (std::strncmp(argv[i], "--exitcode-suppressions=", 24) == 0) {
+            // exitcode-suppressions=filename.txt
+            std::string filename = 24 + argv[i];
+
+            std::ifstream f(filename);
+            if (!f.is_open()) {
+                mLogger.printError("couldn't open the file: \"" + filename + "\".");
+                return Result::Fail;
+            }
+            const std::string errmsg(mSuppressions.nofail.parseFile(f));
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
             }
+        }
 
-            // Force checking of files that have "too many" configurations
-            else if (std::strcmp(argv[i], "-f") == 0 || std::strcmp(argv[i], "--force") == 0)
-                mSettings.force = true;
+        // use a file filter
+        else if (std::strncmp(argv[i], "--file-filter=", 14) == 0) {
+            const char *filter = argv[i] + 14;
+            if (std::strcmp(filter, "-") == 0) {
+                if (!addFilesToList(filter, mSettings.fileFilters)) {
+                    mLogger.printError("Failed: --file-filter=-");
+                    return Result::Fail;
+                }
+            } else if (std::strcmp(filter, "+") == 0) {
+                inputAsFilter = true;
+            } else {
+                mSettings.fileFilters.emplace_back(filter);
+            }
+        }
 
-            // Print help
-            else if (std::strcmp(argv[i], "-h") == 0 || std::strcmp(argv[i], "--help") == 0) {
-                mPathNames.clear();
-                mShowHelp = true;
-                mExitAfterPrint = true;
-                break;
+        // file list specified
+        else if (std::strncmp(argv[i], "--file-list=", 12) == 0) {
+            // open this file and read every input file (1 file name per line)
+            const std::string fileList = argv[i] + 12;
+            if (!addFilesToList(fileList, mPathNames)) {
+                mLogger.printError("couldn't open the file: \"" + fileList + "\".");
+                return Result::Fail;
             }
+        }
 
-            // Ignored paths
-            else if (std::strncmp(argv[i], "-i", 2) == 0) {
-                std::string path;
+        // Force checking of files that have "too many" configurations
+        else if (std::strcmp(argv[i], "-f") == 0 || std::strcmp(argv[i], "--force") == 0) {
+            mSettings.force = true;
+            mSettings.maxConfigsOption = Settings::maxConfigsNotAssigned;
+        }
 
-                // "-i path/"
-                if (std::strcmp(argv[i], "-i") == 0) {
-                    ++i;
-                    if (i >= argc || argv[i][0] == '-') {
-                        printError("argument to '-i' is missing.");
-                        return false;
-                    }
-                    path = argv[i];
-                }
+        else if (std::strcmp(argv[i], "--fsigned-char") == 0)
+            defaultSign = 's';
 
-                // "-ipath/"
-                else {
-                    path = 2 + argv[i];
-                }
+        else if (std::strcmp(argv[i], "--funsigned-char") == 0)
+            defaultSign = 'u';
 
-                if (!path.empty()) {
-                    path = Path::removeQuotationMarks(path);
-                    path = Path::fromNativeSeparators(path);
-                    path = Path::simplifyPath(path);
+        // Ignored paths
+        else if (std::strncmp(argv[i], "-i", 2) == 0) {
+            std::string path;
 
-                    if (FileLister::isDirectory(path)) {
-                        // If directory name doesn't end with / or \, add it
-                        if (!endsWith(path, '/'))
-                            path += '/';
-                    }
-                    mIgnoredPaths.emplace_back(std::move(path));
+            // "-i path/"
+            if (std::strcmp(argv[i], "-i") == 0) {
+                ++i;
+                if (i >= argc || argv[i][0] == '-') {
+                    mLogger.printError("argument to '-i' is missing.");
+                    return Result::Fail;
                 }
+                path = argv[i];
             }
 
-            else if (std::strncmp(argv[i], "--include=", 10) == 0) {
-                mSettings.userIncludes.emplace_back(Path::fromNativeSeparators(argv[i] + 10));
+            // "-ipath/"
+            else {
+                path = 2 + argv[i];
             }
 
-            else if (std::strncmp(argv[i], "--includes-file=", 16) == 0) {
-                // open this file and read every input file (1 file name per line)
-                const std::string includesFile(16 + argv[i]);
-                if (!addIncludePathsToList(includesFile, mSettings.includePaths)) {
-                    printError("unable to open includes file at '" + includesFile + "'");
-                    return false;
-                }
+            if (!path.empty()) {
+                mIgnoredPaths.emplace_back(std::move(path));
             }
+        }
 
-            // Inconclusive checking
-            else if (std::strcmp(argv[i], "--inconclusive") == 0)
-                mSettings.certainty.enable(Certainty::inconclusive);
-
-            // Enables inline suppressions.
-            else if (std::strcmp(argv[i], "--inline-suppr") == 0)
-                mSettings.inlineSuppressions = true;
+        else if (std::strncmp(argv[i], "--include=", 10) == 0) {
+            mSettings.userIncludes.emplace_back(Path::fromNativeSeparators(argv[i] + 10));
+        }
 
-            // Checking threads
-            else if (std::strncmp(argv[i], "-j", 2) == 0) {
-                std::string numberString;
+        else if (std::strncmp(argv[i], "--includes-file=", 16) == 0) {
+            // open this file and read every input file (1 file name per line)
+            const std::string includesFile(16 + argv[i]);
+            if (!addIncludePathsToList(includesFile, mSettings.includePaths)) {
+                mLogger.printError("unable to open includes file at '" + includesFile + "'");
+                return Result::Fail;
+            }
+        }
 
-                // "-j 3"
-                if (std::strcmp(argv[i], "-j") == 0) {
-                    ++i;
-                    if (i >= argc || argv[i][0] == '-') {
-                        printError("argument to '-j' is missing.");
-                        return false;
-                    }
+        // Inconclusive checking
+        else if (std::strcmp(argv[i], "--inconclusive") == 0)
+            mSettings.certainty.enable(Certainty::inconclusive);
 
-                    numberString = argv[i];
-                }
+        // Enables inline suppressions.
+        else if (std::strcmp(argv[i], "--inline-suppr") == 0)
+            mSettings.inlineSuppressions = true;
 
-                // "-j3"
-                else
-                    numberString = argv[i]+2;
+        // Checking threads
+        else if (std::strncmp(argv[i], "-j", 2) == 0) {
+            std::string numberString;
 
-                unsigned int tmp;
-                std::string err;
-                if (!strToInt(numberString, tmp, &err)) {
-                    printError("argument to '-j' is not valid - " +  err + ".");
-                    return false;
-                }
-                if (tmp > 10000) {
-                    // This limit is here just to catch typos. If someone has
-                    // need for more jobs, this value should be increased.
-                    printError("argument for '-j' is allowed to be 10000 at max.");
-                    return false;
+            // "-j 3"
+            if (std::strcmp(argv[i], "-j") == 0) {
+                ++i;
+                if (i >= argc || argv[i][0] == '-') {
+                    mLogger.printError("argument to '-j' is missing.");
+                    return Result::Fail;
                 }
-                mSettings.jobs = tmp;
+
+                numberString = argv[i];
             }
 
-#ifdef THREADING_MODEL_FORK
-            else if (std::strncmp(argv[i], "-l", 2) == 0) {
-                std::string numberString;
+            // "-j3"
+            else
+                numberString = argv[i]+2;
 
-                // "-l 3"
-                if (std::strcmp(argv[i], "-l") == 0) {
-                    ++i;
-                    if (i >= argc || argv[i][0] == '-') {
-                        printError("argument to '-l' is missing.");
-                        return false;
-                    }
+            unsigned int tmp;
+            std::string err;
+            if (!strToInt(numberString, tmp, &err)) {
+                mLogger.printError("argument to '-j' is not valid - " +  err + ".");
+                return Result::Fail;
+            }
+            if (tmp == 0) {
+                // TODO: implement get CPU logical core count and use that.
+                // Usually, -j 0 would mean "use all available cores," but
+                // if we get a 0, we just stall and don't do any work.
+                mLogger.printError("argument for '-j' must be greater than 0.");
+                return Result::Fail;
+            }
+            if (tmp > 1024) {
+                // Almost nobody has 1024 logical cores, but somebody out
+                // there does.
+                mLogger.printError("argument for '-j' is allowed to be 1024 at max.");
+                return Result::Fail;
+            }
+            mSettings.jobs = tmp;
+        }
+
+        else if (std::strncmp(argv[i], "-l", 2) == 0) {
+#ifdef HAS_THREADING_MODEL_FORK
+            std::string numberString;
 
-                    numberString = argv[i];
+            // "-l 3"
+            if (std::strcmp(argv[i], "-l") == 0) {
+                ++i;
+                if (i >= argc || argv[i][0] == '-') {
+                    mLogger.printError("argument to '-l' is missing.");
+                    return Result::Fail;
                 }
 
-                // "-l3"
-                else
-                    numberString = argv[i]+2;
+                numberString = argv[i];
+            }
 
-                int tmp;
-                std::string err;
-                if (!strToInt(numberString, tmp, &err)) {
-                    printError("argument to '-l' is not valid - " + err + ".");
-                    return false;
-                }
-                mSettings.loadAverage = tmp;
+            // "-l3"
+            else
+                numberString = argv[i]+2;
+
+            int tmp;
+            std::string err;
+            if (!strToInt(numberString, tmp, &err)) {
+                mLogger.printError("argument to '-l' is not valid - " + err + ".");
+                return Result::Fail;
             }
+            mSettings.loadAverage = tmp;
+#else
+            mLogger.printError("Option -l cannot be used as Cppcheck has not been built with fork threading model.");
+            return Result::Fail;
 #endif
+        }
 
-            // Enforce language (--language=, -x)
-            else if (std::strncmp(argv[i], "--language=", 11) == 0 || std::strcmp(argv[i], "-x") == 0) {
-                std::string str;
-                if (argv[i][2]) {
-                    str = argv[i]+11;
-                } else {
-                    i++;
-                    if (i >= argc || argv[i][0] == '-') {
-                        printError("no language given to '-x' option.");
-                        return false;
-                    }
-                    str = argv[i];
-                }
-
-                if (str == "c")
-                    mSettings.enforcedLang = Settings::Language::C;
-                else if (str == "c++")
-                    mSettings.enforcedLang = Settings::Language::CPP;
-                else {
-                    printError("unknown language '" + str + "' enforced.");
-                    return false;
+        // Enforce language (--language=, -x)
+        else if (std::strncmp(argv[i], "--language=", 11) == 0 || std::strcmp(argv[i], "-x") == 0) {
+            std::string str;
+            if (argv[i][2]) {
+                str = argv[i]+11;
+            } else {
+                i++;
+                if (i >= argc || argv[i][0] == '-') {
+                    mLogger.printError("no language given to '-x' option.");
+                    return Result::Fail;
                 }
+                str = argv[i];
             }
 
-            // --library
-            else if (std::strncmp(argv[i], "--library=", 10) == 0) {
-                mSettings.libraries.emplace_back(argv[i] + 10);
+            if (str == "c")
+                mEnforcedLang = Standards::Language::C;
+            else if (str == "c++")
+                mEnforcedLang = Standards::Language::CPP;
+            else {
+                mLogger.printError("unknown language '" + str + "' enforced.");
+                return Result::Fail;
             }
+        }
 
-            // Set maximum number of #ifdef configurations to check
-            else if (std::strncmp(argv[i], "--max-configs=", 14) == 0) {
-                int tmp;
-                if (!parseNumberArg(argv[i], 14, tmp))
-                    return false;
-                if (tmp < 1) {
-                    printError("argument to '--max-configs=' must be greater than 0.");
-                    return false;
+        // --library
+        else if (std::strncmp(argv[i], "--library=", 10) == 0) {
+            std::vector<std::string> libs = splitString(argv[i] + 10, ',');
+            for (auto& l : libs) {
+                if (l.empty()) {
+                    mLogger.printError("empty library specified.");
+                    return Result::Fail;
                 }
-
-                mSettings.maxConfigs = tmp;
-                mSettings.force = false;
-                maxconfigs = true;
+                mSettings.libraries.emplace_back(std::move(l));
             }
+        }
 
-            // max ctu depth
-            else if (std::strncmp(argv[i], "--max-ctu-depth=", 16) == 0) {
-                if (!parseNumberArg(argv[i], 16, mSettings.maxCtuDepth))
-                    return false;
+        // Set maximum number of #ifdef configurations to check
+        else if (std::strncmp(argv[i], "--max-configs=", 14) == 0) {
+            int tmp;
+            if (!parseNumberArg(argv[i], 14, tmp))
+                return Result::Fail;
+            if (tmp < 1) {
+                mLogger.printError("argument to '--max-configs=' must be greater than 0.");
+                return Result::Fail;
             }
 
-            // Write results in file
-            else if (std::strncmp(argv[i], "--output-file=", 14) == 0)
-                mSettings.outputFile = Path::simplifyPath(Path::fromNativeSeparators(argv[i] + 14));
+            mSettings.maxConfigsOption = tmp;
+            mSettings.force = false;
+        }
 
-            // Experimental: limit execution time for extended valueflow analysis. basic valueflow analysis
-            // is always executed.
-            else if (std::strncmp(argv[i], "--performance-valueflow-max-time=", 33) == 0) {
-                if (!parseNumberArg(argv[i], 33, mSettings.performanceValueFlowMaxTime, true))
-                    return false;
+        // max ctu depth
+        else if (std::strncmp(argv[i], "--max-ctu-depth=", 16) == 0) {
+            int temp = 0;
+            if (!parseNumberArg(argv[i], 16, temp))
+                return Result::Fail;
+            if (temp > 10) {
+                mLogger.printMessage("--max-ctu-depth is being capped at 10. This limitation will be removed in a future Cppcheck version.");
+                temp = 10;
             }
+            mSettings.maxCtuDepth = temp;
+        }
+
+        else if (std::strncmp(argv[i], "--max-template-recursion=", 25) == 0) {
+            if (!parseNumberArg(argv[i], 25, mSettings.maxTemplateRecursion))
+                return Result::Fail;
+        }
+
+        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;
+
+        else if (std::strcmp(argv[i], "--no-check-unused-templates") == 0)
+            mSettings.checkUnusedTemplates = false;
+
+        // undocumented option for usage in Python tests to indicate that no build dir should be injected
+        else if (std::strcmp(argv[i], "--no-cppcheck-build-dir") == 0) {
+            mSettings.buildDir.clear();
+        }
+
+        else if (std::strcmp(argv[i], "--no-cpp-header-probe") == 0) {
+            mSettings.cppHeaderProbe = false;
+        }
+
+        else if (std::strcmp(argv[i], "--no-safety") == 0)
+            mSettings.safety = false;
 
-            else if (std::strncmp(argv[i], "--performance-valueflow-max-if-count=", 37) == 0) {
-                if (!parseNumberArg(argv[i], 37, mSettings.performanceValueFlowMaxIfCount, true))
-                    return 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")
+                mSettings.outputFormat = Settings::OutputFormat::text;
+            else if (format == "sarif")
+                mSettings.outputFormat = Settings::OutputFormat::sarif;
+            else if (format == "xml")
+                mSettings.outputFormat = Settings::OutputFormat::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;
+        }
 
-            // 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)) {
-                    printError(errstr);
-                    return false;
-                }
+        // Experimental: limit execution time for extended valueflow analysis. basic valueflow analysis
+        // is always executed.
+        else if (std::strncmp(argv[i], "--performance-valueflow-max-time=", 33) == 0) {
+            if (!parseNumberArg(argv[i], 33, mSettings.vfOptions.maxTime, true))
+                return Result::Fail;
+        }
 
-#if defined(_WIN64) || defined(_WIN32)
-                default_platform = false;
-#endif
+        else if (std::strncmp(argv[i], "--performance-valueflow-max-if-count=", 37) == 0) {
+            if (!parseNumberArg(argv[i], 37, mSettings.vfOptions.maxIfCount, true))
+                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 = cppcheck::Platform::Type::Unix32;
-                else if (platform == "unix64-unsigned")
-                    mSettings.platform.type = cppcheck::Platform::Type::Unix64;
-            }
-
-            // Write results in results.plist
-            else if (std::strncmp(argv[i], "--plist-output=", 15) == 0) {
-                mSettings.plistOutput = Path::simplifyPath(Path::fromNativeSeparators(argv[i] + 15));
-                if (mSettings.plistOutput.empty())
-                    mSettings.plistOutput = "./";
-                else if (!endsWith(mSettings.plistOutput,'/'))
-                    mSettings.plistOutput += '/';
-
-                const std::string plistOutput = Path::toNativeSeparators(mSettings.plistOutput);
-                if (!FileLister::isDirectory(plistOutput)) {
-                    std::string message("plist folder does not exist: \"");
-                    message += plistOutput;
-                    message += "\".";
-                    printError(message);
-                    return false;
-                }
+        else if (std::strncmp(argv[i], "--performance-valueflow-max-iterations=", 39) == 0) {
+            if (!parseNumberArg(argv[i], 39, mSettings.vfOptions.maxIterations, true))
+                return Result::Fail;
+        }
+
+        // Specify platform
+        else if (std::strncmp(argv[i], "--platform=", 11) == 0) {
+            std::string p = 11 + argv[i];
+            if (p.empty()) {
+                mLogger.printError("empty platform specified.");
+                return Result::Fail;
+            }
+            platform = std::move(p);
+        }
+
+        // Write results in results.plist
+        else if (std::strncmp(argv[i], "--plist-output=", 15) == 0) {
+            std::string path = Path::simplifyPath(argv[i] + 15);
+            if (path.empty())
+                path = ".";
+
+            const std::string plistOutput = Path::toNativeSeparators(path);
+            if (!Path::isDirectory(plistOutput)) {
+                std::string message("plist folder does not exist: '");
+                message += plistOutput;
+                message += "'.";
+                mLogger.printError(message);
+                return Result::Fail;
             }
 
-            // Special Cppcheck Premium options
-            else if (std::strncmp(argv[i], "--premium=", 10) == 0 && isCppcheckPremium()) {
-                if (!mSettings.premiumArgs.empty())
-                    mSettings.premiumArgs += " ";
-                const std::string p(argv[i] + 10);
-                mSettings.premiumArgs += "--" + p;
-                if (p == "misra-c-2012")
-                    mSettings.addons.emplace("misra");
-            }
-
-            // --project
-            else if (std::strncmp(argv[i], "--project=", 10) == 0) {
-                mSettings.checkAllConfigurations = false; // Can be overridden with --max-configs or --force
-                std::string projectFile = argv[i]+10;
-                ImportProject::Type projType = mSettings.project.import(projectFile, &mSettings);
-                mSettings.project.projectType = projType;
-                if (projType == ImportProject::Type::CPPCHECK_GUI) {
-                    mPathNames = mSettings.project.guiProject.pathNames;
-                    for (const std::string &lib : mSettings.project.guiProject.libraries)
-                        mSettings.libraries.emplace_back(lib);
-
-                    const auto& excludedPaths = mSettings.project.guiProject.excludedPaths;
-                    std::copy(excludedPaths.cbegin(), excludedPaths.cend(), std::back_inserter(mIgnoredPaths));
-
-                    std::string platform(mSettings.project.guiProject.platform);
-
-                    // keep existing platform from command-line intact
-                    if (!platform.empty()) {
-                        if (platform == "Unspecified") {
-                            printMessage("'Unspecified' is a deprecated platform type and will be removed in Cppcheck 2.14. Please use 'unspecified' instead.");
-                            platform = "unspecified";
-                        }
+            if (!endsWith(path,'/'))
+                path += '/';
 
-                        std::string errstr;
-                        const std::vector<std::string> paths = {projectFile, argv[0]};
-                        if (!mSettings.platform.set(platform, errstr, paths)) {
-                            printError(errstr);
-                            return false;
-                        }
-                    }
+            mSettings.outputFormat = Settings::OutputFormat::plist;
+            mSettings.plistOutput = std::move(path);
+        }
 
-                    if (!mSettings.project.guiProject.projectFile.empty()) {
-                        projectFile = mSettings.project.guiProject.projectFile;
-                        projType = mSettings.project.import(mSettings.project.guiProject.projectFile, &mSettings);
-                    }
-                }
-                if (projType == ImportProject::Type::VS_SLN || projType == ImportProject::Type::VS_VCXPROJ) {
-                    if (mSettings.project.guiProject.analyzeAllVsConfigs == "false")
-                        mSettings.project.selectOneVsConfig(mSettings.platform.type);
-                    if (!CppCheckExecutor::tryLoadLibrary(mSettings.library, argv[0], "windows.cfg")) {
-                        // This shouldn't happen normally.
-                        printError("failed to load 'windows.cfg'. Your Cppcheck installation is broken. Please re-install.");
-                        return false;
+        // Special Cppcheck Premium options
+        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",  // TODO: deprecate in favor of the regular --saftey/--no-safety
+                "debug-progress"};
+            // valid options --premium-..=
+            const std::set<std::string> valid2{
+                "cert-c-int-precision",
+                "license-file"
+            };
+
+            if (std::strcmp(argv[i], "--premium=safety-off") == 0) {
+                mSettings.safety = false;
+                continue;
+            }
+            if (std::strcmp(argv[i], "--premium=safety") == 0)
+                mSettings.safety = true;
+            if (!mSettings.premiumArgs.empty())
+                mSettings.premiumArgs += " ";
+            const std::string p(argv[i] + 10);
+            const std::string p2(p.find('=') != std::string::npos ? p.substr(0, p.find('=')) : "");
+            const bool isCodingStandard = startsWith(p, "autosar") || startsWith(p,"cert-") || startsWith(p,"misra-");
+            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 (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");
+                mSettings.addEnabled("portability");
+            }
+        }
+
+        // --project
+        else if (std::strncmp(argv[i], "--project=", 10) == 0) {
+            if (projectType != ImportProject::Type::NONE)
+            {
+                mLogger.printError("multiple --project options are not supported.");
+                return Result::Fail;
+            }
+
+            std::string projectFile = argv[i]+10;
+            projectType = project.import(projectFile, &mSettings, &mSuppressions);
+            if (projectType == ImportProject::Type::CPPCHECK_GUI) {
+                for (const std::string &lib : project.guiProject.libraries)
+                    mSettings.libraries.emplace_back(lib);
+
+                const auto& excludedPaths = project.guiProject.excludedPaths;
+                std::copy(excludedPaths.cbegin(), excludedPaths.cend(), std::back_inserter(mIgnoredPaths));
+
+                if (!project.guiProject.platform.empty())
+                    platform = project.guiProject.platform;
+
+                // look for external files relative to project first
+                lookupPaths.insert(lookupPaths.cbegin(), Path::getPathFromFilename(projectFile));
+
+                const auto& projectFileGui = project.guiProject.projectFile;
+                if (!projectFileGui.empty()) {
+                    // read underlying project
+                    projectFile = projectFileGui;
+                    projectType = project.import(projectFileGui, &mSettings, &mSuppressions);
+                    if (projectType == ImportProject::Type::CPPCHECK_GUI) {
+                        mLogger.printError("nested Cppcheck GUI projects are not supported.");
+                        return Result::Fail;
                     }
                 }
-                if (projType == ImportProject::Type::MISSING) {
-                    printError("failed to open project '" + projectFile + "'. The file does not exist.");
-                    return false;
-                }
-                if (projType == ImportProject::Type::UNKNOWN) {
-                    printError("failed to load project '" + projectFile + "'. The format is unknown.");
-                    return false;
-                }
-                if (projType == ImportProject::Type::FAILURE) {
-                    printError("failed to load project '" + projectFile + "'. An error occurred.");
-                    return false;
-                }
             }
+            if (projectType == ImportProject::Type::COMPILE_DB)
+                mSettings.maxConfigsProject = 1;
+            if (projectType == ImportProject::Type::VS_SLN || 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;
+            }
+            if (projectType == ImportProject::Type::UNKNOWN) {
+                mLogger.printError("failed to load project '" + projectFile + "'. The format is unknown.");
+                return Result::Fail;
+            }
+            if (projectType == ImportProject::Type::FAILURE) {
+                mLogger.printError("failed to load project '" + projectFile + "'. An error occurred.");
+                return Result::Fail;
+            }
+        }
 
-            // --project-configuration
-            else if (std::strncmp(argv[i], "--project-configuration=", 24) == 0) {
-                mVSConfig = argv[i] + 24;
-                if (!mVSConfig.empty() && (mSettings.project.projectType == ImportProject::Type::VS_SLN || mSettings.project.projectType == ImportProject::Type::VS_VCXPROJ))
-                    mSettings.project.ignoreOtherConfigs(mVSConfig);
-            }
-
-            // Only print something when there are errors
-            else if (std::strcmp(argv[i], "-q") == 0 || std::strcmp(argv[i], "--quiet") == 0)
-                mSettings.quiet = true;
-
-            // Output relative paths
-            else if (std::strcmp(argv[i], "-rp") == 0 || std::strcmp(argv[i], "--relative-paths") == 0)
-                mSettings.relativePaths = true;
-            else if (std::strncmp(argv[i], "-rp=", 4) == 0 || std::strncmp(argv[i], "--relative-paths=", 17) == 0) {
-                mSettings.relativePaths = true;
-                if (argv[i][argv[i][3]=='='?4:17] != 0) {
-                    std::string paths = argv[i]+(argv[i][3]=='='?4:17);
-                    for (;;) {
-                        const std::string::size_type pos = paths.find(';');
-                        if (pos == std::string::npos) {
-                            mSettings.basePaths.emplace_back(Path::fromNativeSeparators(paths));
-                            break;
-                        }
-                        mSettings.basePaths.emplace_back(Path::fromNativeSeparators(paths.substr(0, pos)));
-                        paths.erase(0, pos + 1);
+        // --project-configuration
+        else if (std::strncmp(argv[i], "--project-configuration=", 24) == 0) {
+            vsConfig = argv[i] + 24;
+            if (vsConfig.empty()) {
+                mLogger.printError("--project-configuration parameter is empty.");
+                return Result::Fail;
+            }
+            if (projectType != ImportProject::Type::VS_SLN && projectType != ImportProject::Type::VS_VCXPROJ) {
+                mLogger.printError("--project-configuration has no effect - no Visual Studio project provided.");
+                return Result::Fail;
+            }
+        }
+
+        // Only print something when there are errors
+        else if (std::strcmp(argv[i], "-q") == 0 || std::strcmp(argv[i], "--quiet") == 0)
+            mSettings.quiet = true;
+
+        // Output relative paths
+        else if (std::strcmp(argv[i], "-rp") == 0 || std::strcmp(argv[i], "--relative-paths") == 0)
+            mSettings.relativePaths = true;
+        else if (std::strncmp(argv[i], "-rp=", 4) == 0 || std::strncmp(argv[i], "--relative-paths=", 17) == 0) {
+            mSettings.relativePaths = true;
+            if (argv[i][argv[i][3]=='='?4:17] != 0) {
+                std::string paths = argv[i]+(argv[i][3]=='='?4:17);
+                for (;;) {
+                    const std::string::size_type pos = paths.find(';');
+                    if (pos == std::string::npos) {
+                        mSettings.basePaths.emplace_back(Path::fromNativeSeparators(std::move(paths)));
+                        break;
                     }
-                } else {
-                    printError("no paths specified for the '" + std::string(argv[i]) + "' option.");
-                    return false;
+                    mSettings.basePaths.emplace_back(Path::fromNativeSeparators(paths.substr(0, pos)));
+                    paths.erase(0, pos + 1);
                 }
+            } else {
+                mLogger.printError("no paths specified for the '" + std::string(argv[i]) + "' option.");
+                return Result::Fail;
             }
+        }
+
+        // Report progress
+        else if (std::strcmp(argv[i], "--report-progress") == 0) {
+            mSettings.reportProgress = 10;
+        }
+
+        else if (std::strncmp(argv[i], "--report-progress=", 18) == 0) {
+            if (!parseNumberArg(argv[i], 18, mSettings.reportProgress, true))
+                return Result::Fail;
+        }
 
-            // Report progress
-            else if (std::strcmp(argv[i], "--report-progress") == 0) {
-                mSettings.reportProgress = true;
+        else if (std::strncmp(argv[i], "--report-type=", 14) == 0) {
+            const std::string typeStr = argv[i] + 14;
+            if (typeStr == "normal") {
+                mSettings.reportType = ReportType::normal;
+            } else if (typeStr == "autosar") {
+                mSettings.reportType = ReportType::autosar;
+            } else if (typeStr == "cert-c-2016") {
+                mSettings.reportType = ReportType::certC;
+            } else if (typeStr == "cert-cpp-2016") {
+                mSettings.reportType = ReportType::certCpp;
+            } 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") {
+                mSettings.reportType = ReportType::misraCpp2023;
+            } else {
+                mLogger.printError("Unknown report type \'" + typeStr + "\'");
+                return Result::Fail;
             }
+        }
 
+        // Rule given at command line
+        else if (std::strncmp(argv[i], "--rule=", 7) == 0) {
 #ifdef HAVE_RULES
-            // Rule given at command line
-            else if (std::strncmp(argv[i], "--rule=", 7) == 0) {
-                Settings::Rule rule;
-                rule.pattern = 7 + argv[i];
-                mSettings.rules.emplace_back(std::move(rule));
-            }
-
-            // Rule file
-            else if (std::strncmp(argv[i], "--rule-file=", 12) == 0) {
-                tinyxml2::XMLDocument doc;
-                if (doc.LoadFile(12+argv[i]) == tinyxml2::XML_SUCCESS) {
-                    tinyxml2::XMLElement *node = doc.FirstChildElement();
-                    if (node && strcmp(node->Value(), "rules") == 0)
-                        node = node->FirstChildElement("rule");
-                    for (; node && strcmp(node->Value(), "rule") == 0; node = node->NextSiblingElement()) {
-                        Settings::Rule rule;
-
-                        const tinyxml2::XMLElement *tokenlist = node->FirstChildElement("tokenlist");
-                        if (tokenlist)
-                            rule.tokenlist = tokenlist->GetText();
-
-                        const tinyxml2::XMLElement *pattern = node->FirstChildElement("pattern");
-                        if (pattern) {
-                            rule.pattern = pattern->GetText();
-                        }
+            Settings::Rule rule;
+            rule.pattern = 7 + argv[i];
 
-                        tinyxml2::XMLElement *message = node->FirstChildElement("message");
-                        if (message) {
-                            const tinyxml2::XMLElement *severity = message->FirstChildElement("severity");
-                            if (severity)
-                                rule.severity = Severity::fromString(severity->GetText());
+            if (rule.pattern.empty()) {
+                mLogger.printError("no rule pattern provided.");
+                return Result::Fail;
+            }
 
-                            const tinyxml2::XMLElement *id = message->FirstChildElement("id");
-                            if (id)
-                                rule.id = id->GetText();
+            std::string regex_err;
+            auto regex = Regex::create(rule.pattern, 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.");
+            return Result::Fail;
+#endif
+        }
 
-                            const tinyxml2::XMLElement *summary = message->FirstChildElement("summary");
-                            if (summary)
-                                rule.summary = summary->GetText() ? summary->GetText() : "";
+        // Rule file
+        else if (std::strncmp(argv[i], "--rule-file=", 12) == 0) {
+#ifdef HAVE_RULES
+            // TODO: improved error handling - wrong root node, etc.
+            // TODO: consume unused "version" attribute
+            const std::string ruleFile = argv[i] + 12;
+            tinyxml2::XMLDocument doc;
+            const tinyxml2::XMLError err = doc.LoadFile(ruleFile.c_str());
+            if (err == tinyxml2::XML_SUCCESS) {
+                const tinyxml2::XMLElement *node = doc.FirstChildElement();
+                // check if it is a single or multi rule configuration
+                if (node && strcmp(node->Value(), "rules") == 0)
+                    node = node->FirstChildElement("rule");
+                for (; node && strcmp(node->Value(), "rule") == 0; node = node->NextSiblingElement()) {
+                    Settings::Rule rule;
+
+                    for (const tinyxml2::XMLElement *subnode = node->FirstChildElement(); subnode; subnode = subnode->NextSiblingElement()) {
+                        const char * const subname = subnode->Name();
+                        const char * const subtext = subnode->GetText();
+                        if (std::strcmp(subname, "tokenlist") == 0) {
+                            rule.tokenlist = empty_if_null(subtext);
+                        }
+                        else if (std::strcmp(subname, "pattern") == 0) {
+                            rule.pattern = empty_if_null(subtext);
+                        }
+                        else if (std::strcmp(subname, "message") == 0) {
+                            for (const tinyxml2::XMLElement *msgnode = subnode->FirstChildElement(); msgnode; msgnode = msgnode->NextSiblingElement()) {
+                                const char * const msgname = msgnode->Name();
+                                const char * const msgtext = msgnode->GetText();
+                                if (std::strcmp(msgname, "severity") == 0) {
+                                    rule.severity = severityFromString(empty_if_null(msgtext));
+                                }
+                                else if (std::strcmp(msgname, "id") == 0) {
+                                    rule.id = empty_if_null(msgtext);
+                                }
+                                else if (std::strcmp(msgname, "summary") == 0) {
+                                    rule.summary = empty_if_null(msgtext);
+                                }
+                                else {
+                                    mLogger.printError("unable to load rule-file '" + ruleFile + "' - unknown element '" + msgname + "' encountered in 'message'.");
+                                    return Result::Fail;
+                                }
+                            }
+                        }
+                        else {
+                            mLogger.printError("unable to load rule-file '" + ruleFile + "' - unknown element '" + subname + "' encountered in 'rule'.");
+                            return Result::Fail;
                         }
+                    }
 
-                        if (!rule.pattern.empty())
-                            mSettings.rules.emplace_back(std::move(rule));
+                    if (rule.pattern.empty()) {
+                        mLogger.printError("unable to load rule-file '" + ruleFile + "' - a rule is lacking a pattern.");
+                        return Result::Fail;
                     }
-                } else {
-                    printError("unable to load rule-file: " + std::string(12+argv[i]));
-                    return false;
-                }
-            }
-#endif
 
-            // show timing information..
-            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;
-                else if (showtimeMode == "file-total")
-                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
-                else if (showtimeMode == "summary")
-                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY;
-                else if (showtimeMode == "top5")
-                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5;
-                else if (showtimeMode.empty())
-                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
-                else {
-                    printError("unrecognized showtime mode: \"" + showtimeMode + "\". Supported modes: file, file-total, summary, top5.");
-                    return false;
-                }
-            }
+                    if (rule.id.empty()) {
+                        mLogger.printError("unable to load rule-file '" + ruleFile + "' - a rule is lacking an id.");
+                        return Result::Fail;
+                    }
 
-            // --std
-            else if (std::strncmp(argv[i], "--std=", 6) == 0) {
-                const std::string std = argv[i] + 6;
-                // TODO: print error when standard is unknown
-                if (std::strncmp(std.c_str(), "c++", 3) == 0) {
-                    mSettings.standards.cpp = Standards::getCPP(std);
-                }
-                else if (std::strncmp(std.c_str(), "c", 1) == 0) {
-                    mSettings.standards.c = Standards::getC(std);
-                }
-                else {
-                    printError("unknown --std value '" + std + "'");
-                    return false;
-                }
-            }
+                    if (rule.tokenlist.empty()) {
+                        mLogger.printError("unable to load rule-file '" + ruleFile + "' - a rule is lacking a tokenlist.");
+                        return Result::Fail;
+                    }
 
-            else if (std::strncmp(argv[i], "--suppress=", 11) == 0) {
-                const std::string suppression = argv[i]+11;
-                const std::string errmsg(mSuppressions.addSuppressionLine(suppression));
-                if (!errmsg.empty()) {
-                    printError(errmsg);
-                    return false;
-                }
-            }
+                    if (rule.tokenlist != "normal" && rule.tokenlist != "define" && rule.tokenlist != "raw") {
+                        mLogger.printError("unable to load rule-file '" + ruleFile + "' - a rule is using the unsupported tokenlist '" + rule.tokenlist + "'.");
+                        return Result::Fail;
+                    }
 
-            // Filter errors
-            else if (std::strncmp(argv[i], "--suppressions-list=", 20) == 0) {
-                std::string filename = argv[i]+20;
-                std::ifstream f(filename);
-                if (!f.is_open()) {
-                    std::string message("couldn't open the file: \"");
-                    message += filename;
-                    message += "\".";
-                    if (std::count(filename.cbegin(), filename.cend(), ',') > 0 ||
-                        std::count(filename.cbegin(), filename.cend(), '.') > 1) {
-                        // If user tried to pass multiple files (we can only guess that)
-                        // e.g. like this: --suppressions-list=a.txt,b.txt
-                        // print more detailed error message to tell user how he can solve the problem
-                        message += "\nIf you want to pass two files, you can do it e.g. like this:";
-                        message += "\n    cppcheck --suppressions-list=a.txt --suppressions-list=b.txt file.cpp";
+                    std::string regex_err;
+                    auto regex = Regex::create(rule.pattern, 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);
 
-                    printError(message);
-                    return false;
-                }
-                const std::string errmsg(mSuppressions.parseFile(f));
-                if (!errmsg.empty()) {
-                    printError(errmsg);
-                    return false;
+                    if (rule.severity == Severity::none) {
+                        mLogger.printError("unable to load rule-file '" + ruleFile + "' - a rule has an invalid severity.");
+                        return Result::Fail;
+                    }
+
+                    mSettings.rules.emplace_back(std::move(rule));
                 }
+            } else {
+                mLogger.printError("unable to load rule-file '" + ruleFile + "' (" + tinyxml2::XMLDocument::ErrorIDToName(err) + ").");
+                return Result::Fail;
             }
+#else
+            mLogger.printError("Option --rule-file cannot be used as Cppcheck has not been built with rules support.");
+            return Result::Fail;
+#endif
+        }
 
-            else if (std::strncmp(argv[i], "--suppress-xml=", 15) == 0) {
-                const char * filename = argv[i] + 15;
-                const std::string errmsg(mSuppressions.parseXmlFile(filename));
-                if (!errmsg.empty()) {
-                    printError(errmsg);
-                    return false;
-                }
+        // Safety certified behavior
+        else if (std::strcmp(argv[i], "--safety") == 0)
+            mSettings.safety = true;
+
+        // show timing information..
+        else if (std::strncmp(argv[i], "--showtime=", 11) == 0) {
+            const std::string showtimeMode = argv[i] + 11;
+            if (showtimeMode == "file")
+                mSettings.showtime = ShowTime::FILE;
+            else if (showtimeMode == "file-total")
+                mSettings.showtime = ShowTime::FILE_TOTAL;
+            else if (showtimeMode == "summary")
+                mSettings.showtime = ShowTime::SUMMARY;
+            else if (showtimeMode == "top5_file")
+                mSettings.showtime = ShowTime::TOP5_FILE;
+            else if (showtimeMode == "top5_summary")
+                mSettings.showtime = ShowTime::TOP5_SUMMARY;
+            else if (showtimeMode == "none")
+                mSettings.showtime = 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_file, top5_summary.");
+                return Result::Fail;
+            }
+        }
 
-            // TODO: deprecate "--template <template>"
-            // Output formatter
-            else if (std::strcmp(argv[i], "--template") == 0 ||
-                     std::strncmp(argv[i], "--template=", 11) == 0) {
-                // "--template format"
-                if (argv[i][10] == '=')
-                    mSettings.templateFormat = argv[i] + 11;
-                else if ((i+1) < argc && argv[i+1][0] != '-') {
-                    ++i;
-                    mSettings.templateFormat = argv[i];
-                } else {
-                    printError("argument to '--template' is missing.");
-                    return false;
-                }
-                // TODO: bail out when no placeholders are found?
-
-                if (mSettings.templateFormat == "gcc") {
-                    mSettings.templateFormat = "{bold}{file}:{line}:{column}: {magenta}warning:{default} {message} [{id}]{reset}\\n{code}";
-                    mSettings.templateLocation = "{bold}{file}:{line}:{column}: {dim}note:{reset} {info}\\n{code}";
-                } else if (mSettings.templateFormat == "daca2") {
-                    mSettings.daca = true;
-                    mSettings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
-                    mSettings.templateLocation = "{file}:{line}:{column}: note: {info}";
-                } else if (mSettings.templateFormat == "vs")
-                    mSettings.templateFormat = "{file}({line}): {severity}: {message}";
-                else if (mSettings.templateFormat == "edit")
-                    mSettings.templateFormat = "{file} +{line}: {severity}: {message}";
-                else if (mSettings.templateFormat == "cppcheck1")
-                    mSettings.templateFormat = "{callstack}: ({severity}{inconclusive:, inconclusive}) {message}";
-                else if (mSettings.templateFormat == "selfcheck") {
-                    mSettings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}";
-                    mSettings.templateLocation = "{file}:{line}:{column}: note: {info}\\n{code}";
-                    mSettings.daca = true;
-                }
+        // --std
+        else if (std::strncmp(argv[i], "--std=", 6) == 0) {
+            const std::string std = argv[i] + 6;
+            if (!mSettings.standards.setStd(std)) {
+                mLogger.printError("unknown --std value '" + std + "'");
+                return Result::Fail;
             }
+        }
 
-            // TODO: deprecate "--template-location <template>"
-            else if (std::strcmp(argv[i], "--template-location") == 0 ||
-                     std::strncmp(argv[i], "--template-location=", 20) == 0) {
-                // "--template-location format"
-                if (argv[i][19] == '=')
-                    mSettings.templateLocation = argv[i] + 20;
-                else if ((i+1) < argc && argv[i+1][0] != '-') {
-                    ++i;
-                    mSettings.templateLocation = argv[i];
-                } else {
-                    printError("argument to '--template-location' is missing.");
-                    return false;
-                }
-                // TODO: bail out when no placeholders are found?
+        else if (std::strncmp(argv[i], "--suppress=", 11) == 0) {
+            const std::string suppression = argv[i]+11;
+            const std::string errmsg(mSuppressions.nomsg.addSuppressionLine(suppression));
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
             }
+        }
+
+        // Filter errors
+        else if (std::strncmp(argv[i], "--suppressions-list=", 20) == 0) {
+            std::string filename = argv[i]+20;
+            std::ifstream f(filename);
+            if (!f.is_open()) {
+                std::string message("couldn't open the file: \"");
+                message += filename;
+                message += "\".";
+                if (std::count(filename.cbegin(), filename.cend(), ',') > 0 ||
+                    std::count(filename.cbegin(), filename.cend(), '.') > 1) {
+                    // If user tried to pass multiple files (we can only guess that)
+                    // e.g. like this: --suppressions-list=a.txt,b.txt
+                    // print more detailed error message to tell user how he can solve the problem
+                    message += "\nIf you want to pass two files, you can do it e.g. like this:";
+                    message += "\n    cppcheck --suppressions-list=a.txt --suppressions-list=b.txt file.cpp";
+                }
 
-            else if (std::strncmp(argv[i], "--template-max-time=", 20) == 0) {
-                if (!parseNumberArg(argv[i], 20, mSettings.templateMaxTime))
-                    return false;
+                mLogger.printError(message);
+                return Result::Fail;
+            }
+            const std::string errmsg(mSuppressions.nomsg.parseFile(f));
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
             }
+        }
 
-            else if (std::strncmp(argv[i], "--typedef-max-time=", 19) == 0) {
-                if (!parseNumberArg(argv[i], 19, mSettings.typedefMaxTime))
-                    return false;
+        else if (std::strncmp(argv[i], "--suppress-xml=", 15) == 0) {
+            const char * filename = argv[i] + 15;
+            const std::string errmsg(mSuppressions.nomsg.parseXmlFile(filename));
+            if (!errmsg.empty()) {
+                mLogger.printError(errmsg);
+                return Result::Fail;
             }
+        }
 
-            else if (std::strncmp(argv[i], "--valueflow-max-iterations=", 27) == 0) {
-                if (!parseNumberArg(argv[i], 27, mSettings.valueFlowMaxIterations))
-                    return false;
+        // Output formatter
+        else if (std::strncmp(argv[i], "--template=", 11) == 0) {
+            mSettings.templateFormat = argv[i] + 11;
+            // TODO: bail out when no template is provided?
+
+            if (mSettings.templateFormat == "gcc") {
+                mSettings.templateFormat = "{bold}{file}:{line}:{column}: {magenta}warning:{default} {message} [{id}]{reset}\\n{code}";
+                mSettings.templateLocation = "{bold}{file}:{line}:{column}: {dim}note:{reset} {info}\\n{code}";
+            } else if (mSettings.templateFormat == "daca2") {
+                mSettings.daca = true;
+                mSettings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
+                mSettings.templateLocation = "{file}:{line}:{column}: note: {info}";
+            } else if (mSettings.templateFormat == "vs")
+                mSettings.templateFormat = "{file}({line}): {severity}: {message}";
+            else if (mSettings.templateFormat == "edit")
+                mSettings.templateFormat = "{file} +{line}: {severity}: {message}";
+            else if (mSettings.templateFormat == "cppcheck1")
+                mSettings.templateFormat = "{callstack}: ({severity}{inconclusive:, inconclusive}) {message}";
+            else if (mSettings.templateFormat == "selfcheck") {
+                mSettings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}";
+                mSettings.templateLocation = "{file}:{line}:{column}: note: {info}\\n{code}";
+                mSettings.daca = true;
+            } else if (mSettings.templateFormat == "simple") {
+                mSettings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
+                mSettings.templateLocation = "";
             }
+            // TODO: bail out when no placeholders are found?
+        }
 
-            else if (std::strcmp(argv[i], "-v") == 0 || std::strcmp(argv[i], "--verbose") == 0)
-                mSettings.verbose = true;
+        else if (std::strncmp(argv[i], "--template-location=", 20) == 0) {
+            mSettings.templateLocation = argv[i] + 20;
+            // TODO: bail out when no template is provided?
+            // TODO: bail out when no placeholders are found?
+        }
 
-            else if (std::strcmp(argv[i], "--version") == 0) {
-                mShowVersion = true;
-                mExitAfterPrint = true;
-                mSettings.loadCppcheckCfg();
-                return true;
-            }
+        else if (std::strncmp(argv[i], "--template-max-time=", 20) == 0) {
+            if (!parseNumberArg(argv[i], 20, mSettings.templateMaxTime))
+                return Result::Fail;
+        }
 
-            // Write results in results.xml
-            else if (std::strcmp(argv[i], "--xml") == 0)
-                mSettings.xml = true;
+        else if (std::strncmp(argv[i], "--typedef-max-time=", 19) == 0) {
+            if (!parseNumberArg(argv[i], 19, mSettings.typedefMaxTime))
+                return Result::Fail;
+        }
 
-            // Define the XML file version (and enable XML output)
-            else if (std::strncmp(argv[i], "--xml-version=", 14) == 0) {
-                int tmp;
-                if (!parseNumberArg(argv[i], 14, tmp))
-                    return false;
-                if (tmp != 2) {
-                    // We only have xml version 2
-                    printError("'--xml-version' can only be 2.");
-                    return false;
-                }
+        else if (std::strncmp(argv[i], "--valueflow-max-iterations=", 27) == 0) {
+            if (!parseNumberArg(argv[i], 27, mSettings.vfOptions.maxIterations))
+                return Result::Fail;
+        }
+
+        else if (std::strcmp(argv[i], "-v") == 0 || std::strcmp(argv[i], "--verbose") == 0)
+            mSettings.verbose = true;
 
-                mSettings.xml_version = tmp;
-                // Enable also XML if version is set
-                mSettings.xml = true;
+        // 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;
+        }
 
-            else {
-                std::string message("unrecognized command line option: \"");
-                message += argv[i];
-                message += "\".";
-                printError(message);
-                return false;
+        // 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;
+            if (tmp != 2 && tmp != 3) {
+                // We only have xml version 2 and 3
+                mLogger.printError("'--xml-version' can only be 2 or 3.");
+                return Result::Fail;
+            }
+
+            mSettings.xml_version = tmp;
+            // Enable also XML if version is set
+            mSettings.outputFormat = Settings::OutputFormat::xml;
+            xmlOptionProvided = true;
         }
 
         else {
-            mPathNames.emplace_back(Path::fromNativeSeparators(Path::removeQuotationMarks(argv[i])));
+            std::string message("unrecognized command line option: \"");
+            message += argv[i];
+            message += "\".";
+            mLogger.printError(message);
+            return Result::Fail;
         }
     }
 
-    mSettings.loadCppcheckCfg();
+    // TODO: bail out?
+    if (!executorAuto && mSettings.useSingleJob())
+        mLogger.printMessage("'--executor' has no effect as only a single job will be used.");
 
     // Default template format..
     if (mSettings.templateFormat.empty()) {
@@ -1017,62 +1585,126 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
             mSettings.templateLocation = "{bold}{file}:{line}:{column}: {dim}note:{reset} {info}\\n{code}";
     }
     // replace static parts of the templates
-    substituteTemplateFormatStatic(mSettings.templateFormat);
-    substituteTemplateLocationStatic(mSettings.templateLocation);
+    substituteTemplateFormatStatic(mSettings.templateFormat, !mSettings.outputFile.empty());
+    substituteTemplateLocationStatic(mSettings.templateLocation, !mSettings.outputFile.empty());
+
+    if (debug) {
+        mSettings.debugnormal = true;
+        mSettings.debugvalueflow = true;
+        if (mSettings.verbose) {
+            mSettings.debugast = true;
+            mSettings.debugsymdb = true;
+        }
+    }
 
-    mSettings.project.ignorePaths(mIgnoredPaths);
+    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.force || maxconfigs)
-        mSettings.checkAllConfigurations = true;
+    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 (mSettings.force)
-        mSettings.maxConfigs = INT_MAX;
+    if (inputAsFilter) {
+        mSettings.fileFilters.insert(mSettings.fileFilters.end(), mPathNames.cbegin(), mPathNames.cend());
+        mPathNames.clear();
+    }
 
-    else if ((def || mSettings.preprocessOnly) && !maxconfigs)
-        mSettings.maxConfigs = 1U;
+    if (!mPathNames.empty() && projectType != ImportProject::Type::NONE) {
+        mLogger.printError("--project cannot be used in conjunction with source files.");
+        return Result::Fail;
+    }
 
-    if (mSettings.checks.isEnabled(Checks::unusedFunction) && mSettings.jobs > 1) {
-        printMessage("unusedFunction check can't be used with '-j' option. Disabling unusedFunction check.");
+    // TODO: conflicts with analyzeAllVsConfigs
+    if (!vsConfig.empty()) {
+        // TODO: bail out when this does nothing
+        project.ignoreOtherConfigs(vsConfig);
     }
 
-    if (argc <= 1) {
-        mShowHelp = true;
-        mExitAfterPrint = true;
+    if (!platform.empty())
+    {
+        std::string errstr;
+        if (!mSettings.platform.set(platform, errstr, lookupPaths, mSettings.debuglookup || mSettings.debuglookupPlatform)) {
+            mLogger.printError(errstr);
+            return Result::Fail;
+        }
     }
 
-    if (mShowHelp) {
-        printHelp();
-        return true;
+    if (defaultSign != '\0')
+        mSettings.platform.defaultSign = defaultSign;
+
+    if (!mSettings.analyzeAllVsConfigs) {
+        if (projectType != ImportProject::Type::VS_SLN && 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 defined(_WIN64)
-    if (SHOW_DEF_PLATFORM_MSG && default_platform && !mSettings.quiet)
-        printMessage("Windows 64-bit binaries currently default to the 'win64' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win64' explicitly if you rely on this.");
-#elif defined(_WIN32)
-    if (SHOW_DEF_PLATFORM_MSG && default_platform && !mSettings.quiet)
-        printMessage("Windows 32-bit binaries currently default to the 'win32A' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32A' explicitly if you rely on this.");
-#endif
+    if (!mSettings.buildDir.empty() && !Path::isDirectory(mSettings.buildDir)) {
+        mLogger.printError("Directory '" + mSettings.buildDir + "' specified by --cppcheck-build-dir argument has to be existent.");
+        return Result::Fail;
+    }
 
     // Print error only if we have "real" command and expect files
-    if (!mExitAfterPrint && mPathNames.empty() && mSettings.project.fileSettings.empty()) {
-        printError("no C or C++ source files found.");
-        return false;
+    if (mPathNames.empty() && project.guiProject.pathNames.empty() && project.fileSettings.empty()) {
+        // TODO: this message differs from the one reported in fillSettingsFromArgs()
+        mLogger.printError("no C or C++ source files found.");
+        return Result::Fail;
+    }
+
+    for (auto& path : mIgnoredPaths)
+    {
+        path = Path::removeQuotationMarks(std::move(path));
+        path = Path::fromNativeSeparators(std::move(path));
+    }
+
+    if (!project.guiProject.pathNames.empty())
+        mPathNames = project.guiProject.pathNames;
+
+    if (!project.fileSettings.empty()) {
+        project.ignorePaths(mIgnoredPaths, mSettings.debugignore);
+        if (project.fileSettings.empty()) {
+            mLogger.printError("no C or C++ source files found.");
+            mLogger.printMessage("all paths were ignored"); // TODO: log this differently?
+            return Result::Fail;
+        }
+        mFileSettings = project.fileSettings;
+    }
+
+    if (mSettings.debugnormal && mSettings.outputFormat == Settings::OutputFormat::xml && (mPathNames.size() > 1 || mFileSettings.size() > 1))
+    {
+        mLogger.printError("printing debug output in XML format does not support multiple input files.");
+        return Result::Fail;
     }
 
     // Use paths _pathnames if no base paths for relative path output are given
     if (mSettings.basePaths.empty() && mSettings.relativePaths)
         mSettings.basePaths = mPathNames;
 
-    return true;
+    return Result::Success;
 }
 
-void CmdLineParser::printHelp()
+void CmdLineParser::printHelp() const
 {
-    const std::string manualUrl(isCppcheckPremium() ?
-                                "https://cppcheck.sourceforge.io/manual.pdf" :
-                                "https://files.cppchecksolutions.com/manual.pdf");
-
-    std::cout << "Cppcheck - A tool for static C/C++ code analysis\n"
+    std::ostringstream oss;
+    // TODO: display product name
+    oss << "Cppcheck - A tool for static C/C++ code analysis\n"
         "\n"
         "Syntax:\n"
         "    cppcheck [OPTIONS] [files or paths]\n"
@@ -1098,14 +1730,17 @@ void CmdLineParser::printHelp()
         "    --check-config       Check cppcheck configuration. The normal code\n"
         "                         analysis is disabled by this flag.\n"
         "    --check-level=<level>\n"
-        "                         Configure how much checking you want:\n"
-        "                          * normal: Cppcheck uses some compromises in the checking so\n"
+        "                         Configure how much valueflow analysis you want:\n"
+        "                          * reduced: Reduce valueflow to finish checking quickly.\n"
+        "                          * normal: Cppcheck uses some compromises in the analysis so\n"
         "                            the checking will finish in reasonable time.\n"
         "                          * exhaustive: deeper analysis that you choose when you can\n"
         "                            wait.\n"
         "                         The default choice is 'normal'.\n"
         "    --check-library      Show information messages when library files have\n"
         "                         incomplete info.\n"
+        "    --checkers-report=<file>\n"
+        "                         Write a report of all the active checkers to the given file.\n"
         "    --clang=<path>       Experimental: Use Clang parser instead of the builtin Cppcheck\n"
         "                         parser. Takes the executable as optional parameter and\n"
         "                         defaults to `clang`. Cppcheck will run the given Clang\n"
@@ -1120,9 +1755,9 @@ void CmdLineParser::printHelp()
         "                         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"
@@ -1132,31 +1767,24 @@ void CmdLineParser::printHelp()
         "                         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"
@@ -1166,16 +1794,20 @@ void CmdLineParser::printHelp()
         "    --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"
         "    -f, --force          Force checking of all configurations in files. If used\n"
         "                         together with '--max-configs=', the last option is the\n"
         "                         one that is effective.\n"
+        "    --fsigned-char       Treat char type as signed.\n"
+        "    --funsigned-char     Treat char type as unsigned.\n"
         "    -h, --help           Print this help.\n"
         "    -I <dir>             Give path to search for include files. Give several -I\n"
         "                         parameters to give several paths. First given path is\n"
@@ -1189,10 +1821,13 @@ void CmdLineParser::printHelp()
         "                         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"
@@ -1202,79 +1837,99 @@ void CmdLineParser::printHelp()
         "                         more comments, like: '// cppcheck-suppress warningId'\n"
         "                         on the lines before the warning to suppress.\n"
         "    -j <jobs>            Start <jobs> threads to do the checking simultaneously.\n"
-#ifdef THREADING_MODEL_FORK
-    "    -l <load>            Specifies that no new threads should be started if\n"
-    "                         there are other threads running and the load average is\n"
-    "                         at least <load>.\n"
-#endif
-    "    --language=<language>, -x <language>\n"
-    "                         Forces cppcheck to check all files as the given\n"
-    "                         language. Valid values are: c, c++\n"
-    "    --library=<cfg>      Load file <cfg> that contains information about types\n"
-    "                         and functions. With such information Cppcheck\n"
-    "                         understands your code better and therefore you\n"
-    "                         get better results. The std.cfg file that is\n"
-    "                         distributed with Cppcheck is loaded automatically.\n"
-    "                         For more information about library files, read the\n"
-    "                         manual.\n"
-    "    --max-configs=<limit>\n"
-    "                         Maximum number of configurations to check in a file\n"
-    "                         before skipping it. Default is '12'. If used together\n"
-    "                         with '--force', the last option is the one that is\n"
-    "                         effective.\n"
-    "    --max-ctu-depth=N    Max depth in whole program analysis. The default value\n"
-    "                         is 2. A larger value will mean more errors can be found\n"
-    "                         but also means the analysis will be slower.\n"
-    "    --output-file=<file> Write results to file, rather than standard error.\n"
-    "    --platform=<type>, --platform=<file>\n"
-    "                         Specifies platform specific types and sizes. The\n"
-    "                         available builtin platforms are:\n"
-    "                          * unix32\n"
-    "                                 32 bit unix variant\n"
-    "                          * unix64\n"
-    "                                 64 bit unix variant\n"
-    "                          * win32A\n"
-    "                                 32 bit Windows ASCII character encoding\n"
-    "                          * win32W\n"
-    "                                 32 bit Windows UNICODE character encoding\n"
-    "                          * win64\n"
-    "                                 64 bit Windows\n"
-    "                          * avr8\n"
-    "                                 8 bit AVR microcontrollers\n"
-    "                          * elbrus-e1cp\n"
-    "                                 Elbrus e1c+ architecture\n"
-    "                          * pic8\n"
-    "                                 8 bit PIC microcontrollers\n"
-    "                                 Baseline and mid-range architectures\n"
-    "                          * pic8-enhanced\n"
-    "                                 8 bit PIC microcontrollers\n"
-    "                                 Enhanced mid-range and high end (PIC18) architectures\n"
-    "                          * pic16\n"
-    "                                 16 bit PIC microcontrollers\n"
-    "                          * mips32\n"
-    "                                 32 bit MIPS microcontrollers\n"
-    "                          * native\n"
-    "                                 Type sizes of host system are assumed, but no\n"
-    "                                 further assumptions.\n"
-    "                          * unspecified\n"
-    "                                 Unknown type sizes\n"
-    "    --plist-output=<path>\n"
-    "                         Generate Clang-plist output files in folder.\n";
-
-    if (isCppcheckPremium()) {
-        std::cout << "    --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 (partial)\n"
-                  << "                          * misra-c-2012      Misra C 2012\n"
-                  << "                          * misra-c++-2008    Misra C++ 2008 (partial)\n"
-                  << "                         Other:\n"
-                  << "                          * bughunting        Soundy analysis\n"
-                  << "                          * cert-c-int-precision=BITS  Integer precision to use in Cert C analysis.\n";
+        "    -l <load>            Specifies that no new threads should be started if\n"
+        "                         there are other threads running and the load average is\n"
+        "                         at least <load>.\n"
+        "    --language=<language>, -x <language>\n"
+        "                         Forces cppcheck to check all files as the given\n"
+        "                         language. Valid values are: c, c++\n"
+        "    --library=<cfg>      Load file <cfg> that contains information about types\n"
+        "                         and functions. With such information Cppcheck\n"
+        "                         understands your code better and therefore you\n"
+        "                         get better results. The std.cfg file that is\n"
+        "                         distributed with Cppcheck is loaded automatically.\n"
+        "                         For more information about library files, read the\n"
+        "                         manual.\n"
+        "    --max-configs=<limit>\n"
+        "                         Maximum number of configurations to check in a file\n"
+        "                         before skipping it. Default is '12'. If used together\n"
+        "                         with '--force', the last option is the one that is\n"
+        "                         effective.\n"
+        "    --max-ctu-depth=N    Max depth in whole program analysis. The default value\n"
+        "                         is 2. A larger value will mean more errors can be found\n"
+        "                         but also means the analysis will be slower.\n"
+        "    --output-file=<file> Write results to file, rather than standard error.\n"
+        "    --output-format=<format>\n"
+        "                        Specify the output format. The available formats are:\n"
+        "                          * text\n"
+        "                          * sarif\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"
+        "                          * unix32\n"
+        "                                 32 bit unix variant\n"
+        "                          * unix64\n"
+        "                                 64 bit unix variant\n"
+        "                          * win32A\n"
+        "                                 32 bit Windows ASCII character encoding\n"
+        "                          * win32W\n"
+        "                                 32 bit Windows UNICODE character encoding\n"
+        "                          * win64\n"
+        "                                 64 bit Windows\n"
+        "                          * avr8\n"
+        "                                 8 bit AVR microcontrollers\n"
+        "                          * elbrus-e1cp\n"
+        "                                 Elbrus e1c+ architecture\n"
+        "                          * pic8\n"
+        "                                 8 bit PIC microcontrollers\n"
+        "                                 Baseline and mid-range architectures\n"
+        "                          * pic8-enhanced\n"
+        "                                 8 bit PIC microcontrollers\n"
+        "                                 Enhanced mid-range and high end (PIC18) architectures\n"
+        "                          * pic16\n"
+        "                                 16 bit PIC microcontrollers\n"
+        "                          * mips32\n"
+        "                                 32 bit MIPS microcontrollers\n"
+        "                          * native\n"
+        "                                 Type sizes of host system are assumed, but no\n"
+        "                                 further assumptions.\n"
+        "                          * unspecified\n"
+        "                                 Unknown type sizes\n"
+        "    --plist-output=<path>\n"
+        "                         Generate Clang-plist output files in folder.\n";
+
+    if (mSettings.premium) {
+        oss <<
+            "    --premium=<option>\n"
+            "                         Coding standards:\n"
+            "                          * autosar           Autosar (partial)\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"
+            "                          * 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"
+            "    --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";
     }
 
-    std::cout <<
+    oss <<
         "    --project=<file>     Run Cppcheck on project. The <file> can be a Visual\n"
         "                         Studio Solution (*.sln), Visual Studio Project\n"
         "                         (*.vcxproj), compile database (compile_commands.json),\n"
@@ -1287,6 +1942,7 @@ void CmdLineParser::printHelp()
         "                         the configuration cppcheck should check.\n"
         "                         For example: '--project-configuration=Release|Win32'\n"
         "    -q, --quiet          Do not show progress reports.\n"
+        "                         Note that this option is not mutually exclusive with --verbose.\n"
         "    -rp=<paths>, --relative-paths=<paths>\n"
         "                         Use relative paths in output. When given, <paths> are\n"
         "                         used as base. You can separate multiple paths by ';'.\n"
@@ -1295,111 +1951,267 @@ void CmdLineParser::printHelp()
         "                         using e.g. ~ for home folder does not work. It is\n"
         "                         currently only possible to apply the base paths to\n"
         "                         files that are on a lower level in the directory tree.\n"
-        "    --report-progress    Report progress messages while checking a file.\n"
-#ifdef HAVE_RULES
-    "    --rule=<rule>        Match regular expression.\n"
-    "    --rule-file=<file>   Use given rule file. For more information, see:\n"
-    "                         http://sourceforge.net/projects/cppcheck/files/Articles/\n"
-#endif
-    "    --std=<id>           Set standard.\n"
-    "                         The available options are:\n"
-    "                          * c89\n"
-    "                                 C code is C89 compatible\n"
-    "                          * c99\n"
-    "                                 C code is C99 compatible\n"
-    "                          * c11\n"
-    "                                 C code is C11 compatible (default)\n"
-    "                          * c++03\n"
-    "                                 C++ code is C++03 compatible\n"
-    "                          * c++11\n"
-    "                                 C++ code is C++11 compatible\n"
-    "                          * c++14\n"
-    "                                 C++ code is C++14 compatible\n"
-    "                          * c++17\n"
-    "                                 C++ code is C++17 compatible\n"
-    "                          * c++20\n"
-    "                                 C++ code is C++20 compatible (default)\n"
-    "    --suppress=<spec>    Suppress warnings that match <spec>. The format of\n"
-    "                         <spec> is:\n"
-    "                         [error id]:[filename]:[line]\n"
-    "                         The [filename] and [line] are optional. If [error id]\n"
-    "                         is a wildcard '*', all error ids match.\n"
-    "    --suppressions-list=<file>\n"
-    "                         Suppress warnings listed in the file. Each suppression\n"
-    "                         is in the same format as <spec> above.\n"
-    "    --suppress-xml=<file>\n"
-    "                         Suppress warnings listed in a xml file. XML file should\n"
-    "                         follow the manual.pdf format specified in section.\n"
-    "                         `6.4 XML suppressions` .\n"
-    "    --template='<text>'  Format the error messages. Available fields:\n"
-    "                           {file}              file name\n"
-    "                           {line}              line number\n"
-    "                           {column}            column number\n"
-    "                           {callstack}         show a callstack. Example:\n"
-    "                                                 [file.c:1] -> [file.c:100]\n"
-    "                           {inconclusive:text} if warning is inconclusive, text\n"
-    "                                               is written\n"
-    "                           {severity}          severity\n"
-    "                           {message}           warning message\n"
-    "                           {id}                warning id\n"
-    "                           {cwe}               CWE id (Common Weakness Enumeration)\n"
-    "                           {code}              show the real code\n"
-    "                           \\t                 insert tab\n"
-    "                           \\n                 insert newline\n"
-    "                           \\r                 insert carriage return\n"
-    "                         Example formats:\n"
-    "                         '{file}:{line},{severity},{id},{message}' or\n"
-    "                         '{file}({line}):({severity}) {message}' or\n"
-    "                         '{callstack} {message}'\n"
-    "                         Pre-defined templates: gcc (default), cppcheck1 (old default), vs, edit.\n"
-    // Note: template daca2 also exists, but is for internal use (cppcheck scripts).
-    "    --template-location='<text>'\n"
-    "                         Format error message location. If this is not provided\n"
-    "                         then no extra location info is shown.\n"
-    "                         Available fields:\n"
-    "                           {file}      file name\n"
-    "                           {line}      line number\n"
-    "                           {column}    column number\n"
-    "                           {info}      location info\n"
-    "                           {code}      show the real code\n"
-    "                           \\t         insert tab\n"
-    "                           \\n         insert newline\n"
-    "                           \\r         insert carriage return\n"
-    "                         Example format (gcc-like):\n"
-    "                         '{file}:{line}:{column}: note: {info}\\n{code}'\n"
-    "    -U<ID>               Undefine preprocessor symbol. Use -U to explicitly\n"
-    "                         hide certain #ifdef <ID> code paths from checking.\n"
-    "                         Example: '-UDEBUG'\n"
-    "    -v, --verbose        Output more detailed error information.\n"
-    "    --version            Print out version number.\n"
-    "    --xml                Write results in xml format to error stream (stderr).\n"
-    "\n"
-    "Example usage:\n"
-    "  # Recursively check the current folder. Print the progress on the screen and\n"
-    "  # write errors to a file:\n"
-    "  cppcheck . 2> err.txt\n"
-    "\n"
-    "  # Recursively check ../myproject/ and don't print progress:\n"
-    "  cppcheck --quiet ../myproject/\n"
-    "\n"
-    "  # Check test.cpp, enable all checks:\n"
-    "  cppcheck --enable=all --inconclusive --library=posix test.cpp\n"
-    "\n"
-    "  # Check f.cpp and search include files from inc1/ and inc2/:\n"
-    "  cppcheck -I inc1/ -I inc2/ f.cpp\n"
-    "\n"
-    "For more information:\n"
-    "    " << manualUrl << "\n"
+        "    --report-progress    Report progress messages while checking a file (single job only).\n"
+        "    --report-type=<type> Add guideline and classification fields for specified coding standard.\n"
+        "                         The available report types are:\n"
+        "                          * normal           Default, only show cppcheck error ID and severity\n"
+        "                          * autosar          Autosar\n"
+        "                          * cert-c-2016      Cert C 2016\n"
+        "                          * 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"
+        "    --rule-file=<file>   Use given rule file. For more information, see:\n"
+        "                         http://sourceforge.net/projects/cppcheck/files/Articles/\n"
+        "    --safety             Enable safety-certified checking mode: display checker summary, enforce\n"
+        "                         stricter checks for critical errors, and return a non-zero exit code\n"
+        "                         if such errors occur.\n"
+        "    --showtime=<mode>    Show timing information.\n"
+        "                         The available modes are:\n"
+        "                          * none\n"
+        "                                 Show nothing (default)\n"
+        "                          * file\n"
+        "                                 Show for each processed file\n"
+        "                          * file-total\n"
+        "                                 Show total time only for each processed file\n"
+        "                          * summary\n"
+        "                                 Show a summary at the end\n"
+        "                          * top5_file\n"
+        "                                 Show the top 5 for each processed file\n"
+        "                          * top5_summary\n"
+        "                                 Show the top 5 summary at the end\n"
+        "    --std=<id>           Set standard.\n"
+        "                         The available options are:\n"
+        "                          * c89\n"
+        "                                 C code is C89 compatible\n"
+        "                          * c99\n"
+        "                                 C code is C99 compatible\n"
+        "                          * c11\n"
+        "                                 C code is C11 compatible (default)\n"
+        "                          * c++03\n"
+        "                                 C++ code is C++03 compatible\n"
+        "                          * c++11\n"
+        "                                 C++ code is C++11 compatible\n"
+        "                          * c++14\n"
+        "                                 C++ code is C++14 compatible\n"
+        "                          * c++17\n"
+        "                                 C++ code is C++17 compatible\n"
+        "                          * c++20\n"
+        "                                 C++ code is C++20 compatible (default)\n"
+        "    --suppress=<spec>    Suppress warnings that match <spec>. The format of\n"
+        "                         <spec> is:\n"
+        "                         [error id]:[filename]:[line]\n"
+        "                         The [filename] and [line] are optional. If [error id]\n"
+        "                         is a wildcard '*', all error ids match.\n"
+        "    --suppressions-list=<file>\n"
+        "                         Suppress warnings listed in the file. Each suppression\n"
+        "                         is in the same format as <spec> above.\n"
+        "    --suppress-xml=<file>\n"
+        "                         Suppress warnings listed in a xml file. XML file should\n"
+        "                         follow the manual.pdf format specified in section.\n"
+        "                         `6.4 XML suppressions` .\n"
+        "    --template='<text>'  Format the error messages. Available fields:\n"
+        "                           {file}              file name\n"
+        "                           {line}              line number\n"
+        "                           {column}            column number\n"
+        "                           {callstack}         show a callstack. Example:\n"
+        "                                                 [file.c:1] -> [file.c:100]\n"
+        "                           {inconclusive:text} if warning is inconclusive, text\n"
+        "                                               is written\n"
+        "                           {severity}          severity\n"
+        "                           {message}           warning message\n"
+        "                           {id}                warning id\n"
+        "                           {cwe}               CWE id (Common Weakness Enumeration)\n"
+        "                           {code}              show the real code\n"
+        "                           \\t                 insert tab\n"
+        "                           \\n                 insert newline\n"
+        "                           \\r                 insert carriage return\n"
+        "                         Example formats:\n"
+        "                         '{file}:{line},{severity},{id},{message}' or\n"
+        "                         '{file}({line}):({severity}) {message}' or\n"
+        "                         '{callstack} {message}'\n"
+        "                         Pre-defined templates: gcc (default), cppcheck1 (old default), vs, edit.\n"
+        // Note: template daca2 also exists, but is for internal use (cppcheck scripts).
+        "    --template-location='<text>'\n"
+        "                         Format error message location. If this is not provided\n"
+        "                         then no extra location info is shown.\n"
+        "                         Available fields:\n"
+        "                           {file}      file name\n"
+        "                           {line}      line number\n"
+        "                           {column}    column number\n"
+        "                           {info}      location info\n"
+        "                           {code}      show the real code\n"
+        "                           \\t         insert tab\n"
+        "                           \\n         insert newline\n"
+        "                           \\r         insert carriage return\n"
+        "                         Example format (gcc-like):\n"
+        "                         '{file}:{line}:{column}: note: {info}\\n{code}'\n"
+        "    -U<ID>               Undefine preprocessor symbol. Use -U to explicitly\n"
+        "                         hide certain #ifdef <ID> code paths from checking.\n"
+        "                         Example: '-UDEBUG'\n"
+        "    -v, --verbose        Output more detailed error information.\n"
+        "                         Note that this option is not mutually exclusive with --quiet.\n"
+        "    --version            Print out version number.\n"
+        "    --xml                Write results in xml format to error stream (stderr).\n"
+        "\n"
+        "Example usage:\n"
+        "  # Recursively check the current folder. Print the progress on the screen and\n"
+        "  # write errors to a file:\n"
+        "  cppcheck . 2> err.txt\n"
+        "\n"
+        "  # Recursively check ../myproject/ and don't print progress:\n"
+        "  cppcheck --quiet ../myproject/\n"
+        "\n"
+        "  # Check test.cpp, enable all checks:\n"
+        "  cppcheck --enable=all --inconclusive --library=posix test.cpp\n"
+        "\n"
+        "  # Check f.cpp and search include files from inc1/ and inc2/:\n"
+        "  cppcheck -I inc1/ -I inc2/ f.cpp\n"
+        "\n"
+        "For more information:\n"
+        "    " << mSettings.manualUrl << "\n"
         "\n"
         "Many thanks to the 3rd party libraries we use:\n"
         " * tinyxml2 -- loading project/library/ctu files.\n"
         " * picojson -- loading compile database.\n"
         " * pcre -- rules.\n"
         " * qt -- used in GUI\n";
+
+    mLogger.printRaw(oss.str());
+}
+
+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();
+    if (*extraVersion != '\0')
+        return std::string("Cppcheck ") + CppCheck::version() + " ("+ extraVersion + ')';
+    return std::string("Cppcheck ") + CppCheck::version();
+}
+
+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);
+
+    if (err.errorcode == Library::ErrorCode::UNKNOWN_ELEMENT)
+        mLogger.printMessage("Found unknown elements in configuration file '" + std::string(filename) + "': " + err.reason); // TODO: print as errors
+    else if (err.errorcode != Library::ErrorCode::OK) {
+        std::string msg = "Failed to load library configuration file '" + std::string(filename) + "'. ";
+        switch (err.errorcode) {
+        case Library::ErrorCode::OK:
+            break;
+        case Library::ErrorCode::FILE_NOT_FOUND:
+            msg += "File not found";
+            break;
+        case Library::ErrorCode::BAD_XML:
+            msg += "Bad XML";
+            break;
+        case Library::ErrorCode::UNKNOWN_ELEMENT:
+            msg += "Unexpected element";
+            break;
+        case Library::ErrorCode::MISSING_ATTRIBUTE:
+            msg +="Missing attribute";
+            break;
+        case Library::ErrorCode::BAD_ATTRIBUTE_VALUE:
+            msg += "Bad attribute value";
+            break;
+        case Library::ErrorCode::UNSUPPORTED_FORMAT:
+            msg += "File is of unsupported format version";
+            break;
+        case Library::ErrorCode::DUPLICATE_PLATFORM_TYPE:
+            msg += "Duplicate platform type";
+            break;
+        case Library::ErrorCode::PLATFORM_TYPE_REDEFINED:
+            msg += "Platform type redefined";
+            break;
+        case Library::ErrorCode::DUPLICATE_DEFINE:
+            msg += "Duplicate define";
+            break;
+        }
+        if (!err.reason.empty())
+            msg += " '" + err.reason + "'";
+        mLogger.printMessage(msg); // TODO: print as errors
+        return false;
+    }
+    return true;
 }
 
-bool CmdLineParser::isCppcheckPremium() const {
-    if (mSettings.cppcheckCfgProductName.empty())
-        mSettings.loadCppcheckCfg();
-    return mSettings.cppcheckCfgProductName.compare(0, 16, "Cppcheck Premium") == 0;
+bool CmdLineParser::loadLibraries(Settings& settings)
+{
+    if (!tryLoadLibrary(settings.library, settings.exename, "std.cfg", settings.debuglookup || settings.debuglookupLibrary)) {
+        const std::string msg("Failed to load std.cfg. Your Cppcheck installation is broken, please re-install.");
+#ifdef FILESDIR
+        const std::string details("The Cppcheck binary was compiled with FILESDIR set to \""
+                                  FILESDIR "\" and will therefore search for "
+                                  "std.cfg in " FILESDIR "/cfg.");
+#else
+        const std::string cfgfolder(Path::fromNativeSeparators(Path::getPathFromFilename(settings.exename)) + "cfg");
+        const std::string details("The Cppcheck binary was compiled without FILESDIR set. Either the "
+                                  "std.cfg should be available in " + cfgfolder + " or the FILESDIR "
+                                  "should be configured.");
+#endif
+        mLogger.printRaw(msg + " " + details); // TODO: do not print as raw?
+        return false;
+    }
+
+    bool result = true;
+    for (const auto& lib : settings.libraries) {
+        if (!tryLoadLibrary(settings.library, settings.exename, lib.c_str(), settings.debuglookup || settings.debuglookupLibrary)) {
+            result = false;
+        }
+    }
+    return result;
+}
+
+bool CmdLineParser::loadAddons(Settings& settings)
+{
+    bool result = true;
+    for (const std::string &addon: settings.addons) {
+        AddonInfo addonInfo;
+        const std::string failedToGetAddonInfo = addonInfo.getAddonInfo(addon, settings.exename, settings.debuglookup || settings.debuglookupAddon);
+        if (!failedToGetAddonInfo.empty()) {
+            mLogger.printRaw(failedToGetAddonInfo); // TODO: do not print as raw
+            result = false;
+            continue;
+        }
+        settings.addonInfos.emplace_back(std::move(addonInfo));
+    }
+    return result;
+}
+
+bool CmdLineParser::loadCppcheckCfg()
+{
+    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;
+    PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
+    std::copy_if(filesResolved.cbegin(), filesResolved.cend(), std::inserter(files, files.end()), [&](const FileWithDetails& entry) {
+        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 d12a5247b64..3fafce3ce57 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-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
@@ -19,13 +19,20 @@
 #ifndef CMDLINE_PARSER_H
 #define CMDLINE_PARSER_H
 
+#include <cstddef>
+#include <cstdint>
+#include <list>
 #include <string>
 #include <vector>
 
+#include "cmdlinelogger.h"
+#include "filesettings.h"
+#include "standards.h"
 #include "utils.h"
 
 class Settings;
-class Suppressions;
+struct Suppressions;
+class Library;
 
 /// @addtogroup CLI
 /// @{
@@ -43,113 +50,121 @@ class CmdLineParser {
 public:
     /**
      * The constructor.
+     * @param logger The logger instance to log messages through
      * @param settings Settings instance that will be modified according to
      * options user has given.
      * @param suppressions Suppressions instance that keeps the suppressions
-     * @param suppressionsNoFail Suppressions instance that keeps the "do not fail" suppressions
      */
-    CmdLineParser(Settings &settings, Suppressions &suppressions, Suppressions &suppressionsNoFail);
+    CmdLineParser(CmdLineLogger &logger, Settings &settings, Suppressions &suppressions);
 
-    /**
-     * Parse given command line.
-     * @return true if command line was ok, false if there was an error.
-     */
-    bool parseFromArgs(int argc, const char* const argv[]);
+    enum class Result : std::uint8_t { Success, Exit, Fail };
 
     /**
-     * Return if user wanted to see program version.
+     * @brief Parse command line args and fill settings and file lists
+     * from there.
+     *
+     * @param argc argc from main()
+     * @param argv argv from main()
+     * @return false when errors are found in the input
      */
-    bool getShowVersion() const {
-        return mShowVersion;
-    }
+    bool fillSettingsFromArgs(int argc, const char* const argv[]);
 
     /**
-     * Return if user wanted to see list of error messages.
+     * @brief Filter files
+     *
+     * @param fileFilters file filters
+     * @param filesResolved all the files in project
+     * @return the files in filesResolved that match filters
      */
-    bool getShowErrorMessages() const {
-        return mShowErrorMessages;
-    }
+    static std::list<FileWithDetails> filterFiles(const std::vector<std::string>& fileFilters,
+                                                  const std::list<FileWithDetails>& filesResolved);
 
     /**
-     * Return the path names user gave to command line.
+     * Return the files user gave to command line.
      */
-    const std::vector<std::string>& getPathNames() const {
-        return mPathNames;
+    const std::list<FileWithDetails>& getFiles() const {
+        return mFiles;
     }
 
     /**
-     * Return if help is shown to user.
+     * Return the file settings read from command line.
      */
-    bool getShowHelp() const {
-        return mShowHelp;
+    const std::list<FileSettings>& getFileSettings() const {
+        return mFileSettings;
     }
 
-    /**
-     * Return if we should exit after printing version, help etc.
-     */
-    bool exitAfterPrinting() const {
-        return mExitAfterPrint;
-    }
-
-    /**
-     * Return a list of paths user wants to ignore.
-     */
-    const std::vector<std::string>& getIgnoredPaths() const {
-        return mIgnoredPaths;
-    }
-
-#if defined(_WIN64) || defined(_WIN32)
-    // temporary variable to "un-break" tests
-    static bool SHOW_DEF_PLATFORM_MSG;
-#endif
-
 protected:
-
     /**
-     * Print help text to the console.
+     * Parse given command line.
+     * @return true if command line was ok, false if there was an error.
      */
-    void printHelp();
+    Result parseFromArgs(int argc, const char* const argv[]);
 
     /**
-     * Print message (to stdout).
+     * Get Cppcheck version
      */
-    static void printMessage(const std::string &message);
+    std::string getVersion() const;
 
+private:
     /**
-     * Print error message (to stdout).
+     * Print help text to the console.
      */
-    static void printError(const std::string &message);
-
-private:
-    bool isCppcheckPremium() const;
+    void printHelp() const;
 
     template<typename T>
-    static bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool mustBePositive = false)
+    bool parseNumberArg(const char* const arg, std::size_t offset, T& num, bool mustBePositive = false)
     {
         T tmp;
         std::string err;
         if (!strToInt(arg + offset, tmp, &err)) {
-            printError("argument to '" + std::string(arg, offset) + "' is not valid - " + err + ".");
+            mLogger.printError("argument to '" + std::string(arg, offset) + "' is not valid - " + err + ".");
             return false;
         }
         if (mustBePositive && tmp < 0) {
-            printError("argument to '" + std::string(arg, offset) + "' needs to be a positive integer.");
+            mLogger.printError("argument to '" + std::string(arg, offset) + "' needs to be a positive integer.");
             return false;
         }
         num = tmp;
         return true;
     }
 
-    std::vector<std::string> mPathNames;
-    std::vector<std::string> mIgnoredPaths;
+    /**
+     * Tries to load a library and prints warning/error messages
+     * @return false, if an error occurred (except unknown XML elements)
+     */
+    bool tryLoadLibrary(Library& destination, const std::string& basepath, const char* filename, bool debug);
+
+    /**
+     * @brief Load libraries
+     * @param settings Settings
+     * @return Returns true if successful
+     */
+    bool loadLibraries(Settings& settings);
+
+    /**
+     * @brief Load addons
+     * @param settings Settings
+     * @return Returns true if successful
+     */
+    bool loadAddons(Settings& settings);
+
+    bool loadCppcheckCfg();
+
+    void outputFormatOptionMixingError() const;
+
+    CmdLineLogger &mLogger;
+
     Settings &mSettings;
     Suppressions &mSuppressions;
-    Suppressions &mSuppressionsNoFail;
-    bool mShowHelp;
-    bool mShowVersion;
-    bool mShowErrorMessages;
-    bool mExitAfterPrint;
-    std::string mVSConfig;
+
+protected:
+    std::vector<std::string> mPathNames;
+    std::list<FileWithDetails> mFiles;
+    std::list<FileSettings> mFileSettings;
+    std::vector<std::string> mIgnoredPaths;
+    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 cb07f3f356e..a16f76183c0 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-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
@@ -16,341 +16,503 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have popen() and pclose()
+#endif
+
 #include "cppcheckexecutor.h"
 
 #include "analyzerinfo.h"
+#include "checkersreport.h"
+#include "cmdlinelogger.h"
 #include "cmdlineparser.h"
 #include "color.h"
 #include "config.h"
 #include "cppcheck.h"
+#include "errorlogger.h"
 #include "errortypes.h"
-#include "filelister.h"
-#include "importproject.h"
-#include "library.h"
+#include "filesettings.h"
 #include "path.h"
-#include "pathmatch.h"
+#include "sarifreport.h"
 #include "settings.h"
 #include "singleexecutor.h"
 #include "suppressions.h"
+#include "timer.h"
 #include "utils.h"
 
-#include "checkunusedfunctions.h"
-
-#if defined(THREADING_MODEL_THREAD)
+#if defined(HAS_THREADING_MODEL_THREAD)
 #include "threadexecutor.h"
-#elif defined(THREADING_MODEL_FORK)
+#endif
+#if defined(HAS_THREADING_MODEL_FORK)
 #include "processexecutor.h"
 #endif
 
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
-#include <functional>
+#include <ctime>
+#include <fstream>
 #include <iostream>
-#include <iterator>
 #include <list>
-#include <memory>
-#include <sstream> // IWYU pragma: keep
+#include <map>
+#include <set>
+#include <sstream>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
 #ifdef USE_UNIX_SIGNAL_HANDLING
-#include "cppcheckexecutorsig.h"
+#include "signalhandler.h"
 #endif
 
 #ifdef USE_WINDOWS_SEH
-#include "cppcheckexecutorseh.h"
+#include "sehwrapper.h"
 #endif
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
+#if !defined(_WIN32) && !defined(__MINGW32__)
+#include <sys/wait.h> // WIFEXITED and friends
+#endif
 
-/*static*/ FILE* CppCheckExecutor::mExceptionOutput = stdout;
-
-CppCheckExecutor::CppCheckExecutor()
-    : mSettings(nullptr), mLatestProgressOutputTime(0), mErrorOutput(nullptr), mShowAllErrors(false)
-{}
-
-CppCheckExecutor::~CppCheckExecutor()
-{
-    delete mErrorOutput;
-}
+namespace {
+    class CmdLineLoggerStd : public CmdLineLogger
+    {
+    public:
+        CmdLineLoggerStd() = default;
 
-bool CppCheckExecutor::parseFromArgs(Settings &settings, int argc, const char* const argv[])
-{
-    CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-    const bool success = parser.parseFromArgs(argc, argv);
-
-    if (success) {
-        if (parser.getShowVersion() && !parser.getShowErrorMessages()) {
-            if (!settings.cppcheckCfgProductName.empty()) {
-                std::cout << settings.cppcheckCfgProductName << std::endl;
-            } else {
-                const char * const extraVersion = CppCheck::extraVersion();
-                if (*extraVersion != 0)
-                    std::cout << "Cppcheck " << CppCheck::version() << " ("
-                              << extraVersion << ')' << std::endl;
-                else
-                    std::cout << "Cppcheck " << CppCheck::version() << std::endl;
-            }
+        void printMessage(const std::string &message) override
+        {
+            printRaw("cppcheck: " + message);
         }
 
-        if (parser.getShowErrorMessages()) {
-            mShowAllErrors = true;
-            std::cout << ErrorMessage::getXMLHeader(settings.cppcheckCfgProductName);
-            CppCheck::getErrorMessages(*this);
-            std::cout << ErrorMessage::getXMLFooter() << std::endl;
+        void printError(const std::string &message) override
+        {
+            printMessage("error: " + message);
         }
 
-        if (parser.exitAfterPrinting()) {
-            Settings::terminate();
-            return true;
+        void printRaw(const std::string &message) override
+        {
+            std::cout << message << std::endl; // TODO: should not append newline
         }
-    } else {
-        return false;
-    }
+    };
 
-    // Libraries must be loaded before FileLister is executed to ensure markup files will be
-    // listed properly.
-    if (!loadLibraries(settings))
-        return false;
-
-    // Check that all include paths exist
+    class StdLogger : public ErrorLogger
     {
-        for (std::list<std::string>::iterator iter = settings.includePaths.begin();
-             iter != settings.includePaths.end();
-             ) {
-            const std::string path(Path::toNativeSeparators(*iter));
-            if (FileLister::isDirectory(path))
-                ++iter;
-            else {
-                // If the include path is not found, warn user and remove the non-existing path from the list.
-                if (settings.severity.isEnabled(Severity::information))
-                    std::cout << "(information) Couldn't find path given by -I '" << path << '\'' << std::endl;
-                iter = settings.includePaths.erase(iter);
+    public:
+        explicit StdLogger(const Settings& settings)
+            : mSettings(settings)
+            , mGuidelineMapping(createGuidelineMapping(settings.reportType))
+        {
+            if (!mSettings.outputFile.empty()) {
+                mErrorOutput = new std::ofstream(settings.outputFile);
+            }
+            if (!mSettings.buildDir.empty()) {
+                mCheckersFile = Path::join(settings.buildDir, "checkers.txt");
             }
         }
-    }
 
-    // Output a warning for the user if he tries to exclude headers
-    const std::vector<std::string>& ignored = parser.getIgnoredPaths();
-    const bool warn = std::any_of(ignored.cbegin(), ignored.cend(), [](const std::string& i) {
-        return Path::isHeader(i);
-    });
-    if (warn) {
-        std::cout << "cppcheck: filename exclusion does not apply to header (.h and .hpp) files." << std::endl;
-        std::cout << "cppcheck: Please use --suppress for ignoring results from the header files." << std::endl;
-    }
+        ~StdLogger() override {
+            if (mSettings.outputFormat == Settings::OutputFormat::sarif) {
+                reportErr(mSarifReport.serialize(mSettings.cppcheckCfgProductName));
+            }
+            delete mErrorOutput;
+        }
 
-    const std::vector<std::string>& pathnames = parser.getPathNames();
+        StdLogger(const StdLogger&) = delete;
+        StdLogger& operator=(const SingleExecutor &) = delete;
 
-#if defined(_WIN32)
-    // For Windows we want case-insensitive path matching
-    const bool caseSensitive = false;
-#else
-    const bool caseSensitive = true;
-#endif
-    if (!settings.project.fileSettings.empty() && !settings.fileFilters.empty()) {
-        // filter only for the selected filenames from all project files
-        std::list<ImportProject::FileSettings> newList;
+        void resetLatestProgressOutputTime() {
+            mLatestProgressOutputTime = std::time(nullptr);
+        }
 
-        const std::list<ImportProject::FileSettings>& fileSettings = settings.project.fileSettings;
-        std::copy_if(fileSettings.cbegin(), fileSettings.cend(), std::back_inserter(newList), [&](const ImportProject::FileSettings& fs) {
-            return matchglobs(settings.fileFilters, fs.filename);
-        });
-        if (!newList.empty())
-            settings.project.fileSettings = newList;
-        else {
-            std::cout << "cppcheck: error: could not find any files matching the filter." << std::endl;
-            return false;
+        /**
+         * Helper function to print out errors. Appends a line change.
+         * @param errmsg String printed to error stream
+         */
+        void reportErr(const std::string &errmsg);
+
+        void reportMetric(const std::string &metric) override
+        {
+            mFileMetrics.push_back(metric);
         }
-    } else if (!pathnames.empty()) {
-        // Execute recursiveAddFiles() to each given file parameter
-        const PathMatch matcher(ignored, caseSensitive);
-        for (const std::string &pathname : pathnames) {
-            std::string err = FileLister::recursiveAddFiles(mFiles, Path::toNativeSeparators(pathname), settings.library.markupExtensions(), matcher);
-            if (!err.empty()) {
-                std::cout << "cppcheck: " << err << std::endl;
+
+        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;
             }
         }
-    }
 
-    if (mFiles.empty() && settings.project.fileSettings.empty()) {
-        std::cout << "cppcheck: error: could not find or open any of the paths given." << std::endl;
-        if (!ignored.empty())
-            std::cout << "cppcheck: Maybe all paths were ignored?" << std::endl;
-        return false;
-    }
-    if (!settings.fileFilters.empty() && settings.project.fileSettings.empty()) {
-        std::map<std::string, std::size_t> newMap;
-        for (std::map<std::string, std::size_t>::const_iterator i = mFiles.cbegin(); i != mFiles.cend(); ++i)
-            if (matchglobs(settings.fileFilters, i->first)) {
-                newMap[i->first] = i->second;
-            }
-        mFiles = newMap;
-        if (mFiles.empty()) {
-            std::cout << "cppcheck: error: could not find any files matching the filter." << std::endl;
-            return false;
+        /**
+         * @brief Write the checkers report
+         */
+        void writeCheckersReport(const Suppressions& supprs);
+
+        bool hasCriticalErrors() const {
+            return !mCriticalErrors.empty();
         }
 
-    }
+        const std::string& getCtuInfo() const {
+            return mCtuInfo;
+        }
 
-    return true;
+        void readActiveCheckers() {
+            if (mCheckersFile.empty())
+                return;
+
+            std::ifstream fin(mCheckersFile);
+            if (fin.is_open())
+            {
+                std::set<std::string> activeCheckers;
+                std::string line;
+                // cppcheck-suppress accessMoved - FP
+                while (std::getline(fin, line))
+                {
+                    // cppcheck-suppress accessMoved - FP
+                    activeCheckers.emplace(std::move(line));
+                }
+                mActiveCheckers = std::move(activeCheckers);
+            }
+        }
+
+    private:
+        /**
+         * Information about progress is directed here. This should be
+         * called by the CppCheck class only.
+         *
+         * @param outmsg Progress message e.g. "Checking main.cpp..."
+         */
+        void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
+
+        /** xml output of errors */
+        void reportErr(const ErrorMessage &msg) override;
+
+        void reportProgress(const std::string &filename, const char stage[], std::size_t value) override;
+
+        /**
+         * Reference to current settings; set while check() is running for reportError().
+         */
+        const Settings& mSettings;
+
+        /**
+         * Used to filter out duplicate error messages.
+         */
+        // TODO: store hashes instead of the full messages
+        std::unordered_set<std::string> mShownErrors;
+
+        /**
+         * Report progress time
+         */
+        std::time_t mLatestProgressOutputTime{};
+
+        /**
+         * Error output
+         */
+        std::ofstream* mErrorOutput{};
+
+        /**
+         * Checkers that has been executed
+         */
+        std::set<std::string> mActiveCheckers;
+
+        /**
+         * List of critical errors
+         */
+        std::string mCriticalErrors;
+
+        /**
+         * CTU information
+         */
+        std::string mCtuInfo;
+
+        /**
+         * SARIF report generator
+         */
+        SarifReport mSarifReport;
+
+        /**
+         * 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;
+    };
 }
 
 int CppCheckExecutor::check(int argc, const char* const argv[])
 {
-    CheckUnusedFunctions::clear();
-
     Settings settings;
-    if (!parseFromArgs(settings, argc, argv)) {
+    CmdLineLoggerStd logger;
+    Suppressions supprs;
+    CmdLineParser parser(logger, settings, supprs);
+    if (!parser.fillSettingsFromArgs(argc, argv)) {
         return EXIT_FAILURE;
     }
     if (Settings::terminated()) {
         return EXIT_SUCCESS;
     }
 
-    CppCheck cppCheck(*this, true, executeCommand);
-    cppCheck.settings() = settings;
-    mSettings = &settings;
+    Timer realTimeClock("", settings.showtime, nullptr, Timer::Type::OVERALL);
 
-    int ret;
-    if (settings.exceptionHandling)
-        ret = check_wrapper(cppCheck);
-    else
-        ret = check_internal(cppCheck);
+    settings.loadSummaries();
+
+    mFiles = parser.getFiles();
+    mFileSettings = parser.getFileSettings();
+
+    const int ret = check_wrapper(settings, supprs);
 
-    mSettings = nullptr;
     return ret;
 }
 
-int CppCheckExecutor::check_wrapper(CppCheck& cppcheck)
+int CppCheckExecutor::check_wrapper(const Settings& settings, Suppressions& supprs)
 {
 #ifdef USE_WINDOWS_SEH
-    return check_wrapper_seh(*this, &CppCheckExecutor::check_internal, cppcheck);
+    if (settings.exceptionHandling) {
+        CALL_WITH_SEH_WRAPPER(check_internal(settings, supprs));
+    }
 #elif defined(USE_UNIX_SIGNAL_HANDLING)
-    return check_wrapper_sig(*this, &CppCheckExecutor::check_internal, cppcheck);
-#else
-    return check_internal(cppcheck);
+    if (settings.exceptionHandling)
+        register_signal_handler(settings.exceptionOutput);
 #endif
+    return check_internal(settings, supprs);
+}
+
+/**
+ * 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, const std::vector<std::string>& filters)
+{
+    bool err = false;
+    // 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") {
+                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, 0);
+        }
+        errorLogger.reportErr(::ErrorMessage(std::move(callStack), "", Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
+        err = true;
+    }
+    return err;
 }
 
-bool CppCheckExecutor::reportSuppressions(const Settings &settings, bool unusedFunctionCheckEnabled, const std::map<std::string, std::size_t> &files, ErrorLogger& errorLogger) {
-    const auto& suppressions = settings.nomsg.getSuppressions();
-    if (std::any_of(suppressions.begin(), suppressions.end(), [](const Suppressions::Suppression& s) {
-        return s.errorId == "unmatchedSuppression" && s.fileName.empty() && s.lineNumber == Suppressions::Suppression::NO_LINE;
+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) {
+        return s.errorId == "unmatchedSuppression" && (s.fileName.empty() || s.fileName == "*") && s.lineNumber == SuppressionList::Suppression::NO_LINE;
     }))
         return false;
 
+    SuppressionList supprlist;
+
+    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));
+    }
+
     bool err = false;
-    if (settings.useSingleJob()) {
-        for (std::map<std::string, std::size_t>::const_iterator i = files.cbegin(); i != files.cend(); ++i) {
-            err |= errorLogger.reportUnmatchedSuppressions(
-                settings.nomsg.getUnmatchedLocalSuppressions(i->first, unusedFunctionCheckEnabled));
-        }
+
+    for (auto i = files.cbegin(); i != files.cend(); ++i) {
+        err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(*i), errorLogger, settings.unmatchedSuppressionFilters);
+    }
+
+    for (auto i = fileSettings.cbegin(); i != fileSettings.cend(); ++i) {
+        err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedLocalSuppressions(i->file), errorLogger, settings.unmatchedSuppressionFilters);
     }
-    err |= errorLogger.reportUnmatchedSuppressions(settings.nomsg.getUnmatchedGlobalSuppressions(unusedFunctionCheckEnabled));
+
+    if (settings.inlineSuppressions) {
+        err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedInlineSuppressions(), errorLogger, settings.unmatchedSuppressionFilters);
+    }
+
+    err |= ::reportUnmatchedSuppressions(supprlist.getUnmatchedGlobalSuppressions(), errorLogger, settings.unmatchedSuppressionFilters);
     return err;
 }
 
 /*
  * That is a method which gets called from check_wrapper
  * */
-int CppCheckExecutor::check_internal(CppCheck& cppcheck)
+int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& supprs) const
 {
-    Settings& settings = cppcheck.settings();
+    StdLogger stdLogger(settings);
+    TimerResults timerResults;
 
-    if (settings.reportProgress)
-        mLatestProgressOutputTime = std::time(nullptr);
+    if (settings.reportProgress >= 0)
+        stdLogger.resetLatestProgressOutputTime();
 
-    if (!settings.outputFile.empty()) {
-        mErrorOutput = new std::ofstream(settings.outputFile);
-    }
-
-    if (settings.xml) {
-        reportErr(ErrorMessage::getXMLHeader(settings.cppcheckCfgProductName));
+    if (settings.outputFormat == Settings::OutputFormat::xml) {
+        stdLogger.reportErr(ErrorMessage::getXMLHeader(settings.cppcheckCfgProductName, settings.xml_version));
     }
 
     if (!settings.buildDir.empty()) {
-        settings.loadSummaries();
-
         std::list<std::string> fileNames;
-        for (std::map<std::string, std::size_t>::const_iterator i = mFiles.cbegin(); i != mFiles.cend(); ++i)
-            fileNames.emplace_back(i->first);
-        AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, settings.userDefines, settings.project.fileSettings);
+        for (auto i = mFiles.cbegin(); i != mFiles.cend(); ++i)
+            fileNames.emplace_back(i->path());
+        AnalyzerInformation::writeFilesTxt(settings.buildDir, fileNames, settings.userDefines, mFileSettings);
+
+        stdLogger.readActiveCheckers();
     }
 
+    if (!settings.checkersReportFilename.empty())
+        std::remove(settings.checkersReportFilename.c_str());
+
+    CppCheck cppcheck(settings, supprs, stdLogger, &timerResults, true, executeCommand);
+
     unsigned int returnValue = 0;
     if (settings.useSingleJob()) {
         // Single process
-        SingleExecutor executor(cppcheck, mFiles, settings, *this);
+        SingleExecutor executor(cppcheck, mFiles, mFileSettings, settings, supprs, stdLogger, &timerResults);
         returnValue = executor.check();
     } else {
-#if defined(THREADING_MODEL_THREAD)
-        ThreadExecutor executor(mFiles, settings, *this);
-#elif defined(THREADING_MODEL_FORK)
-        ProcessExecutor executor(mFiles, settings, *this);
+#if defined(HAS_THREADING_MODEL_THREAD)
+        if (settings.executor == Settings::ExecutorType::Thread) {
+            ThreadExecutor executor(mFiles, mFileSettings, settings, supprs, stdLogger, &timerResults, 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, &timerResults, CppCheckExecutor::executeCommand);
+            returnValue = executor.check();
+        }
 #endif
-        returnValue = executor.check();
     }
 
-    cppcheck.analyseWholeProgram(settings.buildDir, mFiles);
+    returnValue |= cppcheck.analyseWholeProgram(settings.buildDir, mFiles, mFileSettings, stdLogger.getCtuInfo());
 
     if (settings.severity.isEnabled(Severity::information) || settings.checkConfiguration) {
-        const bool err = reportSuppressions(settings, cppcheck.isUnusedFunctionCheckEnabled(), mFiles, *this);
+        const bool err = reportUnmatchedSuppressions(settings, supprs.nomsg, mFiles, mFileSettings, stdLogger);
         if (err && returnValue == 0)
             returnValue = settings.exitCode;
     }
 
-    if (!settings.checkConfiguration) {
-        cppcheck.tooManyConfigsError(emptyString,0U);
-    }
+    stdLogger.writeCheckersReport(supprs);
 
-    if (settings.xml) {
-        reportErr(ErrorMessage::getXMLFooter());
+    if (settings.outputFormat == Settings::OutputFormat::xml) {
+        if (settings.xml_version == 3)
+            stdLogger.reportMetrics();
+        stdLogger.reportErr(ErrorMessage::getXMLFooter(settings.xml_version));
     }
 
+    if (settings.safety && stdLogger.hasCriticalErrors())
+        return EXIT_FAILURE;
+
     if (returnValue)
         return settings.exitCode;
-    return 0;
+    return EXIT_SUCCESS;
 }
 
-bool CppCheckExecutor::loadLibraries(Settings& settings)
+void StdLogger::writeCheckersReport(const Suppressions& supprs)
 {
-    const bool std = tryLoadLibrary(settings.library, settings.exename, "std.cfg");
+    if (!mCheckersFile.empty())
+    {
+        std::ofstream fout(mCheckersFile);
+        for (const auto& c : mActiveCheckers)
+        {
+            fout << c << std::endl;
+        }
+    }
 
-    const auto failed_lib = std::find_if(settings.libraries.begin(), settings.libraries.end(), [&](const std::string& lib) {
-        return !tryLoadLibrary(settings.library, settings.exename, lib.c_str());
+    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();
+
+    if (!summary && !xmlReport && !textReport)
+        return;
+
+    CheckersReport checkersReport(mSettings, mActiveCheckers);
+
+    const auto& suppressions = supprs.nomsg.getSuppressions();
+    const bool summarySuppressed = std::any_of(suppressions.cbegin(), suppressions.cend(), [](const SuppressionList::Suppression& s) {
+        return s.errorId == "checkersReport";
     });
-    if (failed_lib != settings.libraries.end()) {
-        const std::string msg("Failed to load the library " + *failed_lib);
-        const std::list<ErrorMessage::FileLocation> callstack;
-        ErrorMessage errmsg(callstack, emptyString, Severity::information, msg, "failedToLoadCfg", Certainty::normal);
-        reportErr(errmsg);
-        return false;
+
+    if (summary && !summarySuppressed) {
+        ErrorMessage msg;
+        msg.severity = Severity::information;
+        msg.id = "checkersReport";
+
+        const int activeCheckers = checkersReport.getActiveCheckersCount();
+        const int totalCheckers = checkersReport.getAllCheckersCount();
+
+        std::string what;
+        if (mCriticalErrors.empty())
+            what = std::to_string(activeCheckers) + "/" + std::to_string(totalCheckers);
+        else
+            what = "There was critical errors";
+        if (!xmlReport && !textReport)
+            what += " (use --checkers-report=<filename> to see details)";
+        msg.setmsg("Active checkers: " + what);
+
+        reportErr(msg);
     }
 
-    if (!std) {
-        const std::list<ErrorMessage::FileLocation> callstack;
-        const std::string msg("Failed to load std.cfg. Your Cppcheck installation is broken, please re-install.");
-#ifdef FILESDIR
-        const std::string details("The Cppcheck binary was compiled with FILESDIR set to \""
-                                  FILESDIR "\" and will therefore search for "
-                                  "std.cfg in " FILESDIR "/cfg.");
-#else
-        const std::string cfgfolder(Path::fromNativeSeparators(Path::getPathFromFilename(settings.exename)) + "cfg");
-        const std::string details("The Cppcheck binary was compiled without FILESDIR set. Either the "
-                                  "std.cfg should be available in " + cfgfolder + " or the FILESDIR "
-                                  "should be configured.");
-#endif
-        ErrorMessage errmsg(callstack, emptyString, Severity::information, msg+" "+details, "failedToLoadCfg", Certainty::normal);
-        reportErr(errmsg);
-        return false;
+    if (textReport) {
+        std::ofstream fout(mSettings.checkersReportFilename);
+        if (fout.is_open())
+            fout << checkersReport.getReport(mCriticalErrors);
     }
 
-    return true;
+    if (xmlReport) {
+        reportErr("    </errors>\n");
+        if (mSettings.safety)
+            reportErr("    <safety/>\n");
+        if (mSettings.inlineSuppressions)
+            reportErr("    <inline-suppr/>\n");
+        if (!suppressions.empty()) {
+            std::ostringstream suppressionsXml;
+            supprs.nomsg.dump(suppressionsXml);
+            reportErr(suppressionsXml.str());
+        }
+        reportErr(checkersReport.getXmlReport(mCriticalErrors));
+    }
 }
 
 #ifdef _WIN32
@@ -366,7 +528,7 @@ static inline std::string ansiToOEM(const std::string &msg, bool doConvert)
         // ansi code page characters to wide characters
         MultiByteToWideChar(CP_ACP, 0, msg.data(), msglength, wcContainer.data(), msglength);
         // wide characters to oem codepage characters
-        WideCharToMultiByte(CP_OEMCP, 0, wcContainer.data(), msglength, const_cast<char *>(result.data()), msglength, nullptr, nullptr);
+        WideCharToMultiByte(CP_OEMCP, 0, wcContainer.data(), msglength, &result[0], msglength, nullptr, nullptr);
 
         return result; // hope for return value optimization
     }
@@ -377,16 +539,16 @@ static inline std::string ansiToOEM(const std::string &msg, bool doConvert)
 #define ansiToOEM(msg, doConvert) (msg)
 #endif
 
-void CppCheckExecutor::reportErr(const std::string &errmsg)
+void StdLogger::reportErr(const std::string &errmsg)
 {
     if (mErrorOutput)
         *mErrorOutput << errmsg << std::endl;
     else {
-        std::cerr << ansiToOEM(errmsg, (mSettings == nullptr) ? true : !mSettings->xml) << std::endl;
+        std::cerr << ansiToOEM(errmsg, mSettings.outputFormat != Settings::OutputFormat::xml) << std::endl;
     }
 }
 
-void CppCheckExecutor::reportOut(const std::string &outmsg, Color c)
+void StdLogger::reportOut(const std::string &outmsg, Color c)
 {
     if (c == Color::Reset)
         std::cout << ansiToOEM(outmsg, true) << std::endl;
@@ -394,16 +556,18 @@ void CppCheckExecutor::reportOut(const std::string &outmsg, Color c)
         std::cout << c << ansiToOEM(outmsg, true) << Color::Reset << std::endl;
 }
 
-void CppCheckExecutor::reportProgress(const std::string &filename, const char stage[], const std::size_t value)
+// TODO: remove filename parameter?
+void StdLogger::reportProgress(const std::string &filename, const char stage[], const std::size_t value)
 {
     (void)filename;
 
     if (!mLatestProgressOutputTime)
         return;
 
-    // Report progress messages every 10 seconds
+    // Report progress messages every x seconds
     const std::time_t currentTime = std::time(nullptr);
-    if (currentTime >= (mLatestProgressOutputTime + 10)) {
+    if (currentTime >= (mLatestProgressOutputTime + mSettings.reportProgress))
+    {
         mLatestProgressOutputTime = currentTime;
 
         // format a progress message
@@ -417,86 +581,67 @@ void CppCheckExecutor::reportProgress(const std::string &filename, const char st
     }
 }
 
-void CppCheckExecutor::reportErr(const ErrorMessage &msg)
+void StdLogger::reportErr(const ErrorMessage &msg)
 {
-    if (mShowAllErrors) {
-        reportOut(msg.toXML());
+    if (msg.severity == Severity::internal && (msg.id == "logChecker" || endsWith(msg.id, "-logChecker"))) {
+        const std::string& checker = msg.shortMessage();
+        mActiveCheckers.emplace(checker);
         return;
     }
 
-    // Alert only about unique errors
-    if (!mShownErrors.insert(msg.toString(mSettings->verbose)).second)
+    if (msg.severity == Severity::internal && msg.id == "ctuinfo") {
+        mCtuInfo += msg.shortMessage() + "\n";
+        return;
+    }
+
+    if (ErrorLogger::isCriticalErrorId(msg.id) && mCriticalErrors.find(msg.id) == std::string::npos) {
+        if (!mCriticalErrors.empty())
+            mCriticalErrors += ", ";
+        mCriticalErrors += msg.id;
+        if (msg.severity == Severity::internal)
+            mCriticalErrors += " (suppressed)";
+    }
+
+    if (msg.severity == Severity::internal)
         return;
 
-    if (mSettings->xml)
-        reportErr(msg.toXML());
-    else
-        reportErr(msg.toString(mSettings->verbose, mSettings->templateFormat, mSettings->templateLocation));
-}
+    ErrorMessage msgCopy = msg;
+    msgCopy.guideline = getGuideline(msgCopy.id, mSettings.reportType,
+                                     mGuidelineMapping, msgCopy.severity);
+    msgCopy.classification = getClassification(msgCopy.guideline, mSettings.reportType);
 
-void CppCheckExecutor::setExceptionOutput(FILE* exceptionOutput)
-{
-    mExceptionOutput = exceptionOutput;
-}
+    // TODO: there should be no need for verbose and default messages here
+    const std::string msgStr =
+        msgCopy.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
 
-FILE* CppCheckExecutor::getExceptionOutput()
-{
-    return mExceptionOutput;
-}
+    // Alert only about unique errors
+    if (!mSettings.emitDuplicates && !mShownErrors.insert(msgStr).second)
+        return;
 
-bool CppCheckExecutor::tryLoadLibrary(Library& destination, const std::string& basepath, const char* filename)
-{
-    const Library::Error err = destination.load(basepath.c_str(), filename);
-
-    if (err.errorcode == Library::ErrorCode::UNKNOWN_ELEMENT)
-        std::cout << "cppcheck: Found unknown elements in configuration file '" << filename << "': " << err.reason << std::endl;
-    else if (err.errorcode != Library::ErrorCode::OK) {
-        std::cout << "cppcheck: Failed to load library configuration file '" << filename << "'. ";
-        switch (err.errorcode) {
-        case Library::ErrorCode::OK:
-            break;
-        case Library::ErrorCode::FILE_NOT_FOUND:
-            std::cout << "File not found";
-            break;
-        case Library::ErrorCode::BAD_XML:
-            std::cout << "Bad XML";
-            break;
-        case Library::ErrorCode::UNKNOWN_ELEMENT:
-            std::cout << "Unexpected element";
-            break;
-        case Library::ErrorCode::MISSING_ATTRIBUTE:
-            std::cout << "Missing attribute";
-            break;
-        case Library::ErrorCode::BAD_ATTRIBUTE_VALUE:
-            std::cout << "Bad attribute value";
-            break;
-        case Library::ErrorCode::UNSUPPORTED_FORMAT:
-            std::cout << "File is of unsupported format version";
-            break;
-        case Library::ErrorCode::DUPLICATE_PLATFORM_TYPE:
-            std::cout << "Duplicate platform type";
-            break;
-        case Library::ErrorCode::PLATFORM_TYPE_REDEFINED:
-            std::cout << "Platform type redefined";
-            break;
-        }
-        if (!err.reason.empty())
-            std::cout << " '" + err.reason + "'";
-        std::cout << std::endl;
-        return false;
+    if (mSettings.outputFormat == Settings::OutputFormat::sarif) {
+        mSarifReport.addFinding(std::move(msgCopy));
+    } else if (mSettings.outputFormat == Settings::OutputFormat::xml) {
+        reportErr(msgCopy.toXML());
+    } else {
+        reportErr(msgStr);
     }
-    return true;
 }
 
 /**
  * Execute a shell command and read the output from it. Returns true if command terminated successfully.
  */
-// cppcheck-suppress passedByValue - used as callback so we need to preserve the signature
+// cppcheck-suppress passedByValueCallback - 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
-bool CppCheckExecutor::executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output_)
+int CppCheckExecutor::executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output_)
 {
     output_.clear();
 
+#ifdef _WIN32
+    // Extra quoutes are needed in windows if filename has space
+    if (exe.find(" ") != std::string::npos)
+        exe = "\"" + exe + "\"";
+#endif
+
     std::string joinedArgs;
     for (const std::string &arg : args) {
         if (!joinedArgs.empty())
@@ -507,21 +652,47 @@ bool CppCheckExecutor::executeCommand(std::string exe, std::vector<std::string>
             joinedArgs += arg;
     }
 
+    std::string cmd = exe + " " + joinedArgs + " " + redirect;
+
 #ifdef _WIN32
-    // Extra quoutes are needed in windows if filename has space
-    if (exe.find(" ") != std::string::npos)
-        exe = "\"" + exe + "\"";
-    const std::string cmd = exe + " " + joinedArgs + " " + redirect;
-    std::unique_ptr<FILE, decltype(&_pclose)> pipe(_popen(cmd.c_str(), "r"), _pclose);
+    cmd = "\"" + cmd + "\"";
+    FILE* p = _popen(cmd.c_str(), "r");
 #else
-    const std::string cmd = exe + " " + joinedArgs + " " + redirect;
-    std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.c_str(), "r"), pclose);
+    FILE *p = popen(cmd.c_str(), "r");
 #endif
-    if (!pipe)
-        return false;
+    //std::cout << "invoking command '" << cmd << "'" << std::endl;
+    if (!p) {
+        // TODO: how to provide to caller?
+        //const int err = errno;
+        //std::cout << "popen() errno " << std::to_string(err) << std::endl;
+        return -1;
+    }
     char buffer[1024];
-    while (fgets(buffer, sizeof(buffer), pipe.get()) != nullptr)
+    while (fgets(buffer, sizeof(buffer), p) != nullptr)
         output_ += buffer;
-    return true;
+
+#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
+    if (res == -1) { // error occurred
+        // TODO: how to provide to caller?
+        //const int err = errno;
+        //std::cout << "pclose() errno " << std::to_string(err) << std::endl;
+        return res;
+    }
+#if !defined(_WIN32) && !defined(__MINGW32__)
+    if (WIFEXITED(res)) {
+        return WEXITSTATUS(res);
+    }
+    if (WIFSIGNALED(res)) {
+        return WTERMSIG(res);
+    }
+#endif
+    return res;
 }
 
diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
index 1e94aa58d22..5ef743ef20d 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-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
@@ -19,20 +19,16 @@
 #ifndef CPPCHECKEXECUTOR_H
 #define CPPCHECKEXECUTOR_H
 
-#include "color.h"
-#include "errorlogger.h"
+#include "filesettings.h"
 
-#include <cstdio>
-#include <ctime>
-#include <iosfwd>
-#include <map>
-#include <set>
+#include <list>
 #include <string>
 #include <vector>
 
-class CppCheck;
-class Library;
 class Settings;
+class ErrorLogger;
+class SuppressionList;
+struct Suppressions;
 
 /**
  * This class works as an example of how CppCheck can be used in external
@@ -41,19 +37,16 @@ class Settings;
  * just rewrite this class for your needs and possibly use other methods
  * from CppCheck class instead the ones used here.
  */
-class CppCheckExecutor : public ErrorLogger {
+class CppCheckExecutor {
 public:
+    friend class TestSuppressions;
+
     /**
      * Constructor
      */
-    CppCheckExecutor();
+    CppCheckExecutor() = default;
     CppCheckExecutor(const CppCheckExecutor &) = delete;
-    void operator=(const CppCheckExecutor&) = delete;
-
-    /**
-     * Destructor
-     */
-    ~CppCheckExecutor() override;
+    CppCheckExecutor& operator=(const CppCheckExecutor&) = delete;
 
     /**
      * Starts the checking.
@@ -68,123 +61,45 @@ class CppCheckExecutor : public ErrorLogger {
      */
     int check(int argc, const char* const argv[]);
 
-    /**
-     * Information about progress is directed here. This should be
-     * called by the CppCheck class only.
-     *
-     * @param outmsg Progress message e.g. "Checking main.cpp..."
-     */
-    void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
-
-    /** xml output of errors */
-    void reportErr(const ErrorMessage &msg) override;
-
-    void reportProgress(const std::string &filename, const char stage[], const std::size_t value) override;
-
-    /**
-     * @param exceptionOutput Output file
-     */
-    static void setExceptionOutput(FILE* exceptionOutput);
-    /**
-     * @return file name to be used for output from exception handler. Has to be either "stdout" or "stderr".
-     */
-    static FILE* getExceptionOutput();
-
-    /**
-     * Tries to load a library and prints warning/error messages
-     * @return false, if an error occurred (except unknown XML elements)
-     */
-    static bool tryLoadLibrary(Library& destination, const std::string& basepath, const char* filename);
+private:
 
     /**
-     * Execute a shell command and read the output from it. Returns true if command terminated successfully.
+     * Execute a shell command and read the output from it. Returns exitcode of the executed command,.
      */
-    static bool executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output_);
-
-    static bool reportSuppressions(const Settings &settings, bool unusedFunctionCheckEnabled, const std::map<std::string, std::size_t> &files, ErrorLogger& errorLogger);
+    static int executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output_);
 
 protected:
 
-    /**
-     * Helper function to print out errors. Appends a line change.
-     * @param errmsg String printed to error stream
-     */
-    void reportErr(const std::string &errmsg);
-
-    /**
-     * @brief Parse command line args and get settings and file lists
-     * from there.
-     *
-     * @param settings the settings to store into
-     * @param argc argc from main()
-     * @param argv argv from main()
-     * @return false when errors are found in the input
-     */
-    bool parseFromArgs(Settings &settings, int argc, const char* const argv[]);
-
-private:
+    static bool reportUnmatchedSuppressions(const Settings &settings, const SuppressionList& suppressions, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger);
 
     /**
      * Wrapper around check_internal
      *   - installs optional platform dependent signal handling
      *
-     * @param cppcheck cppcheck instance
+     * @param settings the settings
+     * @param supprs the suppressions
      **/
-    int check_wrapper(CppCheck& cppcheck);
+    int check_wrapper(const Settings& settings, Suppressions& supprs);
 
     /**
      * Starts the checking.
      *
-     * @param cppcheck cppcheck instance
+     * @param settings the settings
+     * @param supprs the suppressions
      * @return EXIT_FAILURE if arguments are invalid or no input files
      *         were found.
      *         If errors are found and --error-exitcode is used,
      *         given value is returned instead of default 0.
      *         If no errors are found, 0 is returned.
      */
-    int check_internal(CppCheck& cppcheck);
-
-    /**
-     * @brief Load libraries
-     * @param settings Settings
-     * @return Returns true if successful
-     */
-    bool loadLibraries(Settings& settings);
-
-    /**
-     * Pointer to current settings; set while check() is running for reportError().
-     */
-    const Settings* mSettings;
-
-    /**
-     * Used to filter out duplicate error messages.
-     */
-    std::set<std::string> mShownErrors;
+    int check_internal(const Settings& settings, Suppressions& supprs) const;
 
     /**
      * Filename associated with size of file
      */
-    std::map<std::string, std::size_t> mFiles;
+    std::list<FileWithDetails> mFiles;
 
-    /**
-     * Report progress time
-     */
-    std::time_t mLatestProgressOutputTime;
-
-    /**
-     * Output file name for exception handler
-     */
-    static FILE* mExceptionOutput;
-
-    /**
-     * Error output
-     */
-    std::ofstream *mErrorOutput;
-
-    /**
-     * Has --errorlist been given?
-     */
-    bool mShowAllErrors;
+    std::list<FileSettings> mFileSettings;
 };
 
 #endif // CPPCHECKEXECUTOR_H
diff --git a/cli/executor.cpp b/cli/executor.cpp
index 7185db07b73..c9c0c73c56e 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-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
@@ -20,29 +20,41 @@
 
 #include "color.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "settings.h"
 #include "suppressions.h"
 
-#include <algorithm>
-#include <sstream> // IWYU pragma: keep
+#include <cassert>
+#include <sstream>
 #include <utility>
 
-Executor::Executor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
-    : mFiles(files), mSettings(settings), mErrorLogger(errorLogger)
-{}
+struct FileSettings;
 
-Executor::~Executor()
-{}
+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()));
+}
 
+// TODO: this logic is duplicated in CppCheck::reportErr()
 bool Executor::hasToLog(const ErrorMessage &msg)
 {
-    if (!mSettings.nomsg.isSuppressed(msg))
+    if (msg.severity == Severity::internal)
+        return true;
+
+    if (!mSuppressions.nomsg.isSuppressed(msg, {}))
     {
-        std::string errmsg = msg.toString(mSettings.verbose);
+        // TODO: there should be no need for verbose and default messages here
+        std::string errmsg = msg.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
+        if (errmsg.empty())
+            return false;
+
+        if (mSettings.emitDuplicates)
+            return true;
 
         std::lock_guard<std::mutex> lg(mErrorListSync);
-        if (std::find(mErrorList.cbegin(), mErrorList.cend(), errmsg) == mErrorList.cend()) {
-            mErrorList.emplace_back(std::move(errmsg));
+        if (mErrorList.emplace(std::move(errmsg)).second) {
             return true;
         }
     }
@@ -53,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 f8f010c2d83..d5a20fd4527 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-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
@@ -21,13 +21,17 @@
 
 #include <cstddef>
 #include <list>
-#include <map>
 #include <mutex>
 #include <string>
+#include <unordered_set>
 
 class Settings;
 class ErrorLogger;
 class ErrorMessage;
+struct Suppressions;
+struct FileSettings;
+class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -38,11 +42,11 @@ class ErrorMessage;
  */
 class Executor {
 public:
-    Executor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger);
-    virtual ~Executor();
+    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;
-    void operator=(const Executor &) = delete;
+    Executor& operator=(const Executor &) = delete;
 
     virtual unsigned int check() = 0;
 
@@ -64,13 +68,17 @@ class Executor {
      */
     bool hasToLog(const ErrorMessage &msg);
 
-    const std::map<std::string, std::size_t> &mFiles;
-    Settings &mSettings;
+    const std::list<FileWithDetails> &mFiles;
+    const std::list<FileSettings>& mFileSettings;
+    const Settings &mSettings;
+    Suppressions &mSuppressions;
     ErrorLogger &mErrorLogger;
+    TimerResults *mTimerResults;
 
 private:
     std::mutex mErrorListSync;
-    std::list<std::string> mErrorList;
+    // TODO: store hashes instead of the full messages
+    std::unordered_set<std::string> mErrorList;
 };
 
 /// @}
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index c83b3756967..24acc186818 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-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
@@ -16,17 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have DT_DIR and DT_UNKNOWN
+#endif
+
 #include "filelister.h"
 
-#include "config.h"
+#include "filesettings.h"
 #include "path.h"
 #include "pathmatch.h"
+#include "standards.h"
 #include "utils.h"
 
-#include <cstddef>
 #include <cstring>
-// fix NAME_MAX not found on macOS GCC8.1
-#include <climits>
+#include <iostream>
+#include <iterator>
+#include <memory>
 
 #ifdef _WIN32
 
@@ -41,29 +46,7 @@
 // When compiling Unicode targets WinAPI automatically uses *W Unicode versions
 // of called functions. Thus, we explicitly call *A versions of the functions.
 
-static BOOL myIsDirectory(const std::string& path)
-{
-// See http://msdn.microsoft.com/en-us/library/bb773621(VS.85).aspx
-    return PathIsDirectoryA(path.c_str());
-}
-
-static HANDLE myFindFirstFile(const std::string& path, LPWIN32_FIND_DATAA findData)
-{
-    HANDLE hFind = FindFirstFileA(path.c_str(), findData);
-    return hFind;
-}
-
-static BOOL myFileExists(const std::string& path)
-{
-    return PathFileExistsA(path.c_str()) && !PathIsDirectoryA(path.c_str());
-}
-
-std::string FileLister::recursiveAddFiles(std::map<std::string, std::size_t> &files, const std::string &path, const std::set<std::string> &extra, const PathMatch& ignored)
-{
-    return addFiles(files, path, extra, true, ignored);
-}
-
-std::string FileLister::addFiles(std::map<std::string, std::size_t> &files, const std::string &path, const std::set<std::string> &extra, bool recursive, const PathMatch& ignored)
+static std::string addFiles2(std::list<FileWithDetails>&files, const std::string &path, const std::set<std::string> &extra, bool recursive, const PathMatch& ignored, bool debug = false)
 {
     const std::string cleanedPath = Path::toNativeSeparators(path);
 
@@ -75,7 +58,7 @@ std::string FileLister::addFiles(std::map<std::string, std::size_t> &files, cons
     std::string searchPattern = cleanedPath;
 
     // The user wants to check all files in a dir
-    const bool checkAllFilesInDir = (myIsDirectory(cleanedPath) != FALSE);
+    const bool checkAllFilesInDir = Path::isDirectory(cleanedPath);
 
     if (checkAllFilesInDir) {
         const char c = cleanedPath.back();
@@ -100,59 +83,103 @@ std::string FileLister::addFiles(std::map<std::string, std::size_t> &files, cons
     }
 
     WIN32_FIND_DATAA ffd;
-    HANDLE hFind = myFindFirstFile(searchPattern, &ffd);
-    if (INVALID_HANDLE_VALUE == hFind)
-        return "";
+    HANDLE hFind = FindFirstFileA(searchPattern.c_str(), &ffd);
+    if (INVALID_HANDLE_VALUE == hFind) {
+        const DWORD err = GetLastError();
+        if (err == ERROR_FILE_NOT_FOUND || // the pattern did not match anything
+            err == ERROR_PATH_NOT_FOUND)   // the given search path does not exist
+        {
+            return "";
+        }
+        return "finding files failed. Search pattern: '" + searchPattern + "'. (error: " + std::to_string(err) + ")";
+    }
+    std::unique_ptr<void, decltype(&FindClose)> hFind_deleter(hFind, FindClose);
 
     do {
-        if (ffd.cFileName[0] == '.' || ffd.cFileName[0] == '\0')
-            continue;
-
-        const char* ansiFfd = ffd.cFileName;
-        if (std::strchr(ansiFfd,'?')) {
-            ansiFfd = ffd.cAlternateFileName;
-        }
+        if (ffd.cFileName[0] != '.' && ffd.cFileName[0] != '\0')
+        {
+            const char* ansiFfd = ffd.cFileName;
+            if (std::strchr(ansiFfd,'?')) {
+                ansiFfd = ffd.cAlternateFileName;
+            }
 
-        const std::string fname(basedir + ansiFfd);
+            const std::string fname(basedir + ansiFfd);
 
-        if ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-            // File
-            if ((!checkAllFilesInDir || Path::acceptFile(fname, extra)) && !ignored.match(fname)) {
-                const std::string nativename = Path::fromNativeSeparators(fname);
+            if ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+                // File
+                Standards::Language lang = Standards::Language::None;
+                if ((!checkAllFilesInDir || Path::acceptFile(fname, extra, &lang))) {
+                    if (!ignored.match(fname)) {
+                        std::string nativename = Path::fromNativeSeparators(fname);
 
-                // Limitation: file sizes are assumed to fit in a 'size_t'
+                        // Limitation: file sizes are assumed to fit in a 'size_t'
 #ifdef _WIN64
-                files[nativename] = (static_cast<std::size_t>(ffd.nFileSizeHigh) << 32) | ffd.nFileSizeLow;
+                        const std::size_t filesize = (static_cast<std::size_t>(ffd.nFileSizeHigh) << 32) | ffd.nFileSizeLow;
 #else
-                files[nativename] = ffd.nFileSizeLow;
+                        const std::size_t filesize = ffd.nFileSizeLow;
+
 #endif
-            }
-        } else {
-            // Directory
-            if (recursive) {
-                if (!ignored.match(fname)) {
-                    std::string err = FileLister::recursiveAddFiles(files, fname, extra, ignored);
-                    if (!err.empty())
-                        return err;
+                        files.emplace_back(std::move(nativename), lang, filesize);
+                    }
+                    else if (debug)
+                    {
+                        std::cout << "ignored path: " << fname << std::endl;
+                    }
+                }
+            } else {
+                // Directory
+                if (recursive) {
+                    if (!ignored.match(fname, PathMatch::Filemode::directory)) {
+                        std::list<FileWithDetails> filesSorted;
+
+                        std::string err = addFiles2(filesSorted, fname, extra, recursive, ignored);
+                        if (!err.empty())
+                            return err;
+
+                        // files inside directories need to be sorted as the filesystem doesn't provide a stable order
+                        filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
+                            return a.path() < b.path();
+                        });
+
+                        files.insert(files.end(), std::make_move_iterator(filesSorted.begin()), std::make_move_iterator(filesSorted.end()));
+                    }
+                    else if (debug)
+                    {
+                        std::cout << "ignored path: " << fname << std::endl;
+                    }
                 }
             }
         }
-    } while (FindNextFileA(hFind, &ffd) != FALSE);
 
-    FindClose(hFind);
+        if (!FindNextFileA(hFind, &ffd)) {
+            const DWORD err = GetLastError();
+            // no more files matched
+            if (err != ERROR_NO_MORE_FILES)
+                return "failed to get next file (error: " + std::to_string(err) + ")";
+            break;
+        }
+    } while (true);
+
     return "";
 }
 
-bool FileLister::isDirectory(const std::string &path)
+std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::string &path, const std::set<std::string> &extra, bool recursive, const PathMatch& ignored, bool debug)
 {
-    return (myIsDirectory(path) != FALSE);
-}
+    if (path.empty())
+        return "no path specified";
 
-bool FileLister::fileExists(const std::string &path)
-{
-    return (myFileExists(path) != FALSE);
-}
+    std::list<FileWithDetails> filesSorted;
 
+    std::string err = addFiles2(filesSorted, path, extra, recursive, ignored, debug);
+
+    // files need to be sorted as the filesystems dosn't provide a stable order
+    filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
+        return a.path() < b.path();
+    });
+    files.insert(files.end(), std::make_move_iterator(filesSorted.begin()), std::make_move_iterator(filesSorted.end()));
+
+    return err;
+}
 
 #else
 
@@ -160,127 +187,124 @@ bool FileLister::fileExists(const std::string &path)
 ////// This code is POSIX-style systems ///////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__CYGWIN__)
-#undef __STRICT_ANSI__
-#endif
-
 #include <dirent.h>
 #include <sys/stat.h>
 #include <cerrno>
 
-#ifndef NAME_MAX
-#ifdef MAXNAMLEN
-#define NAME_MAX MAXNAMLEN
-#endif
-#endif
-
+struct closedir_deleter {
+    void operator()(DIR* d) const {
+        closedir(d);
+    }
+};
 
-static std::string addFiles2(std::map<std::string, std::size_t> &files,
+static std::string addFiles2(std::list<FileWithDetails> &files,
                              const std::string &path,
                              const std::set<std::string> &extra,
                              bool recursive,
-                             const PathMatch& ignored
-                             )
+                             const PathMatch& ignored,
+                             bool debug)
 {
     if (ignored.match(path))
+    {
+        if (debug)
+            std::cout << "ignored path: " << path << std::endl;
         return "";
+    }
 
     struct stat file_stat;
-    if (stat(path.c_str(), &file_stat) != -1) {
-        if ((file_stat.st_mode & S_IFMT) == S_IFDIR) {
-            DIR * dir = opendir(path.c_str());
-            if (!dir)
-                return "";
-
-            dirent * dir_result;
-            // make sure we reserve enough space for the readdir_r() buffer;
-            // according to POSIX:
-            //   The storage pointed to by entry shall be large enough for a
-            //   dirent with an array of char d_name members containing at
-            //   least {NAME_MAX}+1 elements.
-            // on some platforms, d_name is not a static sized-array but
-            // a pointer to space usually reserved right after the dirent
-            // struct; the union here allows to reserve the space and to
-            // provide a pointer to the right type that can be passed where
-            // needed without casts
-            union {
-                dirent entry;
-                char buf[sizeof(*dir_result) + (sizeof(dir_result->d_name) > 1 ? 0 : NAME_MAX + 1)];
-            } dir_result_buffer;
-            // TODO: suppress instead?
-            (void)dir_result_buffer.buf; // do not trigger cppcheck itself on the "unused buf"
-            std::string new_path;
-            new_path.reserve(path.length() + 1 + sizeof(dir_result->d_name));// prealloc some memory to avoid constant new/deletes in loop
-            new_path += path;
-            new_path += '/';
-
-            while ((SUPPRESS_DEPRECATED_WARNING(readdir_r(dir, &dir_result_buffer.entry, &dir_result)) == 0) && (dir_result != nullptr)) {
-                if ((std::strcmp(dir_result->d_name, ".") == 0) ||
-                    (std::strcmp(dir_result->d_name, "..") == 0))
-                    continue;
-
-                new_path.erase(path.length() + 1);
-                new_path += dir_result->d_name;
-
-#if defined(_DIRENT_HAVE_D_TYPE) || defined(_BSD_SOURCE)
-                const bool path_is_directory = (dir_result->d_type == DT_DIR || (dir_result->d_type == DT_UNKNOWN && FileLister::isDirectory(new_path)));
+    if (stat(path.c_str(), &file_stat) == -1)
+        return ""; // TODO: return error?
+    if ((file_stat.st_mode & S_IFMT) != S_IFDIR)
+    {
+        files.emplace_back(path, Standards::Language::None, file_stat.st_size);
+        return "";
+    }
+
+    // process directory entry
+
+    DIR * dir = opendir(path.c_str());
+    if (!dir) {
+        const int err = errno;
+        return "could not open directory '" + path + "' (errno: " + std::to_string(err) + ")";
+    }
+    std::unique_ptr<DIR, closedir_deleter> dir_deleter(dir);
+
+    std::string new_path = path;
+    new_path += '/';
+
+    while (const dirent* dir_result = readdir(dir)) {
+        if ((std::strcmp(dir_result->d_name, ".") == 0) ||
+            (std::strcmp(dir_result->d_name, "..") == 0))
+            continue;
+
+        new_path.erase(path.length() + 1);
+        new_path += dir_result->d_name;
+
+#if defined(_DIRENT_HAVE_D_TYPE)
+        const bool path_is_directory = (dir_result->d_type == DT_DIR || (dir_result->d_type == DT_UNKNOWN && Path::isDirectory(new_path)));
 #else
-                const bool path_is_directory = FileLister::isDirectory(new_path);
+        const bool path_is_directory = Path::isDirectory(new_path);
 #endif
-                if (path_is_directory) {
-                    if (recursive && !ignored.match(new_path)) {
-                        std::string err = addFiles2(files, new_path, extra, recursive, ignored);
-                        if (!err.empty()) {
-                            closedir(dir);
-                            return err;
-                        }
+        if (path_is_directory) {
+            if (recursive) {
+                if (!ignored.match(new_path, PathMatch::Filemode::directory)) {
+                    std::string err = addFiles2(files, new_path, extra, recursive, ignored, debug);
+                    if (!err.empty()) {
+                        return err;
                     }
-                } else {
-                    if (Path::acceptFile(new_path, extra) && !ignored.match(new_path)) {
-                        if (stat(new_path.c_str(), &file_stat) != -1)
-                            files[new_path] = file_stat.st_size;
-                        else {
-                            closedir(dir);
-                            return "Can't stat " + new_path + " errno: " + std::to_string(errno);
-                        }
+                }
+                else if (debug)
+                {
+                    std::cout << "ignored path: " << new_path << std::endl;
+                }
+            }
+        } else {
+            Standards::Language lang = Standards::Language::None;
+            if (Path::acceptFile(new_path, extra, &lang)) {
+                if (!ignored.match(new_path))
+                {
+                    if (stat(new_path.c_str(), &file_stat) == -1) {
+                        const int err = errno;
+                        return "could not stat file '" + new_path + "' (errno: " + std::to_string(err) + ")";
                     }
+                    files.emplace_back(new_path, lang, file_stat.st_size);
+                }
+                else if (debug)
+                {
+                    std::cout << "ignored path: " << new_path << std::endl;
                 }
             }
-            closedir(dir);
-        } else
-            files[path] = file_stat.st_size;
+        }
     }
+
     return "";
 }
 
-std::string FileLister::recursiveAddFiles(std::map<std::string, std::size_t> &files, const std::string &path, const std::set<std::string> &extra, const PathMatch& ignored)
+std::string FileLister::addFiles(std::list<FileWithDetails> &files, const std::string &path, const std::set<std::string> &extra, bool recursive, const PathMatch& ignored, bool debug)
 {
-    return addFiles(files, path, extra, true, ignored);
-}
+    if (path.empty())
+        return "no path specified";
 
-std::string FileLister::addFiles(std::map<std::string, std::size_t> &files, const std::string &path, const std::set<std::string> &extra, bool recursive, const PathMatch& ignored)
-{
-    if (!path.empty()) {
-        std::string corrected_path = path;
-        if (endsWith(corrected_path, '/'))
-            corrected_path.erase(corrected_path.end() - 1);
+    std::string corrected_path = path;
+    if (endsWith(corrected_path, '/'))
+        corrected_path.erase(corrected_path.end() - 1);
 
-        return addFiles2(files, corrected_path, extra, recursive, ignored);
-    }
+    std::list<FileWithDetails> filesSorted;
 
-    return "";
-}
+    std::string err = addFiles2(filesSorted, corrected_path, extra, recursive, ignored, debug);
 
-bool FileLister::isDirectory(const std::string &path)
-{
-    struct stat file_stat;
-    return (stat(path.c_str(), &file_stat) != -1 && (file_stat.st_mode & S_IFMT) == S_IFDIR);
-}
+    // files need to be sorted as the filesystems dosn't provide a stable order
+    filesSorted.sort([](const FileWithDetails& a, const FileWithDetails& b) {
+        return a.path() < b.path();
+    });
+    files.insert(files.end(), std::make_move_iterator(filesSorted.begin()), std::make_move_iterator(filesSorted.end()));
 
-bool FileLister::fileExists(const std::string &path)
-{
-    struct stat file_stat;
-    return (stat(path.c_str(), &file_stat) != -1 && (file_stat.st_mode & S_IFMT) == S_IFREG);
+    return err;
 }
 
 #endif
+
+std::string FileLister::recursiveAddFiles(std::list<FileWithDetails> &files, const std::string &path, const std::set<std::string> &extra, const PathMatch& ignored, bool debug)
+{
+    return addFiles(files, path, extra, true, ignored, debug);
+}
diff --git a/cli/filelister.h b/cli/filelister.h
index b4fbc94d82b..12b8ddeed7e 100644
--- a/cli/filelister.h
+++ b/cli/filelister.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 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
@@ -19,12 +19,12 @@
 #ifndef filelisterH
 #define filelisterH
 
-#include <cstddef>
-#include <map>
+#include <list>
 #include <set>
 #include <string>
 
 class PathMatch;
+class FileWithDetails;
 
 /// @addtogroup CLI
 /// @{
@@ -37,54 +37,29 @@ class FileLister {
      * Add source files from given directory and all subdirectries to the
      * given map. Only files with accepted extensions
      * (*.c;*.cpp;*.cxx;*.c++;*.cc;*.txx) are added.
-     * @param files output map that associates the size of each file with its name
-     * @param path root path
-     * @param ignored ignored paths
-     * @return On success, an empty string is returned. On error, a error message is returned.
-     */
-    static std::string recursiveAddFiles(std::map<std::string, std::size_t> &files, const std::string &path, const PathMatch& ignored) {
-        const std::set<std::string> extra;
-        return recursiveAddFiles(files, path, extra, ignored);
-    }
-
-    /**
-     * @brief Recursively add source files to a map.
-     * Add source files from given directory and all subdirectries to the
-     * given map. Only files with accepted extensions
-     * (*.c;*.cpp;*.cxx;*.c++;*.cc;*.txx) are added.
-     * @param files output map that associates the size of each file with its name
+     * @param files output list that associates the size of each file with its name
      * @param path root path
      * @param extra Extra file extensions
      * @param ignored ignored paths
+     * @param debug log if path was ignored
      * @return On success, an empty string is returned. On error, a error message is returned.
      */
-    static std::string recursiveAddFiles(std::map<std::string, std::size_t> &files, const std::string &path, const std::set<std::string> &extra, const PathMatch& ignored);
+    static std::string recursiveAddFiles(std::list<FileWithDetails> &files, const std::string &path, const std::set<std::string> &extra, const PathMatch& ignored, bool debug = false);
 
     /**
      * @brief (Recursively) add source files to a map.
      * Add source files from given directory and all subdirectries to the
      * given map. Only files with accepted extensions
      * (*.c;*.cpp;*.cxx;*.c++;*.cc;*.txx) are added.
-     * @param files output map that associates the size of each file with its name
+     * @param files output list that associates the size of each file with its name
      * @param path root path
      * @param extra Extra file extensions
      * @param recursive Enable recursion
      * @param ignored ignored paths
+     * @param debug log when a path was ignored
      * @return On success, an empty string is returned. On error, a error message is returned.
      */
-    static std::string addFiles(std::map<std::string, std::size_t> &files, const std::string &path, const std::set<std::string> &extra, bool recursive, const PathMatch& ignored);
-
-    /**
-     * @brief Is given path a directory?
-     * @return returns true if the path is a directory
-     */
-    static bool isDirectory(const std::string &path);
-
-    /**
-     * @brief Check if the given path is a file and if it exists?
-     * @return true if path points to file and the file exists.
-     */
-    static bool fileExists(const std::string &path);
+    static std::string addFiles(std::list<FileWithDetails> &files, const std::string &path, const std::set<std::string> &extra, bool recursive, const PathMatch& ignored, bool debug = false);
 };
 
 /// @}
diff --git a/cli/main.cpp b/cli/main.cpp
index c9c44d88fcb..7c3a865a302 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-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
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 2.11.99
+ * @version 2.18.99
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
@@ -65,7 +65,6 @@
 #include <cstdlib>
 #include <exception>
 #include <iostream>
-#include <string>
 #endif
 
 /**
@@ -77,11 +76,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*
diff --git a/cli/precompiled.h b/cli/precompiled.h
index c77546f480e..3795bd206cf 100644
--- a/cli/precompiled.h
+++ b/cli/precompiled.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index e6aca40ee3a..963818ecfb2 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-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
@@ -16,31 +16,38 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have getloadavg()
+#endif
+
 #include "processexecutor.h"
 
-#if !defined(WIN32) && !defined(__MINGW32__)
+#ifdef HAS_THREADING_MODEL_FORK
 
-#include "config.h"
 #include "cppcheck.h"
-#include "cppcheckexecutor.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "importproject.h"
+#include "filesettings.h"
 #include "settings.h"
 #include "suppressions.h"
+#include "timer.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <numeric>
 #include <cassert>
 #include <cerrno>
 #include <csignal>
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
-#include <functional>
 #include <iostream>
 #include <list>
-#include <sstream> // IWYU pragma: keep
+#include <map>
+#include <sstream>
 #include <sys/select.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <utility>
@@ -55,71 +62,101 @@
 #include <sys/prctl.h>
 #endif
 
-enum class Color;
+enum class Color : std::uint8_t;
 
 // NOLINTNEXTLINE(misc-unused-using-decls) - required for FD_ZERO
 using std::memset;
 
 
-ProcessExecutor::ProcessExecutor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
-    : Executor(files, settings, 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);
 }
 
-ProcessExecutor::~ProcessExecutor()
-{}
+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',REPORT_METRIC='6'};
 
-class PipeWriter : public ErrorLogger {
-public:
-    enum PipeSignal {REPORT_OUT='1',REPORT_ERROR='2', CHILD_END='5'};
+        explicit PipeWriter(int pipe) : mWpipe(pipe) {}
 
-    explicit PipeWriter(int pipe) : mWpipe(pipe) {}
+        void reportOut(const std::string &outmsg, Color c) override {
+            writeToPipe(REPORT_OUT, static_cast<char>(c) + outmsg);
+        }
 
-    void reportOut(const std::string &outmsg, Color c) override {
-        writeToPipe(REPORT_OUT, static_cast<char>(c) + outmsg);
-    }
+        void reportErr(const ErrorMessage &msg) override {
+            writeToPipe(REPORT_ERROR, msg.serialize());
+        }
 
-    void reportErr(const ErrorMessage &msg) override {
-        writeToPipe(REPORT_ERROR, msg.serialize());
-    }
+        void writeSuppr(const SuppressionList &supprs) const {
+            for (const auto& suppr : supprs.getSuppressions())
+            {
+                if (suppr.isInline)
+                    writeToPipe(REPORT_SUPPR_INLINE, suppressionToString(suppr));
+                else if (suppr.checked)
+                    writeToPipe(REPORT_SUPPR, suppressionToString(suppr));
+            }
+        }
 
-    void writeEnd(const std::string& str) const {
-        writeToPipe(CHILD_END, str);
-    }
+        void reportMetric(const std::string &metric) override {
+            writeToPipe(REPORT_METRIC, metric);
+        }
 
-private:
-    // TODO: how to log file name in error?
-    void writeToPipe(PipeSignal type, const std::string &data) const
-    {
-        unsigned int len = static_cast<unsigned int>(data.length() + 1);
-        char *out = new char[len + 1 + sizeof(len)];
-        out[0] = static_cast<char>(type);
-        std::memcpy(&(out[1]), &len, sizeof(len));
-        std::memcpy(&(out[1+sizeof(len)]), data.c_str(), len);
-
-        std::size_t bytes_to_write = len + 1 + sizeof(len);
-        ssize_t bytes_written = write(mWpipe, out, len + 1 + sizeof(len));
-        if (bytes_written <= 0) {
-            const int err = errno;
-            delete[] out;
-            out = nullptr;
-            std::cerr << "#### ThreadExecutor::writeToPipe() error for type " << type << ": " << std::strerror(err) << std::endl;
-            std::exit(EXIT_FAILURE);
+        void writeEnd(const std::string& str) const {
+            writeToPipe(CHILD_END, str);
         }
-        // TODO: write until everything is written
-        if (bytes_written != bytes_to_write) {
-            delete[] out;
-            out = nullptr;
-            std::cerr << "#### ThreadExecutor::writeToPipe() error for type " << type << ": insufficient data written (expected: " << bytes_to_write << " / got: " << bytes_written << ")" << std::endl;
-            std::exit(EXIT_FAILURE);
+
+    private:
+        static std::string suppressionToString(const SuppressionList::Suppression &suppr)
+        {
+            std::string suppr_str = suppr.toString();
+            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;
         }
 
-        delete[] out;
-    }
+        // TODO: how to log file name in error?
+        void writeToPipeInternal(PipeSignal type, const void* data, std::size_t to_write) const
+        {
+            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 " << 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 " << static_cast<unsigned char>(type) << ": insufficient data written (expected: " << to_write << " / got: " << bytes_written << ")" << std::endl;
+                std::exit(EXIT_FAILURE);
+            }
+        }
 
-    const int mWpipe;
-};
+        void writeToPipe(PipeSignal type, const std::string &data) const
+        {
+            {
+                const auto t = static_cast<char>(type);
+                writeToPipeInternal(type, &t, 1);
+            }
+
+            const auto len = static_cast<unsigned int>(data.length());
+            {
+                static constexpr std::size_t l_size = sizeof(unsigned int);
+                writeToPipeInternal(type, &len, l_size);
+            }
+
+            if (len > 0) // TODO: unexpected - write a warning?
+                writeToPipeInternal(type, data.c_str(), len);
+        }
+
+        const int mWpipe;
+    };
+}
 
 bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::string& filename)
 {
@@ -144,7 +181,12 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         std::exit(EXIT_FAILURE);
     }
 
-    if (type != PipeWriter::REPORT_OUT && type != PipeWriter::REPORT_ERROR && type != PipeWriter::CHILD_END) {
+    if (type != PipeWriter::REPORT_OUT &&
+        type != PipeWriter::REPORT_ERROR &&
+        type != PipeWriter::REPORT_SUPPR_INLINE &&
+        type != PipeWriter::REPORT_SUPPR &&
+        type != PipeWriter::CHILD_END &&
+        type != PipeWriter::REPORT_METRIC) {
         std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") invalid type " << int(type) << std::endl;
         std::exit(EXIT_FAILURE);
     }
@@ -162,28 +204,28 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         std::exit(EXIT_FAILURE);
     }
 
-    // Don't rely on incoming data being null-terminated.
-    // Allocate +1 element and null-terminate the buffer.
-    char *buf = new char[len + 1];
-    char *data_start = buf;
-    bytes_to_read = len;
-    do {
-        bytes_read = read(rpipe, data_start, bytes_to_read);
-        if (bytes_read <= 0) {
-            const int err = errno;
-            std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") error (buf) for type" << int(type) << ": " << std::strerror(err) << std::endl;
-            std::exit(EXIT_FAILURE);
-        }
-        bytes_to_read -= bytes_read;
-        data_start += bytes_read;
-    } while (bytes_to_read != 0);
-    buf[len] = 0;
+    std::string buf(len, '\0');
+    if (len > 0) { // TODO: unexpected - write a warning?
+        char *data_start = &buf[0];
+        bytes_to_read = len;
+        do {
+            bytes_read = read(rpipe, data_start, bytes_to_read);
+            if (bytes_read <= 0) {
+                const int err = errno;
+                std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") error (buf) for type" << int(type) << ": " << std::strerror(err) << std::endl;
+                std::exit(EXIT_FAILURE);
+            }
+            bytes_to_read -= bytes_read;
+            data_start += bytes_read;
+        } while (bytes_to_read != 0);
+    }
 
     bool res = true;
     if (type == PipeWriter::REPORT_OUT) {
         // the first character is the color
-        const Color c = static_cast<Color>(buf[0]);
-        mErrorLogger.reportOut(buf + 1, c);
+        const auto c = static_cast<Color>(buf[0]);
+        // TODO: avoid string copy
+        mErrorLogger.reportOut(buf.substr(1), c);
     } else if (type == PipeWriter::REPORT_ERROR) {
         ErrorMessage msg;
         try {
@@ -195,18 +237,46 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
 
         if (hasToLog(msg))
             mErrorLogger.reportErr(msg);
+    } else if (type == PipeWriter::REPORT_SUPPR_INLINE || type == PipeWriter::REPORT_SUPPR) {
+        if (!buf.empty()) {
+            // TODO: avoid string splitting
+            auto parts = splitString(buf, ';');
+            if (parts.size() < 4)
+            {
+                // TODO: make this non-fatal
+                std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - insufficient data" << std::endl;
+                std::exit(EXIT_FAILURE);
+            }
+            auto suppr = SuppressionList::parseLine(parts[0]);
+            suppr.isInline = (type == PipeWriter::REPORT_SUPPR_INLINE);
+            suppr.checked = parts[1] == "1";
+            suppr.matched = parts[2] == "1";
+            suppr.extraComment = parts[3];
+            for (std::size_t i = 4; 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
+                mSuppressions.nomsg.updateSuppressionState(suppr); // TODO: check result
+                // TODO: make this non-fatal
+                //std::cerr << "#### ThreadExecutor::handleRead(" << filename << ") adding of inline suppression failed - " << err << std::endl;
+                //std::exit(EXIT_FAILURE);
+            }
+        }
     } else if (type == PipeWriter::CHILD_END) {
         result += std::stoi(buf);
         res = false;
+    } else if (type == PipeWriter::REPORT_METRIC) {
+        mErrorLogger.reportMetric(buf);
     }
 
-    delete[] buf;
     return res;
 }
 
 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
@@ -231,20 +301,20 @@ unsigned int ProcessExecutor::check()
     unsigned int fileCount = 0;
     unsigned int result = 0;
 
-    const std::size_t totalfilesize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const std::pair<std::string, std::size_t>& p) {
-        return v + p.second;
+    const std::size_t totalfilesize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& p) {
+        return v + p.size();
     });
 
     std::list<int> rpipes;
     std::map<pid_t, std::string> childFile;
     std::map<int, std::string> pipeFile;
     std::size_t processedsize = 0;
-    std::map<std::string, std::size_t>::const_iterator iFile = mFiles.cbegin();
-    std::list<ImportProject::FileSettings>::const_iterator iFileSettings = mSettings.project.fileSettings.cbegin();
+    auto iFile = mFiles.cbegin();
+    auto iFileSettings = mFileSettings.cbegin();
     for (;;) {
         // Start a new child
         const size_t nchildren = childFile.size();
-        if ((iFile != mFiles.cend() || iFileSettings != mSettings.project.fileSettings.cend()) && nchildren < mSettings.jobs && checkLoadAverage(nchildren)) {
+        if ((iFile != mFiles.cend() || iFileSettings != mFileSettings.cend()) && nchildren < mSettings.jobs && checkLoadAverage(nchildren)) {
             int pipes[2];
             if (pipe(pipes) == -1) {
                 std::cerr << "#### ThreadExecutor::check, pipe() failed: "<< std::strerror(errno) << std::endl;
@@ -274,67 +344,70 @@ unsigned int ProcessExecutor::check()
                 close(pipes[0]);
 
                 PipeWriter pipewriter(pipes[1]);
-                CppCheck fileChecker(pipewriter, false, CppCheckExecutor::executeCommand);
-                fileChecker.settings() = mSettings;
+                CppCheck fileChecker(mSettings, mSuppressions, pipewriter, mTimerResults, false, mExecuteCommand);
                 unsigned int resultOfCheck = 0;
 
-                if (iFileSettings != mSettings.project.fileSettings.end()) {
+                if (iFileSettings != mFileSettings.end()) {
                     resultOfCheck = fileChecker.check(*iFileSettings);
                 } else {
                     // Read file from a file
-                    resultOfCheck = fileChecker.check(iFile->first);
+                    resultOfCheck = fileChecker.check(*iFile);
                 }
 
+                pipewriter.writeSuppr(mSuppressions.nomsg);
+
                 pipewriter.writeEnd(std::to_string(resultOfCheck));
                 std::exit(EXIT_SUCCESS);
             }
 
             close(pipes[1]);
             rpipes.push_back(pipes[0]);
-            if (iFileSettings != mSettings.project.fileSettings.end()) {
-                childFile[pid] = iFileSettings->filename + ' ' + iFileSettings->cfg;
-                pipeFile[pipes[0]] = iFileSettings->filename + ' ' + iFileSettings->cfg;
+            if (iFileSettings != mFileSettings.end()) {
+                childFile[pid] = iFileSettings->filename() + ' ' + iFileSettings->cfg;
+                pipeFile[pipes[0]] = iFileSettings->filename() + ' ' + iFileSettings->cfg;
                 ++iFileSettings;
             } else {
-                childFile[pid] = iFile->first;
-                pipeFile[pipes[0]] = iFile->first;
+                childFile[pid] = iFile->path();
+                pipeFile[pipes[0]] = iFile->path();
                 ++iFile;
             }
         }
         if (!rpipes.empty()) {
             fd_set rfds;
             FD_ZERO(&rfds);
-            for (std::list<int>::const_iterator rp = rpipes.cbegin(); rp != rpipes.cend(); ++rp)
+            for (auto rp = rpipes.cbegin(); rp != rpipes.cend(); ++rp)
                 FD_SET(*rp, &rfds);
-            struct timeval tv; // for every second polling of load average condition
+            timeval tv; // for every second polling of load average condition
             tv.tv_sec = 1;
             tv.tv_usec = 0;
             const int r = select(*std::max_element(rpipes.cbegin(), rpipes.cend()) + 1, &rfds, nullptr, nullptr, &tv);
 
             if (r > 0) {
-                std::list<int>::iterator rp = rpipes.begin();
-                while (rp != rpipes.end()) {
+                auto rp = rpipes.cbegin();
+                while (rp != rpipes.cend()) {
                     if (FD_ISSET(*rp, &rfds)) {
                         std::string name;
-                        const std::map<int, std::string>::iterator p = pipeFile.find(*rp);
-                        if (p != pipeFile.end()) {
+                        const auto p = utils::as_const(pipeFile).find(*rp);
+                        if (p != pipeFile.cend()) {
                             name = p->second;
                         }
                         const bool readRes = handleRead(*rp, result, name);
                         if (!readRes) {
                             std::size_t size = 0;
-                            if (p != pipeFile.end()) {
+                            if (p != pipeFile.cend()) {
                                 pipeFile.erase(p);
-                                const std::map<std::string, std::size_t>::const_iterator fs = mFiles.find(name);
+                                const auto fs = std::find_if(mFiles.cbegin(), mFiles.cend(), [&name](const FileWithDetails& entry) {
+                                    return entry.path() == name;
+                                });
                                 if (fs != mFiles.end()) {
-                                    size = fs->second;
+                                    size = fs->size();
                                 }
                             }
 
                             fileCount++;
                             processedsize += size;
                             if (!mSettings.quiet)
-                                Executor::reportStatus(fileCount, mFiles.size() + mSettings.project.fileSettings.size(), processedsize, totalfilesize);
+                                Executor::reportStatus(fileCount, mFiles.size() + mFileSettings.size(), processedsize, totalfilesize);
 
                             close(*rp);
                             rp = rpipes.erase(rp);
@@ -350,8 +423,8 @@ unsigned int ProcessExecutor::check()
             const pid_t child = waitpid(0, &stat, WNOHANG);
             if (child > 0) {
                 std::string childname;
-                const std::map<pid_t, std::string>::iterator c = childFile.find(child);
-                if (c != childFile.end()) {
+                const auto c = utils::as_const(childFile).find(child);
+                if (c != childFile.cend()) {
                     childname = c->second;
                     childFile.erase(c);
                 }
@@ -370,12 +443,15 @@ unsigned int ProcessExecutor::check()
                 }
             }
         }
-        if (iFile == mFiles.end() && iFileSettings == mSettings.project.fileSettings.end() && rpipes.empty() && childFile.empty()) {
+        if (iFile == mFiles.end() && iFileSettings == mFileSettings.end() && rpipes.empty() && childFile.empty()) {
             // All done
             break;
         }
     }
 
+    // TODO: wee need to get the timing information from the subprocess
+    if (mTimerResults && (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY))
+        mTimerResults->showResults(mSettings.showtime);
 
     return result;
 }
@@ -384,15 +460,15 @@ void ProcessExecutor::reportInternalChildErr(const std::string &childname, const
 {
     std::list<ErrorMessage::FileLocation> locations;
     locations.emplace_back(childname, 0, 0);
-    const ErrorMessage errmsg(locations,
-                              emptyString,
+    const ErrorMessage errmsg(std::move(locations),
+                              "",
                               Severity::error,
                               "Internal error: " + msg,
                               "cppcheckError",
                               Certainty::normal);
 
-    if (!mSettings.nomsg.isSuppressed(errmsg))
+    if (!mSuppressions.nomsg.isSuppressed(errmsg, {}))
         mErrorLogger.reportErr(errmsg);
 }
 
-#endif // !WIN32
+#endif // HAS_THREADING_MODEL_FORK
diff --git a/cli/processexecutor.h b/cli/processexecutor.h
index c472fe89500..f813b1893e5 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-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
@@ -19,14 +19,23 @@
 #ifndef PROCESSEXECUTOR_H
 #define PROCESSEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_FORK
+
+#include "cppcheck.h"
 #include "executor.h"
 
 #include <cstddef>
-#include <map>
+#include <list>
 #include <string>
 
 class Settings;
 class ErrorLogger;
+struct Suppressions;
+struct FileSettings;
+class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -37,10 +46,9 @@ class ErrorLogger;
  */
 class ProcessExecutor : public Executor {
 public:
-    ProcessExecutor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger);
+    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() override;
-    void operator=(const ProcessExecutor &) = delete;
+    ProcessExecutor& operator=(const ProcessExecutor &) = delete;
 
     unsigned int check() override;
 
@@ -63,8 +71,12 @@ class ProcessExecutor : public Executor {
      * @param msg The error message
      */
     void reportInternalChildErr(const std::string &childname, const std::string &msg);
+
+    CppCheck::ExecuteCmdFn mExecuteCommand;
 };
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_FORK
+
 #endif // PROCESSEXECUTOR_H
diff --git a/cli/cppcheckexecutorseh.cpp b/cli/sehwrapper.cpp
similarity index 91%
rename from cli/cppcheckexecutorseh.cpp
rename to cli/sehwrapper.cpp
index 7f571bd53a6..c14278d99fd 100644
--- a/cli/cppcheckexecutorseh.cpp
+++ b/cli/sehwrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 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
@@ -16,17 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cppcheckexecutorseh.h"
+#include "sehwrapper.h"
 
 #ifdef USE_WINDOWS_SEH
 
-#include "cppcheckexecutor.h"
 #include "utils.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <tchar.h>
 
+static FILE* sehOutput = stdout;
+
+void set_seh_output(FILE* f)
+{
+    sehOutput = f;
+}
+
 namespace {
     const ULONG maxnamelength = 512;
     struct IMAGEHLP_SYMBOL64_EXT : public IMAGEHLP_SYMBOL64 {
@@ -78,20 +84,23 @@ namespace {
             );
         CONTEXT context = *(ex->ContextRecord);
         STACKFRAME64 stack= {0};
-#ifdef _M_IX86
+        stack.AddrPC.Mode    = AddrModeFlat;
+        stack.AddrStack.Mode = AddrModeFlat;
+        stack.AddrFrame.Mode = AddrModeFlat;
+#if defined(_M_IX86)
         stack.AddrPC.Offset    = context.Eip;
-        stack.AddrPC.Mode      = AddrModeFlat;
         stack.AddrStack.Offset = context.Esp;
-        stack.AddrStack.Mode   = AddrModeFlat;
         stack.AddrFrame.Offset = context.Ebp;
-        stack.AddrFrame.Mode   = AddrModeFlat;
-#else
+#elif defined(_M_AMD64)
         stack.AddrPC.Offset    = context.Rip;
-        stack.AddrPC.Mode      = AddrModeFlat;
         stack.AddrStack.Offset = context.Rsp;
-        stack.AddrStack.Mode   = AddrModeFlat;
         stack.AddrFrame.Offset = context.Rsp;
-        stack.AddrFrame.Mode   = AddrModeFlat;
+#elif defined(_M_ARM64)
+        stack.AddrPC.Offset    = context.Pc;
+        stack.AddrStack.Offset = context.Sp;
+        stack.AddrFrame.Offset = context.Fp;
+#else
+#error Platform not supported!
 #endif
         IMAGEHLP_SYMBOL64_EXT symbol;
         symbol.SizeOfStruct  = sizeof(IMAGEHLP_SYMBOL64);
@@ -101,10 +110,12 @@ namespace {
         for (ULONG frame = 0; ; frame++) {
             BOOL result = pStackWalk64
                           (
-#ifdef _M_IX86
+#if defined(_M_IX86)
                 IMAGE_FILE_MACHINE_I386,
-#else
+#elif defined(_M_AMD64)
                 IMAGE_FILE_MACHINE_AMD64,
+#elif defined(_M_ARM64)
+                IMAGE_FILE_MACHINE_ARM64,
 #endif
                 hProcess,
                 hThread,
@@ -242,25 +253,17 @@ namespace {
         }
         fputc('\n', outputFile);
         printCallstack(outputFile, ex);
+        fputs("Please report this to the cppcheck developers!\n", outputFile);
         fflush(outputFile);
         return EXCEPTION_EXECUTE_HANDLER;
     }
 }
 
-/**
- * Signal/SEH handling
- * Has to be clean for using with SEH on windows, i.e. no construction of C++ object instances is allowed!
- * TODO Check for multi-threading issues!
- *
- */
-int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&), CppCheck& cppcheck)
+namespace internal
 {
-    FILE *outputFile = CppCheckExecutor::getExceptionOutput();
-    __try {
-        return (&executor->*f)(cppcheck);
-    } __except (filterException(outputFile, GetExceptionCode(), GetExceptionInformation())) {
-        fputs("Please report this to the cppcheck developers!\n", outputFile);
-        return -1;
+    int filter_seh_exeception(int code, void* ex)
+    {
+        return filterException(sehOutput, code, static_cast<PEXCEPTION_POINTERS>(ex));
     }
 }
 
diff --git a/cli/sehwrapper.h b/cli/sehwrapper.h
new file mode 100644
index 00000000000..9a7e25f9454
--- /dev/null
+++ b/cli/sehwrapper.h
@@ -0,0 +1,51 @@
+/* -*- 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 CPPCHECKEXECUTORSEH_H
+#define CPPCHECKEXECUTORSEH_H
+
+#include "config.h" // IWYU pragma: keep
+
+#ifdef USE_WINDOWS_SEH
+
+#include <cstdio>
+
+/**
+ * @param f Output file
+ */
+void set_seh_output(FILE* f);
+
+namespace internal
+{
+    int filter_seh_exeception(int code, void* ex);
+}
+
+/**
+ * Signal/SEH handling
+ * Has to be clean for using with SEH on windows, i.e. no construction of C++ object instances is allowed!
+ */
+#define CALL_WITH_SEH_WRAPPER(f) \
+    __try {                      \
+        return (f);              \
+    } __except (internal::filter_seh_exeception(GetExceptionCode(), GetExceptionInformation())) { \
+        return -1; \
+    }
+
+#endif
+
+#endif // CPPCHECKEXECUTORSEH_H
diff --git a/cli/cppcheckexecutorsig.cpp b/cli/signalhandler.cpp
similarity index 84%
rename from cli/cppcheckexecutorsig.cpp
rename to cli/signalhandler.cpp
index e8d447682eb..4f84f036c7e 100644
--- a/cli/cppcheckexecutorsig.cpp
+++ b/cli/signalhandler.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
@@ -16,11 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cppcheckexecutorsig.h"
+#if defined(__CYGWIN__)
+#define _BSD_SOURCE // required to have siginfo_t, SIGSTKSZ, kill(), sigaction and others
+#endif
+
+#include "signalhandler.h"
 
 #if defined(USE_UNIX_SIGNAL_HANDLING)
 
-#include "cppcheckexecutor.h"
+#include "utils.h"
 
 #ifdef USE_UNIX_BACKTRACE_SUPPORT
 #include "stacktrace.h"
@@ -30,8 +34,10 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+//#include <features.h> // __USE_DYNAMIC_STACK_SIZE
 #include <map>
 #include <string>
+#include <sys/types.h>
 #include <unistd.h>
 #include <utility>
 
@@ -48,14 +54,15 @@
 #   include <ucontext.h>
 #endif
 
-
+// TODO: __USE_DYNAMIC_STACK_SIZE is dependent on the features.h include and not a built-in compiler define, so it might be problematic to depend on it
 #ifdef __USE_DYNAMIC_STACK_SIZE
-static const size_t MYSTACKSIZE = 16*1024+32768; // wild guess about a reasonable buffer
+static constexpr size_t MYSTACKSIZE = (16*1024)+32768; // wild guess about a reasonable buffer
 #else
-static const 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()
+static FILE* signalOutput = stdout; // TODO: get rid of this
 
 /**
  * \param[in] ptr address to be examined.
@@ -107,35 +114,33 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
     pid_t killid;
     // TODO: separate these two defines
 #if defined(__linux__) && defined(REG_ERR)
-    const ucontext_t* const uc = reinterpret_cast<const ucontext_t*>(context);
-    killid = (pid_t) syscall(SYS_gettid);
+    const auto* const uc = reinterpret_cast<const ucontext_t*>(context);
+    killid = static_cast<pid_t>(syscall(SYS_gettid));
     if (uc) {
-        type = (int)uc->uc_mcontext.gregs[REG_ERR] & 2;
+        type = static_cast<int>(uc->uc_mcontext.gregs[REG_ERR]) & 2;
     }
 #else
     (void)context;
     killid = getpid();
 #endif
 
-    const Signalmap_t::const_iterator it=listofsignals.find(signo);
+    const auto it = utils::as_const(listofsignals).find(signo);
     const char * const signame = (it==listofsignals.end()) ? "unknown" : it->second.c_str();
-    bool lowMem=false; // was low-memory condition detected? Be careful then! Avoid allocating much more memory then.
     bool unexpectedSignal=true; // unexpected indicates program failure
     bool terminate=true; // exit process/thread
     const bool isAddressOnStack = IsAddressOnStack(info->si_addr);
-    FILE* output = CppCheckExecutor::getExceptionOutput();
+    FILE * const output = signalOutput;
     switch (signo) {
     case SIGABRT:
         fputs("Internal error: cppcheck received signal ", output);
         fputs(signame, output);
         fputs(
 #ifdef NDEBUG
-            " - out of memory?\n",
+            " - abort\n",
 #else
-            " - out of memory or assertion?\n",
+            " - abort or assertion\n",
 #endif
             output);
-        lowMem=true;     // educated guess
         break;
     case SIGBUS:
         fputs("Internal error: cppcheck received signal ", output);
@@ -164,7 +169,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
             break;
         }
         fprintf(output, " (at 0x%lx).\n",
-                (unsigned long)info->si_addr);
+                reinterpret_cast<unsigned long>(info->si_addr));
         break;
     case SIGFPE:
         fputs("Internal error: cppcheck received signal ", output);
@@ -198,7 +203,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
             break;
         }
         fprintf(output, " (at 0x%lx).\n",
-                (unsigned long)info->si_addr);
+                reinterpret_cast<unsigned long>(info->si_addr));
         break;
     case SIGILL:
         fputs("Internal error: cppcheck received signal ", output);
@@ -232,7 +237,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
             break;
         }
         fprintf(output, " (at 0x%lx).%s\n",
-                (unsigned long)info->si_addr,
+                reinterpret_cast<unsigned long>(info->si_addr),
                 (isAddressOnStack)?" Stackoverflow?":"");
         break;
     case SIGINT:
@@ -258,7 +263,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
                 // cppcheck-suppress knownConditionTrueFalse ; FP
                 (type==-1)? "" :
                 (type==0) ? "reading " : "writing ",
-                (unsigned long)info->si_addr,
+                reinterpret_cast<unsigned long>(info->si_addr),
                 (isAddressOnStack)?" Stackoverflow?":""
                 );
         break;
@@ -275,7 +280,9 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
         break;
     }
 #ifdef USE_UNIX_BACKTRACE_SUPPORT
-    print_stacktrace(output, true, -1, lowMem);
+    // flush otherwise the trace might be printed earlier
+    fflush(output);
+    print_stacktrace(output, 1, true, -1, true);
 #endif
     if (unexpectedSignal) {
         fputs("\nPlease report this to the cppcheck developers!\n", output);
@@ -292,11 +299,13 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
     }
 }
 
-int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&), CppCheck& cppcheck)
+void register_signal_handler(FILE * const output)
 {
+    signalOutput = output;
+
     // determine stack vs. heap
     char stackVariable;
-    char *heapVariable=(char*)malloc(1);
+    char *heapVariable=static_cast<char*>(malloc(1));
     bStackBelowHeap = &stackVariable < heapVariable;
     free(heapVariable);
 
@@ -305,17 +314,20 @@ int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(Cpp
     segv_stack.ss_sp = mytstack;
     segv_stack.ss_flags = 0;
     segv_stack.ss_size = MYSTACKSIZE;
-    sigaltstack(&segv_stack, nullptr);
+    if (sigaltstack(&segv_stack, nullptr) != 0) {
+        // TODO: log errno
+        fputs("could not set alternate signal stack context.\n", output);
+        std::exit(EXIT_FAILURE);
+    }
 
     // install signal handler
     struct sigaction act;
     memset(&act, 0, sizeof(act));
     act.sa_flags=SA_SIGINFO|SA_ONSTACK;
     act.sa_sigaction=CppcheckSignalHandler;
-    for (std::map<int, std::string>::const_iterator sig=listofsignals.cbegin(); sig!=listofsignals.cend(); ++sig) {
+    for (auto sig=listofsignals.cbegin(); sig!=listofsignals.cend(); ++sig) {
         sigaction(sig->first, &act, nullptr);
     }
-    return (&executor->*f)(cppcheck);
 }
 
 #endif
diff --git a/cli/cppcheckexecutorsig.h b/cli/signalhandler.h
similarity index 70%
rename from cli/cppcheckexecutorsig.h
rename to cli/signalhandler.h
index 4279378e4b1..df5a6120fe8 100644
--- a/cli/cppcheckexecutorsig.h
+++ b/cli/signalhandler.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
@@ -16,18 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CPPCHECKEXECUTORSIG_H
-#define CPPCHECKEXECUTORSIG_H
+#ifndef SIGNALHANDLER_H
+#define SIGNALHANDLER_H
 
 #include "config.h"
 
 #if defined(USE_UNIX_SIGNAL_HANDLING)
 
-class CppCheckExecutor;
-class CppCheck;
+#include <cstdio>
 
-int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&), CppCheck& cppcheck);
+void register_signal_handler(FILE* output);
 
-#endif // CPPCHECKEXECUTORSIG_H
+#endif // USE_UNIX_SIGNAL_HANDLING
 
-#endif // CPPCHECKEXECUTORSIG_H
+#endif // SIGNALHANDLER_H
diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
index ce7476f3d4c..9da1645a6a4 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-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
@@ -19,99 +19,60 @@
 #include "singleexecutor.h"
 
 #include "cppcheck.h"
-#include "importproject.h"
-#include "library.h"
+#include "filesettings.h"
 #include "settings.h"
+#include "timer.h"
 
 #include <cassert>
+#include <cstddef>
 #include <list>
 #include <numeric>
-#include <utility>
 
 class ErrorLogger;
 
-SingleExecutor::SingleExecutor(CppCheck &cppcheck, const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
-    : Executor(files, settings, 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);
 }
 
-SingleExecutor::~SingleExecutor()
-{}
-
 // TODO: markup handling is not performed with multiple jobs
 unsigned int SingleExecutor::check()
 {
     unsigned int result = 0;
 
-    const std::size_t totalfilesize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const std::pair<std::string, std::size_t>& f) {
-        return v + f.second;
+    const std::size_t totalfilesize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& f) {
+        return v + f.size();
     });
 
     std::size_t processedsize = 0;
     unsigned int c = 0;
-    // TODO: processes either mSettings.project.fileSettings or mFiles - process/thread implementations process both
-    // TODO: thread/process implementations process fileSettings first
-    if (mSettings.project.fileSettings.empty()) {
-        for (std::map<std::string, std::size_t>::const_iterator i = mFiles.cbegin(); i != mFiles.cend(); ++i) {
-            if (!mSettings.library.markupFile(i->first)
-                || !mSettings.library.processMarkupAfterCode(i->first)) {
-                result += mCppcheck.check(i->first);
-                processedsize += i->second;
-                if (!mSettings.quiet)
-                    reportStatus(c + 1, mFiles.size(), processedsize, totalfilesize);
-                // TODO: call analyseClangTidy()
-                c++;
-            }
-        }
-    } else {
-        // filesettings
-        // check all files of the project
-        for (const ImportProject::FileSettings &fs : mSettings.project.fileSettings) {
-            if (!mSettings.library.markupFile(fs.filename)
-                || !mSettings.library.processMarkupAfterCode(fs.filename)) {
-                result += mCppcheck.check(fs);
-                ++c;
-                if (!mSettings.quiet)
-                    reportStatus(c, mSettings.project.fileSettings.size(), c, mSettings.project.fileSettings.size());
-                if (mSettings.clangTidy)
-                    mCppcheck.analyseClangTidy(fs);
-            }
-        }
-    }
 
-    // second loop to parse all markup files which may not work until all
-    // c/cpp files have been parsed and checked
-    // TODO: get rid of duplicated code
-    if (mSettings.project.fileSettings.empty()) {
-        for (std::map<std::string, std::size_t>::const_iterator i = mFiles.cbegin(); i != mFiles.cend(); ++i) {
-            if (mSettings.library.markupFile(i->first)
-                && mSettings.library.processMarkupAfterCode(i->first)) {
-                result += mCppcheck.check(i->first);
-                processedsize += i->second;
-                if (!mSettings.quiet)
-                    reportStatus(c + 1, mFiles.size(), processedsize, totalfilesize);
-                // TODO: call analyseClangTidy()
-                c++;
-            }
-        }
+    for (auto i = mFiles.cbegin(); i != mFiles.cend(); ++i) {
+        result += mCppcheck.check(*i);
+        processedsize += i->size();
+        ++c;
+        if (!mSettings.quiet)
+            reportStatus(c, mFiles.size(), processedsize, totalfilesize);
+        // TODO: call analyseClangTidy()?
     }
-    else {
-        for (const ImportProject::FileSettings &fs : mSettings.project.fileSettings) {
-            if (mSettings.library.markupFile(fs.filename)
-                && mSettings.library.processMarkupAfterCode(fs.filename)) {
-                result += mCppcheck.check(fs);
-                ++c;
-                if (!mSettings.quiet)
-                    reportStatus(c, mSettings.project.fileSettings.size(), c, mSettings.project.fileSettings.size());
-                if (mSettings.clangTidy)
-                    mCppcheck.analyseClangTidy(fs);
-            }
-        }
+
+    // filesettings
+    // check all files of the project
+    for (const FileSettings &fs : mFileSettings) {
+        result += mCppcheck.check(fs);
+        ++c;
+        if (!mSettings.quiet)
+            reportStatus(c, mFileSettings.size(), c, mFileSettings.size());
     }
+
+    // TODO: CppCheckExecutor::check_internal() is also invoking the whole program analysis - is it run twice?
     if (mCppcheck.analyseWholeProgram())
         result++;
 
+    if (mTimerResults && (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY))
+        mTimerResults->showResults(mSettings.showtime);
+
     return result;
 }
diff --git a/cli/singleexecutor.h b/cli/singleexecutor.h
index 74143be7c00..b6cae501214 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-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
@@ -21,21 +21,22 @@
 
 #include "executor.h"
 
-#include <cstddef>
-#include <map>
-#include <string>
+#include <list>
 
 class ErrorLogger;
 class Settings;
 class CppCheck;
+struct Suppressions;
+struct FileSettings;
+class FileWithDetails;
+class TimerResults;
 
 class SingleExecutor : public Executor
 {
 public:
-    SingleExecutor(CppCheck &cppcheck, const std::map<std::string, std::size_t> &files, Settings &settings, 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() override;
-    void operator=(const SingleExecutor &) = delete;
+    SingleExecutor& operator=(const SingleExecutor &) = delete;
 
     unsigned int check() override;
 
diff --git a/cli/stacktrace.cpp b/cli/stacktrace.cpp
index bd766c717f4..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-2022 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,69 +28,115 @@
 #include <cxxabi.h>
 #include <execinfo.h>
 
-void print_stacktrace(FILE* output, bool demangling, int maxdepth, bool lowMem)
+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)
-    const int fd = fileno(output);
+    static constexpr auto ADDRESSDISPLAYLENGTH = (sizeof(long) == 8) ? 12 : 8;
+
     void *callstackArray[32]= {nullptr}; // the less resources the better...
-    const int currentdepth = backtrace(callstackArray, (int)getArrayLength(callstackArray));
-    const int offset=2; // some entries on top are within our own exception handling code or libc
+    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)
         maxdepth=currentdepth-offset;
     else
         maxdepth = std::min(maxdepth, currentdepth);
-    if (lowMem) {
-        fputs("Callstack (symbols only):\n", output);
-        backtrace_symbols_fd(callstackArray+offset, maxdepth, fd);
-    } else {
-        char **symbolStringList = backtrace_symbols(callstackArray, currentdepth);
-        if (symbolStringList) {
-            fputs("Callstack:\n", output);
-            char demangle_buffer[2048]= {0};
-            for (int i = offset; i < maxdepth; ++i) {
-                const char * const symbolString = symbolStringList[i];
-                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     = int(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 int ordinal=i-offset;
-                fprintf(output, "#%-2d 0x",
-                        ordinal);
-                if (padLen>0)
-                    fprintf(output, "%0*d",
-                            padLen, 0);
-                if (realnameString) {
-                    fprintf(output, "%.*s in %s\n",
-                            (int)(secondBracketAddress-firstBracketAddress-3), firstBracketAddress+3,
-                            realnameString);
-                } else {
-                    fprintf(output, "%.*s in %.*s\n",
-                            (int)(secondBracketAddress-firstBracketAddress-3), firstBracketAddress+3,
-                            (int)(firstBracketAddress-symbolString), symbolString);
+
+    char **symbolStringList = backtrace_symbols(callstackArray, currentdepth);
+    if (!symbolStringList) {
+        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 continuous if we omit frames
+        }
+        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
                 }
             }
-            free(symbolStringList);
+        }
+
+        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);
+        if (realnameString) {
+            fprintf(output, "%.*s in %s\n",
+                    static_cast<int>(secondBracketAddress - firstBracketAddress - 3),
+                    firstBracketAddress+3,
+                    realnameString);
         } else {
-            fputs("Callstack could not be obtained\n", output);
+            fprintf(output, "%.*s in %.*s\n",
+                    static_cast<int>(secondBracketAddress - firstBracketAddress - 3),
+                    firstBracketAddress+3,
+                    static_cast<int>(firstBracketAddress - symbolString),
+                    symbolString);
         }
     }
-#undef ADDRESSDISPLAYLENGTH
+    // NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion) - code matches the documented usage
+    free(symbolStringList);
+
+    if (no_address) {
+        fputs("Callstack could not be obtained (no address)\n", output);
+        return;
+    }
 }
 
 #endif // USE_UNIX_BACKTRACE_SUPPORT
diff --git a/cli/stacktrace.h b/cli/stacktrace.h
index 3922384d738..1e98d55ebc0 100644
--- a/cli/stacktrace.h
+++ b/cli/stacktrace.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
@@ -30,8 +30,14 @@
  * That is very sensitive to the operating system, hardware, compiler and runtime.
  * The code is not meant for production environment!
  * One reason is named first: it's using functions not whitelisted for usage in a signal handler function.
+ *
+ * @param output the descriptor to write the trace to
+ * @param start_idx the frame index to start with
+ * @param demangling controls demangling of symbols
+ * @param maxdepth the maximum number of frames to list (32 at most or if -1)
+ * @param omit_above_own omit top frames which are above our own code (i.e. libc symbols)
  */
-void print_stacktrace(FILE* output, bool demangling, int maxdepth, bool lowMem);
+void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth, bool omit_above_own);
 
 #endif
 
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
index 8efdfeea76f..bdf1fb6f2e0 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-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
@@ -18,37 +18,35 @@
 
 #include "threadexecutor.h"
 
+#ifdef HAS_THREADING_MODEL_THREAD
+
 #include "config.h"
 #include "cppcheck.h"
-#include "cppcheckexecutor.h"
 #include "errorlogger.h"
-#include "importproject.h"
+#include "filesettings.h"
 #include "settings.h"
+#include "suppressions.h"
+#include "timer.h"
 
-#include <algorithm>
 #include <cassert>
 #include <cstdlib>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <list>
 #include <numeric>
 #include <mutex>
+#include <string>
 #include <system_error>
 #include <utility>
 #include <vector>
 
-enum class Color;
-
-ThreadExecutor::ThreadExecutor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger)
-    : Executor(files, settings, 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);
 }
 
-ThreadExecutor::~ThreadExecutor()
-{}
-
 class SyncLogForwarder : public ErrorLogger
 {
 public:
@@ -70,6 +68,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);
@@ -84,24 +87,24 @@ class SyncLogForwarder : public ErrorLogger
 class ThreadData
 {
 public:
-    ThreadData(ThreadExecutor &threadExecutor, ErrorLogger &errorLogger, const Settings &settings, const std::map<std::string, std::size_t> &files, const std::list<ImportProject::FileSettings> &fileSettings)
-        : mFiles(files), mFileSettings(fileSettings), mProcessedFiles(0), mProcessedSize(0), mSettings(settings), 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();
 
         mTotalFiles = mFiles.size() + mFileSettings.size();
-        mTotalFileSize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const std::pair<std::string, std::size_t>& p) {
-            return v + p.second;
+        mTotalFileSize = std::accumulate(mFiles.cbegin(), mFiles.cend(), std::size_t(0), [](std::size_t v, const FileWithDetails& p) {
+            return v + p.size();
         });
     }
 
-    bool next(const std::string *&file, const ImportProject::FileSettings *&fs, std::size_t &fileSize) {
+    bool next(const FileWithDetails *&file, const FileSettings *&fs, std::size_t &fileSize) {
         std::lock_guard<std::mutex> l(mFileSync);
         if (mItNextFile != mFiles.end()) {
-            file = &mItNextFile->first;
+            file = &(*mItNextFile);
             fs = nullptr;
-            fileSize = mItNextFile->second;
+            fileSize = mItNextFile->size();
             ++mItNextFile;
             return true;
         }
@@ -116,20 +119,34 @@ class ThreadData
         return false;
     }
 
-    unsigned int check(ErrorLogger &errorLogger, const std::string *file, const ImportProject::FileSettings *fs) const {
-        CppCheck fileChecker(errorLogger, false, CppCheckExecutor::executeCommand);
-        fileChecker.settings() = mSettings; // this is a copy
+    unsigned int check(const FileWithDetails *file, const FileSettings *fs) {
+        CppCheck fileChecker(mSettings, mSuppressions, mLogForwarder, mTimerResults, false, mExecuteCommand);
 
         unsigned int result;
         if (fs) {
             // file settings..
             result = fileChecker.check(*fs);
-            if (fileChecker.settings().clangTidy)
-                fileChecker.analyseClangTidy(*fs);
         } else {
             // Read file from a file
             result = fileChecker.check(*file);
         }
+        for (const auto& suppr : mSuppressions.nomsg.getSuppressions()) {
+            // need to transfer all inline suppressions because these are used later on
+            if (suppr.isInline) {
+                const std::string err = mSuppressions.nomsg.addSuppression(suppr);
+                if (!err.empty()) {
+                    // TODO: only update state if it doesn't exist - otherwise propagate error
+                    mSuppressions.nomsg.updateSuppressionState(suppr); // TODO: check result
+                }
+                continue;
+            }
+
+            // propagate state of global suppressions
+            if (!suppr.isLocal()) {
+                mSuppressions.nomsg.updateSuppressionState(suppr); // TODO: check result
+                continue;
+            }
+        }
         return result;
     }
 
@@ -138,37 +155,39 @@ class ThreadData
         mProcessedSize += fileSize;
         mProcessedFiles++;
         if (!mSettings.quiet)
-            logForwarder.reportStatus(mProcessedFiles, mTotalFiles, mProcessedSize, mTotalFileSize);
+            mLogForwarder.reportStatus(mProcessedFiles, mTotalFiles, mProcessedSize, mTotalFileSize);
     }
 
 private:
-    const std::map<std::string, std::size_t> &mFiles;
-    std::map<std::string, std::size_t>::const_iterator mItNextFile;
-    const std::list<ImportProject::FileSettings> &mFileSettings;
-    std::list<ImportProject::FileSettings>::const_iterator mItNextFileSettings;
+    const std::list<FileWithDetails> &mFiles;
+    std::list<FileWithDetails>::const_iterator mItNextFile;
+    const std::list<FileSettings> &mFileSettings;
+    std::list<FileSettings>::const_iterator mItNextFileSettings;
 
-    std::size_t mProcessedFiles;
-    std::size_t mTotalFiles;
-    std::size_t mProcessedSize;
-    std::size_t mTotalFileSize;
+    std::size_t mProcessedFiles{};
+    std::size_t mTotalFiles{};
+    std::size_t mProcessedSize{};
+    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)
 {
     unsigned int result = 0;
 
-    const std::string *file;
-    const ImportProject::FileSettings *fs;
+    const FileWithDetails *file;
+    const FileSettings *fs;
     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);
     }
@@ -181,7 +200,7 @@ unsigned int ThreadExecutor::check()
     std::vector<std::future<unsigned int>> threadFutures;
     threadFutures.reserve(mSettings.jobs);
 
-    ThreadData data(*this, mErrorLogger, mSettings, mFiles, mSettings.project.fileSettings);
+    ThreadData data(*this, mErrorLogger, mTimerResults, mSettings, mSuppressions, mFiles, mFileSettings, mExecuteCommand);
 
     for (unsigned int i = 0; i < mSettings.jobs; ++i) {
         try {
@@ -193,7 +212,14 @@ unsigned int ThreadExecutor::check()
         }
     }
 
-    return std::accumulate(threadFutures.begin(), threadFutures.end(), 0U, [](unsigned int v, std::future<unsigned int>& f) {
+    unsigned int result = std::accumulate(threadFutures.begin(), threadFutures.end(), 0U, [](unsigned int v, std::future<unsigned int>& f) {
         return v + f.get();
     });
+
+    if (mTimerResults && (mSettings.showtime == ShowTime::SUMMARY || mSettings.showtime == ShowTime::TOP5_SUMMARY))
+        mTimerResults->showResults(mSettings.showtime);
+
+    return result;
 }
+
+#endif // HAS_THREADING_MODEL_THREAD
diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h
index 5c24dfe0c13..e827969037c 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-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
@@ -19,14 +19,21 @@
 #ifndef THREADEXECUTOR_H
 #define THREADEXECUTOR_H
 
+#include "config.h"
+
+#ifdef HAS_THREADING_MODEL_THREAD
+
+#include "cppcheck.h"
 #include "executor.h"
 
-#include <cstddef>
-#include <map>
-#include <string>
+#include <list>
 
 class Settings;
 class ErrorLogger;
+struct Suppressions;
+struct FileSettings;
+class FileWithDetails;
+class TimerResults;
 
 /// @addtogroup CLI
 /// @{
@@ -36,17 +43,20 @@ class ErrorLogger;
  * all files using threads.
  */
 class ThreadExecutor : public Executor {
+    friend class SyncLogForwarder;
+
 public:
-    ThreadExecutor(const std::map<std::string, std::size_t> &files, Settings &settings, ErrorLogger &errorLogger);
+    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() override;
-    void operator=(const ThreadExecutor &) = delete;
+    ThreadExecutor& operator=(const ThreadExecutor &) = delete;
 
     unsigned int check() override;
 
-    friend class SyncLogForwarder;
+    CppCheck::ExecuteCmdFn mExecuteCommand;
 };
 
 /// @}
 
+#endif // HAS_THREADING_MODEL_THREAD
+
 #endif // THREADEXECUTOR_H
diff --git a/cmake/ccache.cmake b/cmake/ccache.cmake
deleted file mode 100644
index 73ad5a189c4..00000000000
--- a/cmake/ccache.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-if (CMAKE_VERSION VERSION_LESS "3.0")
-    if (CMAKE_CXX_COMPILER_LAUNCHER)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_CXX_COMPILER_LAUNCHER}")
-    elseif (CMAKE_C_COMPILER_LAUNCHER)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_C_COMPILER_LAUNCHER}")
-    endif()
-endif()
\ No newline at end of file
diff --git a/cmake/clang_tidy.cmake b/cmake/clang_tidy.cmake
index 07134ddaa9d..e9a9148c6fe 100644
--- a/cmake/clang_tidy.cmake
+++ b/cmake/clang_tidy.cmake
@@ -1,21 +1,23 @@
-if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
-    # clang-tidy and clang need to have the same version when precompiled headers are beign used
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+# TODO: bail out when Python_EXECUTABLE is not set
+
+if(NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
+    # clang-tidy and clang need to have the same version when precompiled headers are being used
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         string(REGEX MATCHALL "[0-9]+" _clang_ver_parts "${CMAKE_CXX_COMPILER_VERSION}")
         LIST(GET _clang_ver_parts 0 _clang_major)
         set(RUN_CLANG_TIDY_NAMES "run-clang-tidy-${_clang_major}")
         message(STATUS "Clang and clang-tidy version need to match when precompiled headers are enabled - limiting search to '${RUN_CLANG_TIDY_NAMES}'")
     else()
-        message(STATUS "Cannot use non-Clang compiler with clang-tidy when precompiled headers are enabled - skipping 'run-clang-tidy' target generation")
+        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-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-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)
+if(RUN_CLANG_TIDY_NAMES)
     find_program(RUN_CLANG_TIDY NAMES ${RUN_CLANG_TIDY_NAMES})
     message(STATUS "RUN_CLANG_TIDY=${RUN_CLANG_TIDY}")
-    if (RUN_CLANG_TIDY)
+    if(RUN_CLANG_TIDY)
         include(ProcessorCount)
         ProcessorCount(NPROC)
         if(NPROC EQUAL 0)
@@ -23,12 +25,37 @@ if (RUN_CLANG_TIDY_NAMES)
         endif()
         message(STATUS "NPROC=${NPROC}")
 
+        # most of these are disabled because they are too noisy in our code
+        # 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.* - 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-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")
+        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)
-        if (BUILD_GUI)
+        add_custom_target(run-clang-tidy
+                ${Python_EXECUTABLE} ${RUN_CLANG_TIDY} -p=${CMAKE_BINARY_DIR} -j ${NPROC} -quiet
+                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}
+                USES_TERMINAL
+                VERBATIM)
+        if(BUILD_GUI)
             add_dependencies(run-clang-tidy gui-build-deps)
-            if (BUILD_TESTS)
+            add_dependencies(run-clang-tidy-csa gui-build-deps)
+            if(BUILD_TRIAGE)
                 add_dependencies(run-clang-tidy triage-build-ui-deps)
+                add_dependencies(run-clang-tidy-csa triage-build-ui-deps)
             endif()
         endif()
     endif()
diff --git a/cmake/compilerCheck.cmake b/cmake/compilerCheck.cmake
index 1167a5cbcf8..47c8fc1245e 100644
--- a/cmake/compilerCheck.cmake
+++ b/cmake/compilerCheck.cmake
@@ -1,14 +1,13 @@
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-        message(ERROR "GCC >= 4.8 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
-    endif ()
+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")
-    # TODO: verify this
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9)
-        message(ERROR "Clang >= 2.9 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
-    endif ()
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
+        message(ERROR "Clang >= 3.5 required - detected ${CMAKE_CXX_COMPILER_VERSION} not supported")
+    endif()
 elseif(MSVC)
-    if (MSVC_VERSION VERSION_LESS 1800)
-        message(ERROR "Visual Studio >= 2013 (1800) required - detected ${MSVC_VERSION} not supported")
-    endif ()
+    if(MSVC_VERSION VERSION_LESS 1900)
+        message(ERROR "Visual Studio >= 2015 (19.0) required - detected ${MSVC_VERSION} not supported")
+    endif()
 endif()
diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake
index 67454f0a4f7..4967c282336 100644
--- a/cmake/compilerDefinitions.cmake
+++ b/cmake/compilerDefinitions.cmake
@@ -1,18 +1,24 @@
-if (MSVC)
+if(MSVC)
+    # add_compile_definitions() requires CMake 3.12
+
     # Visual Studio only sets _DEBUG
-    add_compile_definitions($<$<CONFIG:Debug>:-DDEBUG>)
+    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
-if (CPPCHK_GLIBCXX_DEBUG AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if (USE_LIBCXX)
-            add_definitions(-D_LIBCPP_ENABLE_ASSERTIONS=1)
+# 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?
         endif()
     else()
@@ -21,37 +27,46 @@ if (CPPCHK_GLIBCXX_DEBUG AND UNIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
     endif()
 endif()
 
-if (HAVE_RULES)
-    add_definitions(-DHAVE_RULES -DTIXML_USE_STL)
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND USE_LIBCXX)
+    add_definitions(-D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES)
+endif()
+
+if(HAVE_RULES)
+    add_definitions(-DHAVE_RULES)
 endif()
 
-if (Boost_FOUND)
+if(Boost_FOUND)
     add_definitions(-DHAVE_BOOST)
+    if(USE_BOOST_INT128)
+        add_definitions(-DHAVE_BOOST_INT128)
+    endif()
 endif()
 
-if (ENABLE_CHECK_INTERNAL)
+if(ENABLE_CHECK_INTERNAL)
     add_definitions(-DCHECK_INTERNAL)
 endif()
 
-if (USE_THREADS)
-    add_definitions(-DUSE_THREADS)
+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)
+if(NO_UNIX_SIGNAL_HANDLING)
     add_definitions(-DNO_UNIX_SIGNAL_HANDLING)
 endif()
 
-if (NO_UNIX_BACKTRACE_SUPPORT)
+if(NO_UNIX_BACKTRACE_SUPPORT)
     add_definitions(-DNO_UNIX_BACKTRACE_SUPPORT)
 endif()
 
-if (NO_WINDOWS_SEH)
+if(NO_WINDOWS_SEH)
     add_definitions(-DNO_WINDOWS_SEH)
 endif()
 
-file(TO_CMAKE_PATH ${FILESDIR} _filesdir)
-add_definitions(-DFILESDIR="${_filesdir}")
+if(FILESDIR_DEF)
+    file(TO_CMAKE_PATH "${FILESDIR_DEF}" _filesdir)
+    add_definitions(-DFILESDIR="${_filesdir}")
+endif()
diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
index 74256f5abde..4112ddd2418 100644
--- a/cmake/compileroptions.cmake
+++ b/cmake/compileroptions.cmake
@@ -3,32 +3,65 @@ include(CheckCXXCompilerFlag)
 function(add_compile_options_safe FLAG)
     string(MAKE_C_IDENTIFIER "HAS_CXX_FLAG${FLAG}" mangled_flag)
     check_cxx_compiler_flag(${FLAG} ${mangled_flag})
-    if (${mangled_flag})
+    if(${mangled_flag})
         add_compile_options(${FLAG})
     endif()
 endfunction()
-    
+
 function(target_compile_options_safe TARGET FLAG)
     string(MAKE_C_IDENTIFIER "HAS_CXX_FLAG${FLAG}" mangled_flag)
     check_cxx_compiler_flag(${FLAG} ${mangled_flag})
-    if (${mangled_flag})
+    if(${mangled_flag})
         target_compile_options(${TARGET} PRIVATE ${FLAG})
     endif()
 endfunction()
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+function(target_externals_include_directories TARGET)
+    if(EXTERNALS_AS_SYSTEM)
+        target_include_directories(${TARGET} SYSTEM ${ARGN})
+    else()
+        target_include_directories(${TARGET} ${ARGN})
+    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()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     if(CMAKE_BUILD_TYPE STREQUAL "Release")
         # "Release" uses -O3 by default
         add_compile_options(-O2)
     endif()
-    if (WARNINGS_ARE_ERRORS)
+    if(CMAKE_COMPILE_WARNING_AS_ERROR)
         add_compile_options(-Werror)
     endif()
-    add_compile_options(-pedantic)
+    add_compile_options(-pedantic) # TODO: is this implied by -Weverything?
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     add_compile_options(-Wall)
     add_compile_options(-Wextra)
     add_compile_options(-Wcast-qual)                # Cast for removing type qualifiers
@@ -39,27 +72,48 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang
     add_compile_options(-Wpacked)                   #
     add_compile_options(-Wredundant-decls)          # if anything is declared more than once in the same scope
     add_compile_options(-Wundef)
-    add_compile_options(-Wno-missing-field-initializers)
-    add_compile_options(-Wno-missing-braces)
     add_compile_options(-Wno-sign-compare)
     add_compile_options(-Wno-multichar)
-endif()
+    add_compile_options(-Woverloaded-virtual)       # when a function declaration hides virtual functions from a base class
+
+    # TODO: evaluate
+    #add_compile_options(-Wconversion)  # danmar: gives fp. for instance: unsigned int sizeof_pointer = sizeof(void *);
+    #add_compile_options(-Wlogical-op) # doesn't work on older GCC
+    #add_compile_options(-Wsign-conversion) # too many warnings
+    #add_compile_options(-Wunreachable-code) # some GCC versions report lots of warnings
+    #add_compile_options(-Wsign-promo)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # use pipes instead of temporary files - greatly reduces I/O usage
     add_compile_options(-pipe)
 
-    add_compile_options(-Woverloaded-virtual)       # when a function declaration hides virtual functions from a base class
-    add_compile_options(-Wno-maybe-uninitialized)   # there are some false positives
     add_compile_options(-Wsuggest-attribute=noreturn)
-    add_compile_options(-Wno-shadow)                # whenever a local variable or type declaration shadows another one
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 14 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
+    add_compile_options_safe(-Wuseless-cast)
+    # add_compile_options_safe(-Wsuggest-attribute=returns_nonnull) # reports the warning even if the attribute is set
+
+    # TODO: evaluate
+    #add_compile_options_safe(-Wduplicated-branches)
+    #add_compile_options_safe(-Wduplicated-cond)
+    #add_compile_options_safe(-Wformat=2)
+    #add_compile_options_safe(-Wformat-overflow=2)
+    #add_compile_options_safe(-Wformat-signedness)
+    #add_compile_options_safe(-Wnull-dereference)
+    #add_compile_options_safe(-Wnrvo)
+    #add_compile_options_safe(-Wimplicit-fallthrough=5)
+    #add_compile_options_safe(-Wmissing-include-dirs)
+    #add_compile_options_safe(-Wunused)
+    #add_compile_options_safe(-Wunused-const-variable)
+    #add_compile_options_safe(-Wuninitialized)
+    #add_compile_options_safe(-Wsuggest-attribute=pure)
+    #add_compile_options_safe(-Wsuggest-attribute=const)
+    #add_compile_options_safe(-Wunused-macros)
+    #add_compile_options_safe(-Wpedantic)
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14)
         # TODO: verify this regression still exists in clang-15
-        if (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
             # work around performance regression - see https://github.com/llvm/llvm-project/issues/53555
             check_cxx_compiler_flag("-mllvm -inline-deferral" _has_mllvm_inline_deferral)
-            if (_has_mllvm_inline_deferral)
+            if(_has_mllvm_inline_deferral)
                 add_compile_options(-mllvm -inline-deferral)
             endif()
         endif()
@@ -68,60 +122,69 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         add_compile_options(-gdwarf-4)
     endif()
 
-    if (USE_LIBCXX)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+        add_compile_options(-Wno-poison-system-directories)
+    endif()
+
+    if(USE_LIBCXX)
         add_compile_options(-stdlib=libc++)
-        add_link_options(-lc++)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++")
     endif()
 
-   add_compile_options_safe(-Wno-documentation-unknown-command)
-
-   # TODO: fix and enable these warnings - or move to suppression list below
-   add_compile_options_safe(-Wno-inconsistent-missing-destructor-override) # caused by Qt moc code
-   add_compile_options_safe(-Wno-unused-exception-parameter)
-   add_compile_options_safe(-Wno-old-style-cast)
-   add_compile_options_safe(-Wno-global-constructors)
-   add_compile_options_safe(-Wno-exit-time-destructors)
-   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-zero-as-null-pointer-constant) # TODO: enable when warnings are fixed in in simplecpp and tinyxml2
-   add_compile_options_safe(-Wno-implicit-int-conversion)
-   add_compile_options_safe(-Wno-double-promotion)
-   add_compile_options_safe(-Wno-shadow-field)
-   add_compile_options_safe(-Wno-shadow-uncaptured-local)
-   add_compile_options_safe(-Wno-implicit-float-conversion)
-   add_compile_options_safe(-Wno-switch-enum)
-   add_compile_options_safe(-Wno-float-conversion)
-   add_compile_options_safe(-Wno-enum-enum-conversion)
-   add_compile_options_safe(-Wno-date-time)
-   add_compile_options_safe(-Wno-suggest-override) # TODO: enable when warnings are fixed in in tinyxml2
-   add_compile_options_safe(-Wno-suggest-destructor-override) # TODO: enable when warnings are fixed in in tinyxml2
-   add_compile_options_safe(-Wno-extra-semi-stmt) # TODO: enable when warnings are fixed in in tinyxml2
-   add_compile_options_safe(-Wno-implicitly-unsigned-literal)
-   add_compile_options_safe(-Wno-tautological-type-limit-compare)
-   add_compile_options(-Wno-disabled-macro-expansion)
-   add_compile_options_safe(-Wno-bitwise-instead-of-logical)
-   add_compile_options_safe(-Wno-unsafe-buffer-usage)
-
-   # warnings we are not interested in
-   add_compile_options(-Wno-four-char-constants)
-   add_compile_options(-Wno-c++98-compat)
-   add_compile_options(-Wno-weak-vtables)
-   add_compile_options(-Wno-padded)
-   add_compile_options(-Wno-c++98-compat-pedantic)
-   add_compile_options_safe(-Wno-return-std-move-in-c++11)
-
-   if(ENABLE_COVERAGE OR ENABLE_COVERAGE_XML)
+    # 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)
+    add_compile_options_safe(-Wno-shadow-uncaptured-local)
+    add_compile_options_safe(-Wno-implicit-float-conversion)
+    add_compile_options_safe(-Wno-switch-enum)
+    add_compile_options_safe(-Wno-date-time)
+    add_compile_options(-Wno-disabled-macro-expansion)
+    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)
+    add_compile_options_safe(-Wno-global-constructors)
+    add_compile_options_safe(-Wno-exit-time-destructors)
+
+    # 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)
+    add_compile_options(-Wno-c++98-compat-pedantic)
+
+    # only needs to be addressed to work around issues in older compilers
+    add_compile_options_safe(-Wno-return-std-move-in-c++11)
+
+    # this is reported even when it is unnecessary i.e. -Wswitch-enum warnings have been mitigated
+    add_compile_options_safe(-Wno-switch-default)
+
+    # warnings we are currently not interested in
+    add_compile_options(-Wno-four-char-constants)
+    add_compile_options(-Wno-weak-vtables)
+    add_compile_options(-Wno-multichar)
+
+    if(ENABLE_COVERAGE OR ENABLE_COVERAGE_XML)
       message(FATAL_ERROR "Do not use clang to generate code coverage. Use GCC instead.")
-   endif()
+    endif()
 endif()
 
-if (MSVC)
+if(MSVC)
+    # add_link_options() requires CMake 3.13
+
     # General
     add_compile_options(/W4) # Warning Level
     add_compile_options(/Zi) # Debug Information Format - Program Database
-    if (WARNINGS_ARE_ERRORS)
+    if(CMAKE_COMPILE_WARNING_AS_ERROR)
         add_compile_options(/WX) # Treat Warning As Errors
     endif()
     add_compile_options(/MP) # Multi-processor Compilation
@@ -158,12 +221,10 @@ if (MSVC)
     add_compile_options(/wd4127) # warning C4127: conditional expression is constant
     add_compile_options(/wd4146) # warning C4146: unary minus operator applied to unsigned type, result still unsigned
     add_compile_options(/wd4244) # warning C4244: 'initializing': conversion from 'int' to 'char', possible loss of data
-    add_compile_options(/wd4251)
+    add_compile_options(/wd4251) # warning C4251: 'x': class 'y' needs to have dll-interface to be used by clients of struct 'u'
     # Clang: -Wshorten-64-to-32 -Wimplicit-int-conversion
     add_compile_options(/wd4267) # warning C4267: 'return': conversion from 'size_t' to 'int', possible loss of data
     add_compile_options(/wd4389) # warning C4389: '==': signed/unsigned mismatch
-    add_compile_options(/wd4482)
-    add_compile_options(/wd4512)
     add_compile_options(/wd4701) # warning C4701: potentially uninitialized local variable 'err' used
     add_compile_options(/wd4706) # warning C4706: assignment within conditional expression
     add_compile_options(/wd4800) # warning C4800: 'const SymbolDatabase *' : forcing value to bool 'true' or 'false' (performance warning)
@@ -175,7 +236,7 @@ if (MSVC)
     # Linker - General
     add_link_options($<$<CONFIG:Debug>:/INCREMENTAL>) # Enable Incremental Linking - Yes
 
-    add_link_options(/NOLOGO) # SUppress Startup Banner - Yes
+    add_link_options(/NOLOGO) # Suppress Startup Banner - Yes
     # Ignore Import Library - Yes
 
     # Linker - Debugging
@@ -195,17 +256,17 @@ if (MSVC)
 endif()
 
 # TODO: check if this can be enabled again - also done in Makefile
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
     CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
     add_compile_options(-U_GLIBCXX_DEBUG)
 endif()
 
-if (MSVC)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:8000000")
+if(MSVC)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:8000000")
 endif()
 
-if (CYGWIN)
+if(CYGWIN)
     # TODO: this is a linker flag - not a compiler flag
     add_compile_options(-Wl,--stack,8388608)
 endif()
diff --git a/cmake/cxx11.cmake b/cmake/cxx11.cmake
index 37a038b4e7a..99e94ea4d23 100644
--- a/cmake/cxx11.cmake
+++ b/cmake/cxx11.cmake
@@ -1,20 +1,14 @@
 macro(use_cxx11)
-  if (CMAKE_VERSION VERSION_LESS "3.1")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-    elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif ()
-  else ()
-    # some GitHub Action windows runners randomly fail with a complaint that Qt6 requires a C++17 compiler
-    if (MSVC)
-      set (CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to use")
-    else ()
-      set (CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
+  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_REQUIRED ON)
-    if (POLICY CMP0025)
-      cmake_policy(SET CMP0025 NEW)
-    endif ()
-  endif ()
-endmacro(use_cxx11)
+    set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to use")
+  else()
+    set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
+  endif()
+endmacro()
diff --git a/cmake/dynamic_analyzer_options.cmake b/cmake/dynamic_analyzer_options.cmake
index b5dc5077ba5..45d4674c3a3 100644
--- a/cmake/dynamic_analyzer_options.cmake
+++ b/cmake/dynamic_analyzer_options.cmake
@@ -19,15 +19,21 @@ endif()
 
 if(ANALYZE_UNDEFINED)
     # TODO: enable signed-integer-overflow
-    add_compile_options(-fsanitize=undefined -fsanitize=nullability -fno-sanitize=signed-integer-overflow)
+    add_compile_options(-fsanitize=undefined -fno-sanitize=signed-integer-overflow)
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        add_compile_options(-fsanitize=nullability)
+    endif()
     add_compile_options(-fno-sanitize-recover=all)
     add_compile_options(-fno-omit-frame-pointer)
 
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=nullability -fno-sanitize=signed-integer-overflow")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fno-sanitize=signed-integer-overflow")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=nullability")
+    endif()
 endif()
 
-if(ANALYZE_DATAFLOW)
-    add_compile_options(-fsanitize=dataflow)
+if(ANALYZE_TYPE)
+    add_compile_options(-fsanitize=type)
 
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=dataflow")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=type")
 endif()
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index 3ad0e366f21..61458ced051 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -1,80 +1,101 @@
-if (BUILD_GUI)
+if(BUILD_GUI)
     list(APPEND qt_components Core Gui Widgets PrintSupport LinguistTools Help Network)
-    if (WITH_QCHART)
+    if(WITH_QCHART)
         list(APPEND qt_components Charts)
     endif()
-    if (BUILD_TESTS)
+    if(BUILD_TESTS)
         list(APPEND qt_components Test)
     endif()
-    if (USE_QT6)
-        find_package(Qt6 COMPONENTS ${qt_components} QUIET)
+    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 (NOT Qt6Core_FOUND)
-        find_package(Qt5 COMPONENTS ${qt_components} REQUIRED)
-        set(QT_VERSION "${Qt5Core_VERSION_STRING}")
-    else()
-        # detect faulty Qt6 installation by jurplel/install-qt-action@v2
-        if (WITH_QCHART AND NOT Qt6Charts_FOUND)
-            message(FATAL_ERROR "QtCharts not found")
-        endif()
-        set(QT_VERSION "${Qt6Core_VERSION_STRING}")
-        if (NOT QT_VERSION)
-            message(WARNING "'Qt6Core_VERSION_STRING' 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)
+
+    if(BUILD_ONLINE_HELP)
+        find_program(QHELPGENERATOR qhelpgenerator)
+        if(NOT QHELPGENERATOR)
+            # TODO: how to properly get the Qt binary folder?
+            # piggy-back off Qt::qmake for now as it should be in the same folder as the binary we are looking for
+            get_target_property(_qmake_executable Qt::qmake IMPORTED_LOCATION)
+            get_filename_component(_qt_bin_dir ${_qmake_executable} DIRECTORY)
+            message(STATUS "qhelpgenerator not found in PATH - trying ${_qt_bin_dir}")
+            # cannot be mandatory since qhelpgenerator is missing from the official qttools Linux package - https://bugreports.qt.io/browse/QTBUG-116168
+            find_program(QHELPGENERATOR qhelpgenerator HINTS ${_qt_bin_dir} REQUIRED)
         endif()
     endif()
 endif()
 
-if (HAVE_RULES)
+if(HAVE_RULES)
     find_path(PCRE_INCLUDE pcre.h)
-    find_library(PCRE_LIBRARY pcre)
-    if (NOT PCRE_LIBRARY OR NOT PCRE_INCLUDE)
+    find_library(PCRE_LIBRARY NAMES pcre pcred)
+    if(NOT PCRE_LIBRARY OR NOT PCRE_INCLUDE)
         message(FATAL_ERROR "pcre dependency for RULES has not been found")
     endif()
 endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(PythonInterp 3 QUIET)
-if (NOT PYTHONINTERP_FOUND)
-    set(PYTHONINTERP_FOUND "")
-    find_package(PythonInterp 2.7 QUIET)
-    if (NOT PYTHONINTERP_FOUND AND NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
-        message(WARNING "No python interpreter found. Therefore, the match compiler is switched off.")
+find_package(Python COMPONENTS Interpreter)
+
+if(NOT Python_Interpreter_FOUND)
+    if(NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
+        message(WARNING "No python interpreter found - disabling matchcompiler.")
         set(USE_MATCHCOMPILER_OPT "Off")
     endif()
+else()
+    if(${Python_VERSION} VERSION_LESS 3.7)
+        message(FATAL_ERROR "The minimum supported Python version is 3.7 - found ${Python_VERSION}")
+    endif()
 endif()
 
-if (NOT USE_BUNDLED_TINYXML2)
+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>)
+    if(TARGET tinyxml2::tinyxml2)
+        target_link_libraries(tinyxml2 INTERFACE tinyxml2::tinyxml2)
     else()
         find_library(tinyxml2_LIBRARIES tinyxml2)
         find_path(tinyxml2_INCLUDE_DIRS tinyxml2.h)
-        if (NOT tinyxml2_LIBRARIES AND NOT tinyxml2_INCLUDE_DIRS)
+        if(NOT tinyxml2_LIBRARIES AND NOT tinyxml2_INCLUDE_DIRS)
             message(FATAL_ERROR "tinyxml2 has not been found")
         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 (USE_BOOST)
-    # we are using the header-only "container" component
-    find_package(Boost QUIET)
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.30")
+    # avoid legacy warning about Boost lookup in CMake
+    cmake_policy(SET CMP0167 NEW)
+endif()
+
+if(USE_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}")
+        # TODO: set Boost_VERSION_STRING
+    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/options.cmake b/cmake/options.cmake
index 47e3b0997f9..7de7cb360f6 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -2,65 +2,118 @@
 #------------------------------------------------------
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRel" CACHE STRING "Configs" FORCE)
 if(DEFINED CMAKE_BUILD_TYPE)
-   SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES})
+  SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES})
 endif()
 
 if(NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE "Debug")
+  message(STATUS "No build type set - defaulting to Debug")
+  set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
 # ----------------------------------------------------------------------------
 #   PROJECT CONFIGURATION
 # ----------------------------------------------------------------------------
-option(ANALYZE_MEMORY       "Clang dynamic analyzer: detector of uninitialized reads."      OFF)
-option(ANALYZE_ADDRESS      "Clang dynamic analyzer: fast memory error detector. "          OFF)
-option(ANALYZE_THREAD       "Clang dynamic analyzer: tool that detects data races. "        OFF)
-option(ANALYZE_UNDEFINED    "Clang dynamic analyzer: undefined behavior checker. "          OFF)
-option(ANALYZE_DATAFLOW     "Clang dynamic analyzer: general dynamic dataflow analysis."    OFF)
+option(ANALYZE_MEMORY       "Build with MemorySanitizer to detect usage of uninitialized memory" OFF)
+if(ANALYZE_MEMORY)
+    message(STATUS "MemorySanitzer requires an instrumented libc++")
+endif()
+option(ANALYZE_ADDRESS      "Build with AddressSanitzer to detect memory error"             OFF)
+option(ANALYZE_THREAD       "Build with ThreadSanitizer to detect data races"               OFF)
+option(ANALYZE_UNDEFINED    "Build with UndefinedBehaviorSanitizer to detect undefined behavior" OFF)
+option(ANALYZE_TYPE         "Build with TypeSanitizer to detect aliasing issues"            OFF)
+
 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")
+    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 STREQUAL "Auto")
-    if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-        set(USE_MATCHCOMPILER_OPT "On")
+set_property(CACHE USE_MATCHCOMPILER PROPERTY STRINGS Auto Off On Verify)
+if(USE_MATCHCOMPILER)
+    if(USE_MATCHCOMPILER STREQUAL "Auto")
+        if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+            message(STATUS "Non-debug build detected - enabling matchcompiler")
+            set(USE_MATCHCOMPILER_OPT "On")
+        else()
+            message(STATUS "Debug build detected - disabling matchcompiler")
+            set(USE_MATCHCOMPILER_OPT "Off")
+        endif()
+    elseif(USE_MATCHCOMPILER STREQUAL "Verify")
+        set(USE_MATCHCOMPILER_OPT "Verify")
     else()
-        set(USE_MATCHCOMPILER_OPT "Off")
+        set(USE_MATCHCOMPILER_OPT "On")
     endif()
 else()
-    set(USE_MATCHCOMPILER_OPT ${USE_MATCHCOMPILER})
+    set(USE_MATCHCOMPILER_OPT "Off")
 endif()
 
 option(BUILD_CORE_DLL       "Build lib as cppcheck-core.dll with Visual Studio"             OFF)
-if (NOT MSVC)
-    set(BUILD_CORE_DLL OFF)
+if(BUILD_CORE_DLL AND NOT MSVC)
+    message(FATAL_ERROR "Building of lib as DLL is only supported with Visual Studio")
 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)
+if(NOT BUILD_CLI AND BUILD_TESTS)
+    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)
+
+if(NOT BUILD_GUI)
+    if(BUILD_ONLINE_HELP)
+        message(FATAL_ERROR "BUILD_ONLINE_HELP requires BUILD_GUI to be enabled")
+    endif()
+    if(BUILD_TRIAGE)
+        message(FATAL_ERROR "BUILD_TRIAGE requires BUILD_GUI to be enabled")
+    endif()
+endif()
 
 option(HAVE_RULES           "Usage of rules (needs PCRE library and headers)"               OFF)
-option(USE_BUNDLED_TINYXML2 "Usage of bundled tinyxml2 library"                             ON)
-if (BUILD_CORE_DLL)
-    set(USE_BUNDLED_TINYXML2 ON)
+option(USE_BUNDLED_TINYXML2 "Usage of bundled TinyXML2 library"                             ON)
+if(BUILD_CORE_DLL AND NOT USE_BUNDLED_TINYXML2)
+    message(FATAL_ERROR "Cannot use external TinyXML2 library when building lib as DLL")
 endif()
 option(CPPCHK_GLIBCXX_DEBUG "Usage of STL debug checks in Debug build"                      ON)
-option(USE_THREADS          "Usage of threads instead of fork() for -j"                     OFF)
-option(USE_BOOST            "Usage of Boost"                                                OFF)
+option(DISALLOW_THREAD_EXECUTOR "Disallow usage of ThreadExecutor for -j"                   OFF)
+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(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)
 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)
 
-if (CMAKE_VERSION VERSION_EQUAL "3.16" OR CMAKE_VERSION VERSION_GREATER "3.16")
+option(ENABLE_CSA_ALPHA     "Enable Clang Static Analyzer alpha checkers for run-clang-tidy-csa target"  OFF)
+
+# 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
@@ -76,5 +129,11 @@ 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)
 
-set(FILESDIR                       ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} CACHE STRING "Cppcheck files directory")
-
+string(LENGTH "${FILESDIR}" _filesdir_len)
+# override FILESDIR if it is set or empty
+if(FILESDIR OR ${_filesdir_len} EQUAL 0)
+# TODO: verify that it is an abolute path?
+    set(FILESDIR_DEF                   ${FILESDIR})
+else()
+    set(FILESDIR_DEF                   ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} CACHE STRING "Cppcheck files directory")
+endif()
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
index 97de22ee6f1..6ea93bed207 100644
--- a/cmake/printInfo.cmake
+++ b/cmake/printInfo.cmake
@@ -1,92 +1,107 @@
-message( STATUS "------------------ General configuration for ${PROJECT_NAME} ${VERSION} -----------------")
-message( STATUS )
-message( STATUS "CMake Version =         ${CMAKE_VERSION}")
-message( STATUS "CMake Generator =       ${CMAKE_GENERATOR}")
-message( STATUS "Compiler =              ${CMAKE_CXX_COMPILER_ID}")
-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_DISABLE_PRECOMPILE_HEADERS = ${CMAKE_DISABLE_PRECOMPILE_HEADERS}" )
-message( STATUS "C++ flags (General) =   ${CMAKE_CXX_FLAGS}")
-message( STATUS "C++ flags (Release) =   ${CMAKE_CXX_FLAGS_RELEASE}")
-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}" )
-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 )
-message( STATUS "COMPILE_OPTIONS (global) =  ${DirCompileOptions}" )
-message( STATUS )
-message( STATUS "---------------------------------------------------------" )
-message( STATUS "ANALYZE_MEMORY =        ${ANALYZE_MEMORY}" )
-message( STATUS "ANALYZE_ADDRESS =       ${ANALYZE_ADDRESS}" )
-message( STATUS "ANALYZE_THREAD =        ${ANALYZE_THREAD}" )
-message( STATUS "ANALYZE_UNDEFINED =     ${ANALYZE_UNDEFINED}" )
-message( STATUS "ANALYZE_DATAFLOW =      ${ANALYZE_DATAFLOW}" )
-message( STATUS "WARNINGS_ARE_ERRORS =   ${WARNINGS_ARE_ERRORS}" )
-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}")
-message( STATUS )
+message(STATUS "------------------ General configuration for ${PROJECT_NAME} ${PROJECT_VERSION} -----------------")
+message(STATUS)
+message(STATUS "CMake Version =         ${CMAKE_VERSION}")
+message(STATUS "CMake Generator =       ${CMAKE_GENERATOR}")
+message(STATUS)
+message(STATUS "Compiler =              ${CMAKE_CXX_COMPILER_ID}")
+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_DISABLE_PRECOMPILE_HEADERS = ${CMAKE_DISABLE_PRECOMPILE_HEADERS}")
+message(STATUS "C++ flags (General) =   ${CMAKE_CXX_FLAGS}")
+message(STATUS "C++ flags (Release) =   ${CMAKE_CXX_FLAGS_RELEASE}")
+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}")
+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)
+message(STATUS "COMPILE_OPTIONS (global) =  ${DirCompileOptions}")
+message(STATUS)
+if(Python_Interpreter_FOUND)
+    message(STATUS "Python_VERSION =        ${Python_VERSION}")
+    message(STATUS "Python_EXECUTABLE =     ${Python_EXECUTABLE}")
+endif()
+message(STATUS)
+message(STATUS "---------------------------------------------------------")
+message(STATUS "ANALYZE_MEMORY =        ${ANALYZE_MEMORY}")
+message(STATUS "ANALYZE_ADDRESS =       ${ANALYZE_ADDRESS}")
+message(STATUS "ANALYZE_THREAD =        ${ANALYZE_THREAD}")
+message(STATUS "ANALYZE_UNDEFINED =     ${ANALYZE_UNDEFINED}")
+message(STATUS "ANALYZE_TYPE =          ${ANALYZE_TYPE}")
+message(STATUS)
+message(STATUS "WARNINGS_ARE_ERRORS =   ${WARNINGS_ARE_ERRORS}")
+message(STATUS "EXTERNALS_AS_SYSTEM =   ${EXTERNALS_AS_SYSTEM}")
+message(STATUS)
+message(STATUS "USE_MATCHCOMPILER =     ${USE_MATCHCOMPILER}")
+message(STATUS "USE_MATCHCOMPILER_OPT = ${USE_MATCHCOMPILER_OPT}")
+message(STATUS)
+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}")
+message(STATUS)
+message(STATUS "ENABLE_CSA_ALPHA =      ${ENABLE_CSA_ALPHA}")
+message(STATUS)
 if(NOT DEFINED BUILD_SHARED_LIBS)
-    message( STATUS "BUILD_SHARED_LIBS =     OFF" )
+    message(STATUS "BUILD_SHARED_LIBS =     OFF")
 else()
-    message( STATUS "BUILD_SHARED_LIBS =     ${BUILD_SHARED_LIBS}" )
-endif(NOT DEFINED BUILD_SHARED_LIBS)
-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 "REGISTER_TESTS =        ${REGISTER_TESTS}" )
+    message(STATUS "BUILD_SHARED_LIBS =     ${BUILD_SHARED_LIBS}")
 endif()
-message( STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}" )
-message( STATUS "DISABLE_DMAKE =         ${DISABLE_DMAKE}" )
-message( STATUS )
-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}")
+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 "REGISTER_TESTS =        ${REGISTER_TESTS}")
 endif()
-message( STATUS )
-message( STATUS "HAVE_RULES =            ${HAVE_RULES}" )
-if (HAVE_RULES)
-    message( STATUS "PCRE_LIBRARY =          ${PCRE_LIBRARY}" )
+message(STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}")
+message(STATUS "DISABLE_DMAKE =         ${DISABLE_DMAKE}")
+message(STATUS "BUILD_MANPAGE =         ${BUILD_MANPAGE}")
+message(STATUS)
+message(STATUS "BUILD_CLI =             ${BUILD_CLI}")
+message(STATUS)
+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 "QT_VERSION =            ${QT_VERSION}")
+    message(STATUS "Qt6Core_LIBRARIES =     ${Qt6Core_LIBRARIES}")
+    message(STATUS "Qt6Core_INCLUDE_DIRS =  ${Qt6Core_INCLUDE_DIRS}")
+    message(STATUS "QHELPGENERATOR =        ${QHELPGENERATOR}")
 endif()
-message( STATUS )
-message( STATUS "USE_THREADS =           ${USE_THREADS}" )
-message( STATUS "CMAKE_THREAD_LIBS_INIT = ${CMAKE_THREAD_LIBS_INIT}" )
-if (NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
-    message( STATUS )
-    message( STATUS "PYTHON_VERSION_STRING = ${PYTHON_VERSION_STRING}" )
-    message( STATUS "PYTHON_EXECUTABLE =     ${PYTHON_EXECUTABLE}" )
+message(STATUS)
+message(STATUS "HAVE_RULES =            ${HAVE_RULES}")
+if(HAVE_RULES)
+    message(STATUS "PCRE_LIBRARY =          ${PCRE_LIBRARY}")
 endif()
-message( STATUS )
-message( STATUS "USE_BUNDLED_TINYXML2 =  ${USE_BUNDLED_TINYXML2}" )
-if (NOT USE_BUNDLED_TINYXML2)
+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}")
 endif()
-message( STATUS )
-message( STATUS "USE_BOOST =             ${USE_BOOST}" )
-if (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)
+message(STATUS "USE_BOOST =             ${USE_BOOST}")
+if(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}")
 endif()
-message( STATUS "USE_LIBCXX =            ${USE_LIBCXX}" )
-message( STATUS )
+message(STATUS)
+message(STATUS "USE_LIBCXX =            ${USE_LIBCXX}")
+message(STATUS)
+message(STATUS "FILESDIR =              ${FILESDIR}")
+message(STATUS "FILESDIR_DEF =          ${FILESDIR_DEF}")
+message(STATUS)
 
 if(${ANALYZE_ADDRESS})
-   message("##########################################################")
-   message(STATUS "For better visualization change environment variable: ASAN_SYMBOLIZER_PATH=/path/to/llvm-symbolizer")
-   message("##########################################################")
+  message("##########################################################")
+  message(STATUS "For better visualization change environment variable: ASAN_SYMBOLIZER_PATH=/path/to/llvm-symbolizer")
+  message("##########################################################")
 endif()
diff --git a/cmake/qtCompat.cmake b/cmake/qtCompat.cmake
index ad2b569845f..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/cmake/versions.cmake b/cmake/versions.cmake
index 3488176c896..3ff979ecb8f 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,11 +1,6 @@
 # Version for libraries CPP
 # Version string must have 3 "parts". https://sourceforge.net/p/cppcheck/discussion/development/thread/e57efb2b62/
-SET(VERSION "2.11.99")
-STRING(REGEX MATCHALL "[0-9]+" VERSION_PARTS "${VERSION}")
-LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
-LIST(GET VERSION_PARTS 1 VERSION_MINOR)
-LIST(GET VERSION_PARTS 2 VERSION_PATCH)
-SET(SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+SET(SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # Postfix of so's:
 SET(DLLVERSION "")
diff --git a/console_common.pri b/console_common.pri
deleted file mode 100644
index 9937ae5d06f..00000000000
--- a/console_common.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-# console_common.pri
-# These are common definitions for console builds.
-
-win32 {
-    CONFIG += embed_manifest_exe console
-    DEFINES += _CRT_SECURE_NO_WARNINGS
-    LIBS += -lshlwapi
-}
-
-# Add more strict compiling flags for GCC
-contains(QMAKE_CXX, g++) {
-    QMAKE_CXXFLAGS_WARN_ON += -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wlogical-op -Wno-long-long
-}
-
-# Change Visual Studio compiler (CL) warning level to W4
-contains(QMAKE_CXX, cl) {
-    QMAKE_CXXFLAGS_WARN_ON -= -W3
-    QMAKE_CXXFLAGS_WARN_ON += -W4
-}
-
-CONFIG(release, debug|release) {
-    DEFINES += NDEBUG
-}
diff --git a/cppcheck.sln b/cppcheck.sln
index 37be3fd4f79..ca26e06f2bd 100644
--- a/cppcheck.sln
+++ b/cppcheck.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29020.237
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35506.116 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli\cli.vcxproj", "{35CBDF51-2456-3EC3-99ED-113C30858883}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -15,80 +15,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrunner", "test\testrunn
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "lib\cppcheck.vcxproj", "{C183DB5B-AD6C-423D-80CA-1F9549555A1A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dmake", "tools\dmake.vcxproj", "{19EC86CD-0004-4917-B852-E6BD110B6E6F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Debug-PCRE|Win32 = Debug-PCRE|Win32
 		Debug-PCRE|x64 = Debug-PCRE|x64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		Release-PCRE|Win32 = Release-PCRE|Win32
 		Release-PCRE|x64 = Release-PCRE|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.ActiveCfg = Debug|Win32
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.Build.0 = Debug|Win32
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.ActiveCfg = Debug|x64
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.Build.0 = Debug|x64
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.ActiveCfg = Release|Win32
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.Build.0 = Release|Win32
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.ActiveCfg = Release|x64
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.Build.0 = Release|x64
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32
-		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64
 		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release-PCRE|x64.Build.0 = Release-PCRE|x64
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.Build.0 = Debug|Win32
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|x64.ActiveCfg = Debug|x64
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|x64.Build.0 = Debug|x64
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.ActiveCfg = Release|Win32
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.Build.0 = Release|Win32
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|x64.ActiveCfg = Release|x64
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|x64.Build.0 = Release|x64
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32
-		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64
 		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release-PCRE|x64.Build.0 = Release-PCRE|x64
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|Win32.Build.0 = Debug|Win32
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|x64.ActiveCfg = Debug|x64
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug|x64.Build.0 = Debug|x64
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|Win32.ActiveCfg = Debug-PCRE|Win32
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|Win32.Build.0 = Debug-PCRE|Win32
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|x64.ActiveCfg = Debug-PCRE|x64
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Debug-PCRE|x64.Build.0 = Debug-PCRE|x64
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|Win32.ActiveCfg = Release|Win32
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|Win32.Build.0 = Release|Win32
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|x64.ActiveCfg = Release|x64
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release|x64.Build.0 = Release|x64
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|Win32.ActiveCfg = Release-PCRE|Win32
-		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|Win32.Build.0 = Release-PCRE|Win32
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.ActiveCfg = Release-PCRE|x64
 		{C183DB5B-AD6C-423D-80CA-1F9549555A1A}.Release-PCRE|x64.Build.0 = Release-PCRE|x64
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|Win32.Build.0 = Debug|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug|x64.ActiveCfg = Debug|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|Win32.ActiveCfg = Debug|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|Win32.Build.0 = Debug|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Debug-PCRE|x64.ActiveCfg = Debug|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|Win32.ActiveCfg = Release|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|Win32.Build.0 = Release|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release|x64.ActiveCfg = Release|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|Win32.ActiveCfg = Release|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|Win32.Build.0 = Release|Win32
-		{19EC86CD-0004-4917-B852-E6BD110B6E6F}.Release-PCRE|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/cppcheckpremium-suppressions b/cppcheckpremium-suppressions
new file mode 100644
index 00000000000..6d3f16782bc
--- /dev/null
+++ b/cppcheckpremium-suppressions
@@ -0,0 +1,267 @@
+
+# open source warnings are handled by the selfcheck.yml
+noExplicitConstructor
+postfixOperator
+shadowFunction
+useStlAlgorithm
+normalCheckLevelMaxBranches
+
+###########################################################################################################################
+# Cert C++
+###########################################################################################################################
+
+# False positives for (a?b:c)&=true;
+premium-cert-exp35-c
+# False positives for initializations
+premium-cert-exp45-c
+# False positives when casting to uintptr
+premium-cert-int36-c
+
+# too picky
+premium-cert-arr30-c
+premium-cert-int32-c
+premium-cert-str34-c
+
+# we intentionally pass structs
+premium-cert-dcl39-c-*
+
+# we don't want to check the return values of fclose/sprintf/etc
+premium-cert-err33-c
+
+# TODO: Is there unsafe allocations, in case of exceptions) in cppcheck
+# we have global objects
+premium-cert-err58-cpp
+
+# TODO: Exception objects must be nothrow copy constructible.
+premium-cert-err60-cpp
+
+# TODO should we throw Token?
+premium-cert-err61-cpp
+
+# TODO: Detect errors when converting a string to a number. The library function 'atoi()' shall not be used.
+premium-cert-err62-cpp
+
+# TODO: Can we reduce some const_cast?
+premium-cert-exp55-cpp
+
+
+###########################################################################################################################
+# Misra C++ 2023
+###########################################################################################################################
+
+# There are false positives
+premium-misra-cpp-2023-6.5.1:lib/symboldatabase.cpp
+premium-misra-cpp-2023-6.7.2
+premium-misra-cpp-2023-8.18.2
+# False positives: #13004
+premium-misra-cpp-2023-8.2.7:lib/valueflow.cpp
+premium-misra-cpp-2023-8.2.7:lib/checkclass.cpp
+
+
+# ignored function return value (emplace etc)
+premium-misra-cpp-2023-0.1.2
+
+# TODO use named function arguments
+premium-misra-cpp-2023-0.2.2
+
+# we comment out code by intention in some cases
+premium-misra-cpp-2023-5.7.2
+
+# TODO should we use this rule?
+premium-misra-cpp-2023-5.10.1
+
+# we use octal by intention in lib/color.cpp
+premium-misra-cpp-2023-5.13.2:lib/color.cpp
+
+# we intentionally write numeric constants without suffixes
+premium-misra-cpp-2023-5.13.4
+
+# we declare variables, functions, etc in global namespace by intention
+premium-misra-cpp-2023-6.0.3
+
+# TODO use inline for template functions?
+premium-misra-cpp-2023-6.2.4
+
+# TODO ensure we don't conceal methods in derived classes
+premium-misra-cpp-2023-6.4.2
+
+# Internal linkage using "static" keyword
+premium-misra-cpp-2023-6.5.2
+
+# we use local static variables by intention
+premium-misra-cpp-2023-6.7.1
+
+# Could write good warnings but also has a warning about safe code
+premium-misra-cpp-2023-6.8.3
+
+# FIXME enforce proper ref qualifications
+premium-misra-cpp-2023-6.8.4
+
+# We intentionally use the standard integer types
+premium-misra-cpp-2023-6.9.2
+
+# we have conversion from bool to int by intention
+premium-misra-cpp-2023-7.0.1
+
+# we convert integer to bool by intention
+premium-misra-cpp-2023-7.0.2
+
+# Misra C++ is too pedantic about using character values
+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
+
+# we intentionally have array-to-pointer decay in some function calls
+premium-misra-cpp-2023-7.11.2
+
+# warns when we use callbacks
+premium-misra-cpp-2023-7.11.3
+
+# too picky about operator precedence.
+premium-misra-cpp-2023-8.0.1
+
+# TODO review lambda captures
+premium-misra-cpp-2023-8.1.1
+
+# TODO should we use this rule?
+premium-misra-cpp-2023-8.1.2
+
+# TODO use strchr instead of memchr?
+premium-misra-cpp-2023-8.2.6
+
+# intentional pointer to int conversion in lib/utils.h to output dump files
+premium-misra-cpp-2023-8.2.7:lib/utils.h
+
+# TODO check ellipsis usage
+premium-misra-cpp-2023-8.2.11
+
+# we call functions etc by intention in && || RHS
+premium-misra-cpp-2023-8.14.1
+
+# we use c-style casts by intention
+premium-misra-cpp-2023-8.2.2
+
+# we use const_cast by intention
+premium-misra-cpp-2023-8.2.3
+
+# we use recursion by intention
+premium-misra-cpp-2023-8.2.10
+
+# we separate variable declarations by intention with comma
+premium-misra-cpp-2023-8.19.1
+
+# we leave out {} sometimes
+premium-misra-cpp-2023-9.3.1
+
+# we leave out "else" by intention
+premium-misra-cpp-2023-9.4.1
+
+# looping through linked lists by intention
+premium-misra-cpp-2023-9.5.1
+
+# I believe it warns in some cases where we don't have UB
+premium-misra-cpp-2023-9.5.2
+
+# cppcheck does not understand that __builtin_unreachable() is noreturn
+premium-misra-cpp-2023-9.6.4:lib/utils.h
+
+# we declare multiple variables by intention
+premium-misra-cpp-2023-10.0.1
+
+# we do not define enum type explicitly by intention
+premium-misra-cpp-2023-10.2.1
+
+# TODO we have unscoped enums
+premium-misra-cpp-2023-10.2.2
+
+# we use arrays by intention
+premium-misra-cpp-2023-11.3.1
+
+# we dont initialize variables directly by intention
+premium-misra-cpp-2023-11.6.1
+
+# we have enums where only last constant is initialized by intention
+premium-misra-cpp-2023-11.6.3
+
+# we use unions by intention
+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.
+premium-misra-cpp-2023-13.3.3
+
+# we sometimes use both public/private data members by intention
+premium-misra-cpp-2023-14.1.1
+
+# TODO should we use this rule?
+premium-misra-cpp-2023-15.0.1
+
+# seems too picky (explicitly calling InferModel and Analyzer base class constructors even though they are defaulted).
+premium-misra-cpp-2023-15.1.2
+
+# TODO use explicit for conversion operator
+premium-misra-cpp-2023-15.1.3
+
+# TODO: should we use this rule?
+premium-misra-cpp-2023-16.6.1
+
+# TODO: should we use this rule?
+premium-misra-cpp-2023-17.8.1
+
+# TODO: should we throw token pointers?
+premium-misra-cpp-2023-18.1.1
+
+# TODO do not throw token pointer?
+premium-misra-cpp-2023-18.3.2:lib/tokenize.cpp
+
+# in smallvector we intentionally put a constant above some preprocessor includes
+premium-misra-cpp-2023-19.0.3:lib/smallvector.h
+
+# code is intentional, should cppcheck premium understand __has_cpp_attribute and compiler defines better?
+premium-misra-cpp-2023-19.1.3:lib/config.h
+
+# we use #/## by intention in some cases
+premium-misra-cpp-2023-19.3.1
+
+# We use #pragma by intention
+premium-misra-cpp-2023-19.6.1
+
+# We use atoi by intention
+premium-misra-cpp-2023-21.2.1
+
+# We use <cstring> functions by intention
+premium-misra-cpp-2023-21.2.2
+
+# We have limited use of std::getenv by intention
+premium-misra-cpp-2023-21.2.3
+
+# Dynamic memory usage in std::string etc
+premium-misra-cpp-2023-21.6.1
+
+# We use new/delete by intention sometimes
+premium-misra-cpp-2023-21.6.2
+
+# TODO use std::make_unique when we require C++14
+premium-misra-cpp-2023-23.11.1
+
+# we use <cctype> by intention
+premium-misra-cpp-2023-24.5.1
+
+# we use std::vector<bool> by intention in lib/infer.cpp but in general it should be avoided
+premium-misra-cpp-2023-26.3.1:lib/infer.cpp
+
+# TODO review that std::move is used properly
+premium-misra-cpp-2023-28.6.1
+
+# we use cstdio by intention
+premium-misra-cpp-2023-30.0.1
+
diff --git a/createrelease b/createrelease
index c99964be13d..47f9dd74ab2 100755
--- a/createrelease
+++ b/createrelease
@@ -5,18 +5,34 @@
 # Create release candidate
 # ========================
 #
+# Review trac roadmap, are tickets closed properly?
+# Only tickets that should be retargeted should be open.
+#
+# update cppcheck used in premium addon CI
+# create jira issue "CI: update cppcheck binary"
+# cd ~/cppchecksolutions/addon/tools && python3 ci-update-cppcheck.py
+#
+# 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
+#   diff -y ids1.txt ids2.txt
+# - premiumaddon: check coverage.py
+#   python3 coverage.py --id ; sort ids-*.txt | uniq > ~/cppcheck/ids3.txt
+#   diff -y ids2.txt ids3.txt
+#
 # Windows installer:
 # - 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
-# ./cppcheck -D__CPPCHECK__ -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 --xml cli gui/*.cpp lib 2> selfcheck.xml
+# 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
 #
-# Update translations
-#   lupdate gui.pro
+# 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
+# Update copyright year TODO release script
 # 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/'
 # git diff | grep '^diff --git a/'
 #
@@ -26,16 +42,18 @@
 # Update AUTHORS using output from:
 # git log --format='%aN' 2.7..HEAD | sort -u > AUTHORS2 && diff -y AUTHORS AUTHORS2 | less
 #
-# Create 2.8.x branch
-# git checkout -b 2.8.x ; git push -u origin 2.8.x
+# Update GUI translations
+# lupdate gui.pro
+#
+# Create 2.18.x branch
+# git checkout -b 2.18.x ; git push -u origin 2.18.x
+#
+# 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.9/" cli/main.cpp
-# sed -i -r "s|2[.][0-9]+([.]99)*|2.9.0|" cmake/versions.cmake # version must have 3 parts.
-# sed -i -r "s/MINOR [0-9]+/MINOR 9/" lib/version.h
-# sed -i -r "s/2[.][0-9]+([.]99)*/2.9/" win_installer/productInfo.wxi
-# sed -i -r "s/subtitle: Version 2\.[0-9]+/subtitle: Version 2.9/" man/*.md
-# Ensure that "-rc1" is added in productInfo.wxi and lib/version.h
+# python3 tools/release-set-version.py 2.19.0
 # Verify:
 # grep '\.99' */*.[ch]* && grep '[0-9][0-9] dev' */*.[ch]*
 # egrep "2\.[0-9]+" */*.h */*.cpp man/*.md | grep -v "test/test" | less
@@ -47,6 +65,8 @@
 # make dmake && ./dmake --release
 # git commit -a -m "2.8: Updated Makefile"
 #
+# Ensure that CI is happy
+#
 # Tag:
 # git tag 2.8-rc1
 # git push --tags
@@ -54,8 +74,6 @@
 # Release
 # =======
 #
-# Write release notes
-#
 # Remove "-rc1" from versions. Test: git grep "\-rc[0-9]"
 #
 # Create a release folder on sourceforge:
@@ -64,30 +82,40 @@
 # git tag 2.8 ; git push --tags
 # ./createrelease 2.8
 #
-# copy msi from release-windows
+# 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.18 safety cosmetic changes"
+#    git log --format=oneline 2.17.0..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
 #
 # save "cppcheck --doc" output on wiki
 #
 # compile new democlient:
 # ssh -t danielmarjamaki,cppcheck@shell.sourceforge.net create
-# ./build-cppcheck.sh 2.8
+# ./build-cppcheck.sh
 #
 # run daca with new release
-# 1. edit tools/donate-cpu-server.py. Update OLD_VERSION and VERSION
-# 2. scp -i ../.ssh/osuosl_id_rsa tools/donate-cpu-server.py danielmarjamaki@cppcheck1.osuosl.org:/var/daca@home/
-#
-# self check, fix stylistic issues:
-# ./cppcheck -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h cli gui/*.cpp lib
-#
-# Set debug version (see 803eea912c9512c810a7e78d58bb927d89a6daa1)
+# 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/
+#
+# Backup:
+# * 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
 
-# Tag to use
-tag=$1
+# Folder/tag to use
+folder=$1
+tag=$folder.0
 
 # Name of release
 releasename=cppcheck-$tag
@@ -98,6 +126,7 @@ cd ~/cppcheck
 
 git checkout $tag
 
+rm -rf upload
 mkdir -p upload
 
 make clean
@@ -107,16 +136,17 @@ git archive --format=tar --prefix=$releasename/ $tag | gzip > upload/$releasenam
 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/$tag/
+scp $releasename.* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
 rm $releasename.*
 cd ..
 
 # Generate version.txt
-make -j4
+make -j12
+rm -f cppcheck.cfg
 ./cppcheck --version > upload/version.txt
 
 cd ~/cppcheck/upload
-scp * danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
+scp version.txt danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
 
 cd ~/cppcheck
 rm -rf upload
@@ -128,7 +158,7 @@ cp -R ~/cppcheck/cfg .
 cp -R ~/cppcheck/addons .
 cp -R ~/cppcheck/platforms .
 cd ~/cppcheck
-make clean ; make -j4 FILESDIR=~/.cppcheck/$tag MATCHCOMPILER=yes
+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 c904ff7872f..177aff28b71 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-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
@@ -16,14 +16,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "cppcheck.h"
+#include "errorlogger.h"
+#include "errortypes.h"
+#include "filesettings.h"
+#include "settings.h"
+#include "suppressions.h"
+#include "version.h"
+
+#include <algorithm>
 #include <ctime>
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
+#include <string>
 
-#include "cppcheck.h"
-#include "version.h"
+enum class Color : std::uint8_t;
 
 static void unencode(const char *src, char *dest)
 {
@@ -47,30 +57,31 @@ static FILE *logfile = nullptr;
 class CppcheckExecutor : public ErrorLogger {
 private:
     const std::time_t stoptime;
+    Suppressions supprs;
     CppCheck cppcheck;
 
 public:
-    CppcheckExecutor()
-        : ErrorLogger()
-        , stoptime(std::time(nullptr)+2U)
-        , cppcheck(*this, false, nullptr) {
-        cppcheck.settings().addEnabled("all");
-        cppcheck.settings().certainty.enable(Certainty::inconclusive);
-    }
+    CppcheckExecutor(const Settings& settings)
+        : stoptime(std::time(nullptr)+2U)
+        , cppcheck(settings, supprs, *this, nullptr, false, nullptr)
+    {}
 
-    void run(const char code[]) {
-        cppcheck.check("test.cpp", 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 {}
     void reportErr(const ErrorMessage &msg) override {
-        const std::string s = msg.toString(true);
+        static const std::string templateFormat = "{bold}{file}:{line}:{column}: {red}{inconclusive:{magenta}}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}";
+        static const std::string templateLocation = "{bold}{file}:{line}:{column}: {dim}note:{reset} {info}\\n{code}";
+        const std::string s = msg.toString(true, templateFormat, templateLocation);
 
         std::cout << s << std::endl;
 
         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*/[],
@@ -118,7 +129,10 @@ int main()
 
     std::cout << "<html><body>Cppcheck " CPPCHECK_VERSION_STRING "<pre>";
 
-    CppcheckExecutor cppcheckExecutor;
+    Settings s;
+    s.addEnabled("all");
+    s.certainty.enable(Certainty::inconclusive);
+    CppcheckExecutor cppcheckExecutor(s);
     cppcheckExecutor.run(code);
 
     std::fclose(logfile);
diff --git a/externals/externals.pri b/externals/externals.pri
deleted file mode 100644
index 023e8053733..00000000000
--- a/externals/externals.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-INCLUDEPATH += $${PWD} \
-               $${PWD}/picojson \
-               $${PWD}/simplecpp \
-               $${PWD}/tinyxml2
-
-HEADERS += $${PWD}/picojson/picojson.h \
-           $${PWD}/simplecpp/simplecpp.h \
-           $${PWD}/tinyxml2/tinyxml2.h
-
-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
-           $${PWD}/tinyxml2/tinyxml2.cpp
diff --git a/externals/pcre.patch b/externals/pcre.patch
new file mode 100644
index 00000000000..bf23435c934
--- /dev/null
+++ b/externals/pcre.patch
@@ -0,0 +1,12 @@
+diff -urN pcre/CMakeLists.txt pcre-8.45/CMakeLists.txt
+--- pcre/CMakeLists.txt	2021-11-05 13:28:16.000000000 +0100
++++ pcre-8.45/CMakeLists.txt	2025-04-02 10:18:49.636009900 +0200
+@@ -77,7 +77,7 @@
+ # CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY.
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
+-CMAKE_POLICY(SET CMP0026 OLD)
++#CMAKE_POLICY(SET CMP0026 OLD)
+ 
+ # For FindReadline.cmake. This was changed to allow setting CMAKE_MODULE_PATH
+ # on the command line.
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/picojson/picojson.h b/externals/picojson/picojson.h
index 48bb64e6723..76742fe06ac 100644
--- a/externals/picojson/picojson.h
+++ b/externals/picojson/picojson.h
@@ -32,6 +32,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <cstddef>
 #include <iostream>
 #include <iterator>
 #include <limits>
@@ -39,972 +40,1161 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+#include <utility>
 
 // for isnan/isinf
-#if __cplusplus>=201103L
-# include <cmath>
+#if __cplusplus >= 201103L
+#include <cmath>
 #else
 extern "C" {
-# ifdef _MSC_VER
-#  include <float.h>
-# elif defined(__INTEL_COMPILER)
-#  include <mathimf.h>
-# else
-#  include <math.h>
-# endif
+#ifdef _MSC_VER
+#include <float.h>
+#elif defined(__INTEL_COMPILER)
+#include <mathimf.h>
+#else
+#include <math.h>
+#endif
 }
 #endif
 
+#ifndef PICOJSON_USE_RVALUE_REFERENCE
+#if (defined(__cpp_rvalue_references) && __cpp_rvalue_references >= 200610) || (defined(_MSC_VER) && _MSC_VER >= 1600)
+#define PICOJSON_USE_RVALUE_REFERENCE 1
+#else
+#define PICOJSON_USE_RVALUE_REFERENCE 0
+#endif
+#endif // PICOJSON_USE_RVALUE_REFERENCE
+
+#ifndef PICOJSON_NOEXCEPT
+#if PICOJSON_USE_RVALUE_REFERENCE
+#define PICOJSON_NOEXCEPT noexcept
+#else
+#define PICOJSON_NOEXCEPT throw()
+#endif
+#endif
+
 // experimental support for int64_t (see README.mkdn for detail)
 #ifdef PICOJSON_USE_INT64
-# define __STDC_FORMAT_MACROS
-# include <errno.h>
-# include <inttypes.h>
+#define __STDC_FORMAT_MACROS
+#include <cerrno>
+#if __cplusplus >= 201103L
+#include <cinttypes>
+#else
+extern "C" {
+#include <inttypes.h>
+}
+#endif
 #endif
 
 // to disable the use of localeconv(3), set PICOJSON_USE_LOCALE to 0
 #ifndef PICOJSON_USE_LOCALE
-# define PICOJSON_USE_LOCALE 1
+#define PICOJSON_USE_LOCALE 1
 #endif
 #if PICOJSON_USE_LOCALE
 extern "C" {
-# include <locale.h>
+#include <locale.h>
 }
 #endif
 
 #ifndef PICOJSON_ASSERT
-# define PICOJSON_ASSERT(e) do { if (! (e)) throw std::runtime_error(#e); } while (0)
+#define PICOJSON_ASSERT(e)                                                                                                         \
+  do {                                                                                                                             \
+    if (!(e))                                                                                                                      \
+      throw std::runtime_error(#e);                                                                                                \
+  } while (0)
 #endif
 
 #ifdef _MSC_VER
-    #define SNPRINTF _snprintf_s
-    #pragma warning(push)
-    #pragma warning(disable : 4244) // conversion from int to char
-    #pragma warning(disable : 4127) // conditional expression is constant
-    #pragma warning(disable : 4702) // unreachable code
+#define SNPRINTF _snprintf_s
+#pragma warning(push)
+#pragma warning(disable : 4244) // conversion from int to char
+#pragma warning(disable : 4127) // conditional expression is constant
+#pragma warning(disable : 4702) // unreachable code
+#pragma warning(disable : 4706) // assignment within conditional expression
 #else
-    #define SNPRINTF snprintf
+#define SNPRINTF snprintf
 #endif
 
 namespace picojson {
-  
-  enum {
-    null_type,
-    boolean_type,
-    number_type,
-    string_type,
-    array_type,
-    object_type
+
+enum {
+  null_type,
+  boolean_type,
+  number_type,
+  string_type,
+  array_type,
+  object_type
 #ifdef PICOJSON_USE_INT64
-    , int64_type
+  ,
+  int64_type
 #endif
-  };
-  
-  enum {
-    INDENT_WIDTH = 2
-  };
+};
 
-  struct null {};
-  
-  class value {
-  public:
-    typedef std::vector<value> array;
-    typedef std::map<std::string, value> object;
-    union _storage {
-      bool boolean_;
-      double number_;
-#ifdef PICOJSON_USE_INT64
-      int64_t int64_;
-#endif
-      std::string* string_;
-      array* array_;
-      object* object_;
-    };
-  protected:
-    int type_;
-    _storage u_;
-  public:
-    value();
-    value(int type, bool);
-    explicit value(bool b);
+enum { INDENT_WIDTH = 2, DEFAULT_MAX_DEPTHS = 100 };
+
+struct null {};
+
+class value {
+public:
+  typedef std::vector<value> array;
+  typedef std::map<std::string, value> object;
+  union _storage {
+    bool boolean_;
+    double number_;
 #ifdef PICOJSON_USE_INT64
-    explicit value(int64_t i);
-#endif
-    explicit value(double n);
-    explicit value(const std::string& s);
-    explicit value(const array& a);
-    explicit value(const object& o);
-    explicit value(const char* s);
-    value(const char* s, size_t len);
-    ~value();
-    value(const value& x);
-    value& operator=(const value& x);
-    void swap(value& x);
-    template <typename T> bool is() const;
-    template <typename T> const T& get() const;
-    template <typename T> T& get();
-    bool evaluate_as_boolean() const;
-    const value& get(size_t idx) const;
-    const value& get(const std::string& key) const;
-    value& get(size_t idx);
-    value& get(const std::string& key);
-
-    bool contains(size_t idx) const;
-    bool contains(const std::string& key) const;
-    std::string to_str() const;
-    template <typename Iter> void serialize(Iter os, bool prettify = false) const;
-    std::string serialize(bool prettify = false) const;
-  private:
-    template <typename T> value(const T*); // intentionally defined to block implicit conversion of pointer to bool
-    template <typename Iter> static void _indent(Iter os, int indent);
-    template <typename Iter> void _serialize(Iter os, int indent) const;
-    std::string _serialize(int indent) const;
+    int64_t int64_;
+#endif
+    std::string *string_;
+    array *array_;
+    object *object_;
   };
-  
-  typedef value::array array;
-  typedef value::object object;
-  
-  inline value::value() : type_(null_type) {}
-  
-  inline value::value(int type, bool) : type_(type) {
-    switch (type) {
-#define INIT(p, v) case p##type: u_.p = v; break
-      INIT(boolean_, false);
-      INIT(number_, 0.0);
+
+protected:
+  int type_;
+  _storage u_;
+
+public:
+  value();
+  value(int type, bool);
+  explicit value(bool b);
 #ifdef PICOJSON_USE_INT64
-      INIT(int64_, 0);
+  explicit value(int64_t i);
+#endif
+  explicit value(double n);
+  explicit value(const std::string &s);
+  explicit value(const array &a);
+  explicit value(const object &o);
+#if PICOJSON_USE_RVALUE_REFERENCE
+  explicit value(std::string &&s);
+  explicit value(array &&a);
+  explicit value(object &&o);
+#endif
+  explicit value(const char *s);
+  value(const char *s, size_t len);
+  ~value();
+  value(const value &x);
+  value &operator=(const value &x);
+#if PICOJSON_USE_RVALUE_REFERENCE
+  value(value &&x) PICOJSON_NOEXCEPT;
+  value &operator=(value &&x) PICOJSON_NOEXCEPT;
 #endif
-      INIT(string_, new std::string());
-      INIT(array_, new array());
-      INIT(object_, new object());
+  void swap(value &x) PICOJSON_NOEXCEPT;
+  template <typename T> bool is() const;
+  template <typename T> const T &get() const;
+  template <typename T> T &get();
+  template <typename T> void set(const T &);
+#if PICOJSON_USE_RVALUE_REFERENCE
+  template <typename T> void set(T &&);
+#endif
+  bool evaluate_as_boolean() const;
+  const value &get(const size_t idx) const;
+  const value &get(const std::string &key) const;
+  value &get(const size_t idx);
+  value &get(const std::string &key);
+
+  bool contains(const size_t idx) const;
+  bool contains(const std::string &key) const;
+  std::string to_str() const;
+  template <typename Iter> void serialize(Iter os, bool prettify = false) const;
+  std::string serialize(bool prettify = false) const;
+
+private:
+  template <typename T> value(const T *); // intentionally defined to block implicit conversion of pointer to bool
+  template <typename Iter> static void _indent(Iter os, int indent);
+  template <typename Iter> void _serialize(Iter os, int indent) const;
+  std::string _serialize(int indent) const;
+  void clear();
+};
+
+typedef value::array array;
+typedef value::object object;
+
+inline value::value() : type_(null_type), u_() {
+}
+
+inline value::value(int type, bool) : type_(type), u_() {
+  switch (type) {
+#define INIT(p, v)                                                                                                                 \
+  case p##type:                                                                                                                    \
+    u_.p = v;                                                                                                                      \
+    break
+    INIT(boolean_, false);
+    INIT(number_, 0.0);
+#ifdef PICOJSON_USE_INT64
+    INIT(int64_, 0);
+#endif
+    INIT(string_, new std::string());
+    INIT(array_, new array());
+    INIT(object_, new object());
 #undef INIT
-    default: break;
-    }
-  }
-  
-  inline value::value(bool b) : type_(boolean_type) {
-    u_.boolean_ = b;
+  default:
+    break;
   }
+}
+
+inline value::value(bool b) : type_(boolean_type), u_() {
+  u_.boolean_ = b;
+}
 
 #ifdef PICOJSON_USE_INT64
-  inline value::value(int64_t i) : type_(int64_type) {
-    u_.int64_ = i;
-  }
+inline value::value(int64_t i) : type_(int64_type), u_() {
+  u_.int64_ = i;
+}
 #endif
 
-  inline value::value(double n) : type_(number_type) {
-    if (
+inline value::value(double n) : type_(number_type), u_() {
+  if (
 #ifdef _MSC_VER
-        ! _finite(n)
-#elif __cplusplus>=201103L || !(defined(isnan) && defined(isinf))
-		std::isnan(n) || std::isinf(n)
+      !_finite(n)
+#elif __cplusplus >= 201103L
+      std::isnan(n) || std::isinf(n)
 #else
-        isnan(n) || isinf(n)
+      isnan(n) || isinf(n)
 #endif
-        ) {
-      throw std::overflow_error("");
-    }
-    u_.number_ = n;
-  }
-  
-  inline value::value(const std::string& s) : type_(string_type) {
-    u_.string_ = new std::string(s);
-  }
-  
-  inline value::value(const array& a) : type_(array_type) {
-    u_.array_ = new array(a);
-  }
-  
-  inline value::value(const object& o) : type_(object_type) {
-    u_.object_ = new object(o);
-  }
-  
-  inline value::value(const char* s) : type_(string_type) {
-    u_.string_ = new std::string(s);
-  }
-  
-  inline value::value(const char* s, size_t len) : type_(string_type) {
-    u_.string_ = new std::string(s, len);
-  }
-  
-  inline value::~value() {
-    switch (type_) {
-#define DEINIT(p) case p##type: delete u_.p; break
-      DEINIT(string_);
-      DEINIT(array_);
-      DEINIT(object_);
+          ) {
+    throw std::overflow_error("");
+  }
+  u_.number_ = n;
+}
+
+inline value::value(const std::string &s) : type_(string_type), u_() {
+  u_.string_ = new std::string(s);
+}
+
+inline value::value(const array &a) : type_(array_type), u_() {
+  u_.array_ = new array(a);
+}
+
+inline value::value(const object &o) : type_(object_type), u_() {
+  u_.object_ = new object(o);
+}
+
+#if PICOJSON_USE_RVALUE_REFERENCE
+inline value::value(std::string &&s) : type_(string_type), u_() {
+  u_.string_ = new std::string(std::move(s));
+}
+
+inline value::value(array &&a) : type_(array_type), u_() {
+  u_.array_ = new array(std::move(a));
+}
+
+inline value::value(object &&o) : type_(object_type), u_() {
+  u_.object_ = new object(std::move(o));
+}
+#endif
+
+inline value::value(const char *s) : type_(string_type), u_() {
+  u_.string_ = new std::string(s);
+}
+
+inline value::value(const char *s, size_t len) : type_(string_type), u_() {
+  u_.string_ = new std::string(s, len);
+}
+
+inline void value::clear() {
+  switch (type_) {
+#define DEINIT(p)                                                                                                                  \
+  case p##type:                                                                                                                    \
+    delete u_.p;                                                                                                                   \
+    break
+    DEINIT(string_);
+    DEINIT(array_);
+    DEINIT(object_);
 #undef DEINIT
-    default: break;
-    }
+  default:
+    break;
   }
-  
-  inline value::value(const value& x) : type_(x.type_) {
-    switch (type_) {
-#define INIT(p, v) case p##type: u_.p = v; break
-      INIT(string_, new std::string(*x.u_.string_));
-      INIT(array_, new array(*x.u_.array_));
-      INIT(object_, new object(*x.u_.object_));
+}
+
+inline value::~value() {
+  clear();
+}
+
+inline value::value(const value &x) : type_(x.type_), u_() {
+  switch (type_) {
+#define INIT(p, v)                                                                                                                 \
+  case p##type:                                                                                                                    \
+    u_.p = v;                                                                                                                      \
+    break
+    INIT(string_, new std::string(*x.u_.string_));
+    INIT(array_, new array(*x.u_.array_));
+    INIT(object_, new object(*x.u_.object_));
 #undef INIT
-    default:
-      u_ = x.u_;
-      break;
-    }
+  default:
+    u_ = x.u_;
+    break;
   }
-  
-  inline value& value::operator=(const value& x) {
-    if (this != &x) {
-      value t(x);
-      swap(t);
-    }
-    return *this;
-  }
-  
-  inline void value::swap(value& x) {
-    std::swap(type_, x.type_);
-    std::swap(u_, x.u_);
+}
+
+inline value &value::operator=(const value &x) {
+  if (this != &x) {
+    value t(x);
+    swap(t);
   }
-  
-#define IS(ctype, jtype)			     \
-  template <> inline bool value::is<ctype>() const { \
-    return type_ == jtype##_type;		     \
+  return *this;
+}
+
+#if PICOJSON_USE_RVALUE_REFERENCE
+inline value::value(value &&x) PICOJSON_NOEXCEPT : type_(null_type), u_() {
+  swap(x);
+}
+inline value &value::operator=(value &&x) PICOJSON_NOEXCEPT {
+  swap(x);
+  return *this;
+}
+#endif
+inline void value::swap(value &x) PICOJSON_NOEXCEPT {
+  std::swap(type_, x.type_);
+  std::swap(u_, x.u_);
+}
+
+#define IS(ctype, jtype)                                                                                                           \
+  template <> inline bool value::is<ctype>() const {                                                                               \
+    return type_ == jtype##_type;                                                                                                  \
   }
-  IS(null, null)
-  IS(bool, boolean)
+IS(null, null)
+IS(bool, boolean)
 #ifdef PICOJSON_USE_INT64
-  IS(int64_t, int64)
+IS(int64_t, int64)
 #endif
-  IS(std::string, string)
-  IS(array, array)
-  IS(object, object)
+IS(std::string, string)
+IS(array, array)
+IS(object, object)
 #undef IS
-  template <> inline bool value::is<double>() const {
-    return type_ == number_type
+template <> inline bool value::is<double>() const {
+  return type_ == number_type
 #ifdef PICOJSON_USE_INT64
-      || type_ == int64_type
+         || type_ == int64_type
 #endif
       ;
+}
+
+#define GET(ctype, var)                                                                                                            \
+  template <> inline const ctype &value::get<ctype>() const {                                                                      \
+    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()" && is<ctype>());                                           \
+    return var;                                                                                                                    \
+  }                                                                                                                                \
+  template <> inline ctype &value::get<ctype>() {                                                                                  \
+    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()" && is<ctype>());                                           \
+    return var;                                                                                                                    \
   }
-  
-#define GET(ctype, var)						\
-  template <> inline const ctype& value::get<ctype>() const {	\
-    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()" \
-	   && is<ctype>());				        \
-    return var;							\
-  }								\
-  template <> inline ctype& value::get<ctype>() {		\
-    PICOJSON_ASSERT("type mismatch! call is<type>() before get<type>()"	\
-	   && is<ctype>());					\
-    return var;							\
-  }
-  GET(bool, u_.boolean_)
-  GET(std::string, *u_.string_)
-  GET(array, *u_.array_)
-  GET(object, *u_.object_)
+GET(bool, u_.boolean_)
+GET(std::string, *u_.string_)
+GET(array, *u_.array_)
+GET(object, *u_.object_)
 #ifdef PICOJSON_USE_INT64
-  GET(double, (type_ == int64_type && (const_cast<value*>(this)->type_ = number_type, const_cast<value*>(this)->u_.number_ = u_.int64_), u_.number_))
-  GET(int64_t, u_.int64_)
+GET(double,
+    (type_ == int64_type && (const_cast<value *>(this)->type_ = number_type, (const_cast<value *>(this)->u_.number_ = u_.int64_)),
+     u_.number_))
+GET(int64_t, u_.int64_)
 #else
-  GET(double, u_.number_)
+GET(double, u_.number_)
 #endif
 #undef GET
-  
-  inline bool value::evaluate_as_boolean() const {
-    switch (type_) {
-    case null_type:
-      return false;
-    case boolean_type:
-      return u_.boolean_;
-    case number_type:
-      return u_.number_ != 0;
-    case string_type:
-      return ! u_.string_->empty();
-    default:
-      return true;
-    }
-  }
-  
-  inline const value& value::get(size_t idx) const {
-    static value s_null;
-    PICOJSON_ASSERT(is<array>());
-    return idx < u_.array_->size() ? (*u_.array_)[idx] : s_null;
-  }
 
-  inline value& value::get(size_t idx) {
-    static value s_null;
-    PICOJSON_ASSERT(is<array>());
-    return idx < u_.array_->size() ? (*u_.array_)[idx] : s_null;
+#define SET(ctype, jtype, setter)                                                                                                  \
+  template <> inline void value::set<ctype>(const ctype &_val) {                                                                   \
+    clear();                                                                                                                       \
+    type_ = jtype##_type;                                                                                                          \
+    setter                                                                                                                         \
   }
+SET(bool, boolean, u_.boolean_ = _val;)
+SET(std::string, string, u_.string_ = new std::string(_val);)
+SET(array, array, u_.array_ = new array(_val);)
+SET(object, object, u_.object_ = new object(_val);)
+SET(double, number, u_.number_ = _val;)
+#ifdef PICOJSON_USE_INT64
+SET(int64_t, int64, u_.int64_ = _val;)
+#endif
+#undef SET
 
-  inline const value& value::get(const std::string& key) const {
-    static value s_null;
-    PICOJSON_ASSERT(is<object>());
-    object::const_iterator i = u_.object_->find(key);
-    return i != u_.object_->end() ? i->second : s_null;
+#if PICOJSON_USE_RVALUE_REFERENCE
+#define MOVESET(ctype, jtype, setter)                                                                                              \
+  template <> inline void value::set<ctype>(ctype && _val) {                                                                       \
+    clear();                                                                                                                       \
+    type_ = jtype##_type;                                                                                                          \
+    setter                                                                                                                         \
   }
+MOVESET(std::string, string, u_.string_ = new std::string(std::move(_val));)
+MOVESET(array, array, u_.array_ = new array(std::move(_val));)
+MOVESET(object, object, u_.object_ = new object(std::move(_val));)
+#undef MOVESET
+#endif
 
-  inline value& value::get(const std::string& key) {
-    static value s_null;
-    PICOJSON_ASSERT(is<object>());
-    object::iterator i = u_.object_->find(key);
-    return i != u_.object_->end() ? i->second : s_null;
+inline bool value::evaluate_as_boolean() const {
+  switch (type_) {
+  case null_type:
+    return false;
+  case boolean_type:
+    return u_.boolean_;
+  case number_type:
+    return u_.number_ != 0;
+#ifdef PICOJSON_USE_INT64
+  case int64_type:
+    return u_.int64_ != 0;
+#endif
+  case string_type:
+    return !u_.string_->empty();
+  default:
+    return true;
   }
+}
 
-  inline bool value::contains(size_t idx) const {
-    PICOJSON_ASSERT(is<array>());
-    return idx < u_.array_->size();
-  }
+inline const value &value::get(const size_t idx) const {
+  static value s_null;
+  PICOJSON_ASSERT(is<array>());
+  return idx < u_.array_->size() ? (*u_.array_)[idx] : s_null;
+}
 
-  inline bool value::contains(const std::string& key) const {
-    PICOJSON_ASSERT(is<object>());
-    object::const_iterator i = u_.object_->find(key);
-    return i != u_.object_->end();
-  }
-  
-  inline std::string value::to_str() const {
-    switch (type_) {
-    case null_type:      return "null";
-    case boolean_type:   return u_.boolean_ ? "true" : "false";
+inline value &value::get(const size_t idx) {
+  static value s_null;
+  PICOJSON_ASSERT(is<array>());
+  return idx < u_.array_->size() ? (*u_.array_)[idx] : s_null;
+}
+
+inline const value &value::get(const std::string &key) const {
+  static value s_null;
+  PICOJSON_ASSERT(is<object>());
+  object::const_iterator i = u_.object_->find(key);
+  return i != u_.object_->end() ? i->second : s_null;
+}
+
+inline value &value::get(const std::string &key) {
+  static value s_null;
+  PICOJSON_ASSERT(is<object>());
+  object::iterator i = u_.object_->find(key);
+  return i != u_.object_->end() ? i->second : s_null;
+}
+
+inline bool value::contains(const size_t idx) const {
+  PICOJSON_ASSERT(is<array>());
+  return idx < u_.array_->size();
+}
+
+inline bool value::contains(const std::string &key) const {
+  PICOJSON_ASSERT(is<object>());
+  object::const_iterator i = u_.object_->find(key);
+  return i != u_.object_->end();
+}
+
+inline std::string value::to_str() const {
+  switch (type_) {
+  case null_type:
+    return "null";
+  case boolean_type:
+    return u_.boolean_ ? "true" : "false";
 #ifdef PICOJSON_USE_INT64
-    case int64_type: {
-      char buf[sizeof("-9223372036854775808")];
-      SNPRINTF(buf, sizeof(buf), "%" PRId64, u_.int64_);
-      return buf;
-    }
+  case int64_type: {
+    char buf[sizeof("-9223372036854775808")];
+    SNPRINTF(buf, sizeof(buf), "%" PRId64, u_.int64_);
+    return buf;
+  }
 #endif
-    case number_type:    {
-      char buf[256];
-      double tmp;
-      SNPRINTF(buf, sizeof(buf), fabs(u_.number_) < (1ULL << 53) && modf(u_.number_, &tmp) == 0 ? "%.f" : "%.17g", u_.number_);
+  case number_type: {
+    char buf[256];
+    double tmp;
+    SNPRINTF(buf, sizeof(buf), fabs(u_.number_) < (1ULL << 53) && modf(u_.number_, &tmp) == 0 ? "%.f" : "%.17g", u_.number_);
 #if PICOJSON_USE_LOCALE
-      char *decimal_point = localeconv()->decimal_point;
-      if (strcmp(decimal_point, ".") != 0) {
-        size_t decimal_point_len = strlen(decimal_point);
-        for (char *p = buf; *p != '\0'; ++p) {
-          if (strncmp(p, decimal_point, decimal_point_len) == 0) {
-            return std::string(buf, p) + "." + (p + decimal_point_len);
-          }
+    char *decimal_point = localeconv()->decimal_point;
+    if (strcmp(decimal_point, ".") != 0) {
+      size_t decimal_point_len = strlen(decimal_point);
+      for (char *p = buf; *p != '\0'; ++p) {
+        if (strncmp(p, decimal_point, decimal_point_len) == 0) {
+          return std::string(buf, p) + "." + (p + decimal_point_len);
         }
       }
-#endif
-      return buf;
     }
-    case string_type:    return *u_.string_;
-    case array_type:     return "array";
-    case object_type:    return "object";
-    default:             PICOJSON_ASSERT(0);
+#endif
+    return buf;
+  }
+  case string_type:
+    return *u_.string_;
+  case array_type:
+    return "array";
+  case object_type:
+    return "object";
+  default:
+    PICOJSON_ASSERT(0);
 #ifdef _MSC_VER
-      __assume(0);
+    __assume(0);
 #endif
-    }
-    return std::string();
-  }
-  
-  template <typename Iter> void copy(const std::string& s, Iter oi) {
-    std::copy(s.begin(), s.end(), oi);
-  }
-  
-  template <typename Iter> void serialize_str(const std::string& s, Iter oi) {
-    *oi++ = '"';
-    for (std::string::const_iterator i = s.begin(); i != s.end(); ++i) {
-      switch (*i) {
-#define MAP(val, sym) case val: copy(sym, oi); break
-	MAP('"', "\\\"");
-	MAP('\\', "\\\\");
-	MAP('/', "\\/");
-	MAP('\b', "\\b");
-	MAP('\f', "\\f");
-	MAP('\n', "\\n");
-	MAP('\r', "\\r");
-	MAP('\t', "\\t");
+  }
+  return std::string();
+}
+
+template <typename Iter> void copy(const std::string &s, Iter oi) {
+  std::copy(s.begin(), s.end(), oi);
+}
+
+template <typename Iter> struct serialize_str_char {
+  Iter oi;
+  void operator()(char c) {
+    switch (c) {
+#define MAP(val, sym)                                                                                                              \
+  case val:                                                                                                                        \
+    copy(sym, oi);                                                                                                                 \
+    break
+      MAP('"', "\\\"");
+      MAP('\\', "\\\\");
+      MAP('/', "\\/");
+      MAP('\b', "\\b");
+      MAP('\f', "\\f");
+      MAP('\n', "\\n");
+      MAP('\r', "\\r");
+      MAP('\t', "\\t");
 #undef MAP
-      default:
-	if (static_cast<unsigned char>(*i) < 0x20 || *i == 0x7f) {
-	  char buf[7];
-	  SNPRINTF(buf, sizeof(buf), "\\u%04x", *i & 0xff);
-	  copy(buf, buf + 6, oi);
-	  } else {
-	  *oi++ = *i;
-	}
-	break;
+    default:
+      if (static_cast<unsigned char>(c) < 0x20 || c == 0x7f) {
+        char buf[7];
+        SNPRINTF(buf, sizeof(buf), "\\u%04x", c & 0xff);
+        copy(buf, buf + 6, oi);
+      } else {
+        *oi++ = c;
       }
+      break;
     }
-    *oi++ = '"';
   }
+};
 
-  template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
-    return _serialize(oi, prettify ? 0 : -1);
-  }
-  
-  inline std::string value::serialize(bool prettify) const {
-    return _serialize(prettify ? 0 : -1);
-  }
+template <typename Iter> void serialize_str(const std::string &s, Iter oi) {
+  *oi++ = '"';
+  serialize_str_char<Iter> process_char = {oi};
+  std::for_each(s.begin(), s.end(), process_char);
+  *oi++ = '"';
+}
 
-  template <typename Iter> void value::_indent(Iter oi, int indent) {
-    *oi++ = '\n';
-    for (int i = 0; i < indent * INDENT_WIDTH; ++i) {
-      *oi++ = ' ';
-    }
+template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
+  return _serialize(oi, prettify ? 0 : -1);
+}
+
+inline std::string value::serialize(bool prettify) const {
+  return _serialize(prettify ? 0 : -1);
+}
+
+template <typename Iter> void value::_indent(Iter oi, int indent) {
+  *oi++ = '\n';
+  for (int i = 0; i < indent * INDENT_WIDTH; ++i) {
+    *oi++ = ' ';
   }
+}
 
-  template <typename Iter> void value::_serialize(Iter oi, int indent) const {
-    switch (type_) {
-    case string_type:
-      serialize_str(*u_.string_, oi);
-      break;
-    case array_type: {
-      *oi++ = '[';
-      if (indent != -1) {
-        ++indent;
-      }
-      for (array::const_iterator i = u_.array_->begin();
-           i != u_.array_->end();
-           ++i) {
-	if (i != u_.array_->begin()) {
-	  *oi++ = ',';
-	}
-        if (indent != -1) {
-          _indent(oi, indent);
-        }
-	i->_serialize(oi, indent);
+template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+  switch (type_) {
+  case string_type:
+    serialize_str(*u_.string_, oi);
+    break;
+  case array_type: {
+    *oi++ = '[';
+    if (indent != -1) {
+      ++indent;
+    }
+    for (array::const_iterator i = u_.array_->begin(); i != u_.array_->end(); ++i) {
+      if (i != u_.array_->begin()) {
+        *oi++ = ',';
       }
       if (indent != -1) {
-        --indent;
-        if (! u_.array_->empty()) {
-          _indent(oi, indent);
-        }
+        _indent(oi, indent);
       }
-      *oi++ = ']';
-      break;
+      i->_serialize(oi, indent);
     }
-    case object_type: {
-      *oi++ = '{';
-      if (indent != -1) {
-        ++indent;
+    if (indent != -1) {
+      --indent;
+      if (!u_.array_->empty()) {
+        _indent(oi, indent);
       }
-      for (object::const_iterator i = u_.object_->begin();
-	   i != u_.object_->end();
-	   ++i) {
-	if (i != u_.object_->begin()) {
-	  *oi++ = ',';
-	}
-        if (indent != -1) {
-          _indent(oi, indent);
-        }
-	serialize_str(i->first, oi);
-	*oi++ = ':';
-        if (indent != -1) {
-          *oi++ = ' ';
-        }
-        i->second._serialize(oi, indent);
+    }
+    *oi++ = ']';
+    break;
+  }
+  case object_type: {
+    *oi++ = '{';
+    if (indent != -1) {
+      ++indent;
+    }
+    for (object::const_iterator i = u_.object_->begin(); i != u_.object_->end(); ++i) {
+      if (i != u_.object_->begin()) {
+        *oi++ = ',';
       }
       if (indent != -1) {
-        --indent;
-        if (! u_.object_->empty()) {
-          _indent(oi, indent);
-        }
+        _indent(oi, indent);
       }
-      *oi++ = '}';
-      break;
-    }
-    default:
-      copy(to_str(), oi);
-      break;
+      serialize_str(i->first, oi);
+      *oi++ = ':';
+      if (indent != -1) {
+        *oi++ = ' ';
+      }
+      i->second._serialize(oi, indent);
     }
-    if (indent == 0) {
-      *oi++ = '\n';
+    if (indent != -1) {
+      --indent;
+      if (!u_.object_->empty()) {
+        _indent(oi, indent);
+      }
     }
+    *oi++ = '}';
+    break;
   }
-  
-  inline std::string value::_serialize(int indent) const {
-    std::string s;
-    _serialize(std::back_inserter(s), indent);
-    return s;
-  }
-  
-  template <typename Iter> class input {
-  protected:
-    Iter cur_, end_;
-    int last_ch_;
-    bool ungot_;
-    int line_;
-  public:
-    input(const Iter& first, const Iter& last) : cur_(first), end_(last), last_ch_(-1), ungot_(false), line_(1) {}
-    int getc() {
-      if (ungot_) {
-	ungot_ = false;
-	return last_ch_;
-      }
-      if (cur_ == end_) {
-	last_ch_ = -1;
-	return -1;
-      }
-      if (last_ch_ == '\n') {
-	line_++;
+  default:
+    copy(to_str(), oi);
+    break;
+  }
+  if (indent == 0) {
+    *oi++ = '\n';
+  }
+}
+
+inline std::string value::_serialize(int indent) const {
+  std::string s;
+  _serialize(std::back_inserter(s), indent);
+  return s;
+}
+
+template <typename Iter> class input {
+protected:
+  Iter cur_, end_;
+  bool consumed_;
+  int line_;
+
+public:
+  input(const Iter &first, const Iter &last) : cur_(first), end_(last), consumed_(false), line_(1) {
+  }
+  int getc() {
+    if (consumed_) {
+      if (*cur_ == '\n') {
+        ++line_;
       }
-      last_ch_ = *cur_ & 0xff;
       ++cur_;
-      return last_ch_;
     }
-    void ungetc() {
-      if (last_ch_ != -1) {
-	PICOJSON_ASSERT(! ungot_);
-	ungot_ = true;
-      }
+    if (cur_ == end_) {
+      consumed_ = false;
+      return -1;
     }
-    Iter cur() const { return cur_; }
-    int line() const { return line_; }
-    void skip_ws() {
-      while (1) {
-	int ch = getc();
-	if (! (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')) {
-	  ungetc();
-	  break;
-	}
-      }
+    consumed_ = true;
+    return *cur_ & 0xff;
+  }
+  void ungetc() {
+    consumed_ = false;
+  }
+  Iter cur() const {
+    if (consumed_) {
+      input<Iter> *self = const_cast<input<Iter> *>(this);
+      self->consumed_ = false;
+      ++self->cur_;
     }
-    bool expect(int expect) {
-      skip_ws();
-      if (getc() != expect) {
-	ungetc();
-	return false;
+    return cur_;
+  }
+  int line() const {
+    return line_;
+  }
+  void skip_ws() {
+    while (1) {
+      int ch = getc();
+      if (!(ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')) {
+        ungetc();
+        break;
       }
-      return true;
     }
-    bool match(const std::string& pattern) {
-      for (std::string::const_iterator pi(pattern.begin());
-	   pi != pattern.end();
-	   ++pi) {
-	if (getc() != *pi) {
-	  ungetc();
-	  return false;
-	}
-      }
-      return true;
+  }
+  bool expect(const int expected) {
+    skip_ws();
+    if (getc() != expected) {
+      ungetc();
+      return false;
     }
-  };
-  
-  template<typename Iter> inline int _parse_quadhex(input<Iter> &in) {
-    int uni_ch = 0, hex;
-    for (int i = 0; i < 4; i++) {
-      if ((hex = in.getc()) == -1) {
-	return -1;
-      }
-      if ('0' <= hex && hex <= '9') {
-	hex -= '0';
-      } else if ('A' <= hex && hex <= 'F') {
-	hex -= 'A' - 0xa;
-      } else if ('a' <= hex && hex <= 'f') {
-	hex -= 'a' - 0xa;
-      } else {
-	in.ungetc();
-	return -1;
+    return true;
+  }
+  bool match(const std::string &pattern) {
+    for (std::string::const_iterator pi(pattern.begin()); pi != pattern.end(); ++pi) {
+      if (getc() != *pi) {
+        ungetc();
+        return false;
       }
-      uni_ch = uni_ch * 16 + hex;
     }
-    return uni_ch;
+    return true;
+  }
+};
+
+template <typename Iter> inline int _parse_quadhex(input<Iter> &in) {
+  int uni_ch = 0, hex;
+  for (int i = 0; i < 4; i++) {
+    if ((hex = in.getc()) == -1) {
+      return -1;
+    }
+    if ('0' <= hex && hex <= '9') {
+      hex -= '0';
+    } else if ('A' <= hex && hex <= 'F') {
+      hex -= 'A' - 0xa;
+    } else if ('a' <= hex && hex <= 'f') {
+      hex -= 'a' - 0xa;
+    } else {
+      in.ungetc();
+      return -1;
+    }
+    uni_ch = uni_ch * 16 + hex;
   }
-  
-  template<typename String, typename Iter> inline bool _parse_codepoint(String& out, input<Iter>& in) {
-    int uni_ch;
-    if ((uni_ch = _parse_quadhex(in)) == -1) {
+  return uni_ch;
+}
+
+template <typename String, typename Iter> inline bool _parse_codepoint(String &out, input<Iter> &in) {
+  int uni_ch;
+  if ((uni_ch = _parse_quadhex(in)) == -1) {
+    return false;
+  }
+  if (0xd800 <= uni_ch && uni_ch <= 0xdfff) {
+    if (0xdc00 <= uni_ch) {
+      // a second 16-bit of a surrogate pair appeared
       return false;
     }
-    if (0xd800 <= uni_ch && uni_ch <= 0xdfff) {
-      if (0xdc00 <= uni_ch) {
-	// a second 16-bit of a surrogate pair appeared
-	return false;
-      }
-      // first 16-bit of surrogate pair, get the next one
-      if (in.getc() != '\\' || in.getc() != 'u') {
-	in.ungetc();
-	return false;
-      }
-      int second = _parse_quadhex(in);
-      if (! (0xdc00 <= second && second <= 0xdfff)) {
-	return false;
-      }
-      uni_ch = ((uni_ch - 0xd800) << 10) | ((second - 0xdc00) & 0x3ff);
-      uni_ch += 0x10000;
+    // first 16-bit of surrogate pair, get the next one
+    if (in.getc() != '\\' || in.getc() != 'u') {
+      in.ungetc();
+      return false;
+    }
+    int second = _parse_quadhex(in);
+    if (!(0xdc00 <= second && second <= 0xdfff)) {
+      return false;
     }
-    if (uni_ch < 0x80) {
-      out.push_back(uni_ch);
+    uni_ch = ((uni_ch - 0xd800) << 10) | ((second - 0xdc00) & 0x3ff);
+    uni_ch += 0x10000;
+  }
+  if (uni_ch < 0x80) {
+    out.push_back(static_cast<char>(uni_ch));
+  } else {
+    if (uni_ch < 0x800) {
+      out.push_back(static_cast<char>(0xc0 | (uni_ch >> 6)));
     } else {
-      if (uni_ch < 0x800) {
-	out.push_back(0xc0 | (uni_ch >> 6));
+      if (uni_ch < 0x10000) {
+        out.push_back(static_cast<char>(0xe0 | (uni_ch >> 12)));
       } else {
-	if (uni_ch < 0x10000) {
-	  out.push_back(0xe0 | (uni_ch >> 12));
-	} else {
-	  out.push_back(0xf0 | (uni_ch >> 18));
-	  out.push_back(0x80 | ((uni_ch >> 12) & 0x3f));
-	}
-	out.push_back(0x80 | ((uni_ch >> 6) & 0x3f));
+        out.push_back(static_cast<char>(0xf0 | (uni_ch >> 18)));
+        out.push_back(static_cast<char>(0x80 | ((uni_ch >> 12) & 0x3f)));
       }
-      out.push_back(0x80 | (uni_ch & 0x3f));
+      out.push_back(static_cast<char>(0x80 | ((uni_ch >> 6) & 0x3f)));
     }
-    return true;
+    out.push_back(static_cast<char>(0x80 | (uni_ch & 0x3f)));
   }
-  
-  template<typename String, typename Iter> inline bool _parse_string(String& out, input<Iter>& in) {
-    while (1) {
-      int ch = in.getc();
-      if (ch < ' ') {
-	in.ungetc();
-	return false;
-      } else if (ch == '"') {
-	return true;
-      } else if (ch == '\\') {
-	if ((ch = in.getc()) == -1) {
-	  return false;
-	}
-	switch (ch) {
-#define MAP(sym, val) case sym: out.push_back(val); break
-	  MAP('"', '\"');
-	  MAP('\\', '\\');
-	  MAP('/', '/');
-	  MAP('b', '\b');
-	  MAP('f', '\f');
-	  MAP('n', '\n');
-	  MAP('r', '\r');
-	  MAP('t', '\t');
+  return true;
+}
+
+template <typename String, typename Iter> inline bool _parse_string(String &out, input<Iter> &in) {
+  while (1) {
+    int ch = in.getc();
+    if (ch < ' ') {
+      in.ungetc();
+      return false;
+    } else if (ch == '"') {
+      return true;
+    } else if (ch == '\\') {
+      if ((ch = in.getc()) == -1) {
+        return false;
+      }
+      switch (ch) {
+#define MAP(sym, val)                                                                                                              \
+  case sym:                                                                                                                        \
+    out.push_back(val);                                                                                                            \
+    break
+        MAP('"', '\"');
+        MAP('\\', '\\');
+        MAP('/', '/');
+        MAP('b', '\b');
+        MAP('f', '\f');
+        MAP('n', '\n');
+        MAP('r', '\r');
+        MAP('t', '\t');
 #undef MAP
-	case 'u':
-	  if (! _parse_codepoint(out, in)) {
-	    return false;
-	  }
-	  break;
-	default:
-	  return false;
-	}
-      } else {
-	out.push_back(ch);
+      case 'u':
+        if (!_parse_codepoint(out, in)) {
+          return false;
+        }
+        break;
+      default:
+        return false;
       }
+    } else {
+      out.push_back(static_cast<char>(ch));
     }
+  }
+  return false;
+}
+
+template <typename Context, typename Iter> inline bool _parse_array(Context &ctx, input<Iter> &in) {
+  if (!ctx.parse_array_start()) {
     return false;
   }
-  
-  template <typename Context, typename Iter> inline bool _parse_array(Context& ctx, input<Iter>& in) {
-    if (! ctx.parse_array_start()) {
+  size_t idx = 0;
+  if (in.expect(']')) {
+    return ctx.parse_array_stop(idx);
+  }
+  do {
+    if (!ctx.parse_array_item(in, idx)) {
       return false;
     }
-    size_t idx = 0;
-    if (in.expect(']')) {
-      return ctx.parse_array_stop(idx);
-    }
-    do {
-      if (! ctx.parse_array_item(in, idx)) {
-	return false;
-      }
-      idx++;
-    } while (in.expect(','));
-    return in.expect(']') && ctx.parse_array_stop(idx);
+    idx++;
+  } while (in.expect(','));
+  return in.expect(']') && ctx.parse_array_stop(idx);
+}
+
+template <typename Context, typename Iter> inline bool _parse_object(Context &ctx, input<Iter> &in) {
+  if (!ctx.parse_object_start()) {
+    return false;
   }
-  
-  template <typename Context, typename Iter> inline bool _parse_object(Context& ctx, input<Iter>& in) {
-    if (! ctx.parse_object_start()) {
+  if (in.expect('}')) {
+    return ctx.parse_object_stop();
+  }
+  do {
+    std::string key;
+    if (!in.expect('"') || !_parse_string(key, in) || !in.expect(':')) {
       return false;
     }
-    if (in.expect('}')) {
-      return true;
+    if (!ctx.parse_object_item(in, key)) {
+      return false;
     }
-    do {
-      std::string key;
-      if (! in.expect('"')
-	  || ! _parse_string(key, in)
-	  || ! in.expect(':')) {
-	return false;
-      }
-      if (! ctx.parse_object_item(in, key)) {
-	return false;
-      }
-    } while (in.expect(','));
-    return in.expect('}');
-  }
-  
-  template <typename Iter> inline std::string _parse_number(input<Iter>& in) {
-    std::string num_str;
-    while (1) {
-      int ch = in.getc();
-      if (('0' <= ch && ch <= '9') || ch == '+' || ch == '-'
-          || ch == 'e' || ch == 'E') {
-        num_str.push_back(ch);
-      } else if (ch == '.') {
+  } while (in.expect(','));
+  return in.expect('}') && ctx.parse_object_stop();
+}
+
+template <typename Iter> inline std::string _parse_number(input<Iter> &in) {
+  std::string num_str;
+  while (1) {
+    int ch = in.getc();
+    if (('0' <= ch && ch <= '9') || ch == '+' || ch == '-' || ch == 'e' || ch == 'E') {
+      num_str.push_back(static_cast<char>(ch));
+    } else if (ch == '.') {
 #if PICOJSON_USE_LOCALE
-        num_str += localeconv()->decimal_point;
+      num_str += localeconv()->decimal_point;
 #else
-        num_str.push_back('.');
+      num_str.push_back('.');
 #endif
-      } else {
-	in.ungetc();
-	break;
-      }
+    } else {
+      in.ungetc();
+      break;
     }
-    return num_str;
   }
-  
-  template <typename Context, typename Iter> inline bool _parse(Context& ctx, input<Iter>& in) {
-    in.skip_ws();
-    int ch = in.getc();
-    switch (ch) {
-#define IS(ch, text, op) case ch: \
-      if (in.match(text) && op) { \
-	return true; \
-      } else { \
-	return false; \
-      }
-      IS('n', "ull", ctx.set_null());
-      IS('f', "alse", ctx.set_bool(false));
-      IS('t', "rue", ctx.set_bool(true));
+  return num_str;
+}
+
+template <typename Context, typename Iter> inline bool _parse(Context &ctx, input<Iter> &in) {
+  in.skip_ws();
+  int ch = in.getc();
+  switch (ch) {
+#define IS(ch, text, op)                                                                                                           \
+  case ch:                                                                                                                         \
+    if (in.match(text) && op) {                                                                                                    \
+      return true;                                                                                                                 \
+    } else {                                                                                                                       \
+      return false;                                                                                                                \
+    }
+    IS('n', "ull", ctx.set_null());
+    IS('f', "alse", ctx.set_bool(false));
+    IS('t', "rue", ctx.set_bool(true));
 #undef IS
-    case '"':
-      return ctx.parse_string(in);
-    case '[':
-      return _parse_array(ctx, in);
-    case '{':
-      return _parse_object(ctx, in);
-    default:
-      if (('0' <= ch && ch <= '9') || ch == '-') {
-        double f;
-        char *endp;
-	in.ungetc();
-        std::string num_str = _parse_number(in);
-        if (num_str.empty()) {
-          return false;
-        }
+  case '"':
+    return ctx.parse_string(in);
+  case '[':
+    return _parse_array(ctx, in);
+  case '{':
+    return _parse_object(ctx, in);
+  default:
+    if (('0' <= ch && ch <= '9') || ch == '-') {
+      double f;
+      char *endp;
+      in.ungetc();
+      std::string num_str(_parse_number(in));
+      if (num_str.empty()) {
+        return false;
+      }
 #ifdef PICOJSON_USE_INT64
-        {
-          errno = 0;
-          intmax_t ival = strtoimax(num_str.c_str(), &endp, 10);
-          if (errno == 0
-              && std::numeric_limits<int64_t>::min() <= ival
-              && ival <= std::numeric_limits<int64_t>::max()
-              && endp == num_str.c_str() + num_str.size()) {
-            ctx.set_int64(ival);
-            return true;
-          }
-        }
-#endif
-        f = strtod(num_str.c_str(), &endp);
-        if (endp == num_str.c_str() + num_str.size()) {
-          ctx.set_number(f);
+      {
+        errno = 0;
+        intmax_t ival = strtoimax(num_str.c_str(), &endp, 10);
+        if (errno == 0 && std::numeric_limits<int64_t>::min() <= ival && ival <= std::numeric_limits<int64_t>::max() &&
+            endp == num_str.c_str() + num_str.size()) {
+          ctx.set_int64(ival);
           return true;
         }
-        return false;
       }
-      break;
+#endif
+      f = strtod(num_str.c_str(), &endp);
+      if (endp == num_str.c_str() + num_str.size()) {
+        ctx.set_number(f);
+        return true;
+      }
+      return false;
     }
-    in.ungetc();
+    break;
+  }
+  in.ungetc();
+  return false;
+}
+
+class deny_parse_context {
+public:
+  bool set_null() {
+    return false;
+  }
+  bool set_bool(bool) {
     return false;
   }
-  
-  class deny_parse_context {
-  public:
-    bool set_null() { return false; }
-    bool set_bool(bool) { return false; }
 #ifdef PICOJSON_USE_INT64
-    bool set_int64(int64_t) { return false; }
+  bool set_int64(int64_t) {
+    return false;
+  }
 #endif
-    bool set_number(double) { return false; }
-    template <typename Iter> bool parse_string(input<Iter>&) { return false; }
-    bool parse_array_start() { return false; }
-    template <typename Iter> bool parse_array_item(input<Iter>&, size_t) {
-      return false;
-    }
-    bool parse_array_stop(size_t) { return false; }
-    bool parse_object_start() { return false; }
-    template <typename Iter> bool parse_object_item(input<Iter>&, const std::string&) {
-      return false;
-    }
-  };
-  
-  class default_parse_context {
-  protected:
-    value* out_;
-  public:
-    default_parse_context(value* out) : out_(out) {}
-    bool set_null() {
-      *out_ = value();
-      return true;
-    }
-    bool set_bool(bool b) {
-      *out_ = value(b);
-      return true;
-    }
+  bool set_number(double) {
+    return false;
+  }
+  template <typename Iter> bool parse_string(input<Iter> &) {
+    return false;
+  }
+  bool parse_array_start() {
+    return false;
+  }
+  template <typename Iter> bool parse_array_item(input<Iter> &, size_t) {
+    return false;
+  }
+  bool parse_array_stop(size_t) {
+    return false;
+  }
+  bool parse_object_start() {
+    return false;
+  }
+  template <typename Iter> bool parse_object_item(input<Iter> &, const std::string &) {
+    return false;
+  }
+};
+
+class default_parse_context {
+protected:
+  value *out_;
+  size_t depths_;
+
+public:
+  default_parse_context(value *out, size_t depths = DEFAULT_MAX_DEPTHS) : out_(out), depths_(depths) {
+  }
+  bool set_null() {
+    *out_ = value();
+    return true;
+  }
+  bool set_bool(bool b) {
+    *out_ = value(b);
+    return true;
+  }
 #ifdef PICOJSON_USE_INT64
-    bool set_int64(int64_t i) {
-      *out_ = value(i);
-      return true;
-    }
+  bool set_int64(int64_t i) {
+    *out_ = value(i);
+    return true;
+  }
 #endif
-    bool set_number(double f) {
-      *out_ = value(f);
-      return true;
-    }
-    template<typename Iter> bool parse_string(input<Iter>& in) {
-      *out_ = value(string_type, false);
-      return _parse_string(out_->get<std::string>(), in);
-    }
-    bool parse_array_start() {
-      *out_ = value(array_type, false);
-      return true;
-    }
-    template <typename Iter> bool parse_array_item(input<Iter>& in, size_t) {
-      array& a = out_->get<array>();
-      a.push_back(value());
-      default_parse_context ctx(&a.back());
-      return _parse(ctx, in);
-    }
-    bool parse_array_stop(size_t) { return true; }
-    bool parse_object_start() {
-      *out_ = value(object_type, false);
-      return true;
-    }
-    template <typename Iter> bool parse_object_item(input<Iter>& in, const std::string& key) {
-      object& o = out_->get<object>();
-      default_parse_context ctx(&o[key]);
-      return _parse(ctx, in);
+  bool set_number(double f) {
+    *out_ = value(f);
+    return true;
+  }
+  template <typename Iter> bool parse_string(input<Iter> &in) {
+    *out_ = value(string_type, false);
+    return _parse_string(out_->get<std::string>(), in);
+  }
+  bool parse_array_start() {
+    if (depths_ == 0)
+      return false;
+    --depths_;
+    *out_ = value(array_type, false);
+    return true;
+  }
+  template <typename Iter> bool parse_array_item(input<Iter> &in, size_t) {
+    array &a = out_->get<array>();
+    a.push_back(value());
+    default_parse_context ctx(&a.back(), depths_);
+    return _parse(ctx, in);
+  }
+  bool parse_array_stop(size_t) {
+    ++depths_;
+    return true;
+  }
+  bool parse_object_start() {
+    if (depths_ == 0)
+      return false;
+    *out_ = value(object_type, false);
+    return true;
+  }
+  template <typename Iter> bool parse_object_item(input<Iter> &in, const std::string &key) {
+    object &o = out_->get<object>();
+    default_parse_context ctx(&o[key], depths_);
+    return _parse(ctx, in);
+  }
+  bool parse_object_stop() {
+    ++depths_;
+    return true;
+  }
+
+private:
+  default_parse_context(const default_parse_context &);
+  default_parse_context &operator=(const default_parse_context &);
+};
+
+class null_parse_context {
+protected:
+  size_t depths_;
+
+public:
+  struct dummy_str {
+    void push_back(int) {
     }
-  private:
-    default_parse_context(const default_parse_context&);
-    default_parse_context& operator=(const default_parse_context&);
   };
 
-  class null_parse_context {
-  public:
-    struct dummy_str {
-      void push_back(int) {}
-    };
-  public:
-    null_parse_context() {}
-    bool set_null() { return true; }
-    bool set_bool(bool) { return true; }
+public:
+  null_parse_context(size_t depths = DEFAULT_MAX_DEPTHS) : depths_(depths) {
+  }
+  bool set_null() {
+    return true;
+  }
+  bool set_bool(bool) {
+    return true;
+  }
 #ifdef PICOJSON_USE_INT64
-    bool set_int64(int64_t) { return true; }
+  bool set_int64(int64_t) {
+    return true;
+  }
 #endif
-    bool set_number(double) { return true; }
-    template <typename Iter> bool parse_string(input<Iter>& in) {
-      dummy_str s;
-      return _parse_string(s, in);
-    }
-    bool parse_array_start() { return true; }
-    template <typename Iter> bool parse_array_item(input<Iter>& in, size_t) {
-      return _parse(*this, in);
-    }
-    bool parse_array_stop(size_t) { return true; }
-    bool parse_object_start() { return true; }
-    template <typename Iter> bool parse_object_item(input<Iter>& in, const std::string&) {
-      return _parse(*this, in);
-    }
-  private:
-    null_parse_context(const null_parse_context&);
-    null_parse_context& operator=(const null_parse_context&);
-  };
-  
-  // obsolete, use the version below
-  template <typename Iter> inline std::string parse(value& out, Iter& pos, const Iter& last) {
-    std::string err;
-    pos = parse(out, pos, last, &err);
-    return err;
-  }
-  
-  template <typename Context, typename Iter> inline Iter _parse(Context& ctx, const Iter& first, const Iter& last, std::string* err) {
-    input<Iter> in(first, last);
-    if (! _parse(ctx, in) && err != NULL) {
-      char buf[64];
-      SNPRINTF(buf, sizeof(buf), "syntax error at line %d near: ", in.line());
-      *err = buf;
-      while (1) {
-	int ch = in.getc();
-	if (ch == -1 || ch == '\n') {
-	  break;
-	} else if (ch >= ' ') {
-	  err->push_back(ch);
-	}
-      }
-    }
-    return in.cur();
+  bool set_number(double) {
+    return true;
+  }
+  template <typename Iter> bool parse_string(input<Iter> &in) {
+    dummy_str s;
+    return _parse_string(s, in);
+  }
+  bool parse_array_start() {
+    if (depths_ == 0)
+      return false;
+    --depths_;
+    return true;
+  }
+  template <typename Iter> bool parse_array_item(input<Iter> &in, size_t) {
+    return _parse(*this, in);
+  }
+  bool parse_array_stop(size_t) {
+    ++depths_;
+    return true;
   }
-  
-  template <typename Iter> inline Iter parse(value& out, const Iter& first, const Iter& last, std::string* err) {
-    default_parse_context ctx(&out);
-    return _parse(ctx, first, last, err);
+  bool parse_object_start() {
+    if (depths_ == 0)
+      return false;
+    --depths_;
+    return true;
+  }
+  template <typename Iter> bool parse_object_item(input<Iter> &in, const std::string &) {
+    ++depths_;
+    return _parse(*this, in);
   }
-  
-  inline std::string parse(value& out, const std::string& s) {
-    std::string err;
-    parse(out, s.begin(), s.end(), &err);
-    return err;
+  bool parse_object_stop() {
+    return true;
   }
 
-  inline std::string parse(value& out, std::istream& is) {
-    std::string err;
-    parse(out, std::istreambuf_iterator<char>(is.rdbuf()),
-	  std::istreambuf_iterator<char>(), &err);
-    return err;
+private:
+  null_parse_context(const null_parse_context &);
+  null_parse_context &operator=(const null_parse_context &);
+};
+
+// obsolete, use the version below
+template <typename Iter> inline std::string parse(value &out, Iter &pos, const Iter &last) {
+  std::string err;
+  pos = parse(out, pos, last, &err);
+  return err;
+}
+
+template <typename Context, typename Iter> inline Iter _parse(Context &ctx, const Iter &first, const Iter &last, std::string *err) {
+  input<Iter> in(first, last);
+  if (!_parse(ctx, in) && err != NULL) {
+    char buf[64];
+    SNPRINTF(buf, sizeof(buf), "syntax error at line %d near: ", in.line());
+    *err = buf;
+    while (1) {
+      int ch = in.getc();
+      if (ch == -1 || ch == '\n') {
+        break;
+      } else if (ch >= ' ') {
+        err->push_back(static_cast<char>(ch));
+      }
+    }
   }
-  
-  template <typename T> struct last_error_t {
-    static std::string s;
-  };
-  template <typename T> std::string last_error_t<T>::s;
-  
-  inline void set_last_error(const std::string& s) {
-    last_error_t<bool>::s = s;
-  }
-  
-  inline const std::string& get_last_error() {
-    return last_error_t<bool>::s;
-  }
-
-  inline bool operator==(const value& x, const value& y) {
-    if (x.is<null>())
-      return y.is<null>();
-#define PICOJSON_CMP(type)					\
-    if (x.is<type>())						\
-      return y.is<type>() && x.get<type>() == y.get<type>()
-    PICOJSON_CMP(bool);
-    PICOJSON_CMP(double);
-    PICOJSON_CMP(std::string);
-    PICOJSON_CMP(array);
-    PICOJSON_CMP(object);
+  return in.cur();
+}
+
+template <typename Iter> inline Iter parse(value &out, const Iter &first, const Iter &last, std::string *err) {
+  default_parse_context ctx(&out);
+  return _parse(ctx, first, last, err);
+}
+
+inline std::string parse(value &out, const std::string &s) {
+  std::string err;
+  parse(out, s.begin(), s.end(), &err);
+  return err;
+}
+
+inline std::string parse(value &out, std::istream &is) {
+  std::string err;
+  parse(out, std::istreambuf_iterator<char>(is.rdbuf()), std::istreambuf_iterator<char>(), &err);
+  return err;
+}
+
+template <typename T> struct last_error_t { static std::string s; };
+template <typename T> std::string last_error_t<T>::s;
+
+inline void set_last_error(const std::string &s) {
+  last_error_t<bool>::s = s;
+}
+
+inline const std::string &get_last_error() {
+  return last_error_t<bool>::s;
+}
+
+inline bool operator==(const value &x, const value &y) {
+  if (x.is<null>())
+    return y.is<null>();
+#define PICOJSON_CMP(type)                                                                                                         \
+  if (x.is<type>())                                                                                                                \
+  return y.is<type>() && x.get<type>() == y.get<type>()
+  PICOJSON_CMP(bool);
+  PICOJSON_CMP(double);
+  PICOJSON_CMP(std::string);
+  PICOJSON_CMP(array);
+  PICOJSON_CMP(object);
 #undef PICOJSON_CMP
-    PICOJSON_ASSERT(0);
+  PICOJSON_ASSERT(0);
 #ifdef _MSC_VER
-    __assume(0);
+  __assume(0);
 #endif
-    return false;
-  }
-  
-  inline bool operator!=(const value& x, const value& y) {
-    return ! (x == y);
-  }
+  return false;
 }
 
+inline bool operator!=(const value &x, const value &y) {
+  return !(x == y);
+}
+}
+
+#if !PICOJSON_USE_RVALUE_REFERENCE
 namespace std {
-  template<> inline void swap(picojson::value& x, picojson::value& y)
-    {
-      x.swap(y);
-    }
+template <> inline void swap(picojson::value &x, picojson::value &y) {
+  x.swap(y);
+}
 }
+#endif
 
-inline std::istream& operator>>(std::istream& is, picojson::value& x)
-{
+inline std::istream &operator>>(std::istream &is, picojson::value &x) {
   picojson::set_last_error(std::string());
-  std::string err = picojson::parse(x, is);
-  if (! err.empty()) {
+  const std::string err(picojson::parse(x, is));
+  if (!err.empty()) {
     picojson::set_last_error(err);
     is.setstate(std::ios::failbit);
   }
   return is;
 }
 
-inline std::ostream& operator<<(std::ostream& os, const picojson::value& x)
-{
+inline std::ostream &operator<<(std::ostream &os, const picojson::value &x) {
   x.serialize(std::ostream_iterator<char>(os));
   return os;
 }
 #ifdef _MSC_VER
-    #pragma warning(pop)
+#pragma warning(pop)
 #endif
 
 #endif
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/LICENSE b/externals/simplecpp/LICENSE
index 341c30bda44..b1f013e92fa 100644
--- a/externals/simplecpp/LICENSE
+++ b/externals/simplecpp/LICENSE
@@ -1,166 +1,14 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+BSD Zero Clause License
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (c) 2023 simplecpp team
 
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
 
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
index 77c80fa5af7..581c9b10990 100644
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -1,53 +1,60 @@
 /*
  * simplecpp - A simple and high-fidelity C/C++ preprocessor library
- * Copyright (C) 2016-2022 Daniel Marjamäki.
- *
- * This library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2016-2023 simplecpp team
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#define SIMPLECPP_WINDOWS
-#define NOMINMAX
+#if defined(_WIN32)
+#  ifndef _WIN32_WINNT
+#    define _WIN32_WINNT 0x0602
+#  endif
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  undef ERROR
 #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>
+#include <cstddef> // IWYU pragma: keep
+#include <cstdint>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-#include <exception>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
+#include <istream>
 #include <limits>
-#include <sstream> // IWYU pragma: keep
+#include <list>
+#include <map>
+#include <set>
+#include <sstream>
 #include <stack>
 #include <stdexcept>
-#if __cplusplus >= 201103L
-#include <unordered_map>
-#endif
-#include <utility>
-
+#include <string>
 #ifdef SIMPLECPP_WINDOWS
-#include <windows.h>
-#undef ERROR
+#  include <mutex>
 #endif
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#define nullptr NULL
+#ifdef _WIN32
+#  include <direct.h>
+#else
+#  include <sys/stat.h>
 #endif
 
 static bool isHex(const std::string &s)
@@ -103,6 +110,15 @@ template<class T> static std::string toString(T t)
     return ostr.str();
 }
 
+#ifdef SIMPLECPP_DEBUG_MACRO_EXPANSION
+static std::string locstring(const simplecpp::Location &loc)
+{
+    std::ostringstream ostr;
+    ostr << '[' << loc.file() << ':' << loc.line << ':' << loc.col << ']';
+    return ostr.str();
+}
+#endif
+
 static long long stringToLL(const std::string &s)
 {
     long long ret;
@@ -131,11 +147,6 @@ static unsigned long long stringToULL(const std::string &s)
     return ret;
 }
 
-static bool startsWith(const std::string &str, const std::string &s)
-{
-    return (str.size() >= s.size() && str.compare(0, s.size(), s) == 0);
-}
-
 static bool endsWith(const std::string &s, const std::string &e)
 {
     return (s.size() >= e.size()) && std::equal(e.rbegin(), e.rend(), s.rbegin());
@@ -170,8 +181,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) {
@@ -230,23 +239,23 @@ void simplecpp::Token::printOut() const
     std::cout << std::endl;
 }
 
+// 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;
     virtual void unget() = 0;
     virtual bool good() = 0;
 
-    unsigned char readChar()
-    {
-        unsigned char ch = static_cast<unsigned char>(get());
+    unsigned char readChar() {
+        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));
         }
@@ -268,15 +277,14 @@ class simplecpp::TokenList::Stream {
         return ch;
     }
 
-    unsigned char peekChar()
-    {
-        unsigned char ch = static_cast<unsigned char>(peek());
+    unsigned char peekChar() {
+        auto ch = static_cast<unsigned char>(peek());
 
         // 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));
@@ -289,8 +297,7 @@ class simplecpp::TokenList::Stream {
         return ch;
     }
 
-    void ungetChar()
-    {
+    void ungetChar() {
         unget();
         if (isUtf16)
             unget();
@@ -305,13 +312,11 @@ class simplecpp::TokenList::Stream {
     }
 
 private:
-    inline int makeUtf16Char(const unsigned char ch, const unsigned char ch2) const
-    {
+    inline int makeUtf16Char(const unsigned char ch, const unsigned char ch2) const {
         return (bom == 0xfeff) ? (ch<<8 | ch2) : (ch2<<8 | ch);
     }
 
-    unsigned short getAndSkipBOM()
-    {
+    unsigned short getAndSkipBOM() {
         const int ch1 = peek();
 
         // The UTF-16 BOM is 0xfffe or 0xfeff.
@@ -348,23 +353,23 @@ class simplecpp::TokenList::Stream {
 
 class StdIStream : public simplecpp::TokenList::Stream {
 public:
-    StdIStream(std::istream &istr)
-        : istr(istr)
-    {
+    // 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() {
+    int get() override {
         return istr.get();
     }
-    virtual int peek() {
+    int peek() override {
         return istr.peek();
     }
-    virtual void unget() {
+    void unget() override {
         istr.unget();
     }
-    virtual bool good() {
+    bool good() override {
         return istr.good();
     }
 
@@ -372,36 +377,78 @@ class StdIStream : public simplecpp::TokenList::Stream {
     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)
+    {
+        init();
+    }
+
+    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{};
+};
+
 class FileStream : public simplecpp::TokenList::Stream {
 public:
-    FileStream(const std::string &filename)
+    /**
+     * @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"))
-        , lastCh(0)
-        , lastStatus(0)
     {
-        assert(file != nullptr);
+        if (!file) {
+            files.push_back(filename);
+            throw simplecpp::Output(simplecpp::Output::FILE_NOT_FOUND, {}, "File is missing: " + filename);
+        }
         init();
     }
 
-    ~FileStream() {
+    FileStream(const FileStream&) = delete;
+    FileStream &operator=(const FileStream&) = delete;
+
+    ~FileStream() override {
         fclose(file);
         file = nullptr;
     }
 
-    virtual int get() {
+    int get() override {
         lastStatus = lastCh = fgetc(file);
         return lastCh;
     }
-    virtual int peek() {
+    int peek() override {
         // keep lastCh intact
         const int ch = fgetc(file);
         unget_internal(ch);
         return ch;
     }
-    virtual void unget() {
+    void unget() override {
         unget_internal(lastCh);
     }
-    virtual bool good() {
+    bool good() override {
         return lastStatus != EOF;
     }
 
@@ -411,14 +458,13 @@ class FileStream : public simplecpp::TokenList::Stream {
             // TODO: use ungetc() as well
             // UTF-16 has subsequent unget() calls
             fseek(file, -1, SEEK_CUR);
-        }
-        else
+        } else
             ungetc(ch, file);
     }
 
     FILE *file;
-    int lastCh;
-    int lastStatus;
+    int lastCh{};
+    int lastStatus{};
 };
 
 simplecpp::TokenList::TokenList(std::vector<std::string> &filenames) : frontToken(nullptr), backToken(nullptr), files(filenames) {}
@@ -430,24 +476,33 @@ simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &fi
     readfile(stream,filename,outputList);
 }
 
-simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList)
-        : frontToken(nullptr), backToken(nullptr), files(filenames)
+simplecpp::TokenList::TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int /*unused*/)
+    : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
-    FileStream stream(filename);
+    StdCharBufStream stream(data, size);
     readfile(stream,filename,outputList);
 }
 
+simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList)
+    : frontToken(nullptr), backToken(nullptr), files(filenames)
+{
+    try {
+        FileStream stream(filename, filenames);
+        readfile(stream,filename,outputList);
+    } catch (const simplecpp::Output & e) {
+        outputList->push_back(e);
+    }
+}
+
 simplecpp::TokenList::TokenList(const TokenList &other) : frontToken(nullptr), backToken(nullptr), files(other.files)
 {
     *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()
 {
@@ -466,7 +521,6 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(const TokenList &other)
     return *this;
 }
 
-#if __cplusplus >= 201103L
 simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
 {
     if (this != &other) {
@@ -480,7 +534,6 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
     }
     return *this;
 }
-#endif
 
 void simplecpp::TokenList::clear()
 {
@@ -503,24 +556,33 @@ 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;
+    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))
@@ -553,15 +615,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->push_back(std::move(err));
 }
 
 static bool isStringLiteralPrefix(const std::string &str)
@@ -570,16 +633,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());
@@ -597,26 +660,20 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
 
     const Token *oldLastToken = nullptr;
 
-    Location location(files);
-    location.fileIndex = fileIndex(filename);
-    location.line = 1U;
-    location.col  = 1U;
+    Location location(fileIndex(filename), 1, 1);
     while (stream.good()) {
         unsigned char ch = stream.readChar();
         if (!stream.good())
             break;
-        if (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r')
-            ch = ' ';
 
         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->push_back(std::move(err));
             }
             clear();
             return;
@@ -625,7 +682,7 @@ 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 {
@@ -637,33 +694,56 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
 
             if (oldLastToken != cback()) {
                 oldLastToken = cback();
-                if (!isLastLinePreprocessor())
+                const Token * const llTok = isLastLinePreprocessor();
+                if (!llTok)
                     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);
+                const Token * const llNextToken = llTok->next;
+                if (!llTok->next)
+                    continue;
+                if (llNextToken->next) {
+                    // #file "file.c"
+                    if (llNextToken->str() == "file" &&
+                        llNextToken->next->str()[0] == '\"')
+                    {
+                        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;
+                    }
+                    // TODO: add support for "# 3"
+                    // #3 "file.c"
+                    // #line 3 "file.c"
+                    else if ((llNextToken->number &&
+                              llNextToken->next->str()[0] == '\"') ||
+                             (llNextToken->str() == "line" &&
+                              llNextToken->next->number &&
+                              llNextToken->next->next &&
+                              llNextToken->next->next->str()[0] == '\"'))
+                    {
+                        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);
+                    }
+                    // #line 3
+                    else if (llNextToken->str() == "line" &&
+                             llNextToken->next->number)
+                    {
+                        const Token *numtok = cback();
+                        while (numtok->comment)
+                            numtok = numtok->previous;
+                        lineDirective(location.fileIndex, std::atol(numtok->str().c_str()), location);
+                    }
                 }
                 // #endfile
-                else if (lastline == "# endfile" && !loc.empty()) {
+                else if (llNextToken->str() == "endfile" && !loc.empty())
+                {
                     location = loc.top();
                     loc.pop();
                 }
@@ -672,29 +752,32 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             continue;
         }
 
-        if (std::isspace(ch)) {
+        if (ch <= ' ') {
             location.col++;
             continue;
         }
 
         TokenString currentToken;
 
-        if (cback() && cback()->location.line == location.line && cback()->previous && cback()->previous->op == '#' && isLastLinePreprocessor() && (lastLine() == "# error" || lastLine() == "# warning")) {
-            char prev = ' ';
-            while (stream.good() && (prev == '\\' || (ch != '\r' && ch != '\n'))) {
-                currentToken += ch;
-                prev = ch;
-                ch = stream.readChar();
+        if (cback() && cback()->location.line == location.line && cback()->previous && cback()->previous->op == '#') {
+            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;
+                    prev = ch;
+                    ch = stream.readChar();
+                }
+                stream.ungetChar();
+                push_back(new Token(currentToken, location));
+                location.adjust(currentToken);
+                continue;
             }
-            stream.ungetChar();
-            push_back(new Token(currentToken, location));
-            location.adjust(currentToken);
-            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();
@@ -707,17 +790,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();
             }
         }
@@ -769,24 +870,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->push_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->push_back(std::move(err));
                     }
                     return;
                 }
@@ -796,7 +899,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();
 
@@ -817,16 +920,20 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             }
 
             if (prefix.empty())
-                push_back(new Token(s, location)); // push string without newlines
+                push_back(new Token(s, location, !!std::isspace(stream.peekChar()))); // push string without newlines
             else
                 back()->setstr(prefix + s);
 
-            if (newlines > 0 && isLastLinePreprocessor() && lastLine().compare(0,9,"# define ") == 0) {
-                multiline += newlines;
-                location.adjust(s);
-            } else {
-                location.adjust(currentToken);
+            if (newlines > 0) {
+                const Token * const llTok = lastLineTok();
+                if (llTok && llTok->op == '#' && llTok->next && (llTok->next->str() == "define" || llTok->next->str() == "pragma") && llTok->next->next) {
+                    multiline += newlines;
+                    location.adjust(s);
+                    continue;
+                }
             }
+
+            location.adjust(currentToken);
             continue;
         }
 
@@ -834,13 +941,16 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             currentToken += ch;
         }
 
-        if (*currentToken.begin() == '<' && isLastLinePreprocessor() && lastLine() == "# include") {
-            currentToken = readUntil(stream, location, '<', '>', outputList);
-            if (currentToken.size() < 2U)
-                return;
+        if (*currentToken.begin() == '<') {
+            const Token * const llTok = lastLineTok();
+            if (llTok && llTok->op == '#' && llTok->next && llTok->next->str() == "include") {
+                currentToken = readUntil(stream, location, '<', '>', outputList);
+                if (currentToken.size() < 2U)
+                    return;
+            }
         }
 
-        push_back(new Token(currentToken, location));
+        push_back(new Token(currentToken, location, !!std::isspace(stream.peekChar())));
 
         if (multiline)
             location.col += currentToken.size();
@@ -871,7 +981,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 != '(')
@@ -926,10 +1036,10 @@ void simplecpp::TokenList::combineOperators()
                 continue;
             }
             // float literals..
-            if (tok->previous && tok->previous->number) {
+            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 (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp"))) {
+                if (sameline(tok, tok->next) && (isFloatSuffix(tok->next) || (tok->next && tok->next->startsWithOneOf("AaBbCcDdEeFfPp")))) {
                     tok->setstr(tok->str() + tok->next->str());
                     deleteToken(tok->next);
                 }
@@ -1241,10 +1351,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;
@@ -1259,8 +1370,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);
@@ -1317,11 +1428,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->push_back(std::move(err));
         }
         return "";
     }
@@ -1329,31 +1441,7 @@ 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.insert(0, 1, ' ');
-        if (tok->str()[0] == '\"')
-            ret.insert(0, "%str%");
-        else if (tok->number)
-            ret.insert(0, "%num%");
-        else
-            ret.insert(0, tok->str());
-    }
-    return ret;
-}
-
-bool simplecpp::TokenList::isLastLinePreprocessor(int maxsize) const
+const simplecpp::Token* simplecpp::TokenList::lastLineTok(int maxsize) const
 {
     const Token* prevTok = nullptr;
     int count = 0;
@@ -1363,10 +1451,18 @@ bool simplecpp::TokenList::isLastLinePreprocessor(int maxsize) const
         if (tok->comment)
             continue;
         if (++count > maxsize)
-            return false;
+            return nullptr;
         prevTok = tok;
     }
-    return prevTok && prevTok->str()[0] == '#';
+    return prevTok;
+}
+
+const simplecpp::Token* simplecpp::TokenList::isLastLinePreprocessor(int maxsize) const
+{
+    const Token * const prevTok = lastLineTok(maxsize);
+    if (prevTok && prevTok->op == '#')
+        return prevTok;
+    return nullptr;
 }
 
 unsigned int simplecpp::TokenList::fileIndex(const std::string &filename)
@@ -1379,19 +1475,24 @@ unsigned int simplecpp::TokenList::fileIndex(const std::string &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");
@@ -1408,17 +1509,29 @@ 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);
-            std::istringstream istr(def);
-            StdIStream stream(istr);
+            StdCharBufStream stream(reinterpret_cast<const unsigned char*>(def.data()), def.size());
             tokenListDefine.readfile(stream);
             if (!parseDefine(tokenListDefine.cfront()))
                 throw std::runtime_error("bad macro syntax. macroname=" + name + " value=" + value);
         }
 
         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) {
@@ -1431,6 +1544,7 @@ namespace simplecpp {
                     tokenListDefine = other.tokenListDefine;
                     parseDefine(tokenListDefine.cfront());
                 }
+                usageList = other.usageList;
             }
             return *this;
         }
@@ -1446,23 +1560,29 @@ 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 {
             std::set<TokenString> expandedmacros;
 
+#ifdef SIMPLECPP_DEBUG_MACRO_EXPANSION
+            std::cout << "expand " << name() << " " << locstring(rawtok->location) << std::endl;
+#endif
+
             TokenList output2(inputFiles);
 
             if (functionLike() && rawtok->next && rawtok->next->op == '(') {
                 // Copy macro call to a new tokenlist with no linebreaks
                 const Token * const rawtok1 = rawtok;
                 TokenList rawtokens2(inputFiles);
-                rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location));
+                rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
                 rawtok = rawtok->next;
-                rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location));
+                rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
                 rawtok = rawtok->next;
                 int par = 1;
                 while (rawtok && par > 0) {
@@ -1472,16 +1592,13 @@ namespace simplecpp {
                         --par;
                     else if (rawtok->op == '#' && !sameline(rawtok->previous, rawtok))
                         throw Error(rawtok->location, "it is invalid to use a preprocessor directive as macro parameter");
-                    rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location));
+                    rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
                     rawtok = rawtok->next;
                 }
-                bool first = true;
-                if (valueToken && valueToken->str() == rawtok1->str())
-                    first = false;
-                if (expand(&output2, rawtok1->location, rawtokens2.cfront(), macros, expandedmacros, first))
+                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;
@@ -1529,11 +1646,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;
         }
 
@@ -1579,7 +1696,7 @@ 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()+"'");
@@ -1600,7 +1717,7 @@ namespace simplecpp {
     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)
@@ -1611,6 +1728,11 @@ namespace simplecpp {
         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();
@@ -1626,7 +1748,7 @@ 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;
                     }
@@ -1648,8 +1770,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;
         }
 
@@ -1685,7 +1848,7 @@ namespace simplecpp {
             return parametertokens;
         }
 
-        const Token *appendTokens(TokenList *tokens,
+        const Token *appendTokens(TokenList &tokens,
                                   const Location &rawloc,
                                   const Token * const lpar,
                                   const MacroMap &macros,
@@ -1698,25 +1861,14 @@ namespace simplecpp {
             while (sameline(lpar, tok)) {
                 if (tok->op == '#' && sameline(tok,tok->next) && tok->next->op == '#' && sameline(tok,tok->next->next)) {
                     // A##B => AB
-                    tok = expandHashHash(tokens, rawloc, tok, macros, expandedmacros, parametertokens);
+                    tok = expandHashHash(tokens, rawloc, tok, macros, expandedmacros, parametertokens, false);
                 } else if (tok->op == '#' && sameline(tok, tok->next) && tok->next->op != '#') {
-                    tok = expandHash(tokens, rawloc, tok, macros, expandedmacros, parametertokens);
+                    tok = expandHash(tokens, rawloc, tok, expandedmacros, parametertokens);
                 } else {
                     if (!expandArg(tokens, tok, rawloc, macros, expandedmacros, parametertokens)) {
-                        bool expanded = false;
-                        const MacroMap::const_iterator it = macros.find(tok->str());
-                        if (it != macros.end() && expandedmacros.find(tok->str()) == expandedmacros.end()) {
-                            const Macro &m = it->second;
-                            if (!m.functionLike()) {
-                                m.expand(tokens, rawloc, tok, macros, expandedmacros);
-                                expanded = true;
-                            }
-                        }
-                        if (!expanded) {
-                            tokens->push_back(new Token(*tok));
-                            if (tok->macro.empty() && (par > 0 || tok->str() != "("))
-                                tokens->back()->macro = name();
-                        }
+                        tokens.push_back(new Token(*tok));
+                        if (tok->macro.empty() && (par > 0 || tok->str() != "("))
+                            tokens.back()->macro = name();
                     }
 
                     if (tok->op == '(')
@@ -1729,28 +1881,30 @@ 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, bool first=false) 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());
 
-            if (!first)
-                expandedmacros.insert(nameTokInst->str());
+#ifdef SIMPLECPP_DEBUG_MACRO_EXPANSION
+            std::cout << "  expand " << name() << " " << locstring(defineLocation()) << std::endl;
+#endif
 
             usageList.push_back(loc);
 
             if (nameTokInst->str() == "__FILE__") {
-                output->push_back(new Token('\"'+loc.file()+'\"', loc));
+                output.push_back(new Token('\"'+output.file(loc)+'\"', loc));
                 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));
                 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));
                 return nameTokInst->next;
             }
 
@@ -1762,7 +1916,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;
                 }
 
@@ -1811,23 +1965,46 @@ 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 == '#') {
                         if (!sameline(tok, tok->next->next->next))
                             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);
+                            tok = expandToken(output, loc, tok->next->next->next, macros, expandedmacros, parametertokens2);
+                            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);
@@ -1843,20 +2020,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 == '#') {
@@ -1864,12 +2047,12 @@ namespace simplecpp {
                     tok = expandHashHash(output, loc, tok->previous, macros, expandedmacros, parametertokens2);
                 } else {
                     // #123 => "123"
-                    tok = expandHash(output, loc, tok->previous, macros, expandedmacros, parametertokens2);
+                    tok = expandHash(output, loc, tok->previous, expandedmacros, parametertokens2);
                 }
             }
 
             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();
                 }
             }
@@ -1880,55 +2063,55 @@ 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);
+        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);
+                output.takeTokens(temp);
                 return tok->next;
             }
 
             const MacroMap::const_iterator it = macros.find(temp.cback()->str());
             if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end()) {
-                output->takeTokens(temp);
+                output.takeTokens(temp);
                 return tok->next;
             }
 
             const Macro &calledMacro = it->second;
             if (!calledMacro.functionLike()) {
-                output->takeTokens(temp);
+                output.takeTokens(temp);
                 return tok->next;
             }
 
             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);
+            const Token * const tok2 = appendTokens(temp2, loc, tok->next, macros, expandedmacros, parametertokens);
             if (!tok2)
                 return tok->next;
-            output->takeTokens(temp);
-            output->deleteToken(output->back());
+            output.takeTokens(temp);
+            output.deleteToken(output.back());
             calledMacro.expand(output, loc, temp2.cfront(), macros, expandedmacros);
             return tok2->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 (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);
                 }
             }
@@ -1942,23 +2125,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) || tok->next->op != '(') {
-                    output->push_back(newMacroToken(tok->str(), loc, true, tok));
+                if (!sameline(tok, tok->next)) {
+                    output.push_back(newMacroToken(tok->str(), loc, true, tok));
                     return tok->next;
                 }
                 TokenList tokens(files);
                 tokens.push_back(new Token(*tok));
-                const Token * const tok2 = appendTokens(&tokens, loc, tok->next, macros, expandedmacros, parametertokens);
+                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)) {
+                    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);
-                return recursiveExpandToken(output, temp, loc, tok2, macros, expandedmacros2, parametertokens);
+                calledMacro.expand(temp, loc, tokens.cfront(), macros, expandedmacros);
+                return recursiveExpandToken(output, temp, loc, tok2, macros, expandedmacros, parametertokens);
             }
 
             if (tok->str() == DEFINED) {
@@ -1977,25 +2167,25 @@ 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))
-                            macroName += temp.cback()->str();
+                        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));
             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;
 
@@ -2008,12 +2198,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());
@@ -2023,14 +2213,18 @@ namespace simplecpp {
                 return true;
             for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U];) {
                 const MacroMap::const_iterator it = macros.find(partok->str());
-                if (it != macros.end() && !partok->isExpandedFrom(&it->second) && (partok->str() == name() || expandedmacros.find(partok->str()) == expandedmacros.end()))
-                    partok = it->second.expand(output, loc, partok, macros, expandedmacros);
-                else {
-                    output->push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros), partok));
-                    output->back()->macro = partok->macro;
+                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, std::move(expandedmacros2));
+                } else {
+                    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;
             return true;
         }
 
@@ -2039,20 +2233,24 @@ namespace simplecpp {
          * @param output  destination tokenlist
          * @param loc     location for expanded token
          * @param tok     The # token
-         * @param macros  all macros
          * @param expandedmacros   set with expanded macros, with this macro
          * @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 MacroMap &macros, 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);
-            tok = expandToken(&tokenListHash, loc, tok->next, macros, expandedmacros, parametertokens);
+            const MacroMap macros2; // temporarily bypass macro expansion
+            tok = expandToken(tokenListHash, loc, tok->next, macros2, expandedmacros, parametertokens);
             std::ostringstream ostr;
             ostr << '\"';
-            for (const Token *hashtok = tokenListHash.cfront(); hashtok; hashtok = hashtok->next)
+            for (const Token *hashtok = tokenListHash.cfront(), *next; hashtok; hashtok = next) {
+                next = hashtok->next;
                 ostr << hashtok->str();
+                if (next && hashtok->whitespaceahead)
+                    ostr << ' ';
+            }
             ostr << '\"';
-            output->push_back(newMacroToken(escapeString(ostr.str()), loc, isReplaced(expandedmacros)));
+            output.push_back(newMacroToken(escapeString(ostr.str()), loc, isReplaced(expandedmacros)));
             return tok;
         }
 
@@ -2065,10 +2263,11 @@ namespace simplecpp {
          * @param macros  all macros
          * @param expandedmacros   set with expanded macros, with this macro
          * @param parametertokens  parameters given when expanding this macro
+         * @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) 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))
@@ -2076,10 +2275,9 @@ namespace simplecpp {
 
             const bool canBeConcatenatedWithEqual = A->isOneOf("+-*/%&|^") || A->str() == "<<" || A->str() == ">>";
             const bool canBeConcatenatedStringOrChar = isStringLiteral_(A->str()) || isCharLiteral_(A->str());
-            if (!A->name && !A->number && A->op != ',' && !A->str().empty() && !canBeConcatenatedWithEqual && !canBeConcatenatedStringOrChar)
-                throw invalidHashHash::unexpectedToken(tok->location, name(), A);
+            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);
 
@@ -2095,31 +2293,38 @@ 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 (expandArg(tokensB, B, parametertokens)) {
                     if (tokensB.empty())
                         strAB = A->str();
-                    else if (varargs && A->op == ',') {
+                    else if (varargs && A->op == ',')
                         strAB = ",";
-                    } else {
+                    else if (varargs && unexpectedA)
+                        throw invalidHashHash::unexpectedToken(tok->location, name(), A);
+                    else {
                         strAB = A->str() + tokensB.cfront()->str();
                         tokensB.deleteToken(tokensB.front());
                     }
                 } else {
+                    if (unexpectedA)
+                        throw invalidHashHash::unexpectedToken(tok->location, name(), A);
                     strAB = A->str() + B->str();
                 }
 
@@ -2132,35 +2337,38 @@ namespace simplecpp {
                 }
 
                 if (varargs && tokensB.empty() && tok->previous->str() == ",")
-                    output->deleteToken(A);
+                    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;
                         }
                     }
-                    expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens);
+                    if (expandResult)
+                        expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens);
+                    else
+                        output.takeTokens(tokens);
                     for (Token *b = tokensB.front(); b; b = b->next)
                         b->location = loc;
-                    output->takeTokens(tokensB);
+                    output.takeTokens(tokensB);
                 }
             }
 
@@ -2169,11 +2377,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 */
@@ -2200,6 +2408,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_;
     };
@@ -2207,6 +2422,12 @@ 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;
@@ -2236,169 +2457,27 @@ namespace simplecpp {
 
         return windowsPath;
     }
-}
+#endif
 
+    bool isAbsolutePath(const std::string &path)
+    {
 #ifdef SIMPLECPP_WINDOWS
-
-class ScopedLock {
-public:
-    explicit ScopedLock(CRITICAL_SECTION& criticalSection)
-        : m_criticalSection(criticalSection) {
-        EnterCriticalSection(&m_criticalSection);
-    }
-
-    ~ScopedLock() {
-        LeaveCriticalSection(&m_criticalSection);
-    }
-
-private:
-    ScopedLock& operator=(const ScopedLock&);
-    ScopedLock(const ScopedLock&);
-
-    CRITICAL_SECTION& m_criticalSection;
-};
-
-class RealFileNameMap {
-public:
-    RealFileNameMap() {
-        InitializeCriticalSection(&m_criticalSection);
-    }
-
-    ~RealFileNameMap() {
-        DeleteCriticalSection(&m_criticalSection);
-    }
-
-    bool getCacheEntry(const std::string& path, std::string* returnPath) {
-        ScopedLock lock(m_criticalSection);
-
-        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) {
-        ScopedLock lock(m_criticalSection);
-        m_fileMap[path] = actualPath;
-    }
-
-private:
-    std::map<std::string, std::string> m_fileMap;
-    CRITICAL_SECTION m_criticalSection;
-};
-
-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) {
-        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__
-        std::string fConverted = simplecpp::convertCygwinToWindowsPath(f);
-        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) {
-        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;
-            }
-
-            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 {
     /**
@@ -2471,21 +2550,23 @@ namespace simplecpp {
         if (unc)
             path = '/' + path;
 
-        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");
         }
@@ -2500,7 +2581,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)
@@ -2522,18 +2603,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 bool isGnu(const simplecpp::DUI &dui)
+{
+    return dui.std.rfind("gnu", 0) != std::string::npos;
+}
+
+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 "";
+    }
+    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) && !isGnu(dui))
+        return;
+
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
-        if (tok->str() != "__has_include")
+        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");
         }
@@ -2547,11 +2654,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");
             }
@@ -2562,12 +2669,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();
-            header = realFilename(header);
-        }
-        else {
-            header = realFilename(tok1->str().substr(1U, tok1->str().size() - 2U));
+        } else {
+            header = tok1->str().substr(1U, tok1->str().size() - 2U);
         }
         std::ifstream f;
         const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader);
@@ -2579,12 +2684,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") {
@@ -2595,6 +2702,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");
         }
     }
@@ -2606,7 +2715,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,
@@ -2614,7 +2723,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();
@@ -2626,34 +2735,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
@@ -2847,6 +2928,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) {
@@ -2869,6 +2953,10 @@ 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
+ */
 static long long evaluate(simplecpp::TokenList &expr, const simplecpp::DUI &dui, const std::map<std::string, std::size_t> &sizeOfType)
 {
     simplifyComments(expr);
@@ -2894,171 +2982,220 @@ static const simplecpp::Token *gotoNextLine(const simplecpp::Token *tok)
 
 class NonExistingFilesCache {
 public:
-    NonExistingFilesCache() {
-        InitializeCriticalSection(&m_criticalSection);
-    }
-
-    ~NonExistingFilesCache() {
-        DeleteCriticalSection(&m_criticalSection);
-    }
+    NonExistingFilesCache() {}
 
     bool contains(const std::string& path) {
-        ScopedLock lock(m_criticalSection);
+        std::lock_guard<std::mutex> lock(m_mutex);
         return (m_pathSet.find(path) != m_pathSet.end());
     }
 
     void add(const std::string& path) {
-        ScopedLock lock(m_criticalSection);
+        std::lock_guard<std::mutex> lock(m_mutex);
         m_pathSet.insert(path);
     }
 
     void clear() {
-        ScopedLock lock(m_criticalSection);
+        std::lock_guard<std::mutex> lock(m_mutex);
         m_pathSet.clear();
     }
 
 private:
     std::set<std::string> m_pathSet;
-    CRITICAL_SECTION m_criticalSection;
+    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 &sourcefile, const std::string &header)
-{
-    if (sourcefile.find_first_of("\\/") != std::string::npos)
-        return simplecpp::simplifyPath(sourcefile.substr(0, sourcefile.find_last_of("\\/") + 1U) + header);
-    return simplecpp::simplifyPath(header);
-}
-
-static std::string openHeaderRelative(std::ifstream &f, const std::string &sourcefile, 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)
 {
-    return openHeader(f, getRelativeFileName(sourcefile, header));
-}
+    if (simplecpp::isAbsolutePath(header))
+        return openHeaderDirect(f, simplecpp::simplifyPath(header));
 
-static std::string getIncludePathFileName(const std::string &includePath, const std::string &header)
-{
-    std::string path = includePath;
-    if (!path.empty() && path[path.size()-1U]!='/' && path[path.size()-1U]!='\\')
-        path += '/';
-    return path + header;
-}
+    // 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;
+        }
+    }
 
-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 simplePath = openHeader(f, getIncludePathFileName(*it, header));
-        if (!simplePath.empty())
-            return simplePath;
+    // 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)
+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)
 {
-    if (isAbsolutePath(header))
-        return openHeader(f, header);
+    const std::string &path = name_it->first;
+    FileID fileId;
 
-    std::string ret;
+    if (!getFileId(path, fileId))
+        return {nullptr, false};
 
-    if (systemheader) {
-        ret = openHeaderIncludePath(f, dui, header);
-        return ret;
+    const auto id_it = mIdMap.find(fileId);
+    if (id_it != mIdMap.end()) {
+        name_it->second = id_it->second;
+        return {id_it->second, false};
     }
 
-    ret = openHeaderRelative(f, sourcefile, header);
-    if (ret.empty())
-        return openHeaderIncludePath(f, dui, header);
-    return ret;
+    auto *const data = new FileData {path, TokenList(path, filenames, outputList)};
+
+    if (dui.removeComments)
+        data->tokens.removeComments();
+
+    name_it->second = data;
+    mIdMap.emplace(fileId, data);
+    mData.emplace_back(data);
+
+    return {data, true};
 }
 
-static std::string getFileName(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(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)) {
-        return (filedata.find(header) != filedata.end()) ? simplecpp::simplifyPath(header) : "";
+        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};
     }
 
-    const std::string relativeFilename = getRelativeFileName(sourcefile, header);
-    if (!systemheader && filedata.find(relativeFilename) != filedata.end())
-        return relativeFilename;
+    if (!systemheader) {
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(dirPath(sourcefile) + header), nullptr);
 
-    for (std::list<std::string>::const_iterator it = dui.includePaths.begin(); it != dui.includePaths.end(); ++it) {
-        std::string s = simplecpp::simplifyPath(getIncludePathFileName(*it, header));
-        if (filedata.find(s) != filedata.end())
-            return s;
+        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};
+        }
     }
 
-    if (systemheader && filedata.find(header) != filedata.end())
-        return header;
+    for (const auto &includePath : dui.includePaths) {
+        auto ins = mNameMap.emplace(simplecpp::simplifyPath(includePath + "/" + header), nullptr);
 
-    return "";
+        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 {nullptr, false};
 }
 
-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)
+bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
 {
-    return !getFileName(filedata, sourcefile, header, dui, systemheader).empty();
+#ifdef _WIN32
+    HANDLE hFile = CreateFileA(path.c_str(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    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
 }
 
-std::map<std::string, simplecpp::TokenList*> simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList)
+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();
+        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->push_back(std::move(err));
             }
             continue;
         }
-        fin.close();
 
-        TokenList *tokenlist = new TokenList(filename, filenames, outputList);
-        if (!tokenlist->front()) {
-            delete tokenlist;
+        if (!loaded)
             continue;
-        }
 
-        ret[filename] = tokenlist;
-        filelist.push_back(tokenlist->front());
+        if (!filedata->tokens.front())
+            continue;
+
+        if (dui.removeComments)
+            filedata->tokens.removeComments();
+
+        filelist.push_back(filedata->tokens.front());
     }
 
     for (const Token *rawtok = rawtokens.cfront(); rawtok || !filelist.empty(); rawtok = rawtok ? rawtok->next : nullptr) {
@@ -3074,47 +3211,51 @@ 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);
-        ret[header2] = tokens;
-        if (tokens->front())
-            filelist.push_back(tokens->front());
+        if (dui.removeComments)
+            filedata->tokens.removeComments();
+
+        filelist.push_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::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::Error &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::SYNTAX_ERROR,
+                    err.location,
+                    "failed to expand \'" + tok->str() + "\', " + err.what
+                };
+                outputList->push_back(std::move(out));
             }
             return false;
         }
@@ -3122,7 +3263,7 @@ static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token
     } else {
         if (!tok->comment)
             output.push_back(new simplecpp::Token(*tok));
-        *tok1 = tok->next;
+        tok1 = tok->next;
     }
     return true;
 }
@@ -3132,27 +3273,28 @@ static void getLocaltime(struct tm &ltime)
     time_t t;
     time(&t);
 #ifndef _WIN32
+    // NOLINTNEXTLINE(misc-include-cleaner) - false positive
     localtime_r(&t, &ltime);
 #else
     localtime_s(&ltime, &t);
 #endif
 }
 
-static std::string getDateDefine(struct tm *timep)
+static std::string getDateDefine(const struct tm *timep)
 {
     char buf[] = "??? ?? ????";
     strftime(buf, sizeof(buf), "%b %d %Y", timep);
     return std::string("\"").append(buf).append("\"");
 }
 
-static std::string getTimeDefine(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)
@@ -3181,45 +3323,71 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     sizeOfType.insert(std::make_pair("double *", sizeof(double *)));
     sizeOfType.insert(std::make_pair("long double *", sizeof(long double *)));
 
-    const bool hasInclude = (dui.std.size() == 5 && dui.std.compare(0,3,"c++") == 0 && dui.std >= "c++17");
+    // 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) || 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, files);
+        const Macro macro(lhs, rhs, dummy);
         macros.insert(std::pair<TokenString,Macro>(macro.name(), macro));
     }
 
-    macros.insert(std::make_pair("__FILE__", Macro("__FILE__", "__FILE__", files)));
-    macros.insert(std::make_pair("__LINE__", Macro("__LINE__", "__LINE__", files)));
-    macros.insert(std::make_pair("__COUNTER__", Macro("__COUNTER__", "__COUNTER__", files)));
+    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 = {};
     getLocaltime(ltime);
-    macros.insert(std::make_pair("__DATE__", Macro("__DATE__", getDateDefine(&ltime), files)));
-    macros.insert(std::make_pair("__TIME__", Macro("__TIME__", getTimeDefine(&ltime), files)));
+    macros.insert(std::make_pair("__DATE__", Macro("__DATE__", getDateDefine(&ltime), dummy)));
+    macros.insert(std::make_pair("__TIME__", Macro("__TIME__", getTimeDefine(&ltime), dummy)));
 
     if (!dui.std.empty()) {
-        std::string std_def = simplecpp::getCStdString(dui.std);
-        if (!std_def.empty()) {
-            macros.insert(std::make_pair("__STDC_VERSION__", Macro("__STDC_VERSION__", std_def, files)));
+        const cstd_t c_std = simplecpp::getCStd(dui.std);
+        if (c_std != CUnknown) {
+            const std::string std_def = simplecpp::getCStdString(c_std);
+            if (!std_def.empty())
+                macros.insert(std::make_pair("__STDC_VERSION__", Macro("__STDC_VERSION__", std_def, dummy)));
         } else {
-            std_def = simplecpp::getCppStdString(dui.std);
+            const cppstd_t cpp_std = simplecpp::getCppStd(dui.std);
+            if (cpp_std == CPPUnknown) {
+                if (outputList) {
+                    simplecpp::Output err = {
+                        Output::DUI_ERROR,
+                        {},
+                        "unknown standard specified: '" + dui.std + "'"
+                    };
+                    outputList->push_back(std::move(err));
+                }
+                output.clear();
+                return;
+            }
+            const std::string std_def = simplecpp::getCppStdString(cpp_std);
             if (!std_def.empty())
-                macros.insert(std::make_pair("__cplusplus", Macro("__cplusplus", std_def, files)));
+                macros.insert(std::make_pair("__cplusplus", Macro("__cplusplus", std_def, dummy)));
         }
     }
 
     // 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;
@@ -3227,13 +3395,13 @@ 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 && 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) {
@@ -3255,11 +3423,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
 
             if (ifstates.size() <= 1U && (rawtok->str() == ELIF || 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->push_back(std::move(err));
                 }
                 output.clear();
                 return;
@@ -3267,16 +3436,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->push_back(std::move(err));
                 }
                 if (rawtok->str() == ERROR) {
                     output.clear();
@@ -3298,11 +3471,23 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                     }
                 } catch (const std::runtime_error &) {
                     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 err = {
+                            Output::SYNTAX_ERROR,
+                            rawtok->location,
+                            "Failed to parse #define"
+                        };
+                        outputList->push_back(std::move(err));
+                    }
+                    output.clear();
+                    return;
+                } catch (const simplecpp::Macro::Error &err) {
+                    if (outputList) {
+                        simplecpp::Output out = {
+                            simplecpp::Output::SYNTAX_ERROR,
+                            err.location,
+                            "Failed to parse #define, " + err.what
+                        };
+                        outputList->push_back(std::move(out));
                     }
                     output.clear();
                     return;
@@ -3316,7 +3501,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)) {
                         output.clear();
                         return;
                     }
@@ -3324,7 +3509,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                     inc2.takeTokens(inc1);
                 }
 
-                if (!inc2.empty() && inc2.cfront()->op == '<' && inc2.cback()->op == '>') {
+                if (!inc1.empty() && !inc2.empty() && inc2.cfront()->op == '<' && inc2.cback()->op == '>') {
                     TokenString hdr;
                     // TODO: Sometimes spaces must be added in the string
                     // Somehow preprocessToken etc must be told that the location should be source location not destination location
@@ -3338,11 +3523,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->push_back(std::move(err));
                     }
                     output.clear();
                     return;
@@ -3351,47 +3537,40 @@ 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 = getFileName(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()) {
-                        TokenList * const tokens = new TokenList(f, files, header2, outputList);
-                        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->push_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->push_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) {
                 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->push_back(std::move(out));
                     }
                     output.clear();
                     return;
@@ -3432,11 +3611,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->push_back(std::move(out));
                                 }
                                 output.clear();
                                 return;
@@ -3451,34 +3631,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 std::string &sourcefile = rawtokens.file(rawtok->location);
                                 const bool systemheader = (tok && tok->op == '<');
                                 std::string header;
 
                                 if (systemheader) {
                                     while ((tok = tok->next) && tok->op != '>')
                                         header += tok->str();
-                                    header = realFilename(header);
                                     if (tok && tok->op == '>')
                                         closingAngularBracket = true;
-                                }
-                                else {
-                                    header = realFilename(tok->str().substr(1U, tok->str().size() - 2U));
+                                } else {
+                                    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->push_back(std::move(out));
                                 }
                                 output.clear();
                                 return;
@@ -3489,7 +3670,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         maybeUsedMacros[rawtok->next->str()].push_back(rawtok->next->location);
 
                         const Token *tmp = tok;
-                        if (!preprocessToken(expr, &tmp, macros, files, outputList)) {
+                        if (!preprocessToken(expr, tmp, macros, files, outputList)) {
                             output.clear();
                             return;
                         }
@@ -3504,20 +3685,22 @@ 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->push_back(std::move(out));
                         }
                         output.clear();
                         return;
@@ -3530,15 +3713,23 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         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;
@@ -3548,9 +3739,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;
         }
 
@@ -3574,7 +3768,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)) {
             output.clear();
             return;
         }
@@ -3601,64 +3795,120 @@ 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->push_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();
 }
 
-std::string simplecpp::getCStdString(const std::string &std)
+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")
+        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")
+        return C17;
+    if (std == "c23" || std == "gnu23" || std == "c2x" || std == "gnu2x")
+        return C23;
+    if (std == "c2y" || std == "gnu2y")
+        return C2Y;
+    return CUnknown;
+}
+
+std::string simplecpp::getCStdString(cstd_t std)
 {
-    if (std == "c90" || std == "c89" || std == "iso9899:1990" || std == "iso9899:199409" || std == "gnu90" || std == "gnu89") {
+    switch (std) {
+    case C89:
         // __STDC_VERSION__ is not set for C90 although the macro was added in the 1994 amendments
         return "";
-    }
-    if (std == "c99" || std == "c9x" || std == "iso9899:1999" || std == "iso9899:199x" || std == "gnu99"|| std == "gnu9x")
+    case C99:
         return "199901L";
-    if (std == "c11" || std == "c1x" || std == "iso9899:2011" || std == "gnu11" || std == "gnu1x")
+    case C11:
         return "201112L";
-    if (std == "c17" || std == "c18" || std == "iso9899:2017" || std == "iso9899:2018" || std == "gnu17"|| std == "gnu18")
+    case C17:
         return "201710L";
-    if (std == "c2x" || std == "gnu2x") {
-        // Clang 11, 12, 13 return "201710L" - correct in 14
-        return "202000L";
+    case C23:
+        // supported by GCC 9+ and Clang 9+
+        // Clang 9, 10, 11, 12, 13 return "201710L"
+        // 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 "";
     }
     return "";
 }
 
-std::string simplecpp::getCppStdString(const std::string &std)
+std::string simplecpp::getCStdString(const std::string &std)
+{
+    return getCStdString(getCStd(std));
+}
+
+simplecpp::cppstd_t simplecpp::getCppStd(const std::string &std)
 {
     if (std == "c++98" || std == "c++03" || std == "gnu++98" || std == "gnu++03")
-        return "199711L";
+        return CPP03;
     if (std == "c++11" || std == "gnu++11" || std == "c++0x" || std == "gnu++0x")
-        return "201103L";
+        return CPP11;
     if (std == "c++14" || std == "c++1y" || std == "gnu++14" || std == "gnu++1y")
-        return "201402L";
+        return CPP14;
     if (std == "c++17" || std == "c++1z" || std == "gnu++17" || std == "gnu++1z")
+        return CPP17;
+    if (std == "c++20" || std == "c++2a" || std == "gnu++20" || std == "gnu++2a")
+        return CPP20;
+    if (std == "c++23" || std == "c++2b" || std == "gnu++23" || std == "gnu++2b")
+        return CPP23;
+    if (std == "c++26" || std == "c++2c" || std == "gnu++26" || std == "gnu++2c")
+        return CPP26;
+    return CPPUnknown;
+}
+
+std::string simplecpp::getCppStdString(cppstd_t std)
+{
+    switch (std) {
+    case CPP03:
+        return "199711L";
+    case CPP11:
+        return "201103L";
+    case CPP14:
+        return "201402L";
+    case CPP17:
         return "201703L";
-    if (std == "c++20" || std == "c++2a" || std == "gnu++20" || std == "gnu++2a") {
+    case CPP20:
         // GCC 10 returns "201703L" - correct in 11+
         return "202002L";
-    }
-    if (std == "c++23" || std == "c++2b" || std == "gnu++23" || std == "gnu++2b") {
+    case CPP23:
         // supported by GCC 11+ and Clang 12+
-        // Clang 12, 13, 14 do not support "c++23" and "gnu++23"
-        return "202100L";
+        // GCC 11, 12, 13 return "202100L"
+        // Clang 12, 13, 14, 15, 16 do not support "c++23" and "gnu++23" and return "202101L"
+        // Clang 17, 18 return "202302L"
+        return "202302L";
+    case CPP26:
+        // supported by GCC 14+ and Clang 17+
+        return "202400L";
+    case CPPUnknown:
+        return "";
     }
     return "";
 }
 
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#undef nullptr
-#endif
+std::string simplecpp::getCppStdString(const std::string &std)
+{
+    return getCppStdString(getCppStd(std));
+}
diff --git a/externals/simplecpp/simplecpp.h b/externals/simplecpp/simplecpp.h
index 5b918a9815a..9a847d14969 100644
--- a/externals/simplecpp/simplecpp.h
+++ b/externals/simplecpp/simplecpp.h
@@ -1,32 +1,33 @@
-/*
+/* -*- C++ -*-
  * simplecpp - A simple and high-fidelity C/C++ preprocessor library
- * Copyright (C) 2016-2022 Daniel Marjamäki.
- *
- * This library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2016-2023 simplecpp team
  */
 
 #ifndef simplecppH
 #define simplecppH
 
 #include <cctype>
+#include <cstdint>
 #include <cstring>
-#include <istream>
+#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
@@ -40,32 +41,89 @@
 #  define SIMPLECPP_LIB
 #endif
 
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#define nullptr NULL
+#ifndef _WIN32
+#  include <sys/types.h>
+#endif
+
+#if defined(_MSC_VER)
+#  pragma warning(push)
+// suppress warnings about "conversion from 'type1' to 'type2', possible loss of data"
+#  pragma warning(disable : 4267)
+#  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
+#  endif
 #endif
 
 namespace simplecpp {
+    /** C code standard */
+    enum cstd_t : std::int8_t { CUnknown=-1, C89, C99, C11, C17, C23, C2Y };
+
+    /** C++ code standard */
+    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 initilization 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);
@@ -82,16 +140,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{1};
+        unsigned int col{};
     };
 
     /**
@@ -100,22 +151,15 @@ namespace simplecpp {
      */
     class SIMPLECPP_LIB Token {
     public:
-        Token(const TokenString &s, const Location &loc) :
-            location(loc), previous(nullptr), next(nullptr), string(s) {
+        Token(const TokenString &s, const Location &loc, bool wsahead = false) :
+            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), 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 = std::isdigit(static_cast<unsigned char>(string[0])) || (string.size() > 1U && (string[0] == '-' || string[0] == '+') && std::isdigit(static_cast<unsigned char>(string[1])));
-            op = (string.size() == 1U && !name && !comment && !number) ? string[0] : '\0';
-        }
+        Token &operator=(const Token &tok) = delete;
 
         const TokenString& str() const {
             return string;
@@ -128,15 +172,21 @@ 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])));
+        }
 
         TokenString macro;
         char op;
         bool comment;
         bool name;
         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;
@@ -155,6 +205,8 @@ namespace simplecpp {
         void setExpandedFrom(const Token *tok, const Macro* m) {
             mExpandedFrom = tok->mExpandedFrom;
             mExpandedFrom.insert(m);
+            if (tok->whitespaceahead)
+                whitespaceahead = true;
         }
         bool isExpandedFrom(const Macro* m) const {
             return mExpandedFrom.find(m) != mExpandedFrom.end();
@@ -163,18 +215,22 @@ namespace simplecpp {
         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,
@@ -182,13 +238,16 @@ namespace simplecpp {
             SYNTAX_ERROR,
             PORTABILITY_BACKSLASH,
             UNHANDLED_CHAR_ERROR,
-            EXPLICIT_INCLUDE_NOT_FOUND
+            EXPLICIT_INCLUDE_NOT_FOUND,
+            FILE_NOT_FOUND,
+            DUI_ERROR
         } type;
+        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>;
 
     /** List of tokens. */
     class SIMPLECPP_LIB TokenList {
@@ -198,17 +257,49 @@ 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);
+        /** 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(), OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data), size-1, filenames, filename, 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(), OutputList *outputList = nullptr)
+            : TokenList(data, size-1, filenames, filename, outputList, 0)
+        {}
+#ifdef 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(data, size, filenames, filename, 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(reinterpret_cast<const unsigned char*>(data), size, filenames, filename, 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(), OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, 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(), OutputList *outputList = nullptr)
+            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, outputList, 0)
+        {}
+
+        /** generates a token list from the given buffer */
+        TokenList(std::span<const unsigned char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
+            : TokenList(data.data(), data.size(), filenames, filename, 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 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 {
@@ -216,8 +307,8 @@ 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 constFold();
@@ -272,23 +363,37 @@ namespace simplecpp {
         /** sizeof(T) */
         std::map<std::string, std::size_t> sizeOfType;
 
+        const std::vector<std::string>& getFiles() const {
+            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, 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=100000) const;
-        bool isLastLinePreprocessor(int maxsize=100000) const;
+        const Token* lastLineTok(int maxsize=1000) const;
+        const Token* isLastLinePreprocessor(int maxsize=1000) const;
 
         unsigned int fileIndex(const std::string &filename);
 
@@ -299,11 +404,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 */
@@ -319,18 +424,157 @@ namespace simplecpp {
      * On the command line these are configured by -D, -U, -I, --include, -std
      */
     struct SIMPLECPP_LIB DUI {
-        DUI() : clearIncludeCache(false) {}
+        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 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() = default;
+
+        FileDataCache(const FileDataCache &) = delete;
+        FileDataCache(FileDataCache &&) = default;
+
+        FileDataCache &operator=(const FileDataCache &) = delete;
+        FileDataCache &operator=(FileDataCache &&) = default;
+
+        /** 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() {
+            mNameMap.clear();
+            mIdMap.clear();
+            mData.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();
+        }
+
+    private:
+        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;
+
+            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
+                }
+            };
+        };
+
+        using name_map_type = std::unordered_map<std::string, FileData *>;
+        using id_map_type = std::unordered_map<FileID, FileData *, FileID::Hasher>;
+
+        static bool getFileId(const std::string &path, FileID &id);
+
+        std::pair<FileData *, bool> tryload(name_map_type::iterator &name_it, const DUI &dui, std::vector<std::string> &filenames, OutputList *outputList);
+
+        container_type mData;
+        name_map_type mNameMap;
+        id_map_type mIdMap;
     };
 
+    /** 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
@@ -338,18 +582,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);
@@ -357,15 +601,30 @@ namespace simplecpp {
     /** Convert Cygwin path to Windows path */
     SIMPLECPP_LIB std::string convertCygwinToWindowsPath(const std::string &cygwinPath);
 
+    /** Returns the C version a given standard */
+    SIMPLECPP_LIB cstd_t getCStd(const std::string &std);
+
+    /** Returns the C++ version a given standard */
+    SIMPLECPP_LIB cppstd_t getCppStd(const std::string &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);
 
     /** 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);
 }
 
-#if (__cplusplus < 201103L) && !defined(__APPLE__)
-#undef nullptr
+#undef SIMPLECPP_TOKENLIST_ALLOW_PTR
+
+#if defined(_MSC_VER)
+#  pragma warning(pop)
 #endif
 
+#undef SIMPLECPP_LIB
+
 #endif
diff --git a/externals/tinyxml2/CMakeLists.txt b/externals/tinyxml2/CMakeLists.txt
index 6ec93e526f2..9f15c558682 100644
--- a/externals/tinyxml2/CMakeLists.txt
+++ b/externals/tinyxml2/CMakeLists.txt
@@ -1,21 +1,24 @@
 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 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-extra-semi-stmt)
-    target_compile_options_safe(tinyxml2_objs -Wno-implicit-fallthrough)
-    target_compile_options_safe(tinyxml2_objs -Wno-suggest-override)
-    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 -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)
+endif()
+if(CYGWIN)
+    target_compile_definitions(-D_LARGEFILE_SOURCE)  # required for fseeko() and ftello()
 endif()
 
+target_externals_include_directories(tinyxml2 PUBLIC .)
+
diff --git a/externals/tinyxml2/tinyxml2.cpp b/externals/tinyxml2/tinyxml2.cpp
index b7ccd0522a7..8bb963582ec 100644
--- a/externals/tinyxml2/tinyxml2.cpp
+++ b/externals/tinyxml2/tinyxml2.cpp
@@ -24,7 +24,7 @@ distribution.
 #include "tinyxml2.h"
 
 #include <new>		// yes, this one new style header, is in the Android SDK.
-#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__)
+#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) || defined(__CC_ARM)
 #   include <stddef.h>
 #   include <stdarg.h>
 #else
@@ -45,14 +45,14 @@ distribution.
 	{
 		va_list va;
 		va_start( va, format );
-		int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va );
+		const int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va );
 		va_end( va );
 		return result;
 	}
 
 	static inline int TIXML_VSNPRINTF( char* buffer, size_t size, const char* format, va_list va )
 	{
-		int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va );
+		const int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va );
 		return result;
 	}
 
@@ -100,10 +100,24 @@ distribution.
 	#define TIXML_SSCANF   sscanf
 #endif
 
+#if defined(_WIN64)
+	#define TIXML_FSEEK _fseeki64
+	#define TIXML_FTELL _ftelli64
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
+	#define TIXML_FSEEK fseeko
+	#define TIXML_FTELL ftello
+#elif defined(__ANDROID__) && __ANDROID_API__ > 24
+	#define TIXML_FSEEK fseeko64
+	#define TIXML_FTELL ftello64
+#else
+	#define TIXML_FSEEK fseek
+	#define TIXML_FTELL ftell
+#endif
 
-static const char LINE_FEED				= (char)0x0a;			// all line endings are normalized to LF
+
+static const char LINE_FEED				= static_cast<char>(0x0a);			// all line endings are normalized to LF
 static const char LF = LINE_FEED;
-static const char CARRIAGE_RETURN		= (char)0x0d;			// CR gets filtered out
+static const char CARRIAGE_RETURN		= static_cast<char>(0x0d);			// CR gets filtered out
 static const char CR = CARRIAGE_RETURN;
 static const char SINGLE_QUOTE			= '\'';
 static const char DOUBLE_QUOTE			= '\"';
@@ -197,7 +211,7 @@ char* StrPair::ParseText( char* p, const char* endTag, int strFlags, int* curLin
 	TIXMLASSERT(curLineNumPtr);
 
     char* start = p;
-    char  endChar = *endTag;
+    const char  endChar = *endTag;
     size_t length = strlen( endTag );
 
     // Inner loop of text parsing.
@@ -220,13 +234,13 @@ char* StrPair::ParseName( char* p )
     if ( !p || !(*p) ) {
         return 0;
     }
-    if ( !XMLUtil::IsNameStartChar( *p ) ) {
+    if ( !XMLUtil::IsNameStartChar( static_cast<unsigned char>(*p) ) ) {
         return 0;
     }
 
     char* const start = p;
     ++p;
-    while ( *p && XMLUtil::IsNameChar( *p ) ) {
+    while ( *p && XMLUtil::IsNameChar( static_cast<unsigned char>(*p) ) ) {
         ++p;
     }
 
@@ -310,7 +324,7 @@ const char* StrPair::GetStr()
                         const int buflen = 10;
                         char buf[buflen] = { 0 };
                         int len = 0;
-                        char* adjusted = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) );
+                        const char* adjusted = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) );
                         if ( adjusted == 0 ) {
                             *q = *p;
                             ++p;
@@ -430,22 +444,22 @@ void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length
     switch (*length) {
         case 4:
             --output;
-            *output = (char)((input | BYTE_MARK) & BYTE_MASK);
+            *output = static_cast<char>((input | BYTE_MARK) & BYTE_MASK);
             input >>= 6;
             //fall through
         case 3:
             --output;
-            *output = (char)((input | BYTE_MARK) & BYTE_MASK);
+            *output = static_cast<char>((input | BYTE_MARK) & BYTE_MASK);
             input >>= 6;
             //fall through
         case 2:
             --output;
-            *output = (char)((input | BYTE_MARK) & BYTE_MASK);
+            *output = static_cast<char>((input | BYTE_MARK) & BYTE_MASK);
             input >>= 6;
             //fall through
         case 1:
             --output;
-            *output = (char)(input | FIRST_BYTE_MARK[*length]);
+            *output = static_cast<char>(input | FIRST_BYTE_MARK[*length]);
             break;
         default:
             TIXMLASSERT( false );
@@ -453,102 +467,94 @@ void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length
 }
 
 
-const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
+const char* XMLUtil::GetCharacterRef(const char* p, char* value, int* length)
 {
-    // Presume an entity, and pull it out.
+    // Assume an entity, and pull it out.
     *length = 0;
 
-    if ( *(p+1) == '#' && *(p+2) ) {
-        unsigned long ucs = 0;
-        TIXMLASSERT( sizeof( ucs ) >= 4 );
+    static const uint32_t MAX_CODE_POINT = 0x10FFFF;
+
+    if (*(p + 1) == '#' && *(p + 2)) {
+        uint32_t ucs = 0;
         ptrdiff_t delta = 0;
-        unsigned mult = 1;
+        uint32_t mult = 1;
         static const char SEMICOLON = ';';
 
-        if ( *(p+2) == 'x' ) {
+        bool hex = false;
+        uint32_t radix = 10;
+        const char* q = 0;
+        char terminator = '#';
+
+        if (*(p + 2) == 'x') {
             // Hexadecimal.
-            const char* q = p+3;
-            if ( !(*q) ) {
-                return 0;
-            }
+            hex = true;
+            radix = 16;
+            terminator = 'x';
 
-            q = strchr( q, SEMICOLON );
+            q = p + 3;
+        }
+        else {
+            // Decimal.
+            q = p + 2;
+        }
+        if (!(*q)) {
+            return 0;
+        }
 
-            if ( !q ) {
-                return 0;
-            }
-            TIXMLASSERT( *q == SEMICOLON );
+        q = strchr(q, SEMICOLON);
+        if (!q) {
+            return 0;
+        }
+        TIXMLASSERT(*q == SEMICOLON);
 
-            delta = q-p;
-            --q;
+        delta = q - p;
+        --q;
 
-            while ( *q != 'x' ) {
-                unsigned int digit = 0;
+        while (*q != terminator) {
+            uint32_t digit = 0;
 
-                if ( *q >= '0' && *q <= '9' ) {
-                    digit = *q - '0';
-                }
-                else if ( *q >= 'a' && *q <= 'f' ) {
-                    digit = *q - 'a' + 10;
-                }
-                else if ( *q >= 'A' && *q <= 'F' ) {
-                    digit = *q - 'A' + 10;
-                }
-                else {
-                    return 0;
-                }
-                TIXMLASSERT( digit < 16 );
-                TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
-                const unsigned int digitScaled = mult * digit;
-                TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
-                ucs += digitScaled;
-                TIXMLASSERT( mult <= UINT_MAX / 16 );
-                mult *= 16;
-                --q;
+            if (*q >= '0' && *q <= '9') {
+                digit = *q - '0';
             }
-        }
-        else {
-            // Decimal.
-            const char* q = p+2;
-            if ( !(*q) ) {
-                return 0;
+            else if (hex && (*q >= 'a' && *q <= 'f')) {
+                digit = *q - 'a' + 10;
             }
-
-            q = strchr( q, SEMICOLON );
-
-            if ( !q ) {
+            else if (hex && (*q >= 'A' && *q <= 'F')) {
+                digit = *q - 'A' + 10;
+            }
+            else {
                 return 0;
             }
-            TIXMLASSERT( *q == SEMICOLON );
-
-            delta = q-p;
-            --q;
-
-            while ( *q != '#' ) {
-                if ( *q >= '0' && *q <= '9' ) {
-                    const unsigned int digit = *q - '0';
-                    TIXMLASSERT( digit < 10 );
-                    TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
-                    const unsigned int digitScaled = mult * digit;
-                    TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
-                    ucs += digitScaled;
-                }
-                else {
-                    return 0;
-                }
-                TIXMLASSERT( mult <= UINT_MAX / 10 );
-                mult *= 10;
-                --q;
+            TIXMLASSERT(digit < radix);
+
+            const unsigned int digitScaled = mult * digit;
+            ucs += digitScaled;
+            mult *= radix;       
+            
+            // Security check: could a value exist that is out of range?
+            // Easily; limit to the MAX_CODE_POINT, which also allows for a
+            // bunch of leading zeroes.
+            if (mult > MAX_CODE_POINT) {
+                mult = MAX_CODE_POINT;
             }
+            --q;
+        }
+        // Out of range:
+        if (ucs > MAX_CODE_POINT) {
+            return 0;
         }
         // convert the UCS to UTF-8
-        ConvertUTF32ToUTF8( ucs, value, length );
+        ConvertUTF32ToUTF8(ucs, value, length);
+		if (length == 0) {
+            // If length is 0, there was an error. (Security? Bad input?)
+            // Fail safely.
+			return 0;
+		}
         return p + delta + 1;
     }
-    return p+1;
+    return p + 1;
 }
 
-
 void XMLUtil::ToStr( int v, char* buffer, int bufferSize )
 {
     TIXML_SNPRINTF( buffer, bufferSize, "%d", v );
@@ -582,24 +588,38 @@ void XMLUtil::ToStr( double v, char* buffer, int bufferSize )
 }
 
 
-void XMLUtil::ToStr(int64_t v, char* buffer, int bufferSize)
+void XMLUtil::ToStr( int64_t v, char* buffer, int bufferSize )
 {
 	// horrible syntax trick to make the compiler happy about %lld
-	TIXML_SNPRINTF(buffer, bufferSize, "%lld", (long long)v);
+	TIXML_SNPRINTF(buffer, bufferSize, "%lld", static_cast<long long>(v));
 }
 
+void XMLUtil::ToStr( uint64_t v, char* buffer, int bufferSize )
+{
+    // horrible syntax trick to make the compiler happy about %llu
+    TIXML_SNPRINTF(buffer, bufferSize, "%llu", static_cast<unsigned long long>(v));
+}
 
-bool XMLUtil::ToInt( const char* str, int* value )
+bool XMLUtil::ToInt(const char* str, int* value)
 {
-    if ( TIXML_SSCANF( str, "%d", value ) == 1 ) {
-        return true;
+    if (IsPrefixHex(str)) {
+        unsigned v;
+        if (TIXML_SSCANF(str, "%x", &v) == 1) {
+            *value = static_cast<int>(v);
+            return true;
+        }
+    }
+    else {
+        if (TIXML_SSCANF(str, "%d", value) == 1) {
+            return true;
+        }
     }
     return false;
 }
 
-bool XMLUtil::ToUnsigned( const char* str, unsigned *value )
+bool XMLUtil::ToUnsigned(const char* str, unsigned* value)
 {
-    if ( TIXML_SSCANF( str, "%u", value ) == 1 ) {
+    if (TIXML_SSCANF(str, IsPrefixHex(str) ? "%x" : "%u", value) == 1) {
         return true;
     }
     return false;
@@ -612,13 +632,20 @@ bool XMLUtil::ToBool( const char* str, bool* value )
         *value = (ival==0) ? false : true;
         return true;
     }
-    if ( StringEqual( str, "true" ) ) {
-        *value = true;
-        return true;
+    static const char* TRUE_VALS[] = { "true", "True", "TRUE", 0 };
+    static const char* FALSE_VALS[] = { "false", "False", "FALSE", 0 };
+
+    for (int i = 0; TRUE_VALS[i]; ++i) {
+        if (StringEqual(str, TRUE_VALS[i])) {
+            *value = true;
+            return true;
+        }
     }
-    else if ( StringEqual( str, "false" ) ) {
-        *value = false;
-        return true;
+    for (int i = 0; FALSE_VALS[i]; ++i) {
+        if (StringEqual(str, FALSE_VALS[i])) {
+            *value = false;
+            return true;
+        }
     }
     return false;
 }
@@ -644,16 +671,35 @@ bool XMLUtil::ToDouble( const char* str, double* value )
 
 bool XMLUtil::ToInt64(const char* str, int64_t* value)
 {
-	long long v = 0;	// horrible syntax trick to make the compiler happy about %lld
-	if (TIXML_SSCANF(str, "%lld", &v) == 1) {
-		*value = (int64_t)v;
-		return true;
-	}
+    if (IsPrefixHex(str)) {
+        unsigned long long v = 0;	// horrible syntax trick to make the compiler happy about %llx
+        if (TIXML_SSCANF(str, "%llx", &v) == 1) {
+            *value = static_cast<int64_t>(v);
+            return true;
+        }
+    }
+    else {
+        long long v = 0;	// horrible syntax trick to make the compiler happy about %lld
+        if (TIXML_SSCANF(str, "%lld", &v) == 1) {
+            *value = static_cast<int64_t>(v);
+            return true;
+        }
+    }
 	return false;
 }
 
 
-char* XMLDocument::Identify( char* p, XMLNode** node )
+bool XMLUtil::ToUnsigned64(const char* str, uint64_t* value) {
+    unsigned long long v = 0;	// horrible syntax trick to make the compiler happy about %llu
+    if(TIXML_SSCANF(str, IsPrefixHex(str) ? "%llx" : "%llu", &v) == 1) {
+        *value = static_cast<uint64_t>(v);
+        return true;
+    }
+    return false;
+}
+
+
+char* XMLDocument::Identify( char* p, XMLNode** node, bool first )
 {
     TIXMLASSERT( node );
     TIXMLASSERT( p );
@@ -705,9 +751,19 @@ char* XMLDocument::Identify( char* p, XMLNode** node )
         p += dtdHeaderLen;
     }
     else if ( XMLUtil::StringEqual( p, elementHeader, elementHeaderLen ) ) {
-        returnNode =  CreateUnlinkedNode<XMLElement>( _elementPool );
-        returnNode->_parseLineNum = _parseCurLineNum;
-        p += elementHeaderLen;
+
+        // Preserve whitespace pedantically before closing tag, when it's immediately after opening tag
+        if (WhitespaceMode() == PEDANTIC_WHITESPACE && first && p != start && *(p + elementHeaderLen) == '/') {
+            returnNode = CreateUnlinkedNode<XMLText>(_textPool);
+            returnNode->_parseLineNum = startLine;
+            p = start;	// Back it up, all the text counts.
+            _parseCurLineNum = startLine;
+        }
+        else {
+            returnNode = CreateUnlinkedNode<XMLElement>(_elementPool);
+            returnNode->_parseLineNum = _parseCurLineNum;
+            p += elementHeaderLen;
+        }
     }
     else {
         returnNode = CreateUnlinkedNode<XMLText>( _textPool );
@@ -760,6 +816,34 @@ XMLNode::~XMLNode()
     }
 }
 
+// ChildElementCount was originally suggested by msteiger on the sourceforge page for TinyXML and modified by KB1SPH for TinyXML-2.
+
+int XMLNode::ChildElementCount(const char *value) const {
+	int count = 0;
+
+	const XMLElement *e = FirstChildElement(value);
+
+	while (e) {
+		e = e->NextSiblingElement(value);
+		count++;
+	}
+
+	return count;
+}
+
+int XMLNode::ChildElementCount() const {
+	int count = 0;
+
+	const XMLElement *e = FirstChildElement();
+
+	while (e) {
+		e = e->NextSiblingElement();
+		count++;
+	}
+
+	return count;
+}
+
 const char* XMLNode::Value() const
 {
     // Edge case: XMLDocuments don't have a Value. Return null.
@@ -1004,44 +1088,60 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr )
     // 'endTag' is the end tag for this node, it is returned by a call to a child.
     // 'parentEnd' is the end tag for the parent, which is filled in and returned.
 
-    while( p && *p ) {
+	XMLDocument::DepthTracker tracker(_document);
+	if (_document->Error())
+		return 0;
+
+	bool first = true;
+	while( p && *p ) {
         XMLNode* node = 0;
 
-        p = _document->Identify( p, &node );
+        p = _document->Identify( p, &node, first );
         TIXMLASSERT( p );
         if ( node == 0 ) {
             break;
         }
+        first = false;
 
-        int initialLineNum = node->_parseLineNum;
+       const int initialLineNum = node->_parseLineNum;
 
         StrPair endTag;
         p = node->ParseDeep( p, &endTag, curLineNumPtr );
         if ( !p ) {
-            DeleteNode( node );
+            _document->DeleteNode( node );
             if ( !_document->Error() ) {
                 _document->SetError( XML_ERROR_PARSING, initialLineNum, 0);
             }
             break;
         }
 
-        XMLDeclaration* decl = node->ToDeclaration();
+        const XMLDeclaration* const decl = node->ToDeclaration();
         if ( decl ) {
             // Declarations are only allowed at document level
-            bool wellLocated = ( ToDocument() != 0 );
-            if ( wellLocated ) {
-                // Multiple declarations are allowed but all declarations
-                // must occur before anything else
-                for ( const XMLNode* existingNode = _document->FirstChild(); existingNode; existingNode = existingNode->NextSibling() ) {
-                    if ( !existingNode->ToDeclaration() ) {
-                        wellLocated = false;
-                        break;
-                    }
+            //
+            // Multiple declarations are allowed but all declarations
+            // must occur before anything else. 
+            //
+            // Optimized due to a security test case. If the first node is 
+            // a declaration, and the last node is a declaration, then only 
+            // declarations have so far been added.
+            bool wellLocated = false;
+
+            if (ToDocument()) {
+                if (FirstChild()) {
+                    wellLocated =
+                        FirstChild() &&
+                        FirstChild()->ToDeclaration() &&
+                        LastChild() &&
+                        LastChild()->ToDeclaration();
+                }
+                else {
+                    wellLocated = true;
                 }
             }
             if ( !wellLocated ) {
                 _document->SetError( XML_ERROR_PARSING_DECLARATION, initialLineNum, "XMLDeclaration value=%s", decl->Value());
-                DeleteNode( node );
+                _document->DeleteNode( node );
                 break;
             }
         }
@@ -1076,7 +1176,7 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr )
             }
             if ( mismatch ) {
                 _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, initialLineNum, "XMLElement name=%s", ele->Name());
-                DeleteNode( node );
+                _document->DeleteNode( node );
                 break;
             }
         }
@@ -1359,7 +1459,7 @@ char* XMLAttribute::ParseDeep( char* p, bool processEntities, int* curLineNumPtr
         return 0;
     }
 
-    char endTag[2] = { *p, 0 };
+    const char endTag[2] = { *p, 0 };
     ++p;	// move past opening quote
 
     p = _value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES, curLineNumPtr );
@@ -1400,6 +1500,15 @@ XMLError XMLAttribute::QueryInt64Value(int64_t* value) const
 }
 
 
+XMLError XMLAttribute::QueryUnsigned64Value(uint64_t* value) const
+{
+    if(XMLUtil::ToUnsigned64(Value(), value)) {
+        return XML_SUCCESS;
+    }
+    return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
 XMLError XMLAttribute::QueryBoolValue( bool* value ) const
 {
     if ( XMLUtil::ToBool( Value(), value )) {
@@ -1456,6 +1565,12 @@ void XMLAttribute::SetAttribute(int64_t v)
 	_value.SetStr(buf);
 }
 
+void XMLAttribute::SetAttribute(uint64_t v)
+{
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr(v, buf, BUF_SIZE);
+    _value.SetStr(buf);
+}
 
 
 void XMLAttribute::SetAttribute( bool v )
@@ -1542,6 +1657,13 @@ int64_t XMLElement::Int64Attribute(const char* name, int64_t defaultValue) const
 	return i;
 }
 
+uint64_t XMLElement::Unsigned64Attribute(const char* name, uint64_t defaultValue) const
+{
+	uint64_t i = defaultValue;
+	QueryUnsigned64Attribute(name, &i);
+	return i;
+}
+
 bool XMLElement::BoolAttribute(const char* name, bool defaultValue) const
 {
 	bool b = defaultValue;
@@ -1565,8 +1687,18 @@ float XMLElement::FloatAttribute(const char* name, float defaultValue) const
 
 const char* XMLElement::GetText() const
 {
-    if ( FirstChild() && FirstChild()->ToText() ) {
-        return FirstChild()->Value();
+    /* skip comment node */
+    const XMLNode* node = FirstChild();
+    while (node) {
+        if (node->ToComment()) {
+            node = node->NextSibling();
+            continue;
+        }
+        break;
+    }
+
+    if ( node && node->ToText() ) {
+        return node->Value();
     }
     return 0;
 }
@@ -1606,6 +1738,12 @@ void XMLElement::SetText(int64_t v)
 	SetText(buf);
 }
 
+void XMLElement::SetText(uint64_t v) {
+    char buf[BUF_SIZE];
+    XMLUtil::ToStr(v, buf, BUF_SIZE);
+    SetText(buf);
+}
+
 
 void XMLElement::SetText( bool v )
 {
@@ -1670,6 +1808,19 @@ XMLError XMLElement::QueryInt64Text(int64_t* ival) const
 }
 
 
+XMLError XMLElement::QueryUnsigned64Text(uint64_t* uval) const
+{
+    if(FirstChild() && FirstChild()->ToText()) {
+        const char* t = FirstChild()->Value();
+        if(XMLUtil::ToUnsigned64(t, uval)) {
+            return XML_SUCCESS;
+        }
+        return XML_CAN_NOT_CONVERT_TEXT;
+    }
+    return XML_NO_TEXT_NODE;
+}
+
+
 XMLError XMLElement::QueryBoolText( bool* bval ) const
 {
     if ( FirstChild() && FirstChild()->ToText() ) {
@@ -1729,6 +1880,13 @@ int64_t XMLElement::Int64Text(int64_t defaultValue) const
 	return i;
 }
 
+uint64_t XMLElement::Unsigned64Text(uint64_t defaultValue) const
+{
+	uint64_t i = defaultValue;
+	QueryUnsigned64Text(&i);
+	return i;
+}
+
 bool XMLElement::BoolText(bool defaultValue) const
 {
 	bool b = defaultValue;
@@ -1811,12 +1969,12 @@ char* XMLElement::ParseAttributes( char* p, int* curLineNumPtr )
         }
 
         // attribute.
-        if (XMLUtil::IsNameStartChar( *p ) ) {
+        if (XMLUtil::IsNameStartChar( static_cast<unsigned char>(*p) ) ) {
             XMLAttribute* attrib = CreateAttribute();
             TIXMLASSERT( attrib );
             attrib->_parseLineNum = _document->_parseCurLineNum;
 
-            int attrLineNum = attrib->_parseLineNum;
+            const int attrLineNum = attrib->_parseLineNum;
 
             p = attrib->ParseDeep( p, _document->ProcessEntities(), curLineNumPtr );
             if ( !p || Attribute( attrib->Name() ) ) {
@@ -1877,6 +2035,39 @@ XMLAttribute* XMLElement::CreateAttribute()
     return attrib;
 }
 
+
+XMLElement* XMLElement::InsertNewChildElement(const char* name)
+{
+    XMLElement* node = _document->NewElement(name);
+    return InsertEndChild(node) ? node : 0;
+}
+
+XMLComment* XMLElement::InsertNewComment(const char* comment)
+{
+    XMLComment* node = _document->NewComment(comment);
+    return InsertEndChild(node) ? node : 0;
+}
+
+XMLText* XMLElement::InsertNewText(const char* text)
+{
+    XMLText* node = _document->NewText(text);
+    return InsertEndChild(node) ? node : 0;
+}
+
+XMLDeclaration* XMLElement::InsertNewDeclaration(const char* text)
+{
+    XMLDeclaration* node = _document->NewDeclaration(text);
+    return InsertEndChild(node) ? node : 0;
+}
+
+XMLUnknown* XMLElement::InsertNewUnknown(const char* text)
+{
+    XMLUnknown* node = _document->NewUnknown(text);
+    return InsertEndChild(node) ? node : 0;
+}
+
+
+
 //
 //	<ele></ele>
 //	<ele>foo<b>bar</b></ele>
@@ -1973,10 +2164,8 @@ const char* XMLDocument::_errorNames[XML_ERROR_COUNT] = {
     "XML_ERROR_FILE_NOT_FOUND",
     "XML_ERROR_FILE_COULD_NOT_BE_OPENED",
     "XML_ERROR_FILE_READ_ERROR",
-    "UNUSED_XML_ERROR_ELEMENT_MISMATCH",
     "XML_ERROR_PARSING_ELEMENT",
     "XML_ERROR_PARSING_ATTRIBUTE",
-    "UNUSED_XML_ERROR_IDENTIFYING_TAG",
     "XML_ERROR_PARSING_TEXT",
     "XML_ERROR_PARSING_CDATA",
     "XML_ERROR_PARSING_COMMENT",
@@ -1986,7 +2175,8 @@ const char* XMLDocument::_errorNames[XML_ERROR_COUNT] = {
     "XML_ERROR_MISMATCHED_ELEMENT",
     "XML_ERROR_PARSING",
     "XML_CAN_NOT_CONVERT_TEXT",
-    "XML_NO_TEXT_NODE"
+    "XML_NO_TEXT_NODE",
+	"XML_ELEMENT_DEPTH_EXCEEDED"
 };
 
 
@@ -2000,6 +2190,7 @@ XMLDocument::XMLDocument( bool processEntities, Whitespace whitespaceMode ) :
     _errorLineNum( 0 ),
     _charBuffer( 0 ),
     _parseCurLineNum( 0 ),
+	_parsingDepth(0),
     _unlinked(),
     _elementPool(),
     _attributePool(),
@@ -2017,12 +2208,12 @@ XMLDocument::~XMLDocument()
 }
 
 
-void XMLDocument::MarkInUse(XMLNode* node)
+void XMLDocument::MarkInUse(const XMLNode* const node)
 {
 	TIXMLASSERT(node);
 	TIXMLASSERT(node->_parent == 0);
 
-	for (int i = 0; i < _unlinked.Size(); ++i) {
+	for (size_t i = 0; i < _unlinked.Size(); ++i) {
 		if (node == _unlinked[i]) {
 			_unlinked.SwapRemove(i);
 			break;
@@ -2044,6 +2235,7 @@ void XMLDocument::Clear()
 
     delete [] _charBuffer;
     _charBuffer = 0;
+	_parsingDepth = 0;
 
 #if 0
     _textPool.Trace( "text" );
@@ -2121,7 +2313,7 @@ static FILE* callfopen( const char* filepath, const char* mode )
     TIXMLASSERT( mode );
 #if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE)
     FILE* fp = 0;
-    errno_t err = fopen_s( &fp, filepath, mode );
+    const errno_t err = fopen_s( &fp, filepath, mode );
     if ( err ) {
         return 0;
     }
@@ -2168,49 +2360,34 @@ XMLError XMLDocument::LoadFile( const char* filename )
     return _errorID;
 }
 
-// This is likely overengineered template art to have a check that unsigned long value incremented
-// by one still fits into size_t. If size_t type is larger than unsigned long type
-// (x86_64-w64-mingw32 target) then the check is redundant and gcc and clang emit
-// -Wtype-limits warning. This piece makes the compiler select code with a check when a check
-// is useful and code with no check when a check is redundant depending on how size_t and unsigned long
-// types sizes relate to each other.
-template
-<bool = (sizeof(unsigned long) >= sizeof(size_t))>
-struct LongFitsIntoSizeTMinusOne {
-    static bool Fits( unsigned long value )
-    {
-        return value < (size_t)-1;
-    }
-};
-
-template <>
-struct LongFitsIntoSizeTMinusOne<false> {
-    static bool Fits( unsigned long )
-    {
-        return true;
-    }
-};
-
 XMLError XMLDocument::LoadFile( FILE* fp )
 {
     Clear();
 
-    fseek( fp, 0, SEEK_SET );
+    TIXML_FSEEK( fp, 0, SEEK_SET );
     if ( fgetc( fp ) == EOF && ferror( fp ) != 0 ) {
         SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
         return _errorID;
     }
 
-    fseek( fp, 0, SEEK_END );
-    const long filelength = ftell( fp );
-    fseek( fp, 0, SEEK_SET );
-    if ( filelength == -1L ) {
-        SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
-        return _errorID;
+    TIXML_FSEEK( fp, 0, SEEK_END );
+
+    unsigned long long filelength;
+    {
+        const long long fileLengthSigned = TIXML_FTELL( fp );
+        TIXML_FSEEK( fp, 0, SEEK_SET );
+        if ( fileLengthSigned == -1L ) {
+            SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
+            return _errorID;
+        }
+        TIXMLASSERT( fileLengthSigned >= 0 );
+        filelength = static_cast<unsigned long long>(fileLengthSigned);
     }
-    TIXMLASSERT( filelength >= 0 );
 
-    if ( !LongFitsIntoSizeTMinusOne<>::Fits( filelength ) ) {
+    const size_t maxSizeT = static_cast<size_t>(-1);
+    // We'll do the comparison as an unsigned long long, because that's guaranteed to be at
+    // least 8 bytes, even on a 32-bit platform.
+    if ( filelength >= static_cast<unsigned long long>(maxSizeT) ) {
         // Cannot handle files which won't fit in buffer together with null terminator
         SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
         return _errorID;
@@ -2221,10 +2398,10 @@ XMLError XMLDocument::LoadFile( FILE* fp )
         return _errorID;
     }
 
-    const size_t size = filelength;
+    const size_t size = static_cast<size_t>(filelength);
     TIXMLASSERT( _charBuffer == 0 );
     _charBuffer = new char[size+1];
-    size_t read = fread( _charBuffer, 1, size, fp );
+    const size_t read = fread( _charBuffer, 1, size, fp );
     if ( read != size ) {
         SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
         return _errorID;
@@ -2267,21 +2444,21 @@ XMLError XMLDocument::SaveFile( FILE* fp, bool compact )
 }
 
 
-XMLError XMLDocument::Parse( const char* p, size_t len )
+XMLError XMLDocument::Parse( const char* xml, size_t nBytes )
 {
     Clear();
 
-    if ( len == 0 || !p || !*p ) {
+    if ( nBytes == 0 || !xml || !*xml ) {
         SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
         return _errorID;
     }
-    if ( len == (size_t)(-1) ) {
-        len = strlen( p );
+    if ( nBytes == static_cast<size_t>(-1) ) {
+        nBytes = strlen( xml );
     }
     TIXMLASSERT( _charBuffer == 0 );
-    _charBuffer = new char[ len+1 ];
-    memcpy( _charBuffer, p, len );
-    _charBuffer[len] = 0;
+    _charBuffer = new char[ nBytes+1 ];
+    memcpy( _charBuffer, xml, nBytes );
+    _charBuffer[nBytes] = 0;
 
     Parse();
     if ( Error() ) {
@@ -2310,17 +2487,26 @@ void XMLDocument::Print( XMLPrinter* streamer ) const
 }
 
 
+void XMLDocument::ClearError() {
+    _errorID = XML_SUCCESS;
+    _errorLineNum = 0;
+    _errorStr.Reset();
+}
+
+
 void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... )
 {
-    TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT );
+    TIXMLASSERT(error >= 0 && error < XML_ERROR_COUNT);
     _errorID = error;
     _errorLineNum = lineNum;
 	_errorStr.Reset();
 
-    size_t BUFFER_SIZE = 1000;
+    const size_t BUFFER_SIZE = 1000;
     char* buffer = new char[BUFFER_SIZE];
 
-    TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d", ErrorIDToName(error), int(error), int(error), lineNum);
+    TIXMLASSERT(sizeof(error) <= sizeof(int));
+    TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d",
+        ErrorIDToName(error), static_cast<int>(error), static_cast<unsigned int>(error), lineNum);
 
 	if (format) {
 		size_t len = strlen(buffer);
@@ -2377,6 +2563,20 @@ void XMLDocument::Parse()
     ParseDeep(p, 0, &_parseCurLineNum );
 }
 
+void XMLDocument::PushDepth()
+{
+	_parsingDepth++;
+	if (_parsingDepth == TINYXML2_MAX_ELEMENT_DEPTH) {
+		SetError(XML_ELEMENT_DEPTH_EXCEEDED, _parseCurLineNum, "Element nesting is too deep." );
+	}
+}
+
+void XMLDocument::PopDepth()
+{
+	TIXMLASSERT(_parsingDepth > 0);
+	--_parsingDepth;
+}
+
 XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
     _elementJustOpened( false ),
     _stack(),
@@ -2394,13 +2594,13 @@ XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
     }
     for( int i=0; i<NUM_ENTITIES; ++i ) {
         const char entityValue = entities[i].value;
-        const unsigned char flagIndex = (unsigned char)entityValue;
+        const unsigned char flagIndex = static_cast<unsigned char>(entityValue);
         TIXMLASSERT( flagIndex < ENTITY_RANGE );
         _entityFlag[flagIndex] = true;
     }
-    _restrictedEntityFlag[(unsigned char)'&'] = true;
-    _restrictedEntityFlag[(unsigned char)'<'] = true;
-    _restrictedEntityFlag[(unsigned char)'>'] = true;	// not required, but consistency is nice
+    _restrictedEntityFlag[static_cast<unsigned char>('&')] = true;
+    _restrictedEntityFlag[static_cast<unsigned char>('<')] = true;
+    _restrictedEntityFlag[static_cast<unsigned char>('>')] = true;	// not required, but consistency is nice
     _buffer.Push( 0 );
 }
 
@@ -2475,10 +2675,10 @@ void XMLPrinter::PrintString( const char* p, bool restricted )
                 // Check for entities. If one is found, flush
                 // the stream up until the entity, write the
                 // entity, and keep looking.
-                if ( flag[(unsigned char)(*q)] ) {
+                if ( flag[static_cast<unsigned char>(*q)] ) {
                     while ( p < q ) {
                         const size_t delta = q - p;
-                        const int toPrint = ( INT_MAX < delta ) ? INT_MAX : (int)delta;
+                        const int toPrint = ( INT_MAX < delta ) ? INT_MAX : static_cast<int>(delta);
                         Write( p, toPrint );
                         p += toPrint;
                     }
@@ -2502,14 +2702,16 @@ void XMLPrinter::PrintString( const char* p, bool restricted )
             ++q;
             TIXMLASSERT( p <= q );
         }
+        // Flush the remaining string. This will be the entire
+        // string if an entity wasn't found.
+        if ( p < q ) {
+            const size_t delta = q - p;
+            const int toPrint = ( INT_MAX < delta ) ? INT_MAX : static_cast<int>(delta);
+            Write( p, toPrint );
+        }
     }
-    // Flush the remaining string. This will be the entire
-    // string if an entity wasn't found.
-    TIXMLASSERT( p <= q );
-    if ( !_processEntities || ( p < q ) ) {
-        const size_t delta = q - p;
-        const int toPrint = ( INT_MAX < delta ) ? INT_MAX : (int)delta;
-        Write( p, toPrint );
+    else {
+        Write( p );
     }
 }
 
@@ -2525,24 +2727,33 @@ void XMLPrinter::PushHeader( bool writeBOM, bool writeDec )
     }
 }
 
-
-void XMLPrinter::OpenElement( const char* name, bool compactMode )
+void XMLPrinter::PrepareForNewNode( bool compactMode )
 {
     SealElementIfJustOpened();
-    _stack.Push( name );
 
-    if ( _textDepth < 0 && !_firstElement && !compactMode ) {
-        Putc( '\n' );
+    if ( compactMode ) {
+        return;
     }
-    if ( !compactMode ) {
+
+    if ( _firstElement ) {
+        PrintSpace (_depth);
+    } else if ( _textDepth < 0) {
+        Putc( '\n' );
         PrintSpace( _depth );
     }
 
+    _firstElement = false;
+}
+
+void XMLPrinter::OpenElement( const char* name, bool compactMode )
+{
+    PrepareForNewNode( compactMode );
+    _stack.Push( name );
+
     Write ( "<" );
     Write ( name );
 
     _elementJustOpened = true;
-    _firstElement = false;
     ++_depth;
 }
 
@@ -2582,6 +2793,14 @@ void XMLPrinter::PushAttribute(const char* name, int64_t v)
 }
 
 
+void XMLPrinter::PushAttribute(const char* name, uint64_t v)
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr(v, buf, BUF_SIZE);
+	PushAttribute(name, buf);
+}
+
+
 void XMLPrinter::PushAttribute( const char* name, bool v )
 {
     char buf[BUF_SIZE];
@@ -2651,6 +2870,7 @@ void XMLPrinter::PushText( const char* text, bool cdata )
     }
 }
 
+
 void XMLPrinter::PushText( int64_t value )
 {
     char buf[BUF_SIZE];
@@ -2658,6 +2878,15 @@ void XMLPrinter::PushText( int64_t value )
     PushText( buf, false );
 }
 
+
+void XMLPrinter::PushText( uint64_t value )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr(value, buf, BUF_SIZE);
+	PushText(buf, false);
+}
+
+
 void XMLPrinter::PushText( int value )
 {
     char buf[BUF_SIZE];
@@ -2700,12 +2929,7 @@ void XMLPrinter::PushText( double value )
 
 void XMLPrinter::PushComment( const char* comment )
 {
-    SealElementIfJustOpened();
-    if ( _textDepth < 0 && !_firstElement && !_compactMode) {
-        Putc( '\n' );
-        PrintSpace( _depth );
-    }
-    _firstElement = false;
+    PrepareForNewNode( _compactMode );
 
     Write( "<!--" );
     Write( comment );
@@ -2715,12 +2939,7 @@ void XMLPrinter::PushComment( const char* comment )
 
 void XMLPrinter::PushDeclaration( const char* value )
 {
-    SealElementIfJustOpened();
-    if ( _textDepth < 0 && !_firstElement && !_compactMode) {
-        Putc( '\n' );
-        PrintSpace( _depth );
-    }
-    _firstElement = false;
+    PrepareForNewNode( _compactMode );
 
     Write( "<?" );
     Write( value );
@@ -2730,12 +2949,7 @@ void XMLPrinter::PushDeclaration( const char* value )
 
 void XMLPrinter::PushUnknown( const char* value )
 {
-    SealElementIfJustOpened();
-    if ( _textDepth < 0 && !_firstElement && !_compactMode) {
-        Putc( '\n' );
-        PrintSpace( _depth );
-    }
-    _firstElement = false;
+    PrepareForNewNode( _compactMode );
 
     Write( "<!" );
     Write( value );
diff --git a/externals/tinyxml2/tinyxml2.h b/externals/tinyxml2/tinyxml2.h
index 18afd004dd0..9626be8a0f1 100644
--- a/externals/tinyxml2/tinyxml2.h
+++ b/externals/tinyxml2/tinyxml2.h
@@ -42,9 +42,6 @@ distribution.
 #endif
 #include <stdint.h>
 
-/*
-   TODO: intern strings instead of allocation.
-*/
 /*
 	gcc:
         g++ -Wall -DTINYXML2_DEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe
@@ -64,7 +61,7 @@ distribution.
 #   pragma warning(disable: 4251)
 #endif
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #   ifdef TINYXML2_EXPORT
 #       define TINYXML2_LIB __declspec(dllexport)
 #   elif defined(TINYXML2_IMPORT)
@@ -79,33 +76,41 @@ distribution.
 #endif
 
 
+#if !defined(TIXMLASSERT)
 #if defined(TINYXML2_DEBUG)
 #   if defined(_MSC_VER)
 #       // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like
-#       define TIXMLASSERT( x )           if ( !((void)0,(x))) { __debugbreak(); }
+#       define TIXMLASSERT( x )           do { if ( !((void)0,(x))) { __debugbreak(); } } while(false)
 #   elif defined (ANDROID_NDK)
 #       include <android/log.h>
-#       define TIXMLASSERT( x )           if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); }
+#       define TIXMLASSERT( x )           do { if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } } while(false)
 #   else
 #       include <assert.h>
 #       define TIXMLASSERT                assert
 #   endif
 #else
-#   define TIXMLASSERT( x )               {}
+#   define TIXMLASSERT( x )               do {} while(false)
+#endif
 #endif
-
 
 /* Versioning, past 1.0.14:
 	http://semver.org/
 */
-static const int TIXML2_MAJOR_VERSION = 6;
-static const int TIXML2_MINOR_VERSION = 1;
+static const int TIXML2_MAJOR_VERSION = 11;
+static const int TIXML2_MINOR_VERSION = 0;
 static const int TIXML2_PATCH_VERSION = 0;
 
-#define TINYXML2_MAJOR_VERSION 6
-#define TINYXML2_MINOR_VERSION 1
+#define TINYXML2_MAJOR_VERSION 11
+#define TINYXML2_MINOR_VERSION 0
 #define TINYXML2_PATCH_VERSION 0
 
+// A fixed element depth limit is problematic. There needs to be a
+// limit to avoid a stack overflow. However, that limit varies per
+// system, and the capacity of the stack. On the other hand, it's a trivial
+// attack that can result from ill, malicious, or even correctly formed XML,
+// so there needs to be a limit in place.
+static const int TINYXML2_MAX_ELEMENT_DEPTH = 500;
+
 namespace tinyxml2
 {
 class XMLDocument;
@@ -122,11 +127,13 @@ class XMLPrinter;
 	pointers into the XML file itself, and will apply normalization
 	and entity translation if actually read. Can also store (and memory
 	manage) a traditional char[]
+
+    Isn't clear why TINYXML2_LIB is needed; but seems to fix #719
 */
-class StrPair
+class TINYXML2_LIB StrPair
 {
 public:
-    enum {
+    enum Mode {
         NEEDS_ENTITY_PROCESSING			= 0x01,
         NEEDS_NEWLINE_NORMALIZATION		= 0x02,
         NEEDS_WHITESPACE_COLLAPSING     = 0x04,
@@ -183,7 +190,7 @@ class StrPair
     char*   _end;
 
     StrPair( const StrPair& other );	// not supported
-    void operator=( StrPair& other );	// not supported, use TransferTo()
+    void operator=( const StrPair& other );	// not supported, use TransferTo()
 };
 
 
@@ -192,7 +199,7 @@ class StrPair
 	Has a small initial memory pool, so that low or no usage will not
 	cause a call to new/delete
 */
-template <class T, int INITIAL_SIZE>
+template <class T, size_t INITIAL_SIZE>
 class DynArray
 {
 public:
@@ -220,9 +227,8 @@ class DynArray
         ++_size;
     }
 
-    T* PushArr( int count ) {
-        TIXMLASSERT( count >= 0 );
-        TIXMLASSERT( _size <= INT_MAX - count );
+    T* PushArr( size_t count ) {
+        TIXMLASSERT( _size <= SIZE_MAX - count );
         EnsureCapacity( _size+count );
         T* ret = &_mem[_size];
         _size += count;
@@ -235,7 +241,7 @@ class DynArray
         return _mem[_size];
     }
 
-    void PopArr( int count ) {
+    void PopArr( size_t count ) {
         TIXMLASSERT( _size >= count );
         _size -= count;
     }
@@ -244,13 +250,13 @@ class DynArray
         return _size == 0;
     }
 
-    T& operator[](int i)				{
-        TIXMLASSERT( i>= 0 && i < _size );
+    T& operator[](size_t i) {
+        TIXMLASSERT( i < _size );
         return _mem[i];
     }
 
-    const T& operator[](int i) const	{
-        TIXMLASSERT( i>= 0 && i < _size );
+    const T& operator[](size_t i) const {
+        TIXMLASSERT( i < _size );
         return _mem[i];
     }
 
@@ -259,18 +265,18 @@ class DynArray
         return _mem[ _size - 1];
     }
 
-    int Size() const					{
+    size_t Size() const {
         TIXMLASSERT( _size >= 0 );
         return _size;
     }
 
-    int Capacity() const				{
+    size_t Capacity() const {
         TIXMLASSERT( _allocated >= INITIAL_SIZE );
         return _allocated;
     }
 
-	void SwapRemove(int i) {
-		TIXMLASSERT(i >= 0 && i < _size);
+	void SwapRemove(size_t i) {
+		TIXMLASSERT(i < _size);
 		TIXMLASSERT(_size > 0);
 		_mem[i] = _mem[_size - 1];
 		--_size;
@@ -281,7 +287,7 @@ class DynArray
         return _mem;
     }
 
-    T* Mem()							{
+    T* Mem() {
         TIXMLASSERT( _mem );
         return _mem;
     }
@@ -290,14 +296,14 @@ class DynArray
     DynArray( const DynArray& ); // not supported
     void operator=( const DynArray& ); // not supported
 
-    void EnsureCapacity( int cap ) {
+    void EnsureCapacity( size_t cap ) {
         TIXMLASSERT( cap > 0 );
         if ( cap > _allocated ) {
-            TIXMLASSERT( cap <= INT_MAX / 2 );
-            int newAllocated = cap * 2;
+            TIXMLASSERT( cap <= SIZE_MAX / 2 / sizeof(T));
+            const size_t newAllocated = cap * 2;
             T* newMem = new T[newAllocated];
             TIXMLASSERT( newAllocated >= _size );
-            memcpy( newMem, _mem, sizeof(T)*_size );	// warning: not using constructors, only works for PODs
+            memcpy( newMem, _mem, sizeof(T) * _size );	// warning: not using constructors, only works for PODs
             if ( _mem != _pool ) {
                 delete [] _mem;
             }
@@ -308,8 +314,8 @@ class DynArray
 
     T*  _mem;
     T   _pool[INITIAL_SIZE];
-    int _allocated;		// objects allocated
-    int _size;			// number objects in use
+    size_t _allocated;		// objects allocated
+    size_t _size;			// number objects in use
 };
 
 
@@ -323,26 +329,25 @@ class MemPool
     MemPool() {}
     virtual ~MemPool() {}
 
-    virtual int ItemSize() const = 0;
+    virtual size_t ItemSize() const = 0;
     virtual void* Alloc() = 0;
     virtual void Free( void* ) = 0;
     virtual void SetTracked() = 0;
-    virtual void Clear() = 0;
 };
 
 
 /*
 	Template child class to create pools of the correct type.
 */
-template< int ITEM_SIZE >
+template< size_t ITEM_SIZE >
 class MemPoolT : public MemPool
 {
 public:
     MemPoolT() : _blockPtrs(), _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0)	{}
     ~MemPoolT() {
-        Clear();
+        MemPoolT< ITEM_SIZE >::Clear();
     }
-    
+
     void Clear() {
         // Delete the blocks.
         while( !_blockPtrs.Empty()) {
@@ -356,21 +361,21 @@ class MemPoolT : public MemPool
         _nUntracked = 0;
     }
 
-    virtual int ItemSize() const	{
+    virtual size_t ItemSize() const override {
         return ITEM_SIZE;
     }
-    int CurrentAllocs() const		{
+    size_t CurrentAllocs() const {
         return _currentAllocs;
     }
 
-    virtual void* Alloc() {
+    virtual void* Alloc() override{
         if ( !_root ) {
             // Need a new block.
-            Block* block = new Block();
+            Block* block = new Block;
             _blockPtrs.Push( block );
 
             Item* blockItems = block->items;
-            for( int i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) {
+            for( size_t i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) {
                 blockItems[i].next = &(blockItems[i + 1]);
             }
             blockItems[ITEMS_PER_BLOCK - 1].next = 0;
@@ -388,8 +393,8 @@ class MemPoolT : public MemPool
         ++_nUntracked;
         return result;
     }
-    
-    virtual void Free( void* mem ) {
+
+    virtual void Free( void* mem ) override {
         if ( !mem ) {
             return;
         }
@@ -407,11 +412,11 @@ class MemPoolT : public MemPool
                 ITEM_SIZE, _nAllocs, _blockPtrs.Size() );
     }
 
-    void SetTracked() {
+    void SetTracked() override {
         --_nUntracked;
     }
 
-    int Untracked() const {
+    size_t Untracked() const {
         return _nUntracked;
     }
 
@@ -434,7 +439,7 @@ class MemPoolT : public MemPool
 
     union Item {
         Item*   next;
-        char    itemData[ITEM_SIZE];
+        char    itemData[static_cast<size_t>(ITEM_SIZE)];
     };
     struct Block {
         Item items[ITEMS_PER_BLOCK];
@@ -442,10 +447,10 @@ class MemPoolT : public MemPool
     DynArray< Block*, 10 > _blockPtrs;
     Item* _root;
 
-    int _currentAllocs;
-    int _nAllocs;
-    int _maxAllocs;
-    int _nUntracked;
+    size_t _currentAllocs;
+    size_t _nAllocs;
+    size_t _maxAllocs;
+    size_t _nUntracked;
 };
 
 
@@ -518,10 +523,8 @@ enum XMLError {
     XML_ERROR_FILE_NOT_FOUND,
     XML_ERROR_FILE_COULD_NOT_BE_OPENED,
     XML_ERROR_FILE_READ_ERROR,
-    UNUSED_XML_ERROR_ELEMENT_MISMATCH,	// remove at next major version
     XML_ERROR_PARSING_ELEMENT,
     XML_ERROR_PARSING_ATTRIBUTE,
-    UNUSED_XML_ERROR_IDENTIFYING_TAG,	// remove at next major version
     XML_ERROR_PARSING_TEXT,
     XML_ERROR_PARSING_CDATA,
     XML_ERROR_PARSING_COMMENT,
@@ -532,6 +535,7 @@ enum XMLError {
     XML_ERROR_PARSING,
     XML_CAN_NOT_CONVERT_TEXT,
     XML_NO_TEXT_NODE,
+	XML_ELEMENT_DEPTH_EXCEEDED,
 
 	XML_ERROR_COUNT
 };
@@ -555,7 +559,7 @@ class TINYXML2_LIB XMLUtil
         TIXMLASSERT( p );
         return p;
     }
-    static char* SkipWhiteSpace( char* p, int* curLineNumPtr )				{
+    static char* SkipWhiteSpace( char* const p, int* curLineNumPtr ) {
         return const_cast<char*>( SkipWhiteSpace( const_cast<const char*>(p), curLineNumPtr ) );
     }
 
@@ -564,7 +568,7 @@ class TINYXML2_LIB XMLUtil
     static bool IsWhiteSpace( char p )					{
         return !IsUTF8Continuation(p) && isspace( static_cast<unsigned char>(p) );
     }
-    
+
     inline static bool IsNameStartChar( unsigned char ch ) {
         if ( ch >= 128 ) {
             // This is a heuristic guess in attempt to not implement Unicode-aware isalpha()
@@ -575,7 +579,7 @@ class TINYXML2_LIB XMLUtil
         }
         return ch == ':' || ch == '_';
     }
-    
+
     inline static bool IsNameChar( unsigned char ch ) {
         return IsNameStartChar( ch )
                || isdigit( ch )
@@ -583,6 +587,11 @@ class TINYXML2_LIB XMLUtil
                || ch == '-';
     }
 
+    inline static bool IsPrefixHex( const char* p) {
+        p = SkipWhiteSpace(p, 0);
+        return p && *p == '0' && ( *(p + 1) == 'x' || *(p + 1) == 'X');
+    }
+
     inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX )  {
         if ( p == q ) {
             return true;
@@ -590,10 +599,10 @@ class TINYXML2_LIB XMLUtil
         TIXMLASSERT( p );
         TIXMLASSERT( q );
         TIXMLASSERT( nChar >= 0 );
-        return strncmp( p, q, nChar ) == 0;
+        return strncmp( p, q, static_cast<size_t>(nChar) ) == 0;
     }
-    
-    inline static bool IsUTF8Continuation( char p ) {
+
+    inline static bool IsUTF8Continuation( const char p ) {
         return ( p & 0x80 ) != 0;
     }
 
@@ -610,6 +619,7 @@ class TINYXML2_LIB XMLUtil
     static void ToStr( float v, char* buffer, int bufferSize );
     static void ToStr( double v, char* buffer, int bufferSize );
 	static void ToStr(int64_t v, char* buffer, int bufferSize);
+    static void ToStr(uint64_t v, char* buffer, int bufferSize);
 
     // converts strings to primitive types
     static bool	ToInt( const char* str, int* value );
@@ -618,7 +628,7 @@ class TINYXML2_LIB XMLUtil
     static bool	ToFloat( const char* str, float* value );
     static bool ToDouble( const char* str, double* value );
 	static bool ToInt64(const char* str, int64_t* value);
-
+    static bool ToUnsigned64(const char* str, uint64_t* value);
 	// Changes what is serialized for a boolean value.
 	// Default to "true" and "false". Shouldn't be changed
 	// unless you have a special testing or compatibility need.
@@ -718,6 +728,12 @@ class TINYXML2_LIB XMLNode
         return 0;
     }
 
+    // ChildElementCount was originally suggested by msteiger on the sourceforge page for TinyXML and modified by KB1SPH for TinyXML-2.
+
+    int ChildElementCount(const char *value) const;
+
+    int ChildElementCount() const;
+
     /** The meaning of 'value' changes for the specific type.
     	@verbatim
     	Document:	empty (NULL is returned, not an empty string)
@@ -874,11 +890,11 @@ class TINYXML2_LIB XMLNode
 		Make a copy of this node and all its children.
 
 		If the 'target' is null, then the nodes will
-		be allocated in the current document. If 'target' 
-        is specified, the memory will be allocated is the 
+		be allocated in the current document. If 'target'
+        is specified, the memory will be allocated in the
         specified XMLDocument.
 
-		NOTE: This is probably not the correct tool to 
+		NOTE: This is probably not the correct tool to
 		copy a document, since XMLDocuments can have multiple
 		top level XMLNodes. You probably want to use
         XMLDocument::DeepCopy()
@@ -917,8 +933,8 @@ class TINYXML2_LIB XMLNode
     */
     virtual bool Accept( XMLVisitor* visitor ) const = 0;
 
-	/** 
-		Set user data into the XMLNode. TinyXML-2 in 
+	/**
+		Set user data into the XMLNode. TinyXML-2 in
 		no way processes or interprets user data.
 		It is initially 0.
 	*/
@@ -932,7 +948,7 @@ class TINYXML2_LIB XMLNode
 	void* GetUserData() const			{ return _userData; }
 
 protected:
-    XMLNode( XMLDocument* );
+    explicit XMLNode( XMLDocument* );
     virtual ~XMLNode();
 
     virtual char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr);
@@ -978,12 +994,12 @@ class TINYXML2_LIB XMLText : public XMLNode
 {
     friend class XMLDocument;
 public:
-    virtual bool Accept( XMLVisitor* visitor ) const;
+    virtual bool Accept( XMLVisitor* visitor ) const override;
 
-    virtual XMLText* ToText()			{
+    virtual XMLText* ToText() override		{
         return this;
     }
-    virtual const XMLText* ToText() const	{
+    virtual const XMLText* ToText() const override {
         return this;
     }
 
@@ -996,14 +1012,14 @@ class TINYXML2_LIB XMLText : public XMLNode
         return _isCData;
     }
 
-    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
-    virtual bool ShallowEqual( const XMLNode* compare ) const;
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
+    virtual bool ShallowEqual( const XMLNode* compare ) const override;
 
 protected:
-    XMLText( XMLDocument* doc )	: XMLNode( doc ), _isCData( false )	{}
+    explicit XMLText( XMLDocument* doc )	: XMLNode( doc ), _isCData( false )	{}
     virtual ~XMLText()												{}
 
-    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
 
 private:
     bool _isCData;
@@ -1018,23 +1034,23 @@ class TINYXML2_LIB XMLComment : public XMLNode
 {
     friend class XMLDocument;
 public:
-    virtual XMLComment*	ToComment()					{
+    virtual XMLComment*	ToComment() override		{
         return this;
     }
-    virtual const XMLComment* ToComment() const		{
+    virtual const XMLComment* ToComment() const override {
         return this;
     }
 
-    virtual bool Accept( XMLVisitor* visitor ) const;
+    virtual bool Accept( XMLVisitor* visitor ) const override;
 
-    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
-    virtual bool ShallowEqual( const XMLNode* compare ) const;
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
+    virtual bool ShallowEqual( const XMLNode* compare ) const override;
 
 protected:
-    XMLComment( XMLDocument* doc );
+    explicit XMLComment( XMLDocument* doc );
     virtual ~XMLComment();
 
-    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr);
+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr) override;
 
 private:
     XMLComment( const XMLComment& );	// not supported
@@ -1057,23 +1073,23 @@ class TINYXML2_LIB XMLDeclaration : public XMLNode
 {
     friend class XMLDocument;
 public:
-    virtual XMLDeclaration*	ToDeclaration()					{
+    virtual XMLDeclaration*	ToDeclaration() override		{
         return this;
     }
-    virtual const XMLDeclaration* ToDeclaration() const		{
+    virtual const XMLDeclaration* ToDeclaration() const override {
         return this;
     }
 
-    virtual bool Accept( XMLVisitor* visitor ) const;
+    virtual bool Accept( XMLVisitor* visitor ) const override;
 
-    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
-    virtual bool ShallowEqual( const XMLNode* compare ) const;
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
+    virtual bool ShallowEqual( const XMLNode* compare ) const override;
 
 protected:
-    XMLDeclaration( XMLDocument* doc );
+    explicit XMLDeclaration( XMLDocument* doc );
     virtual ~XMLDeclaration();
 
-    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
 
 private:
     XMLDeclaration( const XMLDeclaration& );	// not supported
@@ -1092,23 +1108,23 @@ class TINYXML2_LIB XMLUnknown : public XMLNode
 {
     friend class XMLDocument;
 public:
-    virtual XMLUnknown*	ToUnknown()					{
+    virtual XMLUnknown*	ToUnknown() override		{
         return this;
     }
-    virtual const XMLUnknown* ToUnknown() const		{
+    virtual const XMLUnknown* ToUnknown() const override {
         return this;
     }
 
-    virtual bool Accept( XMLVisitor* visitor ) const;
+    virtual bool Accept( XMLVisitor* visitor ) const override;
 
-    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
-    virtual bool ShallowEqual( const XMLNode* compare ) const;
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
+    virtual bool ShallowEqual( const XMLNode* compare ) const override;
 
 protected:
-    XMLUnknown( XMLDocument* doc );
+    explicit XMLUnknown( XMLDocument* doc );
     virtual ~XMLUnknown();
 
-    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
 
 private:
     XMLUnknown( const XMLUnknown& );	// not supported
@@ -1157,6 +1173,12 @@ class TINYXML2_LIB XMLAttribute
 		return i;
 	}
 
+    uint64_t Unsigned64Value() const {
+        uint64_t i = 0;
+        QueryUnsigned64Value(&i);
+        return i;
+    }
+
     /// Query as an unsigned integer. See IntValue()
     unsigned UnsignedValue() const			{
         unsigned i=0;
@@ -1191,6 +1213,8 @@ class TINYXML2_LIB XMLAttribute
     XMLError QueryUnsignedValue( unsigned int* value ) const;
 	/// See QueryIntValue
 	XMLError QueryInt64Value(int64_t* value) const;
+    /// See QueryIntValue
+    XMLError QueryUnsigned64Value(uint64_t* value) const;
 	/// See QueryIntValue
     XMLError QueryBoolValue( bool* value ) const;
     /// See QueryIntValue
@@ -1206,7 +1230,9 @@ class TINYXML2_LIB XMLAttribute
     void SetAttribute( unsigned value );
 	/// Set the attribute to value.
 	void SetAttribute(int64_t value);
-	/// Set the attribute to value.
+    /// Set the attribute to value.
+    void SetAttribute(uint64_t value);
+    /// Set the attribute to value.
     void SetAttribute( bool value );
     /// Set the attribute to value.
     void SetAttribute( double value );
@@ -1250,13 +1276,13 @@ class TINYXML2_LIB XMLElement : public XMLNode
         SetValue( str, staticMem );
     }
 
-    virtual XMLElement* ToElement()				{
+    virtual XMLElement* ToElement() override	{
         return this;
     }
-    virtual const XMLElement* ToElement() const {
+    virtual const XMLElement* ToElement() const override {
         return this;
     }
-    virtual bool Accept( XMLVisitor* visitor ) const;
+    virtual bool Accept( XMLVisitor* visitor ) const override;
 
     /** Given an attribute name, Attribute() returns the value
     	for the attribute of that name, or null if none
@@ -1294,6 +1320,8 @@ class TINYXML2_LIB XMLElement : public XMLNode
 	unsigned UnsignedAttribute(const char* name, unsigned defaultValue = 0) const;
 	/// See IntAttribute()
 	int64_t Int64Attribute(const char* name, int64_t defaultValue = 0) const;
+    /// See IntAttribute()
+    uint64_t Unsigned64Attribute(const char* name, uint64_t defaultValue = 0) const;
 	/// See IntAttribute()
 	bool BoolAttribute(const char* name, bool defaultValue = false) const;
     /// See IntAttribute()
@@ -1340,6 +1368,15 @@ class TINYXML2_LIB XMLElement : public XMLNode
 		return a->QueryInt64Value(value);
 	}
 
+    /// See QueryIntAttribute()
+    XMLError QueryUnsigned64Attribute(const char* name, uint64_t* value) const {
+        const XMLAttribute* a = FindAttribute(name);
+        if(!a) {
+            return XML_NO_ATTRIBUTE;
+        }
+        return a->QueryUnsigned64Value(value);
+    }
+
 	/// See QueryIntAttribute()
     XMLError QueryBoolAttribute( const char* name, bool* value ) const				{
         const XMLAttribute* a = FindAttribute( name );
@@ -1376,14 +1413,14 @@ class TINYXML2_LIB XMLElement : public XMLNode
 	}
 
 
-	
+
     /** Given an attribute name, QueryAttribute() returns
     	XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion
     	can't be performed, or XML_NO_ATTRIBUTE if the attribute
     	doesn't exist. It is overloaded for the primitive types,
 		and is a generally more convenient replacement of
 		QueryIntAttribute() and related functions.
-		
+
 		If successful, the result of the conversion
     	will be written to 'value'. If not successful, nothing will
     	be written to 'value'. This allows you to provide default
@@ -1394,30 +1431,38 @@ class TINYXML2_LIB XMLElement : public XMLNode
     	QueryAttribute( "foo", &value );		// if "foo" isn't found, value will still be 10
     	@endverbatim
     */
-	int QueryAttribute( const char* name, int* value ) const {
+	XMLError QueryAttribute( const char* name, int* value ) const {
 		return QueryIntAttribute( name, value );
 	}
 
-	int QueryAttribute( const char* name, unsigned int* value ) const {
+	XMLError QueryAttribute( const char* name, unsigned int* value ) const {
 		return QueryUnsignedAttribute( name, value );
 	}
 
-	int QueryAttribute(const char* name, int64_t* value) const {
+	XMLError QueryAttribute(const char* name, int64_t* value) const {
 		return QueryInt64Attribute(name, value);
 	}
 
-	int QueryAttribute( const char* name, bool* value ) const {
+    XMLError QueryAttribute(const char* name, uint64_t* value) const {
+        return QueryUnsigned64Attribute(name, value);
+    }
+
+    XMLError QueryAttribute( const char* name, bool* value ) const {
 		return QueryBoolAttribute( name, value );
 	}
 
-	int QueryAttribute( const char* name, double* value ) const {
+	XMLError QueryAttribute( const char* name, double* value ) const {
 		return QueryDoubleAttribute( name, value );
 	}
 
-	int QueryAttribute( const char* name, float* value ) const {
+	XMLError QueryAttribute( const char* name, float* value ) const {
 		return QueryFloatAttribute( name, value );
 	}
 
+	XMLError QueryAttribute(const char* name, const char** value) const {
+		return QueryStringAttribute(name, value);
+	}
+
 	/// Sets the named attribute to value.
     void SetAttribute( const char* name, const char* value )	{
         XMLAttribute* a = FindOrCreateAttribute( name );
@@ -1440,7 +1485,13 @@ class TINYXML2_LIB XMLElement : public XMLNode
 		a->SetAttribute(value);
 	}
 
-	/// Sets the named attribute to value.
+    /// Sets the named attribute to value.
+    void SetAttribute(const char* name, uint64_t value) {
+        XMLAttribute* a = FindOrCreateAttribute(name);
+        a->SetAttribute(value);
+    }
+
+    /// Sets the named attribute to value.
     void SetAttribute( const char* name, bool value )			{
         XMLAttribute* a = FindOrCreateAttribute( name );
         a->SetAttribute( value );
@@ -1522,7 +1573,7 @@ class TINYXML2_LIB XMLElement : public XMLNode
     	@verbatim
     		<foo>Hullaballoo!<b>This is text</b></foo>
     	@endverbatim
-		
+
 		For this XML:
     	@verbatim
     		<foo />
@@ -1536,15 +1587,17 @@ class TINYXML2_LIB XMLElement : public XMLNode
     /// Convenience method for setting text inside an element. See SetText() for important limitations.
     void SetText( int value );
     /// Convenience method for setting text inside an element. See SetText() for important limitations.
-    void SetText( unsigned value );  
+    void SetText( unsigned value );
 	/// Convenience method for setting text inside an element. See SetText() for important limitations.
 	void SetText(int64_t value);
+    /// Convenience method for setting text inside an element. See SetText() for important limitations.
+    void SetText(uint64_t value);
 	/// Convenience method for setting text inside an element. See SetText() for important limitations.
-    void SetText( bool value );  
+    void SetText( bool value );
     /// Convenience method for setting text inside an element. See SetText() for important limitations.
-    void SetText( double value );  
+    void SetText( double value );
     /// Convenience method for setting text inside an element. See SetText() for important limitations.
-    void SetText( float value );  
+    void SetText( float value );
 
     /**
     	Convenience method to query the value of a child text node. This is probably best
@@ -1578,6 +1631,8 @@ class TINYXML2_LIB XMLElement : public XMLNode
 	/// See QueryIntText()
 	XMLError QueryInt64Text(int64_t* uval) const;
 	/// See QueryIntText()
+	XMLError QueryUnsigned64Text(uint64_t* uval) const;
+	/// See QueryIntText()
     XMLError QueryBoolText( bool* bval ) const;
     /// See QueryIntText()
     XMLError QueryDoubleText( double* dval ) const;
@@ -1590,12 +1645,29 @@ class TINYXML2_LIB XMLElement : public XMLNode
 	unsigned UnsignedText(unsigned defaultValue = 0) const;
 	/// See QueryIntText()
 	int64_t Int64Text(int64_t defaultValue = 0) const;
+    /// See QueryIntText()
+    uint64_t Unsigned64Text(uint64_t defaultValue = 0) const;
 	/// See QueryIntText()
 	bool BoolText(bool defaultValue = false) const;
 	/// See QueryIntText()
 	double DoubleText(double defaultValue = 0) const;
 	/// See QueryIntText()
-	float FloatText(float defaultValue = 0) const;
+    float FloatText(float defaultValue = 0) const;
+
+    /**
+        Convenience method to create a new XMLElement and add it as last (right)
+        child of this node. Returns the created and inserted element.
+    */
+    XMLElement* InsertNewChildElement(const char* name);
+    /// See InsertNewChildElement()
+    XMLComment* InsertNewComment(const char* comment);
+    /// See InsertNewChildElement()
+    XMLText* InsertNewText(const char* text);
+    /// See InsertNewChildElement()
+    XMLDeclaration* InsertNewDeclaration(const char* text);
+    /// See InsertNewChildElement()
+    XMLUnknown* InsertNewUnknown(const char* text);
+
 
     // internal:
     enum ElementClosingType {
@@ -1606,11 +1678,11 @@ class TINYXML2_LIB XMLElement : public XMLNode
     ElementClosingType ClosingType() const {
         return _closingType;
     }
-    virtual XMLNode* ShallowClone( XMLDocument* document ) const;
-    virtual bool ShallowEqual( const XMLNode* compare ) const;
+    virtual XMLNode* ShallowClone( XMLDocument* document ) const override;
+    virtual bool ShallowEqual( const XMLNode* compare ) const override;
 
 protected:
-    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );
+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) override;
 
 private:
     XMLElement( XMLDocument* doc );
@@ -1618,11 +1690,7 @@ class TINYXML2_LIB XMLElement : public XMLNode
     XMLElement( const XMLElement& );	// not supported
     void operator=( const XMLElement& );	// not supported
 
-    XMLAttribute* FindAttribute( const char* name ) {
-        return const_cast<XMLAttribute*>(const_cast<const XMLElement*>(this)->FindAttribute( name ));
-    }
     XMLAttribute* FindOrCreateAttribute( const char* name );
-    //void LinkAttribute( XMLAttribute* attrib );
     char* ParseAttributes( char* p, int* curLineNumPtr );
     static void DeleteAttribute( XMLAttribute* attribute );
     XMLAttribute* CreateAttribute();
@@ -1638,7 +1706,8 @@ class TINYXML2_LIB XMLElement : public XMLNode
 
 enum Whitespace {
     PRESERVE_WHITESPACE,
-    COLLAPSE_WHITESPACE
+    COLLAPSE_WHITESPACE,
+    PEDANTIC_WHITESPACE
 };
 
 
@@ -1650,9 +1719,9 @@ enum Whitespace {
 class TINYXML2_LIB XMLDocument : public XMLNode
 {
     friend class XMLElement;
-    // Gives access to SetError, but over-access for everything else.
+    // Gives access to SetError and Push/PopDepth, but over-access for everything else.
     // Wishing C++ had "internal" scope.
-    friend class XMLNode;       
+    friend class XMLNode;
     friend class XMLText;
     friend class XMLComment;
     friend class XMLDeclaration;
@@ -1662,11 +1731,11 @@ class TINYXML2_LIB XMLDocument : public XMLNode
     XMLDocument( bool processEntities = true, Whitespace whitespaceMode = PRESERVE_WHITESPACE );
     ~XMLDocument();
 
-    virtual XMLDocument* ToDocument()				{
+    virtual XMLDocument* ToDocument() override		{
         TIXMLASSERT( this == _document );
         return this;
     }
-    virtual const XMLDocument* ToDocument() const	{
+    virtual const XMLDocument* ToDocument() const override {
         TIXMLASSERT( this == _document );
         return this;
     }
@@ -1681,7 +1750,7 @@ class TINYXML2_LIB XMLDocument : public XMLNode
     	specified, TinyXML-2 will assume 'xml' points to a
     	null terminated string.
     */
-    XMLError Parse( const char* xml, size_t nBytes=(size_t)(-1) );
+    XMLError Parse( const char* xml, size_t nBytes=static_cast<size_t>(-1) );
 
     /**
     	Load an XML file from disk.
@@ -1692,8 +1761,8 @@ class TINYXML2_LIB XMLDocument : public XMLNode
 
     /**
     	Load an XML file from disk. You are responsible
-    	for providing and closing the FILE*. 
-     
+    	for providing and closing the FILE*.
+
         NOTE: The file should be opened as binary ("rb")
         not text in order for TinyXML-2 to correctly
         do newline normalization.
@@ -1763,7 +1832,7 @@ class TINYXML2_LIB XMLDocument : public XMLNode
     	@endverbatim
     */
     void Print( XMLPrinter* streamer=0 ) const;
-    virtual bool Accept( XMLVisitor* visitor ) const;
+    virtual bool Accept( XMLVisitor* visitor ) const override;
 
     /**
     	Create a new Element associated with
@@ -1808,9 +1877,8 @@ class TINYXML2_LIB XMLDocument : public XMLNode
     */
     void DeleteNode( XMLNode* node );
 
-    void ClearError() {
-        SetError(XML_SUCCESS, 0, 0);
-    }
+    /// Clears the error flags.
+    void ClearError();
 
     /// Return true if there was an error parsing the document.
     bool Error() const {
@@ -1823,7 +1891,7 @@ class TINYXML2_LIB XMLDocument : public XMLNode
 	const char* ErrorName() const;
     static const char* ErrorIDToName(XMLError errorID);
 
-    /** Returns a "long form" error description. A hopefully helpful 
+    /** Returns a "long form" error description. A hopefully helpful
         diagnostic with location, line number, and/or additional info.
     */
 	const char* ErrorStr() const;
@@ -1836,7 +1904,7 @@ class TINYXML2_LIB XMLDocument : public XMLNode
     {
         return _errorLineNum;
     }
-    
+
     /// Clear the document, resetting it to the initial state.
     void Clear();
 
@@ -1850,15 +1918,15 @@ class TINYXML2_LIB XMLDocument : public XMLNode
 	void DeepCopy(XMLDocument* target) const;
 
 	// internal
-    char* Identify( char* p, XMLNode** node );
+    char* Identify( char* p, XMLNode** node, bool first );
 
 	// internal
-	void MarkInUse(XMLNode*);
+	void MarkInUse(const XMLNode* const);
 
-    virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const	{
+    virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const override{
         return 0;
     }
-    virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const	{
+    virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const override{
         return false;
     }
 
@@ -1874,6 +1942,7 @@ class TINYXML2_LIB XMLDocument : public XMLNode
     int             _errorLineNum;
     char*			_charBuffer;
     int				_parseCurLineNum;
+	int				_parsingDepth;
 	// Memory tracking does add some overhead.
 	// However, the code assumes that you don't
 	// have a bunch of unlinked nodes around.
@@ -1893,11 +1962,29 @@ class TINYXML2_LIB XMLDocument : public XMLNode
 
     void SetError( XMLError error, int lineNum, const char* format, ... );
 
-    template<class NodeType, int PoolElementSize>
+	// Something of an obvious security hole, once it was discovered.
+	// Either an ill-formed XML or an excessively deep one can overflow
+	// the stack. Track stack depth, and error out if needed.
+	class DepthTracker {
+	public:
+		explicit DepthTracker(XMLDocument * document) {
+			this->_document = document;
+			document->PushDepth();
+		}
+		~DepthTracker() {
+			_document->PopDepth();
+		}
+	private:
+		XMLDocument * _document;
+	};
+	void PushDepth();
+	void PopDepth();
+
+    template<class NodeType, size_t PoolElementSize>
     NodeType* CreateUnlinkedNode( MemPoolT<PoolElementSize>& pool );
 };
 
-template<class NodeType, int PoolElementSize>
+template<class NodeType, size_t PoolElementSize>
 inline NodeType* XMLDocument::CreateUnlinkedNode( MemPoolT<PoolElementSize>& pool )
 {
     TIXMLASSERT( sizeof( NodeType ) == PoolElementSize );
@@ -1969,10 +2056,10 @@ class TINYXML2_LIB XMLHandle
 {
 public:
     /// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
-    XMLHandle( XMLNode* node ) : _node( node ) {
+    explicit XMLHandle( XMLNode* node ) : _node( node ) {
     }
     /// Create a handle from a node.
-    XMLHandle( XMLNode& node ) : _node( &node ) {
+    explicit XMLHandle( XMLNode& node ) : _node( &node ) {
     }
     /// Copy constructor
     XMLHandle( const XMLHandle& ref ) : _node( ref._node ) {
@@ -2049,9 +2136,9 @@ class TINYXML2_LIB XMLHandle
 class TINYXML2_LIB XMLConstHandle
 {
 public:
-    XMLConstHandle( const XMLNode* node ) : _node( node ) {
+    explicit XMLConstHandle( const XMLNode* node ) : _node( node ) {
     }
-    XMLConstHandle( const XMLNode& node ) : _node( &node ) {
+    explicit XMLConstHandle( const XMLNode& node ) : _node( &node ) {
     }
     XMLConstHandle( const XMLConstHandle& ref ) : _node( ref._node ) {
     }
@@ -2172,7 +2259,8 @@ class TINYXML2_LIB XMLPrinter : public XMLVisitor
     void PushAttribute( const char* name, const char* value );
     void PushAttribute( const char* name, int value );
     void PushAttribute( const char* name, unsigned value );
-	void PushAttribute(const char* name, int64_t value);
+	void PushAttribute( const char* name, int64_t value );
+	void PushAttribute( const char* name, uint64_t value );
 	void PushAttribute( const char* name, bool value );
     void PushAttribute( const char* name, double value );
     /// If streaming, close the Element.
@@ -2184,8 +2272,10 @@ class TINYXML2_LIB XMLPrinter : public XMLVisitor
     void PushText( int value );
     /// Add a text node from an unsigned.
     void PushText( unsigned value );
-	/// Add a text node from an unsigned.
-	void PushText(int64_t value);
+	/// Add a text node from a signed 64bit integer.
+	void PushText( int64_t value );
+	/// Add a text node from an unsigned 64bit integer.
+	void PushText( uint64_t value );
 	/// Add a text node from a bool.
     void PushText( bool value );
     /// Add a text node from a float.
@@ -2199,18 +2289,18 @@ class TINYXML2_LIB XMLPrinter : public XMLVisitor
     void PushDeclaration( const char* value );
     void PushUnknown( const char* value );
 
-    virtual bool VisitEnter( const XMLDocument& /*doc*/ );
-    virtual bool VisitExit( const XMLDocument& /*doc*/ )			{
+    virtual bool VisitEnter( const XMLDocument& /*doc*/ ) override;
+    virtual bool VisitExit( const XMLDocument& /*doc*/ ) override	{
         return true;
     }
 
-    virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute );
-    virtual bool VisitExit( const XMLElement& element );
+    virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) override;
+    virtual bool VisitExit( const XMLElement& element ) override;
 
-    virtual bool Visit( const XMLText& text );
-    virtual bool Visit( const XMLComment& comment );
-    virtual bool Visit( const XMLDeclaration& declaration );
-    virtual bool Visit( const XMLUnknown& unknown );
+    virtual bool Visit( const XMLText& text ) override;
+    virtual bool Visit( const XMLComment& comment ) override;
+    virtual bool Visit( const XMLDeclaration& declaration ) override;
+    virtual bool Visit( const XMLUnknown& unknown ) override;
 
     /**
     	If in print to memory mode, return a pointer to
@@ -2224,17 +2314,17 @@ class TINYXML2_LIB XMLPrinter : public XMLVisitor
     	of the XML file in memory. (Note the size returned
     	includes the terminating null.)
     */
-    int CStrSize() const {
+    size_t CStrSize() const {
         return _buffer.Size();
     }
     /**
     	If in print to memory mode, reset the buffer to the
     	beginning.
     */
-    void ClearBuffer() {
+    void ClearBuffer( bool resetToFirstElement = true ) {
         _buffer.Clear();
         _buffer.Push(0);
-		_firstElement = true;
+		_firstElement = resetToFirstElement;
     }
 
 protected:
@@ -2244,16 +2334,22 @@ class TINYXML2_LIB XMLPrinter : public XMLVisitor
 	    the space and tabs used. A PrintSpace() override should call Print().
 	*/
     virtual void PrintSpace( int depth );
-    void Print( const char* format, ... );
-    void Write( const char* data, size_t size );
-    inline void Write( const char* data )           { Write( data, strlen( data ) ); }
-    void Putc( char ch );
+    virtual void Print( const char* format, ... );
+    virtual void Write( const char* data, size_t size );
+    virtual void Putc( char ch );
+
+    inline void Write(const char* data) { Write(data, strlen(data)); }
 
     void SealElementIfJustOpened();
     bool _elementJustOpened;
     DynArray< const char*, 10 > _stack;
 
 private:
+    /**
+       Prepares to write a new node. This includes sealing an element that was
+       just opened, and writing any whitespace necessary if not in compact mode.
+     */
+    void PrepareForNewNode( bool compactMode );
     void PrintString( const char*, bool restrictedEntitySet );	// prints out, after detecting entities.
 
     bool _firstElement;
@@ -2278,7 +2374,7 @@ class TINYXML2_LIB XMLPrinter : public XMLVisitor
 };
 
 
-}	// tinyxml2
+} // namespace tinyxml2
 
 #if defined(_MSC_VER)
 #   pragma warning(pop)
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/.clang-tidy b/gui/.clang-tidy
new file mode 100644
index 00000000000..8a62240d85a
--- /dev/null
+++ b/gui/.clang-tidy
@@ -0,0 +1,5 @@
+---
+Checks: >
+        -readability-convert-member-functions-to-static,
+        -readability-redundant-access-specifiers
+InheritParentConfig: true
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 2614b1a76ae..493c6a482d0 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -9,11 +9,6 @@ CheckOptions:
   - { key: HeaderFileExtensions,          value: 'x' }
 ")
 
-    add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
-    add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
-    add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
-    add_compile_definitions($<$<CONFIG:Debug>:QT_DEBUG>)
-
     file(GLOB hdrs "*.h")
     file(GLOB srcs "*.cpp")
     file(GLOB uis  "*.ui")
@@ -26,47 +21,54 @@ 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()
+    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)
-    target_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/lib/)
-    if(USE_BUNDLED_TINYXML2)
-        target_include_directories(cppcheck-gui PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
-    else()
-        target_include_directories(cppcheck-gui SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-    endif()
+    set_target_properties(cppcheck-gui PROPERTIES WIN32_EXECUTABLE ON)
     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)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        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_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(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(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 and 6.9.1 - see https://bugreports.qt.io/browse/QTBUG-135637
+        #target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_QPAIR)
     endif()
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        # Q_UNUSED() in generated code
-        target_compile_options_safe(cppcheck-gui -Wno-extra-semi-stmt)
-        # caused by Qt generated moc code
-        target_compile_options_safe(cppcheck-gui -Wno-redundant-parens)
+    target_compile_definitions(cppcheck-gui PRIVATE -DQT_NO_FOREACH)
+
+    target_compile_definitions(cppcheck-gui PRIVATE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
+    target_compile_definitions(cppcheck-gui PRIVATE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
+    target_compile_definitions(cppcheck-gui PRIVATE $<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
+    target_compile_definitions(cppcheck-gui PRIVATE $<$<CONFIG:Debug>:QT_DEBUG>)
+
+    if (QHELPGENERATOR)
+        # TODO: generate in CMAKE_BINARY_DIR folder
+        add_custom_target(online-help.qhc ${QHELPGENERATOR} ${CMAKE_CURRENT_SOURCE_DIR}/help/online-help.qhcp -o ${CMAKE_CURRENT_SOURCE_DIR}/help/online-help.qhc)
+        add_dependencies(cppcheck-gui online-help.qhc)
     endif()
 
     install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
@@ -78,6 +80,13 @@ CheckOptions:
     install(FILES cppcheck-gui.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
     install(FILES cppcheck-gui.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps)
 
+    add_dependencies(cppcheck-gui copy_cfg)
+    add_dependencies(cppcheck-gui copy_addons)
+    add_dependencies(cppcheck-gui copy_platforms)
+    if (NOT DISABLE_DMAKE)
+        add_dependencies(cppcheck-gui run-dmake)
+    endif()
+
     if (BUILD_TESTS)
         add_subdirectory(test)
     endif()
diff --git a/gui/about.ui b/gui/about.ui
index 3e3b1b38039..72cec833b1b 100644
--- a/gui/about.ui
+++ b/gui/about.ui
@@ -112,7 +112,7 @@ of the GNU General Public License version 3</string>
        <item>
         <widget class="QLabel" name="mUsedLibs">
          <property name="text">
-          <string>&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;</string>
+          <string>&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;</string>
          </property>
         </widget>
        </item>
diff --git a/gui/aboutdialog.h b/gui/aboutdialog.h
index 7e46839d725..2ce51c0930b 100644
--- a/gui/aboutdialog.h
+++ b/gui/aboutdialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/gui/application.h b/gui/application.h
index ee624bf07cd..a7ffd34ffe9 100644
--- a/gui/application.h
+++ b/gui/application.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
@@ -42,14 +42,14 @@
  */
 class Application {
 public:
-    Application() {}
+    Application() = default;
     Application(QString name, QString path, QString params);
 
     /**
      * @brief Get application name.
      * @return Application name.
      */
-    QString getName() const {
+    const QString& getName() const {
         return mName;
     }
 
@@ -57,7 +57,7 @@ class Application {
      * @brief Get application path.
      * @return Application path.
      */
-    QString getPath() const {
+    const QString& getPath() const {
         return mPath;
     }
 
@@ -65,7 +65,7 @@ class Application {
      * @brief Get application command line parameters.
      * @return Application command line parameters.
      */
-    QString getParameters() const {
+    const QString& getParameters() const {
         return mParameters;
     }
 
diff --git a/gui/applicationdialog.h b/gui/applicationdialog.h
index 4bc68bf5b13..49b9df70668 100644
--- a/gui/applicationdialog.h
+++ b/gui/applicationdialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/gui/applicationlist.cpp b/gui/applicationlist.cpp
index 03079b1d7ed..80efbddbb0e 100644
--- a/gui/applicationlist.cpp
+++ b/gui/applicationlist.cpp
@@ -27,8 +27,7 @@
 #include <QVariant>
 
 ApplicationList::ApplicationList(QObject *parent) :
-    QObject(parent),
-    mDefaultApplicationIndex(-1)
+    QObject(parent)
 {
     //ctor
 }
@@ -186,7 +185,7 @@ void ApplicationList::clear()
 
 bool ApplicationList::checkAndAddApplication(const QString& appPath, const QString& name, const QString& parameters)
 {
-    if (QFileInfo(appPath).exists() && QFileInfo(appPath).isExecutable()) {
+    if (QFileInfo::exists(appPath) && QFileInfo(appPath).isExecutable()) {
         Application app;
         app.setName(name);
         app.setPath("\"" + appPath + "\"");
diff --git a/gui/applicationlist.h b/gui/applicationlist.h
index d7885a8bc2b..660fb0e1a46 100644
--- a/gui/applicationlist.h
+++ b/gui/applicationlist.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -65,8 +65,8 @@ class ApplicationList : public QObject {
      * @param index Index of the application whose name to get
      * @return Name of the application
      */
-    const Application& getApplication(const int index) const;
-    Application& getApplication(const int index);
+    const Application& getApplication(int index) const;
+    Application& getApplication(int index);
 
     /**
      * @brief Return the default application.
@@ -88,13 +88,13 @@ class ApplicationList : public QObject {
      *
      * @param index Index of the application to remove.
      */
-    void removeApplication(const int index);
+    void removeApplication(int index);
 
     /**
      * @brief Set application as default application.
      * @param index Index of the application to make the default one
      */
-    void setDefault(const int index);
+    void setDefault(int index);
 
     /**
      * @brief Remove all applications from this list and copy all applications from
@@ -133,7 +133,7 @@ class ApplicationList : public QObject {
      * @brief Index of the default application.
      *
      */
-    int mDefaultApplicationIndex;
+    int mDefaultApplicationIndex = -1;
 };
 /// @}
 #endif // APPLICATIONLIST_H
diff --git a/gui/checkstatistics.cpp b/gui/checkstatistics.cpp
index dc92b4c7a63..25bee336811 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-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
@@ -21,6 +21,9 @@
 #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 +33,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)
@@ -41,22 +41,22 @@ void CheckStatistics::addItem(const QString &tool, ShowTypes::ShowType type)
     const QString lower = tool.toLower();
     switch (type) {
     case ShowTypes::ShowStyle:
-        ::addItem(mStyle, tool);
+        ::addItem(mStyle, lower);
         break;
     case ShowTypes::ShowWarnings:
-        ::addItem(mWarning, tool);
+        ::addItem(mWarning, lower);
         break;
     case ShowTypes::ShowPerformance:
-        ::addItem(mPerformance, tool);
+        ::addItem(mPerformance, lower);
         break;
     case ShowTypes::ShowPortability:
-        ::addItem(mPortability, tool);
+        ::addItem(mPortability, lower);
         break;
     case ShowTypes::ShowErrors:
-        ::addItem(mError, tool);
+        ::addItem(mError, lower);
         break;
     case ShowTypes::ShowInformation:
-        ::addItem(mInformation, tool);
+        ::addItem(mInformation, lower);
         break;
     case ShowTypes::ShowNone:
     default:
@@ -65,6 +65,11 @@ void CheckStatistics::addItem(const QString &tool, ShowTypes::ShowType type)
     }
 }
 
+void CheckStatistics::addChecker(const QString &checker)
+{
+    mActiveCheckers.insert(checker.toStdString());
+}
+
 void CheckStatistics::clear()
 {
     mStyle.clear();
@@ -73,6 +78,8 @@ void CheckStatistics::clear()
     mPortability.clear();
     mInformation.clear();
     mError.clear();
+    mActiveCheckers.clear();
+    mCheckersReport.clear();
 }
 
 unsigned CheckStatistics::getCount(const QString &tool, ShowTypes::ShowType type) const
@@ -106,5 +113,5 @@ QStringList CheckStatistics::getTools() const
     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);
-    return QStringList(ret.values());
+    return ret.values();
 }
diff --git a/gui/checkstatistics.h b/gui/checkstatistics.h
index f487c39c854..5998c1f6b0c 100644
--- a/gui/checkstatistics.h
+++ b/gui/checkstatistics.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -26,6 +26,10 @@
 #include <QString>
 #include <QStringList>
 
+#include <set>
+#include <string>
+#include <utility>
+
 /// @addtogroup GUI
 /// @{
 
@@ -44,6 +48,11 @@ class CheckStatistics : public QObject {
      */
     void addItem(const QString &tool, ShowTypes::ShowType type);
 
+    /**
+     * @brief Add checker to statistics
+     */
+    void addChecker(const QString& checker);
+
     /**
      * @brief Clear the statistics.
      *
@@ -59,9 +68,24 @@ class CheckStatistics : public QObject {
      */
     unsigned getCount(const QString &tool, ShowTypes::ShowType type) const;
 
+    const std::set<std::string>& getActiveCheckers() const {
+        return mActiveCheckers;
+    }
+
+    int getNumberOfActiveCheckers() const {
+        return mActiveCheckers.size();
+    }
+
     /** Get tools with results */
     QStringList getTools() const;
 
+    void setCheckersReport(QString report) {
+        mCheckersReport = std::move(report);
+    }
+    const QString& getCheckersReport() const {
+        return mCheckersReport;
+    }
+
 private:
     QMap<QString, unsigned> mStyle;
     QMap<QString, unsigned> mWarning;
@@ -69,6 +93,8 @@ class CheckStatistics : public QObject {
     QMap<QString, unsigned> mPortability;
     QMap<QString, unsigned> mInformation;
     QMap<QString, unsigned> mError;
+    std::set<std::string> mActiveCheckers;
+    QString mCheckersReport;
 };
 
 /// @}
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index 480907a599f..8f042068ee9 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-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
@@ -24,19 +24,19 @@
 #include "erroritem.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "filesettings.h"
 #include "settings.h"
 #include "standards.h"
 #include "threadresult.h"
+#include "utils.h"
 
 #include <algorithm>
-#include <cstddef>
-#include <functional>
+#include <fstream>
 #include <iterator>
 #include <list>
-#include <map>
-#include <ostream>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <QByteArray>
@@ -51,12 +51,14 @@
 #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);
+    return s;
+}
 
 // NOLINTNEXTLINE(performance-unnecessary-value-param) - used as callback so we need to preserve the signature
-static bool executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output) // cppcheck-suppress passedByValue
+int CheckThread::executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output) // cppcheck-suppress passedByValueCallback
 {
     output.clear();
 
@@ -65,8 +67,28 @@ static bool executeCommand(std::string exe, std::vector<std::string> args, std::
         args2 << QString::fromStdString(arg);
 
     QProcess process;
-    process.start(QString::fromStdString(exe), args2);
-    process.waitForFinished();
+
+    QString e = unquote(QString::fromStdString(exe));
+
+    if (e.toLower().replace("\\", "/").endsWith("/python.exe") && !args.empty()) {
+        const QString path = e.left(e.size()-11);
+        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+        env.insert("PYTHONPATH", path + "/Lib/site-packages");
+        env.insert("PYTHONHOME", path);
+        process.setProcessEnvironment(env);
+
+        const QString pythonScript = unquote(args2[0]);
+        if (pythonScript.endsWith(".py")) {
+            const QString path2 = pythonScript.left(QString(pythonScript).replace('\\', '/').lastIndexOf("/"));
+            process.setWorkingDirectory(path2);
+        }
+    }
+
+    process.start(e, args2);
+    while (!Settings::terminated() && !process.waitForFinished(1000)) {
+        if (process.state() == QProcess::ProcessState::NotRunning)
+            break;
+    }
 
     if (redirect == "2>&1") {
         QString s1 = process.readAllStandardOutput();
@@ -75,80 +97,75 @@ static bool executeCommand(std::string exe, std::vector<std::string> args, std::
     } else
         output = process.readAllStandardOutput().toStdString();
 
-    if (redirect.compare(0,3,"2> ") == 0) {
+    if (startsWith(redirect, "2> ")) {
         std::ofstream fout(redirect.substr(3));
         fout << process.readAllStandardError().toStdString();
     }
-    return process.exitCode() == 0;
+    return process.exitCode();
 }
 
 
 CheckThread::CheckThread(ThreadResult &result) :
-    mState(Ready),
-    mResult(result),
-    mCppcheck(result, true, executeCommand),
-    mAnalyseWholeProgram(false)
-{
-    //ctor
-}
+    mResult(result)
+{}
 
-CheckThread::~CheckThread()
-{
-    //dtor
-}
-
-void CheckThread::check(const Settings &settings)
+void CheckThread::setSettings(const Settings &settings, std::shared_ptr<Suppressions> supprs)
 {
     mFiles.clear();
-    mCppcheck.settings() = settings;
-    start();
+    mSettings = settings; // this is a copy
+    mSuppressions = std::move(supprs);
 }
 
-void CheckThread::analyseWholeProgram(const QStringList &files)
+void CheckThread::analyseWholeProgram(const std::list<FileWithDetails> &files, const std::string& ctuInfo)
 {
     mFiles = files;
     mAnalyseWholeProgram = true;
+    mCtuInfo = ctuInfo;
     start();
 }
 
-// cppcheck-suppress unusedFunction - TODO: false positive
 void CheckThread::run()
 {
     mState = Running;
 
-    if (!mFiles.isEmpty() || mAnalyseWholeProgram) {
+    CppCheck cppcheck(mSettings, *mSuppressions, mResult, nullptr, true, executeCommand);
+
+    if (!mFiles.empty() || mAnalyseWholeProgram) {
         mAnalyseWholeProgram = false;
+        std::string ctuInfo;
+        ctuInfo.swap(mCtuInfo);
         qDebug() << "Whole program analysis";
-        std::map<std::string,std::size_t> files2;
-        for (const QString& file : mFiles)
-            files2[file.toStdString()] = 0;
-        mCppcheck.analyseWholeProgram(mCppcheck.settings().buildDir, files2);
+        cppcheck.analyseWholeProgram(mSettings.buildDir, mFiles, {}, ctuInfo);
         mFiles.clear();
         emit done();
         return;
     }
 
-    QString file = mResult.getNextFile();
-    while (!file.isEmpty() && mState == Running) {
-        qDebug() << "Checking file" << file;
-        mCppcheck.check(file.toStdString());
-        runAddonsAndTools(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);
+        cppcheck.check(*file);
+        runAddonsAndTools(mSettings, nullptr, QString::fromStdString(fname));
+        emit fileChecked(QString::fromStdString(fname));
 
         if (mState == Running)
-            file = mResult.getNextFile();
+            mResult.getNextFile(file);
     }
 
-    ImportProject::FileSettings fileSettings = mResult.getNextFileSettings();
-    while (!fileSettings.filename.empty() && mState == Running) {
-        file = QString::fromStdString(fileSettings.filename);
-        qDebug() << "Checking file" << file;
-        mCppcheck.check(fileSettings);
-        runAddonsAndTools(&fileSettings, QString::fromStdString(fileSettings.filename));
-        emit fileChecked(file);
+    const FileSettings* fileSettings = nullptr;
+    mResult.getNextFileSettings(fileSettings);
+    while (fileSettings && mState == Running) {
+        const std::string& fname = fileSettings->filename();
+        qDebug() << "Checking file" << QString::fromStdString(fname);
+        cppcheck.check(*fileSettings);
+        runAddonsAndTools(mSettings, fileSettings, QString::fromStdString(fname));
+        emit fileChecked(QString::fromStdString(fname));
 
         if (mState == Running)
-            fileSettings = mResult.getNextFileSettings();
+            mResult.getNextFileSettings(fileSettings);
     }
 
     if (mState == Running)
@@ -159,20 +176,20 @@ void CheckThread::run()
     emit done();
 }
 
-void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSettings, const QString &fileName)
+void CheckThread::runAddonsAndTools(const Settings& settings, const FileSettings *fileSettings, const QString &fileName)
 {
     for (const QString& addon : mAddonsAndTools) {
         if (addon == CLANG_ANALYZER || addon == CLANG_TIDY) {
             if (!fileSettings)
                 continue;
 
-            if (!fileSettings->cfg.empty() && fileSettings->cfg.compare(0,5,"Debug") != 0)
+            if (!fileSettings->cfg.empty() && !startsWith(fileSettings->cfg,"Debug"))
                 continue;
 
             QStringList args;
-            for (std::list<std::string>::const_iterator incIt = fileSettings->includePaths.cbegin(); incIt != fileSettings->includePaths.cend(); ++incIt)
+            for (auto incIt = fileSettings->includePaths.cbegin(); incIt != fileSettings->includePaths.cend(); ++incIt)
                 args << ("-I" + QString::fromStdString(*incIt));
-            for (std::list<std::string>::const_iterator i = fileSettings->systemIncludePaths.cbegin(); i != fileSettings->systemIncludePaths.cend(); ++i)
+            for (auto i = fileSettings->systemIncludePaths.cbegin(); i != fileSettings->systemIncludePaths.cend(); ++i)
                 args << "-isystem" << QString::fromStdString(*i);
             for (const QString& def : QString::fromStdString(fileSettings->defines).split(";")) {
                 args << ("-D" + def);
@@ -184,7 +201,7 @@ void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSetti
             const QString clangPath = CheckThread::clangTidyCmd();
             if (!clangPath.isEmpty()) {
                 QDir dir(clangPath + "/../lib/clang");
-                for (QString ver : dir.entryList()) {
+                for (const QString& ver : dir.entryList()) {
                     QString includePath = dir.absolutePath() + '/' + ver + "/include";
                     if (ver[0] != '.' && QDir(includePath).exists()) {
                         args << "-isystem" << includePath;
@@ -211,7 +228,7 @@ void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSetti
                 args << ("-std=" + QString::fromStdString(fileSettings->standard));
             else {
                 // TODO: pass C or C++ standard based on file type
-                const std::string std = mCppcheck.settings().standards.getCPP();
+                const std::string std = settings.standards.getCPP();
                 if (!std.empty()) {
                     args << ("-std=" + QString::fromStdString(std));
                 }
@@ -219,9 +236,9 @@ void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSetti
 
             QString analyzerInfoFile;
 
-            const std::string &buildDir = mCppcheck.settings().buildDir;
+            const std::string &buildDir = settings.buildDir;
             if (!buildDir.empty()) {
-                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->filename, fileSettings->cfg));
+                analyzerInfoFile = QString::fromStdString(AnalyzerInformation::getAnalyzerInfoFile(buildDir, fileSettings->filename(), fileSettings->cfg, fileSettings->fileIndex));
 
                 QStringList args2(args);
                 args2.insert(0,"-E");
@@ -230,11 +247,7 @@ void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSetti
                 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)) {
@@ -250,7 +263,7 @@ void CheckThread::runAddonsAndTools(const ImportProject::FileSettings *fileSetti
                     }
                     f1.close();
                 }
-                f1.open(QIODevice::WriteOnly | QIODevice::Text);
+                (void)f1.open(QIODevice::WriteOnly | QIODevice::Text); // TODO: check result
                 QTextStream out1(&f1);
                 out1 << chksum;
 
@@ -356,9 +369,9 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
         errorItem.errorPath.last().line = r1MatchRes.captured(2).toInt();
         errorItem.errorPath.last().column = r1MatchRes.captured(3).toInt();
         if (r1MatchRes.captured(4) == "warning")
-            errorItem.severity = Severity::SeverityType::warning;
+            errorItem.severity = Severity::warning;
         else if (r1MatchRes.captured(4) == "error" || r1MatchRes.captured(4) == "fatal error")
-            errorItem.severity = Severity::SeverityType::error;
+            errorItem.severity = Severity::error;
 
         QString message,id;
         const QRegularExpressionMatch r2MatchRes = r2.match(r1MatchRes.captured(5));
@@ -371,13 +384,13 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
                 id = tool + '-' + r2MatchRes.captured(2);
             if (tool == CLANG_TIDY) {
                 if (id1.startsWith("performance"))
-                    errorItem.severity = Severity::SeverityType::performance;
+                    errorItem.severity = Severity::performance;
                 else if (id1.startsWith("portability"))
-                    errorItem.severity = Severity::SeverityType::portability;
+                    errorItem.severity = Severity::portability;
                 else if (id1.startsWith("misc") && !id1.contains("unused"))
-                    errorItem.severity = Severity::SeverityType::warning;
+                    errorItem.severity = Severity::warning;
                 else
-                    errorItem.severity = Severity::SeverityType::style;
+                    errorItem.severity = Severity::style;
             }
         } else {
             message = r1MatchRes.captured(5);
@@ -396,7 +409,7 @@ void CheckThread::parseClangErrors(const QString &tool, const QString &file0, QS
     for (const ErrorItem &e : errorItems) {
         if (e.errorPath.isEmpty())
             continue;
-        Suppressions::ErrorMessage errorMessage;
+        SuppressionList::ErrorMessage errorMessage;
         errorMessage.setFileName(e.errorPath.back().file.toStdString());
         errorMessage.lineNumber = e.errorPath.back().line;
         errorMessage.errorId = e.errorId.toStdString();
@@ -412,15 +425,15 @@ 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);
     }
 }
 
-bool CheckThread::isSuppressed(const Suppressions::ErrorMessage &errorMessage) const
+bool CheckThread::isSuppressed(const SuppressionList::ErrorMessage &errorMessage) const
 {
-    return std::any_of(mSuppressions.cbegin(), mSuppressions.cend(), [&](const Suppressions::Suppression& s) {
-        return s.isSuppressed(errorMessage);
+    return std::any_of(mSuppressionsUi.cbegin(), mSuppressionsUi.cend(), [&](const SuppressionList::Suppression& s) -> bool {
+        return s.isSuppressed(errorMessage) == SuppressionList::Suppression::Result::Matched;
     });
 }
 
diff --git a/gui/checkthread.h b/gui/checkthread.h
index 519d74923e0..892bdf5258d 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-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
@@ -20,17 +20,23 @@
 #ifndef CHECKTHREAD_H
 #define CHECKTHREAD_H
 
-#include "cppcheck.h"
-#include "importproject.h"
+#include "filesettings.h"
+#include "settings.h"
 #include "suppressions.h"
 
+#include <atomic>
+#include <cstdint>
+#include <list>
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <QList>
 #include <QObject>
 #include <QString>
 #include <QStringList>
 #include <QThread>
 
-class Settings;
 class ThreadResult;
 
 /// @addtogroup GUI
@@ -44,20 +50,21 @@ class CheckThread : public QThread {
     Q_OBJECT
 public:
     explicit CheckThread(ThreadResult &result);
-    ~CheckThread() override;
 
     /**
      * @brief Set settings for cppcheck
      *
      * @param settings settings for cppcheck
+     * @param supprs suppressions for cppcheck
      */
-    void check(const Settings &settings);
+    void setSettings(const Settings &settings, std::shared_ptr<Suppressions> supprs);
 
     /**
      * @brief Run whole program analysis
      * @param files    All files
+     * @param ctuInfo  Ctu info for addons
      */
-    void analyseWholeProgram(const QStringList &files);
+    void analyseWholeProgram(const std::list<FileWithDetails> &files, const std::string& ctuInfo);
 
     void setAddonsAndTools(const QStringList &addonsAndTools) {
         mAddonsAndTools = addonsAndTools;
@@ -67,8 +74,8 @@ class CheckThread : public QThread {
         mClangIncludePaths = s;
     }
 
-    void setSuppressions(const QList<Suppressions::Suppression> &s) {
-        mSuppressions = s;
+    void setSuppressions(const QList<SuppressionList::Suppression> &s) {
+        mSuppressionsUi = s;
     }
 
     /**
@@ -91,6 +98,8 @@ class CheckThread : public QThread {
      */
     static QString clangTidyCmd();
 
+    static int executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output);
+
 signals:
 
     /**
@@ -110,7 +119,7 @@ class CheckThread : public QThread {
      * has been completed. Thread must be stopped cleanly, just terminating thread
      * likely causes unpredictable side-effects.
      */
-    enum State {
+    enum State : std::uint8_t {
         Running, /**< The thread is checking. */
         Stopping, /**< The thread will stop after current work. */
         Stopped, /**< The thread has been stopped. */
@@ -118,28 +127,28 @@ class CheckThread : public QThread {
     };
 
     /**
-     * @brief Thread's current execution state.
+     * @brief Thread's current execution state. Can be changed from outside
      */
-    State mState;
+    std::atomic<State> mState{Ready};
 
     ThreadResult &mResult;
-    /**
-     * @brief Cppcheck itself
-     */
-    CppCheck mCppcheck;
+
+    Settings mSettings;
+    std::shared_ptr<Suppressions> mSuppressions;
 
 private:
-    void runAddonsAndTools(const ImportProject::FileSettings *fileSettings, const QString &fileName);
+    void runAddonsAndTools(const Settings& settings, const FileSettings *fileSettings, const QString &fileName);
 
     void parseClangErrors(const QString &tool, const QString &file0, QString err);
 
-    bool isSuppressed(const Suppressions::ErrorMessage &errorMessage) const;
+    bool isSuppressed(const SuppressionList::ErrorMessage &errorMessage) const;
 
-    QStringList mFiles;
-    bool mAnalyseWholeProgram;
+    std::list<FileWithDetails> mFiles;
+    bool mAnalyseWholeProgram{};
+    std::string mCtuInfo;
     QStringList mAddonsAndTools;
     QStringList mClangIncludePaths;
-    QList<Suppressions::Suppression> mSuppressions;
+    QList<SuppressionList::Suppression> mSuppressionsUi;
 };
 /// @}
 #endif // CHECKTHREAD_H
diff --git a/gui/codeeditor.cpp b/gui/codeeditor.cpp
index 48739c457cb..b6d88a061d3 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-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
@@ -30,14 +30,12 @@
 #include <QPainter>
 #include <QPaintEvent>
 #include <QRect>
-#include <QRectF>
 #include <QRegularExpressionMatchIterator>
 #include <QShortcut>
 #include <QTextBlock>
 #include <QTextCursor>
 #include <QTextEdit>
 #include <QTextFormat>
-#include <QtCore>
 
 class QTextDocument;
 
@@ -152,7 +150,7 @@ Highlighter::Highlighter(QTextDocument *parent,
     mQuotationFormat.setForeground(mWidgetStyle->quoteColor);
     mQuotationFormat.setFontWeight(mWidgetStyle->quoteWeight);
     // We use lazy `*?` instead greed `*` quantifier to find the real end of the c-string.
-    // We use negative lookbehind assertion `(?<!\)` to ignore `\"` sequience in the c-string.
+    // We use negative lookbehind assertion `(?<!\)` to ignore `\"` sequence in the c-string.
     rule.pattern = QRegularExpression("\".*?(?<!\\\\)\"");
     rule.format = mQuotationFormat;
     rule.ruleRole = RuleRole::Quote;
@@ -248,7 +246,7 @@ void Highlighter::highlightBlock(const QString &text)
     }
 }
 
-void Highlighter::applyFormat(HighlightingRule &rule)
+void Highlighter::applyFormat(HighlightingRule &rule) const
 {
     switch (rule.ruleRole) {
     case RuleRole::Keyword:
@@ -286,13 +284,8 @@ CodeEditor::CodeEditor(QWidget *parent) :
     setObjectName("CodeEditor");
     setStyleSheet(generateStyleString());
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    QShortcut *copyText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_C),this);
-    QShortcut *allText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_A),this);
-#else
-    QShortcut *copyText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_C),this);
-    QShortcut *allText = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_A),this);
-#endif
+    auto *copyText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_C),this);
+    auto *allText = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_A),this);
 
     connect(this, SIGNAL(blockCountChanged(int)), this, SLOT(updateLineNumberAreaWidth(int)));
     connect(this, SIGNAL(updateRequest(QRect,int)), this, SLOT(updateLineNumberArea(QRect,int)));
@@ -369,11 +362,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
+    const int space = 3 + (fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits);
     return space;
 }
 
@@ -420,15 +409,15 @@ void CodeEditor::highlightErrorLine()
     setExtraSelections(extraSelections);
 }
 
-void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
+void CodeEditor::lineNumberAreaPaintEvent(const QPaintEvent *event)
 {
     QPainter painter(mLineNumberArea);
     painter.fillRect(event->rect(), mWidgetStyle->lineNumBGColor);
 
     QTextBlock block = firstVisibleBlock();
     int blockNumber = block.blockNumber();
-    int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top();
-    int bottom = top + (int) blockBoundingRect(block).height();
+    int top = static_cast<int>(blockBoundingGeometry(block).translated(contentOffset()).top());
+    int bottom = top + static_cast<int>(blockBoundingRect(block).height());
 
     while (block.isValid() && top <= event->rect().bottom()) {
         if (block.isVisible() && bottom >= event->rect().top()) {
@@ -440,7 +429,7 @@ void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
 
         block = block.next();
         top = bottom;
-        bottom = top + (int) blockBoundingRect(block).height();
+        bottom = top + static_cast<int>(blockBoundingRect(block).height());
         ++blockNumber;
     }
 }
diff --git a/gui/codeeditor.h b/gui/codeeditor.h
index 553ee7b05da..9508c562c41 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-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
@@ -19,6 +19,9 @@
 #ifndef CODEEDITOR_H
 #define CODEEDITOR_H
 
+#include <cstdint>
+
+#include <QList>
 #include <QObject>
 #include <QPlainTextEdit>
 #include <QRegularExpression>
@@ -27,13 +30,11 @@
 #include <QStringList>
 #include <QSyntaxHighlighter>
 #include <QTextCharFormat>
-#include <QVector>
 #include <QWidget>
 
 class CodeEditorStyle;
 class QPaintEvent;
 class QRect;
-class QResizeEvent;
 class QTextDocument;
 
 class Highlighter : public QSyntaxHighlighter {
@@ -51,7 +52,7 @@ class Highlighter : public QSyntaxHighlighter {
     void highlightBlock(const QString &text) override;
 
 private:
-    enum RuleRole {
+    enum RuleRole : std::uint8_t {
         Keyword = 1,
         Class   = 2,
         Comment = 3,
@@ -64,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;
@@ -91,7 +92,7 @@ class CodeEditor : public QPlainTextEdit {
     CodeEditor &operator=(const CodeEditor &) = delete;
     ~CodeEditor() override;
 
-    void lineNumberAreaPaintEvent(QPaintEvent *event);
+    void lineNumberAreaPaintEvent(const QPaintEvent *event);
     int lineNumberAreaWidth();
     void setStyle(const CodeEditorStyle& newStyle);
 
@@ -114,7 +115,7 @@ class CodeEditor : public QPlainTextEdit {
         mFileName = fileName;
     }
 
-    QString getFileName() const {
+    const QString& getFileName() const {
         return mFileName;
     }
 
diff --git a/gui/codeeditorstyle.cpp b/gui/codeeditorstyle.cpp
index 85900d033df..0536c4ba4b3 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-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
@@ -18,47 +18,35 @@
 
 #include "codeeditorstyle.h"
 
-#include <utility>
-
 #include <QSettings>
-#include <QStringList>
 #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, const QFont::Weight& KeyWdWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor ClsFGColor, const QFont::Weight& ClsWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor QteFGColor, const QFont::Weight& QteWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor CmtFGColor, const QFont::Weight& CmtWeight,
-    // cppcheck-suppress naming-varname - TODO: fix this
-    QColor SymbFGColor, QColor SymbBGColor,
-    const QFont::Weight& SymbWeight) :
-    mSystemTheme(false),
-    widgetFGColor(std::move(CtrlFGColor)),
-    widgetBGColor(std::move(CtrlBGColor)),
-    highlightBGColor(std::move(HiLiBGColor)),
-    lineNumFGColor(std::move(LnNumFGColor)),
-    lineNumBGColor(std::move(LnNumBGColor)),
-    keywordColor(std::move(KeyWdFGColor)),
-    keywordWeight(KeyWdWeight),
-    classColor(std::move(ClsFGColor)),
-    classWeight(ClsWeight),
-    quoteColor(std::move(QteFGColor)),
-    quoteWeight(QteWeight),
-    commentColor(std::move(CmtFGColor)),
-    commentWeight(CmtWeight),
-    symbolFGColor(std::move(SymbFGColor)),
-    symbolBGColor(std::move(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 aee3d028cfe..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-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
@@ -51,23 +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, const QFont::Weight& KeyWdWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor ClsFGColor, const QFont::Weight& ClsWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor QteFGColor, const QFont::Weight& QteWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor CmtFGColor, const QFont::Weight& CmtWeight,
-        // cppcheck-suppress naming-varname - TODO: fix this
-        QColor SymbFGColor, QColor SymbBGColor,
-        const 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;
@@ -81,7 +73,7 @@ class CodeEditorStyle {
     static void saveSettings(QSettings *settings, const CodeEditorStyle& theStyle);
 
 public:
-    bool mSystemTheme;
+    bool mSystemTheme{};
     QColor widgetFGColor;
     QColor widgetBGColor;
     QColor highlightBGColor;
diff --git a/gui/codeeditstylecontrols.cpp b/gui/codeeditstylecontrols.cpp
index 186d76c1e42..1623d75a68a 100644
--- a/gui/codeeditstylecontrols.cpp
+++ b/gui/codeeditstylecontrols.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -20,6 +20,8 @@
 
 #include <QColorDialog>
 #include <QDialog>
+#include <QObject>
+#include <QString>
 #include <QVariant>
 
 class QWidget;
@@ -63,14 +65,13 @@ void SelectColorButton::setColor(const QColor& color)
 }
 
 // cppcheck-suppress unusedFunction
-const QColor& SelectColorButton::getColor()
+const QColor& SelectColorButton::getColor() const
 {
     return mColor;
 }
 
 SelectFontWeightCombo::SelectFontWeightCombo(QWidget* parent) :
-    QComboBox(parent),
-    mWeight(QFont::Normal)
+    QComboBox(parent)
 {
     addItem(QObject::tr("Thin"),
             QVariant(static_cast<int>(QFont::Thin)));
@@ -114,14 +115,14 @@ void SelectFontWeightCombo::changeWeight(int index)
     }
 }
 
-void SelectFontWeightCombo::setWeight(const QFont::Weight& weight)
+void SelectFontWeightCombo::setWeight(QFont::Weight weight)
 {
     mWeight = weight;
     updateWeight();
 }
 
 // cppcheck-suppress unusedFunction
-const QFont::Weight& SelectFontWeightCombo::getWeight()
+const QFont::Weight& SelectFontWeightCombo::getWeight() const
 {
     return mWeight;
 }
diff --git a/gui/codeeditstylecontrols.h b/gui/codeeditstylecontrols.h
index b624d0e8d41..e40746a77a3 100644
--- a/gui/codeeditstylecontrols.h
+++ b/gui/codeeditstylecontrols.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -27,7 +27,6 @@
 #include <QFont>
 #include <QObject>
 #include <QPushButton>
-#include <QString>
 
 class QWidget;
 
@@ -35,10 +34,9 @@ class SelectColorButton : public QPushButton {
     Q_OBJECT
 public:
     explicit SelectColorButton(QWidget* parent);
-    ~SelectColorButton() override {}
 
     void setColor(const QColor& color);
-    const QColor& getColor();
+    const QColor& getColor() const;
 
 signals:
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
@@ -57,21 +55,20 @@ class SelectFontWeightCombo : public QComboBox {
     Q_OBJECT
 public:
     explicit SelectFontWeightCombo(QWidget* parent);
-    ~SelectFontWeightCombo() override {}
 
-    void setWeight(const QFont::Weight& weight);
-    const QFont::Weight& getWeight();
+    void setWeight(QFont::Weight weight);
+    const QFont::Weight& getWeight() const;
 
 signals:
     // NOLINTNEXTLINE(readability-inconsistent-declaration-parameter-name) - caused by generated MOC code
-    void weightChanged(const QFont::Weight& newWeight);
+    void weightChanged(QFont::Weight newWeight);
 
 public slots:
     void updateWeight();
     void changeWeight(int index);
 
 private:
-    QFont::Weight mWeight;
+    QFont::Weight mWeight = QFont::Normal;
 };
 
 #endif  //CODEEDITORSTYLECONTROLS_H
diff --git a/gui/codeeditstyledialog.cpp b/gui/codeeditstyledialog.cpp
index 3b98a9282f1..fa3f0f46f22 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-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
@@ -27,6 +27,7 @@
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QPushButton>
+#include <QString>
 #include <QStringList>
 #include <QVBoxLayout>
 #include <QtGlobal>
@@ -72,10 +73,10 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
     mStyleIncoming(newStyle),
     mStyleOutgoing(newStyle)
 {
-    QVBoxLayout *vboxMain = new QVBoxLayout(this);
-    QHBoxLayout *hboxEdit = new QHBoxLayout();
+    auto *vboxMain = new QVBoxLayout(this);
+    auto *hboxEdit = new QHBoxLayout();
     // Color/Weight controls
-    QFormLayout *flEditControls = new QFormLayout();
+    auto *flEditControls = new QFormLayout();
     mBtnWidgetColorFG = new SelectColorButton(this);
     flEditControls->addRow(QObject::tr("Editor Foreground Color"),
                            mBtnWidgetColorFG);
@@ -129,11 +130,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
@@ -141,7 +138,7 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
     vboxMain->addLayout(hboxEdit);
 
     // Default Controls
-    QHBoxLayout *hboxDefaultControls = new QHBoxLayout();
+    auto *hboxDefaultControls = new QHBoxLayout();
     mBtnDefaultLight = new QPushButton(QObject::tr("Set to Default Light"),
                                        this);
     mBtnDefaultDark  = new QPushButton(QObject::tr("Set to Default Dark"),
@@ -153,7 +150,7 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
     vboxMain->addLayout(hboxDefaultControls);
     vboxMain->addStretch(2);
     // dialog controls
-    QDialogButtonBox *dBtnBox = new QDialogButtonBox(
+    auto *dBtnBox = new QDialogButtonBox(
         QDialogButtonBox::Cancel |
         QDialogButtonBox::Ok |
         QDialogButtonBox::Reset);
@@ -172,38 +169,38 @@ StyleEditDialog::StyleEditDialog(const CodeEditorStyle& newStyle,
             this, SLOT(setStyleDefaultLight()));
     connect(mBtnDefaultDark, SIGNAL(clicked()),
             this, SLOT(setStyleDefaultDark()));
-    connect(mBtnWidgetColorFG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedWidgetFG(const QColor&)));
-    connect(mBtnWidgetColorBG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedWidgetBG(const QColor&)));
-    connect(mBtnHighlightBG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedHighlightBG(const QColor&)));
-    connect(mBtnLineNumFG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedLineNumFG(const QColor&)));
-    connect(mBtnLineNumBG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedLineNumBG(const QColor&)));
-    connect(mBtnKeywordFG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedKeywordFG(const QColor&)));
-    connect(mCBKeywordWeight, SIGNAL(weightChanged(const QFont::Weight&)),
-            this, SLOT(weightChangedKeyword(const QFont::Weight&)));
-    connect(mBtnClassFG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedClassFG(const QColor&)));
-    connect(mCBClassWeight, SIGNAL(weightChanged(const QFont::Weight&)),
-            this, SLOT(weightChangedClass(const QFont::Weight&)));
-    connect(mBtnQuoteFG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedQuoteFG(const QColor&)));
-    connect(mCBQuoteWeight, SIGNAL(weightChanged(const QFont::Weight&)),
-            this, SLOT(weightChangedQuote(const QFont::Weight&)));
-    connect(mBtnCommentFG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedCommentFG(const QColor&)));
-    connect(mCBCommentWeight, SIGNAL(weightChanged(const QFont::Weight&)),
-            this, SLOT(weightChangedComment(const QFont::Weight&)));
-    connect(mBtnSymbolFG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedSymbolFG(const QColor&)));
-    connect(mBtnSymbolBG, SIGNAL(colorChanged(const QColor&)),
-            this, SLOT(colorChangedSymbolBG(const QColor&)));
-    connect(mCBSymbolWeight, SIGNAL(weightChanged(const QFont::Weight&)),
-            this, SLOT(weightChangedSymbol(const QFont::Weight&)));
+    connect(mBtnWidgetColorFG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedWidgetFG(QColor)));
+    connect(mBtnWidgetColorBG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedWidgetBG(QColor)));
+    connect(mBtnHighlightBG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedHighlightBG(QColor)));
+    connect(mBtnLineNumFG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedLineNumFG(QColor)));
+    connect(mBtnLineNumBG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedLineNumBG(QColor)));
+    connect(mBtnKeywordFG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedKeywordFG(QColor)));
+    connect(mCBKeywordWeight, SIGNAL(weightChanged(QFont::Weight)),
+            this, SLOT(weightChangedKeyword(QFont::Weight)));
+    connect(mBtnClassFG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedClassFG(QColor)));
+    connect(mCBClassWeight, SIGNAL(weightChanged(QFont::Weight)),
+            this, SLOT(weightChangedClass(QFont::Weight)));
+    connect(mBtnQuoteFG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedQuoteFG(QColor)));
+    connect(mCBQuoteWeight, SIGNAL(weightChanged(QFont::Weight)),
+            this, SLOT(weightChangedQuote(QFont::Weight)));
+    connect(mBtnCommentFG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedCommentFG(QColor)));
+    connect(mCBCommentWeight, SIGNAL(weightChanged(QFont::Weight)),
+            this, SLOT(weightChangedComment(QFont::Weight)));
+    connect(mBtnSymbolFG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedSymbolFG(QColor)));
+    connect(mBtnSymbolBG, SIGNAL(colorChanged(QColor)),
+            this, SLOT(colorChangedSymbolBG(QColor)));
+    connect(mCBSymbolWeight, SIGNAL(weightChanged(QFont::Weight)),
+            this, SLOT(weightChangedSymbol(QFont::Weight)));
 }
 
 void StyleEditDialog::updateControls()
@@ -234,7 +231,7 @@ void StyleEditDialog::updateStyle()
     mSampleEditor->setStyle(mStyleOutgoing);
 }
 
-CodeEditorStyle StyleEditDialog::getStyle()
+CodeEditorStyle StyleEditDialog::getStyle() const
 {
     return mStyleOutgoing;
 }
@@ -296,7 +293,7 @@ void StyleEditDialog::colorChangedKeywordFG(const QColor& newColor)
     updateStyle();
 }
 
-void StyleEditDialog::weightChangedKeyword(const QFont::Weight& newWeight)
+void StyleEditDialog::weightChangedKeyword(QFont::Weight newWeight)
 {
     mStyleOutgoing.keywordWeight = newWeight;
     updateStyle();
@@ -308,7 +305,7 @@ void StyleEditDialog::colorChangedClassFG(const QColor& newColor)
     updateStyle();
 }
 
-void StyleEditDialog::weightChangedClass(const QFont::Weight& newWeight)
+void StyleEditDialog::weightChangedClass(QFont::Weight newWeight)
 {
     mStyleOutgoing.classWeight = newWeight;
     updateStyle();
@@ -320,7 +317,7 @@ void StyleEditDialog::colorChangedQuoteFG(const QColor& newColor)
     updateStyle();
 }
 
-void StyleEditDialog::weightChangedQuote(const QFont::Weight& newWeight)
+void StyleEditDialog::weightChangedQuote(QFont::Weight newWeight)
 {
     mStyleOutgoing.quoteWeight = newWeight;
     updateStyle();
@@ -332,7 +329,7 @@ void StyleEditDialog::colorChangedCommentFG(const QColor& newColor)
     updateStyle();
 }
 
-void StyleEditDialog::weightChangedComment(const QFont::Weight& newWeight)
+void StyleEditDialog::weightChangedComment(QFont::Weight newWeight)
 {
     mStyleOutgoing.commentWeight = newWeight;
     updateStyle();
@@ -350,7 +347,7 @@ void StyleEditDialog::colorChangedSymbolBG(const QColor& newColor)
     updateStyle();
 }
 
-void StyleEditDialog::weightChangedSymbol(const QFont::Weight& newWeight)
+void StyleEditDialog::weightChangedSymbol(QFont::Weight newWeight)
 {
     mStyleOutgoing.symbolWeight = newWeight;
     updateStyle();
diff --git a/gui/codeeditstyledialog.h b/gui/codeeditstyledialog.h
index 9ef42907be4..80b8b06214d 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-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,26 +25,21 @@
 #include <QDialog>
 #include <QFont>
 #include <QObject>
-#include <QString>
 
 class CodeEditor;
 class SelectColorButton;
 class SelectFontWeightCombo;
 class QPushButton;
 class QWidget;
-
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-class QStringList;
-#endif
+class QString;
 
 class StyleEditDialog : public QDialog {
     Q_OBJECT
 public:
     explicit StyleEditDialog(const CodeEditorStyle& newStyle,
                              QWidget *parent = nullptr);
-    ~StyleEditDialog() override {}
 
-    CodeEditorStyle getStyle();
+    CodeEditorStyle getStyle() const;
 
 private:
     void updateControls();
@@ -60,16 +55,16 @@ public slots:
     void colorChangedLineNumFG(const QColor& newColor);
     void colorChangedLineNumBG(const QColor& newColor);
     void colorChangedKeywordFG(const QColor& newColor);
-    void weightChangedKeyword(const QFont::Weight& newWeight);
+    void weightChangedKeyword(QFont::Weight newWeight);
     void colorChangedClassFG(const QColor& newColor);
-    void weightChangedClass(const QFont::Weight& newWeight);
+    void weightChangedClass(QFont::Weight newWeight);
     void colorChangedQuoteFG(const QColor& newColor);
-    void weightChangedQuote(const QFont::Weight& newWeight);
+    void weightChangedQuote(QFont::Weight newWeight);
     void colorChangedCommentFG(const QColor& newColor);
-    void weightChangedComment(const QFont::Weight& newWeight);
+    void weightChangedComment(QFont::Weight newWeight);
     void colorChangedSymbolFG(const QColor& newColor);
     void colorChangedSymbolBG(const QColor& newColor);
-    void weightChangedSymbol(const QFont::Weight& newWeight);
+    void weightChangedSymbol(QFont::Weight newWeight);
 
 private:
     CodeEditorStyle mStyleIncoming;
diff --git a/gui/common.cpp b/gui/common.cpp
index 68b20217831..8e6272a754f 100644
--- a/gui/common.cpp
+++ b/gui/common.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -23,6 +23,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QList>
+#include <QMap>
 #include <QSettings>
 #include <QStringList>
 #include <QVariant>
@@ -55,7 +56,7 @@ QString toFilterString(const QMap<QString,QString>& filters, bool addAllSupporte
 
     if (addAllSupported) {
         entries << QCoreApplication::translate("toFilterString", "All supported files (%1)")
-            .arg(QStringList(filters.values()).join(" "));
+            .arg(filters.values().join(" "));
     }
 
     if (addAll) {
@@ -79,7 +80,7 @@ QString getDataDir()
     if (!dataDir.isEmpty())
         return dataDir;
     const QString appPath = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath();
-    if (QFileInfo(appPath + "/std.cfg").exists())
+    if (QFileInfo::exists(appPath + "/std.cfg"))
         return appPath;
     if (appPath.indexOf("/cppcheck/", 0, Qt::CaseInsensitive) > 0)
         return appPath.left(appPath.indexOf("/cppcheck/", 0, Qt::CaseInsensitive) + 9);
diff --git a/gui/common.h b/gui/common.h
index e98d260e9cc..60c41f928eb 100644
--- a/gui/common.h
+++ b/gui/common.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * 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
@@ -48,6 +48,9 @@
 #define SETTINGS_TOOLBARS_VIEW_SHOW     "Toolbars/ShowView"
 #define SETTINGS_TOOLBARS_FILTER_SHOW   "Toolbars/ShowFilter"
 
+// Report type
+#define SETTINGS_REPORT_TYPE            "Report type"
+
 // Show * states
 #define SETTINGS_SHOW_STYLE             "Show style"
 #define SETTINGS_SHOW_ERRORS            "Show errors"
diff --git a/gui/compliancereportdialog.cpp b/gui/compliancereportdialog.cpp
index 43a1ef0f746..ae903f47dc4 100644
--- a/gui/compliancereportdialog.cpp
+++ b/gui/compliancereportdialog.cpp
@@ -1,9 +1,28 @@
+/*
+ * 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 "compliancereportdialog.h"
 
 #include "ui_compliancereportdialog.h"
 
 #include "errortypes.h"
 #include "filelist.h"
+#include "filesettings.h"
 #include "importproject.h"
 #include "projectfile.h"
 
@@ -16,7 +35,9 @@
 
 #include <QByteArray>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QCoreApplication>
+#include <QCryptographicHash>
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QFile>
@@ -24,6 +45,7 @@
 #include <QFileInfo>
 #include <QIODevice>
 #include <QLineEdit>
+#include <QList>
 #include <QMessageBox>
 #include <QProcess>
 #include <QRegularExpression>
@@ -31,7 +53,6 @@
 #include <QStringList>
 #include <QTemporaryFile>
 #include <QTextStream>
-#include <QtCore>
 
 static void addHeaders(const QString& file1, QSet<QString> &allFiles) {
     if (allFiles.contains(file1))
@@ -65,15 +86,24 @@ static std::vector<std::string> toStdStringList(const QStringList& from) {
     return ret;
 }
 
-ComplianceReportDialog::ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile) :
-    QDialog(nullptr),
+ComplianceReportDialog::ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport)
+    : QDialog(nullptr),
     mUI(new Ui::ComplianceReportDialog),
     mProjectFile(projectFile),
-    mResultsFile(std::move(resultsFile))
+    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()
@@ -92,7 +122,7 @@ void ComplianceReportDialog::buttonClicked(QAbstractButton* button)
         break;
     default:
         break;
-    };
+    }
 }
 
 void ComplianceReportDialog::save()
@@ -117,6 +147,13 @@ void ComplianceReportDialog::save()
         mProjectFile->write();
     }
 
+    QTemporaryFile tempCheckersReport;
+    if (tempCheckersReport.open()) {
+        QTextStream out(&tempCheckersReport);
+        out << mCheckersReport << "\n";
+        tempCheckersReport.close();
+    }
+
     QTemporaryFile tempFiles;
     if (files && tempFiles.open()) {
         QTextStream out(&tempFiles);
@@ -137,7 +174,7 @@ void ComplianceReportDialog::save()
             } catch (InternalError &e) {
                 QMessageBox msg(QMessageBox::Critical,
                                 tr("Save compliance report"),
-                                tr("Failed to import '%1', can not show files in compliance report").arg(prjfile),
+                                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();
@@ -147,8 +184,8 @@ void ComplianceReportDialog::save()
             p.ignorePaths(toStdStringList(mProjectFile->getExcludedPaths()));
 
             QDir dir(inf.absoluteDir());
-            for (const ImportProject::FileSettings& fs: p.fileSettings)
-                fileList.addFile(dir.relativeFilePath(QString::fromStdString(fs.filename)));
+            for (const FileSettings& fs: p.fileSettings)
+                fileList.addFile(dir.relativeFilePath(QString::fromStdString(fs.filename())));
         }
 
         QSet<QString> allFiles;
@@ -160,7 +197,7 @@ void ComplianceReportDialog::save()
                 QCryptographicHash hash(QCryptographicHash::Algorithm::Md5);
                 if (hash.addData(&f)) {
                     for (auto b: hash.result())
-                        out << QString::number((unsigned char)b,16);
+                        out << QString::number(static_cast<unsigned char>(b),16);
                     out << " " << fileName << "\n";
                 }
             }
@@ -168,17 +205,20 @@ void ComplianceReportDialog::save()
         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};
-
-    if (std.startsWith("misra-c-")) {
-        args << "--misra-c"
-             << "--compliant=misra-c2012-1.1"
-             << "--compliant=misra-c2012-1.2";
-    } else {
-        args << ("--" + std);
-    }
+                     "--output-file=" + outFile,
+                     "--checkers-report=" + tempCheckersReport.fileName()};
+    if (!suppressions.isEmpty())
+        args << "--suppressions=" + suppressions.join(",");
+
+    args << ("--" + std);
 
     if (files)
         args << "--files=" + tempFiles.fileName();
@@ -193,4 +233,13 @@ void ComplianceReportDialog::save()
     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
index 99bf1848903..c7ef27f1cc5 100644
--- a/gui/compliancereportdialog.h
+++ b/gui/compliancereportdialog.h
@@ -1,3 +1,21 @@
+/* -*- 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
 
@@ -17,7 +35,7 @@ class ComplianceReportDialog final : public QDialog
     Q_OBJECT
 
 public:
-    explicit ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile);
+    explicit ComplianceReportDialog(ProjectFile* projectFile, QString resultsFile, QString checkersReport);
     ~ComplianceReportDialog() final;
 
 private slots:
@@ -28,7 +46,8 @@ private slots:
 
     Ui::ComplianceReportDialog *mUI;
     ProjectFile* mProjectFile;
-    QString mResultsFile;
+    const QString mResultsFile;
+    const QString mCheckersReport;
 };
 
 #endif // COMPLIANCEREPORTDIALOG_H
diff --git a/gui/compliancereportdialog.ui b/gui/compliancereportdialog.ui
index b65ef626eed..b756ec7eab5 100644
--- a/gui/compliancereportdialog.ui
+++ b/gui/compliancereportdialog.ui
@@ -47,7 +47,7 @@
       <widget class="QComboBox" name="mCodingStandard">
        <item>
         <property name="text">
-         <string>Misra C 2023</string>
+         <string>Misra C</string>
         </property>
        </item>
        <item>
diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts
index b7ed64d7459..0197f93c728 100644
--- a/gui/cppcheck_de.ts
+++ b/gui/cppcheck_de.ts
@@ -38,8 +38,9 @@ der GNU General Public License Version 3 lizenziert</translation>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <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>&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>
@@ -62,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
@@ -121,42 +122,63 @@ Parameter: -l(line) (file)
     <message>
         <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
+        <translation>Compliance-Report</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation type="unfinished"></translation>
+        <translation>Projektname</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekt-Version</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <location filename="compliancereportdialog.ui" line="42"/>
+        <source>Coding Standard</source>
+        <translation>Programmierstandards</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="50"/>
+        <source>Misra C</source>
+        <translation>Misra C</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="55"/>
+        <source>Cert C</source>
+        <translation>Cert C</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="60"/>
+        <source>Cert C++</source>
+        <translation>Cert C++</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei-Listen mit MD5-Prüfsummen</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation>Compliance-Report</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>HTML-Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <location filename="compliancereportdialog.cpp" line="176"/>
+        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation>Compliance-Report speichern</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
+        <location filename="compliancereportdialog.cpp" line="177"/>
+        <source>Failed to import &apos;%1&apos; (%2), can not show files in compliance report</source>
+        <translation>Import von &apos;%1&apos; (%2) fehlgeschlagen, Compliance-Report kann nicht angezeigt werden</translation>
     </message>
 </context>
 <context>
@@ -183,27 +205,27 @@ 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="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <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="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
-        <translation type="unfinished">Cppcheck</translation>
+        <translation>Cppcheck</translation>
     </message>
 </context>
 <context>
@@ -474,25 +496,25 @@ Parameter: -l(line) (file)
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
@@ -512,234 +534,236 @@ Parameter: -l(line) (file)
         <translation>&amp;Symbolleisten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>A&amp;nalysieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++-Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation>&amp;C-Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Lizenz...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Autoren...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>Ü&amp;ber...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Dateien...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Strg+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Verzeichnis...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Strg+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Strg+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stoppen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Strg+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>Ergebnisse &amp;löschen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>Zeige Fehler</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>Zeige Warnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Zeige &amp;versteckte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Zeige Informationsmeldungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Zeige Portabilitätswarnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Zeige Cppcheck-Ergebnisse</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Zeige Clang-Ergebnisse</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Gefilterte Ergebnisse</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Drucken...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Aktuellen Bericht ausdrucken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Druckvorschau</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>Bibliothekseditor öffnen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>Alle &amp;auswählen</translation>
     </message>
@@ -754,279 +778,325 @@ Parameter: -l(line) (file)
         <translation type="unfinished">Verstecken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <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="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>Stilwar&amp;nungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>F&amp;ehler</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <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="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Alle &amp;reduzieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>Alle &amp;erweitern</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Standardeinträge</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Symbolleiste</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorien</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Fehler-Kategorien</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>Öffne &amp;XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <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="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>&amp;Zeige Schmierzettel...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Neue Projektdatei...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Loganzeige</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Loganzeige</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <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="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>Projektdatei &amp;bearbeiten...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistik</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>&amp;Warnungen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <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="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>&amp;Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>&amp;Portabilität</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>P&amp;lattformen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>Posix</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>&amp;Bibliothekseditor</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <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="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>C++ &amp;erzwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <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="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <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="885"/>
+        <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="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation>Misra C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation>Cert C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation>Cert C++</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Inhalte</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="493"/>
+        <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="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>Schnellfilter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation>Konfiguration wählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1035,65 +1105,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="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>Datei nicht gefunden</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation>Fehlerhaftes XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation>Fehlendes Attribut</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation>Falscher Attributwert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation>Plattformtyp doppelt</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation>Plattformtyp neu definiert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1441"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Lizenz</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Autoren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Speichert die Berichtdatei</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML-Dateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -1102,117 +1209,119 @@ 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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <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="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>Nicht unterstütztes Format</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation>Unbekanntes Element</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation>Unbekannter Fehler</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
         <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.</source>
-        <translation>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>
+        <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="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>Berichtdatei öffnen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>Textdateien (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV-Dateien (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Projektdateien (*.cppcheck);;Alle Dateien(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>Projektdatei auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation>Keine passenden Dateien für Analyse gefunden!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation>C/C++-Quellcode</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation>Compilerdatenbank</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++-Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation>Dateien für Analyse auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation>Verzeichnis für Analyse auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Zu analysierende Konfiguration auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1221,7 +1330,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="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1232,7 +1341,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="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1241,69 +1350,133 @@ 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="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <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="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <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="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation>Import von &apos;%1&apos; fehlgeschlagen; Analyse wurde abgebrochen.</translation>
+        <translation type="vanished">Import von &apos;%1&apos; fehlgeschlagen; Analyse wurde abgebrochen.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Projektdateien (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>Projektnamen auswählen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>Keine Projektdatei geladen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1320,17 +1493,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="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1361,7 +1534,7 @@ Options:
         </translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - Kommandozeilenparameter</translation>
     </message>
@@ -1394,7 +1567,7 @@ Options:
         <translation>Symbolname</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>Fehlerunterdrückung bearbeiten</translation>
     </message>
@@ -1464,17 +1637,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation>MISRA-Regeltexte</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1486,6 +1659,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation>Durchsuchen...</translation>
     </message>
@@ -1497,7 +1671,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"/>
@@ -1513,15 +1687,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
@@ -1557,7 +1731,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation>Analyse</translation>
     </message>
@@ -1571,79 +1745,114 @@ Options:
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation>Maximale CTU-Tiefe</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation>Warnoptionen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation>Wurzelverzeichnis:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Warnungs-Tags (Semikolon-getrennt)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation>Inline-Fehlerunterdrückung aktivieren</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
+        <translation>Cert C</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="946"/>
+        <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="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation>Externe Werkzeuge</translation>
     </message>
@@ -1673,93 +1882,109 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation>Fehlerunterdrückungen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation>Add-Ons</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation>Threadsicherheit</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation>Programmierstandards</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
-        <source>Cert C++</source>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation>Misra C</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="958"/>
+        <source>Cert C++</source>
+        <translation>Cert C++</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation>Clang-Analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation>Clang-Tidy</translation>
     </message>
@@ -1772,268 +1997,338 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation>Wähle Cppcheck-Erstellungsverzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Wähle Include-Verzeichnisse</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>Wähle zu prüfendes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation>Hinweis: Open-Source Cppcheck implementiert Misra C 2012 nicht vollständig</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (nicht gefunden)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation>Compilerdatenbank</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++-Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation>Projekt importieren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>Wähle zu ignorierendes Verzeichnis</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelltext-Dateien</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei ausschließen</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation>Wähle MISRA-Regeltext-Datei</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <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="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Unbekannte Sprache angegeben!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="43"/>
+        <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="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation> (nicht gefunden)</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <translation>Klassen-Vordergrundfarbe</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">Datei</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Zeile</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Schweregrad</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished">Unklar</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">Zusammenfassung</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished">Seit Datum</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2041,109 +2336,108 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>Datei</translation>
+        <translation type="vanished">Datei</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>Schweregrad</translation>
+        <translation type="vanished">Schweregrad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>Zeile</translation>
+        <translation type="vanished">Zeile</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>Zusammenfassung</translation>
+        <translation type="vanished">Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>Undefinierte Datei</translation>
+        <translation type="vanished">Undefinierte Datei</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation>Kann Datei nicht finden:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <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="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>Wähle Verzeichnis &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <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="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>Debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation>Anmerkung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
-        <translation>Erneut prüfen</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="666"/>
-        <source>Hide</source>
-        <translation>Verstecken</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation>Verstecke alle mit gleicher ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation>Ausgewählte ID(s) unterdrücken</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation>Übergeordneten Ordner öffnen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation>Intern</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation>Erneut %1 Datei(en) prüfen</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation>Verstecke %1 Ergebnis(se)</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation>Kein Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2152,7 +2446,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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2161,12 +2455,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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>Datei konnte nicht gefunden werden!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2175,52 +2469,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="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>Wähle Verzeichnis</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Id</source>
-        <translation>Id</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation>Unklar</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation>Seit Datum</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>Performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>Portabilität</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>Information</translation>
     </message>
@@ -2228,82 +2507,102 @@ Bitte überprüfen Sie ob der Pfad und die Parameter der Anwendung richtig einge
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>Bericht drucken</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation>Keine Funde, nichts zu drucken.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 von %2 Dateien geprüft)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>Keine Fehler gefunden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>Lesen des Berichts fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <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="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation>Zuerst inkludiert von</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation>Protokoll leeren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation>Diesen Protokolleintrag kopieren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation>Gesamtes Protokoll kopieren</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation>Analyse wurde gestoppt</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation>Kritischer Fehler mit ID &apos;%1&apos; aufgetreten</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation>beim Prüfen von %1</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation>beim Prüfen einer Datei</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation>Analyse abgebrochen.</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Der Bericht konnte nicht speichern werden.</translation>
     </message>
@@ -2313,12 +2612,17 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
         <translation>Berichte</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation>Kritische Fehler</translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation>Analyseprotokoll</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation>Warnungs-Details</translation>
     </message>
@@ -2364,7 +2668,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>
@@ -2374,175 +2678,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>
@@ -2550,47 +2858,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>
@@ -2600,14 +2907,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
@@ -2638,7 +2945,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>Vorherige Prüfung</translation>
     </message>
@@ -2658,193 +2965,203 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
         <translation>Prüfungsdauer:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>Fehler:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>Warnungen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Stilwarnungen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>Portabilitätswarnungen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>Performance-Probleme:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>Informationsmeldungen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation>Aktive Checker:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation>Checker</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation>Verlauf</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation>Datei:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation>PDF-Export</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 Tag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 Tage</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 Stunde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 Stunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 Minute</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 Minuten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 Sekunde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 Sekunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0,%1 Sekunden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> und </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation>Exportiere PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>Projekteinstellungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>Include-Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>Definitionen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation>Un-Definitionen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>Gewählte Pfade</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>Anzahl geprüfter Dateien</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>Prüfungsdauer</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>Datei: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>Kein Cppcheck-Analyseverzeichnis</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>Warnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>Stilwarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>Portabilitätswarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>Performance-Warnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>Informationsmeldungen</translation>
     </message>
@@ -2852,7 +3169,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 von %2 Dateien geprüft</translation>
     </message>
@@ -2860,7 +3177,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2873,7 +3190,7 @@ 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="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2881,7 +3198,7 @@ Die Sprache wurde auf Englisch zurückgesetzt. Öffnen Sie den Einstellungen-Dia
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>unklar</translation>
     </message>
@@ -2889,12 +3206,12 @@ Die Sprache wurde auf Englisch zurückgesetzt. Öffnen Sie den Einstellungen-Dia
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation>Alle unterstützten Dateien (%1)</translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation>Alle Dateien (%1)</translation>
     </message>
diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts
index 5f837e9bf37..2283e346285 100644
--- a/gui/cppcheck_es.ts
+++ b/gui/cppcheck_es.ts
@@ -37,7 +37,8 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -112,38 +113,59 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -184,12 +206,12 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -454,20 +476,20 @@ Parameters: -l(line) (file)</source>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -487,237 +509,238 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;Herramientas</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licencia...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;utores...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Acerca de...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Ficheros...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Carpeta...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Detener</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Limpiar resultados</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Preferencias</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>Mostrar errores</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <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="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Mostrar advertencias de portabilidad</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Resultados del filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Im&amp;primir...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <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="823"/>
+        <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="826"/>
+        <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="834"/>
+        <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="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Seleccionar todo</translation>
     </message>
@@ -732,355 +755,439 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Ocultar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Deseleccionar todo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Contraer &amp;todo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Expandir todo</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Elementos estándar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenidos</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="493"/>
+        <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="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Barra de herramientas</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorías</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Categorías de error</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Abrir XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <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="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nuevo Proyecto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Visor del log</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Visor del log</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <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="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Editar Proyecto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Estadísticas</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>Mostrar advertencias</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Mostrar &amp;ocultos</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>Archivo no encontrado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation type="unfinished">XML malformado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation type="unfinished">Falta el atributo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>Formato no soportado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>Archivos XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>Abrir informe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1441"/>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Licencia</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Autores</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Guardar informe</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>Filtro rápido:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1089,119 +1196,117 @@ 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="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <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="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>Ficheros de texto (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>Ficheros CVS (*.cvs)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Ficheros de proyecto (*.cppcheck;;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>Selecciona el archivo de proyecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>Proyecto:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1209,76 +1314,81 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <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="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
-        <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>Selecciona el nombre del proyecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>No hay ningún proyecto cargado</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1295,17 +1405,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="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1335,7 +1500,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1368,7 +1533,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1436,37 +1601,53 @@ Options:
         <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="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1478,6 +1659,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1505,15 +1687,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
@@ -1539,7 +1721,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1559,58 +1741,93 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished">Habilitar supresiones inline</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="946"/>
+        <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="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1635,37 +1852,37 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="494"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1680,58 +1897,58 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation type="unfinished">Supresiones</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1744,77 +1961,82 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Selecciona una carpeta para incluir</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>Selecciona la carpeta a comprobar</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>Selecciona la carpeta a ignorar</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1822,191 +2044,256 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>¡Idioma especificado desconocido!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">Archivo</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Línea</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Severidad</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">Resumen</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2014,119 +2301,122 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>Archivo</translation>
+        <translation type="vanished">Archivo</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>Severidad</translation>
+        <translation type="vanished">Severidad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>Línea</translation>
+        <translation type="vanished">Línea</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>Resumen</translation>
+        <translation type="vanished">Resumen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>Fichero no definido</translation>
+        <translation type="vanished">Fichero no definido</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>portabilidad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>información</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>depuración</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>Ocultar</translation>
+        <translation type="vanished">Ocultar</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation>Ocultar todos con el mismo id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation>Abrir carpeta contenedora</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2136,7 +2426,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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2145,12 +2435,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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>¡No se ha encontrado el fichero!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2159,42 +2449,31 @@ 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="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>Selecciona carpeta</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>estilo</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>error</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>advertencia</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>ajuste</translation>
     </message>
@@ -2207,95 +2486,120 @@ Por favor comprueba que la ruta a la aplicación y los parámetros son correctos
         <translation>Resultados</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Error al guardar el informe.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>Imprimir informe</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation>No se encontraron errores, nada que imprimir.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 of %2 archivos comprobados)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>No se han encontrado errores.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>Error al leer el informe.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScratchPad</name>
@@ -2338,145 +2642,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>
@@ -2486,37 +2794,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>
@@ -2524,47 +2832,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>
@@ -2574,14 +2881,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>Proyecto</translation>
     </message>
@@ -2612,7 +2919,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation type="unfinished">Análisis anterior</translation>
     </message>
@@ -2632,193 +2939,203 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
         <translation type="unfinished">Duración del análisis:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>Errores:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>Advertencias:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Advertencias de estilo:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>Advertencias de portabilidad:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>Problemas de rendimiento:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>Mensajes de información:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>Copiar al portapapeles</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 día</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 días</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 hora</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 horas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 minuto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 minutos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 segundo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 segundos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 segundos</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>Preferencias del proyecto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation type="unfinished">Incluye las rutas</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation type="unfinished">Definiciones</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>Ruta seleccionada</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation type="unfinished">Número de archivos analizados</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation type="unfinished">Duración del análisis</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>Errores</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>Advertencias</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>Advertencias de estilo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>Advertencias de portabilidad</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>Advertencias de rendimiento</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>Mensajes de información</translation>
     </message>
@@ -2826,7 +3143,7 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 de %2 archivos comprobados</translation>
     </message>
@@ -2834,7 +3151,7 @@ Para cambiar el tipo de comportamiento, abra el menú Ver.</translation>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2847,7 +3164,7 @@ 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="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2855,7 +3172,7 @@ El idioma de la interfaz gráfica ha sido cambiado a Inglés. Abra la ventana de
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>no concluyente</translation>
     </message>
@@ -2863,12 +3180,12 @@ El idioma de la interfaz gráfica ha sido cambiado a Inglés. Abra la ventana de
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts
index eef46a582e1..d6ad561fd33 100644
--- a/gui/cppcheck_fi.ts
+++ b/gui/cppcheck_fi.ts
@@ -38,7 +38,8 @@ Public lisenssin version 3 alaisuuteen</translation>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -113,38 +114,59 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -187,12 +209,12 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -457,30 +479,30 @@ Parameters: -l(line) (file)</source>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Vakio</translation>
     </message>
@@ -500,233 +522,235 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Muokkaa</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Lisenssi...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Tekijät...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Tietoa ohjelmasta Cppcheck...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Tiedostot...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Hakemisto...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Pysäytä</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Lopeta</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Tyhjennä tulokset</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Asetukset</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="721"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Valitse kaikki</translation>
     </message>
@@ -741,467 +765,548 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Poista kaikista valinta</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>&amp;Pienennä kaikki</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Laajenna kaikki</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>&amp;Ohje</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <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="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1441"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Lisenssi</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Tekijät</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Tallenna raportti</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML-tiedostot (*xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>Tekstitiedostot (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1209,76 +1314,81 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <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="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
-        <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1289,17 +1399,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="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1329,7 +1494,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1362,7 +1527,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1430,17 +1595,17 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1452,6 +1617,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1479,15 +1645,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1523,7 +1689,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1537,79 +1703,114 @@ Options:
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="946"/>
+        <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="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1639,93 +1840,109 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1738,77 +1955,82 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1816,193 +2038,258 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">Tiedosto</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Rivi</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Tyyppi</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2010,109 +2297,104 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>Tiedosto</translation>
+        <translation type="vanished">Tiedosto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>Tyyppi</translation>
+        <translation type="vanished">Tyyppi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>Rivi</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Summary</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Rivi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <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="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
+        <location filename="resultstree.cpp" line="659"/>
+        <source>Hide all with id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="681"/>
+        <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
-        <source>Hide</source>
+        <location filename="resultstree.cpp" line="660"/>
+        <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
-        <source>Hide all with id</source>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
-        <source>Suppress selected id(s)</source>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
-        <source>Open containing folder</source>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2120,19 +2402,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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2141,52 +2423,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="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>Tyyli</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2194,82 +2461,102 @@ Tarkista että ohjelman polku ja parametrit ovat oikeat.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>Virheitä ei löytynyt.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Raportin tallentaminen epäonnistui.</translation>
     </message>
@@ -2279,12 +2566,17 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
         <translation>Tulokset</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2330,7 +2622,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>
@@ -2340,176 +2632,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>
@@ -2517,47 +2809,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>
@@ -2567,14 +2854,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2605,7 +2892,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2625,193 +2912,203 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2819,7 +3116,7 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2827,7 +3124,7 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2836,7 +3133,7 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -2844,7 +3141,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2852,12 +3149,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts
index f2190e9e464..45ee1549a62 100644
--- a/gui/cppcheck_fr.ts
+++ b/gui/cppcheck_fr.ts
@@ -32,7 +32,8 @@ General Public License version 3</translation>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
     <message>
@@ -123,38 +124,59 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -195,12 +217,12 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,20 +485,20 @@ Paramètres : -l(ligne) (fichier)</translation>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -501,168 +523,214 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Édition</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licence...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;uteurs...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>À &amp;Propos...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Fichiers...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Répertoires...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Arrêter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <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="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Préférences</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Tout cocher</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Tout décocher</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>&amp;Tout réduire</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Tout dérouler</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenus</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="493"/>
+        <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="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1441"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Licence</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Sauvegarder le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>Fichiers XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>Fichiers Texte (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>Fichiers CSV (*.csv)</translation>
     </message>
@@ -672,227 +740,294 @@ Paramètres : -l(ligne) (fichier)</translation>
         <translation>&amp;Boite à outils</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>Afficher les erreurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <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="526"/>
+        <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="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Nouveau Projet...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Journal</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Journal</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <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="570"/>
+        <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="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>Afficher les avertissements</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <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="656"/>
+        <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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>Ouvrir le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="458"/>
         <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="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtre</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>Filtre rapide : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <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="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>Projet : </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -903,141 +1038,144 @@ 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="284"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="721"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>Fichier introuvable</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation>Mauvais fichier XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation>Attribut manquant</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation>Mauvaise valeur d&apos;attribut</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <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="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>Format non supporté</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <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="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation> &amp;Imprimer...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Imprimer le rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <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="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1055,269 +1193,296 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="350"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="1385"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1591"/>
         <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="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
-        <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1353,7 +1518,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1417,15 +1582,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="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
@@ -1440,12 +1605,12 @@ Do you want to proceed?</source>
         <translation>Descendre</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation>Suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
@@ -1455,7 +1620,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1480,12 +1645,12 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1520,84 +1685,75 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="827"/>
+        <location filename="projectfile.ui" line="937"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
+        <location filename="projectfile.ui" line="946"/>
         <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="820"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <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"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1621,73 +1777,134 @@ Do you want to proceed?</source>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="848"/>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1708,18 +1925,18 @@ Do you want to proceed?</source>
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1727,77 +1944,82 @@ 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="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Selectionner un répertoire à inclure</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>Selectionner un répertoire à ignorer</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>Selectionner un répertoire à vérifier</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1805,190 +2027,255 @@ Do you want to proceed?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">Fichier</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Ligne</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Sévérité</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">Résumé</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -1996,33 +2283,29 @@ Do you want to proceed?</source>
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation type="unfinished">Fichier</translation>
+        <translation type="obsolete">Fichier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation type="unfinished">Sévérité</translation>
+        <translation type="obsolete">Sévérité</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation type="unfinished">Ligne</translation>
+        <translation type="obsolete">Ligne</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>Fichier indéterminé</translation>
+        <translation type="vanished">Fichier indéterminé</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2031,147 +2314,147 @@ 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="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>erreur de style</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>erreur</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>Résumé</translation>
+        <translation type="vanished">Résumé</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>Cacher</translation>
+        <translation type="vanished">Cacher</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>Fichier introuvable !</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>Selectionner dossier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>avertissement</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>portabilité</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>information</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>débogage</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="734"/>
         <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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <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="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation>Ouvrir l&apos;emplacement du fichier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="664"/>
         <source>Recheck</source>
-        <translation>Revérifier</translation>
+        <translation type="vanished">Revérifier</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2184,92 +2467,117 @@ Please select the default editor application in preferences/Applications.</sourc
         <translation>Résultats</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>Pas d&apos;erreurs trouvées.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="430"/>
-        <source>Bug hunting analysis is incomplete</source>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Erreur lors de la sauvegarde du rapport.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>Erreur lors de la lecture du rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <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="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>Imprimer le rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <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="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2320,180 +2628,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>
@@ -2501,47 +2809,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>
@@ -2551,14 +2854,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>Projet</translation>
     </message>
@@ -2584,7 +2887,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>Analyse précédente</translation>
     </message>
@@ -2604,188 +2907,198 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
         <translation>Durée de l&apos;analyse :</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>Erreurs :</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>Avertissements</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Avertissements de style</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>Avertissements de portabilité</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>Problème de performance</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>Messages d&apos;information :</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>Copier vers le presse-papier</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation type="unfinished">Chemins</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation type="unfinished">Erreurs</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation type="unfinished">Avertissements</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation type="unfinished">Avertissement de style</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation type="unfinished">Avertissements de performance</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2795,7 +3108,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="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2803,7 +3116,7 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2811,7 +3124,7 @@ Pour configurer les erreurs affichées, ouvrez le menu d&apos;affichage.</transl
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2820,7 +3133,7 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2828,7 +3141,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2836,12 +3149,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts
index e1c67ce3ee0..811150c9257 100644
--- a/gui/cppcheck_it.ts
+++ b/gui/cppcheck_it.ts
@@ -38,7 +38,8 @@ della GNU General Public License versione 3</translation>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -124,38 +125,59 @@ Parametri: -l(line) (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -196,12 +218,12 @@ Parametri: -l(line) (file)
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -466,30 +488,30 @@ Parametri: -l(line) (file)
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
@@ -509,233 +531,235 @@ Parametri: -l(line) (file)
         <translation>&amp;Barre degli strumenti</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Modifica</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licenza...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;utori...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>I&amp;nformazioni su...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;File...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Cartella...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Ferma</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Cancella i risultati</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Preferenze</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>Mostra gli errori</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>Mostra gli avvisi</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Mostra &amp;i nascosti</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Mostra messaggi di informazione</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <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="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Filtra i risultati</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Seleziona tutto</translation>
     </message>
@@ -750,280 +774,326 @@ Parametri: -l(line) (file)
         <translation type="unfinished">Nascondi</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>&amp;Deseleziona tutto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Riduci &amp;tutto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Espandi tutto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Oggetti standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Barra degli strumenti</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorie</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Categorie di errore</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Apri XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <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="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <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="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Visualizza il rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Visualizza il rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <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="570"/>
+        <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="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistiche</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Contenuti</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Categorie</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="493"/>
+        <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="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>Rapido filtro:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1032,59 +1102,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="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1441"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Licenza</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Autori</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Salva il file di rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>File XML (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -1093,128 +1200,126 @@ 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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>Apri il file di rapporto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>File di testo (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>Files CSV (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Files di progetto (*.cppcheck);;Tutti i files(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>Seleziona il file di progetto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>Progetto:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1222,76 +1327,81 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <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="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
-        <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>Seleziona il nome del file di progetto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>Nessun file di progetto caricato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1308,17 +1418,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="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1348,7 +1513,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1381,7 +1546,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1449,37 +1614,53 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1491,6 +1672,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1518,15 +1700,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
@@ -1552,7 +1734,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1572,58 +1754,93 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished">Abilita le soppressioni</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="946"/>
+        <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="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1648,37 +1865,37 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="494"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1693,58 +1910,58 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1757,77 +1974,82 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Seleziona la cartella da includere</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>Seleziona una cartella da scansionare</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>Seleziona la cartella da ignorare</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1835,191 +2057,256 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Lingua specificata sconosciuta!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">File</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Linea</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Severità</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">Riassunto</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2027,109 +2314,112 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>File</translation>
+        <translation type="vanished">File</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>Severità</translation>
+        <translation type="vanished">Severità</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>Linea</translation>
+        <translation type="vanished">Linea</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>Riassunto</translation>
+        <translation type="vanished">Riassunto</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>File indefinito</translation>
+        <translation type="vanished">File indefinito</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>Nascondi</translation>
+        <translation type="vanished">Nascondi</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2138,7 +2428,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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2147,12 +2437,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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>Non è stato possibile trovare il file!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2161,52 +2451,41 @@ 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="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>Seleziona Cartella</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>stile</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>errore</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>avviso</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>performance</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>portabilità</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>Informazione</translation>
     </message>
@@ -2214,82 +2493,102 @@ Per favore verifica che il percorso dell&apos;applicazione e i parametri siano c
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 su %2 file scansionati)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>Nessun errore trovato.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>Apertura del report fallito.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Salvataggio del report fallito.</translation>
     </message>
@@ -2299,12 +2598,17 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
         <translation>Risultati</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2350,7 +2654,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>
@@ -2360,175 +2664,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>
@@ -2536,47 +2844,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>
@@ -2586,14 +2893,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>Statistiche</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>Progetto</translation>
     </message>
@@ -2624,7 +2931,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>Precedente Scansione</translation>
     </message>
@@ -2644,193 +2951,203 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
         <translation>Durata della scansione:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>Errori:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>Avvisi:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Avvisi sullo stile:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>Avvisi sulla portabilità:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>Casi sulla performance:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>Messaggi di informazione:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>Copia negli Appunti</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 giorno</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 giorni</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 ora</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 ore</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 minuto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 minuti</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 secondo</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 secondi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0,%1 secondi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>Impostazioni progetto</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>Percorsi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>Percorsi di inclusione</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>Definizioni</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>Selezionato percorso</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>Numero di file scansionati</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>Durata della scansione</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>Errori</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>Avvisi</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>Stilwarnungen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>Avvisi sulla portabilità</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>Avvisi sulle performance</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>Messaggi di informazione</translation>
     </message>
@@ -2838,7 +3155,7 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza.</transl
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 su %2 file scansionati</translation>
     </message>
@@ -2846,7 +3163,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="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2859,7 +3176,7 @@ 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="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -2867,7 +3184,7 @@ L&apos;interfaccia utente è stata risettata in Inglese. Apri la finestra di dia
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>inconcludente</translation>
     </message>
@@ -2875,12 +3192,12 @@ L&apos;interfaccia utente è stata risettata in Inglese. Apri la finestra di dia
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts
index 9d88ed3d802..461f1ef3f07 100644
--- a/gui/cppcheck_ja.ts
+++ b/gui/cppcheck_ja.ts
@@ -37,8 +37,9 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ライブラリの開発者に感謝を捧げます:&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;</translation>
+        <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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ライブラリの開発者に感謝を捧げます:&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>
@@ -120,42 +121,67 @@ Parameters: -l(line) (file)</translation>
     <message>
         <location filename="compliancereportdialog.ui" line="14"/>
         <source>Compliance Report</source>
-        <translation type="unfinished"></translation>
+        <translation>コンプライアンスレポート</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクト名</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトバージョン</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="42"/>
+        <source>Coding Standard</source>
+        <translation>コーディング標準</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="50"/>
+        <source>Misra C</source>
+        <translation>MISRA C</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="55"/>
+        <source>Cert C</source>
+        <translation>CERT C</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <location filename="compliancereportdialog.ui" line="60"/>
+        <source>Cert C++</source>
+        <translation>Cert C++</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="70"/>
         <source>List of files with md5 checksums</source>
-        <translation type="unfinished"></translation>
+        <translation>md5チェックサムつきファイルリスト</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation>コンプライアンスレポート</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
-        <translation type="unfinished"></translation>
+        <translation>HTMLファイル(*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <location filename="compliancereportdialog.cpp" line="176"/>
+        <location filename="compliancereportdialog.cpp" line="239"/>
         <source>Save compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation>コンプライアンスレポートの保存</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>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="138"/>
         <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">&apos;%1&apos;のインポートに失敗しました、コンプライアンスレポートでファイルを表示できません</translation>
     </message>
 </context>
 <context>
@@ -195,12 +221,12 @@ Parameters: -l(line) (file)</translation>
         <translation>インデックス</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>ヘルプファイル &apos;%1&apos; が見つかりません</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -476,20 +502,20 @@ Parameters: -l(line) (file)</translation>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -509,520 +535,568 @@ Parameters: -l(line) (file)</translation>
         <translation>ツールバー(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++標準</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>編集(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>言語規格</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>カテゴリ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>ライセンス(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;u)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>Cppcheckについて(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>ファイル選択(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>ディレクトリ選択(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>停止(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>結果をファイルに保存(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>終了(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>結果をクリア(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>設定(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>エラーを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>情報メッセージを表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>移植可能性の問題を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Cppcheck結果を表示する</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Clangの結果を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>フィルター(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>フィルタ結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>印刷(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>現在のレポートを印刷</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>印刷プレビュー(&amp;v)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>ライブラリエディタを開く</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>プロジェクトを閉じる(&amp;l)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>プロジェクトの編集(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>統計情報(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>警告を表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>非表示を表示(&amp;h)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>すべてのエラーを表示(&amp;C)</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="84"/>
         <source>Checking for updates</source>
-        <translation type="unfinished"></translation>
+        <translation>更新の確認</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="100"/>
         <source>Hide</source>
-        <translation type="unfinished">非表示</translation>
+        <translation>非表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation>レポート</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>チェック(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>フィルター</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>全ファイル再解析(&amp;y)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>スタイル警告(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>エラー(&amp;r)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>すべてのエラーを非表示(&amp;U)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>ツリーを折り畳む(&amp;a)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>ツリーを展開(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>言語規格(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>標準項目</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>コンテンツ(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>ヘルプファイルを開く</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>ツールバー</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>カテゴリ(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>エラーカテゴリ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>XMLを開く(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>プロジェクトを開く(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>スクラッチパッドを表示(&amp;o)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>新規プロジェクト(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>ログを表示(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>ログ表示</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>パフォーマンス警告(&amp;f)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>情報(&amp;I)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>移植可能性(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>プラットフォーム(&amp;l)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++11(&amp;1)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C99(&amp;9)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>Posix(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C11(&amp;1)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>C89(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>C++03(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>ライブラリエディタ(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>自動言語検出(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>C++ 強制(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>C 強制(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>ライブラリを再チェックする</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>チェックの設定(define、インクルード)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
-        <translation type="unfinished"></translation>
+        <translation>コンプライアンスレポート...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation>ノーマル</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation>MISRA C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation>MISRA C++ 2008</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation>CERT C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation>Cert C++</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation>MISRA C++ 2023</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation>AUTOSAR</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation>EULA...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -1031,23 +1105,23 @@ This is probably because the settings were changed between the Cppcheck versions
 Cppcheckの古いバージョンの設定には互換性がありません。エディタアプリケーションの設定を確認して修正してください、そうしないと正しく起動できないかもしれません。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>新しいファイル／ディレクトリをチェックするには現在のプロジェクトを閉じてください!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>クイックフィルタ：</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation>コンフィグレーションの選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1056,202 +1130,220 @@ Do you want to load this project file instead?</source>
 現在のプロジェクトの代わりにこのプロジェクトファイルを読み込んでもかまいませんか？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>このライブラリ &apos;%1&apos; には次の不明な要素が含まれています。
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>ファイルがありません</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation>不正なXML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation>属性がありません</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation>不正な属性があります</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>サポートされていないフォーマット</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation>プラットフォームの種類が重複しています</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation>プラットフォームの種類が再定義されました</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation>不明な要素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation>不明な課題</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <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="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
         <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.</source>
-        <translation>%1のロードに失敗しました。あなたの Cppcheck は正しくインストールされていません。あなたは --data-dir=&lt;directory&gt; コマンドラインオプションでロードするファイルの場所を指定できます。ただし、この --data-dir はインストールスクリプトによってサポートされており、GUI版ではサポートされていません。全ての設定は調整済みでなければなりません。</translation>
+        <translation type="vanished">%1のロードに失敗しました。あなたの Cppcheck は正しくインストールされていません。あなたは --data-dir=&lt;directory&gt; コマンドラインオプションでロードするファイルの場所を指定できます。ただし、この --data-dir はインストールスクリプトによってサポートされており、GUI版ではサポートされていません。全ての設定は調整済みでなければなりません。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <source>Failed to load %1 - %2</source>
+        <translation type="vanished">%1 - %2 の読み込みに失敗</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML ファイル (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>レポートを開く</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1441"/>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>ライセンス</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>レポートを保存</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>テキストファイル (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV形式ファイル (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>プロジェクトファイル (*.cppcheck);;すべてのファイル(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>プロジェクトファイルを選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルを開くのに失敗しました</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトファイルの形式が不明です</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
-        <translation type="unfinished"></translation>
+        <translation>プロジェクトファイルのインポートに失敗しました</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
-        <translation type="unfinished"></translation>
+        <translation>インポートに失敗&apos;%1&apos;: %2
+
+解析を停止しました。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2049"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <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="2310"/>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation>インストール</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいバージョンが利用可能です。: %1. %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>プロジェクト:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation>チェック対象のファイルがみつかりません!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation>C/C++のソースコード</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation>コンパイルデータベース</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation>チェック対象のファイルを選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation>チェックするディレクトリを選択してください</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>チェックの設定を選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1260,7 +1352,46 @@ Do you want to proceed analysis without using any of these project files?</sourc
 みつかったプロジェクトファイルを使用せずにチェックしますか?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1261"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation>重複した定義</translation>
+    </message>
+    <message>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation>アドオンの読み込みまたは設定に失敗 %1 - %2</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation>読み込みに失敗 %1 - %2</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation>%1
+
+解析は中止した。</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1270,7 +1401,7 @@ Do you want to proceed?</source>
 新しくXMLファイルを開くと現在の結果が削除されます。実行しますか？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1279,47 +1410,101 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 チェックを中断して、Cppcheckを終了しますか?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation>CppCheckについて</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <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="1688"/>
+        <location filename="mainwindow.cpp" line="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>ビルドディレクトリ&apos;%1&apos;がありません。作成しますか?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>アドオンを使用してプロジェクトをチェックするためには、ビルドディレクトリが必要です。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation>必須を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation>要求を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation>推奨を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation>ドキュメントを表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation>L1を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation>L2を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation>L3を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation>スタイルを表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation>移植可能性を表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation>パフォーマンスを表示</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation>情報を表示</translation>
+    </message>
+    <message>
         <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation>&apos;%1&apos;のインポートに失敗しました。(チェック中断)</translation>
+        <translation type="vanished">&apos;%1&apos;のインポートに失敗しました。(チェック中断)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation>プロジェクトファイル (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>プロジェクトファイル名を選択</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>プロジェクトファイルが読み込まれていません</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1331,7 +1516,7 @@ Do you want to remove the file from the recently used projects -list?</source>
 最近使用したプロジェクトのリストからこのファイルを取り除きますか？</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1372,7 +1557,7 @@ Options:
     --data-dir=&lt;directory&gt;  GUI のデータファイル(翻訳やcfg)のあるディレクトリを指定する。このオプションを指定した場合、GUIで起動しません。</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - コマンドラインパラメータ</translation>
     </message>
@@ -1405,7 +1590,7 @@ Options:
         <translation>シンボル名</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>抑制の編集</translation>
     </message>
@@ -1477,17 +1662,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation>MISRA ルールテキスト</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1499,6 +1684,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation>参照...</translation>
     </message>
@@ -1526,15 +1712,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>取り除く</translation>
     </message>
@@ -1560,7 +1746,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation>チェック</translation>
     </message>
@@ -1580,63 +1766,124 @@ Options:
         <translation>Cppcheckビルトイン</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="489"/>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation>チェックレベル</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="464"/>
+        <source>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</source>
+        <translation>#R 限定的 -- 開発者が直接的に結果を得るための解析を意味します。解析は限定的で高速ですがより少ない結果になります。</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="471"/>
+        <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"/>
+        <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"/>
         <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="619"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation>プレミアムライセンス</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation>除外するソースファイル</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation>フォルダで除外...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation>ファイルで除外...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation>クラスが安全で公開されたインターフェースをもっているか確認</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation>解析の制限</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation>CTUの最大深さ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation>inline抑制を有効にする</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation>MISRA C</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation>2012</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation>2023</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
+        <translation>2025</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
+        <translation>MISRA C++</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation>2008</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
-        <translation type="unfinished"></translation>
+        <translation>Cert C++</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
-        <translation type="unfinished"></translation>
+        <translation>バグハンティング(プレミアム)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation>外部ツール</translation>
     </message>
@@ -1661,32 +1908,32 @@ Options:
         <translation>Clang (実験的)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="494"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation>テンプレートインスタンス化の最大再帰回数</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation>警告オプション</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation>ルートパス:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>警告中のファイルパスはこのパスからの相対パスになります</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告タグ(セミコロン区切り)</translation>
     </message>
@@ -1701,78 +1948,76 @@ Options:
         <translation>ライブラリ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation>指摘の抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation>アドオン</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation>スレッドセーフ</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation>コーディング標準</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
         <source>Misra C 2012</source>
-        <translation>MISRA C 2012</translation>
+        <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
+        <location filename="projectfile.ui" line="937"/>
         <source>Cert C</source>
         <translation>CERT C</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
+        <location filename="projectfile.ui" line="946"/>
         <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
         <translation>CERT-INT35-C:  int型の精度 (もしサイズが精度と一致する場合空のままにしてください)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
         <source>Misra C++ 2008</source>
-        <translation>MISRA C++ 2008</translation>
+        <translation type="vanished">MISRA C++ 2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation>AUTOSAR</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation>バグハント</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation>Clang Analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation>Clang-tidy</translation>
     </message>
@@ -1785,269 +2030,347 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation>Cppcheckビルドディレクトリ</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>includeディレクトリを選択</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>チェックするディレクトリを選択してください</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation>注意: オープンソースのCppcheckはMisra C 2012を完全にサポートしていません。</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (みつかりません)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation>コンパイルデータベース</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation>プロジェクトのインポート</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>除外するディレクトリを選択してください</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation>ソースファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation>全ファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation>除外ファイル</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation>MISRAルールテキストファイルを選択</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRAルールテキストファイル (%1)</translation>
     </message>
+    <message>
+        <source>Select license file</source>
+        <translation type="vanished">ライセンスファイルの選択</translation>
+    </message>
+    <message>
+        <source>License file (%1)</source>
+        <translation type="vanished">ライセンスファイル (%1)</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>未知の言語が指定されました!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>言語ファイル %1 が見つかりません!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="121"/>
+        <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="43"/>
+        <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="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation> (見つかりません)</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation>シン(細)</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation>エクストラライト</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation>ライト</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation>ノーマル</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation>メディウム</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation>デミボールト</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation>ボールド</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation>エクストラボールド</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation>黒</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation>エディタの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation>エディタの背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation>ハイライトの背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation>行番号の前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation>行番号の背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation>キーワードの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation>キーワードのフォントのウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>クラスの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation>クラスフォントのウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation>クォートの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation>クォートのフォントウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation>コメントの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation>コメントフォントのウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation>シンボルの前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation>シンボルの背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation>シンボルのフォントウェイト</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation>デフォルトをライトに設定</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation>デフォルトをダークに設定</translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation>ファイル</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation>行</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation>警告の種別</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation>分類</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation>レベル</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation>結論のでない</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation>要約</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation>ガイドライン</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation>ルール</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation>日付</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation>タグ</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <source>CWE</source>
+        <translation>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>
@@ -2055,109 +2378,116 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>ファイル</translation>
+        <translation type="vanished">ファイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>警告の種別</translation>
+        <translation type="vanished">警告の種別</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>行</translation>
+        <translation type="vanished">行</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>要約</translation>
+        <translation type="vanished">要約</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>未定義ファイル</translation>
+        <translation type="vanished">未定義ファイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation>コピー</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation>ファイルが見つかりません:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>フォルダ &apos;%1&apos; を選択してください</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>ディレクトリ &apos;%1&apos; 選択</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation>ファイルのあるディレクトリを選択してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>デバッグ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
         <source>Recheck</source>
-        <translation>再チェック</translation>
+        <translation type="vanished">再チェック</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>非表示</translation>
+        <translation type="vanished">非表示</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation>IDで非表示を指定</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation>選択したidを抑制</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation>含まれるフォルダを開く</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation>内部</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+	<translation>再チェック %1 件のファイル</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation>非表示 %1 件の結果</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation>タグ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation>タグなし</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2167,7 +2497,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Cppcheckの「設定」からテキストファイルを編集するアプリケーションを設定してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2176,12 +2506,12 @@ Please select the default editor application in preferences/Applications.</sourc
 設定からデフォルトのエディタアプリケーションを設定してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>ファイルが見つかりません!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2190,52 +2520,49 @@ Please check the application path and parameters are correct.</source>
 実行ファイルパスや引数の設定を確認してください。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>ディレクトリを選択</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Inconclusive</source>
-        <translation>結論のでない</translation>
+        <translation type="vanished">結論のでない</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Since date</source>
-        <translation>日付</translation>
+        <translation type="vanished">日付</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>スタイル</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>パフォーマンス</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>移植可能性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>情報</translation>
     </message>
@@ -2248,94 +2575,123 @@ Please check the application path and parameters are correct.</source>
         <translation>結果</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation>致命的なエラー</translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation>チェックログ</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation>警告の詳細</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>レポートの保存に失敗しました。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>レポートの印刷</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation>指摘がないため、印刷するものがありません。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 / %2 :ファイル数)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>警告/エラーは見つかりませんでした。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>レポートの読み込みに失敗.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML フォーマットバージョン 1 はもうサポートされていません。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation>は次のものが最初にインクルードしました</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
         <source>Bug hunting analysis is incomplete</source>
-        <translation>バグハントの解析は不完全です</translation>
+        <translation type="vanished">バグハントの解析は不完全です</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation>ログの消去</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation>このログ項目をコピー</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation>ログ全体をコピー</translation>
     </message>
+    <message>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation>解析は停止しした</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <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="565"/>
+        <source>when checking %1</source>
+        <translation>%1 をチェックするとき</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation>ファイルをチェックするとき</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation>解析は中止した。</translation>
+    </message>
 </context>
 <context>
     <name>ScratchPad</name>
@@ -2378,7 +2734,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>
@@ -2388,176 +2744,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 type="unfinished"></translation>
+        <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>
@@ -2565,47 +2925,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>
@@ -2615,14 +2974,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>統計情報</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>プロジェクト</translation>
     </message>
@@ -2653,7 +3012,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>前回の解析</translation>
     </message>
@@ -2673,193 +3032,203 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>解析にかかった時間:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>エラー:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>スタイル警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>移植可能性の警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>パフォーマンス警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>情報メッセージ:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation>有効なチェッカー:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation>チェッカー</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation>ヒストリー</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation>ファイル:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>クリップボードにコピー</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation>PDF エクスポート</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>一日</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1日</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>一時間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1時間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>一分</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1分</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>一秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.%1秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> と </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation>PDF エクスポート</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>プロジェクトの設定</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>インクルードパス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>定義(define)</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation>定義取り消し(Undef)</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>選択されたパス</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>スキャンしたファイルの数</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>スキャン期間</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>ファイル: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>cppcheckビルドディレクトリがありません</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>スタイル警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>移植可能性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>パフォーマンス警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>情報メッセージ</translation>
     </message>
@@ -2867,7 +3236,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>チェック: %1 / %2 (ファイル数)</translation>
     </message>
@@ -2875,7 +3244,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2886,7 +3255,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 そのため言語を 英語にリセットします。設定ダイアログから利用可能な言語を選択してください。</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2894,7 +3263,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>結論の出ない</translation>
     </message>
@@ -2902,12 +3271,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation>全サポートファイル (%1)</translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation>全ファイル(%1)</translation>
     </message>
diff --git a/gui/cppcheck_ka.ts b/gui/cppcheck_ka.ts
new file mode 100644
index 00000000000..306308fced3
--- /dev/null
+++ b/gui/cppcheck_ka.ts
@@ -0,0 +1,3241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ka_GE">
+<context>
+    <name>About</name>
+    <message>
+        <location filename="about.ui" line="14"/>
+        <source>About Cppcheck</source>
+        <translation>Cppcheck-ის შესახებ</translation>
+    </message>
+    <message>
+        <location filename="about.ui" line="64"/>
+        <source>Version %1</source>
+        <translation>ვერსია %1</translation>
+    </message>
+    <message>
+        <location filename="about.ui" line="71"/>
+        <source>Cppcheck - A tool for static C/C++ code analysis.</source>
+        <translation>Cppcheck - ხელსაწყო სტატიკური C/C++ კოდის ანალიზისთვის.</translation>
+    </message>
+    <message>
+        <location filename="about.ui" line="81"/>
+        <source>Copyright © 2007-%1 Cppcheck team.</source>
+        <oldsource>Copyright © 2007-2021 Cppcheck team.</oldsource>
+        <translation>Copyright © 2007-%1 Cppcheck-ის გუნდი. ყველა უფლება დაცულია.</translation>
+    </message>
+    <message>
+        <location filename="about.ui" line="91"/>
+        <source>This program is licensed under the terms
+of the GNU General Public License version 3</source>
+        <translation>ვრცელდება GNU-ის საჯარო ლიცენზიის,
+ვერსია 3, პირობებით</translation>
+    </message>
+    <message>
+        <location filename="about.ui" line="102"/>
+        <source>Visit Cppcheck homepage at %1</source>
+        <translation>ეწვიეთ Cppcheck-ის ვებგვერდს მისამართზე %1</translation>
+    </message>
+    <message>
+        <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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;დიდი მადლობა ამ ბიბლიოთეკებს, რომლებსაც ვიყენებთ::&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>
+    <name>ApplicationDialog</name>
+    <message>
+        <location filename="applicationdialog.ui" line="23"/>
+        <source>Add an application</source>
+        <translation>აპლიკაციის დამატება</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.ui" line="41"/>
+        <source>Here you can add an application that can open error files. Specify a name for the application, the application executable and command line parameters for the application.
+
+The following texts in parameters are replaced with appropriate values when application is executed:
+(file) - Filename containing the error
+(line) - Line number containing the error
+(message) - Error message
+(severity) - Error severity
+
+Example opening a file with Kate and make Kate scroll to the correct line:
+Executable: kate
+Parameters: -l(line) (file)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.ui" line="76"/>
+        <source>&amp;Name:</source>
+        <translation>&amp;სახელი:</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.ui" line="86"/>
+        <source>&amp;Executable:</source>
+        <translation>&amp;გამშვები ფაილი:</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.ui" line="96"/>
+        <source>&amp;Parameters:</source>
+        <translation>&amp;პარამეტრები:</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.ui" line="138"/>
+        <source>Browse</source>
+        <translation>დათვალიერება</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.cpp" line="65"/>
+        <source>Executable files (*.exe);;All files(*.*)</source>
+        <translation>შესრულებადი ფაილები (*.exe);;ყველა ფაილი(*.*)</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.cpp" line="68"/>
+        <source>Select viewer application</source>
+        <translation>აირჩიეთ აპლიკაცია</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.cpp" line="83"/>
+        <source>Cppcheck</source>
+        <translation>Cppcheck</translation>
+    </message>
+    <message>
+        <location filename="applicationdialog.cpp" line="84"/>
+        <source>You must specify a name, a path and optionally parameters for the application!</source>
+        <translation>აპლიკაციისთვის უნდა მიუთითოთ სახელი, ბილიკი და არასავალდებულო პარამეტრები!</translation>
+    </message>
+</context>
+<context>
+    <name>ComplianceReportDialog</name>
+    <message>
+        <location filename="compliancereportdialog.ui" line="14"/>
+        <source>Compliance Report</source>
+        <translation>შესაბამისობის ანგარიში</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="29"/>
+        <source>Project name</source>
+        <translation>პროექტის სახელი</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>კოდირების სტანდარტი</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="50"/>
+        <source>Misra C</source>
+        <translation>Misra C</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="55"/>
+        <source>Cert C</source>
+        <translation>Cert C</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="60"/>
+        <source>Cert C++</source>
+        <translation>Cert C++</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.ui" line="70"/>
+        <source>List of files with md5 checksums</source>
+        <translation>MD5 საკონტროლო ჯამების მქონე ფაილების სია</translation>
+    </message>
+    <message>
+        <location filename="compliancereportdialog.cpp" line="133"/>
+        <source>Compliance report</source>
+        <translation>შესაბამისობის ანგარიში</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>შესაბამისობის ანგარიშის შენახვა</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>
+    </message>
+</context>
+<context>
+    <name>FileViewDialog</name>
+    <message>
+        <location filename="fileviewdialog.cpp" line="53"/>
+        <source>Could not find the file: %1</source>
+        <oldsource>Could not find the file:
+</oldsource>
+        <translation>ვერ ვიპოვე ფაილი: %1</translation>
+    </message>
+    <message>
+        <location filename="fileviewdialog.cpp" line="57"/>
+        <location filename="fileviewdialog.cpp" line="71"/>
+        <source>Cppcheck</source>
+        <translation>Cppcheck</translation>
+    </message>
+    <message>
+        <location filename="fileviewdialog.cpp" line="67"/>
+        <source>Could not read the file: %1</source>
+        <translation>ვერ წავიკითხე ფაილი: %1</translation>
+    </message>
+</context>
+<context>
+    <name>HelpDialog</name>
+    <message>
+        <location filename="helpdialog.ui" line="14"/>
+        <source>Cppcheck GUI help</source>
+        <translation>Cppcheck-ის გრაფიკული ინტერფეისის დახმარება</translation>
+    </message>
+    <message>
+        <location filename="helpdialog.ui" line="34"/>
+        <source>Contents</source>
+        <translation>შემცველობა</translation>
+    </message>
+    <message>
+        <location filename="helpdialog.ui" line="44"/>
+        <source>Index</source>
+        <translation>ინდექსი</translation>
+    </message>
+    <message>
+        <location filename="helpdialog.cpp" line="84"/>
+        <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>
+    </message>
+</context>
+<context>
+    <name>LibraryAddFunctionDialog</name>
+    <message>
+        <location filename="libraryaddfunctiondialog.ui" line="23"/>
+        <source>Add function</source>
+        <translation>ფუნქციის დამატება</translation>
+    </message>
+    <message>
+        <location filename="libraryaddfunctiondialog.ui" line="34"/>
+        <source>Function name(s)</source>
+        <translation>ფუნქციის სახელ(ებ)-ი</translation>
+    </message>
+    <message>
+        <location filename="libraryaddfunctiondialog.ui" line="44"/>
+        <source>Number of arguments</source>
+        <translation>არგუმენტების რაოდენობა</translation>
+    </message>
+</context>
+<context>
+    <name>LibraryDialog</name>
+    <message>
+        <location filename="librarydialog.ui" line="14"/>
+        <source>Library Editor</source>
+        <translation>ბიბლიოთეკის რედაქტორი</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="22"/>
+        <source>Open</source>
+        <translation>გახსნა</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="29"/>
+        <source>Save</source>
+        <translation>შენახვა</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="36"/>
+        <source>Save as</source>
+        <translation>შენახვა, როგორც</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="62"/>
+        <source>Functions</source>
+        <translation>ფუნქციები</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="71"/>
+        <source>Sort</source>
+        <translation>დალაგება</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="111"/>
+        <source>Add</source>
+        <translation>დამატება</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="131"/>
+        <source>Filter:</source>
+        <translation>ფილტრი:</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="164"/>
+        <source>Comments</source>
+        <translation>კომენტარები</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="204"/>
+        <source>noreturn</source>
+        <translation>noreturn</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="212"/>
+        <source>False</source>
+        <translation>მცდარი</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="217"/>
+        <source>True</source>
+        <translation>სიმართლე</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="222"/>
+        <source>Unknown</source>
+        <translation>უცნობი</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="232"/>
+        <source>return value must be used</source>
+        <translation>უნდა გამოიყენოთ დაბრუნებული მნიშვნელობა</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="239"/>
+        <source>ignore function in leaks checking</source>
+        <translation>ფუნქციების გამოტოვება გაჟონვები შემოწმებისას</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="246"/>
+        <source>Arguments</source>
+        <translation>არგუმენტები</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.ui" line="258"/>
+        <source>Edit</source>
+        <translation>ჩასწორება</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.cpp" line="98"/>
+        <location filename="librarydialog.cpp" line="170"/>
+        <source>Library files (*.cfg)</source>
+        <translation>ბიბლიოთეკის ფაილები (*.cfg)</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.cpp" line="100"/>
+        <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>
+    </message>
+    <message>
+        <location filename="librarydialog.cpp" line="112"/>
+        <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"/>
+        <source>Failed to load %1. %2.</source>
+        <translation>%1-ის ჩატვირთვის შეცდომა. %2.</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.cpp" line="161"/>
+        <source>Cannot save file %1.</source>
+        <translation>ფაილის შენახვის შეცდომა: %1 .</translation>
+    </message>
+    <message>
+        <location filename="librarydialog.cpp" line="173"/>
+        <source>Save the library as</source>
+        <translation>ბიბლიოთეკის შენახვა, როგორც</translation>
+    </message>
+</context>
+<context>
+    <name>LibraryEditArgDialog</name>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="14"/>
+        <source>Edit argument</source>
+        <translation>არგუმენტის ჩასწორება</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="20"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+&lt;p&gt;Is bool value allowed? For instance result from comparison or from &apos;!&apos; operator.&lt;/p&gt;
+&lt;p&gt;Typically, set this if the argument is a pointer, size, etc.&lt;/p&gt;
+&lt;p&gt;Example:&lt;/p&gt;
+&lt;pre&gt;    memcmp(x, y, i == 123);   // last argument should not have a bool value&lt;/pre&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="28"/>
+        <source>Not bool</source>
+        <translation>ლოგიკური მნ. არაა</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="35"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+&lt;p&gt;Is a null parameter value allowed?&lt;/p&gt;
+&lt;p&gt;Typically this should be used on any pointer parameter that does not allow null.&lt;/p&gt;
+&lt;p&gt;Example:&lt;/p&gt;
+&lt;pre&gt;    strcpy(x,y); // neither x or y is allowed to be null.&lt;/pre&gt;
+&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="43"/>
+        <source>Not null</source>
+        <translation>ნულოვანი არაა</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="50"/>
+        <source>Not uninit</source>
+        <translation>Uninit არაა</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="57"/>
+        <source>String</source>
+        <translation>სტრიქონი</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="70"/>
+        <source>Format string</source>
+        <translation>სტრიქონის ფორმატი</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="92"/>
+        <source>Min size of buffer</source>
+        <translation>ბუფერის მინ. ზომა</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="101"/>
+        <location filename="libraryeditargdialog.ui" line="203"/>
+        <source>Type</source>
+        <translation>ტიპი</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="109"/>
+        <location filename="libraryeditargdialog.ui" line="214"/>
+        <source>None</source>
+        <translation>არაფერი</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="114"/>
+        <location filename="libraryeditargdialog.ui" line="219"/>
+        <source>argvalue</source>
+        <translation>argvalue</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="119"/>
+        <location filename="libraryeditargdialog.ui" line="224"/>
+        <source>mul</source>
+        <translation>mul</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="124"/>
+        <location filename="libraryeditargdialog.ui" line="229"/>
+        <source>strlen</source>
+        <translation>strlen</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="132"/>
+        <location filename="libraryeditargdialog.ui" line="237"/>
+        <source>Arg</source>
+        <translation>არგ</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="159"/>
+        <location filename="libraryeditargdialog.ui" line="264"/>
+        <source>Arg2</source>
+        <translation>Arg2</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="194"/>
+        <source>and</source>
+        <translation>და</translation>
+    </message>
+    <message>
+        <location filename="libraryeditargdialog.ui" line="310"/>
+        <source>Valid values</source>
+        <translation>სწორი მნიშვნელობები</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="mainwindow.ui" line="26"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
+        <source>Cppcheck</source>
+        <translation>Cppcheck</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="209"/>
+        <source>A&amp;nalyze</source>
+        <translation>ა&amp;ნალიზი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="266"/>
+        <source>Standard</source>
+        <translation>სტანდარტული</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="132"/>
+        <source>&amp;File</source>
+        <translation>&amp;ფაილი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="152"/>
+        <source>&amp;View</source>
+        <translation>&amp;ხედი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="156"/>
+        <source>&amp;Toolbars</source>
+        <translation>&amp;ხელსაწყოთა ზოლები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="213"/>
+        <source>C++ standard</source>
+        <translation>C++-ის სტანდარტი</translation>
+    </message>
+    <message>
+        <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="253"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;ჩასწორება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="314"/>
+        <source>&amp;License...</source>
+        <translation>&amp;ლიცენზია...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="319"/>
+        <source>A&amp;uthors...</source>
+        <translation>&amp;ავტორები...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="328"/>
+        <source>&amp;About...</source>
+        <translation>&amp;შესახებ...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="333"/>
+        <source>&amp;Files...</source>
+        <translation>ფაილ&amp;ები...</translation>
+    </message>
+    <message>
+        <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="342"/>
+        <source>Ctrl+F</source>
+        <translation>Ctrl+F</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="351"/>
+        <source>&amp;Directory...</source>
+        <translation>&amp;საქაღალდე....</translation>
+    </message>
+    <message>
+        <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="360"/>
+        <source>Ctrl+D</source>
+        <translation>Ctrl+D</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="372"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="390"/>
+        <source>&amp;Stop</source>
+        <translation>&amp;გაჩერება</translation>
+    </message>
+    <message>
+        <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="399"/>
+        <source>Esc</source>
+        <translation>Esc</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="408"/>
+        <source>&amp;Save results to file...</source>
+        <translation>შედეგები&amp;ს შენახვა ფაილში....</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="411"/>
+        <source>Ctrl+S</source>
+        <translation>Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="416"/>
+        <source>&amp;Quit</source>
+        <translation>გამოსვლა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="428"/>
+        <source>&amp;Clear results</source>
+        <translation>შედეგების &amp;გასუფთავება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="437"/>
+        <source>&amp;Preferences</source>
+        <translation>&amp;გამართვა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
+        <source>Show errors</source>
+        <translation>შეცდომების ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
+        <source>Show warnings</source>
+        <translation>გაფრთხილების ჩვენება</translation>
+    </message>
+    <message>
+        <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="645"/>
+        <source>Show &amp;hidden</source>
+        <translation>დამალულის &amp;ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
+        <source>Information</source>
+        <translation>ინფორმაცია</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="660"/>
+        <source>Show information messages</source>
+        <translation>ინფორმაციის შეტყობინებების ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="675"/>
+        <source>Show portability warnings</source>
+        <translation>გადატანადობის გაფრთხილებების ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="690"/>
+        <source>Show Cppcheck results</source>
+        <translation>Cppcheck-ის შედეგები ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="702"/>
+        <source>Clang</source>
+        <translation>Clang</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="705"/>
+        <source>Show Clang results</source>
+        <translation>Clang-ის შედეგები ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="713"/>
+        <source>&amp;Filter</source>
+        <translation>&amp;ფილტრი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="716"/>
+        <source>Filter results</source>
+        <translation>შედეგების გაფილტვრა</translation>
+    </message>
+    <message>
+        <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="740"/>
+        <source>Windows 32-bit Unicode</source>
+        <translation>Windows 32-bit Unicode</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="748"/>
+        <source>Unix 32-bit</source>
+        <translation>Unix 32-bit</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="756"/>
+        <source>Unix 64-bit</source>
+        <translation>Unix 64-bit</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="764"/>
+        <source>Windows 64-bit</source>
+        <translation>Windows 64-bit</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="858"/>
+        <source>&amp;Print...</source>
+        <translation>&amp;ბეჭდვა…</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="861"/>
+        <source>Print the Current Report</source>
+        <translation>მიმდინარე ანგარიშის დაბეჭდვა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="866"/>
+        <source>Print Pre&amp;view...</source>
+        <translation>საბეჭდის &amp;გადახედვა...</translation>
+    </message>
+    <message>
+        <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="877"/>
+        <source>Open library editor</source>
+        <translation>ბიბლიოთეკის რედაქტორის გახსნა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="478"/>
+        <source>&amp;Check all</source>
+        <translation>&amp;ყველას ჩართვა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="84"/>
+        <source>Checking for updates</source>
+        <translation>განახლებების შემოწმება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="100"/>
+        <source>Hide</source>
+        <translation>დამალვა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
+        <source>Filter</source>
+        <translation>ფილტრი</translation>
+    </message>
+    <message>
+        <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="381"/>
+        <source>Reanal&amp;yze all files</source>
+        <translation>&amp;ყველა ფაილის თავიდან ანალიზი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="419"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="449"/>
+        <source>Style war&amp;nings</source>
+        <translation>ს&amp;ტილის გაფრთხილებები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="467"/>
+        <source>E&amp;rrors</source>
+        <translation>&amp;შეცდომები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="483"/>
+        <source>&amp;Uncheck all</source>
+        <translation>ყველას ჩამოყ&amp;რა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="488"/>
+        <source>Collapse &amp;all</source>
+        <translation>ყველას ჩაკეცვ&amp;ა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="493"/>
+        <source>&amp;Expand all</source>
+        <translation>&amp;ყველას ამოკეცვა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="501"/>
+        <source>&amp;Standard</source>
+        <translation>&amp;სტანდარტული</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="504"/>
+        <source>Standard items</source>
+        <translation>სტანდარტული ელემენტები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="520"/>
+        <source>Toolbar</source>
+        <translation>ხელსაწყოთა ზოლი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="528"/>
+        <source>&amp;Categories</source>
+        <translation>&amp;კატეგორიები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="531"/>
+        <source>Error categories</source>
+        <translation>შეცდომის კატეგორიები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="536"/>
+        <source>&amp;Open XML...</source>
+        <translation>&amp;XML-ის გახსნა...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="545"/>
+        <source>Open P&amp;roject File...</source>
+        <translation>პ&amp;პროექტის ფაილის გახსნა...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="548"/>
+        <source>Ctrl+Shift+O</source>
+        <translation>Ctrl+Shift+O</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="557"/>
+        <source>Sh&amp;ow Scratchpad...</source>
+        <translation>ბლ&amp;ოკნოტის ჩვენება...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="562"/>
+        <source>&amp;New Project File...</source>
+        <translation>&amp;ახალი პროექტის ფაილი...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="565"/>
+        <source>Ctrl+Shift+N</source>
+        <translation>Ctrl+Shift+N</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="570"/>
+        <source>&amp;Log View</source>
+        <translation>ჟურნა&amp;ლის ხედი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="573"/>
+        <source>Log View</source>
+        <translation>ჟურნალის ხედი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="581"/>
+        <source>C&amp;lose Project File</source>
+        <translation>პროექტის ფაი&amp;ლის დახურვა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="589"/>
+        <source>&amp;Edit Project File...</source>
+        <translation>პროექტის ფაილის ჩასწორ&amp;ება...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="601"/>
+        <source>&amp;Statistics</source>
+        <translation>&amp;სტატისტიკა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="613"/>
+        <source>&amp;Warnings</source>
+        <translation>&amp;გაფრთხილებები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="631"/>
+        <source>Per&amp;formance warnings</source>
+        <translation>წარმატების გა&amp;ფრთხილებები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="657"/>
+        <source>&amp;Information</source>
+        <translation>&amp;ინფორმაცია</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="672"/>
+        <source>&amp;Portability</source>
+        <translation>&amp;გადატანადობა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="772"/>
+        <source>P&amp;latforms</source>
+        <translation>პ&amp;ლატფორმები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="786"/>
+        <source>C++&amp;11</source>
+        <translation>C++&amp;11</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="797"/>
+        <source>C&amp;99</source>
+        <translation>C&amp;99</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="805"/>
+        <source>&amp;Posix</source>
+        <translation>&amp;Posix</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="813"/>
+        <source>C&amp;11</source>
+        <translation>C&amp;11</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="845"/>
+        <source>&amp;C89</source>
+        <translation>&amp;C89</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="853"/>
+        <source>&amp;C++03</source>
+        <translation>&amp;C++03</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="874"/>
+        <source>&amp;Library Editor...</source>
+        <translation>ბიბ&amp;ლიოთეკის რედაქტორი...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="885"/>
+        <source>&amp;Auto-detect language</source>
+        <translation>ენის &amp;ავტოდადგენა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="893"/>
+        <source>&amp;Enforce C++</source>
+        <translation>ძ&amp;ალით C++</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="901"/>
+        <source>E&amp;nforce C</source>
+        <translation>ძა&amp;ლით C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="912"/>
+        <source>C++14</source>
+        <translation>C++14</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="920"/>
+        <source>Reanalyze and check library</source>
+        <translation>ბიბლიოთეკის თავიდან ანალიზი და შემოწმება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="928"/>
+        <source>Check configuration (defines, includes)</source>
+        <translation>კონფიგურაციის შემოწმება (defines, includes)</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="936"/>
+        <source>C++17</source>
+        <translation>C++17</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="947"/>
+        <source>C++20</source>
+        <translation>C++20</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="974"/>
+        <source>Compliance report...</source>
+        <translation>შესაბამისობის ანგარიში...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished">ნორმალური</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished">Misra C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished">Cert C</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished">Cert C++</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</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="284"/>
+        <source>Categories</source>
+        <translation>კატეგორიები</translation>
+    </message>
+    <message>
+        <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="512"/>
+        <source>Open the help contents</source>
+        <translation>დახმარების შემცველობის გახსნა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="515"/>
+        <source>F1</source>
+        <translation>F1</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="198"/>
+        <source>&amp;Help</source>
+        <translation>&amp;დახმარება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
+        <source>Quick Filter:</source>
+        <translation>სწრაფი ფილტრი:</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="828"/>
+        <source>Select configuration</source>
+        <translation>აირჩიეთ კონფიგურაცია</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="858"/>
+        <source>Found project file: %1
+
+Do you want to load this project file instead?</source>
+        <translation>ვიპოვე პროექტის ფაილი: %1
+
+გნებავთ, სამაგიეროდ, ეს პროექტის ფაილი ჩატვირთოთ?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="992"/>
+        <source>File not found</source>
+        <translation>ფაილი ნაპოვნი არაა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="995"/>
+        <source>Bad XML</source>
+        <translation>არასწორი XML</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="998"/>
+        <source>Missing attribute</source>
+        <translation>აკლია ატრიბუტი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1001"/>
+        <source>Bad attribute value</source>
+        <translation>არასწორი ატრიბუტის მნიშვნელობა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1004"/>
+        <source>Unsupported format</source>
+        <translation>მხარდაუჭერელი ფორმატი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation>გამეორებული აღწერა</translation>
+    </message>
+    <message>
+        <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="1035"/>
+        <source>File not found: &apos;%1&apos;</source>
+        <translation>ფაილი ვერ ვიპოვე: &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <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="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation>%1-ის ჩატვირთვა ჩავარდა - %2
+
+ანალიზი შეწყდა.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation>%1
+
+ანალიზი შეწყვეტილია.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
+        <source>License</source>
+        <translation>ლიცენზია</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1654"/>
+        <source>Authors</source>
+        <translation>ავტორები</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1674"/>
+        <source>Save the report file</source>
+        <translation>ანგარიშის ფაილში ჩაწერა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
+        <source>XML files (*.xml)</source>
+        <translation>XML ფაილები (*.xml)</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="458"/>
+        <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="753"/>
+        <source>You must close the project file before selecting new files or directories!</source>
+        <translation>ახალი ფაილების ან საქაღალდეების არჩევამდე პრორექტის ფაილი უნდა დახუროთ!</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="983"/>
+        <source>The library &apos;%1&apos; contains unknown elements:
+%2</source>
+        <translation>ბიბლიოთეკა &apos;%1&apos; უცნობ ელემენტებს შეიცავს:
+%2</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1007"/>
+        <source>Duplicate platform type</source>
+        <translation>გამეორებული პლატფორმის ტიპი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1010"/>
+        <source>Platform type redefined</source>
+        <translation>პლატფორმის ტიპი თავდან აღიწერა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1016"/>
+        <source>Unknown element</source>
+        <translation>უცნობი ელემენტი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1019"/>
+        <source>Unknown issue</source>
+        <translation>უცნობი პრობლემა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>Error</source>
+        <translation>შეცდომა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1484"/>
+        <source>Open the report file</source>
+        <translation>ანგარიშის ფაილის გახსნა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1685"/>
+        <source>Text files (*.txt)</source>
+        <translation>ტექსტური ფაილები (*.txt)</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1689"/>
+        <source>CSV files (*.csv)</source>
+        <translation>CSV ფაილები (*.csv)</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1819"/>
+        <source>Project files (*.cppcheck);;All files(*.*)</source>
+        <translation>პროექტის ფაილები (*.cppcheck);;ყველა ფაილი(*.*)</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1821"/>
+        <source>Select Project File</source>
+        <translation>აირჩიეთ პროექტის ფაილი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
+        <source>Project:</source>
+        <translation>პროექტი:</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="668"/>
+        <source>No suitable files found to analyze!</source>
+        <translation>ანალიზისათვის შესაფერისი ფაილები აღმოჩენილი არაა!</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="767"/>
+        <source>C/C++ Source</source>
+        <translation>C/C++ საწყისი კოდი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="768"/>
+        <source>Compile database</source>
+        <translation>მონაცემთა ბაზის კომპილაცია</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="769"/>
+        <source>Visual Studio</source>
+        <translation>Visual Studio</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="770"/>
+        <source>Borland C++ Builder 6</source>
+        <translation>Borland C++ Builder 6</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="773"/>
+        <source>Select files to analyze</source>
+        <translation>აირჩეთ ფაილები ანალიზისთვის</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="788"/>
+        <source>Select directory to analyze</source>
+        <translation>აირჩიეთ საქაღალდე ანალიზისთვის</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="828"/>
+        <source>Select the configuration that will be analyzed</source>
+        <translation>აირჩიეთ კონფიგურაცია ანალიზისთვის</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="880"/>
+        <source>Found project files from the directory.
+
+Do you want to proceed analysis without using any of these project files?</source>
+        <translation>აღმოჩენილია პროექტის ფაილები საქაღალდიდან.
+
+გნებავთ, გააგრძელოთ ანალიზი ამ პროექტის ფაილების გამოყენების გარეშე?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1467"/>
+        <source>Current results will be cleared.
+
+Opening a new XML file will clear current results.
+Do you want to proceed?</source>
+        <translation>მიმდინარე შედეგები გასუფთავდება.
+
+ახალი XML ფაილის გახსნა მიმდინარე შედეგებს გაასუფთავებს.
+გნებავთ, გააგრძელოთ?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1591"/>
+        <source>Analyzer is running.
+
+Do you want to stop the analysis and exit Cppcheck?</source>
+        <translation>ანალიზატორი გაშვებულია.
+
+გნებავთ, გააჩეროთ ანალიზი და გახვიდეთ Cppcheck-დან?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1633"/>
+        <source>About</source>
+        <translation>შესახებ</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1672"/>
+        <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="1712"/>
+        <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>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1937"/>
+        <source>Build dir &apos;%1&apos; does not exist, create it?</source>
+        <translation>აგების საქაღალდე (%1) არ არსებობს. შევქმნა?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1945"/>
+        <source>To check the project using addons, you need a build directory.</source>
+        <translation>პროექტის დამატებებით შესამოწმებლად აგების საქაღალდე გჭირდებათ.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1977"/>
+        <source>Failed to open file</source>
+        <translation>ფაილის გახსნის შეცდომა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1980"/>
+        <source>Unknown project file format</source>
+        <translation>უცნობი პროექტის ფაილის ფორმატი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1983"/>
+        <source>Failed to import project file</source>
+        <translation>პროექტის ფაილის შემოტანა ჩავარდა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1999"/>
+        <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="2008"/>
+        <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="2032"/>
+        <source>Project files (*.cppcheck)</source>
+        <translation>პროექტის ფაილები (*.cppcheck)</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2034"/>
+        <source>Select Project Filename</source>
+        <translation>აირჩიეთ პროექტის ფაილის სახელი</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2080"/>
+        <source>No project file loaded</source>
+        <translation>პროექტის ფაილი ჩატვირთული არაა</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2148"/>
+        <source>The project file
+
+%1
+
+ could not be found!
+
+Do you want to remove the file from the recently used projects -list?</source>
+        <translation>პროექტის ფაილი
+
+%1
+
+ვერ ვიპოვე!
+
+გნებავთ წაშალოთ ეს ფაილი ახლახან გამოყენებული პროექტების სიიდან?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2310"/>
+        <source>Install</source>
+        <translation>დაყენება</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2314"/>
+        <source>New version available: %1. %2</source>
+        <translation>ხელმისაწვდომია ახალი ვერსია: %1. %2</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="100"/>
+        <source>Cppcheck GUI.
+
+Syntax:
+    cppcheck-gui [OPTIONS] [files or paths]
+
+Options:
+    -h, --help              Print this help
+    -p &lt;file&gt;               Open given project file and start checking it
+    -l &lt;file&gt;               Open given results xml file
+    -d &lt;directory&gt;          Specify the directory that was checked to generate the results xml specified with -l
+    -v, --version           Show program version
+    --data-dir=&lt;directory&gt;  This option is for installation scripts so they can configure the directory where
+                            datafiles are located (translations, cfg). The GUI is not started when this option
+                            is used.</source>
+        <oldsource>Cppcheck GUI.
+
+Syntax:
+    cppcheck-gui [OPTIONS] [files or paths]
+
+Options:
+    -h, --help              Print this help
+    -p &lt;file&gt;               Open given project file and start checking it
+    -l &lt;file&gt;               Open given results xml file
+    -d &lt;directory&gt;          Specify the directory that was checked to generate the results xml specified with -l
+    -v, --version           Show program version
+    --data-dir=&lt;directory&gt;  Specify directory where GUI datafiles are located (translations, cfg)</oldsource>
+        <translation>Cppcheck GUI.
+
+სინტაქსი:
+    cppcheck-gui [პარამეტრები] [ფაილები ან ბილიკები]
+
+პარამეტრები:
+    -h, --help              ამ დახმარების დაბეჭდვა
+    -p &lt;file&gt;               მითითებული პროექტის გახსნა და შემოწმების დაწყება
+    -l &lt;file&gt;               მითითებული შედეგების xml ფაილის გახსნა
+    -d &lt;directory&gt;          მიუთითეთ საქაღალდე, რომელიც შემოწმებული იყო, -l-ით მითითებული xml ფაილის გენერაცისთვის
+    -v, --version           პროგრამის ვერსიის ჩვენება
+    --data-dir=&lt;directory&gt;  ეს პარამეტრი დაყენების სკრიპტებისთვისაა, რომ დააყენონ საქაღალდე, სადაა
+                            მონაცემები (თარგმანები, კონფიგურაცია) მოთავსებული. როცა ეს პარამეტრი მითითებულია, გრაფიკული ინტერფეისი
+                            არ გამოიყენება.</translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="115"/>
+        <source>Cppcheck GUI - Command line parameters</source>
+        <translation>Cppcheck GUI - ბრძანების სტრიქონის პარამეტრები</translation>
+    </message>
+</context>
+<context>
+    <name>NewSuppressionDialog</name>
+    <message>
+        <location filename="newsuppressiondialog.ui" line="17"/>
+        <source>New suppression</source>
+        <translation>ახალი ჩახშობა</translation>
+    </message>
+    <message>
+        <location filename="newsuppressiondialog.ui" line="25"/>
+        <source>Error ID</source>
+        <translation>შეცდომის ID</translation>
+    </message>
+    <message>
+        <location filename="newsuppressiondialog.ui" line="32"/>
+        <source>File name</source>
+        <translation>ფაილის სახელი</translation>
+    </message>
+    <message>
+        <location filename="newsuppressiondialog.ui" line="42"/>
+        <source>Line number</source>
+        <translation>ხაზის ნომერი</translation>
+    </message>
+    <message>
+        <location filename="newsuppressiondialog.ui" line="52"/>
+        <source>Symbol name</source>
+        <translation>სიმბოლოს სახელი</translation>
+    </message>
+    <message>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
+        <source>Edit suppression</source>
+        <translation>ჩახშობის ჩასწორება</translation>
+    </message>
+</context>
+<context>
+    <name>Platforms</name>
+    <message>
+        <location filename="platforms.cpp" line="38"/>
+        <source>Native</source>
+        <translation>საკუთარი</translation>
+    </message>
+    <message>
+        <location filename="platforms.cpp" line="39"/>
+        <source>Unix 32-bit</source>
+        <translation>Unix 32-bit</translation>
+    </message>
+    <message>
+        <location filename="platforms.cpp" line="40"/>
+        <source>Unix 64-bit</source>
+        <translation>Unix 64-bit</translation>
+    </message>
+    <message>
+        <location filename="platforms.cpp" line="41"/>
+        <source>Windows 32-bit ANSI</source>
+        <translation>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>
+    </message>
+    <message>
+        <location filename="platforms.cpp" line="43"/>
+        <source>Windows 64-bit</source>
+        <translation>Windows 64-bit</translation>
+    </message>
+</context>
+<context>
+    <name>ProjectFile</name>
+    <message>
+        <location filename="projectfile.ui" line="14"/>
+        <source>Project File</source>
+        <translation>პროექტის ფაილი</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="24"/>
+        <source>Paths and Defines</source>
+        <translation>ბილიკები და აღწერები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="30"/>
+        <source>Import Project (Visual studio / compile database/ Borland C++ Builder 6)</source>
+        <oldsource>Import Project (Visual studio / compile database)</oldsource>
+        <translation>პროექტის შემოტანა (Visual studio / მონაცემთა ბაზი კომპილაცია / Borland C++ Builder 6)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="231"/>
+        <source>Defines must be separated by a semicolon. Example: DEF1;DEF2=5;DEF3=int</source>
+        <oldsource>Defines must be separated by a semicolon &apos;;&apos;</oldsource>
+        <translation>აღწერები წერტილმძიმით უნდა იყოს გამოყოფილი. მაგ: DEF1;DEF2=5;DEF3=int</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="389"/>
+        <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"/>
+        <source>Clang (experimental)</source>
+        <translation>Clang (ექსპერიმენტული)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="494"/>
+        <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"/>
+        <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"/>
+        <source>Max recursion in template instantiation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="639"/>
+        <source>Filepaths in warnings will be relative to this path</source>
+        <translation>ფაილის ბილიკები ამ ბილიკის ფარდობითი იქნება</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="655"/>
+        <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"/>
+        <source>Exclude source files</source>
+        <translation>კოდის ფაილების ამოღება</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="676"/>
+        <source>Exclude folder...</source>
+        <translation>საქაღალდის ამოღება...</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="683"/>
+        <source>Exclude file...</source>
+        <translation>ფაილის ამოღება...</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="876"/>
+        <source>MISRA rule texts</source>
+        <translation>MISRA-ის წესის ტექსტები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="883"/>
+        <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="890"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="73"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You have a choice:&lt;/p&gt;&lt;p&gt; * Analyze all Debug and Release configurations&lt;/p&gt;&lt;p&gt; * Only analyze the first matching Debug configuration&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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"/>
+        <source>Browse...</source>
+        <translation>ნუსხა...</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="76"/>
+        <source>Analyze all Visual Studio configurations</source>
+        <translation>ყველა Visual Studio-ის კონფიგურაციის ანალიზი</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="113"/>
+        <source>Selected VS Configurations</source>
+        <translation>არჩეული VS-ის კონფიგურაციები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="147"/>
+        <source>Paths:</source>
+        <translation>ბილიკები:</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="181"/>
+        <location filename="projectfile.ui" line="296"/>
+        <source>Add...</source>
+        <translation>დამატება...</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="188"/>
+        <location filename="projectfile.ui" line="303"/>
+        <location filename="projectfile.ui" line="690"/>
+        <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"/>
+        <source>Remove</source>
+        <translation>წაშლა</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="242"/>
+        <source>Undefines:</source>
+        <translation>წაშლილი მაკროაღწერები:</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="252"/>
+        <source>Undefines must be separated by a semicolon. Example: UNDEF1;UNDEF2;UNDEF3</source>
+        <translation>წაშლილი მაკროაღწერები წერტილმძიმით უნდა იყოს გამოყოფილი. მაგ: UNDEF1;UNDEF2;UNDEF3</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="265"/>
+        <source>Include Paths:</source>
+        <translation>ჩასმის ბილიკები:</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="362"/>
+        <source>Types and Functions</source>
+        <translation>ტიპები და ფუნქციები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="403"/>
+        <location filename="projectfile.ui" line="488"/>
+        <source>Analysis</source>
+        <translation>ანალიზი</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="415"/>
+        <source>This is a workfolder that Cppcheck will use for various purposes.</source>
+        <translation>ეს სამუშაო საქაღალდეა, რომელსაც Cppcheck სხვადასხვა მიზნებისთვის გამოიყენებს.</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="432"/>
+        <source>Parser</source>
+        <translation>ანალიზატორი</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="438"/>
+        <source>Cppcheck (built in)</source>
+        <translation>Cppcheck (ჩაშენებული)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation>შემოწმების დონე</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Check that each class has a safe public interface</source>
+        <translation>შემოწმება, აქვს თუ არა ყველა კლასს უსაფრთხო საჯარო ინტერფეისი</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="513"/>
+        <source>Limit analysis</source>
+        <translation>ანალიზის შეზღუდვა</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="529"/>
+        <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"/>
+        <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"/>
+        <source>Enable inline suppressions</source>
+        <translation>შეცდომების ხაზშივე ჩახშობის ჩართვა</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
+        <translation type="unfinished">2025</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
+        <translation>Misra C++</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation>2008</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
+        <translation>Cert C</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="946"/>
+        <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="965"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="981"/>
+        <source>Bug hunting</source>
+        <translation>შეცდომებზე ნადირობა</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="991"/>
+        <source>External tools</source>
+        <translation>გარე ხელსაწყოები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="330"/>
+        <source>Up</source>
+        <translation>მაღლა</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="337"/>
+        <source>Down</source>
+        <translation>ქვემოთ</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="368"/>
+        <source>Platform</source>
+        <translation>პლატფორმა</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="627"/>
+        <source>Warning options</source>
+        <translation>გაფრთხილების მორგება</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="633"/>
+        <source>Root path:</source>
+        <translation>Root ბილიკი:</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="649"/>
+        <source>Warning tags (separated by semicolon)</source>
+        <translation>გაფრთხილების ჭდეები (წერტილმძიმით გამოყოფილი)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="409"/>
+        <source>Cppcheck build dir (whole program analysis, incremental analysis, statistics, etc)</source>
+        <translation>Cppcheck-ის აგების საქაღალდე (მთელი პროგრამის ანალიზი, ინკრემენტული ანალიზი, სტატისტიკა და ა.შ.)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="380"/>
+        <source>Libraries</source>
+        <translation>ბიბლიოთეკები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="722"/>
+        <source>Suppressions</source>
+        <translation>ჩახშობები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="733"/>
+        <source>Add</source>
+        <translation>დამატება</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
+        <source>Addons</source>
+        <translation>დამატებები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="798"/>
+        <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"/>
+        <source>Y2038</source>
+        <translation>Y2038</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="815"/>
+        <source>Thread safety</source>
+        <translation>ნაკადების უსაფრთხოება</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="825"/>
+        <source>Coding standards</source>
+        <translation>კოდირების სტანდარტები</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation>Misra C</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation>2012</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation>2023</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
+        <source>Cert C++</source>
+        <translation>Cert C++</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="975"/>
+        <source>Bug hunting (Premium)</source>
+        <translation>შეცდომებზე ნადირობა (ფასიანი)</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="1004"/>
+        <source>Clang analyzer</source>
+        <translation>Clang-ის ანალიზატორი</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="997"/>
+        <source>Clang-tidy</source>
+        <translation>Clang-tidy</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="221"/>
+        <source>Defines:</source>
+        <translation>მაკროაღწრები:</translation>
+    </message>
+</context>
+<context>
+    <name>ProjectFileDialog</name>
+    <message>
+        <location filename="projectfiledialog.cpp" line="137"/>
+        <source>Project file: %1</source>
+        <translation>პროექტის ფაილი: %1</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="604"/>
+        <source>Select Cppcheck build dir</source>
+        <translation>აირჩიეთ Cppcheck-ის აგების საქაღალდე</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="865"/>
+        <source>Select include directory</source>
+        <translation>აირჩიეთ ჩასასმელი საქაღალდე</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="845"/>
+        <source>Select a directory to check</source>
+        <translation>აირჩიეთ შესამოწმებელი საქაღალდე</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
+        <source>Clang-tidy (not found)</source>
+        <translation>Clang-tidy (ვერ ვიპოვე)</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="643"/>
+        <source>Visual Studio</source>
+        <translation>Visual Studio</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="644"/>
+        <source>Compile database</source>
+        <translation>მონაცემთა ბაზის კომპილაცია</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="645"/>
+        <source>Borland C++ Builder 6</source>
+        <translation>Borland C++ Builder 6</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="646"/>
+        <source>Import Project</source>
+        <translation>პროექტის შემოტანა</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="885"/>
+        <source>Select directory to ignore</source>
+        <translation>აირჩიეთ გამოსატოვებელი საქაღალდე</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="893"/>
+        <source>Source files</source>
+        <translation>კოდის ფაილები</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="894"/>
+        <source>All files</source>
+        <translation>ყველა ფაილი</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="895"/>
+        <source>Exclude file</source>
+        <translation>ფაილის ამოღება</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="978"/>
+        <source>Select MISRA rule texts file</source>
+        <translation>აირჩიეთ MISRA-ის წესების ტექსტის ფაილი</translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="980"/>
+        <source>MISRA rule texts file (%1)</source>
+        <translation>MISRA-ის წესის ტექსტების ფაილი (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="translationhandler.cpp" line="91"/>
+        <source>Unknown language specified!</source>
+        <translation>მითითებული ენა უცნობია!</translation>
+    </message>
+    <message>
+        <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="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="38"/>
+        <source>line %1: Unhandled element %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="302"/>
+        <source> (Not found)</source>
+        <translation> (ვერ ვიპოვე)</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
+        <source>Thin</source>
+        <translation>თხელი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
+        <source>ExtraLight</source>
+        <translation>ძალიან მსუბუქი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
+        <source>Light</source>
+        <translation>ღია</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
+        <source>Normal</source>
+        <translation>ნორმალური</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
+        <source>Medium</source>
+        <translation>საშუალო</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
+        <source>DemiBold</source>
+        <translation>საშუალოდ სქელი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
+        <source>Bold</source>
+        <translation>გასქელება</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
+        <source>ExtraBold</source>
+        <translation>ძალიან სქელი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
+        <source>Black</source>
+        <translation>შავი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
+        <source>Editor Foreground Color</source>
+        <translation>რედაქტორის წინა პლანის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
+        <source>Editor Background Color</source>
+        <translation>რედაქტორის ფონის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
+        <source>Highlight Background Color</source>
+        <translation>ფონის ფერის გაოკვეთა</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
+        <source>Line Number Foreground Color</source>
+        <translation>ხაზის ნომრის წინა პლანის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
+        <source>Line Number Background Color</source>
+        <translation>ხაზის ნომრის ფონის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
+        <source>Keyword Foreground Color</source>
+        <translation>საკვანძო სიტყვის წინა პლანის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
+        <source>Keyword Font Weight</source>
+        <translation>საკვანძო სიტყვის ფონტის სიმძიმე</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
+        <source>Class Foreground Color</source>
+        <oldsource>Class ForegroundColor</oldsource>
+        <translation>კლასის წინა პლანის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
+        <source>Class Font Weight</source>
+        <translation>კლასის ფონტის სიმძიმე</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
+        <source>Quote Foreground Color</source>
+        <translation>ციტატის წინა პლანის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
+        <source>Quote Font Weight</source>
+        <translation>ციტატის ფონტის სიმძიმე</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
+        <source>Comment Foreground Color</source>
+        <translation>კომენტარის წინა პლანს ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
+        <source>Comment Font Weight</source>
+        <translation>კომენტარის ფონტის სიმძიმე</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
+        <source>Symbol Foreground Color</source>
+        <translation>სიმბოლოს წინა პლანის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
+        <source>Symbol Background Color</source>
+        <translation>სიმბოლოს ფონის ფერი</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
+        <source>Symbol Font Weight</source>
+        <translation>სიმბოლოს ფონტის სიმძიმე</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
+        <source>Set to Default Light</source>
+        <translation>ნაგულისხმევად ღიას დაყენება</translation>
+    </message>
+    <message>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
+        <source>Set to Default Dark</source>
+        <translation>ნაგულისხმევად მუქის დაყენება</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">ფაილი</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">ხაზი</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">სიმძიმე</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished">არადამაჯერებელი</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">შეჯამება</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished">თარიღიდან</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <source>CWE</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPlatformTheme</name>
+    <message>
+        <location filename="translationhandler.cpp" line="41"/>
+        <source>OK</source>
+        <translation>დიახ</translation>
+    </message>
+    <message>
+        <location filename="translationhandler.cpp" line="42"/>
+        <source>Cancel</source>
+        <translation>შეწყვეტა</translation>
+    </message>
+    <message>
+        <location filename="translationhandler.cpp" line="43"/>
+        <source>Close</source>
+        <translation>დახურვა</translation>
+    </message>
+    <message>
+        <location filename="translationhandler.cpp" line="44"/>
+        <source>Save</source>
+        <translation>შენახვა</translation>
+    </message>
+</context>
+<context>
+    <name>ResultsTree</name>
+    <message>
+        <source>File</source>
+        <translation type="vanished">ფაილი</translation>
+    </message>
+    <message>
+        <source>Severity</source>
+        <translation type="vanished">სიმძიმე</translation>
+    </message>
+    <message>
+        <source>Line</source>
+        <translation type="vanished">ხაზი</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">შეჯამება</translation>
+    </message>
+    <message>
+        <source>Undefined file</source>
+        <translation type="vanished">გაურკვეველი ფაილი</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="657"/>
+        <source>Copy</source>
+        <translation>კოპირება</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="825"/>
+        <source>Could not find file:</source>
+        <translation>ვერ ვიპოვე ფაილი:</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="829"/>
+        <source>Please select the folder &apos;%1&apos;</source>
+        <translation>აირჩიეთ საქაღალდე &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="830"/>
+        <source>Select Directory &apos;%1&apos;</source>
+        <translation>აირჩიეთ საქაღალდე &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="832"/>
+        <source>Please select the directory where file is located.</source>
+        <translation>აირჩიეთ საქაღალდე, სადაც ფაილია მოთავსებული.</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="367"/>
+        <source>debug</source>
+        <translation>შეცდომების მოძებნა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="298"/>
+        <source>note</source>
+        <translation>ნოტა</translation>
+    </message>
+    <message>
+        <source>Recheck</source>
+        <translation type="vanished">თავიდან შემოწმება</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation type="vanished">დამალვა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="659"/>
+        <source>Hide all with id</source>
+        <translation>დამალვა ყველასი id-ით</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="681"/>
+        <source>Suppress selected id(s)</source>
+        <translation>მონიშნული id(ებ)-ის ჩახშობა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="660"/>
+        <source>Open containing folder</source>
+        <translation>შემცველი საქაღალდის გახსნა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation>შიდა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
+        <source>Tag</source>
+        <translation>იარლიყი</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="703"/>
+        <source>No tag</source>
+        <translation>ჭდის გარეშე</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
+        <source>Cppcheck</source>
+        <translation>Cppcheck</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="734"/>
+        <source>No editor application configured.
+
+Configure the editor application for Cppcheck in preferences/Applications.</source>
+        <oldsource>Configure the text file viewer program in Cppcheck preferences/Applications.</oldsource>
+        <translation>რედაქტორის აპლიკაცია მითითებული არაა.
+
+მიუთითეთ რედაქტორის აპლიკაცია Cppcheck-სთვის მენიუში მორგება/აპლიკაციები.</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="748"/>
+        <source>No default editor application selected.
+
+Please select the default editor application in preferences/Applications.</source>
+        <translation>ნაგულისხმევი რედაქტორის აპლიკაცია არჩეული არაა.
+
+აირჩიეთ ნაგულისხმევი რედაქტორის აპლიკაცია მენიუში მორგება/აპლიკაციები.</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="768"/>
+        <source>Could not find the file!</source>
+        <translation>ფაილი ვერ ვიპოვე!</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="811"/>
+        <source>Could not start %1
+
+Please check the application path and parameters are correct.</source>
+        <translation>%1 ვერ გავუშვი
+
+შეამოწმეთ, სწორია, თუ არა აპლიკაციის ბილიკი და მისი პარამეტრები.</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="833"/>
+        <source>Select Directory</source>
+        <translation>აირჩიეთ საქაღალდე</translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="vanished">Id</translation>
+    </message>
+    <message>
+        <source>Inconclusive</source>
+        <translation type="vanished">არადამაჯერებელი</translation>
+    </message>
+    <message>
+        <source>Since date</source>
+        <translation type="vanished">თარიღიდან</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="349"/>
+        <source>style</source>
+        <translation>სტილი</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="352"/>
+        <source>error</source>
+        <translation>შეცდომა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="355"/>
+        <source>warning</source>
+        <translation>გაფრთხილება</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="358"/>
+        <source>performance</source>
+        <translation>წარმადობა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="361"/>
+        <source>portability</source>
+        <translation>გადატანადობა</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="364"/>
+        <source>information</source>
+        <translation>ინფორმაცია</translation>
+    </message>
+</context>
+<context>
+    <name>ResultsView</name>
+    <message>
+        <location filename="resultsview.cpp" line="255"/>
+        <source>Print Report</source>
+        <translation>ანგარიშის დაბეჭდვა</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="274"/>
+        <source>No errors found, nothing to print.</source>
+        <translation>შეცდომები ვერ ვიპოვე. დასაბეჭდი არაფერია.</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="326"/>
+        <source>%p% (%1 of %2 files checked)</source>
+        <translation>%p% (შემოწმებულია %1 ფაილი %2-დან)</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
+        <source>Cppcheck</source>
+        <translation>Cppcheck</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="351"/>
+        <source>No errors found.</source>
+        <translation>შეცდომების გარეშე.</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="358"/>
+        <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"/>
+        <source>Failed to read the report.</source>
+        <translation>ანგარიშის წაკითხვა ჩავარდა.</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="409"/>
+        <source>XML format version 1 is no longer supported.</source>
+        <translation>XML-ის ფორმატის პირველი ვერსია მხარდაჭერილი აღარაა.</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="460"/>
+        <source>First included by</source>
+        <translation>პირველად ჩასმულია ფაილში</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="465"/>
+        <source>Id</source>
+        <translation>Id</translation>
+    </message>
+    <message>
+        <source>Bug hunting analysis is incomplete</source>
+        <translation type="vanished">შეცდომებზე ნადირობის ანალიზი დაუსრულებელია</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="539"/>
+        <source>Clear Log</source>
+        <translation>ჟურნალის გასუფთავება</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="540"/>
+        <source>Copy this Log entry</source>
+        <translation>ამ ჟურნალის ჩანაწერის კოპირება</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="541"/>
+        <source>Copy complete Log</source>
+        <translation>სრული ჟურნალის კოპირება</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation>ანალიზი გაუქმებულია</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <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="565"/>
+        <source>when checking %1</source>
+        <translation>%1-ის შემოწმებისას</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation>ფაილის შემოწმებისას</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation>ანალიზი შეწყვეტილია.</translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
+        <source>Failed to save the report.</source>
+        <translation>ანგარიშის შენახვა ჩავარდა.</translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="26"/>
+        <source>Results</source>
+        <translation>შედეგები</translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation>კრიტიკული შეცდომები</translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
+        <source>Analysis Log</source>
+        <translation>ანალიზის ჟურნალი</translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="114"/>
+        <source>Warning Details</source>
+        <translation>გაფრთხილების დეტალები</translation>
+    </message>
+</context>
+<context>
+    <name>ScratchPad</name>
+    <message>
+        <location filename="scratchpad.ui" line="14"/>
+        <source>Scratchpad</source>
+        <translation>მონახაზი</translation>
+    </message>
+    <message>
+        <location filename="scratchpad.ui" line="20"/>
+        <source>Copy or write some C/C++ code here:</source>
+        <translation>დააკოპირეთ ან დაწერეთ C/C++ კოდი აქ:</translation>
+    </message>
+    <message>
+        <location filename="scratchpad.ui" line="37"/>
+        <source>Optionally enter a filename (mainly for automatic language detection) and click on &quot;Check&quot;:</source>
+        <translation>შეიყვანეთ არასავალდებულო ფაილის სახელი (ძირითადად ავტომატური ენის დადგენისთვის) და დააწკაპუნეთ ღილაკზე &quot;შემოწმება&quot;:</translation>
+    </message>
+    <message>
+        <location filename="scratchpad.ui" line="71"/>
+        <source>filename</source>
+        <translation>ფაილის სახელი</translation>
+    </message>
+    <message>
+        <location filename="scratchpad.ui" line="78"/>
+        <source>Check</source>
+        <translation>შემოწმება</translation>
+    </message>
+</context>
+<context>
+    <name>Settings</name>
+    <message>
+        <location filename="settings.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>მორგება</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="24"/>
+        <source>General</source>
+        <translation>ზოგადი</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="196"/>
+        <source>Add...</source>
+        <translation>დამატება...</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="41"/>
+        <source>Number of threads: </source>
+        <translation>ნაკადების რაოდენობა: </translation>
+    </message>
+    <message>
+        <source>Ideal count:</source>
+        <translation type="vanished">რეკომენდებული მნიშვნელობა:</translation>
+    </message>
+    <message>
+        <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="115"/>
+        <source>Show full path of files</source>
+        <translation>ფაილების სრული ბილიკის ჩვენება</translation>
+    </message>
+    <message>
+        <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="129"/>
+        <source>Display error Id in column &quot;Id&quot;</source>
+        <translation>სვეტში &quot;Id&quot; შეცდომის Id-ის ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="136"/>
+        <source>Enable inline suppressions</source>
+        <translation>შეცდომების ხაზშივე ჩახშობის ჩართვა</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="143"/>
+        <source>Check for inconclusive errors also</source>
+        <translation>ასევე, ნაჩვენები იქნება საკამათო შეცდომებიც</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="150"/>
+        <source>Show statistics on check completion</source>
+        <translation>სტატისტიკის ჩვენება შემოწმების დასრულებისას</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="157"/>
+        <source>Check for updates</source>
+        <translation>განახლებების შემოწმება</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="177"/>
+        <source>Show internal warnings in log</source>
+        <translation>ჟურნალში შიდა გაფრთხილებების ჩვენება</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="288"/>
+        <source>Addons</source>
+        <translation>დამატებები</translation>
+    </message>
+    <message>
+        <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="305"/>
+        <location filename="settings.ui" line="346"/>
+        <location filename="settings.ui" line="391"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="324"/>
+        <source>MISRA addon</source>
+        <translation>MISRA-ის დამატება</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="332"/>
+        <source>MISRA rule texts file</source>
+        <translation>MISRA-ის წესის ტექსტების ფაილი</translation>
+    </message>
+    <message>
+        <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="372"/>
+        <source>Clang</source>
+        <translation>Clang</translation>
+    </message>
+    <message>
+        <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="401"/>
+        <source>Visual Studio headers</source>
+        <translation>Visual Studio-ის თავსართები</translation>
+    </message>
+    <message>
+        <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="437"/>
+        <source>Code Editor</source>
+        <translation>კოდის რედაქტორი</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="443"/>
+        <source>Code Editor Style</source>
+        <translation>კოდის რედაქტორის სტილი</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="449"/>
+        <source>System Style</source>
+        <translation>სისტემის მიყოლა</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="456"/>
+        <source>Default Light Style</source>
+        <translation>ნაგულისხმევი ღია სტილი</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="463"/>
+        <source>Default Dark Style</source>
+        <translation>ნაგულისხმევი მუქი სტილი</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="472"/>
+        <source>Custom</source>
+        <translation>მომხმარებლის</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="210"/>
+        <source>Remove</source>
+        <translation>წაშლა</translation>
+    </message>
+    <message>
+        <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="203"/>
+        <location filename="settings.ui" line="479"/>
+        <source>Edit...</source>
+        <translation>რედაქტირება...</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="217"/>
+        <source>Set as default</source>
+        <translation>ნაგულისხმებად დაყენება</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="240"/>
+        <source>Reports</source>
+        <translation>ანგარიში</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="246"/>
+        <source>Save all errors when creating report</source>
+        <translation>ყველა შეცდომის შენახვა ანგარიშის შექმნისას</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="253"/>
+        <source>Save full path to files in reports</source>
+        <translation>ფაილების სრული ბილიკის ჩვენება ანგარიშებში</translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="274"/>
+        <source>Language</source>
+        <translation>ენა</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <source>N/A</source>
+        <translation type="vanished">N/A</translation>
+    </message>
+    <message>
+        <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="243"/>
+        <source>Add a new application</source>
+        <translation>ახალი აპლიკაციის დამატება</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.cpp" line="273"/>
+        <source>Modify an application</source>
+        <translation>აპლიკაციის შეცვლა</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.cpp" line="278"/>
+        <source> [Default]</source>
+        <translation> [ნაგულისხმევი]</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.cpp" line="303"/>
+        <source>[Default]</source>
+        <translation>[ნაგულისხმევი]</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.cpp" line="358"/>
+        <source>Select python binary</source>
+        <translation>აირჩიეთ python-ის გამშვები ფაილი</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.cpp" line="365"/>
+        <source>Select MISRA File</source>
+        <translation>აირჩიეთ MISA ფაილი</translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.cpp" line="396"/>
+        <source>Select clang path</source>
+        <translation>აირჩიეთ clang-ის ბილიკი</translation>
+    </message>
+</context>
+<context>
+    <name>StatsDialog</name>
+    <message>
+        <location filename="statsdialog.ui" line="14"/>
+        <location filename="statsdialog.ui" line="248"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
+        <source>Statistics</source>
+        <translation>სტატისტიკა</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="27"/>
+        <location filename="statsdialog.cpp" line="221"/>
+        <source>Project</source>
+        <translation>პროექტი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="33"/>
+        <source>Project:</source>
+        <translation>პროექტი:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="53"/>
+        <source>Paths:</source>
+        <translation>ბილიკები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="85"/>
+        <source>Include paths:</source>
+        <translation>თავსართის ფაილის ბილიკები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="108"/>
+        <source>Defines:</source>
+        <translation>მაკროაღწრები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="131"/>
+        <source>Undefines:</source>
+        <translation>წაშლილი მაკროაღწერები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="165"/>
+        <location filename="statsdialog.cpp" line="226"/>
+        <source>Previous Scan</source>
+        <translation>წინა სკანირება</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="171"/>
+        <source>Path Selected:</source>
+        <translation>არჩეული ბილიკი:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="181"/>
+        <source>Number of Files Scanned:</source>
+        <translation>დასკანერებულია ფაილების რაოდენობა:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="201"/>
+        <source>Scan Duration:</source>
+        <translation>სკანირების ხანგრძლივობა:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="254"/>
+        <source>Errors:</source>
+        <translation>შეცდომები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="271"/>
+        <source>Warnings:</source>
+        <translation>გაფრთხილებები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="288"/>
+        <source>Stylistic warnings:</source>
+        <translation>სტილისტური გაფრთხილებები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="305"/>
+        <source>Portability warnings:</source>
+        <translation>გადატანადობის გაფრთხილებები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="322"/>
+        <source>Performance issues:</source>
+        <translation>წარმადობის პრობლემები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="339"/>
+        <source>Information messages:</source>
+        <translation>ინფორმაციის შეტყობინებები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation>აქტიური შემმოწმებლები:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation>შაში</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
+        <source>History</source>
+        <translation>ისტორია</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="405"/>
+        <source>File:</source>
+        <translation>ფაილი:</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="443"/>
+        <source>Copy to Clipboard</source>
+        <translation>ბუფერში კოპირება</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="450"/>
+        <source>Pdf Export</source>
+        <translation>PDF-ად გატანა</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="159"/>
+        <source>1 day</source>
+        <translation>1 დღე</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="159"/>
+        <source>%1 days</source>
+        <translation>%1 დღე</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="161"/>
+        <source>1 hour</source>
+        <translation>%1 საათი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="161"/>
+        <source>%1 hours</source>
+        <translation>%1 საათი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="163"/>
+        <source>1 minute</source>
+        <translation>%1 წუთი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="163"/>
+        <source>%1 minutes</source>
+        <translation>%1 წთ</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="165"/>
+        <source>1 second</source>
+        <translation>1 წამი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="165"/>
+        <source>%1 seconds</source>
+        <translation>%1 წამი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="169"/>
+        <source>0.%1 seconds</source>
+        <translation>0.%1 წამი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="171"/>
+        <source> and </source>
+        <translation> და </translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="198"/>
+        <source>Export PDF</source>
+        <translation>PDF-ში გატანა</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="220"/>
+        <source>Project Settings</source>
+        <translation>პროექტის პარამეტრები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="222"/>
+        <source>Paths</source>
+        <translation>ბილიკები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="223"/>
+        <source>Include paths</source>
+        <translation>ჩასმის ბილიკები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="224"/>
+        <source>Defines</source>
+        <translation>აღწერები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="225"/>
+        <source>Undefines</source>
+        <translation>წაშლილი მაკროაღწერები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="227"/>
+        <source>Path selected</source>
+        <translation>არჩეული ბილიკი</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="228"/>
+        <source>Number of files scanned</source>
+        <translation>დასკანერებულია ფაილების რაოდენობა</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="229"/>
+        <source>Scan duration</source>
+        <translation>სკანირების ხანგრძლივობა</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
+        <source>Errors</source>
+        <translation>შედომები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="112"/>
+        <source>File: </source>
+        <translation>ფაილი: </translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="112"/>
+        <source>No cppcheck build dir</source>
+        <translation>Cppcheck-ის აგების საქაღალდის გარეშე</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
+        <source>Warnings</source>
+        <translation>გაფრთხილებები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
+        <source>Style warnings</source>
+        <translation>სტილის გაფრთხილებები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
+        <source>Portability warnings</source>
+        <translation>გადატანადობის გაფრთხილებები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
+        <source>Performance warnings</source>
+        <translation>წარმადობის გაფრთხილებები</translation>
+    </message>
+    <message>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
+        <source>Information messages</source>
+        <translation>საინფორმაციო შეტყობინებები</translation>
+    </message>
+</context>
+<context>
+    <name>ThreadResult</name>
+    <message>
+        <location filename="threadresult.cpp" line="46"/>
+        <source>%1 of %2 files checked</source>
+        <translation>შემოწმებულია %1 ფაილი %2-დან</translation>
+    </message>
+</context>
+<context>
+    <name>TranslationHandler</name>
+    <message>
+        <location filename="translationhandler.cpp" line="130"/>
+        <source>Failed to change the user interface language:
+
+%1
+
+The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages.</source>
+        <translation>ჩავარდა მომხმარებლის ინტერფეისის ენის გარდართვა ენაზე:
+
+%1
+
+მომხმარებლის ინტერფეისი ინგლისურზე გადაირთო. გახსენით მორგების დიალოგი, რომ ხელმისაწვდომი ენებიდან სასურველი აირჩიოთ.</translation>
+    </message>
+    <message>
+        <location filename="translationhandler.cpp" line="136"/>
+        <source>Cppcheck</source>
+        <translation>Cppcheck</translation>
+    </message>
+</context>
+<context>
+    <name>TxtReport</name>
+    <message>
+        <location filename="txtreport.cpp" line="74"/>
+        <source>inconclusive</source>
+        <translation>არადამაჯერებელი</translation>
+    </message>
+</context>
+<context>
+    <name>toFilterString</name>
+    <message>
+        <location filename="common.cpp" line="58"/>
+        <source>All supported files (%1)</source>
+        <translation>ყველა მხარდაჭერილი ფაილი (%1)</translation>
+    </message>
+    <message>
+        <location filename="common.cpp" line="63"/>
+        <source>All files (%1)</source>
+        <translation>ყველა ფაილი (%1)</translation>
+    </message>
+</context>
+</TS>
diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts
index 773149f772e..972a54bd889 100644
--- a/gui/cppcheck_ko.ts
+++ b/gui/cppcheck_ko.ts
@@ -32,7 +32,8 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
     <message>
@@ -123,38 +124,59 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -195,12 +217,12 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -463,20 +485,20 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -506,298 +528,346 @@ Kate로 파일을 열고, 해당 행으로 이동하는 예제:
         <translation>도구바(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>도움말(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>편집(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>표준 도구</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>분류 도구</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>필터 도구</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>저작권(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>제작자(&amp;u)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>정보(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>파일(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>디렉토리(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>중지(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>결과를 파일에 저장(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>종료(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>결과 지우기(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>설정(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>애러 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>전체 선택(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>전체 해제(&amp;U)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>전체 접기(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>전체 펼치기(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>표준 도구(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>표준 아이템</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>내용(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>도움말을 엽니다</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>도구바</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>분류 도구(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>에러 종류</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>XML 열기(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>프로젝트 파일 열기(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>새 프로젝트 파일(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>로그 보기(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>로그 보기</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>프로젝트 파일 닫기(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>프로젝트 파일 편집(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>통계 보기(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>경고 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>숨기기 보기(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>정보</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>정보 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>이식성 경고 표시</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>필터 도구(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>필터링 결과</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>빠른 필터:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -806,12 +876,12 @@ This is probably because the settings were changed between the Cppcheck versions
 Cppcheck 버전간 설정 방법 차이때문인 것으로 보입니다. 편집기 설정을 검사(및 수정)해주세요, 그렇지 않으면 편집기가 제대로 시작하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>새로운 파일이나 디렉토리를 선택하기 전에 프로젝트 파일을 닫으세요!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -820,113 +890,215 @@ Do you want to load this project file instead?</source>
 이 프로젝트 파일을 불러오겠습니까?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML 파일 (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>보고서 파일 열기</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1441"/>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>저작권</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>제작자</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>보고서 파일 저장</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>텍스트 파일 (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 파일 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>프로젝트 파일 (*.cppcheck);;모든 파일(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>프로젝트 파일 선택</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2049"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>프로젝트:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1427"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>프로젝트 파일이름 선택</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>프로젝트 파일 불러오기 실패</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -943,109 +1115,112 @@ Do you want to remove the file from the recently used projects -list?</source>
 최근 프로젝트 목록에서 파일을 제거하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <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="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1063,269 +1238,259 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="350"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <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="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
-        <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1361,7 +1526,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1425,15 +1590,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="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
@@ -1448,12 +1613,12 @@ Do you want to proceed?</source>
         <translation>아래로</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1463,7 +1628,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1488,12 +1653,12 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1528,84 +1693,75 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="827"/>
+        <location filename="projectfile.ui" line="937"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
+        <location filename="projectfile.ui" line="946"/>
         <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="820"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <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"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1629,73 +1785,134 @@ Do you want to proceed?</source>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished">Inline suppression 사용</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="848"/>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1716,18 +1933,18 @@ Do you want to proceed?</source>
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1735,77 +1952,82 @@ 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="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Include 디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>검사할 디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>무시할 디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1813,190 +2035,255 @@ Do you want to proceed?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>알 수 없는 언어입니다!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>언어 파일(%1)이 없습니다!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">파일</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">행</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">분류</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">요약</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2004,78 +2291,77 @@ Do you want to proceed?</source>
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>파일</translation>
+        <translation type="vanished">파일</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>분류</translation>
+        <translation type="vanished">분류</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>행</translation>
+        <translation type="vanished">행</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>요약</translation>
+        <translation type="vanished">요약</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>미정의된 파일</translation>
+        <translation type="vanished">미정의된 파일</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>스타일</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>에러</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>성능</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>이식성</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>정보</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>디버그</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Hide</source>
-        <translation>숨기기</translation>
+        <translation type="vanished">숨기기</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2084,7 +2370,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 [설정 - 응용 프로그램]에서 편집기를 설정하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2093,12 +2379,12 @@ Please select the default editor application in preferences/Applications.</sourc
 [설정 - 응용 프로그램]에서 기본 편집기를 선택하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>파일을 찾을 수 없습니다!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2107,83 +2393,72 @@ Please check the application path and parameters are correct.</source>
 경로와 인자가 정확한지 확인하세요.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
+        <location filename="resultstree.cpp" line="298"/>
+        <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
-        <source>note</source>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2196,92 +2471,117 @@ Please check the application path and parameters are correct.</source>
         <translation>결과</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>결과 저장 실패.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%2 중 %1 파일 검사됨)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>에러가 발견되지 않았습니다.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>결과 불러오기 실패.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,180 +2632,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>
@@ -2513,47 +2817,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>
@@ -2563,14 +2866,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>통계</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>프로젝트</translation>
     </message>
@@ -2596,7 +2899,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>직전 검사</translation>
     </message>
@@ -2616,188 +2919,198 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>검사 시간:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>에러:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>경고:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>스타일 경고:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>이식성 경고:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>성능 경고:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>정보 메시지:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>클립보드에 복사</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1일</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1일</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1분</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1분</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1초</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1초</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.%1초</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> 및 </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>프로젝트 설정</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>Include 경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>Defines</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>선택된 경로</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>검사된 파일 수</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>검사 시간</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>에러</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>스타일 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>이식성 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>성능 경고</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>정보 메시지</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2807,7 +3120,7 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2815,7 +3128,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%2 중 %1 파일 검사됨</translation>
     </message>
@@ -2823,7 +3136,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2836,7 +3149,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 언어가 영어로 초기화 됐습니다. 설정창을 열어서 설정 가능한 언어를 선택하세요.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -2844,7 +3157,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>불확실</translation>
     </message>
@@ -2852,12 +3165,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts
index fedf90333bf..732073d404a 100644
--- a/gui/cppcheck_nl.ts
+++ b/gui/cppcheck_nl.ts
@@ -38,7 +38,8 @@ van de GNU General Public License versie 3</translation>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -123,38 +124,59 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -197,12 +219,12 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -467,30 +489,30 @@ Parameters: -l(lijn) (bestand)</translation>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
@@ -510,233 +532,235 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation>&amp;Werkbalken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++standaard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>Be&amp;werken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licentie...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>A&amp;uteurs...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Over...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Bestanden...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Mappen...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Resultaten wissen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Voorkeuren</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>Toon fouten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>Toon waarschuwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Toon &amp;verborgen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Toon informatie bericht</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Toon portabiliteit waarschuwingen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Filter resultaten</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Controleer alles</translation>
     </message>
@@ -751,280 +775,326 @@ Parameters: -l(lijn) (bestand)</translation>
         <translation type="unfinished">Verberg</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>Selecteer &amp;niets</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Alles Inkl&amp;appen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>Alles &amp;Uitklappen</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standaard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Standaard items</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Werkbalk</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Categorieën</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Foute Categorieën</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <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="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <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="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>&amp;Log weergave</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Log weergave</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <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="570"/>
+        <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="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Statistieken</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Inhoud</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Categorieën</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="493"/>
+        <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="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>Snel Filter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1032,54 +1102,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="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1441"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Licentie</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Rapport opslaan </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML bestanden (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -1088,133 +1195,131 @@ 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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>Open het rapport bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>Tekst bestanden (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV bestanden (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Project bestanden (*.cppcheck);;Alle bestanden(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>Selecteer project bestand</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>Project:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1222,76 +1327,81 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <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="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
-        <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>Selecteer project bestandsnaam</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>Geen project bestand geladen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1307,17 +1417,72 @@ Kan niet worden gevonden!
 Wilt u het bestand van de onlangs gebruikte project verwijderen -lijst?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1347,7 +1512,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - Command lijn parameters</translation>
     </message>
@@ -1380,7 +1545,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1448,37 +1613,53 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1490,6 +1671,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1517,15 +1699,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
@@ -1551,7 +1733,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,58 +1753,93 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished">Schakel inline suppressies in</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="946"/>
+        <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="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1647,37 +1864,37 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="494"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1692,58 +1909,58 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1756,77 +1973,82 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Selecteer include map</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>Selecteer een map om te controleren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>Selecteer een map om te negeren</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1834,193 +2056,258 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Onbekende taal gekozen!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">Bestand</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Regel</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Ernst</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">Overzicht</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2028,109 +2315,112 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>Bestand</translation>
+        <translation type="vanished">Bestand</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>Ernst</translation>
+        <translation type="vanished">Ernst</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>Regel</translation>
+        <translation type="vanished">Regel</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>Overzicht</translation>
+        <translation type="vanished">Overzicht</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>Niet gedefinieerd bestand</translation>
+        <translation type="vanished">Niet gedefinieerd bestand</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>Verberg</translation>
+        <translation type="vanished">Verberg</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation>Verberg alles met id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2140,7 +2430,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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2148,12 +2438,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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>Kon het bestand niet vinden!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2162,52 +2452,41 @@ 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="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>Selecteer map</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>Stijlfouten</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>Fouten</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>Presentatie</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>Portabiliteit</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>Informatie</translation>
     </message>
@@ -2215,82 +2494,102 @@ Gelieve te controleren of de het pad en de parameters correct zijn.</translation
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 van %2 bestanden gecontroleerd)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>Geen fouten gevonden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>Kon rapport niet lezen.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Kon het rapport niet opslaan.</translation>
     </message>
@@ -2300,12 +2599,17 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
         <translation>Resultaten</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2351,7 +2655,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>
@@ -2361,176 +2665,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>
@@ -2538,47 +2846,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>
@@ -2588,14 +2891,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>Project</translation>
     </message>
@@ -2626,7 +2929,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>Vorige scan</translation>
     </message>
@@ -2646,193 +2949,203 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
         <translation>Scan tijd:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>Fouten:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>Waarschuwingen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Stilistisch waarschuwingen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>Portabiliteit waarschuwingen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>Presentatie problemen:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>Informatie bericht:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>Kopieer naar Clipbord</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 dag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 dagen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 uur</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 uren</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 minuut</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 minuten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 seconde</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 secondes</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 secondes</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> en </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>Project instellingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>Paden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>Bevat paden</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>Omschrijft</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>Pad Geselekteerd</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>Aantal bestanden gescanned</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>Scan tijd</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>Fouten</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>Waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>Stijl waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>Portabiliteit waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>Presentatie waarschuwingen</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>Informatie bericht</translation>
     </message>
@@ -2840,7 +3153,7 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 van %2 bestanden gecontroleerd</translation>
     </message>
@@ -2848,7 +3161,7 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</transla
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2861,7 +3174,7 @@ 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="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2869,7 +3182,7 @@ De gebruikerstaal is gereset naar Engels. Open het dialoogvenster om een van de
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>Onduidelijk</translation>
     </message>
@@ -2877,12 +3190,12 @@ De gebruikerstaal is gereset naar Engels. Open het dialoogvenster om een van de
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts
index 3e94d9a6063..3256348229a 100644
--- a/gui/cppcheck_ru.ts
+++ b/gui/cppcheck_ru.ts
@@ -38,7 +38,8 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -123,38 +124,59 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -197,12 +219,12 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -467,30 +489,30 @@ Parameters: -l(line) (file)</source>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>Анализ</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Стандартные</translation>
     </message>
@@ -510,233 +532,235 @@ Parameters: -l(line) (file)</source>
         <translation>&amp;Панель инструментов</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>Стандарт C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Лицензия...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Авторы...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;О программе...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Файлы...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Каталог...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>Остановить</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>Сохранить отчёт в файл...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>Очистить отчёт</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>Показать ошибки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>Показать предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Показать скрытые</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Информационные сообщения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Показать информационные сообщения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Показать предупреждения переносимости</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Просмотр результатов Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Просмотр результатов Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Результаты фильтрации</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Печать...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>Напечатать текущий отчет</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Предварительный просмотр...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>Открыть редактор библиотек</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>Отметить все</translation>
     </message>
@@ -751,280 +775,326 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">Скрыть</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>Заново проверить все файлы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>Стилистические предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>Ошибки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>Сбросить все</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>Свернуть все</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>Развернуть все</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>Стандартные</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Стандартные элементы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Категории ошибок</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Открыть XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Открыть файл &amp;проекта...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>Показать Блокнот</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>&amp;Новый файл проекта...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>Посмотреть &amp;лог</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Посмотреть лог</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>&amp;Закрыть файл проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>&amp;Изменить файл проекта...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>&amp;Статистика</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>Предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>Предупреждения производительности</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>Информационные предупреждения</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>Предупреждения переносимости</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>Платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>Редактор библиотеки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>Автоматическое определение языка</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>Принудительно C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>Принудительно C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>Повторный анализ библиотеки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>Проверить конфигурацию (defines, includes)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Открыть помощь</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>Быстрый фильтр:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation>Выбор конфигурации</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1033,60 +1103,97 @@ Do you want to load this project file instead?</source>
 Вы хотите загрузить этот проект?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>Файл не найден</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation>Некорректный XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation>Пропущен атрибут</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation>Некорректное значение атрибута</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>Неподдерживаемый формат</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1441"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Лицензия</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Авторы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Сохранить файл с отчетом</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML-файлы (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -1095,122 +1202,124 @@ This is probably because the settings were changed between the Cppcheck versions
 Возможно, это связано с изменениями в версии программы. Пожалуйста, проверьте (и исправьте) настройки приложения.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>Вы должны закрыть проект перед выбором новых файлов или каталогов!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>Библиотека &apos;%1&apos; содержит неизвестные элементы:
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation>Дубликат типа платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation>Переобъявление типа платформы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation>Неизвестный элемент</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation>Неизвестная проблема</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
         <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.</source>
-        <translation>Невозможно загрузить %1. Cppcheck установлен некорректно. Вы можете использовать --data-dir=&lt;directory&gt; в командной строке для указания расположения файлов конфигурации. Обратите внимание, что --data-dir предназначен для использования сценариями установки. При включении данной опции, графический интерфейс пользователя не запускается.</translation>
+        <translation type="vanished">Невозможно загрузить %1. Cppcheck установлен некорректно. Вы можете использовать --data-dir=&lt;directory&gt; в командной строке для указания расположения файлов конфигурации. Обратите внимание, что --data-dir предназначен для использования сценариями установки. При включении данной опции, графический интерфейс пользователя не запускается.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>Открыть файл с отчетом</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>Текстовые файлы (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV файлы(*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Файлы проекта (*.cppcheck);;Все файлы(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>Выберите файл проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>Проект:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation>Не найдено подходящих файлов для анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation>Исходный код C/C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished">Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation>Выбор файлов для анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation>Выбор каталога для анализа</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Выбор используемой конфигурации</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1219,7 +1328,7 @@ Do you want to proceed analysis without using any of these project files?</sourc
 Вы хотите продолжить анализ без использования этих файлов проекта?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1230,7 +1339,7 @@ Do you want to proceed?</source>
 Вы хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1239,69 +1348,133 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 Вы хотите остановить анализ и выйти из Cppcheck?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <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="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>Директория для сборки &apos;%1&apos; не существует, создать?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation>Невозможно импортировать &apos;%1&apos;, анализ остановлен</translation>
+        <translation type="vanished">Невозможно импортировать &apos;%1&apos;, анализ остановлен</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Файлы проекта (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>Выберите имя файла для проекта</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>Файл с проектом не загружен</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1317,17 +1490,17 @@ Do you want to remove the file from the recently used projects -list?</source>
 Хотите удалить его из списка проектов?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1370,7 +1543,7 @@ Options:
                             Графический интерфейс пользователя не будет запущен, если указана эта опция.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - параметры Командной строки</translation>
     </message>
@@ -1403,7 +1576,7 @@ Options:
         <translation>Имя символа</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>Редактировать подавление</translation>
     </message>
@@ -1476,42 +1649,42 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="494"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1520,17 +1693,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation>Файл с текстами правил MISRA</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1542,6 +1715,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation>Обзор...</translation>
     </message>
@@ -1569,15 +1743,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
@@ -1603,7 +1777,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation>Анализ</translation>
     </message>
@@ -1623,58 +1797,93 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation>Максимальная глубина CTU</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished">Включить inline-подавление ошибок</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="946"/>
+        <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="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation>Внешние инструменты</translation>
     </message>
@@ -1694,17 +1903,17 @@ Options:
         <translation>Платформа</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation>Опции предупреждений</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation>Корневой каталог:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Теги предупреждений (через &apos;;&apos;)</translation>
     </message>
@@ -1719,58 +1928,74 @@ Options:
         <translation>Библиотеки</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation>Подавления</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation>Дополнения</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation>Стандарты кодирования</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1783,77 +2008,82 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation>Выбрать директорию сборки Cppcheck</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Выберите директорию для поиска заголовочных файлов</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>Выберите директорию для проверки</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (не найден)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation>Импорт проекта</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>Выберите директорию, которую надо проигнорировать</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation>Выбрать файл текстов правил MISRA</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>Файл текстов правил MISRA (%1)</translation>
     </message>
@@ -1861,193 +2091,258 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>Неизвестный язык!</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation> (Недоступно)</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">Файл</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Строка</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Важность</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished">Спорное</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">Кратко</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished">Начиная с даты</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2055,109 +2350,116 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>Файл</translation>
+        <translation type="vanished">Файл</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>Важность</translation>
+        <translation type="vanished">Важность</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>Строка</translation>
+        <translation type="vanished">Строка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>Кратко</translation>
+        <translation type="vanished">Кратко</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>Неопределенный файл</translation>
+        <translation type="vanished">Неопределенный файл</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation>Невозможно найти файл:</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>Выберите каталог &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>Выбрать каталог &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation>Укажите каталог с расположением файла.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>отлаживать</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation>заметка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
         <source>Recheck</source>
-        <translation>Проверить заново</translation>
+        <translation type="vanished">Проверить заново</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>Скрыть</translation>
+        <translation type="vanished">Скрыть</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation>Скрыть все с id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation>Подавить выбранные id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation>Открыть содержащую папку</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation>Тег</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation>Тег отсутствует</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2166,7 +2468,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 Сконфигурируйте приложение редактора для Cppcheck в предпочтениях/Приложениях.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2174,12 +2476,12 @@ Please select the default editor application in preferences/Applications.</sourc
 Выберите приложение редактора по умолчанию в предпочтениях/Приложениях.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>Не удается найти файл!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2187,52 +2489,49 @@ Please check the application path and parameters are correct.</source>
 Пожалуйста, проверьте путь приложения, и верны ли параметры.</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>Выберите директорию</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Inconclusive</source>
-        <translation>Спорное</translation>
+        <translation type="vanished">Спорное</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Since date</source>
-        <translation>Начиная с даты</translation>
+        <translation type="vanished">Начиная с даты</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>стиль</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>ошибка</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>предупреждение</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>производительность</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>переносимость</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>информация</translation>
     </message>
@@ -2240,82 +2539,102 @@ Please check the application path and parameters are correct.</source>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>Распечатать отчет</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation>Ошибок не найдено, нечего распечатывать.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 из %2 файлов проверено)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>Ошибок не найдено.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>Не удалось прочитать отчет.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>XML формат версии 1 больше не поддерживается.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation>Только первый включенный</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation>Очистить лог</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation>Скопировать данную запись</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation>Скопировать полный лог</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Не удалось сохранить отчет.</translation>
     </message>
@@ -2325,12 +2644,17 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>Результаты</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation>Лог анализа</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation>Детали предупреждения</translation>
     </message>
@@ -2376,7 +2700,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>
@@ -2386,176 +2710,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>
@@ -2563,47 +2891,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>
@@ -2613,14 +2940,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
@@ -2651,7 +2978,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>Последнее сканирование</translation>
     </message>
@@ -2671,193 +2998,203 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>Продолжительность сканирования:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>Ошибки:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>Предупреждения:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Стилистические предупреждения:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>Предупреждения переносимости:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>Проблемы с производительностью:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>Информационные сообщения:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation>История</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation>Файл:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>Скопировать в буфер обмена</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation>Экспорт PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 день</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 дней</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 час</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 часов</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 минута</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 минут</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 секунда</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 секунд</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.1%1 секунд</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation>Экспорт PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>Настройки проекта</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>Пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>Включенные пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>Объявленные макроопределения:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation>Удаленные макроопределения:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>Выбранные пути</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>Количество просканированных файлов</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>Продолжительность сканирования</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>Ошибки</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>Файл: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>Не задана директория сборки</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>Предупреждения</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>Стилистические предупреждения</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>Предупреждения переносимости</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>Предупреждения производительности</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>Информационные сообщения</translation>
     </message>
@@ -2865,7 +3202,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 из %2 файлов проверены</translation>
     </message>
@@ -2873,7 +3210,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2886,7 +3223,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 Язык пользовательского интерфейса был сброшен на английский. Откройте Настройки-диалог для выбора любого из доступных языков.</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2894,7 +3231,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>незначительная</translation>
     </message>
@@ -2902,12 +3239,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation>Все поддерживаемые файлы (%1)</translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation>Все файлы (%1)</translation>
     </message>
diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts
index c18520c8e6a..093d6846612 100644
--- a/gui/cppcheck_sr.ts
+++ b/gui/cppcheck_sr.ts
@@ -38,7 +38,8 @@ of the GNU General Public License version 3</translation>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -113,38 +114,59 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -185,12 +207,12 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -455,30 +477,30 @@ Parameters: -l(line) (file)</source>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation type="unfinished">Standard</translation>
     </message>
@@ -498,233 +520,235 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Edit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation type="unfinished">&amp;License...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <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="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation type="unfinished">&amp;About...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation type="unfinished">&amp;Files...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation type="unfinished">&amp;Directory...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation type="unfinished">Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation type="unfinished">Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation type="unfinished">&amp;Stop</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation type="unfinished">Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation type="unfinished">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation type="unfinished">&amp;Quit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <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="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation type="unfinished">&amp;Preferences</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation type="unfinished">&amp;Check all</translation>
     </message>
@@ -739,467 +763,548 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <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="469"/>
+        <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="474"/>
+        <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="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation type="unfinished">C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation type="unfinished">&amp;Help</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <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="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1441"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation type="unfinished">License</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation type="unfinished">Authors</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation type="unfinished">Save the report file</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished">XML files (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation type="unfinished">Text files (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1207,76 +1312,81 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <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="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
-        <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1287,17 +1397,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="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1327,7 +1492,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1360,7 +1525,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1428,17 +1593,17 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1450,6 +1615,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1477,15 +1643,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1521,7 +1687,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1535,79 +1701,114 @@ Options:
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="946"/>
+        <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="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1637,93 +1838,109 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1736,77 +1953,82 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1814,191 +2036,256 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <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="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">File</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Line</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Severity</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2006,128 +2293,123 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation type="unfinished">File</translation>
+        <translation type="obsolete">File</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation type="unfinished">Severity</translation>
+        <translation type="obsolete">Severity</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation type="unfinished">Line</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Summary</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Line</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation type="unfinished">Undefined file</translation>
+        <translation type="obsolete">Undefined file</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
+        <location filename="resultstree.cpp" line="659"/>
+        <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
-        <source>Hide</source>
+        <location filename="resultstree.cpp" line="681"/>
+        <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
-        <source>Hide all with id</source>
+        <location filename="resultstree.cpp" line="660"/>
+        <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
-        <source>Suppress selected id(s)</source>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
-        <source>Open containing folder</source>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2136,52 +2418,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="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation type="unfinished">Style</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation type="unfinished">Error</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2189,82 +2456,102 @@ Please check the application path and parameters are correct.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation type="unfinished">No errors found.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation type="unfinished">Failed to save the report.</translation>
     </message>
@@ -2274,12 +2561,17 @@ To toggle what kind of errors are shown, open view menu.</translation>
         <translation type="unfinished">Results</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2325,7 +2617,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>
@@ -2335,175 +2627,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>
@@ -2511,47 +2803,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>
@@ -2561,14 +2848,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2599,7 +2886,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,193 +2906,203 @@ To toggle what kind of errors are shown, open view menu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2813,7 +3110,7 @@ To toggle what kind of errors are shown, open view menu.</translation>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2821,7 +3118,7 @@ To toggle what kind of errors are shown, open view menu.</translation>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2830,7 +3127,7 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2838,7 +3135,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2846,12 +3143,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts
index f342c1a715d..8070d7ee1ea 100644
--- a/gui/cppcheck_sv.ts
+++ b/gui/cppcheck_sv.ts
@@ -38,7 +38,8 @@ of the GNU General Public License version 3</translation>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -123,38 +124,59 @@ Parametrar: -l(line) (file)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -197,12 +219,12 @@ Parametrar: -l(line) (file)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation type="unfinished">Cppcheck</translation>
     </message>
@@ -473,30 +495,30 @@ Exempel:
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>Analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
@@ -516,233 +538,235 @@ Exempel:
         <translation>Verktygsfält</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>&amp;Licens...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>&amp;Utvecklat av...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>&amp;Om...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>&amp;Filer...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>&amp;Katalog...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stoppa</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <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="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>&amp;Töm resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>&amp;Inställningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>Visa fel</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>Visa varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>Visa dolda</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>Visa informations meddelanden</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>Visa portabilitets varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>Visa Cppcheck resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>Visa Clang resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>&amp;Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>Filtrera resultat</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <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="721"/>
+        <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="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64-bit</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>Skriv ut...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <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="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>Förhandsgranska utskrift...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>Öppna library editor</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>&amp;Kryssa alla</translation>
     </message>
@@ -757,281 +781,327 @@ Exempel:
         <translation type="unfinished">Dölj</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <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="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>Style varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>Kryssa &amp;ur alla</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <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="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>&amp;Expandera alla</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>&amp;Standard</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>Standard poster</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>Verktygsfält</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>&amp;Kategorier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>Fel kategorier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>&amp;Öppna XML...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>Öppna Projektfil...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>Visa Scratchpad...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>Ny projektfil...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>Logg vy</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <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="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>Redigera projektfil...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>Varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>Optimerings varningar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>Portabilitet</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>Plattformar</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>Posix</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>Library Editor...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <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="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>Tvinga C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation>Tvinga C</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation type="unfinished">C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation type="unfinished">C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>&amp;Innehåll</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>Kategorier</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>Öppna hjälp</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>Snabbfilter:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation>Välj konfiguration</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1040,60 +1110,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="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>Filen hittades ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation>Ogiltig XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation>Attribut finns ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation>Ogiltigt attribut värde</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>Format stöds ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1441"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>Licens</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>Utvecklare</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>Spara rapport</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML filer (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -1102,122 +1209,124 @@ 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="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <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="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <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="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation>Dubbel plattformstyp</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation>Plattformstyp definieras igen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation>Element hanteras ej</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation>Något problem</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
         <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.</source>
-        <translation>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>
+        <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="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>Öppna rapportfilen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>Text filer (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>Projektfiler (*.cppcheck);;Alla filer(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>Välj projektfil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>Projekt:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation>Inga filer hittades att analysera!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation type="unfinished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation>Välj filer att analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation>Välj mapp att analysera</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>Välj konfiguration som kommer analyseras</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1226,7 +1335,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="1261"/>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1234,7 +1343,7 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1243,69 +1352,133 @@ 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="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <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="1688"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1937"/>
         <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="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation>Misslyckades att importera &apos;%1&apos;, analysen stoppas</translation>
+        <translation type="vanished">Misslyckades att importera &apos;%1&apos;, analysen stoppas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation>Projekt filer (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>Välj Projektfil</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>Inget projekt laddat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1322,17 +1495,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="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1375,7 +1548,7 @@ Options:
                             is used.</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - Command line parameters</translation>
     </message>
@@ -1408,7 +1581,7 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1476,7 +1649,7 @@ Options:
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1488,6 +1661,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1515,15 +1689,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <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="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
@@ -1552,68 +1726,129 @@ Options:
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished">Använd inline suppressions</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="848"/>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1634,7 +1869,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1649,38 +1884,38 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation>Bas sökväg:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>Varnings taggar (separerade med semikolon)</translation>
     </message>
@@ -1700,78 +1935,68 @@ Options:
         <translation>Libraries</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation>Suppressions</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>Lägg till</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation>Addons</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation>Tråd säkerhet</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation>Kodstandarder</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="827"/>
+        <location filename="projectfile.ui" line="937"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
+        <location filename="projectfile.ui" line="946"/>
         <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="820"/>
-        <source>Misra C++ 2008</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation>Clang analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation>Clang-tidy</translation>
     </message>
@@ -1784,77 +2009,82 @@ 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="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation>Välj Cppcheck build dir</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>Välj include sökväg</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>Välj mapp att analysera</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation type="unfinished">Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation>Importera Projekt</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>Välj sökväg att ignorera</translation>
     </message>
@@ -1862,193 +2092,258 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <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="116"/>
+        <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="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">Fil</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">Rad</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">Typ</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished">Inconclusive</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">Sammanfattning</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished">Sedan datum</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2056,109 +2351,116 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>Fil</translation>
+        <translation type="vanished">Fil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>Typ</translation>
+        <translation type="vanished">Typ</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>Rad</translation>
+        <translation type="vanished">Rad</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>Sammanfattning</translation>
+        <translation type="vanished">Sammanfattning</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>Odefinierad fil</translation>
+        <translation type="vanished">Odefinierad fil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>debug</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation>note</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
         <source>Recheck</source>
-        <translation>Analysera om</translation>
+        <translation type="vanished">Analysera om</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>Dölj</translation>
+        <translation type="vanished">Dölj</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation>Dölj alla med id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation>Stäng av valda id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation>Ingen tag</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2168,7 +2470,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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2177,12 +2479,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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>Kunde inte hitta filen!</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2191,52 +2493,49 @@ 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="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>Välj mapp</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Inconclusive</source>
-        <translation>Inconclusive</translation>
+        <translation type="vanished">Inconclusive</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Since date</source>
-        <translation>Sedan datum</translation>
+        <translation type="vanished">Sedan datum</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>stil</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>fel</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>varning</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>prestanda</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>portabilitet</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>information</translation>
     </message>
@@ -2244,82 +2543,102 @@ Kontrollera att sökvägen och parametrarna är korrekta.</translation>
 <context>
     <name>ResultsView</name>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>Skriv ut rapport</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation>Inga fel hittades, inget att skriva ut.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%1 av %2 filer analyserade)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>Inga fel hittades.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>Misslyckades att läsa rapporten.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <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="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation>Först inkluderad av</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>Misslyckades med att spara rapporten.</translation>
     </message>
@@ -2329,12 +2648,17 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
         <translation>Resultat</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation>Analys Log</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation>Varningsdetaljer</translation>
     </message>
@@ -2380,7 +2704,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>
@@ -2390,176 +2714,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>
@@ -2567,47 +2895,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>
@@ -2617,14 +2944,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
@@ -2655,7 +2982,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>Föregående analys</translation>
     </message>
@@ -2675,193 +3002,203 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
         <translation>Analys tid:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>Fel:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>Varningar:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Stil varningar:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>Portabilitets varningar:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>Prestanda varningar:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>Informations meddelanden:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation>Historik</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation>Fil:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>Kopiera</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation>Pdf Export</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 dag</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 dagar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 timme</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 timmar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 minut</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 minuter</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 sekund</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 sekunder</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 sekunder</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> och </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation>Exportera PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>Projekt inställningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>Sökvägar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>Include sökvägar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>Definitioner</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>Vald sökväg</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>Antal analyserade filer</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>Fil:</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <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="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>Varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>Stil varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>Portabilitetsvarningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>Prestanda varningar</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>Informationsmeddelanden</translation>
     </message>
@@ -2869,7 +3206,7 @@ För att ställa in vilka fel som skall visas använd visa menyn.</translation>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%1 av %2 filer analyserade</translation>
     </message>
@@ -2877,7 +3214,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="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2890,7 +3227,7 @@ 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="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2898,7 +3235,7 @@ Språket har nollställts till Engelska. Öppna Preferences och välj något av
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>inconclusive</translation>
     </message>
@@ -2906,12 +3243,12 @@ Språket har nollställts till Engelska. Öppna Preferences och välj något av
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts
index f2fb9f702bb..5e329d74f3c 100644
--- a/gui/cppcheck_zh_CN.ts
+++ b/gui/cppcheck_zh_CN.ts
@@ -37,7 +37,8 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -122,38 +123,59 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -194,12 +216,12 @@ Parameters: -l(line) (file)</source>
         <translation>索引</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>帮助文件 &apos;%1&apos; 未找到</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -474,20 +496,20 @@ Parameters: -l(line) (file)</source>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -507,269 +529,271 @@ Parameters: -l(line) (file)</source>
         <translation>工具栏(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ 标准</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <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="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>编辑(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>标准</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>分类</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>许可证(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;U)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>关于(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>文件(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>目录(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>停止(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>保存结果到文件(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>清空结果(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>首选项(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>显示错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>显示信息消息</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>显示可移植性警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>显示 Cppcheck 结果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>显示 Clang 结果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>滤器(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>过滤结果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="721"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>打印(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>打印当前报告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>打印预览(&amp;v)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>打开库编辑器</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>关闭项目文件(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>编辑项目文件(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>统计(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>显示警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>显示隐藏项(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>全部选中(&amp;C)</translation>
     </message>
@@ -784,243 +808,289 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished">隐藏</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>分析(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>滤器</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <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="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>重新分析全部文件(&amp;y)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>风格警告(&amp;n)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>编辑(&amp;r)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation>全部取消选中(&amp;U)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>全部折叠(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>全部展开(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>标准(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translation>标准项</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>内容(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>打开帮助内容</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>工具栏</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>分类(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>错误分类</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>打开 XML (&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>打开项目文件(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation>显示便条(&amp;o)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>新建项目文件(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>日志视图(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>日志视图</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>性能警告(&amp;f)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>信息(&amp;I)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>可移植性(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>平台(&amp;l)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation>&amp;Posix</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>库编辑器(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>自动检测语言(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation>&amp;Enforce C++</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <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="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>重新分析并检查库</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>检查配置(defines, includes)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished">常规</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="458"/>
         <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>
@@ -1029,23 +1099,23 @@ This is probably because the settings were changed between the Cppcheck versions
 这可能是因为 Cppcheck 不同版本间的设置有所不同。请检查(并修复)编辑器应用程序设置，否则编辑器程序可能不会正确启动。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>在选择新的文件或目录之前，你必须先关闭此项目文件！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>快速滤器:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation>选择配置</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <source>Found project file: %1
 
 Do you want to load this project file instead?</source>
@@ -1054,202 +1124,214 @@ Do you want to load this project file instead?</source>
 你是否想加载该项目文件？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation>库 &apos;%1&apos; 包含未知元素：
 %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>文件未找到</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation>无效的 XML</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation>缺失属性</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation>无效的属性值</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>不支持的格式</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation>重复的平台类型</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation>平台类型重定义</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation>位置元素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation>未知问题</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <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="915"/>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
         <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.</source>
-        <translation>加载 %1 失败。您的 Cppcheck 安装已损坏。您可以在命令行添加 --data-dir=&lt;目录&gt; 参数来指定文件位置。请注意，&apos;--data-dir&apos; 参数应当由安装脚本使用，因此，当使用此参数时，GUI不会启动，所发生的一切只是配置了设置。</translation>
+        <translation type="vanished">加载 %1 失败。您的 Cppcheck 安装已损坏。您可以在命令行添加 --data-dir=&lt;目录&gt; 参数来指定文件位置。请注意，&apos;--data-dir&apos; 参数应当由安装脚本使用，因此，当使用此参数时，GUI不会启动，所发生的一切只是配置了设置。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML 文件(*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>打开报告文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1441"/>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>许可证</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>保存报告文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>文本文件(*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 文件(*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>项目文件(*.cppcheck);;所有文件(*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>选择项目文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2049"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>项目:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation>没有找到合适的文件来分析!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation>C/C++ 源码</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation>Compile database</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation>选择要分析的文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation>选择要分析的目录</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>选择要分析的配置</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <source>Found project files from the directory.
 
 Do you want to proceed analysis without using any of these project files?</source>
@@ -1258,7 +1340,44 @@ Do you want to proceed analysis without using any of these project files?</sourc
 您想在不使用这些项目文件的情况下进行分析吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1261"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1269,7 +1388,7 @@ Do you want to proceed?</source>
 你想继续吗?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1278,47 +1397,101 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 您想停止分析并退出 Cppcheck 吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <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="1688"/>
+        <location filename="mainwindow.cpp" line="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>构建文件夹 &apos;%1&apos; 不能存在，创建它吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation>要使用插件检查项目，您需要一个构建目录。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation>导入 &apos;%1&apos; 失败，分析已停止</translation>
+        <translation type="vanished">导入 &apos;%1&apos; 失败，分析已停止</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation>项目文件 (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>选择项目文件名</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation>项目文件未加载</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1335,7 +1508,7 @@ Do you want to remove the file from the recently used projects -list?</source>
 你要从最近使用的项目列表中删除此文件吗？</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1377,7 +1550,7 @@ Options:
                             当使用这个选项时，GUI不会启动。</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - 命令行参数</translation>
     </message>
@@ -1410,7 +1583,7 @@ Options:
         <translation>符号名</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>编辑抑制</translation>
     </message>
@@ -1478,22 +1651,22 @@ Options:
         <translation>注意：把你自己的 .cfg 文件放在和项目文件相同的文件夹中。你应该在上面看到它们。</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation>排除源文件</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation>排除文件夹...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation>排除文件...</translation>
     </message>
@@ -1502,17 +1675,17 @@ Options:
         <translation type="vanished">MISRA C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation>MISRA 规则文本</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -1524,6 +1697,7 @@ Options:
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation>浏览...</translation>
     </message>
@@ -1551,15 +1725,15 @@ Options:
     <message>
         <location filename="projectfile.ui" line="188"/>
         <location filename="projectfile.ui" line="303"/>
-        <location filename="projectfile.ui" line="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <source>Edit</source>
         <translation>编辑</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
@@ -1585,7 +1759,7 @@ Options:
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation>分析</translation>
     </message>
@@ -1605,58 +1779,93 @@ Options:
         <translation>Cppcheck (内建)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="467"/>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>Check that each class has a safe public interface</source>
         <translation>检查每个类是否有一个安全的公共接口</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation>极限分析</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation>最大 CTU 深度</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
-        <source>Misra C 2012</source>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
-        <source>Cert C</source>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished">启用内联方案</translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
-        <source>CERT-INT35-C:  int precision (if size equals precision, you can leave empty)</source>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
-        <source>Misra C++ 2008</source>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="937"/>
+        <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="946"/>
+        <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="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation>外部工具</translation>
     </message>
@@ -1681,37 +1890,37 @@ Options:
         <translation>Clang (实验性的)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="464"/>
+        <location filename="projectfile.ui" line="494"/>
         <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="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation>模板实例化中的最大递归</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation>警告选项</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation>根路径：</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation>警告中的文件路径将相对于此路径</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告标志（用分号隔开）</translation>
     </message>
@@ -1726,58 +1935,74 @@ Options:
         <translation>库</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation>抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation>插件</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation>线程安全</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation>编码标准</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="848"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation>Clang analyzer</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation>Clang-tidy</translation>
     </message>
@@ -1790,77 +2015,82 @@ 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="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation>选择 Cppcheck 构建目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>选择 Include 目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>选择一个检查目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (未找到)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation>Compile database</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation>导入项目</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>选择忽略的目录</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation>源文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation>全部文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation>排除文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation>选择 MISRA 规则文本文件</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA 规则文本文件 (%1)</translation>
     </message>
@@ -1868,191 +2098,256 @@ Options:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>指定了未知语言！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>语言文件 %1 不存在！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="121"/>
+        <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="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation>第%1行：未处理元素 %2</translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation> (未找到)</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation>极细</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation>更细</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation>细</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation>常规</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation>中等</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation>较粗</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation>粗</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation>更粗</translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation>极粗</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation>编辑器前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation>编辑器背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation>高亮背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation>行号前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation>行号背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation>关键字前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation>关键字字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <oldsource>Class ForegroundColor</oldsource>
         <translation>类前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation>类字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation>引用前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation>引用字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation>注释前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation>注释字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation>符号前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation>符号背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation>符号字体大小</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation>设置为默认亮色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation>设置为默认暗色</translation>
     </message>
+    <message>
+        <location filename="resultstree.cpp" line="114"/>
+        <source>File</source>
+        <translation type="unfinished">文件</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">行</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">严重性</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished">不确定的</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished">概要</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">Id</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -2060,109 +2355,116 @@ Options:
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>文件</translation>
+        <translation type="vanished">文件</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>严重性</translation>
+        <translation type="vanished">严重性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>行</translation>
+        <translation type="vanished">行</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Summary</source>
-        <translation>概要</translation>
+        <translation type="vanished">概要</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>未定义文件</translation>
+        <translation type="vanished">未定义文件</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation>找不到文件：</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>请选择文件夹 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>选择目录 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation>请选择文件所在的目录。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation>调试</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation>注意</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
         <source>Recheck</source>
-        <translation>重新检查</translation>
+        <translation type="vanished">重新检查</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>隐藏</translation>
+        <translation type="vanished">隐藏</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation>隐藏全部 ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation>抑制选择的 ID</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation>打开包含的文件夹</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation>标记</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation>取消标记</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <source>No editor application configured.
 
 Configure the editor application for Cppcheck in preferences/Applications.</source>
@@ -2172,7 +2474,7 @@ Configure the editor application for Cppcheck in preferences/Applications.</sour
 在“首先项 / 应用程序”中为 Cppcheck 配置编辑应用程序。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <source>No default editor application selected.
 
 Please select the default editor application in preferences/Applications.</source>
@@ -2181,12 +2483,12 @@ Please select the default editor application in preferences/Applications.</sourc
 请在“首先项 / 应用程序”中选择默认应用程序。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>找不到文件！</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <source>Could not start %1
 
 Please check the application path and parameters are correct.</source>
@@ -2195,52 +2497,49 @@ Please check the application path and parameters are correct.</source>
 请检查此应用程序的路径与参数是否正确。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>选择目录</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>Id</translation>
+        <translation type="vanished">Id</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Inconclusive</source>
-        <translation>不确定的</translation>
+        <translation type="vanished">不确定的</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Since date</source>
-        <translation>日期</translation>
+        <translation type="vanished">日期</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>风格</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>性能</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation>移植可能性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>信息</translation>
     </message>
@@ -2253,95 +2552,124 @@ Please check the application path and parameters are correct.</source>
         <translation>结果</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation>分析日志</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation>警告详情</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>保存报告失败。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>打印报告</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation>没有错误发现，没有可打印内容。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation>%p% (%2 个文件已检查 %1 个)</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>未发现错误。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>读取报告失败。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>不再支持 XML 格式版本 1。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation>首次包含于</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>Id</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
         <source>Bug hunting analysis is incomplete</source>
-        <translation>错误搜寻分析未完成</translation>
+        <translation type="vanished">错误搜寻分析未完成</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation>清空日志</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation>复制此日志条目</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation>复制完整日志</translation>
     </message>
+    <message>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScratchPad</name>
@@ -2384,7 +2712,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>
@@ -2394,176 +2722,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>
@@ -2571,47 +2903,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>
@@ -2621,14 +2952,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>统计</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>项目</translation>
     </message>
@@ -2659,7 +2990,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>上一次扫描</translation>
     </message>
@@ -2679,193 +3010,203 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>扫描时间:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>错误:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation>Stylistic 警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>可移植性警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>性能警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation>历史</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation>文件：</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>复制到剪贴板</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 小时</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 小时</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 分钟</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 分钟</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 秒</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation> 与 </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>项目设置</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>包含路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>定义</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation>未定义</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>选中的路径</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>扫描的文件数</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>扫描时间</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>文件: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>没有 cppcheck 构建目录</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>风格警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>移植可能性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>性能警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>信息</translation>
     </message>
@@ -2873,7 +3214,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation>%2 个文件已检查 %1 个</translation>
     </message>
@@ -2881,7 +3222,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2894,7 +3235,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 用户界面语言已被重置为英语。打开“首选项”对话框，选择任何可用的语言。</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -2902,7 +3243,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation>不确定的</translation>
     </message>
@@ -2910,12 +3251,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation>全部支持的文件 (%1)</translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation>全部文件 (%1)</translation>
     </message>
diff --git a/gui/cppcheck_zh_TW.ts b/gui/cppcheck_zh_TW.ts
index f4ac1fd10b6..c7c220899e8 100644
--- a/gui/cppcheck_zh_TW.ts
+++ b/gui/cppcheck_zh_TW.ts
@@ -37,7 +37,8 @@ of the GNU General Public License version 3</source>
     </message>
     <message>
         <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;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <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>
     </message>
 </context>
@@ -112,38 +113,59 @@ Parameters: -l(line) (file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="22"/>
+        <location filename="compliancereportdialog.ui" line="29"/>
         <source>Project name</source>
         <translation>專案名稱</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="32"/>
+        <location filename="compliancereportdialog.ui" line="22"/>
         <source>Project version</source>
         <translation>專案版本</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.ui" line="44"/>
+        <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="101"/>
+        <location filename="compliancereportdialog.cpp" line="133"/>
         <source>Compliance report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="103"/>
+        <location filename="compliancereportdialog.cpp" line="135"/>
         <source>HTML files (*.html)</source>
         <translation>HTML 檔案 (*.html)</translation>
     </message>
     <message>
-        <location filename="compliancereportdialog.cpp" line="137"/>
+        <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="138"/>
-        <source>Failed to import &apos;%1&apos;, can not show files in compliance report</source>
+        <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>
@@ -184,12 +206,12 @@ Parameters: -l(line) (file)</source>
         <translation>索引</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="83"/>
+        <location filename="helpdialog.cpp" line="84"/>
         <source>Helpfile &apos;%1&apos; was not found</source>
         <translation>找不到幫助檔 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="helpdialog.cpp" line="85"/>
+        <location filename="helpdialog.cpp" line="86"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -452,20 +474,20 @@ Parameters: -l(line) (file)</source>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="26"/>
-        <location filename="mainwindow.ui" line="668"/>
-        <location filename="mainwindow.cpp" line="409"/>
-        <location filename="mainwindow.cpp" line="571"/>
-        <location filename="mainwindow.cpp" line="646"/>
-        <location filename="mainwindow.cpp" line="751"/>
-        <location filename="mainwindow.cpp" line="773"/>
-        <location filename="mainwindow.cpp" line="1260"/>
-        <location filename="mainwindow.cpp" line="1389"/>
-        <location filename="mainwindow.cpp" line="1687"/>
-        <location filename="mainwindow.cpp" line="1695"/>
-        <location filename="mainwindow.cpp" line="1740"/>
-        <location filename="mainwindow.cpp" line="1749"/>
-        <location filename="mainwindow.cpp" line="1820"/>
-        <location filename="mainwindow.cpp" line="1894"/>
+        <location filename="mainwindow.ui" line="687"/>
+        <location filename="mainwindow.cpp" line="463"/>
+        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="857"/>
+        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1466"/>
+        <location filename="mainwindow.cpp" line="1595"/>
+        <location filename="mainwindow.cpp" line="1936"/>
+        <location filename="mainwindow.cpp" line="1944"/>
+        <location filename="mainwindow.cpp" line="1998"/>
+        <location filename="mainwindow.cpp" line="2007"/>
+        <location filename="mainwindow.cpp" line="2079"/>
+        <location filename="mainwindow.cpp" line="2153"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -495,500 +517,548 @@ Parameters: -l(line) (file)</source>
         <translation>工具條(&amp;T)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="184"/>
+        <location filename="mainwindow.ui" line="164"/>
+        <location filename="mainwindow.ui" line="979"/>
+        <source>Report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="198"/>
         <source>&amp;Help</source>
         <translation>幫助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="194"/>
+        <location filename="mainwindow.ui" line="209"/>
         <source>A&amp;nalyze</source>
         <translation>分析(&amp;N)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="213"/>
         <source>C++ standard</source>
         <translation>C++ 標準</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="209"/>
+        <location filename="mainwindow.ui" line="225"/>
         <source>&amp;C standard</source>
         <translation>C 標準(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="234"/>
+        <location filename="mainwindow.ui" line="253"/>
         <source>&amp;Edit</source>
         <translation>編輯(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="247"/>
+        <location filename="mainwindow.ui" line="266"/>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="265"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Categories</source>
         <translation>分類</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="284"/>
+        <location filename="mainwindow.ui" line="303"/>
         <source>Filter</source>
         <translation>篩選</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
+        <location filename="mainwindow.ui" line="314"/>
         <source>&amp;License...</source>
         <translation>授權(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="300"/>
+        <location filename="mainwindow.ui" line="319"/>
         <source>A&amp;uthors...</source>
         <translation>作者(&amp;U)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="309"/>
+        <location filename="mainwindow.ui" line="328"/>
         <source>&amp;About...</source>
         <translation>關於(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="314"/>
+        <location filename="mainwindow.ui" line="333"/>
         <source>&amp;Files...</source>
         <translation>檔案(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="317"/>
-        <location filename="mainwindow.ui" line="320"/>
+        <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="323"/>
+        <location filename="mainwindow.ui" line="342"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="351"/>
         <source>&amp;Directory...</source>
         <translation>目錄(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <location filename="mainwindow.ui" line="338"/>
+        <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="341"/>
+        <location filename="mainwindow.ui" line="360"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="350"/>
+        <location filename="mainwindow.ui" line="369"/>
         <source>&amp;Reanalyze modified files</source>
         <translation>重新分析已修改的檔案(&amp;R)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="353"/>
+        <location filename="mainwindow.ui" line="372"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="362"/>
+        <location filename="mainwindow.ui" line="381"/>
         <source>Reanal&amp;yze all files</source>
         <translation>重新分析所有檔案(&amp;Y)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="390"/>
         <source>&amp;Stop</source>
         <translation>停止(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="374"/>
-        <location filename="mainwindow.ui" line="377"/>
+        <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="380"/>
+        <location filename="mainwindow.ui" line="399"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="389"/>
+        <location filename="mainwindow.ui" line="408"/>
         <source>&amp;Save results to file...</source>
         <translation>儲存結果為檔案(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="392"/>
+        <location filename="mainwindow.ui" line="411"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="397"/>
+        <location filename="mainwindow.ui" line="416"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="400"/>
+        <location filename="mainwindow.ui" line="419"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="409"/>
+        <location filename="mainwindow.ui" line="428"/>
         <source>&amp;Clear results</source>
         <translation>清除結果(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="418"/>
+        <location filename="mainwindow.ui" line="437"/>
         <source>&amp;Preferences</source>
         <translation>偏好設定(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="449"/>
         <source>Style war&amp;nings</source>
         <translation>樣式警告(&amp;N)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="433"/>
-        <location filename="mainwindow.ui" line="436"/>
+        <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="448"/>
+        <location filename="mainwindow.ui" line="467"/>
         <source>E&amp;rrors</source>
         <translation>錯誤(&amp;R)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="451"/>
-        <location filename="mainwindow.ui" line="454"/>
+        <location filename="mainwindow.ui" line="470"/>
+        <location filename="mainwindow.ui" line="473"/>
+        <location filename="mainwindow.cpp" line="2379"/>
         <source>Show errors</source>
         <translation>顯示錯誤</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="459"/>
+        <location filename="mainwindow.ui" line="478"/>
         <source>&amp;Check all</source>
         <translation>全部檢查(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="464"/>
+        <location filename="mainwindow.ui" line="483"/>
         <source>&amp;Uncheck all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="469"/>
+        <location filename="mainwindow.ui" line="488"/>
         <source>Collapse &amp;all</source>
         <translation>全部摺疊(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="493"/>
         <source>&amp;Expand all</source>
         <translation>全部展開(&amp;E)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="482"/>
+        <location filename="mainwindow.ui" line="501"/>
         <source>&amp;Standard</source>
         <translation>標準(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="485"/>
+        <location filename="mainwindow.ui" line="504"/>
         <source>Standard items</source>
         <translatorcomment>標準項目</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="490"/>
+        <location filename="mainwindow.ui" line="509"/>
         <source>&amp;Contents</source>
         <translation>內容(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="493"/>
+        <location filename="mainwindow.ui" line="512"/>
         <source>Open the help contents</source>
         <translation>開啟幫助內容</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="496"/>
+        <location filename="mainwindow.ui" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="501"/>
+        <location filename="mainwindow.ui" line="520"/>
         <source>Toolbar</source>
         <translation>工具條</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="509"/>
+        <location filename="mainwindow.ui" line="528"/>
         <source>&amp;Categories</source>
         <translation>分類(&amp;C)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="512"/>
+        <location filename="mainwindow.ui" line="531"/>
         <source>Error categories</source>
         <translation>錯誤分類</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="517"/>
+        <location filename="mainwindow.ui" line="536"/>
         <source>&amp;Open XML...</source>
         <translation>開啟 XML(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="526"/>
+        <location filename="mainwindow.ui" line="545"/>
         <source>Open P&amp;roject File...</source>
         <translation>開啟專案檔(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="529"/>
+        <location filename="mainwindow.ui" line="548"/>
         <source>Ctrl+Shift+O</source>
         <translation>Ctrl+Shift+O</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="538"/>
+        <location filename="mainwindow.ui" line="557"/>
         <source>Sh&amp;ow Scratchpad...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="562"/>
         <source>&amp;New Project File...</source>
         <translation>新增專案檔(&amp;N)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="546"/>
+        <location filename="mainwindow.ui" line="565"/>
         <source>Ctrl+Shift+N</source>
         <translation>Ctrl+Shift+N</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="551"/>
+        <location filename="mainwindow.ui" line="570"/>
         <source>&amp;Log View</source>
         <translation>日誌檢視(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="554"/>
+        <location filename="mainwindow.ui" line="573"/>
         <source>Log View</source>
         <translation>日誌檢視</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="562"/>
+        <location filename="mainwindow.ui" line="581"/>
         <source>C&amp;lose Project File</source>
         <translation>關閉專案檔(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="570"/>
+        <location filename="mainwindow.ui" line="589"/>
         <source>&amp;Edit Project File...</source>
         <translation>編輯專案檔(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="582"/>
+        <location filename="mainwindow.ui" line="601"/>
         <source>&amp;Statistics</source>
         <translation>統計資料(&amp;S)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="594"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&amp;Warnings</source>
         <translation>警告(&amp;W)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="597"/>
-        <location filename="mainwindow.ui" line="600"/>
+        <location filename="mainwindow.ui" line="616"/>
+        <location filename="mainwindow.ui" line="619"/>
+        <location filename="mainwindow.cpp" line="2380"/>
         <source>Show warnings</source>
         <translation>顯示警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="612"/>
+        <location filename="mainwindow.ui" line="631"/>
         <source>Per&amp;formance warnings</source>
         <translation>效能警告(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="615"/>
-        <location filename="mainwindow.ui" line="618"/>
+        <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="626"/>
+        <location filename="mainwindow.ui" line="645"/>
         <source>Show &amp;hidden</source>
         <translation>顯示隱藏項目(&amp;H)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="638"/>
+        <location filename="mainwindow.ui" line="657"/>
         <source>&amp;Information</source>
         <translation>資訊(&amp;I)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="641"/>
+        <location filename="mainwindow.ui" line="660"/>
         <source>Show information messages</source>
         <translation>顯示資訊訊息</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="672"/>
         <source>&amp;Portability</source>
         <translation>可移植性(&amp;P)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="656"/>
+        <location filename="mainwindow.ui" line="675"/>
         <source>Show portability warnings</source>
         <translation>顯示可移植性警告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="671"/>
+        <location filename="mainwindow.ui" line="690"/>
         <source>Show Cppcheck results</source>
         <translation>顯示 Cppcheck 結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="683"/>
+        <location filename="mainwindow.ui" line="702"/>
         <source>Clang</source>
         <translation>Clang</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="686"/>
+        <location filename="mainwindow.ui" line="705"/>
         <source>Show Clang results</source>
         <translation>顯示 Clang 結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="694"/>
+        <location filename="mainwindow.ui" line="713"/>
         <source>&amp;Filter</source>
         <translation>篩選(&amp;F)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="697"/>
+        <location filename="mainwindow.ui" line="716"/>
         <source>Filter results</source>
         <translation>篩選結果</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="713"/>
+        <location filename="mainwindow.ui" line="732"/>
         <source>Windows 32-bit ANSI</source>
         <translation>Windows 32 位元 ANSI</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="721"/>
+        <location filename="mainwindow.ui" line="740"/>
         <source>Windows 32-bit Unicode</source>
         <translation>Windows 32 位元 Unicode</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="729"/>
+        <location filename="mainwindow.ui" line="748"/>
         <source>Unix 32-bit</source>
         <translation>Unix 32 位元</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="756"/>
         <source>Unix 64-bit</source>
         <translation>Unix 64 位元</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="745"/>
+        <location filename="mainwindow.ui" line="764"/>
         <source>Windows 64-bit</source>
         <translation>Windows 64 位元</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="753"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>P&amp;latforms</source>
         <translation>平臺(&amp;L)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="767"/>
+        <location filename="mainwindow.ui" line="786"/>
         <source>C++&amp;11</source>
         <translation>C++&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="797"/>
         <source>C&amp;99</source>
         <translation>C&amp;99</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="786"/>
+        <location filename="mainwindow.ui" line="805"/>
         <source>&amp;Posix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="794"/>
+        <location filename="mainwindow.ui" line="813"/>
         <source>C&amp;11</source>
         <translation>C&amp;11</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="802"/>
+        <location filename="mainwindow.ui" line="845"/>
         <source>&amp;C89</source>
         <translation>&amp;C89</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="810"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>&amp;C++03</source>
         <translation>&amp;C++03</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="858"/>
         <source>&amp;Print...</source>
         <translation>列印(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="818"/>
+        <location filename="mainwindow.ui" line="861"/>
         <source>Print the Current Report</source>
         <translation>列印當前報告</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="823"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>Print Pre&amp;view...</source>
         <translation>列印預覽(&amp;V)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="826"/>
+        <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="831"/>
+        <location filename="mainwindow.ui" line="874"/>
         <source>&amp;Library Editor...</source>
         <translation>程式庫編輯器(&amp;L)...</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="834"/>
+        <location filename="mainwindow.ui" line="877"/>
         <source>Open library editor</source>
         <translation>開啟程式庫編輯器</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="842"/>
+        <location filename="mainwindow.ui" line="885"/>
         <source>&amp;Auto-detect language</source>
         <translation>自動偵測語言(&amp;A)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="850"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>&amp;Enforce C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="901"/>
         <source>E&amp;nforce C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="869"/>
+        <location filename="mainwindow.ui" line="912"/>
         <source>C++14</source>
         <translation>C++14</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="877"/>
+        <location filename="mainwindow.ui" line="920"/>
         <source>Reanalyze and check library</source>
         <translation>重新分析並檢查程式庫</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="885"/>
+        <location filename="mainwindow.ui" line="928"/>
         <source>Check configuration (defines, includes)</source>
         <translation>檢查組態 (定義、包含)</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="893"/>
+        <location filename="mainwindow.ui" line="936"/>
         <source>C++17</source>
         <translation>C++17</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="904"/>
+        <location filename="mainwindow.ui" line="947"/>
         <source>C++20</source>
         <translation>C++20</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="920"/>
+        <location filename="mainwindow.ui" line="974"/>
         <source>Compliance report...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="107"/>
+        <location filename="mainwindow.ui" line="987"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="995"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1003"/>
+        <source>Misra C++ 2008</source>
+        <translation type="unfinished">Misra C++ 2008</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1011"/>
+        <source>Cert C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1019"/>
+        <source>Cert C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1027"/>
+        <source>Misra C++ 2023</source>
+        <translation type="unfinished">Misra C++ 2023</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1035"/>
+        <source>Autosar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="1040"/>
+        <source>EULA...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="100"/>
         <source>Cppcheck GUI.
 
 Syntax:
@@ -1006,171 +1076,206 @@ Options:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="122"/>
+        <location filename="main.cpp" line="115"/>
         <source>Cppcheck GUI - Command line parameters</source>
         <translation>Cppcheck GUI - 命令行參數</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="141"/>
-        <location filename="mainwindow.cpp" line="1559"/>
+        <location filename="mainwindow.cpp" line="155"/>
+        <location filename="mainwindow.cpp" line="1781"/>
         <source>Quick Filter:</source>
         <translation>快速篩選:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="213"/>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1627"/>
-        <location filename="mainwindow.cpp" line="1789"/>
+        <location filename="mainwindow.cpp" line="239"/>
+        <location filename="mainwindow.cpp" line="1783"/>
+        <location filename="mainwindow.cpp" line="1849"/>
+        <location filename="mainwindow.cpp" line="2047"/>
         <source>Project:</source>
         <translation>專案:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="404"/>
+        <location filename="mainwindow.cpp" line="458"/>
         <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="572"/>
+        <location filename="mainwindow.cpp" line="668"/>
         <source>No suitable files found to analyze!</source>
         <translation>找不到適合的檔案來分析！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="647"/>
+        <location filename="mainwindow.cpp" line="753"/>
         <source>You must close the project file before selecting new files or directories!</source>
         <translation>您必須在選取新檔案或目錄之前關閉該專案檔！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="661"/>
+        <location filename="mainwindow.cpp" line="767"/>
         <source>C/C++ Source</source>
         <translation>C/C++ 來源檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="662"/>
+        <location filename="mainwindow.cpp" line="768"/>
         <source>Compile database</source>
         <translation>編譯資料庫</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="663"/>
+        <location filename="mainwindow.cpp" line="769"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="664"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="667"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>Select files to analyze</source>
         <translation>選取要分析的檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="682"/>
+        <location filename="mainwindow.cpp" line="788"/>
         <source>Select directory to analyze</source>
         <translation>選取要分析的目錄</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select configuration</source>
         <translation>選取組態</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="722"/>
+        <location filename="mainwindow.cpp" line="828"/>
         <source>Select the configuration that will be analyzed</source>
         <translation>選取要分析的組態</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="752"/>
+        <location filename="mainwindow.cpp" line="858"/>
         <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="774"/>
+        <location filename="mainwindow.cpp" line="880"/>
         <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="861"/>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="983"/>
+        <location filename="mainwindow.cpp" line="1024"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="983"/>
         <source>The library &apos;%1&apos; contains unknown elements:
 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="870"/>
+        <location filename="mainwindow.cpp" line="992"/>
         <source>File not found</source>
         <translation>找不到檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="873"/>
+        <location filename="mainwindow.cpp" line="995"/>
         <source>Bad XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="876"/>
+        <location filename="mainwindow.cpp" line="998"/>
         <source>Missing attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="879"/>
+        <location filename="mainwindow.cpp" line="1001"/>
         <source>Bad attribute value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="882"/>
+        <location filename="mainwindow.cpp" line="1004"/>
         <source>Unsupported format</source>
         <translation>未支援的格式</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="885"/>
+        <location filename="mainwindow.cpp" line="1007"/>
         <source>Duplicate platform type</source>
         <translation>重複的平臺型別</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="888"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>Platform type redefined</source>
         <translation>平臺型別重定義</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="891"/>
+        <location filename="mainwindow.cpp" line="1013"/>
+        <source>Duplicate define</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1016"/>
         <source>Unknown element</source>
         <translation>未知的元素</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="894"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Unknown issue</source>
         <translation>未知的議題</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <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="915"/>
+        <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="1058"/>
+        <source>Failed to load/setup addon %1: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="915"/>
-        <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.</source>
+        <location filename="mainwindow.cpp" line="1080"/>
+        <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="1261"/>
+        <location filename="mainwindow.cpp" line="1090"/>
+        <source>Failed to load %1 - %2
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1102"/>
+        <location filename="mainwindow.cpp" line="1197"/>
+        <source>%1
+
+Analysis is aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1467"/>
         <source>Current results will be cleared.
 
 Opening a new XML file will clear current results.
@@ -1178,18 +1283,18 @@ Do you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1276"/>
-        <location filename="mainwindow.cpp" line="1470"/>
+        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1681"/>
         <source>XML files (*.xml)</source>
         <translation>XML 檔案 (*.xml)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1278"/>
+        <location filename="mainwindow.cpp" line="1484"/>
         <source>Open the report file</source>
         <translation>開啟報告檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1385"/>
+        <location filename="mainwindow.cpp" line="1591"/>
         <source>Analyzer is running.
 
 Do you want to stop the analysis and exit Cppcheck?</source>
@@ -1198,77 +1303,82 @@ Do you want to stop the analysis and exit Cppcheck?</source>
 您想停止分析並離開 Cppcheck 嗎？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1427"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1441"/>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>License</source>
         <translation>授權</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1448"/>
+        <location filename="mainwindow.cpp" line="1654"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1461"/>
+        <location filename="mainwindow.cpp" line="1672"/>
         <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="1463"/>
+        <location filename="mainwindow.cpp" line="1674"/>
         <source>Save the report file</source>
         <translation>儲存報告檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1474"/>
+        <location filename="mainwindow.cpp" line="1685"/>
         <source>Text files (*.txt)</source>
         <translation>文字檔 (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1478"/>
+        <location filename="mainwindow.cpp" line="1689"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV 檔案 (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1597"/>
+        <location filename="mainwindow.cpp" line="1712"/>
+        <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="1819"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation>專案檔 (*.cppcheck);;所有檔案 (*.*)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1599"/>
+        <location filename="mainwindow.cpp" line="1821"/>
         <source>Select Project File</source>
         <translation>選取專案檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1688"/>
+        <location filename="mainwindow.cpp" line="1937"/>
         <source>Build dir &apos;%1&apos; does not exist, create it?</source>
         <translation>建置目錄 &apos;%1&apos; 不存在，是否建立它？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1696"/>
+        <location filename="mainwindow.cpp" line="1945"/>
         <source>To check the project using addons, you need a build directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1977"/>
         <source>Failed to open file</source>
         <translation>無法開啟檔案</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1731"/>
+        <location filename="mainwindow.cpp" line="1980"/>
         <source>Unknown project file format</source>
         <translation>未知的專案檔格式</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1734"/>
+        <location filename="mainwindow.cpp" line="1983"/>
         <source>Failed to import project file</source>
         <translation>無法匯入專案檔</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1741"/>
+        <location filename="mainwindow.cpp" line="1999"/>
         <source>Failed to import &apos;%1&apos;: %2
 
 Analysis is stopped.</source>
@@ -1277,27 +1387,86 @@ Analysis is stopped.</source>
 停止分析。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1750"/>
+        <location filename="mainwindow.cpp" line="2008"/>
+        <source>Failed to import &apos;%1&apos; (%2), analysis is stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2352"/>
+        <source>Show Mandatory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2353"/>
+        <source>Show Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2354"/>
+        <source>Show Advisory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2355"/>
+        <source>Show Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2372"/>
+        <source>Show L1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2373"/>
+        <source>Show L2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2374"/>
+        <source>Show L3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2381"/>
+        <source>Show style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2382"/>
+        <source>Show portability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2383"/>
+        <source>Show performance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2384"/>
+        <source>Show information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to import &apos;%1&apos;, analysis is stopped</source>
-        <translation>無法匯入 &apos;%1&apos;，停止分析</translation>
+        <translation type="vanished">無法匯入 &apos;%1&apos;，停止分析</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1774"/>
+        <location filename="mainwindow.cpp" line="2032"/>
         <source>Project files (*.cppcheck)</source>
         <translation>專案檔 (*.cppcheck)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1776"/>
+        <location filename="mainwindow.cpp" line="2034"/>
         <source>Select Project Filename</source>
         <translation>選取專案檔案名稱</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1821"/>
+        <location filename="mainwindow.cpp" line="2080"/>
         <source>No project file loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1889"/>
+        <location filename="mainwindow.cpp" line="2148"/>
         <source>The project file
 
 %1
@@ -1314,12 +1483,12 @@ Do you want to remove the file from the recently used projects -list?</source>
 您要從最近使用的專案列表中移除該檔案嗎？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2049"/>
+        <location filename="mainwindow.cpp" line="2310"/>
         <source>Install</source>
         <translation>安章</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2314"/>
         <source>New version available: %1. %2</source>
         <translation>可用的新版本: %1. %2</translation>
     </message>
@@ -1352,7 +1521,7 @@ Do you want to remove the file from the recently used projects -list?</source>
         <translation>符號名稱</translation>
     </message>
     <message>
-        <location filename="newsuppressiondialog.cpp" line="80"/>
+        <location filename="newsuppressiondialog.cpp" line="83"/>
         <source>Edit suppression</source>
         <translation>編輯抑制</translation>
     </message>
@@ -1410,6 +1579,7 @@ Do you want to remove the file from the recently used projects -list?</source>
     <message>
         <location filename="projectfile.ui" line="60"/>
         <location filename="projectfile.ui" line="422"/>
+        <location filename="projectfile.ui" line="616"/>
         <source>Browse...</source>
         <translation>瀏覽...</translation>
     </message>
@@ -1442,15 +1612,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="654"/>
+        <location filename="projectfile.ui" line="690"/>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <location filename="projectfile.ui" line="195"/>
         <location filename="projectfile.ui" line="310"/>
-        <location filename="projectfile.ui" line="661"/>
-        <location filename="projectfile.ui" line="704"/>
+        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="740"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
@@ -1511,7 +1681,7 @@ Do you want to remove the file from the recently used projects -list?</source>
     </message>
     <message>
         <location filename="projectfile.ui" line="403"/>
-        <location filename="projectfile.ui" line="458"/>
+        <location filename="projectfile.ui" line="488"/>
         <source>Analysis</source>
         <translation>分析</translation>
     </message>
@@ -1540,184 +1710,243 @@ Do you want to remove the file from the recently used projects -list?</source>
         <source>Clang (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="projectfile.ui" line="458"/>
+        <source>Check level</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="projectfile.ui" line="464"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <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="467"/>
+        <location filename="projectfile.ui" line="497"/>
         <source>Check that each class has a safe public interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="483"/>
+        <location filename="projectfile.ui" line="513"/>
         <source>Limit analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="489"/>
+        <location filename="projectfile.ui" line="519"/>
         <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="499"/>
+        <location filename="projectfile.ui" line="529"/>
         <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="511"/>
+        <location filename="projectfile.ui" line="541"/>
         <source>Max CTU depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="542"/>
+        <location filename="projectfile.ui" line="572"/>
         <source>Max recursion in template instantiation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="591"/>
+        <location filename="projectfile.ui" line="607"/>
+        <source>Premium License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="627"/>
         <source>Warning options</source>
         <translation>警告選項</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="597"/>
+        <location filename="projectfile.ui" line="633"/>
         <source>Root path:</source>
         <translation>根路徑:</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="603"/>
+        <location filename="projectfile.ui" line="639"/>
         <source>Filepaths in warnings will be relative to this path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="613"/>
+        <location filename="projectfile.ui" line="649"/>
         <source>Warning tags (separated by semicolon)</source>
         <translation>警告標記 (由分號分隔)</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="619"/>
+        <location filename="projectfile.ui" line="655"/>
         <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="629"/>
+        <location filename="projectfile.ui" line="665"/>
         <source>Exclude source files</source>
         <translation>排除來源檔</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="640"/>
+        <location filename="projectfile.ui" line="676"/>
         <source>Exclude folder...</source>
         <translation>排除資料夾...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="647"/>
+        <location filename="projectfile.ui" line="683"/>
         <source>Exclude file...</source>
         <translation>排除檔案...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="686"/>
+        <location filename="projectfile.ui" line="722"/>
         <source>Suppressions</source>
         <translation>抑制</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="697"/>
+        <location filename="projectfile.ui" line="733"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="743"/>
-        <location filename="projectfile.ui" line="749"/>
+        <location filename="projectfile.ui" line="765"/>
+        <source>Enable inline suppressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="786"/>
+        <location filename="projectfile.ui" line="792"/>
         <source>Addons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="755"/>
+        <location filename="projectfile.ui" line="798"/>
         <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="765"/>
+        <location filename="projectfile.ui" line="808"/>
         <source>Y2038</source>
         <translation>Y2038</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="772"/>
+        <location filename="projectfile.ui" line="815"/>
         <source>Thread safety</source>
         <translation>執行緒安全</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="782"/>
+        <location filename="projectfile.ui" line="825"/>
         <source>Coding standards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="788"/>
+        <location filename="projectfile.ui" line="833"/>
+        <source>Misra C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="841"/>
+        <source>2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="846"/>
+        <location filename="projectfile.ui" line="914"/>
+        <source>2023</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="851"/>
+        <source>2025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="901"/>
+        <source>Misra C++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfile.ui" line="909"/>
+        <source>2008</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Misra C 2012</source>
-        <translation>Misra C 2012</translation>
+        <translation type="vanished">Misra C 2012</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="797"/>
+        <location filename="projectfile.ui" line="876"/>
         <source>MISRA rule texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="804"/>
+        <location filename="projectfile.ui" line="883"/>
         <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="811"/>
+        <location filename="projectfile.ui" line="890"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="820"/>
         <source>Misra C++ 2008</source>
-        <translation>Misra C++ 2008</translation>
+        <translation type="vanished">Misra C++ 2008</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="827"/>
+        <location filename="projectfile.ui" line="937"/>
         <source>Cert C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="836"/>
+        <location filename="projectfile.ui" line="946"/>
         <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="848"/>
+        <location filename="projectfile.ui" line="958"/>
         <source>Cert C++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="855"/>
+        <location filename="projectfile.ui" line="965"/>
         <source>Autosar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="865"/>
+        <location filename="projectfile.ui" line="975"/>
         <source>Bug hunting (Premium)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="871"/>
+        <location filename="projectfile.ui" line="981"/>
         <source>Bug hunting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="881"/>
+        <location filename="projectfile.ui" line="991"/>
         <source>External tools</source>
         <translation>外部工具</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="887"/>
+        <location filename="projectfile.ui" line="997"/>
         <source>Clang-tidy</source>
         <translation>Clang-tidy</translation>
     </message>
     <message>
-        <location filename="projectfile.ui" line="894"/>
+        <location filename="projectfile.ui" line="1004"/>
         <source>Clang analyzer</source>
         <translation>Clang 分析器</translation>
     </message>
@@ -1725,77 +1954,82 @@ Do you want to remove the file from the recently used projects -list?</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="407"/>
+        <location filename="projectfiledialog.cpp" line="414"/>
+        <source>Note: Open source Cppcheck does not fully implement Misra C 2012</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="projectfiledialog.cpp" line="477"/>
         <source>Clang-tidy (not found)</source>
         <translation>Clang-tidy (找不到)</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="523"/>
+        <location filename="projectfiledialog.cpp" line="604"/>
         <source>Select Cppcheck build dir</source>
         <translation>選取 Cppcheck 建置目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="563"/>
+        <location filename="projectfiledialog.cpp" line="643"/>
         <source>Visual Studio</source>
         <translation>Visual Studio</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="564"/>
+        <location filename="projectfiledialog.cpp" line="644"/>
         <source>Compile database</source>
         <translation>編譯資料庫</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="565"/>
+        <location filename="projectfiledialog.cpp" line="645"/>
         <source>Borland C++ Builder 6</source>
         <translation>Borland C++ Builder 6</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="566"/>
+        <location filename="projectfiledialog.cpp" line="646"/>
         <source>Import Project</source>
         <translation>匯入專案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="773"/>
+        <location filename="projectfiledialog.cpp" line="845"/>
         <source>Select a directory to check</source>
         <translation>選取要檢查的目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="793"/>
+        <location filename="projectfiledialog.cpp" line="865"/>
         <source>Select include directory</source>
         <translation>選取包含目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="813"/>
+        <location filename="projectfiledialog.cpp" line="885"/>
         <source>Select directory to ignore</source>
         <translation>選取要忽略的目錄</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="821"/>
+        <location filename="projectfiledialog.cpp" line="893"/>
         <source>Source files</source>
         <translation>來源檔</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="822"/>
+        <location filename="projectfiledialog.cpp" line="894"/>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="823"/>
+        <location filename="projectfiledialog.cpp" line="895"/>
         <source>Exclude file</source>
         <translation>排除檔案</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="907"/>
+        <location filename="projectfiledialog.cpp" line="978"/>
         <source>Select MISRA rule texts file</source>
         <translation>選取 MISRA 規則文字檔</translation>
     </message>
     <message>
-        <location filename="projectfiledialog.cpp" line="909"/>
+        <location filename="projectfiledialog.cpp" line="980"/>
         <source>MISRA rule texts file (%1)</source>
         <translation>MISRA 規則文字檔 (%1)</translation>
     </message>
@@ -1803,190 +2037,255 @@ Do you want to remove the file from the recently used projects -list?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="75"/>
+        <location filename="codeeditstylecontrols.cpp" line="76"/>
         <source>Thin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="77"/>
+        <location filename="codeeditstylecontrols.cpp" line="78"/>
         <source>ExtraLight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="79"/>
+        <location filename="codeeditstylecontrols.cpp" line="80"/>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="81"/>
+        <location filename="codeeditstylecontrols.cpp" line="82"/>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="83"/>
+        <location filename="codeeditstylecontrols.cpp" line="84"/>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="85"/>
+        <location filename="codeeditstylecontrols.cpp" line="86"/>
         <source>DemiBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="87"/>
+        <location filename="codeeditstylecontrols.cpp" line="88"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="89"/>
+        <location filename="codeeditstylecontrols.cpp" line="90"/>
         <source>ExtraBold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstylecontrols.cpp" line="91"/>
+        <location filename="codeeditstylecontrols.cpp" line="92"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="80"/>
+        <location filename="codeeditstyledialog.cpp" line="81"/>
         <source>Editor Foreground Color</source>
         <translation>編輯器前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="83"/>
+        <location filename="codeeditstyledialog.cpp" line="84"/>
         <source>Editor Background Color</source>
         <translation>編輯器背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="86"/>
+        <location filename="codeeditstyledialog.cpp" line="87"/>
         <source>Highlight Background Color</source>
         <translation>標明背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="89"/>
+        <location filename="codeeditstyledialog.cpp" line="90"/>
         <source>Line Number Foreground Color</source>
         <translation>行號前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="92"/>
+        <location filename="codeeditstyledialog.cpp" line="93"/>
         <source>Line Number Background Color</source>
         <translation>行號背景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="95"/>
+        <location filename="codeeditstyledialog.cpp" line="96"/>
         <source>Keyword Foreground Color</source>
         <translation>關鍵字前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="98"/>
+        <location filename="codeeditstyledialog.cpp" line="99"/>
         <source>Keyword Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="101"/>
+        <location filename="codeeditstyledialog.cpp" line="102"/>
         <source>Class Foreground Color</source>
         <translation>類別前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="104"/>
+        <location filename="codeeditstyledialog.cpp" line="105"/>
         <source>Class Font Weight</source>
         <translation type="unfinished">類別字型粗細</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="107"/>
+        <location filename="codeeditstyledialog.cpp" line="108"/>
         <source>Quote Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="110"/>
+        <location filename="codeeditstyledialog.cpp" line="111"/>
         <source>Quote Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="113"/>
+        <location filename="codeeditstyledialog.cpp" line="114"/>
         <source>Comment Foreground Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="116"/>
+        <location filename="codeeditstyledialog.cpp" line="117"/>
         <source>Comment Font Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="119"/>
+        <location filename="codeeditstyledialog.cpp" line="120"/>
         <source>Symbol Foreground Color</source>
         <translation>符號前景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="122"/>
+        <location filename="codeeditstyledialog.cpp" line="123"/>
         <source>Symbol Background Color</source>
         <translation>符號被景色</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="125"/>
+        <location filename="codeeditstyledialog.cpp" line="126"/>
         <source>Symbol Font Weight</source>
         <translation>符號字型粗細</translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="145"/>
+        <location filename="codeeditstyledialog.cpp" line="142"/>
         <source>Set to Default Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="codeeditstyledialog.cpp" line="147"/>
+        <location filename="codeeditstyledialog.cpp" line="144"/>
         <source>Set to Default Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="43"/>
+        <location filename="cppchecklibrarydata.cpp" line="38"/>
         <source>line %1: Unhandled element %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cppchecklibrarydata.cpp" line="48"/>
+        <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="277"/>
+        <location filename="projectfiledialog.cpp" line="302"/>
         <source> (Not found)</source>
         <translation> (找不到)</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="90"/>
+        <location filename="translationhandler.cpp" line="91"/>
         <source>Unknown language specified!</source>
         <translation>指定了未知語言！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="116"/>
+        <location filename="translationhandler.cpp" line="117"/>
         <source>Language file %1 not found!</source>
         <translation>找不到語言檔 %1！</translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="121"/>
+        <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="114"/>
+        <source>File</source>
+        <translation type="unfinished">檔案</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="115"/>
+        <source>Line</source>
+        <translation type="unfinished">行號</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="116"/>
+        <source>Severity</source>
+        <translation type="unfinished">安全性</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="117"/>
+        <source>Classification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="118"/>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="119"/>
+        <source>Inconclusive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="120"/>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="121"/>
+        <source>Id</source>
+        <translation type="unfinished">識別號</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="122"/>
+        <source>Guideline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="123"/>
+        <source>Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="124"/>
+        <source>Since date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="125"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="126"/>
+        <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>
@@ -1994,182 +2293,170 @@ Do you want to remove the file from the recently used projects -list?</source>
 <context>
     <name>ResultsTree</name>
     <message>
-        <location filename="resultstree.cpp" line="165"/>
         <source>Undefined file</source>
-        <translation>未定義的檔案</translation>
+        <translation type="vanished">未定義的檔案</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="287"/>
+        <location filename="resultstree.cpp" line="298"/>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="344"/>
+        <location filename="resultstree.cpp" line="349"/>
         <source>style</source>
         <translation>樣式</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="347"/>
+        <location filename="resultstree.cpp" line="352"/>
         <source>error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="350"/>
+        <location filename="resultstree.cpp" line="355"/>
         <source>warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="353"/>
+        <location filename="resultstree.cpp" line="358"/>
         <source>performance</source>
         <translation>效能</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="356"/>
+        <location filename="resultstree.cpp" line="361"/>
         <source>portability</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="359"/>
+        <location filename="resultstree.cpp" line="364"/>
         <source>information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="362"/>
+        <location filename="resultstree.cpp" line="367"/>
         <source>debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="664"/>
-        <source>Recheck</source>
+        <location filename="resultstree.cpp" line="370"/>
+        <source>internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="665"/>
+        <location filename="resultstree.cpp" line="657"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="666"/>
         <source>Hide</source>
-        <translation>隱藏</translation>
+        <translation type="vanished">隱藏</translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="656"/>
+        <source>Recheck %1 file(s)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="667"/>
+        <location filename="resultstree.cpp" line="658"/>
+        <source>Hide %1 result(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultstree.cpp" line="659"/>
         <source>Hide all with id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="668"/>
+        <location filename="resultstree.cpp" line="660"/>
         <source>Open containing folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="686"/>
+        <location filename="resultstree.cpp" line="681"/>
         <source>Suppress selected id(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="702"/>
-        <location filename="resultstree.cpp" line="1438"/>
+        <location filename="resultstree.cpp" line="701"/>
         <source>Tag</source>
         <translation>標記</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="704"/>
+        <location filename="resultstree.cpp" line="703"/>
         <source>No tag</source>
         <translation>取消標記</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="746"/>
-        <location filename="resultstree.cpp" line="760"/>
+        <location filename="resultstree.cpp" line="733"/>
+        <location filename="resultstree.cpp" line="747"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="747"/>
+        <location filename="resultstree.cpp" line="734"/>
         <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="761"/>
+        <location filename="resultstree.cpp" line="748"/>
         <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="787"/>
+        <location filename="resultstree.cpp" line="768"/>
         <source>Could not find the file!</source>
         <translation>找不到該檔案！</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="834"/>
+        <location filename="resultstree.cpp" line="811"/>
         <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="848"/>
+        <location filename="resultstree.cpp" line="825"/>
         <source>Could not find file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="852"/>
+        <location filename="resultstree.cpp" line="829"/>
         <source>Please select the folder &apos;%1&apos;</source>
         <translation>請選取資料夾 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="853"/>
+        <location filename="resultstree.cpp" line="830"/>
         <source>Select Directory &apos;%1&apos;</source>
         <translation>選取目錄 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="855"/>
+        <location filename="resultstree.cpp" line="832"/>
         <source>Please select the directory where file is located.</source>
         <translation>請選取資料夾所在的目錄。</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="856"/>
+        <location filename="resultstree.cpp" line="833"/>
         <source>Select Directory</source>
         <translation>選取目錄</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>File</source>
-        <translation>檔案</translation>
+        <translation type="vanished">檔案</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Severity</source>
-        <translation>安全性</translation>
+        <translation type="vanished">安全性</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Line</source>
-        <translation>行號</translation>
+        <translation type="vanished">行號</translation>
     </message>
     <message>
-        <location filename="resultstree.cpp" line="1438"/>
         <source>Id</source>
-        <translation>識別號</translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Inconclusive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Summary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultstree.cpp" line="1438"/>
-        <source>Since date</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">識別號</translation>
     </message>
 </context>
 <context>
@@ -2180,94 +2467,119 @@ Please check the application path and parameters are correct.</source>
         <translation>結果</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="82"/>
+        <location filename="resultsview.ui" line="60"/>
+        <source>Critical errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.ui" line="92"/>
         <source>Analysis Log</source>
         <translation>分析日誌</translation>
     </message>
     <message>
-        <location filename="resultsview.ui" line="104"/>
+        <location filename="resultsview.ui" line="114"/>
         <source>Warning Details</source>
         <translation>警告詳細資訊</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="203"/>
-        <location filename="resultsview.cpp" line="211"/>
+        <location filename="resultsview.cpp" line="237"/>
+        <location filename="resultsview.cpp" line="245"/>
         <source>Failed to save the report.</source>
         <translation>無法載入報告。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="221"/>
+        <location filename="resultsview.cpp" line="255"/>
         <source>Print Report</source>
         <translation>列印報告</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
+        <location filename="resultsview.cpp" line="274"/>
         <source>No errors found, nothing to print.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="284"/>
+        <location filename="resultsview.cpp" line="326"/>
         <source>%p% (%1 of %2 files checked)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="301"/>
-        <location filename="resultsview.cpp" line="312"/>
+        <location filename="resultsview.cpp" line="350"/>
+        <location filename="resultsview.cpp" line="361"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="302"/>
+        <location filename="resultsview.cpp" line="351"/>
         <source>No errors found.</source>
         <translation>找不到錯誤。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="309"/>
+        <location filename="resultsview.cpp" line="358"/>
         <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="356"/>
-        <location filename="resultsview.cpp" line="375"/>
+        <location filename="resultsview.cpp" line="402"/>
+        <location filename="resultsview.cpp" line="421"/>
         <source>Failed to read the report.</source>
         <translation>無法讀取報告。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="363"/>
+        <location filename="resultsview.cpp" line="409"/>
         <source>XML format version 1 is no longer supported.</source>
         <translation>不再支援 XML 格式版本 1。</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="423"/>
+        <location filename="resultsview.cpp" line="460"/>
         <source>First included by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="428"/>
+        <location filename="resultsview.cpp" line="465"/>
         <source>Id</source>
         <translation>識別號</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="430"/>
-        <source>Bug hunting analysis is incomplete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="resultsview.cpp" line="504"/>
+        <location filename="resultsview.cpp" line="539"/>
         <source>Clear Log</source>
         <translation>清除日誌</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="505"/>
+        <location filename="resultsview.cpp" line="540"/>
         <source>Copy this Log entry</source>
         <translation>複製該日誌條目</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="506"/>
+        <location filename="resultsview.cpp" line="541"/>
         <source>Copy complete Log</source>
         <translation>複製完整的日誌</translation>
     </message>
+    <message>
+        <location filename="resultsview.cpp" line="549"/>
+        <source>Analysis was stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="563"/>
+        <source>There was a critical error with id &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="565"/>
+        <source>when checking %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="567"/>
+        <source>when checking a file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="resultsview.cpp" line="568"/>
+        <source>Analysis was aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScratchPad</name>
@@ -2315,180 +2627,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>
@@ -2496,47 +2808,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>
@@ -2546,14 +2853,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="181"/>
-        <location filename="statsdialog.cpp" line="228"/>
+        <location filename="statsdialog.cpp" line="183"/>
+        <location filename="statsdialog.cpp" line="230"/>
         <source>Statistics</source>
         <translation>統計資料</translation>
     </message>
     <message>
         <location filename="statsdialog.ui" line="27"/>
-        <location filename="statsdialog.cpp" line="219"/>
+        <location filename="statsdialog.cpp" line="221"/>
         <source>Project</source>
         <translation>專案</translation>
     </message>
@@ -2584,7 +2891,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="224"/>
+        <location filename="statsdialog.cpp" line="226"/>
         <source>Previous Scan</source>
         <translation>上一次掃描</translation>
     </message>
@@ -2604,193 +2911,203 @@ To toggle what kind of errors are shown, open view menu.</source>
         <translation>掃描時間:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="256"/>
+        <location filename="statsdialog.ui" line="254"/>
         <source>Errors:</source>
         <translation>錯誤:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="274"/>
+        <location filename="statsdialog.ui" line="271"/>
         <source>Warnings:</source>
         <translation>警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="292"/>
+        <location filename="statsdialog.ui" line="288"/>
         <source>Stylistic warnings:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="310"/>
+        <location filename="statsdialog.ui" line="305"/>
         <source>Portability warnings:</source>
         <translation>可移植性警告:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="328"/>
+        <location filename="statsdialog.ui" line="322"/>
         <source>Performance issues:</source>
         <translation>效能議題:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="346"/>
+        <location filename="statsdialog.ui" line="339"/>
         <source>Information messages:</source>
         <translation>資訊訊息:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="363"/>
+        <location filename="statsdialog.ui" line="356"/>
+        <source>Active checkers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="374"/>
+        <source>Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="statsdialog.ui" line="399"/>
         <source>History</source>
         <translation>歷史紀錄</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="369"/>
+        <location filename="statsdialog.ui" line="405"/>
         <source>File:</source>
         <translation>檔案:</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="407"/>
+        <location filename="statsdialog.ui" line="443"/>
         <source>Copy to Clipboard</source>
         <translation>複製到剪貼簿</translation>
     </message>
     <message>
-        <location filename="statsdialog.ui" line="414"/>
+        <location filename="statsdialog.ui" line="450"/>
         <source>Pdf Export</source>
         <translation>Pdf 匯出</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>File: </source>
         <translation>檔案: </translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="109"/>
+        <location filename="statsdialog.cpp" line="112"/>
         <source>No cppcheck build dir</source>
         <translation>沒有 cppcheck 建置目錄</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>1 day</source>
         <translation>1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="157"/>
+        <location filename="statsdialog.cpp" line="159"/>
         <source>%1 days</source>
         <translation>%1 天</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>1 hour</source>
         <translation>1 小時</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="159"/>
+        <location filename="statsdialog.cpp" line="161"/>
         <source>%1 hours</source>
         <translation>%1 小時</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>1 minute</source>
         <translation>1 分鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="161"/>
+        <location filename="statsdialog.cpp" line="163"/>
         <source>%1 minutes</source>
         <translation>%1 分鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>1 second</source>
         <translation>1 秒鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="163"/>
+        <location filename="statsdialog.cpp" line="165"/>
         <source>%1 seconds</source>
         <translation>%1 秒鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="167"/>
+        <location filename="statsdialog.cpp" line="169"/>
         <source>0.%1 seconds</source>
         <translation>0.%1 秒鐘</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="169"/>
+        <location filename="statsdialog.cpp" line="171"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="183"/>
-        <location filename="statsdialog.cpp" line="229"/>
+        <location filename="statsdialog.cpp" line="185"/>
+        <location filename="statsdialog.cpp" line="231"/>
         <source>Errors</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="185"/>
-        <location filename="statsdialog.cpp" line="230"/>
+        <location filename="statsdialog.cpp" line="187"/>
+        <location filename="statsdialog.cpp" line="232"/>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="187"/>
-        <location filename="statsdialog.cpp" line="231"/>
+        <location filename="statsdialog.cpp" line="189"/>
+        <location filename="statsdialog.cpp" line="233"/>
         <source>Style warnings</source>
         <translation>樣式警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="189"/>
-        <location filename="statsdialog.cpp" line="232"/>
+        <location filename="statsdialog.cpp" line="191"/>
+        <location filename="statsdialog.cpp" line="234"/>
         <source>Portability warnings</source>
         <translation>可移植性警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="191"/>
-        <location filename="statsdialog.cpp" line="233"/>
+        <location filename="statsdialog.cpp" line="193"/>
+        <location filename="statsdialog.cpp" line="235"/>
         <source>Performance warnings</source>
         <translation>效能警告</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="193"/>
-        <location filename="statsdialog.cpp" line="234"/>
+        <location filename="statsdialog.cpp" line="195"/>
+        <location filename="statsdialog.cpp" line="236"/>
         <source>Information messages</source>
         <translation>資訊訊息</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="196"/>
+        <location filename="statsdialog.cpp" line="198"/>
         <source>Export PDF</source>
         <translation>匯出 PDF</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="218"/>
+        <location filename="statsdialog.cpp" line="220"/>
         <source>Project Settings</source>
         <translation>專案設定</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="220"/>
+        <location filename="statsdialog.cpp" line="222"/>
         <source>Paths</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="221"/>
+        <location filename="statsdialog.cpp" line="223"/>
         <source>Include paths</source>
         <translation>包含路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="222"/>
+        <location filename="statsdialog.cpp" line="224"/>
         <source>Defines</source>
         <translation>定義</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="223"/>
+        <location filename="statsdialog.cpp" line="225"/>
         <source>Undefines</source>
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="225"/>
+        <location filename="statsdialog.cpp" line="227"/>
         <source>Path selected</source>
         <translation>選取的路徑</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="226"/>
+        <location filename="statsdialog.cpp" line="228"/>
         <source>Number of files scanned</source>
         <translation>已掃描的檔案數量</translation>
     </message>
     <message>
-        <location filename="statsdialog.cpp" line="227"/>
+        <location filename="statsdialog.cpp" line="229"/>
         <source>Scan duration</source>
         <translation>掃描時間</translation>
     </message>
@@ -2798,7 +3115,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>ThreadResult</name>
     <message>
-        <location filename="threadresult.cpp" line="55"/>
+        <location filename="threadresult.cpp" line="46"/>
         <source>%1 of %2 files checked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2806,7 +3123,7 @@ To toggle what kind of errors are shown, open view menu.</source>
 <context>
     <name>TranslationHandler</name>
     <message>
-        <location filename="translationhandler.cpp" line="129"/>
+        <location filename="translationhandler.cpp" line="130"/>
         <source>Failed to change the user interface language:
 
 %1
@@ -2815,7 +3132,7 @@ The user interface language has been reset to English. Open the Preferences-dial
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="translationhandler.cpp" line="135"/>
+        <location filename="translationhandler.cpp" line="136"/>
         <source>Cppcheck</source>
         <translation></translation>
     </message>
@@ -2823,7 +3140,7 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>TxtReport</name>
     <message>
-        <location filename="txtreport.cpp" line="77"/>
+        <location filename="txtreport.cpp" line="74"/>
         <source>inconclusive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2831,12 +3148,12 @@ The user interface language has been reset to English. Open the Preferences-dial
 <context>
     <name>toFilterString</name>
     <message>
-        <location filename="common.cpp" line="57"/>
+        <location filename="common.cpp" line="58"/>
         <source>All supported files (%1)</source>
         <translation>所有支援的檔案 (%1)</translation>
     </message>
     <message>
-        <location filename="common.cpp" line="62"/>
+        <location filename="common.cpp" line="63"/>
         <source>All files (%1)</source>
         <translation>所有檔案 (%1)</translation>
     </message>
diff --git a/gui/cppchecklibrarydata.cpp b/gui/cppchecklibrarydata.cpp
index 2e7761a6534..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-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
@@ -18,32 +18,27 @@
 
 #include "cppchecklibrarydata.h"
 
+#include "utils.h"
+
 #include <stdexcept>
 #include <string>
+#include <utility>
 
 #include <QObject>
 #include <QVariant>
 #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;
 
-CppcheckLibraryData::CppcheckLibraryData()
-{}
-
-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())
@@ -83,7 +78,7 @@ static CppcheckLibraryData::Container loadContainer(QXmlStreamReader &xmlReader)
                     break;
                 if (type != QXmlStreamReader::StartElement)
                     continue;
-                struct CppcheckLibraryData::Container::Function function;
+                CppcheckLibraryData::Container::Function function;
                 function.name   = xmlReader.attributes().value("name").toString();
                 function.action = xmlReader.attributes().value("action").toString();
                 function.yields = xmlReader.attributes().value("yields").toString();
@@ -92,7 +87,7 @@ static CppcheckLibraryData::Container loadContainer(QXmlStreamReader &xmlReader)
                 else if (elementName == "access")
                     container.accessFunctions.append(function);
                 else if (elementName == "rangeItemRecordType") {
-                    struct CppcheckLibraryData::Container::RangeItemRecordType rangeItemRecordType;
+                    CppcheckLibraryData::Container::RangeItemRecordType rangeItemRecordType;
                     rangeItemRecordType.name = xmlReader.attributes().value("name").toString();
                     rangeItemRecordType.templateParameter = xmlReader.attributes().value("templateParameter").toString();
                     container.rangeItemRecordTypeList.append(rangeItemRecordType);
@@ -148,7 +143,7 @@ static CppcheckLibraryData::TypeChecks loadTypeChecks(QXmlStreamReader &xmlReade
             continue;
         const QString elementName = xmlReader.name().toString();
         if (elementName == "suppress" || elementName == "check") {
-            QPair<QString, QString> entry(elementName, xmlReader.readElementText());
+            std::pair<QString, QString> entry(elementName, xmlReader.readElementText());
             typeChecks.append(entry);
         }
     }
@@ -272,6 +267,7 @@ static CppcheckLibraryData::MemoryResource loadMemoryResource(QXmlStreamReader &
         if (elementName == "alloc" || elementName == "realloc") {
             CppcheckLibraryData::MemoryResource::Alloc alloc;
             alloc.isRealloc = (elementName == "realloc");
+            alloc.noFail = (xmlReader.attributes().value("no-fail").toString() == "true");
             alloc.init = (xmlReader.attributes().value("init").toString() == "true");
             if (xmlReader.attributes().hasAttribute("arg")) {
                 alloc.arg = xmlReader.attributes().value("arg").toInt();
@@ -454,7 +450,7 @@ static CppcheckLibraryData::Markup loadMarkup(QXmlStreamReader &xmlReader)
     return markup;
 }
 
-static CppcheckLibraryData::Entrypoint loadEntrypoint(QXmlStreamReader &xmlReader)
+static CppcheckLibraryData::Entrypoint loadEntrypoint(const QXmlStreamReader &xmlReader)
 {
     CppcheckLibraryData::Entrypoint entrypoint;
     entrypoint.name = xmlReader.attributes().value("name").toString();
@@ -519,7 +515,7 @@ QString CppcheckLibraryData::open(QIODevice &file)
     return QString();
 }
 
-static void writeContainerFunctions(QXmlStreamWriter &xmlWriter, const QString &name, int extra, const QList<struct CppcheckLibraryData::Container::Function> &functions)
+static void writeContainerFunctions(QXmlStreamWriter &xmlWriter, const QString &name, int extra, const QList<CppcheckLibraryData::Container::Function> &functions)
 {
     if (functions.isEmpty() && extra < 0)
         return;
@@ -542,7 +538,7 @@ static void writeContainerFunctions(QXmlStreamWriter &xmlWriter, const QString &
     xmlWriter.writeEndElement();
 }
 
-static void writeContainerRangeItemRecords(QXmlStreamWriter &xmlWriter, const QList<struct CppcheckLibraryData::Container::RangeItemRecordType> &rangeItemRecords)
+static void writeContainerRangeItemRecords(QXmlStreamWriter &xmlWriter, const QList<CppcheckLibraryData::Container::RangeItemRecordType> &rangeItemRecords)
 {
     if (rangeItemRecords.isEmpty())
         return;
@@ -618,7 +614,7 @@ static void writeFunction(QXmlStreamWriter &xmlWriter, const CppcheckLibraryData
         xmlWriter.writeEndElement();
     }
     if (function.noreturn != CppcheckLibraryData::Function::Unknown)
-        xmlWriter.writeTextElement("noreturn", (function.noreturn == CppcheckLibraryData::Function::True) ? "true" : "false");
+        xmlWriter.writeTextElement("noreturn", bool_to_string(function.noreturn == CppcheckLibraryData::Function::True));
     if (function.leakignore)
         xmlWriter.writeEmptyElement("leak-ignore");
     // Argument info..
@@ -698,14 +694,14 @@ static void writeFunction(QXmlStreamWriter &xmlWriter, const CppcheckLibraryData
     }
     if (!function.notOverlappingDataArgs.isEmpty()) {
         xmlWriter.writeStartElement("not-overlapping-data");
-        foreach (const QString value, function.notOverlappingDataArgs) {
+        for (const QString& value : function.notOverlappingDataArgs) {
             xmlWriter.writeAttribute(function.notOverlappingDataArgs.key(value), value);
         }
         xmlWriter.writeEndElement();
     }
     if (!function.containerAttributes.isEmpty()) {
         xmlWriter.writeStartElement("container");
-        foreach (const QString value, function.containerAttributes) {
+        for (const QString& value : function.containerAttributes) {
             xmlWriter.writeAttribute(function.containerAttributes.key(value), value);
         }
         xmlWriter.writeEndElement();
@@ -722,7 +718,9 @@ static void writeMemoryResource(QXmlStreamWriter &xmlWriter, const CppcheckLibra
         } else {
             xmlWriter.writeStartElement("alloc");
         }
-        xmlWriter.writeAttribute("init", alloc.init ? "true" : "false");
+        xmlWriter.writeAttribute("init", bool_to_string(alloc.init));
+        if (alloc.noFail)
+            xmlWriter.writeAttribute("no-fail", bool_to_string(alloc.noFail));
         if (alloc.arg != -1) {
             xmlWriter.writeAttribute("arg", QString("%1").arg(alloc.arg));
         }
@@ -757,7 +755,7 @@ static void writeTypeChecks(QXmlStreamWriter &xmlWriter, const CppcheckLibraryDa
     if (!typeChecks.isEmpty()) {
         xmlWriter.writeStartElement("unusedvar");
     }
-    for (const QPair<QString, QString> &check : typeChecks) {
+    for (const std::pair<QString, QString> &check : typeChecks) {
         xmlWriter.writeStartElement(check.first);
         xmlWriter.writeCharacters(check.second);
         xmlWriter.writeEndElement();
diff --git a/gui/cppchecklibrarydata.h b/gui/cppchecklibrarydata.h
index e0360534e34..afe39df5050 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-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
@@ -19,10 +19,13 @@
 #ifndef CPPCHECKLIBRARYDATA_H
 #define CPPCHECKLIBRARYDATA_H
 
+#include "config.h"
+
+#include <cstdint>
+#include <utility>
+
 #include <QList>
 #include <QMap>
-#include <QPair>
-#include <QSet>
 #include <QString>
 #include <QStringList>
 
@@ -30,11 +33,9 @@ class QIODevice;
 
 class CppcheckLibraryData {
 public:
-    CppcheckLibraryData();
+    CppcheckLibraryData() = default;
 
     struct Container {
-        Container() : access_arrayLike(false), size_templateParameter(-1) {}
-
         QString id;
         QString inherits;
         QString startPattern;
@@ -42,8 +43,8 @@ class CppcheckLibraryData {
         QString opLessAllowed;
         QString itEndPattern;
 
-        bool access_arrayLike;
-        int size_templateParameter;
+        bool access_arrayLike{};
+        int size_templateParameter = -1;
 
         struct {
             QString templateParameter;
@@ -60,10 +61,10 @@ class CppcheckLibraryData {
             QString yields;
             QString action;
         };
-        QList<struct Function> accessFunctions;
-        QList<struct Function> otherFunctions;
-        QList<struct Function> sizeFunctions;
-        QList<struct RangeItemRecordType> rangeItemRecordTypeList;
+        QList<Function> accessFunctions;
+        QList<Function> otherFunctions;
+        QList<Function> sizeFunctions;
+        QList<RangeItemRecordType> rangeItemRecordTypeList;
     };
 
     struct Define {
@@ -72,21 +73,17 @@ class CppcheckLibraryData {
     };
 
     struct Function {
-        Function() : noreturn(Unknown), gccPure(false), gccConst(false),
-            leakignore(false), useretval(false) {}
-
         QString comments;
         QString name;
-        enum TrueFalseUnknown { False, True, Unknown } noreturn;
-        bool gccPure;
-        bool gccConst;
-        bool leakignore;
-        bool useretval;
+        enum TrueFalseUnknown : std::uint8_t { False, True, Unknown } noreturn = Unknown;
+        bool gccPure{};
+        bool gccConst{};
+        bool leakignore{};
+        bool useretval{};
         struct ReturnValue {
-            ReturnValue() : container(-1) {}
             QString type;
             QString value;
-            int container;
+            int container = -1;
             bool empty() const {
                 return type.isNull() && value.isNull() && container < 0;
             }
@@ -96,33 +93,29 @@ class CppcheckLibraryData {
             QString secure;
         } formatstr;
         struct Arg {
-            Arg() : nr(0), notbool(false), notnull(false), notuninit(false),
-                formatstr(false), strz(false) {}
-
             QString name;
-            unsigned int nr;
+            unsigned int nr{};
             static const unsigned int ANY;
             static const unsigned int VARIADIC;
             QString defaultValue;
-            bool notbool;
-            bool notnull;
-            bool notuninit;
-            bool formatstr;
-            bool strz;
+            bool notbool{};
+            bool notnull{};
+            bool notuninit{};
+            bool formatstr{};
+            bool strz{};
             QString valid;
             struct MinSize {
                 QString type;
                 QString arg;
                 QString arg2;
             };
-            QList<struct MinSize> minsizes;
+            QList<MinSize> minsizes;
             struct Iterator {
-                Iterator() : container(-1) {}
-                int container;
+                int container = -1;
                 QString type;
             } iterator;
         };
-        QList<struct Arg> args;
+        QList<Arg> args;
 
         struct {
             QString severity;
@@ -147,31 +140,21 @@ class CppcheckLibraryData {
     struct MemoryResource {
         QString type; // "memory" or "resource"
         struct Alloc {
-            Alloc() :
-                isRealloc(false),
-                init(false),
-                arg(-1),        // -1: Has no optional "arg" attribute
-                reallocArg(-1)  // -1: Has no optional "realloc-arg" attribute
-            {}
-
-            bool isRealloc;
-            bool init;
-            int arg;
-            int reallocArg;
+            bool isRealloc{};
+            bool init{};
+            bool noFail{};
+            int arg = -1; // -1: Has no optional "realloc-arg" attribute
+            int reallocArg = -1; // -1: Has no optional "arg" attribute
             QString bufferSize;
             QString name;
         };
         struct Dealloc {
-            Dealloc() :
-                arg(-1)        // -1: Has no optional "arg" attribute
-            {}
-
-            int arg;
+            int arg = -1; // -1: Has no optional "arg" attribute
             QString name;
         };
 
-        QList<struct Alloc> alloc;
-        QList<struct Dealloc> dealloc;
+        QList<Alloc> alloc;
+        QList<Dealloc> dealloc;
         QStringList use;
     };
 
@@ -189,29 +172,21 @@ class CppcheckLibraryData {
         QStringList platforms;  // Keeps "type" attribute of each "platform" element
     };
 
-    using TypeChecks = QList<QPair<QString, QString>>;
+    using TypeChecks = QList<std::pair<QString, QString>>;
 
     struct Reflection {
         struct Call {
-            Call() :
-                arg {-1}    // -1: Mandatory "arg" attribute not available
-            {}
-
-            int arg;
+            int arg = -1; // -1: Mandatory "arg" attribute not available
             QString name;
         };
 
-        QList<struct Call> calls;
+        QList<Call> calls;
     };
 
     struct Markup {
         struct CodeBlocks {
-            CodeBlocks() :
-                offset {-1}
-            {}
-
             QStringList blocks;
-            int offset;
+            int offset = -1;
             QString start;
             QString end;
         };
@@ -223,8 +198,8 @@ class CppcheckLibraryData {
         };
 
         QString ext;
-        bool afterCode;
-        bool reportErrors;
+        bool afterCode{};
+        bool reportErrors{};
         QStringList keywords;
         QStringList importer;
         QList<CodeBlocks> codeBlocks;
@@ -232,12 +207,8 @@ class CppcheckLibraryData {
     };
 
     struct SmartPointer {
-        SmartPointer() :
-            unique {false}
-        {}
-
         QString name;
-        bool unique;
+        bool unique{};
     };
 
     struct Entrypoint {
@@ -259,7 +230,7 @@ class CppcheckLibraryData {
         entrypoints.clear();
     }
 
-    void swap(CppcheckLibraryData &other) {
+    void swap(CppcheckLibraryData &other) NOEXCEPT {
         containers.swap(other.containers);
         defines.swap(other.defines);
         undefines.swap(other.undefines);
@@ -277,18 +248,18 @@ class CppcheckLibraryData {
     QString open(QIODevice &file);
     QString toString() const;
 
-    QList<struct Container> containers;
-    QList<struct Define> defines;
-    QList<struct Function> functions;
-    QList<struct MemoryResource> memoryresource;
-    QList<struct PodType> podtypes;
+    QList<Container> containers;
+    QList<Define> defines;
+    QList<Function> functions;
+    QList<MemoryResource> memoryresource;
+    QList<PodType> podtypes;
     QList<TypeChecks> typeChecks;
-    QList<struct PlatformType> platformTypes;
+    QList<PlatformType> platformTypes;
     QStringList undefines;
-    QList<struct SmartPointer> smartPointers;
-    QList<struct Reflection> reflections;
-    QList<struct Markup> markups;
-    QList<struct Entrypoint> entrypoints;
+    QList<SmartPointer> smartPointers;
+    QList<Reflection> reflections;
+    QList<Markup> markups;
+    QList<Entrypoint> entrypoints;
 };
 
 #endif // CPPCHECKLIBRARYDATA_H
diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp
index 36da50bbde5..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-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
@@ -24,15 +24,11 @@
 #include <QDir>
 #include <QFile>
 #include <QList>
-#include <QtGlobal>
 
 CsvReport::CsvReport(const QString &filename) :
     Report(filename)
 {}
 
-CsvReport::~CsvReport()
-{}
-
 bool CsvReport::create()
 {
     if (Report::create()) {
@@ -45,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()
@@ -67,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/csvreport.h b/gui/csvreport.h
index a2efdd93b0a..3d24ab797d9 100644
--- a/gui/csvreport.h
+++ b/gui/csvreport.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
@@ -24,8 +24,6 @@
 #include <QString>
 #include <QTextStream>
 
-class ErrorItem;
-
 /// @addtogroup GUI
 /// @{
 
@@ -39,7 +37,6 @@ class ErrorItem;
 class CsvReport : public Report {
 public:
     explicit CsvReport(const QString &filename);
-    ~CsvReport() override;
 
     /**
      * @brief Create the report (file).
diff --git a/gui/erroritem.cpp b/gui/erroritem.cpp
index ea6ed7951e7..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-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
@@ -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)
 {}
 
@@ -51,12 +51,10 @@ ErrorItem::ErrorItem(const ErrorMessage &errmsg)
     , cwe(errmsg.cwe.id)
     , hash(errmsg.hash)
     , symbolNames(QString::fromStdString(errmsg.symbolNames()))
+    , remark(QString::fromStdString(errmsg.remark))
 {
-    for (std::list<ErrorMessage::FileLocation>::const_iterator loc = errmsg.callStack.cbegin();
-         loc != errmsg.callStack.cend();
-         ++loc) {
-        errorPath << QErrorPathItem(*loc);
-    }
+    for (const auto& loc: errmsg.callStack)
+        errorPath << QErrorPathItem(loc);
 }
 
 QString ErrorItem::tool() const
@@ -72,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
@@ -97,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 5605f7ea6cb..554052ccba9 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-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
@@ -37,12 +37,12 @@
  */
 class GuiSeverity {
 public:
-    static QString toString(Severity::SeverityType severity) {
-        return QString::fromStdString(Severity::toString(severity));
+    static QString toString(Severity severity) {
+        return QString::fromStdString(severityToString(severity));
     }
 
-    static Severity::SeverityType fromString(const QString &severity) {
-        return Severity::fromString(severity.toStdString());
+    static Severity fromString(const QString &severity) {
+        return severityFromString(severity.toStdString());
     }
 };
 
@@ -81,9 +81,23 @@ 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::SeverityType severity;
+    Severity severity;
     bool inconclusive;
     QString summary;
     QString message;
@@ -91,38 +105,18 @@ class ErrorItem {
     unsigned long long hash;
     QList<QErrorPathItem> errorPath;
     QString symbolNames;
+    QString remark;
+    QString classification; // misra/cert/etc: classification/level
+    QString guideline; // misra/cert/etc: guideline/rule
 
     // Special GUI properties
     QString sinceDate;
     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::SeverityType severity;
-    QString summary;
-    QString message;
-    QString sinceDate;
-    QString tags;
-};
-
 /// @}
 #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/filelist.h b/gui/filelist.h
index 6e685e8617b..59f1284998d 100644
--- a/gui/filelist.h
+++ b/gui/filelist.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/gui/fileviewdialog.cpp b/gui/fileviewdialog.cpp
index bebb1f656cb..3f66f008678 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
@@ -62,7 +62,7 @@ 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);
diff --git a/gui/fileviewdialog.h b/gui/fileviewdialog.h
index 91c455eb869..55e32068008 100644
--- a/gui/fileviewdialog.h
+++ b/gui/fileviewdialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/gui/gui.pro b/gui/gui.pro
index 186426dae81..132f113d270 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -1,4 +1,4 @@
-lessThan(QT_MAJOR_VERSION, 5): error(requires >= Qt 5 (You used: $$QT_VERSION))
+lessThan(QT_MAJOR_VERSION, 6): error(requires >= Qt 6 (You used: $$QT_VERSION))
 
 TEMPLATE = app
 TARGET = cppcheck-gui
@@ -13,15 +13,10 @@ QT += help
 QT += network
 
 # Build online help
-onlinehelp.target = online-help.qhc
-equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12) {
-    # qcollectiongenerator is used in case of QT version < 5.12
-    onlinehelp.commands = qcollectiongenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc
-} else {
-    onlinehelp.commands = qhelpgenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc
-}
-QMAKE_EXTRA_TARGETS += onlinehelp
-PRE_TARGETDEPS += online-help.qhc
+#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
@@ -83,6 +78,7 @@ TRANSLATIONS =  cppcheck_de.ts \
                 cppcheck_fr.ts \
                 cppcheck_it.ts \
                 cppcheck_ja.ts \
+                cppcheck_ka.ts \
                 cppcheck_ko.ts \
                 cppcheck_nl.ts \
                 cppcheck_ru.ts \
@@ -96,8 +92,25 @@ CONFIG += embed_manifest_exe
 
 contains(LINKCORE, [yY][eE][sS]) {
 } else {
-    BASEPATH = ../lib/
-    include($$PWD/../lib/lib.pri)
+    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* {
@@ -136,6 +149,7 @@ HEADERS += aboutdialog.h \
            projectfile.h \
            projectfiledialog.h \
            report.h \
+           resultitem.h \
            resultstree.h \
            resultsview.h \
            scratchpad.h \
@@ -178,6 +192,7 @@ SOURCES += aboutdialog.cpp \
            projectfile.cpp \
            projectfiledialog.cpp \
            report.cpp \
+           resultitem.cpp \
            resultstree.cpp \
            resultsview.cpp \
            scratchpad.cpp \
diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp
index 80f7d900ffc..db1125339b9 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-2023 Cppcheck team.
+ * 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
@@ -28,6 +28,7 @@
 #include <QHelpContentWidget>
 #include <QHelpIndexWidget>
 #include <QMessageBox>
+#include <QString>
 #include <QStringList>
 #include <QUrl>
 #include <QVBoxLayout>
@@ -66,7 +67,7 @@ static QString getHelpFile()
 #endif
     for (const QString &p: paths) {
         QString filename = p + "/online-help.qhc";
-        if (QFileInfo(filename).exists())
+        if (QFileInfo::exists(filename))
             return filename;
     }
     return QString();
diff --git a/gui/helpdialog.h b/gui/helpdialog.h
index a5dc0b43039..da80f61ca02 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-2023 Cppcheck team.
+ * 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
@@ -21,12 +21,10 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QString>
 #include <QTextBrowser>
 #include <QVariant>
 
 class QHelpEngine;
-class QUrl;
 class QWidget;
 namespace Ui {
     class HelpDialog;
@@ -34,7 +32,7 @@ namespace Ui {
 
 class HelpBrowser : public QTextBrowser {
 public:
-    explicit HelpBrowser(QWidget* parent = nullptr) : QTextBrowser(parent), mHelpEngine(nullptr) {}
+    explicit HelpBrowser(QWidget* parent = nullptr) : QTextBrowser(parent) {}
     HelpBrowser(const HelpBrowser&) = delete;
     HelpBrowser(HelpBrowser&&) = delete;
     HelpBrowser& operator=(const HelpBrowser&) = delete;
@@ -42,7 +40,7 @@ class HelpBrowser : public QTextBrowser {
     void setHelpEngine(QHelpEngine *helpEngine);
     QVariant loadResource(int type, const QUrl& name) override;
 private:
-    QHelpEngine* mHelpEngine;
+    QHelpEngine* mHelpEngine{};
 };
 
 class HelpDialog : public QDialog {
diff --git a/gui/libraryaddfunctiondialog.h b/gui/libraryaddfunctiondialog.h
index d39666defb5..d0ff04ac866 100644
--- a/gui/libraryaddfunctiondialog.h
+++ b/gui/libraryaddfunctiondialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/gui/librarydialog.cpp b/gui/librarydialog.cpp
index d258e59c0a6..15a2c7f10fe 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-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
@@ -22,11 +22,10 @@
 #include "libraryaddfunctiondialog.h"
 #include "libraryeditargdialog.h"
 #include "path.h"
+#include "utils.h"
 
 #include "ui_librarydialog.h"
 
-#include <string>
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFile>
@@ -48,23 +47,24 @@ class QWidget;
 
 // TODO: get/compare functions from header
 
-class FunctionListItem : public QListWidgetItem {
-public:
-    FunctionListItem(QListWidget *view,
-                     CppcheckLibraryData::Function *function,
-                     bool selected)
-        : QListWidgetItem(view), function(function) {
-        setText(function->name);
-        setFlags(flags() | Qt::ItemIsEditable);
-        setSelected(selected);
-    }
-    CppcheckLibraryData::Function *function;
-};
+namespace {
+    class FunctionListItem : public QListWidgetItem {
+    public:
+        FunctionListItem(QListWidget *view,
+                         CppcheckLibraryData::Function *function,
+                         bool selected)
+            : QListWidgetItem(view), function(function) {
+            setText(function->name);
+            setFlags(flags() | Qt::ItemIsEditable);
+            setSelected(selected);
+        }
+        CppcheckLibraryData::Function *function;
+    };
+}
 
 LibraryDialog::LibraryDialog(QWidget *parent) :
     QDialog(parent),
-    mUi(new Ui::LibraryDialog),
-    mIgnoreChanges(false)
+    mUi(new Ui::LibraryDialog)
 {
     mUi->setupUi(this);
     mUi->buttonSave->setEnabled(false);
@@ -87,7 +87,7 @@ CppcheckLibraryData::Function *LibraryDialog::currentFunction()
     QList<QListWidgetItem *> selitems = mUi->functions->selectedItems();
     if (selitems.count() != 1)
         return nullptr;
-    return static_cast<FunctionListItem *>(selitems.first())->function;
+    return dynamic_cast<FunctionListItem *>(selitems.first())->function;
 }
 
 void LibraryDialog::openCfg()
@@ -185,7 +185,7 @@ void LibraryDialog::saveCfgAs()
 
 void LibraryDialog::addFunction()
 {
-    LibraryAddFunctionDialog *d = new LibraryAddFunctionDialog;
+    auto *d = new LibraryAddFunctionDialog;
     if (d->exec() == QDialog::Accepted && !d->functionName().isEmpty()) {
 
         CppcheckLibraryData::Function f;
@@ -313,7 +313,7 @@ void LibraryDialog::changeFunction()
         return;
 
     function->comments   = mUi->comments->toPlainText();
-    function->noreturn   = (CppcheckLibraryData::Function::TrueFalseUnknown)mUi->noreturn->currentIndex();
+    function->noreturn   = static_cast<CppcheckLibraryData::Function::TrueFalseUnknown>(mUi->noreturn->currentIndex());
     function->useretval  = mUi->useretval->isChecked();
     function->leakignore = mUi->leakignore->isChecked();
 
@@ -346,12 +346,12 @@ QString LibraryDialog::getArgText(const CppcheckLibraryData::Function::Arg &arg)
     if (arg.nr != CppcheckLibraryData::Function::Arg::ANY)
         s += QString::number(arg.nr);
 
-    s += "\n    not bool: " + QString(arg.notbool ? "true" : "false");
-    s += "\n    not null: " + QString(arg.notnull ? "true" : "false");
-    s += "\n    not uninit: " + QString(arg.notuninit ? "true" : "false");
-    s += "\n    format string: " + QString(arg.formatstr ? "true" : "false");
-    s += "\n    strz: " + QString(arg.strz ? "true" : "false");
-    s += "\n    valid: " + QString(arg.valid.isEmpty() ? "any" : arg.valid);
+    s += "\n    not bool: " + QString(bool_to_string(arg.notbool));
+    s += "\n    not null: " +  QString(bool_to_string(arg.notnull));
+    s += "\n    not uninit: " +  QString(bool_to_string(arg.notuninit));
+    s += "\n    format string: " +  QString(bool_to_string(arg.formatstr));
+    s += "\n    strz: " +  QString(bool_to_string(arg.strz));
+    s += "\n    valid: " + (arg.valid.isEmpty() ? "any" : arg.valid);
     for (const CppcheckLibraryData::Function::Arg::MinSize &minsize : arg.minsizes) {
         s += "\n    minsize: " + minsize.type + " " + minsize.arg + " " + minsize.arg2;
     }
diff --git a/gui/librarydialog.h b/gui/librarydialog.h
index d8dd3c247c1..285d36a820a 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-2023 Cppcheck team.
+ * 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
@@ -56,7 +56,7 @@ private slots:
     Ui::LibraryDialog *mUi;
     CppcheckLibraryData mData;
     QString mFileName;
-    bool mIgnoreChanges;
+    bool mIgnoreChanges{};
 
     static QString getArgText(const CppcheckLibraryData::Function::Arg &arg);
     CppcheckLibraryData::Function *currentFunction();
diff --git a/gui/libraryeditargdialog.cpp b/gui/libraryeditargdialog.cpp
index bf971afc450..2b8521dd686 100644
--- a/gui/libraryeditargdialog.cpp
+++ b/gui/libraryeditargdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -24,6 +24,7 @@
 #include <QComboBox>
 #include <QLineEdit>
 #include <QSpinBox>
+#include <QString>
 #include <QStringList>
 
 class QWidget;
diff --git a/gui/libraryeditargdialog.h b/gui/libraryeditargdialog.h
index 190f3d8f644..15d081eee68 100644
--- a/gui/libraryeditargdialog.h
+++ b/gui/libraryeditargdialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -24,7 +24,6 @@
 #include <QDialog>
 #include <QList>
 #include <QObject>
-#include <QString>
 
 class QWidget;
 namespace Ui {
diff --git a/gui/main.cpp b/gui/main.cpp
index 4ea7c331be4..830cb29a72d 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-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
@@ -19,7 +19,7 @@
 #include "cppcheck.h"
 #include "common.h"
 #include "mainwindow.h"
-#include "erroritem.h"
+#include "erroritem.h" // IWYU pragma: keep
 #include "translationhandler.h"
 
 #ifdef _WIN32
@@ -39,7 +39,6 @@
 #include <QString>
 #include <QStringList>
 #include <QVariant>
-#include <QtCore>
 
 
 static void ShowUsage();
@@ -48,18 +47,12 @@ 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");
     QCoreApplication::setApplicationName("Cppcheck-GUI");
 
-    QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
+    auto* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
 
     // Set data dir..
     const QStringList args = QApplication::arguments();
@@ -71,7 +64,7 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    TranslationHandler* th = new TranslationHandler(&app);
+    auto* th = new TranslationHandler(&app);
     th->setLanguage(settings->value(SETTINGS_LANGUAGE, th->suggestLanguage()).toString());
 
     if (!CheckArgs(QApplication::arguments()))
@@ -131,6 +124,7 @@ static void ShowUsage()
 
 static void ShowVersion()
 {
+// TODO: should only *not* show a dialog when we are on a commnd-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 814ec585d8a..2d71ef5e7c6 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-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
@@ -18,24 +18,32 @@
 
 #include "mainwindow.h"
 
+#include "addoninfo.h"
 #include "applicationlist.h"
 #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"
 #include "librarydialog.h"
+#include "path.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "projectfiledialog.h"
 #include "report.h"
+#include "resultstree.h"
 #include "resultsview.h"
 #include "scratchpad.h"
+#include "settings.h"
 #include "showtypes.h"
 #include "statsdialog.h"
 #include "settingsdialog.h"
@@ -44,16 +52,22 @@
 #include "threadhandler.h"
 #include "threadresult.h"
 #include "translationhandler.h"
+#include "utils.h"
 
 #include "ui_mainwindow.h"
 
+#include "frontend.h"
+
 #include <algorithm>
-#include <functional>
+#include <cstddef>
+#include <fstream>
 #include <iterator>
 #include <list>
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include <QApplication>
@@ -64,6 +78,7 @@
 #include <QCloseEvent>
 #include <QCoreApplication>
 #include <QDateTime>
+#include <QDesktopServices>
 #include <QDebug>
 #include <QDialog>
 #include <QDir>
@@ -92,6 +107,8 @@
 #include <QVariant>
 #include <Qt>
 
+#include "json.h"
+
 static const QString compile_commands_json("compile_commands.json");
 
 static QString fromNativePath(const QString& p) {
@@ -109,19 +126,17 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mApplications(new ApplicationList(this)),
     mTranslation(th),
     mUI(new Ui::MainWindow),
-    mScratchPad(nullptr),
-    mProjectFile(nullptr),
     mPlatformActions(new QActionGroup(this)),
     mCStandardActions(new QActionGroup(this)),
     mCppStandardActions(new QActionGroup(this)),
     mSelectLanguageActions(new QActionGroup(this)),
-    mExiting(false),
-    mIsLogfileLoaded(false)
+    mSelectReportActions(new QActionGroup(this))
 {
     {
         Settings tempSettings;
         tempSettings.exename = QCoreApplication::applicationFilePath().toStdString();
-        tempSettings.loadCppcheckCfg();
+        Suppressions tempSupprs;
+        Settings::loadCppcheckCfg(tempSettings, tempSupprs); // TODO: how to handle error?
         mCppcheckCfgProductName = QString::fromStdString(tempSettings.cppcheckCfgProductName);
         mCppcheckCfgAbout = QString::fromStdString(tempSettings.cppcheckCfgAbout);
     }
@@ -141,7 +156,7 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mLineEditFilter->setPlaceholderText(tr("Quick Filter:"));
     mLineEditFilter->setClearButtonEnabled(true);
     mUI->mToolBarFilter->addWidget(mLineEditFilter);
-    connect(mLineEditFilter, SIGNAL(textChanged(const QString&)), mFilterTimer, SLOT(start()));
+    connect(mLineEditFilter, SIGNAL(textChanged(QString)), mFilterTimer, SLOT(start()));
     connect(mLineEditFilter, &QLineEdit::returnPressed, this, &MainWindow::filterResults);
 
     connect(mUI->mActionPrint, SIGNAL(triggered()), mUI->mResults, SLOT(print()));
@@ -181,6 +196,8 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     // 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()));
@@ -197,6 +214,15 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     connect(mUI->mResults, &ResultsView::suppressIds, this, &MainWindow::suppressIds);
     connect(mUI->mMenuView, &QMenu::aboutToShow, this, &MainWindow::aboutToShowViewMenu);
 
+    // Change report type
+    connect(mUI->mActionReportNormal, &QAction::triggered, this, &MainWindow::changeReportType);
+    connect(mUI->mActionReportAutosar, &QAction::triggered, this, &MainWindow::changeReportType);
+    connect(mUI->mActionReportCertC, &QAction::triggered, this, &MainWindow::changeReportType);
+    connect(mUI->mActionReportCertCpp, &QAction::triggered, this, &MainWindow::changeReportType);
+    connect(mUI->mActionReportMisraC, &QAction::triggered, this, &MainWindow::changeReportType);
+    connect(mUI->mActionReportMisraCpp2008, &QAction::triggered, this, &MainWindow::changeReportType);
+    connect(mUI->mActionReportMisraCpp2023, &QAction::triggered, this, &MainWindow::changeReportType);
+
     // File menu
     connect(mUI->mActionNewProjectFile, &QAction::triggered, this, &MainWindow::newProjectFile);
     connect(mUI->mActionOpenProjectFile, &QAction::triggered, this, &MainWindow::openProjectFile);
@@ -209,10 +235,13 @@ 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());
 
@@ -221,7 +250,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     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.
@@ -242,12 +270,9 @@ 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++) {
-        Platform platform = mPlatforms.mPlatforms[i];
-        QAction *action = new QAction(this);
+        PlatformData platform = mPlatforms.mPlatforms[i];
+        auto *action = new QAction(this);
         platform.mActMainWindow = action;
         mPlatforms.mPlatforms[i] = platform;
         action->setText(platform.mTitle);
@@ -258,9 +283,20 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
         connect(action, SIGNAL(triggered()), this, SLOT(selectPlatform()));
     }
 
+    mUI->mActionReportNormal->setActionGroup(mSelectReportActions);
+    mUI->mActionReportAutosar->setActionGroup(mSelectReportActions);
+    mUI->mActionReportCertC->setActionGroup(mSelectReportActions);
+    mUI->mActionReportCertCpp->setActionGroup(mSelectReportActions);
+    mUI->mActionReportMisraC->setActionGroup(mSelectReportActions);
+    mUI->mActionReportMisraCpp2008->setActionGroup(mSelectReportActions);
+    mUI->mActionReportMisraCpp2023->setActionGroup(mSelectReportActions);
+
     mUI->mActionC89->setActionGroup(mCStandardActions);
     mUI->mActionC99->setActionGroup(mCStandardActions);
     mUI->mActionC11->setActionGroup(mCStandardActions);
+    //mUI->mActionC17->setActionGroup(mCStandardActions);
+    //mUI->mActionC23->setActionGroup(mCStandardActions);
+    //mUI->mActionC2Y->setActionGroup(mCStandardActions);
 
     mUI->mActionCpp03->setActionGroup(mCppStandardActions);
     mUI->mActionCpp11->setActionGroup(mCppStandardActions);
@@ -268,20 +304,22 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mUI->mActionCpp17->setActionGroup(mCppStandardActions);
     mUI->mActionCpp20->setActionGroup(mCppStandardActions);
     //mUI->mActionCpp23->setActionGroup(mCppStandardActions);
+    //mUI->mActionCpp26->setActionGroup(mCppStandardActions);
 
     mUI->mActionEnforceC->setActionGroup(mSelectLanguageActions);
     mUI->mActionEnforceCpp->setActionGroup(mSelectLanguageActions);
     mUI->mActionAutoDetectLanguage->setActionGroup(mSelectLanguageActions);
 
+    // TODO: we no longer default to a Windows platform in CLI - so we should probably also get rid of this in the GUI
     // For Windows platforms default to Win32 checked platform.
     // For other platforms default to unspecified/default which means the
     // platform Cppcheck GUI was compiled on.
 #if defined(_WIN32)
-    const cppcheck::Platform::Type defaultPlatform = cppcheck::Platform::Type::Win32W;
+    constexpr Platform::Type defaultPlatform = Platform::Type::Win32W;
 #else
-    const cppcheck::Platform::Type defaultPlatform = cppcheck::Platform::Type::Unspecified;
+    constexpr Platform::Type defaultPlatform = Platform::Type::Unspecified;
 #endif
-    Platform &platform = mPlatforms.get((cppcheck::Platform::Type)mSettings->value(SETTINGS_CHECKED_PLATFORM, defaultPlatform).toInt());
+    PlatformData &platform = mPlatforms.get(static_cast<Platform::Type>(mSettings->value(SETTINGS_CHECKED_PLATFORM, defaultPlatform).toInt()));
     platform.mActMainWindow->setChecked(true);
 
     mNetworkAccessManager = new QNetworkAccessManager(this);
@@ -305,6 +343,8 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     } else {
         delete mUI->mLayoutInformation;
     }
+
+    changeReportType();
 }
 
 MainWindow::~MainWindow()
@@ -355,6 +395,17 @@ void MainWindow::loadSettings()
                mSettings->value(SETTINGS_WINDOW_HEIGHT, 600).toInt());
     }
 
+    const ReportType reportType = static_cast<ReportType>(mSettings->value(SETTINGS_REPORT_TYPE, static_cast<int>(ReportType::normal)).toInt());
+    mUI->mActionReportNormal->setChecked(reportType <= ReportType::normal);
+    mUI->mActionReportAutosar->setChecked(reportType == ReportType::autosar);
+    mUI->mActionReportCertC->setChecked(reportType == ReportType::certC);
+    mUI->mActionReportCertCpp->setChecked(reportType == ReportType::certCpp);
+    mUI->mActionReportMisraC->setChecked(reportType == ReportType::misraC2012 ||
+                                         reportType == ReportType::misraC2023 ||
+                                         reportType == ReportType::misraC2025);
+    mUI->mActionReportMisraCpp2008->setChecked(reportType == ReportType::misraCpp2008);
+    mUI->mActionReportMisraCpp2023->setChecked(reportType == ReportType::misraCpp2023);
+
     const ShowTypes &types = mUI->mResults->getShowTypes();
     mUI->mActionShowStyle->setChecked(types.isShown(ShowTypes::ShowStyle));
     mUI->mActionShowErrors->setChecked(types.isShown(ShowTypes::ShowErrors));
@@ -370,6 +421,9 @@ void MainWindow::loadSettings()
     mUI->mActionC89->setChecked(standards.c == Standards::C89);
     mUI->mActionC99->setChecked(standards.c == Standards::C99);
     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);
@@ -377,6 +431,7 @@ void MainWindow::loadSettings()
     mUI->mActionCpp17->setChecked(standards.cpp == Standards::CPP17);
     mUI->mActionCpp20->setChecked(standards.cpp == Standards::CPP20);
     //mUI->mActionCpp23->setChecked(standards.cpp == Standards::CPP23);
+    //mUI->mActionCpp26->setChecked(standards.cpp == Standards::CPP26);
 
     // Main window settings
     const bool showMainToolbar = mSettings->value(SETTINGS_TOOLBARS_MAIN_SHOW, true).toBool();
@@ -391,10 +446,10 @@ void MainWindow::loadSettings()
     mUI->mActionToolBarFilter->setChecked(showFilterToolbar);
     mUI->mToolBarFilter->setVisible(showFilterToolbar);
 
-    const Settings::Language enforcedLanguage = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
-    if (enforcedLanguage == Settings::CPP)
+    const Standards::Language enforcedLanguage = static_cast<Standards::Language>(mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt());
+    if (enforcedLanguage == Standards::Language::CPP)
         mUI->mActionEnforceCpp->setChecked(true);
-    else if (enforcedLanguage == Settings::C)
+    else if (enforcedLanguage == Standards::Language::C)
         mUI->mActionEnforceC->setChecked(true);
     else
         mUI->mActionAutoDetectLanguage->setChecked(true);
@@ -427,6 +482,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
@@ -434,6 +498,15 @@ void MainWindow::saveSettings() const
     mSettings->setValue(SETTINGS_WINDOW_HEIGHT, size().height());
     mSettings->setValue(SETTINGS_WINDOW_MAXIMIZED, isMaximized());
 
+    const ReportType reportType = mUI->mActionReportAutosar->isChecked() ? ReportType::autosar :
+                                  mUI->mActionReportCertC->isChecked() ? ReportType::certC :
+                                  mUI->mActionReportCertCpp->isChecked() ? ReportType::certCpp :
+                                  mUI->mActionReportMisraC->isChecked() ? (mProjectFile ? getMisraCReportType(mProjectFile->getCodingStandards()) : ReportType::misraC2012) :
+                                  mUI->mActionReportMisraCpp2008->isChecked() ? ReportType::misraCpp2008 :
+                                  mUI->mActionReportMisraCpp2023->isChecked() ? ReportType::misraCpp2023 :
+                                  ReportType::normal;
+    mSettings->setValue(SETTINGS_REPORT_TYPE, static_cast<int>(reportType));
+
     // Show * states
     mSettings->setValue(SETTINGS_SHOW_STYLE, mUI->mActionShowStyle->isChecked());
     mSettings->setValue(SETTINGS_SHOW_ERRORS, mUI->mActionShowErrors->isChecked());
@@ -448,6 +521,12 @@ void MainWindow::saveSettings() const
         mSettings->setValue(SETTINGS_STD_C, "C99");
     if (mUI->mActionC11->isChecked())
         mSettings->setValue(SETTINGS_STD_C, "C11");
+    //if (mUI->mActionC17->isChecked())
+    //    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");
@@ -461,6 +540,8 @@ void MainWindow::saveSettings() const
         mSettings->setValue(SETTINGS_STD_CPP, "C++20");
     //if (mUI.mActionCpp23->isChecked())
     //    mSettings->setValue(SETTINGS_STD_CPP, "C++23");
+    //if (mUI.mActionCpp26->isChecked())
+    //    mSettings->setValue(SETTINGS_STD_CPP, "C++26");
 
     // Main window settings
     mSettings->setValue(SETTINGS_TOOLBARS_MAIN_SHOW, mUI->mToolBarMain->isVisible());
@@ -468,11 +549,11 @@ void MainWindow::saveSettings() const
     mSettings->setValue(SETTINGS_TOOLBARS_FILTER_SHOW, mUI->mToolBarFilter->isVisible());
 
     if (mUI->mActionEnforceCpp->isChecked())
-        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::CPP);
+        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::CPP);
     else if (mUI->mActionEnforceC->isChecked())
-        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::C);
+        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::C);
     else
-        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Settings::None);
+        mSettings->setValue(SETTINGS_ENFORCED_LANGUAGE, Standards::Language::None);
 
     mApplications->saveSettings();
 
@@ -485,6 +566,11 @@ void MainWindow::saveSettings() const
 
 void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, const bool checkConfiguration)
 {
+    Settings checkSettings;
+    auto supprs = std::make_shared<Suppressions>();
+    if (!getCppcheckSettings(checkSettings, *supprs))
+        return;
+
     clearResults();
 
     mIsLogfileLoaded = false;
@@ -497,7 +583,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
         p.ignorePaths(v);
 
         if (!mProjectFile->getAnalyzeAllVsConfigs()) {
-            const cppcheck::Platform::Type platform = (cppcheck::Platform::Type) mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt();
+            const Platform::Type platform = static_cast<Platform::Type>(mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt());
             std::vector<std::string> configurations;
             const QStringList configs = mProjectFile->getVsConfigurations();
             std::transform(configs.cbegin(), configs.cend(), std::back_inserter(configurations), [](const QString& e) {
@@ -510,6 +596,7 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
     }
 
     mUI->mResults->clear(true);
+    mUI->mResults->setResultsSource(ResultsTree::ResultsSource::Analysis);
     mThread->clearFiles();
 
     mUI->mResults->checkingStarted(p.fileSettings.size());
@@ -521,7 +608,6 @@ void MainWindow::doAnalyzeProject(ImportProject p, const bool checkLibrary, cons
     checkLockDownUI(); // lock UI while checking
 
     mUI->mResults->setCheckDirectory(checkPath);
-    Settings checkSettings = getCppcheckSettings();
     checkSettings.force = false;
     checkSettings.checkLibrary = checkLibrary;
     checkSettings.checkConfiguration = checkConfiguration;
@@ -542,15 +628,25 @@ 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);
+    mThread->check(checkSettings, supprs);
+    mUI->mResults->setCheckSettings(checkSettings);
 }
 
 void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrary, const bool checkConfiguration)
 {
-    if (files.isEmpty()) {
+    if (files.isEmpty())
         return;
-    }
+
+    Settings checkSettings;
+    auto supprs = std::make_shared<Suppressions>();
+    if (!getCppcheckSettings(checkSettings, *supprs))
+        return;
+
     clearResults();
 
     mIsLogfileLoaded = false;
@@ -564,6 +660,7 @@ 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()) {
@@ -576,12 +673,14 @@ 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);
+    // TODO: lock UI here?
+    mUI->mResults->checkingStarted(fdetails.size());
+    mThread->setFiles(std::move(fdetails));
     if (mProjectFile && !checkConfiguration)
         mThread->setAddonsAndTools(mProjectFile->getAddonsAndTools());
-    mThread->setSuppressions(mProjectFile ? mProjectFile->getSuppressions() : QList<Suppressions::Suppression>());
+    mThread->setSuppressions(mProjectFile ? mProjectFile->getCheckingSuppressions() : QList<SuppressionList::Suppression>());
     QDir inf(mCurrentDirectory);
     const QString checkPath = inf.canonicalPath();
     setPath(SETTINGS_LAST_CHECK_PATH, checkPath);
@@ -589,7 +688,6 @@ void MainWindow::doAnalyzeFiles(const QStringList &files, const bool checkLibrar
     checkLockDownUI(); // lock UI while checking
 
     mUI->mResults->setCheckDirectory(checkPath);
-    Settings checkSettings = getCppcheckSettings();
     checkSettings.checkLibrary = checkLibrary;
     checkSettings.checkConfiguration = checkConfiguration;
 
@@ -602,36 +700,45 @@ 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, checkSettings.project.fileSettings);
+        AnalyzerInformation::writeFilesTxt(checkSettings.buildDir, sourcefiles, checkSettings.userDefines, {});
     }
 
     mThread->setCheckFiles(true);
-    mThread->check(checkSettings);
+    mThread->check(checkSettings, supprs);
+    mUI->mResults->setCheckSettings(checkSettings);
 }
 
 void MainWindow::analyzeCode(const QString& code, const QString& filename)
 {
+    Settings checkSettings;
+    Suppressions supprs;
+    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,const QString&)),
-            mUI->mResults, SLOT(progress(int,const QString&)));
-    connect(&result, SIGNAL(error(const ErrorItem&)),
-            mUI->mResults, SLOT(error(const ErrorItem&)));
-    connect(&result, SIGNAL(log(const QString&)),
-            mUI->mResults, SLOT(log(const QString&)));
-    connect(&result, SIGNAL(debugError(const ErrorItem&)),
-            mUI->mResults, SLOT(debugError(const ErrorItem&)));
+    connect(&result, SIGNAL(progress(int,QString)),
+            mUI->mResults, SLOT(progress(int,QString)));
+    connect(&result, SIGNAL(error(ErrorItem)),
+            mUI->mResults, SLOT(error(ErrorItem)));
+    connect(&result, SIGNAL(log(QString)),
+            mUI->mResults, SLOT(log(QString)));
+    connect(&result, SIGNAL(debugError(ErrorItem)),
+            mUI->mResults, SLOT(debugError(ErrorItem)));
 
     // Create CppCheck instance
-    CppCheck cppcheck(result, true, nullptr);
-    cppcheck.settings() = getCppcheckSettings();
+    CppCheck cppcheck(checkSettings, supprs, result, nullptr, true, nullptr);
 
     // Check
     checkLockDownUI();
     clearResults();
     mUI->mResults->checkingStarted(1);
-    cppcheck.check(filename.toStdString(), 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
@@ -701,7 +808,7 @@ void MainWindow::analyzeFiles()
 
     QStringList selected = selectFilesToAnalyze(QFileDialog::ExistingFiles);
 
-    const QString file0 = (selected.size() ? selected[0].toLower() : QString());
+    const QString file0 = (!selected.empty() ? selected[0].toLower() : QString());
     if (file0.endsWith(".sln")
         || file0.endsWith(".vcxproj")
         || file0.endsWith(compile_commands_json)
@@ -711,7 +818,7 @@ void MainWindow::analyzeFiles()
 
         if (file0.endsWith(".sln")) {
             QStringList configs;
-            for (std::list<ImportProject::FileSettings>::const_iterator it = p.fileSettings.cbegin(); it != p.fileSettings.cend(); ++it) {
+            for (auto it = p.fileSettings.cbegin(); it != p.fileSettings.cend(); ++it) {
                 const QString cfg(QString::fromStdString(it->cfg));
                 if (!configs.contains(cfg))
                     configs.push_back(cfg);
@@ -725,7 +832,7 @@ void MainWindow::analyzeFiles()
             p.ignoreOtherConfigs(cfg.toStdString());
         }
 
-        doAnalyzeProject(p);
+        doAnalyzeProject(p); // TODO: avoid copy
         return;
     }
 
@@ -805,24 +912,30 @@ void MainWindow::addIncludeDirs(const QStringList &includeDirs, Settings &result
     }
 }
 
-Library::Error MainWindow::loadLibrary(Library *library, const QString &filename)
+Library::Error MainWindow::loadLibrary(Library &library, const QString &filename)
 {
     Library::Error ret;
 
     // Try to load the library from the project folder..
     if (mProjectFile) {
         QString path = QFileInfo(mProjectFile->getFilename()).canonicalPath();
-        ret = library->load(nullptr, (path+"/"+filename).toLatin1());
+        QString libpath = path+"/"+filename;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
+        ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
     }
 
     // Try to load the library from the application folder..
     const QString appPath = QFileInfo(QCoreApplication::applicationFilePath()).canonicalPath();
-    ret = library->load(nullptr, (appPath+"/"+filename).toLatin1());
+    QString libpath = appPath+"/"+filename;
+    qDebug().noquote() << "looking for library '" + libpath + "'";
+    ret = library.load(nullptr, libpath.toLatin1());
     if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
         return ret;
-    ret = library->load(nullptr, (appPath+"/cfg/"+filename).toLatin1());
+    libpath = appPath+"/cfg/"+filename;
+    qDebug().noquote() << "looking for library '" + libpath + "'";
+    ret = library.load(nullptr, libpath.toLatin1());
     if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
         return ret;
 
@@ -830,10 +943,14 @@ Library::Error MainWindow::loadLibrary(Library *library, const QString &filename
     // Try to load the library from FILESDIR/cfg..
     const QString filesdir = FILESDIR;
     if (!filesdir.isEmpty()) {
-        ret = library->load(nullptr, (filesdir+"/cfg/"+filename).toLatin1());
+        libpath = filesdir+"/cfg/"+filename;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
+        ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
-        ret = library->load(nullptr, (filesdir+filename).toLatin1());
+        libpath = filesdir+"/"+filename;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
+        ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
     }
@@ -842,18 +959,24 @@ Library::Error MainWindow::loadLibrary(Library *library, const QString &filename
     // Try to load the library from the cfg subfolder..
     const QString datadir = getDataDir();
     if (!datadir.isEmpty()) {
-        ret = library->load(nullptr, (datadir+"/"+filename).toLatin1());
+        libpath = datadir+"/"+filename;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
+        ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
-        ret = library->load(nullptr, (datadir+"/cfg/"+filename).toLatin1());
+        libpath = datadir+"/cfg/"+filename;
+        qDebug().noquote() << "looking for library '" + libpath + "'";
+        ret = library.load(nullptr, libpath.toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
     }
 
+    qDebug().noquote() << "library not found: '" + filename + "'";
+
     return ret;
 }
 
-bool MainWindow::tryLoadLibrary(Library *library, const QString& filename)
+bool MainWindow::tryLoadLibrary(Library &library, const QString& filename)
 {
     const Library::Error error = loadLibrary(library, filename);
     if (error.errorcode != Library::ErrorCode::OK) {
@@ -887,6 +1010,9 @@ bool MainWindow::tryLoadLibrary(Library *library, const QString& filename)
         case Library::ErrorCode::PLATFORM_TYPE_REDEFINED:
             errmsg = tr("Platform type redefined");
             break;
+        case Library::ErrorCode::DUPLICATE_DEFINE:
+            errmsg = tr("Duplicate define");
+            break;
         case Library::ErrorCode::UNKNOWN_ELEMENT:
             errmsg = tr("Unknown element");
             break;
@@ -902,120 +1028,176 @@ bool MainWindow::tryLoadLibrary(Library *library, const QString& filename)
     return true;
 }
 
-Settings MainWindow::getCppcheckSettings()
+QString MainWindow::loadAddon(Settings &settings, const QString &filesDir, const QString &pythonCmd, const QString& addon)
+{
+    const QString addonFilePath = fromNativePath(ProjectFile::getAddonFilePath(filesDir, addon));
+
+    if (addonFilePath.isEmpty())
+        return tr("File not found: '%1'").arg(addon);
+
+    picojson::object obj;
+    obj["script"] = picojson::value(addonFilePath.toStdString());
+    if (!pythonCmd.isEmpty())
+        obj["python"] = picojson::value(pythonCmd.toStdString());
+
+    if (!isCppcheckPremium() && addon == "misra") {
+        const QString misraFile = fromNativePath(mSettings->value(SETTINGS_MISRA_FILE).toString());
+        if (!misraFile.isEmpty()) {
+            QString arg;
+            picojson::array arr;
+            arg = "--rule-texts=" + misraFile;
+            arr.emplace_back(arg.toStdString());
+            obj["args"] = picojson::value(arr);
+        }
+    }
+
+    const std::string& json_str = picojson::value(obj).serialize();
+
+    AddonInfo addonInfo;
+    const std::string errmsg = addonInfo.getAddonInfo(json_str, settings.exename);
+    if (!errmsg.empty())
+        return tr("Failed to load/setup addon %1: %2").arg(addon, QString::fromStdString(errmsg));
+    settings.addonInfos.emplace_back(std::move(addonInfo));
+
+    settings.addons.emplace(json_str);
+
+    return "";
+}
+
+bool MainWindow::getCppcheckSettings(Settings& settings, Suppressions& supprs)
 {
     saveSettings(); // Save settings
 
-    Settings result;
+    Settings::terminate(true);
+
+    settings.exename = QCoreApplication::applicationFilePath().toStdString();
+    settings.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
+
+    // default to --check-level=normal for GUI for now
+    settings.setCheckLevel(Settings::CheckLevel::normal);
+
+    const bool std = tryLoadLibrary(settings.library, "std.cfg");
+    if (!std) {
+        QMessageBox::critical(this, tr("Error"), tr("Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=<directory> 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.\n\nAnalysis is aborted.").arg("std.cfg"));
+        return false;
+    }
+
+    const QString filesDir(getDataDir());
+    const QString pythonCmd = fromNativePath(mSettings->value(SETTINGS_PYTHON_PATH).toString());
 
-    result.exename = QCoreApplication::applicationFilePath().toStdString();
+    {
+        const QString cfgErr = QString::fromStdString(Settings::loadCppcheckCfg(settings, supprs));
+        if (!cfgErr.isEmpty()) {
+            QMessageBox::critical(this, tr("Error"), tr("Failed to load %1 - %2\n\nAnalysis is aborted.").arg("cppcheck.cfg").arg(cfgErr));
+            return false;
+        }
 
-    const bool std = tryLoadLibrary(&result.library, "std.cfg");
-    if (!std)
-        QMessageBox::critical(this, tr("Error"), tr("Failed to load %1. Your Cppcheck installation is broken. You can use --data-dir=<directory> 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.").arg("std.cfg"));
+        settings.premium = startsWith(settings.cppcheckCfgProductName, "Cppcheck Premium");
 
-    result.loadCppcheckCfg();
+        const auto cfgAddons = settings.addons;
+        settings.addons.clear();
+        for (const std::string& addon : cfgAddons) {
+            // TODO: support addons which are a script and not a file
+            const QString addonError = loadAddon(settings, filesDir, pythonCmd, QString::fromStdString(addon));
+            if (!addonError.isEmpty()) {
+                QMessageBox::critical(this, tr("Error"), tr("%1\n\nAnalysis is aborted.").arg(addonError));
+                return false;
+            }
+        }
+    }
 
     // If project file loaded, read settings from it
     if (mProjectFile) {
         QStringList dirs = mProjectFile->getIncludeDirs();
-        addIncludeDirs(dirs, result);
+        addIncludeDirs(dirs, settings);
+
+        settings.inlineSuppressions = mProjectFile->getInlineSuppression();
 
         const QStringList defines = mProjectFile->getDefines();
         for (const QString& define : defines) {
-            if (!result.userDefines.empty())
-                result.userDefines += ";";
-            result.userDefines += define.toStdString();
+            if (!settings.userDefines.empty())
+                settings.userDefines += ";";
+            settings.userDefines += define.toStdString();
         }
 
-        result.clang = mProjectFile->clangParser;
+        settings.clang = mProjectFile->clangParser;
 
         const QStringList undefines = mProjectFile->getUndefines();
         for (const QString& undefine : undefines)
-            result.userUndefs.insert(undefine.toStdString());
+            settings.userUndefs.insert(undefine.toStdString());
 
         const QStringList libraries = mProjectFile->getLibraries();
         for (const QString& library : libraries) {
-            result.libraries.emplace_back(library.toStdString());
+            settings.libraries.emplace_back(library.toStdString());
             const QString filename = library + ".cfg";
-            tryLoadLibrary(&result.library, filename);
+            tryLoadLibrary(settings.library, filename);
         }
 
-        for (const Suppressions::Suppression &suppression : mProjectFile->getSuppressions()) {
-            result.nomsg.addSuppression(suppression);
+        for (const SuppressionList::Suppression &suppression : mProjectFile->getCheckingSuppressions()) {
+            supprs.nomsg.addSuppression(suppression); // TODO: check result
         }
 
-        // Only check the given -D configuration
-        if (!defines.isEmpty())
-            result.maxConfigs = 1;
-
         // If importing a project, only check the given configuration
-        if (!mProjectFile->getImportProject().isEmpty())
-            result.checkAllConfigurations = false;
+        if (mProjectFile->getImportProject().endsWith("json", Qt::CaseInsensitive))
+            settings.maxConfigsProject = 1;
 
         const QString &buildDir = fromNativePath(mProjectFile->getBuildDir());
         if (!buildDir.isEmpty()) {
             if (QDir(buildDir).isAbsolute()) {
-                result.buildDir = buildDir.toStdString();
+                settings.buildDir = buildDir.toStdString();
             } else {
                 QString prjpath = QFileInfo(mProjectFile->getFilename()).absolutePath();
-                result.buildDir = (prjpath + '/' + buildDir).toStdString();
+                settings.buildDir = (prjpath + '/' + buildDir).toStdString();
             }
         }
 
         const QString platform = mProjectFile->getPlatform();
         if (platform.endsWith(".xml")) {
-            const QString applicationFilePath = QCoreApplication::applicationFilePath();
-            result.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 = cppcheck::Platform::Type::Native; i <= cppcheck::Platform::Type::Unix64; i++) {
-                const cppcheck::Platform::Type p = (cppcheck::Platform::Type)i;
-                if (platform == cppcheck::Platform::toString(p)) {
-                    result.platform.set(p);
+            for (int i = Platform::Type::Native; i <= Platform::Type::Unix64; i++) {
+                const auto p = static_cast<Platform::Type>(i);
+                if (platform == Platform::toString(p)) {
+                    settings.platform.set(p);
                     break;
                 }
             }
         }
 
-        result.maxCtuDepth = mProjectFile->getMaxCtuDepth();
-        result.maxTemplateRecursion = mProjectFile->getMaxTemplateRecursion();
-        if (mProjectFile->isCheckLevelExhaustive())
-            result.setCheckLevelExhaustive();
-        else
-            result.setCheckLevelNormal();
-        result.checkHeaders = mProjectFile->getCheckHeaders();
-        result.checkUnusedTemplates = mProjectFile->getCheckUnusedTemplates();
-        result.safeChecks.classes = mProjectFile->safeChecks.classes;
-        result.safeChecks.externalFunctions = mProjectFile->safeChecks.externalFunctions;
-        result.safeChecks.internalFunctions = mProjectFile->safeChecks.internalFunctions;
-        result.safeChecks.externalVariables = mProjectFile->safeChecks.externalVariables;
+        settings.maxCtuDepth = mProjectFile->getMaxCtuDepth();
+        settings.maxTemplateRecursion = mProjectFile->getMaxTemplateRecursion();
+        switch (mProjectFile->getCheckLevel()) {
+        case ProjectFile::CheckLevel::reduced:
+            settings.setCheckLevel(Settings::CheckLevel::reduced);
+            break;
+        case ProjectFile::CheckLevel::normal:
+            settings.setCheckLevel(Settings::CheckLevel::normal);
+            break;
+        case ProjectFile::CheckLevel::exhaustive:
+            settings.setCheckLevel(Settings::CheckLevel::exhaustive);
+            break;
+        }
+        settings.checkHeaders = mProjectFile->getCheckHeaders();
+        settings.checkUnusedTemplates = mProjectFile->getCheckUnusedTemplates();
+        settings.safeChecks.classes = mProjectFile->safeChecks.classes;
+        settings.safeChecks.externalFunctions = mProjectFile->safeChecks.externalFunctions;
+        settings.safeChecks.internalFunctions = mProjectFile->safeChecks.internalFunctions;
+        settings.safeChecks.externalVariables = mProjectFile->safeChecks.externalVariables;
         for (const QString& s : mProjectFile->getCheckUnknownFunctionReturn())
-            result.checkUnknownFunctionReturn.insert(s.toStdString());
+            settings.checkUnknownFunctionReturn.insert(s.toStdString());
 
-        QString filesDir(getDataDir());
-        const QString pythonCmd = fromNativePath(mSettings->value(SETTINGS_PYTHON_PATH).toString());
         for (const QString& addon : mProjectFile->getAddons()) {
-            QString addonFilePath = ProjectFile::getAddonFilePath(filesDir, addon);
-            if (addonFilePath.isEmpty())
+            if (isCppcheckPremium() && addon == "misra")
                 continue;
-
-            addonFilePath.replace(QChar('\\'), QChar('/'));
-
-            QString json;
-            json += "{ \"script\":\"" + addonFilePath + "\"";
-            if (!pythonCmd.isEmpty())
-                json += ", \"python\":\"" + pythonCmd + "\"";
-            const QString misraFile = fromNativePath(mSettings->value(SETTINGS_MISRA_FILE).toString());
-            if (!isCppcheckPremium() && addon == "misra" && !misraFile.isEmpty()) {
-                QString arg;
-                if (misraFile.endsWith(".pdf", Qt::CaseInsensitive))
-                    arg = "--misra-pdf=" + misraFile;
-                else
-                    arg = "--rule-texts=" + misraFile;
-                json += ", \"args\":[\"" + arg + "\"]";
+            const QString addonError = loadAddon(settings, filesDir, pythonCmd, addon);
+            if (!addonError.isEmpty()) {
+                QMessageBox::critical(this, tr("Error"), tr("%1\n\nAnalysis is aborted.").arg(addonError));
+                return false;
             }
-            json += " }";
-            result.addons.emplace(json.toStdString());
         }
 
         if (isCppcheckPremium()) {
@@ -1024,14 +1206,15 @@ Settings MainWindow::getCppcheckSettings()
                 premiumArgs += " --bughunting";
             if (mProjectFile->getCertIntPrecision() > 0)
                 premiumArgs += " --cert-c-int-precision=" + QString::number(mProjectFile->getCertIntPrecision());
-            if (mProjectFile->getAddons().contains("misra"))
-                premiumArgs += " --misra-c-2012";
-            for (const QString& c: mProjectFile->getCodingStandards()) {
+            for (const QString& c: mProjectFile->getCodingStandards())
                 premiumArgs += " --" + c;
-            }
-            result.premiumArgs = premiumArgs.mid(1).toStdString();
+            if (!premiumArgs.contains("--misra-c-") && mProjectFile->getAddons().contains("misra"))
+                premiumArgs += " --misra-c-2012";
+            settings.premiumArgs = premiumArgs.mid(1).toStdString();
         }
     }
+    else
+        settings.inlineSuppressions = mSettings->value(SETTINGS_INLINE_SUPPRESSIONS, false).toBool();
 
     // Include directories (and files) are searched in listed order.
     // Global include directories must be added AFTER the per project include
@@ -1039,38 +1222,34 @@ Settings MainWindow::getCppcheckSettings()
     const QString globalIncludes = mSettings->value(SETTINGS_GLOBAL_INCLUDE_PATHS).toString();
     if (!globalIncludes.isEmpty()) {
         QStringList includes = globalIncludes.split(";");
-        addIncludeDirs(includes, result);
-    }
-
-    result.severity.enable(Severity::warning);
-    result.severity.enable(Severity::style);
-    result.severity.enable(Severity::performance);
-    result.severity.enable(Severity::portability);
-    result.severity.enable(Severity::information);
-    result.checks.enable(Checks::missingInclude);
-    if (!result.buildDir.empty())
-        result.checks.enable(Checks::unusedFunction);
-    result.debugwarnings = mSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, false).toBool();
-    result.quiet = false;
-    result.verbose = true;
-    result.force = mSettings->value(SETTINGS_CHECK_FORCE, 1).toBool();
-    result.xml = false;
-    result.jobs = mSettings->value(SETTINGS_CHECK_THREADS, 1).toInt();
-    result.inlineSuppressions = mSettings->value(SETTINGS_INLINE_SUPPRESSIONS, false).toBool();
-    result.certainty.setEnabled(Certainty::inconclusive, mSettings->value(SETTINGS_INCONCLUSIVE_ERRORS, false).toBool());
-    if (!mProjectFile || result.platform.type == cppcheck::Platform::Type::Unspecified)
-        result.platform.set((cppcheck::Platform::Type) mSettings->value(SETTINGS_CHECKED_PLATFORM, 0).toInt());
-    result.standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
-    result.standards.setC(mSettings->value(SETTINGS_STD_C, QString()).toString().toStdString());
-    result.enforcedLang = (Settings::Language)mSettings->value(SETTINGS_ENFORCED_LANGUAGE, 0).toInt();
-
-    if (result.jobs <= 1) {
-        result.jobs = 1;
-    }
+        addIncludeDirs(includes, settings);
+    }
+
+    settings.severity.enable(Severity::warning);
+    settings.severity.enable(Severity::style);
+    settings.severity.enable(Severity::performance);
+    settings.severity.enable(Severity::portability);
+    settings.severity.enable(Severity::information);
+    settings.checks.enable(Checks::missingInclude);
+    if (!settings.buildDir.empty())
+        settings.checks.enable(Checks::unusedFunction);
+    settings.debugwarnings = mSettings->value(SETTINGS_SHOW_DEBUG_WARNINGS, false).toBool();
+    settings.quiet = false;
+    settings.verbose = true;
+    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());
+    if (!mProjectFile || settings.platform.type == Platform::Type::Unspecified)
+        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.jobs = std::max(settings.jobs, 1u);
 
     Settings::terminate(false);
 
-    return result;
+    return true;
 }
 
 void MainWindow::analysisDone()
@@ -1106,7 +1285,7 @@ void MainWindow::analysisDone()
         if (QDir(buildDir).exists()) {
             mUI->mResults->saveStatistics(buildDir + "/statistics.txt");
             mUI->mResults->updateFromOldReport(buildDir + "/lastResults.xml");
-            mUI->mResults->save(buildDir + "/lastResults.xml", Report::XMLV2);
+            mUI->mResults->save(buildDir + "/lastResults.xml", Report::XMLV2, mCppcheckCfgProductName);
         }
     }
 
@@ -1170,7 +1349,7 @@ void MainWindow::reAnalyzeModified()
 void MainWindow::reAnalyzeAll()
 {
     if (mProjectFile)
-        analyzeProject(mProjectFile);
+        analyzeProject(mProjectFile, QStringList());
     else
         reAnalyze(true);
 }
@@ -1178,13 +1357,13 @@ void MainWindow::reAnalyzeAll()
 void MainWindow::checkLibrary()
 {
     if (mProjectFile)
-        analyzeProject(mProjectFile, true);
+        analyzeProject(mProjectFile, QStringList(), true);
 }
 
 void MainWindow::checkConfiguration()
 {
     if (mProjectFile)
-        analyzeProject(mProjectFile, false, true);
+        analyzeProject(mProjectFile, QStringList(), false, true);
 }
 
 void MainWindow::reAnalyzeSelected(const QStringList& files)
@@ -1194,6 +1373,21 @@ void MainWindow::reAnalyzeSelected(const QStringList& files)
     if (mThread->isChecking())
         return;
 
+    if (mProjectFile) {
+        // Clear details, statistics and progress
+        mUI->mResults->clear(false);
+        for (int i = 0; i < files.size(); ++i)
+            mUI->mResults->clearRecheckFile(files[i]);
+
+        analyzeProject(mProjectFile, files);
+        return;
+    }
+
+    Settings checkSettings;
+    auto supprs = std::make_shared<Suppressions>();
+    if (!getCppcheckSettings(checkSettings, *supprs))
+        return;
+
     // Clear details, statistics and progress
     mUI->mResults->clear(false);
     for (int i = 0; i < files.size(); ++i)
@@ -1204,31 +1398,39 @@ 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"
     // TODO: Should we store per file CheckStartTime?
     QDateTime saveCheckStartTime = mThread->getCheckStartTime();
-    mThread->check(getCppcheckSettings());
-    mThread->setCheckStartTime(saveCheckStartTime);
+    mThread->check(checkSettings, supprs);
+    mUI->mResults->setCheckSettings(checkSettings);
+    mThread->setCheckStartTime(std::move(saveCheckStartTime));
 }
 
 void MainWindow::reAnalyze(bool all)
 {
-    const QStringList files = mThread->getReCheckFiles(all);
+    const std::list<FileWithDetails> files = mThread->getReCheckFiles(all);
     if (files.empty())
         return;
 
+    Settings checkSettings;
+    auto supprs = std::make_shared<Suppressions>();
+    if (!getCppcheckSettings(checkSettings, *supprs))
+        return;
+
     // Clear details, statistics and progress
     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());
@@ -1237,7 +1439,8 @@ void MainWindow::reAnalyze(bool all)
         qDebug() << "Rechecking project file" << mProjectFile->getFilename();
 
     mThread->setCheckFiles(all);
-    mThread->check(getCppcheckSettings());
+    mThread->check(checkSettings, supprs);
+    mUI->mResults->setCheckSettings(checkSettings);
 }
 
 void MainWindow::clearResults()
@@ -1297,6 +1500,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);
@@ -1316,7 +1520,7 @@ void MainWindow::enableCheckButtons(bool enable)
     mUI->mActionAnalyzeFiles->setEnabled(enable);
 
     if (mProjectFile) {
-        mUI->mActionReanalyzeModified->setEnabled(false);
+        mUI->mActionReanalyzeModified->setEnabled(enable);
         mUI->mActionReanalyzeAll->setEnabled(enable);
     } else if (!enable || mThread->hasPreviousFiles()) {
         mUI->mActionReanalyzeModified->setEnabled(enable);
@@ -1326,17 +1530,16 @@ void MainWindow::enableCheckButtons(bool enable)
     mUI->mActionAnalyzeDirectory->setEnabled(enable);
 
     if (isCppcheckPremium()) {
-        mUI->mActionComplianceReport->setEnabled(enable && mProjectFile && mProjectFile->getAddons().contains("misra"));
+        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)
@@ -1435,25 +1638,30 @@ void MainWindow::about()
         msg.exec();
     }
     else {
-        AboutDialog *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), this);
+        auto *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), this);
         dlg->exec();
     }
 }
 
 void MainWindow::showLicense()
 {
-    FileViewDialog *dlg = new FileViewDialog(":COPYING", tr("License"), this);
+    auto *dlg = new FileViewDialog(":COPYING", tr("License"), this);
     dlg->resize(570, 400);
     dlg->exec();
 }
 
 void MainWindow::showAuthors()
 {
-    FileViewDialog *dlg = new FileViewDialog(":AUTHORS", tr("Authors"), this);
+    auto *dlg = new FileViewDialog(":AUTHORS", tr("Authors"), this);
     dlg->resize(350, 400);
     dlg->exec();
 }
 
+void MainWindow::showEULA()
+{
+    QDesktopServices::openUrl(QUrl("https://www.cppcheck.com/EULA"));
+}
+
 void MainWindow::performSelectedFilesCheck(const QStringList &selectedFilesList)
 {
     reAnalyzeSelected(selectedFilesList);
@@ -1492,27 +1700,37 @@ void MainWindow::save()
                 type = Report::CSV;
         }
 
-        mUI->mResults->save(selectedFile, type);
+        mUI->mResults->save(selectedFile, type, mCppcheckCfgProductName);
         setPath(SETTINGS_LAST_RESULT_PATH, selectedFile);
     }
 }
 
 void MainWindow::complianceReport()
 {
-    if (isCppcheckPremium() && mProjectFile && mProjectFile->getAddons().contains("misra")) {
-        QTemporaryFile tempResults;
-        tempResults.open();
-        tempResults.close();
+    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;
+    }
 
-        mUI->mResults->save(tempResults.fileName(), Report::XMLV2);
+    QTemporaryFile tempResults;
+    (void)tempResults.open(); // TODO: check result
+    tempResults.close();
 
-        ComplianceReportDialog dlg(mProjectFile, tempResults.fileName());
-        dlg.exec();
-    }
+    mUI->mResults->save(tempResults.fileName(), Report::XMLV2, mCppcheckCfgProductName);
+
+    ComplianceReportDialog dlg(mProjectFile, tempResults.fileName(), mUI->mResults->getStatistics()->getCheckersReport());
+    dlg.exec();
 }
 
 void MainWindow::resultsAdded()
-{}
+{
+    enableResultsButtons();
+}
 
 void MainWindow::toggleMainToolBar()
 {
@@ -1539,6 +1757,7 @@ void MainWindow::formatAndSetTitle(const QString &text)
         nameWithVersion += " (" + extraVersion + ")";
     }
 
+    // TODO: should not contain the version
     if (!mCppcheckCfgProductName.isEmpty())
         nameWithVersion = mCppcheckCfgProductName;
 
@@ -1578,7 +1797,7 @@ void MainWindow::aboutToShowViewMenu()
 void MainWindow::stopAnalysis()
 {
     mThread->stop();
-    mUI->mResults->disableProgressbar();
+    mUI->mResults->stopAnalysis();
     const QString &lastResults = getLastResults();
     if (!lastResults.isEmpty()) {
         mUI->mResults->updateFromOldReport(lastResults);
@@ -1592,7 +1811,7 @@ void MainWindow::openHelpContents()
 
 void MainWindow::openOnlineHelp()
 {
-    HelpDialog *helpDialog = new HelpDialog;
+    auto *helpDialog = new HelpDialog;
     helpDialog->showMaximized();
 }
 
@@ -1632,13 +1851,15 @@ 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();
     if (!loadLastResults())
-        analyzeProject(mProjectFile);
+        analyzeProject(mProjectFile, QStringList());
 }
 
 QString MainWindow::getLastResults() const
@@ -1653,8 +1874,9 @@ bool MainWindow::loadLastResults()
     const QString &lastResults = getLastResults();
     if (lastResults.isEmpty())
         return false;
-    if (!QFileInfo(lastResults).exists())
+    if (!QFileInfo::exists(lastResults))
         return false;
+    mUI->mResults->clear(true);
     mUI->mResults->readErrorsXml(lastResults);
     mUI->mResults->setCheckDirectory(mSettings->value(SETTINGS_LAST_CHECK_PATH,QString()).toString());
     mUI->mActionViewStats->setEnabled(true);
@@ -1662,12 +1884,36 @@ bool MainWindow::loadLastResults()
     return true;
 }
 
-void MainWindow::analyzeProject(const ProjectFile *projectFile, const bool checkLibrary, const bool checkConfiguration)
+void MainWindow::analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, const bool checkLibrary, const bool checkConfiguration)
 {
     Settings::terminate(false);
 
     QFileInfo inf(projectFile->getFilename());
-    const QString rootpath = projectFile->getRootPath();
+    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());
 
@@ -1737,8 +1983,17 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const bool check
             case ImportProject::Type::FAILURE:
                 errorMessage = tr("Failed to import project file");
                 break;
+            case ImportProject::Type::NONE:
+                // can never happen
+                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"),
@@ -1751,17 +2006,17 @@ void MainWindow::analyzeProject(const ProjectFile *projectFile, const bool check
         } catch (InternalError &e) {
             QMessageBox msg(QMessageBox::Critical,
                             tr("Cppcheck"),
-                            tr("Failed to import '%1', analysis is stopped").arg(prjfile),
+                            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, checkLibrary, checkConfiguration);  // TODO: avoid copy
         return;
     }
 
-    QStringList paths = projectFile->getCheckPaths();
+    QStringList paths = recheckFiles.isEmpty() ? projectFile->getCheckPaths() : recheckFiles;
 
     // If paths not given then check the root path (which may be the project
     // file's location, see above). This is to keep the compatibility with
@@ -1796,12 +2051,13 @@ void MainWindow::newProjectFile()
     mProjectFile = new ProjectFile(this);
     mProjectFile->setActiveProject();
     mProjectFile->setFilename(filepath);
+    mProjectFile->setProjectName(filename.left(filename.indexOf(".")));
     mProjectFile->setBuildDir(filename.left(filename.indexOf(".")) + "-cppcheck-build-dir");
 
     ProjectFileDialog dlg(mProjectFile, isCppcheckPremium(), this);
     if (dlg.exec() == QDialog::Accepted) {
         addProjectMRU(filepath);
-        analyzeProject(mProjectFile);
+        analyzeProject(mProjectFile, QStringList());
     } else {
         closeProjectFile();
     }
@@ -1822,7 +2078,7 @@ void MainWindow::editProjectFile()
     if (!mProjectFile) {
         QMessageBox msg(QMessageBox::Critical,
                         tr("Cppcheck"),
-                        QString(tr("No project file loaded")),
+                        tr("No project file loaded"),
                         QMessageBox::Ok,
                         this);
         msg.exec();
@@ -1832,7 +2088,7 @@ void MainWindow::editProjectFile()
     ProjectFileDialog dlg(mProjectFile, isCppcheckPremium(), this);
     if (dlg.exec() == QDialog::Accepted) {
         mProjectFile->write();
-        analyzeProject(mProjectFile);
+        analyzeProject(mProjectFile, QStringList());
     }
 }
 
@@ -1877,7 +2133,7 @@ void MainWindow::enableProjectOpenActions(bool enable)
 
 void MainWindow::openRecentProject()
 {
-    QAction *action = qobject_cast<QAction *>(sender());
+    auto *action = qobject_cast<QAction *>(sender());
     if (!action)
         return;
     const QString project = action->data().toString();
@@ -1920,7 +2176,7 @@ void MainWindow::updateMRUMenuItems()
     // Do a sanity check - remove duplicates and non-existing projects
     int removed = projects.removeDuplicates();
     for (int i = projects.size() - 1; i >= 0; i--) {
-        if (!QFileInfo(projects[i]).exists()) {
+        if (!QFileInfo::exists(projects[i])) {
             projects.removeAt(i);
             removed++;
         }
@@ -1929,7 +2185,7 @@ void MainWindow::updateMRUMenuItems()
     if (removed)
         mSettings->setValue(SETTINGS_MRU_PROJECTS, projects);
 
-    const int numRecentProjects = qMin(projects.size(), (int)MaxRecentProjects);
+    const int numRecentProjects = qMin(projects.size(), static_cast<int>(MaxRecentProjects));
     for (int i = 0; i < numRecentProjects; i++) {
         const QString filename = QFileInfo(projects[i]).fileName();
         const QString text = QString("&%1 %2").arg(i + 1).arg(filename);
@@ -1966,9 +2222,9 @@ void MainWindow::removeProjectMRU(const QString &project)
 
 void MainWindow::selectPlatform()
 {
-    QAction *action = qobject_cast<QAction *>(sender());
+    auto *action = qobject_cast<QAction *>(sender());
     if (action) {
-        const cppcheck::Platform::Type platform = (cppcheck::Platform::Type) action->data().toInt();
+        const Platform::Type platform = static_cast<Platform::Type>(action->data().toInt());
         mSettings->setValue(SETTINGS_CHECKED_PLATFORM, platform);
     }
 }
@@ -1979,7 +2235,7 @@ void MainWindow::suppressIds(QStringList ids)
         return;
     ids.removeDuplicates();
 
-    QList<Suppressions::Suppression> suppressions = mProjectFile->getSuppressions();
+    QList<SuppressionList::Suppression> suppressions = mProjectFile->getSuppressions();
     for (const QString& id : ids) {
         // Remove all matching suppressions
         std::string id2 = id.toStdString();
@@ -1990,7 +2246,7 @@ void MainWindow::suppressIds(QStringList ids)
                 ++i;
         }
 
-        Suppressions::Suppression newSuppression;
+        SuppressionList::Suppression newSuppression;
         newSuppression.errorId = id2;
         suppressions << newSuppression;
     }
@@ -2008,17 +2264,17 @@ static int getVersion(const QString& nameWithVersion) {
             break;
         if (c == ' ') {
             if (ret > 0 && dot == 1 && nameWithVersion.endsWith(" dev"))
-                return ret * 1000000 + v * 1000 + 500;
+                return (ret * 1000000) + (v * 1000) + 500;
             dot = ret = v = 0;
         }
         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;
@@ -2036,7 +2292,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);
@@ -2075,3 +2333,65 @@ bool MainWindow::isCppcheckPremium() const {
     return mCppcheckCfgProductName.startsWith("Cppcheck Premium ");
 }
 
+void MainWindow::changeReportType() {
+    const ReportType reportType = mUI->mActionReportAutosar->isChecked() ? ReportType::autosar :
+                                  mUI->mActionReportCertC->isChecked() ? ReportType::certC :
+                                  mUI->mActionReportCertCpp->isChecked() ? ReportType::certCpp :
+                                  mUI->mActionReportMisraC->isChecked() ? (mProjectFile ? getMisraCReportType(mProjectFile->getCodingStandards()) : ReportType::misraC2012) :
+                                  mUI->mActionReportMisraCpp2008->isChecked() ? ReportType::misraCpp2008 :
+                                  mUI->mActionReportMisraCpp2023->isChecked() ? ReportType::misraCpp2023 :
+                                  ReportType::normal;
+
+    mUI->mResults->setReportType(reportType);
+
+    auto setTextAndHint = [](QAction* a, const QString& s) {
+        a->setVisible(!s.isEmpty());
+        a->setText(s);
+        a->setToolTip(s);
+    };
+
+    const QString showMandatory = tr("Show Mandatory");
+    const QString showRequired = tr("Show Required");
+    const QString showAdvisory = tr("Show Advisory");
+    const QString showDocument = tr("Show Document");
+
+    if (mUI->mActionReportAutosar->isChecked()) {
+        setTextAndHint(mUI->mActionShowErrors, "");
+        setTextAndHint(mUI->mActionShowWarnings, showRequired);
+        setTextAndHint(mUI->mActionShowStyle, showAdvisory);
+        setTextAndHint(mUI->mActionShowPortability, "");
+        setTextAndHint(mUI->mActionShowPerformance, "");
+        setTextAndHint(mUI->mActionShowInformation, "");
+    } else if (mUI->mActionReportMisraC->isChecked() || mUI->mActionReportMisraCpp2008->isChecked() || mUI->mActionReportMisraCpp2023->isChecked()) {
+        setTextAndHint(mUI->mActionShowErrors, mUI->mActionReportMisraCpp2008->isChecked() ? "" : showMandatory);
+        setTextAndHint(mUI->mActionShowWarnings, showRequired);
+        setTextAndHint(mUI->mActionShowStyle, showAdvisory);
+        setTextAndHint(mUI->mActionShowPortability, "");
+        setTextAndHint(mUI->mActionShowPerformance, "");
+        setTextAndHint(mUI->mActionShowInformation, mUI->mActionReportMisraCpp2008->isChecked() ? showDocument : QString());
+    } else if (mUI->mActionReportCertC->isChecked() || mUI->mActionReportCertCpp->isChecked()) {
+        setTextAndHint(mUI->mActionShowErrors, tr("Show L1"));
+        setTextAndHint(mUI->mActionShowWarnings, tr("Show L2"));
+        setTextAndHint(mUI->mActionShowStyle, tr("Show L3"));
+        setTextAndHint(mUI->mActionShowPortability, "");
+        setTextAndHint(mUI->mActionShowPerformance, "");
+        setTextAndHint(mUI->mActionShowInformation, "");
+    } else {
+        setTextAndHint(mUI->mActionShowErrors, tr("Show errors"));
+        setTextAndHint(mUI->mActionShowWarnings, tr("Show warnings"));
+        setTextAndHint(mUI->mActionShowStyle, tr("Show style"));
+        setTextAndHint(mUI->mActionShowPortability, tr("Show portability"));
+        setTextAndHint(mUI->mActionShowPerformance, tr("Show performance"));
+        setTextAndHint(mUI->mActionShowInformation, tr("Show information"));
+    }
+}
+
+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 ab7d45d6428..76fda4f0de6 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-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
@@ -20,9 +20,11 @@
 #define MAINWINDOW_H
 
 #include "library.h"
-#include "settings.h"
 #include "platforms.h"
 
+#include <cstdint>
+#include <list>
+
 #include <QFileDialog>
 #include <QMainWindow>
 #include <QObject>
@@ -40,9 +42,11 @@ class QSettings;
 class QTimer;
 class QLineEdit;
 class ImportProject;
-class QCloseEvent;
 class QNetworkAccessManager;
 class QNetworkReply;
+class Settings;
+struct Suppressions;
+class FileWithDetails;
 namespace Ui {
     class MainWindow;
 }
@@ -61,7 +65,7 @@ class MainWindow : public QMainWindow {
     /**
      * @brief Maximum number of MRU project items in File-menu.
      */
-    enum { MaxRecentProjects = 5 };
+    enum : std::uint8_t { MaxRecentProjects = 5 };
 
     MainWindow(TranslationHandler* th, QSettings* settings);
     MainWindow(const MainWindow &) = delete;
@@ -166,6 +170,9 @@ 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();
 
@@ -193,7 +200,7 @@ public slots:
     /** @brief Slot for showing the library editor */
     void showLibraryEditor();
 
-protected slots:
+private slots:
 
     /** @brief Slot for checkthread's done signal */
     void analysisDone();
@@ -238,6 +245,8 @@ private slots:
     void replyFinished(QNetworkReply *reply);
 
     void hideInformation();
+
+    void changeReportType();
 private:
 
     bool isCppcheckPremium() const;
@@ -257,10 +266,11 @@ 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.
      */
-    void analyzeProject(const ProjectFile *projectFile, const bool checkLibrary = false, const bool checkConfiguration = false);
+    void analyzeProject(const ProjectFile *projectFile, const QStringList& recheckFiles, bool checkLibrary = false, bool checkConfiguration = false);
 
     /**
      * @brief Set current language
@@ -299,7 +309,7 @@ private slots:
      * @param checkLibrary Flag to indicate if library should be checked
      * @param checkConfiguration Flag to indicate if the configuration should be checked.
      */
-    void doAnalyzeProject(ImportProject p, const bool checkLibrary = false, const bool checkConfiguration = false);
+    void doAnalyzeProject(ImportProject p, bool checkLibrary = false, bool checkConfiguration = false);
 
     /**
      * @brief Analyze all files specified in parameter files
@@ -308,14 +318,12 @@ private slots:
      * @param checkLibrary Flag to indicate if library should be checked
      * @param checkConfiguration Flag to indicate if the configuration should be checked.
      */
-    void doAnalyzeFiles(const QStringList &files, const bool checkLibrary = false, const bool checkConfiguration = false);
+    void doAnalyzeFiles(const QStringList &files, bool checkLibrary = false, bool checkConfiguration = false);
 
     /**
      * @brief Get our default cppcheck settings and read project file.
-     *
-     * @return Default cppcheck settings
      */
-    Settings getCppcheckSettings();
+    bool getCppcheckSettings(Settings& settings, Suppressions& supprs);
 
     /** @brief Load program settings */
     void loadSettings();
@@ -391,7 +399,7 @@ private slots:
      * @param filename filename (no path)
      * @return error code
      */
-    Library::Error loadLibrary(Library *library, const QString &filename);
+    Library::Error loadLibrary(Library &library, const QString &filename);
 
     /**
      * @brief Tries to load library file, prints message on error
@@ -399,7 +407,9 @@ private slots:
      * @param filename filename (no path)
      * @return True if no error
      */
-    bool tryLoadLibrary(Library *library, const QString& filename);
+    bool tryLoadLibrary(Library &library, const QString& filename);
+
+    QString loadAddon(Settings &settings, const QString &filesDir, const QString &pythonCmd, const QString& addon);
 
     /**
      * @brief Update project MRU items in File-menu.
@@ -418,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;
 
@@ -437,10 +450,10 @@ private slots:
     QString mCurrentDirectory;
 
     /** @brief Scratchpad. */
-    ScratchPad* mScratchPad;
+    ScratchPad* mScratchPad{};
 
     /** @brief Project (file). */
-    ProjectFile *mProjectFile;
+    ProjectFile* mProjectFile{};
 
     /** @brief Filter field in the Filter toolbar. */
     QLineEdit* mLineEditFilter;
@@ -457,15 +470,18 @@ private slots:
     /** @brief GUI actions for selecting language. */
     QActionGroup *mSelectLanguageActions;
 
+    /** @brief GUI actions for selecting report. */
+    QActionGroup *mSelectReportActions;
+
     /**
      * @brief Are we exiting the cppcheck?
      * If this is true then the cppcheck is waiting for check threads to exit
      * so that the application can be closed.
      */
-    bool mExiting;
+    bool mExiting{};
 
     /** @brief Set to true in case of loading log file. */
-    bool mIsLogfileLoaded;
+    bool mIsLogfileLoaded{};
 
     /**
      * @brief Project MRU menu actions.
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index fc2e6cbe1af..a90949344e2 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -124,7 +124,7 @@
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>30</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="mMenuFile">
@@ -159,8 +159,22 @@
      <addaction name="mActionToolBarView"/>
      <addaction name="mActionToolBarFilter"/>
     </widget>
+    <widget class="QMenu" name="menuReport">
+     <property name="title">
+      <string>Report</string>
+     </property>
+     <addaction name="mActionReportNormal"/>
+     <addaction name="mActionReportAutosar"/>
+     <addaction name="mActionReportCertC"/>
+     <addaction name="mActionReportCertCpp"/>
+     <addaction name="mActionReportMisraC"/>
+     <addaction name="mActionReportMisraCpp2008"/>
+     <addaction name="mActionReportMisraCpp2023"/>
+    </widget>
     <addaction name="mMenuToolbars"/>
     <addaction name="separator"/>
+    <addaction name="menuReport"/>
+    <addaction name="separator"/>
     <addaction name="mActionShowErrors"/>
     <addaction name="mActionShowWarnings"/>
     <addaction name="mActionShowStyle"/>
@@ -186,6 +200,7 @@
     <addaction name="mActionHelpContents"/>
     <addaction name="mActionLicense"/>
     <addaction name="mActionAuthors"/>
+    <addaction name="mActionEULA"/>
     <addaction name="separator"/>
     <addaction name="mActionAbout"/>
    </widget>
@@ -203,6 +218,7 @@
      <addaction name="mActionCpp17"/>
      <addaction name="mActionCpp20"/>
      <!--addaction name="mActionCpp23"/-->
+     <!--addaction name="mActionCpp26"/-->
     </widget>
     <widget class="QMenu" name="menuC_standard">
      <property name="title">
@@ -211,6 +227,9 @@
      <addaction name="mActionC89"/>
      <addaction name="mActionC99"/>
      <addaction name="mActionC11"/>
+     <!--addaction name="mActionC17"/-->
+     <!--addaction name="mActionC23"/-->
+     <!--addaction name="mActionC2Y"/-->
     </widget>
     <addaction name="mActionAnalyzeFiles"/>
     <addaction name="mActionAnalyzeDirectory"/>
@@ -794,6 +813,30 @@
     <string>C&amp;11</string>
    </property>
   </action>
+  <!--action name="mActionC17">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>C&amp;17</string>
+   </property>
+  </action-->
+  <!--action name="mActionC23">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <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>
@@ -915,11 +958,88 @@
     <string>C++23</string>
    </property>
   </action-->
+  <!--action name="mActionCpp26">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>C++26</string>
+   </property>
+  </action-->
   <action name="mActionComplianceReport">
    <property name="text">
     <string>Compliance report...</string>
    </property>
   </action>
+  <action name="actionReport">
+   <property name="text">
+    <string>Report</string>
+   </property>
+  </action>
+  <action name="mActionReportNormal">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Normal</string>
+   </property>
+  </action>
+  <action name="mActionReportMisraC">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Misra C</string>
+   </property>
+  </action>
+  <action name="mActionReportMisraCpp2008">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Misra C++ 2008</string>
+   </property>
+  </action>
+  <action name="mActionReportCertC">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Cert C</string>
+   </property>
+  </action>
+  <action name="mActionReportCertCpp">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Cert C++</string>
+   </property>
+  </action>
+  <action name="mActionReportMisraCpp2023">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Misra C++ 2023</string>
+   </property>
+  </action>
+  <action name="mActionReportAutosar">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Autosar</string>
+   </property>
+  </action>
+  <action name="mActionEULA">
+   <property name="text">
+    <string>EULA...</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/gui/manualtest/mainwindow.md b/gui/manualtest/mainwindow.md
new file mode 100644
index 00000000000..563a538530f
--- /dev/null
+++ b/gui/manualtest/mainwindow.md
@@ -0,0 +1,21 @@
+
+# Main window
+
+Some manual testing in the main window interface
+
+
+## Test: Recheck file
+
+1. Load a project with results.
+1. Restart the GUI.
+1. Right click on a file and click on "Recheck".
+
+EXPECTED: Results for that file should be refreshed.
+
+
+## Test: Switch project
+
+1. Open project #1
+1. Open project #2 that has different results
+
+EXPECTED: Results for project #1 should go away, results for project #2 should be shown
diff --git a/gui/newsuppressiondialog.cpp b/gui/newsuppressiondialog.cpp
index 99815837a52..e93312681b1 100644
--- a/gui/newsuppressiondialog.cpp
+++ b/gui/newsuppressiondialog.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
@@ -28,10 +28,10 @@
 
 #include <QComboBox>
 #include <QLineEdit>
+#include <QString>
 #include <QStringList>
 
 class QWidget;
-enum class Color;
 
 NewSuppressionDialog::NewSuppressionDialog(QWidget *parent) :
     QDialog(parent),
@@ -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;
     };
 
@@ -62,9 +65,9 @@ NewSuppressionDialog::~NewSuppressionDialog()
     delete mUI;
 }
 
-Suppressions::Suppression NewSuppressionDialog::getSuppression() const
+SuppressionList::Suppression NewSuppressionDialog::getSuppression() const
 {
-    Suppressions::Suppression ret;
+    SuppressionList::Suppression ret;
     ret.errorId = mUI->mComboErrorId->currentText().toStdString();
     if (ret.errorId.empty())
         ret.errorId = "*";
@@ -75,7 +78,7 @@ Suppressions::Suppression NewSuppressionDialog::getSuppression() const
     return ret;
 }
 
-void NewSuppressionDialog::setSuppression(const Suppressions::Suppression &suppression)
+void NewSuppressionDialog::setSuppression(const SuppressionList::Suppression &suppression)
 {
     setWindowTitle(tr("Edit suppression"));
     mUI->mComboErrorId->setCurrentText(QString::fromStdString(suppression.errorId));
diff --git a/gui/newsuppressiondialog.h b/gui/newsuppressiondialog.h
index ac9aca46836..a0e637ddfec 100644
--- a/gui/newsuppressiondialog.h
+++ b/gui/newsuppressiondialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -23,7 +23,6 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QString>
 
 class QWidget;
 namespace Ui {
@@ -43,14 +42,14 @@ class NewSuppressionDialog : public QDialog {
      * @brief Translate the user input in the GUI into a suppression
      * @return Cppcheck suppression
      */
-    Suppressions::Suppression getSuppression() const;
+    SuppressionList::Suppression getSuppression() const;
 
     /**
      * @brief Update the GUI so it corresponds with the given
      * Cppcheck suppression
      * @param suppression Cppcheck suppression
      */
-    void setSuppression(const Suppressions::Suppression &suppression);
+    void setSuppression(const SuppressionList::Suppression &suppression);
 
 private:
     Ui::NewSuppressionDialog *mUI;
diff --git a/gui/platforms.cpp b/gui/platforms.cpp
index ce5f1c62ddb..77683a6ea09 100644
--- a/gui/platforms.cpp
+++ b/gui/platforms.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
@@ -24,9 +24,9 @@ Platforms::Platforms(QObject *parent)
     init();
 }
 
-void Platforms::add(const QString &title, cppcheck::Platform::Type platform)
+void Platforms::add(const QString &title, Platform::Type platform)
 {
-    Platform plat;
+    PlatformData plat;
     plat.mTitle = title;
     plat.mType = platform;
     plat.mActMainWindow = nullptr;
@@ -35,12 +35,12 @@ void Platforms::add(const QString &title, cppcheck::Platform::Type platform)
 
 void Platforms::init()
 {
-    add(tr("Native"), cppcheck::Platform::Type::Native);
-    add(tr("Unix 32-bit"), cppcheck::Platform::Type::Unix32);
-    add(tr("Unix 64-bit"), cppcheck::Platform::Type::Unix64);
-    add(tr("Windows 32-bit ANSI"), cppcheck::Platform::Type::Win32A);
-    add(tr("Windows 32-bit Unicode"), cppcheck::Platform::Type::Win32W);
-    add(tr("Windows 64-bit"), cppcheck::Platform::Type::Win64);
+    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);
 }
 
 int Platforms::getCount() const
@@ -48,11 +48,11 @@ int Platforms::getCount() const
     return mPlatforms.count();
 }
 
-Platform& Platforms::get(cppcheck::Platform::Type platform)
+PlatformData& Platforms::get(Platform::Type platform)
 {
-    QList<Platform>::iterator iter = mPlatforms.begin();
+    auto iter = mPlatforms.begin();
     while (iter != mPlatforms.end()) {
-        if ((*iter).mType == platform) {
+        if (iter->mType == platform) {
             return *iter;
         }
         ++iter;
diff --git a/gui/platforms.h b/gui/platforms.h
index 0693615f5fa..ec18eccf5ee 100644
--- a/gui/platforms.h
+++ b/gui/platforms.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -33,9 +33,9 @@ class QAction;
 /**
  * @brief Checked platform GUI-data.
  */
-struct Platform {
+struct PlatformData {
     QString mTitle;  /**< Text visible in the GUI. */
-    cppcheck::Platform::Type mType; /**< Type in the core. */
+    Platform::Type mType; /**< Type in the core. */
     QAction *mActMainWindow; /**< Pointer to main window action item. */
 };
 
@@ -47,12 +47,12 @@ class Platforms : public QObject {
 
 public:
     explicit Platforms(QObject *parent = nullptr);
-    void add(const QString &title, cppcheck::Platform::Type platform);
+    void add(const QString &title, Platform::Type platform);
     int getCount() const;
     void init();
-    Platform& get(cppcheck::Platform::Type platform);
+    PlatformData& get(Platform::Type platform);
 
-    QList<Platform> mPlatforms;
+    QList<PlatformData> mPlatforms;
 };
 
 /// @}
diff --git a/gui/precompiled.h b/gui/precompiled.h
index 7e10f3e1a18..e22e5442dc2 100644
--- a/gui/precompiled.h
+++ b/gui/precompiled.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/gui/precompiled_qmake.h b/gui/precompiled_qmake.h
index 9ef90ecfd40..dc41edce776 100644
--- a/gui/precompiled_qmake.h
+++ b/gui/precompiled_qmake.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
diff --git a/gui/printablereport.cpp b/gui/printablereport.cpp
index 9bcfff55c34..f6b9808bc55 100644
--- a/gui/printablereport.cpp
+++ b/gui/printablereport.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -27,9 +27,6 @@ PrintableReport::PrintableReport() :
     Report(QString())
 {}
 
-PrintableReport::~PrintableReport()
-{}
-
 bool PrintableReport::create()
 {
     return true;
@@ -55,7 +52,7 @@ void PrintableReport::writeError(const ErrorItem &error)
     mFormattedReport += "\n";
 }
 
-QString PrintableReport::getFormattedReportText() const
+const QString& PrintableReport::getFormattedReportText() const
 {
     return mFormattedReport;
 }
diff --git a/gui/printablereport.h b/gui/printablereport.h
index 29fa008bf61..7019c287176 100644
--- a/gui/printablereport.h
+++ b/gui/printablereport.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -23,8 +23,6 @@
 
 #include <QString>
 
-class ErrorItem;
-
 /// @addtogroup GUI
 /// @{
 
@@ -36,7 +34,6 @@ class ErrorItem;
 class PrintableReport : public Report {
 public:
     PrintableReport();
-    ~PrintableReport() override;
 
     /**
      * @brief Create the report (file).
@@ -63,7 +60,7 @@ class PrintableReport : public Report {
     /**
      * @brief Returns the formatted report.
      */
-    QString getFormattedReportText() const;
+    const QString& getFormattedReportText() const;
 
 private:
 
diff --git a/gui/projectfile.cpp b/gui/projectfile.cpp
index e60e54a61b7..3e4e783d7a8 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-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
@@ -22,22 +22,19 @@
 #include "config.h"
 #include "importproject.h"
 #include "settings.h"
+#include "utils.h"
 
-#include <string>
 #include <utility>
 
 #include <QFile>
 #include <QDir>
 #include <QIODevice>
 #include <QLatin1String>
+#include <QRegularExpression>
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-#include <QStringRef>
-#endif
-
 ProjectFile *ProjectFile::mActiveProject;
 
 ProjectFile::ProjectFile(QObject *parent) :
@@ -73,9 +70,10 @@ void ProjectFile::clear()
     mSuppressions.clear();
     mAddons.clear();
     mClangAnalyzer = mClangTidy = false;
-    mAnalyzeAllVsConfigs = false;
+    mAnalyzeAllVsConfigs = false; // TODO: defaults to true if loading a GUI project via CLI
     mCheckHeaders = true;
     mCheckUnusedTemplates = true;
+    mInlineSuppression = true;
     mMaxCtuDepth = settings.maxCtuDepth;
     mMaxTemplateRecursion = settings.maxTemplateRecursion;
     mCheckUnknownFunctionReturn.clear();
@@ -88,6 +86,7 @@ void ProjectFile::clear()
     mBughunting = false;
     mCertIntPrecision = 0;
     mCodingStandards.clear();
+    mPremiumLicenseFile.clear();
 }
 
 bool ProjectFile::read(const QString &filename)
@@ -142,9 +141,18 @@ bool ProjectFile::read(const QString &filename)
             if (xmlReader.name() == QString(CppcheckXml::CheckUnusedTemplatesElementName))
                 mCheckUnusedTemplates = readBool(xmlReader);
 
+            if (xmlReader.name() == QString(CppcheckXml::InlineSuppression))
+                mInlineSuppression = readBool(xmlReader);
+
             if (xmlReader.name() == QString(CppcheckXml::CheckLevelExhaustiveElementName))
                 mCheckLevel = CheckLevel::exhaustive;
 
+            if (xmlReader.name() == QString(CppcheckXml::CheckLevelNormalElementName))
+                mCheckLevel = CheckLevel::normal;
+
+            if (xmlReader.name() == QString(CppcheckXml::CheckLevelReducedElementName))
+                mCheckLevel = CheckLevel::reduced;
+
             // Find include directory from inside project element
             if (xmlReader.name() == QString(CppcheckXml::IncludeDirElementName))
                 readIncludeDirs(xmlReader);
@@ -220,6 +228,8 @@ 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);
 
@@ -248,7 +258,7 @@ bool ProjectFile::read(const QString &filename)
     return projectTagFound;
 }
 
-void ProjectFile::readRootPath(QXmlStreamReader &reader)
+void ProjectFile::readRootPath(const QXmlStreamReader &reader)
 {
     QXmlStreamAttributes attribs = reader.attributes();
     QString name = attribs.value(QString(), CppcheckXml::RootPathNameAttrib).toString();
@@ -388,10 +398,9 @@ QString ProjectFile::readString(QXmlStreamReader &reader)
 
 void ProjectFile::readIncludeDirs(QXmlStreamReader &reader)
 {
-    QXmlStreamReader::TokenType type;
     bool allRead = false;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
 
@@ -426,10 +435,9 @@ void ProjectFile::readIncludeDirs(QXmlStreamReader &reader)
 
 void ProjectFile::readDefines(QXmlStreamReader &reader)
 {
-    QXmlStreamReader::TokenType type;
     bool allRead = false;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
             // Read define-elements
@@ -463,10 +471,9 @@ void ProjectFile::readDefines(QXmlStreamReader &reader)
 
 void ProjectFile::readCheckPaths(QXmlStreamReader &reader)
 {
-    QXmlStreamReader::TokenType type;
     bool allRead = false;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
 
@@ -501,10 +508,9 @@ void ProjectFile::readCheckPaths(QXmlStreamReader &reader)
 
 void ProjectFile::readExcludes(QXmlStreamReader &reader)
 {
-    QXmlStreamReader::TokenType type;
     bool allRead = false;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
             // Read exclude-elements
@@ -547,9 +553,8 @@ void ProjectFile::readExcludes(QXmlStreamReader &reader)
 
 void ProjectFile::readVsConfigurations(QXmlStreamReader &reader)
 {
-    QXmlStreamReader::TokenType type;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
             // Read library-elements
@@ -611,14 +616,13 @@ void ProjectFile::readPlatform(QXmlStreamReader &reader)
 
 void ProjectFile::readSuppressions(QXmlStreamReader &reader)
 {
-    QXmlStreamReader::TokenType type;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
             // Read library-elements
             if (reader.name().toString() == CppcheckXml::SuppressionElementName) {
-                Suppressions::Suppression suppression;
+                SuppressionList::Suppression suppression;
                 if (reader.attributes().hasAttribute(QString(),"fileName"))
                     suppression.fileName = reader.attributes().value(QString(),"fileName").toString().toStdString();
                 if (reader.attributes().hasAttribute(QString(),"lineNumber"))
@@ -658,9 +662,8 @@ void ProjectFile::readSuppressions(QXmlStreamReader &reader)
 
 void ProjectFile::readTagWarnings(QXmlStreamReader &reader, const QString &tag)
 {
-    QXmlStreamReader::TokenType type;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
             // Read library-elements
@@ -693,10 +696,9 @@ void ProjectFile::readTagWarnings(QXmlStreamReader &reader, const QString &tag)
 
 void ProjectFile::readStringList(QStringList &stringlist, QXmlStreamReader &reader, const char elementname[])
 {
-    QXmlStreamReader::TokenType type;
     bool allRead = false;
     do {
-        type = reader.readNext();
+        QXmlStreamReader::TokenType type = reader.readNext();
         switch (type) {
         case QXmlStreamReader::StartElement:
             // Read library-elements
@@ -764,12 +766,27 @@ void ProjectFile::setPlatform(const QString &platform)
     mPlatform = platform;
 }
 
-void ProjectFile::setSuppressions(const QList<Suppressions::Suppression> &suppressions)
+QList<SuppressionList::Suppression> ProjectFile::getCheckingSuppressions() const
+{
+    const QRegularExpression re1("^[a-zA-Z0-9_\\-]+/.*");
+    const QRegularExpression re2("^[^/]+$");
+    QList<SuppressionList::Suppression> result;
+    for (SuppressionList::Suppression suppression : mSuppressions) {
+        if (re1.match(suppression.fileName.c_str()).hasMatch() || re2.match(suppression.fileName.c_str()).hasMatch()) {
+            if (suppression.fileName[0] != '*')
+                suppression.fileName = QFileInfo(mFilename).absolutePath().toStdString() + "/" + suppression.fileName;
+        }
+        result << suppression;
+    }
+    return result;
+}
+
+void ProjectFile::setSuppressions(const QList<SuppressionList::Suppression> &suppressions)
 {
     mSuppressions = suppressions;
 }
 
-void ProjectFile::addSuppression(const Suppressions::Suppression &suppression)
+void ProjectFile::addSuppression(const SuppressionList::Suppression &suppression)
 {
     mSuppressions.append(suppression);
 }
@@ -789,11 +806,6 @@ void ProjectFile::setCheckLevel(ProjectFile::CheckLevel checkLevel)
     mCheckLevel = checkLevel;
 }
 
-bool ProjectFile::isCheckLevelExhaustive() const
-{
-    return mCheckLevel == CheckLevel::exhaustive;
-}
-
 void ProjectFile::setWarningTags(std::size_t hash, const QString& tags)
 {
     if (tags.isEmpty())
@@ -848,7 +860,7 @@ bool ProjectFile::write(const QString &filename)
     }
 
     xmlWriter.writeStartElement(CppcheckXml::AnalyzeAllVsConfigsElementName);
-    xmlWriter.writeCharacters(mAnalyzeAllVsConfigs ? "true" : "false");
+    xmlWriter.writeCharacters(bool_to_string(mAnalyzeAllVsConfigs));
     xmlWriter.writeEndElement();
 
     if (clangParser) {
@@ -858,11 +870,15 @@ bool ProjectFile::write(const QString &filename)
     }
 
     xmlWriter.writeStartElement(CppcheckXml::CheckHeadersElementName);
-    xmlWriter.writeCharacters(mCheckHeaders ? "true" : "false");
+    xmlWriter.writeCharacters(bool_to_string(mCheckHeaders));
     xmlWriter.writeEndElement();
 
     xmlWriter.writeStartElement(CppcheckXml::CheckUnusedTemplatesElementName);
-    xmlWriter.writeCharacters(mCheckUnusedTemplates ? "true" : "false");
+    xmlWriter.writeCharacters(bool_to_string(mCheckUnusedTemplates));
+    xmlWriter.writeEndElement();
+
+    xmlWriter.writeStartElement(CppcheckXml::InlineSuppression);
+    xmlWriter.writeCharacters(bool_to_string(mInlineSuppression));
     xmlWriter.writeEndElement();
 
     xmlWriter.writeStartElement(CppcheckXml::MaxCtuDepthElementName);
@@ -932,7 +948,7 @@ bool ProjectFile::write(const QString &filename)
 
     if (!mSuppressions.isEmpty()) {
         xmlWriter.writeStartElement(CppcheckXml::SuppressionsElementName);
-        for (const Suppressions::Suppression &suppression : mSuppressions) {
+        for (const SuppressionList::Suppression &suppression : mSuppressions) {
             xmlWriter.writeStartElement(CppcheckXml::SuppressionElementName);
             if (!suppression.fileName.empty())
                 xmlWriter.writeAttribute("fileName", QString::fromStdString(suppression.fileName));
@@ -992,9 +1008,19 @@ bool ProjectFile::write(const QString &filename)
         }
     }
 
-    if (mCheckLevel == CheckLevel::exhaustive) {
+    switch (mCheckLevel) {
+    case CheckLevel::reduced:
+        xmlWriter.writeStartElement(CppcheckXml::CheckLevelReducedElementName);
+        xmlWriter.writeEndElement();
+        break;
+    case CheckLevel::normal:
+        xmlWriter.writeStartElement(CppcheckXml::CheckLevelNormalElementName);
+        xmlWriter.writeEndElement();
+        break;
+    case CheckLevel::exhaustive:
         xmlWriter.writeStartElement(CppcheckXml::CheckLevelExhaustiveElementName);
         xmlWriter.writeEndElement();
+        break;
     }
 
     // Cppcheck Premium
@@ -1020,6 +1046,12 @@ 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;
@@ -1123,6 +1155,9 @@ void ProjectFile::SafeChecks::saveToXml(QXmlStreamWriter &xmlWriter) const
 
 QString ProjectFile::getAddonFilePath(QString filesDir, const QString &addon)
 {
+    if (QFile(addon).exists())
+        return addon;
+
     if (!filesDir.endsWith("/"))
         filesDir += "/";
 
diff --git a/gui/projectfile.h b/gui/projectfile.h
index 50d87ea5663..18503e8d6e1 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-2023 Cppcheck team.
+ * 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
@@ -23,6 +23,7 @@
 #include "suppressions.h"
 
 #include <cstddef>
+#include <cstdint>
 #include <map>
 #include <utility>
 
@@ -53,7 +54,8 @@ class ProjectFile : public QObject {
         if (this == mActiveProject) mActiveProject = nullptr;
     }
 
-    enum class CheckLevel {
+    enum class CheckLevel : std::uint8_t {
+        reduced,
         normal,
         exhaustive
     };
@@ -75,15 +77,15 @@ class ProjectFile : public QObject {
      * @brief Get project root path.
      * @return project root path.
      */
-    QString getRootPath() const {
+    const QString& getRootPath() const {
         return mRootPath;
     }
 
-    QString getBuildDir() const {
+    const QString& getBuildDir() const {
         return mBuildDir;
     }
 
-    QString getImportProject() const {
+    const QString& getImportProject() const {
         return mImportProject;
     }
 
@@ -107,6 +109,14 @@ class ProjectFile : public QObject {
         mCheckUnusedTemplates = b;
     }
 
+    bool getInlineSuppression() const {
+        return mInlineSuppression;
+    }
+
+    void setInlineSuppression(bool b) {
+        mInlineSuppression = b;
+    }
+
     /**
      * @brief Get list of include directories.
      * @return list of directories.
@@ -119,7 +129,7 @@ class ProjectFile : public QObject {
      * @brief Get list of defines.
      * @return list of defines.
      */
-    QStringList getDefines() const {
+    const QStringList& getDefines() const {
         return mDefines;
     }
 
@@ -127,7 +137,7 @@ class ProjectFile : public QObject {
      * @brief Get list of undefines.
      * @return list of undefines.
      */
-    QStringList getUndefines() const {
+    const QStringList& getUndefines() const {
         return mUndefines;
     }
 
@@ -151,7 +161,7 @@ class ProjectFile : public QObject {
      * @brief Get list of paths to exclude from the check.
      * @return list of paths.
      */
-    QStringList getVsConfigurations() const {
+    const QStringList& getVsConfigurations() const {
         return mVsConfigurations;
     }
 
@@ -159,7 +169,7 @@ class ProjectFile : public QObject {
      * @brief Get list libraries.
      * @return list of libraries.
      */
-    QStringList getLibraries() const {
+    const QStringList& getLibraries() const {
         return mLibraries;
     }
 
@@ -167,11 +177,11 @@ class ProjectFile : public QObject {
      * @brief Get platform.
      * @return Current platform. If it ends with .xml then it is a file. Otherwise it must match one of the return values from @sa cppcheck::Platform::toString() ("win32A", "unix32", ..)
      */
-    QString getPlatform() const {
+    const QString& getPlatform() const {
         return mPlatform;
     }
 
-    QString getProjectName() const {
+    const QString& getProjectName() const {
         return mProjectName;
     }
 
@@ -183,15 +193,21 @@ class ProjectFile : public QObject {
      * @brief Get "raw" suppressions.
      * @return list of suppressions.
      */
-    QList<Suppressions::Suppression> getSuppressions() const {
+    const QList<SuppressionList::Suppression>& getSuppressions() const {
         return mSuppressions;
     }
 
+    /**
+     * @brief Get "checking" suppressions. Relative paths are converted to absolute paths.
+     * @return list of suppressions.
+     */
+    QList<SuppressionList::Suppression> getCheckingSuppressions() const;
+
     /**
      * @brief Get list addons.
      * @return list of addons.
      */
-    QStringList getAddons() const {
+    const QStringList& getAddons() const {
         return mAddons;
     }
 
@@ -209,6 +225,7 @@ class ProjectFile : public QObject {
     QStringList getAddonsAndTools() const;
 
     bool getClangAnalyzer() const {
+        // TODO
         return false; //mClangAnalyzer;
     }
 
@@ -224,7 +241,7 @@ class ProjectFile : public QObject {
         mClangTidy = c;
     }
 
-    QStringList getTags() const {
+    const QStringList& getTags() const {
         return mTags;
     }
 
@@ -248,7 +265,7 @@ class ProjectFile : public QObject {
      * @brief Get filename for the project file.
      * @return file name.
      */
-    QString getFilename() const {
+    const QString& getFilename() const {
         return mFilename;
     }
 
@@ -318,10 +335,10 @@ class ProjectFile : public QObject {
      * @brief Set list of suppressions.
      * @param suppressions List of suppressions.
      */
-    void setSuppressions(const QList<Suppressions::Suppression> &suppressions);
+    void setSuppressions(const QList<SuppressionList::Suppression> &suppressions);
 
     /** Add suppression */
-    void addSuppression(const Suppressions::Suppression &suppression);
+    void addSuppression(const SuppressionList::Suppression &suppression);
 
     /**
      * @brief Set list of addons.
@@ -336,7 +353,9 @@ class ProjectFile : public QObject {
 
     /** CheckLevel: normal/exhaustive */
     void setCheckLevel(CheckLevel checkLevel);
-    bool isCheckLevelExhaustive() const;
+    CheckLevel getCheckLevel() const {
+        return mCheckLevel;
+    }
 
     /**
      * @brief Set tags.
@@ -361,7 +380,7 @@ class ProjectFile : public QObject {
     }
 
     /** @brief Get list of coding standards (checked by Cppcheck Premium). */
-    QStringList getCodingStandards() const {
+    const QStringList& getCodingStandards() const {
         return mCodingStandards;
     }
 
@@ -381,6 +400,13 @@ 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).
@@ -408,7 +434,7 @@ class ProjectFile : public QObject {
     SafeChecks safeChecks;
 
     /** Check unknown function return values */
-    QStringList getCheckUnknownFunctionReturn() const {
+    const QStringList& getCheckUnknownFunctionReturn() const {
         return mCheckUnknownFunctionReturn;
     }
     /*
@@ -426,7 +452,7 @@ class ProjectFile : public QObject {
      * @brief Read optional root path from XML.
      * @param reader XML stream reader.
      */
-    void readRootPath(QXmlStreamReader &reader);
+    void readRootPath(const QXmlStreamReader &reader);
 
     void readBuildDir(QXmlStreamReader &reader);
 
@@ -551,6 +577,11 @@ class ProjectFile : public QObject {
     /** Check code in unused templates */
     bool mCheckUnusedTemplates;
 
+    /**
+     * @brief Enable inline suppression.
+     */
+    bool mInlineSuppression;
+
     /**
      * @brief List of include directories used to search include files.
      */
@@ -589,7 +620,7 @@ class ProjectFile : public QObject {
     /**
      * @brief List of suppressions.
      */
-    QList<Suppressions::Suppression> mSuppressions;
+    QList<SuppressionList::Suppression> mSuppressions;
 
     /**
      * @brief List of addons.
@@ -606,6 +637,9 @@ 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 79ed0908fd5..3bf02f30631 100644
--- a/gui/projectfile.ui
+++ b/gui/projectfile.ui
@@ -458,6 +458,13 @@
           <string>Check level</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_18">
+          <item>
+           <widget class="QRadioButton" name="mCheckLevelReduced">
+            <property name="text">
+             <string>Reduced -- meant for usage where developer wants results directly. Limited and faster analysis with fewer results.</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QRadioButton" name="mCheckLevelNormal">
             <property name="text">
@@ -595,17 +602,23 @@
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_7">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>73</height>
-          </size>
+        <widget class="QGroupBox" name="premiumLicense">
+         <property name="title">
+          <string>Premium License</string>
          </property>
-        </spacer>
+         <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>
@@ -746,6 +759,13 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="mInlineSuppressions">
+         <property name="text">
+          <string>Enable inline suppressions</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_9">
          <property name="orientation">
@@ -806,11 +826,47 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_20">
           <item>
-           <widget class="QCheckBox" name="mMisraC2012">
-            <property name="text">
-             <string>Misra C 2012</string>
-            </property>
-           </widget>
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <item>
+             <widget class="QCheckBox" name="mMisraC">
+              <property name="text">
+               <string>Misra C</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="mMisraVersion">
+              <item>
+               <property name="text">
+                <string>2012</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <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>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="mLayoutMisraRuleTexts">
@@ -838,11 +894,42 @@
            </layout>
           </item>
           <item>
-           <widget class="QCheckBox" name="mMisraCpp2008">
-            <property name="text">
-             <string>Misra C++ 2008</string>
-            </property>
-           </widget>
+           <layout class="QHBoxLayout" name="horizontalLayout_11">
+            <item>
+             <widget class="QCheckBox" name="mMisraCpp">
+              <property name="text">
+               <string>Misra C++</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="mMisraCppVersion">
+              <item>
+               <property name="text">
+                <string>2008</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>2023</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_5">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
           </item>
           <item>
            <widget class="QCheckBox" name="mCertC2016">
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
index 523641d273c..bfa351722ec 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-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
@@ -23,33 +23,35 @@
 #include "importproject.h"
 #include "library.h"
 #include "newsuppressiondialog.h"
+#include "path.h"
 #include "platform.h"
 #include "platforms.h"
 #include "projectfile.h"
 #include "settings.h"
+#include "utils.h"
 
 #include "ui_projectfile.h"
 
+#include <array>
 #include <list>
 #include <string>
+#include <utility>
 
 #include <QByteArray>
-#include <QChar>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QCoreApplication>
 #include <QDialogButtonBox>
 #include <QDir>
-#include <QFile>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QFileInfoList>
 #include <QFlags>
 #include <QLabel>
 #include <QLineEdit>
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QMap>
+#include <QObject>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QRegularExpression>
@@ -58,13 +60,15 @@
 #include <QSize>
 #include <QSpinBox>
 #include <QVariant>
-#include <QtCore>
 
-static const char ADDON_MISRA[]   = "misra";
-static const char CODING_STANDARD_MISRA_CPP_2008[] = "misra-cpp-2008";
-static const char CODING_STANDARD_CERT_C[] = "cert-c-2016";
-static const char CODING_STANDARD_CERT_CPP[] = "cert-cpp-2016";
-static const 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";
 
 /** Return paths from QListWidget */
 static QStringList getPaths(const QListWidget *list)
@@ -79,16 +83,32 @@ static QStringList getPaths(const QListWidget *list)
 }
 
 /** Platforms shown in the platform combobox */
-static const cppcheck::Platform::Type builtinPlatforms[] = {
-    cppcheck::Platform::Type::Native,
-    cppcheck::Platform::Type::Win32A,
-    cppcheck::Platform::Type::Win32W,
-    cppcheck::Platform::Type::Win64,
-    cppcheck::Platform::Type::Unix32,
-    cppcheck::Platform::Type::Unix64
+static const std::array<Platform::Type, 6> builtinPlatforms = {
+    Platform::Type::Native,
+    Platform::Type::Win32A,
+    Platform::Type::Win32W,
+    Platform::Type::Win64,
+    Platform::Type::Unix32,
+    Platform::Type::Unix64
 };
 
-static const int numberOfBuiltinPlatforms = sizeof(builtinPlatforms) / sizeof(builtinPlatforms[0]);
+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)
 {
@@ -97,7 +117,8 @@ QStringList ProjectFileDialog::getProjectConfigs(const QString &fileName)
     QStringList ret;
     ImportProject importer;
     Settings projSettings;
-    importer.import(fileName.toStdString(), &projSettings);
+    Suppressions projSupprs;
+    importer.import(fileName.toStdString(), &projSettings, &projSupprs);
     for (const std::string &cfg : importer.getVSConfigs())
         ret << QString::fromStdString(cfg);
     return ret;
@@ -119,6 +140,8 @@ 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();
@@ -185,14 +208,14 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
     libs.sort();
     mUI->mLibraries->clear();
     for (const QString &lib : libs) {
-        QListWidgetItem* item = new QListWidgetItem(lib, mUI->mLibraries);
+        auto* item = new QListWidgetItem(lib, mUI->mLibraries);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
         item->setCheckState(Qt::Unchecked); // AND initialize check state
     }
 
     // Platforms..
     Platforms platforms;
-    for (const cppcheck::Platform::Type builtinPlatform : builtinPlatforms)
+    for (const Platform::Type builtinPlatform : builtinPlatforms)
         mUI->mComboBoxPlatform->addItem(platforms.get(builtinPlatform).mTitle);
     QStringList platformFiles;
     for (QString sp : searchPaths) {
@@ -205,8 +228,12 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, bool premium, QWi
         for (const QFileInfo& item : dir.entryInfoList()) {
             const QString platformFile = item.fileName();
 
-            cppcheck::Platform plat2;
-            if (!plat2.loadFromFile(applicationFilePath.toStdString().c_str(), platformFile.toStdString()))
+            const std::vector<std::string> paths = {
+                Path::getCurrentPath(), // TODO: do we want to look in CWD?
+                applicationFilePath.toStdString(),
+            };
+            Platform plat2;
+            if (!plat2.loadFromFile(paths, platformFile.toStdString()))
                 continue;
 
             if (platformFiles.indexOf(platformFile) == -1)
@@ -307,12 +334,20 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         else
             item->setCheckState(Qt::Unchecked);
     }
-    if (projectFile->isCheckLevelExhaustive())
-        mUI->mCheckLevelExhaustive->setChecked(true);
-    else
+    switch (projectFile->getCheckLevel()) {
+    case ProjectFile::CheckLevel::reduced:
+        mUI->mCheckLevelReduced->setChecked(true);
+        break;
+    case ProjectFile::CheckLevel::normal:
         mUI->mCheckLevelNormal->setChecked(true);
+        break;
+    case ProjectFile::CheckLevel::exhaustive:
+        mUI->mCheckLevelExhaustive->setChecked(true);
+        break;
+    }
     mUI->mCheckHeaders->setChecked(projectFile->getCheckHeaders());
     mUI->mCheckUnusedTemplates->setChecked(projectFile->getCheckUnusedTemplates());
+    mUI->mInlineSuppressions->setChecked(projectFile->getInlineSuppression());
     mUI->mMaxCtuDepth->setValue(projectFile->getMaxCtuDepth());
     mUI->mMaxTemplateRecursion->setValue(projectFile->getMaxTemplateRecursion());
     if (projectFile->clangParser)
@@ -322,10 +357,10 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     mUI->mBtnSafeClasses->setChecked(projectFile->safeChecks.classes);
     setExcludedPaths(projectFile->getExcludedPaths());
     setLibraries(projectFile->getLibraries());
-    const QString platform = projectFile->getPlatform();
+    const QString& platform = projectFile->getPlatform();
     if (platform.endsWith(".xml")) {
         int i;
-        for (i = numberOfBuiltinPlatforms; i < mUI->mComboBoxPlatform->count(); ++i) {
+        for (i = builtinPlatforms.size(); i < mUI->mComboBoxPlatform->count(); ++i) {
             if (mUI->mComboBoxPlatform->itemText(i) == platform)
                 break;
         }
@@ -337,12 +372,12 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         }
     } else {
         int i;
-        for (i = 0; i < numberOfBuiltinPlatforms; ++i) {
-            const cppcheck::Platform::Type p = builtinPlatforms[i];
-            if (platform == cppcheck::Platform::toString(p))
+        for (i = 0; i < builtinPlatforms.size(); ++i) {
+            const Platform::Type p = builtinPlatforms[i];
+            if (platform == Platform::toString(p))
                 break;
         }
-        if (i < numberOfBuiltinPlatforms)
+        if (i < builtinPlatforms.size())
             mUI->mComboBoxPlatform->setCurrentIndex(i);
         else
             mUI->mComboBoxPlatform->setCurrentIndex(-1);
@@ -373,22 +408,56 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     const QString dataDir = getDataDir();
     updateAddonCheckBox(mUI->mAddonThreadSafety, projectFile, dataDir, "threadsafety");
     updateAddonCheckBox(mUI->mAddonY2038, projectFile, dataDir, "y2038");
-    updateAddonCheckBox(mUI->mMisraC2012, projectFile, dataDir, ADDON_MISRA);
+
+    // Misra checkbox..
+    if (mPremium)
+        mUI->mMisraC->setText("Misra C");
+    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);
 
     const QString &misraFile = settings.value(SETTINGS_MISRA_FILE, QString()).toString();
     mUI->mEditMisraFile->setText(misraFile);
+    mUI->mMisraVersion->setVisible(mPremium);
+    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);
         mUI->mBtnBrowseMisraFile->setVisible(false);
-    } else if (!mUI->mMisraC2012->isEnabled()) {
+    } else if (!mUI->mMisraC->isEnabled()) {
         mUI->mEditMisraFile->setEnabled(false);
         mUI->mBtnBrowseMisraFile->setEnabled(false);
     }
 
+    mUI->mMisraCpp->setEnabled(mPremium);
+    mUI->mMisraCppVersion->setVisible(mPremium);
+    if (projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_CPP_2008)) {
+        mUI->mMisraCpp->setChecked(true);
+        mUI->mMisraCppVersion->setCurrentIndex(0);
+    }
+    else if (projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_CPP_2023)) {
+        mUI->mMisraCpp->setChecked(true);
+        mUI->mMisraCppVersion->setCurrentIndex(1);
+    } else {
+        mUI->mMisraCpp->setChecked(false);
+        mUI->mMisraCppVersion->setCurrentIndex(1);
+    }
+
+    mUI->mMisraCppVersion->setEnabled(mUI->mMisraCpp->isChecked());
+    connect(mUI->mMisraCpp, &QCheckBox::toggled, mUI->mMisraCppVersion, &QComboBox::setEnabled);
+
     mUI->mCertC2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_C));
     mUI->mCertCpp2016->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_CERT_CPP));
-    mUI->mMisraCpp2008->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_MISRA_CPP_2008));
     mUI->mAutosar->setChecked(mPremium && projectFile->getCodingStandards().contains(CODING_STANDARD_AUTOSAR));
 
     if (projectFile->getCertIntPrecision() <= 0)
@@ -396,7 +465,6 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
     else
         mUI->mEditCertIntPrecision->setText(QString::number(projectFile->getCertIntPrecision()));
 
-    mUI->mMisraCpp2008->setEnabled(mPremium);
     mUI->mCertC2016->setEnabled(mPremium);
     mUI->mCertCpp2016->setEnabled(mPremium);
     mUI->mAutosar->setEnabled(mPremium);
@@ -412,6 +480,7 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
         mUI->mToolClangTidy->setEnabled(false);
     }
     mUI->mEditTags->setText(projectFile->getTags().join(';'));
+    mUI->mEditLicenseFile->setText(projectFile->getLicenseFile());
     updatePathsAndDefines();
 }
 
@@ -424,6 +493,7 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     projectFile->setVSConfigurations(getProjectConfigurations());
     projectFile->setCheckHeaders(mUI->mCheckHeaders->isChecked());
     projectFile->setCheckUnusedTemplates(mUI->mCheckUnusedTemplates->isChecked());
+    projectFile->setInlineSuppression(mUI->mInlineSuppressions->isChecked());
     projectFile->setMaxCtuDepth(mUI->mMaxCtuDepth->value());
     projectFile->setMaxTemplateRecursion(mUI->mMaxTemplateRecursion->value());
     projectFile->setIncludes(getIncludePaths());
@@ -432,15 +502,20 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
     projectFile->setCheckPaths(getCheckPaths());
     projectFile->setExcludedPaths(getExcludedPaths());
     projectFile->setLibraries(getLibraries());
-    projectFile->setCheckLevel(mUI->mCheckLevelExhaustive->isChecked() ? ProjectFile::CheckLevel::exhaustive : ProjectFile::CheckLevel::normal);
+    if (mUI->mCheckLevelReduced->isChecked())
+        projectFile->setCheckLevel(ProjectFile::CheckLevel::reduced);
+    else if (mUI->mCheckLevelNormal->isChecked())
+        projectFile->setCheckLevel(ProjectFile::CheckLevel::normal);
+    else // if (mUI->mCheckLevelExhaustive->isChecked())
+        projectFile->setCheckLevel(ProjectFile::CheckLevel::exhaustive);
     projectFile->clangParser = mUI->mBtnClangParser->isChecked();
     projectFile->safeChecks.classes = mUI->mBtnSafeClasses->isChecked();
     if (mUI->mComboBoxPlatform->currentText().endsWith(".xml"))
         projectFile->setPlatform(mUI->mComboBoxPlatform->currentText());
     else {
         const int i = mUI->mComboBoxPlatform->currentIndex();
-        if (i>=0 && i < numberOfBuiltinPlatforms)
-            projectFile->setPlatform(cppcheck::Platform::toString(builtinPlatforms[i]));
+        if (i>=0 && i < builtinPlatforms.size())
+            projectFile->setPlatform(Platform::toString(builtinPlatforms[i]));
         else
             projectFile->setPlatform(QString());
     }
@@ -467,7 +542,7 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
         addons << "threadsafety";
     if (mUI->mAddonY2038->isChecked())
         addons << "y2038";
-    if (mUI->mMisraC2012->isChecked())
+    if (mUI->mMisraC->isChecked())
         addons << ADDON_MISRA;
     projectFile->setAddons(addons);
     QStringList codingStandards;
@@ -475,20 +550,23 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
         codingStandards << CODING_STANDARD_CERT_C;
     if (mUI->mCertCpp2016->isChecked())
         codingStandards << CODING_STANDARD_CERT_CPP;
-    if (mUI->mMisraCpp2008->isChecked())
+    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;
-    projectFile->setCodingStandards(codingStandards);
+    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());
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    projectFile->setLicenseFile(mUI->mEditLicenseFile->text());
     projectFile->setTags(mUI->mEditTags->text().split(";", Qt::SkipEmptyParts));
-#else
-    projectFile->setTags(mUI->mEditTags->text().split(";", QString::SkipEmptyParts));
-#endif
 }
 
 void ProjectFileDialog::ok()
@@ -501,17 +579,17 @@ void ProjectFileDialog::ok()
 QString ProjectFileDialog::getExistingDirectory(const QString &caption, bool trailingSlash)
 {
     const QFileInfo inf(mProjectFile->getFilename());
-    const QString rootpath = inf.absolutePath();
+    const QString projectPath = inf.absolutePath();
     QString selectedDir = QFileDialog::getExistingDirectory(this,
                                                             caption,
-                                                            rootpath);
+                                                            projectPath);
 
     if (selectedDir.isEmpty())
         return QString();
 
     // 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(rootpath);
+    const QDir dir(projectPath);
     const QString relpath(dir.relativeFilePath(selectedDir));
     if (!relpath.startsWith("../.."))
         selectedDir = relpath;
@@ -541,7 +619,6 @@ void ProjectFileDialog::updatePathsAndDefines()
     mUI->mBtnAddCheckPath->setEnabled(!importProject);
     mUI->mBtnEditCheckPath->setEnabled(!importProject);
     mUI->mBtnRemoveCheckPath->setEnabled(!importProject);
-    mUI->mEditDefines->setEnabled(!importProject);
     mUI->mEditUndefines->setEnabled(!importProject);
     mUI->mBtnAddInclude->setEnabled(!importProject);
     mUI->mBtnEditInclude->setEnabled(!importProject);
@@ -598,7 +675,7 @@ void ProjectFileDialog::setProjectConfigurations(const QStringList &configs)
     mUI->mListVsConfigs->clear();
     mUI->mListVsConfigs->setEnabled(!configs.isEmpty() && !mUI->mChkAllVsConfigs->isChecked());
     for (const QString &cfg : configs) {
-        QListWidgetItem* item = new QListWidgetItem(cfg, mUI->mListVsConfigs);
+        auto* item = new QListWidgetItem(cfg, mUI->mListVsConfigs);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable); // set checkable flag
         item->setCheckState(Qt::Unchecked);
     }
@@ -615,7 +692,7 @@ void ProjectFileDialog::addIncludeDir(const QString &dir)
         return;
 
     const QString newdir = QDir::toNativeSeparators(dir);
-    QListWidgetItem *item = new QListWidgetItem(newdir);
+    auto *item = new QListWidgetItem(newdir);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI->mListIncludeDirs->addItem(item);
 }
@@ -626,7 +703,7 @@ void ProjectFileDialog::addCheckPath(const QString &path)
         return;
 
     const QString newpath = QDir::toNativeSeparators(path);
-    QListWidgetItem *item = new QListWidgetItem(newpath);
+    auto *item = new QListWidgetItem(newpath);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI->mListCheckPaths->addItem(item);
 }
@@ -637,7 +714,7 @@ void ProjectFileDialog::addExcludePath(const QString &path)
         return;
 
     const QString newpath = QDir::toNativeSeparators(path);
-    QListWidgetItem *item = new QListWidgetItem(newpath);
+    auto *item = new QListWidgetItem(newpath);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
     mUI->mListExcludedPaths->addItem(item);
 }
@@ -662,21 +739,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;
 }
@@ -756,18 +825,18 @@ void ProjectFileDialog::setLibraries(const QStringList &libraries)
     }
 }
 
-void ProjectFileDialog::addSingleSuppression(const Suppressions::Suppression &suppression)
+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<Suppressions::Suppression> &suppressions)
+void ProjectFileDialog::setSuppressions(const QList<SuppressionList::Suppression> &suppressions)
 {
     mUI->mListSuppressions->clear();
-    QList<Suppressions::Suppression> new_suppressions = suppressions;
+    QList<SuppressionList::Suppression> new_suppressions = suppressions;
     mSuppressions.clear();
-    for (const Suppressions::Suppression &suppression : new_suppressions) {
+    for (const SuppressionList::Suppression &suppression : new_suppressions) {
         addSingleSuppression(suppression);
     }
     mUI->mListSuppressions->sortItems();
@@ -899,11 +968,10 @@ void ProjectFileDialog::editSuppression(const QModelIndex & /*index*/)
 int ProjectFileDialog::getSuppressionIndex(const QString &shortText) const
 {
     const std::string s = shortText.toStdString();
-    for (int i = 0; i < mSuppressions.size(); ++i) {
-        if (mSuppressions[i].getText() == s)
-            return i;
-    }
-    return -1;
+    auto it = std::find_if(mSuppressions.cbegin(), mSuppressions.cend(), [&](const SuppressionList::Suppression& sup) {
+        return suppressionAsText(sup) == s;
+    });
+    return it == mSuppressions.cend() ? -1 : static_cast<int>(std::distance(mSuppressions.cbegin(), it));
 }
 
 void ProjectFileDialog::browseMisraFile()
@@ -917,8 +985,8 @@ void ProjectFileDialog::browseMisraFile()
         mUI->mEditMisraFile->setText(fileName);
         settings.setValue(SETTINGS_MISRA_FILE, fileName);
 
-        mUI->mMisraC2012->setText("MISRA C 2012");
-        mUI->mMisraC2012->setEnabled(true);
-        updateAddonCheckBox(mUI->mMisraC2012, nullptr, getDataDir(), ADDON_MISRA);
+        mUI->mMisraC->setText("MISRA C 2012");
+        mUI->mMisraC->setEnabled(true);
+        updateAddonCheckBox(mUI->mMisraC, nullptr, getDataDir(), ADDON_MISRA);
     }
 }
diff --git a/gui/projectfiledialog.h b/gui/projectfiledialog.h
index 623608cc162..68f62ea83e5 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-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
@@ -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
 /// @{
 
@@ -109,7 +118,7 @@ class ProjectFileDialog : public QDialog {
      * @brief Return suppressions from the dialog control.
      * @return List of suppressions.
      */
-    QList<Suppressions::Suppression> getSuppressions() const {
+    const QList<SuppressionList::Suppression>& getSuppressions() const {
         return mSuppressions;
     }
 
@@ -164,15 +173,15 @@ class ProjectFileDialog : public QDialog {
      * @brief Add a single suppression to dialog control.
      * @param suppression A suppressions to add to dialog control.
      */
-    void addSingleSuppression(const Suppressions::Suppression &suppression);
+    void addSingleSuppression(const SuppressionList::Suppression &suppression);
 
     /**
      * @brief Set suppressions to dialog control.
      * @param suppressions List of suppressions to set to dialog control.
      */
-    void setSuppressions(const QList<Suppressions::Suppression> &suppressions);
+    void setSuppressions(const QList<SuppressionList::Suppression> &suppressions);
 
-protected slots:
+private slots:
 
     /** ok button pressed, save changes and accept */
     void ok();
@@ -319,19 +328,19 @@ protected slots:
 private:
     static QStringList getProjectConfigs(const QString &fileName);
 
-    Ui::ProjectFile *mUI;
+    Ui::ProjectFile * const mUI;
 
     /**
      * @brief Projectfile path.
      */
-    ProjectFile *mProjectFile;
+    ProjectFile * const mProjectFile;
 
     /** Is this Cppcheck Premium? */
-    bool mPremium;
+    const bool mPremium;
 
     QString getExistingDirectory(const QString &caption, bool trailingSlash);
 
-    QList<Suppressions::Suppression> mSuppressions;
+    QList<SuppressionList::Suppression> mSuppressions;
 };
 
 /// @}
diff --git a/gui/readme.txt b/gui/readme.txt
index 3974af609d2..2137c6d174d 100644
--- a/gui/readme.txt
+++ b/gui/readme.txt
@@ -29,28 +29,16 @@ Linux:
   names depend on distribution, but e.g. for Ubuntu the needed packages are:
   * qt5-default 
 
-After you have needed libraries and tools installed, open command
-prompt/console, go to gui directory and run command:
-- qmake (in Linux and in Windows if build with MinGW/gcc or nmake)
-- qmake -tp vc (to generate Visual Studio project file)
-- qmake -tp vc LINKCORE=yes (to generate Visual Studio project file, linking
-                             dynamically to core. Recommended.)
+After you have needed libraries and tools installed you need to run CMake with
+`-DBUILD_GUI=On`.
 
 On Windows, you have to either call qtvars.bat in Qt folder or use the Qt command
 line prompt shortcut added in the start menu by Qt installation.
 
-These commands generate makefiles to actually build the software. After that
-the actual building is done in IDE or command line as usual. Note that you
-don't need to run qmake again unless you add/remove files from the project.
-
-The Visual Studio solution does not contain a configuration for x64 platform, but
-it can be added easily.
-
 Tests
 -----
-There are tests for the GUI in gui/test -directory. There is test.pro
--projectfile for building all the tests. Each test is in own subdirectory and
-builds own binary. Test is run by simple running that binary. The binary also
+There are tests for the GUI in gui/test -directory. Each test is in own subdirectory
+and builds own binary. Test is run by simple running that binary. The binary also
 has several options to select tests etc. You can get the help by running
 "binaryname -help" -command.
 
@@ -60,11 +48,4 @@ The GUI is translated to several languages. Qt comes with two tools to update
 and compile the translations. lupdate updates translations files from the code
 and lrelease compiles translation files use with the executable.
 
-To update translations:
-- run "lupdate gui.pro -no-obsolete" to update the translation files to match the code. This
-  command updates all the .ts files. Which can be then edited to translate
-  the application.
-
-To compile translations:
-- run "lrelease gui.pro" to compile .ts files to .qm files which are used by the
-  executable.
+The translations are automatically updated and compiled within CMake.
\ No newline at end of file
diff --git a/gui/report.cpp b/gui/report.cpp
index 9a4c391fd0b..e7b7e06edf9 100644
--- a/gui/report.cpp
+++ b/gui/report.cpp
@@ -23,7 +23,6 @@
 #include <QIODevice>
 
 Report::Report(QString filename) :
-    QObject(),
     mFilename(std::move(filename))
 {}
 
diff --git a/gui/report.h b/gui/report.h
index 5cea9be508f..1bbd9f8c1bd 100644
--- a/gui/report.h
+++ b/gui/report.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
@@ -19,6 +19,8 @@
 #ifndef REPORT_H
 #define REPORT_H
 
+#include <cstdint>
+
 #include <QFile>
 #include <QObject>
 #include <QString>
@@ -33,7 +35,7 @@ class ErrorItem;
  */
 class Report : public QObject {
 public:
-    enum Type {
+    enum Type : std::uint8_t {
         TXT,
         XMLV2,
         CSV,
diff --git a/cli/cppcheckexecutorseh.h b/gui/resultitem.cpp
similarity index 66%
rename from cli/cppcheckexecutorseh.h
rename to gui/resultitem.cpp
index 56616d95af9..4215115be07 100644
--- a/cli/cppcheckexecutorseh.h
+++ b/gui/resultitem.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
@@ -16,18 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CPPCHECKEXECUTORSEH_H
-#define CPPCHECKEXECUTORSEH_H
+#include "resultitem.h"
 
-#include "config.h" // IWYU pragma: keep
+#include <utility>
 
-#ifdef USE_WINDOWS_SEH
-
-class CppCheckExecutor;
-class CppCheck;
-
-int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&), CppCheck& cppcheck);
-
-#endif
-
-#endif // CPPCHECKEXECUTORSEH_H
+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..a39606ad23d
--- /dev/null
+++ b/gui/resultitem.h
@@ -0,0 +1,61 @@
+/* -*- 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 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 792f777fe8a..0c8ee2e3101 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-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
@@ -20,18 +20,22 @@
 
 #include "application.h"
 #include "applicationlist.h"
+#include "checkers.h"
 #include "common.h"
-#include "config.h"
 #include "erroritem.h"
+#include "errorlogger.h"
+#include "errortypes.h"
 #include "path.h"
 #include "projectfile.h"
 #include "report.h"
+#include "resultitem.h"
 #include "showtypes.h"
 #include "suppressions.h"
 #include "threadhandler.h"
 #include "xmlreportv2.h"
 
-#include <string>
+#include <algorithm>
+#include <utility>
 
 #include <QAction>
 #include <QApplication>
@@ -51,63 +55,94 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QModelIndex>
-#include <QModelIndexList>
+#include <QObject>
 #include <QProcess>
 #include <QSet>
 #include <QSettings>
 #include <QSignalMapper>
-#include <QStandardItem>
+#include <QStandardItemModel>
 #include <QUrl>
-#include <QVariant>
-#include <QVariantMap>
 #include <Qt>
-
-static const char COLUMN[] = "column";
-static const char CWE[] = "cwe";
-static const char ERRORID[] = "id";
-static const char FILENAME[] = "file";
-static const char FILE0[] = "file0";
-static const char HASH[] = "hash";
-static const char HIDE[] = "hide";
-static const char INCONCLUSIVE[] = "inconclusive";
-static const char LINE[] = "line";
-static const char MESSAGE[] = "message";
-static const char SEVERITY[] = "severity";
-static const char SINCEDATE[] = "sinceDate";
-static const char SYMBOLNAMES[] = "symbolNames";
-static const char SUMMARY[] = "summary";
-static const char TAGS[] = "tags";
+#include <QHeaderView>
 
 // These must match column headers given in ResultsTree::translate()
-static const int COLUMN_SINCE_DATE = 6;
-static const int COLUMN_TAGS       = 7;
+static constexpr int COLUMN_FILE                  = 0;
+static constexpr int COLUMN_LINE                  = 1;
+static constexpr int COLUMN_SEVERITY              = 2;
+static constexpr int COLUMN_MISRA_CLASSIFICATION  = 3;
+static constexpr int COLUMN_CERT_LEVEL            = 4;
+static constexpr int COLUMN_INCONCLUSIVE          = 5;
+static constexpr int COLUMN_SUMMARY               = 6;
+static constexpr int COLUMN_ID                    = 7;
+static constexpr int COLUMN_MISRA_GUIDELINE       = 8;
+static constexpr int COLUMN_CERT_RULE             = 9;
+static constexpr int COLUMN_SINCE_DATE            = 10;
+static constexpr int COLUMN_TAGS                  = 11;
+static constexpr int COLUMN_CWE                   = 12;
+
+static QString getGuideline(ReportType reportType, const std::map<std::string, std::string> &guidelineMapping,
+                            const QString& errorId, Severity severity) {
+    return QString::fromStdString(getGuideline(errorId.toStdString(),
+                                               reportType, guidelineMapping,
+                                               severity));
+}
+
+static QString getClassification(ReportType reportType, const QString& guideline) {
+    return QString::fromStdString(getClassification(guideline.toStdString(), reportType));
+}
+
+static Severity getSeverityFromClassification(const QString &c) {
+    if (c == checkers::Man)
+        return Severity::error;
+    if (c == checkers::Req)
+        return Severity::warning;
+    if (c == checkers::Adv)
+        return Severity::style;
+    if (c == checkers::Doc)
+        return Severity::information;
+    if (c == "L1")
+        return Severity::error;
+    if (c == "L2")
+        return Severity::warning;
+    if (c == "L3")
+        return Severity::style;
+    return Severity::none;
+}
+
+static QStringList getLabels() {
+    return QStringList{
+        QObject::tr("File"),
+        QObject::tr("Line"),
+        QObject::tr("Severity"),
+        QObject::tr("Classification"),
+        QObject::tr("Level"),
+        QObject::tr("Inconclusive"),
+        QObject::tr("Summary"),
+        QObject::tr("Id"),
+        QObject::tr("Guideline"),
+        QObject::tr("Rule"),
+        QObject::tr("Since date"),
+        QObject::tr("Tags"),
+        QObject::tr("CWE")};
+}
+
+static Severity getSeverity(ReportType reportType, const ErrorItem& errorItem) {
+    return reportType == ReportType::normal ? errorItem.severity : getSeverityFromClassification(errorItem.classification);
+}
 
 ResultsTree::ResultsTree(QWidget * parent) :
     QTreeView(parent),
-    mSettings(nullptr),
-    mApplications(nullptr),
-    mContextItem(nullptr),
-    mShowFullPath(false),
-    mSaveFullPath(false),
-    mSaveAllErrors(true),
-    mShowErrorId(false),
-    mVisibleErrors(false),
-    mSelectionModel(nullptr),
-    mThread(nullptr),
-    mShowCppcheck(true),
-    mShowClang(true)
+    mModel(new QStandardItemModel)
 {
-    setModel(&mModel);
+    setModel(mModel);
     translate(); // Adds columns to grid
+    clear();
     setExpandsOnDoubleClick(false);
     setSortingEnabled(true);
 
     connect(this, &ResultsTree::doubleClicked, this, &ResultsTree::quickStartApplication);
 }
 
-ResultsTree::~ResultsTree()
-{}
-
 void ResultsTree::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
@@ -116,6 +151,52 @@ void ResultsTree::keyPressEvent(QKeyEvent *event)
     QTreeView::keyPressEvent(event);
 }
 
+void ResultsTree::setReportType(ReportType reportType) {
+    mReportType = reportType;
+
+    mGuideline = createGuidelineMapping(reportType);
+
+    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) {
+            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);
+        }
+    }
+
+    if (isAutosarMisraReport()) {
+        showColumn(COLUMN_MISRA_CLASSIFICATION);
+        showColumn(COLUMN_MISRA_GUIDELINE);
+    } else {
+        hideColumn(COLUMN_MISRA_CLASSIFICATION);
+        hideColumn(COLUMN_MISRA_GUIDELINE);
+    }
+
+    if (isCertReport()) {
+        showColumn(COLUMN_CERT_LEVEL);
+        showColumn(COLUMN_CERT_RULE);
+    } else {
+        hideColumn(COLUMN_CERT_LEVEL);
+        hideColumn(COLUMN_CERT_RULE);
+    }
+
+    if (mReportType == ReportType::normal) {
+        showColumn(COLUMN_SEVERITY);
+    } else {
+        hideColumn(COLUMN_SEVERITY);
+    }
+
+    refreshTree();
+}
+
 void ResultsTree::initialize(QSettings *settings, ApplicationList *list, ThreadHandler *checkThreadHandler)
 {
     mSettings = settings;
@@ -124,220 +205,151 @@ 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)
 {
-    QStandardItem *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)
 {
-    QStandardItem *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)
 {
-    QStandardItem *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");
-    }
+    const QString s = errorItem.toString();
+    if (mErrorList.contains(s))
+        return false;
+    mErrorList.append(s);
 
-    bool hide = false;
+    QSharedPointer<ErrorItem> errorItemPtr{new ErrorItem(errorItem)};
 
-    // Ids that are temporarily hidden..
-    if (mHiddenMessageId.contains(item.errorId))
-        hide = true;
-
-    //If specified, filter on summary, message, filename, and id
-    if (!hide && !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)) {
-            hide = true;
-        }
+    if (mReportType != ReportType::normal) {
+        errorItemPtr->guideline = getGuideline(mReportType, mGuideline, errorItemPtr->errorId, errorItemPtr->severity);
+        errorItemPtr->classification = getClassification(mReportType, errorItemPtr->guideline);
     }
 
-    //if there is at least one error that is not hidden, we have a visible error
-    if (!hide) {
-        mVisibleErrors = true;
-    }
+    const bool showItem = !isErrorItemHidden(errorItemPtr);
 
-    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);
-    }
+    // if there is at least one error that is not hidden, we have a visible error
+    mVisibleErrors |= showItem;
+
+    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, hide);
-    QStandardItem* stditem = addBacktraceFiles(fileItem,
-                                               line,
-                                               hide,
-                                               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> data;
-    data[SEVERITY]  = ShowTypes::SeverityToShowType(item.severity);
-    data[SUMMARY] = item.summary;
-    data[MESSAGE]  = item.message;
-    data[FILENAME]  = loc.file;
-    data[LINE]  = loc.line;
-    data[COLUMN] = loc.column;
-    data[ERRORID]  = item.errorId;
-    data[CWE] = item.cwe;
-    data[HASH] = item.hash;
-    data[INCONCLUSIVE] = item.inconclusive;
-    data[FILE0] = stripPath(item.file0, true);
-    data[SINCEDATE] = item.sinceDate;
-    data[SYMBOLNAMES] = item.symbolNames;
-    data[TAGS] = line.tags;
-    data[HIDE] = hide;
-    stditem->setData(QVariant(data));
-
     //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;
-            child_item = addBacktraceFiles(stditem,
-                                           line,
-                                           hide,
-                                           ":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);
         }
     }
 
-    // Partially refresh the tree: Unhide file item if necessary
-    if (!hide) {
-        setRowHidden(fileItem->row(), QModelIndex(), !mShowSeverities.isShown(item.severity));
-    }
     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) {
+    if (!parent)
         return nullptr;
-    }
-
-    QList<QStandardItem*> list;
-    // Ensure shown path is with native separators
-    list << createNormalItem(QDir::toNativeSeparators(item.file))
-         << createNormalItem(childOfMessage ? tr("note") : severityToTranslatedString(item.severity))
-         << createLineNumberItem(QString::number(item.line))
-         << createNormalItem(childOfMessage ? QString() : item.errorId)
-         << (childOfMessage ? createNormalItem(QString()) : createCheckboxItem(item.inconclusive))
-         << createNormalItem(item.summary)
-         << createNormalItem(item.sinceDate)
-         << createNormalItem(item.tags);
 
     //TODO message has parameter names so we'll need changes to the core
     //cppcheck so we can get proper translations
 
+    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
+        const auto& e = errorItem->errorPath[i];
+        if (loc.line == e.line && loc.info == e.info)
+            return nullptr;
+    }
 
-        // the third column is the line number so check it first
-        if (parent->child(i, 2)->text() == list[2]->text()) {
-            // the second column is the severity so check it next
-            if (parent->child(i, 1)->text() == list[1]->text()) {
-                // the sixth column is the summary so check it last
-                if (parent->child(i, 5)->text() == list[5]->text()) {
-                    // this row matches so don't add it
-                    return nullptr;
-                }
-            }
-        }
+    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] ? 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));
-    }
-
-    /* TODO: the list items leak memory
-        Indirect leak of 80624 byte(s) in 5039 object(s) allocated from:
-     #0 0xa15a2d in operator new(unsigned long) (/mnt/s/GitHub/cppcheck-fw/cmake-build-debug-wsl-kali-clang-asan-ubsan/bin/cppcheck-gui+0xa15a2d)
-     #1 0xdda276 in ResultsTree::createNormalItem(QString const&) /mnt/s/GitHub/cppcheck-fw/gui/resultstree.cpp:122:27
-     #2 0xde4290 in ResultsTree::addBacktraceFiles(QStandardItem*, ErrorLine const&, bool, QString const&, bool) /mnt/s/GitHub/cppcheck-fw/gui/resultstree.cpp:289:13
-     #3 0xddd754 in ResultsTree::addErrorItem(ErrorItem const&) /mnt/s/GitHub/cppcheck-fw/gui/resultstree.cpp:199:30
-     #4 0xe37046 in ResultsView::error(ErrorItem const&) /mnt/s/GitHub/cppcheck-fw/gui/resultsview.cpp:129:21
-     #5 0xd2448d in QtPrivate::FunctorCall<QtPrivate::IndexesList<0>, QtPrivate::List<ErrorItem const&>, void, void (ResultsView::*)(ErrorItem const&)>::call(void (ResultsView::*)(ErrorItem const&), ResultsView*, void**) /usr/include/x86_64-linux-gnu/qt5/QtCore/qobjectdefs_impl.h:152:13
-     #6 0xd2402c in void QtPrivate::FunctionPointer<void (ResultsView::*)(ErrorItem const&)>::call<QtPrivate::List<ErrorItem const&>, void>(void (ResultsView::*)(ErrorItem const&), ResultsView*, void**) /usr/include/x86_64-linux-gnu/qt5/QtCore/qobjectdefs_impl.h:185:13
-     #7 0xd23b45 in QtPrivate::QSlotObject<void (ResultsView::*)(ErrorItem const&), QtPrivate::List<ErrorItem const&>, void>::impl(int, QtPrivate::QSlotObjectBase*, QObject*, void**, bool*) /usr/include/x86_64-linux-gnu/qt5/QtCore/qobjectdefs_impl.h:418:17
-     #8 0x7fd2536cc0dd in QObject::event(QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Core.so.5+0x2dc0dd)
-     #9 0x7fd2541836be in QApplicationPrivate::notify_helper(QObject*, QEvent*) (/usr/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x1636be)
-     */
-
-    return list[0];
+    return columns[COLUMN_FILE];
 }
 
-QString ResultsTree::severityToTranslatedString(Severity::SeverityType severity)
+QString ResultsTree::severityToTranslatedString(Severity severity)
 {
     switch (severity) {
     case Severity::style:
@@ -361,46 +373,62 @@ QString ResultsTree::severityToTranslatedString(Severity::SeverityType severity)
     case Severity::debug:
         return tr("debug");
 
+    case Severity::internal:
+        return tr("internal");
+
     case Severity::none:
     default:
         return QString();
     }
 }
 
-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, 0)->text(), name, Qt::CaseInsensitive) == 0)
+        if (QString::compare(mModel->item(i, COLUMN_FILE)->text(), name, Qt::CaseInsensitive) == 0)
 #else
-        if (mModel.item(i, 0)->text() == name)
+        if (mModel->item(i, COLUMN_FILE)->text() == name)
 #endif
-            return mModel.item(i, 0);
+            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);
+        if (activeProject->getTags().isEmpty())
+            hideColumn(COLUMN_TAGS);
+        else
+            showColumn(COLUMN_TAGS);
+    } else {
+        hideColumn(COLUMN_SINCE_DATE);
+        hideColumn(COLUMN_TAGS);
+    }
 }
 
 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, 0);
+    for (int i = 0; i < mModel->rowCount(); ++i) {
+        const auto *fileItem = dynamic_cast<ResultItem*>(mModel->item(i, COLUMN_FILE));
         if (!fileItem)
             continue;
 
-        QVariantMap data = fileItem->data().toMap();
-        if (stripped == data[FILENAME].toString() ||
-            filename == data[FILE0].toString()) {
-            mModel.removeRow(i);
+        if (stripped == fileItem->text() ||
+            filename == fileItem->errorItem->file0) {
+            mModel->removeRow(i);
+            mErrorList.removeAll(fileItem->errorItem->toString());
             break;
         }
     }
@@ -408,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, 0);
+    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 data = fileItem->data().toMap();
-        QString storedfile = data[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);
+            mModel->removeRow(i);
+            mErrorList.removeAll(fileItem->errorItem->toString());
             break;
         }
     }
@@ -427,22 +455,22 @@ 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();
     mSaveAllErrors = mSettings->value(SETTINGS_SAVE_ALL_ERRORS, false).toBool();
     mShowFullPath = mSettings->value(SETTINGS_SHOW_FULL_PATH, false).toBool();
 
-    showIdColumn(mSettings->value(SETTINGS_SHOW_ERROR_ID, false).toBool());
+    showIdColumn(mSettings->value(SETTINGS_SHOW_ERROR_ID, true).toBool());
     showInconclusiveColumn(mSettings->value(SETTINGS_INCONCLUSIVE_ERRORS, false).toBool());
 }
 
 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));
     }
@@ -478,26 +506,6 @@ void ResultsTree::showHiddenResults()
 {
     //Clear the "hide" flag for each item
     mHiddenMessageId.clear();
-    const int filecount = mModel.rowCount();
-    for (int i = 0; i < filecount; i++) {
-        QStandardItem *fileItem = mModel.item(i, 0);
-        if (!fileItem)
-            continue;
-
-        QVariantMap data = fileItem->data().toMap();
-        data[HIDE] = false;
-        fileItem->setData(QVariant(data));
-
-        const int errorcount = fileItem->rowCount();
-        for (int j = 0; j < errorcount; j++) {
-            QStandardItem *child = fileItem->child(j, 0);
-            if (child) {
-                data = child->data().toMap();
-                data[HIDE] = false;
-                child->setData(QVariant(data));
-            }
-        }
-    }
     refreshTree();
     emit resultsHidden(false);
 }
@@ -507,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;
         }
@@ -520,90 +528,81 @@ void ResultsTree::refreshTree()
         const int errorcount = fileItem->rowCount();
 
         //By default it shouldn't be visible
-        bool show = false;
+        bool showFile = false;
 
         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
-            QVariant userdata = child->data();
-            //Convert it to QVariantMap
-            QVariantMap data = userdata.toMap();
-
             //Check if this error should be hidden
-            bool hide = (data[HIDE].toBool() || !mShowSeverities.isShown(ShowTypes::VariantToShowType(data[SEVERITY])));
-
-            //If specified, filter on summary, message, filename, and id
-            if (!hide && !mFilter.isEmpty()) {
-                if (!data[SUMMARY].toString().contains(mFilter, Qt::CaseInsensitive) &&
-                    !data[MESSAGE].toString().contains(mFilter, Qt::CaseInsensitive) &&
-                    !data[FILENAME].toString().contains(mFilter, Qt::CaseInsensitive) &&
-                    !data[ERRORID].toString().contains(mFilter, Qt::CaseInsensitive)) {
-                    hide = true;
-                }
-            }
-
-            // Tool filter
-            if (!hide) {
-                if (data[ERRORID].toString().startsWith("clang"))
-                    hide = !mShowClang;
-                else
-                    hide = !mShowCppcheck;
-            }
+            const bool hide = child->hidden || isErrorItemHidden(child->errorItem);
 
             if (!hide) {
+                showFile = true;
                 mVisibleErrors = true;
             }
 
             //Hide/show accordingly
             setRowHidden(j, fileItem->index(), hide);
-
-            //If it was shown then the file itself has to be shown as well
-            if (!hide) {
-                show = true;
-            }
         }
 
-        //Hide the file if its "hide" attribute is set
-        if (fileItem->data().toMap()["hide"].toBool()) {
-            show = false;
-        }
+        // 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);
 
-        //Show the file if any of it's errors are visible
-        setRowHidden(i, QModelIndex(), !show);
+    // 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) {
-        return item;
+    if (fileItem) {
+        if (!hide)
+            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> data;
-    data[FILENAME] = fullpath;
-    data[FILE0] = file0;
-    item->setData(QVariant(data));
-    mModel.appendRow(item);
+    mModel->appendRow(fileItem);
 
-    setRowHidden(mModel.rowCount() - 1, QModelIndex(), hide);
+    setRowHidden(fileItem->row(), QModelIndex(), hide);
 
-    return item;
+    return fileItem;
 }
 
 void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
@@ -616,41 +615,34 @@ 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);
 
-        //Store all applications in a list
-        QList<QAction*> actions;
-
         //Create a signal mapper so we don't have to store data to class
         //member variables
-        QSignalMapper *signalMapper = new QSignalMapper(this);
+        QSignalMapper signalMapper;
 
         if (mContextItem && mApplications->getApplicationCount() > 0 && mContextItem->parent()) {
             //Create an action for the application
             int defaultApplicationIndex = mApplications->getDefaultApplication();
-            if (defaultApplicationIndex < 0)
-                defaultApplicationIndex = 0;
+            defaultApplicationIndex = std::max(defaultApplicationIndex, 0);
             const Application& app = mApplications->getApplication(defaultApplicationIndex);
-            QAction *start = new QAction(app.getName(), &menu);
+            auto *start = new QAction(app.getName(), &menu);
             if (multipleSelection)
                 start->setDisabled(true);
 
-            //Add it to our list so we can disconnect later on
-            actions << start;
-
             //Add it to context menu
             menu.addAction(start);
 
             //Connect the signal to signal mapper
-            connect(start, SIGNAL(triggered()), signalMapper, SLOT(map()));
+            connect(start, &QAction::triggered, &signalMapper, QOverload<>::of(&QSignalMapper::map));
 
             //Add a new mapping
-            signalMapper->setMapping(start, defaultApplicationIndex);
+            signalMapper.setMapping(start, defaultApplicationIndex);
 
-            connect(signalMapper, SIGNAL(mapped(int)),
+            connect(&signalMapper, SIGNAL(mappedInt(int)),
                     this, SLOT(context(int)));
         }
 
@@ -660,58 +652,76 @@ 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
-            QAction *recheckSelectedFiles   = new QAction(tr("Recheck"), &menu);
-            QAction *copy                   = new QAction(tr("Copy"), &menu);
-            QAction *hide                   = new QAction(tr("Hide"), &menu);
-            QAction *hideallid              = new QAction(tr("Hide all with id"), &menu);
-            QAction *opencontainingfolder   = new QAction(tr("Open containing folder"), &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 %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 (selectedFiles == 0 || mThread->isChecking() || mResultsSource == ResultsSource::Log)
+                recheckAction->setDisabled(true);
+
+            if (selectedResults == 0)
+                hide->setDisabled(true);
 
-            if (multipleSelection) {
+            if (selectedResults == 0 || multipleSelection)
                 hideallid->setDisabled(true);
+
+            if (multipleSelection || mResultsSource == ResultsSource::Log)
                 opencontainingfolder->setDisabled(true);
-            }
-            if (mThread->isChecking())
-                recheckSelectedFiles->setDisabled(true);
-            else
-                recheckSelectedFiles->setDisabled(false);
 
-            menu.addAction(recheckSelectedFiles);
+            menu.addAction(recheckAction);
             menu.addSeparator();
-            menu.addAction(copy);
+            menu.addAction(copyAction);
             menu.addSeparator();
             menu.addAction(hide);
             menu.addAction(hideallid);
 
-            QAction *suppress = new QAction(tr("Suppress selected id(s)"), &menu);
+            auto *suppress = new QAction(tr("Suppress selected id(s)"), &menu);
+            {
+                if (selectedResults == 0 || ErrorLogger::isCriticalErrorId(mContextItem->errorItem->errorId.toStdString()))
+                    suppress->setDisabled(true);
+            }
             menu.addAction(suppress);
             connect(suppress, &QAction::triggered, this, &ResultsTree::suppressSelectedIds);
 
             menu.addSeparator();
             menu.addAction(opencontainingfolder);
 
-            connect(recheckSelectedFiles, SIGNAL(triggered()), this, SLOT(recheckSelectedFiles()));
-            connect(copy, SIGNAL(triggered()), this, SLOT(copy()));
-            connect(hide, SIGNAL(triggered()), this, SLOT(hideResult()));
-            connect(hideallid, SIGNAL(triggered()), this, SLOT(hideAllIdResult()));
-            connect(opencontainingfolder, SIGNAL(triggered()), this, SLOT(openContainingFolder()));
+            connect(recheckAction, &QAction::triggered, this, &ResultsTree::recheckSelectedFiles);
+            connect(copyAction, &QAction::triggered, this, &ResultsTree::copy);
+            connect(hide, &QAction::triggered, this, &ResultsTree::hideResult);
+            connect(hideallid, &QAction::triggered, this, &ResultsTree::hideAllIdResult);
+            connect(opencontainingfolder, &QAction::triggered, this, &ResultsTree::openContainingFolder);
 
             const ProjectFile *currentProject = ProjectFile::getActiveProject();
             if (currentProject && !currentProject->getTags().isEmpty()) {
                 menu.addSeparator();
                 QMenu *tagMenu = menu.addMenu(tr("Tag"));
                 {
-                    QAction *action = new QAction(tr("No tag"), tagMenu);
+                    auto *action = new QAction(tr("No tag"), tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [this]() {
                         tagSelectedItems(QString());
                     });
                 }
 
                 for (const QString& tagstr : currentProject->getTags()) {
-                    QAction *action = new QAction(tagstr, tagMenu);
+                    auto *action = new QAction(tagstr, tagMenu);
                     tagMenu->addAction(action);
-                    connect(action, &QAction::triggered, [=]() {
+                    connect(action, &QAction::triggered, [tagstr, this]() {
                         tagSelectedItems(tagstr);
                     });
                 }
@@ -721,24 +731,12 @@ void ResultsTree::contextMenuEvent(QContextMenuEvent * e)
         //Start the menu
         menu.exec(e->globalPos());
         index = indexAt(e->pos());
-        if (index.isValid()) {
-            mContextItem = mModel.itemFromIndex(index);
-            if (mContextItem && mApplications->getApplicationCount() > 0 && mContextItem->parent()) {
-                //Disconnect all signals
-                for (QAction* action : actions) {
-                    disconnect(action, SIGNAL(triggered()), signalMapper, SLOT(map()));
-                }
-
-                disconnect(signalMapper, SIGNAL(mapped(int)),
-                           this, SLOT(context(int)));
-                //And remove the signal mapper
-                delete signalMapper;
-            }
-        }
+        if (index.isValid())
+            mContextItem = dynamic_cast<ResultItem*>(mModel->itemFromIndex(index));
     }
 }
 
-void ResultsTree::startApplication(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) {
@@ -764,22 +762,16 @@ void ResultsTree::startApplication(QStandardItem *target, int application)
                         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 data = target->data().toMap();
+        const auto& errorPathItem = target->getErrorPathItem();
 
         //Replace (file) with filename
-        QString file = data[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);
@@ -808,11 +800,10 @@ void ResultsTree::startApplication(QStandardItem *target, int application)
         QString params = app.getParameters();
         params.replace("(file)", file, Qt::CaseInsensitive);
 
-        QVariant line = data[LINE];
-        params.replace("(line)", QString("%1").arg(line.toInt()), Qt::CaseInsensitive);
+        params.replace("(line)", QString::number(errorPathItem.line), Qt::CaseInsensitive);
 
-        params.replace("(message)", data[MESSAGE].toString(), Qt::CaseInsensitive);
-        params.replace("(severity)", data[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();
 
@@ -826,10 +817,7 @@ void ResultsTree::startApplication(QStandardItem *target, int application)
         }
 #endif // Q_OS_WIN
 
-        const QString cmdLine = QString("%1 %2").arg(program).arg(params);
-
-        // this is reported as deprecated in Qt 5.15.2 but no longer in Qt 6
-        const bool success = SUPPRESS_DEPRECATED_WARNING(QProcess::startDetached(cmdLine));
+        const bool success = QProcess::startDetached(program, QProcess::splitCommand(params));
         if (!success) {
             QString text = tr("Could not start %1\n\nPlease check the application path and parameters are correct.").arg(program);
 
@@ -870,7 +858,7 @@ QString ResultsTree::askFileDir(const QString &file)
         return QString();
 
     // User selected root path
-    if (QFileInfo(dir + '/' + file).exists())
+    if (QFileInfo::exists(dir + '/' + file))
         mCheckPath = dir;
 
     // user selected checked folder
@@ -879,7 +867,7 @@ QString ResultsTree::askFileDir(const QString &file)
         QString folderName = file.mid(0, file.indexOf('/'));
         if (dir.indexOf('/' + folderName + '/'))
             dir = dir.mid(0, dir.lastIndexOf('/' + folderName + '/'));
-        if (QFileInfo(dir + '/' + file).exists())
+        if (QFileInfo::exists(dir + '/' + file))
             mCheckPath = dir;
     }
 
@@ -897,26 +885,18 @@ void ResultsTree::copy()
         return;
 
     QString text;
-    for (QModelIndex index : mSelectionModel->selectedRows()) {
-        QStandardItem *item = mModel.itemFromIndex(index);
-        if (!item->parent()) {
-            text += item->text() + '\n';
+    for (const QModelIndex& index : mSelectionModel->selectedRows()) {
+        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 data = item->data().toMap();
-        if (!data.contains("id"))
-            continue;
-        QString inconclusive = data[INCONCLUSIVE].toBool() ? ",inconclusive" : "";
-        text += '[' + data[FILENAME].toString() + ':' + QString::number(data[LINE].toInt())
-                + "] ("
-                + QString::fromStdString(Severity::toString(ShowTypes::ShowTypeToSeverity((ShowTypes::ShowType)data[SEVERITY].toInt()))) + inconclusive
-                + ") "
-                + data[MESSAGE].toString()
-                + " ["
-                + data[ERRORID].toString()
-                + "]\n";
     }
 
     QClipboard *clipboard = QApplication::clipboard();
@@ -927,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 data = item->data().toMap();
-        data[HIDE] = true;
-        item->setData(QVariant(data));
-
+    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);
     }
@@ -946,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 data = item->data().toMap();
-        QString currentFile = data[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
@@ -965,58 +944,24 @@ void ResultsTree::recheckSelectedFiles()
                 return;
             }
             if (Path::isHeader(currentFile.toStdString())) {
-                if (!data[FILE0].toString().isEmpty() && !selectedItems.contains(data[FILE0].toString())) {
-                    selectedItems<<((!mCheckPath.isEmpty() && (data[FILE0].toString().indexOf(mCheckPath) != 0)) ? (mCheckPath + "/" + data[FILE0].toString()) : data[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(selectedItems);
+    emit checkSelected(std::move(selectedItems));
 }
 
 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 data = mContextItem->data().toMap();
-
-    QString messageId = data[ERRORID].toString();
-
-    mHiddenMessageId.append(messageId);
-
-    // hide all errors with that message Id
-    const int filecount = mModel.rowCount();
-    for (int i = 0; i < filecount; i++) {
-        //Get file i
-        QStandardItem *file = mModel.item(i, 0);
-        if (!file) {
-            continue;
-        }
-
-        //Get the amount of errors this file contains
-        const int errorcount = file->rowCount();
-
-        for (int j = 0; j < errorcount; j++) {
-            //Get the error itself
-            QStandardItem *child = file->child(j, 0);
-            if (!child) {
-                continue;
-            }
-
-            QVariantMap userdata = child->data().toMap();
-            if (userdata[ERRORID].toString() == messageId) {
-                userdata[HIDE] = true;
-                child->setData(QVariant(userdata));
-            }
-        }
-    }
+    mHiddenMessageId.append(mContextItem->errorItem->errorId);
 
     refreshTree();
     emit resultsHidden(true);
@@ -1027,38 +972,33 @@ void ResultsTree::suppressSelectedIds()
     if (!mSelectionModel)
         return;
 
-    QModelIndexList selectedRows = mSelectionModel->selectedRows();
     QSet<QString> selectedIds;
-    for (QModelIndex index : mSelectionModel->selectedRows()) {
-        QStandardItem *item = mModel.itemFromIndex(index);
-        if (!item->parent())
+    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;
-        if (item->parent()->parent())
-            item = item->parent();
-        QVariantMap data = item->data().toMap();
-        if (!data.contains("id"))
-            continue;
-        selectedIds << data[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()
@@ -1066,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 data = item->data().toMap();
-        if (projectFile && data.contains(HASH)) {
-            Suppressions::Suppression suppression;
-            suppression.hash = data[HASH].toULongLong();
-            suppression.errorId = data[ERRORID].toString().toStdString();
-            suppression.fileName = data[FILENAME].toString().toStdString();
-            suppression.lineNumber = data[LINE].toInt();
+        // Suppress
+        if (projectFile && item->errorItem->hash > 0) {
+            SuppressionList::Suppression suppression;
+            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)
@@ -1102,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));
@@ -1116,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 data = item->data().toMap();
-        if (data.contains("tags")) {
-            data[TAGS] = tag;
-            item->setData(QVariant(data));
+        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 && data.contains(HASH)) {
+            if (currentProject && item->errorItem->hash > 0) {
                 isTagged = true;
-                currentProject->setWarningTags(data[HASH].toULongLong(), tag);
+                currentProject->setWarningTags(item->errorItem->hash, tag);
             }
         }
     }
@@ -1139,34 +1076,10 @@ void ResultsTree::context(int application)
 
 void ResultsTree::quickStartApplication(const QModelIndex &index)
 {
-    startApplication(mModel.itemFromIndex(index));
-}
-
-QString ResultsTree::getFilePath(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 data = target->data().toMap();
-        QString pathStr;
-
-        //Replace (file) with filename
-        QString file = data[FILENAME].toString();
-        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::SeverityType severity)
+QString ResultsTree::severityToIcon(Severity severity)
 {
     switch (severity) {
     case Severity::error:
@@ -1190,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;
@@ -1215,105 +1128,52 @@ 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)
-{
-    for (int i = 0; i < list.size(); i++) {
-        if (ErrorItem::sameCID(item, list[i])) {
-            return i;
-        }
-    }
-    return -1;
-}
-
 void ResultsTree::updateFromOldReport(const QString &filename)
 {
+    showColumn(COLUMN_SINCE_DATE);
+
     QList<ErrorItem> oldErrors;
-    XmlReportV2 oldReport(filename);
+    XmlReportV2 oldReport(filename, QString());
     if (oldReport.open()) {
         oldErrors = oldReport.read();
         oldReport.close();
     }
 
     // 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 data = 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()) {
-                data[SINCEDATE] = oldErrors[oldErrorIndex].sinceDate;
-                error->setData(data);
-                fileItem->child(j, COLUMN_SINCE_DATE)->setText(oldErrors[oldErrorIndex].sinceDate);
-            } else if (oldErrorIndex < 0 || data[SINCEDATE].toString().isEmpty()) {
-                const QString sinceDate = QLocale::system().dateFormat(QLocale::ShortFormat);
-                data[SINCEDATE] = sinceDate;
-                error->setData(data);
+            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);
+                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];
-            data[TAGS] = oldErrorItem.tags;
-            error->setData(data);
+            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 data = error->data().toMap();
-
-    item->severity = ShowTypes::ShowTypeToSeverity(ShowTypes::VariantToShowType(data[SEVERITY]));
-    item->summary = data[SUMMARY].toString();
-    item->message = data[MESSAGE].toString();
-    item->errorId = data[ERRORID].toString();
-    item->cwe = data[CWE].toInt();
-    item->hash = data[HASH].toULongLong();
-    item->inconclusive = data[INCONCLUSIVE].toBool();
-    item->file0 = data[FILE0].toString();
-    item->sinceDate = data[SINCEDATE].toString();
-    item->tags = data[TAGS].toString();
-
-    if (error->rowCount() == 0) {
-        QErrorPathItem e;
-        e.file = stripPath(data[FILENAME].toString(), true);
-        e.line = data[LINE].toInt();
-        e.info = data[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,
@@ -1337,12 +1197,16 @@ void ResultsTree::setCheckDirectory(const QString &dir)
     mCheckPath = dir;
 }
 
-
-QString ResultsTree::getCheckDirectory()
+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)) {
@@ -1353,62 +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
-        QVariant userdata = error->data();
-        //Convert it to QVariantMap
-        QVariantMap data = userdata.toMap();
-
-        //Get list of files
-        QString file = data[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());
-        }
-
     }
 }
 
@@ -1417,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)));
     }
 }
 
@@ -1429,14 +1269,12 @@ bool ResultsTree::hasVisibleResults() const
 
 bool ResultsTree::hasResults() const
 {
-    return mModel.rowCount() > 0;
+    return mModel->rowCount() > 0;
 }
 
 void ResultsTree::translate()
 {
-    QStringList labels;
-    labels << tr("File") << tr("Severity") << tr("Line") << tr("Id") << tr("Inconclusive") << tr("Summary") << tr("Since date") << tr("Tag");
-    mModel.setHorizontalHeaderLabels(labels);
+    mModel->setHorizontalHeaderLabels(getLabels());
     //TODO go through all the errors in the tree and translate severity and message
 }
 
@@ -1444,21 +1282,35 @@ void ResultsTree::showIdColumn(bool show)
 {
     mShowErrorId = show;
     if (show)
-        showColumn(3);
+        showColumn(COLUMN_ID);
     else
-        hideColumn(3);
+        hideColumn(COLUMN_ID);
 }
 
 void ResultsTree::showInconclusiveColumn(bool show)
 {
     if (show)
-        showColumn(4);
+        showColumn(COLUMN_INCONCLUSIVE);
     else
-        hideColumn(4);
+        hideColumn(COLUMN_INCONCLUSIVE);
 }
 
 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 {
+    return mReportType == ReportType::certC || mReportType == ReportType::certCpp;
+}
+
+bool ResultsTree::isAutosarMisraReport() const {
+    return mReportType == ReportType::autosar ||
+           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 1e67dca9710..efa759cd6d1 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-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
@@ -20,11 +20,15 @@
 #ifndef RESULTSTREE_H
 #define RESULTSTREE_H
 
-#include "errortypes.h"
 #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>
@@ -32,19 +36,17 @@
 class ApplicationList;
 class Report;
 class ErrorItem;
-class ErrorLine;
 class QModelIndex;
 class QWidget;
 class QItemSelectionModel;
 class ThreadHandler;
-class QContextMenuEvent;
-class QKeyEvent;
 class QSettings;
+class QStandardItemModel;
+enum class Severity : std::uint8_t;
 
 /// @addtogroup GUI
 /// @{
 
-
 /**
  * @brief Cppcheck's results are shown in this tree
  *
@@ -53,15 +55,15 @@ class ResultsTree : public QTreeView {
     Q_OBJECT
 public:
     explicit ResultsTree(QWidget * parent = nullptr);
-    ~ResultsTree() override;
+
     void initialize(QSettings *settings, ApplicationList *list, ThreadHandler *checkThreadHandler);
 
     /**
      * @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
@@ -134,7 +136,25 @@ class ResultsTree : public QTreeView {
      * @return Directory containing source files
      */
 
-    QString getCheckDirectory();
+    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.
@@ -184,6 +204,15 @@ class ResultsTree : public QTreeView {
 
     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
@@ -203,11 +232,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
@@ -308,9 +336,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);
 
 
     /**
@@ -328,14 +356,14 @@ 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
      *
      * @param severity Severity
      */
-    static QString severityToIcon(Severity::SeverityType severity);
+    static QString severityToIcon(Severity severity);
 
     /**
      * @brief Helper function to open an error within target with application*
@@ -344,15 +372,7 @@ protected slots:
      * @param application Index of the application to open with. Giving -1
      *  (default value) will open the default application.
      */
-    void startApplication(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(QStandardItem *target, bool fullPath);
+    void startApplication(const ResultItem *target, int application = -1);
 
     /**
      * @brief Context menu event (user right clicked on the tree)
@@ -365,24 +385,26 @@ 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,
-                                     const 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.
      * @param severity Severity to convert
      * @return Severity as translated string
      */
-    static QString severityToTranslatedString(Severity::SeverityType severity);
+    static QString severityToTranslatedString(Severity severity);
 
     /**
      * @brief Load all settings
@@ -400,29 +422,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
@@ -430,30 +473,28 @@ 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
      *
      */
-    QSettings *mSettings;
+    QSettings* mSettings{};
 
     /**
      * @brief A string used to filter the results for display.
@@ -465,37 +506,37 @@ protected slots:
      * @brief List of applications to open errors with
      *
      */
-    ApplicationList *mApplications;
+    ApplicationList* mApplications{};
 
     /**
      * @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)
      *
      */
-    bool mShowFullPath;
+    bool mShowFullPath{};
 
     /**
      * @brief Should full path of files be saved
      *
      */
-    bool mSaveFullPath;
+    bool mSaveFullPath{};
 
     /**
      * @brief Save all errors (true) or only visible (false)
      *
      */
-    bool mSaveAllErrors;
+    bool mSaveAllErrors = true;
 
     /**
      * @brief true if optional column "Id" is shown
      *
      */
-    bool mShowErrorId;
+    bool mShowErrorId{};
 
     /**
      * @brief Path we are currently checking
@@ -503,26 +544,40 @@ protected slots:
      */
     QString mCheckPath;
 
+    /**
+     * @brief The type of source of the current results
+     *
+     */
+    ResultsSource mResultsSource{ResultsSource::Analysis};
+
     /**
      * @brief Are there any visible errors
      *
      */
-    bool mVisibleErrors;
+    bool mVisibleErrors{};
 
 private:
     /** 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;
 
-    QItemSelectionModel *mSelectionModel;
-    ThreadHandler *mThread;
+    // List of existing errors so we can avoid duplicates
+    QStringList mErrorList;
+
+    QItemSelectionModel* mSelectionModel{};
+    ThreadHandler *mThread{};
+
+    bool mShowCppcheck = true;
+    bool mShowClang = true;
+
+    ReportType mReportType = ReportType::normal;
 
-    bool mShowCppcheck;
-    bool mShowClang;
+    std::map<std::string, std::string> mGuideline;
 };
 /// @}
 #endif // RESULTSTREE_H
diff --git a/gui/resultsview.cpp b/gui/resultsview.cpp
index 2ee37ae9493..8336a697878 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-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
@@ -19,20 +19,27 @@
 #include "resultsview.h"
 
 #include "checkstatistics.h"
+#include "checkersreport.h"
 #include "codeeditor.h"
 #include "codeeditorstyle.h"
 #include "common.h"
 #include "csvreport.h"
 #include "erroritem.h"
+#include "errorlogger.h"
+#include "errortypes.h"
 #include "path.h"
 #include "printablereport.h"
 #include "resultstree.h"
+#include "settings.h"
 #include "txtreport.h"
 #include "xmlreport.h"
 #include "xmlreportv2.h"
 
 #include "ui_resultsview.h"
 
+#include <set>
+#include <string>
+
 #include <QAbstractItemModel>
 #include <QApplication>
 #include <QByteArray>
@@ -44,6 +51,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QIODevice>
+#include <QLabel>
 #include <QList>
 #include <QListWidget>
 #include <QListWidgetItem>
@@ -61,13 +69,12 @@
 #include <QTextDocument>
 #include <QTextEdit>
 #include <QTextStream>
-#include <QVariant>
-#include <QVariantMap>
 #include <Qt>
 
+enum class ReportType : std::uint8_t;
+
 ResultsView::ResultsView(QWidget * parent) :
     QWidget(parent),
-    mShowNoErrorsMessage(true),
     mUI(new Ui::ResultsView),
     mStatistics(new CheckStatistics(this))
 {
@@ -91,6 +98,7 @@ void ResultsView::initialize(QSettings *settings, ApplicationList *list, ThreadH
 {
     mUI->mProgress->setMinimum(0);
     mUI->mProgress->setVisible(false);
+    mUI->mLabelCriticalErrors->setVisible(false);
 
     CodeEditorStyle theStyle(CodeEditorStyle::loadSettings(settings));
     mUI->mCode->setStyle(theStyle);
@@ -105,6 +113,7 @@ void ResultsView::initialize(QSettings *settings, ApplicationList *list, ThreadH
 ResultsView::~ResultsView()
 {
     delete mUI;
+    delete mCheckSettings;
 }
 
 void ResultsView::clear(bool results)
@@ -116,11 +125,17 @@ void ResultsView::clear(bool results)
     mUI->mDetails->setText(QString());
 
     mStatistics->clear();
+    delete mCheckSettings;
+    mCheckSettings = nullptr;
 
     //Clear the progressbar
     mUI->mProgress->setMaximum(PROGRESS_MAX);
     mUI->mProgress->setValue(0);
     mUI->mProgress->setFormat("%p%");
+
+    mUI->mLabelCriticalErrors->setVisible(false);
+
+    mSuccess = false;
 }
 
 void ResultsView::clear(const QString &filename)
@@ -138,6 +153,15 @@ const ShowTypes & ResultsView::getShowTypes() const
     return mUI->mTree->mShowSeverities;
 }
 
+void ResultsView::setReportType(ReportType reportType) {
+    mUI->mTree->setReportType(reportType);
+}
+
+void ResultsView::setResultsSource(ResultsTree::ResultsSource source)
+{
+    mUI->mTree->setResultsSource(source);
+}
+
 void ResultsView::progress(int value, const QString& description)
 {
     mUI->mProgress->setValue(value);
@@ -146,6 +170,16 @@ void ResultsView::progress(int value, const QString& description)
 
 void ResultsView::error(const ErrorItem &item)
 {
+    if (item.severity == Severity::internal && (item.errorId == "logChecker" || item.errorId.endsWith("-logChecker"))) {
+        mStatistics->addChecker(item.message);
+        return;
+    }
+
+    handleCriticalError(item);
+
+    if (item.severity == Severity::internal)
+        return;
+
     if (mUI->mTree->addErrorItem(item)) {
         emit gotResults();
         mStatistics->addItem(item.tool(), ShowTypes::SeverityToShowType(item.severity));
@@ -179,7 +213,7 @@ void ResultsView::updateFromOldReport(const QString &filename) const
     mUI->mTree->updateFromOldReport(filename);
 }
 
-void ResultsView::save(const QString &filename, Report::Type type) const
+void ResultsView::save(const QString &filename, Report::Type type, const QString& productName) const
 {
     Report *report = nullptr;
 
@@ -191,7 +225,7 @@ void ResultsView::save(const QString &filename, Report::Type type) const
         report = new TxtReport(filename);
         break;
     case Report::XMLV2:
-        report = new XmlReportV2(filename);
+        report = new XmlReportV2(filename, productName);
         break;
     }
 
@@ -233,7 +267,7 @@ void ResultsView::printPreview()
     dialog.exec();
 }
 
-void ResultsView::print(QPrinter* printer)
+void ResultsView::print(QPrinter* printer) const
 {
     if (!hasResults()) {
         QMessageBox msgBox;
@@ -271,13 +305,21 @@ void ResultsView::setCheckDirectory(const QString &dir)
     mUI->mTree->setCheckDirectory(dir);
 }
 
-QString ResultsView::getCheckDirectory()
+QString ResultsView::getCheckDirectory() const
 {
     return mUI->mTree->getCheckDirectory();
 }
 
+void ResultsView::setCheckSettings(const Settings &settings)
+{
+    delete mCheckSettings;
+    mCheckSettings = new Settings;
+    *mCheckSettings = settings;
+}
+
 void ResultsView::checkingStarted(int count)
 {
+    mSuccess = true;
     mUI->mProgress->setVisible(true);
     mUI->mProgress->setMaximum(PROGRESS_MAX);
     mUI->mProgress->setValue(0);
@@ -289,6 +331,13 @@ void ResultsView::checkingFinished()
     mUI->mProgress->setVisible(false);
     mUI->mProgress->setFormat("%p%");
 
+    {
+        Settings checkSettings;
+        const std::set<std::string> activeCheckers = mStatistics->getActiveCheckers();
+        CheckersReport checkersReport(mCheckSettings ? *mCheckSettings : checkSettings, activeCheckers);
+        mStatistics->setCheckersReport(QString::fromStdString(checkersReport.getReport(mCriticalErrors.toStdString())));
+    }
+
     // TODO: Items can be mysteriously hidden when checking is finished, this function
     // call should be redundant but it "unhides" the wrongly hidden items.
     mUI->mTree->refreshTree();
@@ -343,13 +392,10 @@ 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;
@@ -366,7 +412,7 @@ void ResultsView::readErrorsXml(const QString &filename)
         return;
     }
 
-    XmlReportV2 report(filename);
+    XmlReportV2 report(filename, QString());
     QList<ErrorItem> errors;
     if (report.open()) {
         errors = report.read();
@@ -378,67 +424,56 @@ void ResultsView::readErrorsXml(const QString &filename)
     }
 
     for (const ErrorItem& item : errors) {
+        handleCriticalError(item);
         mUI->mTree->addErrorItem(item);
     }
 
     QString dir;
     if (!errors.isEmpty() && !errors[0].errorPath.isEmpty()) {
         QString relativePath = QFileInfo(filename).canonicalPath();
-        if (QFileInfo(relativePath + '/' + errors[0].errorPath[0].file).exists())
+        if (QFileInfo::exists(relativePath + '/' + errors[0].errorPath[0].file))
             dir = relativePath;
     }
 
     mUI->mTree->setCheckDirectory(dir);
 }
 
-void ResultsView::updateDetails(const QModelIndex &index)
+void ResultsView::updateDetails(const ResultItem* item)
 {
-    const QStandardItemModel *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 data = item->data().toMap();
-
-    // If there is no severity data then it is a parent item without summary and message
-    if (!data.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 = data["message"].toString();
-    QString formattedMsg = message;
+    QString formattedMsg = item->errorItem->message;
 
-    const QString file0 = data["file0"].toString();
-    if (!file0.isEmpty() && Path::isHeader(data["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 (data["cwe"].toInt() > 0)
-        formattedMsg.prepend("CWE: " + QString::number(data["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") + ": " + data["id"].toString() + "\n");
-    if (data["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 = data["line"].toInt();
+    const int lineNumber = item->getErrorPathItem().line;
 
-    QString filepath = data["file"].toString();
-    if (!QFileInfo(filepath).exists() && QFileInfo(mUI->mTree->getCheckDirectory() + '/' + filepath).exists())
+    QString filepath = item->getErrorPathItem().file;
+    if (!QFileInfo::exists(filepath) && QFileInfo::exists(mUI->mTree->getCheckDirectory() + '/' + filepath))
         filepath = mUI->mTree->getCheckDirectory() + '/' + filepath;
 
     QStringList symbols;
-    if (data.contains("symbolNames"))
-        symbols = data["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);
@@ -507,3 +542,36 @@ void ResultsView::on_mListLog_customContextMenuRequested(const QPoint &pos)
 
     contextMenu.exec(globalPos);
 }
+
+void ResultsView::stopAnalysis()
+{
+    mSuccess = false;
+    mUI->mLabelCriticalErrors->setText(tr("Analysis was stopped"));
+    mUI->mLabelCriticalErrors->setVisible(true);
+}
+
+void ResultsView::handleCriticalError(const ErrorItem &item)
+{
+    if (ErrorLogger::isCriticalErrorId(item.errorId.toStdString())) {
+        if (!mCriticalErrors.contains(item.errorId)) {
+            if (!mCriticalErrors.isEmpty())
+                mCriticalErrors += ",";
+            mCriticalErrors += item.errorId;
+            if (item.severity == Severity::internal)
+                mCriticalErrors += " (suppressed)";
+        }
+        QString msg = tr("There was a critical error with id '%1'").arg(item.errorId);
+        if (!item.file0.isEmpty())
+            msg += ", " + tr("when checking %1").arg(item.file0);
+        else
+            msg += ", " + tr("when checking a file");
+        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 f07c588732a..770f9c0c3fa 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-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
@@ -21,21 +21,26 @@
 #define RESULTSVIEW_H
 
 #include "report.h"
+#include "resultstree.h"
 #include "showtypes.h"
 
+#include <cstdint>
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
 #include <QWidget>
 
 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;
 }
@@ -85,8 +90,9 @@ class ResultsView : public QWidget {
      *
      * @param filename Filename to save results to
      * @param type Type of the report.
+     * @param productName Custom product name
      */
-    void save(const QString &filename, Report::Type type) const;
+    void save(const QString &filename, Report::Type type, const QString& productName) const;
 
     /**
      * @brief Update results from old report (tag, sinceDate)
@@ -134,7 +140,12 @@ class ResultsView : public QWidget {
      * @return Directory containing source files
      */
 
-    QString getCheckDirectory();
+    QString getCheckDirectory() const;
+
+    /**
+     * Set settings used in checking
+     */
+    void setCheckSettings(const Settings& settings);
 
     /**
      * @brief Inform the view that checking has started
@@ -176,7 +187,16 @@ class ResultsView : public QWidget {
      */
     void translate();
 
-    void disableProgressbar();
+    /**
+     * @brief This function should be called when analysis is stopped
+     */
+    void stopAnalysis();
+
+    /**
+     * @brief Are there successful results?
+     * @return true if analysis finished without critical errors etc
+     */
+    bool isSuccess() const;
 
     /**
      * @brief Read errors from report XML file.
@@ -199,6 +219,15 @@ class ResultsView : public QWidget {
      */
     const ShowTypes & getShowTypes() const;
 
+    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:
 
     /**
@@ -295,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
@@ -308,7 +337,7 @@ public slots:
      * @brief Slot printing the current report to the printer.
      * @param printer The printer used for printing the report.
      */
-    void print(QPrinter* printer);
+    void print(QPrinter* printer) const;
 
     /**
      * @brief Slot opening a print preview dialog
@@ -340,16 +369,33 @@ public slots:
      */
     void logCopyComplete();
 
-protected:
+private:
+
+    /**
+     * If provided ErrorItem is a critical error then display warning message
+     * in the resultsview
+     */
+    void handleCriticalError(const ErrorItem& item);
+
     /**
      * @brief Should we show a "No errors found dialog" every time no errors were found?
      */
-    bool mShowNoErrorsMessage;
+    bool mShowNoErrorsMessage = true;
 
     Ui::ResultsView *mUI;
 
     CheckStatistics *mStatistics;
 
+    Settings* mCheckSettings = nullptr;
+
+    /**
+     * Set to true when checking finish successfully. Set to false whenever analysis starts.
+     */
+    bool mSuccess = false;
+
+    /** Critical error ids */
+    QString mCriticalErrors;
+
 private slots:
     /**
      * @brief Custom context menu for Analysis Log
diff --git a/gui/resultsview.ui b/gui/resultsview.ui
index 9e22e561eaa..7ab18fffc9c 100644
--- a/gui/resultsview.ui
+++ b/gui/resultsview.ui
@@ -51,6 +51,16 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="mLabelCriticalErrors">
+     <property name="styleSheet">
+      <string notr="true">color: red;</string>
+     </property>
+     <property name="text">
+      <string>Critical errors</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QSplitter" name="mVerticalSplitter">
      <property name="orientation">
diff --git a/gui/scratchpad.cpp b/gui/scratchpad.cpp
index 6258df73042..4dee6b44664 100644
--- a/gui/scratchpad.cpp
+++ b/gui/scratchpad.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -25,6 +25,7 @@
 
 #include <QLineEdit>
 #include <QPushButton>
+#include <QString>
 
 ScratchPad::ScratchPad(MainWindow& mainWindow)
     : QDialog(&mainWindow)
diff --git a/gui/scratchpad.h b/gui/scratchpad.h
index bd75afe93e6..141b7b953f6 100644
--- a/gui/scratchpad.h
+++ b/gui/scratchpad.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -21,7 +21,6 @@
 
 #include <QDialog>
 #include <QObject>
-#include <QString>
 
 class MainWindow;
 namespace Ui {
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 1e8d13a4474..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-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
@@ -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()));
@@ -73,7 +76,7 @@ SettingsDialog::SettingsDialog(ApplicationList *list,
     mUI->mInlineSuppressions->setCheckState(boolToCheckState(settings.value(SETTINGS_INLINE_SUPPRESSIONS, false).toBool()));
     mUI->mEnableInconclusive->setCheckState(boolToCheckState(settings.value(SETTINGS_INCONCLUSIVE_ERRORS, false).toBool()));
     mUI->mShowStatistics->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_STATISTICS, false).toBool()));
-    mUI->mShowErrorId->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_ERROR_ID, false).toBool()));
+    mUI->mShowErrorId->setCheckState(boolToCheckState(settings.value(SETTINGS_SHOW_ERROR_ID, true).toBool()));
     mUI->mCheckForUpdates->setCheckState(boolToCheckState(settings.value(SETTINGS_CHECK_FOR_UPDATES, false).toBool()));
     mUI->mEditPythonPath->setText(settings.value(SETTINGS_PYTHON_PATH, QString()).toString());
     validateEditPythonPath();
@@ -92,7 +95,7 @@ SettingsDialog::SettingsDialog(ApplicationList *list,
     mCurrentStyle = new CodeEditorStyle(CodeEditorStyle::loadSettings(&settings));
     manageStyleControls();
 
-    connect(mUI->mEditPythonPath, SIGNAL(textEdited(const QString&)),
+    connect(mUI->mEditPythonPath, SIGNAL(textEdited(QString)),
             this, SLOT(validateEditPythonPath()));
 
     connect(mUI->mButtons, &QDialogButtonBox::accepted, this, &SettingsDialog::ok);
@@ -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();
@@ -140,7 +139,7 @@ void SettingsDialog::initTranslationsList()
 {
     const QString current = mTranslator->getCurrentLanguage();
     for (const TranslationInfo& translation : mTranslator->getTranslations()) {
-        QListWidgetItem *item = new QListWidgetItem;
+        auto *item = new QListWidgetItem;
         item->setText(translation.mName);
         item->setData(mLangCodeRole, QVariant(translation.mCode));
         mUI->mListLanguages->addItem(item);
@@ -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);
@@ -214,7 +209,7 @@ void SettingsDialog::saveSettingValues() const
     CodeEditorStyle::saveSettings(&settings, *mCurrentStyle);
 }
 
-void SettingsDialog::saveCheckboxValue(QSettings *settings, QCheckBox *box,
+void SettingsDialog::saveCheckboxValue(QSettings *settings, const QCheckBox *box,
                                        const QString &name)
 {
     settings->setValue(name, checkStateToBool(box->checkState()));
diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index 4c789458f83..d77a703ef26 100644
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -185,7 +185,7 @@ protected slots:
      * @param box checkbox to save
      * @param name name for QSettings to store the value
      */
-    static void saveCheckboxValue(QSettings *settings, QCheckBox *box, const QString &name);
+    static void saveCheckboxValue(QSettings *settings, const QCheckBox *box, const QString &name);
 
     /**
      * @brief Convert bool to Qt::CheckState
@@ -240,7 +240,7 @@ protected slots:
 private:
     void manageStyleControls();
 
-    static const int mLangCodeRole = Qt::UserRole;
+    static constexpr int mLangCodeRole = Qt::UserRole;
 
     bool mPremium;
 };
diff --git a/gui/showtypes.cpp b/gui/showtypes.cpp
index 03d61c47ebf..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-2022 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
@@ -19,6 +19,7 @@
 #include "showtypes.h"
 
 #include "common.h"
+#include "errortypes.h"
 
 #include <QSettings>
 
@@ -32,10 +33,11 @@ ShowTypes::~ShowTypes()
     save();
 }
 
-ShowTypes::ShowType ShowTypes::SeverityToShowType(Severity::SeverityType severity)
+ShowTypes::ShowType ShowTypes::SeverityToShowType(Severity severity)
 {
     switch (severity) {
     case Severity::none:
+    case Severity::internal:
         return ShowTypes::ShowNone;
     case Severity::error:
         return ShowTypes::ShowErrors;
@@ -54,42 +56,6 @@ ShowTypes::ShowType ShowTypes::SeverityToShowType(Severity::SeverityType severit
     }
 }
 
-Severity::SeverityType 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 (ShowTypes::ShowType)value;
-}
-
 void ShowTypes::load()
 {
     QSettings settings;
@@ -117,7 +83,7 @@ bool ShowTypes::isShown(ShowTypes::ShowType category) const
     return mVisible[category];
 }
 
-bool ShowTypes::isShown(Severity::SeverityType severity) const
+bool ShowTypes::isShown(Severity severity) const
 {
     return isShown(ShowTypes::SeverityToShowType(severity));
 }
diff --git a/gui/showtypes.h b/gui/showtypes.h
index d1e98336152..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-2022 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
@@ -19,9 +19,9 @@
 #ifndef SHOWTYPES_H
 #define SHOWTYPES_H
 
-#include "errortypes.h"
+#include <cstdint>
 
-#include <QVariant>
+enum class Severity : std::uint8_t;
 
 /// @addtogroup GUI
 /// @{
@@ -41,7 +41,7 @@ class ShowTypes {
     /**
      * @brief Show types we have (i.e. severities in the GUI).
      */
-    enum ShowType {
+    enum ShowType : std::uint8_t {
         ShowStyle = 0,
         ShowWarnings,
         ShowPerformance,
@@ -85,7 +85,7 @@ class ShowTypes {
      * @param severity severity to check.
      * @return true if the severity is visible.
      */
-    bool isShown(Severity::SeverityType severity) const;
+    bool isShown(Severity severity) const;
 
     /**
      * @brief Show/hide the showtype.
@@ -99,22 +99,7 @@ class ShowTypes {
      * @param severity Error severity
      * @return Severity converted to ShowTypes value
      */
-    static ShowTypes::ShowType SeverityToShowType(Severity::SeverityType severity);
-
-    /**
-     * @brief Convert ShowType to severity string
-     * @param type ShowType to convert
-     * @return ShowType converted to severity
-     */
-    static Severity::SeverityType 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);
+    static ShowTypes::ShowType SeverityToShowType(Severity severity);
 
     bool mVisible[ShowNone];
 };
diff --git a/gui/statsdialog.cpp b/gui/statsdialog.cpp
index 7b8db7ca66d..f16b6cba3b9 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-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
@@ -22,6 +22,8 @@
 #include "projectfile.h"
 #include "showtypes.h"
 
+#include <algorithm>
+
 #include "ui_statsdialog.h"
 
 #include <QApplication>
@@ -29,10 +31,12 @@
 #include <QDate>
 #include <QFileDialog>
 #include <QFileInfo>
+#include <QFont>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMimeData>
 #include <QPageSize>
+#include <QPlainTextEdit>
 #include <QPrinter>
 #include <QPushButton>
 #include <QStringList>
@@ -59,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
@@ -71,11 +71,14 @@ static const QString CPPCHECK("cppcheck");
 
 StatsDialog::StatsDialog(QWidget *parent)
     : QDialog(parent),
-    mUI(new Ui::StatsDialog),
-    mStatistics(nullptr)
+    mUI(new Ui::StatsDialog)
 {
     mUI->setupUi(this);
 
+    QFont font("courier");
+    font.setStyleHint(QFont::Monospace);
+    mUI->mCheckersReport->setFont(font);
+
     setWindowFlags(Qt::Window);
 
     connect(mUI->mCopyToClipboard, &QPushButton::pressed, this, &StatsDialog::copyToClipboard);
@@ -108,8 +111,7 @@ void StatsDialog::setProject(const ProjectFile* projectFile)
         }
         mUI->mLblHistoryFile->setText(tr("File: ") + (statsFile.isEmpty() ? tr("No cppcheck build dir") : statsFile));
         if (!statsFile.isEmpty()) {
-            QChartView *chartView;
-            chartView = createChart(statsFile, "cppcheck");
+            QChartView *chartView = createChart(statsFile, "cppcheck");
             mUI->mTabHistory->layout()->addWidget(chartView);
             if (projectFile->getClangAnalyzer()) {
                 chartView = createChart(statsFile, CLANG_ANALYZER);
@@ -143,7 +145,7 @@ void StatsDialog::setNumberOfFilesScanned(int num)
 void StatsDialog::setScanDuration(double seconds)
 {
     // Factor the duration into units (days/hours/minutes/seconds)
-    int secs = seconds;
+    int secs = static_cast<int>(seconds);
     const int days = secs / (24 * 60 * 60);
     secs -= days * (24 * 60 * 60);
     const int hours = secs / (60 * 60);
@@ -193,7 +195,7 @@ void StatsDialog::pdfExport()
                          .arg(tr("Information messages"))
                          .arg(mStatistics->getCount(CPPCHECK,ShowTypes::ShowInformation));
 
-    QString fileName = QFileDialog::getSaveFileName((QWidget*)nullptr, tr("Export PDF"), QString(), "*.pdf");
+    QString fileName = QFileDialog::getSaveFileName(nullptr, tr("Export PDF"), QString(), "*.pdf");
     if (QFileInfo(fileName).suffix().isEmpty()) {
         fileName.append(".pdf");
     }
@@ -358,7 +360,7 @@ void StatsDialog::copyToClipboard()
 
     const QString htmlSummary = htmlSettings + htmlPrevious + htmlStatistics;
 
-    QMimeData *mimeData = new QMimeData();
+    auto *mimeData = new QMimeData();
     mimeData->setText(textSummary);
     mimeData->setHtml(htmlSummary);
     clipboard->setMimeData(mimeData);
@@ -367,25 +369,27 @@ void StatsDialog::copyToClipboard()
 void StatsDialog::setStatistics(const CheckStatistics *stats)
 {
     mStatistics = stats;
-    mUI->mLblErrors->setText(QString("%1").arg(stats->getCount(CPPCHECK,ShowTypes::ShowErrors)));
-    mUI->mLblWarnings->setText(QString("%1").arg(stats->getCount(CPPCHECK,ShowTypes::ShowWarnings)));
-    mUI->mLblStyle->setText(QString("%1").arg(stats->getCount(CPPCHECK,ShowTypes::ShowStyle)));
-    mUI->mLblPortability->setText(QString("%1").arg(stats->getCount(CPPCHECK,ShowTypes::ShowPortability)));
-    mUI->mLblPerformance->setText(QString("%1").arg(stats->getCount(CPPCHECK,ShowTypes::ShowPerformance)));
-    mUI->mLblInformation->setText(QString("%1").arg(stats->getCount(CPPCHECK,ShowTypes::ShowInformation)));
+    mUI->mLblErrors->setText(QString::number(stats->getCount(CPPCHECK,ShowTypes::ShowErrors)));
+    mUI->mLblWarnings->setText(QString::number(stats->getCount(CPPCHECK,ShowTypes::ShowWarnings)));
+    mUI->mLblStyle->setText(QString::number(stats->getCount(CPPCHECK,ShowTypes::ShowStyle)));
+    mUI->mLblPortability->setText(QString::number(stats->getCount(CPPCHECK,ShowTypes::ShowPortability)));
+    mUI->mLblPerformance->setText(QString::number(stats->getCount(CPPCHECK,ShowTypes::ShowPerformance)));
+    mUI->mLblInformation->setText(QString::number(stats->getCount(CPPCHECK,ShowTypes::ShowInformation)));
+    mUI->mLblActiveCheckers->setText(QString::number(stats->getNumberOfActiveCheckers()));
+    mUI->mCheckersReport->setPlainText(stats->getCheckersReport());
 }
 
 #ifdef QT_CHARTS_LIB
 QChartView *createChart(const QString &statsFile, const QString &tool)
 {
-    QChart *chart = new QChart;
+    auto *chart = new QChart;
     chart->addSeries(numberOfReports(statsFile, tool + "-error"));
     chart->addSeries(numberOfReports(statsFile, tool + "-warning"));
     chart->addSeries(numberOfReports(statsFile, tool + "-style"));
     chart->addSeries(numberOfReports(statsFile, tool + "-performance"));
     chart->addSeries(numberOfReports(statsFile, tool + "-portability"));
 
-    QDateTimeAxis *axisX = new QDateTimeAxis;
+    auto *axisX = new QDateTimeAxis;
     axisX->setTitleText("Date");
     chart->addAxis(axisX, Qt::AlignBottom);
 
@@ -393,7 +397,7 @@ QChartView *createChart(const QString &statsFile, const QString &tool)
         s->attachAxis(axisX);
     }
 
-    QValueAxis *axisY = new QValueAxis;
+    auto *axisY = new QValueAxis;
     axisY->setLabelFormat("%i");
     axisY->setTitleText("Count");
     chart->addAxis(axisY, Qt::AlignLeft);
@@ -401,10 +405,10 @@ QChartView *createChart(const QString &statsFile, const QString &tool)
     qreal maxY = 0;
     for (QAbstractSeries *s : chart->series()) {
         s->attachAxis(axisY);
-        if (const QLineSeries *ls = dynamic_cast<const QLineSeries*>(s)) {
+        if (const auto *ls = dynamic_cast<const QLineSeries*>(s)) {
             for (QPointF p : ls->points()) {
-                if (p.y() > maxY)
-                    maxY = p.y();
+                // cppcheck-suppress useStlAlgorithm - this would reduce the readability of the code
+                maxY = std::max(p.y(), maxY);
             }
         }
     }
@@ -413,14 +417,14 @@ QChartView *createChart(const QString &statsFile, const QString &tool)
     //chart->createDefaultAxes();
     chart->setTitle(tool);
 
-    QChartView *chartView = new QChartView(chart);
+    auto *chartView = new QChartView(chart);
     chartView->setRenderHint(QPainter::Antialiasing);
     return chartView;
 }
 
 QLineSeries *numberOfReports(const QString &fileName, const QString &severity)
 {
-    QLineSeries *series = new QLineSeries();
+    auto *series = new QLineSeries();
     series->setName(severity);
     QFile f(fileName);
     if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
diff --git a/gui/statsdialog.h b/gui/statsdialog.h
index 1b7f41d0e06..2093e17389e 100644
--- a/gui/statsdialog.h
+++ b/gui/statsdialog.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -73,7 +73,7 @@ private slots:
     void pdfExport();
 private:
     Ui::StatsDialog *mUI;
-    const CheckStatistics *mStatistics;
+    const CheckStatistics* mStatistics{};
 };
 
 /// @}
diff --git a/gui/statsdialog.ui b/gui/statsdialog.ui
index 8147b8e7ec6..a749c51e676 100644
--- a/gui/statsdialog.ui
+++ b/gui/statsdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>502</width>
-    <height>274</height>
+    <width>500</width>
+    <height>414</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -247,114 +247,150 @@
       <attribute name="title">
        <string>Statistics</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout">
+      <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Errors:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="mLblErrors">
-           <property name="text">
-            <string notr="true">TextLabel</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Errors:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLabel" name="mLblErrors">
+         <property name="text">
+          <string notr="true">TextLabel</string>
+         </property>
+        </widget>
        </item>
        <item row="1" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Warnings:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="mLblWarnings">
-           <property name="text">
-            <string notr="true">TextLabel</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Warnings:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLabel" name="mLblWarnings">
+         <property name="text">
+          <string notr="true">TextLabel</string>
+         </property>
+        </widget>
        </item>
        <item row="2" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string>Stylistic warnings:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="mLblStyle">
-           <property name="text">
-            <string notr="true">TextLabel</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Stylistic warnings:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLabel" name="mLblStyle">
+         <property name="text">
+          <string notr="true">TextLabel</string>
+         </property>
+        </widget>
        </item>
        <item row="3" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <item>
-          <widget class="QLabel" name="label_6">
-           <property name="text">
-            <string>Portability warnings:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="mLblPortability">
-           <property name="text">
-            <string notr="true">TextLabel</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Portability warnings:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLabel" name="mLblPortability">
+         <property name="text">
+          <string notr="true">TextLabel</string>
+         </property>
+        </widget>
        </item>
        <item row="4" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="QLabel" name="label_4">
-           <property name="text">
-            <string>Performance issues:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="mLblPerformance">
-           <property name="text">
-            <string notr="true">TextLabel</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Performance issues:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLabel" name="mLblPerformance">
+         <property name="text">
+          <string notr="true">TextLabel</string>
+         </property>
+        </widget>
        </item>
        <item row="5" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
-         <item>
-          <widget class="QLabel" name="label_5">
-           <property name="text">
-            <string>Information messages:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="mLblInformation">
-           <property name="text">
-            <string notr="true">TextLabel</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Information messages:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QLabel" name="mLblInformation">
+         <property name="text">
+          <string notr="true">TextLabel</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Active checkers:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QLabel" name="mLblActiveCheckers">
+         <property name="text">
+          <string notr="true">TextLabel</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="mCheckersTab">
+      <attribute name="title">
+       <string>Checkers</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QPlainTextEdit" name="mCheckersReport">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="font">
+          <font>
+           <family>Courier 10 Pitch</family>
+          </font>
+         </property>
+         <property name="undoRedoEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
        </item>
       </layout>
      </widget>
diff --git a/gui/test/CMakeLists.txt b/gui/test/CMakeLists.txt
index ea868eb97e6..b2e63c08f86 100644
--- a/gui/test/CMakeLists.txt
+++ b/gui/test/CMakeLists.txt
@@ -1,6 +1,8 @@
+add_custom_target(gui-tests)
+
 add_subdirectory(cppchecklibrarydata)
 add_subdirectory(filelist)
 add_subdirectory(projectfile)
+add_subdirectory(resultstree)
 add_subdirectory(translationhandler)
-add_subdirectory(xmlreportv2)
-# TODO: add all tests to CTest
\ No newline at end of file
+add_subdirectory(xmlreportv2)
\ No newline at end of file
diff --git a/gui/test/common.pri b/gui/test/common.pri
deleted file mode 100644
index e6589d8ed09..00000000000
--- a/gui/test/common.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-QT += testlib
-
-INCLUDEPATH += $${PWD}/.. \
-    $${PWD}/../../lib
-
-contains(QMAKE_CC, gcc) {
-    QMAKE_CXXFLAGS += -std=c++11
-}
-
-contains(QMAKE_CXX, clang++) {
-    QMAKE_CXXFLAGS += -std=c++11
-}
diff --git a/gui/test/cppchecklibrarydata/CMakeLists.txt b/gui/test/cppchecklibrarydata/CMakeLists.txt
index cf29fafdf74..ea8f2b95097 100644
--- a/gui/test/cppchecklibrarydata/CMakeLists.txt
+++ b/gui/test/cppchecklibrarydata/CMakeLists.txt
@@ -8,15 +8,19 @@ add_executable(test-cppchecklibrarydata
         testcppchecklibrarydata.cpp
         ${CMAKE_SOURCE_DIR}/gui/cppchecklibrarydata.cpp
         )
-target_include_directories(test-cppchecklibrarydata PRIVATE ${CMAKE_SOURCE_DIR}/gui)
+target_include_directories(test-cppchecklibrarydata PRIVATE ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/gui)
 target_compile_definitions(test-cppchecklibrarydata PRIVATE SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
 target_link_libraries(test-cppchecklibrarydata ${QT_CORE_LIB} ${QT_TEST_LIB})
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # Q_UNUSED() in generated code
-    target_compile_options_safe(test-cppchecklibrarydata -Wno-extra-semi-stmt)
+    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()
 
 if (REGISTER_GUI_TESTS)
     add_test(NAME test-cppchecklibrarydata COMMAND $<TARGET_FILE:test-cppchecklibrarydata>)
-endif()
\ No newline at end of file
+endif()
+
+add_dependencies(gui-tests test-cppchecklibrarydata)
\ No newline at end of file
diff --git a/gui/test/cppchecklibrarydata/cppchecklibrarydata.pro b/gui/test/cppchecklibrarydata/cppchecklibrarydata.pro
deleted file mode 100644
index 787e95f8a59..00000000000
--- a/gui/test/cppchecklibrarydata/cppchecklibrarydata.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-TEMPLATE = app
-TARGET = test-cppchecklibrarydata
-DEPENDPATH += .
-INCLUDEPATH += .
-OBJECTS_DIR = ../../temp
-MOC_DIR = ../../temp
-
-QT -= gui
-QT += core
-QT += testlib
-
-include(../common.pri)
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-SOURCES += testcppchecklibrarydata.cpp \
-    ../../cppchecklibrarydata.cpp
-
-HEADERS += testcppchecklibrarydata.h \
-    ../../cppchecklibrarydata.h \
-
-RESOURCES += \
-    resources.qrc
diff --git a/gui/test/cppchecklibrarydata/files/memory_resource_valid.cfg b/gui/test/cppchecklibrarydata/files/memory_resource_valid.cfg
index fe0e9329096..3f59249c9c1 100644
--- a/gui/test/cppchecklibrarydata/files/memory_resource_valid.cfg
+++ b/gui/test/cppchecklibrarydata/files/memory_resource_valid.cfg
@@ -6,6 +6,7 @@
 	<realloc init="false" buffer-size="malloc:2">realloc</realloc> 
 	<alloc arg="2">UuidToString</alloc>
 	<dealloc arg="3">HeapFree</dealloc>
+	<alloc init="false" no-fail="true" buffer-size="malloc">g_malloc</alloc>
   </memory>
 
   <resource>
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
index aadb090d1e7..c747f1b5093 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
@@ -23,10 +23,12 @@
 #include <QFile>
 #include <QIODevice>
 #include <QList>
-#include <QPair>
 #include <QStringList>
 #include <QTextStream>
 #include <QtTest>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtLogging>
+#endif
 
 const QString TestCppcheckLibraryData::TempCfgFile = "./tmp.cfg";
 
@@ -285,7 +287,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
     // Do size and content checks against swapped data.
     QCOMPARE(libraryData.memoryresource.size(), 2);
     QCOMPARE(libraryData.memoryresource[0].type, QString("memory"));
-    QCOMPARE(libraryData.memoryresource[0].alloc.size(), 4);
+    QCOMPARE(libraryData.memoryresource[0].alloc.size(), 5);
     QCOMPARE(libraryData.memoryresource[0].dealloc.size(), 1);
     QCOMPARE(libraryData.memoryresource[0].use.size(), 0);
 
@@ -293,6 +295,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
     QCOMPARE(libraryData.memoryresource[0].alloc[0].bufferSize, QString("malloc"));
     QCOMPARE(libraryData.memoryresource[0].alloc[0].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[0].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[0].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[0].arg, -1);
     QCOMPARE(libraryData.memoryresource[0].alloc[0].reallocArg, -1);
 
@@ -300,6 +303,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
     QCOMPARE(libraryData.memoryresource[0].alloc[1].bufferSize, QString("calloc"));
     QCOMPARE(libraryData.memoryresource[0].alloc[1].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[1].init, true);
+    QCOMPARE(libraryData.memoryresource[0].alloc[1].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[1].arg, -1);
     QCOMPARE(libraryData.memoryresource[0].alloc[1].reallocArg, -1);
 
@@ -307,6 +311,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
     QCOMPARE(libraryData.memoryresource[0].alloc[2].bufferSize, QString("malloc:2"));
     QCOMPARE(libraryData.memoryresource[0].alloc[2].isRealloc, true);
     QCOMPARE(libraryData.memoryresource[0].alloc[2].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[2].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[2].arg, -1);
     QCOMPARE(libraryData.memoryresource[0].alloc[2].reallocArg, -1);
 
@@ -314,9 +319,18 @@ void TestCppcheckLibraryData::memoryResourceValid()
     QCOMPARE(libraryData.memoryresource[0].alloc[3].bufferSize.isEmpty(), true);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[3].noFail, false);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].arg, 2);
     QCOMPARE(libraryData.memoryresource[0].alloc[3].reallocArg, -1);
 
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].name, QString("g_malloc"));
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].bufferSize, QString("malloc"));
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].isRealloc, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].init, false);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].noFail, true);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].arg, -1);
+    QCOMPARE(libraryData.memoryresource[0].alloc[4].reallocArg, -1);
+
     QCOMPARE(libraryData.memoryresource[0].dealloc[0].name, QString("HeapFree"));
     QCOMPARE(libraryData.memoryresource[0].dealloc[0].arg, 3);
 
@@ -329,6 +343,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
     QCOMPARE(libraryData.memoryresource[1].alloc[0].bufferSize.isEmpty(), true);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].isRealloc, false);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].init, true);
+    QCOMPARE(libraryData.memoryresource[1].alloc[0].noFail, false);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].arg, 1);
     QCOMPARE(libraryData.memoryresource[1].alloc[0].reallocArg, -1);
 
@@ -363,6 +378,7 @@ void TestCppcheckLibraryData::memoryResourceValid()
             QCOMPARE(lhs.alloc[num].bufferSize, rhs.alloc[num].bufferSize);
             QCOMPARE(lhs.alloc[num].isRealloc, rhs.alloc[num].isRealloc);
             QCOMPARE(lhs.alloc[num].init, rhs.alloc[num].init);
+            QCOMPARE(lhs.alloc[num].noFail, rhs.alloc[num].noFail);
             QCOMPARE(lhs.alloc[num].arg, rhs.alloc[num].arg);
             QCOMPARE(lhs.alloc[num].reallocArg, rhs.alloc[num].reallocArg);
         }
@@ -620,7 +636,7 @@ void TestCppcheckLibraryData::validateAllCfg()
 {
     const QDir dir(QString(SRCDIR) + "/../../../cfg/");
     const QStringList files = dir.entryList(QStringList() << "*.cfg",QDir::Files);
-    QVERIFY(files.size() != 0);
+    QVERIFY(!files.empty());
     bool error = false;
     for (const QString& f : files) {
         loadCfgFile(dir.absolutePath() + "/" + f, fileLibraryData, result);
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
index 079436f5509..625ad4046a9 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.h
@@ -1,4 +1,4 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
  * Copyright (C) 2007-2021 Cppcheck team.
  *
@@ -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 5b3413a1493..4af40a1c876 100644
--- a/gui/test/filelist/CMakeLists.txt
+++ b/gui/test/filelist/CMakeLists.txt
@@ -5,20 +5,20 @@ 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 ${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")
-    # Q_UNUSED() in generated code
-    target_compile_options_safe(test-filelist -Wno-extra-semi-stmt)
+    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()
 
 if (REGISTER_GUI_TESTS)
     add_test(NAME test-filelist COMMAND $<TARGET_FILE:test-filelist>)
-endif()
\ No newline at end of file
+endif()
+
+add_dependencies(gui-tests test-filelist)
diff --git a/gui/test/filelist/filelist.pro b/gui/test/filelist/filelist.pro
deleted file mode 100644
index 110746a5ae0..00000000000
--- a/gui/test/filelist/filelist.pro
+++ /dev/null
@@ -1,29 +0,0 @@
-TEMPLATE = app
-TARGET = test-filelist
-DEPENDPATH += .
-INCLUDEPATH += . ../../../externals/simplecpp
-OBJECTS_DIR = ../../temp
-MOC_DIR = ../../temp
-
-QT -= gui
-QT += core
-QT += testlib
-
-include(../common.pri)
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-# tests
-SOURCES += testfilelist.cpp \
-    ../../filelist.cpp \
-    ../../../lib/pathmatch.cpp \
-    ../../../lib/path.cpp \
-    ../../../lib/utils.cpp \
-    ../../../externals/simplecpp/simplecpp.cpp
-
-HEADERS += testfilelist.h \
-    ../../filelist.h \
-    ../../../lib/pathmatch.h \
-    ../../../lib/path.h \
-    ../../../lib/utils.h \
-    ../../../externals/simplecpp/simplecpp.h
diff --git a/gui/test/filelist/testfilelist.h b/gui/test/filelist/testfilelist.h
index 1089499932a..17a33d86e3e 100644
--- a/gui/test/filelist/testfilelist.h
+++ b/gui/test/filelist/testfilelist.h
@@ -1,4 +1,4 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
  * Copyright (C) 2007-2021 Cppcheck team.
  *
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestFileList : public QObject {
     Q_OBJECT
diff --git a/gui/test/projectfile/CMakeLists.txt b/gui/test/projectfile/CMakeLists.txt
index 1e87916f6d4..2d9c254ec5f 100644
--- a/gui/test/projectfile/CMakeLists.txt
+++ b/gui/test/projectfile/CMakeLists.txt
@@ -11,10 +11,14 @@ 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")
-    # Q_UNUSED() in generated code
-    target_compile_options_safe(test-projectfile -Wno-extra-semi-stmt)
+    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()
 
 if (REGISTER_GUI_TESTS)
     add_test(NAME test-projectfile COMMAND $<TARGET_FILE:test-projectfile>)
-endif()
\ No newline at end of file
+endif()
+
+add_dependencies(gui-tests test-projectfile)
\ No newline at end of file
diff --git a/gui/test/projectfile/projectfile.pro b/gui/test/projectfile/projectfile.pro
deleted file mode 100644
index 68555272d6c..00000000000
--- a/gui/test/projectfile/projectfile.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-TEMPLATE = app
-TARGET = test-projectfile
-DEPENDPATH += .
-INCLUDEPATH += . ../../../externals/simplecpp ../../../externals/tinyxml2 ../../../externals/picojson
-OBJECTS_DIR = ../../temp
-MOC_DIR = ../../temp
-
-QT -= gui
-QT += core
-QT += testlib
-
-include(../common.pri)
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-# tests
-SOURCES += testprojectfile.cpp \
-    ../../projectfile.cpp
-
-HEADERS += testprojectfile.h \
-    ../../projectfile.h \
-    ../../../externals/picojson/picojson.h
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index 95cbe9404bd..988d62e8bce 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -18,19 +18,17 @@
 
 #include "testprojectfile.h"
 
-#include "importproject.h"
 #include "library.h"
 #include "platform.h"
 #include "projectfile.h"
 #include "settings.h"
+#include "suppressions.h"
 
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
+#include <QFile>
+#include <QIODevice>
 #include <QList>
 #include <QStringList>
+#include <QTemporaryDir>
 #include <QtTest>
 
 // Mock...
@@ -39,13 +37,11 @@ const char Settings::SafeChecks::XmlClasses[] = "class-public";
 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), maxTemplateRecursion(100) {}
-cppcheck::Platform::Platform() {}
-Library::Library() {}
-ImportProject::ImportProject() {}
-bool ImportProject::sourceFileExists(const std::string & /*file*/) {
-    return true;
-}
+Settings::Settings() : maxCtuDepth(10) {}
+Platform::Platform() = default;
+Library::Library() = default;
+Library::~Library() = default;
+struct Library::LibraryData {};
 
 void TestProjectFile::loadInexisting() const
 {
@@ -121,4 +117,69 @@ void TestProjectFile::loadSimpleNoroot() const
     QCOMPARE(defines[0], QString("FOO"));
 }
 
+void TestProjectFile::getAddonFilePath() const
+{
+    QTemporaryDir tempdir;
+    QVERIFY(tempdir.isValid());
+    const QString filepath(tempdir.path() + "/addon.py");
+
+    QFile file(filepath);
+    QVERIFY(file.open(QIODevice::WriteOnly | QIODevice::Text));
+    file.close();
+
+    // Relative path to addon
+    QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), "addon"), filepath);
+    QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), "not exist"), QString());
+
+    // Absolute path to addon
+    QCOMPARE(ProjectFile::getAddonFilePath("/not/exist", filepath), filepath);
+    QCOMPARE(ProjectFile::getAddonFilePath(tempdir.path(), filepath), filepath);
+}
+
+void TestProjectFile::getInlineSuppressionDefaultValue() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/123.cppcheck");
+    QCOMPARE(projectFile.getInlineSuppression(), true);
+}
+
+void TestProjectFile::getInlineSuppression() const
+{
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/123.cppcheck");
+    projectFile.setInlineSuppression(false);
+    QCOMPARE(projectFile.getInlineSuppression(), false);
+}
+
+void TestProjectFile::getCheckingSuppressionsRelative() const
+{
+    const SuppressionList::Suppression suppression("*", "externals/*");
+    const QList<SuppressionList::Suppression> suppressions{suppression};
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/123.cppcheck");
+    projectFile.setSuppressions(suppressions);
+    QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "/some/path/externals/*");
+}
+
+void TestProjectFile::getCheckingSuppressionsAbsolute() const
+{
+    const SuppressionList::Suppression suppression("*", "/some/path/1.h");
+    const QList<SuppressionList::Suppression> suppressions{suppression};
+    ProjectFile projectFile;
+    projectFile.setFilename("/other/123.cppcheck");
+    projectFile.setSuppressions(suppressions);
+    QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "/some/path/1.h");
+}
+
+void TestProjectFile::getCheckingSuppressionsStar() const
+{
+    const SuppressionList::Suppression suppression("*", "*.cpp");
+    const QList<SuppressionList::Suppression> suppressions{suppression};
+    ProjectFile projectFile;
+    projectFile.setFilename("/some/path/123.cppcheck");
+    projectFile.setSuppressions(suppressions);
+    QCOMPARE(projectFile.getCheckingSuppressions()[0].fileName, "*.cpp");
+}
+
 QTEST_MAIN(TestProjectFile)
+
diff --git a/gui/test/projectfile/testprojectfile.h b/gui/test/projectfile/testprojectfile.h
index b0bc7d96969..8f3e54c3008 100644
--- a/gui/test/projectfile/testprojectfile.h
+++ b/gui/test/projectfile/testprojectfile.h
@@ -1,4 +1,4 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
  * Copyright (C) 2007-2021 Cppcheck team.
  *
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestProjectFile : public QObject {
     Q_OBJECT
@@ -27,4 +26,13 @@ private slots:
     void loadSimple() const;
     void loadSimpleWithIgnore() const;
     void loadSimpleNoroot() const;
+
+    void getAddonFilePath() const;
+
+    void getInlineSuppressionDefaultValue() const;
+    void getInlineSuppression() const;
+
+    void getCheckingSuppressionsRelative() const;
+    void getCheckingSuppressionsAbsolute() const;
+    void getCheckingSuppressionsStar() const;
 };
diff --git a/gui/test/readme.txt b/gui/test/readme.txt
deleted file mode 100644
index b02dcbcab87..00000000000
--- a/gui/test/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-GUI tests
-===========================
-
-As the GUI uses Qt framework, the GUI tests also use Qt's Testlib. This is
-totally different test framework than lib/cli is using. By principle each
-testcase is compiled as an own runnable binary.
-
-Compiling
----------
-
-To compile all the tests run in root directory of tests:
- - qmake ; make
-
-You can also (re)compile single test by CD:ing to the directory where test
-(source) resides and running:
- - qmake ; make
-
-Running
--------
-
-As each test is compiled as single executable binary you can run the test just
-by running the executable.
-
-You can get from
- http://bitbucket.org/kimmov/testrun
-a script which runs all the tests and collects the results.
-
diff --git a/gui/test/resultstree/CMakeLists.txt b/gui/test/resultstree/CMakeLists.txt
new file mode 100644
index 00000000000..1bf8a02ffb1
--- /dev/null
+++ b/gui/test/resultstree/CMakeLists.txt
@@ -0,0 +1,55 @@
+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/projectfile.h
+        ${CMAKE_SOURCE_DIR}/gui/threadhandler.h
+        ${CMAKE_SOURCE_DIR}/gui/threadresult.h
+)
+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/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)
+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 (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    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)
+    # TODO: might crash - see #13223
+    #add_test(NAME test-resultstree COMMAND $<TARGET_FILE:test-resultstree> -platform offscreen)
+endif()
+
+add_dependencies(gui-tests test-resultstree)
diff --git a/gui/test/resultstree/testresultstree.cpp b/gui/test/resultstree/testresultstree.cpp
new file mode 100644
index 00000000000..ac3ba4ff78c
--- /dev/null
+++ b/gui/test/resultstree/testresultstree.cpp
@@ -0,0 +1,396 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2021 Cppcheck team.
+ *
+ * This 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 "testresultstree.h"
+
+#include "resultstree.h"
+
+// headers that declare mocked functions/variables
+#include "applicationlist.h"
+#include "common.h"
+#include "filesettings.h"
+#include "projectfile.h"
+#include "threadhandler.h"
+#include "threadresult.h"
+
+#include "application.h"
+#include "checkers.h"
+#include "erroritem.h"
+#include "errorlogger.h"
+#include "errortypes.h"
+#include "report.h"
+#include "resultitem.h"
+#include "showtypes.h"
+#include "suppressions.h"
+#include "xmlreport.h"
+
+#include <cstddef>
+#include <string>
+#include <utility>
+
+#include <QList>
+#include <QModelIndex>
+#include <QString>
+#include <QtTest>
+
+class TestReport : public Report {
+public:
+    explicit TestReport(QString format) : Report(QString()), format(std::move(format)) {}
+    void writeHeader() override {
+        output.clear();
+    }
+    void writeFooter() override {}
+    void writeError(const ErrorItem &error) override {
+        QString line = format;
+        line.replace("{id}", error.errorId);
+        line.replace("{classification}", error.classification);
+        line.replace("{guideline}", error.guideline);
+        output += (output.isEmpty() ? "" : "\n") + line;
+    }
+    QString format;
+    QString output;
+};
+
+// Mock GUI...
+ProjectFile::ProjectFile(QObject *parent) : QObject(parent) {}
+ProjectFile *ProjectFile::mActiveProject;
+void ProjectFile::addSuppression(const SuppressionList::Suppression & /*unused*/) {}
+QString ProjectFile::getWarningTags(std::size_t /*unused*/) const {
+    return QString();
+}
+void ProjectFile::setWarningTags(std::size_t /*unused*/, const QString& /*unused*/) {}
+bool ProjectFile::write(const QString & /*unused*/) {
+    return true;
+}
+ApplicationList::ApplicationList(QObject *parent) : QObject(parent) {}
+ApplicationList::~ApplicationList() = default;
+int ApplicationList::getApplicationCount() const {
+    return 0;
+}
+ThreadHandler::ThreadHandler(QObject *parent) : QObject(parent) {}
+ThreadHandler::~ThreadHandler() = default;
+bool ThreadHandler::isChecking() const {
+    return false;
+}
+void ThreadHandler::stop() {
+    throw 1;
+}
+void ThreadHandler::threadDone() {
+    throw 1;
+}
+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;
+}
+QString XmlReport::unquoteMessage(const QString &message) {
+    return message;
+}
+XmlReport::XmlReport(const QString& filename) : Report(filename) {}
+void ThreadResult::fileChecked(const QString & /*unused*/) {
+    throw 1;
+}
+void ThreadResult::reportOut(const std::string & /*unused*/, Color /*unused*/) {
+    throw 1;
+}
+void ThreadResult::reportErr(const ErrorMessage & /*unused*/) {
+    throw 1;
+}
+
+// Test...
+
+void TestResultsTree::test1() const
+{
+    // #12772 : GUI: information messages are shown even though information tool button is deselected
+    ResultsTree tree(nullptr);
+    tree.showResults(ShowTypes::ShowType::ShowInformation, false);
+    ErrorItem errorItem;
+    errorItem.errorPath << QErrorPathItem();
+    errorItem.severity = Severity::information;
+    tree.addErrorItem(errorItem);
+    QCOMPARE(tree.isRowHidden(0,QModelIndex()), true);  // Added item is hidden
+    tree.showResults(ShowTypes::ShowType::ShowInformation, true);
+    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}");
+
+    int msgCount = 0;
+    auto createErrorItem = [&msgCount](const Severity severity, const QString& errorId) -> ErrorItem {
+        ++msgCount;
+        ErrorItem errorItem;
+        errorItem.errorPath << QErrorPathItem(ErrorMessage::FileLocation("file1.c", msgCount, 1));
+        errorItem.severity = severity;
+        errorItem.errorId = errorId;
+        errorItem.summary = "test summary " + QString::number(msgCount);
+        return errorItem;
+    };
+
+    // normal report with 2 errors
+    ResultsTree tree(nullptr);
+    tree.updateSettings(false, false, false, false, false);
+    tree.addErrorItem(createErrorItem(Severity::style, "id1"));
+    tree.addErrorItem(createErrorItem(Severity::style, "unusedVariable")); // Misra C 2.8
+    tree.saveResults(&report);
+    QCOMPARE(report.output, "id1,,\nunusedVariable,,");
+
+    // switch to Misra C report and check that "id1" is not shown
+    tree.setReportType(ReportType::misraC2012);
+    tree.saveResults(&report);
+    QCOMPARE(report.output, "unusedVariable,Advisory,2.8");
+
+    // add "missingReturn" and check that it is added properly
+    tree.addErrorItem(createErrorItem(Severity::warning, "missingReturn")); // Misra C 17.4
+    tree.saveResults(&report);
+    QCOMPARE(report.output,
+             "unusedVariable,Advisory,2.8\n"
+             "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
+{
+    TestReport report("{id},{classification},{guideline}");
+
+    int msgCount = 0;
+    auto createErrorItem = [&msgCount](const Severity severity, const QString& errorId) -> ErrorItem {
+        ++msgCount;
+        ErrorItem errorItem;
+        errorItem.errorPath << QErrorPathItem(ErrorMessage::FileLocation("file1.c", msgCount, 1));
+        errorItem.severity = severity;
+        errorItem.errorId = errorId;
+        errorItem.summary = "test summary " + QString::number(msgCount);
+        return errorItem;
+    };
+
+    // normal report with 2 errors
+    ResultsTree tree(nullptr);
+    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
new file mode 100644
index 00000000000..8604dc81c6b
--- /dev/null
+++ b/gui/test/resultstree/testresultstree.h
@@ -0,0 +1,33 @@
+/* -*- C++ -*-
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2021 Cppcheck team.
+ *
+ * This 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 <QObject>
+
+class TestResultsTree : public QObject {
+    Q_OBJECT
+
+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/test.pro b/gui/test/test.pro
deleted file mode 100644
index 7f75e3711f9..00000000000
--- a/gui/test/test.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-#lessThan(QT_MAJOR_VERSION, 5): error(requires >= Qt 5 (You used: $$QT_VERSION))
-
-CONFIG  += ordered
-TEMPLATE = subdirs
-
-SUBDIRS = \
-    filelist \
-    projectfile \
-    xmlreportv2
diff --git a/gui/test/translationhandler/CMakeLists.txt b/gui/test/translationhandler/CMakeLists.txt
index 35cbf3c0d14..f70b5759148 100644
--- a/gui/test/translationhandler/CMakeLists.txt
+++ b/gui/test/translationhandler/CMakeLists.txt
@@ -11,11 +11,14 @@ 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")
-    # Q_UNUSED() in generated code
-    target_compile_options_safe(test-translationhandler -Wno-extra-semi-stmt)
+    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()
 
 if (REGISTER_GUI_TESTS)
-    # TODO: requires X session
-    #add_test(NAME test-translationhandler COMMAND $<TARGET_FILE:test-translationhandler>)
-endif()
\ No newline at end of file
+    add_test(NAME test-translationhandler COMMAND $<TARGET_FILE:test-translationhandler> -platform offscreen)
+endif()
+
+add_dependencies(gui-tests test-translationhandler)
\ No newline at end of file
diff --git a/gui/test/translationhandler/testtranslationhandler.cpp b/gui/test/translationhandler/testtranslationhandler.cpp
index f6a925c6b1a..7c093e3edfd 100644
--- a/gui/test/translationhandler/testtranslationhandler.cpp
+++ b/gui/test/translationhandler/testtranslationhandler.cpp
@@ -24,7 +24,7 @@
 #include <QStringList>
 #include <QtTest>
 
-static const QStringList getTranslationNames(const TranslationHandler& handler)
+static QStringList getTranslationNames(const TranslationHandler& handler)
 {
     QStringList names;
     for (const TranslationInfo& translation : handler.getTranslations()) {
@@ -36,7 +36,7 @@ static const QStringList getTranslationNames(const TranslationHandler& handler)
 void TestTranslationHandler::construct() const
 {
     TranslationHandler handler;
-    QCOMPARE(getTranslationNames(handler).size(), 13);  // 12 translations + english
+    QCOMPARE(getTranslationNames(handler).size(), 15);  // 14 translations + english
     QCOMPARE(handler.getCurrentLanguage(), QString("en"));
 }
 
diff --git a/gui/test/translationhandler/testtranslationhandler.h b/gui/test/translationhandler/testtranslationhandler.h
index 45bd1ae5186..249bbaa5ddd 100644
--- a/gui/test/translationhandler/testtranslationhandler.h
+++ b/gui/test/translationhandler/testtranslationhandler.h
@@ -1,4 +1,4 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
  * Copyright (C) 2007-2021 Cppcheck team.
  *
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestTranslationHandler : public QObject {
     Q_OBJECT
diff --git a/gui/test/translationhandler/translationhandler.pro b/gui/test/translationhandler/translationhandler.pro
deleted file mode 100644
index bc4468effa7..00000000000
--- a/gui/test/translationhandler/translationhandler.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-TEMPLATE = app
-TARGET = test-translationhandler
-DEPENDPATH += .
-INCLUDEPATH += .
-OBJECTS_DIR = ../../temp
-MOC_DIR = ../../temp
-
-QT -= gui
-QT += core
-QT += widgets # TODO: get rid of this - causes X server dependency
-QT += testlib
-
-include(../common.pri)
-
-# tests
-SOURCES += testtranslationhandler.cpp \
-    ../../translationhandler.cpp \
-    ../../common.cpp
-
-HEADERS += testtranslationhandler.h \
-    ../../translationhandler.h \
-    ../../common.h
diff --git a/gui/test/xmlreportv2/CMakeLists.txt b/gui/test/xmlreportv2/CMakeLists.txt
index cea8a4a3841..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,20 +9,18 @@ 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)
+target_link_libraries(test-xmlreportv2 ${QT_CORE_LIB} ${QT_TEST_LIB} cppcheck-core)
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    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()
 
 if (REGISTER_GUI_TESTS)
     add_test(NAME test-xmlreportv2 COMMAND $<TARGET_FILE:test-xmlreportv2>)
 endif()
+
+add_dependencies(gui-tests test-xmlreportv2)
diff --git a/gui/test/xmlreportv2/testxmlreportv2.cpp b/gui/test/xmlreportv2/testxmlreportv2.cpp
index 25b822718f4..cede5842de0 100644
--- a/gui/test/xmlreportv2/testxmlreportv2.cpp
+++ b/gui/test/xmlreportv2/testxmlreportv2.cpp
@@ -27,7 +27,7 @@
 void TestXmlReportV2::readXml() const
 {
     const QString filepath(QString(SRCDIR) + "/../data/xmlfiles/xmlreport_v2.xml");
-    XmlReportV2 report(filepath);
+    XmlReportV2 report(filepath, QString());
     QVERIFY(report.open());
     QList<ErrorItem> errors = report.read();
     QCOMPARE(errors.size(), 6);
diff --git a/gui/test/xmlreportv2/testxmlreportv2.h b/gui/test/xmlreportv2/testxmlreportv2.h
index d5d0f659f93..f4de863bff0 100644
--- a/gui/test/xmlreportv2/testxmlreportv2.h
+++ b/gui/test/xmlreportv2/testxmlreportv2.h
@@ -1,4 +1,4 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
  * Copyright (C) 2007-2021 Cppcheck team.
  *
@@ -17,7 +17,6 @@
  */
 
 #include <QObject>
-#include <QString>
 
 class TestXmlReportV2 : public QObject {
     Q_OBJECT
diff --git a/gui/test/xmlreportv2/xmlreportv2.pro b/gui/test/xmlreportv2/xmlreportv2.pro
deleted file mode 100644
index 5802dadb345..00000000000
--- a/gui/test/xmlreportv2/xmlreportv2.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-TEMPLATE = app
-TARGET = test-xmlreportv2
-DEPENDPATH += .
-INCLUDEPATH += . ../../../externals/simplecpp
-OBJECTS_DIR = ../../temp
-MOC_DIR = ../../temp
-
-QT -= gui
-QT += core
-QT += testlib
-
-include(../common.pri)
-include(../../../lib/lib.pri)
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-# tests
-SOURCES += testxmlreportv2.cpp \
-    ../../erroritem.cpp \
-    ../../report.cpp \
-    ../../xmlreport.cpp \
-    ../../xmlreportv2.cpp
-
-HEADERS += testxmlreportv2.h \
-    ../../erroritem.h \
-    ../../report.h \
-    ../../xmlreport.cpp \
-    ../../xmlreportv2.h
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
index fddb3348022..ad4d0e2a61d 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-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
@@ -20,9 +20,11 @@
 
 #include "checkthread.h"
 #include "common.h"
+#include "filesettings.h"
 #include "resultsview.h"
 #include "settings.h"
 
+#include <algorithm>
 #include <string>
 #include <unordered_set>
 #include <utility>
@@ -34,16 +36,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),
-    mScanDuration(0),
-    mRunningThreadCount(0),
-    mAnalyseWholeProgram(false)
-
-{
-    setThreadCount(1);
-}
+    QObject(parent)
+{}
 
 ThreadHandler::~ThreadHandler()
 {
@@ -55,14 +54,15 @@ void ThreadHandler::clearFiles()
     mLastFiles.clear();
     mResults.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)
@@ -78,14 +78,22 @@ 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::check(const Settings &settings)
+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) {
         qDebug() << "Can't start checking if there's no files to check or if check is in progress.";
@@ -93,26 +101,26 @@ void ThreadHandler::check(const Settings &settings)
         return;
     }
 
-    setThreadCount(settings.jobs);
+    mCheckSettings = settings;
+    mCheckSuppressions = supprs;
 
-    mRunningThreadCount = mThreads.size();
+    createThreads(mCheckSettings.jobs);
 
-    if (mResults.getFileCount() < mRunningThreadCount) {
-        mRunningThreadCount = mResults.getFileCount();
-    }
+    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]->check(settings);
+        setupCheckThread(*mThreads[i]);
+        mThreads[i]->start();
     }
 
     // Date and time when checking starts..
@@ -125,14 +133,12 @@ void ThreadHandler::check(const Settings &settings)
 
 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;
     }
 
@@ -142,9 +148,9 @@ void ThreadHandler::setThreadCount(const int count)
     for (int i = mThreads.size(); i < count; i++) {
         mThreads << new CheckThread(mResults);
         connect(mThreads.last(), &CheckThread::done,
-                this, &ThreadHandler::threadDone);
+                this, &ThreadHandler::threadDone, Qt::QueuedConnection);
         connect(mThreads.last(), &CheckThread::fileChecked,
-                &mResults, &ThreadResult::fileChecked);
+                &mResults, &ThreadResult::fileChecked, Qt::QueuedConnection);
     }
 }
 
@@ -152,7 +158,10 @@ void ThreadHandler::setThreadCount(const int count)
 void ThreadHandler::removeThreads()
 {
     for (CheckThread* thread : mThreads) {
-        thread->terminate();
+        if (thread->isRunning()) {
+            thread->stop();
+            thread->wait();
+        }
         disconnect(thread, &CheckThread::done,
                    this, &ThreadHandler::threadDone);
         disconnect(thread, &CheckThread::fileChecked,
@@ -161,18 +170,23 @@ void ThreadHandler::removeThreads()
     }
 
     mThreads.clear();
-    mAnalyseWholeProgram = false;
 }
 
 void ThreadHandler::threadDone()
 {
-    if (mRunningThreadCount == 1 && mAnalyseWholeProgram) {
-        mThreads[0]->analyseWholeProgram(mLastFiles);
+    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();
 
@@ -183,6 +197,9 @@ void ThreadHandler::threadDone()
             mLastCheckTime = mCheckStartTime;
             mCheckStartTime = QDateTime();
         }
+
+        mCheckAddonsAndTools.clear();
+        mCheckSuppressions.reset();
     }
 }
 
@@ -190,12 +207,13 @@ void ThreadHandler::stop()
 {
     mCheckStartTime = QDateTime();
     mAnalyseWholeProgram = false;
+    mCtuInfo.clear();
     for (CheckThread* thread : mThreads) {
         thread->stop();
     }
 }
 
-void ThreadHandler::initialize(ResultsView *view)
+void ThreadHandler::initialize(const ResultsView *view)
 {
     connect(&mResults, &ThreadResult::progress,
             view, &ResultsView::progress);
@@ -212,7 +230,7 @@ void ThreadHandler::initialize(ResultsView *view)
 
 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
@@ -222,7 +240,7 @@ void ThreadHandler::saveSettings(QSettings &settings) const
 
 bool ThreadHandler::hasPreviousFiles() const
 {
-    return !mLastFiles.isEmpty();
+    return !mLastFiles.empty();
 }
 
 int ThreadHandler::getPreviousFilesCount() const
@@ -235,7 +253,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;
@@ -243,11 +261,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;
 }
 
diff --git a/gui/threadhandler.h b/gui/threadhandler.h
index 93d30893d2a..cc578bd5643 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-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
@@ -20,10 +20,14 @@
 #ifndef THREADHANDLER_H
 #define THREADHANDLER_H
 
+#include "settings.h"
 #include "suppressions.h"
 #include "threadresult.h"
 
+#include <list>
+#include <memory>
 #include <set>
+#include <string>
 
 #include <QDateTime>
 #include <QElapsedTimer>
@@ -35,9 +39,9 @@
 class ResultsView;
 class CheckThread;
 class QSettings;
-class Settings;
 class ImportProject;
 class ErrorItem;
+class FileWithDetails;
 
 /// @addtogroup GUI
 /// @{
@@ -53,18 +57,12 @@ 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(const int count);
-
     /**
      * @brief Initialize the threads (connect all signals to resultsview's slots)
      *
      * @param view View to show error results
      */
-    void initialize(ResultsView *view);
+    void initialize(const ResultsView *view);
 
     /**
      * @brief Load settings
@@ -82,8 +80,8 @@ class ThreadHandler : public QObject {
         mAddonsAndTools = addonsAndTools;
     }
 
-    void setSuppressions(const QList<Suppressions::Suppression> &s) {
-        mSuppressions = s;
+    void setSuppressions(const QList<SuppressionList::Suppression> &s) {
+        mSuppressionsUI = s;
     }
 
     void setClangIncludePaths(const QStringList &s) {
@@ -101,7 +99,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
@@ -114,8 +112,9 @@ class ThreadHandler : public QObject {
      * @brief Start the threads to check the files
      *
      * @param settings Settings for checking
+     * @param supprs Suppressions for checking
      */
-    void check(const Settings &settings);
+    void check(const Settings &settings, const std::shared_ptr<Suppressions>& supprs);
 
     /**
      * @brief Set files to check
@@ -129,7 +128,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?
@@ -163,7 +162,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
@@ -210,7 +209,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;
@@ -230,7 +229,13 @@ protected slots:
      * @brief The previous scan duration in milliseconds.
      *
      */
-    int mScanDuration;
+    int mScanDuration{};
+
+    /**
+     * @brief Create checker threads
+     * @param count The number of threads to spawn
+     */
+    void createThreads(int count);
 
     /**
      * @brief Function to delete all threads
@@ -238,6 +243,12 @@ protected slots:
      */
     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
      *
@@ -254,13 +265,26 @@ protected slots:
      * @brief The amount of threads currently running
      *
      */
-    int mRunningThreadCount;
+    int mRunningThreadCount{};
 
-    bool mAnalyseWholeProgram;
+    /**
+     * @brief A whole program check is queued by check()
+     */
+    bool mAnalyseWholeProgram{};
+    std::string mCtuInfo;
 
     QStringList mAddonsAndTools;
-    QList<Suppressions::Suppression> mSuppressions;
+    QList<SuppressionList::Suppression> mSuppressionsUI;
     QStringList mClangIncludePaths;
+
+    /// @{
+    /**
+     * @brief Settings specific to the current analysis
+     */
+    QStringList mCheckAddonsAndTools;
+    Settings mCheckSettings;
+    std::shared_ptr<Suppressions> mCheckSuppressions;
+    /// @}
 private:
 
     /**
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
index f32da9b1c74..ea858c92e4a 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-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
@@ -22,21 +22,12 @@
 #include "erroritem.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "importproject.h"
 
 #include <numeric>
+#include <utility>
 
 #include <QFile>
-#include <QMutexLocker>
-
-ThreadResult::ThreadResult() : QObject(), ErrorLogger(), mMaxProgress(0), mProgress(0), mFilesChecked(0), mTotalFiles(0)
-{
-    //ctor
-}
-
-ThreadResult::~ThreadResult()
-{
-    //dtor
-}
 
 void ThreadResult::reportOut(const std::string &outmsg, Color /*c*/)
 {
@@ -45,7 +36,7 @@ void ThreadResult::reportOut(const std::string &outmsg, Color /*c*/)
 
 void ThreadResult::fileChecked(const QString &file)
 {
-    QMutexLocker locker(&mutex);
+    std::lock_guard<std::mutex> locker(mutex);
 
     mProgress += QFile(file).size();
     mFilesChecked++;
@@ -60,7 +51,7 @@ void ThreadResult::fileChecked(const QString &file)
 
 void ThreadResult::reportErr(const ErrorMessage &msg)
 {
-    QMutexLocker locker(&mutex);
+    std::lock_guard<std::mutex> locker(mutex);
     const ErrorItem item(msg);
     if (msg.severity != Severity::debug)
         emit error(item);
@@ -68,70 +59,75 @@ void ThreadResult::reportErr(const ErrorMessage &msg)
         emit debugError(item);
 }
 
-QString ThreadResult::getNextFile()
+void ThreadResult::getNextFile(const FileWithDetails*& file)
 {
-    QMutexLocker locker(&mutex);
-    if (mFiles.isEmpty()) {
-        return QString();
+    std::lock_guard<std::mutex> locker(mutex);
+    file = nullptr;
+    if (mItNextFile == mFiles.cend()) {
+        return;
     }
-
-    return mFiles.takeFirst();
+    file = &(*mItNextFile);
+    ++mItNextFile;
 }
 
-ImportProject::FileSettings ThreadResult::getNextFileSettings()
+void ThreadResult::getNextFileSettings(const FileSettings*& fs)
 {
-    QMutexLocker locker(&mutex);
-    if (mFileSettings.empty()) {
-        return ImportProject::FileSettings();
+    std::lock_guard<std::mutex> locker(mutex);
+    fs = nullptr;
+    if (mItNextFileSettings == mFileSettings.cend()) {
+        return;
     }
-    const ImportProject::FileSettings fs = mFileSettings.front();
-    mFileSettings.pop_front();
-    return fs;
+    fs = &(*mItNextFileSettings);
+    ++mItNextFileSettings;
 }
 
-void ThreadResult::setFiles(const QStringList &files)
+void ThreadResult::setFiles(std::list<FileWithDetails> files)
 {
-    QMutexLocker locker(&mutex);
-    mFiles = files;
+    std::lock_guard<std::mutex> locker(mutex);
+    mTotalFiles = files.size();
+    mFiles = std::move(files);
+    mItNextFile = mFiles.cbegin();
     mProgress = 0;
     mFilesChecked = 0;
-    mTotalFiles = files.size();
 
     // 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;
 }
 
 void ThreadResult::setProject(const ImportProject &prj)
 {
-    QMutexLocker locker(&mutex);
+    std::lock_guard<std::mutex> locker(mutex);
     mFiles.clear();
+    mItNextFile = mFiles.cbegin();
     mFileSettings = prj.fileSettings;
+    mItNextFileSettings = mFileSettings.cbegin();
     mProgress = 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 ImportProject::FileSettings& fs) {
-        return v + QFile(QString::fromStdString(fs.filename)).size();
+    mMaxProgress = std::accumulate(prj.fileSettings.begin(), prj.fileSettings.end(), quint64{ 0 }, [](quint64 v, const FileSettings& fs) {
+        return v + QFile(QString::fromStdString(fs.filename())).size();
     });
 }
 
 void ThreadResult::clearFiles()
 {
-    QMutexLocker locker(&mutex);
+    std::lock_guard<std::mutex> locker(mutex);
     mFiles.clear();
     mFileSettings.clear();
+    mItNextFileSettings = mFileSettings.cend();
     mFilesChecked = 0;
     mTotalFiles = 0;
 }
 
 int ThreadResult::getFileCount() const
 {
-    QMutexLocker locker(&mutex);
+    std::lock_guard<std::mutex> locker(mutex);
     return mFiles.size() + mFileSettings.size();
 }
diff --git a/gui/threadresult.h b/gui/threadresult.h
index 9a3c5895375..dc7b5c0372a 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-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
@@ -22,18 +22,18 @@
 
 #include "color.h"
 #include "errorlogger.h"
-#include "importproject.h"
+#include "filesettings.h"
 
 #include <list>
+#include <mutex>
 #include <string>
 
-#include <QMutex>
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QtGlobal>
 
 class ErrorItem;
+class ImportProject;
 
 /// @addtogroup GUI
 /// @{
@@ -45,22 +45,20 @@ class ErrorItem;
 class ThreadResult : public QObject, public ErrorLogger {
     Q_OBJECT
 public:
-    ThreadResult();
-    ~ThreadResult() override;
+    ThreadResult() = default;
 
     /**
      * @brief Get next unprocessed file
-     * @return File path
      */
-    QString getNextFile();
+    void getNextFile(const FileWithDetails*& file);
 
-    ImportProject::FileSettings getNextFileSettings();
+    void getNextFileSettings(const FileSettings*& fs);
 
     /**
      * @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);
 
@@ -81,6 +79,10 @@ class ThreadResult : public QObject, public ErrorLogger {
      */
     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;
+    }
 
 public slots:
 
@@ -128,39 +130,41 @@ public slots:
      * @brief Mutex
      *
      */
-    mutable QMutex mutex;
+    mutable std::mutex mutex;
 
     /**
      * @brief List of files to check
      *
      */
-    QStringList mFiles;
+    std::list<FileWithDetails> mFiles;
+    std::list<FileWithDetails>::const_iterator mItNextFile{mFiles.cbegin()};
 
-    std::list<ImportProject::FileSettings> mFileSettings;
+    std::list<FileSettings> mFileSettings;
+    std::list<FileSettings>::const_iterator mItNextFileSettings{mFileSettings.cbegin()};
 
     /**
      * @brief Max progress
      *
      */
-    quint64 mMaxProgress;
+    quint64 mMaxProgress{};
 
     /**
      * @brief Current progress
      *
      */
-    quint64 mProgress;
+    quint64 mProgress{};
 
     /**
      * @brief Current number of files checked
      *
      */
-    unsigned long mFilesChecked;
+    unsigned long mFilesChecked{};
 
     /**
      * @brief Total number of files
      *
      */
-    unsigned long mTotalFiles;
+    unsigned long mTotalFiles{};
 };
 /// @}
 #endif // THREADRESULT_H
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
index 0a0aefd0763..d8160525856 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-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
@@ -28,11 +28,15 @@
 #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"
-static UNUSED void unused()
+UNUSED static void unused()
 {
     Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "OK"))
     Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Cancel"))
@@ -42,8 +46,7 @@ static UNUSED void unused()
 
 TranslationHandler::TranslationHandler(QObject *parent) :
     QObject(parent),
-    mCurrentLanguage("en"),
-    mTranslator(nullptr)
+    mCurrentLanguage("en")
 {
     // Add our available languages
     // Keep this list sorted
@@ -56,6 +59,7 @@ TranslationHandler::TranslationHandler(QObject *parent) :
     addTranslation("German", "cppcheck_de");
     addTranslation("Italian", "cppcheck_it");
     addTranslation("Japanese", "cppcheck_ja");
+    addTranslation("Georgian", "cppcheck_ka");
     addTranslation("Korean", "cppcheck_ko");
     addTranslation("Russian", "cppcheck_ru");
     addTranslation("Serbian", "cppcheck_sr");
@@ -63,9 +67,6 @@ TranslationHandler::TranslationHandler(QObject *parent) :
     addTranslation("Swedish", "cppcheck_sv");
 }
 
-TranslationHandler::~TranslationHandler()
-{}
-
 bool TranslationHandler::setLanguage(const QString &code)
 {
     bool failure = false;
@@ -146,7 +147,7 @@ bool TranslationHandler::setLanguage(const QString &code)
     return true;
 }
 
-QString TranslationHandler::getCurrentLanguage() const
+const QString& TranslationHandler::getCurrentLanguage() const
 {
     return mCurrentLanguage;
 }
@@ -180,12 +181,8 @@ void TranslationHandler::addTranslation(const char *name, const char *filename)
 
 int TranslationHandler::getLanguageIndexByCode(const QString &code) const
 {
-    int index = -1;
-    for (int i = 0; i < mTranslations.size(); i++) {
-        if (mTranslations[i].mCode == code || mTranslations[i].mCode == code.left(2)) {
-            index = i;
-            break;
-        }
-    }
-    return index;
+    auto it = std::find_if(mTranslations.cbegin(), mTranslations.cend(), [&](const TranslationInfo& ti) {
+        return ti.mCode == code || ti.mCode == code.left(2);
+    });
+    return it == mTranslations.cend() ? -1 : static_cast<int>(std::distance(mTranslations.cbegin(), it));
 }
diff --git a/gui/translationhandler.h b/gui/translationhandler.h
index 66effc5ed40..0b2988f583e 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-2023 Cppcheck team.
+ * 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
@@ -63,14 +63,13 @@ class TranslationHandler : QObject {
     Q_OBJECT
 public:
     explicit TranslationHandler(QObject *parent = nullptr);
-    ~TranslationHandler() override;
 
     /**
      * @brief Get a list of available translations.
      * @return List of available translations.
      *
      */
-    QList<TranslationInfo> getTranslations() const {
+    const QList<TranslationInfo>& getTranslations() const {
         return mTranslations;
     }
 
@@ -87,7 +86,7 @@ class TranslationHandler : QObject {
      * @return ISO 639 language code for current translation.
      *
      */
-    QString getCurrentLanguage() const;
+    const QString& getCurrentLanguage() const;
 
     /**
      * @brief Get translation suggestion for the system.
@@ -135,7 +134,7 @@ class TranslationHandler : QObject {
      * @brief Translator class instance.
      *
      */
-    QTranslator *mTranslator;
+    QTranslator* mTranslator{};
 };
 
 /// @}
diff --git a/gui/txtreport.cpp b/gui/txtreport.cpp
index 1be3944341c..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
@@ -29,9 +29,6 @@ TxtReport::TxtReport(const QString &filename) :
     Report(filename)
 {}
 
-TxtReport::~TxtReport()
-{}
-
 bool TxtReport::create()
 {
     if (Report::create()) {
@@ -80,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/txtreport.h b/gui/txtreport.h
index 02395cc4484..35c6a5a5bfa 100644
--- a/gui/txtreport.h
+++ b/gui/txtreport.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -25,8 +25,6 @@
 #include <QObject>
 #include <QTextStream>
 
-class ErrorItem;
-
 /// @addtogroup GUI
 /// @{
 
@@ -40,7 +38,6 @@ class TxtReport : public Report {
 
 public:
     explicit TxtReport(const QString &filename);
-    ~TxtReport() override;
 
     /**
      * @brief Create the report (file).
diff --git a/gui/xmlreport.cpp b/gui/xmlreport.cpp
index 0a6234bf123..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,12 +25,8 @@
 #include <QXmlStreamAttributes>
 #include <QXmlStreamReader>
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-#include <QStringRef>
-#endif
-
-static const char ResultElementName[] = "results";
-static const char VersionAttribute[] = "version";
+static constexpr char ResultElementName[] = "results";
+static constexpr char VersionAttribute[] = "version";
 
 XmlReport::XmlReport(const QString &filename) :
     Report(filename)
diff --git a/gui/xmlreport.h b/gui/xmlreport.h
index e275749300b..2483b1b7471 100644
--- a/gui/xmlreport.h
+++ b/gui/xmlreport.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
diff --git a/gui/xmlreportv2.cpp b/gui/xmlreportv2.cpp
index e6b199398f2..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-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
@@ -21,17 +21,19 @@
 #include "cppcheck.h"
 #include "erroritem.h"
 #include "report.h"
+#include "settings.h"
 #include "xmlreport.h"
 
+#include <utility>
+
 #include <QDebug>
 #include <QDir>
 #include <QFile>
 #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";
@@ -46,6 +48,7 @@ static const QString TagsAttribute = "tag";
 static const QString FilenameAttribute = "file";
 static const QString IncludedFromFilenameAttribute = "file0";
 static const QString InconclusiveAttribute = "inconclusive";
+static const QString RemarkAttribute = "remark";
 static const QString InfoAttribute = "info";
 static const QString LineAttribute = "line";
 static const QString ColumnAttribute = "column";
@@ -53,10 +56,12 @@ static const QString IdAttribute = "id";
 static const QString SeverityAttribute = "severity";
 static const QString MsgAttribute = "msg";
 static const QString VersionAttribute = "version";
+static const QString ProductNameAttribute = "product-name";
 static const QString VerboseAttribute = "verbose";
 
-XmlReportV2::XmlReportV2(const QString &filename) :
+XmlReportV2::XmlReportV2(const QString &filename, QString productName) :
     XmlReport(filename),
+    mProductName(std::move(productName)),
     mXmlReader(nullptr),
     mXmlWriter(nullptr)
 {}
@@ -87,12 +92,19 @@ bool XmlReportV2::open()
 
 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);
     mXmlWriter->writeStartDocument();
     mXmlWriter->writeStartElement(ResultElementName);
     mXmlWriter->writeAttribute(VersionAttribute, QString::number(2));
     mXmlWriter->writeStartElement(CppcheckElementName);
-    mXmlWriter->writeAttribute(VersionAttribute, QString(CppCheck::version()));
+    if (!name.isEmpty())
+        mXmlWriter->writeAttribute(ProductNameAttribute, name);
+    mXmlWriter->writeAttribute(VersionAttribute, version);
     mXmlWriter->writeEndElement();
     mXmlWriter->writeStartElement(ErrorsElementName);
 }
@@ -126,6 +138,8 @@ void XmlReportV2::writeError(const ErrorItem &error)
     mXmlWriter->writeAttribute(VerboseAttribute, message);
     if (error.inconclusive)
         mXmlWriter->writeAttribute(InconclusiveAttribute, "true");
+    if (!error.remark.isEmpty())
+        mXmlWriter->writeAttribute(RemarkAttribute, error.remark);
     if (error.cwe > 0)
         mXmlWriter->writeAttribute(CWEAttribute, QString::number(error.cwe));
     if (error.hash > 0)
@@ -196,7 +210,7 @@ QList<ErrorItem> XmlReportV2::read()
     return errors;
 }
 
-ErrorItem XmlReportV2::readError(QXmlStreamReader *reader)
+ErrorItem XmlReportV2::readError(const QXmlStreamReader *reader)
 {
     /*
        Error example from the core program in xml
@@ -220,6 +234,8 @@ ErrorItem XmlReportV2::readError(QXmlStreamReader *reader)
         item.message = XmlReport::unquoteMessage(message);
         if (attribs.hasAttribute(QString(), InconclusiveAttribute))
             item.inconclusive = true;
+        if (attribs.hasAttribute(QString(), RemarkAttribute))
+            item.remark = attribs.value(QString(), RemarkAttribute).toString();
         if (attribs.hasAttribute(QString(), CWEAttribute))
             item.cwe = attribs.value(QString(), CWEAttribute).toInt();
         if (attribs.hasAttribute(QString(), HashAttribute))
diff --git a/gui/xmlreportv2.h b/gui/xmlreportv2.h
index e09e64692c9..6f5834b3417 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-2023 Cppcheck team.
+ * 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
@@ -39,7 +39,7 @@ class QXmlStreamWriter;
  */
 class XmlReportV2 : public XmlReport {
 public:
-    explicit XmlReportV2(const QString &filename);
+    explicit XmlReportV2(const QString &filename, QString productName);
     ~XmlReportV2() override;
 
     /**
@@ -79,9 +79,12 @@ class XmlReportV2 : public XmlReport {
      * @brief Read and parse error item from XML stream.
      * @param reader XML stream reader to use.
      */
-    ErrorItem readError(QXmlStreamReader *reader);
+    ErrorItem readError(const QXmlStreamReader *reader);
 
 private:
+    /** Product name read from cppcheck.cfg */
+    const QString mProductName;
+
     /**
      * @brief XML stream reader for reading the report in XML format.
      */
diff --git a/htmlreport/README.txt b/htmlreport/README.txt
index 88a84a1637f..38c035e27f2 100644
--- a/htmlreport/README.txt
+++ b/htmlreport/README.txt
@@ -3,7 +3,7 @@ cppcheck-htmlreport
 This is a little utility to generate a html report of a XML file produced by
 cppcheck.
 
-The utility is implemented in Python (2.7+) and requires the pygments module
+The utility is implemented in Python and requires the pygments module
 to generate syntax highlighted source code.
 If you are using a Debian based Linux system, the pygments package can be 
 installed by following command:
diff --git a/htmlreport/check.sh b/htmlreport/check.sh
deleted file mode 100755
index a4515ec0690..00000000000
--- a/htmlreport/check.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash -ex
-
-# Command for checking HTML syntax with HTML Tidy, see http://www.html-tidy.org/
-tidy_version=$(tidy --version)
-
-if [[ "$tidy_version" == *"5.6.0"* ]] ;then
-    # newer tidy (5.6.0) command, if using this it is not necessary to ignore warnings:
-    tidy_cmd='tidy -o /dev/null -eq --drop-empty-elements no'
-else
-    # older tidy from 2009 (Ubuntu 16.04 Xenial comes with this old version):
-    tidy_cmd='tidy -o /dev/null -eq'
-fi
-
-function validate_html {
-    if [ ! -f "$1" ]; then
-        echo "File $1 does not exist!"
-	      exit 1
-    fi
-    if ! ${tidy_cmd} "$1"; then
-        echo "HTML validation failed!"
-        exit 1
-    fi
-}
-
-if [ -z "$PYTHON" ]; then
-    PYTHON=python
-fi
-
-REPORT_DIR=$(mktemp -d -t htmlreport-XXXXXXXXXX)
-INDEX_HTML="$REPORT_DIR/index.html"
-STATS_HTML="$REPORT_DIR/stats.html"
-GUI_TEST_XML="$REPORT_DIR/gui_test.xml"
-ERRORLIST_XML="$REPORT_DIR/errorlist.xml"
-UNMATCHEDSUPPR_XML="$REPORT_DIR/unmatchedSuppr.xml"
-
-$PYTHON cppcheck-htmlreport --file ../gui/test/data/xmlfiles/xmlreport_v2.xml --title "xml2 test" --report-dir "$REPORT_DIR" --source-dir ../test/
-echo -e "\n"
-# Check HTML syntax
-validate_html "$INDEX_HTML"
-validate_html "$STATS_HTML"
-
-
-../cppcheck ../samples --enable=all --inconclusive --xml-version=2 2> "$GUI_TEST_XML"
-xmllint --noout "$GUI_TEST_XML"
-$PYTHON cppcheck-htmlreport --file "$GUI_TEST_XML" --title "xml2 + inconclusive test" --report-dir "$REPORT_DIR"
-echo ""
-# Check HTML syntax
-validate_html "$INDEX_HTML"
-validate_html "$STATS_HTML"
-
-
-../cppcheck ../samples --enable=all --inconclusive --verbose --xml-version=2 2> "$GUI_TEST_XML"
-xmllint --noout "$GUI_TEST_XML"
-$PYTHON cppcheck-htmlreport --file "$GUI_TEST_XML" --title "xml2 + inconclusive + verbose test" --report-dir "$REPORT_DIR"
-echo -e "\n"
-# Check HTML syntax
-validate_html "$INDEX_HTML"
-validate_html "$STATS_HTML"
-
-
-../cppcheck --errorlist --inconclusive --xml-version=2 > "$ERRORLIST_XML"
-xmllint --noout "$ERRORLIST_XML"
-$PYTHON cppcheck-htmlreport --file "$ERRORLIST_XML" --title "errorlist" --report-dir "$REPORT_DIR"
-# Check HTML syntax
-validate_html "$INDEX_HTML"
-validate_html "$STATS_HTML"
-
-
-../cppcheck ../samples/memleak/good.c ../samples/resourceLeak/good.c  --xml-version=2 --enable=information --suppressions-list=test_suppressions.txt --xml 2> "$UNMATCHEDSUPPR_XML"
-xmllint --noout "$UNMATCHEDSUPPR_XML"
-$PYTHON cppcheck-htmlreport --file "$UNMATCHEDSUPPR_XML" --title "unmatched Suppressions" --report-dir="$REPORT_DIR"
-grep "unmatchedSuppression<.*>information<.*>Unmatched suppression: variableScope*<" "$INDEX_HTML"
-grep ">unmatchedSuppression</.*>information<.*>Unmatched suppression: uninitstring<" "$INDEX_HTML"
-grep "notexisting" "$INDEX_HTML"
-grep ">unmatchedSuppression<.*>information<.*>Unmatched suppression: \*<" "$INDEX_HTML"
-# Check HTML syntax
-validate_html "$INDEX_HTML"
-validate_html "$STATS_HTML"
-
-rm -rf "$REPORT_DIR"
diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport
index ce5956c1e1b..5044443a0a9 100755
--- a/htmlreport/cppcheck-htmlreport
+++ b/htmlreport/cppcheck-htmlreport
@@ -3,14 +3,15 @@
 from __future__ import unicode_literals
 
 from datetime import date
+import argparse
 import io
 import locale
 import operator
-import optparse
 import os
 import re
 import sys
 import subprocess
+import time
 
 from collections import Counter
 from pygments import highlight
@@ -138,7 +139,7 @@ label.checkBtn > input {
 
 table.summaryTable td { padding: 0 5px 0 5px; }
 
-.statHeader, .severityHeader {
+.statHeader, .severityHeader, .classificationHeader {
     font-weight: bold;
 }
 
@@ -200,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;
 }
 """
@@ -277,7 +278,18 @@ 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);
 
@@ -339,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>
@@ -371,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>
@@ -382,8 +445,8 @@ HTML_FOOTER = """
 HTML_ERROR = "<span class=\"error2\">&lt;--- %s</span>\n"
 HTML_INCONCLUSIVE = "<span class=\"inconclusive2\">&lt;--- %s</span>\n"
 
-HTML_EXPANDABLE_ERROR = "<div class=\"verbose expandable\"><span class=\"error2\">&lt;--- %s <span class=\"marker\">[+]</span></span><div class=\"content\">%s</div></div>\n"""
-HTML_EXPANDABLE_INCONCLUSIVE = "<div class=\"verbose expandable\"><span class=\"inconclusive2\">&lt;--- %s <span class=\"marker\">[+]</span></span><div class=\"content\">%s</div></div>\n"""
+HTML_EXPANDABLE_ERROR = "<div class=\"verbose expandable\"><span class=\"error2\">&lt;--- %s <span class=\"marker\">[+]</span></span><div class=\"content\">%s</div></div>\n"
+HTML_EXPANDABLE_INCONCLUSIVE = "<div class=\"verbose expandable\"><span class=\"inconclusive2\">&lt;--- %s <span class=\"marker\">[+]</span></span><div class=\"content\">%s</div></div>\n"
 
 # escape() and unescape() takes care of &, < and >.
 html_escape_table = {
@@ -398,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="text" oninput="filterFile(this.value)"/></label>'
-    ,'\n        <label class="severityHeader">Filter: <input type="text" 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:
@@ -422,8 +492,8 @@ def git_blame(errors, path, file, blame_options):
     full_path = os.path.join(path, file)
     path, filename = os.path.split(full_path)
 
-    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:
@@ -433,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 []
@@ -446,7 +514,7 @@ def git_blame(errors, path, file, blame_options):
     blame_data = []
     line_from = 0
     line_to = 0
-    blame_info = dict()
+    blame_info = {}
 
     for line_str in result.splitlines():
         field, _, value = line_str.partition(' ')
@@ -469,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, 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("https://") 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
@@ -484,6 +569,9 @@ def tr_str(td_th, line, id, cwe, severity, message, author, author_mail, date, a
         message_attribute = ''
     ret += '<%s%s>%s</%s>' % (td_th, message_attribute, html_escape(message), td_th)
 
+    if timestamp:
+        ret += '<%s>%s</%s>' % (td_th, timestamp, td_th)
+
     for field in  add_author:
         if field == 'name':
             ret += '<%s>%s</%s>' % (td_th, html_escape(author), td_th)
@@ -555,6 +643,8 @@ class CppCheckHandler(XmlContentHandler):
         self.errors = []
         self.version = '1'
         self.versionCppcheck = ''
+        self.timestamp = ''
+        self.report_type = False
 
     def startElement(self, name, attributes):
         if name == 'results':
@@ -568,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)),
@@ -578,6 +671,9 @@ class CppCheckHandler(XmlContentHandler):
             }],
             'id': attributes['id'],
             'severity': attributes['severity'],
+            'classification': att_class,
+            'guideline': att_guide,
+            'timestamp': self.timestamp,
             'msg': attributes['msg']
         })
 
@@ -585,12 +681,19 @@ 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')
             }
@@ -615,54 +718,61 @@ class CppCheckHandler(XmlContentHandler):
                 'line': line,
                 'info': attributes.get('info')
             })
-
-if __name__ == '__main__':
+def main() -> None:
     # Configure all the options this little utility is using.
-    parser = optparse.OptionParser()
-    parser.add_option('--title', dest='title',
-                      help='The title of the project.',
-                      default='[project name]')
-    parser.add_option('--file', dest='file', action="append",
-                      help='The cppcheck xml output file to read defects '
-                           'from. You can combine results from several '
-                           'xml reports i.e. "--file file1.xml --file file2.xml ..". '
-                           'Default is reading from stdin.')
-    parser.add_option('--report-dir', dest='report_dir',
-                      help='The directory where the HTML report content is '
-                           'written.')
-    parser.add_option('--source-dir', dest='source_dir',
-                      help='Base directory where source code files can be '
-                           'found.')
-    parser.add_option('--add-author-information', dest='add_author_information',
-                      help='Blame information to include. '
-                           'Adds specified author information. '
-                           'Specify as comma-separated list of either "name", "email", "date" or "n","e","d". '
-                           'Default: "n,e,d"')
-    parser.add_option('--source-encoding', dest='source_encoding',
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--title', dest='title',
+                        help='The title of the project.',
+                        default='[project name]')
+    parser.add_argument('--file', dest='file', action="append",
+                        help='The cppcheck xml output file to read defects '
+                             'from. You can combine results from several '
+                             'xml reports i.e. "--file file1.xml --file file2.xml ..". '
+                             'Default is reading from stdin.')
+    parser.add_argument('--checkers-report-file', dest='checkers_report',
+                      help='The cppcheck checkers report file as produced '
+                           'with the "--checkers-report" option of cppcheck.')
+    parser.add_argument('--report-dir', dest='report_dir',
+                         help='The directory where the HTML report content is '
+                              'written.')
+    parser.add_argument('--source-dir', dest='source_dir',
+                         help='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>/')
+    parser.add_argument('--add-author-information', dest='add_author_information',
+                        help='Blame information to include. '
+                             'Adds specified author information. '
+                             'Specify as comma-separated list of either "name", "email", "date" or "n","e","d". '
+                             'Default: "n,e,d"')
+    parser.add_argument('--source-encoding', dest='source_encoding',
                       help='Encoding of source code.', default='utf-8')
-    parser.add_option('--blame-options', dest='blame_options',
-                      help='[-w, -M] blame options which you can use to get author and author mail  '
-                           '-w --> not including white spaces and returns original author of the line  '
-                           '-M --> not including moving of lines and returns original author of the line')
+    parser.add_argument('--blame-options', dest='blame_options',
+                        help='[-w, -M] blame options which you can use to get author and author mail  '
+                             '-w --> not including white spaces and returns original author of the line  '
+                             '-M --> not including moving of lines and returns original author of the line')
 
     # Parse options and make sure that we have an output directory set.
-    options, args = parser.parse_args()
+    options = parser.parse_args()
 
     try:
         sys.argv[1]
     except IndexError:  # no arguments give, print --help
         parser.print_help()
-        quit()
+        sys.exit(0)
 
     if not options.report_dir:
         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("https://") 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(',')]
@@ -690,6 +800,13 @@ if __name__ == '__main__':
     try:
         contentHandler = CppCheckHandler()
         for fname in options.file or [sys.stdin]:
+            if options.file is not None:
+                t = os.path.getmtime(fname)
+            else:
+                t = time.time()
+            t_s = time.ctime(t)
+            if t_s is not None:
+                contentHandler.timestamp = t_s
             xml_parse(fname, contentHandler)
     except (XmlParseException, ValueError) as msg:
         print('Failed to parse cppcheck xml file: %s' % msg)
@@ -704,9 +821,14 @@ if __name__ == '__main__':
     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.
@@ -733,6 +855,8 @@ if __name__ == '__main__':
                     if location.get('info'):
                         newError['msg'] = location['info']
                         newError['severity'] = 'information'
+                        newError['classification'] = ''
+                        newError['guideline'] = ''
                         del newError['verbose']
 
                     errors.append(newError)
@@ -744,14 +868,17 @@ if __name__ == '__main__':
         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:
                 content = input_file.read()
         except IOError:
-            if error['id'] == 'unmatchedSuppression':
-                continue  # file not found, bail out
-            else:
+            if error['id'] != 'unmatchedSuppression':
                 sys.stderr.write("ERROR: Source file '%s' not found.\n" %
                                  source_filename)
             continue
@@ -788,8 +915,8 @@ if __name__ == '__main__':
                     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:
@@ -816,7 +943,12 @@ if __name__ == '__main__':
         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
 
@@ -856,12 +988,20 @@ if __name__ == '__main__':
         output_file.write('\n           <tr><td></td><td>' + str(stats_count) + '</td><td>total</td></tr>')
         output_file.write('\n       </table>')
         output_file.write('\n       <p><a href="stats.html">Statistics</a></p>')
+        if options.checkers_report:
+            output_file.write('\n       <p><a href="checkers.html">Checkers</a></p>')
         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', '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('*')
@@ -870,10 +1010,10 @@ if __name__ == '__main__':
             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 []
@@ -887,23 +1027,31 @@ if __name__ == '__main__':
                 except KeyError:
                     pass
 
+                cwe_url = ""
                 try:
                     if error['cwe']:
                         cwe_url = "<a href=\"https://cwe.mitre.org/data/definitions/" + error['cwe'] + ".html\">" + error['cwe'] + "</a>"
                 except KeyError:
-                    cwe_url = ""
+                    pass
 
                 if error['severity'] in ['error', 'warning']:
                     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"],
+                    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))
@@ -916,7 +1064,6 @@ if __name__ == '__main__':
         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)
 
@@ -983,4 +1130,28 @@ if __name__ == '__main__':
 
         stats_file.write(HTML_FOOTER % contentHandler.versionCppcheck)
 
+    if options.checkers_report:
+        print("Creating checkers.html (checkers report)\n")
+
+        with io.open(os.path.join(options.report_dir, 'checkers.html'), 'w') as checkers_file:
+
+            checkers_file.write(HTML_HEAD % (options.title, '', options.title, ': Checkers'))
+            checkers_file.write(HTML_HEAD_END)
+
+            checkers_file.write(HTML_MENU.replace('id="menu"', 'id="menu_index"', 1).replace("Defects:", "Back to summary", 1) % (''))
+            checkers_file.write(HTML_MENU_END.replace("content", "content_index", 1))
+
+            with io.open(options.checkers_report, 'r', encoding=options.source_encoding) as checkers_report:
+                content = checkers_report.read()
+
+                checkers_file.write("<pre>\n")
+                checkers_file.write(html_escape(content))
+                checkers_file.write("</pre>\n")
+
+            checkers_file.write(HTML_FOOTER % contentHandler.versionCppcheck)
+
     print("\nOpen '" + options.report_dir + "/index.html' to see the results.")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/htmlreport/cppcheck_htmlreport/__init__.py b/htmlreport/cppcheck_htmlreport/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htmlreport/setup.py b/htmlreport/setup.py
index ac790fbebc1..3e049181ce6 100755
--- a/htmlreport/setup.py
+++ b/htmlreport/setup.py
@@ -1,21 +1,31 @@
 #!/usr/bin/env python3
+import shutil
+from setuptools import find_packages, setup
 
-from setuptools import setup
-
-with open('README.txt') as f:
+with open("README.txt") as f:
     readme = f.read()
 
+shutil.copy("cppcheck-htmlreport", "cppcheck_htmlreport/run.py")
+
 setup(
-    name="cppcheck",
-    description='Python script to parse the XML (version 2) output of ' +
-                'cppcheck and generate an HTML report using Pygments for syntax ' +
-                'highlighting.',
+    name="cppcheck-htmlreport",
+    description=(
+        "Python script to parse the XML (version 2) output of "
+        "cppcheck and generate an HTML report using Pygments for syntax "
+        "highlighting."
+    ),
     long_description=readme,
-    author='Henrik Nilsson',
-    url='https://github.com/danmar/cppcheck',
-    license='GPL',
-    scripts=[
-        "cppcheck-htmlreport",
-    ],
-    install_requires=['Pygments']
+    author="Cppcheck Team",
+    url="https://github.com/danmar/cppcheck",
+    license="GPL",
+    packages=find_packages(exclude=("tests", "docs")),
+    use_scm_version={"root": ".."},
+    entry_points={
+        "console_scripts": [
+            "cppcheck-htmlreport = cppcheck_htmlreport:run.main",
+        ]
+    },
+    install_requires=["Pygments"],
+    # Required by setuptools-scm 7.0 for Python 3.7+
+    setup_requires=["setuptools>=60", "setuptools-scm>=7.0"],
 )
diff --git a/htmlreport/test_suppressions.txt b/htmlreport/test_suppressions.txt
deleted file mode 100644
index ec3130c099f..00000000000
--- a/htmlreport/test_suppressions.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-variableScope:../samples/memleak/good.c
-*:../samples/resourceLeak/notexisting.c*
-uninitstring:*
diff --git a/htmlreport/tox.ini b/htmlreport/tox.ini
deleted file mode 100644
index 502ca70c110..00000000000
--- a/htmlreport/tox.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[tox]
-envlist=py26,py27,py32,pypy
-
-[testenv]
-commands=
-    python test_htmlreport.py
-deps=pygments
-
-[testenv:py26]
-deps=
-    unittest2
-    pygments
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 741e6c2adfc..d7a94de352e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,16 +1,21 @@
 file(GLOB_RECURSE hdrs "*.h")
 file(GLOB_RECURSE srcs "*.cpp")
 
+# move the slowest files to the top
+set(srcs_slow "${CMAKE_CURRENT_SOURCE_DIR}/valueflow.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/tokenize.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/symboldatabase.cpp")
+list(REMOVE_ITEM srcs ${srcs_slow})
+list(INSERT srcs 0 ${srcs_slow})
+
 function(build_src output filename)
     get_filename_component(file ${filename} NAME)
     set(outfile ${CMAKE_CURRENT_BINARY_DIR}/build/mc_${file})
     set(${output} ${${output}} ${outfile} PARENT_SCOPE)
-    if (USE_MATCHCOMPILER STREQUAL "Verify")
+    if (USE_MATCHCOMPILER_OPT STREQUAL "Verify")
         set(verify_option "--verify")
     endif()
     add_custom_command(
         OUTPUT ${outfile}
-        COMMAND ${PYTHON_EXECUTABLE} "${PROJECT_SOURCE_DIR}/tools/matchcompiler.py" 
+        COMMAND ${Python_EXECUTABLE} "${PROJECT_SOURCE_DIR}/tools/matchcompiler.py"
                 --read-dir="${CMAKE_CURRENT_SOURCE_DIR}" 
                 --prefix="mc_" 
                 --line 
@@ -32,40 +37,28 @@ 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_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/)
-if(USE_BUNDLED_TINYXML2)
-    target_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_include_directories(cppcheck-core PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
-target_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)
     target_precompile_headers(cppcheck-core PRIVATE precompiled.h)
 endif()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # -Wfloat-equal is generated by picojson.h
-    if (NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
-        set_source_files_properties(mc_cppcheck.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(mc_importproject.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(mc_settings.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-    else()
-        set_source_files_properties(cppcheck.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(importproject.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(settings.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-    endif()
-endif()
diff --git a/lib/addoninfo.cpp b/lib/addoninfo.cpp
new file mode 100644
index 00000000000..a2426d91999
--- /dev/null
+++ b/lib/addoninfo.cpp
@@ -0,0 +1,186 @@
+/*
+ * 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 "addoninfo.h"
+
+#include "path.h"
+#include "utils.h"
+
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <utility>
+
+#include "json.h"
+
+static std::string getFullPath(const std::string &fileName, const std::string &exename, bool debug = false) {
+    if (debug)
+        std::cout << "looking for addon '" << fileName << "'" << std::endl;
+    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;
+
+#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);
+#endif
+    return "";
+}
+
+static std::string parseAddonInfo(AddonInfo& addoninfo, const picojson::value &json, const std::string &fileName, const std::string &exename) {
+    const std::string& json_error = picojson::get_last_error();
+    if (!json_error.empty()) {
+        return "Loading " + fileName + " failed. " + json_error;
+    }
+    if (!json.is<picojson::object>())
+        return "Loading " + fileName + " failed. JSON is not an object.";
+
+    // TODO: remove/complete default value handling for missing fields
+    const picojson::object& obj = json.get<picojson::object>();
+    {
+        const auto it = obj.find("args");
+        if (it != obj.cend()) {
+            const auto& val = it->second;
+            if (!val.is<picojson::array>())
+                return "Loading " + fileName + " failed. 'args' must be an array.";
+            for (const picojson::value &v : val.get<picojson::array>()) {
+                if (!v.is<std::string>())
+                    return "Loading " + fileName + " failed. 'args' entry is not a string.";
+                addoninfo.args += " " + v.get<std::string>();
+            }
+        }
+    }
+
+    {
+        const auto it = obj.find("ctu");
+        if (it != obj.cend()) {
+            const auto& val = it->second;
+            // ctu is specified in the config file
+            if (!val.is<bool>())
+                return "Loading " + fileName + " failed. 'ctu' must be a boolean.";
+            addoninfo.ctu = val.get<bool>();
+        }
+        else {
+            addoninfo.ctu = false;
+        }
+    }
+
+    {
+        const auto it = obj.find("python");
+        if (it != obj.cend()) {
+            const auto& val = it->second;
+            // Python was defined in the config file
+            if (!val.is<std::string>()) {
+                return "Loading " + fileName +" failed. 'python' must be a string.";
+            }
+            addoninfo.python = val.get<std::string>();
+        }
+        else {
+            addoninfo.python = "";
+        }
+    }
+
+    {
+        const auto it = obj.find("executable");
+        if (it != obj.cend()) {
+            const auto& val = it->second;
+            if (!val.is<std::string>())
+                return "Loading " + fileName + " failed. 'executable' must be a string.";
+            std::string e = val.get<std::string>();
+            addoninfo.executable = getFullPath(e, fileName);
+            if (addoninfo.executable.empty())
+                addoninfo.executable = std::move(e);
+            return ""; // <- do not load both "executable" and "script".
+        }
+    }
+
+    const auto it = obj.find("script");
+    if (it == obj.cend())
+        return "Loading " + fileName + " failed. 'script' is missing.";
+
+    const auto& val = it->second;
+    if (!val.is<std::string>())
+        return "Loading " + fileName + " failed. 'script' must be a string.";
+
+    return addoninfo.getAddonInfo(val.get<std::string>(), exename);
+}
+
+std::string AddonInfo::getAddonInfo(const std::string &fileName, const std::string &exename, bool debug) {
+    if (fileName[0] == '{') {
+        picojson::value json;
+        const std::string err = picojson::parse(json, fileName);
+        (void)err; // TODO: report
+        return parseAddonInfo(*this, json, fileName, exename);
+    }
+    if (fileName.find('.') == std::string::npos)
+        return getAddonInfo(fileName + ".py", exename, debug);
+
+    if (endsWith(fileName, ".py")) {
+        scriptFile = Path::fromNativeSeparators(getFullPath(fileName, exename, debug));
+        if (scriptFile.empty())
+            return "Did not find addon " + fileName;
+
+        std::string::size_type pos1 = scriptFile.rfind('/');
+        if (pos1 == std::string::npos)
+            pos1 = 0;
+        else
+            pos1++;
+        std::string::size_type pos2 = scriptFile.rfind('.');
+        if (pos2 < pos1)
+            pos2 = std::string::npos;
+        name = scriptFile.substr(pos1, pos2 - pos1);
+
+        runScript = getFullPath("runaddon.py", exename);
+
+        return "";
+    }
+
+    if (!endsWith(fileName, ".json"))
+        return "Failed to open addon " + fileName;
+
+    std::ifstream fin(fileName);
+    if (!fin.is_open())
+        return "Failed to open " + fileName;
+    if (name.empty()) {
+        name = Path::fromNativeSeparators(fileName);
+        if (name.find('/') != std::string::npos)
+            name = name.substr(name.rfind('/') + 1);
+    }
+    picojson::value json;
+    fin >> json;
+    return parseAddonInfo(*this, json, fileName, exename);
+}
diff --git a/lib/addoninfo.h b/lib/addoninfo.h
new file mode 100644
index 00000000000..592833c2162
--- /dev/null
+++ b/lib/addoninfo.h
@@ -0,0 +1,38 @@
+/* -*- 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 addonInfoH
+#define addonInfoH
+
+#include "config.h"
+
+#include <string>
+
+struct CPPCHECKLIB AddonInfo {
+    std::string name;
+    std::string scriptFile; // addon script
+    std::string executable; // addon executable
+    std::string args;       // special extra arguments
+    std::string python;     // script interpreter
+    bool ctu = false;
+    std::string runScript;
+
+    std::string getAddonInfo(const std::string &fileName, const std::string &exename, bool debug = false);
+};
+
+#endif // addonInfoH
diff --git a/lib/analyzer.h b/lib/analyzer.h
index 51da0281f69..a4546eb7dc4 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-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
@@ -21,6 +21,8 @@
 
 #include "config.h"
 #include "mathlib.h"
+
+#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <vector>
@@ -32,7 +34,9 @@ class ValuePtr;
 struct Analyzer {
     struct Action {
 
-        Action() : mFlag(0) {}
+        Action() = default;
+        Action(const Action&) = default;
+        Action& operator=(const Action& rhs) & = default;
 
         template<class T,
                  REQUIRES("T must be convertible to unsigned int", std::is_convertible<T, unsigned int> ),
@@ -41,7 +45,7 @@ struct Analyzer {
         Action(T f) : mFlag(f) // cppcheck-suppress noExplicitConstructor
         {}
 
-        enum {
+        enum : std::uint16_t {
             None = 0,
             Read = (1 << 0),
             Write = (1 << 1),
@@ -125,10 +129,10 @@ struct Analyzer {
         }
 
     private:
-        unsigned int mFlag;
+        unsigned int mFlag{};
     };
 
-    enum class Terminate { None, Bail, Escape, Modified, Inconclusive, Conditional };
+    enum class Terminate : std::uint8_t { None, Bail, Escape, Modified, Inconclusive, Conditional };
 
     struct Result {
         explicit Result(Action action = Action::None, Terminate terminate = Terminate::None)
@@ -144,10 +148,10 @@ struct Analyzer {
         }
     };
 
-    enum class Direction { Forward, Reverse };
+    enum class Direction : std::uint8_t { Forward, Reverse };
 
     struct Assume {
-        enum Flags {
+        enum Flags : std::uint8_t {
             None = 0,
             Quiet = (1 << 0),
             Absolute = (1 << 1),
@@ -155,7 +159,7 @@ struct Analyzer {
         };
     };
 
-    enum class Evaluate { Integral, ContainerEmpty };
+    enum class Evaluate : std::uint8_t { Integral, ContainerEmpty };
 
     /// Analyze a token
     virtual Action analyze(const Token* tok, Direction d) const = 0;
@@ -179,12 +183,14 @@ struct Analyzer {
     virtual bool stopOnCondition(const Token* condTok) const = 0;
     /// The condition that will be assumed during analysis
     virtual void assume(const Token* tok, bool state, unsigned int flags = 0) = 0;
+    /// 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;
     }
-    virtual ~Analyzer() {}
+    virtual ~Analyzer() = default;
     Analyzer(const Analyzer&) = default;
 protected:
     Analyzer() = default;
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index b3b6a394724..6d5ac9a9b15 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-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
@@ -19,13 +19,17 @@
 #include "analyzerinfo.h"
 
 #include "errorlogger.h"
+#include "filesettings.h"
 #include "path.h"
 #include "utils.h"
 
-#include <tinyxml2.h>
 #include <cstring>
+#include <exception>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
+#include <utility>
+
+#include "xml.h"
 
 AnalyzerInformation::~AnalyzerInformation()
 {
@@ -44,23 +48,32 @@ 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<ImportProject::FileSettings> &fileSettings)
+void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings)
 {
-    std::map<std::string, unsigned int> fileCount;
-
     const std::string filesTxt(buildDir + "/files.txt");
     std::ofstream fout(filesTxt);
+    fout << getFilesTxt(sourcefiles, userDefines, fileSettings);
+}
+
+std::string AnalyzerInformation::getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings) {
+    std::ostringstream ret;
+
+    std::map<std::string, unsigned int> fileCount;
+
     for (const std::string &f : sourcefiles) {
         const std::string afile = getFilename(f);
-        fout << afile << ".a" << (++fileCount[afile]) << "::" << Path::simplifyPath(Path::fromNativeSeparators(f)) << '\n';
+        ret << afile << ".a" << (++fileCount[afile]) << sep << sep << sep << Path::simplifyPath(f) << '\n';
         if (!userDefines.empty())
-            fout << afile << ".a" << (++fileCount[afile]) << ":" << userDefines << ":" << Path::simplifyPath(Path::fromNativeSeparators(f)) << '\n';
+            ret << afile << ".a" << (++fileCount[afile]) << sep << userDefines << sep << sep << Path::simplifyPath(f) << '\n';
     }
 
-    for (const ImportProject::FileSettings &fs : fileSettings) {
-        const std::string afile = getFilename(fs.filename);
-        fout << afile << ".a" << (++fileCount[afile]) << ":" << fs.cfg << ":" << Path::simplifyPath(Path::fromNativeSeparators(fs.filename)) << std::endl;
+    for (const FileSettings &fs : fileSettings) {
+        const std::string afile = getFilename(fs.filename());
+        const std::string id = fs.fileIndex > 0 ? std::to_string(fs.fileIndex) : "";
+        ret << afile << ".a" << (++fileCount[afile]) << sep << fs.cfg << sep << id << sep << Path::simplifyPath(fs.filename()) << std::endl;
     }
+
+    return ret.str();
 }
 
 void AnalyzerInformation::close()
@@ -72,14 +85,9 @@ void AnalyzerInformation::close()
     }
 }
 
-static bool skipAnalysis(const std::string &analyzerInfoFile, std::size_t hash, std::list<ErrorMessage> &errors)
+bool 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;
 
@@ -87,6 +95,16 @@ static bool skipAnalysis(const std::string &analyzerInfoFile, std::size_t hash,
     if (!attr || attr != std::to_string(hash))
         return false;
 
+    // Check for invalid license error or internal error, in which case we should retry analysis
+    for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
+        if (std::strcmp(e->Name(), "error") == 0 &&
+            (e->Attribute("id", "premium-invalidLicense") ||
+             e->Attribute("id", "premium-internalError") ||
+             e->Attribute("id", "internalError")
+            ))
+            return false;
+    }
+
     for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
         if (std::strcmp(e->Name(), "error") == 0)
             errors.emplace_back(e);
@@ -95,25 +113,26 @@ static bool skipAnalysis(const std::string &analyzerInfoFile, std::size_t hash,
     return true;
 }
 
-std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg)
+std::string AnalyzerInformation::getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, int fileIndex)
 {
+    const std::string id = (fileIndex > 0) ? std::to_string(fileIndex) : "";
     std::string line;
-    const std::string end(':' + cfg + ':' + Path::simplifyPath(sourcefile));
+    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(':'));
+        return line.substr(0,line.find(sep));
     }
     return "";
 }
 
-std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg)
+std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex)
 {
     std::ifstream fin(Path::join(buildDir, "files.txt"));
     if (fin.is_open()) {
-        const std::string& ret = getAnalyzerInfoFileFromFilesTxt(fin, sourcefile, cfg);
+        const std::string& ret = getAnalyzerInfoFileFromFilesTxt(fin, sourcefile, cfg, fileIndex);
         if (!ret.empty())
             return Path::join(buildDir, ret);
     }
@@ -124,18 +143,20 @@ std::string AnalyzerInformation::getAnalyzerInfoFile(const std::string &buildDir
         filename = sourcefile;
     else
         filename = sourcefile.substr(pos + 1);
-    return Path::join(buildDir, filename) + ".analyzerinfo";
+    return Path::join(buildDir, std::move(filename)) + ".analyzerinfo";
 }
 
-bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, std::size_t hash, std::list<ErrorMessage> &errors)
+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)
 {
     if (buildDir.empty() || sourcefile.empty())
         return true;
     close();
 
-    mAnalyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg);
+    mAnalyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir,sourcefile,cfg,fileIndex);
 
-    if (skipAnalysis(mAnalyzerInfoFile, hash, errors))
+    tinyxml2::XMLDocument analyzerInfoDoc;
+    const tinyxml2::XMLError xmlError = analyzerInfoDoc.LoadFile(mAnalyzerInfoFile.c_str());
+    if (xmlError == tinyxml2::XML_SUCCESS && skipAnalysis(analyzerInfoDoc, hash, errors))
         return false;
 
     mOutputStream.open(mAnalyzerInfoFile);
@@ -160,3 +181,65 @@ void AnalyzerInformation::setFileInfo(const std::string &check, const std::strin
     if (mOutputStream.is_open() && !fileInfo.empty())
         mOutputStream << "  <FileInfo check=\"" << check << "\">\n" << fileInfo << "  </FileInfo>\n";
 }
+
+bool AnalyzerInformation::Info::parse(const std::string& filesTxtLine) {
+    const std::string::size_type sep1 = filesTxtLine.find(sep);
+    if (sep1 == std::string::npos)
+        return false;
+    const std::string::size_type sep2 = filesTxtLine.find(sep, sep1+1);
+    if (sep2 == std::string::npos)
+        return false;
+    const std::string::size_type sep3 = filesTxtLine.find(sep, sep2+1);
+    if (sep3 == std::string::npos)
+        return false;
+
+    if (sep3 == sep2 + 1)
+        fileIndex = 0;
+    else {
+        try {
+            fileIndex = std::stoi(filesTxtLine.substr(sep2+1, sep3-sep2-1));
+        } catch (const std::exception&) {
+            return false;
+        }
+    }
+
+    afile = filesTxtLine.substr(0, sep1);
+    cfg = filesTxtLine.substr(sep1+1, sep2-sep1-1);
+    sourceFile = filesTxtLine.substr(sep3+1);
+    return true;
+}
+
+// TODO: bail out on unexpected data
+void AnalyzerInformation::processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler)
+{
+    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;
+        }
+
+        const std::string xmlfile = buildDir + '/' + filesTxtInfo.afile;
+
+        tinyxml2::XMLDocument doc;
+        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
+        if (error != tinyxml2::XML_SUCCESS)
+            return;
+
+        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
+        if (rootNode == nullptr)
+            return;
+
+        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)
+                continue;
+            handler(checkattr, e, filesTxtInfo);
+        }
+    }
+}
+
diff --git a/lib/analyzerinfo.h b/lib/analyzerinfo.h
index 340d08f5e07..04ea1a5b339 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-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
@@ -22,14 +22,20 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "importproject.h"
 
 #include <cstddef>
 #include <fstream>
+#include <functional>
 #include <list>
 #include <string>
 
 class ErrorMessage;
+struct FileSettings;
+
+namespace tinyxml2 {
+    class XMLDocument;
+    class XMLElement;
+};
 
 /// @addtogroup Core
 /// @{
@@ -51,16 +57,35 @@ class CPPCHECKLIB AnalyzerInformation {
 public:
     ~AnalyzerInformation();
 
-    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<ImportProject::FileSettings> &fileSettings);
+    static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, 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, std::size_t hash, std::list<ErrorMessage> &errors);
+    bool analyzeFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex, std::size_t hash, std::list<ErrorMessage> &errors);
     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);
+    static std::string getAnalyzerInfoFile(const std::string &buildDir, const std::string &sourcefile, const std::string &cfg, int fileIndex);
+
+    static const char sep = ':';
+
+    class CPPCHECKLIB Info {
+    public:
+        bool parse(const std::string& filesTxtLine);
+        std::string afile;
+        std::string cfg;
+        int fileIndex = 0;
+        std::string sourceFile;
+    };
+
+    static void processFilesTxt(const std::string& buildDir, const std::function<void(const char* checkattr, const tinyxml2::XMLElement* e, const Info& filesTxtInfo)>& handler);
+
 protected:
-    static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg);
+    static std::string getFilesTxt(const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<FileSettings> &fileSettings);
+
+    static std::string getAnalyzerInfoFileFromFilesTxt(std::istream& filesTxt, const std::string &sourcefile, const std::string &cfg, int fileIndex);
+
+    static bool 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 7dea9a4604a..c91f41d9651 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-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
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include "errortypes.h"
+#include "findtoken.h"
 #include "infer.h"
 #include "library.h"
 #include "mathlib.h"
@@ -36,7 +37,7 @@
 #include "checkclass.h"
 
 #include <algorithm>
-#include <cassert>
+#include <cstring>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
@@ -106,31 +107,32 @@ static int getArgumentPos(const Token* ftok, const Token* tokToFind){
     return findArgumentPos(startTok, tokToFind);
 }
 
-template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-static void astFlattenRecursive(T* tok, std::vector<T*>& result, const char* op, nonneg int depth = 0)
+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, int depth = 100)
 {
-    ++depth;
-    if (!tok || depth >= 100)
+    --depth;
+    if (!tok || depth < 0)
         return;
-    if (tok->str() == op) {
-        astFlattenRecursive(tok->astOperand1(), result, op, depth);
-        astFlattenRecursive(tok->astOperand2(), result, op, depth);
+    if (strcmp(tok->str().c_str(), op) == 0) {
+        astFlattenCopy(tok->astOperand1(), op, out, depth);
+        astFlattenCopy(tok->astOperand2(), op, out, depth);
     } else {
-        result.push_back(tok);
+        *out = tok;
+        ++out;
     }
 }
 
 std::vector<const Token*> astFlatten(const Token* tok, const char* op)
 {
     std::vector<const Token*> result;
-    astFlattenRecursive(tok, result, op);
+    astFlattenCopy(tok, op, std::back_inserter(result));
     return result;
 }
 
 std::vector<Token*> astFlatten(Token* tok, const char* op)
 {
     std::vector<Token*> result;
-    astFlattenRecursive(tok, result, op);
+    astFlattenCopy(tok, op, std::back_inserter(result));
     return result;
 }
 
@@ -139,7 +141,7 @@ nonneg int astCount(const Token* tok, const char* op, int depth)
     --depth;
     if (!tok || depth < 0)
         return 0;
-    if (tok->str() == op)
+    if (strcmp(tok->str().c_str(), op) == 0)
         return astCount(tok->astOperand1(), op, depth) + astCount(tok->astOperand2(), op, depth);
     return 1;
 }
@@ -162,6 +164,15 @@ bool astHasVar(const Token * tok, nonneg int varid)
     return astHasVar(tok->astOperand1(), varid) || astHasVar(tok->astOperand2(), varid);
 }
 
+bool astHasExpr(const Token* tok, nonneg int exprid)
+{
+    if (!tok)
+        return false;
+    if (tok->exprId() == exprid)
+        return true;
+    return astHasExpr(tok->astOperand1(), exprid) || astHasExpr(tok->astOperand2(), exprid);
+}
+
 static bool astIsCharWithSign(const Token *tok, ValueType::Sign sign)
 {
     if (!tok)
@@ -249,6 +260,12 @@ bool astIsContainer(const Token* tok) {
     return getLibraryContainer(tok) != nullptr && !astIsIterator(tok);
 }
 
+bool astIsNonStringContainer(const Token* tok)
+{
+    const Library::Container* container = getLibraryContainer(tok);
+    return container && !container->stdStringLike && !astIsIterator(tok);
+}
+
 bool astIsContainerView(const Token* tok)
 {
     const Library::Container* container = getLibraryContainer(tok);
@@ -259,43 +276,56 @@ bool astIsContainerOwned(const Token* tok) {
     return astIsContainer(tok) && !astIsContainerView(tok);
 }
 
-static const Token* getContainerFunction(const Token* tok)
+bool astIsContainerString(const Token* tok)
 {
-    if (!tok || !tok->valueType() || !tok->valueType()->container)
-        return nullptr;
+    if (!tok)
+        return false;
+    if (!tok->valueType())
+        return false;
+    const Library::Container* container = tok->valueType()->container;
+    if (!container)
+        return false;
+    return container->stdStringLike;
+}
+
+static std::pair<const Token*, const Library::Container*> getContainerFunction(const Token* tok, const Library& library)
+{
+    const Library::Container* cont{};
+    if (!tok || !tok->valueType() || (!tok->valueType()->container && (!(cont = library.detectContainerOrIterator(tok->valueType()->smartPointerTypeToken)))))
+        return {};
     const Token* parent = tok->astParent();
-    if (Token::Match(parent, ". %name% (") && astIsLHS(tok)) {
-        return parent->next();
+    if (Token::Match(parent, ". %name% [(<]") && astIsLHS(tok)) {
+        return { parent->next(), cont ? cont : tok->valueType()->container };
     }
-    return nullptr;
+    return {};
 }
 
-Library::Container::Action astContainerAction(const Token* tok, const Token** ftok)
+Library::Container::Action astContainerAction(const Token* tok, const Library& library, const Token** ftok)
 {
-    const Token* ftok2 = getContainerFunction(tok);
+    const auto ftokCont = getContainerFunction(tok, library);
     if (ftok)
-        *ftok = ftok2;
-    if (!ftok2)
+        *ftok = ftokCont.first;
+    if (!ftokCont.first)
         return Library::Container::Action::NO_ACTION;
-    return tok->valueType()->container->getAction(ftok2->str());
+    return ftokCont.second->getAction(ftokCont.first->str());
 }
 
-Library::Container::Yield astContainerYield(const Token* tok, const Token** ftok)
+Library::Container::Yield astContainerYield(const Token* tok, const Library& library, const Token** ftok)
 {
-    const Token* ftok2 = getContainerFunction(tok);
+    const auto ftokCont = getContainerFunction(tok, library);
     if (ftok)
-        *ftok = ftok2;
-    if (!ftok2)
+        *ftok = ftokCont.first;
+    if (!ftokCont.first)
         return Library::Container::Yield::NO_YIELD;
-    return tok->valueType()->container->getYield(ftok2->str());
+    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 Settings& settings, const Token** ftok)
 {
     if (!tok)
         return Library::Container::Yield::NO_YIELD;
 
-    const auto* function = settings->library.getFunction(tok);
+    const auto* function = settings.library.getFunction(tok);
     if (!function)
         return Library::Container::Yield::NO_YIELD;
 
@@ -329,7 +359,7 @@ static bool match(const Token *tok, const std::string &rhs)
 {
     if (tok->str() == rhs)
         return true;
-    if (!tok->varId() && tok->hasKnownIntValue() && MathLib::toString(tok->values().front().intvalue) == rhs)
+    if (!tok->varId() && tok->hasKnownIntValue() && MathLib::toString(tok->getKnownIntValue()) == rhs)
         return true;
     return false;
 }
@@ -398,22 +428,30 @@ bool isStlStringType(const Token* tok)
            (Token::simpleMatch(tok, "std :: basic_string <") && !Token::simpleMatch(tok->linkAt(3), "> ::"));
 }
 
-bool isTemporary(bool cpp, const Token* tok, const Library* library, bool unknown)
+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)
         return false;
     if (Token::simpleMatch(tok, "."))
-        return (tok->originalName() != "->" && isTemporary(cpp, tok->astOperand1(), library)) ||
-               isTemporary(cpp, tok->astOperand2(), library);
+        return (tok->originalName() != "->" && isTemporary(tok->astOperand1(), library)) ||
+               isTemporary(tok->astOperand2(), library);
     if (Token::Match(tok, ",|::"))
-        return isTemporary(cpp, tok->astOperand2(), library);
-    if (tok->isCast() || (cpp && isCPPCast(tok)))
-        return isTemporary(cpp, tok->astOperand2(), library);
+        return isTemporary(tok->astOperand2(), library);
+    if (tok->isCast() || (tok->isCpp() && isCPPCast(tok)))
+        return isTemporary(tok->astOperand2(), library);
+    if (findLambdaEndToken(tok) != nullptr)
+        return true;
     if (Token::Match(tok, ".|[|++|--|%name%|%assign%"))
         return false;
     if (tok->isUnaryOp("*"))
         return false;
-    if (Token::Match(tok, "&|<<|>>") && isLikelyStream(cpp, tok->astOperand1()))
+    if (Token::Match(tok, "&|<<|>>") && isLikelyStream(tok->astOperand1()))
         return false;
     if (Token::simpleMatch(tok, "?")) {
         const Token* branchTok = tok->astOperand2();
@@ -428,11 +466,19 @@ bool isTemporary(bool cpp, const Token* tok, const Library* library, bool unknow
         if (Token::simpleMatch(tok->astOperand1(), "typeid"))
             return false;
         if (tok->valueType()) {
-            return tok->valueType()->reference == Reference::None;
+            if (tok->valueType()->pointer > 0) {
+                const Token* const parent = tok->astParent();
+                if (Token::simpleMatch(parent, "&"))
+                    return true;
+                if (Token::simpleMatch(parent, "return") && parent->valueType()->reference != Reference::None &&
+                    parent->valueType()->container && parent->valueType()->container->stdStringLike)
+                    return true;
+            }
+            return tok->valueType()->reference == Reference::None && tok->valueType()->pointer == 0;
         }
         const Token* ftok = nullptr;
-        if (Token::simpleMatch(tok->previous(), ">") && tok->previous()->link())
-            ftok = tok->previous()->link()->previous();
+        if (Token::simpleMatch(tok->previous(), ">") && tok->linkAt(-1))
+            ftok = tok->linkAt(-1)->previous();
         else
             ftok = tok->previous();
         if (!ftok)
@@ -442,7 +488,7 @@ bool isTemporary(bool cpp, const Token* tok, const Library* library, bool unknow
         if (ftok->type())
             return true;
         if (library) {
-            std::string returnType = library->returnValueType(ftok);
+            const std::string& returnType = library->returnValueType(ftok);
             return !returnType.empty() && returnType.back() != '&';
         }
         return unknown;
@@ -454,7 +500,7 @@ bool isTemporary(bool cpp, const Token* tok, const Library* library, bool unknow
         return unknown;
     if (Token::simpleMatch(tok, "{") && Token::simpleMatch(tok->astParent(), "return") && tok->astOperand1() &&
         !tok->astOperand2())
-        return isTemporary(cpp, tok->astOperand1(), library);
+        return isTemporary(tok->astOperand1(), library);
     return true;
 }
 
@@ -462,7 +508,7 @@ static bool isFunctionCall(const Token* tok)
 {
     if (Token::Match(tok, "%name% ("))
         return true;
-    if (Token::Match(tok, "%name% <") && Token::simpleMatch(tok->next()->link(), "> ("))
+    if (Token::Match(tok, "%name% <") && Token::simpleMatch(tok->linkAt(1), "> ("))
         return true;
     if (Token::Match(tok, "%name% ::"))
         return isFunctionCall(tok->tokAt(2));
@@ -516,7 +562,7 @@ static T* nextAfterAstRightmostLeafGeneric(T* tok)
         else
             break;
     } while (rightmostLeaf->astOperand1() || rightmostLeaf->astOperand2());
-    while (Token::Match(rightmostLeaf->next(), "]|)") && !hasToken(rightmostLeaf->next()->link(), rightmostLeaf->next(), tok))
+    while (Token::Match(rightmostLeaf->next(), "]|)") && !hasToken(rightmostLeaf->linkAt(1), rightmostLeaf->next(), tok))
         rightmostLeaf = rightmostLeaf->next();
     if (Token::Match(rightmostLeaf, "{|(|[") && rightmostLeaf->link())
         rightmostLeaf = rightmostLeaf->link();
@@ -546,7 +592,7 @@ Token* astParentSkipParens(Token* tok)
     if (parent->link() != nextAfterAstRightmostLeaf(tok))
         return parent;
     if (Token::Match(parent->previous(), "%name% (") ||
-        (Token::simpleMatch(parent->previous(), "> (") && parent->previous()->link()))
+        (Token::simpleMatch(parent->previous(), "> (") && parent->linkAt(-1)))
         return parent;
     return astParentSkipParens(parent);
 }
@@ -610,32 +656,48 @@ static std::vector<const Token*> getParentMembers(const Token* tok)
     return result;
 }
 
-const Token* getParentLifetime(bool cpp, const Token* tok, const Library* library)
+static const Token* getParentLifetimeObject(const Token* tok)
+{
+    while (Token::simpleMatch(tok, "["))
+        tok = tok->astOperand1();
+    return tok;
+}
+
+const Token* getParentLifetime(const Token* tok, const Library& library)
 {
     std::vector<const Token*> members = getParentMembers(tok);
     if (members.size() < 2)
         return tok;
-    // Find the first local variable or temporary
+    // Find the first local variable, temporary, or array
     auto it = std::find_if(members.crbegin(), members.crend(), [&](const Token* tok2) {
         const Variable* var = tok2->variable();
         if (var)
             return var->isLocal() || var->isArgument();
-        return isTemporary(cpp, tok2, library);
+        if (Token::simpleMatch(tok2, "["))
+            return true;
+        return isTemporary(tok2, &library);
     });
     if (it == members.rend())
         return tok;
     // If any of the submembers are borrowed types then stop
     if (std::any_of(it.base() - 1, members.cend() - 1, [&](const Token* tok2) {
-        if (astIsPointer(tok2) || astIsContainerView(tok2) || astIsIterator(tok2))
+        const Token* obj = getParentLifetimeObject(tok2);
+        if (!obj)
+            return false;
+        const Variable* var = obj->variable();
+        // Check for arrays first since astIsPointer will return true, but an array is not a borrowed type
+        if (var && var->isArray())
+            return false;
+        if (astIsPointer(obj) || astIsContainerView(obj) || astIsIterator(obj))
             return true;
-        if (!astIsUniqueSmartPointer(tok2)) {
-            if (astIsSmartPointer(tok2))
+        if (!astIsUniqueSmartPointer(obj)) {
+            if (astIsSmartPointer(obj))
                 return true;
-            const Token* dotTok = tok2->next();
+            const Token* dotTok = obj->next();
             if (!Token::simpleMatch(dotTok, ".")) {
-                const Token* endTok = nextAfterAstRightmostLeaf(tok2);
+                const Token* endTok = nextAfterAstRightmostLeaf(obj);
                 if (!endTok)
-                    dotTok = tok2->next();
+                    dotTok = obj->next();
                 else if (Token::simpleMatch(endTok, "."))
                     dotTok = endTok;
                 else if (Token::simpleMatch(endTok->next(), "."))
@@ -645,11 +707,13 @@ const Token* getParentLifetime(bool cpp, const Token* tok, const Library* librar
             if (Token::simpleMatch(dotTok, ".") && dotTok->originalName() == "->")
                 return true;
         }
-        const Variable* var = tok2->variable();
         return var && var->isReference();
     }))
         return nullptr;
-    return *it;
+    const Token* result = getParentLifetimeObject(*it);
+    if (result != *it)
+        return getParentLifetime(result);
+    return result;
 }
 
 static bool isInConstructorList(const Token* tok)
@@ -671,7 +735,7 @@ static bool isInConstructorList(const Token* tok)
     return Token::simpleMatch(parent, ":") && !Token::simpleMatch(parent->astParent(), "?");
 }
 
-std::vector<ValueType> getParentValueTypes(const Token* tok, const Settings* settings, const Token** parent)
+std::vector<ValueType> getParentValueTypes(const Token* tok, const Settings& settings, const Token** parent)
 {
     if (!tok)
         return {};
@@ -684,9 +748,10 @@ std::vector<ValueType> getParentValueTypes(const Token* tok, const Settings* set
             return {*tok->astParent()->astOperand1()->valueType()};
         return {};
     }
+    const Token* ftok = nullptr;
     if (Token::Match(tok->astParent(), "(|{|,")) {
         int argn = -1;
-        const Token* ftok = getTokenArgumentFunction(tok, argn);
+        ftok = getTokenArgumentFunction(tok, argn);
         const Token* typeTok = nullptr;
         if (ftok && argn >= 0) {
             if (ftok->function()) {
@@ -699,6 +764,8 @@ std::vector<ValueType> getParentValueTypes(const Token* tok, const Settings* set
                         continue;
                     nameTok = var->nameToken();
                     result.push_back(*var->valueType());
+                    if (var->isArray())
+                        result.back().pointer += var->dimensions().size();
                 }
                 if (result.size() == 1 && nameTok && parent) {
                     *parent = nameTok;
@@ -711,25 +778,31 @@ std::vector<ValueType> getParentValueTypes(const Token* tok, const Settings* set
                 const Scope* scope = t->classScope;
                 // Check for aggregate constructors
                 if (scope && scope->numConstructors == 0 && t->derivedFrom.empty() &&
-                    (t->isClassType() || t->isStructType()) && numberOfArguments(ftok) < scope->varlist.size()) {
-                    assert(argn < scope->varlist.size());
-                    auto it = std::next(scope->varlist.cbegin(), argn);
-                    if (it->valueType())
-                        return {*it->valueType()};
+                    (t->isClassType() || t->isStructType()) && numberOfArguments(ftok) <= scope->varlist.size() &&
+                    !scope->varlist.empty()) {
+                    if (argn < scope->varlist.size()) {
+                        auto it = std::next(scope->varlist.cbegin(), argn);
+                        if (it->valueType())
+                            return { *it->valueType() };
+                    }
                 }
             }
         }
     }
-    if (settings && Token::Match(tok->astParent()->tokAt(-2), ". push_back|push_front|insert|push (") &&
+    if (Token::Match(tok->astParent()->tokAt(-2), ". push_back|push_front|insert|push (") &&
         astIsContainer(tok->astParent()->tokAt(-2)->astOperand1())) {
         const Token* contTok = tok->astParent()->tokAt(-2)->astOperand1();
         const ValueType* vtCont = contTok->valueType();
         if (!vtCont->containerTypeToken)
             return {};
-        ValueType vtParent = ValueType::parseDecl(vtCont->containerTypeToken, *settings, true); // TODO: set isCpp
+        ValueType vtParent = ValueType::parseDecl(vtCont->containerTypeToken, settings);
         return {std::move(vtParent)};
     }
-    if (Token::Match(tok->astParent(), "return|(|{|%assign%") && parent) {
+    // The return type of a function is not the parent valuetype
+    if (Token::simpleMatch(tok->astParent(), "(") && ftok && !tok->astParent()->isCast() &&
+        ftok->tokType() != Token::eType)
+        return {};
+    if (parent && Token::Match(tok->astParent(), "return|(|{|%assign%")) {
         *parent = tok->astParent();
     }
     if (tok->astParent()->valueType())
@@ -771,11 +844,18 @@ static T* getCondTokImpl(T* tok)
         return nullptr;
     if (Token::simpleMatch(tok, "("))
         return getCondTok(tok->previous());
+    if (Token::simpleMatch(tok, "do {")) {
+        T* endTok = tok->linkAt(1);
+        if (Token::simpleMatch(endTok, "} while ("))
+            return endTok->tokAt(2)->astOperand2();
+    }
     if (Token::simpleMatch(tok, "for") && Token::simpleMatch(tok->next()->astOperand2(), ";") &&
         tok->next()->astOperand2()->astOperand2())
         return tok->next()->astOperand2()->astOperand2()->astOperand1();
     if (Token::simpleMatch(tok->next()->astOperand2(), ";"))
         return tok->next()->astOperand2()->astOperand1();
+    if (tok->isName() && !tok->isControlFlowKeyword())
+        return nullptr;
     return tok->next()->astOperand2();
 }
 
@@ -787,8 +867,10 @@ static T* getCondTokFromEndImpl(T* endBlock)
     T* startBlock = endBlock->link();
     if (!Token::simpleMatch(startBlock, "{"))
         return nullptr;
+    if (Token::simpleMatch(startBlock->previous(), "do"))
+        return getCondTok(startBlock->previous());
     if (Token::simpleMatch(startBlock->previous(), ")"))
-        return getCondTok(startBlock->previous()->link());
+        return getCondTok(startBlock->linkAt(-1));
     if (Token::simpleMatch(startBlock->tokAt(-2), "} else {"))
         return getCondTokFromEnd(startBlock->tokAt(-2));
     return nullptr;
@@ -862,8 +944,8 @@ const Token *findNextTokenFromBreak(const Token *breakToken)
 {
     const Scope *scope = breakToken->scope();
     while (scope) {
-        if (scope->isLoopScope() || scope->type == Scope::ScopeType::eSwitch) {
-            if (scope->type == Scope::ScopeType::eDo && Token::simpleMatch(scope->bodyEnd, "} while ("))
+        if (scope->isLoopScope() || scope->type == ScopeType::eSwitch) {
+            if (scope->type == ScopeType::eDo && Token::simpleMatch(scope->bodyEnd, "} while ("))
                 return scope->bodyEnd->linkAt(2)->next();
             return scope->bodyEnd;
         }
@@ -887,10 +969,18 @@ bool extractForLoopValues(const Token *forToken,
     const Token *incExpr  = forToken->next()->astOperand2()->astOperand2()->astOperand2();
     if (!initExpr || !initExpr->isBinaryOp() || initExpr->str() != "=" || !Token::Match(initExpr->astOperand1(), "%var%"))
         return false;
-    std::vector<MathLib::bigint> minInitValue = getMinValue(ValueFlow::makeIntegralInferModel(), initExpr->astOperand2()->values());
+    std::vector<MathLib::bigint> minInitValue =
+        getMinValue(makeIntegralInferModel(), initExpr->astOperand2()->values());
+    if (minInitValue.empty()) {
+        const ValueFlow::Value* v = initExpr->astOperand2()->getMinValue(true);
+        if (v)
+            minInitValue.push_back(v->intvalue);
+    }
+    if (minInitValue.empty())
+        return false;
     varid = initExpr->astOperand1()->varId();
     knownInitValue = initExpr->astOperand2()->hasKnownIntValue();
-    initValue = minInitValue.empty() ? 0 : minInitValue.front();
+    initValue = minInitValue.front();
     partialCond = Token::Match(condExpr, "%oror%|&&");
     visitAstNodes(condExpr, [varid, &condExpr](const Token *tok) {
         if (Token::Match(tok, "%oror%|&&"))
@@ -929,7 +1019,12 @@ static const Token * getVariableInitExpression(const Variable * var)
 const Token* isInLoopCondition(const Token* tok)
 {
     const Token* top = tok->astTop();
-    return top && Token::Match(top->previous(), "for|while (") ? top : nullptr;
+    return Token::Match(top->previous(), "for|while (") ? top : nullptr;
+}
+
+bool isDesignatedInitializer(const Token* tok)
+{
+    return tok && tok->isUnaryOp(".");
 }
 
 /// If tok2 comes after tok1
@@ -960,6 +1055,7 @@ bool isAliasOf(const Token *tok, nonneg int varid, bool* inconclusive)
 {
     if (tok->varId() == varid)
         return false;
+    // NOLINTNEXTLINE(readability-use-anyofallof) - TODO: fix this / also Cppcheck false negative
     for (const ValueFlow::Value &val : tok->values()) {
         if (!val.isLocalLifetimeValue())
             continue;
@@ -976,32 +1072,41 @@ bool isAliasOf(const Token *tok, nonneg int varid, bool* inconclusive)
     return false;
 }
 
-bool isAliasOf(const Token* tok, const Token* expr, bool* inconclusive)
+bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect)
 {
-    const bool pointer = astIsPointer(tok);
-    const ValueFlow::Value* value = nullptr;
-    const Token* r = findAstNode(expr, [&](const Token* childTok) {
-        for (const ValueFlow::Value& val : tok->values()) {
-            if (val.isImpossible())
-                continue;
-            if (val.isLocalLifetimeValue() || (pointer && val.isSymbolicValue() && val.intvalue == 0)) {
-                if (findAstNode(val.tokvalue,
-                                [&](const Token* aliasTok) {
-                    return aliasTok->exprId() == childTok->exprId();
-                })) {
-                    if (val.isInconclusive() && inconclusive != nullptr) {
-                        value = &val;
-                    } else {
+    if (indirect)
+        *indirect = 1;
+    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 (indirect)
+                    *indirect = 0;
+                return true;
+            }
+            for (const ValueFlow::Value& val : ref.token->values()) {
+                if (val.isImpossible())
+                    continue;
+                if (val.isLocalLifetimeValue() || (pointer && val.isSymbolicValue() && val.intvalue == 0)) {
+                    if (findAstNode(val.tokvalue,
+                                    [&](const Token* aliasTok) {
+                        return aliasTok != childTok && aliasTok->exprId() == childTok->exprId();
+                    })) {
                         return true;
                     }
                 }
             }
-        }
-        return false;
-    });
-    if (!r && value && inconclusive)
-        *inconclusive = true;
-    return r || value;
+            return false;
+        });
+        if (r)
+            break;
+    }
+    return r;
 }
 
 static bool isAliased(const Token *startTok, const Token *endTok, nonneg int varid)
@@ -1017,18 +1122,6 @@ static bool isAliased(const Token *startTok, const Token *endTok, nonneg int var
     return false;
 }
 
-bool isAliased(const Variable *var)
-{
-    if (!var)
-        return false;
-    if (!var->scope())
-        return false;
-    const Token *start = var->declEndToken();
-    if (!start)
-        return false;
-    return isAliased(start, var->scope()->bodyEnd, var->declarationId());
-}
-
 bool exprDependsOnThis(const Token* expr, bool onVar, nonneg int depth)
 {
     if (!expr)
@@ -1041,19 +1134,23 @@ bool exprDependsOnThis(const Token* expr, bool onVar, nonneg int depth)
     ++depth;
 
     // calling nonstatic method?
-    if (Token::Match(expr, "%name% (") && expr->function() && expr->function()->nestedIn && expr->function()->nestedIn->isClassOrStruct() && !expr->function()->isStatic()) {
-        // is it a method of this?
-        const Scope* fScope = expr->scope();
-        while (!fScope->functionOf && fScope->nestedIn)
-            fScope = fScope->nestedIn;
-
-        const Scope* classScope = fScope->functionOf;
-        if (classScope && classScope->function)
-            classScope = classScope->function->token->scope();
-
-        if (classScope && classScope->isClassOrStruct())
-            return contains(classScope->findAssociatedScopes(), expr->function()->nestedIn);
-        return false;
+    if (Token::Match(expr, "%name% (")) {
+        if (expr->function() && expr->function()->nestedIn && expr->function()->nestedIn->isClassOrStruct() && !expr->function()->isStatic()) {
+            // is it a method of this?
+            const Scope* fScope = expr->scope();
+            while (!fScope->functionOf && fScope->nestedIn)
+                fScope = fScope->nestedIn;
+
+            const Scope* classScope = fScope->functionOf;
+            if (classScope && classScope->function)
+                classScope = classScope->function->token->scope();
+
+            if (classScope && classScope->isClassOrStruct())
+                return contains(classScope->findAssociatedScopes(), expr->function()->nestedIn);
+            return false;
+        }
+        if (expr->isOperatorKeyword() && !Token::simpleMatch(expr->next()->astParent(), "."))
+            return true;
     }
     if (onVar && expr->variable()) {
         const Variable* var = expr->variable();
@@ -1079,7 +1176,7 @@ static bool hasUnknownVars(const Token* startTok)
 
 bool isStructuredBindingVariable(const Variable* var)
 {
-    if (!var)
+    if (!var || var->isArray())
         return false;
     const Token* tok = var->nameToken();
     while (tok && Token::Match(tok->astParent(), "[|,|:"))
@@ -1090,7 +1187,7 @@ bool isStructuredBindingVariable(const Variable* var)
 /// This takes a token that refers to a variable and it will return the token
 /// to the expression that the variable is assigned to. If its not valid to
 /// make such substitution then it will return the original token.
-static const Token * followVariableExpression(const Token * tok, bool cpp, const Token * end = nullptr)
+static const Token * followVariableExpression(const Settings& settings, const Token * tok, const Token * end = nullptr)
 {
     if (!tok)
         return tok;
@@ -1112,6 +1209,8 @@ static const Token * followVariableExpression(const Token * tok, bool cpp, const
         return tok;
     if (hasUnknownVars(varTok))
         return tok;
+    if (astIsRangeBasedForDecl(var->nameToken()))
+        return tok;
     if (var->isVolatile())
         return tok;
     if (!var->isLocal() && !var->isConst())
@@ -1128,7 +1227,8 @@ static const Token * followVariableExpression(const Token * tok, bool cpp, const
     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, nullptr, cpp)))
+    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;
@@ -1140,7 +1240,7 @@ static const Token * followVariableExpression(const Token * tok, bool cpp, const
             return tok;
     } else if (!precedes(startToken, endToken)) {
         return tok;
-    } else if (isExpressionChanged(varTok, startToken, endToken, nullptr, cpp)) {
+    } else if (findExpressionChanged(varTok, startToken, endToken, settings)) {
         return tok;
     }
     return varTok;
@@ -1160,73 +1260,76 @@ 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 {
             return x.token < y.token;
         }
     };
-    SmallVector<ReferenceToken> refs_result;
     if (!tok)
-        return refs_result;
+        return {};
     if (depth < 0) {
-        refs_result.push_back({tok, std::move(errors)});
+        SmallVector<ReferenceToken> refs_result;
+        refs_result.emplace_back(tok, std::move(errors));
         return refs_result;
     }
     const Variable *var = tok->variable();
     if (var && var->declarationId() == tok->varId()) {
         if (var->nameToken() == tok || isStructuredBindingVariable(var)) {
-            refs_result.push_back({tok, std::move(errors)});
+            SmallVector<ReferenceToken> refs_result;
+            refs_result.emplace_back(tok, std::move(errors));
             return refs_result;
         }
         if (var->isReference() || var->isRValueReference()) {
             const Token * const varDeclEndToken = var->declEndToken();
             if (!varDeclEndToken) {
-                refs_result.push_back({tok, std::move(errors)});
+                SmallVector<ReferenceToken> refs_result;
+                refs_result.emplace_back(tok, std::move(errors));
                 return refs_result;
             }
             if (var->isArgument()) {
                 errors.emplace_back(varDeclEndToken, "Passed to reference.");
-                refs_result.push_back({tok, std::move(errors)});
+                SmallVector<ReferenceToken> refs_result;
+                refs_result.emplace_back(tok, std::move(errors));
                 return refs_result;
             }
             if (Token::simpleMatch(varDeclEndToken, "=")) {
                 if (astHasToken(varDeclEndToken, tok))
-                    return refs_result;
+                    return {};
                 errors.emplace_back(varDeclEndToken, "Assigned to reference.");
                 const Token *vartok = varDeclEndToken->astOperand2();
-                if (vartok == tok || (!temporary && isTemporary(true, vartok, nullptr, true) &&
+                if (vartok == tok || (!temporary && isTemporary(vartok, nullptr, true) &&
                                       (var->isConst() || var->isRValueReference()))) {
-                    refs_result.push_back({tok, std::move(errors)});
+                    SmallVector<ReferenceToken> refs_result;
+                    refs_result.emplace_back(tok, std::move(errors));
                     return refs_result;
                 }
                 if (vartok)
-                    return followAllReferences(vartok, temporary, inconclusive, std::move(errors), depth - 1);
-            } else {
-                refs_result.push_back({tok, std::move(errors)});
-                return refs_result;
+                    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) {
-            refs_result.push_back({tok, std::move(errors)});
+            SmallVector<ReferenceToken> refs_result;
+            refs_result.emplace_back(tok, std::move(errors));
             return refs_result;
         }
 
         if (!result.empty()) {
+            SmallVector<ReferenceToken> refs_result;
             refs_result.insert(refs_result.end(), result.cbegin(), result.cend());
             return refs_result;
         }
@@ -1234,7 +1337,8 @@ SmallVector<ReferenceToken> followAllReferences(const Token* tok,
     } else if (tok->previous() && tok->previous()->function() && Token::Match(tok->previous(), "%name% (")) {
         const Function *f = tok->previous()->function();
         if (!Function::returnsReference(f)) {
-            refs_result.push_back({tok, std::move(errors)});
+            SmallVector<ReferenceToken> refs_result;
+            refs_result.emplace_back(tok, std::move(errors));
             return refs_result;
         }
         std::set<ReferenceToken, ReferenceTokenLess> result;
@@ -1243,21 +1347,24 @@ 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) {
-                    refs_result.push_back({tok, std::move(errors)});
+                    SmallVector<ReferenceToken> refs_result;
+                    refs_result.emplace_back(tok, std::move(errors));
                     return refs_result;
                 }
                 if (argvar->isArgument() && (argvar->isReference() || argvar->isRValueReference())) {
                     const int n = getArgumentPos(argvar, f);
                     if (n < 0) {
-                        refs_result.push_back({tok, std::move(errors)});
+                        SmallVector<ReferenceToken> refs_result;
+                        refs_result.emplace_back(tok, std::move(errors));
                         return refs_result;
                     }
                     std::vector<const Token*> args = getArguments(tok->previous());
                     if (n >= args.size()) {
-                        refs_result.push_back({tok, std::move(errors)});
+                        SmallVector<ReferenceToken> refs_result;
+                        refs_result.emplace_back(tok, std::move(errors));
                         return refs_result;
                     }
                     const Token* argTok = args[n];
@@ -1265,29 +1372,37 @@ 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) {
-                        refs_result.push_back({tok, std::move(errors)});
+                        SmallVector<ReferenceToken> refs_result;
+                        refs_result.emplace_back(tok, std::move(errors));
                         return refs_result;
                     }
                 }
             }
         }
         if (!result.empty()) {
+            SmallVector<ReferenceToken> refs_result;
             refs_result.insert(refs_result.end(), result.cbegin(), result.cend());
             return refs_result;
         }
     }
-    refs_result.push_back({tok, std::move(errors)});
+    SmallVector<ReferenceToken> refs_result;
+    refs_result.emplace_back(tok, std::move(errors));
     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);
@@ -1315,7 +1430,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()) {
@@ -1362,10 +1477,10 @@ static inline bool isSameConstantValue(bool macro, const Token* tok1, const Toke
     };
 
     tok1 = adjustForCast(tok1);
-    if (!tok1->isNumber())
+    if (!tok1->isNumber() && !tok1->enumerator())
         return false;
     tok2 = adjustForCast(tok2);
-    if (!tok2->isNumber())
+    if (!tok2->isNumber() && !tok2->enumerator())
         return false;
 
     if (macro && (tok1->isExpandedMacro() || tok2->isExpandedMacro() || tok1->isTemplateArg() || tok2->isTemplateArg()))
@@ -1403,7 +1518,7 @@ static bool isForLoopIncrement(const Token* const tok)
            parent->astParent()->astParent()->astOperand1()->str() == "for";
 }
 
-bool isUsedAsBool(const Token* const tok)
+bool isUsedAsBool(const Token* const tok, const Settings& settings)
 {
     if (!tok)
         return false;
@@ -1416,14 +1531,23 @@ bool isUsedAsBool(const Token* const tok)
     const Token* parent = tok->astParent();
     if (!parent)
         return false;
+    if (Token::simpleMatch(parent, "["))
+        return false;
+    if (parent->isUnaryOp("*"))
+        return false;
+    if (Token::simpleMatch(parent, ".")) {
+        if (astIsRHS(tok))
+            return isUsedAsBool(parent, settings);
+        return false;
+    }
     if (Token::Match(parent, "&&|!|%oror%"))
         return true;
     if (parent->isCast())
-        return isUsedAsBool(parent);
+        return !Token::simpleMatch(parent->astOperand1(), "dynamic_cast") && isUsedAsBool(parent, settings);
     if (parent->isUnaryOp("*"))
-        return isUsedAsBool(parent);
-    if (Token::Match(parent, "==|!=") && tok->astSibling()->hasKnownIntValue() &&
-        tok->astSibling()->values().front().intvalue == 0)
+        return isUsedAsBool(parent, settings);
+    if (Token::Match(parent, "==|!=") && (tok->astSibling()->isNumber() || tok->astSibling()->isKeyword()) && tok->astSibling()->hasKnownIntValue() &&
+        tok->astSibling()->getKnownIntValue() == 0)
         return true;
     if (parent->str() == "(" && astIsRHS(tok) && Token::Match(parent->astOperand1(), "if|while"))
         return true;
@@ -1431,8 +1555,10 @@ bool isUsedAsBool(const Token* const tok)
         return true;
     if (isForLoopCondition(tok))
         return true;
-    if (!Token::Match(parent, "%cop%")) {
-        std::vector<ValueType> vtParents = getParentValueTypes(tok);
+    if (!Token::Match(parent, "%cop%") && !(parent->str() == "(" && tok == parent->astOperand1())) {
+        if (parent->str() == "," && parent->isInitComma())
+            return false;
+        std::vector<ValueType> vtParents = getParentValueTypes(tok, settings);
         return std::any_of(vtParents.cbegin(), vtParents.cend(), [&](const ValueType& vt) {
             return vt.pointer == 0 && vt.type == ValueType::BOOL;
         });
@@ -1440,52 +1566,87 @@ bool isUsedAsBool(const Token* const tok)
     return false;
 }
 
-static bool astIsBoolLike(const Token* tok)
+bool compareTokenFlags(const Token* tok1, const Token* tok2, bool macro) {
+    if (macro) {
+        if (tok1->isExpandedMacro() != tok2->isExpandedMacro())
+            return false;
+        if (tok1->isExpandedMacro()) { // both are macros
+            if (tok1->getMacroName() != tok2->getMacroName())
+                return false;
+            if (tok1->astParent() && tok2->astParent() && tok1->astParent()->isExpandedMacro() && tok1->astParent()->getMacroName() == tok2->astParent()->getMacroName())
+                return false;
+        }
+        if (tok1->isTemplateArg() || tok2->isTemplateArg())
+            return false;
+    }
+    if (tok1->isComplex() != tok2->isComplex())
+        return false;
+    if (tok1->isLong() != tok2->isLong())
+        return false;
+    if (tok1->isUnsigned() != tok2->isUnsigned())
+        return false;
+    if (tok1->isSigned() != tok2->isSigned())
+        return false;
+    return true;
+}
+
+static bool astIsBoolLike(const Token* tok, const Settings& settings)
 {
-    return astIsBool(tok) || isUsedAsBool(tok);
+    return astIsBool(tok) || isUsedAsBool(tok, settings);
 }
 
-bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2, const Library& library, bool pure, bool followVar, ErrorPath* errors)
+bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors)
 {
-    if (tok1 == nullptr && tok2 == nullptr)
+    if (tok1 == tok2)
         return true;
     if (tok1 == nullptr || tok2 == nullptr)
         return false;
-    if (cpp) {
+    // tokens needs to be from the same TokenList so no need check standard on both of them
+    if (tok1->isCpp()) {
         if (tok1->str() == "." && tok1->astOperand1() && tok1->astOperand1()->str() == "this")
             tok1 = tok1->astOperand2();
         if (tok2->str() == "." && tok2->astOperand1() && tok2->astOperand1()->str() == "this")
             tok2 = tok2->astOperand2();
     }
     // Skip double not
-    if (Token::simpleMatch(tok1, "!") && Token::simpleMatch(tok1->astOperand1(), "!") && !Token::simpleMatch(tok1->astParent(), "=") && astIsBoolLike(tok2)) {
-        return isSameExpression(cpp, macro, tok1->astOperand1()->astOperand1(), tok2, library, pure, followVar, errors);
+    if (Token::simpleMatch(tok1, "!") && Token::simpleMatch(tok1->astOperand1(), "!") && !Token::simpleMatch(tok1->astParent(), "=") && astIsBoolLike(tok2, settings)) {
+        return isSameExpression(macro, tok1->astOperand1()->astOperand1(), tok2, settings, pure, followVar, errors);
     }
-    if (Token::simpleMatch(tok2, "!") && Token::simpleMatch(tok2->astOperand1(), "!") && !Token::simpleMatch(tok2->astParent(), "=") && astIsBoolLike(tok1)) {
-        return isSameExpression(cpp, macro, tok1, tok2->astOperand1()->astOperand1(), library, pure, followVar, errors);
+    if (Token::simpleMatch(tok2, "!") && Token::simpleMatch(tok2->astOperand1(), "!") && !Token::simpleMatch(tok2->astParent(), "=") && astIsBoolLike(tok1, settings)) {
+        return isSameExpression(macro, tok1, tok2->astOperand1()->astOperand1(), settings, pure, followVar, errors);
     }
     const bool tok_str_eq = tok1->str() == tok2->str();
     if (!tok_str_eq && isDifferentKnownValues(tok1, tok2))
         return false;
-    if (isSameConstantValue(macro, tok1, tok2))
+
+    const Token *followTok1 = tok1, *followTok2 = tok2;
+    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;
 
     // Follow variable
-    if (followVar && !tok_str_eq && (tok1->varId() || tok2->varId())) {
-        const Token * varTok1 = followVariableExpression(tok1, cpp, tok2);
-        if ((varTok1->str() == tok2->str()) || isSameConstantValue(macro, varTok1, tok2)) {
-            followVariableExpressionError(tok1, varTok1, errors);
-            return isSameExpression(cpp, macro, varTok1, tok2, library, true, followVar, errors);
+    if (followVar && !tok_str_eq && (followTok1->varId() || followTok2->varId() || followTok1->enumerator() || followTok2->enumerator())) {
+        const Token * varTok1 = followVariableExpression(settings, followTok1, followTok2);
+        if ((varTok1->str() == followTok2->str()) || isSameConstantValue(macro, varTok1, followTok2)) {
+            followVariableExpressionError(followTok1, varTok1, errors);
+            return isSameExpression(macro, varTok1, followTok2, settings, true, followVar, errors);
         }
-        const Token * varTok2 = followVariableExpression(tok2, cpp, tok1);
-        if ((tok1->str() == varTok2->str()) || isSameConstantValue(macro, tok1, varTok2)) {
-            followVariableExpressionError(tok2, varTok2, errors);
-            return isSameExpression(cpp, macro, tok1, varTok2, library, true, followVar, errors);
+        const Token * varTok2 = followVariableExpression(settings, followTok2, followTok1);
+        if ((followTok1->str() == varTok2->str()) || isSameConstantValue(macro, followTok1, varTok2)) {
+            followVariableExpressionError(followTok2, varTok2, errors);
+            return isSameExpression(macro, followTok1, varTok2, settings, true, followVar, errors);
         }
         if ((varTok1->str() == varTok2->str()) || isSameConstantValue(macro, varTok1, varTok2)) {
             followVariableExpressionError(tok1, varTok1, errors);
             followVariableExpressionError(tok2, varTok2, errors);
-            return isSameExpression(cpp, macro, varTok1, varTok2, library, true, followVar, errors);
+            return isSameExpression(macro, varTok1, varTok2, settings, true, followVar, errors);
         }
     }
     // Follow references
@@ -1497,17 +1658,17 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
                 const Token *start = refTok1, *end = refTok2;
                 if (!precedes(start, end))
                     std::swap(start, end);
-                if (isExpressionChanged(start, start, end, nullptr, cpp))
+                if (findExpressionChanged(start, start, end, settings))
                     return false;
             }
-            return isSameExpression(cpp, macro, refTok1, refTok2, library, pure, followVar, errors);
+            return isSameExpression(macro, refTok1, refTok2, settings, pure, followVar, errors);
         }
     }
     if (tok1->varId() != tok2->varId() || !tok_str_eq || tok1->originalName() != tok2->originalName()) {
         if ((Token::Match(tok1,"<|>") && Token::Match(tok2,"<|>")) ||
             (Token::Match(tok1,"<=|>=") && Token::Match(tok2,"<=|>="))) {
-            return isSameExpression(cpp, macro, tok1->astOperand1(), tok2->astOperand2(), library, pure, followVar, errors) &&
-                   isSameExpression(cpp, macro, tok1->astOperand2(), tok2->astOperand1(), library, pure, followVar, errors);
+            return isSameExpression(macro, tok1->astOperand1(), tok2->astOperand2(), settings, pure, followVar, errors) &&
+                   isSameExpression(macro, tok1->astOperand2(), tok2->astOperand1(), settings, pure, followVar, errors);
         }
         const Token* condTok = nullptr;
         const Token* exprTok = nullptr;
@@ -1522,11 +1683,11 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
             const Token* varTok1 = nullptr;
             const Token* varTok2 = exprTok;
             const ValueFlow::Value* value = nullptr;
-            if (condTok->astOperand1()->hasKnownIntValue()) {
-                value = &condTok->astOperand1()->values().front();
+            if (const ValueFlow::Value* vi1 = condTok->astOperand1()->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+                value = vi1;
                 varTok1 = condTok->astOperand2();
-            } else if (condTok->astOperand2()->hasKnownIntValue()) {
-                value = &condTok->astOperand2()->values().front();
+            } else if (const ValueFlow::Value* vi2 = condTok->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+                value = vi2;
                 varTok1 = condTok->astOperand1();
             }
             const bool exprIsNot = Token::simpleMatch(exprTok, "!");
@@ -1544,29 +1705,17 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
                     compare = true;
                 }
             }
-            if (compare && astIsBoolLike(varTok1) && astIsBoolLike(varTok2))
-                return isSameExpression(cpp, macro, varTok1, varTok2, library, pure, followVar, errors);
+            if (compare && astIsBoolLike(varTok1, settings) && astIsBoolLike(varTok2, settings))
+                return isSameExpression(macro, varTok1, varTok2, settings, pure, followVar, errors);
 
         }
         return false;
     }
-    auto flagsDiffer = [](const Token* tok1, const Token* tok2, bool macro) {
-        if (macro && (tok1->isExpandedMacro() || tok2->isExpandedMacro() || tok1->isTemplateArg() || tok2->isTemplateArg()))
-            return true;
-        if (tok1->isComplex() != tok2->isComplex())
-            return true;
-        if (tok1->isLong() != tok2->isLong())
-            return true;
-        if (tok1->isUnsigned() != tok2->isUnsigned())
-            return true;
-        if (tok1->isSigned() != tok2->isSigned())
-            return true;
-        return false;
-    };
-    if (flagsDiffer(tok1, tok2, macro))
+
+    if (!compareTokenFlags(tok1, tok2, macro))
         return false;
 
-    if (pure && tok1->isName() && tok1->next()->str() == "(" && tok1->str() != "sizeof" && !(tok1->variable() && tok1 == tok1->variable()->nameToken())) {
+    if (pure && tok1->isName() && tok1->strAt(1) == "(" && tok1->str() != "sizeof" && !(tok1->variable() && tok1 == tok1->variable()->nameToken())) {
         if (!tok1->function()) {
             if (Token::simpleMatch(tok1->previous(), ".")) {
                 const Token *lhs = tok1->previous();
@@ -1576,14 +1725,12 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
                     return false;
                 const bool lhsIsConst = (lhs->variable() && lhs->variable()->isConst()) ||
                                         (lhs->valueType() && lhs->valueType()->constness > 0) ||
-                                        (Token::Match(lhs, "%var% . %name% (") && library.isFunctionConst(lhs->tokAt(2)));
+                                        (Token::Match(lhs, "%var% . %name% (") && settings.library.isFunctionConst(lhs->tokAt(2)));
                 if (!lhsIsConst)
                     return false;
             } else {
                 const Token * ftok = tok1;
-                if (Token::simpleMatch(tok1->previous(), "::"))
-                    ftok = tok1->previous();
-                if (!library.isFunctionConst(ftok) && !ftok->isAttributeConst() && !ftok->isAttributePure())
+                if (!settings.library.isFunctionConst(ftok) && !ftok->isAttributeConst() && !ftok->isAttributePure())
                     return false;
             }
         } else {
@@ -1593,11 +1740,11 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
         }
     }
     // templates/casts
-    if ((tok1->next() && tok1->next()->link() && Token::Match(tok1, "%name% <")) ||
-        (tok2->next() && tok2->next()->link() && Token::Match(tok2, "%name% <"))) {
+    if ((tok1->next() && tok1->linkAt(1) && Token::Match(tok1, "%name% <")) ||
+        (tok2->next() && tok2->linkAt(1) && Token::Match(tok2, "%name% <"))) {
 
         // non-const template function that is not a dynamic_cast => return false
-        if (pure && Token::simpleMatch(tok1->next()->link(), "> (") &&
+        if (pure && Token::simpleMatch(tok1->linkAt(1), "> (") &&
             !(tok1->function() && tok1->function()->isConst()) &&
             tok1->str() != "dynamic_cast")
             return false;
@@ -1608,7 +1755,7 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
         const Token *end1 = t1->link();
         const Token *end2 = t2->link();
         while (t1 && t2 && t1 != end1 && t2 != end2) {
-            if (t1->str() != t2->str() || flagsDiffer(t1, t2, macro))
+            if (t1->str() != t2->str() || !compareTokenFlags(t1, t2, macro))
                 return false;
             t1 = t1->next();
             t2 = t2->next();
@@ -1624,12 +1771,12 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
     // cast => assert that the casts are equal
     if (tok1->str() == "(" && tok1->previous() &&
         !tok1->previous()->isName() &&
-        !(tok1->previous()->str() == ">" && tok1->previous()->link())) {
+        !(tok1->strAt(-1) == ">" && tok1->linkAt(-1))) {
         const Token *t1 = tok1->next();
         const Token *t2 = tok2->next();
         while (t1 && t2 &&
                t1->str() == t2->str() &&
-               !flagsDiffer(t1, t2, macro) &&
+               compareTokenFlags(t1, t2, macro) &&
                (t1->isName() || t1->str() == "*")) {
             t1 = t1->next();
             t2 = t2->next();
@@ -1638,15 +1785,15 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
             return false;
     }
     bool noncommutativeEquals =
-        isSameExpression(cpp, macro, tok1->astOperand1(), tok2->astOperand1(), library, pure, followVar, errors);
+        isSameExpression(macro, tok1->astOperand1(), tok2->astOperand1(), settings, pure, followVar, errors);
     noncommutativeEquals = noncommutativeEquals &&
-                           isSameExpression(cpp, macro, tok1->astOperand2(), tok2->astOperand2(), library, pure, followVar, errors);
+                           isSameExpression(macro, tok1->astOperand2(), tok2->astOperand2(), settings, pure, followVar, errors);
 
     if (noncommutativeEquals)
         return true;
 
     // in c++, a+b might be different to b+a, depending on the type of a and b
-    if (cpp && tok1->str() == "+" && tok1->isBinaryOp()) {
+    if (tok1->isCpp() && tok1->str() == "+" && tok1->isBinaryOp()) {
         const ValueType* vt1 = tok1->astOperand1()->valueType();
         const ValueType* vt2 = tok1->astOperand2()->valueType();
         if (!(vt1 && (vt1->type >= ValueType::VOID || vt1->pointer) && vt2 && (vt2->type >= ValueType::VOID || vt2->pointer)))
@@ -1655,9 +1802,9 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2
 
     const bool commutative = tok1->isBinaryOp() && Token::Match(tok1, "%or%|%oror%|+|*|&|&&|^|==|!=");
     bool commutativeEquals = commutative &&
-                             isSameExpression(cpp, macro, tok1->astOperand2(), tok2->astOperand1(), library, pure, followVar, errors);
+                             isSameExpression(macro, tok1->astOperand2(), tok2->astOperand1(), settings, pure, followVar, errors);
     commutativeEquals = commutativeEquals &&
-                        isSameExpression(cpp, macro, tok1->astOperand1(), tok2->astOperand2(), library, pure, followVar, errors);
+                        isSameExpression(macro, tok1->astOperand1(), tok2->astOperand2(), settings, pure, followVar, errors);
 
 
     return commutativeEquals;
@@ -1681,12 +1828,12 @@ static bool isZeroBoundCond(const Token * const cond)
     return false;
 }
 
-bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token * const cond2, const Library& library, bool pure, bool followVar, ErrorPath* errors)
+bool isOppositeCond(bool isNot, const Token * const cond1, const Token * const cond2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors)
 {
     if (!cond1 || !cond2)
         return false;
 
-    if (isSameExpression(cpp, true, cond1, cond2, library, pure, followVar, errors))
+    if (isSameExpression(true, cond1, cond2, settings, pure, followVar, errors))
         return false;
 
     if (!isNot && cond1->str() == "&&" && cond2->str() == "&&") {
@@ -1696,8 +1843,8 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
             for (const Token* tok2: {
                 cond2->astOperand1(), cond2->astOperand2()
             }) {
-                if (isSameExpression(cpp, true, tok1, tok2, library, pure, followVar, errors)) {
-                    if (isOppositeCond(isNot, cpp, tok1->astSibling(), tok2->astSibling(), library, pure, followVar, errors))
+                if (isSameExpression(true, tok1, tok2, settings, pure, followVar, errors)) {
+                    if (isOppositeCond(isNot, tok1->astSibling(), tok2->astSibling(), settings, pure, followVar, errors))
                         return true;
                 }
             }
@@ -1715,40 +1862,39 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
             orCond = cond2;
             otherCond = cond1;
         }
-        return isOppositeCond(isNot, cpp, orCond->astOperand1(), otherCond, library, pure, followVar, errors) &&
-               isOppositeCond(isNot, cpp, orCond->astOperand2(), otherCond, library, pure, followVar, errors);
+        return isOppositeCond(isNot, orCond->astOperand1(), otherCond, settings, pure, followVar, errors) &&
+               isOppositeCond(isNot, orCond->astOperand2(), otherCond, settings, pure, followVar, errors);
     }
 
     if (cond1->str() == "!") {
         if (cond2->str() == "!=") {
             if (cond2->astOperand1() && cond2->astOperand1()->str() == "0")
-                return isSameExpression(cpp, true, cond1->astOperand1(), cond2->astOperand2(), library, pure, followVar, errors);
+                return isSameExpression(true, cond1->astOperand1(), cond2->astOperand2(), settings, pure, followVar, errors);
             if (cond2->astOperand2() && cond2->astOperand2()->str() == "0")
-                return isSameExpression(cpp, true, cond1->astOperand1(), cond2->astOperand1(), library, pure, followVar, errors);
+                return isSameExpression(true, cond1->astOperand1(), cond2->astOperand1(), settings, pure, followVar, errors);
         }
-        if (!isUsedAsBool(cond2))
+        if (!isUsedAsBool(cond2, settings))
             return false;
-        return isSameExpression(cpp, true, cond1->astOperand1(), cond2, library, pure, followVar, errors);
+        return isSameExpression(true, cond1->astOperand1(), cond2, settings, pure, followVar, errors);
     }
 
     if (cond2->str() == "!")
-        return isOppositeCond(isNot, cpp, cond2, cond1, library, pure, followVar, errors);
+        return isOppositeCond(isNot, cond2, cond1, settings, pure, followVar, errors);
 
     if (!isNot) {
         if (cond1->str() == "==" && cond2->str() == "==") {
-            if (isSameExpression(cpp, true, cond1->astOperand1(), cond2->astOperand1(), library, pure, followVar, errors))
+            if (isSameExpression(true, cond1->astOperand1(), cond2->astOperand1(), settings, pure, followVar, errors))
                 return isDifferentKnownValues(cond1->astOperand2(), cond2->astOperand2());
-            if (isSameExpression(cpp, true, cond1->astOperand2(), cond2->astOperand2(), library, pure, followVar, errors))
+            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(cpp,
-                             true,
+            isSameExpression(true,
                              cond1->astOperand1()->astOperand1(),
                              cond2->astOperand1()->astOperand1()->astOperand1(),
-                             library,
+                             settings,
                              pure,
                              followVar,
                              errors)) {
@@ -1757,11 +1903,10 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
 
         if (Library::isContainerYield(cond2, Library::Container::Yield::EMPTY, "empty") &&
             Library::isContainerYield(cond1->astOperand1(), Library::Container::Yield::SIZE, "size") &&
-            isSameExpression(cpp,
-                             true,
+            isSameExpression(true,
                              cond2->astOperand1()->astOperand1(),
                              cond1->astOperand1()->astOperand1()->astOperand1(),
-                             library,
+                             settings,
                              pure,
                              followVar,
                              errors)) {
@@ -1777,11 +1922,11 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
 
     // condition found .. get comparator
     std::string comp2;
-    if (isSameExpression(cpp, true, cond1->astOperand1(), cond2->astOperand1(), library, pure, followVar, errors) &&
-        isSameExpression(cpp, true, cond1->astOperand2(), cond2->astOperand2(), library, pure, followVar, errors)) {
+    if (isSameExpression(true, cond1->astOperand1(), cond2->astOperand1(), settings, pure, followVar, errors) &&
+        isSameExpression(true, cond1->astOperand2(), cond2->astOperand2(), settings, pure, followVar, errors)) {
         comp2 = cond2->str();
-    } else if (isSameExpression(cpp, true, cond1->astOperand1(), cond2->astOperand2(), library, pure, followVar, errors) &&
-               isSameExpression(cpp, true, cond1->astOperand2(), cond2->astOperand1(), library, pure, followVar, errors)) {
+    } else if (isSameExpression(true, cond1->astOperand1(), cond2->astOperand2(), settings, pure, followVar, errors) &&
+               isSameExpression(true, cond1->astOperand2(), cond2->astOperand1(), settings, pure, followVar, errors)) {
         comp2 = cond2->str();
         if (comp2[0] == '>')
             comp2[0] = '<';
@@ -1817,7 +1962,7 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
         if (!expr1 || !value1 || !expr2 || !value2) {
             return false;
         }
-        if (!isSameExpression(cpp, true, expr1, expr2, library, pure, followVar, errors))
+        if (!isSameExpression(true, expr1, expr2, settings, pure, followVar, errors))
             return false;
 
         const ValueFlow::Value &rhsValue1 = value1->values().front();
@@ -1845,16 +1990,16 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
                         )));
 }
 
-bool isOppositeExpression(bool cpp, const Token * const tok1, const Token * const tok2, const Library& library, bool pure, bool followVar, ErrorPath* errors)
+bool isOppositeExpression(const Token * const tok1, const Token * const tok2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors)
 {
     if (!tok1 || !tok2)
         return false;
-    if (isOppositeCond(true, cpp, tok1, tok2, library, pure, followVar, errors))
+    if (isOppositeCond(true, tok1, tok2, settings, pure, followVar, errors))
         return true;
     if (tok1->isUnaryOp("-") && !(tok2->astParent() && tok2->astParent()->tokType() == Token::eBitOp))
-        return isSameExpression(cpp, true, tok1->astOperand1(), tok2, library, pure, followVar, errors);
+        return isSameExpression(true, tok1->astOperand1(), tok2, settings, pure, followVar, errors);
     if (tok2->isUnaryOp("-") && !(tok2->astParent() && tok2->astParent()->tokType() == Token::eBitOp))
-        return isSameExpression(cpp, true, tok2->astOperand1(), tok1, library, pure, followVar, errors);
+        return isSameExpression(true, tok2->astOperand1(), tok1, settings, pure, followVar, errors);
     return false;
 }
 
@@ -1869,7 +2014,7 @@ static bool functionModifiesArguments(const Function* f)
 
 bool isConstFunctionCall(const Token* ftok, const Library& library)
 {
-    if (isSizeOfEtc(ftok))
+    if (isUnevaluated(ftok))
         return true;
     if (!Token::Match(ftok, "%name% ("))
         return false;
@@ -1914,7 +2059,7 @@ bool isConstFunctionCall(const Token* ftok, const Library& library)
             return false;
         if (container->getYield(ftok->str()) != Library::Container::Yield::NO_YIELD)
             return true;
-        if (container->getAction(ftok->str()) == Library::Container::Action::FIND)
+        if (container->getAction(ftok->str()) == Library::Container::Action::FIND_CONST)
             return true;
         return false;
     } else if (const Library::Function* lf = library.getFunction(ftok)) {
@@ -1922,7 +2067,7 @@ bool isConstFunctionCall(const Token* ftok, const Library& library)
             return true;
         if (lf->containerYield != Library::Container::Yield::NO_YIELD)
             return true;
-        if (lf->containerAction == Library::Container::Action::FIND)
+        if (lf->containerAction == Library::Container::Action::FIND_CONST)
             return true;
         return false;
     } else {
@@ -1947,13 +2092,13 @@ bool isConstFunctionCall(const Token* ftok, const Library& library)
     return true;
 }
 
-bool isConstExpression(const Token *tok, const Library& library, bool cpp)
+bool isConstExpression(const Token *tok, const Library& library)
 {
     if (!tok)
         return true;
     if (tok->variable() && tok->variable()->isVolatile())
         return false;
-    if (tok->isName() && tok->next()->str() == "(") {
+    if (tok->isName() && tok->strAt(1) == "(") {
         if (!isConstFunctionCall(tok, library))
             return false;
     }
@@ -1961,17 +2106,19 @@ bool isConstExpression(const Token *tok, const Library& library, bool cpp)
         return false;
     if (tok->isAssignmentOp())
         return false;
-    if (isLikelyStreamRead(cpp, tok))
+    if (isLikelyStreamRead(tok))
         return false;
     // bailout when we see ({..})
     if (tok->str() == "{")
         return false;
-    return isConstExpression(tok->astOperand1(), library, cpp) && isConstExpression(tok->astOperand2(), library, cpp);
+    return isConstExpression(tok->astOperand1(), library) && isConstExpression(tok->astOperand2(), library);
 }
 
-bool isWithoutSideEffects(bool cpp, const Token* tok, bool checkArrayAccess, bool checkReference)
+bool isWithoutSideEffects(const Token* tok, bool checkArrayAccess, bool checkReference)
 {
-    if (!cpp)
+    if (!tok)
+        return true;
+    if (!tok->isCpp())
         return true;
 
     while (tok && tok->astOperand2() && tok->astOperand2()->str() != "(")
@@ -1994,7 +2141,7 @@ bool isUniqueExpression(const Token* tok)
             return true;
         const std::string returnType = fun->retType ? fun->retType->name() : fun->retDef->stringifyList(fun->tokenDef);
         if (!std::all_of(scope->functionList.begin(), scope->functionList.end(), [&](const Function& f) {
-            if (f.type != Function::eFunction)
+            if (f.type != FunctionType::eFunction)
                 return true;
 
             const std::string freturnType = f.retType ? f.retType->name() : f.retDef->stringifyList(f.returnDefEnd());
@@ -2033,25 +2180,25 @@ bool isUniqueExpression(const Token* tok)
     return isUniqueExpression(tok->astOperand2());
 }
 
-static bool isEscaped(const Token* tok, bool functionsScope, const Library* library)
+static bool isEscaped(const Token* tok, bool functionsScope, const Library& library)
 {
-    if (library && library->isnoreturn(tok))
+    if (library.isnoreturn(tok))
         return true;
     if (functionsScope)
         return Token::simpleMatch(tok, "throw");
     return Token::Match(tok, "return|throw");
 }
 
-static bool isEscapedOrJump(const Token* tok, bool functionsScope, const Library* library)
+static bool isEscapedOrJump(const Token* tok, bool functionsScope, const Library& library)
 {
-    if (library && library->isnoreturn(tok))
+    if (library.isnoreturn(tok))
         return true;
     if (functionsScope)
         return Token::simpleMatch(tok, "throw");
     return Token::Match(tok, "return|goto|throw|continue|break");
 }
 
-bool isEscapeFunction(const Token* ftok, const Library* library)
+bool isEscapeFunction(const Token* ftok, const Library& library)
 {
     if (!Token::Match(ftok, "%name% ("))
         return false;
@@ -2061,18 +2208,18 @@ bool isEscapeFunction(const Token* ftok, const Library* library)
             return true;
         if (function->isAttributeNoreturn())
             return true;
-    } else if (library) {
-        if (library->isnoreturn(ftok))
+    } else {
+        if (library.isnoreturn(ftok))
             return true;
     }
     return false;
 }
 
-static bool hasNoreturnFunction(const Token* tok, const Library* library, const Token** unknownFunc)
+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) {
@@ -2082,12 +2229,12 @@ static bool hasNoreturnFunction(const Token* tok, const Library* library, const
                 return true;
             if (function->isAttributeNoreturn())
                 return true;
-        } else if (library && library->isnoreturn(ftok)) {
+        } else if (library.isnoreturn(ftok)) {
             return true;
         } else if (Token::Match(ftok, "exit|abort")) {
             return true;
         }
-        if (unknownFunc && !function && library && library->functions.count(library->getFunctionName(ftok)) == 0)
+        if (unknownFunc && !function && library.functions().count(library.getFunctionName(ftok)) == 0)
             *unknownFunc = ftok;
         return false;
     }
@@ -2098,7 +2245,7 @@ static bool hasNoreturnFunction(const Token* tok, const Library* library, const
     return false;
 }
 
-bool isReturnScope(const Token* const endToken, const Library* library, const Token** unknownFunc, bool functionScope)
+bool isReturnScope(const Token* const endToken, const Library& library, const Token** unknownFunc, bool functionScope)
 {
     if (!endToken || endToken->str() != "}")
         return false;
@@ -2132,8 +2279,8 @@ bool isReturnScope(const Token* const endToken, const Library* library, const To
                 *unknownFunc = prev->previous();
             return false;
         }
-        if (Token::simpleMatch(prev->previous(), ") ;") && prev->previous()->link() &&
-            isEscaped(prev->previous()->link()->astTop(), functionScope, library))
+        if (Token::simpleMatch(prev->previous(), ") ;") && prev->linkAt(-1) &&
+            isEscaped(prev->linkAt(-1)->astTop(), functionScope, library))
             return true;
         if (isEscaped(prev->previous()->astTop(), functionScope, library))
             return true;
@@ -2146,7 +2293,7 @@ bool isReturnScope(const Token* const endToken, const Library* library, const To
     return false;
 }
 
-bool isWithinScope(const Token* tok, const Variable* var, Scope::ScopeType type)
+bool isWithinScope(const Token* tok, const Variable* var, ScopeType type)
 {
     if (!tok || !var)
         return false;
@@ -2159,7 +2306,7 @@ bool isWithinScope(const Token* tok, const Variable* var, Scope::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 Settings &settings, bool *inconclusive)
 {
     if (!tok)
         return false;
@@ -2183,12 +2330,12 @@ bool isScopeBracket(const Token* tok)
 }
 
 template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-T* getTokenArgumentFunctionImpl(T* tok, int& argn)
+static T* getTokenArgumentFunctionImpl(T* tok, int& argn)
 {
     argn = -1;
     {
         T* parent = tok->astParent();
-        if (parent && parent->isUnaryOp("&"))
+        if (parent && (parent->isUnaryOp("&") || parent->isIncDecOp()))
             parent = parent->astParent();
         while (parent && parent->isCast())
             parent = parent->astParent();
@@ -2196,7 +2343,7 @@ T* getTokenArgumentFunctionImpl(T* tok, int& argn)
             parent = parent->astParent();
 
         // passing variable to subfunction?
-        if (Token::Match(parent, "[(,{]"))
+        if (Token::Match(parent, "[[(,{.]") || Token::Match(parent, "%oror%|&&") || (parent && parent->isUnaryOp("*")))
             ;
         else if (Token::simpleMatch(parent, ":")) {
             while (Token::Match(parent, "[?:]"))
@@ -2232,6 +2379,8 @@ T* getTokenArgumentFunctionImpl(T* tok, int& argn)
         tok = tok->astOperand1();
     while (tok && (tok->isUnaryOp("*") || tok->str() == "["))
         tok = tok->astOperand1();
+    if (Token::Match(tok, ". * %name%")) // bailout for pointer to member
+        return tok->tokAt(2);
     while (Token::simpleMatch(tok, "."))
         tok = tok->astOperand2();
     while (Token::simpleMatch(tok, "::")) {
@@ -2264,28 +2413,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) {
@@ -2299,8 +2448,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)
@@ -2332,7 +2482,39 @@ static bool isArray(const Token* tok)
     return false;
 }
 
-bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Settings *settings, bool *inconclusive)
+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)
+        return false;
+    if (tok->isLiteral() || tok->isKeyword() || tok->isStandardType() || tok->isEnumerator())
+        return false;
+    if (Token::Match(tok, ",|;|:|]|)|}"))
+        return false;
+    if (Token::simpleMatch(tok, "[ ]"))
+        return false;
+    if (tok->previous() && tok->previous()->isKeyword() && Token::Match(tok->previous(), "%name% ("))
+        return false;
+    if (tok->link() && Token::Match(tok, "<|>"))
+        return false;
+    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())
+            return false;
+    }
+    return true;
+}
+
+bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Settings &settings, bool *inconclusive)
 {
     if (!tok)
         return false;
@@ -2347,13 +2529,20 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
     if (addressOf)
         indirect++;
 
+    const bool deref = tok->astParent() && tok->astParent()->isUnaryOp("*");
+    if (deref && indirect > 0)
+        indirect--;
+
+    if (indirect == 1 && tok->isCpp() && tok->tokAt(-1) && Token::simpleMatch(tok->tokAt(-2), "new (")) // placement new TODO: fix AST
+        return true;
+
     int argnr;
     tok = getTokenArgumentFunction(tok, argnr);
     if (!tok)
         return false; // not a function => variable not changed
     if (Token::simpleMatch(tok, "{") && isTrivialConstructor(tok))
         return false;
-    if (tok->isKeyword() && !isCPPCastKeyword(tok) && tok->str().compare(0,8,"operator") != 0)
+    if (tok->isKeyword() && !isCPPCastKeyword(tok) && !startsWith(tok->str(),"operator"))
         return false;
     // A functional cast won't modify the variable
     if (Token::Match(tok, "%type% (|{") && tok->tokType() == Token::eType && astIsPrimitive(tok->next()))
@@ -2364,29 +2553,27 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
     const bool possiblyPassedByReference = (parenTok->next() == tok1 || Token::Match(tok1->previous(), ", %name% [,)}]"));
 
     if (!tok->function() && !tok->variable() && tok->isName()) {
-        if (settings) {
-            // 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);
-            if (argDirection == Library::ArgumentChecks::Direction::DIR_IN)
-                return false;
+        // 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);
+        if (argDirection == Library::ArgumentChecks::Direction::DIR_IN)
+            return false;
 
-            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;
-            }
-            if (Token::simpleMatch(tok->tokAt(-2), "std :: tie"))
+        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;
-            // if the library says 0 is invalid
-            // => it is assumed that parameter is an in parameter (TODO: this is a bad heuristic)
-            if (indirect == 0 && requireNonNull)
-                return false;
         }
+        if (Token::simpleMatch(tok->tokAt(-2), "std :: tie"))
+            return true;
+        // if the library says 0 is invalid
+        // => it is assumed that parameter is an in parameter (TODO: this is a bad heuristic)
+        if (indirect == 0 && requireNonNull)
+            return false;
         // possible pass-by-reference => inconclusive
         if (possiblyPassedByReference) {
             if (inconclusive != nullptr)
@@ -2397,6 +2584,11 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
         return true;
     }
 
+    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;
+    }
+
     std::vector<const Variable*> args = getArgumentVars(tok, argnr);
     bool conclusive = false;
     for (const Variable *arg:args) {
@@ -2414,15 +2606,33 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, const Setti
         if (!arg->isConst() && arg->isReference())
             return true;
     }
+    if (addressOf && tok1->astParent()->isUnaryOp("&")) {
+        const Token* castToken = tok1->astParent();
+        while (castToken->astParent()->isCast())
+            castToken = castToken->astParent();
+        if (Token::Match(castToken->astParent(), ",|(") &&
+            castToken->valueType() &&
+            castToken->valueType()->isIntegral() &&
+            castToken->valueType()->pointer == 0)
+            return true;
+    }
     if (!conclusive && inconclusive) {
         *inconclusive = true;
     }
     return false;
 }
 
-bool isVariableChanged(const Token *tok, int indirect, const Settings *settings, bool cpp, int depth)
+static bool hasOverloadedMemberAccess(const Token* tok)
 {
-    if (!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))
         return false;
 
     if (indirect == 0 && isConstVarExpression(tok))
@@ -2430,11 +2640,11 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
 
     const Token *tok2 = tok;
     int derefs = 0;
-    while (Token::simpleMatch(tok2->astParent(), "*") ||
-           (Token::simpleMatch(tok2->astParent(), ".") && !Token::simpleMatch(tok2->astParent()->astParent(), "(")) ||
+    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() == "->")))
+        if (tok2->astParent() && (tok2->astParent()->isUnaryOp("*") || (astIsLHS(tok2) && tok2->astParent()->originalName() == "->" && !hasOverloadedMemberAccess(tok2))))
             derefs++;
         if (derefs > indirect)
             break;
@@ -2455,7 +2665,7 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
            (Token::simpleMatch(tok2->astParent(), ":") && Token::simpleMatch(tok2->astParent()->astParent(), "?")))
         tok2 = tok2->astParent();
 
-    if (tok2->astParent() && tok2->astParent()->tokType() == Token::eIncDecOp)
+    if (indirect == 0 && tok2->astParent() && tok2->astParent()->tokType() == Token::eIncDecOp)
         return true;
 
     auto skipRedundantPtrOp = [](const Token* tok, const Token* parent) {
@@ -2471,12 +2681,13 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
     tok2 = skipRedundantPtrOp(tok2, tok2->astParent());
 
     if (tok2->astParent() && tok2->astParent()->isAssignmentOp()) {
-        if (tok2 == tok2->astParent()->astOperand1())
+        if (astIsLHS(tok2))
             return true;
         // Check if assigning to a non-const lvalue
         const Variable * var = getLHSVariable(tok2->astParent());
-        if (var && var->isReference() && !var->isConst() && var->nameToken() && var->nameToken()->next() == tok2->astParent()) {
-            if (!var->isLocal() || isVariableChanged(var, settings, cpp, depth - 1))
+        if (var && var->isReference() && !var->isConst() && var->nameToken() &&
+            var->nameToken()->next() == tok2->astParent()) {
+            if (!var->isLocal() || isVariableChanged(var, settings, depth - 1))
                 return true;
         }
     }
@@ -2493,10 +2704,10 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
             return false;
     }
 
-    if (cpp && Token::Match(tok2->astParent(), ">>|&") && astIsRHS(tok2) && isLikelyStreamRead(cpp, tok2->astParent()))
+    if (tok2->isCpp() && Token::Match(tok2->astParent(), ">>|&") && astIsRHS(tok2) && isLikelyStreamRead(tok2->astParent()))
         return true;
 
-    if (isLikelyStream(cpp, tok2))
+    if (isLikelyStream(tok2))
         return true;
 
     // Member function call
@@ -2506,16 +2717,19 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
         if (indirect == 0 && astIsPointer(tok))
             return false;
 
-        const Token *ftok = tok->tokAt(2);
-        if (astIsContainer(tok) && vt && vt->container) {
-            const Library::Container* c = vt->container;
+        const Token *ftok = tok2->astParent()->astOperand2();
+        const Token* const ctok = tok2->str() == "." ? tok2->astOperand2() : tok2;
+        if (astIsContainer(ctok) && ctok->valueType() && ctok->valueType()->container) {
+            const Library::Container* c = ctok->valueType()->container;
             const Library::Container::Action action = c->getAction(ftok->str());
             if (contains({Library::Container::Action::INSERT,
                           Library::Container::Action::ERASE,
+                          Library::Container::Action::APPEND,
                           Library::Container::Action::CHANGE,
                           Library::Container::Action::CHANGE_CONTENT,
                           Library::Container::Action::CHANGE_INTERNAL,
                           Library::Container::Action::CLEAR,
+                          Library::Container::Action::FIND,
                           Library::Container::Action::PUSH,
                           Library::Container::Action::POP,
                           Library::Container::Action::RESIZE},
@@ -2524,14 +2738,14 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
             const Library::Container::Yield yield = c->getYield(ftok->str());
             // If accessing element check if the element is changed
             if (contains({Library::Container::Yield::ITEM, Library::Container::Yield::AT_INDEX}, yield))
-                return isVariableChanged(ftok->next(), indirect, settings, cpp, depth - 1);
+                return isVariableChanged(ftok->next(), indirect, settings, depth - 1);
 
             if (contains({Library::Container::Yield::BUFFER,
                           Library::Container::Yield::BUFFER_NT,
                           Library::Container::Yield::START_ITERATOR,
                           Library::Container::Yield::ITERATOR},
                          yield)) {
-                return isVariableChanged(ftok->next(), indirect + 1, settings, cpp, depth - 1);
+                return isVariableChanged(ftok->next(), indirect + 1, settings, depth - 1);
             }
             if (contains({Library::Container::Yield::SIZE,
                           Library::Container::Yield::EMPTY,
@@ -2540,7 +2754,7 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
                 return false;
             }
         }
-        if ((settings && settings->library.isFunctionConst(ftok)) || (astIsSmartPointer(tok) && ftok->str() == "get")) // TODO: replace with action/yield?
+        if (settings.library.isFunctionConst(ftok) || (astIsSmartPointer(tok) && ftok->str() == "get")) // TODO: replace with action/yield?
             return false;
 
         const Function * fun = ftok->function();
@@ -2556,6 +2770,8 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
         if (!ftok->function() || !ftok->function()->isConst())
             return true;
     }
+    if (Token::Match(tok2->astParent(), ". * %name%")) // bailout
+        return true;
 
     if (Token::simpleMatch(tok2, "[") && astIsContainer(tok) && vt && vt->container && vt->container->stdAssociativeLike)
         return true;
@@ -2565,11 +2781,16 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
         ftok = ftok->astParent();
 
     if (ftok && Token::Match(ftok->link(), ")|} !!{")) {
+        if (ftok->str() == "(" && Token::simpleMatch(ftok->astOperand1(), "[")) // operator() on array element, bail out
+            return true;
         const Token * ptok = tok2;
         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, indirect, settings, &inconclusive);
+        bool isChanged = isVariableChangedByFunctionCall(ptok, pindirect, settings, &inconclusive);
         isChanged |= inconclusive;
         if (isChanged)
             return true;
@@ -2578,12 +2799,12 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
     const Token *parent = tok2->astParent();
     while (Token::Match(parent, ".|::"))
         parent = parent->astParent();
-    if (parent && parent->tokType() == Token::eIncDecOp)
+    if (parent && parent->tokType() == Token::eIncDecOp && (indirect == 0 || tok2 != tok))
         return true;
 
     // structured binding, nonconst reference variable in lhs
     if (Token::Match(tok2->astParent(), ":|=") && tok2 == tok2->astParent()->astOperand2() && Token::simpleMatch(tok2->astParent()->previous(), "]")) {
-        const Token *typeStart = tok2->astParent()->previous()->link()->previous();
+        const Token *typeStart = tok2->astParent()->linkAt(-1)->previous();
         if (Token::simpleMatch(typeStart, "&"))
             typeStart = typeStart->previous();
         if (typeStart && Token::Match(typeStart->previous(), "[;{}(] auto &| [")) {
@@ -2607,7 +2828,7 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
         const Variable * loopVar = varTok->variable();
         if (!loopVar)
             return false;
-        if (!loopVar->isConst() && loopVar->isReference() && isVariableChanged(loopVar, settings, cpp, depth - 1))
+        if (!loopVar->isConst() && loopVar->isReference() && isVariableChanged(loopVar, settings, depth - 1))
             return true;
         return false;
     }
@@ -2615,7 +2836,7 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
     if (indirect > 0) {
         // check for `*(ptr + 1) = new_value` case
         parent = tok2->astParent();
-        while (parent && parent->isArithmeticalOp() && parent->isBinaryOp()) {
+        while (parent && ((parent->isArithmeticalOp() && parent->isBinaryOp()) || parent->isIncDecOp())) {
             parent = parent->astParent();
         }
         if (Token::simpleMatch(parent, "*")) {
@@ -2629,14 +2850,14 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
     return false;
 }
 
-bool isVariableChanged(const Token *start, const Token *end, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth)
+bool isVariableChanged(const Token *start, const Token *end, const nonneg int exprid, bool globalvar, const Settings &settings, int depth)
 {
-    return findVariableChanged(start, end, 0, exprid, globalvar, settings, cpp, depth) != nullptr;
+    return findVariableChanged(start, end, 0, exprid, globalvar, settings, depth) != nullptr;
 }
 
-bool isVariableChanged(const Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth)
+bool isVariableChanged(const Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings &settings, int depth)
 {
-    return findVariableChanged(start, end, indirect, exprid, globalvar, settings, cpp, depth) != nullptr;
+    return findVariableChanged(start, end, indirect, exprid, globalvar, settings, depth) != nullptr;
 }
 
 const Token* findExpression(const Token* start, const nonneg int exprid)
@@ -2655,19 +2876,39 @@ const Token* findExpression(const Token* start, const nonneg int exprid)
     return nullptr;
 }
 
-// Thread-unsafe memoization
-template<class F, class R=decltype(std::declval<F>()())>
-static std::function<R()> memoize(F f)
+const Token* findEscapeStatement(const Scope* scope, const Library& library)
 {
-    bool init = false;
-    R result{};
-    return [=]() mutable -> R {
-        if (init)
-            return result;
-        result = f();
-        init = true;
-        return result;
-    };
+    if (!scope)
+        return nullptr;
+    for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
+        const Scope* escapeScope = tok->scope();
+        if (!escapeScope->isExecutable()) { // skip type definitions
+            tok = escapeScope->bodyEnd;
+            continue;
+        }
+        if (const Token* lambdaEnd = findLambdaEndToken(tok)) { // skip lambdas
+            tok = lambdaEnd;
+            continue;
+        }
+        if (!tok->isName())
+            continue;
+        if (isEscapeFunction(tok, library))
+            return tok;
+        if (!tok->isKeyword())
+            continue;
+        if (Token::Match(tok, "goto|return|throw")) // TODO: check try/catch, labels?
+            return tok;
+        if (!Token::Match(tok, "break|continue"))
+            continue;
+        const bool isBreak = tok->str()[0] == 'b';
+        while (escapeScope && escapeScope != scope) {
+            if (escapeScope->isLoopScope() || (isBreak && escapeScope->type == ScopeType::eSwitch))
+                return nullptr;
+            escapeScope = escapeScope->nestedIn;
+        }
+        return tok;
+    }
+    return nullptr;
 }
 
 template<class F,
@@ -2678,70 +2919,84 @@ static bool isExpressionChangedAt(const F& getExprTok,
                                   int indirect,
                                   const nonneg int exprid,
                                   bool globalvar,
-                                  const Settings* settings,
-                                  bool cpp,
+                                  const Settings& settings,
                                   int depth)
 {
     if (depth < 0)
         return true;
-    if (tok->exprId() != exprid) {
-        if (globalvar && !tok->isKeyword() && Token::Match(tok, "%name% (") && !(tok->function() && tok->function()->isAttributePure()))
-            // TODO: Is global variable really changed by function call?
-            return true;
+    if (!isMutableExpression(tok))
+        return false;
+    if (tok->exprId() != exprid || (!tok->varId() && !tok->isName())) {
+        if (globalvar && Token::Match(tok, "%name% (") &&
+            (!(tok->function() && (tok->function()->isAttributePure() || tok->function()->isAttributeConst())))) {
+            if (!Token::simpleMatch(tok->astParent(), "."))
+                return true;
+            const auto yield = astContainerYield(tok->astParent()->astOperand1(), settings.library);
+            if (yield != Library::Container::Yield::SIZE && yield != Library::Container::Yield::EMPTY &&
+                yield != Library::Container::Yield::BUFFER && yield != Library::Container::Yield::BUFFER_NT)
+                // TODO: Is global variable really changed by function call?
+                return true;
+        }
+        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)
+        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);
+            aliased = isAliasOf(tok, expr, &i);
         if (!aliased)
             return false;
-        if (isVariableChanged(tok, indirect + 1, settings, cpp, 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% ("))
             return true;
         return false;
     }
-    return (isVariableChanged(tok, indirect, settings, cpp, depth));
+    return (isVariableChanged(tok, indirect, settings, depth));
 }
 
 bool isExpressionChangedAt(const Token* expr,
                            const Token* tok,
                            int indirect,
                            bool globalvar,
-                           const Settings* settings,
-                           bool cpp,
+                           const Settings& settings,
                            int depth)
 {
     return isExpressionChangedAt([&] {
         return expr;
-    }, tok, indirect, expr->exprId(), globalvar, settings, cpp, depth);
+    }, tok, indirect, expr->exprId(), globalvar, settings, depth);
 }
 
-Token* findVariableChanged(Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth)
+Token* findVariableChanged(Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings &settings, int depth)
 {
     if (!precedes(start, end))
         return nullptr;
     if (depth < 0)
         return start;
-    auto getExprTok = memoize([&] {
+    auto getExprTok = utils::memoize([&] {
         return findExpression(start, exprid);
     });
     for (Token *tok = start; tok != end; tok = tok->next()) {
-        if (isExpressionChangedAt(getExprTok, tok, indirect, exprid, globalvar, settings, cpp, depth))
+        if (isExpressionChangedAt(getExprTok, tok, indirect, exprid, globalvar, settings, depth))
             return tok;
     }
     return nullptr;
 }
 
-const Token* findVariableChanged(const Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth)
+const Token* findVariableChanged(const Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings &settings, int depth)
 {
-    return findVariableChanged(const_cast<Token*>(start), end, indirect, exprid, globalvar, settings, cpp, depth);
+    return findVariableChanged(const_cast<Token*>(start), end, indirect, exprid, globalvar, settings, depth);
 }
 
-bool isVariableChanged(const Variable * var, const Settings *settings, bool cpp, int depth)
+bool isVariableChanged(const Variable * var, const Settings &settings, int depth)
 {
     if (!var)
         return false;
@@ -2752,15 +3007,19 @@ bool isVariableChanged(const Variable * var, const Settings *settings, bool cpp,
         return false;
     if (Token::Match(start, "; %varid% =", var->declarationId()))
         start = start->tokAt(2);
-    return isExpressionChanged(var->nameToken(), start->next(), var->scope()->bodyEnd, settings, cpp, depth);
+    if (Token::simpleMatch(start, "=")) {
+        const Token* next = nextAfterAstRightmostLeafGeneric(start);
+        if (next)
+            start = next;
+    }
+    return findExpressionChanged(var->nameToken(), start->next(), var->scope()->bodyEnd, settings, depth);
 }
 
 bool isVariablesChanged(const Token* start,
                         const Token* end,
                         int indirect,
                         const std::vector<const Variable*> &vars,
-                        const Settings* settings,
-                        bool cpp)
+                        const Settings& settings)
 {
     std::set<int> varids;
     std::transform(vars.cbegin(), vars.cend(), std::inserter(varids, varids.begin()), [](const Variable* var) {
@@ -2769,57 +3028,66 @@ bool isVariablesChanged(const Token* start,
     const bool globalvar = std::any_of(vars.cbegin(), vars.cend(), [](const Variable* var) {
         return var->isGlobal();
     });
-    for (const Token* tok = start; tok != end; tok = tok->next()) {
+    for (const Token* tok = start; tok && tok != end; tok = tok->next()) {
         if (tok->varId() == 0 || varids.count(tok->varId()) == 0) {
             if (globalvar && Token::Match(tok, "%name% ("))
                 // TODO: Is global variable really changed by function call?
                 return true;
             continue;
         }
-        if (isVariableChanged(tok, indirect, settings, cpp))
+        if (isVariableChanged(tok, indirect, settings))
             return true;
     }
     return false;
 }
 
-bool isThisChanged(const Token* tok, int indirect, const Settings* settings, bool cpp)
+bool isThisChanged(const Token* tok, int indirect, const Settings& settings)
 {
     if ((Token::Match(tok->previous(), "%name% (") && !Token::simpleMatch(tok->astOperand1(), ".")) ||
         Token::Match(tok->tokAt(-3), "this . %name% (")) {
         if (tok->previous()->function()) {
             return (!tok->previous()->function()->isConst() && !tok->previous()->function()->isStatic());
         }
-        if (!tok->previous()->isKeyword()) {
+        if (!tok->previous()->isKeyword() || tok->previous()->isOperatorKeyword()) {
             return true;
         }
     }
-    if (isVariableChanged(tok, indirect, settings, cpp))
+    if (isVariableChanged(tok, indirect, settings))
         return true;
     return false;
 }
 
-bool isThisChanged(const Token* start, const Token* end, int indirect, const Settings* settings, bool cpp)
+static const Token* findThisChanged(const Token* start, const Token* end, int indirect, const Settings& settings)
 {
     if (!precedes(start, end))
-        return false;
+        return nullptr;
     for (const Token* tok = start; tok != end; tok = tok->next()) {
         if (!exprDependsOnThis(tok))
             continue;
-        if (isThisChanged(tok, indirect, settings, cpp))
-            return true;
+        if (isThisChanged(tok, indirect, settings))
+            return tok;
     }
-    return false;
+    return nullptr;
 }
 
-bool isExpressionChanged(const Token* expr, const Token* start, const Token* end, const Settings* settings, bool cpp, int depth)
+template<class Find>
+static const Token* findExpressionChangedImpl(const Token* expr,
+                                              const Token* start,
+                                              const Token* end,
+                                              const Settings& settings,
+                                              int depth,
+                                              Find find)
 {
     if (depth < 0)
-        return true;
+        return start;
     if (!precedes(start, end))
-        return false;
-    const Token* result = findAstNode(expr, [&](const Token* tok) {
-        if (exprDependsOnThis(tok) && isThisChanged(start, end, false, settings, cpp)) {
-            return true;
+        return nullptr;
+    const Token* result = nullptr;
+    findAstNode(expr, [&](const Token* tok) {
+        if (exprDependsOnThis(tok)) {
+            result = findThisChanged(start, end, /*indirect*/ 0, settings);
+            if (result)
+                return true;
         }
         bool global = false;
         if (tok->variable()) {
@@ -2831,16 +3099,23 @@ bool isExpressionChanged(const Token* expr, const Token* start, const Token* end
             global = true;
         }
 
-        if (tok->exprId() > 0) {
-            for (const Token* tok2 = start; tok2 != end; tok2 = tok2->next()) {
+        if (tok->exprId() > 0 || global) {
+            const Token* modifedTok = find(start, end, [&](const Token* tok2) {
                 int indirect = 0;
                 if (const ValueType* vt = tok->valueType()) {
                     indirect = vt->pointer;
                     if (vt->type == ValueType::ITERATOR)
                         ++indirect;
                 }
-                if (isExpressionChangedAt(tok, tok2, indirect, global, settings, cpp, depth))
-                    return true;
+                for (int i = 0; i <= indirect; ++i) {
+                    if (isExpressionChangedAt(tok, tok2, i, global, settings, depth))
+                        return true;
+                }
+                return false;
+            });
+            if (modifedTok) {
+                result = modifedTok;
+                return true;
             }
         }
         return false;
@@ -2848,11 +3123,57 @@ bool isExpressionChanged(const Token* expr, const Token* start, const Token* end
     return result;
 }
 
+namespace {
+    struct ExpressionChangedSimpleFind {
+        template<class F>
+        const Token* operator()(const Token* start, const Token* end, F f) const
+        {
+            return findToken(start, end, f);
+        }
+    };
+
+    struct ExpressionChangedSkipDeadCode {
+        const Library& library;
+        const std::function<std::vector<MathLib::bigint>(const Token* tok)>* evaluate;
+        ExpressionChangedSkipDeadCode(const Library& library,
+                                      const std::function<std::vector<MathLib::bigint>(const Token* tok)>& evaluate)
+            : library(library), evaluate(&evaluate)
+        {}
+        template<class F>
+        const Token* operator()(const Token* start, const Token* end, F f) const
+        {
+            return findTokenSkipDeadCode(library, start, end, std::move(f), *evaluate);
+        }
+    };
+}
+
+const Token* findExpressionChanged(const Token* expr,
+                                   const Token* start,
+                                   const Token* end,
+                                   const Settings& settings,
+                                   int depth)
+{
+    return findExpressionChangedImpl(expr, start, end, settings, depth, ExpressionChangedSimpleFind{});
+}
+
+const Token* findExpressionChangedSkipDeadCode(const Token* expr,
+                                               const Token* start,
+                                               const Token* end,
+                                               const Settings& settings,
+                                               const std::function<std::vector<MathLib::bigint>(const Token* tok)>& evaluate,
+                                               int depth)
+{
+    return findExpressionChangedImpl(
+        expr, start, end, settings, depth, ExpressionChangedSkipDeadCode{settings.library, evaluate});
+}
+
 const Token* getArgumentStart(const Token* ftok)
 {
     const Token* tok = ftok;
-    if (Token::Match(tok, "%name% (|{"))
+    if (Token::Match(tok, "%name% (|{|)"))
         tok = ftok->next();
+    while (Token::simpleMatch(tok, ")"))
+        tok = tok->next();
     if (!Token::Match(tok, "(|{|["))
         return nullptr;
     const Token* startTok = tok->astOperand2();
@@ -2871,7 +3192,7 @@ int numberOfArgumentsWithoutAst(const Token* start)
     const Token* openBracket = start->next();
     while (Token::simpleMatch(openBracket, ")"))
         openBracket = openBracket->next();
-    if (openBracket && openBracket->str()=="(" && openBracket->next() && openBracket->next()->str()!=")") {
+    if (openBracket && openBracket->str()=="(" && openBracket->next() && openBracket->strAt(1)!=")") {
         const Token* argument=openBracket->next();
         while (argument) {
             ++arguments;
@@ -2920,7 +3241,7 @@ const Token* getIteratorExpression(const Token* tok)
     return nullptr;
 }
 
-bool isIteratorPair(std::vector<const Token*> args)
+bool isIteratorPair(const std::vector<const Token*>& args)
 {
     if (args.size() != 2)
         return false;
@@ -2945,7 +3266,7 @@ bool isIteratorPair(std::vector<const Token*> args)
 
 const Token *findLambdaStartToken(const Token *last)
 {
-    if (!last || last->str() != "}")
+    if (!last || !last->isCpp() || last->str() != "}")
         return nullptr;
     const Token* tok = last->link();
     if (Token::simpleMatch(tok->astParent(), "("))
@@ -2955,8 +3276,8 @@ const Token *findLambdaStartToken(const Token *last)
     return nullptr;
 }
 
-template<class T>
-T* findLambdaEndTokenGeneric(T* first)
+template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+static T* findLambdaEndTokenGeneric(T* first)
 {
     auto maybeLambda = [](T* tok) -> bool {
         while (Token::Match(tok, "*|%name%|::|>")) {
@@ -2973,7 +3294,7 @@ T* findLambdaEndTokenGeneric(T* first)
         return true;
     };
 
-    if (!first || first->str() != "[")
+    if (!first || !first->isCpp() || first->str() != "[")
         return nullptr;
     if (!maybeLambda(first->previous()))
         return nullptr;
@@ -3002,12 +3323,12 @@ Token* findLambdaEndToken(Token* first)
     return findLambdaEndTokenGeneric(first);
 }
 
-bool isLikelyStream(bool cpp, const Token *stream)
+bool isLikelyStream(const Token *stream)
 {
-    if (!cpp)
+    if (!stream)
         return false;
 
-    if (!stream)
+    if (!stream->isCpp())
         return false;
 
     if (!Token::Match(stream->astParent(), "&|<<|>>") || !stream->astParent()->isBinaryOp())
@@ -3019,9 +3340,12 @@ bool isLikelyStream(bool cpp, const Token *stream)
     return !astIsIntegral(stream, false);
 }
 
-bool isLikelyStreamRead(bool cpp, const Token *op)
+bool isLikelyStreamRead(const Token *op)
 {
-    if (!cpp)
+    if (!op)
+        return false;
+
+    if (!op->isCpp())
         return false;
 
     if (!Token::Match(op, "&|>>") || !op->isBinaryOp())
@@ -3047,7 +3371,7 @@ bool isCPPCast(const Token* tok)
     return tok && Token::simpleMatch(tok->previous(), "> (") && tok->astOperand2() && tok->astOperand1() && isCPPCastKeyword(tok->astOperand1());
 }
 
-bool isConstVarExpression(const Token *tok, std::function<bool(const Token*)> skipPredicate)
+bool isConstVarExpression(const Token *tok, const std::function<bool(const Token*)>& skipPredicate)
 {
     if (!tok)
         return false;
@@ -3090,7 +3414,7 @@ bool isConstVarExpression(const Token *tok, std::function<bool(const Token*)> sk
     return false;
 }
 
-static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings* settings)
+static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings& settings)
 {
     const bool addressOf = tok->astParent() && tok->astParent()->isUnaryOp("&");
 
@@ -3098,51 +3422,124 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings
     const Token* ftok = getTokenArgumentFunction(tok, argnr);
     if (!ftok)
         return ExprUsage::None;
-    if (ftok->function()) {
+    const Function* func = ftok->function();
+    // 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))
+            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)
+                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) {
+                    return f.isConstructor();
+                });
+                if (it != scope->functionList.end())
+                    func = &*it;
+            }
+        }
+    }
+    if (func) {
         std::vector<const Variable*> args = getArgumentVars(ftok, argnr);
         for (const Variable* arg : args) {
             if (!arg)
                 continue;
-            if (arg->isReference())
-                return ExprUsage::PassedByReference;
+            if (arg->isReference() || (arg->isPointer() && indirect == 1)) {
+                if (!func->hasBody())
+                    return ExprUsage::PassedByReference;
+                for (const Token* bodytok = func->functionScope->bodyStart; bodytok != func->functionScope->bodyEnd; bodytok = bodytok->next()) {
+                    if (bodytok->variable() == arg) {
+                        if (arg->isReference())
+                            return ExprUsage::PassedByReference;
+                        if (Token::Match(bodytok->astParent(), "%comp%|!"))
+                            return ExprUsage::NotUsed;
+                        return ExprUsage::PassedByReference;
+                    }
+                }
+                return ExprUsage::NotUsed;
+            }
         }
         if (!args.empty() && indirect == 0 && !addressOf)
             return ExprUsage::Used;
     } else if (ftok->isControlFlowKeyword()) {
         return ExprUsage::Used;
     } else if (ftok->str() == "{") {
-        return ExprUsage::Used;
+        return indirect == 0 ? ExprUsage::Used : ExprUsage::Inconclusive;
     } else {
-        const bool isnullbad = settings->library.isnullargbad(ftok, argnr + 1);
+        const bool isnullbad = settings.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 = settings.library.isuninitargbad(ftok, argnr + 1, indirect, &hasIndirect);
         if (isuninitbad && (!addressOf || isnullbad))
             return ExprUsage::Used;
     }
     return ExprUsage::Inconclusive;
 }
 
-ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings)
+bool isLeafDot(const Token* tok)
 {
-    if (indirect > 0 && tok->astParent()) {
-        if (Token::Match(tok->astParent(), "%assign%") && astIsRHS(tok))
+    if (!tok)
+        return false;
+    const Token * parent = tok->astParent();
+    if (!Token::simpleMatch(parent, "."))
+        return false;
+    if (parent->astOperand2() == tok && !Token::simpleMatch(parent->astParent(), "."))
+        return true;
+    return isLeafDot(parent);
+}
+
+ExprUsage getExprUsage(const Token* tok, int indirect, const Settings& settings)
+{
+    const Token* parent = tok->astParent();
+    if (indirect > 0 && parent) {
+        while (Token::simpleMatch(parent, "[") && parent->astParent())
+            parent = parent->astParent();
+        if (Token::Match(parent, "%assign%") && (astIsRHS(tok) || astIsLHS(parent->astOperand1())))
             return ExprUsage::NotUsed;
-        if (tok->astParent()->isConstOp())
+        if (Token::Match(parent, "++|--"))
             return ExprUsage::NotUsed;
-        if (tok->astParent()->isCast())
+        if (parent->isConstOp())
+            return ExprUsage::NotUsed;
+        if (parent->isCast())
+            return ExprUsage::NotUsed;
+        if (Token::simpleMatch(parent, ":") && Token::simpleMatch(parent->astParent(), "?"))
+            return getExprUsage(parent->astParent(), indirect, settings);
+        if (isUsedAsBool(tok, settings))
             return ExprUsage::NotUsed;
     }
+    if (tok->isUnaryOp("&") && !parent)
+        return ExprUsage::NotUsed;
     if (indirect == 0) {
-        if (Token::Match(tok->astParent(), "%cop%|%assign%|++|--") && !Token::simpleMatch(tok->astParent(), "=") &&
-            !tok->astParent()->isUnaryOp("&"))
+        if (Token::Match(parent, "%cop%|%assign%|++|--") && parent->str() != "=" &&
+            !parent->isUnaryOp("&") &&
+            !(astIsRHS(tok) && isLikelyStreamRead(parent)))
             return ExprUsage::Used;
-        if (Token::simpleMatch(tok->astParent(), "=") && astIsRHS(tok))
+        if (isLeafDot(tok)) {
+            const Token* op = parent->astParent();
+            while (Token::simpleMatch(op, "."))
+                op = op->astParent();
+            if (Token::Match(op, "%assign%|++|--")) {
+                if (op->str() == "=") {
+                    if (precedes(tok, op))
+                        return ExprUsage::NotUsed;
+                } else
+                    return ExprUsage::Used;
+            }
+        }
+        if (Token::simpleMatch(parent, "=") && astIsRHS(tok)) {
+            const Token* const lhs  = parent->astOperand1();
+            if (lhs && lhs->variable() && lhs->variable()->isReference() && lhs == lhs->variable()->nameToken())
+                return ExprUsage::NotUsed;
             return ExprUsage::Used;
+        }
         // Function call or index
-        if (((Token::simpleMatch(tok->astParent(), "(") && !tok->astParent()->isCast()) || (Token::simpleMatch(tok->astParent(), "[") && tok->valueType())) &&
-            (astIsLHS(tok) || Token::simpleMatch(tok->astParent(), "( )")))
+        if (((Token::simpleMatch(parent, "(") && !parent->isCast()) || (Token::simpleMatch(parent, "[") && tok->valueType())) &&
+            (astIsLHS(tok) || Token::simpleMatch(parent, "( )")))
             return ExprUsage::Used;
     }
     return getFunctionUsage(tok, indirect, settings);
@@ -3171,13 +3568,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;
 }
@@ -3244,7 +3641,7 @@ bool isNullOperand(const Token *expr)
 {
     if (!expr)
         return false;
-    if (Token::Match(expr, "static_cast|const_cast|dynamic_cast|reinterpret_cast <"))
+    if (expr->isCpp() && Token::Match(expr, "static_cast|const_cast|dynamic_cast|reinterpret_cast <"))
         expr = expr->astParent();
     else if (!expr->isCast())
         return Token::Match(expr, "NULL|nullptr");
@@ -3254,7 +3651,7 @@ bool isNullOperand(const Token *expr)
     return Token::Match(castOp, "NULL|nullptr") || (MathLib::isInt(castOp->str()) && MathLib::isNullValue(castOp->str()));
 }
 
-bool isGlobalData(const Token *expr, bool cpp)
+bool isGlobalData(const Token *expr)
 {
     // function call that returns reference => assume global data
     if (expr && expr->str() == "(" && expr->valueType() && expr->valueType()->reference != Reference::None) {
@@ -3267,7 +3664,7 @@ bool isGlobalData(const Token *expr, bool cpp)
     bool globalData = false;
     bool var = false;
     visitAstNodes(expr,
-                  [expr, cpp, &globalData, &var](const Token *tok) {
+                  [expr, &globalData, &var](const Token *tok) {
         if (tok->varId())
             var = true;
         if (tok->varId() && !tok->variable()) {
@@ -3284,7 +3681,7 @@ bool isGlobalData(const Token *expr, bool cpp)
             // TODO check if pointer points at local data
             const Variable *lhsvar = tok->astOperand1()->variable();
             const ValueType *lhstype = tok->astOperand1()->valueType();
-            if (lhsvar->isPointer()) {
+            if (lhsvar->isPointer() || !lhstype || lhstype->type == ValueType::Type::ITERATOR) {
                 globalData = true;
                 return ChildrenToVisit::none;
             }
@@ -3292,12 +3689,12 @@ bool isGlobalData(const Token *expr, bool cpp)
                 globalData = true;
                 return ChildrenToVisit::none;
             }
-            if (lhsvar->isArgument() && (!lhstype || (lhstype->type <= ValueType::Type::VOID && !lhstype->container))) {
+            if (lhsvar->isArgument() && lhstype->type <= ValueType::Type::VOID && !lhstype->container) {
                 globalData = true;
                 return ChildrenToVisit::none;
             }
         }
-        if (tok->varId() == 0 && tok->isName() && tok->previous()->str() != ".") {
+        if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") {
             globalData = true;
             return ChildrenToVisit::none;
         }
@@ -3311,7 +3708,7 @@ bool isGlobalData(const Token *expr, bool cpp)
                 globalData = true;
                 return ChildrenToVisit::none;
             }
-            if (tok->previous()->str() != "." && !tok->variable()->isLocal() && !tok->variable()->isArgument()) {
+            if (tok->strAt(-1) != "." && !tok->variable()->isLocal() && !tok->variable()->isArgument()) {
                 globalData = true;
                 return ChildrenToVisit::none;
             }
@@ -3325,7 +3722,7 @@ bool isGlobalData(const Token *expr, bool cpp)
             }
         }
         // Unknown argument type => it might be some reference type..
-        if (cpp && tok->str() == "." && tok->astOperand1() && tok->astOperand1()->variable() && !tok->astOperand1()->valueType()) {
+        if (tok->isCpp() && tok->str() == "." && tok->astOperand1() && tok->astOperand1()->variable() && !tok->astOperand1()->valueType()) {
             globalData = true;
             return ChildrenToVisit::none;
         }
@@ -3336,7 +3733,176 @@ bool isGlobalData(const Token *expr, bool cpp)
     return globalData || !var;
 }
 
-bool isSizeOfEtc(const Token *tok)
+bool isUnevaluated(const Token *tok)
 {
-    return Token::Match(tok, "sizeof|typeof|offsetof|decltype|__typeof__ (");
+    return Token::Match(tok, "alignof|_Alignof|_alignof|__alignof|__alignof__|decltype|offsetof|sizeof|typeid|typeof|__typeof__ (");
+}
+
+static std::set<MathLib::bigint> getSwitchValues(const Token *startbrace, bool &hasDefault)
+{
+    std::set<MathLib::bigint> values;
+    const Token *endbrace = startbrace->link();
+    if (!endbrace)
+        return values;
+
+    hasDefault = false;
+    for (const Token *tok = startbrace->next(); tok && tok != endbrace; tok = tok->next()) {
+        if (Token::simpleMatch(tok, "{") && tok->scope()->type == ScopeType::eSwitch) {
+            tok = tok->link();
+            continue;
+        }
+        if (Token::simpleMatch(tok, "default")) {
+            hasDefault = true;
+            break;
+        }
+        if (Token::simpleMatch(tok, "case")) {
+            const Token *valueTok = tok->astOperand1();
+            if (const ValueFlow::Value* v = valueTok->getKnownValue(ValueFlow::Value::ValueType::INT))
+                values.insert(v->intvalue);
+            continue;
+        }
+    }
+
+    return values;
+}
+
+bool isExhaustiveSwitch(const Token *startbrace)
+{
+    if (!startbrace || !Token::simpleMatch(startbrace->previous(), ") {") || startbrace->scope()->type != ScopeType::eSwitch)
+        return false;
+    const Token *rpar = startbrace->previous();
+    const Token *lpar = rpar->link();
+
+    const Token *condition = lpar->astOperand2();
+    if (!condition->valueType())
+        return true;
+
+    bool hasDefault = false;
+    const std::set<MathLib::bigint> switchValues = getSwitchValues(startbrace, hasDefault);
+
+    if (hasDefault)
+        return true;
+
+    if (condition->valueType()->type == ValueType::Type::BOOL)
+        return switchValues.count(0) && switchValues.count(1);
+
+    if (condition->valueType()->isEnum()) {
+        const std::vector<Enumerator> &enumList = condition->valueType()->typeScope->enumeratorList;
+        return std::all_of(enumList.cbegin(), enumList.cend(), [&](const Enumerator &e) {
+            return !e.value_known || switchValues.count(e.value);
+        });
+    }
+
+    return false;
+}
+
+bool isUnreachableOperand(const Token *tok)
+{
+    for (;;)
+    {
+        const Token *parent = tok->astParent();
+        if (!parent)
+            break;
+
+        if (parent->isBinaryOp()) {
+            const bool left = tok == parent->astOperand1();
+            const Token *sibling = left ? parent->astOperand2() : parent->astOperand1();
+
+            // logical and
+            if (Token::simpleMatch(parent, "&&") && !left && sibling->hasKnownIntValue()
+                && !sibling->getKnownIntValue())
+                return true;
+
+            // logical or
+            if (Token::simpleMatch(parent, "||") && !left && sibling->hasKnownIntValue()
+                && sibling->getKnownIntValue())
+                return true;
+
+            // ternary
+            if (Token::simpleMatch(parent, ":") && Token::simpleMatch(parent->astParent(), "?")) {
+                const Token *condTok = parent->astParent()->astOperand1();
+                if (condTok->hasKnownIntValue() && static_cast<bool>(condTok->getKnownIntValue()) != left)
+                    return true;
+            }
+        }
+
+        tok = parent;
+    }
+
+    return false;
+}
+
+static bool unknownLeafValuesAreTemplateArgs(const Token *tok)
+{
+    if (!tok)
+        return true;
+
+    if (!tok->astOperand1() && !tok->astOperand2())
+        return tok->isTemplateArg() || tok->hasKnownIntValue();
+
+    return unknownLeafValuesAreTemplateArgs(tok->astOperand1())
+           && unknownLeafValuesAreTemplateArgs(tok->astOperand2());
+}
+
+static const Token *skipUnreachableIfBranch(const Token *tok)
+{
+    const Token *condTok = tok->linkAt(-1);
+    if (!condTok)
+        return tok;
+
+    if (!Token::simpleMatch(condTok->tokAt(-1), "if") && !Token::simpleMatch(condTok->tokAt(-2), "if constexpr"))
+        return tok;
+
+    condTok = condTok->astOperand2();
+    if (!condTok)
+        return tok;
+
+    if ((condTok->hasKnownIntValue() && condTok->getKnownIntValue() == 0)
+        || (unknownLeafValuesAreTemplateArgs(condTok) && condTok->getValue(0))) {
+        tok = tok->link();
+    }
+
+    return tok;
+}
+
+static const Token *skipUnreachableElseBranch(const Token *tok)
+{
+    if (!Token::simpleMatch(tok->tokAt(-2), "} else {"))
+        return tok;
+
+    const Token *condTok = tok->linkAt(-2);
+    if (!condTok)
+        return tok;
+
+    condTok = condTok->linkAt(-1);
+    if (!condTok)
+        return tok;
+
+    if (!Token::simpleMatch(condTok->tokAt(-1), "if (") && !Token::simpleMatch(condTok->tokAt(-2), "if constexpr ("))
+        return tok;
+
+    condTok = condTok->astOperand2();
+
+    if ((condTok->hasKnownIntValue() && condTok->getKnownIntValue() != 0)
+        || (unknownLeafValuesAreTemplateArgs(condTok) && condTok->getValueNE(0))) {
+        tok = tok->link();
+    }
+
+    return tok;
+}
+
+const Token *skipUnreachableBranch(const Token *tok)
+{
+    if (!Token::simpleMatch(tok, "{"))
+        return tok;
+
+    if (tok->scope()->type == ScopeType::eIf) {
+        return skipUnreachableIfBranch(tok);
+    }
+
+    if (tok->scope()->type == ScopeType::eElse) {
+        return skipUnreachableElseBranch(tok);
+    }
+
+    return tok;
 }
diff --git a/lib/astutils.h b/lib/astutils.h
index 04143bc7f57..06f01acab11 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-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
@@ -22,22 +22,29 @@
 #define astutilsH
 //---------------------------------------------------------------------------
 
+#include <cstdint>
 #include <functional>
-#include <stack>
+#include <list>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "config.h"
 #include "errortypes.h"
 #include "library.h"
+#include "mathlib.h"
 #include "smallvector.h"
-#include "symboldatabase.h"
 #include "token.h"
 
 class Settings;
+class Variable;
+class ValueType;
+class Function;
+class Scope;
+enum class ScopeType : std::uint8_t;
 
-enum class ChildrenToVisit {
+enum class ChildrenToVisit : std::uint8_t {
     none,
     op1,
     op2,
@@ -56,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);
 }
 
@@ -108,11 +115,14 @@ const Token* findParent(const Token* tok, const TFunc& pred)
     return parent;
 }
 
-const Token* findExpression(const nonneg int exprid,
+const Token* findExpression(nonneg int exprid,
                             const Token* start,
                             const Token* end,
                             const std::function<bool(const Token*)>& pred);
-const Token* findExpression(const Token* start, const nonneg int exprid);
+const Token* findExpression(const Token* start, nonneg int exprid);
+
+/** Does code execution escape from the given scope? */
+const Token* findEscapeStatement(const Scope* scope, const Library& library);
 
 std::vector<const Token*> astFlatten(const Token* tok, const char* op);
 std::vector<Token*> astFlatten(Token* tok, const char* op);
@@ -121,6 +131,7 @@ nonneg int astCount(const Token* tok, const char* op, int depth = 100);
 
 bool astHasToken(const Token* root, const Token * tok);
 
+bool astHasExpr(const Token* tok, nonneg int exprid);
 bool astHasVar(const Token * tok, nonneg int varid);
 
 bool astIsPrimitive(const Token* tok);
@@ -146,14 +157,16 @@ bool astIsUniqueSmartPointer(const Token* tok);
 bool astIsIterator(const Token *tok);
 
 bool astIsContainer(const Token *tok);
+bool astIsNonStringContainer(const Token *tok);
 
 bool astIsContainerView(const Token* tok);
 bool astIsContainerOwned(const Token* tok);
+bool astIsContainerString(const Token* tok);
 
-Library::Container::Action astContainerAction(const Token* tok, const Token** ftok = nullptr);
-Library::Container::Yield astContainerYield(const Token* tok, const Token** ftok = nullptr);
+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 Settings& settings, const Token** ftok = nullptr);
 
 /** Is given token a range-declaration in a range-based for loop */
 bool astIsRangeBasedForDecl(const Token* tok);
@@ -175,7 +188,9 @@ const Token * astIsVariableComparison(const Token *tok, const std::string &comp,
 bool isVariableDecl(const Token* tok);
 bool isStlStringType(const Token* tok);
 
-bool isTemporary(bool cpp, const Token* tok, const Library* library, bool unknown = false);
+bool isVoidCast(const Token* tok);
+
+bool isTemporary(const Token* tok, const Library* library, bool unknown = false);
 
 const Token* previousBeforeAstLeftmostLeaf(const Token* tok);
 Token* previousBeforeAstLeftmostLeaf(Token* tok);
@@ -189,10 +204,10 @@ const Token* astParentSkipParens(const Token* tok);
 const Token* getParentMember(const Token * tok);
 
 const Token* getParentLifetime(const Token* tok);
-const Token* getParentLifetime(bool cpp, const Token* tok, const Library* library);
+const Token* getParentLifetime(const Token* tok, const Library& library);
 
 std::vector<ValueType> getParentValueTypes(const Token* tok,
-                                           const Settings* settings = nullptr,
+                                           const Settings& settings,
                                            const Token** parent = nullptr);
 
 bool astIsLHS(const Token* tok);
@@ -220,10 +235,10 @@ const Token *findNextTokenFromBreak(const Token *breakToken);
 bool extractForLoopValues(const Token *forToken,
                           nonneg int &varid,
                           bool &knownInitValue,
-                          long long &initValue,
+                          MathLib::bigint &initValue,
                           bool &partialCond,
-                          long long &stepValue,
-                          long long &lastValue);
+                          MathLib::bigint &stepValue,
+                          MathLib::bigint &lastValue);
 
 bool precedes(const Token * tok1, const Token * tok2);
 bool succeeds(const Token* tok1, const Token* tok2);
@@ -231,63 +246,72 @@ bool succeeds(const Token* tok1, const Token* tok2);
 bool exprDependsOnThis(const Token* expr, bool onVar = true, nonneg int depth = 0);
 
 struct ReferenceToken {
+    ReferenceToken(const Token* t, ErrorPath e)
+        : token(t)
+        , errors(std::move(e))
+    {}
     const Token* token;
     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 cpp, bool macro, const Token *tok1, const Token *tok2, const Library& library, bool pure, bool followVar, ErrorPath* errors=nullptr);
+CPPCHECKLIB bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors=nullptr);
 
-bool isEqualKnownValue(const Token * const tok1, const Token * const tok2);
+bool isEqualKnownValue(const Token * tok1, const Token * tok2);
 
 bool isStructuredBindingVariable(const Variable* var);
 
 const Token* isInLoopCondition(const Token* tok);
 
 /**
- * Is token used a boolean, that is to say cast to a bool, or used as a condition in a if/while/for
+ * 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
+ */
+CPPCHECKLIB bool isUsedAsBool(const Token* tok, const Settings& settings);
+
+/**
+ * Are the tokens' flags equal?
  */
-CPPCHECKLIB bool isUsedAsBool(const Token * const tok);
+bool compareTokenFlags(const Token* tok1, const Token* tok2, bool macro);
 
 /**
  * Are two conditions opposite
  * @param isNot  do you want to know if cond1 is !cond2 or if cond1 and cond2 are non-overlapping. true: cond1==!cond2  false: cond1==true => cond2==false
- * @param cpp    c++ file
  * @param cond1  condition1
  * @param cond2  condition2
- * @param library files data
+ * @param settings settings
  * @param pure boolean
  */
-bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token * const cond2, const Library& library, bool pure, bool followVar, ErrorPath* errors=nullptr);
+bool isOppositeCond(bool isNot, const Token * cond1, const Token * cond2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors=nullptr);
 
-bool isOppositeExpression(bool cpp, const Token * const tok1, const Token * const tok2, const Library& library, bool pure, bool followVar, ErrorPath* errors=nullptr);
+bool isOppositeExpression(const Token * tok1, const Token * tok2, const Settings& settings, bool pure, bool followVar, ErrorPath* errors=nullptr);
 
 bool isConstFunctionCall(const Token* ftok, const Library& library);
 
-bool isConstExpression(const Token *tok, const Library& library, bool cpp);
+bool isConstExpression(const Token *tok, const Library& library);
 
-bool isWithoutSideEffects(bool cpp, const Token* tok, bool checkArrayAccess = false, bool checkReference = true);
+bool isWithoutSideEffects(const Token* tok, bool checkArrayAccess = false, bool checkReference = true);
 
 bool isUniqueExpression(const Token* tok);
 
-bool isEscapeFunction(const Token* ftok, const Library* library);
+bool isEscapeFunction(const Token* ftok, const Library& library);
 
 /** Is scope a return scope (scope will unconditionally return) */
-CPPCHECKLIB bool isReturnScope(const Token* const endToken,
-                               const Library* library = nullptr,
+CPPCHECKLIB bool isReturnScope(const Token* endToken,
+                               const Library& library,
                                const Token** unknownFunc = nullptr,
                                bool functionScope = false);
 
 /** Is tok within a scope of the given type, nested within var's scope? */
 bool isWithinScope(const Token* tok,
                    const Variable* var,
-                   Scope::ScopeType type);
+                   ScopeType type);
 
 /// Return the token to the function and the argument number
 const Token * getTokenArgumentFunction(const Token * tok, int& argn);
@@ -304,7 +328,7 @@ std::vector<const Variable*> getArgumentVars(const Token* tok, int argnr);
  * @param settings      program settings
  * @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 Settings &settings, 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
@@ -314,50 +338,51 @@ bool isVariableChangedByFunctionCall(const Token *tok, int indirect, nonneg int
  * @param settings      program settings
  * @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 Settings &settings, bool *inconclusive);
 
 /** Is variable changed in block of code? */
-CPPCHECKLIB bool isVariableChanged(const Token *start, const Token *end, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth = 20);
-bool isVariableChanged(const Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth = 20);
+CPPCHECKLIB bool isVariableChanged(const Token *start, const Token *end, nonneg int exprid, bool globalvar, const Settings &settings, int depth = 20);
+bool isVariableChanged(const Token *start, const Token *end, int indirect, nonneg int exprid, bool globalvar, const Settings &settings, int depth = 20);
 
-bool isVariableChanged(const Token *tok, int indirect, const Settings *settings, bool cpp, int depth = 20);
+bool isVariableChanged(const Token *tok, int indirect, const Settings &settings, int depth = 20);
 
-bool isVariableChanged(const Variable * var, const Settings *settings, bool cpp, int depth = 20);
+bool isVariableChanged(const Variable * var, const Settings &settings, int depth = 20);
 
 bool isVariablesChanged(const Token* start,
                         const Token* end,
                         int indirect,
                         const std::vector<const Variable*> &vars,
-                        const Settings* settings,
-                        bool cpp);
+                        const Settings& settings);
 
-bool isThisChanged(const Token* tok, int indirect, const Settings* settings, bool cpp);
-bool isThisChanged(const Token* start, const Token* end, int indirect, const Settings* settings, bool cpp);
+bool isThisChanged(const Token* tok, int indirect, const Settings& settings);
 
-const Token* findVariableChanged(const Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth = 20);
-Token* findVariableChanged(Token *start, const Token *end, int indirect, const nonneg int exprid, bool globalvar, const Settings *settings, bool cpp, int depth = 20);
+const Token* findVariableChanged(const Token *start, const Token *end, int indirect, nonneg int exprid, bool globalvar, const Settings &settings, int depth = 20);
+Token* findVariableChanged(Token *start, const Token *end, int indirect, nonneg int exprid, bool globalvar, const Settings &settings, int depth = 20);
 
-CPPCHECKLIB bool isExpressionChanged(const Token* expr,
-                                     const Token* start,
-                                     const Token* end,
-                                     const Settings* settings,
-                                     bool cpp,
-                                     int depth = 20);
+CPPCHECKLIB const Token* findExpressionChanged(const Token* expr,
+                                               const Token* start,
+                                               const Token* end,
+                                               const Settings& settings,
+                                               int depth = 20);
+
+const Token* findExpressionChangedSkipDeadCode(const Token* expr,
+                                               const Token* start,
+                                               const Token* end,
+                                               const Settings& settings,
+                                               const std::function<std::vector<MathLib::bigint>(const Token* tok)>& evaluate,
+                                               int depth = 20);
 
 bool isExpressionChangedAt(const Token* expr,
                            const Token* tok,
                            int indirect,
                            bool globalvar,
-                           const Settings* settings,
-                           bool cpp,
+                           const Settings& settings,
                            int depth = 20);
 
 /// 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, bool* inconclusive = nullptr);
-
-bool isAliased(const Variable *var);
+bool isAliasOf(const Token* tok, const Token* expr, nonneg int* indirect = nullptr);
 
 const Token* getArgumentStart(const Token* ftok);
 
@@ -382,7 +407,7 @@ const Token* getIteratorExpression(const Token* tok);
 /**
  * Are the arguments a pair of iterators/pointers?
  */
-bool isIteratorPair(std::vector<const Token*> args);
+bool isIteratorPair(const std::vector<const Token*>& args);
 
 CPPCHECKLIB const Token *findLambdaStartToken(const Token *last);
 
@@ -394,22 +419,24 @@ CPPCHECKLIB const Token *findLambdaStartToken(const Token *last);
 CPPCHECKLIB const Token *findLambdaEndToken(const Token *first);
 CPPCHECKLIB Token* findLambdaEndToken(Token* first);
 
-bool isLikelyStream(bool cpp, const Token *stream);
+bool isLikelyStream(const Token *stream);
 
 /**
  * do we see a likely write of rhs through overloaded operator
  *   s >> x;
  *   a & x;
  */
-bool isLikelyStreamRead(bool cpp, const Token *op);
+bool isLikelyStreamRead(const Token *op);
 
 bool isCPPCast(const Token* tok);
 
-bool isConstVarExpression(const Token* tok, std::function<bool(const Token*)> skipPredicate = nullptr);
+bool isConstVarExpression(const Token* tok, const std::function<bool(const Token*)>& skipPredicate = nullptr);
 
-enum class ExprUsage { None, NotUsed, PassedByReference, Used, Inconclusive };
+bool isLeafDot(const Token* tok);
 
-ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings);
+enum class ExprUsage : std::uint8_t { None, NotUsed, PassedByReference, Used, Inconclusive };
+
+ExprUsage getExprUsage(const Token* tok, int indirect, const Settings& settings);
 
 const Variable *getLHSVariable(const Token *tok);
 
@@ -424,8 +451,14 @@ bool isScopeBracket(const Token* tok);
 
 CPPCHECKLIB bool isNullOperand(const Token *expr);
 
-bool isGlobalData(const Token *expr, bool cpp);
+bool isGlobalData(const Token *expr);
+
+bool isUnevaluated(const Token *tok);
+
+bool isExhaustiveSwitch(const Token *startbrace);
+
+bool isUnreachableOperand(const Token *tok);
 
-bool isSizeOfEtc(const Token *tok);
+const Token *skipUnreachableBranch(const Token *tok);
 
 #endif // astutilsH
diff --git a/lib/calculate.h b/lib/calculate.h
index 3e62e212b21..c33e37fd3b7 100644
--- a/lib/calculate.h
+++ b/lib/calculate.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 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,6 +21,7 @@
 
 #include "mathlib.h"
 #include "errortypes.h"
+#include <limits>
 #include <string>
 
 template<class T>
@@ -36,7 +37,7 @@ inline bool isEqual(double x, double y)
 }
 inline bool isEqual(float x, float y)
 {
-    return isEqual(double{x}, double{y});
+    return isEqual(double(x), double(y));
 }
 
 template<class T>
@@ -45,15 +46,18 @@ 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)
 {
     auto wrap = [](T z) {
         return R{z};
     };
-    const MathLib::bigint maxBitsShift = sizeof(MathLib::bigint) * 8;
+    constexpr MathLib::bigint maxBitsShift = sizeof(MathLib::bigint) * 8;
     // For portability we cannot shift signed integers by 63 bits
-    const MathLib::bigint maxBitsSignedShift = maxBitsShift - 1;
+    constexpr MathLib::bigint maxBitsSignedShift = maxBitsShift - 1;
     switch (MathLib::encodeMultiChar(s)) {
     case '+':
         return wrap(x + y);
@@ -62,14 +66,14 @@ R calculate(const std::string& s, const T& x, const T& y, bool* error = nullptr)
     case '*':
         return wrap(x * y);
     case '/':
-        if (isZero(y)) {
+        if (isZero(y) || (std::is_signed<T>{} && y < 0)) {
             if (error)
                 *error = true;
             return R{};
         }
         return wrap(x / y);
     case '%':
-        if (isZero(MathLib::bigint(y))) {
+        if (isZero(MathLib::bigint(y)) || (std::is_signed<T>{} && MathLib::bigint(y) < 0)) {
             if (error)
                 *error = true;
             return R{};
diff --git a/lib/check.cpp b/lib/check.cpp
index f01d938a699..58b8dbfe0e1 100644
--- a/lib/check.cpp
+++ b/lib/check.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
@@ -35,7 +35,7 @@
 //---------------------------------------------------------------------------
 
 Check::Check(const std::string &aname)
-    : mTokenizer(nullptr), mSettings(nullptr), mErrorLogger(nullptr), mName(aname)
+    : mName(aname)
 {
     {
         const auto it = std::find_if(instances().begin(), instances().end(), [&](const Check *i) {
@@ -55,28 +55,30 @@ Check::Check(const std::string &aname)
         instances().insert(it, this);
 }
 
-void Check::reportError(const ErrorMessage &errmsg)
+void Check::writeToErrorList(const ErrorMessage &errmsg)
 {
     std::cout << errmsg.toXML() << std::endl;
 }
 
 
-void Check::reportError(const std::list<const Token *> &callstack, Severity::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty)
+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
-        reportError(errmsg);
+        writeToErrorList(errmsg);
 }
 
-void Check::reportError(const ErrorPath &errorPath, Severity::SeverityType severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
+void Check::reportError(ErrorPath errorPath, Severity severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
 {
-    const ErrorMessage errmsg(errorPath, mTokenizer ? &mTokenizer->list : nullptr, severity, id, msg, cwe, 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);
     if (mErrorLogger)
         mErrorLogger->reportErr(errmsg);
     else
-        reportError(errmsg);
+        writeToErrorList(errmsg);
 }
 
 bool Check::wrongData(const Token *tok, const char *str)
@@ -104,7 +106,7 @@ 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") + (char)std::toupper(id[0]) + (id + 1);
+        return std::string("safe") + static_cast<char>(std::toupper(id[0])) + (id + 1);
     return id;
 }
 
@@ -113,7 +115,7 @@ ErrorPath Check::getErrorPath(const Token* errtok, const ValueFlow::Value* value
     ErrorPath errorPath;
     if (!value) {
         errorPath.emplace_back(errtok, std::move(bug));
-    } else if (mSettings->verbose || mSettings->xml || !mSettings->templateLocation.empty()) {
+    } else if (mSettings->verbose || mSettings->outputFormat == Settings::OutputFormat::xml || !mSettings->templateLocation.empty()) {
         errorPath = value->errorPath;
         errorPath.emplace_back(errtok, std::move(bug));
     } else {
@@ -125,3 +127,9 @@ ErrorPath Check::getErrorPath(const Token* errtok, const ValueFlow::Value* value
     }
     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 2f29d9b1db5..4e3c5b9a4e3 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-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
@@ -61,10 +61,12 @@ class CPPCHECKLIB Check {
     /** 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)) {}
 
+public:
     virtual ~Check() {
         if (!mTokenizer)
             instances().remove(this);
@@ -77,7 +79,7 @@ class CPPCHECKLIB Check {
     static std::list<Check *> &instances();
 
     /** run checks, the token list is not simplified */
-    virtual void runChecks(const Tokenizer *, const Settings *, ErrorLogger *) = 0;
+    virtual void runChecks(const Tokenizer &, ErrorLogger *) = 0;
 
     /** get error messages */
     virtual void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const = 0;
@@ -91,25 +93,24 @@ class CPPCHECKLIB Check {
     virtual std::string classInfo() const = 0;
 
     /**
-     * Write given error to errorlogger or to out stream in xml format.
+     * 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 reportError(const ErrorMessage &errmsg);
+    static void writeToErrorList(const ErrorMessage &errmsg);
 
     /** Base class used for whole-program analysis */
     class CPPCHECKLIB FileInfo {
     public:
-        FileInfo() {}
-        virtual ~FileInfo() {}
+        explicit FileInfo(std::string f0 = {}) : file0(std::move(f0)) {}
+        virtual ~FileInfo() = default;
         virtual std::string toString() const {
             return std::string();
         }
+        std::string file0;
     };
 
-    virtual FileInfo * getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const {
-        (void)tokenizer;
-        (void)settings;
+    virtual FileInfo * getFileInfo(const Tokenizer& /*tokenizer*/, const Settings& /*settings*/, const std::string& /*currentConfig*/) const {
         return nullptr;
     }
 
@@ -119,41 +120,35 @@ class CPPCHECKLIB Check {
     }
 
     // Return true if an error is reported.
-    virtual bool analyseWholeProgram(const CTU::FileInfo *ctu, const std::list<FileInfo*> &fileInfo, const Settings& /*settings*/, ErrorLogger & /*errorLogger*/) {
-        (void)ctu;
-        (void)fileInfo;
-        //(void)settings;
-        //(void)errorLogger;
+    virtual bool analyseWholeProgram(const CTU::FileInfo& /*ctu*/, const std::list<FileInfo*>& /*fileInfo*/, const Settings& /*settings*/, ErrorLogger & /*errorLogger*/) {
         return false;
     }
 
+protected:
     static std::string getMessageId(const ValueFlow::Value &value, const char id[]);
 
-protected:
-    const Tokenizer * const mTokenizer;
-    const Settings * const mSettings;
-    ErrorLogger * const mErrorLogger;
+    const Tokenizer* const mTokenizer{};
+    const Settings* const mSettings{};
+    ErrorLogger* const mErrorLogger{};
 
     /** report an error */
-    void reportError(const Token *tok, const Severity::SeverityType severity, const std::string &id, const std::string &msg) {
+    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::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty) {
+    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::SeverityType severity, const std::string &id, const std::string &msg) {
-        reportError(callstack, severity, id, msg, CWE(0U), Certainty::normal);
-    }
+    void reportError(const std::list<const Token *> &callstack, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe, Certainty certainty);
 
-    /** report an error */
-    void reportError(const std::list<const Token *> &callstack, Severity::SeverityType 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);
 
-    void reportError(const ErrorPath &errorPath, Severity::SeverityType 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;
 
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
index a70e94a214d..a106b0afe5f 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-2022 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
@@ -23,6 +23,7 @@
 #include "check64bit.h"
 
 #include "errortypes.h"
+#include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -33,19 +34,35 @@
 //---------------------------------------------------------------------------
 
 // CWE ids used
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
-static const struct CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
+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;
+}
+
+static bool isFunctionPointer(const Token* tok)
+{
+    if (!tok || !tok->variable())
+        return false;
+    return Tokenizer::isFunctionPointer(tok->variable()->nameToken());
+}
+
 void Check64BitPortability::pointerassignment()
 {
     if (!mSettings->severity.isEnabled(Severity::portability))
         return;
 
+    logChecker("Check64BitPortability::pointerassignment"); // portability
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Check return values
@@ -56,7 +73,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;
@@ -64,7 +81,7 @@ void Check64BitPortability::pointerassignment()
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             // skip nested functions
             if (tok->str() == "{") {
-                if (tok->scope()->type == Scope::ScopeType::eFunction || tok->scope()->type == Scope::ScopeType::eLambda)
+                if (tok->scope()->type == ScopeType::eFunction || tok->scope()->type == ScopeType::eLambda)
                     tok = tok->link();
             }
 
@@ -81,8 +98,17 @@ void Check64BitPortability::pointerassignment()
             if (retPointer && !returnType->typeScope && returnType->pointer == 0U)
                 returnIntegerError(tok);
 
-            if (!retPointer && returnType->pointer >= 1U)
-                returnPointerError(tok);
+            if (!retPointer) {
+                bool warn = returnType->pointer >= 1U;
+                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);
+            }
         }
     }
 
@@ -102,7 +128,8 @@ void Check64BitPortability::pointerassignment()
                 !tok->astOperand2()->isNumber() &&
                 rhstype->pointer == 0U &&
                 rhstype->originalTypeName.empty() &&
-                rhstype->type == ValueType::Type::INT)
+                rhstype->type == ValueType::Type::INT &&
+                !isFunctionPointer(tok->astOperand1()))
                 assignmentIntegerToAddressError(tok);
 
             // Assign pointer to integer..
@@ -147,7 +174,7 @@ 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)
@@ -160,3 +187,18 @@ void Check64BitPortability::returnIntegerError(const Token *tok)
                 "and Linux they are of different width. In worst case you end up casting 64-bit integer down to 32-bit pointer. "
                 "The safe way is to always return a pointer.", CWE758, Certainty::normal);
 }
+
+void Check64BitPortability::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    Check64BitPortability check64BitPortability(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    check64BitPortability.pointerassignment();
+}
+
+void Check64BitPortability::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    Check64BitPortability c(nullptr, settings, errorLogger);
+    c.assignmentAddressToIntegerError(nullptr);
+    c.assignmentIntegerToAddressError(nullptr);
+    c.returnIntegerError(nullptr);
+    c.returnPointerError(nullptr);
+}
diff --git a/lib/check64bit.h b/lib/check64bit.h
index 67f10c42e38..79397e98e5f 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-2022 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,7 +32,6 @@ class Settings;
 class Token;
 class Tokenizer;
 
-
 /// @addtogroup Checks
 /// @{
 
@@ -41,37 +40,29 @@ class Tokenizer;
  */
 
 class CPPCHECKLIB Check64BitPortability : public Check {
+    friend class Test64BitPortability;
+
 public:
     /** This constructor is used when registering the Check64BitPortability */
     Check64BitPortability() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        Check64BitPortability check64BitPortability(tokenizer, settings, errorLogger);
-        check64BitPortability.pointerassignment();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** Check for pointer assignment */
     void pointerassignment();
 
-private:
-
     void assignmentAddressToIntegerError(const Token *tok);
     void assignmentIntegerToAddressError(const Token *tok);
     void returnIntegerError(const Token *tok);
     void returnPointerError(const Token *tok);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        Check64BitPortability c(nullptr, settings, errorLogger);
-        c.assignmentAddressToIntegerError(nullptr);
-        c.assignmentIntegerToAddressError(nullptr);
-        c.returnIntegerError(nullptr);
-        c.returnPointerError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "64-bit portability";
diff --git a/lib/checkassert.cpp b/lib/checkassert.cpp
index 41fe45574cf..3ab55967ede 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-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
@@ -22,17 +22,22 @@
 
 #include "checkassert.h"
 
+#include "astutils.h"
 #include "errortypes.h"
+#include "library.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
+#include <algorithm>
+#include <utility>
+
 //---------------------------------------------------------------------------
 
 // CWE ids used
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
+static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
 // Register this check class (by creating a static instance of it)
 namespace {
@@ -44,19 +49,39 @@ void CheckAssert::assertWithSideEffects()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckAssert::assertWithSideEffects"); // warning
+
     for (const Token* tok = mTokenizer->list.front(); tok; tok = tok->next()) {
         if (!Token::simpleMatch(tok, "assert ("))
             continue;
 
-        const Token *endTok = tok->next()->link();
+        const Token *endTok = tok->linkAt(1);
         for (const Token* tmp = tok->next(); tmp != endTok; tmp = tmp->next()) {
             if (Token::simpleMatch(tmp, "sizeof ("))
                 tmp = tmp->linkAt(1);
 
             checkVariableAssignment(tmp, tok->scope());
 
-            if (tmp->tokType() != Token::eFunction)
+            if (tmp->tokType() != Token::eFunction) {
+                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
+                        continue;
+                    if (std::any_of(f->argumentChecks.begin(), f->argumentChecks.end(), [](const std::pair<int, Library::ArgumentChecks>& ac) {
+                        return ac.second.iteratorInfo.container > 0; // bailout, takes iterators -> assume read access
+                    }))
+                        continue;
+                    if (tmp->str() == "get" && Token::simpleMatch(tmp->astParent(), ".") && astIsSmartPointer(tmp->astParent()->astOperand1()))
+                        continue;
+                    if (f->containerYield == Library::Container::Yield::START_ITERATOR || // bailout for std::begin/end/prev/next
+                        f->containerYield == Library::Container::Yield::END_ITERATOR ||
+                        f->containerYield == Library::Container::Yield::ITERATOR)
+                        continue;
+                    sideEffectInAssertError(tmp, mSettings->library.getFunctionName(tmp));
+                }
                 continue;
+            }
 
             const Function* f = tmp->function();
             const Scope* scope = f->functionScope;
@@ -127,6 +152,8 @@ void CheckAssert::checkVariableAssignment(const Token* assignTok, const Scope *a
     if (!assignTok->isAssignmentOp() && assignTok->tokType() != Token::eIncDecOp)
         return;
 
+    if (!assignTok->astOperand1())
+        return;
     const Variable* var = assignTok->astOperand1()->variable();
     if (!var)
         return;
@@ -155,3 +182,16 @@ bool CheckAssert::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)
+{
+    CheckAssert checkAssert(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkAssert.assertWithSideEffects();
+}
+
+void CheckAssert::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckAssert c(nullptr, settings, errorLogger);
+    c.sideEffectInAssertError(nullptr, "function");
+    c.assignmentInAssertError(nullptr, "var");
+}
diff --git a/lib/checkassert.h b/lib/checkassert.h
index 78ce0905c4c..b01831a5eec 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-2022 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
@@ -44,30 +44,22 @@ class CPPCHECKLIB CheckAssert : public Check {
 public:
     CheckAssert() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckAssert checkAssert(tokenizer, settings, errorLogger);
-        checkAssert.assertWithSideEffects();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     void assertWithSideEffects();
 
-protected:
     void checkVariableAssignment(const Token* assignTok, const Scope *assertionScope);
     static bool inSameScope(const Token* returnTok, const Token* assignTok);
 
-private:
     void sideEffectInAssertError(const Token *tok, const std::string& functionName);
     void assignmentInAssertError(const Token *tok, const std::string &varname);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckAssert c(nullptr, settings, errorLogger);
-        c.sideEffectInAssertError(nullptr, "function");
-        c.assignmentInAssertError(nullptr, "var");
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Assert";
diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
index 6e4322ebfad..ab0ad0505b0 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-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
@@ -55,10 +55,10 @@ static bool isPtrArg(const Token *tok)
     return (var && var->isArgument() && var->isPointer());
 }
 
-static bool isArrayArg(const Token *tok, const Settings* settings)
+static bool isArrayArg(const Token *tok, const Settings& settings)
 {
     const Variable *var = tok->variable();
-    return (var && var->isArgument() && var->isArray() && !settings->library.isentrypoint(var->scope()->className));
+    return (var && var->isArgument() && var->isArray() && (!var->scope() || !settings.library.isentrypoint(var->scope()->className)));
 }
 
 static bool isArrayVar(const Token *tok)
@@ -99,6 +99,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;
 }
@@ -133,7 +135,7 @@ static bool isAutoVarArray(const Token *tok)
 
     // ValueFlow
     if (var->isPointer() && !var->isArgument()) {
-        for (std::list<ValueFlow::Value>::const_iterator it = tok->values().cbegin(); it != tok->values().cend(); ++it) {
+        for (auto it = tok->values().cbegin(); it != tok->values().cend(); ++it) {
             const ValueFlow::Value &val = *it;
             if (val.isTokValue() && isAutoVarArray(val.tokvalue))
                 return true;
@@ -143,14 +145,14 @@ static bool isAutoVarArray(const Token *tok)
     return false;
 }
 
-static bool isLocalContainerBuffer(const Token* tok)
+static bool isLocalContainerBuffer(const Token* tok, const Settings& settings)
 {
     if (!tok)
         return false;
 
     // x+y
     if (tok->str() == "+")
-        return isLocalContainerBuffer(tok->astOperand1()) || isLocalContainerBuffer(tok->astOperand2());
+        return isLocalContainerBuffer(tok->astOperand1(), settings) || isLocalContainerBuffer(tok->astOperand2(), settings);
 
     if (tok->str() != "(" || !Token::simpleMatch(tok->astOperand1(), "."))
         return false;
@@ -161,7 +163,7 @@ static bool isLocalContainerBuffer(const Token* tok)
     if (!var || !var->isLocal() || var->isStatic())
         return false;
 
-    const Library::Container::Yield yield = astContainerYield(tok);
+    const Library::Container::Yield yield = astContainerYield(tok, settings.library);
 
     return yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT;
 }
@@ -197,8 +199,8 @@ static bool variableIsUsedInScope(const Token* start, nonneg int varId, const Sc
     for (const Token *tok = start; tok && tok != scope->bodyEnd; tok = tok->next()) {
         if (tok->varId() == varId)
             return true;
-        const Scope::ScopeType scopeType = tok->scope()->type;
-        if (scopeType == Scope::eFor || scopeType == Scope::eDo || scopeType == Scope::eWhile) // In case of loops, better checking would be necessary
+        const ScopeType scopeType = tok->scope()->type;
+        if (scopeType == ScopeType::eFor || scopeType == ScopeType::eDo || scopeType == ScopeType::eWhile) // In case of loops, better checking would be necessary
             return true;
         if (Token::simpleMatch(tok, "asm ("))
             return true;
@@ -210,9 +212,11 @@ void CheckAutoVariables::assignFunctionArg()
 {
     const bool printStyle = mSettings->severity.isEnabled(Severity::style);
     const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarning)
+    if (!printStyle && !printWarning && !mSettings->isPremiumEnabled("uselessAssignmentPtrArg"))
         return;
 
+    logChecker("CheckAutoVariables::assignFunctionArg"); // style,warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
@@ -235,14 +239,14 @@ void CheckAutoVariables::assignFunctionArg()
     }
 }
 
-static bool isAutoVariableRHS(const Token* tok) {
-    return isAddressOfLocalVariable(tok) || isAutoVarArray(tok) || isLocalContainerBuffer(tok);
+static bool isAutoVariableRHS(const Token* tok, const Settings& settings) {
+    return isAddressOfLocalVariable(tok) || isAutoVarArray(tok) || isLocalContainerBuffer(tok, settings);
 }
 
-static bool hasOverloadedAssignment(const Token* tok, bool c, bool& inconclusive)
+static bool hasOverloadedAssignment(const Token* tok, bool& inconclusive)
 {
     inconclusive = false;
-    if (c)
+    if (tok->isC())
         return false;
     if (const ValueType* vt = tok->valueType()) {
         if (vt->pointer && !Token::simpleMatch(tok->astParent(), "*"))
@@ -261,6 +265,8 @@ static bool hasOverloadedAssignment(const Token* tok, bool c, bool& inconclusive
 
 void CheckAutoVariables::autoVariables()
 {
+    logChecker("CheckAutoVariables::autoVariables");
+
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -271,28 +277,28 @@ void CheckAutoVariables::autoVariables()
                 continue;
             }
             // Critical assignment
-            if (Token::Match(tok, "[;{}] %var% =") && isRefPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(2)->astOperand2())) {
+            if (Token::Match(tok, "[;{}] %var% =") && isRefPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(2)->astOperand2(), *mSettings)) {
                 checkAutoVariableAssignment(tok->next(), false);
-            } else if (Token::Match(tok, "[;{}] * %var% =") && isPtrArg(tok->tokAt(2)) && isAutoVariableRHS(tok->tokAt(3)->astOperand2())) {
+            } else if (Token::Match(tok, "[;{}] * %var% =") && isPtrArg(tok->tokAt(2)) && isAutoVariableRHS(tok->tokAt(3)->astOperand2(), *mSettings)) {
                 const Token* lhs = tok->tokAt(2);
                 bool inconclusive = false;
-                if (!hasOverloadedAssignment(lhs, mTokenizer->isC(), inconclusive) || (printInconclusive && inconclusive))
+                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())) {
+            } else if (Token::Match(tok, "[;{}] %var% . %var% =") && isPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(4)->astOperand2(), *mSettings)) {
                 const Token* lhs = tok->tokAt(3);
                 bool inconclusive = false;
-                if (!hasOverloadedAssignment(lhs, mTokenizer->isC(), inconclusive) || (printInconclusive && inconclusive))
+                if (!hasOverloadedAssignment(lhs, inconclusive) || (printInconclusive && inconclusive))
                     checkAutoVariableAssignment(tok->next(), inconclusive);
                 tok = tok->tokAt(5);
             } else if (Token::Match(tok, "[;{}] %var% [") && Token::simpleMatch(tok->linkAt(2), "] =") &&
-                       (isPtrArg(tok->next()) || isArrayArg(tok->next(), mSettings)) &&
-                       isAutoVariableRHS(tok->linkAt(2)->next()->astOperand2())) {
+                       (isPtrArg(tok->next()) || isArrayArg(tok->next(), *mSettings)) &&
+                       isAutoVariableRHS(tok->linkAt(2)->next()->astOperand2(), *mSettings)) {
                 errorAutoVariableAssignment(tok->next(), false);
             }
             // Invalid pointer deallocation
             else if ((Token::Match(tok, "%name% ( %var%|%str% ) ;") && mSettings->library.getDeallocFuncInfo(tok)) ||
-                     (mTokenizer->isCPP() && Token::Match(tok, "delete [| ]| (| %var%|%str% !!["))) {
+                     (tok->isCpp() && Token::Match(tok, "delete [| ]| (| %var%|%str% !!["))) {
                 tok = Token::findmatch(tok->next(), "%var%|%str%");
                 if (Token::simpleMatch(tok->astParent(), "."))
                     continue;
@@ -310,7 +316,7 @@ void CheckAutoVariables::autoVariables()
                     }
                 }
             } else if ((Token::Match(tok, "%name% ( & %var% ) ;") && mSettings->library.getDeallocFuncInfo(tok)) ||
-                       (mTokenizer->isCPP() && Token::Match(tok, "delete [| ]| (| & %var% !!["))) {
+                       (tok->isCpp() && Token::Match(tok, "delete [| ]| (| & %var% !!["))) {
                 tok = Token::findmatch(tok->next(), "%var%");
                 if (isAutoVar(tok))
                     errorInvalidDeallocation(tok, nullptr);
@@ -324,7 +330,7 @@ bool CheckAutoVariables::checkAutoVariableAssignment(const Token *expr, bool inc
     if (!startToken)
         startToken = Token::findsimplematch(expr, "=")->next();
     for (const Token *tok = startToken; tok; tok = tok->next()) {
-        if (tok->str() == "}" && tok->scope()->type == Scope::ScopeType::eFunction)
+        if (tok->str() == "}" && tok->scope()->type == ScopeType::eFunction)
             errorAutoVariableAssignment(expr, inconclusive);
 
         if (Token::Match(tok, "return|throw|break|continue")) {
@@ -459,14 +465,16 @@ static int getPointerDepth(const Token *tok)
     return n;
 }
 
-static bool isDeadTemporary(bool cpp, const Token* tok, const Token* expr, const Library* library)
+static bool isDeadTemporary(const Token* tok, const Token* expr, const Library& library)
 {
-    if (!isTemporary(cpp, tok, library))
+    if (!isTemporary(tok, &library))
         return false;
     if (expr) {
         if (!precedes(nextAfterAstRightmostLeaf(tok->astTop()), nextAfterAstRightmostLeaf(expr->astTop())))
             return false;
         const Token* parent = tok->astParent();
+        if (Token::simpleMatch(parent, "{") && Token::simpleMatch(parent->astParent(), ":"))
+            parent = parent->astParent();
         // Is in a for loop
         if (astIsRHS(tok) && Token::simpleMatch(parent, ":") && Token::simpleMatch(parent->astParent(), "(") && Token::simpleMatch(parent->astParent()->previous(), "for (")) {
             const Token* braces = parent->astParent()->link()->next();
@@ -489,7 +497,7 @@ static bool isEscapedReference(const Variable* var)
     if (!Token::simpleMatch(varDeclEndToken, "="))
         return false;
     const Token* vartok = varDeclEndToken->astOperand2();
-    return !isTemporary(true, vartok, nullptr, false);
+    return !isTemporary(vartok, nullptr, false);
 }
 
 static bool isDanglingSubFunction(const Token* tokvalue, const Token* tok)
@@ -547,7 +555,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, true)) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok, *mSettings, true)) {
                 if (!printInconclusive && lt.inconclusive)
                     continue;
                 const Variable* var = lt.token->variable();
@@ -556,7 +564,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                     errorReturnReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
-                if (isDeadTemporary(mTokenizer->isCPP(), lt.token, nullptr, &mSettings->library)) {
+                if (isDeadTemporary(lt.token, nullptr, mSettings->library)) {
                     errorReturnTempReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
@@ -567,18 +575,18 @@ 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);
+            const Variable *var = ValueFlow::getLifetimeVariable(tok, errorPath, *mSettings);
             if (var && isInScope(var->nameToken(), tok->scope())) {
-                errorDanglingReference(tok, var, errorPath);
+                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))) {
+            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(getParentLifetime(tok), *mSettings)) {
                 if (!printInconclusive && lt.inconclusive)
                     continue;
                 const Token * tokvalue = lt.token;
-                if (isDeadTemporary(mTokenizer->isCPP(), tokvalue, tok, &mSettings->library)) {
+                if (isDeadTemporary(tokvalue, tok, mSettings->library)) {
                     errorDanglingTempReference(tok, lt.errorPath, lt.inconclusive);
                     break;
                 }
@@ -592,23 +600,23 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                 continue;
             if (!printInconclusive && val.isInconclusive())
                 continue;
-            const Token* parent = getParentLifetime(mTokenizer->isCPP(), 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, 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(mTokenizer->isCPP(), tokvalue, nullptr, &mSettings->library)) {
+                            isDeadTemporary(tokvalue, nullptr, mSettings->library)) {
                             errorReturnDanglingLifetime(tok, &val);
                             break;
                         }
@@ -616,7 +624,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                         errorInvalidLifetime(tok, &val);
                         break;
                     } else if (!tokvalue->variable() &&
-                               isDeadTemporary(mTokenizer->isCPP(), tokvalue, tok, &mSettings->library)) {
+                               isDeadTemporary(tokvalue, tok, mSettings->library)) {
                         if (!diag(tokvalue))
                             errorDanglingTemporaryLifetime(tok, &val, tokvalue);
                         break;
@@ -634,19 +642,19 @@ 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->isArgument() && !(val.tokvalue && val.tokvalue->variable() && val.tokvalue->variable()->isStatic()) &&
+                    if (var && (!var->isLocal() || var->isStatic()) && !var->isArgument() && !(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,
-                                           mTokenizer->isCPP())) {
-                        errorDanglngLifetime(tok2, &val);
+                                           *mSettings)) {
+                        errorDanglngLifetime(tok2, &val, var->isLocal());
                         break;
                     }
                 }
@@ -659,9 +667,9 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
         }
         if (tok->str() == "{" && tok->scope()) {
             // Check functions in local classes
-            if (tok->scope()->type == Scope::eClass ||
-                tok->scope()->type == Scope::eStruct ||
-                tok->scope()->type == Scope::eUnion) {
+            if (tok->scope()->type == ScopeType::eClass ||
+                tok->scope()->type == ScopeType::eStruct ||
+                tok->scope()->type == ScopeType::eUnion) {
                 for (const Function& f:tok->scope()->functionList) {
                     if (f.functionScope)
                         checkVarLifetimeScope(f.functionScope->bodyStart, f.functionScope->bodyEnd);
@@ -674,6 +682,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
 
 void CheckAutoVariables::checkVarLifetime()
 {
+    logChecker("CheckAutoVariables::checkVarLifetime");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         if (!scope->function)
@@ -688,7 +697,7 @@ void CheckAutoVariables::errorReturnDanglingLifetime(const Token *tok, const Val
     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)
@@ -697,7 +706,7 @@ void CheckAutoVariables::errorInvalidLifetime(const Token *tok, const ValueFlow:
     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)
@@ -707,7 +716,7 @@ void CheckAutoVariables::errorDanglingTemporaryLifetime(const Token* tok, const
     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.",
@@ -715,28 +724,29 @@ void CheckAutoVariables::errorDanglingTemporaryLifetime(const Token* tok, const
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-void CheckAutoVariables::errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val)
+void CheckAutoVariables::errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val, bool isStatic)
 {
     const bool inconclusive = val ? val->isInconclusive() : false;
     ErrorPath errorPath = val ? val->errorPath : ErrorPath();
     std::string tokName = tok ? tok->expressionString() : "x";
-    std::string msg = "Non-local variable '" + tokName + "' will use " + lifetimeMessage(tok, val, errorPath);
+    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)
 {
     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)
 {
     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)
@@ -745,14 +755,14 @@ void CheckAutoVariables::errorDanglingReference(const Token *tok, const Variable
     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)
 {
     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)
@@ -781,3 +791,28 @@ void CheckAutoVariables::errorInvalidDeallocation(const Token *tok, const ValueF
                 "The deallocation of " + type + " results in undefined behaviour. You should only free memory "
                 "that has been allocated dynamically.", CWE590, Certainty::normal);
 }
+
+void CheckAutoVariables::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckAutoVariables checkAutoVariables(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkAutoVariables.assignFunctionArg();
+    checkAutoVariables.checkVarLifetime();
+    checkAutoVariables.autoVariables();
+}
+
+void CheckAutoVariables::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckAutoVariables c(nullptr,settings,errorLogger);
+    c.errorAutoVariableAssignment(nullptr, false);
+    c.errorReturnReference(nullptr, ErrorPath{}, false);
+    c.errorDanglingReference(nullptr, nullptr, ErrorPath{});
+    c.errorReturnTempReference(nullptr, ErrorPath{}, false);
+    c.errorDanglingTempReference(nullptr, ErrorPath{}, false);
+    c.errorInvalidDeallocation(nullptr, nullptr);
+    c.errorUselessAssignmentArg(nullptr);
+    c.errorUselessAssignmentPtrArg(nullptr);
+    c.errorReturnDanglingLifetime(nullptr, nullptr);
+    c.errorInvalidLifetime(nullptr, nullptr);
+    c.errorDanglngLifetime(nullptr, nullptr);
+    c.errorDanglingTemporaryLifetime(nullptr, nullptr, nullptr);
+}
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
index ea70beba372..d94f254508f 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-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
@@ -31,9 +31,9 @@
 
 class Settings;
 class Token;
-class Tokenizer;
 class ErrorLogger;
 class Variable;
+class Tokenizer;
 
 namespace ValueFlow {
     class Value;
@@ -49,17 +49,13 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
     /** This constructor is used when registering the CheckClass */
     CheckAutoVariables() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckAutoVariables checkAutoVariables(tokenizer, settings, errorLogger);
-        checkAutoVariables.assignFunctionArg();
-        checkAutoVariables.checkVarLifetime();
-        checkAutoVariables.autoVariables();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** assign function argument */
     void assignFunctionArg();
@@ -76,11 +72,10 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
 
     void checkVarLifetimeScope(const Token * start, const Token * end);
 
-private:
     void errorAutoVariableAssignment(const Token *tok, bool inconclusive);
     void errorReturnDanglingLifetime(const Token *tok, const ValueFlow::Value* val);
     void errorInvalidLifetime(const Token *tok, const ValueFlow::Value* val);
-    void errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val);
+    void errorDanglngLifetime(const Token *tok, const ValueFlow::Value *val, bool isStatic = false);
     void errorDanglingTemporaryLifetime(const Token* tok, const ValueFlow::Value* val, const Token* tempTok);
     void errorReturnReference(const Token* tok, ErrorPath errorPath, bool inconclusive);
     void errorDanglingReference(const Token *tok, const Variable *var, ErrorPath errorPath);
@@ -90,22 +85,7 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
     void errorUselessAssignmentArg(const Token *tok);
     void errorUselessAssignmentPtrArg(const Token *tok);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        ErrorPath errorPath;
-        CheckAutoVariables c(nullptr,settings,errorLogger);
-        c.errorAutoVariableAssignment(nullptr, false);
-        c.errorReturnReference(nullptr, errorPath, false);
-        c.errorDanglingReference(nullptr, nullptr, errorPath);
-        c.errorReturnTempReference(nullptr, errorPath, false);
-        c.errorDanglingTempReference(nullptr, errorPath, false);
-        c.errorInvalidDeallocation(nullptr, nullptr);
-        c.errorUselessAssignmentArg(nullptr);
-        c.errorUselessAssignmentPtrArg(nullptr);
-        c.errorReturnDanglingLifetime(nullptr, nullptr);
-        c.errorInvalidLifetime(nullptr, nullptr);
-        c.errorDanglngLifetime(nullptr, nullptr);
-        c.errorDanglingTemporaryLifetime(nullptr, nullptr, nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Auto Variables";
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
index 970cd7d708a..93e501416aa 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-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
@@ -50,9 +50,11 @@ static bool isBool(const Variable* var)
 //---------------------------------------------------------------------------
 void CheckBool::checkIncrementBoolean()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("incrementboolean"))
         return;
 
+    logChecker("CheckBool::checkIncrementBoolean"); // style
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -88,13 +90,14 @@ static bool isConvertedToBool(const Token* tok)
 //---------------------------------------------------------------------------
 void CheckBool::checkBitwiseOnBoolean()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    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;
 
-    // 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))
-        return;
+    logChecker("CheckBool::checkBitwiseOnBoolean"); // style,inconclusive
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -109,6 +112,8 @@ void CheckBool::checkBitwiseOnBoolean()
                     continue;
                 const bool isBoolOp1 = astIsBool(tok->astOperand1());
                 const bool isBoolOp2 = astIsBool(tok->astOperand2());
+                if (!tok->astOperand1()->valueType() || !tok->astOperand2()->valueType())
+                    continue;
                 if (!(isBoolOp1 || isBoolOp2))
                     continue;
                 if (isCompound && (!isBoolOp1 || isBoolOp2))
@@ -116,7 +121,7 @@ void CheckBool::checkBitwiseOnBoolean()
                 if (tok->str() == "|" && !isConvertedToBool(tok) && !(isBoolOp1 && isBoolOp2))
                     continue;
                 // first operand will always be evaluated
-                if (!isConstExpression(tok->astOperand2(), mSettings->library, mTokenizer->isCPP()))
+                if (!isConstExpression(tok->astOperand2(), mSettings->library))
                     continue;
                 if (tok->astOperand2()->variable() && tok->astOperand2()->variable()->nameToken() == tok->astOperand2())
                     continue;
@@ -149,6 +154,8 @@ void CheckBool::checkComparisonOfBoolWithInt()
     if (!mSettings->severity.isEnabled(Severity::warning) || !mTokenizer->isCPP())
         return;
 
+    logChecker("CheckBool::checkComparisonOfBoolWithInt"); // warning,c++
+
     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()) {
@@ -201,6 +208,8 @@ void CheckBool::checkComparisonOfFuncReturningBool()
     if (!mTokenizer->isCPP())
         return;
 
+    logChecker("CheckBool::checkComparisonOfFuncReturningBool"); // style,c++
+
     const SymbolDatabase * const symbolDatabase = mTokenizer->getSymbolDatabase();
     auto getFunctionTok = [](const Token* tok) -> const Token* {
         while (Token::simpleMatch(tok, "!") || (tok && tok->isCast() && !isCPPCast(tok)))
@@ -265,6 +274,8 @@ void CheckBool::checkComparisonOfBoolWithBool()
     if (!mTokenizer->isCPP())
         return;
 
+    logChecker("CheckBool::checkComparisonOfBoolWithBool"); // style,c++
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -308,6 +319,7 @@ void CheckBool::comparisonOfBoolWithBoolError(const Token *tok, const std::strin
 //-----------------------------------------------------------------------------
 void CheckBool::checkAssignBoolToPointer()
 {
+    logChecker("CheckBool::checkAssignBoolToPointer");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -328,9 +340,11 @@ void CheckBool::assignBoolToPointerError(const Token *tok)
 //-----------------------------------------------------------------------------
 void CheckBool::checkComparisonOfBoolExpressionWithInt()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("compareBoolExpressionWithInt"))
         return;
 
+    logChecker("CheckBool::checkComparisonOfBoolExpressionWithInt"); // warning
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -364,13 +378,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, ">|==|!=")))
@@ -397,19 +411,21 @@ void CheckBool::comparisonOfBoolExpressionWithIntError(const Token *tok, bool no
 
 void CheckBool::pointerArithBool()
 {
+    logChecker("CheckBool::pointerArithBool");
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eIf && !scope.isLoopScope())
+        if (scope.type != ScopeType::eIf && !scope.isLoopScope())
             continue;
         const Token* tok = scope.classDef->next()->astOperand2();
-        if (scope.type == Scope::eFor) {
+        if (scope.type == ScopeType::eFor) {
             tok = Token::findsimplematch(scope.classDef->tokAt(2), ";");
             if (tok)
                 tok = tok->astOperand2();
             if (tok)
                 tok = tok->astOperand1();
-        } else if (scope.type == Scope::eDo)
+        } else if (scope.type == ScopeType::eDo)
             tok = (scope.bodyEnd->tokAt(2)) ? scope.bodyEnd->tokAt(2)->astOperand2() : nullptr;
 
         pointerArithBoolCond(tok);
@@ -451,6 +467,7 @@ void CheckBool::checkAssignBoolToFloat()
         return;
     if (!mSettings->severity.isEnabled(Severity::style))
         return;
+    logChecker("CheckBool::checkAssignBoolToFloat"); // style,c++
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -472,6 +489,8 @@ void CheckBool::returnValueOfFunctionReturningBool()
     if (!mSettings->severity.isEnabled(Severity::style))
         return;
 
+    logChecker("CheckBool::returnValueOfFunctionReturningBool"); // style
+
     const SymbolDatabase * const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -486,7 +505,7 @@ 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);
         }
@@ -497,3 +516,36 @@ void CheckBool::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)
+{
+    CheckBool checkBool(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    // Checks
+    checkBool.checkComparisonOfBoolExpressionWithInt();
+    checkBool.checkComparisonOfBoolWithInt();
+    checkBool.checkAssignBoolToFloat();
+    checkBool.pointerArithBool();
+    checkBool.returnValueOfFunctionReturningBool();
+    checkBool.checkComparisonOfFuncReturningBool();
+    checkBool.checkComparisonOfBoolWithBool();
+    checkBool.checkIncrementBoolean();
+    checkBool.checkAssignBoolToPointer();
+    checkBool.checkBitwiseOnBoolean();
+}
+
+void CheckBool::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckBool c(nullptr, settings, errorLogger);
+    c.assignBoolToPointerError(nullptr);
+    c.assignBoolToFloatError(nullptr);
+    c.comparisonOfFuncReturningBoolError(nullptr, "func_name");
+    c.comparisonOfTwoFuncsReturningBoolError(nullptr, "func_name1", "func_name2");
+    c.comparisonOfBoolWithBoolError(nullptr, "var_name");
+    c.incrementBooleanError(nullptr);
+    c.bitwiseOnBooleanError(nullptr, "expression", "&&");
+    c.comparisonOfBoolExpressionWithIntError(nullptr, true);
+    c.pointerArithBoolError(nullptr);
+    c.comparisonOfBoolWithInvalidComparator(nullptr, "expression");
+    c.returnValueBoolError(nullptr);
+}
diff --git a/lib/checkbool.h b/lib/checkbool.h
index d6213a58dbb..65e5d0254ea 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-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
@@ -43,26 +43,13 @@ class CPPCHECKLIB CheckBool : public Check {
     /** @brief This constructor is used when registering the CheckClass */
     CheckBool() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckBool checkBool(tokenizer, settings, errorLogger);
-
-        // Checks
-        checkBool.checkComparisonOfBoolExpressionWithInt();
-        checkBool.checkComparisonOfBoolWithInt();
-        checkBool.checkAssignBoolToFloat();
-        checkBool.pointerArithBool();
-        checkBool.returnValueOfFunctionReturningBool();
-        checkBool.checkComparisonOfFuncReturningBool();
-        checkBool.checkComparisonOfBoolWithBool();
-        checkBool.checkIncrementBoolean();
-        checkBool.checkAssignBoolToPointer();
-        checkBool.checkBitwiseOnBoolean();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief %Check for comparison of function returning bool*/
     void checkComparisonOfFuncReturningBool();
@@ -95,7 +82,6 @@ class CPPCHECKLIB CheckBool : public Check {
     /** @brief %Check if a function returning bool returns an integer other than 0 or 1 */
     void returnValueOfFunctionReturningBool();
 
-private:
     // Error messages..
     void comparisonOfFuncReturningBoolError(const Token *tok, const std::string &expression);
     void comparisonOfTwoFuncsReturningBoolError(const Token *tok, const std::string &expression1, const std::string &expression2);
@@ -109,20 +95,7 @@ class CPPCHECKLIB CheckBool : public Check {
     void pointerArithBoolError(const Token *tok);
     void returnValueBoolError(const Token *tok);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckBool c(nullptr, settings, errorLogger);
-        c.assignBoolToPointerError(nullptr);
-        c.assignBoolToFloatError(nullptr);
-        c.comparisonOfFuncReturningBoolError(nullptr, "func_name");
-        c.comparisonOfTwoFuncsReturningBoolError(nullptr, "func_name1", "func_name2");
-        c.comparisonOfBoolWithBoolError(nullptr, "var_name");
-        c.incrementBooleanError(nullptr);
-        c.bitwiseOnBooleanError(nullptr, "expression", "&&");
-        c.comparisonOfBoolExpressionWithIntError(nullptr, true);
-        c.pointerArithBoolError(nullptr);
-        c.comparisonOfBoolWithInvalidComparator(nullptr, "expression");
-        c.returnValueBoolError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Boolean";
diff --git a/lib/checkboost.cpp b/lib/checkboost.cpp
deleted file mode 100644
index 9974f5e6d2e..00000000000
--- a/lib/checkboost.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
- *
- * This 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 "checkboost.h"
-
-#include "errortypes.h"
-#include "symboldatabase.h"
-#include "token.h"
-
-#include <vector>
-
-// Register this check class (by creating a static instance of it)
-namespace {
-    CheckBoost instance;
-}
-
-static const CWE CWE664(664);
-
-void CheckBoost::checkBoostForeachModification()
-{
-    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()) {
-            if (!Token::simpleMatch(tok, "BOOST_FOREACH ("))
-                continue;
-
-            const Token *containerTok = tok->next()->link()->previous();
-            if (!Token::Match(containerTok, "%var% ) {"))
-                continue;
-
-            const Token *tok2 = containerTok->tokAt(2);
-            const Token *end = tok2->link();
-            for (; tok2 != end; tok2 = tok2->next()) {
-                if (Token::Match(tok2, "%varid% . insert|erase|push_back|push_front|pop_front|pop_back|clear|swap|resize|assign|merge|remove|remove_if|reverse|sort|splice|unique|pop|push", containerTok->varId())) {
-                    const Token* nextStatement = Token::findsimplematch(tok2->linkAt(3), ";", end);
-                    if (!Token::Match(nextStatement, "; break|return|throw"))
-                        boostForeachError(tok2);
-                    break;
-                }
-            }
-        }
-    }
-}
-
-void CheckBoost::boostForeachError(const Token *tok)
-{
-    reportError(tok, Severity::error, "boostForeachError",
-                "BOOST_FOREACH caches the end() iterator. It's undefined behavior if you modify the container inside.", CWE664, Certainty::normal
-                );
-}
diff --git a/lib/checkboost.h b/lib/checkboost.h
deleted file mode 100644
index a232ad22cf1..00000000000
--- a/lib/checkboost.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
- *
- * This 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 checkboostH
-#define checkboostH
-//---------------------------------------------------------------------------
-
-#include "check.h"
-#include "config.h"
-#include "tokenize.h"
-
-#include <string>
-
-class ErrorLogger;
-class Settings;
-class Token;
-
-/// @addtogroup Checks
-/// @{
-
-
-/** @brief %Check Boost usage */
-class CPPCHECKLIB CheckBoost : public Check {
-public:
-    /** This constructor is used when registering the CheckClass */
-    CheckBoost() : Check(myName()) {}
-
-    /** This constructor is used when running checks. */
-    CheckBoost(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, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (!tokenizer->isCPP())
-            return;
-
-        CheckBoost checkBoost(tokenizer, settings, errorLogger);
-        checkBoost.checkBoostForeachModification();
-    }
-
-    /** @brief %Check for container modification while using the BOOST_FOREACH macro */
-    void checkBoostForeachModification();
-
-private:
-    void boostForeachError(const Token *tok);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckBoost c(nullptr, settings, errorLogger);
-        c.boostForeachError(nullptr);
-    }
-
-    static std::string myName() {
-        return "Boost usage";
-    }
-
-    std::string classInfo() const override {
-        return "Check for invalid usage of Boost:\n"
-               "- container modification during BOOST_FOREACH\n";
-    }
-};
-/// @}
-//---------------------------------------------------------------------------
-#endif // checkboostH
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index 7afad1de9d9..57c46492bc0 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-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
@@ -24,6 +24,7 @@
 
 #include "astutils.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "library.h"
 #include "mathlib.h"
 #include "platform.h"
@@ -31,8 +32,10 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -40,7 +43,9 @@
 #include <iterator>
 #include <numeric> // std::accumulate
 #include <sstream>
-#include <tinyxml2.h>
+#include <utility>
+
+#include "xml.h"
 
 //---------------------------------------------------------------------------
 
@@ -70,6 +75,14 @@ static const ValueFlow::Value *getBufferSizeValue(const Token *tok)
     return it == tokenValues.cend() ? nullptr : &*it;
 }
 
+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)
 {
     if (formatStringArgNr <= 0 || formatStringArgNr > parameters.size())
@@ -83,8 +96,8 @@ 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;
-    for (int i = 1; i + 1 < formatString.length(); ++i) {
+    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')
                 break;
@@ -156,13 +169,11 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
                 if (formatString[i] == 's') {
                     // For strings, the length after the dot "%.2s" will limit
                     // the length of the string.
-                    if (parameterLength > maxLen)
-                        parameterLength = maxLen;
+                    parameterLength = std::min(parameterLength, maxLen);
                 } else {
                     // For integers, the length after the dot "%.2d" can
                     // increase required length
-                    if (tempDigits < maxLen)
-                        tempDigits = maxLen;
+                    tempDigits = std::max(tempDigits, maxLen);
                 }
             }
 
@@ -185,7 +196,7 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
 
 //---------------------------------------------------------------------------
 
-static bool getDimensionsEtc(const Token * const arrayToken, const Settings *settings, std::vector<Dimension> &dimensions, ErrorPath &errorPath, bool &mightBeLarger, MathLib::bigint &path)
+static bool getDimensionsEtc(const Token * const arrayToken, const Settings &settings, std::vector<Dimension> &dimensions, ErrorPath &errorPath, bool &mightBeLarger, MathLib::bigint &path)
 {
     const Token *array = arrayToken;
     while (Token::Match(array, ".|::"))
@@ -218,7 +229,8 @@ static bool getDimensionsEtc(const Token * const arrayToken, const Settings *set
         Dimension dim;
         dim.known = value->isKnown();
         dim.tok = nullptr;
-        const int 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;
@@ -255,7 +267,7 @@ static std::vector<ValueFlow::Value> getOverrunIndexValues(const Token* tok,
 
     bool overflow = false;
     std::vector<ValueFlow::Value> indexValues;
-    for (int i = 0; i < dimensions.size() && i < indexTokens.size(); ++i) {
+    for (std::size_t i = 0; i < dimensions.size() && i < indexTokens.size(); ++i) {
         MathLib::bigint size = dimensions[i].num;
         if (!isArrayIndex)
             size++;
@@ -264,8 +276,8 @@ static std::vector<ValueFlow::Value> getOverrunIndexValues(const Token* tok,
                                                    ? ValueFlow::isOutOfBounds(makeSizeValue(size, path), indexTokens[i])
                                                    : std::vector<ValueFlow::Value>{};
         if (values.empty()) {
-            if (indexTokens[i]->hasKnownIntValue())
-                indexValues.push_back(indexTokens[i]->values().front());
+            if (const ValueFlow::Value* v = indexTokens[i]->getKnownValue(ValueFlow::Value::ValueType::INT))
+                indexValues.push_back(*v);
             else
                 indexValues.push_back(ValueFlow::Value::unknown());
             continue;
@@ -280,6 +292,8 @@ static std::vector<ValueFlow::Value> getOverrunIndexValues(const Token* tok,
 
 void CheckBufferOverrun::arrayIndex()
 {
+    logChecker("CheckBufferOverrun::arrayIndex");
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (tok->str() != "[")
             continue;
@@ -315,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();
@@ -323,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, mTokenizer->isCPP()))) {
+                                                    /*globalvar*/ false, *mSettings))) {
                 if (!Token::simpleMatch(changeTok->astParent(), "[")) {
                     isChanged = true;
                     break;
@@ -345,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;
@@ -385,7 +399,7 @@ static std::string arrayIndexMessage(const Token* tok,
     auto add_dim = [](const std::string &s, const Dimension &dim) {
         return s + "[" + MathLib::toString(dim.num) + "]";
     };
-    const std::string array = std::accumulate(dimensions.cbegin(), dimensions.cend(), tok->astOperand1()->expressionString(), add_dim);
+    const std::string array = std::accumulate(dimensions.cbegin(), dimensions.cend(), tok->astOperand1()->expressionString(), std::move(add_dim));
 
     std::ostringstream errmsg;
     if (condition)
@@ -458,9 +472,11 @@ void CheckBufferOverrun::negativeIndexError(const Token* tok,
 
 void CheckBufferOverrun::pointerArithmetic()
 {
-    if (!mSettings->severity.isEnabled(Severity::portability))
+    if (!mSettings->severity.isEnabled(Severity::portability) && !mSettings->isPremiumEnabled("pointerOutOfBounds"))
         return;
 
+    logChecker("CheckBufferOverrun::pointerArithmetic"); // portability
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!Token::Match(tok, "+|-"))
             continue;
@@ -487,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() == "+") {
@@ -496,11 +512,11 @@ void CheckBufferOverrun::pointerArithmetic()
                 const std::vector<const Token *> indexTokens{indexToken};
                 const std::vector<ValueFlow::Value>& indexValues =
                     getOverrunIndexValues(tok, arrayToken, dimensions, indexTokens, path);
-                if (!indexValues.empty())
+                if (!indexValues.empty() && !isUnreachableOperand(tok))
                     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())
@@ -510,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);
             }
@@ -546,6 +562,8 @@ ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
 {
     if (!bufTok->valueType())
         return ValueFlow::Value(-1);
+    if (bufTok->isUnaryOp("&"))
+        bufTok = bufTok->astOperand1();
     const Variable *var = bufTok->variable();
 
     if (!var || var->dimensions().empty()) {
@@ -554,28 +572,21 @@ ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
             return *value;
     }
 
-    MathLib::bigint dim = -1;
-    if (var) {
-        dim = std::accumulate(var->dimensions().cbegin(), var->dimensions().cend(), 1LL, [](MathLib::bigint i1, const Dimension &dim) {
-            return i1 * dim.num;
-        });
-    }
-    else if (bufTok->tokType() == Token::Type::eString) {
-        dim = Token::getStrLength(bufTok) + 1;
-    }
-    else
+    if (!var || var->isPointer())
         return ValueFlow::Value(-1);
 
+    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;
+    });
+
     ValueFlow::Value v;
     v.setKnown();
     v.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
 
-    if (var && var->isPointerArray())
+    if (var->isPointerArray())
         v.intvalue = dim * mSettings->platform.sizeof_pointer;
-    else if (var && var->isPointer())
-        return ValueFlow::Value(-1);
     else {
-        const MathLib::bigint typeSize = bufTok->valueType()->typeSize(mSettings->platform);
+        const size_t typeSize = bufTok->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
         v.intvalue = dim * typeSize;
     }
 
@@ -583,14 +594,14 @@ ValueFlow::Value CheckBufferOverrun::getBufferSize(const Token *bufTok) const
 }
 //---------------------------------------------------------------------------
 
-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, const MathLib::bigint 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;
 
     switch (minsize.type) {
     case Library::ArgumentChecks::MinSize::Type::STRLEN:
-        if (settings->library.isargformatstr(ftok, minsize.arg)) {
+        if (settings.library.isargformatstr(ftok, minsize.arg)) {
             return getMinFormatStringOutputLength(args, minsize.arg) < bufferSize;
         } else if (arg) {
             const Token *strtoken = arg->getValueTokenMaxStrLength();
@@ -601,7 +612,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
     case Library::ArgumentChecks::MinSize::Type::ARGVALUE: {
         if (arg && arg->hasKnownIntValue()) {
             MathLib::bigint myMinsize = arg->getKnownIntValue();
-            const unsigned int baseSize = tokenizer->sizeOfType(minsize.baseType);
+            const int baseSize = tokenizer->sizeOfType(minsize.baseType);
             if (baseSize != 0)
                 myMinsize *= baseSize;
             return myMinsize <= bufferSize;
@@ -617,7 +628,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
         break;
     case Library::ArgumentChecks::MinSize::Type::VALUE: {
         MathLib::bigint myMinsize = minsize.value;
-        const unsigned int baseSize = tokenizer->sizeOfType(minsize.baseType);
+        const int baseSize = tokenizer->sizeOfType(minsize.baseType);
         if (baseSize != 0)
             myMinsize *= baseSize;
         return myMinsize <= bufferSize;
@@ -631,6 +642,8 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
 
 void CheckBufferOverrun::bufferOverflow()
 {
+    logChecker("CheckBufferOverrun::bufferOverflow");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -651,7 +664,7 @@ void CheckBufferOverrun::bufferOverflow()
                     argtok = argtok->astOperand2() ? argtok->astOperand2() : argtok->astOperand1();
                 while (Token::Match(argtok, ".|::"))
                     argtok = argtok->astOperand2();
-                if (!argtok || (!argtok->variable() && argtok->tokType() != Token::Type::eString))
+                if (!argtok)
                     continue;
                 if (argtok->valueType() && argtok->valueType()->pointer == 0)
                     continue;
@@ -674,8 +687,8 @@ void CheckBufferOverrun::bufferOverflow()
                             continue;
                     }
                 }
-                const bool error = std::none_of(minsizes->begin(), minsizes->end(), [=](const Library::ArgumentChecks::MinSize &minsize) {
-                    return checkBufferSize(tok, minsize, args, bufferSize.intvalue, mSettings, mTokenizer);
+                const bool error = std::none_of(minsizes->begin(), minsizes->end(), [&](const Library::ArgumentChecks::MinSize &minsize) {
+                    return checkBufferSize(tok, minsize, args, bufferSize.intvalue, *mSettings, mTokenizer);
                 });
                 if (error)
                     bufferOverflowError(args[argnr], &bufferSize, Certainty::normal);
@@ -686,7 +699,7 @@ void CheckBufferOverrun::bufferOverflow()
 
 void CheckBufferOverrun::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);
+    reportError(getErrorPath(tok, value, "Buffer overrun"), Severity::error, "bufferAccessOutOfBounds", "Buffer is accessed out of bounds: " + (tok ? getRealBufferTok(tok)->expressionString() : "buf"), CWE_BUFFER_OVERRUN, certainty);
 }
 
 //---------------------------------------------------------------------------
@@ -696,6 +709,8 @@ void CheckBufferOverrun::arrayIndexThenCheck()
     if (!mSettings->severity.isEnabled(Severity::portability))
         return;
 
+    logChecker("CheckBufferOverrun::arrayIndexThenCheck");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * const scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
@@ -751,6 +766,9 @@ void CheckBufferOverrun::stringNotZeroTerminated()
     // this is currently 'inconclusive'. See TestBufferOverrun::terminateStrncpy3
     if (!mSettings->severity.isEnabled(Severity::warning) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
         return;
+
+    logChecker("CheckBufferOverrun::stringNotZeroTerminated"); // warning,inconclusive
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * const scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
@@ -779,19 +797,19 @@ void CheckBufferOverrun::stringNotZeroTerminated()
             }
             // Is the buffer zero terminated after the call?
             bool isZeroTerminated = false;
-            for (const Token *tok2 = tok->next()->link(); tok2 != scope->bodyEnd; tok2 = tok2->next()) {
+            for (const Token *tok2 = tok->linkAt(1); tok2 != scope->bodyEnd; tok2 = tok2->next()) {
                 if (!Token::simpleMatch(tok2, "] ="))
                     continue;
                 const Token *rhs = tok2->next()->astOperand2();
                 if (!rhs || !rhs->hasKnownIntValue() || rhs->getKnownIntValue() != 0)
                     continue;
-                if (isSameExpression(mTokenizer->isCPP(), false, args[0], tok2->link()->astOperand1(), mSettings->library, 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());
         }
     }
 }
@@ -812,9 +830,11 @@ void CheckBufferOverrun::terminateStrncpyError(const Token *tok, const std::stri
 void CheckBufferOverrun::argumentSize()
 {
     // Check '%type% x[10]' arguments
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("argumentSize"))
         return;
 
+    logChecker("CheckBufferOverrun::argumentSize"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * const scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -840,7 +860,7 @@ void CheckBufferOverrun::argumentSize()
                 if (calldata->variable()->dimensions().size() != argument->dimensions().size())
                     continue;
                 bool err = false;
-                for (int d = 0; d < argument->dimensions().size(); ++d) {
+                for (std::size_t d = 0; d < argument->dimensions().size(); ++d) {
                     const auto& dim1 = calldata->variable()->dimensions()[d];
                     const auto& dim2 = argument->dimensions()[d];
                     if (!dim1.known || !dim2.known)
@@ -866,7 +886,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);
 }
@@ -875,24 +895,42 @@ void CheckBufferOverrun::argumentSizeError(const Token *tok, const std::string &
 // CTU..
 //---------------------------------------------------------------------------
 
-std::string CheckBufferOverrun::MyFileInfo::toString() const
+// a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
+// see https://trac.cppcheck.net/ticket/12108 for more details
+#ifdef __clang__
+inline namespace CheckBufferOverrun_internal
+#else
+namespace
+#endif
 {
-    std::string xml;
-    if (!unsafeArrayIndex.empty())
-        xml = "    <array-index>\n" + CTU::toString(unsafeArrayIndex) + "    </array-index>\n";
-    if (!unsafePointerArith.empty())
-        xml += "    <pointer-arith>\n" + CTU::toString(unsafePointerArith) + "    </pointer-arith>\n";
-    return xml;
+    /** data for multifile checking */
+    class MyFileInfo : public Check::FileInfo {
+    public:
+        using Check::FileInfo::FileInfo;
+        /** unsafe array index usage */
+        std::list<CTU::FileInfo::UnsafeUsage> unsafeArrayIndex;
+
+        /** unsafe pointer arithmetics */
+        std::list<CTU::FileInfo::UnsafeUsage> unsafePointerArith;
+
+        /** Convert data into xml string */
+        std::string toString() const override
+        {
+            std::string xml;
+            if (!unsafeArrayIndex.empty())
+                xml = "    <array-index>\n" + CTU::toString(unsafeArrayIndex) + "    </array-index>\n";
+            if (!unsafePointerArith.empty())
+                xml += "    <pointer-arith>\n" + CTU::toString(unsafePointerArith) + "    </pointer-arith>\n";
+            return xml;
+        }
+    };
 }
 
-bool CheckBufferOverrun::isCtuUnsafeBufferUsage(const Check *check, const Token *argtok, MathLib::bigint *offset, int type)
+bool CheckBufferOverrun::isCtuUnsafeBufferUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset, int type)
 {
     if (!offset)
         return false;
-    const CheckBufferOverrun *c = dynamic_cast<const CheckBufferOverrun *>(check);
-    if (!c)
-        return false;
-    if (!argtok->valueType() || argtok->valueType()->typeSize(c->mSettings->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), "] ["))
@@ -905,44 +943,46 @@ bool CheckBufferOverrun::isCtuUnsafeBufferUsage(const Check *check, const Token
         return false;
     if (!indexTok->hasKnownIntValue())
         return false;
-    *offset = indexTok->getKnownIntValue() * argtok->valueType()->typeSize(c->mSettings->platform);
+    offset->value = indexTok->getKnownIntValue() * argtok->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
     return true;
 }
 
-bool CheckBufferOverrun::isCtuUnsafeArrayIndex(const Check *check, const Token *argtok, MathLib::bigint *offset)
+bool CheckBufferOverrun::isCtuUnsafeArrayIndex(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *offset)
 {
-    return CheckBufferOverrun::isCtuUnsafeBufferUsage(check, argtok, offset, 1);
+    return isCtuUnsafeBufferUsage(settings, argtok, offset, 1);
 }
 
-bool CheckBufferOverrun::isCtuUnsafePointerArith(const Check *check, const Token *argtok, MathLib::bigint *offset)
+bool CheckBufferOverrun::isCtuUnsafePointerArith(const Settings &settings, const Token *argtok, CTU::FileInfo::Value* offset)
 {
-    return CheckBufferOverrun::isCtuUnsafeBufferUsage(check, argtok, offset, 2);
+    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
+Check::FileInfo *CheckBufferOverrun::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
 {
-    CheckBufferOverrun checkBufferOverrun(tokenizer, settings, nullptr);
-    MyFileInfo *fileInfo = new MyFileInfo;
-    fileInfo->unsafeArrayIndex = CTU::getUnsafeUsage(tokenizer, settings, &checkBufferOverrun, isCtuUnsafeArrayIndex);
-    fileInfo->unsafePointerArith = CTU::getUnsafeUsage(tokenizer, settings, &checkBufferOverrun, isCtuUnsafePointerArith);
-    if (fileInfo->unsafeArrayIndex.empty() && fileInfo->unsafePointerArith.empty()) {
-        delete fileInfo;
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeArrayIndex = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafeArrayIndex);
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafePointerArith = CTU::getUnsafeUsage(tokenizer, settings, isCtuUnsafePointerArith);
+    if (unsafeArrayIndex.empty() && unsafePointerArith.empty()) {
         return nullptr;
     }
+    auto *fileInfo = new MyFileInfo(tokenizer.list.getFiles()[0]);
+    fileInfo->unsafeArrayIndex = unsafeArrayIndex;
+    fileInfo->unsafePointerArith = unsafePointerArith;
     return fileInfo;
 }
 
 Check::FileInfo * CheckBufferOverrun::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
 {
+    // cppcheck-suppress shadowFunction - TODO: fix this
     const std::string arrayIndex("array-index");
     const std::string pointerArith("pointer-arith");
 
-    MyFileInfo *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo;
     for (const tinyxml2::XMLElement *e = xmlElement->FirstChildElement(); e; e = e->NextSiblingElement()) {
-        if (e->Name() == arrayIndex)
+        const char* name = e->Name();
+        if (name == arrayIndex)
             fileInfo->unsafeArrayIndex = CTU::loadUnsafeUsageListFromXml(e);
-        else if (e->Name() == pointerArith)
+        else if (name == pointerArith)
             fileInfo->unsafePointerArith = CTU::loadUnsafeUsageListFromXml(e);
     }
 
@@ -955,38 +995,44 @@ 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<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
-    if (!ctu)
+    CheckBufferOverrun dummy(nullptr, &settings, &errorLogger);
+    dummy.
+    logChecker("CheckBufferOverrun::analyseWholeProgram");
+
+    if (fileInfo.empty())
         return false;
-    bool foundErrors = false;
-    (void)settings; // This argument is unused
 
-    const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> callsMap = ctu->getCallsMap();
+    const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> callsMap = ctu.getCallsMap();
+
+    bool foundErrors = false;
 
     for (const Check::FileInfo* fi1 : fileInfo) {
-        const MyFileInfo *fi = dynamic_cast<const MyFileInfo*>(fi1);
+        const auto *fi = dynamic_cast<const MyFileInfo*>(fi1);
         if (!fi)
             continue;
         for (const CTU::FileInfo::UnsafeUsage &unsafeUsage : fi->unsafeArrayIndex)
-            foundErrors |= analyseWholeProgram1(callsMap, unsafeUsage, 1, errorLogger);
+            foundErrors |= analyseWholeProgram1(callsMap, unsafeUsage, 1, errorLogger, settings.maxCtuDepth, fi->file0);
         for (const CTU::FileInfo::UnsafeUsage &unsafeUsage : fi->unsafePointerArith)
-            foundErrors |= analyseWholeProgram1(callsMap, unsafeUsage, 2, errorLogger);
+            foundErrors |= analyseWholeProgram1(callsMap, unsafeUsage, 2, errorLogger, settings.maxCtuDepth, fi->file0);
     }
     return foundErrors;
 }
 
-bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap, const CTU::FileInfo::UnsafeUsage &unsafeUsage, int type, ErrorLogger &errorLogger)
+bool CheckBufferOverrun::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)
 {
     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,
                                     "Using argument ARG",
                                     &functionCall,
-                                    false);
+                                    false,
+                                    maxCtuDepth);
     if (locationList.empty())
         return false;
 
@@ -997,18 +1043,18 @@ bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::l
     if (type == 1) {
         errorId = "ctuArrayIndex";
         if (unsafeUsage.value > 0)
-            errmsg = "Array index out of bounds; '" + unsafeUsage.myArgumentName + "' buffer size is " + MathLib::toString(functionCall->callArgValue) + " and it is accessed at offset " + MathLib::toString(unsafeUsage.value) + ".";
+            errmsg = "Array index out of bounds; '" + unsafeUsage.myArgumentName + "' buffer size is " + MathLib::toString(functionCall->callArgValue.value) + " and it is accessed at offset " + MathLib::toString(unsafeUsage.value) + ".";
         else
             errmsg = "Array index out of bounds; buffer '" + unsafeUsage.myArgumentName + "' is accessed at offset " + MathLib::toString(unsafeUsage.value) + ".";
         cwe = (unsafeUsage.value > 0) ? CWE_BUFFER_OVERRUN : CWE_BUFFER_UNDERRUN;
     } else {
         errorId = "ctuPointerArith";
-        errmsg = "Pointer arithmetic overflow; '" + unsafeUsage.myArgumentName + "' buffer size is " + MathLib::toString(functionCall->callArgValue);
+        errmsg = "Pointer arithmetic overflow; '" + unsafeUsage.myArgumentName + "' buffer size is " + MathLib::toString(functionCall->callArgValue.value);
         cwe = CWE_POINTER_ARITHMETIC_OVERFLOW;
     }
 
-    const ErrorMessage errorMessage(locationList,
-                                    emptyString,
+    const ErrorMessage errorMessage(std::move(locationList),
+                                    file0,
                                     Severity::error,
                                     errmsg,
                                     errorId,
@@ -1020,6 +1066,7 @@ bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::l
 
 void CheckBufferOverrun::objectIndex()
 {
+    logChecker("CheckBufferOverrun::objectIndex");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *functionScope : symbolDatabase->functionScopes) {
         for (const Token *tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
@@ -1029,12 +1076,10 @@ void CheckBufferOverrun::objectIndex()
             const Token *idx = tok->astOperand2();
             if (!idx || !obj)
                 continue;
-            if (idx->hasKnownIntValue()) {
-                if (idx->getKnownIntValue() == 0)
+            if (const ValueFlow::Value* v = idx->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+                if (v->intvalue == 0)
                     continue;
             }
-            if (idx->hasKnownIntValue() && idx->getKnownIntValue() == 0)
-                continue;
 
             std::vector<ValueFlow::Value> values = ValueFlow::getLifetimeObjValues(obj, false, -1);
             for (const ValueFlow::Value& v:values) {
@@ -1057,8 +1102,8 @@ void CheckBufferOverrun::objectIndex()
                     if (var->valueType()->pointer > obj->valueType()->pointer)
                         continue;
                 }
-                if (obj->valueType() && var->valueType() && (obj->isCast() || (mTokenizer->isCPP() && isCPPCast(obj)) || obj->valueType()->pointer)) { // allow cast to a different type
-                    const auto varSize = var->valueType()->typeSize(mSettings->platform);
+                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()->getSizeOf(*mSettings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointee);
                     if (varSize == 0)
                         continue;
                     if (obj->valueType()->type != var->valueType()->type) {
@@ -1096,15 +1141,18 @@ void CheckBufferOverrun::objectIndexError(const Token *tok, const ValueFlow::Val
     ErrorPath errorPath;
     std::string name;
     if (v) {
-        name = v->tokvalue->variable()->name();
+        const Token* expr = v->tokvalue;
+        while (Token::simpleMatch(expr->astParent(), "."))
+            expr = expr->astParent();
+        name = expr->expressionString();
         errorPath = v->errorPath;
     }
     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 local variable '" + name + "' " + verb + " accessed at non-zero index.",
+                "The address of variable '" + name + "' " + verb + " accessed at non-zero index.",
                 CWE758,
                 Certainty::normal);
 }
@@ -1127,6 +1175,7 @@ static bool isVLAIndex(const Token* tok)
 
 void CheckBufferOverrun::negativeArraySize()
 {
+    logChecker("CheckBufferOverrun::negativeArraySize");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || !var->isArray())
@@ -1134,7 +1183,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);
@@ -1147,7 +1196,7 @@ 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);
         }
@@ -1166,8 +1215,38 @@ void CheckBufferOverrun::negativeArraySizeError(const Token* tok)
 void CheckBufferOverrun::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)
+{
+    CheckBufferOverrun checkBufferOverrun(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkBufferOverrun.arrayIndex();
+    checkBufferOverrun.pointerArithmetic();
+    checkBufferOverrun.bufferOverflow();
+    checkBufferOverrun.arrayIndexThenCheck();
+    checkBufferOverrun.stringNotZeroTerminated();
+    checkBufferOverrun.objectIndex();
+    checkBufferOverrun.argumentSize();
+    checkBufferOverrun.negativeArraySize();
+}
+
+void CheckBufferOverrun::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckBufferOverrun 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>());
+    c.arrayIndexThenCheckError(nullptr, "i");
+    c.bufferOverflowError(nullptr, nullptr, Certainty::normal);
+    c.objectIndexError(nullptr, nullptr, true);
+    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 d402330dd56..9c6e1f0386d 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-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,24 +25,25 @@
 #include "check.h"
 #include "config.h"
 #include "ctu.h"
-#include "errortypes.h"
-#include "mathlib.h"
-#include "symboldatabase.h"
-#include "vfvalue.h"
 
+#include <cstdint>
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
-namespace tinyxml2 {
-    class XMLElement;
-}
-
 class ErrorLogger;
 class Settings;
 class Token;
 class Tokenizer;
+class Variable;
+struct Dimension;
+enum class Certainty : std::uint8_t;
+
+namespace ValueFlow
+{
+    class Value;
+}
 
 /// @addtogroup Checks
 /// @{
@@ -58,46 +59,23 @@ class Tokenizer;
  */
 class CPPCHECKLIB CheckBufferOverrun : public Check {
 public:
-
     /** This constructor is used when registering the CheckClass */
     CheckBufferOverrun() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckBufferOverrun checkBufferOverrun(tokenizer, settings, errorLogger);
-        checkBufferOverrun.arrayIndex();
-        checkBufferOverrun.pointerArithmetic();
-        checkBufferOverrun.bufferOverflow();
-        checkBufferOverrun.arrayIndexThenCheck();
-        checkBufferOverrun.stringNotZeroTerminated();
-        checkBufferOverrun.objectIndex();
-        checkBufferOverrun.argumentSize();
-        checkBufferOverrun.negativeArraySize();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckBufferOverrun 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>());
-        c.arrayIndexThenCheckError(nullptr, "i");
-        c.bufferOverflowError(nullptr, nullptr, Certainty::normal);
-        c.objectIndexError(nullptr, nullptr, true);
-        c.argumentSizeError(nullptr, "function", 1, "buffer", nullptr, nullptr);
-        c.negativeMemoryAllocationSizeError(nullptr, nullptr);
-        c.negativeArraySizeError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const override;
+    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;
-
-private:
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
 
     void arrayIndex();
     void arrayIndexError(const Token* tok,
@@ -132,26 +110,13 @@ class CPPCHECKLIB CheckBufferOverrun : public Check {
     ValueFlow::Value getBufferSize(const Token *bufTok) const;
 
     // CTU
-
-    /** data for multifile checking */
-    class MyFileInfo : public Check::FileInfo {
-    public:
-        /** unsafe array index usage */
-        std::list<CTU::FileInfo::UnsafeUsage> unsafeArrayIndex;
-
-        /** unsafe pointer arithmetic */
-        std::list<CTU::FileInfo::UnsafeUsage> unsafePointerArith;
-
-        /** Convert MyFileInfo data into xml string */
-        std::string toString() const override;
-    };
-
-    static bool isCtuUnsafeBufferUsage(const Check *check, const Token *argtok, MathLib::bigint *offset, int type);
-    static bool isCtuUnsafeArrayIndex(const Check *check, const Token *argtok, MathLib::bigint *offset);
-    static bool isCtuUnsafePointerArith(const Check *check, const Token *argtok, MathLib::bigint *offset);
+    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);
+    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() {
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index 703796682b6..d8f7d16fbaf 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-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
@@ -26,7 +26,7 @@
 #include "symboldatabase.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "mathlib.h"
+#include "platform.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
@@ -34,17 +34,12 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstdlib>
 #include <cstring>
 #include <iterator>
 #include <utility>
 #include <unordered_map>
 
-#include <tinyxml2.h>
-
-namespace CTU {
-    class FileInfo;
-}
+#include "xml.h"
 
 //---------------------------------------------------------------------------
 
@@ -61,36 +56,36 @@ static const CWE CWE762(762U);  // Mismatched Memory Management Routines
 
 static const CWE CWE_ONE_DEFINITION_RULE(758U);
 
-static const char * getFunctionTypeName(Function::Type type)
+static const char * getFunctionTypeName(FunctionType type)
 {
     switch (type) {
-    case Function::eConstructor:
+    case FunctionType::eConstructor:
         return "constructor";
-    case Function::eCopyConstructor:
+    case FunctionType::eCopyConstructor:
         return "copy constructor";
-    case Function::eMoveConstructor:
+    case FunctionType::eMoveConstructor:
         return "move constructor";
-    case Function::eDestructor:
+    case FunctionType::eDestructor:
         return "destructor";
-    case Function::eFunction:
+    case FunctionType::eFunction:
         return "function";
-    case Function::eOperatorEqual:
+    case FunctionType::eOperatorEqual:
         return "operator=";
-    case Function::eLambda:
+    case FunctionType::eLambda:
         return "lambda";
     }
     return "";
 }
 
-static bool isVariableCopyNeeded(const Variable &var, Function::Type type)
+static bool isVariableCopyNeeded(const Variable &var, FunctionType type)
 {
     bool isOpEqual = false;
     switch (type) {
-    case Function::eOperatorEqual:
+    case FunctionType::eOperatorEqual:
         isOpEqual = true;
         break;
-    case Function::eCopyConstructor:
-    case Function::eMoveConstructor:
+    case FunctionType::eCopyConstructor:
+    case FunctionType::eMoveConstructor:
         break;
     default:
         return true;
@@ -129,9 +124,11 @@ void CheckClass::constructors()
 {
     const bool printStyle = mSettings->severity.isEnabled(Severity::style);
     const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
-    if (!printStyle && !printWarnings)
+    if (!printStyle && !printWarnings && !mSettings->isPremiumEnabled("uninitMemberVar"))
         return;
 
+    logChecker("CheckClass::checkConstructors"); // style,warning
+
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
         if (mSettings->hasLib("vcl") && isVclTypeInit(scope->definedType))
@@ -140,7 +137,7 @@ void CheckClass::constructors()
         const bool unusedTemplate = Token::simpleMatch(scope->classDef->previous(), ">");
 
         const bool usedInUnion = std::any_of(mSymbolDatabase->scopeList.cbegin(), mSymbolDatabase->scopeList.cend(), [&](const Scope& unionScope) {
-            if (unionScope.type != Scope::eUnion)
+            if (unionScope.type != ScopeType::eUnion)
                 return false;
             return std::any_of(unionScope.varlist.cbegin(), unionScope.varlist.cend(), [&](const Variable& var) {
                 return var.type() && var.type()->classScope == scope;
@@ -174,26 +171,15 @@ void CheckClass::constructors()
         if (!printWarnings)
             continue;
 
-        // #3196 => bailout if there are nested unions
-        // TODO: handle union variables better
-        {
-            const bool bailout = std::any_of(scope->nestedList.cbegin(), scope->nestedList.cend(), [](const Scope* nestedScope) {
-                return nestedScope->type == Scope::eUnion;
-            });
-            if (bailout)
-                continue;
-        }
-
-
         std::vector<Usage> usageList = createUsageList(scope);
 
         for (const Function &func : scope->functionList) {
-            if (!(func.isConstructor() && (func.hasBody() || (func.isDefault() && func.type == Function::eConstructor))) &&
-                !(func.type == Function::eOperatorEqual && func.hasBody()))
+            if (!(func.isConstructor() && (func.hasBody() || (func.isDefault() && func.type == FunctionType::eConstructor))) &&
+                !(func.type == FunctionType::eOperatorEqual && func.hasBody()))
                 continue; // a defaulted constructor does not initialize primitive members
 
             // Bail: If initializer list is not recognized as a variable or type then skip since parsing is incomplete
-            if (unusedTemplate && func.type == Function::eConstructor) {
+            if (unusedTemplate && func.type == FunctionType::eConstructor) {
                 const Token *initList = func.constructorMemberInitialization();
                 if (Token::Match(initList, ": %name% (") && initList->next()->tokType() == Token::eName)
                     break;
@@ -207,7 +193,7 @@ void CheckClass::constructors()
                 const Variable& var = *usage.var;
 
                 // check for C++11 initializer
-                if (var.hasDefault() && func.type != Function::eOperatorEqual && func.type != Function::eCopyConstructor) { // variable still needs to be copied
+                if (var.hasDefault() && func.type != FunctionType::eOperatorEqual && func.type != FunctionType::eCopyConstructor) { // variable still needs to be copied
                     usage.init = true;
                 }
             }
@@ -221,15 +207,15 @@ void CheckClass::constructors()
                 if (!usage.assign && !usage.init)
                     continue;
                 const Scope* varScope1 = var.nameToken()->scope();
-                while (varScope1->type == Scope::ScopeType::eStruct)
+                while (varScope1->type == ScopeType::eStruct)
                     varScope1 = varScope1->nestedIn;
-                if (varScope1->type == Scope::ScopeType::eUnion) {
+                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 == Scope::ScopeType::eStruct)
+                        while (varScope2->type == ScopeType::eStruct)
                             varScope2 = varScope2->nestedIn;
                         if (varScope1 == varScope2)
                             usage2.assign = true;
@@ -244,6 +230,9 @@ void CheckClass::constructors()
                 if (usage.assign || usage.init || var.isStatic())
                     continue;
 
+                if (!var.nameToken() || var.nameToken()->isAnonymous())
+                    continue;
+
                 if (var.valueType() && var.valueType()->pointer == 0 && var.type() && var.type()->needInitialization == Type::NeedInitialization::False && var.type()->derivedFrom.empty())
                     continue;
 
@@ -251,14 +240,22 @@ void CheckClass::constructors()
                     continue;
 
                 // Check if this is a class constructor
-                if (!var.isPointer() && !var.isPointerArray() && var.isClass() && func.type == Function::eConstructor) {
+                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
+                        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
+                                    continue;
+                            }
+                            else
                                 continue;
                         }
                         else
@@ -273,7 +270,7 @@ void CheckClass::constructors()
 
                 // Check if type can't be copied
                 if (!var.isPointer() && !var.isPointerArray() && var.typeScope()) {
-                    if (func.type == Function::eMoveConstructor) {
+                    if (func.type == FunctionType::eMoveConstructor) {
                         if (canNotMove(var.typeScope()))
                             continue;
                     } else {
@@ -295,7 +292,7 @@ void CheckClass::constructors()
                 }
 
                 // It's non-static and it's not initialized => error
-                if (func.type == Function::eOperatorEqual) {
+                if (func.type == FunctionType::eOperatorEqual) {
                     const Token *operStart = func.arg;
 
                     bool classNameUsed = false;
@@ -312,33 +309,38 @@ void CheckClass::constructors()
                     // If constructor is not in scope then we maybe using a constructor from a different template specialization
                     if (!precedes(scope->bodyStart, func.tokenDef))
                         continue;
-                    const Scope *varType = var.typeScope();
-                    if (!varType || varType->type != Scope::eUnion) {
-                        const bool derived = scope != var.scope();
-                        if (func.type == Function::eConstructor &&
-                            func.nestedIn && (func.nestedIn->numConstructors - func.nestedIn->numCopyOrMoveConstructors) > 1 &&
-                            func.argCount() == 0 && func.functionScope &&
-                            func.arg && func.arg->link()->next() == func.functionScope->bodyStart &&
-                            func.functionScope->bodyStart->link() == func.functionScope->bodyStart->next()) {
-                            // don't warn about user defined default constructor when there are other constructors
-                            if (printInconclusive)
-                                uninitVarError(func.token, func.access == AccessControl::Private, func.type, var.scope()->className, var.name(), derived, true);
-                        } else if (missingCopy)
-                            missingMemberCopyError(func.token, func.type, var.scope()->className, var.name());
-                        else
-                            uninitVarError(func.token, func.access == AccessControl::Private, func.type, var.scope()->className, var.name(), derived, false);
-                    }
+
+                    const bool derived = scope != var.scope();
+                    if (func.type == FunctionType::eConstructor &&
+                        func.nestedIn && (func.nestedIn->numConstructors - func.nestedIn->numCopyOrMoveConstructors) > 1 &&
+                        func.argCount() == 0 && func.functionScope &&
+                        func.arg && func.arg->link()->next() == func.functionScope->bodyStart &&
+                        func.functionScope->bodyStart->link() == func.functionScope->bodyStart->next()) {
+                        // don't warn about user defined default constructor when there are other constructors
+                        if (printInconclusive)
+                            uninitVarError(func.token, func.access == AccessControl::Private, func.type, var.scope()->className, var.name(), derived, true);
+                    } else if (missingCopy)
+                        missingMemberCopyError(func.token, func.type, var.scope()->className, var.name());
+                    else
+                        uninitVarError(func.token, func.access == AccessControl::Private, func.type, var.scope()->className, var.name(), derived, false);
                 }
             }
         }
     }
 }
 
+static bool isPermissibleConversion(const std::string& type)
+{
+    return type == "std::initializer_list" || type == "std::nullptr_t";
+}
+
 void CheckClass::checkExplicitConstructors()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("noExplicitConstructor"))
         return;
 
+    logChecker("CheckClass::checkExplicitConstructors"); // style
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
         // Do not perform check, if the class/struct has not any constructors
         if (scope->numConstructors == 0)
@@ -367,11 +369,11 @@ void CheckClass::checkExplicitConstructors()
 
             if (!func.isExplicit() &&
                 func.argCount() > 0 && func.minArgCount() < 2 &&
-                func.type != Function::eCopyConstructor &&
-                func.type != Function::eMoveConstructor &&
+                func.type != FunctionType::eCopyConstructor &&
+                func.type != FunctionType::eMoveConstructor &&
                 !(func.templateDef && Token::simpleMatch(func.argumentList.front().typeEndToken(), "...")) &&
-                func.argumentList.front().getTypeName() != "std::initializer_list") {
-                noExplicitConstructorError(func.tokenDef, scope->className, scope->type == Scope::eStruct);
+                !isPermissibleConversion(func.argumentList.front().getTypeName())) {
+                noExplicitConstructorError(func.tokenDef, scope->className, scope->type == ScopeType::eStruct);
             }
         }
     }
@@ -390,7 +392,7 @@ static bool hasNonCopyableBase(const Scope *scope, bool *unknown)
             return true;
 
         for (const Function &func : baseInfo.type->classScope->functionList) {
-            if (func.type != Function::eCopyConstructor)
+            if (func.type != FunctionType::eCopyConstructor)
                 continue;
             if (func.access == AccessControl::Private || func.isDelete()) {
                 *unknown = false;
@@ -406,56 +408,83 @@ void CheckClass::copyconstructors()
     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 != Function::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->isPointer() && var->scope() == scope)
+                            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->isPointer() && var->scope() == scope && !var->isStatic())
+                            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->isPointer() && var->scope() == scope && !var->isStatic())
+                            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;
             for (const Function &func : scope->functionList) {
-                if (func.type == Function::eCopyConstructor)
+                if (func.type == FunctionType::eCopyConstructor)
                     funcCopyCtor = &func;
-                else if (func.type == Function::eOperatorEqual)
+                else if (func.type == FunctionType::eOperatorEqual)
                     funcOperatorEq = &func;
-                else if (func.type == Function::eDestructor)
+                else if (func.type == FunctionType::eDestructor)
                     funcDestructor = &func;
             }
             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;
-                for (std::map<int, const Token*>::const_iterator it = allocatedVars.cbegin(); it != allocatedVars.cend(); ++it) {
+                for (auto it = allocatedVars.cbegin(); it != allocatedVars.cend(); ++it) {
                     if (!Token::Match(it->second, "%var% [(=] new %type%")) {
                         mustDealloc = it->second;
                         break;
@@ -478,7 +507,7 @@ void CheckClass::copyconstructors()
         std::set<const Token*> copiedVars;
         const Token* copyCtor = nullptr;
         for (const Function &func : scope->functionList) {
-            if (func.type != Function::eCopyConstructor)
+            if (func.type != FunctionType::eCopyConstructor)
                 continue;
             copyCtor = func.tokenDef;
             if (!func.functionScope) {
@@ -499,7 +528,7 @@ void CheckClass::copyconstructors()
                 }
             }
             for (tok = func.functionScope->bodyStart; tok != func.functionScope->bodyEnd; tok = tok->next()) {
-                if ((mTokenizer->isCPP() && Token::Match(tok, "%var% = new")) ||
+                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))))) {
                     allocatedVars.erase(tok->varId());
                 } else if (Token::Match(tok, "%var% = %name% . %name% ;") && allocatedVars.find(tok->varId()) != allocatedVars.end()) {
@@ -513,7 +542,7 @@ void CheckClass::copyconstructors()
                 copyConstructorShallowCopyError(cv, cv->str());
             // throw error if count mismatch
             /* FIXME: This doesn't work. See #4154
-               for (std::map<int, const Token*>::const_iterator i = allocatedVars.begin(); i != allocatedVars.end(); ++i) {
+               for (auto i = allocatedVars.cbegin(); i != allocatedVars.end(); ++i) {
                 copyConstructorMallocError(copyCtor, i->second, i->second->str());
                }
              */
@@ -540,7 +569,7 @@ void CheckClass::copyConstructorShallowCopyError(const Token *tok, const std::st
 static std::string noMemberErrorMessage(const Scope *scope, const char function[], bool isdefault)
 {
     const std::string &classname = scope ? scope->className : "class";
-    const std::string type = (scope && scope->type == Scope::eStruct) ? "Struct" : "Class";
+    const std::string type = (scope && scope->type == ScopeType::eStruct) ? "Struct" : "Class";
     const bool isDestructor = (function[0] == 'd');
     std::string errmsg = "$symbol:" + classname + '\n';
 
@@ -551,7 +580,7 @@ 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;
@@ -583,11 +612,11 @@ bool CheckClass::canNotCopy(const Scope *scope)
             constructor = true;
         if (func.access != AccessControl::Public)
             continue;
-        if (func.type == Function::eCopyConstructor) {
+        if (func.type == FunctionType::eCopyConstructor) {
             publicCopy = true;
             break;
         }
-        if (func.type == Function::eOperatorEqual) {
+        if (func.type == FunctionType::eOperatorEqual) {
             publicAssign = true;
             break;
         }
@@ -608,15 +637,15 @@ bool CheckClass::canNotMove(const Scope *scope)
             constructor = true;
         if (func.access != AccessControl::Public)
             continue;
-        if (func.type == Function::eCopyConstructor) {
+        if (func.type == FunctionType::eCopyConstructor) {
             publicCopy = true;
             break;
         }
-        if (func.type == Function::eMoveConstructor) {
+        if (func.type == FunctionType::eMoveConstructor) {
             publicMove = true;
             break;
         }
-        if (func.type == Function::eOperatorEqual) {
+        if (func.type == FunctionType::eOperatorEqual) {
             publicAssign = true;
             break;
         }
@@ -655,12 +684,11 @@ std::vector<CheckClass::Usage> CheckClass::createUsageList(const Scope *scope)
 
 void CheckClass::assignVar(std::vector<Usage> &usageList, nonneg int varid)
 {
-    for (Usage& usage: usageList) {
-        if (usage.var->declarationId() == varid) {
-            usage.assign = true;
-            return;
-        }
-    }
+    auto it = std::find_if(usageList.begin(), usageList.end(), [varid](const Usage& usage) {
+        return usage.var->declarationId() == varid;
+    });
+    if (it != usageList.end())
+        it->assign = true;
 }
 
 void CheckClass::assignVar(std::vector<Usage> &usageList, const Token* vartok)
@@ -669,23 +697,21 @@ void CheckClass::assignVar(std::vector<Usage> &usageList, const Token* vartok)
         assignVar(usageList, vartok->varId());
         return;
     }
-    for (Usage& usage: usageList) {
+    auto it = std::find_if(usageList.begin(), usageList.end(), [vartok](const Usage& usage) {
         // FIXME: This is a workaround when varid is not set for a derived member
-        if (usage.var->name() == vartok->str()) {
-            usage.assign = true;
-            return;
-        }
-    }
+        return usage.var->name() == vartok->str();
+    });
+    if (it != usageList.end())
+        it->assign = true;
 }
 
 void CheckClass::initVar(std::vector<Usage> &usageList, nonneg int varid)
 {
-    for (Usage& usage: usageList) {
-        if (usage.var->declarationId() == varid) {
-            usage.init = true;
-            return;
-        }
-    }
+    auto it = std::find_if(usageList.begin(), usageList.end(), [varid](const Usage& usage) {
+        return usage.var->declarationId() == varid;
+    });
+    if (it != usageList.end())
+        it->init = true;
 }
 
 void CheckClass::assignAllVar(std::vector<Usage> &usageList)
@@ -759,7 +785,14 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
         if (initList) {
             if (level == 0 && Token::Match(ftok, "%name% {|(") && Token::Match(ftok->linkAt(1), "}|) ,|{")) {
                 if (ftok->str() != func.name()) {
-                    initVar(usage, ftok->varId());
+                    if (ftok->varId())
+                        initVar(usage, ftok->varId());
+                    else { // base class constructor
+                        for (Usage& u : usage) {
+                            if (u.var->scope() != scope) // assume that all variables are initialized in base class
+                                u.init = true;
+                        }
+                    }
                 } else { // c++11 delegate constructor
                     const Function *member = ftok->function();
                     // member function not found => assume it initializes all members
@@ -809,7 +842,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
             continue;
 
         // Variable getting value from stream?
-        if (Token::Match(ftok, ">>|& %name%") && isLikelyStreamRead(true, ftok)) {
+        if (Token::Match(ftok, ">>|& %name%") && isLikelyStreamRead(ftok)) {
             assignVar(usage, ftok->next()->varId());
         }
 
@@ -827,7 +860,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
         }
 
         // Using swap to assign all variables..
-        if (func.type == Function::eOperatorEqual && Token::Match(ftok, "[;{}] %name% (") && Token::Match(ftok->linkAt(2), ") . %name% ( *| this ) ;")) {
+        if (func.type == FunctionType::eOperatorEqual && Token::Match(ftok, "[;{}] %name% (") && Token::Match(ftok->linkAt(2), ") . %name% ( *| this ) ;")) {
             assignAllVar(usage);
             break;
         }
@@ -846,7 +879,9 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
         if (!Token::Match(ftok->next(), "::| %name%") &&
             !Token::Match(ftok->next(), "*| this . %name%") &&
             !Token::Match(ftok->next(), "* %name% =") &&
-            !Token::Match(ftok->next(), "( * this ) . %name%"))
+            !Token::Match(ftok->next(), "( * this ) . %name%") &&
+            !Token::Match(ftok->next(), "( * %name% ) =") &&
+            !Token::Match(ftok->next(), "* ( %name% ) ="))
             continue;
 
         // Goto the first token in this statement..
@@ -939,7 +974,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
                 ftok = ftok->next();
 
             // Passing "this" => assume that everything is initialized
-            for (const Token *tok2 = ftok->next()->link(); tok2 && tok2 != ftok; tok2 = tok2->previous()) {
+            for (const Token *tok2 = ftok->linkAt(1); tok2 && tok2 != ftok; tok2 = tok2->previous()) {
                 if (tok2->str() == "this") {
                     assignAllVar(usage);
                     return;
@@ -973,7 +1008,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
                             tok2 = tok2->next();
                             if (tok2->str() == "&")
                                 tok2 = tok2->next();
-                            if (isVariableChangedByFunctionCall(tok2, tok2->previous()->str() == "&", tok2->varId(), mSettings, nullptr))
+                            if (isVariableChangedByFunctionCall(tok2, tok2->strAt(-1) == "&", tok2->varId(), *mSettings, nullptr))
                                 assignVar(usage, tok2->varId());
                         }
                     }
@@ -983,6 +1018,14 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
                 else if (!member->isConst() && !member->isStatic()) {
                     assignAllVar(usage);
                 }
+
+                // const method, assume it assigns all mutable members
+                else if (member->isConst()) {
+                    for (Usage& i: usage) {
+                        if (i.var->isMutable())
+                            i.assign = true;
+                    }
+                }
             }
 
             // not member function
@@ -1002,7 +1045,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
                 // the function is external and it's neither friend nor inherited virtual function.
                 // assume all variables that are passed to it are initialized..
                 else {
-                    for (const Token *tok = ftok->tokAt(2); tok && tok != ftok->next()->link(); tok = tok->next()) {
+                    for (const Token *tok = ftok->tokAt(2); tok && tok != ftok->linkAt(1); tok = tok->next()) {
                         if (tok->isName()) {
                             assignVar(usage, tok->varId());
                         }
@@ -1029,7 +1072,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
             const Token *tok2 = ftok;
             while (tok2) {
                 if (tok2->strAt(1) == "[")
-                    tok2 = tok2->next()->link();
+                    tok2 = tok2->linkAt(1);
                 else if (Token::Match(tok2->next(), ". %name%"))
                     tok2 = tok2->tokAt(2);
                 else
@@ -1040,10 +1083,17 @@ 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, "* this . %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, "* 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()) {
+                if (rangeVar->isReference() && !rangeVar->isConst())
+                    assignVar(usage, ftok->varId());
+            }
         }
 
         // The functions 'clear' and 'Clear' are supposed to initialize variable.
@@ -1056,51 +1106,49 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
 void CheckClass::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"
-    reportError(tok, Severity::style, "noConstructor",
-                "$symbol:" + classname + "\n" +
-                "The " + std::string(isStruct ? "struct" : "class") + " '$symbol' does not declare a constructor although it has private member variables which likely require initialization.\n"
-                "The " + std::string(isStruct ? "struct" : "class") + " '$symbol' does not declare a constructor "
-                "although it has private member variables. Member variables of builtin types are left "
-                "uninitialized when the class is instantiated. That may cause bugs or undefined behavior.", CWE398, Certainty::normal);
+    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."};
+    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::style, "noConstructor", "$symbol:" + classname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
 void CheckClass::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 constructors should in general be explicit for type safety reasons. Using the explicit keyword in the constructor means some mistakes when using the class can be avoided.");
+    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, Function::Type functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive)
+void CheckClass::uninitVarError(const Token *tok, bool isprivate, FunctionType functionType, const std::string &classname, const std::string &varname, bool derived, bool inconclusive)
 {
     std::string ctor;
-    if (functionType == Function::eCopyConstructor)
+    if (functionType == FunctionType::eCopyConstructor)
         ctor = "copy ";
-    else if (functionType == Function::eMoveConstructor)
+    else if (functionType == FunctionType::eMoveConstructor)
         ctor = "move ";
     std::string message("Member variable '$symbol' is not initialized in the " + ctor + "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" : "");
-    reportError(tok, Severity::warning, id, "$symbol:" + classname + "::" + varname + "\n" + message, CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
+    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)
 {
     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."};
     const std::string id = std::string("uninitMemberVarPrivate");
-    reportError(tok, Severity::warning, id, "$symbol:" + classname + "::" + varname + "\n" + message, CWE398, Certainty::normal);
+    reportError(tok, Severity::warning, id, "$symbol:" + classname + "::" + varname + '\n' + message + '\n' + verbose, CWE398, Certainty::normal);
 }
 
-void CheckClass::missingMemberCopyError(const Token *tok, Function::Type functionType, const std::string& classname, const std::string& varname)
+void CheckClass::missingMemberCopyError(const Token *tok, FunctionType functionType, const std::string& classname, const std::string& varname)
 {
-    const std::string ctor(functionType == Function::Type::eCopyConstructor ? "copy" : "move");
-    const std::string action(functionType == Function::Type::eCopyConstructor ? "copied?" : "moved?");
+    const std::string ctor(functionType == FunctionType::eCopyConstructor ? "copy" : "move");
+    const std::string action(functionType == FunctionType::eCopyConstructor ? "copied?" : "moved?");
     const std::string message =
         "$symbol:" + classname + "::" + varname + "\n" +
         "Member variable '$symbol' is not assigned in the " + ctor + " constructor. Should it be " + action;
-    const char id[] = "missingMemberCopy";
-    reportError(tok, Severity::warning, id, message, CWE398, Certainty::inconclusive);
+    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)
@@ -1117,6 +1165,8 @@ void CheckClass::initializationListUsage()
     if (!mSettings->severity.isEnabled(Severity::performance))
         return;
 
+    logChecker("CheckClass::initializationListUsage"); // performance
+
     for (const Scope *scope : mSymbolDatabase->functionScopes) {
         // Check every constructor
         if (!scope->function || !scope->function->isConstructor())
@@ -1173,6 +1223,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;
@@ -1207,7 +1261,7 @@ static bool checkFunctionUsage(const Function *privfunc, const Scope* scope)
     if (!scope)
         return true; // Assume it is used, if scope is not seen
 
-    for (std::list<Function>::const_iterator func = scope->functionList.cbegin(); func != scope->functionList.cend(); ++func) {
+    for (auto func = scope->functionList.cbegin(); func != scope->functionList.cend(); ++func) {
         if (func->functionScope) {
             if (Token::Match(func->tokenDef, "%name% (")) {
                 for (const Token *ftok = func->tokenDef->tokAt(2); ftok && ftok->str() != ")"; ftok = ftok->next()) {
@@ -1223,15 +1277,15 @@ static bool checkFunctionUsage(const Function *privfunc, const Scope* scope)
                 if (ftok->varId() == 0U && ftok->str() == privfunc->name()) // TODO: This condition should be redundant
                     return true;
             }
-        } else if ((func->type != Function::eCopyConstructor &&
-                    func->type != Function::eOperatorEqual) ||
+        } else if ((func->type != FunctionType::eCopyConstructor &&
+                    func->type != FunctionType::eOperatorEqual &&
+                    !func->isDefault() && !func->isDelete()) ||
                    func->access != AccessControl::Private) // Assume it is used, if a function implementation isn't seen, but empty private copy constructors and assignment operators are OK
             return true;
     }
 
-    const std::map<std::string, Type*>::const_iterator end = scope->definedTypesMap.cend();
-    for (std::map<std::string, Type*>::const_iterator iter = scope->definedTypesMap.cbegin(); iter != end; ++iter) {
-        const Type *type = (*iter).second;
+    for (auto iter = scope->definedTypesMap.cbegin(); iter != scope->definedTypesMap.cend(); ++iter) {
+        const Type *type = iter->second;
         if (type->enclosingScope == scope && checkFunctionUsage(privfunc, type->classScope))
             return true;
     }
@@ -1254,9 +1308,11 @@ static bool checkFunctionUsage(const Function *privfunc, const Scope* scope)
 
 void CheckClass::privateFunctions()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedPrivateFunction"))
         return;
 
+    logChecker("CheckClass::privateFunctions"); // style
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
 
         // do not check borland classes with properties..
@@ -1266,14 +1322,14 @@ void CheckClass::privateFunctions()
         std::list<const Function*> privateFuncs;
         for (const Function &func : scope->functionList) {
             // Get private functions..
-            if (func.type == Function::eFunction && func.access == AccessControl::Private && !func.isOperator()) // TODO: There are smarter ways to check private operator usage
+            if (func.type == FunctionType::eFunction && func.access == AccessControl::Private && !func.isOperator()) // TODO: There are smarter ways to check private operator usage
                 privateFuncs.push_back(&func);
         }
 
         // Bailout for overridden virtual functions of base classes
         if (!scope->definedType->derivedFrom.empty()) {
             // Check virtual functions
-            for (std::list<const Function*>::iterator it = privateFuncs.begin(); it != privateFuncs.end();) {
+            for (auto it = privateFuncs.cbegin(); it != privateFuncs.cend();) {
                 if ((*it)->isImplicitlyVirtual(true)) // Give true as default value to be returned if we don't see all base classes
                     it = privateFuncs.erase(it);
                 else
@@ -1283,7 +1339,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;
             }
@@ -1291,7 +1351,7 @@ void CheckClass::privateFunctions()
             bool used = checkFunctionUsage(pf, scope); // Usage in this class
             // Check in friend classes
             const std::vector<Type::FriendInfo>& friendList = scope->definedType->friendList;
-            for (int i = 0; i < friendList.size() && !used; i++) {
+            for (std::size_t i = 0; i < friendList.size() && !used; i++) {
                 if (friendList[i].type)
                     used = checkFunctionUsage(pf, friendList[i].type->classScope);
                 else
@@ -1299,16 +1359,19 @@ void CheckClass::privateFunctions()
             }
 
             if (!used)
-                unusedPrivateFunctionError(pf->tokenDef, scope->className, pf->name());
+                unusedPrivateFunctionError(pf->token, pf->tokenDef, scope->className, pf->name());
 
             privateFuncs.pop_front();
         }
     }
 }
 
-void CheckClass::unusedPrivateFunctionError(const Token *tok, const std::string &classname, const std::string &funcname)
+void CheckClass::unusedPrivateFunctionError(const Token* tok1, const Token *tok2, const std::string &classname, const std::string &funcname)
 {
-    reportError(tok, Severity::style, "unusedPrivateFunction", "$symbol:" + classname + "::" + funcname + "\nUnused private function: '$symbol'", CWE398, Certainty::normal);
+    std::list<const Token *> toks{ tok1 };
+    if (tok2)
+        toks.push_front(tok2);
+    reportError(toks, Severity::style, "unusedPrivateFunction", "$symbol:" + classname + "::" + funcname + "\nUnused private function: '$symbol'", CWE398, Certainty::normal);
 }
 
 //---------------------------------------------------------------------------
@@ -1318,7 +1381,7 @@ void CheckClass::unusedPrivateFunctionError(const Token *tok, const std::string
 static const Scope* findFunctionOf(const Scope* scope)
 {
     while (scope) {
-        if (scope->type == Scope::eFunction)
+        if (scope->type == ScopeType::eFunction)
             return scope->functionOf;
         scope = scope->nestedIn;
     }
@@ -1327,6 +1390,7 @@ static const Scope* findFunctionOf(const Scope* scope)
 
 void CheckClass::checkMemset()
 {
+    logChecker("CheckClass::checkMemset");
     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()) {
@@ -1402,13 +1466,16 @@ void CheckClass::checkMemset()
                     type = typeTok->type()->classScope;
 
                 if (type) {
-                    const std::set<const Scope *> parsedTypes;
-                    checkMemsetType(scope, tok, type, false, parsedTypes);
+                    checkMemsetType(scope, tok, type, false, {});
                 }
-            } else if (tok->variable() && tok->variable()->typeScope() && Token::Match(tok, "%var% = %name% (") &&
-                       (mSettings->library.getAllocFuncInfo(tok->tokAt(2)) || mSettings->library.getReallocFuncInfo(tok->tokAt(2)))) {
-                const std::set<const Scope *> parsedTypes;
-                checkMemsetType(scope, tok->tokAt(2), tok->variable()->typeScope(), true, parsedTypes);
+            } 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));
+                if (!alloc)
+                    alloc = mSettings->library.getReallocFuncInfo(tok->tokAt(2));
+                if (!alloc || alloc->bufferSize == Library::AllocFunc::BufferSize::none)
+                    continue;
+                std::set<const Scope *> parsedTypes;
+                checkMemsetType(scope, tok->tokAt(2), tok->variable()->typeScope(), true, std::move(parsedTypes));
 
                 if (printWarnings && tok->variable()->typeScope()->numConstructors > 0)
                     mallocOnClassWarning(tok, tok->strAt(2), tok->variable()->typeScope()->classDef);
@@ -1540,12 +1607,14 @@ void CheckClass::memsetErrorFloat(const Token *tok, const std::string &type)
 
 void CheckClass::operatorEqRetRefThis()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("operatorEqRetRefThis"))
         return;
 
+    logChecker("CheckClass::operatorEqRetRefThis"); // style
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
-        for (std::list<Function>::const_iterator func = scope->functionList.cbegin(); func != scope->functionList.cend(); ++func) {
-            if (func->type == Function::eOperatorEqual && func->hasBody()) {
+        for (auto func = scope->functionList.cbegin(); func != scope->functionList.cend(); ++func) {
+            if (func->type == FunctionType::eOperatorEqual && func->hasBody()) {
                 // make sure return signature is correct
                 if (func->retType == func->nestedIn->definedType && func->tokenDef->strAt(-1) == "&") {
                     checkReturnPtrThis(scope, &(*func), func->functionScope->bodyStart, func->functionScope->bodyEnd);
@@ -1590,14 +1659,14 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
 
         // check if a function is called
         if (tok->strAt(2) == "(" &&
-            tok->linkAt(2)->next()->str() == ";") {
+            tok->linkAt(2)->strAt(1) == ";") {
             // check if it is a member function
-            for (std::list<Function>::const_iterator it = scope->functionList.cbegin(); it != scope->functionList.cend(); ++it) {
+            for (auto it = scope->functionList.cbegin(); it != scope->functionList.cend(); ++it) {
                 // check for a regular function with the same name and a body
-                if (it->type == Function::eFunction && it->hasBody() &&
-                    it->token->str() == tok->next()->str()) {
+                if (it->type == FunctionType::eFunction && it->hasBody() &&
+                    it->token->str() == tok->strAt(1)) {
                     // check for the proper return type
-                    if (it->tokenDef->previous()->str() == "&" &&
+                    if (it->tokenDef->strAt(-1) == "&" &&
                         it->tokenDef->strAt(-2) == scope->className) {
                         // make sure it's not a const function
                         if (!it->isConst()) {
@@ -1605,7 +1674,7 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
                             // avoid endless recursions
                             if (analyzedFunctions.find(&*it) == analyzedFunctions.end()) {
                                 analyzedFunctions.insert(&*it);
-                                checkReturnPtrThis(scope, &*it, it->arg->link()->next(), it->arg->link()->next()->link(),
+                                checkReturnPtrThis(scope, &*it, it->arg->link()->next(), it->arg->link()->linkAt(1),
                                                    analyzedFunctions);
                             }
                             // just bail for now
@@ -1621,7 +1690,7 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
         else if (!(Token::simpleMatch(tok->next(), "operator= (") ||
                    Token::simpleMatch(tok->next(), "this . operator= (") ||
                    (Token::Match(tok->next(), "%type% :: operator= (") &&
-                    tok->next()->str() == scope->className)))
+                    tok->strAt(1) == scope->className)))
             operatorEqRetRefThisError(func->token);
     }
     if (foundReturn) {
@@ -1682,16 +1751,18 @@ void CheckClass::operatorEqMissingReturnStatementError(const Token *tok, bool er
 
 void CheckClass::operatorEqToSelf()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("operatorEqToSelf"))
         return;
 
+    logChecker("CheckClass::operatorEqToSelf"); // warning
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
         // skip classes with multiple inheritance
         if (scope->definedType->derivedFrom.size() > 1)
             continue;
 
         for (const Function &func : scope->functionList) {
-            if (func.type == Function::eOperatorEqual && func.hasBody()) {
+            if (func.type == FunctionType::eOperatorEqual && func.hasBody()) {
                 // make sure that the operator takes an object of the same type as *this, otherwise we can't detect self-assignment checks
                 if (func.argumentList.empty())
                     continue;
@@ -1706,7 +1777,7 @@ void CheckClass::operatorEqToSelf()
                     // find the parameter name
                     const Token *rhs = func.argumentList.cbegin()->nameToken();
                     const Token* out_ifStatementScopeStart = nullptr;
-                    if (!hasAssignSelf(&func, rhs, &out_ifStatementScopeStart)) {
+                    if (!hasAssignSelf(&func, rhs, out_ifStatementScopeStart)) {
                         if (hasAllocation(&func, scope))
                             operatorEqToSelfError(func.token);
                     } else if (out_ifStatementScopeStart != nullptr) {
@@ -1739,7 +1810,7 @@ bool CheckClass::hasAllocation(const Function *func, const Scope* scope, const T
     if (!end)
         end = func->functionScope->bodyEnd;
     for (const Token *tok = start; tok && (tok != end); tok = tok->next()) {
-        if (((mTokenizer->isCPP() && Token::Match(tok, "%var% = new")) ||
+        if (((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
              (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) &&
             isMemberVar(scope, tok))
             return true;
@@ -1748,9 +1819,9 @@ bool CheckClass::hasAllocation(const Function *func, const Scope* scope, const T
         const Token *var;
         if (Token::Match(tok, "%name% ( %var%") && mSettings->library.getDeallocFuncInfo(tok))
             var = tok->tokAt(2);
-        else if (mTokenizer->isCPP() && Token::Match(tok, "delete [ ] %var%"))
+        else if (tok->isCpp() && Token::Match(tok, "delete [ ] %var%"))
             var = tok->tokAt(3);
-        else if (mTokenizer->isCPP() && Token::Match(tok, "delete %var%"))
+        else if (tok->isCpp() && Token::Match(tok, "delete %var%"))
             var = tok->next();
         else
             continue;
@@ -1819,13 +1890,13 @@ const Token * CheckClass::getIfStmtBodyStart(const Token *tok, const Token *rhs)
         case Bool::TRUE:
             return top->link()->next();
         case Bool::FALSE:
-            return top->link()->next()->link();
+            return top->link()->linkAt(1);
         }
     }
     return nullptr;
 }
 
-bool CheckClass::hasAssignSelf(const Function *func, const Token *rhs, const Token **out_ifStatementScopeStart)
+bool CheckClass::hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart)
 {
     if (!rhs)
         return false;
@@ -1848,7 +1919,7 @@ bool CheckClass::hasAssignSelf(const Function *func, const Token *rhs, const Tok
             if (tok2 && tok2->isUnaryOp("&") && tok2->astOperand1()->str() == rhs->str())
                 ret = true;
             if (ret) {
-                *out_ifStatementScopeStart = getIfStmtBodyStart(tok2, rhs);
+                out_ifStatementScopeStart = getIfStmtBodyStart(tok2, rhs);
             }
             return ret ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
         });
@@ -1883,6 +1954,8 @@ void CheckClass::virtualDestructor()
 
     std::list<const Function *> inconclusiveErrors;
 
+    logChecker("CheckClass::virtualDestructor");
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
 
         // Skip base classes (unless inconclusive)
@@ -1990,8 +2063,8 @@ void CheckClass::virtualDestructor()
                         if (baseDestructor->access == AccessControl::Public) {
                             virtualDestructorError(baseDestructor->token, derivedFrom->name(), derivedClass->str(), false);
                             // check for duplicate error and remove it if found
-                            const std::list<const Function *>::iterator found = find(inconclusiveErrors.begin(), inconclusiveErrors.end(), baseDestructor);
-                            if (found != inconclusiveErrors.end())
+                            const auto found = std::find(inconclusiveErrors.cbegin(), inconclusiveErrors.cend(), baseDestructor);
+                            if (found != inconclusiveErrors.cend())
                                 inconclusiveErrors.erase(found);
                         }
                     }
@@ -2001,7 +2074,7 @@ void CheckClass::virtualDestructor()
     }
 
     for (const Function *func : inconclusiveErrors)
-        virtualDestructorError(func->tokenDef, func->name(), emptyString, true);
+        virtualDestructorError(func->tokenDef, func->name(), "", true);
 }
 
 void CheckClass::virtualDestructorError(const Token *tok, const std::string &Base, const std::string &Derived, bool inconclusive)
@@ -2030,6 +2103,8 @@ void CheckClass::thisSubtraction()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckClass::thisSubtraction"); // warning
+
     const Token *tok = mTokenizer->tokens();
     for (;;) {
         tok = Token::findmatch(tok, "this - %name%");
@@ -2054,21 +2129,25 @@ void CheckClass::thisSubtractionError(const Token *tok)
 
 void CheckClass::checkConst()
 {
-    // This is an inconclusive check. False positives: #3322.
-    if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if (!mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("functionConst") &&
+        !mSettings->isPremiumEnabled("functionStatic"))
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style))
-        return;
+    logChecker("CheckClass::checkConst"); // style,inconclusive
 
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
         for (const Function &func : scope->functionList) {
             // does the function have a body?
-            if (func.type != Function::eFunction || !func.hasBody())
+            if (func.type != FunctionType::eFunction || !func.hasBody())
                 continue;
             // don't warn for friend/static/virtual functions
             if (func.isFriend() || func.isStatic() || func.hasVirtualSpecifier())
                 continue;
+            if (func.functionPointerUsage)
+                continue;
+            if (func.hasRvalRefQualifier())
+                continue;
 
             // don't suggest const when returning non-const pointer/reference, but still suggest static
             auto isPointerOrReference = [this](const Token* start, const Token* end) -> bool {
@@ -2124,22 +2203,37 @@ void CheckClass::checkConst()
             }
 
             // check if base class function is virtual
-            if (!scope->definedType->derivedFrom.empty() && func.isImplicitlyVirtual(true))
+            bool foundAllBaseClasses = true;
+            if (!scope->definedType->derivedFrom.empty() && func.isImplicitlyVirtual(true, &foundAllBaseClasses) && foundAllBaseClasses)
                 continue;
 
-            enum MemberAccess memberAccessed = MemberAccess::NONE;
+            MemberAccess memberAccessed = MemberAccess::NONE;
             // if nothing non-const was found. write error..
             if (!checkConstFunc(scope, &func, memberAccessed))
                 continue;
 
             const bool suggestStatic = memberAccessed != MemberAccess::MEMBER && !func.isOperator();
-            if ((returnsPtrOrRef || func.isConst()) && !suggestStatic)
+            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;
-            while (nest && nest->type != Scope::eGlobal) {
-                classname = std::string(nest->className + "::" + classname);
+            while (nest && nest->type != ScopeType::eGlobal) {
+                classname = nest->className + "::" + classname;
                 nest = nest->nestedIn;
             }
 
@@ -2152,9 +2246,9 @@ void CheckClass::checkConst()
                 functionName += "]";
 
             if (func.isInline())
-                checkConstError(func.token, classname, functionName, suggestStatic);
+                checkConstError(func.token, classname, functionName, suggestStatic, foundAllBaseClasses);
             else // not inline
-                checkConstError2(func.token, func.tokenDef, classname, functionName, suggestStatic);
+                checkConstError2(func.token, func.tokenDef, classname, functionName, suggestStatic, foundAllBaseClasses);
         }
     }
 }
@@ -2193,11 +2287,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()) {
@@ -2211,7 +2312,7 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
             bool isMember = tok == fqTok;
             std::string scopeStr;
             const Scope* curScope = scope;
-            while (!isMember && curScope && curScope->type != Scope::ScopeType::eGlobal) {
+            while (!isMember && curScope && curScope->type != ScopeType::eGlobal) {
                 scopeStr.insert(0, curScope->className + " :: ");
                 isMember = Token::Match(fqTok, scopeStr.c_str());
 
@@ -2229,9 +2330,12 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
     // not found in this class
     if (!scope->definedType->derivedFrom.empty()) {
         // check each base class
+        bool foundAllBaseClasses = true;
         for (const Type::BaseInfo & i : scope->definedType->derivedFrom) {
             // find the base class
             const Type *derivedFrom = i.type;
+            if (!derivedFrom || !derivedFrom->classScope)
+                foundAllBaseClasses = false;
 
             // find the function in the base class
             if (derivedFrom && derivedFrom->classScope && derivedFrom->classScope != scope) {
@@ -2239,6 +2343,8 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
                     return true;
             }
         }
+        if (!foundAllBaseClasses)
+            return true;
     }
 
     return false;
@@ -2312,6 +2418,14 @@ bool CheckClass::isConstMemberFunc(const Scope *scope, const Token *tok)
 
 const std::set<std::string> CheckClass::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
 {
     if (mTokenizer->hasIfdef(func->functionScope->bodyStart, func->functionScope->bodyEnd))
@@ -2347,6 +2461,8 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                                 !(argVar->valueType() && argVar->valueType()->isConst(argVar->valueType()->pointer)))) { // argument might be modified
                     const Token* arg = args[argIndex];
                     // Member variable given as parameter
+                    while (Token::simpleMatch(arg, "(") && arg->astOperand2())
+                        arg = arg->astOperand2();
                     const Token* varTok = previousBeforeAstLeftmostLeaf(arg);
                     if (!varTok)
                         return false;
@@ -2361,11 +2477,15 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
             return true;
         }
 
+        if (const Library::Function* fLib = mSettings->library.getFunction(funcTok))
+            if (fLib->isconst || fLib->ispure)
+                return true;
+
         // Member variable given as parameter to unknown function
         const Token *lpar = funcTok->next();
         if (Token::simpleMatch(lpar, "( ) ("))
             lpar = lpar->tokAt(2);
-        for (const Token* tok = lpar->next(); tok && tok != funcTok->next()->link(); tok = tok->next()) {
+        for (const Token* tok = lpar->next(); tok && tok != funcTok->linkAt(1); tok = tok->next()) {
             if (tok->str() == "(")
                 tok = tok->link();
             else if ((tok->isName() && isMemberVar(scope, tok)) || (tok->isUnaryOp("&") && (tok = tok->astOperand1()) && isMemberVar(scope, tok))) {
@@ -2396,9 +2516,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
             }
 
             // 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();
@@ -2409,6 +2527,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
@@ -2445,6 +2569,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                             return false;
                         const Token* assignTok = end->next()->astParent();
                         if (var && assignTok && assignTok->isAssignmentOp() && assignTok->astOperand1() && assignTok->astOperand1()->variable()) {
+                            // cppcheck-suppress shadowFunction - TODO: fix this
                             const Variable* assignVar = assignTok->astOperand1()->variable();
                             if (assignVar->isPointer() && !assignVar->isConst() && var->typeScope()) {
                                 const auto& funcMap = var->typeScope()->functionMap;
@@ -2468,8 +2593,9 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
             auto hasOverloadedMemberAccess = [](const Token* end, const Scope* scope) -> bool {
                 if (!end || !scope || !Token::simpleMatch(end->astParent(), "."))
                     return false;
-                auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [](const Function& f) {
-                    return f.isConst() && f.name() == "operator.";
+                const std::string op = "operator" + end->astParent()->originalName();
+                auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [&op](const Function& f) {
+                    return f.isConst() && f.name() == op;
                 });
                 if (it == scope->functionList.end() || !it->retType || !it->retType->classScope)
                     return false;
@@ -2477,27 +2603,47 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                 return func && func->isConst();
             };
 
+            auto isConstContainerUsage = [&](const ValueType* vt) -> bool {
+                if (!vt || !vt->container)
+                    return false;
+                const auto yield = vt->container->getYield(end->str());
+                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
+                    if (parent && parent->isAssignmentOp() && tok1->tokAt(-2)->variable() && Token::Match(tok1->tokAt(-2)->variable()->typeEndToken(), "const_iterator|const_reverse_iterator"))
+                        return true;
+                }
+                if ((yield == Library::Container::Yield::ITEM || yield == Library::Container::Yield::AT_INDEX) &&
+                    ((parent && parent->isComparisonOp()) || lhs->isAssignmentOp() || (lhs->str() == "(" && Token::Match(lhs->astParent(), "%cop%"))))
+                    return true; // assume that these functions have const overloads
+                return false;
+            };
+
             if (end->strAt(1) == "(") {
                 const Variable *var = lastVarTok->variable();
                 if (!var)
                     return false;
-                if ((var->isStlType() // assume all std::*::size() and std::*::empty() are const
-                     && (Token::Match(end, "size|empty|cend|crend|cbegin|crbegin|max_size|length|count|capacity|get_allocator|c_str|str ( )") || Token::Match(end, "rfind|copy"))) ||
-
-                    (lastVarTok->valueType() && lastVarTok->valueType()->container &&
-                     ((lastVarTok->valueType()->container->getYield(end->str()) == Library::Container::Yield::START_ITERATOR) ||
-                      (lastVarTok->valueType()->container->getYield(end->str()) == Library::Container::Yield::END_ITERATOR))
-                     && (tok1->previous()->isComparisonOp() ||
-                         (tok1->previous()->isAssignmentOp() && tok1->tokAt(-2)->variable() && Token::Match(tok1->tokAt(-2)->variable()->typeEndToken(), "const_iterator|const_reverse_iterator")))))
-                    ;
+                if (var->isStlType() // assume all std::*::size() and std::*::empty() are const
+                    && (Token::Match(end, "size|empty|cend|crend|cbegin|crbegin|max_size|length|count|capacity|get_allocator|c_str|str ( )") || Token::Match(end, "rfind|copy"))) {
+                    // empty body
+                }
+                else if (isConstContainerUsage(lastVarTok->valueType())) {
+                    // empty body
+                }
                 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)) {
-                    ;
+                    // empty body
                 } else if (hasOverloadedMemberAccess(end, var->typeScope())) {
-                    ;
-                } else if (!var->typeScope() || (end->function() != func && !isConstMemberFunc(var->typeScope(), end)))
-                    return false;
+                    // empty body
+                } else if (!var->typeScope() || (end->function() != func && !isConstMemberFunc(var->typeScope(), end))) {
+                    if (!mSettings->library.isFunctionConst(end))
+                        return false;
+                }
             }
 
             // Assignment
@@ -2507,7 +2653,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
             // Streaming
             else if (end->strAt(1) == "<<" && tok1->strAt(-1) != "<<")
                 return false;
-            else if (isLikelyStreamRead(true, tok1->previous()))
+            else if (isLikelyStreamRead(tok1->previous()))
                 return false;
 
             // ++/--
@@ -2536,7 +2682,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
         }
 
         // streaming: >> *this
-        else if (Token::simpleMatch(tok1, ">> * this") && isLikelyStreamRead(true, tok1)) {
+        else if (Token::simpleMatch(tok1, ">> * this") && isLikelyStreamRead(tok1)) {
             return false;
         }
 
@@ -2552,36 +2698,35 @@ 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)
+void CheckClass::checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
 {
-    checkConstError2(tok, nullptr, classname, funcname, suggestStatic);
+    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)
+void CheckClass::checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses)
 {
-    std::list<const Token *> toks;
-    toks.push_back(tok1);
+    std::list<const Token *> toks{ tok1 };
     if (tok2)
-        toks.push_back(tok2);
-    if (!suggestStatic)
+        toks.push_front(tok2);
+    if (!suggestStatic) {
+        const std::string msg = foundAllBaseClasses ?
+                                "Technically the member function '$symbol' can be const.\nThe member function '$symbol' can be made a const " :
+                                "Either there is a missing 'override', or the member function '$symbol' can be const.\nUnless it overrides a base class member, the member function '$symbol' can be made a const ";
         reportError(toks, Severity::style, "functionConst",
                     "$symbol:" + classname + "::" + funcname +"\n"
-                    "Technically the member function '$symbol' can be const.\n"
-                    "The member function '$symbol' can be made a const "
+                    + msg +
                     "function. Making this function 'const' should not cause compiler errors. "
                     "Even though the function can be made const function technically it may not make "
                     "sense conceptually. Think about your design and the task of the function first - is "
                     "it a function that must not change object internal state?", CWE398, Certainty::inconclusive);
-    else
-        reportError(toks, Severity::performance, "functionStatic",
-                    "$symbol:" + classname + "::" + funcname +"\n"
-                    "Technically the member function '$symbol' can be static (but you may consider moving to unnamed namespace).\n"
-                    "The member function '$symbol' can be made a static "
-                    "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 a unnamed namespace.", CWE398, Certainty::inconclusive);
+    }
+    else {
+        const std::string msg = foundAllBaseClasses ?
+                                "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);
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -2595,12 +2740,13 @@ namespace { // avoid one-definition-rule violation
 
         const Variable *var;
         const Token *tok;
+        std::vector<const Variable*> initArgs;
     };
 }
 
 void CheckClass::initializerListOrder()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("initializerList"))
         return;
 
     // This check is not inconclusive.  However it only determines if the initialization
@@ -2610,10 +2756,12 @@ void CheckClass::initializerListOrder()
     if (!mSettings->certainty.isEnabled(Certainty::inconclusive))
         return;
 
+    logChecker("CheckClass::initializerListOrder"); // style,inconclusive
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
 
         // iterate through all member functions looking for constructors
-        for (std::list<Function>::const_iterator func = scope->functionList.cbegin(); func != scope->functionList.cend(); ++func) {
+        for (auto func = scope->functionList.cbegin(); func != scope->functionList.cend(); ++func) {
             if (func->isConstructor() && func->hasBody()) {
                 // check for initializer list
                 const Token *tok = func->arg->link()->next();
@@ -2623,25 +2771,46 @@ void CheckClass::initializerListOrder()
                     tok = tok->next();
 
                     // find all variable initializations in list
-                    while (tok && tok != func->functionScope->bodyStart) {
+                    for (; tok && tok != func->functionScope->bodyStart; tok = tok->next()) {
                         if (Token::Match(tok, "%name% (|{")) {
+                            const Token* const end = tok->linkAt(1);
                             const Variable *var = scope->getVariable(tok->str());
                             if (var)
                                 vars.emplace_back(var, tok);
-
-                            if (Token::Match(tok->tokAt(2), "%name% =")) {
-                                var = scope->getVariable(tok->strAt(2));
-
-                                if (var)
-                                    vars.emplace_back(var, tok->tokAt(2));
+                            else
+                                tok = end;
+
+                            for (; tok != end; tok = tok->next()) {
+                                if (Token::Match(tok->astParent(), ".|::"))
+                                    continue;
+                                if (const Variable* argVar = scope->getVariable(tok->str())) {
+                                    if (scope != argVar->scope())
+                                        continue;
+                                    if (argVar->isStatic())
+                                        continue;
+                                    if (tok->variable() && tok->variable()->isArgument())
+                                        continue;
+                                    if (var->isPointer() && (argVar->isArray() || Token::simpleMatch(tok->astParent(), "&")))
+                                        continue;
+                                    if (var->isReference())
+                                        continue;
+                                    if (Token::simpleMatch(tok->astParent(), "="))
+                                        continue;
+                                    vars.back().initArgs.emplace_back(argVar);
+                                }
                             }
-                            tok = tok->next()->link()->next();
-                        } else
-                            tok = tok->next();
+                        }
                     }
 
-                    // need at least 2 members to have out of order initialization
-                    for (int j = 1; j < vars.size(); j++) {
+                    for (std::size_t j = 0; j < vars.size(); j++) {
+                        // check for use of uninitialized arguments
+                        for (const auto& arg : vars[j].initArgs)
+                            if (vars[j].var->index() < arg->index())
+                                initializerListError(vars[j].tok, vars[j].var->nameToken(), scope->className, vars[j].var->name(), arg->name());
+
+                        // need at least 2 members to have out of order initialization
+                        if (j == 0)
+                            continue;
                         // check for out of order initialization
                         if (vars[j].var->index() < vars[j - 1].var->index())
                             initializerListError(vars[j].tok,vars[j].var->nameToken(), scope->className, vars[j].var->name());
@@ -2652,15 +2821,18 @@ void CheckClass::initializerListOrder()
     }
 }
 
-void CheckClass::initializerListError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &varname)
+void CheckClass::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() ?
+                            "Member variable '$symbol' is in the wrong place in the initializer list." :
+                            "Member variable '$symbol' uses an uninitialized argument '" + argname + "' due to the order of declarations.";
     reportError(toks, Severity::style, "initializerList",
-                "$symbol:" + classname + "::" + varname +"\n"
-                "Member variable '$symbol' is in the wrong place in the initializer list.\n"
-                "Member variable '$symbol' is in the wrong place in the initializer list. "
+                "$symbol:" + classname + "::" + varname + '\n' +
+                msg + '\n' +
+                msg + ' ' +
                 "Members are initialized in the order they are declared, not in the "
-                "order they are in the initializer list.  Keeping the initializer list "
+                "order they are in the initializer list. Keeping the initializer list "
                 "in the same order that the members were declared prevents order dependent "
                 "initialization errors.", CWE398, Certainty::inconclusive);
 }
@@ -2672,6 +2844,8 @@ void CheckClass::initializerListError(const Token *tok1, const Token *tok2, cons
 
 void CheckClass::checkSelfInitialization()
 {
+    logChecker("CheckClass::checkSelfInitialization");
+
     for (const Scope *scope : mSymbolDatabase->functionScopes) {
         const Function* function = scope->function;
         if (!function || !function->isConstructor())
@@ -2711,6 +2885,7 @@ void CheckClass::checkVirtualFunctionCallInConstructor()
 {
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
+    logChecker("CheckClass::checkVirtualFunctionCallInConstructor"); // warning
     std::map<const Function *, std::list<const Token *>> virtualFunctionCallsMap;
     for (const Scope *scope : mSymbolDatabase->functionScopes) {
         if (scope->function == nullptr || !scope->function->hasBody() ||
@@ -2739,7 +2914,7 @@ void CheckClass::checkVirtualFunctionCallInConstructor()
 const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Function & function,
                                                                      std::map<const Function *, std::list<const Token *>> & virtualFunctionCallsMap)
 {
-    const std::map<const Function *, std::list<const Token *>>::const_iterator found = virtualFunctionCallsMap.find(&function);
+    const auto found = utils::as_const(virtualFunctionCallsMap).find(&function);
     if (found != virtualFunctionCallsMap.end())
         return found->second;
 
@@ -2750,10 +2925,10 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
         return virtualFunctionCalls;
 
     for (const Token *tok = function.arg->link(); tok != function.functionScope->bodyEnd; tok = tok->next()) {
-        if (function.type != Function::eConstructor &&
-            function.type != Function::eCopyConstructor &&
-            function.type != Function::eMoveConstructor &&
-            function.type != Function::eDestructor) {
+        if (function.type != FunctionType::eConstructor &&
+            function.type != FunctionType::eCopyConstructor &&
+            function.type != FunctionType::eMoveConstructor &&
+            function.type != FunctionType::eDestructor) {
             if ((Token::simpleMatch(tok, ") {") && tok->link() && Token::Match(tok->link()->previous(), "if|switch")) ||
                 Token::simpleMatch(tok, "else {")) {
                 // Assume pure virtual function call is prevented by "if|else|switch" condition
@@ -2761,7 +2936,7 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
                 continue;
             }
         }
-        if (tok->scope()->type == Scope::eLambda)
+        if (tok->scope()->type == ScopeType::eLambda)
             tok = tok->scope()->bodyEnd->next();
 
         const Function * callFunction = tok->function();
@@ -2772,11 +2947,11 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
             continue;
 
         if (tok->previous() &&
-            tok->previous()->str() == "(") {
+            tok->strAt(-1) == "(") {
             const Token * prev = tok->previous();
             if (prev->previous() &&
                 (mSettings->library.ignorefunction(tok->str())
-                 || mSettings->library.ignorefunction(prev->previous()->str())))
+                 || mSettings->library.ignorefunction(prev->strAt(-1))))
                 continue;
         }
 
@@ -2804,7 +2979,7 @@ void CheckClass::getFirstVirtualFunctionCallStack(
         pureFuncStack.push_back(callFunction->tokenDef);
         return;
     }
-    std::map<const Function *, std::list<const Token *>>::const_iterator found = virtualFunctionCallsMap.find(callFunction);
+    auto found = utils::as_const(virtualFunctionCallsMap).find(callFunction);
     if (found == virtualFunctionCallsMap.cend() || found->second.empty()) {
         pureFuncStack.clear();
         return;
@@ -2819,6 +2994,9 @@ void CheckClass::virtualFunctionCallInConstructorError(
     const std::list<const Token *> & tokStack,
     const std::string &funcname)
 {
+    if (scopeFunction && !mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("virtualCallInConstructor"))
+        return;
+
     const char * scopeFunctionTypeName = scopeFunction ? getFunctionTypeName(scopeFunction->type) : "constructor";
 
     ErrorPath errorPath;
@@ -2834,7 +3012,7 @@ void CheckClass::virtualFunctionCallInConstructorError(
     std::string constructorName;
     if (scopeFunction) {
         const Token *endToken = scopeFunction->argDef->link()->next();
-        if (scopeFunction->type == Function::Type::eDestructor)
+        if (scopeFunction->type == FunctionType::eDestructor)
             constructorName = "~";
         for (const Token *tok = scopeFunction->tokenDef; tok != endToken; tok = tok->next()) {
             if (!constructorName.empty() && Token::Match(tok->previous(), "%name%|%num% %name%|%num%"))
@@ -2845,8 +3023,8 @@ void CheckClass::virtualFunctionCallInConstructorError(
         }
     }
 
-    reportError(errorPath, Severity::style, "virtualCallInConstructor",
-                "Virtual function '" + funcname + "' is called from " + scopeFunctionTypeName + " '" + constructorName + "' at line " + MathLib::toString(lineNumber) + ". Dynamic binding is not used.", CWE(0U), Certainty::normal);
+    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(
@@ -2863,7 +3041,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);
@@ -2876,9 +3054,11 @@ void CheckClass::pureVirtualFunctionCallInConstructorError(
 
 void CheckClass::checkDuplInheritedMembers()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("duplInheritedMember"))
         return;
 
+    logChecker("CheckClass::checkDuplInheritedMembers"); // warning
+
     // Iterate over all classes
     for (const Type &classIt : mSymbolDatabase->typeList) {
         // Iterate over the parent classes
@@ -2939,11 +3119,15 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
         for (const Function& classFuncIt : typeCurrent->classScope->functionList) {
             if (classFuncIt.isImplicitlyVirtual())
                 continue;
+            if (classFuncIt.tokenDef->isExpandedMacro())
+                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);
             }
         }
@@ -2961,16 +3145,16 @@ void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, con
     for (const auto& r : resultsVar) {
         duplInheritedMembersError(r.classVar->nameToken(), r.parentClassVar->nameToken(),
                                   typeCurrent->name(), r.parentClass->type->name(), r.classVar->name(),
-                                  typeCurrent->classScope->type == Scope::eStruct,
-                                  r.parentClass->type->classScope->type == Scope::eStruct);
+                                  typeCurrent->classScope->type == ScopeType::eStruct,
+                                  r.parentClass->type->classScope->type == ScopeType::eStruct);
     }
 
     const auto resultsFunc = getDuplInheritedMemberFunctionsRecursive(typeCurrent, typeBase);
     for (const auto& r : resultsFunc) {
         duplInheritedMembersError(r.classFunc->token, r.parentClassFunc->token,
                                   typeCurrent->name(), r.parentClass->type->name(), r.classFunc->name(),
-                                  typeCurrent->classScope->type == Scope::eStruct,
-                                  r.parentClass->type->classScope->type == Scope::eStruct, /*isFunction*/ true);
+                                  typeCurrent->classScope->type == ScopeType::eStruct,
+                                  r.parentClass->type->classScope->type == ScopeType::eStruct, /*isFunction*/ true);
     }
 }
 
@@ -2988,7 +3172,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);
 }
 
 
@@ -2996,7 +3180,7 @@ void CheckClass::duplInheritedMembersError(const Token *tok1, const Token* tok2,
 // Check that copy constructor and operator defined together
 //---------------------------------------------------------------------------
 
-enum class CtorType {
+enum class CtorType : std::uint8_t {
     NO,
     WITHOUT_BODY,
     WITH_BODY
@@ -3006,10 +3190,11 @@ void CheckClass::checkCopyCtorAndEqOperator()
 {
     // 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)
         return;
 
+    // logChecker
+
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
 
         const bool hasNonStaticVars = std::any_of(scope->varlist.begin(), scope->varlist.end(), [](const Variable& var) {
@@ -3023,16 +3208,16 @@ void CheckClass::checkCopyCtorAndEqOperator()
         CtorType assignmentOperators = CtorType::NO;
 
         for (const Function &func : scope->functionList) {
-            if (copyCtors == CtorType::NO && func.type == Function::eCopyConstructor) {
+            if (copyCtors == CtorType::NO && func.type == FunctionType::eCopyConstructor) {
                 copyCtors = func.hasBody() ? CtorType::WITH_BODY : CtorType::WITHOUT_BODY;
             }
-            if (assignmentOperators == CtorType::NO && func.type == Function::eOperatorEqual) {
+            if (assignmentOperators == CtorType::NO && func.type == FunctionType::eOperatorEqual) {
                 const Variable * variable = func.getArgumentVar(0);
                 if (variable && variable->type() && variable->type()->classScope == scope) {
                     assignmentOperators = func.hasBody() ? CtorType::WITH_BODY : CtorType::WITHOUT_BODY;
                 }
             }
-            if (func.type == Function::eMoveConstructor) {
+            if (func.type == FunctionType::eMoveConstructor) {
                 moveCtor = true;
                 break;
             }
@@ -3049,7 +3234,7 @@ void CheckClass::checkCopyCtorAndEqOperator()
         if (copyCtors != CtorType::NO && assignmentOperators != CtorType::NO)
             continue;
 
-        copyCtorAndEqOperatorError(scope->classDef, scope->className, scope->type == Scope::eStruct, copyCtors == CtorType::WITH_BODY);
+        copyCtorAndEqOperatorError(scope->classDef, scope->className, scope->type == ScopeType::eStruct, copyCtors == CtorType::WITH_BODY);
     }
 }
 
@@ -3057,24 +3242,27 @@ void CheckClass::copyCtorAndEqOperatorError(const Token *tok, const std::string
 {
     const std::string message = "$symbol:" + classname + "\n"
                                 "The " + std::string(isStruct ? "struct" : "class") + " '$symbol' has '" +
-                                getFunctionTypeName(hasCopyCtor ? Function::eCopyConstructor : Function::eOperatorEqual) +
-                                "' but lack of '" + getFunctionTypeName(hasCopyCtor ? Function::eOperatorEqual : Function::eCopyConstructor) +
+                                getFunctionTypeName(hasCopyCtor ? FunctionType::eCopyConstructor : FunctionType::eOperatorEqual) +
+                                "' but lack of '" + getFunctionTypeName(hasCopyCtor ? FunctionType::eOperatorEqual : FunctionType::eCopyConstructor) +
                                 "'.";
     reportError(tok, Severity::warning, "copyCtorAndEqOperator", message);
 }
 
 void CheckClass::checkOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("missingOverride"))
         return;
     if (mSettings->standards.cpp < Standards::CPP11)
         return;
+    logChecker("CheckClass::checkMissingOverride"); // style,c++03
     for (const Scope * classScope : mSymbolDatabase->classAndStructScopes) {
         if (!classScope->definedType || classScope->definedType->derivedFrom.empty())
             continue;
         for (const Function &func : classScope->functionList) {
             if (func.hasOverrideSpecifier() || func.hasFinalSpecifier())
                 continue;
+            if (func.tokenDef->isExpandedMacro())
+                continue;
             const Function *baseFunc = func.getOverriddenFunction();
             if (baseFunc)
                 overrideError(baseFunc, &func);
@@ -3093,7 +3281,7 @@ 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! */,
@@ -3117,7 +3305,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! */,
@@ -3146,10 +3334,14 @@ static bool compareTokenRanges(const Token* start1, const Token* end1, const Tok
     const Token* tok2 = start2;
     bool isEqual = false;
     while (tok1 && tok2) {
+        if (tok1->function() != tok2->function())
+            break;
         if (tok1->str() != tok2->str())
             break;
         if (tok1->str() == "this")
             break;
+        if (tok1->isExpandedMacro() || tok2->isExpandedMacro())
+            break;
         if (tok1 == end1 && tok2 == end2) {
             isEqual = true;
             break;
@@ -3162,9 +3354,11 @@ static bool compareTokenRanges(const Token* start1, const Token* end1, const Tok
 
 void CheckClass::checkUselessOverride()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("uselessOverride"))
         return;
 
+    logChecker("CheckClass::checkUselessOverride"); // style
+
     for (const Scope* classScope : mSymbolDatabase->classAndStructScopes) {
         if (!classScope->definedType || classScope->definedType->derivedFrom.size() != 1)
             continue;
@@ -3204,11 +3398,12 @@ void CheckClass::checkUselessOverride()
             if (const Token* const call = getSingleFunctionCall(func.functionScope)) {
                 if (call->function() != baseFunc)
                     continue;
-                std::vector<const Token*> funcArgs = getArguments(func.tokenDef);
+                if (Token::simpleMatch(call->astParent(), "."))
+                    continue;
                 std::vector<const Token*> callArgs = getArguments(call);
-                if (funcArgs.size() != callArgs.size() ||
-                    !std::equal(funcArgs.begin(), funcArgs.end(), callArgs.begin(), [](const Token* t1, const Token* t2) {
-                    return t1->str() == t2->str();
+                if (func.argumentList.size() != callArgs.size() ||
+                    !std::equal(func.argumentList.begin(), func.argumentList.end(), callArgs.begin(), [](const Variable& v, const Token* t) {
+                    return v.nameToken() && v.nameToken()->str() == t->str();
                 }))
                     continue;
                 uselessOverrideError(baseFunc, &func);
@@ -3217,17 +3412,90 @@ void CheckClass::checkUselessOverride()
     }
 }
 
+static const Variable* getSingleReturnVar(const Scope* scope) {
+    if (!scope || !scope->bodyStart)
+        return nullptr;
+    const Token* const start = scope->bodyStart->next();
+    const Token* const end = Token::findsimplematch(start, ";", 1, scope->bodyEnd);
+    if (!end || end->next() != scope->bodyEnd)
+        return nullptr;
+    if (!start->astOperand1() || start->str() != "return")
+        return nullptr;
+    const Token* tok = start->astOperand1();
+    if (tok->str() == ".") {
+        const Token* top = tok->astOperand1();
+        while (Token::Match(top, "[[.]"))
+            top = top->astOperand1();
+        if (!Token::Match(top, "%var%"))
+            return nullptr;
+        tok = tok->astOperand2();
+    }
+    return tok->variable();
+}
+
+void CheckClass::checkReturnByReference()
+{
+    if (!mSettings->severity.isEnabled(Severity::performance) && !mSettings->isPremiumEnabled("returnByReference"))
+        return;
+
+    logChecker("CheckClass::checkReturnByReference"); // performance
+
+    for (const Scope* classScope : mSymbolDatabase->classAndStructScopes) {
+        for (const Function& func : classScope->functionList) {
+            if (Function::returnsPointer(&func) || Function::returnsReference(&func) || Function::returnsStandardType(&func))
+                continue;
+            if (func.isImplicitlyVirtual())
+                continue;
+            if (func.isOperator())
+                continue;
+            if (func.functionPointerUsage)
+                continue;
+            if (const Library::Container* container = mSettings->library.detectContainer(func.retDef))
+                if (container->view)
+                    continue;
+            if (!func.isConst() && func.hasRvalRefQualifier())
+                // this method could be used by temporary objects, return by value can be dangerous
+                continue;
+            if (const Variable* var = getSingleReturnVar(func.functionScope)) {
+                if (!var->valueType())
+                    continue;
+                if (var->isArgument())
+                    continue;
+                const bool isContainer = var->valueType()->type == ValueType::Type::CONTAINER && var->valueType()->container;
+                const bool isView = isContainer && var->valueType()->container->view;
+                bool warn = isContainer && !isView;
+                if (!warn && !isView) {
+                    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)
+                    returnByReferenceError(&func, var);
+            }
+        }
+    }
+}
+
+void CheckClass::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()
 {
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckClass::checkThisUseAfterFree"); // warning
+
     for (const Scope * classScope : mSymbolDatabase->classAndStructScopes) {
 
         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, true); // this is only called for C++
+                const ValueType valueType = ValueType::parseDecl(var.typeStartToken(), *mSettings);
                 if (valueType.smartPointerType != classScope->definedType)
                     continue;
             }
@@ -3236,7 +3504,7 @@ void CheckClass::checkThisUseAfterFree()
             if (!var.isStatic()) {
                 bool hasAssign = false;
                 for (const Function &func : classScope->functionList) {
-                    if (func.type != Function::Type::eFunction || !func.hasBody())
+                    if (func.type != FunctionType::eFunction || !func.hasBody())
                         continue;
                     for (const Token *tok = func.functionScope->bodyStart; tok != func.functionScope->bodyEnd; tok = tok->next()) {
                         if (Token::Match(tok, "%varid% = this|shared_from_this", var.declarationId())) {
@@ -3253,18 +3521,18 @@ void CheckClass::checkThisUseAfterFree()
 
             // Check usage of self pointer..
             for (const Function &func : classScope->functionList) {
-                if (func.type != Function::Type::eFunction || !func.hasBody())
+                if (func.type != FunctionType::eFunction || !func.hasBody())
                     continue;
 
                 const Token * freeToken = nullptr;
                 std::set<const Function *> callstack;
-                checkThisUseAfterFreeRecursive(classScope, &func, &var, callstack, &freeToken);
+                checkThisUseAfterFreeRecursive(classScope, &func, &var, std::move(callstack), freeToken);
             }
         }
     }
 }
 
-bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token **freeToken)
+bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token *&freeToken)
 {
     if (!func || !func->functionScope)
         return false;
@@ -3277,26 +3545,26 @@ bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const F
     const Token * const bodyStart = func->functionScope->bodyStart;
     const Token * const bodyEnd = func->functionScope->bodyEnd;
     for (const Token *tok = bodyStart; tok != bodyEnd; tok = tok->next()) {
-        const bool isDestroyed = *freeToken != nullptr && !func->isStatic();
+        const bool isDestroyed = freeToken != nullptr && !func->isStatic();
         if (Token::Match(tok, "delete %var% ;") && selfPointer == tok->next()->variable()) {
-            *freeToken = tok;
+            freeToken = tok;
             tok = tok->tokAt(2);
         } else if (Token::Match(tok, "%var% . reset ( )") && selfPointer == tok->variable())
-            *freeToken = tok;
-        else if (Token::Match(tok->previous(), "!!. %name% (") && tok->function() && tok->function()->nestedIn == classScope) {
+            freeToken = tok;
+        else if (Token::Match(tok->previous(), "!!. %name% (") && tok->function() && tok->function()->nestedIn == classScope && tok->function()->type == FunctionType::eFunction) {
             if (isDestroyed) {
-                thisUseAfterFree(selfPointer->nameToken(), *freeToken, tok);
+                thisUseAfterFree(selfPointer->nameToken(), freeToken, tok);
                 return true;
             }
             if (checkThisUseAfterFreeRecursive(classScope, tok->function(), selfPointer, callstack, freeToken))
                 return true;
         } else if (isDestroyed && Token::Match(tok->previous(), "!!. %name%") && tok->variable() && tok->variable()->scope() == classScope && !tok->variable()->isStatic() && !tok->variable()->isArgument()) {
-            thisUseAfterFree(selfPointer->nameToken(), *freeToken, tok);
+            thisUseAfterFree(selfPointer->nameToken(), freeToken, tok);
             return true;
-        } else if (*freeToken && Token::Match(tok, "return|throw")) {
+        } else if (freeToken && Token::Match(tok, "return|throw")) {
             // TODO
             return tok->str() == "throw";
-        } else if (tok->str() == "{" && tok->scope()->type == Scope::ScopeType::eLambda) {
+        } else if (tok->str() == "{" && tok->scope()->type == ScopeType::eLambda) {
             tok = tok->link();
         }
     }
@@ -3306,10 +3574,10 @@ bool CheckClass::checkThisUseAfterFreeRecursive(const Scope *classScope, const F
 void CheckClass::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);
@@ -3319,6 +3587,7 @@ void CheckClass::checkUnsafeClassRefMember()
 {
     if (!mSettings->safeChecks.classes || !mSettings->severity.isEnabled(Severity::warning))
         return;
+    logChecker("CheckClass::checkUnsafeClassRefMember"); // warning,safeChecks
     for (const Scope * classScope : mSymbolDatabase->classAndStructScopes) {
         for (const Function &func : classScope->functionList) {
             if (!func.hasBody() || !func.isConstructor())
@@ -3347,14 +3616,60 @@ void CheckClass::unsafeClassRefMemberError(const Token *tok, const std::string &
                 CWE(0), Certainty::normal);
 }
 
-Check::FileInfo *CheckClass::getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const
+// a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
+// see https://trac.cppcheck.net/ticket/12108 for more details
+#ifdef __clang__
+inline namespace CheckClass_internal
+#else
+namespace
+#endif
+{
+    /* multifile checking; one definition rule violations */
+    class MyFileInfo : public Check::FileInfo {
+    public:
+        using Check::FileInfo::FileInfo;
+        struct NameLoc {
+            std::string className;
+            std::string fileName;
+            std::string configuration;
+            int lineNumber;
+            int column;
+            std::size_t hash;
+
+            bool isSameLocation(const NameLoc& other) const {
+                return fileName == other.fileName &&
+                       lineNumber == other.lineNumber &&
+                       column == other.column;
+            }
+        };
+        std::vector<NameLoc> classDefinitions;
+
+        /** Convert data into xml string */
+        std::string toString() const override
+        {
+            std::string ret;
+            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) +
+                       "\"/>\n";
+            }
+            return ret;
+        }
+    };
+}
+
+Check::FileInfo *CheckClass::getFileInfo(const Tokenizer &tokenizer, const Settings& /*settings*/, const std::string& currentConfig) const
 {
-    if (!tokenizer->isCPP())
+    if (!tokenizer.isCPP())
         return nullptr;
-    (void)settings;
+
     // One definition rule
     std::vector<MyFileInfo::NameLoc> classDefinitions;
-    for (const Scope * classScope : tokenizer->getSymbolDatabase()->classAndStructScopes) {
+    for (const Scope * classScope : tokenizer.getSymbolDatabase()->classAndStructScopes) {
         if (classScope->isAnonymous())
             continue;
 
@@ -3384,12 +3699,12 @@ Check::FileInfo *CheckClass::getFileInfo(const Tokenizer *tokenizer, const Setti
         if (name.empty())
             continue;
         name.erase(name.size() - 2);
-        if (scope->type != Scope::ScopeType::eGlobal)
+        if (scope->type != ScopeType::eGlobal)
             continue;
 
         MyFileInfo::NameLoc nameLoc;
-        nameLoc.className = name;
-        nameLoc.fileName = tokenizer->list.file(classScope->classDef);
+        nameLoc.className = std::move(name);
+        nameLoc.fileName = tokenizer.list.file(classScope->classDef);
         nameLoc.lineNumber = classScope->classDef->linenr();
         nameLoc.column = classScope->classDef->column();
 
@@ -3404,6 +3719,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));
     }
@@ -3411,40 +3727,28 @@ Check::FileInfo *CheckClass::getFileInfo(const Tokenizer *tokenizer, const Setti
     if (classDefinitions.empty())
         return nullptr;
 
-    MyFileInfo *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(tokenizer.list.getFiles()[0]);
     fileInfo->classDefinitions.swap(classDefinitions);
     return fileInfo;
 }
 
-std::string CheckClass::MyFileInfo::toString() const
-{
-    std::string ret;
-    for (const MyFileInfo::NameLoc &nameLoc: classDefinitions) {
-        ret += "<class name=\"" + ErrorLogger::toxml(nameLoc.className) +
-               "\" file=\"" + ErrorLogger::toxml(nameLoc.fileName) +
-               "\" line=\"" + std::to_string(nameLoc.lineNumber) +
-               "\" col=\"" + std::to_string(nameLoc.column) +
-               "\" hash=\"" + std::to_string(nameLoc.hash) +
-               "\"/>\n";
-    }
-    return ret;
-}
-
 Check::FileInfo * CheckClass::loadFileInfoFromXml(const tinyxml2::XMLElement *xmlElement) const
 {
-    MyFileInfo *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo;
     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);
@@ -3458,16 +3762,24 @@ 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<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
+    (void)ctu;
+    (void)settings;
+
+    CheckClass dummy(nullptr, &settings, &errorLogger);
+    dummy.
+    logChecker("CheckClass::analyseWholeProgram");
+
+    if (fileInfo.empty())
+        return false;
+
     bool foundErrors = false;
-    (void)ctu; // This argument is unused
-    (void)settings; // This argument is unused
 
     std::unordered_map<std::string, MyFileInfo::NameLoc> all;
 
     for (const Check::FileInfo* fi1 : fileInfo) {
-        const MyFileInfo *fi = dynamic_cast<const MyFileInfo*>(fi1);
+        const auto *fi = dynamic_cast<const MyFileInfo*>(fi1);
         if (!fi)
             continue;
         for (const MyFileInfo::NameLoc &nameLoc : fi->classDefinitions) {
@@ -3478,6 +3790,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;
@@ -3486,8 +3800,8 @@ bool CheckClass::analyseWholeProgram(const CTU::FileInfo *ctu, const std::list<C
             locationList.emplace_back(nameLoc.fileName, nameLoc.lineNumber, nameLoc.column);
             locationList.emplace_back(it->second.fileName, it->second.lineNumber, it->second.column);
 
-            const ErrorMessage errmsg(locationList,
-                                      emptyString,
+            const ErrorMessage errmsg(std::move(locationList),
+                                      fi->file0,
                                       Severity::error,
                                       "$symbol:" + nameLoc.className +
                                       "\nThe one definition rule is violated, different classes/structs have the same name '$symbol'",
@@ -3502,4 +3816,78 @@ bool CheckClass::analyseWholeProgram(const CTU::FileInfo *ctu, const std::list<C
     return foundErrors;
 }
 
+void CheckClass::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    if (tokenizer.isC())
+        return;
 
+    CheckClass checkClass(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    // can't be a simplified check .. the 'sizeof' is used.
+    checkClass.checkMemset();
+    checkClass.constructors();
+    checkClass.privateFunctions();
+    checkClass.operatorEqRetRefThis();
+    checkClass.thisSubtraction();
+    checkClass.operatorEqToSelf();
+    checkClass.initializerListOrder();
+    checkClass.initializationListUsage();
+    checkClass.checkSelfInitialization();
+    checkClass.virtualDestructor();
+    checkClass.checkConst();
+    checkClass.copyconstructors();
+    checkClass.checkVirtualFunctionCallInConstructor();
+    checkClass.checkDuplInheritedMembers();
+    checkClass.checkExplicitConstructors();
+    checkClass.checkCopyCtorAndEqOperator();
+    checkClass.checkOverride();
+    checkClass.checkUselessOverride();
+    checkClass.checkReturnByReference();
+    checkClass.checkThisUseAfterFree();
+    checkClass.checkUnsafeClassRefMember();
+}
+
+void CheckClass::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckClass c(nullptr, settings, errorLogger);
+    c.noConstructorError(nullptr, "classname", false);
+    c.noExplicitConstructorError(nullptr, "classname", false);
+    //c.copyConstructorMallocError(nullptr, 0, "var");
+    c.copyConstructorShallowCopyError(nullptr, "var");
+    c.noCopyConstructorError(nullptr, false, nullptr, false);
+    c.noOperatorEqError(nullptr, false, nullptr, false);
+    c.noDestructorError(nullptr, false, nullptr);
+    c.uninitVarError(nullptr, false, FunctionType::eConstructor, "classname", "varname", false, false);
+    c.uninitVarError(nullptr, true, FunctionType::eConstructor, "classname", "varnamepriv", false, false);
+    c.uninitVarError(nullptr, false, FunctionType::eConstructor, "classname", "varname", true, false);
+    c.uninitVarError(nullptr, true, FunctionType::eConstructor, "classname", "varnamepriv", true, false);
+    c.missingMemberCopyError(nullptr, FunctionType::eConstructor, "classname", "varnamepriv");
+    c.operatorEqVarError(nullptr, "classname", "", false);
+    c.unusedPrivateFunctionError(nullptr, nullptr, "classname", "funcname");
+    c.memsetError(nullptr, "memfunc", "classname", "class");
+    c.memsetErrorReference(nullptr, "memfunc", "class");
+    c.memsetErrorFloat(nullptr, "class");
+    c.mallocOnClassWarning(nullptr, "malloc", nullptr);
+    c.mallocOnClassError(nullptr, "malloc", nullptr, "std::string");
+    c.virtualDestructorError(nullptr, "Base", "Derived", false);
+    c.thisSubtractionError(nullptr);
+    c.operatorEqRetRefThisError(nullptr);
+    c.operatorEqMissingReturnStatementError(nullptr, true);
+    c.operatorEqShouldBeLeftUnimplementedError(nullptr);
+    c.operatorEqToSelfError(nullptr);
+    c.checkConstError(nullptr, "class", "function", false);
+    c.checkConstError(nullptr, "class", "function", true);
+    c.initializerListError(nullptr, nullptr, "class", "variable");
+    c.suggestInitializationList(nullptr, "variable");
+    c.selfInitializationError(nullptr, "var");
+    c.duplInheritedMembersError(nullptr, nullptr, "class", "class", "variable", false, false);
+    c.copyCtorAndEqOperatorError(nullptr, "class", false, false);
+    c.overrideError(nullptr, nullptr);
+    c.uselessOverrideError(nullptr, nullptr);
+    c.returnByReferenceError(nullptr, nullptr);
+    c.pureVirtualFunctionCallInConstructorError(nullptr, std::list<const Token *>(), "f");
+    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 bd1ed8db054..130f6ffd781 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-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
@@ -23,10 +23,8 @@
 
 #include "check.h"
 #include "config.h"
-#include "tokenize.h"
-#include "symboldatabase.h"
 
-#include <cstddef>
+#include <cstdint>
 #include <list>
 #include <map>
 #include <set>
@@ -35,15 +33,14 @@
 
 class ErrorLogger;
 class Settings;
+class Tokenizer;
 class Token;
-
-namespace CTU {
-    class FileInfo;
-}
-
-namespace tinyxml2 {
-    class XMLElement;
-}
+class Scope;
+class SymbolDatabase;
+class Function;
+class Variable;
+class Type;
+enum class FunctionType : std::uint8_t;
 
 /// @addtogroup Checks
 /// @{
@@ -51,42 +48,23 @@ namespace tinyxml2 {
 
 /** @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()), mSymbolDatabase(nullptr) {}
+    CheckClass() : Check(myName()) {}
 
+    /** @brief Set of the STL types whose operator[] is not const */
+    static const std::set<std::string> stl_containers_not_const;
+
+private:
     /** @brief This constructor is used when running checks. */
     CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger);
 
     /** @brief Run checks on the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (tokenizer->isC())
-            return;
-
-        CheckClass checkClass(tokenizer, settings, errorLogger);
-
-        // can't be a simplified check .. the 'sizeof' is used.
-        checkClass.checkMemset();
-        checkClass.constructors();
-        checkClass.privateFunctions();
-        checkClass.operatorEqRetRefThis();
-        checkClass.thisSubtraction();
-        checkClass.operatorEqToSelf();
-        checkClass.initializerListOrder();
-        checkClass.initializationListUsage();
-        checkClass.checkSelfInitialization();
-        checkClass.virtualDestructor();
-        checkClass.checkConst();
-        checkClass.copyconstructors();
-        checkClass.checkVirtualFunctionCallInConstructor();
-        checkClass.checkDuplInheritedMembers();
-        checkClass.checkExplicitConstructors();
-        checkClass.checkCopyCtorAndEqOperator();
-        checkClass.checkOverride();
-        checkClass.checkUselessOverride();
-        checkClass.checkThisUseAfterFree();
-        checkClass.checkUnsafeClassRefMember();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief %Check that all class constructors are ok */
     void constructors();
@@ -150,52 +128,24 @@ class CPPCHECKLIB CheckClass : public Check {
     /** @brief Check that the overriden function is not identical to the base function */
     void checkUselessOverride();
 
+    /** @brief Check that large members are returned by reference from getter function */
+    void checkReturnByReference();
+
     /** @brief When "self pointer" is destroyed, 'this' might become invalid. */
     void checkThisUseAfterFree();
 
     /** @brief Unsafe class check - const reference member */
     void checkUnsafeClassRefMember();
 
-
-    /* multifile checking; one definition rule violations */
-    class MyFileInfo : public Check::FileInfo {
-    public:
-        struct NameLoc {
-            std::string className;
-            std::string fileName;
-            int lineNumber;
-            int column;
-            std::size_t hash;
-
-            bool operator==(const NameLoc& other) const {
-                return isSameLocation(other) && hash == other.hash;
-            }
-
-            bool isSameLocation(const NameLoc& other) const {
-                return fileName == other.fileName &&
-                       lineNumber == other.lineNumber &&
-                       column == other.column;
-            }
-        };
-        std::vector<NameLoc> classDefinitions;
-
-        /** Convert MyFileInfo data into xml string */
-        std::string toString() const override;
-    };
-
     /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const override;
+    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& currentConfig) 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;
-
-    /** @brief Set of the STL types whose operator[] is not const */
-    static const std::set<std::string> stl_containers_not_const;
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
 
-private:
-    const SymbolDatabase *mSymbolDatabase;
+    const SymbolDatabase* mSymbolDatabase{};
 
     // Reporting errors..
     void noConstructorError(const Token *tok, const std::string &classname, bool isStruct);
@@ -205,11 +155,11 @@ 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, Function::Type 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);
     void uninitVarError(const Token *tok, const std::string &classname, const std::string &varname);
-    void missingMemberCopyError(const Token *tok, Function::Type functionType, 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);
-    void unusedPrivateFunctionError(const Token *tok, const std::string &classname, const std::string &funcname);
+    void unusedPrivateFunctionError(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname);
     void memsetError(const Token *tok, const std::string &memfunc, const std::string &classname, const std::string &type, bool isContainer = false);
     void memsetErrorReference(const Token *tok, const std::string &memfunc, const std::string &type);
     void memsetErrorFloat(const Token *tok, const std::string &type);
@@ -221,9 +171,9 @@ class CPPCHECKLIB CheckClass : public Check {
     void operatorEqShouldBeLeftUnimplementedError(const Token *tok);
     void operatorEqMissingReturnStatementError(const Token *tok, bool error);
     void operatorEqToSelfError(const Token *tok);
-    void checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic);
-    void checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic);
-    void initializerListError(const Token *tok1,const Token *tok2, const std::string & classname, const std::string &varname);
+    void checkConstError(const Token *tok, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses = true);
+    void checkConstError2(const Token *tok1, const Token *tok2, const std::string &classname, const std::string &funcname, bool suggestStatic, bool foundAllBaseClasses = true);
+    void initializerListError(const Token *tok1,const Token *tok2, const std::string & classname, const std::string &varname, const std::string& argname = {});
     void suggestInitializationList(const Token *tok, const std::string& varname);
     void selfInitializationError(const Token* tok, const std::string& varname);
     void pureVirtualFunctionCallInConstructorError(const Function * scopeFunction, const std::list<const Token *> & tokStack, const std::string &purefuncname);
@@ -232,50 +182,12 @@ class CPPCHECKLIB CheckClass : public Check {
     void copyCtorAndEqOperatorError(const Token *tok, const std::string &classname, bool isStruct, bool hasCopyCtor);
     void overrideError(const Function *funcInBase, const Function *funcInDerived);
     void uselessOverrideError(const Function *funcInBase, const Function *funcInDerived, bool isSameCode = false);
+    void returnByReferenceError(const Function *func, const Variable* var);
     void thisUseAfterFree(const Token *self, const Token *free, const Token *use);
     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 {
-        CheckClass c(nullptr, settings, errorLogger);
-        c.noConstructorError(nullptr, "classname", false);
-        c.noExplicitConstructorError(nullptr, "classname", false);
-        //c.copyConstructorMallocError(nullptr, 0, "var");
-        c.copyConstructorShallowCopyError(nullptr, "var");
-        c.noCopyConstructorError(nullptr, false, nullptr, false);
-        c.noOperatorEqError(nullptr, false, nullptr, false);
-        c.noDestructorError(nullptr, false, nullptr);
-        c.uninitVarError(nullptr, false, Function::eConstructor, "classname", "varname", false, false);
-        c.uninitVarError(nullptr, true, Function::eConstructor, "classname", "varnamepriv", false, false);
-        c.uninitVarError(nullptr, false, Function::eConstructor, "classname", "varname", true, false);
-        c.uninitVarError(nullptr, true, Function::eConstructor, "classname", "varnamepriv", true, false);
-        c.missingMemberCopyError(nullptr, Function::eConstructor, "classname", "varnamepriv");
-        c.operatorEqVarError(nullptr, "classname", emptyString, false);
-        c.unusedPrivateFunctionError(nullptr, "classname", "funcname");
-        c.memsetError(nullptr, "memfunc", "classname", "class");
-        c.memsetErrorReference(nullptr, "memfunc", "class");
-        c.memsetErrorFloat(nullptr, "class");
-        c.mallocOnClassWarning(nullptr, "malloc", nullptr);
-        c.mallocOnClassError(nullptr, "malloc", nullptr, "std::string");
-        c.virtualDestructorError(nullptr, "Base", "Derived", false);
-        c.thisSubtractionError(nullptr);
-        c.operatorEqRetRefThisError(nullptr);
-        c.operatorEqMissingReturnStatementError(nullptr, true);
-        c.operatorEqShouldBeLeftUnimplementedError(nullptr);
-        c.operatorEqToSelfError(nullptr);
-        c.checkConstError(nullptr, "class", "function", false);
-        c.checkConstError(nullptr, "class", "function", true);
-        c.initializerListError(nullptr, nullptr, "class", "variable");
-        c.suggestInitializationList(nullptr, "variable");
-        c.selfInitializationError(nullptr, "var");
-        c.duplInheritedMembersError(nullptr, nullptr, "class", "class", "variable", false, false);
-        c.copyCtorAndEqOperatorError(nullptr, "class", false, false);
-        c.pureVirtualFunctionCallInConstructorError(nullptr, std::list<const Token *>(), "f");
-        c.virtualFunctionCallInConstructorError(nullptr, std::list<const Token *>(), "f");
-        c.overrideError(nullptr, nullptr);
-        c.thisUseAfterFree(nullptr, nullptr, nullptr);
-        c.unsafeClassRefMemberError(nullptr, "UnsafeClass::var");
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Class";
@@ -315,8 +227,8 @@ class CPPCHECKLIB CheckClass : public Check {
     bool hasAllocation(const Function *func, const Scope* scope) const;
     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 { TRUE, FALSE, BAILOUT };
+    static bool hasAssignSelf(const Function *func, const Token *rhs, const Token *&out_ifStatementScopeStart);
+    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);
 
@@ -324,22 +236,22 @@ class CPPCHECKLIB CheckClass : public Check {
     bool isMemberVar(const Scope *scope, const Token *tok) const;
     static bool isMemberFunc(const Scope *scope, const Token *tok);
     static bool isConstMemberFunc(const Scope *scope, const Token *tok);
-    enum class MemberAccess { NONE, SELF, MEMBER };
+    enum class MemberAccess : std::uint8_t { NONE, SELF, MEMBER };
     bool checkConstFunc(const Scope *scope, const Function *func, MemberAccess& memberAccessed) const;
 
     // constructors helper function
     /** @brief Information about a member variable. Used when checking for uninitialized variables */
     struct Usage {
-        explicit Usage(const Variable *var) : var(var), assign(false), init(false) {}
+        explicit Usage(const Variable *var) : var(var) {}
 
         /** Variable that this usage is for */
         const Variable *var;
 
         /** @brief has this variable been assigned? */
-        bool assign;
+        bool assign{};
 
         /** @brief has this variable been initialized? */
-        bool init;
+        bool init{};
     };
 
     static bool isBaseClassMutableMemberFunc(const Token *tok, const Scope *scope);
@@ -428,7 +340,7 @@ class CPPCHECKLIB CheckClass : public Check {
     /**
      * @brief Helper for checkThisUseAfterFree
      */
-    bool checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token **freeToken);
+    bool checkThisUseAfterFreeRecursive(const Scope *classScope, const Function *func, const Variable *selfPointer, std::set<const Function *> callstack, const Token *&freeToken);
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index a0799b4b41c..5f35f443cbf 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-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
@@ -29,11 +29,14 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "utils.h"
 #include "vfvalue.h"
 
 #include "checkother.h" // comparisonNonZeroExpressionLessThanZero and testIfNonZeroExpressionIsPositive
 
 #include <algorithm>
+#include <cstdint>
+#include <initializer_list>
 #include <limits>
 #include <list>
 #include <set>
@@ -42,10 +45,10 @@
 #include <vector>
 
 // CWE ids used
-static const struct CWE uncheckedErrorConditionCWE(391U);
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
-static const struct CWE CWE570(570U);   // Expression is Always False
-static const struct CWE CWE571(571U);   // Expression is Always True
+static const CWE uncheckedErrorConditionCWE(391U);
+static const CWE CWE398(398U);   // Indicator of Poor Code Quality
+static const CWE CWE570(570U);   // Expression is Always False
+static const CWE CWE571(571U);   // Expression is Always True
 
 //---------------------------------------------------------------------------
 
@@ -60,7 +63,7 @@ bool CheckCondition::diag(const Token* tok, bool insert)
         return false;
     const Token* parent = tok->astParent();
     bool hasParent = false;
-    while (Token::Match(parent, "&&|%oror%")) {
+    while (Token::Match(parent, "!|&&|%oror%")) {
         if (mCondDiags.count(parent) != 0) {
             hasParent = true;
             break;
@@ -75,6 +78,13 @@ bool CheckCondition::diag(const Token* tok, bool insert)
     return true;
 }
 
+bool CheckCondition::diag(const Token* tok1, const Token* tok2)
+{
+    const bool b1 = diag(tok1);
+    const bool b2 = diag(tok2);
+    return b1 && b2;
+}
+
 bool CheckCondition::isAliased(const std::set<int> &vars) const
 {
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -86,9 +96,11 @@ bool CheckCondition::isAliased(const std::set<int> &vars) const
 
 void CheckCondition::assignIf()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignIfError"))
         return;
 
+    logChecker("CheckCondition::assignIf"); // style
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (tok->str() != "=")
             continue;
@@ -103,7 +115,7 @@ void CheckCondition::assignIf()
 
             if (Token::Match(tok->next(), "%num% [&|]")) {
                 bitop = tok->strAt(2).at(0);
-                num = MathLib::toLongNumber(tok->next()->str());
+                num = MathLib::toBigNumber(tok->tokAt(1));
             } else {
                 const Token *endToken = Token::findsimplematch(tok, ";");
 
@@ -113,7 +125,7 @@ void CheckCondition::assignIf()
 
                 if (endToken && Token::Match(endToken->tokAt(-2), "[&|] %num% ;")) {
                     bitop = endToken->strAt(-2).at(0);
-                    num = MathLib::toLongNumber(endToken->previous()->str());
+                    num = MathLib::toBigNumber(endToken->tokAt(-1));
                 }
             }
 
@@ -166,7 +178,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
 
     for (const Token *tok2 = startTok; tok2; tok2 = tok2->next()) {
         if ((bitop == '&') && Token::Match(tok2->tokAt(2), "%varid% %cop% %num% ;", varid) && tok2->strAt(3) == std::string(1U, bitop)) {
-            const MathLib::bigint num2 = MathLib::toLongNumber(tok2->strAt(4));
+            const MathLib::bigint num2 = MathLib::toBigNumber(tok2->tokAt(4));
             if (0 == (num & num2))
                 mismatchingBitAndError(assignTok, num, tok2, num2);
         }
@@ -174,7 +186,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
             return true;
         }
         if (bitop == '&' && Token::Match(tok2, "%varid% &= %num% ;", varid)) {
-            const MathLib::bigint num2 = MathLib::toLongNumber(tok2->strAt(2));
+            const MathLib::bigint num2 = MathLib::toBigNumber(tok2->tokAt(2));
             if (0 == (num & num2))
                 mismatchingBitAndError(assignTok, num, tok2, num2);
         }
@@ -188,7 +200,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
             ret = true;
         if (ret && tok2->str() == ";")
             return false;
-        if (!islocal && Token::Match(tok2, "%name% (") && !Token::simpleMatch(tok2->next()->link(), ") {"))
+        if (!islocal && Token::Match(tok2, "%name% (") && !Token::simpleMatch(tok2->linkAt(1), ") {"))
             return true;
         if (Token::Match(tok2, "if|while (")) {
             if (!islocal && tok2->str() == "while")
@@ -197,19 +209,19 @@ 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, mTokenizer->isCPP()))
+                if (!bodyEnd || bodyEnd->str() != "}" || isVariableChanged(bodyStart, bodyEnd, varid, !islocal, *mSettings))
                     continue;
             }
 
             // parse condition
-            const Token * const end = tok2->next()->link();
+            const Token * const end = tok2->linkAt(1);
             for (; tok2 != end; tok2 = tok2->next()) {
                 if (Token::Match(tok2, "[(,] &| %varid% [,)]", varid)) {
                     return true;
                 }
                 if (Token::Match(tok2,"&&|%oror%|( %varid% ==|!= %num% &&|%oror%|)", varid)) {
                     const Token *vartok = tok2->next();
-                    const MathLib::bigint num2 = MathLib::toLongNumber(vartok->strAt(2));
+                    const MathLib::bigint num2 = MathLib::toBigNumber(vartok->tokAt(2));
                     if ((num & num2) != ((bitop=='&') ? num2 : num)) {
                         const std::string& op(vartok->strAt(1));
                         const bool alwaysTrue = op == "!=";
@@ -224,8 +236,8 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
 
             const bool ret1 = assignIfParseScope(assignTok, end->tokAt(2), varid, islocal, bitop, num);
             bool ret2 = false;
-            if (Token::simpleMatch(end->next()->link(), "} else {"))
-                ret2 = assignIfParseScope(assignTok, end->next()->link()->tokAt(3), varid, islocal, bitop, num);
+            if (Token::simpleMatch(end->linkAt(1), "} else {"))
+                ret2 = assignIfParseScope(assignTok, end->linkAt(1)->tokAt(3), varid, islocal, bitop, num);
             if (ret1 || ret2)
                 return true;
         }
@@ -241,7 +253,7 @@ void CheckCondition::assignIfError(const Token *tok1, const Token *tok2, const s
     reportError(locations,
                 Severity::style,
                 "assignIfError",
-                "Mismatching assignment and comparison, comparison '" + condition + "' is always " + std::string(result ? "true" : "false") + ".", CWE398, Certainty::normal);
+                "Mismatching assignment and comparison, comparison '" + condition + "' is always " + std::string(bool_to_string(result)) + ".", CWE398, Certainty::normal);
 }
 
 
@@ -263,11 +275,11 @@ void CheckCondition::mismatchingBitAndError(const Token *tok1, const MathLib::bi
 static void getnumchildren(const Token *tok, std::list<MathLib::bigint> &numchildren)
 {
     if (tok->astOperand1() && tok->astOperand1()->isNumber())
-        numchildren.push_back(MathLib::toLongNumber(tok->astOperand1()->str()));
+        numchildren.push_back(MathLib::toBigNumber(tok->astOperand1()));
     else if (tok->astOperand1() && tok->str() == tok->astOperand1()->str())
         getnumchildren(tok->astOperand1(), numchildren);
     if (tok->astOperand2() && tok->astOperand2()->isNumber())
-        numchildren.push_back(MathLib::toLongNumber(tok->astOperand2()->str()));
+        numchildren.push_back(MathLib::toBigNumber(tok->astOperand2()));
     else if (tok->astOperand2() && tok->str() == tok->astOperand2()->str())
         getnumchildren(tok->astOperand2(), numchildren);
 }
@@ -278,7 +290,7 @@ static bool inBooleanFunction(const Token *tok)
     const Scope *scope = tok ? tok->scope() : nullptr;
     while (scope && scope->isLocal())
         scope = scope->nestedIn;
-    if (scope && scope->type == Scope::eFunction) {
+    if (scope && scope->type == ScopeType::eFunction) {
         const Function *func = scope->function;
         if (func) {
             const Token *ret = func->retDef;
@@ -290,11 +302,24 @@ static bool inBooleanFunction(const Token *tok)
     return false;
 }
 
+static bool isOperandExpanded(const Token *tok)
+{
+    if (tok->isExpandedMacro() || tok->isEnumerator())
+        return true;
+    if (tok->astOperand1() && isOperandExpanded(tok->astOperand1()))
+        return true;
+    if (tok->astOperand2() && isOperandExpanded(tok->astOperand2()))
+        return true;
+    return false;
+}
+
 void CheckCondition::checkBadBitmaskCheck()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("badBitmaskCheck"))
         return;
 
+    logChecker("CheckCondition::checkBadBitmaskCheck"); // style
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (tok->str() == "|" && tok->astOperand1() && tok->astOperand2() && tok->astParent()) {
             const Token* parent = tok->astParent();
@@ -304,8 +329,8 @@ void CheckCondition::checkBadBitmaskCheck()
                                    (parent->str() == "(" && Token::Match(parent->astOperand1(), "if|while")) ||
                                    (parent->str() == "return" && parent->astOperand1() == tok && inBooleanFunction(tok));
 
-            const bool isTrue = (tok->astOperand1()->hasKnownIntValue() && tok->astOperand1()->values().front().intvalue != 0) ||
-                                (tok->astOperand2()->hasKnownIntValue() && tok->astOperand2()->values().front().intvalue != 0);
+            const bool isTrue = (tok->astOperand1()->hasKnownIntValue() && tok->astOperand1()->getKnownIntValue() != 0) ||
+                                (tok->astOperand2()->hasKnownIntValue() && tok->astOperand2()->getKnownIntValue() != 0);
 
             if (isBoolean && isTrue)
                 badBitmaskCheckError(tok);
@@ -315,14 +340,11 @@ void CheckCondition::checkBadBitmaskCheck()
             if (mTokenizer->hasIfdef(startStop.first, startStop.second))
                 continue;
 
-            const bool isZero1 = (tok->astOperand1()->hasKnownIntValue() && tok->astOperand1()->values().front().intvalue == 0);
-            const bool isZero2 = (tok->astOperand2()->hasKnownIntValue() && tok->astOperand2()->values().front().intvalue == 0);
+            const bool isZero1 = (tok->astOperand1()->hasKnownIntValue() && tok->astOperand1()->getKnownIntValue() == 0);
+            const bool isZero2 = (tok->astOperand2()->hasKnownIntValue() && tok->astOperand2()->getKnownIntValue() == 0);
             if (!isZero1 && !isZero2)
                 continue;
 
-            auto isOperandExpanded = [](const Token *op) {
-                return op->isExpandedMacro() || op->isEnumerator();
-            };
             if (!tok->isExpandedMacro() &&
                 !(isZero1 && isOperandExpanded(tok->astOperand1())) &&
                 !(isZero2 && isOperandExpanded(tok->astOperand2())))
@@ -341,9 +363,11 @@ void CheckCondition::badBitmaskCheckError(const Token *tok, bool isNoOp)
 
 void CheckCondition::comparison()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("comparisonError"))
         return;
 
+    logChecker("CheckCondition::comparison"); // style
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!tok->isComparisonOp())
             continue;
@@ -352,11 +376,13 @@ void CheckCondition::comparison()
         const Token *expr2 = tok->astOperand2();
         if (!expr1 || !expr2)
             continue;
-        if (expr1->isNumber())
+        if (expr1->hasKnownIntValue())
             std::swap(expr1,expr2);
-        if (!expr2->isNumber())
+        if (!expr2->hasKnownIntValue())
+            continue;
+        if (!compareTokenFlags(expr1, expr2, /*macro*/ true))
             continue;
-        const MathLib::bigint num2 = MathLib::toLongNumber(expr2->str());
+        const MathLib::bigint num2 = expr2->getKnownIntValue();
         if (num2 < 0)
             continue;
         if (!Token::Match(expr1,"[&|]"))
@@ -405,8 +431,8 @@ void CheckCondition::comparisonError(const Token *tok, const std::string &bitop,
     std::ostringstream expression;
     expression << std::hex << "(X " << bitop << " 0x" << value1 << ") " << op << " 0x" << value2;
 
-    const std::string errmsg("Expression '" + expression.str() + "' is always " + (result?"true":"false") + ".\n"
-                             "The expression '" + expression.str() + "' is always " + (result?"true":"false") +
+    const std::string errmsg("Expression '" + expression.str() + "' is always " + bool_to_string(result) + ".\n"
+                             "The expression '" + expression.str() + "' is always " + bool_to_string(result) +
                              ". Check carefully constants and operators used, these errors might be hard to "
                              "spot sometimes. In case of complex expression it might help to split it to "
                              "separate expressions.");
@@ -420,7 +446,7 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
         return false;
 
     // same expressions
-    if (isSameExpression(mTokenizer->isCPP(), true, cond1, cond2, mSettings->library, pure, false))
+    if (isSameExpression(true, cond1, cond2, *mSettings, pure, false))
         return true;
 
     // bitwise overlap for example 'x&7' and 'x==1'
@@ -443,11 +469,11 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
         if (!num2->isNumber() || MathLib::isNegative(num2->str()))
             return false;
 
-        if (!isSameExpression(mTokenizer->isCPP(), true, expr1, expr2, mSettings->library, pure, false))
+        if (!isSameExpression(true, expr1, expr2, *mSettings, pure, false))
             return false;
 
-        const MathLib::bigint value1 = MathLib::toLongNumber(num1->str());
-        const MathLib::bigint value2 = MathLib::toLongNumber(num2->str());
+        const MathLib::bigint value1 = MathLib::toBigNumber(num1);
+        const MathLib::bigint value2 = MathLib::toBigNumber(num2);
         if (cond2->str() == "&")
             return ((value1 & value2) == value2);
         return ((value1 & value2) > 0);
@@ -457,13 +483,15 @@ bool CheckCondition::isOverlappingCond(const Token * const cond1, const Token *
 
 void CheckCondition::duplicateCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateCondition"))
         return;
 
+    logChecker("CheckCondition::duplicateCondition"); // style
+
     const SymbolDatabase *const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eIf)
+        if (scope.type != ScopeType::eIf)
             continue;
 
         const Token* tok2 = scope.classDef->next();
@@ -486,33 +514,35 @@ void CheckCondition::duplicateCondition()
             continue;
 
         ErrorPath errorPath;
-        if (!isExpressionChanged(cond1, scope.classDef->next(), cond2, mSettings, mTokenizer->isCPP()) &&
-            isSameExpression(mTokenizer->isCPP(), true, cond1, cond2, mSettings->library, true, true, &errorPath))
-            duplicateConditionError(cond1, cond2, 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)
 {
-    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()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("multiCondition"))
         return;
 
+    logChecker("CheckCondition::multiCondition"); // style
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eIf)
+        if (scope.type != ScopeType::eIf)
             continue;
 
         const Token * const cond1 = scope.classDef->next()->astOperand2();
@@ -533,11 +563,13 @@ void CheckCondition::multiCondition()
 
             if (tok2->astOperand2()) {
                 ErrorPath errorPath;
-                if (isOverlappingCond(cond1, tok2->astOperand2(), true) && !isExpressionChanged(cond1, cond1, tok2->astOperand2(), mSettings, mTokenizer->isCPP()))
+                if (isOverlappingCond(cond1, tok2->astOperand2(), true) &&
+                    !findExpressionChanged(cond1, cond1, tok2->astOperand2(), *mSettings))
                     overlappingElseIfConditionError(tok2->astOperand2(), cond1->linenr());
-                else if (isOppositeCond(true, mTokenizer->isCPP(), cond1, tok2->astOperand2(), mSettings->library, true, true, &errorPath) &&
-                         !isExpressionChanged(cond1, cond1, tok2->astOperand2(), mSettings, mTokenizer->isCPP()))
-                    oppositeElseIfConditionError(cond1, tok2->astOperand2(), errorPath);
+                else if (isOppositeCond(
+                             true, cond1, tok2->astOperand2(), *mSettings, true, true, &errorPath) &&
+                         !findExpressionChanged(cond1, cond1, tok2->astOperand2(), *mSettings))
+                    oppositeElseIfConditionError(cond1, tok2->astOperand2(), std::move(errorPath));
             }
         }
     }
@@ -556,7 +588,7 @@ void CheckCondition::overlappingElseIfConditionError(const Token *tok, nonneg in
 
 void CheckCondition::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 "
@@ -565,7 +597,7 @@ 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);
 }
 
 //---------------------------------------------------------------------------
@@ -590,18 +622,32 @@ static bool isNonConstFunctionCall(const Token *ftok, const Library &library)
     return true;
 }
 
+static bool isNestedInLambda(const Scope* inner, const Scope* outer)
+{
+    while (inner && inner != outer) {
+        if (inner->type == ScopeType::eLambda)
+            return true;
+        inner = inner->nestedIn;
+    }
+    return false;
+}
+
 void CheckCondition::multiCondition2()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) &&
+        !mSettings->isPremiumEnabled("identicalConditionAfterEarlyExit") &&
+        !mSettings->isPremiumEnabled("identicalInnerCondition"))
         return;
 
+    logChecker("CheckCondition::multiCondition2"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
         const Token *condTok = nullptr;
-        if (scope.type == Scope::eIf || scope.type == Scope::eWhile)
+        if (scope.type == ScopeType::eIf || scope.type == ScopeType::eWhile)
             condTok = scope.classDef->next()->astOperand2();
-        else if (scope.type == Scope::eFor) {
+        else if (scope.type == ScopeType::eFor) {
             condTok = scope.classDef->next()->astOperand2();
             if (!condTok || condTok->str() != ";")
                 continue;
@@ -642,7 +688,7 @@ void CheckCondition::multiCondition2()
                 }
             } else if (!nonlocal && cond->isName()) {
                 // varid is 0. this is possibly a nonlocal variable..
-                nonlocal = Token::Match(cond->astParent(), "%cop%|(|[") || Token::Match(cond, "%name% .") || (mTokenizer->isCPP() && cond->str() == "this");
+                nonlocal = Token::Match(cond->astParent(), "%cop%|(|[") || Token::Match(cond, "%name% .") || (cond->isCpp() && cond->str() == "this");
             } else {
                 return ChildrenToVisit::op1_and_op2;
             }
@@ -664,7 +710,7 @@ void CheckCondition::multiCondition2()
         });
 
         // parse until second condition is reached..
-        enum MULTICONDITIONTYPE { INNER, AFTER };
+        enum MULTICONDITIONTYPE : std::uint8_t { INNER, AFTER };
         const Token *tok;
 
         // Parse inner condition first and then early return condition
@@ -680,18 +726,20 @@ void CheckCondition::multiCondition2()
             const Token * const endToken = tok->scope()->bodyEnd;
 
             for (; tok && tok != endToken; tok = tok->next()) {
-                if (isExpressionChangedAt(cond1, tok, 0, false, mSettings, mTokenizer->isCPP()))
+                if (isNestedInLambda(tok->scope(), cond1->scope()))
+                    continue;
+                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 (isExpressionChanged(cond1, condStartToken, condEndToken, mSettings, mTokenizer->isCPP()))
+                    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%"));
+                    const bool isReturnVar = (tok->str() == "return" && (!Token::Match(cond2, "%cop%") || (cond2 && cond2->isUnaryOp("!"))));
 
                     ErrorPath errorPath;
 
@@ -700,14 +748,14 @@ void CheckCondition::multiCondition2()
                             if (!firstCondition)
                                 return ChildrenToVisit::none;
                             if (firstCondition->str() == "&&") {
-                                if (!isOppositeCond(false, mTokenizer->isCPP(), firstCondition, cond2, mSettings->library, true, true))
+                                if (!isOppositeCond(false, firstCondition, cond2, *mSettings, true, true))
                                     return ChildrenToVisit::op1_and_op2;
                             }
                             if (!firstCondition->hasKnownIntValue()) {
-                                if (!isReturnVar && isOppositeCond(false, mTokenizer->isCPP(), firstCondition, cond2, mSettings->library, true, true, &errorPath)) {
+                                if (!isReturnVar && isOppositeCond(false, firstCondition, cond2, *mSettings, true, true, &errorPath)) {
                                     if (!isAliased(vars))
                                         oppositeInnerConditionError(firstCondition, cond2, errorPath);
-                                } else if (!isReturnVar && isSameExpression(mTokenizer->isCPP(), true, firstCondition, cond2, mSettings->library, true, true, &errorPath)) {
+                                } else if (!isReturnVar && isSameExpression(true, firstCondition, cond2, *mSettings, true, true, &errorPath)) {
                                     identicalInnerConditionError(firstCondition, cond2, errorPath);
                                 }
                             }
@@ -719,7 +767,7 @@ void CheckCondition::multiCondition2()
                                 return ChildrenToVisit::op1_and_op2;
 
                             if ((!cond1->hasKnownIntValue() || !secondCondition->hasKnownIntValue()) &&
-                                isSameExpression(mTokenizer->isCPP(), true, cond1, secondCondition, mSettings->library, 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;
@@ -730,7 +778,7 @@ void CheckCondition::multiCondition2()
                     }
                 }
                 if (Token::Match(tok, "%name% (") &&
-                    isVariablesChanged(tok, tok->linkAt(1), 0, varsInCond, mSettings, mTokenizer->isCPP())) {
+                    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
@@ -759,7 +807,7 @@ void CheckCondition::multiCondition2()
                         break;
                     }
                     const bool changed = std::any_of(vars.cbegin(), vars.cend(), [&](int varid) {
-                        return isVariableChanged(tok1, tok2, varid, nonlocal, mSettings, mTokenizer->isCPP());
+                        return isVariableChanged(tok1, tok2, varid, nonlocal, *mSettings);
                     });
                     if (changed)
                         break;
@@ -776,9 +824,9 @@ void CheckCondition::multiCondition2()
                         if (Token::Match(parent->astParent(), "%assign%|++|--"))
                             break;
                     }
-                    if (mTokenizer->isCPP() && Token::Match(tok, "%name% <<") && (!tok->valueType() || !tok->valueType()->isIntegral()))
+                    if (tok->isCpp() && Token::Match(tok, "%name% <<") && (!tok->valueType() || !tok->valueType()->isIntegral()))
                         break;
-                    if (isLikelyStreamRead(mTokenizer->isCPP(), tok->next()) || isLikelyStreamRead(mTokenizer->isCPP(), tok->previous()))
+                    if (isLikelyStreamRead(tok->next()) || isLikelyStreamRead(tok->previous()))
                         break;
                     if (Token::Match(tok, "%name% [")) {
                         const Token *tok2 = tok->linkAt(1);
@@ -808,8 +856,6 @@ static std::string innerSmtString(const Token * tok)
 {
     if (!tok)
         return "if";
-    if (!tok->astTop())
-        return "if";
     const Token * top = tok->astTop();
     if (top->str() == "(" && top->astOperand1())
         return top->astOperand1()->str();
@@ -818,7 +864,7 @@ static std::string innerSmtString(const Token * tok)
 
 void CheckCondition::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");
@@ -828,12 +874,12 @@ 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 CheckCondition::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");
@@ -843,12 +889,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)
 {
-    if (diag(cond1) & diag(cond2))
+    if (diag(cond1, cond2))
         return;
 
     const bool isReturnValue = cond2 && Token::simpleMatch(cond2->astParent(), "return");
@@ -859,7 +905,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
@@ -970,7 +1016,7 @@ static bool checkFloatRelation(const std::string &op, const double value1, const
 }
 
 template<class T>
-T getvalue3(const T value1, const T value2)
+static T getvalue3(const T value1, const T value2)
 {
     const T min = std::min(value1, value2);
     if (min== std::numeric_limits<T>::max())
@@ -981,7 +1027,7 @@ T getvalue3(const T value1, const T value2)
 template<>
 double getvalue3(const double value1, const double value2)
 {
-    return (value1 + value2) / 2.0f;
+    return (value1 + value2) / 2.0;
 }
 
 
@@ -1093,17 +1139,19 @@ static std::string conditionString(const Token * tok)
 
 static bool isIfConstexpr(const Token* tok) {
     const Token* const top = tok->astTop();
-    return top && Token::simpleMatch(top->astOperand1(), "if") && top->astOperand1()->isConstexpr();
+    return Token::simpleMatch(top->astOperand1(), "if") && top->astOperand1()->isConstexpr();
 }
 
 void CheckCondition::checkIncorrectLogicOperator()
 {
     const bool printStyle = mSettings->severity.isEnabled(Severity::style);
     const bool printWarning = mSettings->severity.isEnabled(Severity::warning);
-    if (!printWarning && !printStyle)
+    if (!printWarning && !printStyle && !mSettings->isPremiumEnabled("incorrectLogicOperator"))
         return;
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
 
+    logChecker("CheckCondition::checkIncorrectLogicOperator"); // style,warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
 
@@ -1120,7 +1168,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                 ((tok->str() == "||" && tok->astOperand2()->str() == "&&") ||
                  (tok->str() == "&&" && tok->astOperand2()->str() == "||"))) {
                 const Token* tok2 = tok->astOperand2()->astOperand1();
-                if (isOppositeCond(true, mTokenizer->isCPP(), tok->astOperand1(), tok2, mSettings->library, 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());
@@ -1152,7 +1200,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                     redundantConditionError(tok, msg, false);
                     continue;
                 }
-                if (isSameExpression(mTokenizer->isCPP(), false, tok->astOperand1(), tok2, mSettings->library, 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());
@@ -1168,7 +1216,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                     }
 
                     const std::string cond1 = expr1 + " " + tok->str() + " (" + expr2 + " " + tok->astOperand2()->str() + " " + expr3 + ")";
-                    const std::string cond2 = expr1;
+                    const std::string cond2 = std::move(expr1);
 
                     const std::string cond1VerboseMsg = expr1VerboseMsg + " " + tok->str() + " " + expr2VerboseMsg + " " + tok->astOperand2()->str() + " " + expr3VerboseMsg;
                     const std::string& cond2VerboseMsg = expr1VerboseMsg;
@@ -1217,10 +1265,10 @@ void CheckCondition::checkIncorrectLogicOperator()
 
             // Opposite comparisons around || or && => always true or always false
             const bool isLogicalOr(tok->str() == "||");
-            if (!isfloat && isOppositeCond(isLogicalOr, mTokenizer->isCPP(), tok->astOperand1(), tok->astOperand2(), mSettings->library, 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, errorPath);
+                    incorrectLogicOperatorError(tok, conditionString(tok), alwaysTrue, inconclusive, std::move(errorPath));
                 }
                 continue;
             }
@@ -1228,9 +1276,9 @@ void CheckCondition::checkIncorrectLogicOperator()
             if (!parseable)
                 continue;
 
-            if (isSameExpression(mTokenizer->isCPP(), true, comp1, comp2, mSettings->library, true, true))
+            if (isSameExpression(true, comp1, comp2, *mSettings, true, true))
                 continue; // same expressions => only report that there are same expressions
-            if (!isSameExpression(mTokenizer->isCPP(), true, expr1, expr2, mSettings->library, true, true))
+            if (!isSameExpression(true, expr1, expr2, *mSettings, true, true))
                 continue;
 
 
@@ -1239,14 +1287,14 @@ void CheckCondition::checkIncorrectLogicOperator()
             if (isfloat && (op1 == "==" || op1 == "!=" || op2 == "==" || op2 == "!="))
                 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::toLongNumber(value1);
-            const MathLib::bigint i2 = (isfloat) ? 0 : MathLib::toLongNumber(value2);
+            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::toLongNumber(value1) : 0;
-            const MathLib::biguint u2 = (useUnsignedInt) ? MathLib::toLongNumber(value2) : 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;
@@ -1260,15 +1308,15 @@ void CheckCondition::checkIncorrectLogicOperator()
                 // 5 => testvalue is larger than both value1 and value2
                 bool result1, result2;
                 if (isfloat) {
-                    const double testvalue = getvalue<double>(test, d1, d2);
+                    const auto testvalue = getvalue<double>(test, d1, d2);
                     result1 = checkFloatRelation(op1, testvalue, d1);
                     result2 = checkFloatRelation(op2, testvalue, d2);
                 } else if (useUnsignedInt) {
-                    const MathLib::biguint testvalue = getvalue<MathLib::biguint>(test, u1, u2);
+                    const auto testvalue = getvalue<MathLib::biguint>(test, u1, u2);
                     result1 = checkIntRelation(op1, testvalue, u1);
                     result2 = checkIntRelation(op2, testvalue, u2);
                 } else {
-                    const MathLib::bigint testvalue = getvalue<MathLib::bigint>(test, i1, i2);
+                    const auto testvalue = getvalue<MathLib::bigint>(test, i1, i2);
                     result1 = checkIntRelation(op1, testvalue, i1);
                     result2 = checkIntRelation(op2, testvalue, i2);
                 }
@@ -1291,9 +1339,9 @@ void CheckCondition::checkIncorrectLogicOperator()
             const std::string cond2str = conditionString(not2, expr2, op2, value2);
             if (printWarning && (alwaysTrue || alwaysFalse)) {
                 const std::string text = cond1str + " " + tok->str() + " " + cond2str;
-                incorrectLogicOperatorError(tok, text, alwaysTrue, inconclusive, errorPath);
+                incorrectLogicOperatorError(tok, text, alwaysTrue, inconclusive, std::move(errorPath));
             } else if (printStyle && (firstTrue || secondTrue)) {
-                const int which = isfloat ? sufficientCondition(op1, not1, d1, op2, not2, d2, isAnd) : sufficientCondition(op1, not1, i1, op2, not2, i2, isAnd);
+                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) {
                     text = "The condition '" + (which == 1 ? cond2str : cond1str) + "' is redundant since '" + (which == 1 ? cond1str : cond2str) + "' is sufficient.";
@@ -1311,12 +1359,12 @@ void CheckCondition::incorrectLogicOperatorError(const Token *tok, const std::st
         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);
@@ -1337,6 +1385,8 @@ void CheckCondition::checkModuloAlwaysTrueFalse()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckCondition::checkModuloAlwaysTrueFalse"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -1362,6 +1412,8 @@ void CheckCondition::checkModuloAlwaysTrueFalse()
 
 void CheckCondition::moduloAlwaysTrueFalseError(const Token* tok, const std::string& maxVal)
 {
+    if (diag(tok))
+        return;
     reportError(tok, Severity::warning, "moduloAlwaysTrueFalse",
                 "Comparison of modulo result is predetermined, because it is always less than " + maxVal + ".", CWE398, Certainty::normal);
 }
@@ -1386,10 +1438,10 @@ static int countPar(const Token *tok1, const Token *tok2)
 //---------------------------------------------------------------------------
 void CheckCondition::clarifyCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCondition"))
         return;
 
-    const bool isC = mTokenizer->isC();
+    logChecker("CheckCondition::clarifyCondition"); // style
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -1400,7 +1452,7 @@ void CheckCondition::clarifyCondition()
                         tok2 = tok2->link();
                     else if (tok2->isComparisonOp()) {
                         // This might be a template
-                        if (!isC && tok2->link())
+                        if (!tok2->isC() && tok2->link())
                             break;
                         if (Token::simpleMatch(tok2->astParent(), "?"))
                             break;
@@ -1450,14 +1502,23 @@ void CheckCondition::clarifyConditionError(const Token *tok, bool assign, bool b
 
 void CheckCondition::alwaysTrueFalse()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("alwaysTrue") &&
+        !mSettings->isPremiumEnabled("alwaysFalse") &&
+        !mSettings->isPremiumEnabled("knownConditionTrueFalse"))
         return;
 
+    logChecker("CheckCondition::alwaysTrueFalse"); // style
+
     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::simpleMatch(tok, "<") && tok->link()) // don't write false positives when templates are used
+            // don't write false positives when templates are used or inside of asserts or non-evaluated contexts
+            if (tok->link() && (Token::simpleMatch(tok, "<") ||
+                                Token::Match(tok->previous(), "static_assert|assert|ASSERT|sizeof|decltype ("))) {
+                tok = tok->link();
                 continue;
+            }
             if (!tok->hasKnownIntValue())
                 continue;
             if (Token::Match(tok->previous(), "%name% (") && tok->previous()->function()) {
@@ -1482,6 +1543,8 @@ void CheckCondition::alwaysTrueFalse()
                 else if (parent->str() == ";" && parent->astParent() && parent->astParent()->astParent() &&
                          Token::simpleMatch(parent->astParent()->astParent()->previous(), "for ("))
                     condition = parent->astParent()->astParent()->previous();
+                else if (Token::Match(tok, "%comp%"))
+                    condition = tok;
                 else
                     continue;
             }
@@ -1490,7 +1553,7 @@ void CheckCondition::alwaysTrueFalse()
                 continue;
             if (condition->isConstexpr())
                 continue;
-            if (!isUsedAsBool(tok))
+            if (!isUsedAsBool(tok, *mSettings))
                 continue;
             if (Token::simpleMatch(condition, "return") && Token::Match(tok, "%assign%"))
                 continue;
@@ -1500,19 +1563,26 @@ void CheckCondition::alwaysTrueFalse()
                 continue;
             if (Token::Match(tok, "! %num%|%bool%|%char%"))
                 continue;
-            if (Token::Match(tok, "%oror%|&&") &&
-                (tok->astOperand1()->hasKnownIntValue() || tok->astOperand2()->hasKnownIntValue()))
-                continue;
+            if (Token::Match(tok, "%oror%|&&")) {
+                bool bail = false;
+                for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) {
+                    if (op->hasKnownIntValue() && (!op->isLiteral() || op->isBoolean())) {
+                        bail = true;
+                        break;
+                    }
+                }
+                if (bail)
+                    continue;
+            }
             if (Token::simpleMatch(tok, ":"))
                 continue;
             if (Token::Match(tok->astOperand1(), "%name% (") && Token::simpleMatch(tok->astParent(), "return"))
                 continue;
-            if (tok->isComparisonOp() && isWithoutSideEffects(mTokenizer->isCPP(), tok->astOperand1()) &&
-                isSameExpression(mTokenizer->isCPP(),
-                                 true,
+            if (tok->isComparisonOp() && isWithoutSideEffects(tok->astOperand1()) &&
+                isSameExpression(true,
                                  tok->astOperand1(),
                                  tok->astOperand2(),
-                                 mSettings->library,
+                                 *mSettings,
                                  true,
                                  true))
                 continue;
@@ -1526,8 +1596,8 @@ void CheckCondition::alwaysTrueFalse()
             {
                 const ValueFlow::Value *zeroValue = nullptr;
                 const Token *nonZeroExpr = nullptr;
-                if (CheckOther::comparisonNonZeroExpressionLessThanZero(tok, &zeroValue, &nonZeroExpr) ||
-                    CheckOther::testIfNonZeroExpressionIsPositive(tok, &zeroValue, &nonZeroExpr))
+                if (CheckOther::comparisonNonZeroExpressionLessThanZero(tok, zeroValue, nonZeroExpr, /*suppress*/ true) ||
+                    CheckOther::testIfNonZeroExpressionIsPositive(tok, zeroValue, nonZeroExpr))
                     continue;
             }
 
@@ -1579,12 +1649,12 @@ void CheckCondition::alwaysTrueFalse()
 
 void CheckCondition::alwaysTrueFalseError(const Token* tok, const Token* condition, const ValueFlow::Value* value)
 {
-    const bool alwaysTrue = value && (value->intvalue != 0);
+    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 errmsg = conditionStr + " '" + expr + "' is always " + (alwaysTrue ? "true" : "false");
-    const ErrorPath errorPath = getErrorPath(tok, value, errmsg);
-    reportError(errorPath,
+    const std::string errmsg = conditionStr + " '" + expr + "' is always " + bool_to_string(alwaysTrue);
+    ErrorPath errorPath = getErrorPath(tok, value, errmsg);
+    reportError(std::move(errorPath),
                 Severity::style,
                 "knownConditionTrueFalse",
                 errmsg,
@@ -1609,6 +1679,8 @@ void CheckCondition::checkInvalidTestForOverflow()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckCondition::checkInvalidTestForOverflow"); // warning
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!Token::Match(tok, "<|<=|>=|>") || !tok->isBinaryOp())
             continue;
@@ -1635,11 +1707,10 @@ void CheckCondition::checkInvalidTestForOverflow()
                 if (expr->hasKnownIntValue())
                     continue;
 
-                if (!isSameExpression(mTokenizer->isCPP(),
-                                      true,
+                if (!isSameExpression(true,
                                       expr,
                                       lhs->astSibling(),
-                                      mSettings->library,
+                                      *mSettings,
                                       true,
                                       false))
                     continue;
@@ -1647,14 +1718,14 @@ void CheckCondition::checkInvalidTestForOverflow()
                 const Token * const other = expr->astSibling();
 
                 // x [+-] c cmp x
-                if ((other->isNumber() && other->getKnownIntValue() > 0) ||
+                if ((other->isNumber() && other->hasKnownIntValue() && other->getKnownIntValue() > 0) ||
                     (!other->isNumber() && other->valueType() && other->valueType()->isIntegral() && other->valueType()->sign == ValueType::Sign::UNSIGNED)) {
                     bool result;
                     if (lhs->str() == "+")
                         result = (cmp == ">" || cmp == ">=");
                     else
                         result = (cmp == "<" || cmp == "<=");
-                    invalidTestForOverflow(tok, lhs->valueType(), result ? "true" : "false");
+                    invalidTestForOverflow(tok, lhs->valueType(), bool_to_string(result));
                     continue;
                 }
 
@@ -1698,6 +1769,8 @@ void CheckCondition::checkPointerAdditionResultNotNull()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckCondition::checkPointerAdditionResultNotNull"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
 
@@ -1740,17 +1813,19 @@ void CheckCondition::pointerAdditionResultNotNullError(const Token *tok, const T
 
 void CheckCondition::checkDuplicateConditionalAssign()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("duplicateConditionalAssign"))
         return;
 
+    logChecker("CheckCondition::checkDuplicateConditionalAssign"); // style
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
             if (!Token::simpleMatch(tok, "if ("))
                 continue;
-            if (!Token::simpleMatch(tok->next()->link(), ") {"))
+            if (!Token::simpleMatch(tok->linkAt(1), ") {"))
                 continue;
-            const Token *blockTok = tok->next()->link()->next();
+            const Token *blockTok = tok->linkAt(1)->next();
             const Token *condTok = tok->next()->astOperand2();
             const bool isBoolVar = Token::Match(condTok, "!| %var%");
             if (!isBoolVar && !Token::Match(condTok, "==|!="))
@@ -1782,10 +1857,10 @@ void CheckCondition::checkDuplicateConditionalAssign()
                 isRedundant = (isNegation && val == 0) || (!isNegation && val == 1);
             } else { // comparison
                 if (!isSameExpression(
-                        mTokenizer->isCPP(), true, condTok->astOperand1(), assignTok->astOperand1(), mSettings->library, true, true))
+                        true, condTok->astOperand1(), assignTok->astOperand1(), *mSettings, true, true))
                     continue;
                 if (!isSameExpression(
-                        mTokenizer->isCPP(), true, condTok->astOperand2(), assignTok->astOperand2(), mSettings->library, true, true))
+                        true, condTok->astOperand2(), assignTok->astOperand2(), *mSettings, true, true))
                     continue;
             }
             duplicateConditionalAssignError(condTok, assignTok, isRedundant);
@@ -1811,15 +1886,17 @@ 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()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("assignmentInCondition"))
         return;
 
+    logChecker("CheckCondition::checkAssignmentInCondition"); // style
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -1862,13 +1939,14 @@ void CheckCondition::assignmentInCondition(const Token *eq)
 
 void CheckCondition::checkCompareValueOutOfTypeRange()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("compareValueOutOfTypeRangeError"))
         return;
 
-    if (mSettings->platform.type == cppcheck::Platform::Type::Native ||
-        mSettings->platform.type == cppcheck::Platform::Type::Unspecified)
+    if (mSettings->platform.type == Platform::Type::Unspecified)
         return;
 
+    logChecker("CheckCondition::checkCompareValueOutOfTypeRange"); // style,platform
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -1884,7 +1962,7 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                     continue;
                 if (valueTok->valueType() && valueTok->valueType()->isTypeEqual(typeTok->valueType()))
                     continue;
-                int bits = 0;
+                std::uint8_t bits = 0;
                 switch (typeTok->valueType()->type) {
                 case ValueType::Type::BOOL:
                     bits = 1;
@@ -1907,7 +1985,7 @@ void CheckCondition::checkCompareValueOutOfTypeRange()
                 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)));
@@ -1970,20 +2048,66 @@ 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, long long value, bool result)
+void CheckCondition::compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, MathLib::bigint value, bool result)
 {
     reportError(
         comparison,
         Severity::style,
         "compareValueOutOfTypeRangeError",
-        "Comparing expression of type '" + type + "' against value " + std::to_string(value) + ". Condition is always " + (result ? "true" : "false") + ".",
+        "Comparing expression of type '" + type + "' against value " + MathLib::toString(value) + ". Condition is always " + bool_to_string(result) + ".",
         CWE398,
         Certainty::normal);
 }
+
+void CheckCondition::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckCondition checkCondition(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkCondition.multiCondition();
+    checkCondition.clarifyCondition();   // not simplified because ifAssign
+    checkCondition.multiCondition2();
+    checkCondition.checkIncorrectLogicOperator();
+    checkCondition.checkInvalidTestForOverflow();
+    checkCondition.duplicateCondition();
+    checkCondition.checkPointerAdditionResultNotNull();
+    checkCondition.checkDuplicateConditionalAssign();
+    checkCondition.assignIf();
+    checkCondition.checkBadBitmaskCheck();
+    checkCondition.comparison();
+    checkCondition.checkModuloAlwaysTrueFalse();
+    checkCondition.checkAssignmentInCondition();
+    checkCondition.checkCompareValueOutOfTypeRange();
+    checkCondition.alwaysTrueFalse();
+}
+
+void CheckCondition::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckCondition 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.mismatchingBitAndError(nullptr, 0xf0, nullptr, 1);
+    c.oppositeInnerConditionError(nullptr, nullptr, ErrorPath{});
+    c.identicalInnerConditionError(nullptr, nullptr, ErrorPath{});
+    c.identicalConditionAfterEarlyExitError(nullptr, nullptr, ErrorPath{});
+    c.incorrectLogicOperatorError(nullptr, "foo > 3 && foo < 4", true, false, ErrorPath{});
+    c.redundantConditionError(nullptr, "If x > 11 the condition x > 10 is always true.", false);
+    c.moduloAlwaysTrueFalseError(nullptr, "1");
+    c.clarifyConditionError(nullptr, true, false);
+    c.alwaysTrueFalseError(nullptr, nullptr, nullptr);
+    c.invalidTestForOverflow(nullptr, nullptr, "false");
+    c.pointerAdditionResultNotNullError(nullptr, nullptr);
+    c.duplicateConditionalAssignError(nullptr, nullptr);
+    c.assignmentInCondition(nullptr);
+    c.compareValueOutOfTypeRangeError(nullptr, "unsigned char", 256, true);
+}
diff --git a/lib/checkcondition.h b/lib/checkcondition.h
index 57e09c50b49..dac3ba8d0de 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-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
@@ -32,9 +32,9 @@
 
 class Settings;
 class Token;
-class Tokenizer;
 class ErrorLogger;
 class ValueType;
+class Tokenizer;
 
 namespace ValueFlow {
     class Value;
@@ -52,39 +52,23 @@ class CPPCHECKLIB CheckCondition : public Check {
     /** This constructor is used when registering the CheckAssignIf */
     CheckCondition() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckCondition checkCondition(tokenizer, settings, errorLogger);
-        checkCondition.multiCondition();
-        checkCondition.clarifyCondition();   // not simplified because ifAssign
-        checkCondition.multiCondition2();
-        checkCondition.checkIncorrectLogicOperator();
-        checkCondition.checkInvalidTestForOverflow();
-        checkCondition.duplicateCondition();
-        checkCondition.checkPointerAdditionResultNotNull();
-        checkCondition.checkDuplicateConditionalAssign();
-        checkCondition.assignIf();
-        checkCondition.alwaysTrueFalse();
-        checkCondition.checkBadBitmaskCheck();
-        checkCondition.comparison();
-        checkCondition.checkModuloAlwaysTrueFalse();
-        checkCondition.checkAssignmentInCondition();
-        checkCondition.checkCompareValueOutOfTypeRange();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** mismatching assignment / comparison */
     void assignIf();
 
     /** parse scopes recursively */
-    bool assignIfParseScope(const Token * const assignTok,
-                            const Token * const startTok,
-                            const nonneg int varid,
-                            const bool islocal,
-                            const char bitop,
-                            const MathLib::bigint num);
+    bool assignIfParseScope(const Token * assignTok,
+                            const Token * startTok,
+                            nonneg int varid,
+                            bool islocal,
+                            char bitop,
+                            MathLib::bigint num);
 
     /** check bitmask using | instead of & */
     void checkBadBitmaskCheck();
@@ -128,14 +112,15 @@ class CPPCHECKLIB CheckCondition : public Check {
     /** @brief Assignment in condition */
     void checkAssignmentInCondition();
 
-private:
     // 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 * const cond1, const Token * const cond2, bool pure) 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);
-    void mismatchingBitAndError(const Token *tok1, const MathLib::bigint num1, const Token *tok2, const MathLib::bigint num2);
+    void mismatchingBitAndError(const Token *tok1, MathLib::bigint num1, const Token *tok2, MathLib::bigint num2);
     void badBitmaskCheckError(const Token *tok, bool isNoOp = false);
     void comparisonError(const Token *tok,
                          const std::string &bitop,
@@ -170,33 +155,9 @@ class CPPCHECKLIB CheckCondition : public Check {
     void assignmentInCondition(const Token *eq);
 
     void checkCompareValueOutOfTypeRange();
-    void compareValueOutOfTypeRangeError(const Token *comparison, const std::string &type, long long value, bool result);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckCondition c(nullptr, settings, errorLogger);
-
-        ErrorPath errorPath;
-
-        c.assignIfError(nullptr, nullptr, emptyString, false);
-        c.badBitmaskCheckError(nullptr);
-        c.comparisonError(nullptr, "&", 6, "==", 1, false);
-        c.duplicateConditionError(nullptr, nullptr, errorPath);
-        c.overlappingElseIfConditionError(nullptr, 1);
-        c.mismatchingBitAndError(nullptr, 0xf0, nullptr, 1);
-        c.oppositeInnerConditionError(nullptr, nullptr, errorPath);
-        c.identicalInnerConditionError(nullptr, nullptr, errorPath);
-        c.identicalConditionAfterEarlyExitError(nullptr, nullptr, errorPath);
-        c.incorrectLogicOperatorError(nullptr, "foo > 3 && foo < 4", true, false, errorPath);
-        c.redundantConditionError(nullptr, "If x > 11 the condition x > 10 is always true.", false);
-        c.moduloAlwaysTrueFalseError(nullptr, "1");
-        c.clarifyConditionError(nullptr, true, false);
-        c.alwaysTrueFalseError(nullptr, nullptr, nullptr);
-        c.invalidTestForOverflow(nullptr, nullptr, "false");
-        c.pointerAdditionResultNotNullError(nullptr, nullptr);
-        c.duplicateConditionalAssignError(nullptr, nullptr);
-        c.assignmentInCondition(nullptr);
-        c.compareValueOutOfTypeRangeError(nullptr, "unsigned char", 256, true);
-    }
+    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";
diff --git a/lib/checkers.cpp b/lib/checkers.cpp
new file mode 100644
index 00000000000..a84da1bc986
--- /dev/null
+++ b/lib/checkers.cpp
@@ -0,0 +1,2850 @@
+/*
+ * 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/>.
+ */
+
+// This file is auto-generated by tools/get_checkers.py:
+// python3 tools/get_checkers.py > lib/checkers.cpp
+
+#include "checkers.h"
+
+namespace checkers {
+    const std::map<std::string, std::string> allCheckers{
+        {"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::checkIncrementBoolean","style"},
+        {"CheckBool::pointerArithBool",""},
+        {"CheckBool::returnValueOfFunctionReturningBool","style"},
+        {"CheckBufferOverrun::analyseWholeProgram",""},
+        {"CheckBufferOverrun::argumentSize","warning"},
+        {"CheckBufferOverrun::arrayIndex",""},
+        {"CheckBufferOverrun::arrayIndexThenCheck",""},
+        {"CheckBufferOverrun::bufferOverflow",""},
+        {"CheckBufferOverrun::negativeArraySize",""},
+        {"CheckBufferOverrun::objectIndex",""},
+        {"CheckBufferOverrun::pointerArithmetic","portability"},
+        {"CheckBufferOverrun::stringNotZeroTerminated","warning,inconclusive"},
+        {"CheckClass::analyseWholeProgram",""},
+        {"CheckClass::checkConst","style,inconclusive"},
+        {"CheckClass::checkConstructors","style,warning"},
+        {"CheckClass::checkCopyConstructors","warning"},
+        {"CheckClass::checkDuplInheritedMembers","warning"},
+        {"CheckClass::checkExplicitConstructors","style"},
+        {"CheckClass::checkMemset",""},
+        {"CheckClass::checkMissingOverride","style,c++03"},
+        {"CheckClass::checkReturnByReference","performance"},
+        {"CheckClass::checkSelfInitialization",""},
+        {"CheckClass::checkThisUseAfterFree","warning"},
+        {"CheckClass::checkUnsafeClassRefMember","warning,safeChecks"},
+        {"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"},
+        {"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::checkMathFunctions","style,warning,c99,c++11"},
+        {"CheckFunctions::checkMissingReturn",""},
+        {"CheckFunctions::checkProhibitedFunctions",""},
+        {"CheckFunctions::invalidFunctionUsage",""},
+        {"CheckFunctions::memsetInvalid2ndParam","warning,portability"},
+        {"CheckFunctions::memsetZeroBytes","warning"},
+        {"CheckFunctions::returnLocalStdMove","performance,c++11"},
+        {"CheckFunctions::useStandardLibrary","style"},
+        {"CheckIO::checkCoutCerrMisusage","c"},
+        {"CheckIO::checkFileUsage",""},
+        {"CheckIO::checkWrongPrintfScanfArguments",""},
+        {"CheckIO::invalidScanf",""},
+        {"CheckLeakAutoVar::check","notclang"},
+        {"CheckMemoryLeakInClass::check",""},
+        {"CheckMemoryLeakInFunction::checkReallocUsage",""},
+        {"CheckMemoryLeakNoVar::check",""},
+        {"CheckMemoryLeakNoVar::checkForUnsafeArgAlloc",""},
+        {"CheckMemoryLeakStructMember::check",""},
+        {"CheckNullPointer::analyseWholeProgram","unusedfunctions"},
+        {"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::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 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++: EXP54-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++: MEM51-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: DCL05-C",""},
+        {"Cert C: DCL06-C",""},
+        {"Cert C: DCL20-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: ERR34-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: EXP20-C",""},
+        {"Cert C: EXP30-C",""},
+        {"Cert C: EXP32-C",""},
+        {"Cert C: EXP34-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: INT17-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: MSC41-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: STR30-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.2",""},
+        {"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.11",""},
+        {"Misra C: 11.2",""},
+        {"Misra C: 11.3",""},
+        {"Misra C: 11.4",""},
+        {"Misra C: 11.5",""},
+        {"Misra C: 11.6",""},
+        {"Misra C: 11.7",""},
+        {"Misra C: 11.8",""},
+        {"Misra C: 11.9",""},
+        {"Misra C: 12.1",""},
+        {"Misra C: 12.2",""},
+        {"Misra C: 12.3",""},
+        {"Misra C: 12.4",""},
+        {"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: 14.1",""},
+        {"Misra C: 14.2",""},
+        {"Misra C: 14.4",""},
+        {"Misra C: 15.1",""},
+        {"Misra C: 15.2",""},
+        {"Misra C: 15.3",""},
+        {"Misra C: 15.4",""},
+        {"Misra C: 15.5",""},
+        {"Misra C: 15.6",""},
+        {"Misra C: 15.7",""},
+        {"Misra C: 16.1",""},
+        {"Misra C: 16.2",""},
+        {"Misra C: 16.3",""},
+        {"Misra C: 16.4",""},
+        {"Misra C: 16.5",""},
+        {"Misra C: 16.6",""},
+        {"Misra C: 16.7",""},
+        {"Misra C: 17.1",""},
+        {"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.6",""},
+        {"Misra C: 17.7",""},
+        {"Misra C: 17.8",""},
+        {"Misra C: 17.9",""},
+        {"Misra C: 18.10",""},
+        {"Misra C: 18.4",""},
+        {"Misra C: 18.5",""},
+        {"Misra C: 18.7",""},
+        {"Misra C: 18.8",""},
+        {"Misra C: 18.9",""},
+        {"Misra C: 19.2",""},
+        {"Misra C: 19.3",""},
+        {"Misra C: 2.2",""},
+        {"Misra C: 2.7",""},
+        {"Misra C: 20.1",""},
+        {"Misra C: 20.10",""},
+        {"Misra C: 20.11",""},
+        {"Misra C: 20.12",""},
+        {"Misra C: 20.13",""},
+        {"Misra C: 20.14",""},
+        {"Misra C: 20.15",""},
+        {"Misra C: 20.2",""},
+        {"Misra C: 20.3",""},
+        {"Misra C: 20.4",""},
+        {"Misra C: 20.5",""},
+        {"Misra C: 20.7",""},
+        {"Misra C: 20.8",""},
+        {"Misra C: 20.9",""},
+        {"Misra C: 21.1",""},
+        {"Misra C: 21.10",""},
+        {"Misra C: 21.11",""},
+        {"Misra C: 21.12",""},
+        {"Misra C: 21.14",""},
+        {"Misra C: 21.15",""},
+        {"Misra C: 21.16",""},
+        {"Misra C: 21.18",""},
+        {"Misra C: 21.19",""},
+        {"Misra C: 21.2",""},
+        {"Misra C: 21.20",""},
+        {"Misra C: 21.21",""},
+        {"Misra C: 21.22",""},
+        {"Misra C: 21.23",""},
+        {"Misra C: 21.24",""},
+        {"Misra C: 21.25","warning"},
+        {"Misra C: 21.26","warning"},
+        {"Misra C: 21.3",""},
+        {"Misra C: 21.4",""},
+        {"Misra C: 21.5",""},
+        {"Misra C: 21.6",""},
+        {"Misra C: 21.7",""},
+        {"Misra C: 21.8",""},
+        {"Misra C: 21.9",""},
+        {"Misra C: 22.10",""},
+        {"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: 22.5",""},
+        {"Misra C: 22.7",""},
+        {"Misra C: 22.8",""},
+        {"Misra C: 22.9",""},
+        {"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: 3.1",""},
+        {"Misra C: 3.2",""},
+        {"Misra C: 4.1",""},
+        {"Misra C: 4.2",""},
+        {"Misra C: 5.1",""},
+        {"Misra C: 5.10",""},
+        {"Misra C: 5.2",""},
+        {"Misra C: 5.3",""},
+        {"Misra C: 5.4",""},
+        {"Misra C: 5.5",""},
+        {"Misra C: 5.6",""},
+        {"Misra C: 5.7",""},
+        {"Misra C: 6.1",""},
+        {"Misra C: 6.2",""},
+        {"Misra C: 6.3",""},
+        {"Misra C: 7.1",""},
+        {"Misra C: 7.2",""},
+        {"Misra C: 7.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.11",""},
+        {"Misra C: 8.12",""},
+        {"Misra C: 8.14",""},
+        {"Misra C: 8.15",""},
+        {"Misra C: 8.16",""},
+        {"Misra C: 8.17",""},
+        {"Misra C: 8.18",""},
+        {"Misra C: 8.19",""},
+        {"Misra C: 8.2",""},
+        {"Misra C: 8.3",""},
+        {"Misra C: 8.4",""},
+        {"Misra C: 8.5",""},
+        {"Misra C: 8.6",""},
+        {"Misra C: 8.7",""},
+        {"Misra C: 8.8",""},
+        {"Misra C: 8.9",""},
+        {"Misra C: 9.2",""},
+        {"Misra C: 9.3",""},
+        {"Misra C: 9.4",""},
+        {"Misra C: 9.5",""},
+        {"Misra C: 9.6",""},
+        {"Misra C: 9.7",""},
+        {"Misra C: Dir 1.2",""},
+        {"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.7",""},
+        {"Misra C: Dir 4.9",""},
+        {"PremiumCheckBufferOverrun::addressOfPointerArithmetic","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"},
+        {"PremiumMetrics::HIS::Call",""},
+        {"PremiumMetrics::HIS::Calling",""},
+        {"PremiumMetrics::HIS::Comment",""},
+        {"PremiumMetrics::HIS::Goto",""},
+        {"PremiumMetrics::HIS::Level",""},
+        {"PremiumMetrics::HIS::Param",""},
+        {"PremiumMetrics::HIS::Path",""},
+        {"PremiumMetrics::HIS::Stmt",""},
+        {"PremiumMetrics::HIS::StmtFile",""},
+        {"PremiumMetrics::HIS::VOCF",""},
+        {"PremiumMetrics::HIS::return",""},
+        {"PremiumMetrics::cyclomaticComplexity",""},
+    };
+
+    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::vector<MisraInfo> misraC2025Directives{
+        {1,1,Req,0},
+        {1,2,Adv,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> misraC2025Rules{
+        {1,1,Req,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},
+        {5,10,Req,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},
+        {8,18,Req,0},
+        {8,19,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,Req,0},
+        {11,5,Adv,0},
+        {11,6,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,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,Dis,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,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},
+        {19,3,Req,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},
+        {20,15,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::vector<MisraCppInfo> misraCpp2008Rules =
+    {
+        {0,1,1,Req},
+        {0,1,2,Req},
+        {0,1,3,Req},
+        {0,1,4,Req},
+        {0,1,5,Req},
+        {0,1,6,Req},
+        {0,1,7,Req},
+        {0,1,8,Req},
+        {0,1,9,Req},
+        {0,1,10,Req},
+        {0,1,11,Req},
+        {0,1,12,Req},
+        {0,2,1,Req},
+        {0,3,1,Doc},
+        {0,3,2,Req},
+        {0,4,1,Doc},
+        {0,4,2,Doc},
+        {0,4,3,Doc},
+        {1,0,1,Req},
+        {1,0,2,Doc},
+        {1,0,3,Doc},
+        {2,2,1,Doc},
+        {2,3,1,Req},
+        {2,5,1,Adv},
+        {2,7,1,Req},
+        {2,7,2,Req},
+        {2,7,3,Adv},
+        {2,10,1,Req},
+        {2,10,2,Req},
+        {2,10,3,Req},
+        {2,10,4,Req},
+        {2,10,5,Adv},
+        {2,10,6,Req},
+        {2,13,1,Req},
+        {2,13,2,Req},
+        {2,13,3,Req},
+        {2,13,4,Req},
+        {2,13,5,Req},
+        {3,1,1,Req},
+        {3,1,2,Req},
+        {3,1,3,Req},
+        {3,2,1,Req},
+        {3,2,2,Req},
+        {3,2,3,Req},
+        {3,2,4,Req},
+        {3,3,1,Req},
+        {3,3,2,Req},
+        {3,4,1,Req},
+        {3,9,1,Req},
+        {3,9,2,Adv},
+        {3,9,3,Req},
+        {4,5,1,Req},
+        {4,5,2,Req},
+        {4,5,3,Req},
+        {4,10,1,Req},
+        {4,10,2,Req},
+        {5,0,1,Req},
+        {5,0,2,Adv},
+        {5,0,3,Req},
+        {5,0,4,Req},
+        {5,0,5,Req},
+        {5,0,6,Req},
+        {5,0,7,Req},
+        {5,0,8,Req},
+        {5,0,9,Req},
+        {5,0,10,Req},
+        {5,0,11,Req},
+        {5,0,12,Req},
+        {5,0,13,Req},
+        {5,0,14,Req},
+        {5,0,15,Req},
+        {5,0,16,Req},
+        {5,0,17,Req},
+        {5,0,18,Req},
+        {5,0,19,Req},
+        {5,0,20,Req},
+        {5,0,21,Req},
+        {5,2,1,Req},
+        {5,2,2,Req},
+        {5,2,3,Adv},
+        {5,2,4,Req},
+        {5,2,5,Req},
+        {5,2,6,Req},
+        {5,2,7,Req},
+        {5,2,8,Req},
+        {5,2,9,Adv},
+        {5,2,10,Adv},
+        {5,2,11,Req},
+        {5,2,12,Req},
+        {5,3,1,Req},
+        {5,3,2,Req},
+        {5,3,3,Req},
+        {5,3,4,Req},
+        {5,8,1,Req},
+        {5,14,1,Req},
+        {5,17,1,Req},
+        {5,18,1,Req},
+        {5,19,1,Adv},
+        {6,2,1,Req},
+        {6,2,2,Req},
+        {6,2,3,Req},
+        {6,3,1,Req},
+        {6,4,1,Req},
+        {6,4,2,Req},
+        {6,4,3,Req},
+        {6,4,4,Req},
+        {6,4,5,Req},
+        {6,4,6,Req},
+        {6,4,7,Req},
+        {6,4,8,Req},
+        {6,5,1,Req},
+        {6,5,2,Req},
+        {6,5,3,Req},
+        {6,5,4,Req},
+        {6,5,5,Req},
+        {6,5,6,Req},
+        {6,6,1,Req},
+        {6,6,2,Req},
+        {6,6,3,Req},
+        {6,6,4,Req},
+        {6,6,5,Req},
+        {7,1,1,Req},
+        {7,1,2,Req},
+        {7,2,1,Req},
+        {7,3,1,Req},
+        {7,3,2,Req},
+        {7,3,3,Req},
+        {7,3,4,Req},
+        {7,3,5,Req},
+        {7,3,6,Req},
+        {7,4,1,Doc},
+        {7,4,2,Req},
+        {7,4,3,Req},
+        {7,5,1,Req},
+        {7,5,2,Req},
+        {7,5,3,Req},
+        {7,5,4,Adv},
+        {8,4,1,Req},
+        {8,4,2,Req},
+        {8,4,3,Req},
+        {8,4,4,Req},
+        {8,5,1,Req},
+        {8,5,2,Req},
+        {8,5,3,Req},
+        {9,3,1,Req},
+        {9,3,2,Req},
+        {9,3,3,Req},
+        {9,5,1,Req},
+        {9,6,1,Doc},
+        {9,6,2,Req},
+        {9,6,3,Req},
+        {9,6,4,Req},
+        {10,1,1,Adv},
+        {10,1,2,Req},
+        {10,1,3,Req},
+        {10,2,1,Adv},
+        {10,3,1,Req},
+        {10,3,2,Req},
+        {10,3,3,Req},
+        {11,0,1,Req},
+        {12,1,1,Req},
+        {12,1,2,Adv},
+        {12,1,3,Req},
+        {12,8,1,Req},
+        {12,8,2,Req},
+        {14,5,1,Req},
+        {14,5,2,Req},
+        {14,5,3,Req},
+        {14,6,1,Req},
+        {14,6,2,Req},
+        {14,7,1,Req},
+        {14,7,2,Req},
+        {14,7,3,Req},
+        {14,8,1,Req},
+        {14,8,2,Req},
+        {15,0,1,Req},
+        {15,0,2,Req},
+        {15,0,3,Req},
+        {15,1,1,Req},
+        {15,1,2,Req},
+        {15,1,3,Req},
+        {15,3,1,Req},
+        {15,3,2,Adv},
+        {15,3,3,Req},
+        {15,3,4,Req},
+        {15,3,5,Req},
+        {15,3,6,Req},
+        {15,3,7,Req},
+        {15,4,1,Req},
+        {15,5,1,Req},
+        {15,5,2,Req},
+        {15,5,3,Req},
+        {16,0,1,Req},
+        {16,0,2,Req},
+        {16,0,3,Req},
+        {16,0,4,Req},
+        {16,0,5,Req},
+        {16,0,6,Req},
+        {16,0,7,Req},
+        {16,0,8,Req},
+        {16,1,1,Req},
+        {16,1,2,Req},
+        {16,2,1,Req},
+        {16,2,2,Req},
+        {16,2,3,Req},
+        {16,2,4,Req},
+        {16,2,5,Adv},
+        {16,2,6,Req},
+        {16,3,1,Req},
+        {16,3,2,Adv},
+        {16,6,1,Doc},
+        {17,0,1,Req},
+        {17,0,2,Req},
+        {17,0,3,Req},
+        {17,0,4,Doc},
+        {17,0,5,Req},
+        {18,0,1,Req},
+        {18,0,2,Req},
+        {18,0,3,Req},
+        {18,0,4,Req},
+        {18,0,5,Req},
+        {18,2,1,Req},
+        {18,4,1,Req},
+        {18,7,1,Req},
+        {19,3,1,Req},
+        {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},
+        {0,0,2,Adv},
+        {0,1,1,Adv},
+        {0,1,2,Req},
+        {0,2,1,Adv},
+        {0,2,2,Req},
+        {0,2,3,Adv},
+        {0,2,4,Adv},
+        {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,3,Req},
+        {5,10,1,Req},
+        {5,13,1,Req},
+        {5,13,2,Req},
+        {5,13,3,Req},
+        {5,13,4,Req},
+        {5,13,5,Req},
+        {5,13,6,Req},
+        {5,13,7,Req},
+        {6,0,1,Req},
+        {6,0,2,Adv},
+        {6,0,3,Adv},
+        {6,0,4,Req},
+        {6,2,1,Req},
+        {6,2,2,Req},
+        {6,2,3,Req},
+        {6,2,4,Req},
+        {6,4,1,Req},
+        {6,4,2,Req},
+        {6,4,3,Req},
+        {6,5,1,Adv},
+        {6,5,2,Adv},
+        {6,7,1,Req},
+        {6,7,2,Req},
+        {6,8,1,Req},
+        {6,8,2,Man},
+        {6,8,3,Req},
+        {6,8,4,Adv},
+        {6,9,1,Req},
+        {6,9,2,Adv},
+        {7,0,1,Req},
+        {7,0,2,Req},
+        {7,0,3,Req},
+        {7,0,4,Req},
+        {7,0,5,Req},
+        {7,0,6,Req},
+        {7,11,1,Req},
+        {7,11,2,Req},
+        {7,11,3,Req},
+        {8,0,1,Adv},
+        {8,1,1,Req},
+        {8,1,2,Adv},
+        {8,2,1,Req},
+        {8,2,2,Req},
+        {8,2,3,Req},
+        {8,2,4,Req},
+        {8,2,5,Req},
+        {8,2,6,Req},
+        {8,2,7,Adv},
+        {8,2,8,Req},
+        {8,2,9,Req},
+        {8,2,10,Req},
+        {8,2,11,Req},
+        {8,3,1,Adv},
+        {8,3,2,Adv},
+        {8,7,1,Req},
+        {8,7,2,Req},
+        {8,9,1,Req},
+        {8,14,1,Adv},
+        {8,18,1,Man},
+        {8,18,2,Adv},
+        {8,19,1,Adv},
+        {8,20,1,Adv},
+        {9,2,1,Req},
+        {9,3,1,Req},
+        {9,4,1,Req},
+        {9,4,2,Req},
+        {9,5,2,Adv},
+        {9,5,3,Req},
+        {9,6,1,Adv},
+        {9,6,2,Req},
+        {9,6,3,Req},
+        {9,6,4,Req},
+        {9,6,5,Req},
+        {10,0,1,Adv},
+        {10,1,1,Adv},
+        {10,1,2,Req},
+        {10,2,1,Req},
+        {10,2,2,Adv},
+        {10,2,3,Req},
+        {10,3,1,Adv},
+        {10,4,1,Req},
+        {11,3,1,Adv},
+        {11,3,2,Adv},
+        {11,6,1,Adv},
+        {11,6,2,Man},
+        {11,6,3,Req},
+        {12,2,1,Adv},
+        {12,2,2,Req},
+        {12,2,3,Req},
+        {12,3,1,Req},
+        {13,1,1,Adv},
+        {13,1,2,Req},
+        {13,3,1,Req},
+        {13,3,2,Req},
+        {13,3,3,Req},
+        {13,3,4,Req},
+        {14,1,1,Adv},
+        {15,0,1,Req},
+        {15,0,2,Adv},
+        {15,1,1,Req},
+        {15,1,2,Adv},
+        {15,1,3,Req},
+        {15,1,4,Adv},
+        {15,1,5,Req},
+        {16,5,2,Req},
+        {16,6,1,Adv},
+        {17,8,1,Req},
+        {18,1,1,Req},
+        {18,1,2,Req},
+        {18,3,1,Adv},
+        {18,3,2,Req},
+        {18,3,3,Req},
+        {18,4,1,Req},
+        {18,5,1,Adv},
+        {18,5,2,Adv},
+        {19,0,1,Req},
+        {19,0,2,Req},
+        {19,0,3,Adv},
+        {19,0,4,Adv},
+        {19,1,1,Req},
+        {19,1,2,Req},
+        {19,1,3,Req},
+        {19,2,1,Req},
+        {19,2,2,Req},
+        {19,2,3,Req},
+        {19,3,1,Adv},
+        {19,3,2,Req},
+        {19,3,3,Req},
+        {19,3,4,Req},
+        {19,3,5,Req},
+        {19,6,1,Adv},
+        {21,2,1,Req},
+        {21,2,2,Req},
+        {21,2,3,Req},
+        {21,2,4,Req},
+        {21,6,1,Adv},
+        {21,6,2,Req},
+        {21,6,3,Req},
+        {21,6,4,Req},
+        {21,6,5,Req},
+        {21,10,1,Req},
+        {21,10,2,Req},
+        {21,10,3,Req},
+        {22,3,1,Req},
+        {22,4,1,Req},
+        {23,11,1,Adv},
+        {24,5,1,Req},
+        {24,5,2,Req},
+        {25,5,1,Req},
+        {25,5,2,Man},
+        {25,5,3,Man},
+        {26,3,1,Adv},
+        {28,3,1,Req},
+        {28,6,1,Req},
+        {28,6,2,Req},
+        {28,6,3,Req},
+        {28,6,4,Req},
+        {30,0,1,Req},
+        {30,0,2,Req}
+    };
+}
+
+std::vector<checkers::Info> checkers::autosarInfo{
+    {"m0-1-1", checkers::Req},
+    {"m0-1-2", checkers::Req},
+    {"m0-1-3", checkers::Req},
+    {"m0-1-4", checkers::Req},
+    {"a0-1-1", checkers::Req},
+    {"a0-1-2", checkers::Req},
+    {"m0-1-8", checkers::Req},
+    {"m0-1-9", checkers::Req},
+    {"m0-1-10", checkers::Adv},
+    {"a0-1-3", checkers::Req},
+    {"a0-1-4", checkers::Req},
+    {"a0-1-5", checkers::Req},
+    {"a0-1-6", checkers::Adv},
+    {"m0-2-1", checkers::Req},
+    {"a0-4-2", checkers::Req},
+    {"a0-4-3", checkers::Req},
+    {"a0-4-4", checkers::Req},
+    {"a1-1-1", checkers::Req},
+    {"a1-4-3", checkers::Adv},
+    {"a2-3-1", checkers::Req},
+    {"a2-5-1", checkers::Req},
+    {"a2-5-2", checkers::Req},
+    {"m2-7-1", checkers::Req},
+    {"a2-7-1", checkers::Req},
+    {"a2-7-3", checkers::Req},
+    {"a2-8-2", checkers::Adv},
+    {"m2-10-1", checkers::Req},
+    {"a2-10-1", checkers::Req},
+    {"a2-10-6", checkers::Req},
+    {"a2-10-4", checkers::Req},
+    {"a2-10-5", checkers::Adv},
+    {"a2-11-1", checkers::Req},
+    {"a2-13-1", checkers::Req},
+    {"a2-13-6", checkers::Req},
+    {"a2-13-5", checkers::Adv},
+    {"m2-13-2", checkers::Req},
+    {"m2-13-3", checkers::Req},
+    {"m2-13-4", checkers::Req},
+    {"a2-13-2", checkers::Req},
+    {"a2-13-3", checkers::Req},
+    {"a2-13-4", checkers::Req},
+    {"a3-1-1", checkers::Req},
+    {"a3-1-2", checkers::Req},
+    {"a3-1-3", checkers::Adv},
+    {"m3-1-2", checkers::Req},
+    {"a3-1-4", checkers::Req},
+    {"a3-1-6", checkers::Adv},
+    {"m3-2-1", checkers::Req},
+    {"m3-2-2", checkers::Req},
+    {"m3-2-3", checkers::Req},
+    {"m3-2-4", checkers::Req},
+    {"a3-3-1", checkers::Req},
+    {"a3-3-2", checkers::Req},
+    {"m3-3-2", checkers::Req},
+    {"m3-4-1", checkers::Req},
+    {"m3-9-1", checkers::Req},
+    {"a3-9-1", checkers::Req},
+    {"m3-9-3", checkers::Req},
+    {"m4-5-1", checkers::Req},
+    {"a4-5-1", checkers::Req},
+    {"m4-5-3", checkers::Req},
+    {"a4-7-1", checkers::Req},
+    {"m4-10-1", checkers::Req},
+    {"a4-10-1", checkers::Req},
+    {"m4-10-2", checkers::Req},
+    {"a5-0-1", checkers::Req},
+    {"m5-0-2", checkers::Adv},
+    {"m5-0-3", checkers::Req},
+    {"m5-0-4", checkers::Req},
+    {"m5-0-5", checkers::Req},
+    {"m5-0-6", checkers::Req},
+    {"m5-0-7", checkers::Req},
+    {"m5-0-8", checkers::Req},
+    {"m5-0-9", checkers::Req},
+    {"m5-0-10", checkers::Req},
+    {"m5-0-11", checkers::Req},
+    {"m5-0-12", checkers::Req},
+    {"a5-0-2", checkers::Req},
+    {"m5-0-14", checkers::Req},
+    {"m5-0-15", checkers::Req},
+    {"m5-0-16", checkers::Req},
+    {"m5-0-17", checkers::Req},
+    {"a5-0-4", checkers::Req},
+    {"m5-0-18", checkers::Req},
+    {"a5-0-3", checkers::Req},
+    {"m5-0-20", checkers::Req},
+    {"m5-0-21", checkers::Req},
+    {"a5-1-1", checkers::Req},
+    {"a5-1-2", checkers::Req},
+    {"a5-1-3", checkers::Req},
+    {"a5-1-4", checkers::Req},
+    {"a5-1-6", checkers::Adv},
+    {"a5-1-7", checkers::Req},
+    {"a5-1-8", checkers::Adv},
+    {"a5-1-9", checkers::Adv},
+    {"m5-2-2", checkers::Req},
+    {"m5-2-3", checkers::Adv},
+    {"a5-2-1", checkers::Adv},
+    {"a5-2-2", checkers::Req},
+    {"a5-2-3", checkers::Req},
+    {"m5-2-6", checkers::Req},
+    {"a5-2-4", checkers::Req},
+    {"a5-2-6", checkers::Req},
+    {"m5-2-8", checkers::Req},
+    {"m5-2-9", checkers::Req},
+    {"m5-2-10", checkers::Req},
+    {"m5-2-11", checkers::Req},
+    {"a5-2-5", checkers::Req},
+    {"m5-2-12", checkers::Req},
+    {"m5-3-1", checkers::Req},
+    {"m5-3-2", checkers::Req},
+    {"m5-3-3", checkers::Req},
+    {"m5-3-4", checkers::Req},
+    {"a5-3-1", checkers::Req},
+    {"a5-3-2", checkers::Req},
+    {"a5-3-3", checkers::Req},
+    {"a5-5-1", checkers::Req},
+    {"a5-6-1", checkers::Req},
+    {"m5-8-1", checkers::Req},
+    {"a5-10-1", checkers::Req},
+    {"m5-14-1", checkers::Req},
+    {"a5-16-1", checkers::Req},
+    {"m5-18-1", checkers::Req},
+    {"m5-19-1", checkers::Req},
+    {"m6-2-1", checkers::Req},
+    {"a6-2-1", checkers::Req},
+    {"a6-2-2", checkers::Req},
+    {"m6-2-2", checkers::Req},
+    {"m6-2-3", checkers::Req},
+    {"m6-3-1", checkers::Req},
+    {"m6-4-1", checkers::Req},
+    {"m6-4-2", checkers::Req},
+    {"m6-4-3", checkers::Req},
+    {"m6-4-4", checkers::Req},
+    {"m6-4-5", checkers::Req},
+    {"m6-4-6", checkers::Req},
+    {"m6-4-7", checkers::Req},
+    {"a6-4-1", checkers::Req},
+    {"a6-5-1", checkers::Req},
+    {"a6-5-2", checkers::Req},
+    {"m6-5-2", checkers::Req},
+    {"m6-5-3", checkers::Req},
+    {"m6-5-4", checkers::Req},
+    {"m6-5-5", checkers::Req},
+    {"m6-5-6", checkers::Req},
+    {"a6-5-3", checkers::Adv},
+    {"a6-5-4", checkers::Adv},
+    {"a6-6-1", checkers::Req},
+    {"m6-6-1", checkers::Req},
+    {"m6-6-2", checkers::Req},
+    {"m6-6-3", checkers::Req},
+    {"a7-1-1", checkers::Req},
+    {"a7-1-2", checkers::Req},
+    {"m7-1-2", checkers::Req},
+    {"a7-1-3", checkers::Req},
+    {"a7-1-4", checkers::Req},
+    {"a7-1-5", checkers::Req},
+    {"a7-1-6", checkers::Req},
+    {"a7-1-7", checkers::Req},
+    {"a7-1-8", checkers::Req},
+    {"a7-1-9", checkers::Req},
+    {"a7-2-1", checkers::Req},
+    {"a7-2-2", checkers::Req},
+    {"a7-2-3", checkers::Req},
+    {"a7-2-4", checkers::Req},
+    {"m7-3-1", checkers::Req},
+    {"m7-3-2", checkers::Req},
+    {"m7-3-3", checkers::Req},
+    {"m7-3-4", checkers::Req},
+    {"a7-3-1", checkers::Req},
+    {"m7-3-6", checkers::Req},
+    {"a7-4-1", checkers::Req},
+    {"m7-4-2", checkers::Req},
+    {"m7-4-3", checkers::Req},
+    {"a7-5-1", checkers::Req},
+    {"a7-5-2", checkers::Req},
+    {"a7-6-1", checkers::Req},
+    {"m8-0-1", checkers::Req},
+    {"a8-2-1", checkers::Req},
+    {"m8-3-1", checkers::Req},
+    {"a8-4-1", checkers::Req},
+    {"m8-4-2", checkers::Req},
+    {"a8-4-2", checkers::Req},
+    {"m8-4-4", checkers::Req},
+    {"a8-4-4", checkers::Adv},
+    {"a8-4-5", checkers::Req},
+    {"a8-4-6", checkers::Req},
+    {"a8-4-7", checkers::Req},
+    {"a8-4-8", checkers::Req},
+    {"a8-4-9", checkers::Req},
+    {"a8-4-10", checkers::Req},
+    {"a8-4-11", checkers::Req},
+    {"a8-4-12", checkers::Req},
+    {"a8-4-13", checkers::Req},
+    {"a8-4-14", checkers::Req},
+    {"a8-5-0", checkers::Req},
+    {"a8-5-1", checkers::Req},
+    {"m8-5-2", checkers::Req},
+    {"a8-5-2", checkers::Req},
+    {"a8-5-3", checkers::Req},
+    {"a8-5-4", checkers::Adv},
+    {"m9-3-1", checkers::Req},
+    {"a9-3-1", checkers::Req},
+    {"m9-3-3", checkers::Req},
+    {"a9-5-1", checkers::Req},
+    {"a9-6-1", checkers::Req},
+    {"m9-6-4", checkers::Req},
+    {"a10-1-1", checkers::Req},
+    {"m10-1-1", checkers::Adv},
+    {"m10-1-2", checkers::Req},
+    {"m10-1-3", checkers::Req},
+    {"m10-2-1", checkers::Adv},
+    {"a10-2-1", checkers::Req},
+    {"a10-3-1", checkers::Req},
+    {"a10-3-2", checkers::Req},
+    {"a10-3-3", checkers::Req},
+    {"a10-3-5", checkers::Req},
+    {"m10-3-3", checkers::Req},
+    {"a10-4-1", checkers::Req},
+    {"m11-0-1", checkers::Req},
+    {"a11-0-1", checkers::Adv},
+    {"a11-0-2", checkers::Req},
+    {"a11-3-1", checkers::Req},
+    {"a12-0-1", checkers::Req},
+    {"a12-0-2", checkers::Req},
+    {"a12-1-1", checkers::Req},
+    {"m12-1-1", checkers::Req},
+    {"a12-1-2", checkers::Req},
+    {"a12-1-3", checkers::Req},
+    {"a12-1-4", checkers::Req},
+    {"a12-1-5", checkers::Req},
+    {"a12-1-6", checkers::Req},
+    {"a12-4-1", checkers::Req},
+    {"a12-4-2", checkers::Adv},
+    {"a12-6-1", checkers::Req},
+    {"a12-7-1", checkers::Req},
+    {"a12-8-1", checkers::Req},
+    {"a12-8-2", checkers::Adv},
+    {"a12-8-3", checkers::Req},
+    {"a12-8-4", checkers::Req},
+    {"a12-8-5", checkers::Req},
+    {"a12-8-6", checkers::Req},
+    {"a12-8-7", checkers::Adv},
+    {"a13-1-2", checkers::Req},
+    {"a13-1-3", checkers::Req},
+    {"a13-2-1", checkers::Req},
+    {"a13-2-2", checkers::Req},
+    {"a13-2-3", checkers::Req},
+    {"a13-3-1", checkers::Req},
+    {"a13-5-1", checkers::Req},
+    {"a13-5-2", checkers::Req},
+    {"a13-5-3", checkers::Adv},
+    {"a13-5-4", checkers::Req},
+    {"a13-5-5", checkers::Req},
+    {"a13-6-1", checkers::Req},
+    {"a14-1-1", checkers::Adv},
+    {"a14-5-1", checkers::Req},
+    {"a14-5-2", checkers::Req},
+    {"a14-5-3", checkers::Req},
+    {"m14-5-3", checkers::Req},
+    {"m14-6-1", checkers::Req},
+    {"a14-7-1", checkers::Req},
+    {"a14-7-2", checkers::Req},
+    {"a14-8-2", checkers::Req},
+    {"a15-0-2", checkers::Req},
+    {"a15-1-2", checkers::Req},
+    {"m15-0-3", checkers::Req},
+    {"m15-1-1", checkers::Req},
+    {"m15-1-2", checkers::Req},
+    {"m15-1-3", checkers::Req},
+    {"a15-1-3", checkers::Adv},
+    {"a15-1-4", checkers::Req},
+    {"a15-2-1", checkers::Req},
+    {"a15-2-2", checkers::Req},
+    {"m15-3-1", checkers::Req},
+    {"a15-3-2", checkers::Req},
+    {"a15-3-3", checkers::Req},
+    {"m15-3-3", checkers::Req},
+    {"m15-3-4", checkers::Req},
+    {"a15-3-5", checkers::Req},
+    {"m15-3-6", checkers::Req},
+    {"m15-3-7", checkers::Req},
+    {"a15-4-1", checkers::Req},
+    {"a15-4-2", checkers::Req},
+    {"a15-4-3", checkers::Req},
+    {"a15-4-4", checkers::Req},
+    {"a15-4-5", checkers::Req},
+    {"a15-5-1", checkers::Req},
+    {"a15-5-2", checkers::Req},
+    {"a15-5-3", checkers::Req},
+    {"a16-0-1", checkers::Req},
+    {"m16-0-1", checkers::Req},
+    {"m16-0-2", checkers::Req},
+    {"m16-0-5", checkers::Req},
+    {"m16-0-6", checkers::Req},
+    {"m16-0-7", checkers::Req},
+    {"m16-0-8", checkers::Req},
+    {"m16-1-1", checkers::Req},
+    {"m16-1-2", checkers::Req},
+    {"m16-2-3", checkers::Req},
+    {"a16-2-1", checkers::Req},
+    {"a16-2-2", checkers::Req},
+    {"a16-2-3", checkers::Req},
+    {"m16-3-1", checkers::Req},
+    {"m16-3-2", checkers::Adv},
+    {"a16-6-1", checkers::Req},
+    {"a16-7-1", checkers::Req},
+    {"a17-0-1", checkers::Req},
+    {"m17-0-2", checkers::Req},
+    {"m17-0-3", checkers::Req},
+    {"m17-0-5", checkers::Req},
+    {"a17-1-1", checkers::Req},
+    {"a17-6-1", checkers::Req},
+    {"a18-0-1", checkers::Req},
+    {"a18-0-2", checkers::Req},
+    {"m18-0-3", checkers::Req},
+    {"m18-0-4", checkers::Req},
+    {"m18-0-5", checkers::Req},
+    {"a18-0-3", checkers::Req},
+    {"a18-1-1", checkers::Req},
+    {"a18-1-2", checkers::Req},
+    {"a18-1-3", checkers::Req},
+    {"a18-1-4", checkers::Req},
+    {"a18-1-6", checkers::Req},
+    {"m18-2-1", checkers::Req},
+    {"a18-5-1", checkers::Req},
+    {"a18-5-2", checkers::Req},
+    {"a18-5-3", checkers::Req},
+    {"a18-5-4", checkers::Req},
+    {"a18-5-5", checkers::Req},
+    {"a18-5-6", checkers::Req},
+    {"a18-5-7", checkers::Req},
+    {"a18-5-8", checkers::Req},
+    {"a18-5-9", checkers::Req},
+    {"a18-5-10", checkers::Req},
+    {"a18-5-11", checkers::Req},
+    {"m18-7-1", checkers::Req},
+    {"a18-9-1", checkers::Req},
+    {"a18-9-2", checkers::Req},
+    {"a18-9-3", checkers::Req},
+    {"a18-9-4", checkers::Req},
+    {"m19-3-1", checkers::Req},
+    {"a20-8-1", checkers::Req},
+    {"a20-8-2", checkers::Req},
+    {"a20-8-3", checkers::Req},
+    {"a20-8-4", checkers::Req},
+    {"a20-8-5", checkers::Req},
+    {"a20-8-6", checkers::Req},
+    {"a20-8-7", checkers::Req},
+    {"a21-8-1", checkers::Req},
+    {"a23-0-1", checkers::Req},
+    {"a23-0-2", checkers::Req},
+    {"a25-1-1", checkers::Req},
+    {"a25-4-1", checkers::Req},
+    {"a26-5-1", checkers::Req},
+    {"a26-5-2", checkers::Req},
+    {"m27-0-1", checkers::Req},
+    {"a27-0-1", checkers::Req},
+    {"a27-0-4", checkers::Req},
+    {"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", "L2"},
+    {"EXP30-C", "L2"},
+    {"EXP32-C", "L2"},
+    {"EXP33-C", "L1"},
+    {"EXP34-C", "L1"},
+    {"EXP35-C", "L2"},
+    {"EXP36-C", "L3"},
+    {"EXP37-C", "L3"},
+    {"EXP39-C", "L2"},
+    {"EXP40-C", "L3"},
+    {"EXP42-C", "L1"},
+    {"EXP43-C", "L3"},
+    {"EXP44-C", "L3"},
+    {"EXP45-C", "L2"},
+    {"EXP46-C", "L2"},
+    {"EXP47-C", "L2"},
+    {"INT30-C", "L2"},
+    {"INT31-C", "L1"},
+    {"INT32-C", "L1"},
+    {"INT33-C", "L2"},
+    {"INT34-C", "L3"},
+    {"INT35-C", "L3"},
+    {"INT36-C", "L3"},
+    {"FLP30-C", "L2"},
+    {"FLP32-C", "L1"},
+    {"FLP34-C", "L3"},
+    {"FLP36-C", "L3"},
+    {"FLP37-C", "L3"},
+    {"ARR30-C", "L2"},
+    {"ARR32-C", "L2"},
+    {"ARR36-C", "L3"},
+    {"ARR37-C", "L2"},
+    {"ARR38-C", "L2"},
+    {"ARR39-C", "L2"},
+    {"STR30-C", "L2"},
+    {"STR31-C", "L2"},
+    {"STR32-C", "L1"},
+    {"STR34-C", "L2"},
+    {"STR37-C", "L3"},
+    {"STR38-C", "L1"},
+    {"MEM30-C", "L2"},
+    {"MEM31-C", "L3"},
+    {"MEM33-C", "L3"},
+    {"MEM34-C", "L2"},
+    {"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", "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", "L1"},
+    {"SIG34-C", "L3"},
+    {"SIG35-C", "L3"},
+    {"ERR30-C", "L1"},
+    {"ERR32-C", "L3"},
+    {"ERR33-C", "L1"},
+    {"ERR34-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"},
+    {"MSC30-C", "L3"},
+    {"MSC32-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"},
+    {"WIN30-C", "L3"},
+    // Recommendations
+    {"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"},
+    {"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"},
+    {"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"},
+    {"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"},
+    {"FLP00-C", "L3"},
+    {"FLP01-C", "L3"},
+    {"FLP02-C", "L3"},
+    {"FLP03-C", "L3"},
+    {"FLP04-C", "L3"},
+    {"FLP05-C", "L3"},
+    {"FLP06-C", "L3"},
+    {"FLP07-C", "L3"},
+    {"ARR00-C", "L2"},
+    {"ARR01-C", "L1"},
+    {"ARR02-C", "L2"},
+    {"STR00-C", "L3"},
+    {"STR01-C", "L3"},
+    {"STR02-C", "L2"},
+    {"STR03-C", "L3"},
+    {"STR04-C", "L3"},
+    {"STR05-C", "L3"},
+    {"STR06-C", "L2"},
+    {"STR08-C", "L2"},
+    {"STR09-C", "L3"},
+    {"STR10-C", "L3"},
+    {"STR11-C", "L2"},
+    {"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"},
+    {"ENV01-C", "L2"},
+    {"ENV02-C", "L3"},
+    {"ENV03-C", "L2"},
+    {"SIG00-C", "L2"},
+    {"SIG01-C", "L3"},
+    {"SIG02-C", "L2"},
+    {"ERR00-C", "L3"},
+    {"ERR01-C", "L2"},
+    {"ERR02-C", "L3"},
+    {"ERR04-C", "L3"},
+    {"ERR05-C", "L2"},
+    {"ERR06-C", "L3"},
+    {"ERR07-C", "L1"},
+    {"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"},
+    {"CON01-C", "L3"},
+    {"CON02-C", "L3"},
+    {"CON04-C", "L3"},
+    {"CON05-C", "L3"},
+    {"CON06-C", "L3"},
+    {"CON07-C", "L2"},
+    {"CON08-C", "L3"},
+    {"CON09-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"},
+    {"WIN00-C", "L2"},
+    {"WIN01-C", "L1"},
+    {"WIN02-C", "L1"},
+    {"WIN03-C", "L3"},
+    {"WIN04-C", "L3"},
+};
+
+std::vector<checkers::Info> checkers::certCppInfo{
+    {"DCL50-CPP", "L1"},
+    {"DCL51-CPP", "L3"},
+    {"DCL52-CPP", "L3"},
+    {"DCL53-CPP", "L3"},
+    {"DCL54-CPP", "L3"},
+    {"DCL55-CPP", "L3"},
+    {"DCL56-CPP", "L3"},
+    {"DCL57-CPP", "L2"},
+    {"DCL58-CPP", "L2"},
+    {"DCL59-CPP", "L3"},
+    {"DCL60-CPP", "L2"},
+    {"EXP50-CPP", "L2"},
+    {"EXP51-CPP", "L3"},
+    {"EXP52-CPP", "L3"},
+    {"EXP53-CPP", "L1"},
+    {"EXP54-CPP", "L2"},
+    {"EXP55-CPP", "L3"},
+    {"EXP56-CPP", "L3"},
+    {"EXP57-CPP", "L3"},
+    {"EXP58-CPP", "L3"},
+    {"EXP59-CPP", "L3"},
+    {"EXP60-CPP", "L2"},
+    {"EXP61-CPP", "L2"},
+    {"EXP62-CPP", "L1"},
+    {"EXP63-CPP", "L2"},
+    {"INT50-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"},
+    {"STR50-CPP", "L2"},
+    {"STR51-CPP", "L1"},
+    {"STR52-CPP", "L2"},
+    {"STR53-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"},
+    {"FIO50-CPP", "L2"},
+    {"FIO51-CPP", "L3"},
+    {"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"},
+    {"OOP50-CPP", "L3"},
+    {"OOP51-CPP", "L3"},
+    {"OOP52-CPP", "L3"},
+    {"OOP53-CPP", "L2"},
+    {"OOP54-CPP", "L3"},
+    {"OOP55-CPP", "L2"},
+    {"OOP56-CPP", "L3"},
+    {"OOP57-CPP", "L1"},
+    {"OOP58-CPP", "L2"},
+    {"CON50-CPP", "L3"},
+    {"CON51-CPP", "L2"},
+    {"CON52-CPP", "L3"},
+    {"CON53-CPP", "L3"},
+    {"CON54-CPP", "L3"},
+    {"CON55-CPP", "L3"},
+    {"CON56-CPP", "L3"},
+    {"MSC50-CPP", "L3"},
+    {"MSC51-CPP", "L1"},
+    {"MSC52-CPP", "L2"},
+    {"MSC53-CPP", "L3"},
+    {"MSC54-CPP", "L2"},
+};
+
diff --git a/lib/checkers.h b/lib/checkers.h
new file mode 100644
index 00000000000..a9329d6c08f
--- /dev/null
+++ b/lib/checkers.h
@@ -0,0 +1,94 @@
+/* -*- 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 checkersH
+#define checkersH
+
+#include <map>
+#include <string>
+#include <vector>
+#include <cstdint>
+
+#include "config.h"
+
+enum class ReportType : std::uint8_t {
+    normal = 0,
+    autosar = 1,
+    certC = 2,
+    certCpp = 3,
+    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;
+        int b;
+        const char* str;
+        int amendment;
+    };
+
+    struct CPPCHECKLIB MisraCppInfo {
+        int a;
+        int b;
+        int c;
+        const char* classification;
+    };
+
+    extern CPPCHECKLIB const char Req[]; // = "Required";
+    extern CPPCHECKLIB const char Adv[]; // = "Advisory";
+    extern CPPCHECKLIB const char Man[]; // = "Mandatory";
+    extern CPPCHECKLIB const char Doc[]; // = "Document";
+
+    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;
+
+    struct CPPCHECKLIB IdMapping {
+        const char* guideline;
+        const char* cppcheckId;
+    };
+    extern std::vector<IdMapping> idMappingMisraC;
+    extern std::vector<IdMapping> idMappingMisraCpp2008;
+    extern std::vector<IdMapping> idMappingMisraCpp2023;
+    extern std::vector<IdMapping> idMappingAutosar;
+    extern std::vector<IdMapping> idMappingCertC;
+    extern std::vector<IdMapping> idMappingCertCpp;
+
+    struct CPPCHECKLIB Info {
+        const char* guideline;
+        const char* classification;
+    };
+    extern std::vector<Info> autosarInfo;
+    extern std::vector<Info> certCInfo;
+    extern std::vector<Info> certCppInfo;
+}
+
+#endif
diff --git a/lib/checkersidmapping.cpp b/lib/checkersidmapping.cpp
new file mode 100644
index 00000000000..5b0e6705c4c
--- /dev/null
+++ b/lib/checkersidmapping.cpp
@@ -0,0 +1,219 @@
+/*
+ * 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/>.
+ */
+// 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"},
+    {"m0-1-9", "redundantAssignment,redundantInitialization"},
+    {"m0-1-10", "unusedFunction"},
+    {"m0-2-1", "overlappingWriteUnion,overlappingWriteFunction"},
+    {"a1-1-1", "g++ .."},
+    {"a2-3-1", "The code contains unhandled character(s) (character code=195). Neither unicode nor extended ascii is supported. [syntaxError]"},
+    {"a2-7-3", "doxygen,clang -Wdocumentation"},
+    {"a2-10-1", "shadowVariable,shadowFunction,shadowArgument"},
+    {"a2-13-2", "compile error"},
+    {"a2-13-4", "compiler error"},
+    {"m3-2-2", "ctuOneDefinitionRuleViolation"},
+    {"m3-4-1", "variableScope"},
+    {"a5-0-1", "-Wsequence-point"},
+    {"m5-0-16", "pointerOutOfBounds"},
+    {"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"},
+    {"a5-6-1", "zerodiv,zerodivcond"},
+    {"m5-8-1", "shiftTooManyBits"},
+    {"m7-1-2", "constParameter"},
+    {"a7-5-1", "returnDanglingLifetime"},
+    {"m8-4-2", "funcArgNamesDifferent"},
+    {"a8-4-2", "missingReturn"},
+    {"a8-5-0", "uninitdata"},
+    {"m9-3-3", "functionConst,functionStatic"},
+    {"m10-2-1", "duplInheritedMember"},
+    {"a12-1-1", "uninitMemberVar"},
+    {"m12-1-1", "virtualCallInConstructor"},
+    {"a12-1-4", "noExplicitConstructor"},
+    {"a12-6-1", "useInitializationList"},
+    {"a12-8-3", "accessMoved"},
+    {"a15-1-4", "memleak"},
+    {"m15-3-1", "exceptThrowInDestructor"},
+    {"a15-4-2", "throwInNoexceptFunction"},
+    {"m16-0-5", "preprocessorErrorDirective"},
+    {"a16-2-2", "iwyu,check headers"},
+    {"a18-5-3", "mismatchAllocDealloc"},
+    {"a20-8-1", "doubleFree"},
+    {"a23-0-2", "invalidContainer"},
+};
+
+std::vector<checkers::IdMapping> checkers::idMappingCertC{
+    {"PRE30", "preprocessorErrorDirective"},
+    {"PRE32", "preprocessorErrorDirective"},
+    {"DCL30", "danglingLifetime,autoVariables,invalidLifetime,returnDanglingLifetime"},
+    {"EXP30", "unknownEvaluationOrder"},
+    {"EXP33", "uninitvar,uninitdata,uninitStructMember"},
+    {"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"},
+    {"MEM30", "doubleFree,deallocret,deallocuse"},
+    {"MEM31", "memleak,leakReturnValNotUsed,leakUnsafeArgAlloc,memleakOnRealloc"},
+    {"MEM34", "autovarInvalidDeallocation,mismatchAllocDealloc"},
+    {"FIO39", "IOWithoutPositioning"},
+    {"FIO42", "resourceLeak"},
+    {"FIO46", "deallocuse,useClosedFile"},
+    {"FIO47", "invalidscanf,wrongPrintfScanfArgNum,invalidLengthModifierError,invalidScanfFormatWidth,wrongPrintfScanfParameterPositionError"},
+    {"MSC37", "missingReturn"},
+};
+
+std::vector<checkers::IdMapping> checkers::idMappingCertCpp{
+    {"CTR51", "eraseDereference"},
+    {"CTR54", "comparePointers"},
+    {"CTR55", "containerOutOfBounds"},
+    {"DCL57", "deallocThrow,exceptThrowInDestructor"},
+    {"DCL60", "ctuOneDefinitionRuleViolation"},
+    {"ERR57", "memleak"},
+    {"EXP52", "sizeofCalculation"},
+    {"EXP53", "uninitvar,uninitdata,uninitStructMember"},
+    {"EXP54", "uninitvar,danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
+    {"EXP61", "danglingLifetime,danglingReference,danglingTemporaryLifetime,danglingTempReference,returnDanglingLifetime"},
+    {"EXP63", "accessMoved"},
+    {"FIO50", "IOWithoutPositioning"},
+    {"MEM50", "deallocuse"},
+    {"MEM51", "mismatchAllocDealloc"},
+    {"MEM56", "doubleFree"},
+    {"MSC52", "missingReturn"},
+    {"OOP50", "virtualCallInConstructor"},
+    {"OOP52", "virtualDestructor"},
+    {"OOP53", "initializerList"},
+    {"OOP54", "operatorEqToSelf"},
+    {"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.6", "unusedLabel"},
+    {"2.8", "unusedVariable"},
+    {"5.3", "shadowVariable"},
+    {"8.3", "funcArgNamesDifferent"},
+    {"8.13", "constParameterPointer"},
+    {"9.1", "uninitvar"},
+    {"12.5", "sizeofwithsilentarraypointer"},
+    {"13.2", "unknownEvaluationOrder"},
+    {"13.6", "sizeofCalculation"},
+    {"14.3", "compareValueOutOfTypeRangeError,knownConditionTrueFalse"},
+    {"17.4", "missingReturn"},
+    {"17.5", "argumentSize"},
+    {"18.1", "pointerOutOfBounds"},
+    {"18.2", "comparePointers"},
+    {"18.3", "comparePointers"},
+    {"18.6", "danglingLifetime,danglingTemporaryLifetime,returnDanglingLifetime"},
+    {"19.1", "overlappingWriteUnion,overlappingWriteFunction"},
+    {"20.6", "preprocessorErrorDirective"},
+    {"21.13", "invalidFunctionArg"},
+    {"21.17", "bufferAccessOutOfBounds"},
+    {"21.18", "bufferAccessOutOfBounds"},
+    {"22.1", "memleak,resourceLeak,memleakOnRealloc,leakReturnValNotUsed,leakNoVarFunctionCall"},
+    {"22.2", "autovarInvalidDeallocation"},
+    {"22.3", "incompatibleFileOpen"},
+    {"22.4", "writeReadOnlyFile"},
+    {"22.6", "useClosedFile"},
+};
+
+std::vector<checkers::IdMapping> checkers::idMappingMisraCpp2008{
+    {"0-1-1", "unreachableCode,duplicateBreak"},
+    {"0-1-2", "unsignedLessThanZero"},
+    {"0-1-3", "unusedVariable,unusedStructMember"},
+    {"0-1-6", "redundantAssignment,unreadVariable,variableScope"},
+    {"0-1-9", "redundantAssignment,redundantInitialization"},
+    {"0-1-10", "unusedFunction"},
+    {"0-2-1", "overlappingWriteUnion,overlappingWriteFunction"},
+    {"2-10-2", "shadowVariable"},
+    {"3-2-2", "ctuOneDefinitionRuleViolation"},
+    {"3-4-1", "variableScope"},
+    {"5-0-1", "unknownEvaluationOrder"},
+    {"5-0-16", "pointerOutOfBounds"},
+    {"5-0-17", "comparePointers"},
+    {"5-0-18", "comparePointers"},
+    {"5-2-4", "cstyleCast"},
+    {"5-3-4", "sizeofFunctionCall"},
+    {"5-8-1", "shiftTooManyBits"},
+    {"6-6-5", "missingReturn"},
+    {"7-1-1", "constVariable,constParameter"},
+    {"7-1-2", "constParameter"},
+    {"7-5-1", "autoVariables,returnReference,returnTempReference"},
+    {"7-5-2", "danglingLifetime"},
+    {"8-4-2", "funcArgNamesDifferent"},
+    {"8-4-3", "missingReturn"},
+    {"8-5-1", "uninitvar,uninitdata,uninitStructMember,uninitMemberVar,uninitMemberVarPrivate,uninitDerivedMemberVar,uninitDerivedMemberVarPrivate"},
+    {"9-3-3", "functionConst,functionStatic"},
+    {"10-2-1", "duplInheritedMember"},
+    {"12-1-1", "virtualCallInConstructor"},
+    {"12-1-3", "noExplicitConstructor"},
+    {"15-3-1", "exceptThrowInDestructor"},
+    {"15-5-1", "exceptThrowInDestructor"},
+    {"15-5-3", "exceptThrowInDestructor"},
+    {"16-0-5", "preprocessorErrorDirective"},
+};
+
+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"},
+    {"5.10.1", "syntaxError"},
+    {"6.2.1", "ctuOneDefinitionRuleViolation"},
+    {"6.4.1", "shadowVariable"},
+    {"6.8.1", "danglingLifetime"},
+    {"6.8.2", "autoVariables"},
+    {"8.7.1", "pointerOutOfBounds,pointerOutOfBoundsCond"},
+    {"8.7.2", "subtractPointers"},
+    {"8.9.1", "comparePointers"},
+    {"8.18.1", "overlappingWriteUnion"},
+    {"9.6.5", "missingReturn"},
+    {"10.1.1", "constParameter,constParameterReference"},
+    {"11.6.2", "uninitvar"},
+    {"15.1.1", "virtualCallInConstructor"},
+    {"15.1.3", "noExplicitConstructor"},
+    {"15.1.4", "uninitMemberVar"},
+    {"Dir 15.8.1", "operatorEqToSelf"},
+    {"19.3.5", "preprocessorErrorDirective"},
+    {"28.6.3", "accessForwarded,accessMoved"},
+    {"28.6.4", "ignoredReturnValue"},
+};
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
new file mode 100644
index 00000000000..a5135bed3f8
--- /dev/null
+++ b/lib/checkersreport.cpp
@@ -0,0 +1,312 @@
+/*
+ * 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 "checkersreport.h"
+
+#include "addoninfo.h"
+#include "checkers.h"
+#include "errortypes.h"
+#include "settings.h"
+
+#include <algorithm>
+#include <cstddef>
+#include <map>
+#include <sstream>
+#include <unordered_set>
+#include <vector>
+
+static int getMisraCVersion(const Settings& settings) {
+    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) {
+        return addonInfo.name == "misra";
+    });
+    if (misraAddonInfo)
+        return 2012;
+    return 0;
+}
+
+static bool isMisraRuleActive(const std::set<std::string>& activeCheckers, const std::string& rule) {
+    if (activeCheckers.count("Misra C: " + rule))
+        return true;
+    if (rule == "1.1")
+        return true; // syntax error
+    if (rule == "1.3")
+        return true; // undefined behavior
+    if (rule == "2.1")
+        return activeCheckers.count("CheckCondition::alwaysTrueFalse") != 0;
+    if (rule == "2.6")
+        return activeCheckers.count("CheckOther::checkUnusedLabel") != 0;
+    if (rule == "2.8")
+        return activeCheckers.count("CheckUnusedVar::checkFunctionVariableUsage") != 0;
+    if (rule == "5.3")
+        return activeCheckers.count("CheckOther::checkShadowVariables") != 0;
+    if (rule == "8.13")
+        return activeCheckers.count("CheckOther::checkConstPointer") != 0;
+    if (rule == "9.1")
+        return true; // uninitvar
+    if (rule == "12.5")
+        return activeCheckers.count("CheckOther::checkConstPointer") != 0;
+    if (rule == "14.3")
+        return activeCheckers.count("CheckCondition::alwaysTrueFalse") != 0;
+    if (rule == "17.5")
+        return activeCheckers.count("CheckBufferOverrun::argumentSize") != 0;
+    if (rule == "18.1")
+        return activeCheckers.count("CheckBufferOverrun::pointerArithmetic") != 0;
+    if (rule == "18.2")
+        return activeCheckers.count("CheckOther::checkComparePointers") != 0;
+    if (rule == "18.3")
+        return activeCheckers.count("CheckOther::checkComparePointers") != 0;
+    if (rule == "18.6")
+        return true; // danlingLifetime => error
+    if (rule == "19.1")
+        return activeCheckers.count("CheckOther::checkOverlappingWrite") != 0;
+    if (rule == "20.6")
+        return true; // preprocessorErrorDirective
+    if (rule == "21.13")
+        return activeCheckers.count("CheckFunctions::invalidFunctionUsage") != 0;
+    if (rule == "21.17")
+        return activeCheckers.count("CheckBufferOverrun::bufferOverflow") != 0;
+    if (rule == "21.18")
+        return activeCheckers.count("CheckBufferOverrun::bufferOverflow") != 0;
+    if (rule == "22.1")
+        return true;  // memleak => error
+    if (rule == "22.2")
+        return activeCheckers.count("CheckAutoVariables::autoVariables") != 0;
+    if (rule == "22.3")
+        return activeCheckers.count("CheckIO::checkFileUsage") != 0;
+    if (rule == "22.4")
+        return activeCheckers.count("CheckIO::checkFileUsage") != 0;
+    if (rule == "22.6")
+        return activeCheckers.count("CheckIO::checkFileUsage") != 0;
+
+    return false;
+}
+
+CheckersReport::CheckersReport(const Settings& settings, const std::set<std::string>& activeCheckers)
+    : mSettings(settings), mActiveCheckers(activeCheckers)
+{}
+
+int CheckersReport::getActiveCheckersCount()
+{
+    if (mAllCheckersCount == 0) {
+        countCheckers();
+    }
+    return mActiveCheckersCount;
+}
+
+int CheckersReport::getAllCheckersCount()
+{
+    if (mAllCheckersCount == 0) {
+        countCheckers();
+    }
+    return mAllCheckersCount;
+}
+
+void CheckersReport::countCheckers()
+{
+    mActiveCheckersCount = mAllCheckersCount = 0;
+
+    for (const auto& checkReq: checkers::allCheckers) {
+        if (mActiveCheckers.count(checkReq.first) > 0)
+            ++mActiveCheckersCount;
+        ++mAllCheckersCount;
+    }
+    for (const auto& checkReq: checkers::premiumCheckers) {
+        if (mActiveCheckers.count(checkReq.first) > 0)
+            ++mActiveCheckersCount;
+        ++mAllCheckersCount;
+    }
+    if (mSettings.premiumArgs.find("misra-c-") != std::string::npos || 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);
+            // 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;
+        }
+    }
+}
+
+std::string CheckersReport::getReport(const std::string& criticalErrors) const
+{
+    std::ostringstream fout;
+
+    fout << "Critical errors" << std::endl;
+    fout << "---------------" << std::endl;
+    if (!criticalErrors.empty()) {
+        fout << "There were critical errors (" << criticalErrors << ")." << std::endl;
+        fout << "These cause the analysis of the file to end prematurely." << std::endl;
+    } else {
+        fout << "No critical errors encountered." << std::endl;
+        // 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)
+        fout << "Note: There might still have been non-critical bailouts which might lead to false negatives." << std::endl;
+    }
+
+    fout << std::endl << std::endl;
+    fout << "Open source checkers" << std::endl;
+    fout << "--------------------" << std::endl;
+
+    std::size_t maxCheckerSize = 0;
+    for (const auto& checkReq: checkers::allCheckers) {
+        const std::string& checker = checkReq.first;
+        maxCheckerSize = std::max(checker.size(), maxCheckerSize);
+    }
+    for (const auto& checkReq: checkers::allCheckers) {
+        const std::string& checker = checkReq.first;
+        const bool active = mActiveCheckers.count(checkReq.first) > 0;
+        const std::string& req = checkReq.second;
+        fout << (active ? "Yes  " : "No   ") << checker;
+        if (!active && !req.empty())
+            fout << std::string(maxCheckerSize + 4 - checker.size(), ' ') << "require:" + req;
+        fout << std::endl;
+    }
+
+    const bool cppcheckPremium = mSettings.premium;
+
+    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) {
+        fout << std::endl << std::endl;
+        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) {
+            const std::string& checker = checkReq.first;
+            if (checker.find(substring) != std::string::npos && checker.size() > maxCheckerSize)
+                maxCheckerSize = checker.size();
+        }
+        for (const auto& checkReq: premiumCheckers) {
+            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
+            }
+            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;
+            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();
+}
+
+std::string CheckersReport::getXmlReport(const std::string& criticalErrors) const
+{
+    std::string ret;
+    if (!criticalErrors.empty())
+        ret += "    <critical-errors>" + criticalErrors + "</critical-errors>\n";
+    else
+        ret += "    <critical-errors/>\n";
+    ret += "    <checkers-report>\n";
+    const int misraCVersion = getMisraCVersion(mSettings);
+    for (std::string checker: mActiveCheckers) {
+        if (checker.compare(0,8,"Misra C:") == 0)
+            checker = "Misra C " + std::to_string(misraCVersion) + ":" + checker.substr(8);
+        ret += "        <checker id=\"" + checker + "\"/>\n";
+    }
+    ret += "    </checkers-report>";
+    return ret;
+}
diff --git a/lib/checkersreport.h b/lib/checkersreport.h
new file mode 100644
index 00000000000..b189a7f1ebd
--- /dev/null
+++ b/lib/checkersreport.h
@@ -0,0 +1,49 @@
+/* -*- 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 checkersReportH
+#define checkersReportH
+
+#include "config.h"
+
+#include <set>
+#include <string>
+
+class Settings;
+
+class CPPCHECKLIB CheckersReport {
+public:
+    CheckersReport(const Settings& settings, const std::set<std::string>& activeCheckers);
+
+    int getActiveCheckersCount();
+    int getAllCheckersCount();
+
+    std::string getReport(const std::string& criticalErrors) const;
+    std::string getXmlReport(const std::string& criticalErrors) const;
+
+private:
+    const Settings& mSettings;
+    const std::set<std::string>& mActiveCheckers;
+
+    void countCheckers();
+
+    int mActiveCheckersCount = 0;
+    int mAllCheckersCount = 0;
+};
+
+#endif
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
index 5a6b233e983..36cec717d90 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-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
@@ -19,11 +19,13 @@
 //---------------------------------------------------------------------------
 #include "checkexceptionsafety.h"
 
+#include "astutils.h"
 #include "errortypes.h"
 #include "library.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
+#include "tokenize.h"
 
 #include <list>
 #include <set>
@@ -37,9 +39,9 @@ namespace {
     CheckExceptionSafety instance;
 }
 
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
-static const struct CWE CWE703(703U);   // Improper Check or Handling of Exceptional Conditions
-static const struct CWE CWE480(480U);   // Use of Incorrect Operator
+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
 
 //---------------------------------------------------------------------------
 
@@ -48,6 +50,8 @@ void CheckExceptionSafety::destructors()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckExceptionSafety::destructors"); // warning
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Perform check..
@@ -56,22 +60,21 @@ void CheckExceptionSafety::destructors()
         if (!function)
             continue;
         // only looking for destructors
-        if (function->type == Function::eDestructor) {
+        if (function->type == FunctionType::eDestructor) {
             // Inspect this destructor.
             for (const Token *tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
                 // Skip try blocks
                 if (Token::simpleMatch(tok, "try {")) {
-                    tok = tok->next()->link();
+                    tok = tok->linkAt(1);
                 }
 
                 // Skip uncaught exceptions
                 else if (Token::simpleMatch(tok, "if ( ! std :: uncaught_exception ( ) ) {")) {
-                    tok = tok->next()->link(); // end of if ( ... )
-                    tok = tok->next()->link(); // end of { ... }
+                    tok = tok->linkAt(1); // end of if ( ... )
+                    tok = tok->linkAt(1); // end of { ... }
                 }
-
                 // throw found within a destructor
-                else if (tok->str() == "throw") {
+                else if (tok->str() == "throw" && function->isNoExcept()) {
                     destructorsError(tok, scope->className);
                     break;
                 }
@@ -95,6 +98,8 @@ void CheckExceptionSafety::deallocThrow()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckExceptionSafety::deallocThrow"); // warning
+
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
@@ -165,20 +170,22 @@ void CheckExceptionSafety::deallocThrowError(const Token * const tok, const std:
 //---------------------------------------------------------------------------
 void CheckExceptionSafety::checkRethrowCopy()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("exceptRethrowCopy"))
         return;
 
+    logChecker("CheckExceptionSafety::checkRethrowCopy"); // style
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eCatch)
+        if (scope.type != ScopeType::eCatch)
             continue;
 
         const unsigned int varid = scope.bodyStart->tokAt(-2)->varId();
         if (varid) {
             for (const Token* tok = scope.bodyStart->next(); tok && tok != scope.bodyEnd; tok = tok->next()) {
-                if (Token::simpleMatch(tok, "catch (") && tok->next()->link() && tok->next()->link()->next()) { // Don't check inner catch - it is handled in another iteration of outer loop.
-                    tok = tok->next()->link()->next()->link();
+                if (Token::simpleMatch(tok, "catch (") && tok->linkAt(1) && tok->linkAt(1)->next()) { // Don't check inner catch - it is handled in another iteration of outer loop.
+                    tok = tok->linkAt(1)->linkAt(1);
                     if (!tok)
                         break;
                 } else if (Token::Match(tok, "%varid% .", varid)) {
@@ -207,13 +214,15 @@ void CheckExceptionSafety::rethrowCopyError(const Token * const tok, const std::
 //---------------------------------------------------------------------------
 void CheckExceptionSafety::checkCatchExceptionByValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("catchExceptionByValue"))
         return;
 
+    logChecker("CheckExceptionSafety::checkCatchExceptionByValue"); // style
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eCatch)
+        if (scope.type != ScopeType::eCatch)
             continue;
 
         // Find a pass-by-value declaration in the catch(), excluding basic types
@@ -232,7 +241,6 @@ void CheckExceptionSafety::catchExceptionByValueError(const Token *tok)
                 "as a (const) reference which is usually recommended in C++.", CWE398, Certainty::normal);
 }
 
-
 static const Token * functionThrowsRecursive(const Function * function, std::set<const Function *> & recursive)
 {
     // check for recursion and bail if found
@@ -244,11 +252,12 @@ static const Token * functionThrowsRecursive(const Function * function, std::set
 
     for (const Token *tok = function->functionScope->bodyStart->next();
          tok != function->functionScope->bodyEnd; tok = tok->next()) {
+        tok = skipUnreachableBranch(tok);
         if (Token::simpleMatch(tok, "try {"))
             tok = tok->linkAt(1);  // skip till start of catch clauses
         if (tok->str() == "throw")
             return tok;
-        if (tok->function()) {
+        if (tok->function() && Token::simpleMatch(tok->astParent(), "(")) {
             const Function * called = tok->function();
             // check if called function has an exception specification
             if (called->isThrow() && called->throwArg)
@@ -278,6 +287,8 @@ static const Token * functionThrows(const Function * function)
 //--------------------------------------------------------------------------
 void CheckExceptionSafety::nothrowThrows()
 {
+    logChecker("CheckExceptionSafety::nothrowThrows");
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -285,25 +296,22 @@ void CheckExceptionSafety::nothrowThrows()
         if (!function)
             continue;
 
-        // check noexcept and noexcept(true) functions
-        if (function->isNoExcept() &&
-            (!function->noexceptArg || function->noexceptArg->str() == "true")) {
-            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);
         }
     }
@@ -311,7 +319,12 @@ void CheckExceptionSafety::nothrowThrows()
 
 void CheckExceptionSafety::noexceptThrowError(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, "throwInNoexceptFunction", "Unhandled exception thrown in function declared not to throw exceptions.", CWE398, Certainty::normal);
+}
+
+void CheckExceptionSafety::entryPointThrowError(const Token * const tok)
+{
+    reportError(tok, Severity::error, "throwInEntryPoint", "Unhandled exception thrown in function that is an entry point.", CWE398, Certainty::normal);
 }
 
 //--------------------------------------------------------------------------
@@ -319,9 +332,12 @@ void CheckExceptionSafety::noexceptThrowError(const Token * const tok)
 //--------------------------------------------------------------------------
 void CheckExceptionSafety::unhandledExceptionSpecification()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
+    if ((!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive)) &&
+        !mSettings->isPremiumEnabled("unhandledExceptionSpecification"))
         return;
 
+    logChecker("CheckExceptionSafety::unhandledExceptionSpecification"); // style,inconclusive
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -359,6 +375,7 @@ void CheckExceptionSafety::unhandledExceptionSpecificationError(const Token * co
 //--------------------------------------------------------------------------
 void CheckExceptionSafety::rethrowNoCurrentException()
 {
+    logChecker("CheckExceptionSafety::rethrowNoCurrentException");
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         const Function* function = scope->function;
@@ -395,3 +412,31 @@ void CheckExceptionSafety::rethrowNoCurrentExceptionError(const Token *tok)
                 " More: https://isocpp.org/wiki/faq/exceptions#throw-without-an-object",
                 CWE480, Certainty::normal);
 }
+
+void CheckExceptionSafety::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    if (tokenizer.isC())
+        return;
+
+    CheckExceptionSafety checkExceptionSafety(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkExceptionSafety.destructors();
+    checkExceptionSafety.deallocThrow();
+    checkExceptionSafety.checkRethrowCopy();
+    checkExceptionSafety.checkCatchExceptionByValue();
+    checkExceptionSafety.nothrowThrows();
+    checkExceptionSafety.unhandledExceptionSpecification();
+    checkExceptionSafety.rethrowNoCurrentException();
+}
+
+void CheckExceptionSafety::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckExceptionSafety 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 6f90b881c7a..7c5a52b5605 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-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
@@ -23,14 +23,13 @@
 
 #include "check.h"
 #include "config.h"
-#include "tokenize.h"
 
 #include <string>
 
 class Settings;
 class ErrorLogger;
 class Token;
-
+class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -49,23 +48,12 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
     /** This constructor is used when registering the CheckClass */
     CheckExceptionSafety() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (tokenizer->isC())
-            return;
-
-        CheckExceptionSafety checkExceptionSafety(tokenizer, settings, errorLogger);
-        checkExceptionSafety.destructors();
-        checkExceptionSafety.deallocThrow();
-        checkExceptionSafety.checkRethrowCopy();
-        checkExceptionSafety.checkCatchExceptionByValue();
-        checkExceptionSafety.nothrowThrows();
-        checkExceptionSafety.unhandledExceptionSpecification();
-        checkExceptionSafety.rethrowNoCurrentException();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** Don't throw exceptions in destructors */
     void destructors();
@@ -88,29 +76,20 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
     /** @brief %Check for rethrow not from catch scope */
     void rethrowNoCurrentException();
 
-private:
     /** Don't throw exceptions in destructors */
-    void destructorsError(const Token * const tok, const std::string &className);
-    void deallocThrowError(const Token * const tok, const std::string &varname);
-    void rethrowCopyError(const Token * const tok, const std::string &varname);
+    void destructorsError(const Token * tok, const std::string &className);
+    void deallocThrowError(const Token * tok, const std::string &varname);
+    void rethrowCopyError(const Token * tok, const std::string &varname);
     void catchExceptionByValueError(const Token *tok);
-    void noexceptThrowError(const Token * const tok);
+    void noexceptThrowError(const Token * tok);
+    void entryPointThrowError(const Token * tok);
     /** Missing exception specification */
-    void unhandledExceptionSpecificationError(const Token * const tok1, const Token * const tok2, const std::string & funcname);
+    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 {
-        CheckExceptionSafety c(nullptr, settings, errorLogger);
-        c.destructorsError(nullptr, "Class");
-        c.deallocThrowError(nullptr, "p");
-        c.rethrowCopyError(nullptr, "varname");
-        c.catchExceptionByValueError(nullptr);
-        c.noexceptThrowError(nullptr);
-        c.unhandledExceptionSpecificationError(nullptr, nullptr, "funcname");
-        c.rethrowNoCurrentExceptionError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     /** Short description of class (for --doc) */
     static std::string myName() {
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
index 36f67d7536c..1ab21eacfd2 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-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
@@ -23,8 +23,11 @@
 #include "checkfunctions.h"
 
 #include "astutils.h"
+#include "errortypes.h"
+#include "library.h"
 #include "mathlib.h"
 #include "platform.h"
+#include "settings.h"
 #include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -34,6 +37,7 @@
 
 #include <iomanip>
 #include <list>
+#include <map>
 #include <sstream>
 #include <unordered_map>
 #include <vector>
@@ -56,7 +60,9 @@ static const CWE CWE688(688U);  // Function Call With Incorrect Variable or Refe
 
 void CheckFunctions::checkProhibitedFunctions()
 {
-    const bool checkAlloca = mSettings->severity.isEnabled(Severity::warning) && ((mSettings->standards.c >= Standards::C99 && mTokenizer->isC()) || 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");
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
@@ -64,8 +70,8 @@ void CheckFunctions::checkProhibitedFunctions()
             if (!Token::Match(tok, "%name% (") && tok->varId() == 0)
                 continue;
             // 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 == Scope::eGlobal)) {
-                if (mTokenizer->isC()) {
+            if (checkAlloca && Token::simpleMatch(tok, "alloca (") && (!tok->function() || tok->function()->nestedIn->type == ScopeType::eGlobal)) {
+                if (tok->isC()) {
                     if (mSettings->standards.c > Standards::C89)
                         reportError(tok, Severity::warning, "allocaCalled",
                                     "$symbol:alloca\n"
@@ -86,7 +92,7 @@ void CheckFunctions::checkProhibitedFunctions()
 
                 const Library::WarnInfo* wi = mSettings->library.getWarnInfo(tok);
                 if (wi) {
-                    if (mSettings->severity.isEnabled(wi->severity) && mSettings->standards.c >= wi->standards.c && mSettings->standards.cpp >= wi->standards.cpp) {
+                    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);
                     }
@@ -101,9 +107,11 @@ void CheckFunctions::checkProhibitedFunctions()
 //---------------------------------------------------------------------------
 void CheckFunctions::invalidFunctionUsage()
 {
+    logChecker("CheckFunctions::invalidFunctionUsage");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
+            tok = skipUnreachableBranch(tok);
             if (!Token::Match(tok, "%name% ( !!)"))
                 continue;
             const Token * const functionToken = tok;
@@ -112,7 +120,7 @@ void CheckFunctions::invalidFunctionUsage()
                 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));
                 }
@@ -123,9 +131,9 @@ void CheckFunctions::invalidFunctionUsage()
                         invalidFunctionArgBoolError(argtok, functionToken->str(), argnr);
 
                     // Are the values 0 and 1 valid?
-                    else if (!mSettings->library.isIntArgValid(functionToken, argnr, 0))
+                    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))
+                    else if (!mSettings->library.isIntArgValid(functionToken, argnr, 1, *mSettings))
                         invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings->library.validarg(functionToken, argnr));
                 }
                 // check <strz>
@@ -145,9 +153,9 @@ 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, mTokenizer->isCPP())) {
+                        && !isVariablesChanged(variable->declEndToken(), functionToken, 0 /*indirect*/, { variable }, *mSettings)) {
                         const Token* varTok = variable->declEndToken();
-                        auto count = -1; // Find out explicitly set count, e.g.: char buf[3] = {...}. Variable 'count' is set to 3 then.
+                        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(), "["))
                         {
                             const Token* const countTok = varTok->astOperand1()->astOperand2();
@@ -175,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)
@@ -239,9 +247,13 @@ void CheckFunctions::invalidFunctionArgStrError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 void CheckFunctions::checkIgnoredReturnValue()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::warning) &&
+        !mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("ignoredReturnValue"))
         return;
 
+    logChecker("CheckFunctions::checkIgnoredReturnValue"); // style,warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -271,7 +283,8 @@ 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 bool warn = (tok->function() && tok->function()->isAttributeNodiscard()) || // avoid duplicate warnings for resource-allocating functions
+                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)
                     ignoredReturnValueError(tok, tok->next()->astOperand1()->expressionString());
@@ -302,14 +315,15 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
 
 void CheckFunctions::checkMissingReturn()
 {
+    logChecker("CheckFunctions::checkMissingReturn");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         const Function *function = scope->function;
         if (!function || !function->hasBody())
             continue;
-        if (function->name() == "main" && !(mSettings->standards.c < Standards::C99 && mTokenizer->isC()))
+        if (function->name() == "main" && !(mTokenizer->isC() && mSettings->standards.c < Standards::C99))
             continue;
-        if (function->type != Function::Type::eFunction && function->type != Function::Type::eOperatorEqual)
+        if (function->type != FunctionType::eFunction && function->type != FunctionType::eOperatorEqual)
             continue;
         if (Token::Match(function->retDef, "%name% (") && function->retDef->isUpperCaseName())
             continue;
@@ -326,9 +340,9 @@ static bool isForwardJump(const Token *gotoToken)
     if (!Token::Match(gotoToken, "goto %name% ;"))
         return false;
     for (const Token *prev = gotoToken; gotoToken; gotoToken = gotoToken->previous()) {
-        if (Token::Match(prev, "%name% :") && prev->str() == gotoToken->next()->str())
+        if (Token::Match(prev, "%name% :") && prev->str() == gotoToken->strAt(1))
             return true;
-        if (prev->str() == "{" && prev->scope()->type == Scope::eFunction)
+        if (prev->str() == "{" && prev->scope()->type == ScopeType::eFunction)
             return false;
     }
     return false;
@@ -349,9 +363,7 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
                 if (prev->str() == "goto" && !isForwardJump(prev))
                     return nullptr;
             }
-            if (tok->scope()->type == Scope::ScopeType::eSwitch) {
-                // find reachable break / !default
-                bool hasDefault = false;
+            if (tok->scope()->type == ScopeType::eSwitch) {
                 bool reachable = false;
                 for (const Token *switchToken = tok->link()->next(); switchToken != tok; switchToken = switchToken->next()) {
                     if (reachable && Token::simpleMatch(switchToken, "break ;")) {
@@ -366,19 +378,17 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
                         reachable = false;
                     if (Token::Match(switchToken, "case|default"))
                         reachable = true;
-                    if (Token::simpleMatch(switchToken, "default :"))
-                        hasDefault = true;
-                    else if (switchToken->str() == "{" && (switchToken->scope()->isLoopScope() || switchToken->scope()->type == Scope::ScopeType::eSwitch))
+                    else if (switchToken->str() == "{" && (switchToken->scope()->isLoopScope() || switchToken->scope()->type == ScopeType::eSwitch))
                         switchToken = switchToken->link();
                 }
-                if (!hasDefault)
+                if (!isExhaustiveSwitch(tok->link()))
                     return tok->link();
-            } else if (tok->scope()->type == Scope::ScopeType::eIf) {
+            } else if (tok->scope()->type == ScopeType::eIf) {
                 const Token *condition = tok->scope()->classDef->next()->astOperand2();
                 if (condition && condition->hasKnownIntValue() && condition->getKnownIntValue() == 1)
                     return checkMissingReturnScope(tok, library);
                 return tok;
-            } else if (tok->scope()->type == Scope::ScopeType::eElse) {
+            } else if (tok->scope()->type == ScopeType::eElse) {
                 const Token *errorToken = checkMissingReturnScope(tok, library);
                 if (errorToken)
                     return errorToken;
@@ -386,6 +396,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;
@@ -394,7 +417,10 @@ static const Token *checkMissingReturnScope(const Token *tok, const Library &lib
             return nullptr;
         if (tok->str() == "goto" && !isForwardJump(tok))
             return nullptr;
-        if (Token::Match(tok, "%name% (") && !library.isnotnoreturn(tok)) {
+        if (Token::Match(tok, "%name% (") && library.isnoreturn(tok)) {
+            return nullptr;
+        }
+        if (Token::Match(tok->previous(), "[;{}] %name% (") && !library.isnotnoreturn(tok)) {
             return nullptr;
         }
         if (Token::Match(tok, "[;{}] %name% :"))
@@ -415,9 +441,14 @@ void CheckFunctions::missingReturnError(const Token* tok)
 //---------------------------------------------------------------------------
 void CheckFunctions::checkMathFunctions()
 {
-    const bool styleC99 = mSettings->severity.isEnabled(Severity::style) && mSettings->standards.c != Standards::C89 && mSettings->standards.cpp != Standards::CPP03;
+    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"))
+        return;
+
+    logChecker("CheckFunctions::checkMathFunctions"); // style,warning,c99,c++11
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -427,12 +458,12 @@ void CheckFunctions::checkMathFunctions()
                 if (tok->strAt(-1) != "."
                     && Token::Match(tok, "log|logf|logl|log10|log10f|log10l|log2|log2f|log2l ( %num% )")) {
                     const std::string& number = tok->strAt(2);
-                    if ((MathLib::isInt(number) && MathLib::toLongNumber(number) <= 0) ||
+                    if ((MathLib::isInt(number) && MathLib::toBigNumber(number) <= 0) ||
                         (MathLib::isFloat(number) && MathLib::toDoubleNumber(number) <= 0.))
                         mathfunctionCallWarning(tok);
                 } else if (Token::Match(tok, "log1p|log1pf|log1pl ( %num% )")) {
                     const std::string& number = tok->strAt(2);
-                    if ((MathLib::isInt(number) && MathLib::toLongNumber(number) <= -1) ||
+                    if ((MathLib::isInt(number) && MathLib::toBigNumber(number) <= -1) ||
                         (MathLib::isFloat(number) && MathLib::toDoubleNumber(number) <= -1.))
                         mathfunctionCallWarning(tok);
                 }
@@ -500,6 +531,8 @@ void CheckFunctions::memsetZeroBytes()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckFunctions::memsetZeroBytes"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -539,6 +572,8 @@ void CheckFunctions::memsetInvalid2ndParam()
     if (!printWarning && !printPortability)
         return;
 
+    logChecker("CheckFunctions::memsetInvalid2ndParam"); // warning,portability
+
     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()) {
@@ -560,7 +595,7 @@ void CheckFunctions::memsetInvalid2ndParam()
             }
 
             if (printWarning && secondParamTok->isNumber()) { // Check if the second parameter is a literal and is out of range
-                const long long int value = MathLib::toLongNumber(secondParamTok->str());
+                const MathLib::bigint value = MathLib::toBigNumber(secondParamTok);
                 const long long sCharMin = mSettings->platform.signedCharMin();
                 const long long uCharMax = mSettings->platform.unsignedCharMax();
                 if (value < sCharMin || value > uCharMax)
@@ -624,9 +659,9 @@ void CheckFunctions::checkLibraryMatchFunctions()
 
         if (Token::simpleMatch(tok->astParent(), ".")) {
             const Token* contTok = tok->astParent()->astOperand1();
-            if (astContainerAction(contTok) != Library::Container::Action::NO_ACTION)
+            if (astContainerAction(contTok, mSettings->library) != Library::Container::Action::NO_ACTION)
                 continue;
-            if (astContainerYield(contTok) != Library::Container::Yield::NO_YIELD)
+            if (astContainerYield(contTok, mSettings->library) != Library::Container::Yield::NO_YIELD)
                 continue;
         }
 
@@ -637,7 +672,7 @@ void CheckFunctions::checkLibraryMatchFunctions()
         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()))
@@ -647,7 +682,7 @@ void CheckFunctions::checkLibraryMatchFunctions()
             continue;
 
         const Token* start = tok;
-        while (Token::Match(start->tokAt(-2), "%name% ::"))
+        while (Token::Match(start->tokAt(-2), "%name% ::") && !start->tokAt(-2)->isKeyword())
             start = start->tokAt(-2);
         if (mSettings->library.detectContainerOrIterator(start))
             continue;
@@ -670,10 +705,12 @@ void CheckFunctions::returnLocalStdMove()
     if (!mSettings->severity.isEnabled(Severity::performance))
         return;
 
+    logChecker("CheckFunctions::returnLocalStdMove"); // performance,c++11
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         // Expect return by-value
-        if (Function::returnsReference(scope->function, true))
+        if (Function::returnsReference(scope->function, /*unknown*/ true, /*includeRValueRef*/ true))
             continue;
         const auto rets = Function::findReturns(scope->function);
         for (const Token* ret : rets) {
@@ -704,8 +741,10 @@ void CheckFunctions::useStandardLibrary()
     if (!mSettings->severity.isEnabled(Severity::style))
         return;
 
+    logChecker("CheckFunctions::useStandardLibrary"); // style
+
     for (const Scope& scope: mTokenizer->getSymbolDatabase()->scopeList) {
-        if (scope.type != Scope::ScopeType::eFor)
+        if (scope.type != ScopeType::eFor)
             continue;
 
         const Token *forToken = scope.classDef;
@@ -735,17 +774,17 @@ void CheckFunctions::useStandardLibrary()
 
         const auto& secondOp = condToken->str();
         const bool isLess = "<" == secondOp &&
-                            isConstExpression(condToken->astOperand2(), mSettings->library, mTokenizer->isCPP()) &&
+                            isConstExpression(condToken->astOperand2(), mSettings->library) &&
                             condToken->astOperand1()->varId() == idxVarId;
         const bool isMore = ">" == secondOp &&
-                            isConstExpression(condToken->astOperand1(), mSettings->library, mTokenizer->isCPP()) &&
+                            isConstExpression(condToken->astOperand1(), mSettings->library) &&
                             condToken->astOperand2()->varId() == idxVarId;
 
         if (!(isLess || isMore))
             continue;
 
         // 3. we expect idx incrementing by 1
-        const bool inc = stepToken->str() == "++" && stepToken->astOperand1()->varId() == idxVarId;
+        const bool inc = stepToken->str() == "++" && stepToken->astOperand1() && stepToken->astOperand1()->varId() == idxVarId;
         const bool plusOne = stepToken->isBinaryOp() && stepToken->str() == "+=" &&
                              stepToken->astOperand1()->varId() == idxVarId &&
                              stepToken->astOperand2()->str() == "1";
@@ -755,7 +794,7 @@ void CheckFunctions::useStandardLibrary()
         // technically using void* here is not correct but some compilers could allow it
 
         const Token *tok = scope.bodyStart;
-        const std::string memcpyName = mTokenizer->isCPP() ? "std::memcpy" : "memcpy";
+        const std::string memcpyName = tok->isCpp() ? "std::memcpy" : "memcpy";
         // (reinterpret_cast<uint8_t*>(dest))[i] = (reinterpret_cast<const uint8_t*>(src))[i];
         if (Token::Match(tok, "{ (| reinterpret_cast < uint8_t|int8_t|char|void * > ( %var% ) )| [ %varid% ] = "
                          "(| reinterpret_cast < const| uint8_t|int8_t|char|void * > ( %var% ) )| [ %varid% ] ; }", idxVarId)) {
@@ -771,7 +810,7 @@ void CheckFunctions::useStandardLibrary()
         }
 
 
-        const static std::string memsetName = mTokenizer->isCPP() ? "std::memset" : "memset";
+        const static std::string memsetName = tok->isCpp() ? "std::memset" : "memset";
         // ((char*)dst)[i] = 0;
         if (Token::Match(tok, "{ ( ( uint8_t|int8_t|char|void * ) (| %var% ) )| [ %varid% ] = %char%|%num% ; }", idxVarId)) {
             useStandardLibraryError(tok->next(), memsetName);
@@ -807,3 +846,46 @@ void CheckFunctions::useStandardLibraryError(const Token *tok, const std::string
                 "useStandardLibrary",
                 "Consider using " + expected + " instead of loop.");
 }
+
+void CheckFunctions::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckFunctions checkFunctions(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    checkFunctions.checkIgnoredReturnValue();
+    checkFunctions.checkMissingReturn();  // Missing "return" in exit path
+
+    // --check-library : functions with nonmatching configuration
+    checkFunctions.checkLibraryMatchFunctions();
+
+    checkFunctions.checkProhibitedFunctions();
+    checkFunctions.invalidFunctionUsage();
+    checkFunctions.checkMathFunctions();
+    checkFunctions.memsetZeroBytes();
+    checkFunctions.memsetInvalid2ndParam();
+    checkFunctions.returnLocalStdMove();
+    checkFunctions.useStandardLibrary();
+}
+
+void CheckFunctions::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckFunctions 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);
+    }
+
+    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);
+    c.memsetFloatError(nullptr,  "varname");
+    c.memsetValueOutOfRangeError(nullptr,  "varname");
+    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 bff40c2eb00..f5954d14043 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-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
@@ -24,17 +24,13 @@
 
 #include "check.h"
 #include "config.h"
-#include "errortypes.h"
-#include "library.h"
-#include "settings.h"
 
-#include <map>
 #include <string>
-#include <utility>
 
 class Token;
-class Tokenizer;
 class ErrorLogger;
+class Tokenizer;
+class Settings;
 
 namespace ValueFlow {
     class Value;
@@ -53,28 +49,13 @@ class CPPCHECKLIB CheckFunctions : public Check {
     /** This constructor is used when registering the CheckFunctions */
     CheckFunctions() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckFunctions checkFunctions(tokenizer, settings, errorLogger);
-
-        checkFunctions.checkIgnoredReturnValue();
-        checkFunctions.checkMissingReturn();  // Missing "return" in exit path
-
-        // --check-library : functions with nonmatching configuration
-        checkFunctions.checkLibraryMatchFunctions();
-
-        checkFunctions.checkProhibitedFunctions();
-        checkFunctions.invalidFunctionUsage();
-        checkFunctions.checkMathFunctions();
-        checkFunctions.memsetZeroBytes();
-        checkFunctions.memsetInvalid2ndParam();
-        checkFunctions.returnLocalStdMove();
-        checkFunctions.useStandardLibrary();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** Check for functions that should not be used */
     void checkProhibitedFunctions();
@@ -109,7 +90,6 @@ class CPPCHECKLIB CheckFunctions : public Check {
     /** @brief --check-library: warn for unconfigured function calls */
     void checkLibraryMatchFunctions();
 
-private:
     /** @brief %Check for missing "return" */
     void checkMissingReturn();
 
@@ -118,7 +98,7 @@ class CPPCHECKLIB CheckFunctions : public Check {
     void invalidFunctionArgStrError(const Token *tok, const std::string &functionName, nonneg int argnr);
     void ignoredReturnValueError(const Token* tok, const std::string& function);
     void ignoredReturnErrorCode(const Token* tok, const std::string& function);
-    void mathfunctionCallWarning(const Token *tok, const nonneg int numParam = 1);
+    void mathfunctionCallWarning(const Token *tok, nonneg int numParam = 1);
     void mathfunctionCallWarning(const Token *tok, const std::string& oldexp, const std::string& newexp);
     void memsetZeroBytesError(const Token *tok);
     void memsetFloatError(const Token *tok, const std::string &var_value);
@@ -127,26 +107,7 @@ class CPPCHECKLIB CheckFunctions : public Check {
     void copyElisionError(const Token *tok);
     void useStandardLibraryError(const Token *tok, const std::string& expected);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckFunctions c(nullptr, settings, errorLogger);
-
-        for (std::map<std::string, Library::WarnInfo>::const_iterator i = settings->library.functionwarn.cbegin(); i != settings->library.functionwarn.cend(); ++i) {
-            c.reportError(nullptr, Severity::style, i->first+"Called", 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.mathfunctionCallWarning(nullptr);
-        c.mathfunctionCallWarning(nullptr, "1 - erf(x)", "erfc(x)");
-        c.memsetZeroBytesError(nullptr);
-        c.memsetFloatError(nullptr,  "varname");
-        c.memsetValueOutOfRangeError(nullptr,  "varname");
-        c.missingReturnError(nullptr);
-        c.copyElisionError(nullptr);
-        c.useStandardLibraryError(nullptr, "memcpy");
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Check function usage";
diff --git a/lib/checkinternal.cpp b/lib/checkinternal.cpp
index 21405b2f0ef..f289044b102 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-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
@@ -21,6 +21,8 @@
 #include "checkinternal.h"
 
 #include "astutils.h"
+#include "errortypes.h"
+#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
@@ -124,7 +126,7 @@ void CheckInternal::checkRedundantTokCheck()
 void CheckInternal::checkRedundantTokCheckError(const Token* tok)
 {
     reportError(tok, Severity::style, "redundantTokCheck",
-                "Unnecessary check of \"" + (tok? tok->expressionString(): emptyString) + "\", match-function already checks if it is null.");
+                "Unnecessary check of \"" + (tok? tok->expressionString(): "") + "\", match-function already checks if it is null.");
 }
 
 void CheckInternal::checkTokenSimpleMatchPatterns()
@@ -228,9 +230,8 @@ void CheckInternal::checkMissingPercentCharacter()
 
             const std::string pattern = patternTok->strValue();
 
-            std::set<std::string>::const_iterator knownPattern, knownPatternsEnd = knownPatterns.cend();
-            for (knownPattern = knownPatterns.cbegin(); knownPattern != knownPatternsEnd; ++knownPattern) {
-                const std::string brokenPattern = (*knownPattern).substr(0, (*knownPattern).size() - 1);
+            for (auto knownPattern = knownPatterns.cbegin(); knownPattern != knownPatterns.cend(); ++knownPattern) {
+                const std::string brokenPattern = knownPattern->substr(0, knownPattern->size() - 1);
 
                 std::string::size_type pos = 0;
                 while ((pos = pattern.find(brokenPattern, pos)) != std::string::npos) {
@@ -296,7 +297,7 @@ void CheckInternal::checkRedundantNextPrevious()
                 continue;
             tok = tok->next();
 
-            if (Token::Match(tok, "previous ( ) . next|tokAt|strAt|linkAt (") || Token::Match(tok, "next ( ) . previous|tokAt|strAt|linkAt (") ||
+            if (Token::Match(tok, "previous ( ) . previous|next|tokAt|str|strAt|link|linkAt (") || Token::Match(tok, "next ( ) . previous|next|tokAt|str|strAt|link|linkAt (") ||
                 (Token::simpleMatch(tok, "tokAt (") && Token::Match(tok->linkAt(1), ") . previous|next|tokAt|strAt|linkAt|str|link ("))) {
                 const std::string& func1 = tok->str();
                 const std::string& func2 = tok->linkAt(1)->strAt(2);
@@ -304,14 +305,6 @@ void CheckInternal::checkRedundantNextPrevious()
                 if ((func2 == "previous" || func2 == "next" || func2 == "str" || func2 == "link") && tok->linkAt(1)->strAt(4) != ")")
                     continue;
 
-                redundantNextPreviousError(tok, func1, func2);
-            } else if (Token::Match(tok, "next|previous ( ) . next|previous ( ) . next|previous|linkAt|strAt|link|str (")) {
-                const std::string& func1 = tok->str();
-                const std::string& func2 = tok->strAt(8);
-
-                if ((func2 == "previous" || func2 == "next" || func2 == "str" || func2 == "link") && tok->strAt(10) != ")")
-                    continue;
-
                 redundantNextPreviousError(tok, func1, func2);
             }
         }
@@ -344,13 +337,6 @@ 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)
 {
     reportError(tok, Severity::warning, "simplePatternError",
@@ -397,4 +383,33 @@ void CheckInternal::extraWhitespaceError(const Token* tok, const std::string& pa
                 );
 }
 
+void CheckInternal::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    if (!tokenizer.getSettings().checks.isEnabled(Checks::internalCheck))
+        return;
+
+    CheckInternal checkInternal(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    checkInternal.checkTokenMatchPatterns();
+    checkInternal.checkTokenSimpleMatchPatterns();
+    checkInternal.checkMissingPercentCharacter();
+    checkInternal.checkUnknownPattern();
+    checkInternal.checkRedundantNextPrevious();
+    checkInternal.checkExtraWhitespace();
+    checkInternal.checkRedundantTokCheck();
+}
+
+void CheckInternal::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckInternal c(nullptr, settings, errorLogger);
+    c.simplePatternError(nullptr, "class {", "Match");
+    c.complexPatternError(nullptr, "%type% ( )", "Match");
+    c.missingPercentCharacterError(nullptr, "%num", "Match");
+    c.unknownPatternError(nullptr, "%typ");
+    c.redundantNextPreviousError(nullptr, "previous", "next");
+    c.orInComplexPattern(nullptr, "||", "Match");
+    c.extraWhitespaceError(nullptr, "%str% ", "Match");
+    c.checkRedundantTokCheckError(nullptr);
+}
+
 #endif // #ifdef CHECK_INTERNAL
diff --git a/lib/checkinternal.h b/lib/checkinternal.h
index 4d44204de8c..1fc97bcb247 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-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
@@ -24,14 +24,13 @@
 
 #include "check.h"
 #include "config.h"
-#include "errortypes.h"
-#include "settings.h"
 
 #include <string>
 
 class ErrorLogger;
 class Token;
 class Tokenizer;
+class Settings;
 
 /// @addtogroup Checks
 /// @{
@@ -43,24 +42,12 @@ class CPPCHECKLIB CheckInternal : public Check {
     /** This constructor is used when registering the CheckClass */
     CheckInternal() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (!settings->checks.isEnabled(Checks::internalCheck))
-            return;
-
-        CheckInternal checkInternal(tokenizer, settings, errorLogger);
-
-        checkInternal.checkTokenMatchPatterns();
-        checkInternal.checkTokenSimpleMatchPatterns();
-        checkInternal.checkMissingPercentCharacter();
-        checkInternal.checkUnknownPattern();
-        checkInternal.checkRedundantNextPrevious();
-        checkInternal.checkExtraWhitespace();
-        checkInternal.checkRedundantTokCheck();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief %Check if a simple pattern is used inside Token::Match or Token::findmatch */
     void checkTokenMatchPatterns();
@@ -82,8 +69,7 @@ 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();
-private:
-    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);
@@ -93,18 +79,7 @@ class CPPCHECKLIB CheckInternal : public Check {
     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 {
-        CheckInternal c(nullptr, settings, errorLogger);
-        c.multiComparePatternError(nullptr, ";|%type%", "Match");
-        c.simplePatternError(nullptr, "class {", "Match");
-        c.complexPatternError(nullptr, "%type% ( )", "Match");
-        c.missingPercentCharacterError(nullptr, "%num", "Match");
-        c.unknownPatternError(nullptr, "%typ");
-        c.redundantNextPreviousError(nullptr, "previous", "next");
-        c.orInComplexPattern(nullptr, "||", "Match");
-        c.extraWhitespaceError(nullptr, "%str% ", "Match");
-        c.checkRedundantTokCheckError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "cppcheck internal API usage";
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
index 2a0fdc4d483..3662adfda8f 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-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
@@ -19,6 +19,8 @@
 //---------------------------------------------------------------------------
 #include "checkio.h"
 
+#include "astutils.h"
+#include "errortypes.h"
 #include "library.h"
 #include "mathlib.h"
 #include "platform.h"
@@ -36,7 +38,7 @@
 #include <list>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 #include <vector>
@@ -66,6 +68,8 @@ void CheckIO::checkCoutCerrMisusage()
     if (mTokenizer->isC())
         return;
 
+    logChecker("CheckIO::checkCoutCerrMisusage"); // c
+
     const SymbolDatabase * const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
@@ -92,7 +96,7 @@ void CheckIO::coutCerrMisusageError(const Token* tok, const std::string& streamN
 // fopen("","r"); fwrite(); <- write to read-only file (or vice versa)
 // fclose(); fread(); <- Use closed file
 //---------------------------------------------------------------------------
-enum class OpenMode { CLOSED, READ_MODE, WRITE_MODE, RW_MODE, UNKNOWN_OM };
+enum class OpenMode : std::uint8_t { CLOSED, READ_MODE, WRITE_MODE, RW_MODE, UNKNOWN_OM };
 static OpenMode getMode(const std::string& str)
 {
     if (str.find('+', 1) != std::string::npos)
@@ -104,19 +108,19 @@ static OpenMode getMode(const std::string& str)
     return OpenMode::UNKNOWN_OM;
 }
 
-struct Filepointer {
-    OpenMode mode;
-    nonneg int mode_indent;
-    enum class Operation {NONE, UNIMPORTANT, READ, WRITE, POSITIONING, OPEN, CLOSE, UNKNOWN_OP} lastOperation;
-    nonneg int op_indent;
-    enum class AppendMode { UNKNOWN_AM, APPEND, APPEND_EX };
-    AppendMode append_mode;
-    std::string filename;
-    explicit Filepointer(OpenMode mode_ = OpenMode::UNKNOWN_OM)
-        : mode(mode_), mode_indent(0), lastOperation(Operation::NONE), op_indent(0), append_mode(AppendMode::UNKNOWN_AM) {}
-};
-
 namespace {
+    struct Filepointer {
+        OpenMode mode;
+        nonneg int mode_indent{};
+        enum class Operation : std::uint8_t {NONE, UNIMPORTANT, READ, WRITE, POSITIONING, OPEN, CLOSE, UNKNOWN_OP} lastOperation = Operation::NONE;
+        nonneg int op_indent{};
+        enum class AppendMode : std::uint8_t { UNKNOWN_AM, APPEND, APPEND_EX };
+        AppendMode append_mode = AppendMode::UNKNOWN_AM;
+        std::string filename;
+        explicit Filepointer(OpenMode mode_ = OpenMode::UNKNOWN_OM)
+            : mode(mode_) {}
+    };
+
     const std::unordered_set<std::string> whitelist = { "clearerr", "feof", "ferror", "fgetpos", "ftell", "setbuf", "setvbuf", "ungetc", "ungetwc" };
 }
 
@@ -128,6 +132,8 @@ void CheckIO::checkFileUsage()
 
     std::map<int, Filepointer> filepointers;
 
+    logChecker("CheckIO::checkFileUsage");
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || !var->declarationId() || var->isArray() || !Token::simpleMatch(var->typeStartToken(), "FILE *"))
@@ -135,11 +141,11 @@ void CheckIO::checkFileUsage()
 
         if (var->isLocal()) {
             if (var->nameToken()->strAt(1) == "(") // initialize by calling "ctor"
-                filepointers.insert(std::make_pair(var->declarationId(), Filepointer(OpenMode::UNKNOWN_OM)));
+                filepointers.emplace(var->declarationId(), Filepointer(OpenMode::UNKNOWN_OM));
             else
-                filepointers.insert(std::make_pair(var->declarationId(), Filepointer(OpenMode::CLOSED)));
+                filepointers.emplace(var->declarationId(), Filepointer(OpenMode::CLOSED));
         } else {
-            filepointers.insert(std::make_pair(var->declarationId(), Filepointer(OpenMode::UNKNOWN_OM)));
+            filepointers.emplace(var->declarationId(), Filepointer(OpenMode::UNKNOWN_OM));
             // TODO: If all fopen calls we find open the file in the same type, we can set Filepointer::mode
         }
     }
@@ -147,6 +153,10 @@ void CheckIO::checkFileUsage()
     for (const Scope * scope : symbolDatabase->functionScopes) {
         int indent = 0;
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
+            if (Token::Match(tok, "%name% (") && isUnevaluated(tok)) {
+                tok = tok->linkAt(1);
+                continue;
+            }
             if (tok->str() == "{")
                 indent++;
             else if (tok->str() == "}") {
@@ -171,7 +181,7 @@ void CheckIO::checkFileUsage()
             } else if (Token::Match(tok, "%var% =") &&
                        (tok->strAt(2) != "fopen" && tok->strAt(2) != "freopen" && tok->strAt(2) != "tmpfile" &&
                         (windows ? (tok->str() != "_wfopen" && tok->str() != "_wfreopen") : true))) {
-                const std::map<int, Filepointer>::iterator i = filepointers.find(tok->varId());
+                const auto i = filepointers.find(tok->varId());
                 if (i != filepointers.end()) {
                     i->second.mode = OpenMode::UNKNOWN_OM;
                     i->second.lastOperation = Filepointer::Operation::UNKNOWN_OP;
@@ -271,16 +281,15 @@ void CheckIO::checkFileUsage()
                 if (!fileTok || !fileTok->varId() || fileTok->strAt(1) == "[")
                     continue;
 
-                if (filepointers.find(fileTok->varId()) == filepointers.end()) { // function call indicates: Its a File
-                    filepointers.insert(std::make_pair(fileTok->varId(), Filepointer(OpenMode::UNKNOWN_OM)));
-                }
+                // function call indicates: Its a File
+                filepointers.emplace(fileTok->varId(), Filepointer(OpenMode::UNKNOWN_OM));
 
                 Filepointer& f = filepointers[fileTok->varId()];
 
                 switch (operation) {
                 case Filepointer::Operation::OPEN:
                     if (fileNameTok) {
-                        for (std::map<int, Filepointer>::const_iterator it = filepointers.cbegin(); it != filepointers.cend(); ++it) {
+                        for (auto it = filepointers.cbegin(); it != filepointers.cend(); ++it) {
                             const Filepointer &fptr = it->second;
                             if (fptr.filename == fileNameTok->str() && (fptr.mode == OpenMode::RW_MODE || fptr.mode == OpenMode::WRITE_MODE))
                                 incompatibleFileOpenError(tok, fileNameTok->str());
@@ -401,9 +410,11 @@ void CheckIO::incompatibleFileOpenError(const Token *tok, const std::string &fil
 //---------------------------------------------------------------------------
 void CheckIO::invalidScanf()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("invalidscanf"))
         return;
 
+    logChecker("CheckIO::invalidScanf");
+
     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()) {
@@ -434,7 +445,7 @@ void CheckIO::invalidScanf()
                     format = false;
                 }
 
-                else if (std::isalpha((unsigned char)formatstr[i]) || formatstr[i] == '[') {
+                else if (std::isalpha(static_cast<unsigned char>(formatstr[i])) || formatstr[i] == '[') {
                     if (formatstr[i] == 's' || formatstr[i] == '[' || formatstr[i] == 'S' || (formatstr[i] == 'l' && formatstr[i+1] == 's'))  // #3490 - field width limits are only necessary for string input
                         invalidScanfError(tok);
                     format = false;
@@ -477,7 +488,7 @@ void CheckIO::invalidScanfError(const Token *tok)
 //---------------------------------------------------------------------------
 
 static bool findFormat(nonneg int arg, const Token *firstArg,
-                       const Token **formatStringTok, const Token **formatArgTok)
+                       const Token *&formatStringTok, const Token *&formatArgTok)
 {
     const Token* argTok = firstArg;
 
@@ -485,8 +496,8 @@ static bool findFormat(nonneg int arg, const Token *firstArg,
         argTok = argTok->nextArgument();
 
     if (Token::Match(argTok, "%str% [,)]")) {
-        *formatArgTok = argTok->nextArgument();
-        *formatStringTok = argTok;
+        formatArgTok = argTok->nextArgument();
+        formatStringTok = argTok;
         return true;
     }
     if (Token::Match(argTok, "%var% [,)]") &&
@@ -496,13 +507,13 @@ 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();
+        formatArgTok = argTok->nextArgument();
         if (!argTok->values().empty()) {
-            const std::list<ValueFlow::Value>::const_iterator value = std::find_if(
+            const auto value = std::find_if(
                 argTok->values().cbegin(), argTok->values().cend(), std::mem_fn(&ValueFlow::Value::isTokValue));
             if (value != argTok->values().cend() && value->isTokValue() && value->tokvalue &&
                 value->tokvalue->tokType() == Token::eString) {
-                *formatStringTok = value->tokvalue;
+                formatStringTok = value->tokvalue;
             }
         }
         return true;
@@ -521,6 +532,8 @@ void CheckIO::checkWrongPrintfScanfArguments()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     const bool isWindows = mSettings->platform.isWindows();
 
+    logChecker("CheckIO::checkWrongPrintfScanfArguments");
+
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             if (!tok->isName()) continue;
@@ -540,37 +553,37 @@ void CheckIO::checkWrongPrintfScanfArguments()
 
             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, 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, tok->tokAt(2), formatStringTok, argListTok))
                         continue;
                 } else {
                     // Find fourth parameter and format string
-                    if (!findFormat(2, tok->tokAt(2), &formatStringTok, &argListTok))
+                    if (!findFormat(2, 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, 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, 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, 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, tok->tokAt(2), formatStringTok, argListTok)) {
                     if (!formatStringTok)
                         continue;
                 }
@@ -602,7 +615,7 @@ void CheckIO::checkFormatString(const Token * const tok,
     bool percent = false;
     const Token* argListTok2 = argListTok;
     std::set<int> parameterPositionsUsed;
-    for (std::string::const_iterator i = formatString.cbegin(); i != formatString.cend(); ++i) {
+    for (auto i = formatString.cbegin(); i != formatString.cend(); ++i) {
         if (*i == '%') {
             percent = !percent;
         } else if (percent && *i == '[') {
@@ -632,7 +645,7 @@ void CheckIO::checkFormatString(const Token * const tok,
             std::string width;
             int parameterPosition = 0;
             bool hasParameterPosition = false;
-            while (i != formatString.cend() && *i != '[' && !std::isalpha((unsigned char)*i)) {
+            while (i != formatString.cend() && *i != '[' && !std::isalpha(static_cast<unsigned char>(*i))) {
                 if (*i == '*') {
                     skip = true;
                     if (scan)
@@ -684,9 +697,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)) || *i == ']') {
                     if (scan) {
                         std::string specifier;
                         bool done = false;
@@ -1330,15 +1343,8 @@ 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)
-    : variableInfo(nullptr)
-    , typeToken(nullptr)
-    , functionInfo(nullptr)
-    , tempToken(nullptr)
-    , element(false)
-    , _template(false)
-    , address(false)
-    , isCPP(_isCPP)
+CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings, bool _isCPP)
+    : isCPP(_isCPP)
 {
     if (!arg)
         return;
@@ -1353,7 +1359,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
             top = top->astParent();
         const ValueType *valuetype = top->argumentType();
         if (valuetype && valuetype->type >= ValueType::Type::BOOL) {
-            typeToken = tempToken = new Token();
+            typeToken = tempToken = new Token(top);
             if (valuetype->pointer && valuetype->constness & 1) {
                 tempToken->str("const");
                 tempToken->insertToken("a");
@@ -1393,7 +1399,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;
         }
@@ -1427,7 +1433,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
         const Token *tok1 = arg->next();
         for (; tok1; tok1 = tok1->next()) {
             if (tok1->str() == "," || tok1->str() == ")") {
-                if (tok1->previous()->str() == "]") {
+                if (tok1->strAt(-1) == "]") {
                     varTok = tok1->linkAt(-1)->previous();
                     if (varTok->str() == ")" && varTok->link()->previous()->tokType() == Token::eFunction) {
                         const Function * function = varTok->link()->previous()->function();
@@ -1435,9 +1441,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
                             if (function->retType->classScope->enumType)
                                 typeToken = function->retType->classScope->enumType;
                             else {
-                                tempToken = new Token();
-                                tempToken->fileIndex(tok1->fileIndex());
-                                tempToken->linenr(tok1->linenr());
+                                tempToken = new Token(tok1);
                                 tempToken->str("int");
                                 typeToken = tempToken;
                             }
@@ -1450,15 +1454,13 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
                         }
                         return;
                     }
-                } else if (tok1->previous()->str() == ")" && tok1->linkAt(-1)->previous()->tokType() == Token::eFunction) {
+                } else if (tok1->strAt(-1) == ")" && tok1->linkAt(-1)->previous()->tokType() == Token::eFunction) {
                     const Function * function = tok1->linkAt(-1)->previous()->function();
                     if (function && function->retType && function->retType->isEnumType()) {
                         if (function->retType->classScope->enumType)
                             typeToken = function->retType->classScope->enumType;
                         else {
-                            tempToken = new Token();
-                            tempToken->fileIndex(tok1->fileIndex());
-                            tempToken->linenr(tok1->linenr());
+                            tempToken = new Token(tok1);
                             tempToken->str("int");
                             typeToken = tempToken;
                         }
@@ -1481,18 +1483,16 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
 
             // check for some common well known functions
             else if (isCPP && ((Token::Match(tok1->previous(), "%var% . size|empty|c_str ( ) [,)]") && isStdContainer(tok1->previous())) ||
-                               (Token::Match(tok1->previous(), "] . size|empty|c_str ( ) [,)]") && isStdContainer(tok1->previous()->link()->previous())))) {
-                tempToken = new Token();
-                tempToken->fileIndex(tok1->fileIndex());
-                tempToken->linenr(tok1->linenr());
-                if (tok1->next()->str() == "size") {
+                               (Token::Match(tok1->previous(), "] . size|empty|c_str ( ) [,)]") && isStdContainer(tok1->linkAt(-1)->previous())))) {
+                tempToken = new Token(tok1);
+                if (tok1->strAt(1) == "size") {
                     // size_t is platform dependent
-                    if (settings->platform.sizeof_size_t == 8) {
+                    if (settings.platform.sizeof_size_t == 8) {
                         tempToken->str("long");
-                        if (settings->platform.sizeof_long != 8)
+                        if (settings.platform.sizeof_long != 8)
                             tempToken->isLong(true);
-                    } else if (settings->platform.sizeof_size_t == 4) {
-                        if (settings->platform.sizeof_long == 4) {
+                    } else if (settings.platform.sizeof_size_t == 4) {
+                        if (settings.platform.sizeof_long == 4) {
                             tempToken->str("long");
                         } else {
                             tempToken->str("int");
@@ -1501,9 +1501,9 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
 
                     tempToken->originalName("size_t");
                     tempToken->isUnsigned(true);
-                } else if (tok1->next()->str() == "empty") {
+                } else if (tok1->strAt(1) == "empty") {
                     tempToken->str("bool");
-                } else if (tok1->next()->str() == "c_str") {
+                } else if (tok1->strAt(1) == "c_str") {
                     tempToken->str("const");
                     tempToken->insertToken("*");
                     if (typeToken->strAt(2) == "string")
@@ -1533,7 +1533,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
 
         if (varTok) {
             variableInfo = varTok->variable();
-            element = tok1->previous()->str() == "]";
+            element = tok1->strAt(-1) == "]";
 
             // look for std::vector operator [] and use template type as return type
             if (variableInfo) {
@@ -1543,9 +1543,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings *settings,
                     if (variableInfo->type() && variableInfo->type()->classScope && variableInfo->type()->classScope->enumType)
                         typeToken = variableInfo->type()->classScope->enumType;
                     else {
-                        tempToken = new Token();
-                        tempToken->fileIndex(tok1->fileIndex());
-                        tempToken->linenr(tok1->linenr());
+                        tempToken = new Token(tok1);
                         tempToken->str("int");
                         typeToken = tempToken;
                     }
@@ -1583,9 +1581,7 @@ bool CheckIO::ArgumentInfo::isStdVectorOrString()
         return true;
     }
     if (variableInfo->isStlType(stl_string)) {
-        tempToken = new Token();
-        tempToken->fileIndex(variableInfo->typeStartToken()->fileIndex());
-        tempToken->linenr(variableInfo->typeStartToken()->linenr());
+        tempToken = new Token(variableInfo->typeStartToken());
         if (variableInfo->typeStartToken()->strAt(2) == "string")
             tempToken->str("char");
         else
@@ -1603,9 +1599,7 @@ bool CheckIO::ArgumentInfo::isStdVectorOrString()
                 return true;
             }
             if (Token::Match(nameTok, "std :: string|wstring")) {
-                tempToken = new Token();
-                tempToken->fileIndex(variableInfo->typeStartToken()->fileIndex());
-                tempToken->linenr(variableInfo->typeStartToken()->linenr());
+                tempToken = new Token(variableInfo->typeStartToken());
                 if (nameTok->strAt(2) == "string")
                     tempToken->str("char");
                 else
@@ -1706,9 +1700,9 @@ bool CheckIO::ArgumentInfo::isKnownType() const
     return typeToken->isStandardType() || Token::Match(typeToken, "std :: string|wstring");
 }
 
-bool CheckIO::ArgumentInfo::isLibraryType(const Settings *settings) const
+bool CheckIO::ArgumentInfo::isLibraryType(const Settings &settings) const
 {
-    return typeToken && typeToken->isStandardType() && settings->library.podtype(typeToken->str());
+    return typeToken && typeToken->isStandardType() && settings.library.podtype(typeToken->str());
 }
 
 void CheckIO::wrongPrintfScanfArgumentsError(const Token* tok,
@@ -1716,8 +1710,8 @@ void CheckIO::wrongPrintfScanfArgumentsError(const Token* tok,
                                              nonneg int numFormat,
                                              nonneg int numFunction)
 {
-    const Severity::SeverityType severity = numFormat > numFunction ? Severity::error : Severity::warning;
-    if (severity != Severity::error && !mSettings->severity.isEnabled(Severity::warning))
+    const Severity severity = numFormat > numFunction ? Severity::error : Severity::warning;
+    if (severity != Severity::error && !mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("wrongPrintfScanfArgNum"))
         return;
 
     std::ostringstream errmsg;
@@ -1736,7 +1730,7 @@ void CheckIO::wrongPrintfScanfArgumentsError(const Token* tok,
 void CheckIO::wrongPrintfScanfPosixParameterPositionError(const Token* tok, const std::string& functionName,
                                                           nonneg int index, nonneg int numFunction)
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("wrongPrintfScanfParameterPositionError"))
         return;
     std::ostringstream errmsg;
     errmsg << functionName << ": ";
@@ -1750,7 +1744,7 @@ void CheckIO::wrongPrintfScanfPosixParameterPositionError(const Token* tok, cons
 
 void CheckIO::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1766,7 +1760,7 @@ void CheckIO::invalidScanfArgTypeError_s(const Token* tok, nonneg int numFormat,
 }
 void CheckIO::invalidScanfArgTypeError_int(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo, bool isUnsigned)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1811,7 +1805,7 @@ void CheckIO::invalidScanfArgTypeError_int(const Token* tok, nonneg int numForma
 }
 void CheckIO::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1830,7 +1824,7 @@ void CheckIO::invalidScanfArgTypeError_float(const Token* tok, nonneg int numFor
 
 void CheckIO::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1841,7 +1835,7 @@ void CheckIO::invalidPrintfArgTypeError_s(const Token* tok, nonneg int numFormat
 }
 void CheckIO::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1852,7 +1846,7 @@ void CheckIO::invalidPrintfArgTypeError_n(const Token* tok, nonneg int numFormat
 }
 void CheckIO::invalidPrintfArgTypeError_p(const Token* tok, nonneg int numFormat, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1902,7 +1896,7 @@ static void printfFormatType(std::ostream& os, const std::string& specifier, boo
 
 void CheckIO::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1916,7 +1910,7 @@ void CheckIO::invalidPrintfArgTypeError_uint(const Token* tok, nonneg int numFor
 
 void CheckIO::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1929,7 +1923,7 @@ void CheckIO::invalidPrintfArgTypeError_sint(const Token* tok, nonneg int numFor
 }
 void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFormat, const std::string& specifier, const ArgumentInfo* argInfo)
 {
-    const Severity::SeverityType severity = getSeverity(argInfo);
+    const Severity severity = getSeverity(argInfo);
     if (!mSettings->severity.isEnabled(severity))
         return;
     std::ostringstream errmsg;
@@ -1942,7 +1936,7 @@ void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, nonneg int numFo
     reportError(tok, severity, "invalidPrintfArgType_float", errmsg.str(), CWE686, Certainty::normal);
 }
 
-Severity::SeverityType CheckIO::getSeverity(const CheckIO::ArgumentInfo *argInfo)
+Severity CheckIO::getSeverity(const CheckIO::ArgumentInfo *argInfo)
 {
     return (argInfo && argInfo->typeToken && !argInfo->typeToken->originalName().empty()) ? Severity::portability : Severity::warning;
 }
@@ -1999,7 +1993,7 @@ void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
 
 void CheckIO::invalidLengthModifierError(const Token* tok, nonneg int numFormat, const std::string& modifier)
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    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.";
@@ -2029,3 +2023,41 @@ void CheckIO::invalidScanfFormatWidthError(const Token* tok, nonneg int numForma
         reportError(tok, Severity::error, "invalidScanfFormatWidth", errmsg.str(), CWE687, Certainty::normal);
     }
 }
+
+void CheckIO::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckIO checkIO(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    checkIO.checkWrongPrintfScanfArguments();
+    checkIO.checkCoutCerrMisusage();
+    checkIO.checkFileUsage();
+    checkIO.invalidScanf();
+}
+
+void CheckIO::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckIO 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.seekOnAppendedFileError(nullptr);
+    c.incompatibleFileOpenError(nullptr, "tmp");
+    c.invalidScanfError(nullptr);
+    c.wrongPrintfScanfArgumentsError(nullptr, "printf",3,2);
+    c.invalidScanfArgTypeError_s(nullptr,  1, "s", nullptr);
+    c.invalidScanfArgTypeError_int(nullptr,  1, "d", nullptr, false);
+    c.invalidScanfArgTypeError_float(nullptr,  1, "f", nullptr);
+    c.invalidPrintfArgTypeError_s(nullptr,  1, nullptr);
+    c.invalidPrintfArgTypeError_n(nullptr,  1, nullptr);
+    c.invalidPrintfArgTypeError_p(nullptr,  1, nullptr);
+    c.invalidPrintfArgTypeError_uint(nullptr,  1, "u", nullptr);
+    c.invalidPrintfArgTypeError_sint(nullptr,  1, "i", nullptr);
+    c.invalidPrintfArgTypeError_float(nullptr,  1, "f", nullptr);
+    c.invalidLengthModifierError(nullptr,  1, "I");
+    c.invalidScanfFormatWidthError(nullptr,  10, 5, nullptr, "s");
+    c.invalidScanfFormatWidthError(nullptr,  99, -1, nullptr, "s");
+    c.wrongPrintfScanfPosixParameterPositionError(nullptr,  "printf", 2, 1);
+}
diff --git a/lib/checkio.h b/lib/checkio.h
index 9e9b07a2581..e37a942770b 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-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
@@ -23,40 +23,37 @@
 
 #include "check.h"
 #include "config.h"
-#include "errortypes.h"
 
+#include <cstdint>
 #include <ostream>
 #include <string>
 
 class Function;
 class Settings;
 class Token;
-class Tokenizer;
 class Variable;
 class ErrorLogger;
+class Tokenizer;
+enum class Severity : std::uint8_t;
 
 /// @addtogroup Checks
 /// @{
 
 /** @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()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckIO checkIO(tokenizer, settings, errorLogger);
-
-        checkIO.checkWrongPrintfScanfArguments();
-        checkIO.checkCoutCerrMisusage();
-        checkIO.checkFileUsage();
-        checkIO.invalidScanf();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief %Check for missusage of std::cout */
     void checkCoutCerrMisusage();
@@ -70,10 +67,9 @@ class CPPCHECKLIB CheckIO : public Check {
     /** @brief %Checks type and number of arguments given to functions like printf or scanf*/
     void checkWrongPrintfScanfArguments();
 
-private:
     class ArgumentInfo {
     public:
-        ArgumentInfo(const Token *arg, const Settings *settings, bool _isCPP);
+        ArgumentInfo(const Token *arg, const Settings &settings, bool _isCPP);
         ~ArgumentInfo();
 
         ArgumentInfo(const ArgumentInfo &) = delete;
@@ -84,23 +80,23 @@ class CPPCHECKLIB CheckIO : public Check {
         bool isKnownType() const;
         bool isStdVectorOrString();
         bool isStdContainer(const Token *tok);
-        bool isLibraryType(const Settings *settings) const;
-
-        const Variable *variableInfo;
-        const Token *typeToken;
-        const Function *functionInfo;
-        Token *tempToken;
-        bool element;
-        bool _template;
-        bool address;
-        bool isCPP;
+        bool isLibraryType(const Settings &settings) const;
+
+        const Variable* variableInfo{};
+        const Token* typeToken{};
+        const Function* functionInfo{};
+        Token* tempToken{};
+        bool element{};
+        bool _template{};
+        bool address{};
+        bool isCPP{};
     };
 
-    void checkFormatString(const Token * const tok,
-                           const Token * const formatStringTok,
-                           const Token *       argListTok,
-                           const bool scan,
-                           const bool scanf_s);
+    void checkFormatString(const Token * tok,
+                           const Token * formatStringTok,
+                           const Token * argListTok,
+                           bool scan,
+                           bool scanf_s);
 
     // Reporting errors..
     void coutCerrMisusageError(const Token* tok, const std::string& streamName);
@@ -130,34 +126,9 @@ class CPPCHECKLIB CheckIO : public Check {
     void invalidLengthModifierError(const Token* tok, nonneg int numFormat, const std::string& modifier);
     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::SeverityType getSeverity(const ArgumentInfo *argInfo);
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckIO 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.seekOnAppendedFileError(nullptr);
-        c.incompatibleFileOpenError(nullptr, "tmp");
-        c.invalidScanfError(nullptr);
-        c.wrongPrintfScanfArgumentsError(nullptr, "printf",3,2);
-        c.invalidScanfArgTypeError_s(nullptr,  1, "s", nullptr);
-        c.invalidScanfArgTypeError_int(nullptr,  1, "d", nullptr, false);
-        c.invalidScanfArgTypeError_float(nullptr,  1, "f", nullptr);
-        c.invalidPrintfArgTypeError_s(nullptr,  1, nullptr);
-        c.invalidPrintfArgTypeError_n(nullptr,  1, nullptr);
-        c.invalidPrintfArgTypeError_p(nullptr,  1, nullptr);
-        c.invalidPrintfArgTypeError_uint(nullptr,  1, "u", nullptr);
-        c.invalidPrintfArgTypeError_sint(nullptr,  1, "i", nullptr);
-        c.invalidPrintfArgTypeError_float(nullptr,  1, "f", nullptr);
-        c.invalidLengthModifierError(nullptr,  1, "I");
-        c.invalidScanfFormatWidthError(nullptr,  10, 5, nullptr, "s");
-        c.invalidScanfFormatWidthError(nullptr,  99, -1, nullptr, "s");
-        c.wrongPrintfScanfPosixParameterPositionError(nullptr,  "printf", 2, 1);
-    }
+    static Severity getSeverity(const ArgumentInfo *argInfo);
+
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "IO using format string";
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index ae53485d7c1..83f7227091c 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-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
@@ -32,14 +32,13 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "vfvalue.h"
+#include "tokenlist.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <array>
 #include <cstddef>
-#include <iostream>
 #include <list>
-#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
@@ -53,11 +52,28 @@ static const CWE CWE672(672U);
 static const CWE CWE415(415U);
 
 // Hardcoded allocation types (not from library)
-static const int NEW_ARRAY = -2;
-static const int NEW = -1;
+static constexpr int NEW_ARRAY = -2;
+static constexpr int NEW = -1;
 
 static const std::array<std::pair<std::string, std::string>, 4> alloc_failed_conds {{{"==", "0"}, {"<", "0"}, {"==", "-1"}, {"<=", "-1"}}};
-static const std::array<std::pair<std::string, std::string>, 4> alloc_success_conds {{{"!=", "0"}, {">", "0"}, {"!=", "-1"}, {">=", "0"}}};
+static const std::array<std::pair<std::string, std::string>, 5> alloc_success_conds {{{"!=", "0"}, {">", "0"}, {"!=", "-1"}, {">=", "0"}, {">", "-1"}}};
+
+static bool isAutoDeallocType(const Type* type) {
+    if (!type || !type->classScope)
+        return true;
+    if (type->classScope->numConstructors > 0)
+        return true;
+    const std::list<Variable>& varlist = type->classScope->varlist;
+    if (std::any_of(varlist.begin(), varlist.end(), [](const Variable& v) {
+        return !v.valueType() || (!v.valueType()->isPrimitive() && !v.valueType()->container);
+    }))
+        return true;
+    if (std::none_of(type->derivedFrom.cbegin(), type->derivedFrom.cend(), [](const Type::BaseInfo& bi) {
+        return isAutoDeallocType(bi.type);
+    }))
+        return false;
+    return true;
+}
 
 /**
  * @brief Is variable type some class with automatic deallocation?
@@ -71,14 +87,8 @@ static bool isAutoDealloc(const Variable *var)
 
     // return false if the type is a simple record type without side effects
     // a type that has no side effects (no constructors and no members with constructors)
-    /** @todo false negative: check base class for side effects */
     /** @todo false negative: check constructors for side effects */
-    if (var->typeScope() && var->typeScope()->numConstructors == 0 &&
-        (var->typeScope()->varlist.empty() || var->type()->needInitialization == Type::NeedInitialization::True) &&
-        var->type()->derivedFrom.empty())
-        return false;
-
-    return true;
+    return isAutoDeallocType(var->type());
 }
 
 template<std::size_t N>
@@ -92,51 +102,10 @@ static bool isVarTokComparison(const Token * tok, const Token ** vartok,
 
 //---------------------------------------------------------------------------
 
-void VarInfo::print()
-{
-    std::cout << "size=" << alloctype.size() << std::endl;
-    for (std::map<int, AllocInfo>::const_iterator it = alloctype.cbegin(); it != alloctype.cend(); ++it) {
-        std::string strusage;
-        const auto use = possibleUsage.find(it->first);
-        if (use != possibleUsage.end())
-            strusage = use->second.first;
-
-        std::string status;
-        switch (it->second.status) {
-        case OWNED:
-            status = "owned";
-            break;
-        case DEALLOC:
-            status = "dealloc";
-            break;
-        case ALLOC:
-            status = "alloc";
-            break;
-        case NOALLOC:
-            status = "noalloc";
-            break;
-        case REALLOC:
-            status = "realloc";
-            break;
-        default:
-            status = "?";
-            break;
-        }
-
-        std::cout << "status=" << status << " "
-                  << "alloctype='" << it->second.type << "' "
-                  << "possibleUsage='" << strusage << "' "
-                  << "conditionalAlloc=" << (conditionalAlloc.find(it->first) != conditionalAlloc.end() ? "yes" : "no") << " "
-                  << "referenced=" << (referenced.find(it->first) != referenced.end() ? "yes" : "no") << " "
-                  << "reallocedFrom=" << it->second.reallocedFromType
-                  << std::endl;
-    }
-}
-
-void VarInfo::possibleUsageAll(const std::pair<std::string, Usage>& functionUsage)
+void VarInfo::possibleUsageAll(const std::pair<const Token*, Usage>& functionUsage)
 {
     possibleUsage.clear();
-    for (std::map<int, AllocInfo>::const_iterator it = alloctype.cbegin(); it != alloctype.cend(); ++it)
+    for (auto it = alloctype.cbegin(); it != alloctype.cend(); ++it)
         possibleUsage[it->first] = functionUsage;
 }
 
@@ -169,13 +138,17 @@ void CheckLeakAutoVar::deallocReturnError(const Token *tok, const Token *dealloc
     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<std::string, VarInfo::Usage>& functionUsage)
+void CheckLeakAutoVar::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";
+        if (funcStr.empty())
+            funcStr = "unknown::" + functionUsage.first->str();
         reportError(tok,
                     Severity::information,
                     "checkLibraryUseIgnore",
-                    "--check-library: Function " + functionUsage.first + "() should have <use>/<leak-ignore> configuration");
+                    "--check-library: Function " + funcStr + "() should have <use>/<leak-ignore> configuration");
     }
 }
 
@@ -195,6 +168,8 @@ void CheckLeakAutoVar::check()
     if (mSettings->clang)
         return;
 
+    logChecker("CheckLeakAutoVar::check"); // notclang
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Local variables that are known to be non-zero.
@@ -236,7 +211,7 @@ static bool isPointerReleased(const Token *startToken, const Token *endToken, no
     return false;
 }
 
-static bool isLocalVarNoAutoDealloc(const Token *varTok, const bool isCpp)
+static bool isLocalVarNoAutoDealloc(const Token *varTok)
 {
     // not a local variable nor argument?
     const Variable *var = varTok->variable();
@@ -250,9 +225,9 @@ static bool isLocalVarNoAutoDealloc(const Token *varTok, const bool isCpp)
         return false;
 
     // non-pod variable
-    if (isCpp) {
+    if (varTok->isCpp()) {
         // Possibly automatically deallocated memory
-        if (isAutoDealloc(var) && Token::Match(varTok, "%var% = new"))
+        if (isAutoDealloc(var) && Token::Match(varTok, "%var% [=({] new"))
             return false;
         if (!var->isPointer() && !var->typeStartToken()->isStandardType())
             return false;
@@ -278,7 +253,7 @@ static const Token * isFunctionCall(const Token * nameToken)
             nameToken = nameToken->link()->next();
         }
         // check for '('
-        if (nameToken && nameToken->link() && nameToken->str() == "(") {
+        if (nameToken && nameToken->link() && !nameToken->isCast() && nameToken->str() == "(") {
             // returning opening parenthesis pointer
             return nameToken;
         }
@@ -286,6 +261,30 @@ static const Token * isFunctionCall(const Token * nameToken)
     return nullptr;
 }
 
+static const Token* getOutparamAllocation(const Token* tok, const Settings& settings)
+{
+    if (!tok)
+        return nullptr;
+    int argn{};
+    const Token* ftok = getTokenArgumentFunction(tok, argn);
+    if (!ftok)
+        return nullptr;
+    if (const Library::AllocFunc* allocFunc = settings.library.getAllocFuncInfo(ftok)) {
+        if (allocFunc->arg == argn + 1)
+            return ftok;
+    }
+    return nullptr;
+}
+
+static const Token* getReturnValueFromOutparamAlloc(const Token* alloc, const Settings& settings)
+{
+    if (const Token* ftok = getOutparamAllocation(alloc, settings)) {
+        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,
@@ -293,8 +292,11 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 {
 #if ASAN
     static const nonneg int recursiveLimit = 300;
+#elif defined(__MINGW32__)
+    // testrunner crashes with stack overflow in CI
+    static constexpr nonneg int recursiveLimit = 600;
 #else
-    static const nonneg int recursiveLimit = 1000;
+    static constexpr nonneg int recursiveLimit = 1000;
 #endif
     if (++recursiveCount > recursiveLimit)    // maximum number of "else if ()"
         throw InternalError(startToken, "Internal limit: CheckLeakAutoVar::checkScope() Maximum recursive count of 1000 reached.", InternalError::LIMIT);
@@ -314,7 +316,8 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
         // check each token
         {
-            const Token * nextTok = checkTokenInsideExpression(tok, varInfo);
+            const bool isInit = Token::Match(tok, "%var% {|(") && tok->variable() && tok == tok->variable()->nameToken() && tok->variable()->isPointer();
+            const Token * nextTok = isInit ? nullptr : checkTokenInsideExpression(tok, varInfo);
             if (nextTok) {
                 tok = nextTok;
                 continue;
@@ -323,26 +326,33 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
 
         // look for end of statement
-        if (!Token::Match(tok, "[;{},]") || Token::Match(tok->next(), "[;{},]"))
+        const bool isInit = Token::Match(tok->tokAt(-1), "%var% {|(") && tok->tokAt(-1)->variable() && tok->tokAt(-1) == tok->tokAt(-1)->variable()->nameToken();
+        if ((!Token::Match(tok, "[;{},]") || Token::Match(tok->next(), "[;{},]")) && !(isInit && tok->str() == "("))
             continue;
 
         if (Token::Match(tok, "[;{},] %var% ["))
             continue;
 
-        tok = tok->next();
+        if (!isInit)
+            tok = tok->next();
         if (!tok || tok == endToken)
             break;
 
+        if (Token::Match(tok, "%name% (") && isUnevaluated(tok)) {
+            tok = tok->linkAt(1);
+            continue;
+        }
+
         if (Token::Match(tok, "const %type%"))
             tok = tok->tokAt(2);
 
-        while (tok->str() == "(")
+        while (!isInit && tok->str() == "(")
             tok = tok->next();
         while (tok->isUnaryOp("*") && tok->astOperand1()->isUnaryOp("&"))
             tok = tok->astOperand1()->astOperand1();
 
         // parse statement, skip to last member
-        const Token *varTok = tok;
+        const Token* varTok = isInit ? tok->tokAt(-1) : tok;
         while (Token::Match(varTok, "%name% ::|. %name% !!("))
             varTok = varTok->tokAt(2);
 
@@ -352,6 +362,50 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
         while (Token::Match(ftok, "%name% :: %name%"))
             ftok = ftok->tokAt(2);
 
+        // bailout for variable passed to library function with out parameter
+        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);
+            const std::map<int, ArgumentChecks> &argChecks = libFunc->argumentChecks;
+            bool hasOutParam = std::any_of(argChecks.cbegin(), argChecks.cend(), [](const std::pair<int, ArgumentChecks> &pair) {
+                return std::any_of(pair.second.direction.cbegin(), pair.second.direction.cend(), [](const Direction dir) {
+                    return dir == Direction::DIR_OUT;
+                });
+            });
+            if (hasOutParam) {
+                for (int i = 0; i < args.size(); i++) {
+                    if (!argChecks.count(i + 1))
+                        continue;
+                    const ArgumentChecks argCheck = argChecks.at(i + 1);
+                    const bool isInParam = std::any_of(argCheck.direction.cbegin(), argCheck.direction.cend(), [&](const Direction dir) {
+                        return dir == Direction::DIR_IN;
+                    });
+                    if (!isInParam)
+                        continue;
+                    const Token *inTok = args[i];
+                    int indirect = 0;
+                    while (inTok->isUnaryOp("&")) {
+                        inTok = inTok->astOperand1();
+                        indirect++;
+                    }
+                    if (inTok->isVariable() && indirect) {
+                        varInfo.erase(inTok->varId());
+                    }
+                }
+            }
+        }
+
+        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;
@@ -367,12 +421,10 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
         };
 
         // assignment..
-        if (const Token* const tokAssignOp = isAssignment(varTok)) {
+        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% [+;]")) {
+            if (Token::Match(tokAssignOp, "= %var% +|;|?|%comp%")) {
                 if (varTok->tokAt(2)->varId() != varTok->varId()) {
                     // If variable points at allocated memory => error
                     leakIfAllocated(varTok, varInfo);
@@ -403,7 +455,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 leakIfAllocated(varTok, varInfo);
             varInfo.erase(varTok->varId());
 
-            if (!isLocalVarNoAutoDealloc(varTok, mTokenizer->isCPP()))
+            if (!isLocalVarNoAutoDealloc(varTok))
                 continue;
 
             // allocation?
@@ -418,7 +470,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 }
 
                 changeAllocStatusIfRealloc(alloctype, fTok, varTok);
-            } else if (mTokenizer->isCPP() && Token::Match(varTok->tokAt(2), "new !!(")) {
+            } else if (varTok->isCpp() && Token::Match(varTok->tokAt(2), "new !!(")) {
                 const Token* tok2 = varTok->tokAt(2)->astOperand1();
                 const bool arrayNew = (tok2 && (tok2->str() == "[" || (Token::Match(tok2, "(|{") && tok2->astOperand1() && tok2->astOperand1()->str() == "[")));
                 VarInfo::AllocInfo& varAlloc = alloctype[varTok->varId()];
@@ -429,7 +481,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
             // Assigning non-zero value variable. It might be used to
             // track the execution for a later if condition.
-            if (Token::Match(varTok->tokAt(2), "%num% ;") && MathLib::toLongNumber(varTok->strAt(2)) != 0)
+            if (Token::Match(varTok->tokAt(2), "%num% ;") && MathLib::toBigNumber(varTok->tokAt(2)) != 0)
                 notzero.insert(varTok->varId());
             else if (Token::Match(varTok->tokAt(2), "- %type% ;") && varTok->tokAt(3)->isUpperCaseName())
                 notzero.insert(varTok->varId());
@@ -439,13 +491,30 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
 
         // if/else
         else if (Token::simpleMatch(tok, "if (")) {
+
+            bool skipIfBlock = false;
+            bool skipElseBlock = false;
+            const Token *condTok = tok->astSibling();
+
+            if (condTok && condTok->hasKnownIntValue()) {
+                skipIfBlock = !condTok->getKnownIntValue();
+                skipElseBlock = !skipIfBlock;
+            }
+
             // Parse function calls inside the condition
 
             const Token * closingParenthesis = tok->linkAt(1);
             for (const Token *innerTok = tok->tokAt(2); innerTok && innerTok != closingParenthesis; innerTok = innerTok->next()) {
+                if (isUnevaluated(innerTok)) {
+                    innerTok = innerTok->linkAt(1);
+                    continue;
+                }
                 // TODO: replace with checkTokenInsideExpression()
+                const Token* const openingPar = isFunctionCall(innerTok);
+                if (!openingPar)
+                    checkTokenInsideExpression(innerTok, varInfo);
 
-                if (!isLocalVarNoAutoDealloc(innerTok, mTokenizer->isCPP()))
+                if (!isLocalVarNoAutoDealloc(innerTok))
                     continue;
 
                 // Check assignments in the if-statement. Skip multiple assignments since we don't track those
@@ -469,7 +538,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                             alloctype.erase(innerTok->varId());
                         }
                         changeAllocStatusIfRealloc(alloctype, fTok, varTok);
-                    } else if (mTokenizer->isCPP() && Token::Match(innerTok->tokAt(2), "new !!(")) {
+                    } else if (innerTok->isCpp() && Token::Match(innerTok->tokAt(2), "new !!(")) {
                         const Token* tok2 = innerTok->tokAt(2)->astOperand1();
                         const bool arrayNew = (tok2 && (tok2->str() == "[" || (tok2->str() == "(" && tok2->astOperand1() && tok2->astOperand1()->str() == "[")));
                         VarInfo::AllocInfo& varAlloc = alloctype[innerTok->varId()];
@@ -480,7 +549,6 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 }
 
                 // check for function call
-                const Token * const openingPar = isFunctionCall(innerTok);
                 if (openingPar) {
                     const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(innerTok);
                     // innerTok is a function name
@@ -532,6 +600,15 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                         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();
+                        }
                     } else if (isVarTokComparison(tok3, &vartok, alloc_failed_conds)) {
                         varInfo1.reallocToAlloc(vartok->varId());
                         varInfo1.erase(vartok->varId());
@@ -539,13 +616,13 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                     return ChildrenToVisit::none;
                 });
 
-                if (!checkScope(closingParenthesis->next(), varInfo1, notzero, recursiveCount)) {
+                if (!skipIfBlock && !checkScope(closingParenthesis->next(), varInfo1, notzero, recursiveCount)) {
                     varInfo.clear();
                     continue;
                 }
                 closingParenthesis = closingParenthesis->linkAt(1);
                 if (Token::simpleMatch(closingParenthesis, "} else {")) {
-                    if (!checkScope(closingParenthesis->tokAt(2), varInfo2, notzero, recursiveCount)) {
+                    if (!skipElseBlock && !checkScope(closingParenthesis->tokAt(2), varInfo2, notzero, recursiveCount)) {
                         varInfo.clear();
                         return false;
                     }
@@ -557,9 +634,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 VarInfo old;
                 old.swap(varInfo);
 
-                std::map<int, VarInfo::AllocInfo>::const_iterator it;
-
-                for (it = old.alloctype.cbegin(); it != old.alloctype.cend(); ++it) {
+                for (auto it = old.alloctype.cbegin(); it != old.alloctype.cend(); ++it) {
                     const int varId = it->first;
                     if (old.conditionalAlloc.find(varId) == old.conditionalAlloc.end())
                         continue;
@@ -571,7 +646,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 }
 
                 // Conditional allocation in varInfo1
-                for (it = varInfo1.alloctype.cbegin(); it != varInfo1.alloctype.cend(); ++it) {
+                for (auto it = varInfo1.alloctype.cbegin(); it != varInfo1.alloctype.cend(); ++it) {
                     if (varInfo2.alloctype.find(it->first) == varInfo2.alloctype.end() &&
                         old.alloctype.find(it->first) == old.alloctype.end()) {
                         varInfo.conditionalAlloc.insert(it->first);
@@ -579,7 +654,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 }
 
                 // Conditional allocation in varInfo2
-                for (it = varInfo2.alloctype.cbegin(); it != varInfo2.alloctype.cend(); ++it) {
+                for (auto it = varInfo2.alloctype.cbegin(); it != varInfo2.alloctype.cend(); ++it) {
                     if (varInfo1.alloctype.find(it->first) == varInfo1.alloctype.end() &&
                         old.alloctype.find(it->first) == old.alloctype.end()) {
                         varInfo.conditionalAlloc.insert(it->first);
@@ -587,13 +662,13 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 }
 
                 // Conditional allocation/deallocation
-                for (it = varInfo1.alloctype.cbegin(); it != varInfo1.alloctype.cend(); ++it) {
+                for (auto it = varInfo1.alloctype.cbegin(); it != varInfo1.alloctype.cend(); ++it) {
                     if (it->second.managed() && conditionalAlloc.find(it->first) != conditionalAlloc.end()) {
                         varInfo.conditionalAlloc.erase(it->first);
                         varInfo2.erase(it->first);
                     }
                 }
-                for (it = varInfo2.alloctype.cbegin(); it != varInfo2.alloctype.cend(); ++it) {
+                for (auto it = varInfo2.alloctype.cbegin(); it != varInfo2.alloctype.cend(); ++it) {
                     if (it->second.managed() && conditionalAlloc.find(it->first) != conditionalAlloc.end()) {
                         varInfo.conditionalAlloc.erase(it->first);
                         varInfo1.erase(it->first);
@@ -621,11 +696,11 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
         }
 
         // throw
-        else if (mTokenizer->isCPP() && tok->str() == "throw") {
+        else if (tok->isCpp() && tok->str() == "throw") {
             bool tryFound = false;
             const Scope* scope = tok->scope();
             while (scope && scope->isExecutable()) {
-                if (scope->type == Scope::eTry)
+                if (scope->type == ScopeType::eTry)
                     tryFound = true;
                 scope = scope->nestedIn;
             }
@@ -636,7 +711,7 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
         }
 
         // delete
-        else if (mTokenizer->isCPP() && tok->str() == "delete") {
+        else if (tok->isCpp() && tok->str() == "delete") {
             const Token * delTok = tok;
             if (Token::simpleMatch(delTok->astOperand1(), "."))
                 continue;
@@ -645,11 +720,12 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
                 tok = tok->tokAt(3);
             else
                 tok = tok->next();
-            if (tok->str() == "(")
+            bool startparen;
+            if ((startparen = (tok->str() == "(")))
                 tok = tok->next();
-            while (Token::Match(tok, "%name% ::|."))
+            while (Token::Match(tok, "%name% ::|.") || (startparen && Token::Match(tok, "%name% ,")))
                 tok = tok->tokAt(2);
-            const bool isnull = tok->hasKnownIntValue() && tok->values().front().intvalue == 0;
+            const bool isnull = tok->hasKnownIntValue() && tok->getKnownIntValue() == 0;
             if (!isnull && tok->varId() && tok->strAt(1) != "[") {
                 const VarInfo::AllocInfo allocation(arrayDelete ? NEW_ARRAY : NEW, VarInfo::DEALLOC, delTok);
                 changeAllocStatus(varInfo, allocation, tok, tok);
@@ -662,17 +738,15 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             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->next()->link();
+            tok = ftok->linkAt(1);
 
             // Handle scopes that might be noreturn
             if (allocation.status == VarInfo::NOALLOC && Token::simpleMatch(tok, ") ; }")) {
                 if (ftok->isKeyword())
                     continue;
-                const std::string functionName(mSettings->library.getFunctionName(ftok));
                 bool unknown = false;
                 if (mTokenizer->isScopeNoReturn(tok->tokAt(2), &unknown)) {
                     if (!unknown)
@@ -681,9 +755,10 @@ 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 VarInfo::Usage usage = Token::simpleMatch(openingPar, "( )") ? VarInfo::NORET : VarInfo::USED; // TODO: check parameters passed to function
-                            varInfo.possibleUsageAll({ functionName, usage });
+                            varInfo.possibleUsageAll({ ftok, usage });
                         }
                     }
                 }
@@ -783,43 +858,48 @@ bool CheckLeakAutoVar::checkScope(const Token * const startToken,
             const Token * vtok = typeEndTok->tokAt(3);
             const VarInfo::AllocInfo allocation(af ? af->groupId : (arrayDelete ? NEW_ARRAY : NEW), VarInfo::OWNED, ftok);
             changeAllocStatus(varInfo, allocation, vtok, vtok);
-        }
+        } else if (Token::Match(tok, "%var% ."))
+            checkTokenInsideExpression(tok, varInfo);
     }
     ret(endToken, varInfo, true);
     return true;
 }
 
 
-const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo)
+const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo, bool inFuncCall)
 {
     // Deallocation and then dereferencing pointer..
     if (tok->varId() > 0) {
         // TODO : Write a separate checker for this that uses valueFlowForward.
-        const std::map<int, VarInfo::AllocInfo>::const_iterator var = varInfo.alloctype.find(tok->varId());
+        const auto var = utils::as_const(varInfo.alloctype).find(tok->varId());
         if (var != varInfo.alloctype.end()) {
             bool unknown = false;
-            if (var->second.status == VarInfo::DEALLOC && CheckNullPointer::isPointerDeRef(tok, unknown, mSettings) && !unknown) {
+            if (var->second.status == VarInfo::DEALLOC && tok->valueType() && tok->valueType()->pointer &&
+                CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings, /*checkNullArg*/ false) && !unknown) {
                 deallocUseError(tok, tok->str());
             } else if (Token::simpleMatch(tok->tokAt(-2), "= &")) {
                 varInfo.erase(tok->varId());
             } else {
                 // check if tok is assigned into another variable
                 const Token *rhs = tok;
+                bool isAssignment = false;
                 while (rhs->astParent()) {
-                    if (rhs->astParent()->str() == "=")
+                    if (rhs->astParent()->str() == "=") {
+                        isAssignment = true;
                         break;
+                    }
                     rhs = rhs->astParent();
                 }
                 while (rhs->isCast()) {
                     rhs = rhs->astOperand2() ? rhs->astOperand2() : rhs->astOperand1();
                 }
-                if (rhs->varId() == tok->varId()) {
+                if ((rhs->str() == "." || rhs->varId() == tok->varId()) && isAssignment) {
                     // simple assignment
                     varInfo.erase(tok->varId());
-                } else if (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());
-                    if (returnValue.compare(0, 3, "arg") == 0) {
+                    if (startsWith(returnValue, "arg")) {
                         int argn;
                         const Token *func = getTokenArgumentFunction(tok, argn);
                         if (func) {
@@ -837,7 +917,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
     }
 
     // check for function call
-    const Token * const openingPar = isFunctionCall(tok);
+    const Token * const openingPar = inFuncCall ? nullptr : isFunctionCall(tok);
     if (openingPar) {
         const Library::AllocFunc* allocFunc = mSettings->library.getDeallocFuncInfo(tok);
         VarInfo::AllocInfo alloc(allocFunc ? allocFunc->groupId : 0, VarInfo::DEALLOC, tok);
@@ -845,7 +925,7 @@ const Token * CheckLeakAutoVar::checkTokenInsideExpression(const Token * const t
             alloc.status = VarInfo::NOALLOC;
         functionCall(tok, openingPar, varInfo, alloc, nullptr);
         const std::string &returnValue = mSettings->library.returnValue(tok);
-        if (returnValue.compare(0, 3, "arg") == 0)
+        if (startsWith(returnValue, "arg"))
             // the function returns one of its argument, we need to process a potential assignment
             return openingPar;
         return isCPPCast(tok->astParent()) ? openingPar : openingPar->link();
@@ -879,12 +959,18 @@ void CheckLeakAutoVar::changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocIn
 void CheckLeakAutoVar::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Token* tok, const Token* arg)
 {
     std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
-    const std::map<int, VarInfo::AllocInfo>::iterator var = alloctype.find(arg->varId());
+    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)) {
+            varInfo.erase(arg->varId());
+            return;
+        }
         if (allocation.status == VarInfo::NOALLOC) {
             // possible usage
-            varInfo.possibleUsage[arg->varId()] = { tok->str(), VarInfo::USED };
-            if (var->second.status == VarInfo::DEALLOC && arg->previous()->str() == "&")
+            varInfo.possibleUsage[arg->varId()] = { tok, VarInfo::USED };
+            if (var->second.status == VarInfo::DEALLOC && arg->strAt(-1) == "&")
                 varInfo.erase(arg->varId());
         } else if (var->second.managed()) {
             doubleFreeError(tok, var->second.allocTok, arg->str(), allocation.type);
@@ -900,18 +986,21 @@ void CheckLeakAutoVar::changeAllocStatus(VarInfo &varInfo, const VarInfo::AllocI
             var->second.allocTok = allocation.allocTok;
         }
     } else if (allocation.status != VarInfo::NOALLOC && allocation.status != VarInfo::OWNED && !Token::simpleMatch(tok->astTop(), "return")) {
-        alloctype[arg->varId()].status = VarInfo::DEALLOC;
-        alloctype[arg->varId()].allocTok = tok;
+        auto& allocInfo = alloctype[arg->varId()];
+        allocInfo.status = VarInfo::DEALLOC;
+        allocInfo.allocTok = tok;
+        allocInfo.type = allocation.type;
     }
 }
 
 void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpeningPar, VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Library::AllocFunc* af)
 {
     // Ignore function call?
-    if (mSettings->library.isLeakIgnore(mSettings->library.getFunctionName(tokName)))
-        return;
+    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;
 
     const Token * const tokFirstArg = tokOpeningPar->next();
     if (!tokFirstArg || tokFirstArg->str() == ")") {
@@ -922,7 +1011,7 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
     int argNr = 1;
     for (const Token *funcArg = tokFirstArg; funcArg; funcArg = funcArg->nextArgument()) {
         const Token* arg = funcArg;
-        if (mTokenizer->isCPP()) {
+        if (arg->isCpp()) {
             int tokAdvance = 0;
             if (arg->str() == "new")
                 tokAdvance = 1;
@@ -942,24 +1031,43 @@ 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);
 
-        if (Token::Match(arg, "%var% [-,)] !!.") || Token::Match(arg, "& %var%")) {
+        if ((Token::Match(arg, "%var% [-,)] !!.") && !(arg->variable() && arg->variable()->isArray())) ||
+            (Token::Match(arg, "& %var% !!.") && !(arg->next()->variable() && arg->next()->variable()->isArray()))) {
             // goto variable
-            if (arg->str() == "&")
+            const bool isAddressOf = arg->str() == "&";
+            if (isAddressOf)
                 arg = arg->next();
 
-            const bool isnull = arg->hasKnownIntValue() && arg->values().front().intvalue == 0;
+            const bool isnull = !isAddressOf && (arg->hasKnownIntValue() && arg->getKnownIntValue() == 0);
 
             // Is variable allocated?
             if (!isnull && (!af || af->arg == argNr)) {
                 const Library::AllocFunc* deallocFunc = mSettings->library.getDeallocFuncInfo(tokName);
                 VarInfo::AllocInfo dealloc(deallocFunc ? deallocFunc->groupId : 0, VarInfo::DEALLOC, tokName);
-                if (dealloc.type == 0)
-                    changeAllocStatus(varInfo, allocation, tokName, arg);
+                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 &&
+                        !(arg->variable() && arg->variable()->isArgument() && arg->valueType() && arg->valueType()->pointer > 1) &&
+                        (isAddressOf || (arg->valueType() && arg->valueType()->pointer == 2))) {
+                        leakIfAllocated(arg, varInfo);
+                        VarInfo::AllocInfo& varAlloc = varInfo.alloctype[arg->varId()];
+                        varAlloc.type = allocFunc->groupId;
+                        varAlloc.status = VarInfo::ALLOC;
+                        varAlloc.allocTok = arg;
+                    }
+                }
+                else if (isLeakIgnore)
+                    checkTokenInsideExpression(arg, varInfo);
                 else
-                    changeAllocStatus(varInfo, dealloc, tokName, arg);
+                    changeAllocStatus(varInfo, dealloc.type == 0 ? allocation : dealloc, tokName, arg);
             }
         }
         // Check smart pointer
@@ -1009,7 +1117,14 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
             const VarInfo::AllocInfo sp_allocation(sp_af ? sp_af->groupId : (arrayDelete ? NEW_ARRAY : NEW), VarInfo::OWNED, allocTok);
             changeAllocStatus(varInfo, sp_allocation, vtok, vtok);
         } else {
-            checkTokenInsideExpression(arg, varInfo);
+            const Token* const nextArg = funcArg->nextArgument();
+            while (arg && ((nextArg && arg != nextArg) || (!nextArg && arg != tokOpeningPar->link()))) {
+                checkTokenInsideExpression(arg, varInfo, /*inFuncCall*/ isLeakIgnore);
+
+                if (isLambdaCaptureList(arg))
+                    break;
+                arg = arg->next();
+            }
         }
         // TODO: check each token in argument expression (could contain multiple variables)
         argNr++;
@@ -1023,7 +1138,7 @@ void CheckLeakAutoVar::leakIfAllocated(const Token *vartok,
     const std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
     const auto& possibleUsage = varInfo.possibleUsage;
 
-    const std::map<int, VarInfo::AllocInfo>::const_iterator var = alloctype.find(vartok->varId());
+    const auto var = utils::as_const(alloctype).find(vartok->varId());
     if (var != alloctype.cend() && var->second.status == VarInfo::ALLOC) {
         const auto use = possibleUsage.find(vartok->varId());
         if (use == possibleUsage.end()) {
@@ -1034,6 +1149,12 @@ void CheckLeakAutoVar::leakIfAllocated(const Token *vartok,
     }
 }
 
+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 CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndOfScope)
 {
     const std::map<int, VarInfo::AllocInfo> &alloctype = varInfo.alloctype;
@@ -1041,7 +1162,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
     std::vector<int> toRemove;
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
-    for (std::map<int, VarInfo::AllocInfo>::const_iterator it = alloctype.cbegin(); it != alloctype.cend(); ++it) {
+    for (auto it = alloctype.cbegin(); it != alloctype.cend(); ++it) {
         // don't warn if variable is conditionally allocated, unless it leaves the scope
         if (!isEndOfScope && !it->second.managed() && varInfo.conditionalAlloc.find(it->first) != varInfo.conditionalAlloc.end())
             continue;
@@ -1056,18 +1177,18 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
             // don't warn if we leave an inner scope
             if (isEndOfScope && var->scope() && tok != var->scope()->bodyEnd)
                 continue;
-            enum class PtrUsage { NONE, DEREF, PTR } used = PtrUsage::NONE;
+            enum class PtrUsage : std::uint8_t { NONE, DEREF, PTR } used = PtrUsage::NONE;
             for (const Token *tok2 = tok; tok2; tok2 = tok2->next()) {
                 if (tok2->str() == ";")
                     break;
-                if (!Token::Match(tok2, "return|(|{|,"))
+                if (!Token::Match(tok2, "return|(|{|,|*"))
                     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();
@@ -1077,7 +1198,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
                     tok2 = tok3;
                 else
                     continue;
-                if (Token::Match(tok2, "[});,+]")) {
+                if (Token::Match(tok2, "[});,+]") && (!astIsBool(tok) || tok2->str() != ";")) {
                     used = PtrUsage::PTR;
                     break;
                 }
@@ -1087,6 +1208,36 @@ 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))) {
+                const Scope* scope = tok->scope();
+                if (scope->type == ScopeType::eElse) {
+                    scope = scope->bodyStart->tokAt(-2)->scope();
+                }
+                const Token* const ifEnd = scope->bodyStart->previous();
+                const Token* const ifStart = ifEnd->link();
+                const Token* const alloc = it->second.allocTok;
+                if (precedes(ifStart, alloc) && succeeds(ifEnd, alloc)) { // allocation and check in if
+                    if (outparamFunc->next()->astParent() == ifStart || Token::Match(outparamFunc->next()->astParent(), "%comp%"))
+                        continue;
+                } else { // allocation result assigned to variable
+                    const Token* const retAssign = outparamFunc->next()->astParent();
+                    if (Token::simpleMatch(retAssign, "=") && retAssign->astOperand1()->varId()) {
+                        bool isRetComp = false;
+                        for (const Token* tok2 = ifStart; tok2 != ifEnd; tok2 = tok2->next()) {
+                            if (tok2->varId() == retAssign->astOperand1()->varId()) {
+                                isRetComp = true;
+                                break;
+                            }
+                        }
+                        if (isRetComp)
+                            continue;
+                    }
+                }
+            }
+
             // return deallocated pointer
             if (used != PtrUsage::NONE && it->second.status == VarInfo::DEALLOC)
                 deallocReturnError(tok, it->second.allocTok, var->name());
@@ -1095,7 +1246,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
                 const auto use = possibleUsage.find(varid);
                 if (use == possibleUsage.end()) {
                     leakError(tok, var->name(), it->second.type);
-                } else {
+                } else if (!use->second.first->variable()) { // TODO: handle constructors
                     configurationInfo(tok, use->second);
                 }
             }
@@ -1105,3 +1256,17 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
     for (const int varId : toRemove)
         varInfo.erase(varId);
 }
+
+void CheckLeakAutoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckLeakAutoVar checkLeakAutoVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkLeakAutoVar.check();
+}
+
+void CheckLeakAutoVar::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckLeakAutoVar 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 1d7cb5fb37e..b7f57d0bd5e 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-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
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "library.h"
 
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>
@@ -36,10 +37,9 @@ class Settings;
 class Token;
 class Tokenizer;
 
-
 class CPPCHECKLIB VarInfo {
 public:
-    enum AllocStatus { REALLOC = -3, OWNED = -2, DEALLOC = -1, NOALLOC = 0, ALLOC = 1 };
+    enum AllocStatus : std::int8_t { REALLOC = -3, OWNED = -2, DEALLOC = -1, NOALLOC = 0, ALLOC = 1 };
     struct AllocInfo {
         AllocStatus status;
         /** Allocation type. If it is a positive value then it corresponds to
@@ -55,9 +55,9 @@ class CPPCHECKLIB VarInfo {
             return status < 0;
         }
     };
-    enum Usage { USED, NORET };
+    enum Usage : std::uint8_t { USED, NORET };
     std::map<int, AllocInfo> alloctype;
-    std::map<int, std::pair<std::string, Usage>> possibleUsage;
+    std::map<int, std::pair<const Token*, Usage>> possibleUsage;
     std::set<int> conditionalAlloc;
     std::set<int> referenced;
 
@@ -75,7 +75,7 @@ class CPPCHECKLIB VarInfo {
         referenced.erase(varid);
     }
 
-    void swap(VarInfo &other) {
+    void swap(VarInfo &other) NOEXCEPT {
         alloctype.swap(other.alloctype);
         possibleUsage.swap(other.possibleUsage);
         conditionalAlloc.swap(other.conditionalAlloc);
@@ -85,7 +85,7 @@ class CPPCHECKLIB VarInfo {
     void reallocToAlloc(nonneg int varid) {
         const AllocInfo& alloc = alloctype[varid];
         if (alloc.reallocedFromType >= 0) {
-            const std::map<int, VarInfo::AllocInfo>::iterator it = alloctype.find(alloc.reallocedFromType);
+            const auto it = alloctype.find(alloc.reallocedFromType);
             if (it != alloctype.end() && it->second.status == REALLOC) {
                 it->second.status = ALLOC;
             }
@@ -93,9 +93,7 @@ class CPPCHECKLIB VarInfo {
     }
 
     /** set possible usage for all variables */
-    void possibleUsageAll(const std::pair<std::string, Usage>& functionUsage);
-
-    void print();
+    void possibleUsageAll(const std::pair<const Token*, Usage>& functionUsage);
 };
 
 
@@ -111,22 +109,20 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
     /** This constructor is used when registering the CheckLeakAutoVar */
     CheckLeakAutoVar() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckLeakAutoVar checkLeakAutoVar(tokenizer, settings, errorLogger);
-        checkLeakAutoVar.check();
-    }
-
-private:
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** check for leaks in all scopes */
     void check();
 
-    /** check for leaks in a function scope */
-    bool checkScope(const Token * const startToken,
+    /** 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,
                     nonneg int recursiveCount);
@@ -136,7 +132,7 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
      * @param varInfo Variable info
      * @return next token to process (if no other checks needed for this token). NULL if other checks could be performed.
      */
-    const Token * checkTokenInsideExpression(const Token * const tok, VarInfo &varInfo);
+    const Token * checkTokenInsideExpression(const Token * tok, VarInfo &varInfo, bool inFuncCall = false);
 
     /** parse function call */
     void functionCall(const Token *tokName, const Token *tokOpeningPar, VarInfo &varInfo, const VarInfo::AllocInfo& allocation, const Library::AllocFunc* af);
@@ -148,7 +144,7 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
     void changeAllocStatusIfRealloc(std::map<int, VarInfo::AllocInfo> &alloctype, const Token *fTok, const Token *retTok) const;
 
     /** return. either "return" or end of variable scope is seen */
-    void ret(const Token *tok, VarInfo &varInfo, const bool isEndOfScope = false);
+    void ret(const Token *tok, VarInfo &varInfo, bool isEndOfScope = false);
 
     /** if variable is allocated then there is a leak */
     void leakIfAllocated(const Token *vartok, const VarInfo &varInfo);
@@ -160,14 +156,9 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
     void doubleFreeError(const Token *tok, const Token *prevFreeTok, const std::string &varname, int type);
 
     /** message: user configuration is needed to complete analysis */
-    void configurationInfo(const Token* tok, const std::pair<std::string, VarInfo::Usage>& functionUsage);
+    void configurationInfo(const Token* tok, const std::pair<const Token*, VarInfo::Usage>& functionUsage);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckLeakAutoVar c(nullptr, settings, errorLogger);
-        c.deallocReturnError(nullptr, nullptr, "p");
-        c.configurationInfo(nullptr, { "f", VarInfo::USED });  // user configuration is needed to complete analysis
-        c.doubleFreeError(nullptr, nullptr, "varname", 0);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Leaks (auto variables)";
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 06d7b779f2a..bd9d1bc892f 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-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
@@ -21,14 +21,16 @@
 
 #include "astutils.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "library.h"
+#include "platform.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
 
 #include <algorithm>
-#include <unordered_set>
+#include <cstddef>
 #include <utility>
 #include <vector>
 
@@ -65,16 +67,18 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         return No;
     if (tok2->str() == "::")
         tok2 = tok2->next();
+    while (Token::Match(tok2, "%name% :: %type%"))
+        tok2 = tok2->tokAt(2);
     if (!tok2->isName())
         return No;
 
-    if (!Token::Match(tok2, "%name% ::|. %type%")) {
+    if (!Token::Match(tok2, "%name% . %type%")) {
         // Using realloc..
         AllocType reallocType = getReallocationType(tok2, varid);
         if (reallocType != No)
             return reallocType;
 
-        if (mTokenizer_->isCPP() && tok2->str() == "new") {
+        if (tok2->isCpp() && tok2->str() == "new") {
             if (tok2->strAt(1) == "(" && !Token::Match(tok2->next(),"( std| ::| nothrow )"))
                 return No;
             if (tok2->astOperand1() && (tok2->astOperand1()->str() == "[" || (tok2->astOperand1()->astOperand1() && tok2->astOperand1()->astOperand1()->str() == "[")))
@@ -83,7 +87,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
             while (Token::Match(typeTok, "%name% :: %name%"))
                 typeTok = typeTok->tokAt(2);
             const Scope* classScope = nullptr;
-            if (typeTok->type() && typeTok->type()->isClassType()) {
+            if (typeTok->type() && (typeTok->type()->isClassType() || typeTok->type()->isStructType() || typeTok->type()->isUnionType())) {
                 classScope = typeTok->type()->classScope;
             } else if (typeTok->function() && typeTok->function()->isConstructor()) {
                 classScope = typeTok->function()->nestedIn;
@@ -122,7 +126,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         }
     }
 
-    while (Token::Match(tok2,"%name% ::|. %type%"))
+    while (Token::Match(tok2,"%name% . %type%"))
         tok2 = tok2->tokAt(2);
 
     // User function
@@ -185,7 +189,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getReallocationType(const Token *tok
 
 CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok, nonneg int varid) const
 {
-    if (mTokenizer_->isCPP() && tok->str() == "delete" && tok->astOperand1()) {
+    if (tok->isCpp() && tok->str() == "delete" && tok->astOperand1()) {
         const Token* vartok = tok->astOperand1();
         if (Token::Match(vartok, ".|::"))
             vartok = vartok->astOperand2();
@@ -278,7 +282,7 @@ void CheckMemoryLeak::memoryLeak(const Token *tok, const std::string &varname, A
 }
 //---------------------------------------------------------------------------
 
-void CheckMemoryLeak::reportErr(const Token *tok, Severity::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe) const
+void CheckMemoryLeak::reportErr(const Token *tok, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const
 {
     std::list<const Token *> callstack;
 
@@ -288,13 +292,13 @@ void CheckMemoryLeak::reportErr(const Token *tok, Severity::SeverityType severit
     reportErr(callstack, severity, id, msg, cwe);
 }
 
-void CheckMemoryLeak::reportErr(const std::list<const Token *> &callstack, Severity::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe) const
+void CheckMemoryLeak::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::reportError(errmsg);
+        Check::writeToErrorList(errmsg);
 }
 
 void CheckMemoryLeak::memleakError(const Token *tok, const std::string &varname) const
@@ -373,7 +377,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::functionReturnType(const Function* f
         if (Token::Match(tok, "= %varid% ;", varid)) {
             return No;
         }
-        if (!mTokenizer_->isC() && Token::Match(tok, "[(,] %varid% [,)]", varid)) {
+        if (!tok->isC() && Token::Match(tok, "[(,] %varid% [,)]", varid)) {
             return No;
         }
         if (Token::Match(tok, "[(,] & %varid% [.,)]", varid)) {
@@ -423,8 +427,10 @@ static bool ifvar(const Token *tok, nonneg int varid, const std::string &comp, c
 //     a = malloc(10); a = realloc(a, 100);
 //---------------------------------------------------------------------------
 
-void CheckMemoryLeakInFunction::checkReallocUsage() const
+void CheckMemoryLeakInFunction::checkReallocUsage()
 {
+    logChecker("CheckMemoryLeakInFunction::checkReallocUsage");
+
     // only check functions
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -491,6 +497,22 @@ void CheckMemoryLeakInFunction::checkReallocUsage() const
 }
 //---------------------------------------------------------------------------
 
+void CheckMemoryLeakInFunction::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkMemoryLeak.checkReallocUsage();
+}
+
+void CheckMemoryLeakInFunction::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+{
+    CheckMemoryLeakInFunction c(nullptr, settings, e);
+    c.memleakError(nullptr, "varname");
+    c.resourceLeakError(nullptr, "varname");
+    c.deallocuseError(nullptr, "varname");
+    const std::list<const Token *> callstack;
+    c.mismatchAllocDealloc(callstack, "varname");
+    c.memleakUponReallocFailureError(nullptr, "realloc", "varname");
+}
 
 //---------------------------------------------------------------------------
 // Checks for memory leaks in classes..
@@ -499,6 +521,8 @@ void CheckMemoryLeakInFunction::checkReallocUsage() const
 
 void CheckMemoryLeakInClass::check()
 {
+    logChecker("CheckMemoryLeakInClass::check");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // only check classes and structures
@@ -629,7 +653,7 @@ void CheckMemoryLeakInClass::variable(const Scope *scope, const Token *tokVarnam
 
 void CheckMemoryLeakInClass::unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsafeClassCanLeak"))
         return;
 
     reportError(tok, Severity::style, "unsafeClassCanLeak",
@@ -653,7 +677,7 @@ void CheckMemoryLeakInClass::checkPublicFunctions(const Scope *scope, const Toke
     // Parse public functions..
     // If they allocate member variables, they should also deallocate
     for (const Function &func : scope->functionList) {
-        if ((func.type == Function::eFunction || func.type == Function::eOperatorEqual) &&
+        if ((func.type == FunctionType::eFunction || func.type == FunctionType::eOperatorEqual) &&
             func.access == AccessControl::Public && func.hasBody()) {
             const Token *tok2 = func.functionScope->bodyStart->next();
             if (Token::Match(tok2, "%varid% =", varid)) {
@@ -675,12 +699,30 @@ void CheckMemoryLeakInClass::publicAllocationError(const Token *tok, const std::
     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)
+{
+    if (!tokenizer.isCPP())
+        return;
+
+    CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkMemoryLeak.check();
+}
+
+void CheckMemoryLeakInClass::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+{
+    CheckMemoryLeakInClass c(nullptr, settings, e);
+    c.publicAllocationError(nullptr, "varname");
+    c.unsafeClassError(nullptr, "class", "class::varname");
+}
+
 
-void CheckMemoryLeakStructMember::check() const
+void CheckMemoryLeakStructMember::check()
 {
     if (mSettings->clang)
         return;
 
+    logChecker("CheckMemoryLeakStructMember::check");
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || (!var->isLocal() && !(var->isArgument() && var->scope())) || var->isStatic())
@@ -702,8 +744,15 @@ 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;
 }
@@ -745,7 +794,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 deallocated = true;
                 break;
             }
-        };
+        }
 
         return deallocated;
     };
@@ -791,7 +840,8 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
 
         // Struct member is allocated => check if it is also properly deallocated..
         else if ((assignToks = isMemberAssignment(tok2, variable->declarationId())).first && assignToks.first->varId()) {
-            if (getAllocationType(assignToks.second, assignToks.first->varId()) == AllocType::No)
+            const AllocType allocType = getAllocationType(assignToks.second, assignToks.first->varId());
+            if (allocType == AllocType::No)
                 continue;
 
             if (variable->isArgument() && variable->valueType() && variable->valueType()->type == ValueType::UNKNOWN_TYPE && assignToks.first->astParent()) {
@@ -808,12 +858,18 @@ 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) {
-                        memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), Malloc);
+                        memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), allocType);
                         break;
                     }
                     --indentlevel3;
@@ -844,7 +900,7 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 // Deallocating the struct..
                 else if (Token::Match(tok3, "%name% ( %varid% )", structid) && mSettings->library.getDeallocFuncInfo(tok3)) {
                     if (indentlevel2 == 0)
-                        memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), Malloc);
+                        memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), allocType);
                     break;
                 }
 
@@ -852,20 +908,20 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 else if (Token::simpleMatch(tok3, "if (") &&
                          notvar(tok3->next()->astOperand2(), structmemberid)) {
                     // Goto the ")"
-                    tok3 = tok3->next()->link();
+                    tok3 = tok3->linkAt(1);
 
                     // make sure we have ") {".. it should be
                     if (!Token::simpleMatch(tok3, ") {"))
                         break;
 
                     // Goto the "}"
-                    tok3 = tok3->next()->link();
+                    tok3 = tok3->linkAt(1);
                 }
 
                 // succeeded allocation
                 else if (ifvar(tok3, structmemberid, "!=", "0")) {
                     // goto the ")"
-                    tok3 = tok3->next()->link();
+                    tok3 = tok3->linkAt(1);
 
                     // check if the variable is deallocated or returned..
                     int indentlevel4 = 0;
@@ -887,13 +943,13 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
                 }
 
                 // Returning from function..
-                else if ((tok3->scope()->type != Scope::ScopeType::eLambda || tok3->scope() == variable->scope()) && tok3->str() == "return") {
+                else if ((tok3->scope()->type != ScopeType::eLambda || 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) &&
                         !(Token::Match(tok3, "return %varid% . %var%", structid) && tok3->tokAt(3)->varId() == structmemberid) &&
                         !(Token::Match(tok3, "return %name% (") && tok3->astOperand1() && deallocInFunction(tok3->astOperand1(), structid))) {
-                        memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), Malloc);
+                        memoryLeak(tok3, variable->name() + "." + tok2->strAt(2), allocType);
                     }
                     break;
                 }
@@ -919,10 +975,20 @@ void CheckMemoryLeakStructMember::checkStructVariable(const Variable* const vari
     }
 }
 
+void CheckMemoryLeakStructMember::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckMemoryLeakStructMember checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkMemoryLeak.check();
+}
+
+void CheckMemoryLeakStructMember::getErrorMessages(ErrorLogger * /*errorLogger*/, const Settings * /*settings*/) const
+{}
 
 
 void CheckMemoryLeakNoVar::check()
 {
+    logChecker("CheckMemoryLeakNoVar::check");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // only check functions
@@ -963,31 +1029,52 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
             continue;
 
         const std::string& functionName = tok->str();
-        if ((mTokenizer->isCPP() && functionName == "delete") ||
+        if ((tok->isCpp() && functionName == "delete") ||
             functionName == "return")
             continue;
 
         if (Token::simpleMatch(tok->next()->astParent(), "(")) // passed to another function
             continue;
-        if (!tok->isKeyword() && (mSettings->library.isNotLibraryFunction(tok) || !mSettings->library.isLeakIgnore(functionName)))
+        if (!tok->isKeyword() && !tok->function() && !mSettings->library.isLeakIgnore(functionName))
             continue;
 
         const std::vector<const Token *> args = getArguments(tok);
+        int argnr = -1;
         for (const Token* arg : args) {
+            ++argnr;
             if (arg->isOp() && !(tok->isKeyword() && arg->str() == "*")) // e.g. switch (*new int)
                 continue;
             while (arg->astOperand1()) {
-                if (mTokenizer->isCPP() && Token::simpleMatch(arg, "new"))
+                if (arg->isCpp() && Token::simpleMatch(arg, "new"))
                     break;
                 arg = arg->astOperand1();
             }
             const AllocType alloc = getAllocationType(arg, 0);
             if (alloc == No)
                 continue;
-            if ((alloc == New || alloc == NewArray) && arg->next() && !(arg->next()->isStandardType() || mSettings->library.detectContainerOrIterator(arg)))
-                continue;
+            if (alloc == New || alloc == NewArray) {
+                const Token* typeTok = arg->next();
+                bool bail = !typeTok->isStandardType() &&
+                            !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) {
+                    bail = false;
+                }
+                if (bail)
+                    continue;
+            }
             if (isReopenStandardStream(arg))
                 continue;
+            if (tok->function()) {
+                const Variable* argvar = tok->function()->getArgumentVar(argnr);
+                if (!argvar || !argvar->valueType())
+                    continue;
+                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);
         }
 
@@ -1000,7 +1087,7 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
 void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
 {
     for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
-        const bool isNew = mTokenizer->isCPP() && tok->str() == "new";
+        const bool isNew = tok->isCpp() && tok->str() == "new";
         if (!isNew && !Token::Match(tok, "%name% ("))
             continue;
 
@@ -1043,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());
         }
     }
@@ -1062,12 +1151,17 @@ void CheckMemoryLeakNoVar::checkForUnusedReturnValue(const Scope *scope)
 void CheckMemoryLeakNoVar::checkForUnsafeArgAlloc(const Scope *scope)
 {
     // This test only applies to C++ source
-    if (!mTokenizer->isCPP() || !mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mTokenizer->isCPP())
+        return;
+
+    if (!mSettings->isPremiumEnabled("leakUnsafeArgAlloc") && (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning)))
         return;
 
+    logChecker("CheckMemoryLeakNoVar::checkForUnsafeArgAlloc");
+
     for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
         if (Token::Match(tok, "%name% (")) {
-            const Token *endParamToken = tok->next()->link();
+            const Token *endParamToken = tok->linkAt(1);
             const Token* pointerType = nullptr;
             const Token* functionCalled = nullptr;
 
@@ -1076,12 +1170,12 @@ void CheckMemoryLeakNoVar::checkForUnsafeArgAlloc(const Scope *scope)
                 const Function *func = tok2->function();
                 const bool isNothrow = func && (func->isAttributeNothrow() || func->isThrow());
 
-                if (Token::Match(tok2, "shared_ptr|unique_ptr <") && Token::Match(tok2->next()->link(), "> ( new %name%")) {
+                if (Token::Match(tok2, "shared_ptr|unique_ptr <") && Token::Match(tok2->linkAt(1), "> ( new %name%")) {
                     pointerType = tok2;
                 } else if (!isNothrow) {
                     if (Token::Match(tok2, "%name% ("))
                         functionCalled = tok2;
-                    else if (tok2->isName() && Token::simpleMatch(tok2->next()->link(), "> ("))
+                    else if (tok2->isName() && Token::simpleMatch(tok2->linkAt(1), "> ("))
                         functionCalled = tok2;
                 }
             }
@@ -1090,12 +1184,12 @@ void CheckMemoryLeakNoVar::checkForUnsafeArgAlloc(const Scope *scope)
                 std::string functionName = functionCalled->str();
                 if (functionCalled->strAt(1) == "<") {
                     functionName += '<';
-                    for (const Token* tok2 = functionCalled->tokAt(2); tok2 != functionCalled->next()->link(); tok2 = tok2->next())
+                    for (const Token* tok2 = functionCalled->tokAt(2); tok2 != functionCalled->linkAt(1); tok2 = tok2->next())
                         functionName += tok2->str();
                     functionName += '>';
                 }
                 std::string objectTypeName;
-                for (const Token* tok2 = pointerType->tokAt(2); tok2 != pointerType->next()->link(); tok2 = tok2->next())
+                for (const Token* tok2 = pointerType->tokAt(2); tok2 != pointerType->linkAt(1); tok2 = tok2->next())
                     objectTypeName += tok2->str();
 
                 unsafeArgAllocError(tok, functionName, pointerType->str(), objectTypeName);
@@ -1123,3 +1217,17 @@ void CheckMemoryLeakNoVar::unsafeArgAllocError(const Token *tok, const std::stri
                 CWE401,
                 Certainty::inconclusive); // Inconclusive because funcName may never throw
 }
+
+void CheckMemoryLeakNoVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckMemoryLeakNoVar checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkMemoryLeak.check();
+}
+
+void CheckMemoryLeakNoVar::getErrorMessages(ErrorLogger *e, const Settings *settings) const
+{
+    CheckMemoryLeakNoVar 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 48144668fcd..cf8cc4c11a2 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-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
@@ -34,9 +34,8 @@
 
 #include "check.h"
 #include "config.h"
-#include "errortypes.h"
-#include "tokenize.h"
 
+#include <cstdint>
 #include <list>
 #include <string>
 
@@ -46,6 +45,9 @@ class Settings;
 class Token;
 class Variable;
 class ErrorLogger;
+struct CWE;
+class Tokenizer;
+enum class Severity : std::uint8_t;
 
 /// @addtogroup Core
 /// @{
@@ -70,7 +72,7 @@ class CPPCHECKLIB CheckMemoryLeak {
      * @param msg text
      * @param cwe cwe number
      */
-    void reportErr(const Token *tok, Severity::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe) const;
+    void reportErr(const Token *tok, Severity severity, const std::string &id, const std::string &msg, const CWE &cwe) const;
 
     /**
      * Report error. Similar with the function Check::reportError
@@ -80,18 +82,18 @@ class CPPCHECKLIB CheckMemoryLeak {
      * @param msg text
      * @param cwe cwe number
      */
-    void reportErr(const std::list<const Token *> &callstack, Severity::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe) const;
+    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;
-    void operator=(const CheckMemoryLeak &) = delete;
+    CheckMemoryLeak& operator=(const CheckMemoryLeak &) = delete;
 
     CheckMemoryLeak(const Tokenizer *t, ErrorLogger *e, const Settings *s)
         : mTokenizer_(t), mErrorLogger_(e), mSettings_(s) {}
 
     /** @brief What type of allocation are used.. the "Many" means that several types of allocation and deallocation are used */
-    enum AllocType { No, Malloc, New, NewArray, File, Fd, Pipe, OtherMem, OtherRes, Many };
+    enum AllocType : std::uint8_t { No, Malloc, New, NewArray, File, Fd, Pipe, OtherMem, OtherRes, Many };
 
     void memoryLeak(const Token *tok, const std::string &varname, AllocType alloctype) const;
 
@@ -163,36 +165,27 @@ class CPPCHECKLIB CheckMemoryLeak {
  * -# finally, check if the simplified token list contain any leaks.
  */
 
-class CPPCHECKLIB CheckMemoryLeakInFunction : private Check, public CheckMemoryLeak {
+class CPPCHECKLIB CheckMemoryLeakInFunction : public Check, public CheckMemoryLeak {
+    friend class TestMemleakInFunction;
+
 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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakInFunction checkMemoryLeak(tokenizer, settings, errorLogger);
-        checkMemoryLeak.checkReallocUsage();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /**
      * Checking for a memory leak caused by improper realloc usage.
      */
-    void checkReallocUsage() const;
+    void checkReallocUsage();
 
-private:
     /** Report all possible errors (for the --errorlist) */
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override {
-        CheckMemoryLeakInFunction c(nullptr, settings, e);
-        c.memleakError(nullptr, "varname");
-        c.resourceLeakError(nullptr, "varname");
-        c.deallocuseError(nullptr, "varname");
-        const std::list<const Token *> callstack;
-        c.mismatchAllocDealloc(callstack, "varname");
-        c.memleakUponReallocFailureError(nullptr, "realloc", "varname");
-    }
+    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
 
     /**
      * Get name of class (--doc)
@@ -217,24 +210,20 @@ class CPPCHECKLIB CheckMemoryLeakInFunction : private Check, public CheckMemoryL
  * @brief %Check class variables, variables that are allocated in the constructor should be deallocated in the destructor
  */
 
-class CPPCHECKLIB CheckMemoryLeakInClass : private Check, private CheckMemoryLeak {
+class CPPCHECKLIB CheckMemoryLeakInClass : public Check, private CheckMemoryLeak {
+    friend class TestMemleakInClass;
+
 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 *tokenizr, const Settings *settings, ErrorLogger *errLog) override {
-        if (!tokenizr->isCPP())
-            return;
-
-        CheckMemoryLeakInClass checkMemoryLeak(tokenizr, settings, errLog);
-        checkMemoryLeak.check();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     void check();
 
-private:
     void variable(const Scope *scope, const Token *tokVarname);
 
     /** Public functions: possible double-allocation */
@@ -243,11 +232,7 @@ class CPPCHECKLIB CheckMemoryLeakInClass : private Check, private CheckMemoryLea
 
     void unsafeClassError(const Token *tok, const std::string &classname, const std::string &varname);
 
-    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override {
-        CheckMemoryLeakInClass c(nullptr, settings, e);
-        c.publicAllocationError(nullptr, "varname");
-        c.unsafeClassError(nullptr, "class", "class::varname");
-    }
+    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
 
     static std::string myName() {
         return "Memory leaks (class variables)";
@@ -262,28 +247,26 @@ class CPPCHECKLIB CheckMemoryLeakInClass : private Check, private CheckMemoryLea
 
 /** @brief detect simple memory leaks for struct members */
 
-class CPPCHECKLIB CheckMemoryLeakStructMember : private Check, private CheckMemoryLeak {
+class CPPCHECKLIB CheckMemoryLeakStructMember : public Check, private CheckMemoryLeak {
+    friend class TestMemleakStructMember;
+
 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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakStructMember checkMemoryLeak(tokenizer, settings, errorLogger);
-        checkMemoryLeak.check();
-    }
-
-    void check() const;
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
-private:
+    void check();
 
     /** Is local variable allocated with malloc? */
     bool isMalloc(const Variable *variable) const;
 
-    void checkStructVariable(const Variable* const variable) const;
+    void checkStructVariable(const Variable*  variable) const;
 
-    void getErrorMessages(ErrorLogger * /*errorLogger*/, const Settings * /*settings*/) const override {}
+    void getErrorMessages(ErrorLogger * errorLogger, const Settings * settings) const override;
 
     static std::string myName() {
         return "Memory leaks (struct members)";
@@ -298,21 +281,20 @@ class CPPCHECKLIB CheckMemoryLeakStructMember : private Check, private CheckMemo
 
 /** @brief detect simple memory leaks (address not taken) */
 
-class CPPCHECKLIB CheckMemoryLeakNoVar : private Check, private CheckMemoryLeak {
+class CPPCHECKLIB CheckMemoryLeakNoVar : public Check, private CheckMemoryLeak {
+    friend class TestMemleakNoVar;
+
 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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakNoVar checkMemoryLeak(tokenizer, settings, errorLogger);
-        checkMemoryLeak.check();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     void check();
 
-private:
     /**
      * @brief %Check if an input argument to a function is the return value of an allocation function
      * like malloc(), and the function does not release it.
@@ -336,12 +318,7 @@ class CPPCHECKLIB CheckMemoryLeakNoVar : private Check, private CheckMemoryLeak
     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 {
-        CheckMemoryLeakNoVar c(nullptr, settings, e);
-        c.functionCallLeak(nullptr, "funcName", "funcName");
-        c.returnValueNotUsedError(nullptr, "funcName");
-        c.unsafeArgAllocError(nullptr, "funcName", "shared_ptr", "int");
-    }
+    void getErrorMessages(ErrorLogger *e, const Settings *settings) const override;
 
     static std::string myName() {
         return "Memory leaks (address not taken)";
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
index 42c66bf5149..0214eceedd1 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-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
@@ -21,27 +21,31 @@
 #include "checknullpointer.h"
 
 #include "astutils.h"
+#include "ctu.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "findtoken.h"
 #include "library.h"
-#include "mathlib.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cctype>
 #include <map>
 #include <set>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
 
 // CWE ids used:
-static const struct CWE CWE_NULL_POINTER_DEREFERENCE(476U);
-static const struct CWE CWE_INCORRECT_CALCULATION(682U);
+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 {
@@ -60,29 +64,28 @@ static bool checkNullpointerFunctionCallPlausibility(const Function* func, unsig
  * @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)
+void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token *> &var, const Library &library, bool checkNullArg)
 {
     if (Token::Match(&tok, "%name% ( )") || !tok.tokAt(2))
         return;
 
     const std::vector<const Token *> args = getArguments(&tok);
 
-    if (library || tok.function() != nullptr) {
-        for (int argnr = 1; argnr <= args.size(); ++argnr) {
-            const Token *param = args[argnr - 1];
-            if (library && library->isnullargbad(&tok, argnr) && checkNullpointerFunctionCallPlausibility(tok.function(), argnr))
+    for (int 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);
+        else if (tok.function()) {
+            const Variable* argVar = tok.function()->getArgumentVar(argnr-1);
+            if (argVar && argVar->isStlStringType() && !argVar->isArrayOrPointer())
                 var.push_back(param);
-            else if (tok.function()) {
-                const Variable* argVar = tok.function()->getArgumentVar(argnr-1);
-                if (argVar && argVar->isStlStringType() && !argVar->isArrayOrPointer())
-                    var.push_back(param);
-            }
         }
     }
 
-    if (library && library->formatstr_function(&tok)) {
-        const int formatStringArgNr = library->formatstr_argno(&tok);
+    if (library.formatstr_function(&tok)) {
+        const int formatStringArgNr = library.formatstr_argno(&tok);
         if (formatStringArgNr < 0 || formatStringArgNr >= args.size())
             return;
 
@@ -94,17 +97,17 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
             return;
         const std::string &formatString = args[formatStringArgNr]->strValue();
         int argnr = formatStringArgNr + 1;
-        const bool scan = library->formatstr_scan(&tok);
+        const bool scan = library.formatstr_scan(&tok);
 
         bool percent = false;
-        for (std::string::const_iterator i = formatString.cbegin(); i != formatString.cend(); ++i) {
+        for (auto i = formatString.cbegin(); i != formatString.cend(); ++i) {
             if (*i == '%') {
                 percent = !percent;
             } else if (percent) {
                 percent = false;
 
                 bool _continue = false;
-                while (!std::isalpha((unsigned char)*i)) {
+                while (!std::isalpha(static_cast<unsigned char>(*i))) {
                     if (*i == '*') {
                         if (scan)
                             _continue = true;
@@ -147,20 +150,15 @@ namespace {
  */
 bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown) const
 {
-    return isPointerDeRef(tok, unknown, mSettings);
-}
-
-static bool isUnevaluatedOperator(const Token* tok)
-{
-    return Token::Match(tok, "sizeof|decltype|typeid|typeof|alignof|_Alignof|_alignof|__alignof|__alignof__ (");
+    return isPointerDeRef(tok, unknown, *mSettings);
 }
 
-bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Settings *settings)
+bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Settings &settings, bool checkNullArg)
 {
     unknown = false;
 
     // Is pointer used as function parameter?
-    if (Token::Match(tok->previous(), "[(,] %name% [,)]") && settings) {
+    if (Token::Match(tok->previous(), "[(,] %name% [,)]")) {
         const Token *ftok = tok->previous();
         while (ftok && ftok->str() != "(") {
             if (ftok->str() == ")")
@@ -169,7 +167,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
         }
         if (ftok && ftok->previous()) {
             std::list<const Token *> varlist;
-            parseFunctionCall(*ftok->previous(), varlist, &settings->library);
+            parseFunctionCall(*ftok->previous(), varlist, settings.library, checkNullArg);
             if (std::find(varlist.cbegin(), varlist.cend(), tok) != varlist.cend()) {
                 return true;
             }
@@ -192,7 +190,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
 
     // Dereferencing pointer..
     const Token* grandParent = parent->astParent();
-    if (parent->isUnaryOp("*") && !(grandParent && isUnevaluatedOperator(grandParent->previous()))) {
+    if (parent->isUnaryOp("*") && !(grandParent && isUnevaluated(grandParent->previous()))) {
         // declaration of function pointer
         if (tok->variable() && tok->variable()->nameToken() == tok)
             return false;
@@ -267,7 +265,7 @@ bool CheckNullPointer::isPointerDeRef(const Token *tok, bool &unknown, const Set
 }
 
 
-static bool isNullablePointer(const Token* tok, const Settings* settings)
+static bool isNullablePointer(const Token* tok)
 {
     if (!tok)
         return false;
@@ -278,53 +276,61 @@ static bool isNullablePointer(const Token* tok, const Settings* settings)
     if (astIsSmartPointer(tok))
         return true;
     if (Token::simpleMatch(tok, "."))
-        return isNullablePointer(tok->astOperand2(), settings);
+        return isNullablePointer(tok->astOperand2());
     if (const Variable* var = tok->variable()) {
         return (var->isPointer() || var->isSmartPointer());
     }
     return false;
 }
 
-void CheckNullPointer::nullPointerByDeRefAndChec()
+void CheckNullPointer::nullPointerByDeRefAndCheck()
 {
     const bool printInconclusive = (mSettings->certainty.isEnabled(Certainty::inconclusive));
 
-    for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
-        if (isUnevaluatedOperator(tok)) {
-            tok = tok->next()->link();
-            continue;
-        }
+    const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
+    for (const Scope * scope : symbolDatabase->functionScopes) {
+        auto pred = [printInconclusive](const Token* tok) -> bool {
+            if (!tok)
+                return false;
 
-        if (Token::Match(tok, "%num%|%char%|%str%"))
-            continue;
+            if (Token::Match(tok, "%num%|%char%|%str%"))
+                return false;
 
-        if (!isNullablePointer(tok, mSettings) ||
-            (tok->str() == "." && isNullablePointer(tok->astOperand2(), mSettings) && tok->astOperand2()->getValue(0))) // avoid duplicate warning
-            continue;
+            if (!isNullablePointer(tok) ||
+                (tok->str() == "." && isNullablePointer(tok->astOperand2()) && tok->astOperand2()->getValue(0))) // avoid duplicate warning
+                return false;
 
-        // Can pointer be NULL?
-        const ValueFlow::Value *value = tok->getValue(0);
-        if (!value)
-            continue;
+            // Can pointer be NULL?
+            const ValueFlow::Value *value = tok->getValue(0);
+            if (!value)
+                return false;
 
-        if (!printInconclusive && value->isInconclusive())
-            continue;
+            if (!printInconclusive && value->isInconclusive())
+                return false;
 
-        // Pointer dereference.
-        bool unknown = false;
-        if (!isPointerDeRef(tok,unknown)) {
-            if (unknown)
-                nullPointerError(tok, tok->expressionString(), value, true);
-            continue;
-        }
+            return true;
+        };
+        std::vector<const Token *> tokens = findTokensSkipDeadAndUnevaluatedCode(mSettings->library, scope->bodyStart, 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 (unknown)
+                    nullPointerError(tok, tok->expressionString(), value, true);
+                continue;
+            }
 
-        nullPointerError(tok, tok->expressionString(), value, value->isInconclusive());
+            nullPointerError(tok, tok->expressionString(), value, value->isInconclusive());
+        }
     }
 }
 
 void CheckNullPointer::nullPointer()
 {
-    nullPointerByDeRefAndChec();
+    logChecker("CheckNullPointer::nullPointer");
+    nullPointerByDeRefAndCheck();
 }
 
 namespace {
@@ -337,6 +343,8 @@ namespace {
 /** Dereferencing null constant (simplified token list) */
 void CheckNullPointer::nullConstantDereference()
 {
+    logChecker("CheckNullPointer::nullConstantDereference");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -349,8 +357,8 @@ void CheckNullPointer::nullConstantDereference()
             tok = scope->function->token; // Check initialization list
 
         for (; tok != scope->bodyEnd; tok = tok->next()) {
-            if (isUnevaluatedOperator(tok))
-                tok = tok->next()->link();
+            if (isUnevaluated(tok))
+                tok = tok->linkAt(1);
 
             else if (Token::simpleMatch(tok, "* 0")) {
                 if (Token::Match(tok->previous(), "return|throw|;|{|}|:|[|(|,") || tok->previous()->isOp()) {
@@ -358,17 +366,17 @@ void CheckNullPointer::nullConstantDereference()
                 }
             }
 
-            else if (Token::Match(tok, "0 [") && (tok->previous()->str() != "&" || !Token::Match(tok->next()->link()->next(), "[.(]")))
+            else if (Token::Match(tok, "0 [") && (tok->strAt(-1) != "&" || !Token::Match(tok->linkAt(1)->next(), "[.(]")))
                 nullPointerError(tok);
 
-            else if (Token::Match(tok->previous(), "!!. %name% (|{") && (tok->previous()->str() != "::" || tok->strAt(-2) == "std")) {
+            else if (Token::Match(tok->previous(), "!!. %name% (|{") && (tok->strAt(-1) != "::" || tok->strAt(-2) == "std")) {
                 if (Token::Match(tok->tokAt(2), "0|NULL|nullptr )|}") && tok->varId()) { // constructor call
                     const Variable *var = tok->variable();
                     if (var && !var->isPointer() && !var->isArray() && var->isStlStringType())
                         nullPointerError(tok);
                 } else { // function call
                     std::list<const Token *> var;
-                    parseFunctionCall(*tok, var, &mSettings->library);
+                    parseFunctionCall(*tok, var, mSettings->library);
 
                     // is one of the var items a NULL pointer?
                     for (const Token *vartok : var) {
@@ -385,7 +393,7 @@ void CheckNullPointer::nullConstantDereference()
                     const Token *argtok = args[argnr];
                     if (!argtok->hasKnownIntValue())
                         continue;
-                    if (argtok->values().front().intvalue != 0)
+                    if (argtok->getKnownIntValue() != 0)
                         continue;
                     if (mSettings->library.isnullargbad(tok, argnr+1))
                         nullPointerError(argtok);
@@ -398,7 +406,7 @@ void CheckNullPointer::nullConstantDereference()
                     if (Token::Match(tok2->previous(), ";|{|}|:|("))
                         break;
                 }
-                if (tok2 && tok2->previous() && tok2->previous()->str()=="(")
+                if (tok2 && tok2->previous() && tok2->strAt(-1)=="(")
                     continue;
                 if (Token::simpleMatch(tok2, "std :: cin"))
                     nullPointerError(tok);
@@ -427,6 +435,13 @@ void CheckNullPointer::nullConstantDereference()
     }
 }
 
+void CheckNullPointer::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)
 {
     const std::string errmsgcond("$symbol:" + varname + '\n' + ValueFlow::eitherTheConditionIsRedundant(value ? value->condition : nullptr) + " or there is possible null pointer dereference: $symbol.");
@@ -436,6 +451,8 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
         reportError(tok, Severity::error, "nullPointer", "Null pointer dereference", CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
         reportError(tok, Severity::warning, "nullPointerDefaultArg", errmsgdefarg, CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
         reportError(tok, Severity::warning, "nullPointerRedundantCheck", errmsgcond, CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
+        reportError(tok, Severity::warning, "nullPointerOutOfMemory", "Null pointer dereference", CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
+        reportError(tok, Severity::warning, "nullPointerOutOfResources", "Null pointer dereference", CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
         return;
     }
 
@@ -444,24 +461,34 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
         return;
     }
 
-    if (!mSettings->isEnabled(value, inconclusive))
+    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;
-        errmsg = std::string(value->isKnown() ? "Null" : "Possible null") + " pointer dereference";
+        std::string errmsg = std::string(value->isKnown() ? "Null" : "Possible null") + " pointer dereference";
+
+        std::string id = "nullPointer";
+        if (value->unknownFunctionReturn == ValueFlow::Value::UnknownFunctionReturn::outOfMemory) {
+            errmsg = "If memory allocation fails, then there is a " + (static_cast<char>(std::tolower(errmsg[0])) + errmsg.substr(1));
+            id += "OutOfMemory";
+        }
+        else if (value->unknownFunctionReturn == ValueFlow::Value::UnknownFunctionReturn::outOfResources) {
+            errmsg = "If resource allocation fails, then there is a " + (static_cast<char>(std::tolower(errmsg[0])) + errmsg.substr(1));
+            id += "OutOfResources";
+        }
+
         if (!varname.empty())
             errmsg = "$symbol:" + varname + '\n' + errmsg + ": $symbol";
 
-        reportError(errorPath,
+        reportError(std::move(errorPath),
                     value->isKnown() ? Severity::error : Severity::warning,
-                    "nullPointer",
+                    id.c_str(),
                     errmsg,
                     CWE_NULL_POINTER_DEREFERENCE, inconclusive || value->isInconclusive() ? Certainty::inconclusive : Certainty::normal);
     }
@@ -469,6 +496,7 @@ void CheckNullPointer::nullPointerError(const Token *tok, const std::string &var
 
 void CheckNullPointer::arithmetic()
 {
+    logChecker("CheckNullPointer::arithmetic");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -515,6 +543,7 @@ static std::string arithmeticTypeString(const Token *tok)
 
 void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow::Value *value, bool inconclusive)
 {
+    // cppcheck-suppress shadowFunction - TODO: fix this
     std::string arithmetic = arithmeticTypeString(tok);
     std::string errmsg;
     if (tok && tok->str()[0] == '-') {
@@ -522,10 +551,21 @@ void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow:
     } else {
         errmsg = "Pointer " + arithmetic + " with NULL pointer.";
     }
-    const ErrorPath errorPath = getErrorPath(tok, value, "Null pointer " + arithmetic);
-    reportError(errorPath,
+
+    std::string id = "nullPointerArithmetic";
+    if (value && value->unknownFunctionReturn == ValueFlow::Value::UnknownFunctionReturn::outOfMemory) {
+        errmsg = "If memory allocation fails: " + (static_cast<char>(std::tolower(errmsg[0])) + errmsg.substr(1));
+        id += "OutOfMemory";
+    }
+    else if (value && value->unknownFunctionReturn == ValueFlow::Value::UnknownFunctionReturn::outOfResources) {
+        errmsg = "If resource allocation fails: " + (static_cast<char>(std::tolower(errmsg[0])) + errmsg.substr(1));
+        id += "OutOfResources";
+    }
+
+    ErrorPath errorPath = getErrorPath(tok, value, "Null pointer " + arithmetic);
+    reportError(std::move(errorPath),
                 Severity::error,
-                "nullPointerArithmetic",
+                id.c_str(),
                 errmsg,
                 CWE_INCORRECT_CALCULATION,
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
@@ -533,6 +573,7 @@ void CheckNullPointer::pointerArithmeticError(const Token* tok, const ValueFlow:
 
 void CheckNullPointer::redundantConditionWarning(const Token* tok, const ValueFlow::Value *value, const Token *condition, bool inconclusive)
 {
+    // cppcheck-suppress shadowFunction - TODO: fix this
     std::string arithmetic = arithmeticTypeString(tok);
     std::string errmsg;
     if (tok && tok->str()[0] == '-') {
@@ -540,8 +581,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,
@@ -549,28 +590,44 @@ void CheckNullPointer::redundantConditionWarning(const Token* tok, const ValueFl
                 inconclusive ? Certainty::inconclusive : Certainty::normal);
 }
 
-std::string CheckNullPointer::MyFileInfo::toString() const
-{
-    return CTU::toString(unsafeUsage);
-}
-
 // NOLINTNEXTLINE(readability-non-const-parameter) - used as callback so we need to preserve the signature
-static bool isUnsafeUsage(const Check *check, const Token *vartok, MathLib::bigint *value)
+static bool isUnsafeUsage(const Settings &settings, const Token *vartok, CTU::FileInfo::Value *value)
 {
     (void)value;
-    const CheckNullPointer *checkNullPointer = dynamic_cast<const CheckNullPointer *>(check);
     bool unknown = false;
-    return checkNullPointer && checkNullPointer->isPointerDeRef(vartok, unknown);
+    return CheckNullPointer::isPointerDeRef(vartok, unknown, settings);
+}
+
+// a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
+// see https://trac.cppcheck.net/ticket/12108 for more details
+#ifdef __clang__
+inline namespace CheckNullPointer_internal
+#else
+namespace
+#endif
+{
+    /* data for multifile checking */
+    class MyFileInfo : public Check::FileInfo {
+    public:
+        using Check::FileInfo::FileInfo;
+        /** function arguments that are dereferenced without checking if they are null */
+        std::list<CTU::FileInfo::UnsafeUsage> unsafeUsage;
+
+        /** Convert data into xml string */
+        std::string toString() const override
+        {
+            return CTU::toString(unsafeUsage);
+        }
+    };
 }
 
-Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const
+Check::FileInfo *CheckNullPointer::getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) const
 {
-    CheckNullPointer check(tokenizer, settings, nullptr);
-    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, &check, ::isUnsafeUsage);
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, isUnsafeUsage);
     if (unsafeUsage.empty())
         return nullptr;
 
-    MyFileInfo *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(tokenizer.list.getFiles()[0]);
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
@@ -581,22 +638,28 @@ Check::FileInfo * CheckNullPointer::loadFileInfoFromXml(const tinyxml2::XMLEleme
     if (unsafeUsage.empty())
         return nullptr;
 
-    MyFileInfo *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo;
     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<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
-    if (!ctu)
+    (void)settings;
+
+    CheckNullPointer dummy(nullptr, &settings, &errorLogger);
+    dummy.
+    logChecker("CheckNullPointer::analyseWholeProgram"); // unusedfunctions
+
+    if (fileInfo.empty())
         return false;
-    bool foundErrors = false;
-    (void)settings; // This argument is unused
 
-    const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> callsMap = ctu->getCallsMap();
+    const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> callsMap = ctu.getCallsMap();
+
+    bool foundErrors = false;
 
     for (const Check::FileInfo* fi1 : fileInfo) {
-        const MyFileInfo *fi = dynamic_cast<const MyFileInfo*>(fi1);
+        const auto *fi = dynamic_cast<const MyFileInfo*>(fi1);
         if (!fi)
             continue;
         for (const CTU::FileInfo::UnsafeUsage &unsafeUsage : fi->unsafeUsage) {
@@ -604,22 +667,35 @@ bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo *ctu, const std::
                 if (warning == 1 && !settings.severity.isEnabled(Severity::warning))
                     break;
 
-                const std::list<ErrorMessage::FileLocation> &locationList =
+                ValueFlow::Value::UnknownFunctionReturn unknownFunctionReturn = ValueFlow::Value::UnknownFunctionReturn::no;
+                std::list<ErrorMessage::FileLocation> locationList =
                     CTU::FileInfo::getErrorPath(CTU::FileInfo::InvalidValueType::null,
                                                 unsafeUsage,
                                                 callsMap,
                                                 "Dereferencing argument ARG that is null",
                                                 nullptr,
-                                                warning);
+                                                warning,
+                                                settings.maxCtuDepth,
+                                                &unknownFunctionReturn);
                 if (locationList.empty())
                     continue;
 
-                const ErrorMessage errmsg(locationList,
-                                          emptyString,
-                                          warning ? Severity::warning : Severity::error,
-                                          "Null pointer dereference: " + unsafeUsage.myArgumentName,
-                                          "ctunullpointer",
-                                          CWE_NULL_POINTER_DEREFERENCE, Certainty::normal);
+                std::string id = "ctunullpointer";
+                std::string message = "Null pointer dereference: " + unsafeUsage.myArgumentName;
+                if (unknownFunctionReturn == ValueFlow::Value::UnknownFunctionReturn::outOfMemory) {
+                    id += "OutOfMemory";
+                    message = "If memory allocation fails, then there is a possible null pointer dereference: " + unsafeUsage.myArgumentName;
+                } else if (unknownFunctionReturn == ValueFlow::Value::UnknownFunctionReturn::outOfResources) {
+                    id += "OutOfResources";
+                    message = "If resource allocation fails, then there is a possible null pointer dereference: " + unsafeUsage.myArgumentName;
+                }
+
+                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;
@@ -630,3 +706,23 @@ bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo *ctu, const std::
 
     return foundErrors;
 }
+
+void CheckNullPointer::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckNullPointer checkNullPointer(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkNullPointer.nullPointer();
+    checkNullPointer.arithmetic();
+    checkNullPointer.nullConstantDereference();
+}
+
+void CheckNullPointer::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckNullPointer 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 6751e00bc9b..d28927d19e9 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-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
@@ -24,8 +24,6 @@
 
 #include "check.h"
 #include "config.h"
-#include "ctu.h"
-#include "vfvalue.h"
 
 #include <list>
 #include <string>
@@ -36,8 +34,9 @@ class Settings;
 class Token;
 class Tokenizer;
 
-namespace tinyxml2 {
-    class XMLElement;
+namespace ValueFlow
+{
+    class Value;
 }
 
 /// @addtogroup Checks
@@ -47,22 +46,26 @@ namespace tinyxml2 {
 /** @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()) {}
 
-    /** @brief This constructor is used when running checks. */
-    CheckNullPointer(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
+    /**
+     * 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 isPointerDeRef(const Token *tok, bool &unknown) const;
 
-    /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckNullPointer checkNullPointer(tokenizer, settings, errorLogger);
-        checkNullPointer.nullPointer();
-        checkNullPointer.arithmetic();
-        checkNullPointer.nullConstantDereference();
-    }
+    static bool isPointerDeRef(const Token *tok, bool &unknown, const Settings &settings, bool checkNullArg = true);
 
+private:
     /**
      * @brief parse a function call and extract information about variable usage
      * @param tok first token
@@ -71,20 +74,14 @@ class CPPCHECKLIB CheckNullPointer : public Check {
      */
     static void parseFunctionCall(const Token &tok,
                                   std::list<const Token *> &var,
-                                  const Library *library);
+                                  const Library &library, bool checkNullArg = true);
 
-    /**
-     * 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 isPointerDeRef(const Token *tok, bool &unknown) const;
+    /** @brief This constructor is used when running checks. */
+    CheckNullPointer(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
+        : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    static bool isPointerDeRef(const Token *tok, bool &unknown, const Settings *settings);
+    /** @brief Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief possible null pointer dereference */
     void nullPointer();
@@ -92,39 +89,19 @@ class CPPCHECKLIB CheckNullPointer : public Check {
     /** @brief dereferencing null constant (after Tokenizer::simplifyKnownVariables) */
     void nullConstantDereference();
 
-    void nullPointerError(const Token *tok) {
-        ValueFlow::Value v(0);
-        v.setKnown();
-        nullPointerError(tok, emptyString, &v, false);
-    }
+    void nullPointerError(const Token *tok);
     void nullPointerError(const Token *tok, const std::string &varname, const ValueFlow::Value* value, bool inconclusive);
 
-    /* data for multifile checking */
-    class MyFileInfo : public Check::FileInfo {
-    public:
-        /** function arguments that are dereferenced without checking if they are null */
-        std::list<CTU::FileInfo::UnsafeUsage> unsafeUsage;
-
-        /** Convert MyFileInfo data into xml string */
-        std::string toString() const override;
-    };
-
     /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const override;
+    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) 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;
+    bool analyseWholeProgram(const CTU::FileInfo &ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger) override;
 
-private:
     /** Get error messages. Used by --errorlist */
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckNullPointer c(nullptr, settings, errorLogger);
-        c.nullPointerError(nullptr, "pointer", nullptr, false);
-        c.pointerArithmeticError(nullptr, nullptr, false);
-        c.redundantConditionWarning(nullptr, nullptr, nullptr, false);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     /** Name of check */
     static std::string myName() {
@@ -142,7 +119,7 @@ class CPPCHECKLIB CheckNullPointer : public Check {
      * @brief Does one part of the check for nullPointer().
      * Dereferencing a pointer and then checking if it's NULL..
      */
-    void nullPointerByDeRefAndChec();
+    void nullPointerByDeRefAndCheck();
 
     /** undefined null pointer arithmetic */
     void arithmetic();
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index 2a167a068aa..1247d97365e 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-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
@@ -36,12 +36,16 @@
 #include "vfvalue.h"
 
 #include <algorithm> // find_if()
+#include <cassert>
 #include <cctype>
+#include <cstddef>
+#include <cstdint>
 #include <list>
 #include <map>
+#include <set>
 #include <sstream>
+#include <unordered_map>
 #include <utility>
-#include <numeric>
 
 //---------------------------------------------------------------------------
 
@@ -50,24 +54,24 @@ namespace {
     CheckOther instance;
 }
 
-static const struct CWE CWE128(128U);   // Wrap-around Error
-static const struct CWE CWE131(131U);   // Incorrect Calculation of Buffer Size
-static const struct CWE CWE197(197U);   // Numeric Truncation Error
-static const struct CWE CWE362(362U);   // Concurrent Execution using Shared Resource with Improper Synchronization ('Race Condition')
-static const struct CWE CWE369(369U);   // Divide By Zero
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
-static const struct CWE CWE475(475U);   // Undefined Behavior for Input to API
-static const struct CWE CWE561(561U);   // Dead Code
-static const struct CWE CWE563(563U);   // Assignment to Variable without Use ('Unused Variable')
-static const struct CWE CWE570(570U);   // Expression is Always False
-static const struct CWE CWE571(571U);   // Expression is Always True
-static const struct CWE CWE672(672U);   // Operation on a Resource after Expiration or Release
-static const struct CWE CWE628(628U);   // Function Call with Incorrectly Specified Arguments
-static const struct CWE CWE683(683U);   // Function Call With Incorrect Order of Arguments
-static const struct CWE CWE704(704U);   // Incorrect Type Conversion or Cast
-static const struct CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
-static const struct CWE CWE768(768U);   // Incorrect Short Circuit Evaluation
-static const struct CWE CWE783(783U);   // Operator Precedence Logic Error
+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
+static const CWE CWE362(362U);   // Concurrent Execution using Shared Resource with Improper Synchronization ('Race Condition')
+static const CWE CWE369(369U);   // Divide By Zero
+static const CWE CWE398(398U);   // Indicator of Poor Code Quality
+static const CWE CWE475(475U);   // Undefined Behavior for Input to API
+static const CWE CWE561(561U);   // Dead Code
+static const CWE CWE563(563U);   // Assignment to Variable without Use ('Unused Variable')
+static const CWE CWE570(570U);   // Expression is Always False
+static const CWE CWE571(571U);   // Expression is Always True
+static const CWE CWE672(672U);   // Operation on a Resource after Expiration or Release
+static const CWE CWE628(628U);   // Function Call with Incorrectly Specified Arguments
+static const CWE CWE683(683U);   // Function Call With Incorrect Order of Arguments
+static const CWE CWE704(704U);   // Incorrect Type Conversion or Cast
+static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
+static const CWE CWE768(768U);   // Incorrect Short Circuit Evaluation
+static const CWE CWE783(783U);   // Operator Precedence Logic Error
 
 //----------------------------------------------------------------------------------
 // The return value of fgetc(), getc(), ungetc(), getchar() etc. is an integer value.
@@ -86,10 +90,12 @@ void CheckOther::checkCastIntToCharAndBack()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckOther::checkCastIntToCharAndBack"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         std::map<int, std::string> vars;
-        for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
+        for (const Token* tok = scope->bodyStart->next(); tok && tok != scope->bodyEnd; tok = tok->next()) {
             // Quick check to see if any of the matches below have any chances
             if (!Token::Match(tok, "%var%|EOF %comp%|="))
                 continue;
@@ -104,13 +110,13 @@ void CheckOther::checkCastIntToCharAndBack()
                 if (var && var->typeEndToken()->str() == "char" && !var->typeEndToken()->isSigned()) {
                     checkCastIntToCharAndBackError(tok, tok->strAt(2));
                 }
-            } else if (mTokenizer->isCPP() && (Token::Match(tok, "EOF %comp% ( %var% = std :: cin . get (") || Token::Match(tok, "EOF %comp% ( %var% = cin . get ("))) {
+            } else if (tok->isCpp() && (Token::Match(tok, "EOF %comp% ( %var% = std :: cin . get (") || Token::Match(tok, "EOF %comp% ( %var% = cin . get ("))) {
                 tok = tok->tokAt(3);
                 const Variable *var = tok->variable();
                 if (var && var->typeEndToken()->str() == "char" && !var->typeEndToken()->isSigned()) {
                     checkCastIntToCharAndBackError(tok, "cin.get");
                 }
-            } else if (mTokenizer->isCPP() && (Token::Match(tok, "%var% = std :: cin . get (") || Token::Match(tok, "%var% = cin . get ("))) {
+            } else if (tok->isCpp() && (Token::Match(tok, "%var% = std :: cin . get (") || Token::Match(tok, "%var% = cin . get ("))) {
                 const Variable *var = tok->variable();
                 if (var && var->typeEndToken()->str() == "char" && !var->typeEndToken()->isSigned()) {
                     vars[tok->varId()] = "cin.get";
@@ -151,9 +157,11 @@ void CheckOther::checkCastIntToCharAndBackError(const Token *tok, const std::str
 //---------------------------------------------------------------------------
 void CheckOther::clarifyCalculation()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("clarifyCalculation"))
         return;
 
+    logChecker("CheckOther::clarifyCalculation"); // style
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -223,6 +231,8 @@ void CheckOther::clarifyStatement()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckOther::clarifyStatement"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
@@ -259,9 +269,11 @@ void CheckOther::checkSuspiciousSemicolon()
 
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
+    logChecker("CheckOther::checkSuspiciousSemicolon"); // warning,inconclusive
+
     // Look for "if(); {}", "for(); {}" or "while(); {}"
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type == Scope::eIf || scope.type == Scope::eElse || scope.type == Scope::eWhile || scope.type == Scope::eFor) {
+        if (scope.type == ScopeType::eIf || scope.type == ScopeType::eElse || scope.type == ScopeType::eWhile || scope.type == ScopeType::eFor) {
             // Ensure the semicolon is at the same line number as the if/for/while statement
             // and the {..} block follows it without an extra empty line.
             if (Token::simpleMatch(scope.bodyStart, "{ ; } {") &&
@@ -280,6 +292,44 @@ void CheckOther::suspiciousSemicolonError(const Token* tok)
                 "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
@@ -287,9 +337,14 @@ void CheckOther::suspiciousSemicolonError(const Token* tok)
 void CheckOther::warningOldStylePointerCast()
 {
     // Only valid on C++ code
-    if (!mSettings->severity.isEnabled(Severity::style) || !mTokenizer->isCPP())
+    if (!mTokenizer->isCPP())
         return;
 
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("cstyleCast"))
+        return;
+
+    logChecker("CheckOther::warningOldStylePointerCast"); // style,c++
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         const Token* tok;
@@ -299,13 +354,35 @@ void CheckOther::warningOldStylePointerCast()
             tok = scope->bodyStart;
         for (; tok && tok != scope->bodyEnd; tok = tok->next()) {
             // Old style pointer casting..
-            if (!Token::Match(tok, "( const|volatile| const|volatile|class|struct| %type% * *| *| const|&| ) (| %name%|%num%|%bool%|%char%|%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();
+                if (Token::simpleMatch(castTok, "<") && castTok->link())
+                    castTok = castTok->link()->next();
+            }
+            if (castTok == tok->next())
+                continue;
+            bool isPtr = false, isRef = false;
+            while (Token::Match(castTok, "*|const|&")) {
+                if (castTok->str() == "*")
+                    isPtr = true;
+                else if (castTok->str() == "&")
+                    isRef = true;
+                castTok = castTok->next();
+            }
+            if ((!isPtr && !isRef) || !Token::Match(castTok, ") (| %name%|%bool%|%char%|%str%|&"))
+                continue;
+
             if (Token::Match(tok->previous(), "%type%"))
                 continue;
 
             // skip first "const" in "const Type* const"
-            while (Token::Match(tok->next(), "const|volatile|class|struct"))
+            while (Token::Match(tok->next(), "const|volatile|class|struct|union"))
                 tok = tok->next();
             const Token* typeTok = tok->next();
             // skip second "const" in "const Type* const"
@@ -313,25 +390,156 @@ void CheckOther::warningOldStylePointerCast()
                 tok = tok->next();
 
             const Token *p = tok->tokAt(4);
-            if (p->hasKnownIntValue() && p->values().front().intvalue==0) // Casting nullpointers is safe
+            if (p->hasKnownIntValue() && p->getKnownIntValue()==0) // Casting nullpointers is safe
                 continue;
 
             if (typeTok->tokType() == Token::eType || typeTok->tokType() == Token::eName)
-                cstyleCastError(tok);
+                cstyleCastError(errtok, isPtr);
         }
     }
 }
 
-void CheckOther::cstyleCastError(const Token *tok)
+void CheckOther::cstyleCastError(const Token *tok, bool isPtr)
 {
+    const std::string type = isPtr ? "pointer" : "reference";
     reportError(tok, Severity::style, "cstyleCast",
-                "C-style pointer casting\n"
-                "C-style pointer casting detected. C++ offers four different kinds of casts as replacements: "
+                "C-style " + type + " casting\n"
+                "C-style " + type + " casting detected. C++ offers four different kinds of casts as replacements: "
                 "static_cast, const_cast, dynamic_cast and reinterpret_cast. A C-style cast could evaluate to "
                 "any of those automatically, thus it is considered safer if the programmer explicitly states "
                 "which kind of cast is expected.", CWE398, Certainty::normal);
 }
 
+void CheckOther::warningDangerousTypeCast()
+{
+    // Only valid on C++ code
+    if (!mTokenizer->isCPP())
+        return;
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("cstyleCast"))
+        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 CheckOther::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 CheckOther::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
+                continue;
+            intToPointerCastError(tok, format);
+        }
+    }
+}
+
+void CheckOther::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 CheckOther::suspiciousFloatingPointCast()
+{
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("suspiciousFloatingPointCast"))
+        return;
+
+    logChecker("CheckOther::suspiciousFloatingPointCast"); // style
+
+    const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
+    for (const Scope * scope : symbolDatabase->functionScopes) {
+        const Token* tok = scope->bodyStart;
+        if (scope->function && scope->function->isConstructor())
+            tok = scope->classDef;
+        for (; tok && tok != scope->bodyEnd; tok = tok->next()) {
+
+            if (!tok->isCast())
+                continue;
+
+            const ValueType* vt = tok->valueType();
+            if (!vt || vt->pointer || vt->reference != Reference::None || (vt->type != ValueType::FLOAT && vt->type != ValueType::DOUBLE))
+                continue;
+
+            using VTT = std::vector<ValueType::Type>;
+            const VTT sourceTypes = vt->type == ValueType::FLOAT ? VTT{ ValueType::DOUBLE, ValueType::LONGDOUBLE } : VTT{ ValueType::LONGDOUBLE };
+
+            const Token* source = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
+            if (!source || !source->valueType() || std::find(sourceTypes.begin(), sourceTypes.end(), source->valueType()->type) == sourceTypes.end())
+                continue;
+
+            const Token* parent = tok->astParent();
+            if (!parent)
+                continue;
+
+            const ValueType* parentVt = parent->valueType();
+            if (!parentVt || parent->str() == "(") {
+                int argn{};
+                if (const Token* ftok = getTokenArgumentFunction(tok, argn)) {
+                    if (ftok->function()) {
+                        if (const Variable* argVar = ftok->function()->getArgumentVar(argn))
+                            parentVt = argVar->valueType();
+                    }
+                }
+            }
+            if (!parentVt || std::find(sourceTypes.begin(), sourceTypes.end(), parentVt->type) == sourceTypes.end())
+                continue;
+
+            suspiciousFloatingPointCastError(tok);
+        }
+    }
+}
+
+void CheckOther::suspiciousFloatingPointCastError(const Token* tok)
+{
+    reportError(tok, Severity::style, "suspiciousFloatingPointCast",
+                "Floating-point cast causes loss of precision.\n"
+                "If this cast is not intentional, remove it to avoid loss of precision", CWE398, Certainty::normal);
+}
+
 //---------------------------------------------------------------------------
 // float* f; double* d = (double*)f; <-- Pointer cast to a type with an incompatible binary data representation
 //---------------------------------------------------------------------------
@@ -341,6 +549,8 @@ void CheckOther::invalidPointerCast()
     if (!mSettings->severity.isEnabled(Severity::portability))
         return;
 
+    logChecker("CheckOther::invalidPointerCast"); // portability
+
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -389,8 +599,13 @@ void CheckOther::invalidPointerCastError(const Token* tok, const std::string& fr
 
 void CheckOther::checkRedundantAssignment()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("redundantAssignment") &&
+        !mSettings->isPremiumEnabled("redundantAssignInSwitch"))
         return;
+
+    logChecker("CheckOther::checkRedundantAssignment"); // style
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *scope : symbolDatabase->functionScopes) {
         if (!scope->bodyStart)
@@ -443,7 +658,7 @@ void CheckOther::checkRedundantAssignment()
                     continue;
 
                 bool inconclusive = false;
-                if (mTokenizer->isCPP() && tok->astOperand1()->valueType()) {
+                if (tok->isCpp() && tok->astOperand1()->valueType()) {
                     // If there is a custom assignment operator => this is inconclusive
                     if (tok->astOperand1()->valueType()->typeScope) {
                         const std::string op = "operator" + tok->str();
@@ -459,19 +674,37 @@ void CheckOther::checkRedundantAssignment()
                 if (inconclusive && !mSettings->certainty.isEnabled(Certainty::inconclusive))
                     continue;
 
-                FwdAnalysis fwdAnalysis(mTokenizer->isCPP(), mSettings->library);
+                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();
 
+                const Token * tokenToCheck = tok->astOperand1();
+
+                // Check if we are working with union
+                for (const Token* tempToken = tokenToCheck; Token::simpleMatch(tempToken, ".");) {
+                    tempToken = tempToken->astOperand1();
+                    if (tempToken && tempToken->variable() && tempToken->variable()->type() && tempToken->variable()->type()->isUnionType())
+                        tokenToCheck = tempToken;
+                }
+
+                if (start->hasKnownSymbolicValue(tokenToCheck) && Token::simpleMatch(start->astParent(), "=") && !diag(tok)) {
+                    const ValueFlow::Value* val = start->getKnownValue(ValueFlow::Value::ValueType::SYMBOLIC);
+                    if (val->intvalue == 0) // no offset
+                        redundantAssignmentSameValueError(tokenToCheck, val, tok->astOperand1()->expressionString());
+                }
+
                 // Get next assignment..
-                const Token *nextAssign = fwdAnalysis.reassign(tok->astOperand1(), start, scope->bodyEnd);
+                const Token *nextAssign = fwdAnalysis.reassign(tokenToCheck, start, scope->bodyEnd);
+                // extra check for union
+                if (nextAssign && tokenToCheck != tok->astOperand1())
+                    nextAssign = fwdAnalysis.reassign(tok->astOperand1(), start, scope->bodyEnd);
 
                 if (!nextAssign)
                     continue;
@@ -492,8 +725,10 @@ void CheckOther::checkRedundantAssignment()
                     redundantAssignmentInSwitchError(tok, nextAssign, tok->astOperand1()->expressionString());
                 else if (isInitialization)
                     redundantInitializationError(tok, nextAssign, tok->astOperand1()->expressionString(), inconclusive);
-                else
+                else {
+                    diag(nextAssign);
                     redundantAssignmentError(tok, nextAssign, tok->astOperand1()->expressionString(), inconclusive);
+                }
             }
         }
     }
@@ -509,22 +744,22 @@ void CheckOther::redundantCopyError(const Token *tok1, const Token* tok2, const
 
 void CheckOther::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)
 {
-    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);
@@ -532,12 +767,21 @@ void CheckOther::redundantInitializationError(const Token *tok1, const Token* to
 
 void CheckOther::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)
+{
+    auto errorPath = val->errorPath;
+    errorPath.emplace_back(tok, "");
+    reportError(std::move(errorPath), Severity::style, "redundantAssignment",
+                "$symbol:" + var + "\n"
+                "Variable '$symbol' is assigned an expression that holds the same value.", CWE563, Certainty::normal);
+}
+
 
 //---------------------------------------------------------------------------
 //    switch (x)
@@ -553,17 +797,19 @@ static inline bool isFunctionOrBreakPattern(const Token *tok)
     return Token::Match(tok, "%name% (") || Token::Match(tok, "break|continue|return|exit|goto|throw");
 }
 
-void CheckOther::checkRedundantAssignmentInSwitch()
+void CheckOther::redundantBitwiseOperationInSwitchError()
 {
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckOther::redundantBitwiseOperationInSwitch"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Find the beginning of a switch. E.g.:
     //   switch (var) { ...
     for (const Scope &switchScope : symbolDatabase->scopeList) {
-        if (switchScope.type != Scope::eSwitch || !switchScope.bodyStart)
+        if (switchScope.type != ScopeType::eSwitch || !switchScope.bodyStart)
             continue;
 
         // Check the contents of the switch statement
@@ -605,13 +851,13 @@ void CheckOther::checkRedundantAssignmentInSwitch()
             else if (Token::Match(tok2->previous(), ";|{|}|: %var% %assign% %num% ;") &&
                      (tok2->strAt(1) == "|=" || tok2->strAt(1) == "&=") &&
                      Token::Match(tok2->next()->astOperand2(), "%num%")) {
-                const std::string bitOp = tok2->strAt(1)[0] + tok2->strAt(2);
-                const std::map<int, const Token*>::const_iterator i2 = varsWithBitsSet.find(tok2->varId());
+                std::string bitOp = tok2->strAt(1)[0] + tok2->strAt(2);
+                const auto i2 = utils::as_const(varsWithBitsSet).find(tok2->varId());
 
                 // This variable has not had a bit operation performed on it yet, so just make a note of it
                 if (i2 == varsWithBitsSet.end()) {
                     varsWithBitsSet[tok2->varId()] = tok2;
-                    bitOperations[tok2->varId()] = bitOp;
+                    bitOperations[tok2->varId()] = std::move(bitOp);
                 }
 
                 // The same bit operation has been performed on the same variable twice, so report an error
@@ -630,13 +876,13 @@ void CheckOther::checkRedundantAssignmentInSwitch()
             //    case 4: b = b | 1;
             else if (Token::Match(tok2->previous(), ";|{|}|: %var% = %name% %or%|& %num% ;") &&
                      tok2->varId() == tok2->tokAt(2)->varId()) {
-                const std::string bitOp = tok2->strAt(3) + tok2->strAt(4);
-                const std::map<int, const Token*>::const_iterator i2 = varsWithBitsSet.find(tok2->varId());
+                std::string bitOp = tok2->strAt(3) + tok2->strAt(4);
+                const auto i2 = utils::as_const(varsWithBitsSet).find(tok2->varId());
 
                 // This variable has not had a bit operation performed on it yet, so just make a note of it
                 if (i2 == varsWithBitsSet.end()) {
                     varsWithBitsSet[tok2->varId()] = tok2;
-                    bitOperations[tok2->varId()] = bitOp;
+                    bitOperations[tok2->varId()] = std::move(bitOp);
                 }
 
                 // The same bit operation has been performed on the same variable twice, so report an error
@@ -685,10 +931,12 @@ void CheckOther::checkSuspiciousCaseInSwitch()
     if (!mSettings->certainty.isEnabled(Certainty::inconclusive) || !mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckOther::checkSuspiciousCaseInSwitch"); // warning,inconclusive
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope & scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eSwitch)
+        if (scope.type != ScopeType::eSwitch)
             continue;
 
         for (const Token* tok = scope.bodyStart->next(); tok != scope.bodyEnd; tok = tok->next()) {
@@ -719,6 +967,43 @@ void CheckOther::suspiciousCaseInSwitchError(const Token* tok, const std::string
                 "Using an operator like '" + operatorString + "' in a case label is suspicious. Did you intend to use a bitwise operator, multiple case labels or if/else instead?", CWE398, Certainty::inconclusive);
 }
 
+static bool isNestedInSwitch(const Scope* scope)
+{
+    while (scope) {
+        if (scope->type == ScopeType::eSwitch)
+            return true;
+        if (scope->type == ScopeType::eUnconditional) {
+            scope = scope->nestedIn;
+            continue;
+        }
+        break;
+    }
+    return false;
+}
+
+static bool isVardeclInSwitch(const Token* tok)
+{
+    if (!tok)
+        return false;
+    if (!isNestedInSwitch(tok->scope()))
+        return false;
+    if (const Token* end = Token::findsimplematch(tok, ";")) {
+        for (const Token* tok2 = tok; tok2 != end; tok2 = tok2->next()) {
+            if (tok2->isKeyword() && tok2->str() == "case")
+                return false;
+            if (tok2->variable() && tok2->variable()->nameToken() == tok2) {
+                end = tok2->scope()->bodyEnd;
+                for (const Token* tok3 = tok2; tok3 != end; tok3 = tok3->next()) {
+                    if (tok3->isKeyword())
+                        return tok3->str() == "case";
+                }
+                return false;
+            }
+        }
+    }
+    return false;
+}
+
 //---------------------------------------------------------------------------
 //    Find consecutive return, break, continue, goto or throw statements. e.g.:
 //        break; break;
@@ -727,11 +1012,20 @@ void CheckOther::suspiciousCaseInSwitchError(const Token* tok, const std::string
 //---------------------------------------------------------------------------
 void CheckOther::checkUnreachableCode()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    // 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"))
         return;
+
+    logChecker("CheckOther::checkUnreachableCode"); // style
+
     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))
+            continue;
         for (const Token* tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
             const Token* secondBreak = nullptr;
             const Token* labelName = nullptr;
@@ -762,6 +1056,15 @@ void CheckOther::checkUnreachableCode()
                     continue;
                 }
             }
+            while (Token::simpleMatch(secondBreak, "}") && secondBreak->scope()->type == ScopeType::eUnconditional)
+                secondBreak = secondBreak->next();
+            if (secondBreak && secondBreak->scope()->nestedIn && secondBreak->scope()->nestedIn->type == ScopeType::eSwitch &&
+                tok->str() == "break") {
+                while (Token::simpleMatch(secondBreak, "{") && secondBreak->scope()->type == ScopeType::eUnconditional)
+                    secondBreak = secondBreak->next();
+            }
+            while (Token::simpleMatch(secondBreak, ";"))
+                secondBreak = secondBreak->next();
 
             // Statements follow directly, no line between them. (#3383)
             // TODO: Try to find a better way to avoid false positives due to preprocessor configurations.
@@ -775,7 +1078,7 @@ void CheckOther::checkUnreachableCode()
                     if (tok->str() == "break") // If the previous was a break, too: Issue warning
                         duplicateBreakError(secondBreak, inconclusive);
                     else {
-                        if (tok->scope()->type != Scope::eSwitch) // Check, if the enclosing scope is a switch
+                        if (tok->scope()->type != ScopeType::eSwitch) // Check, if the enclosing scope is a switch
                             duplicateBreakError(secondBreak, inconclusive);
                     }
                     tok = Token::findmatch(secondBreak, "[}:]");
@@ -810,7 +1113,7 @@ void CheckOther::checkUnreachableCode()
                     if (silencedWarning)
                         secondBreak = silencedWarning;
 
-                    if (!labelInFollowingLoop && !silencedCompilerWarningOnly)
+                    if (!labelInFollowingLoop && !silencedCompilerWarningOnly && !isVardeclInSwitch(secondBreak))
                         unreachableCodeError(secondBreak, tok, inconclusive);
                     tok = Token::findmatch(secondBreak, "[}:]");
                 } else if (secondBreak->scope() && secondBreak->scope()->isLoopScope() && secondBreak->str() == "}" && tok->str() == "continue") {
@@ -855,19 +1158,29 @@ void CheckOther::redundantContinueError(const Token *tok)
                 "'continue' is redundant since it is the last statement in a loop.", CWE561, Certainty::normal);
 }
 
-static bool isSimpleExpr(const Token* tok, const Variable* var, const Settings* settings) {
+static bool isSimpleExpr(const Token* tok, const Variable* var, const Settings& settings) {
     if (!tok)
         return false;
     if (tok->isNumber() || tok->tokType() == Token::eString || tok->tokType() == Token::eChar || tok->isBoolean())
         return true;
     bool needsCheck = tok->varId() > 0;
     if (!needsCheck) {
+        if (tok->isArithmeticalOp())
+            return isSimpleExpr(tok->astOperand1(), var, settings) && (!tok->astOperand2() || isSimpleExpr(tok->astOperand2(), var, settings));
         const Token* ftok = tok->previous();
         if (Token::Match(ftok, "%name% (") &&
-            ((ftok->function() && ftok->function()->isConst()) || settings->library.isFunctionConst(ftok->str(), /*pure*/ true)))
+            ((ftok->function() && ftok->function()->isConst()) || settings.library.isFunctionConst(ftok->str(), /*pure*/ true)))
             needsCheck = true;
+        else if (tok->str() == "[") {
+            needsCheck = tok->astOperand1() && tok->astOperand1()->varId() > 0;
+            tok = tok->astOperand1();
+        }
+        else if (isLeafDot(tok->astOperand2())) {
+            needsCheck = tok->astOperand2()->varId() > 0;
+            tok = tok->astOperand2();
+        }
     }
-    return (needsCheck && !isExpressionChanged(tok, tok->astParent(), var->scope()->bodyEnd, settings, true));
+    return (needsCheck && !findExpressionChanged(tok, tok->astParent(), var->scope()->bodyEnd, settings));
 }
 
 //---------------------------------------------------------------------------
@@ -878,7 +1191,7 @@ void CheckOther::checkVariableScope()
     if (mSettings->clang)
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("variableScope"))
         return;
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -888,12 +1201,20 @@ void CheckOther::checkVariableScope()
     if (mSettings->daca && mTokenizer->isC())
         return;
 
+    logChecker("CheckOther::checkVariableScope"); // style,notclang
+
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || !var->isLocal() || var->isConst())
             continue;
 
+        if (var->nameToken()->isExpandedMacro())
+            continue;
+        if (isStructuredBindingVariable(var) && // warn for single decomposition
+            !(Token::simpleMatch(var->nameToken()->astParent(), "[") && var->nameToken()->astParent()->astOperand2() == var->nameToken()))
+            continue;
+
         const bool isPtrOrRef = var->isPointer() || var->isReference();
-        const bool isSimpleType = var->typeStartToken()->isStandardType() || var->typeStartToken()->isEnumType() || (mTokenizer->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;
 
@@ -926,7 +1247,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
@@ -935,11 +1256,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;
                 }
@@ -954,7 +1275,7 @@ void CheckOther::checkVariableScope()
         bool reduce = true;
         bool used = false; // Don't warn about unused variables
         for (; tok && tok != var->scope()->bodyEnd; tok = tok->next()) {
-            if (tok->str() == "{" && tok->scope() != tok->previous()->scope() && !tok->isExpandedMacro() && !isWithinScope(tok, var, Scope::ScopeType::eLambda)) {
+            if (tok->str() == "{" && tok->scope() != tok->previous()->scope() && !tok->isExpandedMacro() && !isWithinScope(tok, var, ScopeType::eLambda)) {
                 if (used) {
                     bool used2 = false;
                     if (!checkInnerScope(tok, var, used2) || used2) {
@@ -970,16 +1291,7 @@ void CheckOther::checkVariableScope()
 
                 // parse else if blocks..
             } else if (Token::simpleMatch(tok, "else { if (") && Token::simpleMatch(tok->linkAt(3), ") {")) {
-                const Token *endif = tok->linkAt(3)->linkAt(1);
-                bool elseif = false;
-                if (Token::simpleMatch(endif, "} }"))
-                    elseif = true;
-                else if (Token::simpleMatch(endif, "} else {") && Token::simpleMatch(endif->linkAt(2),"} }"))
-                    elseif = true;
-                if (elseif && Token::findmatch(tok->next(), "%varid%", tok->linkAt(1), var->declarationId())) {
-                    reduce = false;
-                    break;
-                }
+                tok = tok->next();
             } else if (tok->varId() == var->declarationId() || tok->str() == "goto") {
                 reduce = false;
                 break;
@@ -991,21 +1303,47 @@ void CheckOther::checkVariableScope()
     }
 }
 
-bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& used)
+// used to check if an argument to a function might depend on another argument
+static bool mayDependOn(const ValueType *other, const ValueType *original)
+{
+    if (!other || !original)
+        return false;
+
+    // other must be pointer
+    if (!other->pointer)
+        return false;
+
+    // must be same underlying type
+    if (other->type != original->type)
+        return false;
+
+    const int otherPtr = other->pointer + (other->reference == Reference::LValue ? 1 : 0);
+    const int originalPtr = original->pointer;
+
+    if (otherPtr == originalPtr) {
+        // if other is not const than original may be copied to other
+        return !other->isConst(otherPtr);
+    }
+
+    // other may be reassigned to original
+    return otherPtr > originalPtr;
+}
+
+bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& used) const
 {
     const Scope* scope = tok->next()->scope();
     bool loopVariable = scope->isLoopScope();
     bool noContinue = true;
     const Token* forHeadEnd = nullptr;
     const Token* end = tok->link();
-    if (scope->type == Scope::eUnconditional && (tok->strAt(-1) == ")" || tok->previous()->isName())) // Might be an unknown macro like BOOST_FOREACH
+    if (scope->type == ScopeType::eUnconditional && (tok->strAt(-1) == ")" || tok->previous()->isName())) // Might be an unknown macro like BOOST_FOREACH
         loopVariable = true;
 
-    if (scope->type == Scope::eDo) {
+    if (scope->type == ScopeType::eDo) {
         end = end->linkAt(2);
     } else if (loopVariable && tok->strAt(-1) == ")") {
         tok = tok->linkAt(-1); // Jump to opening ( of for/while statement
-    } else if (scope->type == Scope::eSwitch) {
+    } else if (scope->type == ScopeType::eSwitch) {
         for (const Scope* innerScope : scope->nestedList) {
             if (used) {
                 bool used2 = false;
@@ -1030,7 +1368,7 @@ 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 != Scope::eSwitch && Token::Match(tok, "%varid% =", var->declarationId())) { // Assigned in outer scope.
+        if (loopVariable && noContinue && tok->scope() == scope && !forHeadEnd && scope->type != ScopeType::eSwitch && Token::Match(tok, "%varid% =", var->declarationId())) { // Assigned in outer scope.
             loopVariable = false;
             std::pair<const Token*, const Token*> range = tok->next()->findExpressionStartEndTokens();
             if (range.first)
@@ -1065,12 +1403,36 @@ bool CheckOther::checkInnerScope(const Token *tok, const Variable* var, bool& us
         if (tok->varId() == var->declarationId()) {
             used = true;
             if (scope == tok->scope()) {
-                if (scope->type == Scope::eSwitch)
+                if (scope->type == ScopeType::eSwitch)
                     return false; // Used in outer switch scope - unsafe or impossible to reduce scope
 
                 if (scope->bodyStart && scope->bodyStart->isSimplifiedScope())
                     return false; // simplified if/for/switch init statement
             }
+            if (var->isArrayOrPointer()) {
+                int argn{};
+                if (const Token* ftok = getTokenArgumentFunction(tok, argn)) { // var passed to function?
+                    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
+                        if (!ret.empty() && ret.back() == '*')
+                            return false;
+                    }
+                    if (ftok->function()) {
+                        const std::list<Variable> &argvars = ftok->function()->argumentList;
+                        if (const Variable* argvar = ftok->function()->getArgumentVar(argn)) {
+                            if (!std::all_of(argvars.cbegin(), argvars.cend(), [&](const Variable& other) {
+                                return &other == argvar || !mayDependOn(other.valueType(), argvar->valueType());
+                            }))
+                                return false;
+                        }
+                    }
+                }
+            }
+            const auto yield = astContainerYield(tok, mSettings->library);
+            if (yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT)
+                return false;
         }
     }
 
@@ -1110,6 +1472,8 @@ void CheckOther::checkCommaSeparatedReturn()
     if ((true) || !mSettings->severity.isEnabled(Severity::style)) // NOLINT(readability-simplify-boolean-expr)
         return;
 
+    // logChecker
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (tok->str() == "return") {
             tok = tok->next();
@@ -1146,155 +1510,25 @@ void CheckOther::commaSeparatedReturnError(const Token *tok)
                 "macro is then used in a return statement, it is less likely such code is misunderstood.", CWE398, Certainty::normal);
 }
 
-//---------------------------------------------------------------------------
-// Check for function parameters that should be passed by const reference
-//---------------------------------------------------------------------------
-static int estimateSize(const Type* type, const Settings* settings, const SymbolDatabase* symbolDatabase, int recursionDepth = 0)
-{
-    if (recursionDepth > 20)
-        return 0;
-
-    int cumulatedSize = 0;
-    const bool isUnion = type->classScope->type == Scope::ScopeType::eUnion;
-    const auto accumulateSize = [](int& cumulatedSize, int size, bool isUnion) -> void {
-        if (isUnion)
-            cumulatedSize = std::max(cumulatedSize, size);
-        else
-            cumulatedSize += size;
-    };
-    for (const Variable&var : type->classScope->varlist) {
-        int size = 0;
-        if (var.isStatic())
-            continue;
-        if (var.isPointer() || var.isReference())
-            size = settings->platform.sizeof_pointer;
-        else if (var.type() && var.type()->classScope)
-            size = estimateSize(var.type(), settings, symbolDatabase, recursionDepth+1);
-        else if (var.valueType() && var.valueType()->type == ValueType::Type::CONTAINER)
-            size = 3 * settings->platform.sizeof_pointer; // Just guess
-        else
-            size = symbolDatabase->sizeOfType(var.typeStartToken());
-
-        if (var.isArray())
-            size *= std::accumulate(var.dimensions().cbegin(), var.dimensions().cend(), 1, [](int v, const Dimension& d) {
-                return v *= d.num;
-            });
-
-        accumulateSize(cumulatedSize, size, isUnion);
-    }
-    return std::accumulate(type->derivedFrom.cbegin(), type->derivedFrom.cend(), cumulatedSize, [&](int v, const Type::BaseInfo& baseInfo) {
-        if (baseInfo.type && baseInfo.type->classScope)
-            v += estimateSize(baseInfo.type, settings, symbolDatabase, recursionDepth + 1);
-        return v;
-    });
-}
-
-static bool isConstRangeBasedFor(const Token* tok) {
-    if (astIsRangeBasedForDecl(tok)) {
-        const Variable* loopVar = tok->astParent()->astOperand1()->variable();
-        return loopVar && (!loopVar->isReference() || loopVar->isConst());
-    }
-    return false;
-}
-
-static bool canBeConst(const Variable *var, const Settings* settings)
+static bool isLargeContainer(const Variable* var, const Settings& settings)
 {
-    if (!var->scope())
+    const ValueType* vt = var->valueType();
+    if (vt->container->startPattern == "std :: initializer_list <")
         return false;
-    {
-        // check initializer list. If variable is moved from it can't be const.
-        const Function* func_scope = var->scope()->function;
-        if (func_scope && func_scope->type == Function::Type::eConstructor) {
-            //could be initialized in initializer list
-            if (func_scope->arg->link()->next()->str() == ":") {
-                for (const Token* tok2 = func_scope->arg->link()->next()->next(); tok2 != var->scope()->bodyStart; tok2 = tok2->next()) {
-                    if (tok2->varId() != var->declarationId())
-                        continue;
-                    const Token* parent = tok2->astParent();
-                    if (parent && Token::simpleMatch(parent->previous(), "move ("))
-                        return false;
-                }
-            }
-        }
-    }
-    for (const Token* tok2 = var->scope()->bodyStart; tok2 != var->scope()->bodyEnd; tok2 = tok2->next()) {
-        if (tok2->varId() != var->declarationId())
-            continue;
-
-        const Token* parent = tok2->astParent();
-        while (Token::simpleMatch(parent, "["))
-            parent = parent->astParent();
-        if (!parent)
-            continue;
-        if (Token::simpleMatch(tok2->next(), ";") && tok2->next()->isSplittedVarDeclEq()) {
-            tok2 = tok2->tokAt(2);
-            tok2 = Token::findsimplematch(tok2, ";");
-            continue;
+    if (vt->container->size_templateArgNo < 0)
+        return true;
+    const std::size_t maxByValueSize = 2 * settings.platform.sizeof_pointer;
+    if (var->dimensions().empty()) {
+        if (vt->container->startPattern == "std :: bitset <") {
+            if (const ValueFlow::Value* v = vt->containerTypeToken->getKnownValue(ValueFlow::Value::ValueType::INT))
+                return v->intvalue / 8 > maxByValueSize;
         }
-        if (parent->str() == "<<" || isLikelyStreamRead(true, parent)) {
-            if (parent->str() == "<<" && parent->astOperand1() == tok2)
-                return false;
-            if (parent->str() == ">>" && parent->astOperand2() == tok2)
-                return false;
-        } else if (parent->str() == "," || parent->str() == "(") { // function argument
-            const Token* tok3 = tok2->previous();
-            int argNr = 0;
-            while (tok3 && tok3->str() != "(") {
-                if (tok3->link() && Token::Match(tok3, ")|]|}|>"))
-                    tok3 = tok3->link();
-                else if (tok3->link())
-                    break;
-                else if (tok3->str() == ";")
-                    break;
-                else if (tok3->str() == ",")
-                    argNr++;
-                tok3 = tok3->previous();
-            }
-            if (!tok3 || tok3->str() != "(")
-                return false;
-            const Token* functionTok = tok3->astOperand1();
-            if (!functionTok)
-                return false;
-            const Function* tokFunction = functionTok->function();
-            if (!tokFunction && functionTok->str() == "." && (functionTok = functionTok->astOperand2()))
-                tokFunction = functionTok->function();
-            if (tokFunction) {
-                const Variable* argVar = tokFunction->getArgumentVar(argNr);
-                if (!argVar || (!argVar->isConst() && argVar->isReference()))
-                    return false;
-            }
-            else if (!settings->library.isFunctionConst(functionTok))
-                return false;
-        } else if (parent->isUnaryOp("&")) {
-            // TODO: check how pointer is used
-            return false;
-        } else if (parent->isConstOp() ||
-                   (parent->astOperand2() && settings->library.isFunctionConst(parent->astOperand2())))
-            continue;
-        else if (parent->isAssignmentOp()) {
-            const Token* assignee = parent->astOperand1();
-            while (Token::simpleMatch(assignee, "["))
-                assignee = assignee->astOperand1();
-            if (assignee == tok2)
-                return false;
-            const Variable* assignedVar = assignee ? assignee->variable() : nullptr;
-            if (assignedVar &&
-                !assignedVar->isConst() &&
-                assignedVar->isReference() &&
-                assignedVar->nameToken() == parent->astOperand1())
-                return false;
-        } else if (Token::Match(tok2, "%var% . %name% (")) {
-            const Function* func = tok2->tokAt(2)->function();
-            if (func && (func->isConst() || func->isStatic()))
-                continue;
-            return false;
-        } else if (isConstRangeBasedFor(tok2))
-            continue;
-        else
-            return false;
+        return false;
     }
-
-    return true;
+    const ValueType vtElem = ValueType::parseDecl(vt->containerTypeToken, settings);
+    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()
@@ -1302,13 +1536,19 @@ void CheckOther::checkPassByReference()
     if (!mSettings->severity.isEnabled(Severity::performance) || mTokenizer->isC())
         return;
 
+    logChecker("CheckOther::checkPassByReference"); // performance,c++
+
     const SymbolDatabase * const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Variable* var : symbolDatabase->variableList()) {
-        if (!var || !var->isArgument() || !var->isClass() || var->isPointer() || var->isArray() || var->isReference() || var->isEnumType())
+        if (!var || !var->isClass() || var->isPointer() || (var->isArray() && !var->isStlType()) || var->isReference() || var->isEnumType())
             continue;
 
-        if (var->scope() && var->scope()->function->arg->link()->strAt(-1) == "...")
+        const bool isRangeBasedFor = astIsRangeBasedForDecl(var->nameToken());
+        if (!var->isArgument() && !isRangeBasedFor)
+            continue;
+
+        if (!isRangeBasedFor && var->scope() && var->scope()->function->arg->link()->strAt(-1) == "...")
             continue; // references could not be used as va_start parameters (#5824)
 
         const Token * const varDeclEndToken = var->declEndToken();
@@ -1319,12 +1559,14 @@ 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))
+            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 (estimateSize(var->type(), mSettings, symbolDatabase) <= 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
@@ -1334,43 +1576,45 @@ void CheckOther::checkPassByReference()
         if (inconclusive && !mSettings->certainty.isEnabled(Certainty::inconclusive))
             continue;
 
+        if (var->isArray() && (!var->isStlType() || Token::simpleMatch(var->nameToken()->next(), "[")))
+            continue;
+
         const bool isConst = var->isConst();
         if (isConst) {
-            passedByValueError(var->nameToken(), var->name(), inconclusive);
+            passedByValueError(var, inconclusive, isRangeBasedFor);
             continue;
         }
 
         // Check if variable could be const
-        if (!var->scope() || var->scope()->function->isImplicitlyVirtual())
+        if (!isRangeBasedFor && (!var->scope() || var->scope()->function->isImplicitlyVirtual()))
             continue;
 
-        if (canBeConst(var, mSettings)) {
-            passedByValueError(var->nameToken(), var->name(), inconclusive);
+        if (!isVariableChanged(var, *mSettings)) {
+            passedByValueError(var, inconclusive, isRangeBasedFor);
         }
     }
 }
 
-void CheckOther::passedByValueError(const Token *tok, const std::string &parname, bool inconclusive)
+void CheckOther::passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor)
 {
-    reportError(tok, Severity::performance, "passedByValue",
-                "$symbol:" + parname + "\n"
-                "Function parameter '$symbol' should be passed by const reference.\n"
-                "Parameter '$symbol' is passed by value. It could be passed "
-                "as a const reference which is usually faster and recommended in C++.", CWE398, inconclusive ? Certainty::inconclusive : Certainty::normal);
-}
-
-static bool isUnusedVariable(const Variable *var)
-{
-    if (!var)
-        return false;
-    if (!var->scope())
-        return false;
-    const Token *start = var->declEndToken();
-    if (!start)
-        return false;
-    if (Token::Match(start, "; %varid% =", var->declarationId()))
-        start = start->tokAt(2);
-    return !Token::findmatch(start->next(), "%varid%", var->scope()->bodyEnd, var->declarationId());
+    std::string id = isRangeBasedFor ? "iterateByValue" : "passedByValue";
+    const std::string action = isRangeBasedFor ? "declared as": "passed by";
+    const std::string type = isRangeBasedFor ? "Range variable" : "Function parameter";
+    std::string msg = "$symbol:" + (var ? var->name() : "") + "\n" +
+                      type + " '$symbol' should be " + action + " const reference.";
+    ErrorPath errorPath;
+    if (var && var->scope() && var->scope()->function && var->scope()->function->functionPointerUsage) {
+        id += "Callback";
+        errorPath.emplace_front(var->scope()->function->functionPointerUsage, "Function pointer used here.");
+        msg += " However it seems that '" + var->scope()->function->name() + "' is a callback function.";
+    }
+    if (var)
+        errorPath.emplace_back(var->nameToken(), msg);
+    if (isRangeBasedFor)
+        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(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)
@@ -1401,11 +1645,28 @@ static bool isVariableMutableInInitializer(const Token* start, const Token * end
     return false;
 }
 
+static bool isCastToVoid(const Variable* var)
+{
+    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 CheckOther::checkConstVariable()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) || mTokenizer->isC())
+    if ((!mSettings->severity.isEnabled(Severity::style) || mTokenizer->isC()) && !mSettings->isPremiumEnabled("constVariable"))
         return;
 
+    logChecker("CheckOther::checkConstVariable"); // style,c++
+
     const SymbolDatabase *const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Variable *var : symbolDatabase->variableList()) {
@@ -1428,8 +1689,6 @@ void CheckOther::checkConstVariable()
         if (function && var->isArgument()) {
             if (function->isImplicitlyVirtual() || function->templateDef)
                 continue;
-            if (isUnusedVariable(var))
-                continue;
             if (function->isConstructor() && isVariableMutableInInitializer(function->constructorMemberInitialization(), scope->bodyStart, var->declarationId()))
                 continue;
         }
@@ -1443,9 +1702,15 @@ void CheckOther::checkConstVariable()
             continue;
         if (var->isVolatile())
             continue;
+        if (var->isMaybeUnused())
+            continue;
+        if (var->nameToken()->isExpandedMacro())
+            continue;
         if (isStructuredBindingVariable(var)) // TODO: check all bound variables
             continue;
-        if (isVariableChanged(var, mSettings, mTokenizer->isCPP()))
+        if (isCastToVoid(var))
+            continue;
+        if (isVariableChanged(var, *mSettings))
             continue;
         const bool hasFunction = function != nullptr;
         if (!hasFunction) {
@@ -1460,12 +1725,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());
+                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;
         }
@@ -1484,10 +1752,10 @@ void CheckOther::checkConstVariable()
                 if (tok->isUnaryOp("&") && Token::Match(tok, "& %varid%", var->declarationId())) {
                     const Token* opTok = tok->astParent();
                     int argn = -1;
-                    if (opTok && opTok->isUnaryOp("!"))
+                    if (opTok && (opTok->isUnaryOp("!") || opTok->isComparisonOp()))
                         continue;
-                    if (opTok && (opTok->isComparisonOp() || opTok->isAssignmentOp() || opTok->isCalculation())) {
-                        if (opTok->isComparisonOp() || opTok->isCalculation()) {
+                    if (opTok && (opTok->isAssignmentOp() || opTok->isCalculation())) {
+                        if (opTok->isCalculation()) {
                             if (opTok->astOperand1() != tok)
                                 opTok = opTok->astOperand1();
                             else
@@ -1497,7 +1765,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, &inconclusive) && !inconclusive)
                             continue;
                     }
                     usedInAssignment = true;
@@ -1514,25 +1782,6 @@ void CheckOther::checkConstVariable()
             if (usedInAssignment)
                 continue;
         }
-        // Skip if we ever cast this variable to a pointer/reference to a non-const type
-        {
-            bool castToNonConst = false;
-            for (const Token* tok = var->nameToken(); tok != scope->bodyEnd && tok != nullptr; tok = tok->next()) {
-                if (tok->isCast()) {
-                    if (!tok->valueType()) {
-                        castToNonConst = true; // safe guess
-                        break;
-                    }
-                    const bool isConst = tok->valueType()->isConst(tok->valueType()->pointer);
-                    if (!isConst) {
-                        castToNonConst = true;
-                        break;
-                    }
-                }
-            }
-            if (castToNonConst)
-                continue;
-        }
 
         constVariableError(var, hasFunction ? function : nullptr);
     }
@@ -1548,12 +1797,59 @@ static const Token* getVariableChangedStart(const Variable* p)
     return start;
 }
 
+static bool isConstPointerVariable(const Variable* p, const Settings& settings)
+{
+    const int indirect = p->isArray() ? p->dimensions().size() : 1;
+    const Token* start = getVariableChangedStart(p);
+    while (const Token* tok =
+               findVariableChanged(start, p->scope()->bodyEnd, indirect, p->declarationId(), false, settings)) {
+        if (p->isReference())
+            return false;
+        // Assigning a pointer through another pointer may still be const
+        if (!Token::simpleMatch(tok->astParent(), "="))
+            return false;
+        if (!astIsLHS(tok))
+            return false;
+        start = tok->next();
+    }
+    return true;
+}
+
+namespace {
+    struct CompareVariables {
+        bool operator()(const Variable* a, const Variable* b) const {
+            const int fileA = a->nameToken()->fileIndex();
+            const int fileB = b->nameToken()->fileIndex();
+            if (fileA != fileB)
+                return fileA < fileB;
+            const int lineA = a->nameToken()->linenr();
+            const int lineB = b->nameToken()->linenr();
+            if (lineA != lineB)
+                return lineA < lineB;
+            const int columnA = a->nameToken()->column();
+            const int columnB = b->nameToken()->column();
+            return columnA < columnB;
+        }
+    };
+}
+
+static bool isCastToInteger(const Token* tok)
+{
+    return tok && tok->isCast() && tok->valueType() && tok->valueType()->isIntegral() && tok->valueType()->pointer == 0;
+}
+
 void CheckOther::checkConstPointer()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) &&
+        !mSettings->isPremiumEnabled("constParameter") &&
+        !mSettings->isPremiumEnabled("constParameterPointer") &&
+        !mSettings->isPremiumEnabled("constParameterReference") &&
+        !mSettings->isPremiumEnabled("constVariablePointer"))
         return;
 
-    std::vector<const Variable*> pointers, nonConstPointers;
+    logChecker("CheckOther::checkConstPointer"); // style
+
+    std::set<const Variable*, CompareVariables> pointers, nonConstPointers;
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         const Variable* const var = tok->variable();
         if (!var)
@@ -1561,9 +1857,14 @@ void CheckOther::checkConstPointer()
         if (!var->isLocal() && !var->isArgument())
             continue;
         const Token* const nameTok = var->nameToken();
-        // declarations of (static) pointers are (not) split up, array declarations are never split up
-        if (tok == nameTok && (!var->isStatic() || Token::simpleMatch(nameTok->next(), "[")) &&
-            !astIsRangeBasedForDecl(nameTok))
+        if (tok == nameTok) {
+            // 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))
+                continue;
+        }
+        // Skip function pointers
+        if (Token::Match(nameTok, "%name% ) ("))
             continue;
         const ValueType* const vt = tok->valueType();
         if (!vt)
@@ -1574,21 +1875,27 @@ void CheckOther::checkConstPointer()
             continue;
         if (std::find(nonConstPointers.cbegin(), nonConstPointers.cend(), var) != nonConstPointers.cend())
             continue;
-        pointers.emplace_back(var);
-        const Token* const parent = tok->astParent();
-        enum Deref { NONE, DEREF, MEMBER } deref = NONE;
-        if (parent && parent->isUnaryOp("*"))
+        pointers.emplace(var);
+        const Token* parent = tok->astParent();
+        enum Deref : std::uint8_t { NONE, DEREF, MEMBER } deref = NONE;
+        bool hasIncDecPlus = false;
+        if (parent && (parent->isUnaryOp("*") || (((hasIncDecPlus = parent->isIncDecOp()) || (hasIncDecPlus = (parent->str() == "+"))) &&
+                                                  parent->astParent() && parent->astParent()->isUnaryOp("*"))))
             deref = DEREF;
         else if (Token::simpleMatch(parent, "[") && parent->astOperand1() == tok && tok != nameTok)
             deref = DEREF;
         else if (Token::Match(parent, "%op%") && Token::simpleMatch(parent->astParent(), "."))
-            deref = DEREF;
+            deref = MEMBER;
         else if (Token::simpleMatch(parent, "."))
             deref = MEMBER;
         else if (astIsRangeBasedForDecl(tok))
             continue;
+        else if (isCastToInteger(parent))
+            continue;
         if (deref != NONE) {
-            const Token* const gparent = parent->astParent();
+            const Token* gparent = parent->astParent();
+            while (Token::simpleMatch(gparent, "[") && parent != gparent->astOperand2() && parent->str() == gparent->str())
+                gparent = gparent->astParent();
             if (deref == MEMBER) {
                 if (!gparent)
                     continue;
@@ -1599,6 +1906,10 @@ void CheckOther::checkConstPointer()
                         continue;
                 }
             }
+            if (hasIncDecPlus) {
+                parent = gparent;
+                gparent = gparent ? gparent->astParent() : nullptr;
+            }
             if (Token::Match(gparent, "%cop%") && !gparent->isUnaryOp("&") && !gparent->isUnaryOp("*"))
                 continue;
             int argn = -1;
@@ -1610,36 +1921,54 @@ void CheckOther::checkConstPointer()
             else if (Token::Match(gparent, "%assign%") && parent == gparent->astOperand2()) {
                 bool takingRef = false, nonConstPtrAssignment = false;
                 const Token *lhs = gparent->astOperand1();
-                if (lhs && lhs->variable() && lhs->variable()->isReference() && lhs->variable()->nameToken() == lhs)
+                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;
             } else if (Token::simpleMatch(gparent, "[") && gparent->astOperand2() == parent)
                 continue;
+            else if (gparent && gparent->isCast() && gparent->valueType() &&
+                     ((gparent->valueType()->pointer == 0 && gparent->valueType()->reference == Reference::None) ||
+                      (var->valueType() && gparent->valueType()->isConst(var->valueType()->pointer))))
+                continue;
             else if (const Token* ftok = getTokenArgumentFunction(parent, argn)) {
                 bool inconclusive{};
-                if (!isVariableChangedByFunctionCall(ftok, vt->pointer, var->declarationId(), mSettings, &inconclusive) && !inconclusive)
+                if (!isVariableChangedByFunctionCall(ftok->next(), vt->pointer, var->declarationId(), *mSettings, &inconclusive) && !inconclusive)
                     continue;
             }
         } else {
             int argn = -1;
-            if (Token::Match(parent, "%oror%|%comp%|&&|?|!|-"))
+            if (Token::Match(parent, "%oror%|%comp%|&&|?|!|-|<<|;"))
                 continue;
-            if (Token::simpleMatch(parent, "(") && Token::Match(parent->astOperand1(), "if|while"))
+            if (hasIncDecPlus && (!parent->astParent() || parent->astParent()->str() == ";"))
                 continue;
-            if (Token::simpleMatch(parent, "=") && parent->astOperand1() == tok)
+            if (Token::simpleMatch(parent, "(") && Token::Match(parent->astOperand1(), "if|while"))
                 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() && !parent->isCast()) {
-                    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)
-                            continue;
+                if (ftok->function()) {
+                    const bool isCastArg = parent->isCast() && !ftok->function()->getOverloadedFunctions().empty(); // assume that cast changes the called function
+                    if (!isCastArg) {
+                        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)
+                                continue;
+                        }
                     }
+                } else {
+                    const auto dir = mSettings->library.getArgDirection(ftok, argn + 1);
+                    if (dir == Library::ArgumentChecks::Direction::DIR_IN)
+                        continue;
                 }
             }
             else if (Token::simpleMatch(parent, "(")) {
@@ -1647,24 +1976,33 @@ void CheckOther::checkConstPointer()
                     continue;
             }
         }
-        nonConstPointers.emplace_back(var);
+        if (tok != nameTok)
+            nonConstPointers.emplace(var);
     }
     for (const Variable *p: pointers) {
         if (p->isArgument()) {
             if (!p->scope() || !p->scope()->function || p->scope()->function->isImplicitlyVirtual(true) || p->scope()->function->hasVirtualSpecifier())
                 continue;
+            if (p->isMaybeUnused())
+                continue;
         }
+        if (const Function* func = Scope::nestedInFunction(p->scope()))
+            if (func->templateDef)
+                continue;
         if (std::find(nonConstPointers.cbegin(), nonConstPointers.cend(), p) == nonConstPointers.cend()) {
-            const Token *start = getVariableChangedStart(p);
-            const int indirect = p->isArray() ? p->dimensions().size() : 1;
-            if (isVariableChanged(start, p->scope()->bodyEnd, indirect, p->declarationId(), false, mSettings, mTokenizer->isCPP()))
+            // const Token *start = getVariableChangedStart(p);
+            // 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))
                 continue;
-            if (p->isArgument() && p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
+            if (p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
                 continue;
             constVariableError(p, p->isArgument() ? p->scope()->function : nullptr);
         }
     }
 }
+
 void CheckOther::constVariableError(const Variable *var, const Function *function)
 {
     if (!var) {
@@ -1679,7 +2017,7 @@ void CheckOther::constVariableError(const Variable *var, const Function *functio
     }
 
     const std::string vartype(var->isArgument() ? "Parameter" : "Variable");
-    const std::string varname(var->name());
+    const std::string& varname(var->name());
     const std::string ptrRefArray = var->isArray() ? "const array" : (var->isPointer() ? "pointer to const" : "reference to const");
 
     ErrorPath errorPath;
@@ -1696,7 +2034,7 @@ 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);
 }
 
 //---------------------------------------------------------------------------
@@ -1710,6 +2048,8 @@ void CheckOther::checkCharVariable()
     if (!warning && !portability)
         return;
 
+    logChecker("CheckOther::checkCharVariable"); // warning,portability
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -1719,24 +2059,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;
                 }
@@ -1795,6 +2135,8 @@ static bool isType(const Token * tok, bool unknown)
 {
     if (tok && (tok->isStandardType() || (!tok->isKeyword() && Token::Match(tok, "%type%")) || tok->str() == "auto"))
         return true;
+    if (tok && tok->varId())
+        return false;
     if (Token::simpleMatch(tok, "::"))
         return isType(tok->astOperand2(), unknown);
     if (Token::simpleMatch(tok, "<") && tok->link())
@@ -1830,10 +2172,10 @@ static bool isBracketAccess(const Token* tok)
 }
 
 static bool isConstant(const Token* tok) {
-    return Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL");
+    return tok && (tok->isEnumerator() || Token::Match(tok, "%bool%|%num%|%str%|%char%|nullptr|NULL"));
 }
 
-static bool isConstStatement(const Token *tok, bool cpp)
+static bool isConstStatement(const Token *tok, const Library& library, bool platformIndependent, bool isNestedBracket = false)
 {
     if (!tok)
         return false;
@@ -1848,26 +2190,33 @@ static bool isConstStatement(const Token *tok, bool cpp)
         return false;
     if (Token::Match(tok, "<<|>>") && !astIsIntegral(tok, false))
         return false;
-    if (tok->astTop() && Token::simpleMatch(tok->astTop()->astOperand1(), "delete"))
-        return false;
+    const Token* tok2 = tok;
+    while (tok2) {
+        if (Token::simpleMatch(tok2->astOperand1(), "delete"))
+            return false;
+        tok2 = tok2->astParent();
+    }
     if (Token::Match(tok, "&&|%oror%"))
-        return isConstStatement(tok->astOperand1(), cpp) && isConstStatement(tok->astOperand2(), cpp);
+        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(cpp, tok) && isConstStatement(tok->astOperand2(), cpp);
+        return isWithoutSideEffects(tok) && isConstStatement(tok->astOperand2(), library, platformIndependent);
     }
     if (tok->isCast() && tok->next() && tok->next()->isStandardType())
-        return isWithoutSideEffects(cpp, tok->astOperand1()) && isConstStatement(tok->astOperand1(), cpp);
+        return isWithoutSideEffects(tok->astOperand1()) && isConstStatement(tok->astOperand1(), library, platformIndependent);
     if (Token::simpleMatch(tok, "."))
-        return isConstStatement(tok->astOperand2(), cpp);
+        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(), cpp) && isConstStatement(tok->astOperand2(), cpp);
+            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)
@@ -1875,14 +2224,38 @@ static bool isConstStatement(const Token *tok, bool cpp)
         const Token* stream = lml;
         while (stream && Token::Match(stream->astParent(), ".|[|(|*"))
             stream = stream->astParent();
-        return (!stream || !isLikelyStream(cpp, stream)) && isConstStatement(tok->astOperand2(), cpp);
+        return (!stream || !isLikelyStream(stream)) && isConstStatement(tok->astOperand2(), library, platformIndependent);
     }
     if (Token::simpleMatch(tok, "?") && Token::simpleMatch(tok->astOperand2(), ":")) // ternary operator
-        return isConstStatement(tok->astOperand1(), cpp) && isConstStatement(tok->astOperand2()->astOperand1(), cpp) && isConstStatement(tok->astOperand2()->astOperand2(), cpp);
-    if (isBracketAccess(tok) && isWithoutSideEffects(cpp, tok->astOperand1(), /*checkArrayAccess*/ true, /*checkReference*/ false)) {
-        if (Token::simpleMatch(tok->astParent(), "["))
-            return isConstStatement(tok->astOperand2(), cpp) && isConstStatement(tok->astParent(), cpp);
-        return isConstStatement(tok->astOperand2(), cpp);
+        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, platformIndependent) &&
+                       isConstStatement(tok->astParent(), library, platformIndependent);
+            return isNestedBracket && isConstStatement(tok->astOperand2(), library, platformIndependent);
+        }
+        return isConstStatement(tok->astOperand2(), library, platformIndependent, /*isNestedBracket*/ !isChained);
+    }
+    if (!tok->astParent() && findLambdaEndToken(tok))
+        return true;
+
+    tok2 = tok;
+    if (tok2->str() == "::")
+        tok2 = tok2->next();
+    if (Token::Match(tok2, "%name% ;")) {
+        if (tok2->function())
+            return true;
+        std::string funcStr = tok2->str();
+        while (tok2->index() > 1 && Token::Match(tok2->tokAt(-2), "%name% ::")) {
+            funcStr.insert(0, tok2->strAt(-2) + "::");
+            tok2 = tok2->tokAt(-2);
+        }
+        if (library.functions().count(funcStr) > 0)
+            return true;
     }
     return false;
 }
@@ -1896,7 +2269,7 @@ static bool isVoidStmt(const Token *tok)
     const Token *tok2 = tok;
     while (tok2->astOperand1())
         tok2 = tok2->astOperand1();
-    if (Token::simpleMatch(tok2->previous(), ")") && Token::simpleMatch(tok2->previous()->link(), "( void"))
+    if (Token::simpleMatch(tok2->previous(), ")") && Token::simpleMatch(tok2->linkAt(-1), "( void"))
         return true;
     if (Token::simpleMatch(tok2, "( void"))
         return true;
@@ -1929,9 +2302,12 @@ static bool isConstTop(const Token *tok)
 
 void CheckOther::checkIncompleteStatement()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) &&
+        !mSettings->isPremiumEnabled("constStatement"))
         return;
 
+    logChecker("CheckOther::checkIncompleteStatement"); // warning
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         const Scope *scope = tok->scope();
         if (scope && !scope->isExecutable())
@@ -1964,7 +2340,8 @@ void CheckOther::checkIncompleteStatement()
         const Token *rtok = nextAfterAstRightmostLeaf(tok);
         if (!Token::simpleMatch(tok->astParent(), ";") && !Token::simpleMatch(rtok, ";") &&
             !Token::Match(tok->previous(), ";|}|{ %any% ;") &&
-            !(mTokenizer->isCPP() && tok->isCast() && !tok->astParent()) &&
+            !(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()))
@@ -1972,14 +2349,14 @@ void CheckOther::checkIncompleteStatement()
         // Skip statement expressions
         if (Token::simpleMatch(rtok, "; } )"))
             continue;
-        if (!isConstStatement(tok, mTokenizer->isCPP()))
+        if (!isConstStatement(tok, mSettings->library, false))
             continue;
         if (isVoidStmt(tok))
             continue;
-        if (mTokenizer->isCPP() && tok->str() == "&" && !(tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->isIntegral()))
+        if (tok->isCpp() && tok->str() == "&" && !(tok->astOperand1() && tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->isIntegral()))
             // Possible archive
             continue;
-        const bool inconclusive = tok->isConstOp();
+        const bool inconclusive = tok->isConstOp() && !mSettings->isPremiumEnabled("constStatement");
         if (mSettings->certainty.isEnabled(Certainty::inconclusive) || !inconclusive)
             constStatementError(tok, tok->isNumber() ? "numeric" : "string", inconclusive);
     }
@@ -2008,6 +2385,8 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
             typeStr = "character";
         else if (isNullOperand(valueTok))
             typeStr = "NULL";
+        else if (valueTok->isEnumerator())
+            typeStr = "enumerator";
         msg = "Redundant code: Found a statement that begins with " + typeStr + " constant.";
     }
     else if (!tok)
@@ -2022,6 +2401,12 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
         msg = "Redundant code: Found unused member access.";
     else if (tok->str() == "[" && tok->tokType() == Token::Type::eExtendedOp)
         msg = "Redundant code: Found unused array access.";
+    else if (tok->str() == "[" && !tok->astParent())
+        msg = "Redundant code: Found unused lambda.";
+    else if (Token::Match(tok, "%name%|::"))
+        msg = "Redundant code: Found unused function.";
+    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;
@@ -2034,6 +2419,8 @@ void CheckOther::constStatementError(const Token *tok, const std::string &type,
 //---------------------------------------------------------------------------
 void CheckOther::checkZeroDivision()
 {
+    logChecker("CheckOther::checkZeroDivision");
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!tok->astOperand2() || !tok->astOperand1())
             continue;
@@ -2041,7 +2428,7 @@ void CheckOther::checkZeroDivision()
             continue;
         if (!tok->valueType() || !tok->valueType()->isIntegral())
             continue;
-        if (tok->scope() && tok->scope()->type == Scope::eEnum) // don't warn for compile-time error
+        if (tok->scope() && tok->scope()->type == ScopeType::eEnum) // don't warn for compile-time error
             continue;
 
         // Value flow..
@@ -2055,11 +2442,11 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
 {
     if (!tok && !value) {
         reportError(tok, Severity::error, "zerodiv", "Division by zero.", CWE369, Certainty::normal);
-        reportError(tok, Severity::error, "zerodivcond", ValueFlow::eitherTheConditionIsRedundant(nullptr) + " or there is division by zero.", CWE369, Certainty::normal);
+        reportError(tok, Severity::warning, "zerodivcond", ValueFlow::eitherTheConditionIsRedundant(nullptr) + " or there is division by zero.", CWE369, Certainty::normal);
         return;
     }
 
-    const ErrorPath errorPath = getErrorPath(tok, value, "Division by zero");
+    ErrorPath errorPath = getErrorPath(tok, value, "Division by zero");
 
     std::ostringstream errmsg;
     if (value->condition) {
@@ -2069,7 +2456,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);
@@ -2082,8 +2469,9 @@ void CheckOther::zerodivError(const Token *tok, const ValueFlow::Value *value)
 
 void CheckOther::checkNanInArithmeticExpression()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("nanInArithmeticExpression"))
         return;
+    logChecker("CheckOther::checkNanInArithmeticExpression"); // style
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (tok->str() != "/")
             continue;
@@ -2111,11 +2499,13 @@ void CheckOther::checkMisusedScopedObject()
     if (mTokenizer->isC())
         return;
 
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedScopedObject"))
         return;
 
+    logChecker("CheckOther::checkMisusedScopedObject"); // style,c++
+
     auto getConstructorTok = [](const Token* tok, std::string& typeStr) -> const Token* {
-        if (!Token::Match(tok, "[;{}] %name%"))
+        if (!Token::Match(tok, "[;{}] %name%") || tok->next()->isKeyword())
             return nullptr;
         tok = tok->next();
         typeStr.clear();
@@ -2154,7 +2544,7 @@ void CheckOther::checkMisusedScopedObject()
                 if (Token::simpleMatch(parTok, "<") && parTok->link())
                     parTok = parTok->link()->next();
                 if (const Token* arg = parTok->astOperand2()) {
-                    if (!isConstStatement(arg, mTokenizer->isCPP()))
+                    if (!isConstStatement(arg, mSettings->library, false))
                         continue;
                     if (parTok->str() == "(") {
                         if (arg->varId() && !(arg->variable() && arg->variable()->nameToken() != arg))
@@ -2193,8 +2583,6 @@ static const Token * getSingleExpressionInBlock(const Token * tok)
     if (!tok)
         return nullptr;
     const Token * top = tok->astTop();
-    if (!top)
-        return nullptr;
     const Token * nextExpression = nextAfterAstRightmostLeaf(top);
     if (!Token::simpleMatch(nextExpression, "; }"))
         return nullptr;
@@ -2218,10 +2606,12 @@ void CheckOther::checkDuplicateBranch()
     if (!mSettings->severity.isEnabled(Severity::style) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
         return;
 
+    logChecker("CheckOther::checkDuplicateBranch"); // style,inconclusive
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope & scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eIf)
+        if (scope.type != ScopeType::eIf)
             continue;
 
         // check all the code in the function for if (..) else
@@ -2275,9 +2665,9 @@ void CheckOther::checkDuplicateBranch()
             if (branchTop1->str() != branchTop2->str())
                 continue;
             ErrorPath errorPath;
-            if (isSameExpression(mTokenizer->isCPP(), false, branchTop1->astOperand1(), branchTop2->astOperand1(), mSettings->library, true, true, &errorPath) &&
-                isSameExpression(mTokenizer->isCPP(), false, branchTop1->astOperand2(), branchTop2->astOperand2(), mSettings->library, true, true, &errorPath))
-                duplicateBranchError(scope.classDef, scope.bodyEnd->next(), 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));
         }
     }
 }
@@ -2287,7 +2677,7 @@ void CheckOther::duplicateBranchError(const Token *tok1, const Token *tok2, Erro
     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);
@@ -2304,16 +2694,18 @@ void CheckOther::checkInvalidFree()
     std::map<int, bool> inconclusive;
     std::map<int, std::string> allocation;
 
+    logChecker("CheckOther::checkInvalidFree");
+
     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 != scope->bodyEnd; tok = tok->next()) {
+        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 ((mTokenizer->isCPP() && Token::Match(tok, "%var% = new")) ||
+            if ((tok->isCpp() && Token::Match(tok, "%var% = new")) ||
                 (Token::Match(tok, "%var% = %name% (") && mSettings->library.getAllocFuncInfo(tok->tokAt(2)))) {
-                allocation.insert(std::make_pair(tok->varId(), tok->strAt(2)));
-                inconclusive.insert(std::make_pair(tok->varId(), false));
+                allocation.emplace(tok->varId(), tok->strAt(2));
+                inconclusive.emplace(tok->varId(), false);
             }
 
             // If a previously-allocated pointer is incremented or decremented, any subsequent
@@ -2347,8 +2739,8 @@ void CheckOther::checkInvalidFree()
                                      tok->strAt(3) == "(" ? 4 : 1;
                 const int var1 = tok->tokAt(varIndex)->varId();
                 const int var2 = tok->tokAt(varIndex + 2)->varId();
-                const std::map<int, bool>::const_iterator alloc1 = inconclusive.find(var1);
-                const std::map<int, bool>::const_iterator alloc2 = inconclusive.find(var2);
+                const auto alloc1 = utils::as_const(inconclusive).find(var1);
+                const auto alloc2 = utils::as_const(inconclusive).find(var2);
                 if (alloc1 != inconclusive.end()) {
                     invalidFreeError(tok, allocation[var1], alloc1->second);
                 } else if (alloc2 != inconclusive.end()) {
@@ -2404,7 +2796,7 @@ namespace {
                 functionsByName[func.tokenDef->str()].push_back(&func);
             }
             for (std::pair<const std::string, std::list<const Function*>>& it : functionsByName) {
-                const std::list<const Function*>::const_iterator nc = std::find_if(it.second.cbegin(), it.second.cend(), notconst);
+                const auto nc = std::find_if(it.second.cbegin(), it.second.cend(), notconst);
                 if (nc == it.second.cend()) {
                     // ok to add all of them
                     constFunctions.splice(constFunctions.end(), it.second);
@@ -2414,12 +2806,39 @@ namespace {
     }
 }
 
+static bool
+isStaticAssert(const Settings &settings, const Token *tok)
+{
+    if (tok->isCpp() && settings.standards.cpp >= Standards::CPP11 &&
+        Token::simpleMatch(tok, "static_assert")) {
+        return true;
+    }
+
+    if (tok->isC() && settings.standards.c >= Standards::C11 &&
+        Token::simpleMatch(tok, "_Static_assert")) {
+        return true;
+    }
+
+    return false;
+}
+
 void CheckOther::checkDuplicateExpression()
 {
-    const bool styleEnabled = mSettings->severity.isEnabled(Severity::style);
-    const bool warningEnabled = mSettings->severity.isEnabled(Severity::warning);
-    if (!styleEnabled && !warningEnabled)
-        return;
+    {
+        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;
+    }
+
+    logChecker("CheckOther::checkDuplicateExpression"); // style,warning
 
     // Parse all executing scopes..
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
@@ -2427,8 +2846,6 @@ void CheckOther::checkDuplicateExpression()
     std::list<const Function*> constFunctions;
     getConstFunctions(symbolDatabase, constFunctions);
 
-    const bool cpp = mTokenizer->isCPP();
-
     for (const Scope *scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
             if (tok->str() == "=" && Token::Match(tok->astOperand1(), "%var%")) {
@@ -2453,12 +2870,13 @@ void CheckOther::checkDuplicateExpression()
                             Token::Match(tok->astOperand2()->previous(), "%name% (")
                             ) &&
                         tok->next()->tokType() != Token::eType &&
-                        isSameExpression(cpp, true, tok->next(), nextAssign->next(), mSettings->library, true, false) &&
-                        isSameExpression(cpp, true, tok->astOperand2(), nextAssign->astOperand2(), mSettings->library, 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;
-                        for (const Token *assignTok = Token::findsimplematch(var2, ";"); assignTok && assignTok != varScope->bodyEnd; assignTok = assignTok->next()) {
+                        const Token* assignTok = Token::findsimplematch(var2, ";");
+                        for (; assignTok && assignTok != varScope->bodyEnd; assignTok = assignTok->next()) {
                             if (!Token::Match(assignTok, "%assign%|%comp%"))
                                 continue;
                             if (!assignTok->astOperand1())
@@ -2468,21 +2886,19 @@ void CheckOther::checkDuplicateExpression()
 
                             if (assignTok->astOperand1()->varId() != var1->varId() &&
                                 assignTok->astOperand1()->varId() != var2->varId() &&
-                                !isSameExpression(cpp,
-                                                  true,
+                                !isSameExpression(true,
                                                   tok->astOperand2(),
                                                   assignTok->astOperand1(),
-                                                  mSettings->library,
+                                                  *mSettings,
                                                   true,
                                                   true))
                                 continue;
                             if (assignTok->astOperand2()->varId() != var1->varId() &&
                                 assignTok->astOperand2()->varId() != var2->varId() &&
-                                !isSameExpression(cpp,
-                                                  true,
+                                !isSameExpression(true,
                                                   tok->astOperand2(),
                                                   assignTok->astOperand2(),
-                                                  mSettings->library,
+                                                  *mSettings,
                                                   true,
                                                   true))
                                 continue;
@@ -2491,8 +2907,10 @@ 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);
+                        }
                     }
                 }
             }
@@ -2506,76 +2924,78 @@ 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(cpp,
-                                     true,
+                if (isSameExpression(true,
                                      tok->astOperand1(),
                                      tok->astOperand2(),
-                                     mSettings->library,
+                                     *mSettings,
                                      true,
                                      followVar,
                                      &errorPath)) {
-                    if (isWithoutSideEffects(cpp, tok->astOperand1())) {
+                    if (isWithoutSideEffects(tok->astOperand1())) {
                         const Token* loopTok = isInLoopCondition(tok);
-                        if (!loopTok || !isExpressionChanged(tok, tok, loopTok->link()->next()->link(), mSettings, cpp)) {
-                            const bool assignment = tok->str() == "=";
-                            if (assignment && warningEnabled)
+                        if (!loopTok ||
+                            !findExpressionChanged(tok, tok, loopTok->link()->linkAt(1), *mSettings)) {
+                            const bool isEnum = tok->scope()->type == ScopeType::eEnum;
+                            const bool assignment = !isEnum && tok->str() == "=";
+                            if (assignment)
                                 selfAssignmentError(tok, tok->astOperand1()->expressionString());
-                            else if (styleEnabled) {
-                                if (cpp && mSettings->standards.cpp >= Standards::CPP11 && tok->str() == "==") {
+                            else if (!isEnum) {
+                                if (tok->str() == "==") {
                                     const Token* parent = tok->astParent();
                                     while (parent && parent->astParent()) {
                                         parent = parent->astParent();
                                     }
-                                    if (parent && parent->previous() && parent->previous()->str() == "static_assert") {
+                                    if (parent && parent->previous() &&
+                                        (isStaticAssert(*mSettings, parent->previous()) ||
+                                         Token::simpleMatch(parent->previous(), "assert"))) {
                                         continue;
                                     }
                                 }
-                                duplicateExpressionError(tok->astOperand1(), tok->astOperand2(), tok, errorPath);
+                                duplicateExpressionError(tok->astOperand1(), tok->astOperand2(), tok, std::move(errorPath));
                             }
                         }
                     }
                 } else if (tok->str() == "=" && Token::simpleMatch(tok->astOperand2(), "=") &&
-                           isSameExpression(cpp,
-                                            false,
+                           isSameExpression(false,
                                             tok->astOperand1(),
                                             tok->astOperand2()->astOperand1(),
-                                            mSettings->library,
+                                            *mSettings,
                                             true,
                                             false)) {
-                    if (warningEnabled && isWithoutSideEffects(cpp, tok->astOperand1())) {
+                    if (isWithoutSideEffects(tok->astOperand1())) {
                         selfAssignmentError(tok, tok->astOperand1()->expressionString());
                     }
-                } else if (styleEnabled &&
-                           isOppositeExpression(cpp,
-                                                tok->astOperand1(),
+                } else if (isOppositeExpression(tok->astOperand1(),
                                                 tok->astOperand2(),
-                                                mSettings->library,
+                                                *mSettings,
                                                 false,
                                                 true,
                                                 &errorPath) &&
                            !Token::Match(tok, "=|-|-=|/|/=") &&
-                           isWithoutSideEffects(cpp, tok->astOperand1())) {
-                    oppositeExpressionError(tok, errorPath);
+                           isWithoutSideEffects(tok->astOperand1())) {
+                    oppositeExpressionError(tok, std::move(errorPath));
                 } else if (!Token::Match(tok, "[-/%]")) { // These operators are not associative
-                    if (styleEnabled && tok->astOperand2() && tok->str() == tok->astOperand1()->str() &&
-                        isSameExpression(cpp,
-                                         true,
+                    if (tok->astOperand2() && tok->str() == tok->astOperand1()->str() &&
+                        isSameExpression(true,
                                          tok->astOperand2(),
                                          tok->astOperand1()->astOperand2(),
-                                         mSettings->library,
+                                         *mSettings,
                                          true,
                                          followVar,
                                          &errorPath) &&
-                        isWithoutSideEffects(cpp, tok->astOperand2()))
-                        duplicateExpressionError(tok->astOperand2(), tok->astOperand1()->astOperand2(), tok, errorPath);
-                    else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings->library, cpp)) {
+                        isWithoutSideEffects(tok->astOperand2()))
+                        duplicateExpressionError(tok->astOperand2(), tok->astOperand1()->astOperand2(), tok, std::move(errorPath));
+                    else if (tok->astOperand2() && isConstExpression(tok->astOperand1(), mSettings->library)) {
                         auto checkDuplicate = [&](const Token* exp1, const Token* exp2, const Token* ast1) {
-                            if (isSameExpression(cpp, true, exp1, exp2, mSettings->library, true, true, &errorPath) &&
-                                isWithoutSideEffects(cpp, exp1) &&
-                                isWithoutSideEffects(cpp, ast1->astOperand2()))
+                            if (isSameExpression(true, exp1, exp2, *mSettings, true, true, &errorPath) &&
+                                isWithoutSideEffects(exp1) &&
+                                isWithoutSideEffects(ast1->astOperand2()))
                                 duplicateExpressionError(exp1, exp2, tok, errorPath, /*hasMultipleExpr*/ true);
                         };
                         const Token *ast1 = tok->astOperand1();
@@ -2587,13 +3007,14 @@ void CheckOther::checkDuplicateExpression()
                         }
                     }
                 }
-            } else if (styleEnabled && 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, cpp) &&
-                    isConstStatement(tok->astOperand1(), cpp) && isConstStatement(tok->astOperand2(), cpp))
+            } else if (tok->astOperand1() && tok->astOperand2() && tok->str() == ":" && tok->astParent() && tok->astParent()->str() == "?") {
+                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);
-                else if (isSameExpression(cpp, true, tok->astOperand1(), tok->astOperand2(), mSettings->library, false, true, &errorPath))
-                    duplicateExpressionTernaryError(tok, errorPath);
             }
         }
     }
@@ -2605,7 +3026,7 @@ void CheckOther::oppositeExpressionError(const Token *opTok, ErrorPath errors)
 
     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);
@@ -2621,18 +3042,19 @@ void CheckOther::duplicateExpressionError(const Token *tok1, const Token *tok2,
     const std::string& op = opTok ? opTok->str() : "&&";
     std::string msg = "Same expression " + (hasMultipleExpr ? "\'" + expr1 + "\'" + " found multiple times in chain of \'" + op + "\' operators" : "on both sides of \'" + op + "\'");
     const char *id = "duplicateExpression";
-    if (expr1 != expr2 && (!opTok || !opTok->isArithmeticalOp())) {
+    if (expr1 != expr2 && (!opTok || Token::Match(opTok, "%oror%|%comp%|&&|?|!"))) {
         id = "knownConditionTrueFalse";
         std::string exprMsg = "The comparison \'" + expr1 + " " + op +  " " + expr2 + "\' is always ";
         if (Token::Match(opTok, "==|>=|<="))
             msg = exprMsg + "true";
         else if (Token::Match(opTok, "!=|>|<"))
             msg = exprMsg + "false";
-        if (!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 +
+    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(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);
@@ -2655,7 +3077,7 @@ void CheckOther::duplicateAssignExpressionError(const Token *tok1, const Token *
 void CheckOther::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);
 }
@@ -2669,7 +3091,7 @@ void CheckOther::duplicateValueTernaryError(const Token *tok)
 
 void CheckOther::selfAssignmentError(const Token *tok, const std::string &varname)
 {
-    reportError(tok, Severity::warning,
+    reportError(tok, Severity::style,
                 "selfAssignment",
                 "$symbol:" + varname + "\n"
                 "Redundant assignment of '$symbol' to itself.", CWE398, Certainty::normal);
@@ -2689,6 +3111,8 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -2714,8 +3138,8 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse()
 }
 void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* tok, const std::string &functionName, const std::string &varName, const bool result)
 {
-    const std::string strResult = result ? "true" : "false";
-    const struct CWE cweResult = result ? CWE571 : CWE570;
+    const std::string strResult = bool_to_string(result);
+    const CWE cweResult = result ? CWE571 : CWE570;
 
     reportError(tok, Severity::warning, "comparisonFunctionIsAlwaysTrueOrFalse",
                 "$symbol:" + functionName + "\n"
@@ -2729,9 +3153,11 @@ void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* to
 //---------------------------------------------------------------------------
 void CheckOther::checkSignOfUnsignedVariable()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unsignedLessThanZero"))
         return;
 
+    logChecker("CheckOther::checkSignOfUnsignedVariable"); // style
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -2739,13 +3165,13 @@ void CheckOther::checkSignOfUnsignedVariable()
         for (const Token *tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             const ValueFlow::Value *zeroValue = nullptr;
             const Token *nonZeroExpr = nullptr;
-            if (comparisonNonZeroExpressionLessThanZero(tok, &zeroValue, &nonZeroExpr)) {
+            if (comparisonNonZeroExpressionLessThanZero(tok, zeroValue, nonZeroExpr)) {
                 const ValueType* vt = nonZeroExpr->valueType();
                 if (vt->pointer)
                     pointerLessThanZeroError(tok, zeroValue);
                 else
                     unsignedLessThanZeroError(tok, zeroValue, nonZeroExpr->expressionString());
-            } else if (testIfNonZeroExpressionIsPositive(tok, &zeroValue, &nonZeroExpr)) {
+            } else if (testIfNonZeroExpressionIsPositive(tok, zeroValue, nonZeroExpr)) {
                 const ValueType* vt = nonZeroExpr->valueType();
                 if (vt->pointer)
                     pointerPositiveError(tok, zeroValue);
@@ -2756,7 +3182,7 @@ void CheckOther::checkSignOfUnsignedVariable()
     }
 }
 
-bool CheckOther::comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value **zeroValue, const Token **nonZeroExpr)
+bool CheckOther::comparisonNonZeroExpressionLessThanZero(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr, bool suppress)
 {
     if (!tok->isComparisonOp() || !tok->astOperand1() || !tok->astOperand2())
         return false;
@@ -2765,20 +3191,24 @@ bool CheckOther::comparisonNonZeroExpressionLessThanZero(const Token *tok, const
     const ValueFlow::Value *v2 = tok->astOperand2()->getValue(0);
 
     if (Token::Match(tok, "<|<=") && v2 && v2->isKnown()) {
-        *zeroValue = v2;
-        *nonZeroExpr = tok->astOperand1();
+        zeroValue = v2;
+        nonZeroExpr = tok->astOperand1();
     } else if (Token::Match(tok, ">|>=") && v1 && v1->isKnown()) {
-        *zeroValue = v1;
-        *nonZeroExpr = tok->astOperand2();
+        zeroValue = v1;
+        nonZeroExpr = tok->astOperand2();
     } else {
         return false;
     }
 
-    const ValueType* vt = (*nonZeroExpr)->valueType();
+    if (const Variable* var = nonZeroExpr->variable())
+        if (var->typeStartToken()->isTemplateArg())
+            return suppress;
+
+    const ValueType* vt = nonZeroExpr->valueType();
     return vt && (vt->pointer || vt->sign == ValueType::UNSIGNED);
 }
 
-bool CheckOther::testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value **zeroValue, const Token **nonZeroExpr)
+bool CheckOther::testIfNonZeroExpressionIsPositive(const Token *tok, const ValueFlow::Value *&zeroValue, const Token *&nonZeroExpr)
 {
     if (!tok->isComparisonOp() || !tok->astOperand1() || !tok->astOperand2())
         return false;
@@ -2787,16 +3217,16 @@ bool CheckOther::testIfNonZeroExpressionIsPositive(const Token *tok, const Value
     const ValueFlow::Value *v2 = tok->astOperand2()->getValue(0);
 
     if (Token::simpleMatch(tok, ">=") && v2 && v2->isKnown()) {
-        *zeroValue = v2;
-        *nonZeroExpr = tok->astOperand1();
+        zeroValue = v2;
+        nonZeroExpr = tok->astOperand1();
     } else if (Token::simpleMatch(tok, "<=") && v1 && v1->isKnown()) {
-        *zeroValue = v1;
-        *nonZeroExpr = tok->astOperand2();
+        zeroValue = v1;
+        nonZeroExpr = tok->astOperand2();
     } else {
         return false;
     }
 
-    const ValueType* vt = (*nonZeroExpr)->valueType();
+    const ValueType* vt = nonZeroExpr->valueType();
     return vt && (vt->pointer || vt->sign == ValueType::UNSIGNED);
 }
 
@@ -2853,18 +3283,24 @@ void CheckOther::checkRedundantCopy()
     if (!mSettings->severity.isEnabled(Severity::performance) || mTokenizer->isC() || !mSettings->certainty.isEnabled(Certainty::inconclusive))
         return;
 
+    logChecker("CheckOther::checkRedundantCopy"); // c++,performance,inconclusive
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Variable* var : symbolDatabase->variableList()) {
-        if (!var || var->isReference() || (!var->isConst() && !canBeConst(var, mSettings)) || var->isPointer() || (!var->type() && !var->isStlType())) // bailout if var is of standard type, if it is a pointer or non-const
+        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)))
             continue;
 
         const Token* startTok = var->nameToken();
         if (startTok->strAt(1) == "=") // %type% %name% = ... ;
             ;
-        else if (Token::Match(startTok->next(), "(|{") && var->isClass() && var->typeScope()) {
+        else if (Token::Match(startTok->next(), "(|{") && var->isClass()) {
+            if (!var->typeScope() && !(var->valueType() && var->valueType()->container))
+                continue;
             // Object is instantiated. Warn if constructor takes arguments by value.
-            if (constructorTakesReference(var->typeScope()))
+            if (var->typeScope() && constructorTakesReference(var->typeScope()))
                 continue;
         } else if (Token::simpleMatch(startTok->next(), ";") && startTok->next()->isSplittedVarDeclEq()) {
             startTok = startTok->tokAt(2);
@@ -2876,14 +3312,16 @@ void CheckOther::checkRedundantCopy()
             continue;
         if (!Token::Match(tok->previous(), "%name% ("))
             continue;
-        if (!Token::Match(tok->link(), ") )| ;")) // bailout for usage like "const A a = getA()+3"
+        if (!Token::Match(tok->link(), ") )|}| ;")) // bailout for usage like "const A a = getA()+3"
             continue;
 
         const Token* dot = tok->astOperand1();
         if (Token::simpleMatch(dot, ".")) {
-            if (dot->astOperand1() && isVariableChanged(dot->astOperand1()->variable(), mSettings, mTokenizer->isCPP()))
+            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(/*cpp*/ true, dot, &mSettings->library, /*unknown*/ true))
+            if (isTemporary(dot, &mSettings->library, /*unknown*/ true))
                 continue;
         }
         if (exprDependsOnThis(tok->previous()))
@@ -2894,7 +3332,10 @@ void CheckOther::checkRedundantCopy()
             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())
+                if (varTok->variable() && !varTok->variable()->isGlobal() &&
+                    (!varTok->variable()->type() || !varTok->variable()->type()->classScope ||
+                     (varTok->variable()->valueType() &&
+                      varTok->variable()->valueType()->getSizeOf(*mSettings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer) > 2 * mSettings->platform.sizeof_pointer)))
                     redundantCopyError(startTok, startTok->str());
             }
         }
@@ -2916,7 +3357,7 @@ void CheckOther::redundantCopyError(const Token *tok,const std::string& varname)
 // Checking for shift by negative values
 //---------------------------------------------------------------------------
 
-static bool isNegative(const Token *tok, const Settings *settings)
+static bool isNegative(const Token *tok, const Settings &settings)
 {
     return tok->valueType() && tok->valueType()->sign == ValueType::SIGNED && tok->getValueLE(-1LL, settings);
 }
@@ -2925,7 +3366,11 @@ void CheckOther::checkNegativeBitwiseShift()
 {
     const bool portability = mSettings->severity.isEnabled(Severity::portability);
 
+    logChecker("CheckOther::checkNegativeBitwiseShift");
+
     for (const Token* tok = mTokenizer->tokens(); tok; tok = tok->next()) {
+        tok = skipUnreachableBranch(tok);
+
         if (!tok->astOperand1() || !tok->astOperand2())
             continue;
 
@@ -2933,9 +3378,9 @@ void CheckOther::checkNegativeBitwiseShift()
             continue;
 
         // don't warn if lhs is a class. this is an overloaded operator then
-        if (mTokenizer->isCPP()) {
+        if (tok->isCpp()) {
             const ValueType * lhsType = tok->astOperand1()->valueType();
-            if (!lhsType || !lhsType->isIntegral())
+            if (!lhsType || !lhsType->isIntegral() || lhsType->pointer)
                 continue;
         }
 
@@ -2951,9 +3396,9 @@ 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);
     }
 }
@@ -2982,12 +3427,17 @@ void CheckOther::checkIncompleteArrayFill()
     if (!printPortability && !printWarning)
         return;
 
+    logChecker("CheckOther::checkIncompleteArrayFill"); // warning,portability,inconclusive
+
     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|memcpy|memmove (") && Token::Match(tok->linkAt(1)->tokAt(-2), ", %num% )")) {
-                const Token* tok2 = tok->tokAt(2);
+            if (Token::Match(tok, "memset|memcpy|memmove (")) {
+                std::vector<const Token*> args = getArguments(tok);
+                if (args.size() != 3)
+                    continue;
+                const Token* tok2 = args[0];
                 if (tok2->str() == "::")
                     tok2 = tok2->next();
                 while (Token::Match(tok2, "%name% ::|."))
@@ -2999,19 +3449,19 @@ void CheckOther::checkIncompleteArrayFill()
                 if (!var || !var->isArray() || var->dimensions().empty() || !var->dimension(0))
                     continue;
 
-                if (MathLib::toLongNumber(tok->linkAt(1)->strAt(-1)) == var->dimension(0)) {
-                    int size = mTokenizer->sizeOfType(var->typeStartToken());
-                    if (size == 0 && var->valueType()->pointer)
-                        size = mSettings->platform.sizeof_pointer;
-                    else if (size == 0 && var->type())
-                        size = estimateSize(var->type(), mSettings, symbolDatabase);
-                    const Token* tok3 = tok->next()->astOperand2()->astOperand1()->astOperand1();
-                    if ((size != 1 && size != 100 && size != 0) || var->isPointer()) {
-                        if (printWarning)
-                            incompleteArrayFillError(tok, tok3->expressionString(), tok->str(), false);
-                    } else if (var->valueType()->type == ValueType::Type::BOOL && printPortability) // sizeof(bool) is not 1 on all platforms
-                        incompleteArrayFillError(tok, tok3->expressionString(), tok->str(), true);
-                }
+                if (!args[2]->hasKnownIntValue() || args[2]->getKnownIntValue() != var->dimension(0))
+                    continue;
+                int size = mTokenizer->sizeOfType(var->typeStartToken());
+                if (size == 0 && var->valueType()->pointer)
+                    size = mSettings->platform.sizeof_pointer;
+                else if (size == 0 && var->valueType())
+                    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)
+                        incompleteArrayFillError(tok, tok3->expressionString(), tok->str(), false);
+                } else if (var->valueType()->type == ValueType::Type::BOOL && printPortability) // sizeof(bool) is not 1 on all platforms
+                    incompleteArrayFillError(tok, tok3->expressionString(), tok->str(), true);
             }
         }
     }
@@ -3042,6 +3492,8 @@ void CheckOther::checkVarFuncNullUB()
     if (!mSettings->severity.isEnabled(Severity::portability))
         return;
 
+    logChecker("CheckOther::checkVarFuncNullUB"); // portability
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -3122,9 +3574,11 @@ void CheckOther::varFuncNullUBError(const Token *tok)
 
 void CheckOther::checkRedundantPointerOp()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantPointerOp"))
         return;
 
+    logChecker("CheckOther::checkRedundantPointerOp"); // style
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (tok->isExpandedMacro() && tok->str() == "(")
             tok = tok->link();
@@ -3170,6 +3624,8 @@ void CheckOther::checkInterlockedDecrement()
         return;
     }
 
+    logChecker("CheckOther::checkInterlockedDecrement"); // windows-platform
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (tok->isName() && Token::Match(tok, "InterlockedDecrement ( & %name% ) ; if ( %name%|!|0")) {
             const Token* interlockedVarTok = tok->tokAt(3);
@@ -3181,11 +3637,11 @@ void CheckOther::checkInterlockedDecrement()
                 raceAfterInterlockedDecrementError(checkStartTok);
             }
         } else if (Token::Match(tok, "if ( ::| InterlockedDecrement ( & %name%")) {
-            const Token* condEnd = tok->next()->link();
+            const Token* condEnd = tok->linkAt(1);
             const Token* funcTok = tok->tokAt(2);
             const Token* firstAccessTok = funcTok->str() == "::" ? funcTok->tokAt(4) : funcTok->tokAt(3);
-            if (condEnd && condEnd->next() && condEnd->next()->link()) {
-                const Token* ifEndTok = condEnd->next()->link();
+            if (condEnd && condEnd->next() && condEnd->linkAt(1)) {
+                const Token* ifEndTok = condEnd->linkAt(1);
                 if (Token::Match(ifEndTok, "} return %name%")) {
                     const Token* secondAccessTok = ifEndTok->tokAt(2);
                     if (secondAccessTok->str() == firstAccessTok->str()) {
@@ -3210,9 +3666,11 @@ void CheckOther::raceAfterInterlockedDecrementError(const Token* tok)
 
 void CheckOther::checkUnusedLabel()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("unusedLabel"))
         return;
 
+    logChecker("CheckOther::checkUnusedLabel"); // style,warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         const bool hasIfdef = mTokenizer->hasIfdef(scope->bodyStart, scope->bodyEnd);
@@ -3222,8 +3680,8 @@ void CheckOther::checkUnusedLabel()
 
             if (Token::Match(tok, "{|}|; %name% :") && !tok->tokAt(1)->isKeyword()) {
                 const std::string tmp("goto " + tok->strAt(1));
-                if (!Token::findsimplematch(scope->bodyStart->next(), tmp.c_str(), tmp.size(), scope->bodyEnd->previous()))
-                    unusedLabelError(tok->next(), tok->next()->scope()->type == Scope::eSwitch, hasIfdef);
+                if (!Token::findsimplematch(scope->bodyStart->next(), tmp.c_str(), tmp.size(), scope->bodyEnd->previous()) && !tok->next()->isExpandedMacro())
+                    unusedLabelError(tok->next(), tok->next()->scope()->type == ScopeType::eSwitch, hasIfdef);
             }
         }
     }
@@ -3240,7 +3698,7 @@ void CheckOther::unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef
     if (hasIfdef)
         id += "Configuration";
 
-    std::string msg = "$symbol:" + (tok ? tok->str() : emptyString) + "\nLabel '$symbol' is not used.";
+    std::string msg = "$symbol:" + (tok ? tok->str() : "") + "\nLabel '$symbol' is not used.";
     if (hasIfdef)
         msg += " There is #if in function body so the label might be used in code that is removed by the preprocessor.";
     if (inSwitch)
@@ -3254,17 +3712,82 @@ void CheckOther::unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef
                 Certainty::normal);
 }
 
+static bool checkEvaluationOrderC(const Token * tok, const Token * tok2, const Token * parent, const Settings & settings, bool & selfAssignmentError)
+{
+    // self assignment..
+    if (tok2 == tok && tok->str() == "=" && parent->str() == "=" && isSameExpression(false, tok->astOperand1(), parent->astOperand1(), settings, true, false)) {
+        if (settings.severity.isEnabled(Severity::warning) && isSameExpression(true, tok->astOperand1(), parent->astOperand1(), settings, true, false))
+            selfAssignmentError = true;
+        return false;
+    }
+    // Is expression used?
+    bool foundError = false;
+    visitAstNodes((parent->astOperand1() != tok2) ? parent->astOperand1() : parent->astOperand2(), [&](const Token *tok3) {
+        if (tok3->str() == "&" && !tok3->astOperand2())
+            return ChildrenToVisit::none; // don't handle address-of for now
+        if (tok3->str() == "(" && Token::simpleMatch(tok3->previous(), "sizeof"))
+            return ChildrenToVisit::none; // don't care about sizeof usage
+        if (isSameExpression(false, tok->astOperand1(), tok3, settings, true, false))
+            foundError = true;
+        return foundError ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
+    });
+
+    return foundError;
+}
+
+static bool checkEvaluationOrderCpp11(const Token * tok, const Token * tok2, const Token * parent, const Settings & settings)
+{
+    if (tok->isAssignmentOp()) // TODO check assignment
+        return false;
+    if (tok->previous() == tok->astOperand1() && parent->isArithmeticalOp() && parent->isBinaryOp()) {
+        if (parent->astParent() && parent->astParent()->isAssignmentOp() && isSameExpression(false, tok->astOperand1(), parent->astParent()->astOperand1(), settings, true, false))
+            return true;
+    }
+    bool foundUndefined{false};
+    visitAstNodes((parent->astOperand1() != tok2) ? parent->astOperand1() : parent->astOperand2(), [&](const Token *tok3) {
+        if (tok3->str() == "&" && !tok3->astOperand2())
+            return ChildrenToVisit::none; // don't handle address-of for now
+        if (tok3->str() == "(" && Token::simpleMatch(tok3->previous(), "sizeof"))
+            return ChildrenToVisit::none; // don't care about sizeof usage
+        if (isSameExpression(false, tok->astOperand1(), tok3, settings, true, false))
+            foundUndefined = true;
+        return foundUndefined ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
+    });
+
+    return foundUndefined;
+}
 
-void CheckOther::checkEvaluationOrder()
+static bool checkEvaluationOrderCpp17(const Token * tok, const Token * tok2, const Token * parent, const Settings & settings, bool & foundUnspecified)
 {
-    // This checker is not written according to C++11 sequencing rules
-    if (mTokenizer->isCPP() && mSettings->standards.cpp >= Standards::CPP11)
-        return;
+    if (tok->isAssignmentOp())
+        return false;
+    bool foundUndefined{false};
+    visitAstNodes((parent->astOperand1() != tok2) ? parent->astOperand1() : parent->astOperand2(), [&](const Token *tok3) {
+        if (tok3->str() == "&" && !tok3->astOperand2())
+            return ChildrenToVisit::none; // don't handle address-of for now
+        if (tok3->str() == "(" && Token::simpleMatch(tok3->previous(), "sizeof"))
+            return ChildrenToVisit::none; // don't care about sizeof usage
+        if (isSameExpression(false, tok->astOperand1(), tok3, settings, true, false) && parent->isArithmeticalOp() && parent->isBinaryOp())
+            foundUndefined = true;
+        if (tok3->tokType() == Token::eIncDecOp && isSameExpression(false, tok->astOperand1(), tok3->astOperand1(), settings, true, false)) {
+            if (parent->isArithmeticalOp() && parent->isBinaryOp())
+                foundUndefined = true;
+            else
+                foundUnspecified = true;
+        }
+        return (foundUndefined || foundUnspecified) ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
+    });
+
+    return foundUndefined || foundUnspecified;
+}
 
+void CheckOther::checkEvaluationOrder()
+{
+    logChecker("CheckOther::checkEvaluationOrder");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * functionScope : symbolDatabase->functionScopes) {
         for (const Token* tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
-            if (tok->tokType() != Token::eIncDecOp && !tok->isAssignmentOp())
+            if (!tok->isIncDecOp() && !tok->isAssignmentOp())
                 continue;
             if (!tok->astOperand1())
                 continue;
@@ -3295,32 +3818,22 @@ void CheckOther::checkEvaluationOrder()
                 if (parent->str() == "(" && parent->astOperand2())
                     break;
 
-                // self assignment..
-                if (tok2 == tok &&
-                    tok->str() == "=" &&
-                    parent->str() == "=" &&
-                    isSameExpression(mTokenizer->isCPP(), false, tok->astOperand1(), parent->astOperand1(), mSettings->library, true, false)) {
-                    if (mSettings->severity.isEnabled(Severity::warning) &&
-                        isSameExpression(mTokenizer->isCPP(), true, tok->astOperand1(), parent->astOperand1(), mSettings->library, true, false))
-                        selfAssignmentError(parent, tok->astOperand1()->expressionString());
-                    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);
+                    else
+                        foundError = checkEvaluationOrderCpp11(tok, tok2, parent, *mSettings);
                 }
-
-                // Is expression used?
-                bool foundError = false;
-                visitAstNodes((parent->astOperand1() != tok2) ? parent->astOperand1() : parent->astOperand2(),
-                              [&](const Token *tok3) {
-                    if (tok3->str() == "&" && !tok3->astOperand2())
-                        return ChildrenToVisit::none; // don't handle address-of for now
-                    if (tok3->str() == "(" && Token::simpleMatch(tok3->previous(), "sizeof"))
-                        return ChildrenToVisit::none; // don't care about sizeof usage
-                    if (isSameExpression(mTokenizer->isCPP(), false, tok->astOperand1(), tok3, mSettings->library, true, false))
-                        foundError = true;
-                    return foundError ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
-                });
+                else
+                    foundError = checkEvaluationOrderC(tok, tok2, parent, *mSettings, bSelfAssignmentError);
 
                 if (foundError) {
-                    unknownEvaluationOrder(parent);
+                    unknownEvaluationOrder(parent, foundUnspecified);
+                    break;
+                }
+                if (bSelfAssignmentError) {
+                    selfAssignmentError(parent, tok->astOperand1()->expressionString());
                     break;
                 }
             }
@@ -3328,16 +3841,22 @@ void CheckOther::checkEvaluationOrder()
     }
 }
 
-void CheckOther::unknownEvaluationOrder(const Token* tok)
+void CheckOther::unknownEvaluationOrder(const Token* tok, bool isUnspecifiedBehavior)
 {
-    reportError(tok, Severity::error, "unknownEvaluationOrder",
-                "Expression '" + (tok ? tok->expressionString() : std::string("x = x++;")) + "' depends on order of evaluation of side effects", CWE768, Certainty::normal);
+    isUnspecifiedBehavior ?
+    reportError(tok, Severity::portability, "unknownEvaluationOrder",
+                "Expression '" + (tok ? tok->expressionString() : std::string("x++, x++")) + "' depends on order of evaluation of side effects. Behavior is Unspecified according to c++17", CWE768, Certainty::normal)
+    :   reportError(tok, Severity::error, "unknownEvaluationOrder",
+                    "Expression '" + (tok ? tok->expressionString() : std::string("x = x++;")) + "' depends on order of evaluation of side effects", CWE768, Certainty::normal);
 }
 
 void CheckOther::checkAccessOfMovedVariable()
 {
-    if (!mTokenizer->isCPP() || mSettings->standards.cpp < Standards::CPP11 || !mSettings->severity.isEnabled(Severity::warning))
+    if (!mTokenizer->isCPP() || mSettings->standards.cpp < Standards::CPP11)
         return;
+    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 SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -3364,11 +3883,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, &inconclusive);
                 else if (usage == ExprUsage::Inconclusive)
                     inconclusive = true;
             }
@@ -3401,8 +3920,8 @@ 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);
 }
 
 
@@ -3413,9 +3932,11 @@ void CheckOther::checkFuncArgNamesDifferent()
     const bool inconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     const bool warning = mSettings->severity.isEnabled(Severity::warning);
 
-    if (!(warning || (style && inconclusive)))
+    if (!(warning || (style && inconclusive)) && !mSettings->isPremiumEnabled("funcArgNamesDifferent"))
         return;
 
+    logChecker("CheckOther::checkFuncArgNamesDifferent"); // style,warning,inconclusive
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     // check every function
     for (const Scope *scope : symbolDatabase->functionScopes) {
@@ -3494,7 +4015,7 @@ void CheckOther::funcArgNamesDifferent(const std::string & functionName, nonneg
     std::list<const Token *> tokens = { declaration,definition };
     reportError(tokens, Severity::style, "funcArgNamesDifferent",
                 "$symbol:" + functionName + "\n"
-                "Function '$symbol' argument " + MathLib::toString(index + 1) + " names different: declaration '" +
+                "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);
 }
@@ -3505,18 +4026,18 @@ void CheckOther::funcArgOrderDifferent(const std::string & functionName,
                                        const std::vector<const Token *> & definitions)
 {
     std::list<const Token *> tokens = {
-        declarations.size() ? declarations[0] ? declarations[0] : declaration : nullptr,
-        definitions.size() ? definitions[0] ? definitions[0] : definition : nullptr
+        !declarations.empty() ? declarations[0] ? declarations[0] : declaration : nullptr,
+        !definitions.empty() ? definitions[0] ? definitions[0] : definition : nullptr
     };
     std::string msg = "$symbol:" + functionName + "\nFunction '$symbol' argument order different: declaration '";
-    for (int i = 0; i < declarations.size(); ++i) {
+    for (std::size_t i = 0; i < declarations.size(); ++i) {
         if (i != 0)
             msg += ", ";
         if (declarations[i])
             msg += declarations[i]->str();
     }
     msg += "' definition '";
-    for (int i = 0; i < definitions.size(); ++i) {
+    for (std::size_t i = 0; i < definitions.size(); ++i) {
         if (i != 0)
             msg += ", ";
         if (definitions[i])
@@ -3526,47 +4047,48 @@ void CheckOther::funcArgOrderDifferent(const std::string & functionName,
     reportError(tokens, Severity::warning, "funcArgOrderDifferent", msg, CWE683, Certainty::normal);
 }
 
-static const Token *findShadowed(const Scope *scope, const std::string &varname, int linenr)
+static const Token *findShadowed(const Scope *scope, const Variable& var, int linenr)
 {
     if (!scope)
         return nullptr;
-    for (const Variable &var : scope->varlist) {
-        if (scope->isExecutable() && var.nameToken()->linenr() > linenr)
+    for (const Variable &v : scope->varlist) {
+        if (scope->isExecutable() && v.nameToken()->linenr() > linenr)
             continue;
-        if (var.name() == varname)
-            return var.nameToken();
+        if (v.name() == var.name())
+            return v.nameToken();
     }
     auto it = std::find_if(scope->functionList.cbegin(), scope->functionList.cend(), [&](const Function& f) {
-        return f.type == Function::Type::eFunction && f.name() == varname;
+        return f.type == FunctionType::eFunction && f.name() == var.name() && precedes(f.tokenDef, var.nameToken());
     });
     if (it != scope->functionList.end())
         return it->tokenDef;
 
-    if (scope->type == Scope::eLambda)
+    if (scope->type == ScopeType::eLambda)
         return nullptr;
-    const Token* shadowed = findShadowed(scope->nestedIn, varname, linenr);
+    const Token* shadowed = findShadowed(scope->nestedIn, var, linenr);
     if (!shadowed)
-        shadowed = findShadowed(scope->functionOf, varname, linenr);
+        shadowed = findShadowed(scope->functionOf, var, linenr);
     return shadowed;
 }
 
 void CheckOther::checkShadowVariables()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("shadowVariable"))
         return;
+    logChecker("CheckOther::checkShadowVariables"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope & scope : symbolDatabase->scopeList) {
-        if (!scope.isExecutable() || scope.type == Scope::eLambda)
+        if (!scope.isExecutable() || scope.type == ScopeType::eLambda)
             continue;
         const Scope *functionScope = &scope;
-        while (functionScope && functionScope->type != Scope::ScopeType::eFunction && functionScope->type != Scope::ScopeType::eLambda)
+        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;
 
-            if (functionScope && functionScope->type == Scope::ScopeType::eFunction && functionScope->function) {
-                const auto argList = functionScope->function->argumentList;
+            if (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();
                 });
@@ -3576,14 +4098,15 @@ void CheckOther::checkShadowVariables()
                 }
             }
 
-            const Token *shadowed = findShadowed(scope.nestedIn, var.name(), var.nameToken()->linenr());
+            const Token *shadowed = findShadowed(scope.nestedIn, var, var.nameToken()->linenr());
             if (!shadowed)
-                shadowed = findShadowed(scope.functionOf, var.name(), var.nameToken()->linenr());
+                shadowed = findShadowed(scope.functionOf, var, var.nameToken()->linenr());
             if (!shadowed)
                 continue;
-            if (scope.type == Scope::eFunction && scope.className == var.name())
+            if (scope.type == ScopeType::eFunction && scope.className == var.name())
                 continue;
-            if (functionScope->functionOf && functionScope->functionOf->isClassOrStructOrUnion() && functionScope->function && functionScope->function->isStatic() &&
+            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");
@@ -3591,7 +4114,7 @@ void CheckOther::checkShadowVariables()
     }
 }
 
-void CheckOther::shadowError(const Token *var, const Token *shadowed, std::string type)
+void CheckOther::shadowError(const Token *var, const Token *shadowed, const std::string& type)
 {
     ErrorPath errorPath;
     errorPath.emplace_back(shadowed, "Shadowed declaration");
@@ -3600,7 +4123,7 @@ void CheckOther::shadowError(const Token *var, const Token *shadowed, std::strin
     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);
+    reportError(std::move(errorPath), Severity::style, id.c_str(), message, CWE398, Certainty::normal);
 }
 
 static bool isVariableExpression(const Token* tok)
@@ -3611,29 +4134,50 @@ static bool isVariableExpression(const Token* tok)
         return isVariableExpression(tok->astOperand1()) &&
                isVariableExpression(tok->astOperand2());
     if (Token::simpleMatch(tok, "["))
-        return isVariableExpression(tok->astOperand1()) &&
-               tok->astOperand2() && tok->astOperand2()->hasKnownIntValue();
+        return isVariableExpression(tok->astOperand1());
+    return false;
+}
+
+static bool isVariableExprHidden(const Token* tok)
+{
+    if (!tok)
+        return false;
+    if (!tok->astParent())
+        return false;
+    if (Token::simpleMatch(tok->astParent(), "*") && Token::simpleMatch(tok->astSibling(), "0"))
+        return true;
+    if (Token::simpleMatch(tok->astParent(), "&&") && Token::simpleMatch(tok->astSibling(), "false"))
+        return true;
+    if (Token::simpleMatch(tok->astParent(), "||") && Token::simpleMatch(tok->astSibling(), "true"))
+        return true;
     return false;
 }
 
 void CheckOther::checkKnownArgument()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownArgument"))
         return;
+    logChecker("CheckOther::checkKnownArgument"); // style
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *functionScope : symbolDatabase->functionScopes) {
         for (const Token *tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
-            if (!Token::simpleMatch(tok->astParent(), "("))
+            if (!tok->hasKnownIntValue() || tok->isExpandedMacro())
                 continue;
-            if (!Token::Match(tok->astParent()->previous(), "%name%"))
+            if (Token::Match(tok, "++|--|%assign%"))
                 continue;
-            if (Token::Match(tok->astParent()->previous(), "if|while|switch|sizeof"))
+            if (!Token::Match(tok->astParent(), "(|{|,"))
                 continue;
-            if (tok == tok->astParent()->previous())
+            if (tok->astParent()->isCast() || (tok->isCast() && Token::Match(tok->astOperand2(), "++|--|%assign%")))
                 continue;
-            if (!tok->hasKnownIntValue())
+            int argn = -1;
+            const Token* ftok = getTokenArgumentFunction(tok, argn);
+            if (!ftok)
+                continue;
+            if (ftok->isCast())
                 continue;
-            if (tok->tokType() == Token::eIncDecOp)
+            if (Token::Match(ftok, "if|while|switch|sizeof"))
+                continue;
+            if (tok == tok->astParent()->previous())
                 continue;
             if (isConstVarExpression(tok))
                 continue;
@@ -3644,45 +4188,36 @@ void CheckOther::checkKnownArgument()
                 tok2 = tok2->astOperand2();
             if (isVariableExpression(tok2))
                 continue;
+            if (tok->isComparisonOp() &&
+                isSameExpression(
+                    true, tok->astOperand1(), tok->astOperand2(), *mSettings, true, true))
+                continue;
             // ensure that there is a integer variable in expression with unknown value
-            std::string varexpr;
-            bool isVariableExprHidden = false;  // Is variable expression explicitly hidden
-            auto setVarExpr = [&varexpr, &isVariableExprHidden](const Token *child) {
+            const Token* vartok = nullptr;
+            visitAstNodes(tok, [&](const Token* child) {
                 if (Token::Match(child, "%var%|.|[")) {
-                    if (child->valueType() && child->valueType()->pointer == 0 && child->valueType()->isIntegral() && child->values().empty()) {
-                        varexpr = child->expressionString();
+                    if (child->hasKnownIntValue())
+                        return ChildrenToVisit::none;
+                    if (astIsIntegral(child, false) && !astIsPointer(child) && child->values().empty()) {
+                        vartok = child;
                         return ChildrenToVisit::done;
                     }
-                    return ChildrenToVisit::none;
-                }
-                if (Token::simpleMatch(child->previous(), "sizeof ("))
-                    return ChildrenToVisit::none;
-
-                // hide variable explicitly with 'x * 0' etc
-                if (!isVariableExprHidden) {
-                    if (Token::simpleMatch(child, "*") && (Token::simpleMatch(child->astOperand1(), "0") || Token::simpleMatch(child->astOperand2(), "0")))
-                        return ChildrenToVisit::none;
-                    if (Token::simpleMatch(child, "&&") && (Token::simpleMatch(child->astOperand1(), "false") || Token::simpleMatch(child->astOperand2(), "false")))
-                        return ChildrenToVisit::none;
-                    if (Token::simpleMatch(child, "||") && (Token::simpleMatch(child->astOperand1(), "true") || Token::simpleMatch(child->astOperand2(), "true")))
-                        return ChildrenToVisit::none;
                 }
-
                 return ChildrenToVisit::op1_and_op2;
-            };
-            visitAstNodes(tok, setVarExpr);
-            if (varexpr.empty()) {
-                isVariableExprHidden = true;
-                visitAstNodes(tok, setVarExpr);
-            }
-            if (varexpr.empty())
+            });
+            if (!vartok)
+                continue;
+            if (vartok->astSibling() &&
+                findAstNode(vartok->astSibling(), [](const Token* child) {
+                return Token::simpleMatch(child, "sizeof");
+            }))
                 continue;
             // ensure that function name does not contain "assert"
-            std::string funcname = tok->astParent()->previous()->str();
+            std::string funcname = ftok->str();
             strTolower(funcname);
             if (funcname.find("assert") != std::string::npos)
                 continue;
-            knownArgumentError(tok, tok->astParent()->previous(), &tok->values().front(), varexpr, isVariableExprHidden);
+            knownArgumentError(tok, ftok, &tok->values().front(), vartok->expressionString(), isVariableExprHidden(vartok));
         }
     }
 }
@@ -3699,8 +4234,14 @@ void CheckOther::knownArgumentError(const Token *tok, const Token *ftok, const V
     const std::string &expr = tok->expressionString();
     const std::string &fun = ftok->str();
 
+    std::string ftype = "function ";
+    if (ftok->type())
+        ftype = "constructor ";
+    else if (fun == "{")
+        ftype = "init list ";
+
     const char *id;
-    std::string errmsg = "Argument '" + expr + "' to function " + fun + " is always " + std::to_string(intvalue) + ". ";
+    std::string errmsg = "Argument '" + expr + "' to " + ftype + fun + " is always " + MathLib::toString(intvalue) + ". ";
     if (!isVariableExpressionHidden) {
         id = "knownArgument";
         errmsg += "It does not matter what value '" + varexpr + "' has.";
@@ -3709,24 +4250,72 @@ 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()
+{
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownPointerToBool"))
+        return;
+    logChecker("CheckOther::checkKnownPointerToBool"); // style
+    const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
+    for (const Scope* functionScope : symbolDatabase->functionScopes) {
+        for (const Token* tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
+            if (!tok->hasKnownIntValue())
+                continue;
+            if (!astIsPointer(tok))
+                continue;
+            if (Token::Match(tok->astParent(), "?|!|&&|%oror%|%comp%"))
+                continue;
+            if (tok->astParent() && Token::Match(tok->astParent()->previous(), "if|while|switch|sizeof ("))
+                continue;
+            if (tok->isExpandedMacro())
+                continue;
+            if (findParent(tok, [](const Token* parent) {
+                return parent->isExpandedMacro();
+            }))
+                continue;
+            if (!isUsedAsBool(tok, *mSettings))
+                continue;
+            const ValueFlow::Value& value = tok->values().front();
+            knownPointerToBoolError(tok, &value);
+        }
+    }
+}
+
+void CheckOther::knownPointerToBoolError(const Token* tok, const ValueFlow::Value* value)
+{
+    if (!tok) {
+        reportError(tok, Severity::style, "knownPointerToBool", "Pointer expression 'p' converted to bool is always true.");
+        return;
+    }
+    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 + ".";
+    ErrorPath errorPath = getErrorPath(tok, value, errmsg);
+    reportError(std::move(errorPath), Severity::style, "knownPointerToBool", errmsg, CWE570, Certainty::normal);
 }
 
 void CheckOther::checkComparePointers()
 {
+    logChecker("CheckOther::checkComparePointers");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *functionScope : symbolDatabase->functionScopes) {
         for (const Token *tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
             if (!Token::Match(tok, "<|>|<=|>=|-"))
                 continue;
             const Token *tok1 = tok->astOperand1();
+            if (!astIsPointer(tok1))
+                continue;
             const Token *tok2 = tok->astOperand2();
-            if (!astIsPointer(tok1) || !astIsPointer(tok2))
+            if (!astIsPointer(tok2))
                 continue;
             ValueFlow::Value v1 = ValueFlow::getLifetimeObjValue(tok1);
+            if (!v1.isLocalLifetimeValue())
+                continue;
             ValueFlow::Value v2 = ValueFlow::getLifetimeObjValue(tok2);
-            if (!v1.isLocalLifetimeValue() || !v2.isLocalLifetimeValue())
+            if (!v2.isLocalLifetimeValue())
                 continue;
             const Variable *var1 = v1.tokvalue->variable();
             const Variable *var2 = v2.tokvalue->variable();
@@ -3738,10 +4327,10 @@ void CheckOther::checkComparePointers()
                 continue;
             if (var1->isRValueReference() || var2->isRValueReference())
                 continue;
-            if (const Token* parent2 = getParentLifetime(mTokenizer->isCPP(), v2.tokvalue, &mSettings->library))
+            if (const Token* parent2 = getParentLifetime(v2.tokvalue, mSettings->library))
                 if (var1 == parent2->variable())
                     continue;
-            if (const Token* parent1 = getParentLifetime(mTokenizer->isCPP(), v1.tokvalue, &mSettings->library))
+            if (const Token* parent1 = getParentLifetime(v1.tokvalue, mSettings->library))
                 if (var2 == parent1->variable())
                     continue;
             comparePointersError(tok, &v1, &v2);
@@ -3755,6 +4344,7 @@ void CheckOther::comparePointersError(const Token *tok, const ValueFlow::Value *
     std::string verb = "Comparing";
     if (Token::simpleMatch(tok, "-"))
         verb = "Subtracting";
+    const char * const id = (verb[0] == 'C') ? "comparePointers" : "subtractPointers";
     if (v1) {
         errorPath.emplace_back(v1->tokvalue->variable()->nameToken(), "Variable declared here.");
         errorPath.insert(errorPath.end(), v1->errorPath.cbegin(), v1->errorPath.cend());
@@ -3765,14 +4355,16 @@ void CheckOther::comparePointersError(const Token *tok, const ValueFlow::Value *
     }
     errorPath.emplace_back(tok, "");
     reportError(
-        errorPath, Severity::error, "comparePointers", 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()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("moduloofone"))
         return;
 
+    logChecker("CheckOther::checkModuloOfOne"); // style
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!tok->astOperand2() || !tok->astOperand1())
             continue;
@@ -3793,32 +4385,181 @@ void CheckOther::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 CheckOther::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) {
+        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 CheckOther::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)
 //-----------------------------------------------------------------------------
-static bool getBufAndOffset(const Token *expr, const Token **buf, MathLib::bigint *offset)
+static bool getBufAndOffset(const Token *expr, const Token *&buf, MathLib::bigint *offset, const Settings& settings, MathLib::bigint* sizeValue = nullptr)
 {
     if (!expr)
         return false;
     const Token *bufToken, *offsetToken;
+    MathLib::bigint elementSize = 0;
     if (expr->isUnaryOp("&") && Token::simpleMatch(expr->astOperand1(), "[")) {
         bufToken = expr->astOperand1()->astOperand1();
         offsetToken = expr->astOperand1()->astOperand2();
+        if (expr->astOperand1()->valueType())
+            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);
         if (pointer1 && !pointer2) {
             bufToken = expr->astOperand1();
             offsetToken = expr->astOperand2();
+            auto vt = *expr->astOperand1()->valueType();
+            --vt.pointer;
+            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 = vt.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
         } else {
             return false;
         }
     } else if (expr->valueType() && expr->valueType()->pointer > 0) {
-        *buf = expr;
+        buf = expr;
         *offset = 0;
+        auto vt = *expr->valueType();
+        --vt.pointer;
+        elementSize = vt.getSizeOf(settings, ValueType::Accuracy::LowerBound, ValueType::SizeOf::Pointer);
+        if (elementSize > 0) {
+            *offset *= elementSize;
+            if (sizeValue)
+                *sizeValue *= elementSize;
+        }
         return true;
     } else {
         return false;
@@ -3827,13 +4568,19 @@ static bool getBufAndOffset(const Token *expr, const Token **buf, MathLib::bigin
         return false;
     if (!offsetToken->hasKnownIntValue())
         return false;
-    *buf = bufToken;
+    buf = bufToken;
     *offset = offsetToken->getKnownIntValue();
+    if (elementSize > 0) {
+        *offset *= elementSize;
+        if (sizeValue)
+            *sizeValue *= elementSize;
+    }
     return true;
 }
 
 void CheckOther::checkOverlappingWrite()
 {
+    logChecker("CheckOther::checkOverlappingWrite");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *functionScope : symbolDatabase->functionScopes) {
         for (const Token *tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
@@ -3843,7 +4590,7 @@ void CheckOther::checkOverlappingWrite()
                 if (!Token::simpleMatch(lhs, ".") || !lhs->isBinaryOp())
                     continue;
                 const Variable * const lhsvar = lhs->astOperand1()->variable();
-                if (!lhsvar || !lhsvar->typeScope() || lhsvar->typeScope()->type != Scope::ScopeType::eUnion)
+                if (!lhsvar || !lhsvar->typeScope() || lhsvar->typeScope()->type != ScopeType::eUnion)
                     continue;
                 const Token* const lhsmember = lhs->astOperand2();
                 if (!lhsmember)
@@ -3888,26 +4635,28 @@ void CheckOther::checkOverlappingWrite()
                     continue;
 
                 // TODO: nonOverlappingData->strlenArg
-                if (nonOverlappingData->sizeArg <= 0 || nonOverlappingData->sizeArg > args.size()) {
+                const int sizeArg = std::max(nonOverlappingData->sizeArg, nonOverlappingData->countArg);
+                if (sizeArg <= 0 || sizeArg > args.size()) {
                     if (nonOverlappingData->sizeArg == -1) {
                         ErrorPath errorPath;
-                        const bool macro = true;
-                        const bool pure = true;
-                        const bool follow = true;
-                        if (!isSameExpression(mTokenizer->isCPP(), macro, ptr1, ptr2, mSettings->library, pure, follow, &errorPath))
+                        constexpr bool macro = true;
+                        constexpr bool pure = true;
+                        constexpr bool follow = true;
+                        if (!isSameExpression(macro, ptr1, ptr2, *mSettings, pure, follow, &errorPath))
                             continue;
-                        overlappingWriteFunction(tok);
+                        overlappingWriteFunction(tok, tok->str());
                     }
                     continue;
                 }
-                if (!args[nonOverlappingData->sizeArg-1]->hasKnownIntValue())
+                const bool isCountArg = nonOverlappingData->countArg > 0;
+                if (!args[sizeArg-1]->hasKnownIntValue())
                     continue;
-                const MathLib::bigint sizeValue = args[nonOverlappingData->sizeArg-1]->getKnownIntValue();
+                MathLib::bigint sizeValue = args[sizeArg-1]->getKnownIntValue();
                 const Token *buf1, *buf2;
                 MathLib::bigint offset1, offset2;
-                if (!getBufAndOffset(ptr1, &buf1, &offset1))
+                if (!getBufAndOffset(ptr1, buf1, &offset1, *mSettings, isCountArg ? &sizeValue : nullptr))
                     continue;
-                if (!getBufAndOffset(ptr2, &buf2, &offset2))
+                if (!getBufAndOffset(ptr2, buf2, &offset2, *mSettings))
                     continue;
 
                 if (offset1 < offset2 && offset1 + sizeValue <= offset2)
@@ -3916,12 +4665,12 @@ void CheckOther::checkOverlappingWrite()
                     continue;
 
                 ErrorPath errorPath;
-                const bool macro = true;
-                const bool pure = true;
-                const bool follow = true;
-                if (!isSameExpression(mTokenizer->isCPP(), macro, buf1, buf2, mSettings->library, pure, follow, &errorPath))
+                constexpr bool macro = true;
+                constexpr bool pure = true;
+                constexpr bool follow = true;
+                if (!isSameExpression(macro, buf1, buf2, *mSettings, pure, follow, &errorPath))
                     continue;
-                overlappingWriteFunction(tok);
+                overlappingWriteFunction(tok, tok->str());
             }
         }
     }
@@ -3932,8 +4681,142 @@ void CheckOther::overlappingWriteUnion(const Token *tok)
     reportError(tok, Severity::error, "overlappingWriteUnion", "Overlapping read/write of union is undefined behavior");
 }
 
-void CheckOther::overlappingWriteFunction(const Token *tok)
+void CheckOther::overlappingWriteFunction(const Token *tok, const std::string& funcname)
 {
-    const std::string &funcname = tok ? tok->str() : emptyString;
     reportError(tok, Severity::error, "overlappingWriteFunction", "Overlapping read/write in " + funcname + "() is undefined behavior");
 }
+
+void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckOther checkOther(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    // Checks
+    checkOther.warningOldStylePointerCast();
+    checkOther.warningDangerousTypeCast();
+    checkOther.warningIntToPointerCast();
+    checkOther.suspiciousFloatingPointCast();
+    checkOther.invalidPointerCast();
+    checkOther.checkCharVariable();
+    checkOther.redundantBitwiseOperationInSwitchError();
+    checkOther.checkSuspiciousCaseInSwitch();
+    checkOther.checkDuplicateBranch();
+    checkOther.checkDuplicateExpression();
+    checkOther.checkRedundantAssignment();
+    checkOther.checkUnreachableCode();
+    checkOther.checkSuspiciousSemicolon();
+    checkOther.checkVariableScope();
+    checkOther.checkSignOfUnsignedVariable();  // don't ignore casts (#3574)
+    checkOther.checkIncompleteArrayFill();
+    checkOther.checkVarFuncNullUB();
+    checkOther.checkNanInArithmeticExpression();
+    checkOther.checkCommaSeparatedReturn();
+    checkOther.checkRedundantPointerOp();
+    checkOther.checkZeroDivision();
+    checkOther.checkNegativeBitwiseShift();
+    checkOther.checkInterlockedDecrement();
+    checkOther.checkUnusedLabel();
+    checkOther.checkEvaluationOrder();
+    checkOther.checkFuncArgNamesDifferent();
+    checkOther.checkShadowVariables();
+    checkOther.checkKnownArgument();
+    checkOther.checkKnownPointerToBool();
+    checkOther.checkComparePointers();
+    checkOther.checkIncompleteStatement();
+    checkOther.checkRedundantCopy();
+    checkOther.clarifyCalculation();
+    checkOther.checkPassByReference();
+    checkOther.checkConstVariable();
+    checkOther.checkConstPointer();
+    checkOther.checkComparisonFunctionIsAlwaysTrueOrFalse();
+    checkOther.checkInvalidFree();
+    checkOther.clarifyStatement();
+    checkOther.checkCastIntToCharAndBack();
+    checkOther.checkMisusedScopedObject();
+    checkOther.checkAccessOfMovedVariable();
+    checkOther.checkModuloOfOne();
+    checkOther.checkOverlappingWrite();
+    checkOther.checkUnionZeroInit();
+}
+
+void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckOther c(nullptr, settings, errorLogger);
+
+    // error
+    c.zerodivError(nullptr, nullptr);
+    c.misusedScopeObjectError(nullptr, "varname");
+    c.invalidPointerCastError(nullptr,  "float *", "double *", false, false);
+    c.negativeBitwiseShiftError(nullptr, 1);
+    c.negativeBitwiseShiftError(nullptr, 2);
+    c.raceAfterInterlockedDecrementError(nullptr);
+    c.invalidFreeError(nullptr, "malloc", false);
+    c.overlappingWriteUnion(nullptr);
+    c.overlappingWriteFunction(nullptr, "funcname");
+
+    //performance
+    c.redundantCopyError(nullptr,  "varname");
+    c.redundantCopyError(nullptr, nullptr, "var");
+
+    // style/warning
+    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);
+    c.unknownSignCharArrayIndexError(nullptr);
+    c.charBitOpError(nullptr);
+    c.variableScopeError(nullptr,  "varname");
+    c.redundantAssignmentInSwitchError(nullptr, nullptr, "var");
+    c.suspiciousCaseInSwitchError(nullptr,  "||");
+    c.selfAssignmentError(nullptr,  "varname");
+    c.clarifyCalculationError(nullptr,  "+");
+    c.clarifyStatementError(nullptr);
+    c.duplicateBranchError(nullptr, nullptr, ErrorPath{});
+    c.duplicateAssignExpressionError(nullptr, nullptr, true);
+    c.oppositeExpressionError(nullptr, ErrorPath{});
+    c.duplicateExpressionError(nullptr, nullptr, nullptr, ErrorPath{});
+    c.duplicateValueTernaryError(nullptr);
+    c.duplicateExpressionTernaryError(nullptr, ErrorPath{});
+    c.duplicateBreakError(nullptr,  false);
+    c.unreachableCodeError(nullptr, nullptr,  false);
+    c.unsignedLessThanZeroError(nullptr, nullptr, "varname");
+    c.unsignedPositiveError(nullptr, nullptr, "varname");
+    c.pointerLessThanZeroError(nullptr, nullptr);
+    c.pointerPositiveError(nullptr, nullptr);
+    c.suspiciousSemicolonError(nullptr);
+    c.incompleteArrayFillError(nullptr,  "buffer", "memset", false);
+    c.varFuncNullUBError(nullptr);
+    c.nanInArithmeticExpressionError(nullptr);
+    c.commaSeparatedReturnError(nullptr);
+    c.redundantPointerOpError(nullptr,  "varname", false, /*addressOfDeref*/ true);
+    c.unusedLabelError(nullptr, false, false);
+    c.unusedLabelError(nullptr, false, true);
+    c.unusedLabelError(nullptr, true, false);
+    c.unusedLabelError(nullptr, true, true);
+    c.unknownEvaluationOrder(nullptr);
+    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.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 14e0409145e..28ee25cfa76 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-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
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "errortypes.h"
 
+#include <set>
 #include <string>
 #include <vector>
 
@@ -35,10 +36,11 @@ namespace ValueFlow {
 
 class Settings;
 class Token;
-class Tokenizer;
 class Function;
 class Variable;
 class ErrorLogger;
+class Tokenizer;
+struct UnionMember;
 
 /// @addtogroup Checks
 /// @{
@@ -47,67 +49,28 @@ class ErrorLogger;
 /** @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()) {}
 
+    /** 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);
+
+    /** 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);
+
+private:
     /** @brief This constructor is used when running checks. */
     CheckOther(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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckOther checkOther(tokenizer, settings, errorLogger);
-
-        // Checks
-        checkOther.warningOldStylePointerCast();
-        checkOther.invalidPointerCast();
-        checkOther.checkCharVariable();
-        checkOther.checkRedundantAssignment();
-        checkOther.checkRedundantAssignmentInSwitch();
-        checkOther.checkSuspiciousCaseInSwitch();
-        checkOther.checkDuplicateBranch();
-        checkOther.checkDuplicateExpression();
-        checkOther.checkUnreachableCode();
-        checkOther.checkSuspiciousSemicolon();
-        checkOther.checkVariableScope();
-        checkOther.checkSignOfUnsignedVariable();  // don't ignore casts (#3574)
-        checkOther.checkIncompleteArrayFill();
-        checkOther.checkVarFuncNullUB();
-        checkOther.checkNanInArithmeticExpression();
-        checkOther.checkCommaSeparatedReturn();
-        checkOther.checkRedundantPointerOp();
-        checkOther.checkZeroDivision();
-        checkOther.checkNegativeBitwiseShift();
-        checkOther.checkInterlockedDecrement();
-        checkOther.checkUnusedLabel();
-        checkOther.checkEvaluationOrder();
-        checkOther.checkFuncArgNamesDifferent();
-        checkOther.checkShadowVariables();
-        checkOther.checkKnownArgument();
-        checkOther.checkComparePointers();
-        checkOther.checkIncompleteStatement();
-        checkOther.checkRedundantCopy();
-        checkOther.clarifyCalculation();
-        checkOther.checkPassByReference();
-        checkOther.checkConstVariable();
-        checkOther.checkConstPointer();
-        checkOther.checkComparisonFunctionIsAlwaysTrueOrFalse();
-        checkOther.checkInvalidFree();
-        checkOther.clarifyStatement();
-        checkOther.checkCastIntToCharAndBack();
-        checkOther.checkMisusedScopedObject();
-        checkOther.checkAccessOfMovedVariable();
-        checkOther.checkModuloOfOne();
-        checkOther.checkOverlappingWrite();
-    }
-
-    /** 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);
-
-    /** 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 Run checks against the normal token list */
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief Clarify calculation for ".. a * b ? .." */
     void clarifyCalculation();
@@ -118,12 +81,20 @@ 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 */
     void invalidPointerCast();
 
     /** @brief %Check scope of variables */
     void checkVariableScope();
-    static bool checkInnerScope(const Token *tok, const Variable* var, bool& used);
+    bool checkInnerScope(const Token *tok, const Variable* var, bool& used) const;
 
     /** @brief %Check for comma separated statements in return */
     void checkCommaSeparatedReturn();
@@ -149,8 +120,8 @@ class CPPCHECKLIB CheckOther : public Check {
     /** @brief copying to memory or assigning to a variable twice */
     void checkRedundantAssignment();
 
-    /** @brief %Check for assigning to the same variable twice in a switch statement*/
-    void checkRedundantAssignmentInSwitch();
+    /** @brief %Check for redundant bitwise operation in switch statement*/
+    void redundantBitwiseOperationInSwitchError();
 
     /** @brief %Check for code like 'case A||B:'*/
     void checkSuspiciousCaseInSwitch();
@@ -218,23 +189,32 @@ class CPPCHECKLIB CheckOther : public Check {
 
     void checkKnownArgument();
 
+    void checkKnownPointerToBool();
+
     void checkComparePointers();
 
     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);
+    void overlappingWriteFunction(const Token *tok, const std::string& funcname);
 
-private:
     // Error messages..
-    void checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* tok, const std::string &functionName, const std::string &varName, const bool result);
+    void checkComparisonFunctionIsAlwaysTrueOrFalseError(const Token* tok, const std::string &functionName, const std::string &varName, bool result);
     void checkCastIntToCharAndBackError(const Token *tok, const std::string &strFunctionName);
     void clarifyCalculationError(const Token *tok, const std::string &op);
     void clarifyStatementError(const Token* tok);
-    void cstyleCastError(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 Token *tok, const std::string &parname, bool inconclusive);
+    void passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor = false);
     void constVariableError(const Variable *var, const Function *function);
     void constStatementError(const Token *tok, const std::string &type, bool inconclusive);
     void signedCharArrayIndexError(const Token *tok);
@@ -246,6 +226,7 @@ class CPPCHECKLIB CheckOther : public Check {
     void redundantAssignmentError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive);
     void redundantInitializationError(const Token *tok1, const Token* tok2, const std::string& var, bool inconclusive);
     void redundantAssignmentInSwitchError(const Token *tok1, const Token *tok2, const std::string &var);
+    void redundantAssignmentSameValueError(const Token* tok, const ValueFlow::Value* val, const std::string& var);
     void redundantCopyError(const Token *tok1, const Token* tok2, const std::string& var);
     void redundantBitwiseOperationInSwitchError(const Token *tok, const std::string &varname);
     void suspiciousCaseInSwitchError(const Token* tok, const std::string& operatorString);
@@ -273,89 +254,18 @@ class CPPCHECKLIB CheckOther : public Check {
     void redundantPointerOpError(const Token* tok, const std::string& varname, bool inconclusive, bool addressOfDeref);
     void raceAfterInterlockedDecrementError(const Token* tok);
     void unusedLabelError(const Token* tok, bool inSwitch, bool hasIfdef);
-    void unknownEvaluationOrder(const Token* tok);
+    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 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, std::string type);
+    void shadowError(const Token *var, const Token *shadowed, const std::string& type);
     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 unionZeroInitError(const Token *tok, const UnionMember& largestMember);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckOther c(nullptr, settings, errorLogger);
-
-        ErrorPath errorPath;
-
-        // error
-        c.zerodivError(nullptr, nullptr);
-        c.misusedScopeObjectError(nullptr, "varname");
-        c.invalidPointerCastError(nullptr,  "float *", "double *", false, false);
-        c.negativeBitwiseShiftError(nullptr, 1);
-        c.negativeBitwiseShiftError(nullptr, 2);
-        c.raceAfterInterlockedDecrementError(nullptr);
-        c.invalidFreeError(nullptr, "malloc", false);
-        c.overlappingWriteUnion(nullptr);
-        c.overlappingWriteFunction(nullptr);
-
-        //performance
-        c.redundantCopyError(nullptr,  "varname");
-        c.redundantCopyError(nullptr, nullptr, "var");
-
-        // style/warning
-        c.checkComparisonFunctionIsAlwaysTrueOrFalseError(nullptr, "isless","varName",false);
-        c.checkCastIntToCharAndBackError(nullptr, "func_name");
-        c.cstyleCastError(nullptr);
-        c.passedByValueError(nullptr, "parametername", false);
-        c.constVariableError(nullptr, nullptr);
-        c.constStatementError(nullptr, "type", false);
-        c.signedCharArrayIndexError(nullptr);
-        c.unknownSignCharArrayIndexError(nullptr);
-        c.charBitOpError(nullptr);
-        c.variableScopeError(nullptr,  "varname");
-        c.redundantAssignmentInSwitchError(nullptr, nullptr, "var");
-        c.suspiciousCaseInSwitchError(nullptr,  "||");
-        c.selfAssignmentError(nullptr,  "varname");
-        c.clarifyCalculationError(nullptr,  "+");
-        c.clarifyStatementError(nullptr);
-        c.duplicateBranchError(nullptr, nullptr, errorPath);
-        c.duplicateAssignExpressionError(nullptr, nullptr, true);
-        c.oppositeExpressionError(nullptr, errorPath);
-        c.duplicateExpressionError(nullptr, nullptr, nullptr, errorPath);
-        c.duplicateValueTernaryError(nullptr);
-        c.duplicateExpressionTernaryError(nullptr, errorPath);
-        c.duplicateBreakError(nullptr,  false);
-        c.unreachableCodeError(nullptr, nullptr,  false);
-        c.unsignedLessThanZeroError(nullptr, nullptr, "varname");
-        c.unsignedPositiveError(nullptr, nullptr, "varname");
-        c.pointerLessThanZeroError(nullptr, nullptr);
-        c.pointerPositiveError(nullptr, nullptr);
-        c.suspiciousSemicolonError(nullptr);
-        c.incompleteArrayFillError(nullptr,  "buffer", "memset", false);
-        c.varFuncNullUBError(nullptr);
-        c.nanInArithmeticExpressionError(nullptr);
-        c.commaSeparatedReturnError(nullptr);
-        c.redundantPointerOpError(nullptr,  "varname", false, /*addressOfDeref*/ true);
-        c.unusedLabelError(nullptr, false, false);
-        c.unusedLabelError(nullptr, false, true);
-        c.unusedLabelError(nullptr, true, false);
-        c.unusedLabelError(nullptr, true, true);
-        c.unknownEvaluationOrder(nullptr);
-        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.knownArgumentError(nullptr, nullptr, nullptr, "x", false);
-        c.comparePointersError(nullptr, nullptr, nullptr);
-        c.redundantAssignmentError(nullptr, nullptr, "var", false);
-        c.redundantInitializationError(nullptr, nullptr, "var", false);
-
-        const std::vector<const Token *> nullvec;
-        c.funcArgOrderDifferent("function", nullptr, nullptr, nullvec, nullvec);
-        c.checkModuloOfOneError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Other";
@@ -378,6 +288,7 @@ class CPPCHECKLIB CheckOther : public Check {
                // warning
                "- either division by zero or useless condition\n"
                "- access of moved or forwarded variable.\n"
+               "- potentially dangerous C style type cast of pointer/reference to object.\n"
 
                // performance
                "- redundant data copying for const variable\n"
@@ -386,6 +297,8 @@ class CPPCHECKLIB CheckOther : public Check {
 
                // portability
                "- Passing NULL pointer to function with variable number of arguments leads to UB.\n"
+               "- Casting non-zero integer literal in decimal or octal format to pointer.\n"
+               "- Incorrect zero initialization of unions can lead to access of uninitialized memory.\n"
 
                // style
                "- C-style pointer cast in C++ code\n"
@@ -419,6 +332,11 @@ class CPPCHECKLIB CheckOther : public Check {
                "- calculating modulo of one.\n"
                "- known function argument, suspicious calculation.\n";
     }
+
+    bool diag(const Token* tok) {
+        return !mRedundantAssignmentDiag.emplace(tok).second;
+    }
+    std::set<const Token*> mRedundantAssignmentDiag;
 };
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/checkpostfixoperator.cpp b/lib/checkpostfixoperator.cpp
index f491e58b2ee..c6c9ccba77b 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-2022 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
@@ -27,6 +27,7 @@
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
+#include "tokenize.h"
 
 #include <vector>
 
@@ -40,7 +41,7 @@ namespace {
 
 
 // CWE ids used
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
+static const CWE CWE398(398U);   // Indicator of Poor Code Quality
 
 
 void CheckPostfixOperator::postfixOperator()
@@ -48,6 +49,8 @@ void CheckPostfixOperator::postfixOperator()
     if (!mSettings->severity.isEnabled(Severity::performance))
         return;
 
+    logChecker("CheckPostfixOperator::postfixOperator"); // performance
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -61,7 +64,19 @@ void CheckPostfixOperator::postfixOperator()
                 if (var->isPointer() || var->isArray())
                     continue;
 
-                if (Token::Match(var->nameToken()->previous(), "iterator|const_iterator|reverse_iterator|const_reverse_iterator")) {
+                const Token* typeEndTok = var->typeStartToken();
+                if (Token::simpleMatch(typeEndTok, "::"))
+                    typeEndTok = typeEndTok->next();
+                while (Token::Match(typeEndTok, "%name% ::|<")) {
+                    if (typeEndTok->linkAt(1)) {
+                        typeEndTok = typeEndTok->linkAt(1)->next();
+                        if (Token::simpleMatch(typeEndTok, "::"))
+                            typeEndTok = typeEndTok->next();
+                    }
+                    else
+                        typeEndTok = typeEndTok->tokAt(2);
+                }
+                if (Token::Match(typeEndTok, "iterator|const_iterator|reverse_iterator|const_reverse_iterator")) {
                     // the variable is an iterator
                     postfixOperatorError(tok);
                 } else if (var->type()) {
@@ -85,3 +100,18 @@ void CheckPostfixOperator::postfixOperatorError(const Token *tok)
                 "involves keeping a copy of the previous value around and "
                 "adds a little extra code.", CWE398, Certainty::normal);
 }
+
+void CheckPostfixOperator::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    if (tokenizer.isC())
+        return;
+
+    CheckPostfixOperator checkPostfixOperator(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkPostfixOperator.postfixOperator();
+}
+
+void CheckPostfixOperator::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckPostfixOperator c(nullptr, settings, errorLogger);
+    c.postfixOperatorError(nullptr);
+}
diff --git a/lib/checkpostfixoperator.h b/lib/checkpostfixoperator.h
index 96aeec74578..c9f58a7e143 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-2022 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,13 +24,13 @@
 
 #include "check.h"
 #include "config.h"
-#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Settings;
 class Token;
+class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -40,33 +40,26 @@ class Token;
  */
 
 class CPPCHECKLIB CheckPostfixOperator : public Check {
+    friend class TestPostfixOperator;
+
 public:
     /** This constructor is used when registering the CheckPostfixOperator */
     CheckPostfixOperator() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (tokenizer->isC())
-            return;
-
-        CheckPostfixOperator checkPostfixOperator(tokenizer, settings, errorLogger);
-        checkPostfixOperator.postfixOperator();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** Check postfix operators */
     void postfixOperator();
 
-private:
     /** Report Error */
     void postfixOperatorError(const Token *tok);
 
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        CheckPostfixOperator c(nullptr, settings, errorLogger);
-        c.postfixOperatorError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Using postfix operators";
diff --git a/lib/checksizeof.cpp b/lib/checksizeof.cpp
index 220195401e2..15a1caf1a8e 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-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
@@ -21,6 +21,7 @@
 #include "checksizeof.h"
 
 #include "errortypes.h"
+#include "library.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
@@ -39,9 +40,8 @@ namespace {
 }
 
 // CWE IDs used:
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
-static const struct CWE CWE467(467U);   // Use of sizeof() on a Pointer Type
-static const struct CWE CWE682(682U);   // Incorrect Calculation
+static const CWE CWE467(467U);   // Use of sizeof() on a Pointer Type
+static const CWE CWE682(682U);   // Incorrect Calculation
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 void CheckSizeof::checkSizeofForNumericParameter()
@@ -49,6 +49,8 @@ void CheckSizeof::checkSizeofForNumericParameter()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckSizeof::checkSizeofForNumericParameter"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -76,6 +78,9 @@ void CheckSizeof::checkSizeofForArrayParameter()
 {
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
+
+    logChecker("CheckSizeof::checkSizeofForArrayParameter"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -115,6 +120,8 @@ void CheckSizeof::checkSizeofForPointerSize()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckSizeof::checkSizeofForPointerSize"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -229,7 +236,8 @@ void CheckSizeof::checkSizeofForPointerSize()
                 continue;
 
             // Now check for the sizeof usage: Does the level of pointer indirection match?
-            if (tokSize->linkAt(1)->strAt(-1) == "*") {
+            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)
                     sizeofForPointerError(variable, variable->str());
                 else if (variable2 && variable2->valueType() && variable2->valueType()->pointer == 1 && variable2->valueType()->type != ValueType::VOID)
@@ -281,6 +289,8 @@ void CheckSizeof::sizeofsizeof()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckSizeof::sizeofsizeof"); // warning
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::Match(tok, "sizeof (| sizeof")) {
             sizeofsizeofError(tok);
@@ -305,6 +315,8 @@ void CheckSizeof::sizeofCalculation()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckSizeof::sizeofCalculation"); // warning
+
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
 
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
@@ -314,7 +326,7 @@ void CheckSizeof::sizeofCalculation()
         // ignore if the `sizeof` result is cast to void inside a macro, i.e. the calculation is
         // expected to be parsed but skipped, such as in a disabled custom ASSERT() macro
         if (tok->isExpandedMacro() && tok->previous()) {
-            const Token *cast_end = (tok->previous()->str() == "(") ? tok->previous() : tok;
+            const Token *cast_end = (tok->strAt(-1) == "(") ? tok->previous() : tok;
             if (Token::simpleMatch(cast_end->tokAt(-3), "( void )") ||
                 Token::simpleMatch(cast_end->tokAt(-4), "static_cast < void >")) {
                 continue;
@@ -346,16 +358,18 @@ void CheckSizeof::sizeofCalculationError(const Token *tok, bool inconclusive)
 
 void CheckSizeof::sizeofFunction()
 {
-    if (!mSettings->severity.isEnabled(Severity::warning))
+    if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("sizeofFunctionCall"))
         return;
 
+    logChecker("CheckSizeof::sizeofFunction"); // warning
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
 
             // ignore if the `sizeof` result is cast to void inside a macro, i.e. the calculation is
             // expected to be parsed but skipped, such as in a disabled custom ASSERT() macro
             if (tok->isExpandedMacro() && tok->previous()) {
-                const Token *cast_end = (tok->previous()->str() == "(") ? tok->previous() : tok;
+                const Token *cast_end = (tok->strAt(-1) == "(") ? tok->previous() : tok;
                 if (Token::simpleMatch(cast_end->tokAt(-3), "( void )") ||
                     Token::simpleMatch(cast_end->tokAt(-4), "static_cast < void >")) {
                     continue;
@@ -365,7 +379,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,6 +404,8 @@ void CheckSizeof::suspiciousSizeofCalculation()
     if (!mSettings->severity.isEnabled(Severity::warning) || !mSettings->certainty.isEnabled(Certainty::inconclusive))
         return;
 
+    logChecker("CheckSizeof::suspiciousSizeofCalculation"); // warning,inconclusive
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
             const Token* lPar = tok->astParent();
@@ -432,6 +448,8 @@ void CheckSizeof::sizeofVoid()
     if (!mSettings->severity.isEnabled(Severity::portability))
         return;
 
+    logChecker("CheckSizeof::sizeofVoid"); // portability
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof ( void )")) {
             sizeofVoidError(tok);
@@ -483,3 +501,35 @@ void CheckSizeof::arithOperationsOnVoidPointerError(const Token* tok, const std:
     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)
+{
+    CheckSizeof checkSizeof(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    // Checks
+    checkSizeof.sizeofsizeof();
+    checkSizeof.sizeofCalculation();
+    checkSizeof.sizeofFunction();
+    checkSizeof.suspiciousSizeofCalculation();
+    checkSizeof.checkSizeofForArrayParameter();
+    checkSizeof.checkSizeofForPointerSize();
+    checkSizeof.checkSizeofForNumericParameter();
+    checkSizeof.sizeofVoid();
+}
+
+void CheckSizeof::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+{
+    CheckSizeof c(nullptr, settings, errorLogger);
+    c.sizeofForArrayParameterError(nullptr);
+    c.sizeofForPointerError(nullptr, "varname");
+    c.divideBySizeofError(nullptr, "memset");
+    c.sizeofForNumericParameterError(nullptr);
+    c.sizeofsizeofError(nullptr);
+    c.sizeofCalculationError(nullptr, false);
+    c.sizeofFunctionError(nullptr);
+    c.multiplySizeofError(nullptr);
+    c.divideSizeofError(nullptr);
+    c.sizeofVoidError(nullptr);
+    c.sizeofDereferencedVoidPointerError(nullptr, "varname");
+    c.arithOperationsOnVoidPointerError(nullptr, "varname", "vartype");
+}
diff --git a/lib/checksizeof.h b/lib/checksizeof.h
index ad853c619dd..4c10ca88dac 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-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
@@ -43,24 +43,13 @@ class CPPCHECKLIB CheckSizeof : public Check {
     /** @brief This constructor is used when registering the CheckClass */
     CheckSizeof() : Check(myName()) {}
 
+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, const Settings* settings, ErrorLogger* errorLogger) override {
-        CheckSizeof checkSizeof(tokenizer, settings, errorLogger);
-
-        // Checks
-        checkSizeof.sizeofsizeof();
-        checkSizeof.sizeofCalculation();
-        checkSizeof.sizeofFunction();
-        checkSizeof.suspiciousSizeofCalculation();
-        checkSizeof.checkSizeofForArrayParameter();
-        checkSizeof.checkSizeofForPointerSize();
-        checkSizeof.checkSizeofForNumericParameter();
-        checkSizeof.sizeofVoid();
-    }
+    void runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger) override;
 
     /** @brief %Check for 'sizeof sizeof ..' */
     void sizeofsizeof();
@@ -86,7 +75,6 @@ class CPPCHECKLIB CheckSizeof : public Check {
     /** @brief %Check for using sizeof(void) */
     void sizeofVoid();
 
-private:
     // Error messages..
     void sizeofsizeofError(const Token* tok);
     void sizeofCalculationError(const Token* tok, bool inconclusive);
@@ -101,21 +89,7 @@ class CPPCHECKLIB CheckSizeof : public Check {
     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 {
-        CheckSizeof c(nullptr, settings, errorLogger);
-        c.sizeofForArrayParameterError(nullptr);
-        c.sizeofForPointerError(nullptr, "varname");
-        c.divideBySizeofError(nullptr, "memset");
-        c.sizeofForNumericParameterError(nullptr);
-        c.sizeofsizeofError(nullptr);
-        c.sizeofCalculationError(nullptr, false);
-        c.sizeofFunctionError(nullptr);
-        c.multiplySizeofError(nullptr);
-        c.divideSizeofError(nullptr);
-        c.sizeofVoidError(nullptr);
-        c.sizeofDereferencedVoidPointerError(nullptr, "varname");
-        c.arithOperationsOnVoidPointerError(nullptr, "varname", "vartype");
-    }
+    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
 
     static std::string myName() {
         return "Sizeof";
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index e89eb254d61..c4827157988 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-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
@@ -30,18 +30,18 @@
 #include "tokenize.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include "checknullpointer.h"
 
 #include <algorithm>
-#include <cassert>
+#include <initializer_list>
 #include <iterator>
 #include <list>
 #include <map>
 #include <set>
 #include <sstream>
 #include <tuple>
-#include <type_traits>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@@ -52,20 +52,20 @@ namespace {
 }
 
 // CWE IDs used:
-static const struct CWE CWE398(398U);   // Indicator of Poor Code Quality
-static const struct CWE CWE597(597U);   // Use of Wrong Operator in String Comparison
-static const struct CWE CWE628(628U);   // Function Call with Incorrectly Specified Arguments
-static const struct CWE CWE664(664U);   // Improper Control of a Resource Through its Lifetime
-static const struct CWE CWE667(667U);   // Improper Locking
-static const struct CWE CWE704(704U);   // Incorrect Type Conversion or Cast
-static const struct CWE CWE762(762U);   // Mismatched Memory Management Routines
-static const struct CWE CWE786(786U);   // Access of Memory Location Before Start of Buffer
-static const struct CWE CWE788(788U);   // Access of Memory Location After End of Buffer
-static const struct CWE CWE825(825U);   // Expired Pointer Dereference
-static const struct CWE CWE833(833U);   // Deadlock
-static const struct CWE CWE834(834U);   // Excessive Iteration
-
-static bool isElementAccessYield(const Library::Container::Yield& yield)
+static const CWE CWE398(398U);   // Indicator of Poor Code Quality
+static const CWE CWE597(597U);   // Use of Wrong Operator in String Comparison
+static const CWE CWE628(628U);   // Function Call with Incorrectly Specified Arguments
+static const CWE CWE664(664U);   // Improper Control of a Resource Through its Lifetime
+static const CWE CWE667(667U);   // Improper Locking
+static const CWE CWE704(704U);   // Incorrect Type Conversion or Cast
+static const CWE CWE762(762U);   // Mismatched Memory Management Routines
+static const CWE CWE786(786U);   // Access of Memory Location Before Start of Buffer
+static const CWE CWE788(788U);   // Access of Memory Location After End of Buffer
+static const CWE CWE825(825U);   // Expired Pointer Dereference
+static const CWE CWE833(833U);   // Deadlock
+static const CWE CWE834(834U);   // Excessive Iteration
+
+static bool isElementAccessYield(Library::Container::Yield yield)
 {
     return contains({Library::Container::Yield::ITEM, Library::Container::Yield::AT_INDEX}, yield);
 }
@@ -75,6 +75,7 @@ static bool containerAppendsElement(const Library::Container* container, const T
     if (Token::Match(parent, ". %name% (")) {
         const Library::Container::Action action = container->getAction(parent->strAt(1));
         if (contains({Library::Container::Action::INSERT,
+                      Library::Container::Action::APPEND,
                       Library::Container::Action::CHANGE,
                       Library::Container::Action::CHANGE_INTERNAL,
                       Library::Container::Action::PUSH,
@@ -133,6 +134,8 @@ static const Token* getContainerFromSize(const Library::Container* container, co
 
 void CheckStl::outOfBounds()
 {
+    logChecker("CheckStl::outOfBounds");
+
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
         for (const Token *tok = function->bodyStart; tok != function->bodyEnd; tok = tok->next()) {
             const Library::Container *container = getLibraryContainer(tok);
@@ -177,7 +180,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())
@@ -200,7 +203,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";
@@ -230,21 +233,21 @@ void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerNa
         if (indexValue && indexValue->condition)
             errmsg = ValueFlow::eitherTheConditionIsRedundant(indexValue->condition) + " or '" + index +
                      "' can have the value " + indexValueString(*indexValue, containerName) + ". Expression '" +
-                     expression + "' cause access out of bounds.";
+                     expression + "' causes access out of bounds.";
         else
             errmsg = "Out of bounds access in expression '" + expression + "'";
     } else if (containerSize->intvalue == 0) {
         if (containerSize->condition)
-            errmsg = ValueFlow::eitherTheConditionIsRedundant(containerSize->condition) + " or expression '" + expression + "' cause access out of bounds.";
-        else if (indexValue == nullptr && !index.empty())
+            errmsg = ValueFlow::eitherTheConditionIsRedundant(containerSize->condition) + " or expression '" + expression + "' causes access out of bounds.";
+        else if (indexValue == nullptr && !index.empty() && tok->valueType() && tok->valueType()->type == ValueType::ITERATOR)
             errmsg = "Out of bounds access in expression '" + expression + "' because '$symbol' is empty and '" + index + "' may be non-zero.";
         else
             errmsg = "Out of bounds access in expression '" + expression + "' because '$symbol' is empty.";
     } else if (indexValue) {
         if (containerSize->condition)
-            errmsg = ValueFlow::eitherTheConditionIsRedundant(containerSize->condition) + " or $symbol size can be " + MathLib::toString(containerSize->intvalue) + ". Expression '" + expression + "' cause access out of bounds.";
+            errmsg = ValueFlow::eitherTheConditionIsRedundant(containerSize->condition) + " or size of '$symbol' can be " + MathLib::toString(containerSize->intvalue) + ". Expression '" + expression + "' causes access out of bounds.";
         else if (indexValue->condition)
-            errmsg = ValueFlow::eitherTheConditionIsRedundant(indexValue->condition) + " or '" + index + "' can have the value " + indexValueString(*indexValue) + ". Expression '" + expression + "' cause access out of bounds.";
+            errmsg = ValueFlow::eitherTheConditionIsRedundant(indexValue->condition) + " or '" + index + "' can have the value " + indexValueString(*indexValue) + ". Expression '" + expression + "' causes access out of bounds.";
         else
             errmsg = "Out of bounds access in '" + expression + "', if '$symbol' size is " + MathLib::toString(containerSize->intvalue) + " and '" + index + "' is " + indexValueString(*indexValue);
     } else {
@@ -259,16 +262,16 @@ void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerNa
         ErrorPath errorPath1 = getErrorPath(tok, containerSize, "Access out of bounds");
         ErrorPath errorPath2 = getErrorPath(tok, indexValue, "Access out of bounds");
         if (errorPath1.size() <= 1)
-            errorPath = errorPath2;
+            errorPath = std::move(errorPath2);
         else if (errorPath2.size() <= 1)
-            errorPath = errorPath1;
+            errorPath = std::move(errorPath1);
         else {
-            errorPath = errorPath1;
+            errorPath = std::move(errorPath1);
             errorPath.splice(errorPath.end(), errorPath2);
         }
     }
 
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 (containerSize && !containerSize->errorSeverity()) || (indexValue && !indexValue->errorSeverity()) ? Severity::warning : Severity::error,
                 "containerOutOfBounds",
                 "$symbol:" + containerName +"\n" + errmsg,
@@ -282,9 +285,9 @@ bool CheckStl::isContainerSize(const Token *containerToken, const Token *expr) c
         return false;
     if (!Token::Match(expr->astOperand1(), ". %name% ("))
         return false;
-    if (!isSameExpression(mTokenizer->isCPP(), false, containerToken, expr->astOperand1()->astOperand1(), mSettings->library, false, false))
+    if (!isSameExpression(false, containerToken, expr->astOperand1()->astOperand1(), *mSettings, false, false))
         return false;
-    return containerToken->valueType()->container->getYield(expr->previous()->str()) == Library::Container::Yield::SIZE;
+    return containerToken->valueType()->container->getYield(expr->strAt(-1)) == Library::Container::Yield::SIZE;
 }
 
 bool CheckStl::isContainerSizeGE(const Token * containerToken, const Token *expr) const
@@ -301,7 +304,7 @@ bool CheckStl::isContainerSizeGE(const Token * containerToken, const Token *expr
             mul = expr->astOperand1();
         else
             return false;
-        return mul && (!mul->hasKnownIntValue() || mul->values().front().intvalue != 0);
+        return mul && (!mul->hasKnownIntValue() || mul->getKnownIntValue() != 0);
     }
     if (expr->str() == "+") {
         const Token *op;
@@ -311,13 +314,14 @@ 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()
 {
+    logChecker("CheckStl::outOfBoundsIndexExpression");
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
         for (const Token *tok = function->bodyStart; tok != function->bodyEnd; tok = tok->next()) {
             if (!tok->isName() || !tok->valueType())
@@ -338,7 +342,7 @@ void CheckStl::outOfBoundsIndexExpression()
 void CheckStl::outOfBoundsIndexExpressionError(const Token *tok, const Token *index)
 {
     const std::string varname = tok ? tok->str() : std::string("var");
-    const std::string i = index ? index->expressionString() : std::string(varname + ".size()");
+    const std::string i = index ? index->expressionString() : (varname + ".size()");
 
     std::string errmsg = "Out of bounds access of $symbol, index '" + i + "' is out of bounds.";
 
@@ -366,15 +370,6 @@ 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)
 {
     std::list<const Token*> callstack = { tok, containerTok };
@@ -461,6 +456,8 @@ static bool isVector(const Token* tok)
 
 void CheckStl::iterators()
 {
+    logChecker("CheckStl::iterators");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Filling map of iterators id and their scope begin
@@ -484,7 +481,7 @@ void CheckStl::iterators()
         const int iteratorId = var->declarationId();
 
         // the validIterator flag says if the iterator has a valid value or not
-        bool validIterator = Token::Match(var->nameToken()->next(), "[(=:{]");
+        bool validIterator = Token::Match(var->nameToken()->next(), "[(=:{[]");
         const Scope* invalidationScope = nullptr;
 
         // The container this iterator can be used with
@@ -534,7 +531,7 @@ void CheckStl::iterators()
                         continue; // No warning
 
                     // skip error message if the iterator is erased/inserted by value
-                    if (itTok->previous()->str() == "*")
+                    if (itTok->strAt(-1) == "*")
                         continue;
 
                     // inserting iterator range..
@@ -642,14 +639,15 @@ void CheckStl::iterators()
     }
 }
 
-void CheckStl::mismatchingContainerIteratorError(const Token* tok, const Token* iterTok)
+void CheckStl::mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2)
 {
-    const std::string container(tok ? tok->expressionString() : std::string("v1"));
+    const std::string container(containerTok ? containerTok->expressionString() : std::string("v1"));
+    const std::string container2(containerTok2 ? containerTok2->expressionString() : std::string("v2"));
     const std::string iter(iterTok ? iterTok->expressionString() : std::string("it"));
-    reportError(tok,
+    reportError(containerTok,
                 Severity::error,
                 "mismatchingContainerIterator",
-                "Iterator '" + iter + "' from different container '" + container + "' are used together.",
+                "Iterator '" + iter + "' referring to container '" + container2 + "' is used with container '" + container + "'.",
                 CWE664,
                 Certainty::normal);
 }
@@ -681,35 +679,81 @@ void CheckStl::sameIteratorExpressionError(const Token *tok)
     reportError(tok, Severity::style, "sameIteratorExpression", "Same iterators expression are used for algorithm.", CWE664, Certainty::normal);
 }
 
-static const Token* getAddressContainer(const Token* tok)
+static std::vector<const Token*> getAddressContainer(const Token* tok)
 {
     if (Token::simpleMatch(tok, "[") && tok->astOperand1())
-        return tok->astOperand1();
-    return tok;
+        return { tok->astOperand1() };
+    while (Token::simpleMatch(tok, "::") && tok->astOperand2())
+        tok = tok->astOperand2();
+    std::vector<ValueFlow::Value> values = ValueFlow::getLifetimeObjValues(tok, /*inconclusive*/ false);
+    std::vector<const Token*> res;
+    for (const auto& v : values) {
+        if (v.tokvalue)
+            res.emplace_back(v.tokvalue);
+    }
+    if (res.empty())
+        res.emplace_back(tok);
+    return res;
 }
 
 static bool isSameIteratorContainerExpression(const Token* tok1,
                                               const Token* tok2,
-                                              const Library& library,
+                                              const Settings& settings,
                                               ValueFlow::Value::LifetimeKind kind = ValueFlow::Value::LifetimeKind::Iterator)
 {
-    if (isSameExpression(true, false, tok1, tok2, library, false, false)) {
-        return !astIsContainerOwned(tok1) || !isTemporary(true, tok1, &library);
+    if (isSameExpression(false, tok1, tok2, settings, false, false)) {
+        return !astIsContainerOwned(tok1) || !isTemporary(tok1, &settings.library);
     }
-    if (kind == ValueFlow::Value::LifetimeKind::Address) {
-        return isSameExpression(true, false, getAddressContainer(tok1), getAddressContainer(tok2), library, false, false);
+    if (astContainerYield(tok2, settings.library) == Library::Container::Yield::ITEM)
+        return true;
+    if (kind == ValueFlow::Value::LifetimeKind::Address || kind == ValueFlow::Value::LifetimeKind::Iterator) {
+        const auto address1 = getAddressContainer(tok1);
+        const auto address2 = getAddressContainer(tok2);
+        return std::any_of(address1.begin(), address1.end(), [&](const Token* tok1) {
+            return std::any_of(address2.begin(), address2.end(), [&](const Token* tok2) {
+                return isSameExpression(false, tok1, tok2, settings, false, false);
+            });
+        });
     }
     return false;
 }
 
+// First it groups the lifetimes together using std::partition with the lifetimes that refer to the same token or token of a subexpression.
+// Then it finds the lifetime in that group that refers to the "highest" parent using std::min_element and adds that to the vector.
+static std::vector<ValueFlow::Value> pruneLifetimes(std::vector<ValueFlow::Value> lifetimes)
+{
+    std::vector<ValueFlow::Value> result;
+    auto start = lifetimes.begin();
+    while (start != lifetimes.end())
+    {
+        const Token* tok1 = start->tokvalue;
+        auto it = std::partition(start, lifetimes.end(), [&](const ValueFlow::Value& v) {
+            const Token* tok2 = v.tokvalue;
+            return start->lifetimeKind == v.lifetimeKind && (astHasToken(tok1, tok2) || astHasToken(tok2, tok1));
+        });
+        auto root = std::min_element(start, it, [](const ValueFlow::Value& x, const ValueFlow::Value& y) {
+            return x.tokvalue != y.tokvalue && astHasToken(x.tokvalue, y.tokvalue);
+        });
+        result.push_back(*root);
+        start = it;
+    }
+    return result;
+}
+
 static ValueFlow::Value getLifetimeIteratorValue(const Token* tok, MathLib::bigint path = 0)
 {
-    std::vector<ValueFlow::Value> values = ValueFlow::getLifetimeObjValues(tok, false, path);
-    auto it = std::find_if(values.cbegin(), values.cend(), [](const ValueFlow::Value& v) {
-        return v.lifetimeKind == ValueFlow::Value::LifetimeKind::Iterator;
-    });
-    if (it != values.end())
-        return *it;
+    auto findIterVal = [](const std::vector<ValueFlow::Value>& values, const std::vector<ValueFlow::Value>::const_iterator beg) {
+        return std::find_if(beg, values.cend(), [](const ValueFlow::Value& v) {
+            return v.lifetimeKind == ValueFlow::Value::LifetimeKind::Iterator;
+        });
+    };
+    std::vector<ValueFlow::Value> values = pruneLifetimes(ValueFlow::getLifetimeObjValues(tok, false, path));
+    auto it = findIterVal(values, values.begin());
+    if (it != values.end()) {
+        auto it2 = findIterVal(values, it + 1);
+        if (it2 == values.cend())
+            return *it;
+    }
     if (values.size() == 1)
         return values.front();
     return ValueFlow::Value{};
@@ -733,7 +777,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->library, 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());
@@ -743,26 +787,34 @@ bool CheckStl::checkIteratorPair(const Token* tok1, const Token* tok2)
     }
 
     if (Token::Match(tok1->astParent(), "%comp%|-")) {
-        if (astIsIntegral(tok1, false) || astIsIntegral(tok2, false) || astIsFloat(tok1, false) ||
-            astIsFloat(tok2, false))
+        if (astIsIntegral(tok1, true) || astIsIntegral(tok2, true) ||
+            astIsFloat(tok1, true) || astIsFloat(tok2, true))
             return false;
     }
     const Token* iter1 = getIteratorExpression(tok1);
+    if (!iter1)
+        return false;
     const Token* iter2 = getIteratorExpression(tok2);
-    if (iter1 && iter2 && !isSameIteratorContainerExpression(iter1, iter2, mSettings->library)) {
+    if (!iter2)
+        return false;
+    if (!isSameIteratorContainerExpression(iter1, iter2, *mSettings)) {
         mismatchingContainerExpressionError(iter1, iter2);
         return true;
     }
     return false;
 }
 
-struct ArgIteratorInfo {
-    const Token* tok;
-    const Library::ArgumentChecks::IteratorInfo* info;
-};
+namespace {
+    struct ArgIteratorInfo {
+        const Token* tok;
+        const Library::ArgumentChecks::IteratorInfo* info;
+    };
+}
 
 void CheckStl::mismatchingContainers()
 {
+    logChecker("CheckStl::misMatchingContainers");
+
     // Check if different containers are used in various calls of standard functions
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -799,7 +851,7 @@ void CheckStl::mismatchingContainers()
                             if (iter1.tok == iter2.tok)
                                 continue;
                             if (iter1.info->first && iter2.info->last &&
-                                isSameExpression(true, false, iter1.tok, iter2.tok, mSettings->library, false, false))
+                                isSameExpression(false, iter1.tok, iter2.tok, *mSettings, false, false))
                                 sameIteratorExpressionError(iter1.tok);
                             if (checkIteratorPair(iter1.tok, iter2.tok))
                                 return;
@@ -821,6 +873,8 @@ void CheckStl::mismatchingContainers()
 
 void CheckStl::mismatchingContainerIterator()
 {
+    logChecker("CheckStl::misMatchingContainerIterator");
+
     // Check if different containers are used in various calls of standard functions
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -855,11 +909,15 @@ void CheckStl::mismatchingContainerIterator()
             ValueFlow::Value val = getLifetimeIteratorValue(iterTok);
             if (!val.tokvalue)
                 continue;
+            if (!val.isKnown() && Token::simpleMatch(val.tokvalue->astParent(), ":"))
+                continue;
             if (val.lifetimeKind != ValueFlow::Value::LifetimeKind::Iterator)
                 continue;
-            if (isSameIteratorContainerExpression(tok, val.tokvalue, mSettings->library))
+            if (iterTok->str() == "*" && iterTok->astOperand1()->valueType() && iterTok->astOperand1()->valueType()->type == ValueType::ITERATOR)
                 continue;
-            mismatchingContainerIteratorError(tok, iterTok);
+            if (isSameIteratorContainerExpression(tok, val.tokvalue, *mSettings))
+                continue;
+            mismatchingContainerIteratorError(tok, iterTok, val.tokvalue);
         }
     }
 }
@@ -905,102 +963,104 @@ static const Token* getInvalidMethod(const Token* tok)
     return nullptr;
 }
 
-struct InvalidContainerAnalyzer {
-    struct Info {
-        struct Reference {
-            const Token* tok;
-            ErrorPath errorPath;
-            const Token* ftok;
-        };
-        std::unordered_map<int, Reference> expressions;
-
-        void add(const std::vector<Reference>& refs) {
-            for (const Reference& r : refs) {
-                add(r);
+namespace {
+    struct InvalidContainerAnalyzer {
+        struct Info {
+            struct Reference {
+                const Token* tok;
+                ErrorPath errorPath;
+                const Token* ftok;
+            };
+            std::unordered_map<int, Reference> expressions;
+
+            void add(const std::vector<Reference>& refs) {
+                for (const Reference& r : refs) {
+                    add(r);
+                }
+            }
+            void add(const Reference& r) {
+                if (!r.tok)
+                    return;
+                expressions.emplace(r.tok->exprId(), r);
             }
-        }
-        void add(const Reference& r) {
-            if (!r.tok)
-                return;
-            expressions.insert(std::make_pair(r.tok->exprId(), r));
-        }
-
-        std::vector<Reference> invalidTokens() const {
-            std::vector<Reference> result;
-            std::transform(expressions.cbegin(), expressions.cend(), std::back_inserter(result), SelectMapValues{});
-            return result;
-        }
-    };
-    std::unordered_map<const Function*, Info> invalidMethods;
 
-    std::vector<Info::Reference> invalidatesContainer(const Token* tok) const {
-        std::vector<Info::Reference> result;
-        if (Token::Match(tok, "%name% (")) {
-            const Function* f = tok->function();
-            if (!f)
+            std::vector<Reference> invalidTokens() const {
+                std::vector<Reference> result;
+                std::transform(expressions.cbegin(), expressions.cend(), std::back_inserter(result), SelectMapValues{});
                 return result;
-            ErrorPathItem epi = std::make_pair(tok, "Calling function " + tok->str());
-            const bool dependsOnThis = exprDependsOnThis(tok->next());
-            auto it = invalidMethods.find(f);
-            if (it != invalidMethods.end()) {
-                std::vector<Info::Reference> refs = it->second.invalidTokens();
-                std::copy_if(refs.cbegin(), refs.cend(), std::back_inserter(result), [&](const Info::Reference& r) {
-                    const Variable* var = r.tok->variable();
-                    if (!var)
-                        return false;
-                    if (dependsOnThis && !var->isLocal() && !var->isGlobal() && !var->isStatic())
+            }
+        };
+        std::unordered_map<const Function*, Info> invalidMethods;
+
+        std::vector<Info::Reference> invalidatesContainer(const Token* tok) const {
+            std::vector<Info::Reference> result;
+            if (Token::Match(tok, "%name% (")) {
+                const Function* f = tok->function();
+                if (!f)
+                    return result;
+                ErrorPathItem epi = std::make_pair(tok, "Calling function " + tok->str());
+                const bool dependsOnThis = exprDependsOnThis(tok->next());
+                auto it = invalidMethods.find(f);
+                if (it != invalidMethods.end()) {
+                    std::vector<Info::Reference> refs = it->second.invalidTokens();
+                    std::copy_if(refs.cbegin(), refs.cend(), std::back_inserter(result), [&](const Info::Reference& r) {
+                        const Variable* var = r.tok->variable();
+                        if (!var)
+                            return false;
+                        if (dependsOnThis && !var->isLocal() && !var->isGlobal() && !var->isStatic())
+                            return true;
+                        if (!var->isArgument())
+                            return false;
+                        if (!var->isReference())
+                            return false;
                         return true;
-                    if (!var->isArgument())
-                        return false;
-                    if (!var->isReference())
-                        return false;
-                    return true;
-                });
-                std::vector<const Token*> args = getArguments(tok);
-                for (Info::Reference& r : result) {
-                    r.errorPath.push_front(epi);
-                    r.ftok = tok;
-                    const Variable* var = r.tok->variable();
-                    if (!var)
-                        continue;
-                    if (var->isArgument()) {
-                        const int n = getArgumentPos(var, f);
-                        const Token* tok2 = nullptr;
-                        if (n >= 0 && n < args.size())
-                            tok2 = args[n];
-                        r.tok = tok2;
+                    });
+                    std::vector<const Token*> args = getArguments(tok);
+                    for (Info::Reference& r : result) {
+                        r.errorPath.push_front(epi);
+                        r.ftok = tok;
+                        const Variable* var = r.tok->variable();
+                        if (!var)
+                            continue;
+                        if (var->isArgument()) {
+                            const int n = getArgumentPos(var, f);
+                            const Token* tok2 = nullptr;
+                            if (n >= 0 && n < args.size())
+                                tok2 = args[n];
+                            r.tok = tok2;
+                        }
                     }
                 }
+            } else if (astIsContainer(tok)) {
+                const Token* ftok = getInvalidMethod(tok);
+                if (ftok) {
+                    ErrorPath ep;
+                    ep.emplace_front(ftok,
+                                     "After calling '" + ftok->expressionString() +
+                                     "', iterators or references to the container's data may be invalid .");
+                    result.emplace_back(Info::Reference{tok, std::move(ep), ftok});
+                }
             }
-        } else if (astIsContainer(tok)) {
-            const Token* ftok = getInvalidMethod(tok);
-            if (ftok) {
-                ErrorPath ep;
-                ep.emplace_front(ftok,
-                                 "After calling '" + ftok->expressionString() +
-                                 "', iterators or references to the container's data may be invalid .");
-                result.emplace_back(Info::Reference{tok, ep, ftok});
-            }
+            return result;
         }
-        return result;
-    }
 
-    void analyze(const SymbolDatabase* symboldatabase) {
-        for (const Scope* scope : symboldatabase->functionScopes) {
-            const Function* f = scope->function;
-            if (!f)
-                continue;
-            for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
-                if (Token::Match(tok, "if|while|for|goto|return"))
-                    break;
-                std::vector<Info::Reference> c = invalidatesContainer(tok);
-                if (c.empty())
+        void analyze(const SymbolDatabase* symboldatabase) {
+            for (const Scope* scope : symboldatabase->functionScopes) {
+                const Function* f = scope->function;
+                if (!f)
                     continue;
-                invalidMethods[f].add(c);
+                for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
+                    if (Token::Match(tok, "if|while|for|goto|return"))
+                        break;
+                    std::vector<Info::Reference> c = invalidatesContainer(tok);
+                    if (c.empty())
+                        continue;
+                    invalidMethods[f].add(c);
+                }
             }
         }
-    }
-};
+    };
+}
 
 static const Token* getLoopContainer(const Token* tok)
 {
@@ -1031,10 +1091,13 @@ static const ValueFlow::Value* getInnerLifetime(const Token* tok,
             if (val.isInconclusive())
                 return nullptr;
             if (val.capturetok)
-                return getInnerLifetime(val.capturetok, id, errorPath, depth - 1);
+                if (const ValueFlow::Value* v = getInnerLifetime(val.capturetok, id, errorPath, depth - 1))
+                    return v;
             if (errorPath)
                 errorPath->insert(errorPath->end(), val.errorPath.cbegin(), val.errorPath.cend());
-            return getInnerLifetime(val.tokvalue, id, errorPath, depth - 1);
+            if (const ValueFlow::Value* v = getInnerLifetime(val.tokvalue, id, errorPath, depth - 1))
+                return v;
+            continue;
         }
         if (!val.tokvalue->variable())
             continue;
@@ -1062,14 +1125,14 @@ static const Token* endOfExpression(const Token* tok)
 
 void CheckStl::invalidContainer()
 {
+    logChecker("CheckStl::invalidContainer");
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
-    const Library& library = mSettings->library;
     InvalidContainerAnalyzer analyzer;
     analyzer.analyze(symbolDatabase);
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             if (const Token* contTok = getLoopContainer(tok)) {
-                const Token* blockStart = tok->next()->link()->next();
+                const Token* blockStart = tok->linkAt(1)->next();
                 const Token* blockEnd = blockStart->link();
                 if (contTok->exprId() == 0)
                     continue;
@@ -1085,7 +1148,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;
@@ -1116,7 +1179,7 @@ void CheckStl::invalidContainer()
                     const ValueFlow::Value* v = nullptr;
                     ErrorPath errorPath;
                     PathAnalysis::Info info =
-                        PathAnalysis{endToken, library}.forwardFind([&](const PathAnalysis::Info& info) {
+                        PathAnalysis{endToken}.forwardFind([&](const PathAnalysis::Info& info) {
                         if (!info.tok->variable())
                             return false;
                         if (info.tok->varId() == 0)
@@ -1128,18 +1191,23 @@ void CheckStl::invalidContainer()
                         if (Token::Match(info.tok->astParent(), "%assign%") && astIsLHS(info.tok))
                             skipVarIds.insert(info.tok->varId());
                         if (info.tok->variable()->isReference() && !isVariableDecl(info.tok) &&
-                            reaches(info.tok->variable()->nameToken(), tok, library, nullptr)) {
+                            reaches(info.tok->variable()->nameToken(), tok, nullptr)) {
+
+                            if ((assignExpr && Token::Match(assignExpr->astOperand1(), "& %varid%", info.tok->varId())) || // TODO: fix AST
+                                Token::Match(assignExpr, "& %varid% {|(", info.tok->varId())) {
+                                return false;
+                            }
 
                             ErrorPath ep;
                             bool addressOf = false;
-                            const Variable* var = ValueFlow::getLifetimeVariable(info.tok, ep, &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
                                 if (var->isArgument() ||
                                     (!var->isReference() && !var->isRValueReference() && !isVariableDecl(tok) &&
-                                     reaches(var->nameToken(), tok, library, &ep))) {
-                                    errorPath = ep;
+                                     reaches(var->nameToken(), tok, &ep))) {
+                                    errorPath = std::move(ep);
                                     return true;
                                 }
                             }
@@ -1147,9 +1215,9 @@ void CheckStl::invalidContainer()
                         ErrorPath ep;
                         const ValueFlow::Value* val = getInnerLifetime(info.tok, r.tok->varId(), &ep);
                         // Check the iterator is created before the change
-                        if (val && val->tokvalue != tok && reaches(val->tokvalue, tok, library, &ep)) {
+                        if (val && val->tokvalue != tok && reaches(val->tokvalue, tok, &ep)) {
                             v = val;
-                            errorPath = ep;
+                            errorPath = std::move(ep);
                             return true;
                         }
                         return false;
@@ -1159,9 +1227,9 @@ 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, errorPath);
+                        invalidContainerError(info.tok, r.tok, v, std::move(errorPath));
                     } else {
-                        invalidContainerReferenceError(info.tok, r.tok, errorPath);
+                        invalidContainerReferenceError(info.tok, r.tok, std::move(errorPath));
                     }
                 }
             }
@@ -1181,7 +1249,7 @@ 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)
@@ -1191,7 +1259,7 @@ void CheckStl::invalidContainerError(const Token *tok, const Token * /*contTok*/
         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)
@@ -1199,22 +1267,24 @@ void CheckStl::invalidContainerReferenceError(const Token* tok, const Token* con
     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()
 {
+    logChecker("CheckStl::stlOutOfBounds");
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Scan through all scopes..
     for (const Scope &scope : symbolDatabase->scopeList) {
         const Token* tok = scope.classDef;
         // only interested in conditions
-        if ((!scope.isLoopScope() && scope.type != Scope::eIf) || !tok)
+        if ((!scope.isLoopScope() && scope.type != ScopeType::eIf) || !tok)
             continue;
 
         const Token *condition = nullptr;
-        if (scope.type == Scope::eFor) {
+        if (scope.type == ScopeType::eFor) {
             if (Token::simpleMatch(tok->next()->astOperand2(), ";") && Token::simpleMatch(tok->next()->astOperand2()->astOperand2(), ";"))
                 condition = tok->next()->astOperand2()->astOperand2()->astOperand1();
         } else if (Token::simpleMatch(tok, "do {") && Token::simpleMatch(tok->linkAt(1), "} while ("))
@@ -1296,6 +1366,8 @@ void CheckStl::stlOutOfBoundsError(const Token *tok, const std::string &num, con
 
 void CheckStl::negativeIndex()
 {
+    logChecker("CheckStl::negativeIndex");
+
     // Negative index is out of bounds..
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -1308,7 +1380,7 @@ void CheckStl::negativeIndex()
             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);
@@ -1318,7 +1390,7 @@ void CheckStl::negativeIndex()
 
 void CheckStl::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)
@@ -1327,15 +1399,17 @@ 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()
 {
+    logChecker("CheckStl::erase");
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type == Scope::eFor && Token::simpleMatch(scope.classDef, "for (")) {
+        if (scope.type == ScopeType::eFor && Token::simpleMatch(scope.classDef, "for (")) {
             const Token *tok = scope.classDef->linkAt(1);
             if (!Token::Match(tok->tokAt(-3), "; ++| %var% ++| ) {"))
                 continue;
@@ -1343,7 +1417,7 @@ void CheckStl::erase()
             if (!tok->isName())
                 tok = tok->previous();
             eraseCheckLoopVar(scope, tok->variable());
-        } else if (scope.type == Scope::eWhile && Token::Match(scope.classDef, "while ( %var% !=")) {
+        } else if (scope.type == ScopeType::eWhile && Token::Match(scope.classDef, "while ( %var% !=")) {
             eraseCheckLoopVar(scope, scope.classDef->tokAt(2)->variable());
         }
     }
@@ -1395,6 +1469,8 @@ void CheckStl::eraseCheckLoopVar(const Scope &scope, const Variable *var)
 
 void CheckStl::stlBoundaries()
 {
+    logChecker("CheckStl::stlBoundaries");
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || !var->scope() || !var->scope()->isExecutable())
@@ -1452,10 +1528,12 @@ void CheckStl::if_find()
     if (!printWarning && !printPerformance)
         return;
 
+    logChecker("CheckStl::if_find"); // warning,performance
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if ((scope.type != Scope::eIf && scope.type != Scope::eWhile) || !scope.classDef)
+        if ((scope.type != ScopeType::eIf && scope.type != ScopeType::eWhile) || !scope.classDef)
             continue;
 
         const Token *conditionStart = scope.classDef->next();
@@ -1493,13 +1571,15 @@ void CheckStl::if_find()
                         for (int j = 0; j < container->type_templateArgNo; j++)
                             tok2 = tok2->nextTemplateArgument();
 
-                        container = mSettings->library.detectContainer(tok2); // innner container
+                        container = mSettings->library.detectContainer(tok2); // inner container
                     } else
                         container = nullptr;
                 }
             }
 
-            if (container && container->getAction(funcTok->str()) == Library::Container::Action::FIND) {
+            Library::Container::Action action{};
+            if (container &&
+                ((action = container->getAction(funcTok->str())) == Library::Container::Action::FIND || action == Library::Container::Action::FIND_CONST)) {
                 if (if_findCompare(funcTok->next(), container->stdStringLike))
                     continue;
 
@@ -1559,22 +1639,8 @@ static const Token* skipLocalVars(const Token* const tok)
     if (Token::simpleMatch(tok, "{"))
         return skipLocalVars(tok->next());
 
-    const Token *top = tok->astTop();
-    if (!top) {
-        const Token *semi = Token::findsimplematch(tok, ";");
-        if (!semi)
-            return tok;
-        if (!Token::Match(semi->previous(), "%var% ;"))
-            return tok;
-        const Token *varTok = semi->previous();
-        const Variable *var = varTok->variable();
-        if (!var)
-            return tok;
-        if (var->nameToken() != varTok)
-            return tok;
-        return skipLocalVars(semi->next());
-    }
     if (tok->isAssignmentOp()) {
+        const Token *top = tok->astTop();
         const Token *varTok = top->astOperand1();
         const Variable *var = varTok->variable();
         if (!var)
@@ -1589,7 +1655,7 @@ static const Token* skipLocalVars(const Token* const tok)
     return tok;
 }
 
-static const Token *findInsertValue(const Token *tok, const Token *containerTok, const Token *keyTok, const Library &library)
+static const Token *findInsertValue(const Token *tok, const Token *containerTok, const Token *keyTok, const Settings &settings)
 {
     const Token *startTok = skipLocalVars(tok);
     const Token *top = startTok->astTop();
@@ -1614,8 +1680,8 @@ static const Token *findInsertValue(const Token *tok, const Token *containerTok,
     }
     if (!ikeyTok || !icontainerTok)
         return nullptr;
-    if (isSameExpression(true, true, containerTok, icontainerTok, library, true, false) &&
-        isSameExpression(true, true, keyTok, ikeyTok, library, true, true)) {
+    if (isSameExpression(true, containerTok, icontainerTok, settings, true, false) &&
+        isSameExpression(true, keyTok, ikeyTok, settings, true, true)) {
         if (ivalueTok)
             return ivalueTok;
         return ikeyTok;
@@ -1628,12 +1694,14 @@ void CheckStl::checkFindInsert()
     if (!mSettings->severity.isEnabled(Severity::performance))
         return;
 
+    logChecker("CheckStl::checkFindInsert"); // performance
+
     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()) {
             if (!Token::simpleMatch(tok, "if ("))
                 continue;
-            if (!Token::simpleMatch(tok->next()->link(), ") {"))
+            if (!Token::simpleMatch(tok->linkAt(1), ") {"))
                 continue;
             if (!Token::Match(tok->next()->astOperand2(), "%comp%"))
                 continue;
@@ -1647,17 +1715,17 @@ void CheckStl::checkFindInsert()
             if (mSettings->standards.cpp < Standards::CPP17 && !(keyTok && keyTok->valueType() && (keyTok->valueType()->isIntegral() || keyTok->valueType()->pointer > 0)))
                 continue;
 
-            const Token *thenTok = tok->next()->link()->next();
-            const Token *valueTok = findInsertValue(thenTok, containerTok, keyTok, mSettings->library);
+            const Token *thenTok = tok->linkAt(1)->next();
+            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->library);
+                    findInsertValue(thenTok->link()->tokAt(2), containerTok, keyTok, *mSettings);
                 if (!valueTok2)
                     continue;
-                if (isSameExpression(true, true, valueTok, valueTok2, mSettings->library, true, true)) {
+                if (isSameExpression(true, valueTok, valueTok2, *mSettings, true, true)) {
                     checkFindInsertError(valueTok);
                 }
             } else {
@@ -1707,6 +1775,8 @@ void CheckStl::size()
     if (mSettings->standards.cpp >= Standards::CPP11)
         return;
 
+    logChecker("CheckStl::size"); // performance,c++03
+
     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()) {
@@ -1760,13 +1830,15 @@ void CheckStl::sizeError(const Token *tok)
 
 void CheckStl::redundantCondition()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("redundantIfRemove"))
         return;
 
+    logChecker("CheckStl::redundantCondition"); // style
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eIf)
+        if (scope.type != ScopeType::eIf)
             continue;
 
         const Token* tok = scope.classDef->tokAt(2);
@@ -1802,10 +1874,12 @@ void CheckStl::missingComparison()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckStl::missingComparison"); // warning
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eFor || !scope.classDef)
+        if (scope.type != ScopeType::eFor || !scope.classDef)
             continue;
 
         for (const Token *tok2 = scope.classDef->tokAt(2); tok2 != scope.bodyStart; tok2 = tok2->next()) {
@@ -1898,10 +1972,12 @@ void CheckStl::string_c_str()
 
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
 
+    logChecker("CheckStl::string_c_str");
+
     // Find all functions that take std::string as argument
     struct StrArg {
-        nonneg int n; // cppcheck-suppress unusedStructMember // FP used through iterator/pair
-        std::string argtype; // cppcheck-suppress unusedStructMember
+        nonneg int n;
+        std::string argtype;
     };
     std::multimap<const Function*, StrArg> c_strFuncParam;
     if (printPerformance) {
@@ -1929,10 +2005,10 @@ void CheckStl::string_c_str()
 
     // Try to detect common problems when using string::c_str()
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eFunction || !scope.function)
+        if (scope.type != ScopeType::eFunction || !scope.function)
             continue;
 
-        enum {charPtr, stdString, stdStringConstRef, Other} returnType = Other;
+        enum : std::uint8_t {charPtr, stdString, stdStringConstRef, Other} returnType = Other;
         if (Token::Match(scope.function->tokenDef->tokAt(-2), "char|wchar_t *"))
             returnType = charPtr;
         else if (Token::Match(scope.function->tokenDef->tokAt(-5), "const std :: string|wstring &"))
@@ -1977,7 +2053,7 @@ void CheckStl::string_c_str()
                     else
                         break;
                     if (!tok2 && j == i->second.n - 1)
-                        tok2 = tok->next()->link();
+                        tok2 = tok->linkAt(1);
                     else if (tok2)
                         tok2 = tok2->previous();
                     else
@@ -2006,7 +2082,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);
                 }
             }
@@ -2166,6 +2242,8 @@ void CheckStl::uselessCalls()
     if (!printPerformance && !printWarning)
         return;
 
+    logChecker("CheckStl::uselessCalls"); // performance,warning
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
@@ -2263,7 +2341,8 @@ void CheckStl::uselessCallsSubstrError(const Token *tok, SubstrErrorType type)
 
 void CheckStl::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);
 }
 
@@ -2288,15 +2367,17 @@ void CheckStl::checkDereferenceInvalidIterator()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckStl::checkDereferenceInvalidIterator"); // warning
+
     // Iterate over "if", "while", and "for" conditions where there may
     // be an iterator that is dereferenced before being checked for validity.
     for (const Scope &scope : mTokenizer->getSymbolDatabase()->scopeList) {
-        if (!(scope.type == Scope::eIf || scope.isLoopScope()))
+        if (!(scope.type == ScopeType::eIf || scope.isLoopScope()))
             continue;
 
         const Token* const tok = scope.classDef;
         const Token* startOfCondition = tok->next();
-        if (scope.type == Scope::eDo)
+        if (scope.type == ScopeType::eDo)
             startOfCondition = startOfCondition->link()->tokAt(2);
         if (!startOfCondition) // ticket #6626 invalid code
             continue;
@@ -2305,7 +2386,7 @@ void CheckStl::checkDereferenceInvalidIterator()
             continue;
 
         // For "for" loops, only search between the two semicolons
-        if (scope.type == Scope::eFor) {
+        if (scope.type == ScopeType::eFor) {
             startOfCondition = Token::findsimplematch(tok->tokAt(2), ";", endOfCondition);
             if (!startOfCondition)
                 continue;
@@ -2349,9 +2430,11 @@ void CheckStl::checkDereferenceInvalidIterator2()
 {
     const bool printInconclusive = (mSettings->certainty.isEnabled(Certainty::inconclusive));
 
+    logChecker("CheckStl::checkDereferenceInvalidIterator2");
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (Token::Match(tok, "sizeof|decltype|typeid|typeof (")) {
-            tok = tok->next()->link();
+            tok = tok->linkAt(1);
             continue;
         }
 
@@ -2405,7 +2488,7 @@ void CheckStl::checkDereferenceInvalidIterator2()
             if (cValue && cValue->intvalue == 0) {
                 if (Token::Match(tok->astParent(), "+|-") && astIsIntegral(tok->astSibling(), false)) {
                     if (tok->astSibling() && tok->astSibling()->hasKnownIntValue()) {
-                        if (tok->astSibling()->values().front().intvalue == 0)
+                        if (tok->astSibling()->getKnownIntValue() == 0)
                             continue;
                     } else {
                         advanceIndex = tok->astSibling();
@@ -2415,21 +2498,20 @@ void CheckStl::checkDereferenceInvalidIterator2()
                     emptyAdvance = tok->astParent();
                 }
             }
-            if (!CheckNullPointer::isPointerDeRef(tok, unknown, mSettings) && !isInvalidIterator && !emptyAdvance) {
+            if (!CheckNullPointer::isPointerDeRef(tok, unknown, *mSettings) && !isInvalidIterator && !emptyAdvance) {
                 if (!unknown)
                     continue;
                 inconclusive = true;
             }
             if (cValue) {
                 const ValueFlow::Value& lValue = getLifetimeIteratorValue(tok, cValue->path);
-                assert(cValue->isInconclusive() || value.isInconclusive() || lValue.isLifetimeValue());
                 if (!lValue.isLifetimeValue())
                     continue;
                 if (emptyAdvance)
                     outOfBoundsError(emptyAdvance,
                                      lValue.tokvalue->expressionString(),
                                      cValue,
-                                     advanceIndex ? advanceIndex->expressionString() : emptyString,
+                                     advanceIndex ? advanceIndex->expressionString() : "",
                                      nullptr);
                 else
                     outOfBoundsError(tok, lValue.tokvalue->expressionString(), cValue, tok->expressionString(), &value);
@@ -2452,17 +2534,16 @@ void CheckStl::dereferenceInvalidIteratorError(const Token* tok, const ValueFlow
     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;
-        errmsg = std::string(value->isKnown() ? "Dereference" : "Possible dereference") + " of an invalid iterator";
+        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,
@@ -2490,8 +2571,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)
@@ -2514,7 +2595,9 @@ static const Token *singleStatement(const Token *start)
     return endStatement;
 }
 
-static const Token *singleAssignInScope(const Token *start, nonneg int varid, bool &input, const Settings* settings)
+enum class LoopType : std::uint8_t { OTHER, RANGE, ITERATOR, INDEX };
+
+static const Token *singleAssignInScope(const Token *start, nonneg int varid, bool &input, bool &hasBreak, LoopType loopType, const Settings& settings)
 {
     const Token *endStatement = singleStatement(start);
     if (!endStatement)
@@ -2522,15 +2605,33 @@ static const Token *singleAssignInScope(const Token *start, nonneg int varid, bo
     if (!Token::Match(start->next(), "%var% %assign%"))
         return nullptr;
     const Token *assignTok = start->tokAt(2);
-    if (isVariableChanged(assignTok->next(), endStatement, assignTok->astOperand1()->varId(), /*globalvar*/ false, settings, /*cpp*/ true))
+    if (isVariableChanged(assignTok->next(), endStatement, assignTok->astOperand1()->varId(), /*globalvar*/ false, settings))
         return nullptr;
-    if (isVariableChanged(assignTok->next(), endStatement, varid, /*globalvar*/ false, settings, /*cpp*/ true))
+    if (isVariableChanged(assignTok->next(), endStatement, varid, /*globalvar*/ false, settings))
         return nullptr;
     input = Token::findmatch(assignTok->next(), "%varid%", endStatement, varid) || !Token::Match(start->next(), "%var% =");
+    hasBreak = Token::simpleMatch(endStatement->previous(), "break");
+
+    if (loopType == LoopType::INDEX) { // check for container access
+        nonneg int containerId{};
+        for (const Token* tok = assignTok->next(); tok != endStatement; tok = tok->next()) {
+            if (tok->varId() == varid) {
+                if (!Token::simpleMatch(tok->astParent(), "["))
+                    return nullptr;
+                const Token* contTok = tok->astParent()->astOperand1();
+                if (!contTok->valueType() || !contTok->valueType()->container || contTok->varId() == 0)
+                    return nullptr;
+                if (containerId > 0 && containerId != contTok->varId()) // allow only one container
+                    return nullptr;
+                containerId = contTok->varId();
+            }
+        }
+        return containerId > 0 ? assignTok : nullptr;
+    }
     return assignTok;
 }
 
-static const Token *singleMemberCallInScope(const Token *start, nonneg int varid, bool &input, const Settings* settings)
+static const Token *singleMemberCallInScope(const Token *start, nonneg int varid, bool &input, const Settings& settings)
 {
     if (start->str() != "{")
         return nullptr;
@@ -2547,7 +2648,7 @@ static const Token *singleMemberCallInScope(const Token *start, nonneg int varid
     if (!Token::findmatch(dotTok->tokAt(2), "%varid%", endStatement, varid))
         return nullptr;
     input = Token::Match(start->next(), "%var% . %name% ( %varid% )", varid);
-    if (isVariableChanged(dotTok->next(), endStatement, dotTok->astOperand1()->varId(), /*globalvar*/ false, settings, /*cpp*/ true))
+    if (isVariableChanged(dotTok->next(), endStatement, dotTok->astOperand1()->varId(), /*globalvar*/ false, settings))
         return nullptr;
     return dotTok;
 }
@@ -2567,7 +2668,7 @@ static const Token *singleIncrementInScope(const Token *start, nonneg int varid,
     return varTok;
 }
 
-static const Token *singleConditionalInScope(const Token *start, nonneg int varid, const Settings* settings)
+static const Token *singleConditionalInScope(const Token *start, nonneg int varid, LoopType loopType, const Settings& settings)
 {
     if (start->str() != "{")
         return nullptr;
@@ -2584,8 +2685,24 @@ static const Token *singleConditionalInScope(const Token *start, nonneg int vari
         return nullptr;
     if (!Token::findmatch(start, "%varid%", bodyTok, varid))
         return nullptr;
-    if (isVariableChanged(start, bodyTok, varid, /*globalvar*/ false, settings, /*cpp*/ true))
+    if (isVariableChanged(start, bodyTok, varid, /*globalvar*/ false, settings))
         return nullptr;
+    if (loopType == LoopType::INDEX) { // check for container access
+        nonneg int containerId{};
+        for (const Token* tok = start->tokAt(2); tok != start->linkAt(2); tok = tok->next()) {
+            if (tok->varId() == varid) {
+                if (!Token::simpleMatch(tok->astParent(), "["))
+                    return nullptr;
+                const Token* contTok = tok->astParent()->astOperand1();
+                if (!contTok->valueType() || !contTok->valueType()->container || contTok->varId() == 0)
+                    return nullptr;
+                if (containerId > 0 && containerId != contTok->varId()) // allow only one container
+                    return nullptr;
+                containerId = contTok->varId();
+            }
+        }
+        return containerId > 0 ? bodyTok : nullptr;
+    }
     return bodyTok;
 }
 
@@ -2650,11 +2767,9 @@ static std::string flipMinMax(const std::string &algo)
     return algo;
 }
 
-static std::string minmaxCompare(const Token *condTok, nonneg int loopVar, nonneg int assignVar, bool invert = false)
+static std::string minmaxCompare(const Token *condTok, nonneg int loopVar, nonneg int assignVar, LoopType loopType, bool invert = false)
 {
-    if (!Token::Match(condTok, "<|<=|>=|>"))
-        return "std::accumulate";
-    if (!hasVarIds(condTok, loopVar, assignVar))
+    if (loopType == LoopType::RANGE && !hasVarIds(condTok, loopVar, assignVar))
         return "std::accumulate";
     std::string algo = "std::max_element";
     if (Token::Match(condTok, "<|<="))
@@ -2666,15 +2781,47 @@ static std::string minmaxCompare(const Token *condTok, nonneg int loopVar, nonne
     return algo;
 }
 
+static bool isTernaryAssignment(const Token* assignTok, nonneg int loopVarId, nonneg int assignVarId, LoopType loopType, std::string& algo)
+{
+    if (!Token::simpleMatch(assignTok->astOperand2(), "?"))
+        return false;
+    const Token* condTok = assignTok->astOperand2()->astOperand1();
+    if (!Token::Match(condTok, "<|<=|>=|>"))
+        return false;
+
+    const Token* colon = assignTok->astOperand2()->astOperand2();
+    if (loopType == LoopType::RANGE) {
+        if (!(condTok->astOperand1()->varId() && condTok->astOperand2()->varId() && colon->astOperand1()->varId() && colon->astOperand2()->varId()))
+            return false;
+    }
+    else if (loopType == LoopType::INDEX) {
+        int nVar = 0, nCont = 0;
+        for (const Token* tok : { condTok->astOperand1(), condTok->astOperand2(), colon->astOperand1(), colon->astOperand2() }) {
+            if (tok->varId())
+                ++nVar;
+            else if (tok->str() == "[" && tok->astOperand1()->varId() && tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->container &&
+                     tok->astOperand2()->varId() == loopVarId)
+                ++nCont;
+        }
+        if (nVar != 2 || nCont != 2)
+            return false;
+    }
+    else
+        return false;
+
+    algo = minmaxCompare(condTok, loopVarId, assignVarId, loopType, colon->astOperand1()->varId() == assignVarId);
+    return true;
+}
+
 namespace {
     struct LoopAnalyzer {
         const Token* bodyTok = nullptr;
         const Token* loopVar = nullptr;
         const Settings* settings = nullptr;
-        std::set<nonneg int> varsChanged = {};
+        std::set<nonneg int> varsChanged;
 
         explicit LoopAnalyzer(const Token* tok, const Settings* psettings)
-            : bodyTok(tok->next()->link()->next()), settings(psettings)
+            : bodyTok(tok->linkAt(1)->next()), settings(psettings)
         {
             const Token* splitTok = tok->next()->astOperand2();
             if (Token::simpleMatch(splitTok, ":") && splitTok->previous()->varId() != 0) {
@@ -2695,11 +2842,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, *settings, &inconclusive))
                     return true;
                 if (inconclusive)
                     return true;
-                if (isVariableChanged(tok, i, settings, true))
+                if (isVariableChanged(tok, i, *settings))
                     return true;
             }
             return false;
@@ -2755,8 +2902,8 @@ namespace {
                         alwaysFalse = false;
                         return;
                     }
-                    (returnTok->values().front().intvalue ? alwaysTrue : alwaysFalse) &= true;
-                    (returnTok->values().front().intvalue ? alwaysFalse : alwaysTrue) &= false;
+                    (returnTok->getKnownIntValue() ? alwaysTrue : alwaysFalse) &= true;
+                    (returnTok->getKnownIntValue() ? alwaysFalse : alwaysTrue) &= false;
                 });
                 if (alwaysTrue == alwaysFalse)
                     return "";
@@ -2803,19 +2950,39 @@ namespace {
 
 void CheckStl::useStlAlgorithm()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("useStlAlgorithm"))
         return;
 
+    logChecker("CheckStl::useStlAlgorithm"); // style
+
     auto checkAssignee = [](const Token* tok) {
         if (astIsBool(tok)) // std::accumulate is not a good fit for bool values, std::all/any/none_of return early
             return false;
         return !astIsContainer(tok); // don't warn for containers, where overloaded operators can be costly
     };
 
-    auto isConditionWithoutSideEffects = [this](const Token* tok) -> bool {
+    enum class ConditionOpType : std::uint8_t { OTHER, MIN, MAX };
+    auto isConditionWithoutSideEffects = [this](const Token* tok, ConditionOpType& type) -> bool {
         if (!Token::simpleMatch(tok, "{") || !Token::simpleMatch(tok->previous(), ")"))
             return false;
-        return isConstExpression(tok->previous()->link()->astOperand2(), mSettings->library, true);
+        const Token* condTok = tok->linkAt(-1)->astOperand2();
+        if (isConstExpression(condTok, mSettings->library)) {
+            if (condTok->str() == "<")
+                type = ConditionOpType::MIN;
+            else if (condTok->str() == ">")
+                type = ConditionOpType::MAX;
+            else
+                type = ConditionOpType::OTHER;
+            return true;
+        }
+        return false;
+    };
+
+    auto isAccumulation = [](const Token* tok, int varId) {
+        if (tok->str() != "=")
+            return true;
+        const Token* end = Token::findmatch(tok, "%varid%|;", varId); // TODO: lambdas?
+        return end && end->varId() != 0;
     };
 
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
@@ -2823,7 +2990,7 @@ void CheckStl::useStlAlgorithm()
             // Parse range-based for loop
             if (!Token::simpleMatch(tok, "for ("))
                 continue;
-            if (!Token::simpleMatch(tok->next()->link(), ") {"))
+            if (!Token::simpleMatch(tok->linkAt(1), ") {"))
                 continue;
             LoopAnalyzer a{tok, mSettings};
             std::string algoName = a.findAlgo();
@@ -2832,14 +2999,17 @@ void CheckStl::useStlAlgorithm()
                 continue;
             }
 
-            const Token *bodyTok = tok->next()->link()->next();
+            const Token *bodyTok = tok->linkAt(1)->next();
             const Token *splitTok = tok->next()->astOperand2();
             const Token* loopVar{};
-            bool isIteratorLoop = false;
+            LoopType loopType{};
             if (Token::simpleMatch(splitTok, ":")) {
                 loopVar = splitTok->previous();
                 if (loopVar->varId() == 0)
                     continue;
+                if (Token::simpleMatch(splitTok->astOperand2(), "{"))
+                    continue;
+                loopType = LoopType::RANGE;
             }
             else { // iterator-based loop?
                 const Token* initTok = getInitTok(tok);
@@ -2848,18 +3018,19 @@ void CheckStl::useStlAlgorithm()
                 if (!initTok || !condTok || !stepTok)
                     continue;
                 loopVar = Token::Match(condTok, "%comp%") ? condTok->astOperand1() : nullptr;
-                if (!Token::Match(loopVar, "%var%") || !loopVar->valueType() || loopVar->valueType()->type != ValueType::Type::ITERATOR)
+                if (!Token::Match(loopVar, "%var%") || !loopVar->valueType() ||
+                    (loopVar->valueType()->type != ValueType::Type::ITERATOR && !loopVar->valueType()->isIntegral()))
                     continue;
                 if (!Token::simpleMatch(initTok, "=") || !Token::Match(initTok->astOperand1(), "%varid%", loopVar->varId()))
                     continue;
                 if (!stepTok->isIncDecOp())
                     continue;
-                isIteratorLoop = true;
+                loopType = (loopVar->valueType()->type == ValueType::Type::ITERATOR) ? LoopType::ITERATOR : LoopType::INDEX;
             }
 
             // Check for single assignment
-            bool useLoopVarInAssign;
-            const Token *assignTok = singleAssignInScope(bodyTok, loopVar->varId(), useLoopVarInAssign, mSettings);
+            bool useLoopVarInAssign{}, hasBreak{};
+            const Token *assignTok = singleAssignInScope(bodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, *mSettings);
             if (assignTok) {
                 if (!checkAssignee(assignTok->astOperand1()))
                     continue;
@@ -2879,18 +3050,20 @@ void CheckStl::useStlAlgorithm()
                         algo = "std::distance";
                     else if (accumulateBool(assignTok, assignVarId))
                         algo = "std::any_of, std::all_of, std::none_of, or std::accumulate";
-                    else if (Token::Match(assignTok, "= %var% <|<=|>=|> %var% ? %var% : %var%") && hasVarIds(assignTok->tokAt(6), loopVar->varId(), assignVarId))
-                        algo = minmaxCompare(assignTok->tokAt(2), loopVar->varId(), assignVarId, assignTok->tokAt(5)->varId() == assignVarId);
-                    else
+                    else if (isTernaryAssignment(assignTok, loopVar->varId(), assignVarId, loopType, algo))
+                        ;
+                    else if (isAccumulation(assignTok, assignVarId))
                         algo = "std::accumulate";
+                    else
+                        continue;
                 }
                 useStlAlgorithmError(assignTok, algo);
                 continue;
             }
             // Check for container calls
             bool useLoopVarInMemCall;
-            const Token *memberAccessTok = singleMemberCallInScope(bodyTok, loopVar->varId(), useLoopVarInMemCall, mSettings);
-            if (memberAccessTok && !isIteratorLoop) {
+            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())
@@ -2922,10 +3095,10 @@ void CheckStl::useStlAlgorithm()
             }
 
             // Check for conditionals
-            const Token *condBodyTok = singleConditionalInScope(bodyTok, loopVar->varId(), mSettings);
+            const Token *condBodyTok = singleConditionalInScope(bodyTok, loopVar->varId(), loopType, *mSettings);
             if (condBodyTok) {
                 // Check for single assign
-                assignTok = singleAssignInScope(condBodyTok, loopVar->varId(), useLoopVarInAssign, mSettings);
+                assignTok = singleAssignInScope(condBodyTok, loopVar->varId(), useLoopVarInAssign, hasBreak, loopType, *mSettings);
                 if (assignTok) {
                     if (!checkAssignee(assignTok->astOperand1()))
                         continue;
@@ -2937,14 +3110,27 @@ void CheckStl::useStlAlgorithm()
                         else
                             algo = "std::replace_if";
                     } else {
+                        ConditionOpType type{};
                         if (addByOne(assignTok, assignVarId))
                             algo = "std::count_if";
                         else if (accumulateBoolLiteral(assignTok, assignVarId))
                             algo = "std::any_of, std::all_of, std::none_of, or std::accumulate";
                         else if (assignTok->str() != "=")
                             algo = "std::accumulate";
-                        else if (isConditionWithoutSideEffects(condBodyTok))
-                            algo = "std::any_of, std::all_of, std::none_of";
+                        else if (isConditionWithoutSideEffects(condBodyTok, type)) {
+                            if (hasBreak)
+                                algo = "std::any_of, std::all_of, std::none_of";
+                            else if (assignTok->astOperand2()->varId() == loopVar->varId()) {
+                                if (type == ConditionOpType::MIN)
+                                    algo = "std::min_element";
+                                else if (type == ConditionOpType::MAX)
+                                    algo = "std::max_element";
+                                else
+                                    continue;
+                            }
+                            else
+                                continue;
+                        }
                         else
                             continue;
                     }
@@ -2953,7 +3139,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();
@@ -2986,7 +3172,7 @@ void CheckStl::useStlAlgorithm()
                     const Token *loopVar2 = Token::findmatch(condBodyTok, "%varid%", condBodyTok->link(), loopVar->varId());
                     std::string algo;
                     if (loopVar2 ||
-                        (isIteratorLoop && loopVar->variable() && precedes(loopVar->variable()->nameToken(), tok))) // iterator declared outside the loop
+                        (loopType == LoopType::ITERATOR && loopVar->variable() && precedes(loopVar->variable()->nameToken(), tok))) // iterator declared outside the loop
                         algo = "std::find_if";
                     else
                         algo = "std::any_of";
@@ -3031,8 +3217,9 @@ static bool isKnownEmptyContainer(const Token* tok)
 
 void CheckStl::knownEmptyContainer()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("knownEmptyContainer"))
         return;
+    logChecker("CheckStl::knownEmptyContainer"); // style
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
         for (const Token *tok = function->bodyStart; tok != function->bodyEnd; tok = tok->next()) {
 
@@ -3041,7 +3228,7 @@ void CheckStl::knownEmptyContainer()
 
             // Parse range-based for loop
             if (tok->str() == "for") {
-                if (!Token::simpleMatch(tok->next()->link(), ") {"))
+                if (!Token::simpleMatch(tok->linkAt(1), ") {"))
                     continue;
                 const Token *splitTok = tok->next()->astOperand2();
                 if (!Token::simpleMatch(splitTok, ":"))
@@ -3049,7 +3236,7 @@ void CheckStl::knownEmptyContainer()
                 const Token* contTok = splitTok->astOperand2();
                 if (!isKnownEmptyContainer(contTok))
                     continue;
-                knownEmptyContainerError(contTok, emptyString);
+                knownEmptyContainerError(contTok, "");
             } else {
                 const std::vector<const Token *> args = getArguments(tok);
                 if (args.empty())
@@ -3071,6 +3258,77 @@ void CheckStl::knownEmptyContainer()
     }
 }
 
+void CheckStl::eraseIteratorOutOfBoundsError(const Token *ftok, const Token* itertok, const ValueFlow::Value* val)
+{
+    if (!ftok || !itertok || !val) {
+        reportError(ftok, Severity::error, "eraseIteratorOutOfBounds",
+                    "Calling function 'erase()' on the iterator 'iter' which is out of bounds.", CWE628, Certainty::normal);
+        reportError(ftok, Severity::warning, "eraseIteratorOutOfBoundsCond",
+                    "Either the condition 'x' is redundant or function 'erase()' is called on the iterator 'iter' which is out of bounds.", CWE628, Certainty::normal);
+        return;
+    }
+    const std::string& func = ftok->str();
+    const std::string iter = itertok->expressionString();
+
+    const bool isConditional = val->isPossible();
+    std::string msg;
+    if (isConditional) {
+        msg = ValueFlow::eitherTheConditionIsRedundant(val->condition) + " or function '" + func + "()' is called on the iterator '" + iter + "' which is out of bounds.";
+    } else {
+        msg = "Calling function '" + func + "()' on the iterator '" + iter + "' which is out of bounds.";
+    }
+
+    const Severity severity = isConditional ? Severity::warning : Severity::error;
+    const std::string id = isConditional ? "eraseIteratorOutOfBoundsCond" : "eraseIteratorOutOfBounds";
+    reportError(ftok, severity,
+                id,
+                msg, CWE628, Certainty::normal);
+}
+
+static const ValueFlow::Value* getOOBIterValue(const Token* tok, const ValueFlow::Value* sizeVal)
+{
+    auto it = std::find_if(tok->values().begin(), tok->values().end(), [&](const ValueFlow::Value& v) {
+        if (v.isPossible() || v.isKnown()) {
+            switch (v.valueType) {
+            case ValueFlow::Value::ValueType::ITERATOR_END:
+                return v.intvalue >= 0;
+            case ValueFlow::Value::ValueType::ITERATOR_START:
+                return (v.intvalue < 0) || (sizeVal && v.intvalue >= sizeVal->intvalue);
+            default:
+                break;
+            }
+        }
+        return false;
+    });
+    return it != tok->values().end() ? &*it : nullptr;
+}
+
+void CheckStl::eraseIteratorOutOfBounds()
+{
+    logChecker("CheckStl::eraseIteratorOutOfBounds");
+    for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
+        for (const Token *tok = function->bodyStart; tok != function->bodyEnd; tok = tok->next()) {
+
+            if (!tok->valueType())
+                continue;
+            const Library::Container* container = tok->valueType()->container;
+            if (!container || !astIsLHS(tok) || !Token::simpleMatch(tok->astParent(), "."))
+                continue;
+            const Token* const ftok = tok->astParent()->astOperand2();
+            const Library::Container::Action action = container->getAction(ftok->str());
+            if (action != Library::Container::Action::ERASE)
+                continue;
+            const std::vector<const Token*> args = getArguments(ftok);
+            if (args.size() != 1) // TODO: check range overload
+                continue;
+
+            const ValueFlow::Value* sizeVal = tok->getKnownValue(ValueFlow::Value::ValueType::CONTAINER_SIZE);
+            if (const ValueFlow::Value* errVal = getOOBIterValue(args[0], sizeVal))
+                eraseIteratorOutOfBoundsError(ftok, args[0], errVal);
+        }
+    }
+}
+
 static bool isMutex(const Variable* var)
 {
     const Token* tok = Token::typeDecl(var->nameToken()).first;
@@ -3110,7 +3368,7 @@ void CheckStl::checkMutexes()
 {
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
-
+    logChecker("CheckStl::checkMutexes"); // warning
     for (const Scope *function : mTokenizer->getSymbolDatabase()->functionScopes) {
         std::set<nonneg int> checkedVars;
         for (const Token *tok = function->bodyStart; tok != function->bodyEnd; tok = tok->next()) {
@@ -3143,3 +3401,87 @@ void CheckStl::checkMutexes()
     }
 }
 
+void CheckStl::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    if (!tokenizer.isCPP()) {
+        return;
+    }
+
+    CheckStl checkStl(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkStl.erase();
+    checkStl.if_find();
+    checkStl.checkFindInsert();
+    checkStl.iterators();
+    checkStl.missingComparison();
+    checkStl.outOfBounds();
+    checkStl.outOfBoundsIndexExpression();
+    checkStl.redundantCondition();
+    checkStl.string_c_str();
+    checkStl.uselessCalls();
+    checkStl.useStlAlgorithm();
+
+    checkStl.stlOutOfBounds();
+    checkStl.negativeIndex();
+
+    checkStl.invalidContainer();
+    checkStl.mismatchingContainers();
+    checkStl.mismatchingContainerIterator();
+    checkStl.knownEmptyContainer();
+    checkStl.eraseIteratorOutOfBounds();
+
+    checkStl.stlBoundaries();
+    checkStl.checkDereferenceInvalidIterator();
+    checkStl.checkDereferenceInvalidIterator2();
+    checkStl.checkMutexes();
+
+    // Style check
+    checkStl.size();
+}
+
+void CheckStl::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+{
+    CheckStl c(nullptr, settings, errorLogger);
+    c.outOfBoundsError(nullptr, "container", nullptr, "x", nullptr);
+    c.invalidIteratorError(nullptr, "iterator");
+    c.iteratorsError(nullptr, "container1", "container2");
+    c.iteratorsError(nullptr, nullptr, "container");
+    c.invalidContainerLoopError(nullptr, nullptr, ErrorPath{});
+    c.invalidContainerError(nullptr, nullptr, nullptr, ErrorPath{});
+    c.invalidContainerReferenceError(nullptr, nullptr, ErrorPath{});
+    c.mismatchingContainerIteratorError(nullptr, nullptr, nullptr);
+    c.mismatchingContainersError(nullptr, nullptr);
+    c.mismatchingContainerExpressionError(nullptr, nullptr);
+    c.sameIteratorExpressionError(nullptr);
+    c.dereferenceErasedError(nullptr, nullptr, "iter", false);
+    c.stlOutOfBoundsError(nullptr, "i", "foo", false);
+    c.negativeIndexError(nullptr, ValueFlow::Value(-1));
+    c.stlBoundariesError(nullptr);
+    c.if_findError(nullptr, false);
+    c.if_findError(nullptr, true);
+    c.checkFindInsertError(nullptr);
+    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.uselessCallsConstructorError(nullptr);
+    c.uselessCallsEmptyError(nullptr);
+    c.uselessCallsRemoveError(nullptr, "remove");
+    c.dereferenceInvalidIteratorError(nullptr, "i");
+    // TODO: derefInvalidIteratorRedundantCheck
+    c.eraseIteratorOutOfBoundsError(nullptr, nullptr);
+    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 0fd1dac0a4a..60b9d4c7000 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-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,9 +25,8 @@
 #include "check.h"
 #include "config.h"
 #include "errortypes.h"
-#include "tokenize.h"
-#include "vfvalue.h"
 
+#include <cstdint>
 #include <string>
 
 class Scope;
@@ -35,7 +34,11 @@ class Settings;
 class Token;
 class Variable;
 class ErrorLogger;
-
+class Tokenizer;
+namespace ValueFlow
+{
+    class Value;
+}
 
 /// @addtogroup Checks
 /// @{
@@ -47,45 +50,13 @@ class CPPCHECKLIB CheckStl : public Check {
     /** This constructor is used when registering the CheckClass */
     CheckStl() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (!tokenizer->isCPP()) {
-            return;
-        }
-
-        CheckStl checkStl(tokenizer, settings, errorLogger);
-        checkStl.erase();
-        checkStl.if_find();
-        checkStl.checkFindInsert();
-        checkStl.iterators();
-        checkStl.missingComparison();
-        checkStl.outOfBounds();
-        checkStl.outOfBoundsIndexExpression();
-        checkStl.redundantCondition();
-        checkStl.string_c_str();
-        checkStl.uselessCalls();
-        checkStl.useStlAlgorithm();
-
-        checkStl.stlOutOfBounds();
-        checkStl.negativeIndex();
-
-        checkStl.invalidContainer();
-        checkStl.mismatchingContainers();
-        checkStl.mismatchingContainerIterator();
-        checkStl.knownEmptyContainer();
-
-        checkStl.stlBoundaries();
-        checkStl.checkDereferenceInvalidIterator();
-        checkStl.checkDereferenceInvalidIterator2();
-        checkStl.checkMutexes();
-
-        // Style check
-        checkStl.size();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** Accessing container out of bounds using ValueFlow */
     void outOfBounds();
@@ -182,9 +153,10 @@ class CPPCHECKLIB CheckStl : public Check {
 
     void knownEmptyContainer();
 
+    void eraseIteratorOutOfBounds();
+
     void checkMutexes();
 
-private:
     bool isContainerSize(const Token *containerToken, const Token *expr) const;
     bool isContainerSizeGE(const Token * containerToken, const Token *expr) const;
 
@@ -204,9 +176,8 @@ 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* tok, const Token* iterTok);
+    void mismatchingContainerIteratorError(const Token* containerTok, const Token* iterTok, const Token* containerTok2);
     void mismatchingContainersError(const Token* tok1, const Token* tok2);
     void mismatchingContainerExpressionError(const Token *tok1, const Token *tok2);
     void sameIteratorExpressionError(const Token *tok);
@@ -221,7 +192,7 @@ class CPPCHECKLIB CheckStl : public Check {
 
     void uselessCallsReturnValueError(const Token* tok, const std::string& varname, const std::string& function);
     void uselessCallsSwapError(const Token* tok, const std::string& varname);
-    enum class SubstrErrorType { EMPTY, COPY, PREFIX, PREFIX_CONCAT };
+    enum class SubstrErrorType : std::uint8_t { EMPTY, COPY, PREFIX, PREFIX_CONCAT };
     void uselessCallsSubstrError(const Token* tok, SubstrErrorType type);
     void uselessCallsEmptyError(const Token* tok);
     void uselessCallsRemoveError(const Token* tok, const std::string& function);
@@ -234,48 +205,12 @@ class CPPCHECKLIB CheckStl : public Check {
 
     void knownEmptyContainerError(const Token *tok, const std::string& algo);
 
+    void eraseIteratorOutOfBoundsError(const Token* ftok, const Token* itertok, const ValueFlow::Value* val = nullptr);
+
     void globalLockGuardError(const Token *tok);
     void localMutexError(const Token *tok);
 
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override {
-        ErrorPath errorPath;
-        CheckStl 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.mismatchingContainerIteratorError(nullptr, nullptr);
-        c.mismatchingContainersError(nullptr, nullptr);
-        c.mismatchingContainerExpressionError(nullptr, nullptr);
-        c.sameIteratorExpressionError(nullptr);
-        c.dereferenceErasedError(nullptr, nullptr, "iter", false);
-        c.stlOutOfBoundsError(nullptr, "i", "foo", false);
-        c.negativeIndexError(nullptr, ValueFlow::Value(-1));
-        c.stlBoundariesError(nullptr);
-        c.if_findError(nullptr, false);
-        c.if_findError(nullptr, true);
-        c.checkFindInsertError(nullptr);
-        c.string_c_strError(nullptr);
-        c.string_c_strReturn(nullptr);
-        c.string_c_strParam(nullptr, 0);
-        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.uselessCallsEmptyError(nullptr);
-        c.uselessCallsRemoveError(nullptr, "remove");
-        c.dereferenceInvalidIteratorError(nullptr, "i");
-        c.useStlAlgorithmError(nullptr, emptyString);
-        c.knownEmptyContainerError(nullptr, emptyString);
-        c.globalLockGuardError(nullptr);
-        c.localMutexError(nullptr);
-    }
+    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
 
     static std::string myName() {
         return "STL usage";
@@ -296,6 +231,7 @@ class CPPCHECKLIB CheckStl : public Check {
                "- 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"
diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp
index cd6617abbd0..64b575df72d 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-2022 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
@@ -42,24 +42,25 @@ namespace {
 }
 
 // CWE ids used:
-static const struct CWE CWE570(570U);   // Expression is Always False
-static const struct CWE CWE571(571U);   // Expression is Always True
-static const struct CWE CWE595(595U);   // Comparison of Object References Instead of Object Contents
-static const struct CWE CWE628(628U);   // Function Call with Incorrectly Specified Arguments
-static const struct CWE CWE665(665U);   // Improper Initialization
-static const struct CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
+static const CWE CWE570(570U);   // Expression is Always False
+static const CWE CWE571(571U);   // Expression is Always True
+static const CWE CWE595(595U);   // Comparison of Object References Instead of Object Contents
+static const CWE CWE628(628U);   // Function Call with Incorrectly Specified Arguments
+static const CWE CWE665(665U);   // Improper Initialization
+static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
 
 //---------------------------------------------------------------------------
 // Writing string literal is UB
 //---------------------------------------------------------------------------
 void CheckString::stringLiteralWrite()
 {
+    logChecker("CheckString::stringLiteralWrite");
     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 (!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), "] ="))
@@ -72,8 +73,7 @@ void CheckString::stringLiteralWrite()
 
 void CheckString::stringLiteralWriteError(const Token *tok, const Token *strValue)
 {
-    std::list<const Token *> callstack;
-    callstack.push_back(tok);
+    std::list<const Token*> callstack{ tok };
     if (strValue)
         callstack.push_back(strValue);
 
@@ -99,8 +99,10 @@ void CheckString::checkAlwaysTrueOrFalseStringCompare()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckString::checkAlwaysTrueOrFalseStringCompare"); // warning
+
     for (const Token* tok = mTokenizer->tokens(); tok; tok = tok->next()) {
-        if (tok->isName() && tok->strAt(1) == "(" && Token::Match(tok, "memcmp|strncmp|strcmp|stricmp|strverscmp|bcmp|strcmpi|strcasecmp|strncasecmp|strncasecmp_l|strcasecmp_l|wcsncasecmp|wcscasecmp|wmemcmp|wcscmp|wcscasecmp_l|wcsncasecmp_l|wcsncmp|_mbscmp|_mbscmp_l|_memicmp|_memicmp_l|_stricmp|_wcsicmp|_mbsicmp|_stricmp_l|_wcsicmp_l|_mbsicmp_l")) {
+        if (tok->isName() && tok->strAt(1) == "(" && Token::Match(tok, "memcmp|strncmp|strcmp|stricmp|strverscmp|bcmp|strcmpi|strcasecmp|strncasecmp|strncasecmp_l|strcasecmp_l|wcsncasecmp|wcscasecmp|wmemcmp|wcscmp|wcscasecmp_l|wcsncasecmp_l|wcsncmp|_mbscmp|_mbscmp_l|_memicmp|_memicmp_l|_stricmp|_wcsicmp|wcsicmp|_mbsicmp|_stricmp_l|_wcsicmp_l|_mbsicmp_l")) {
             if (Token::Match(tok->tokAt(2), "%str% , %str% ,|)")) {
                 const std::string &str1 = tok->strAt(2);
                 const std::string &str2 = tok->strAt(4);
@@ -138,7 +140,7 @@ void CheckString::checkAlwaysTrueOrFalseStringCompare()
 
 void CheckString::alwaysTrueFalseStringCompareError(const Token *tok, const std::string& str1, const std::string& str2)
 {
-    const std::size_t stringLen = 10;
+    constexpr std::size_t stringLen = 10;
     const std::string string1 = (str1.size() < stringLen) ? str1 : (str1.substr(0, stringLen-2) + "..");
     const std::string string2 = (str2.size() < stringLen) ? str2 : (str2.substr(0, stringLen-2) + "..");
 
@@ -166,6 +168,8 @@ void CheckString::checkSuspiciousStringCompare()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckString::checkSuspiciousStringCompare"); // warning
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -185,11 +189,11 @@ void CheckString::checkSuspiciousStringCompare()
                 continue;
 
             const ValueType* varType = varTok->valueType();
-            if (mTokenizer->isCPP() && (!varType || !varType->isIntegral()))
+            if (varTok->isCpp() && (!varType || !varType->isIntegral()))
                 continue;
 
             if (litTok->tokType() == Token::eString) {
-                if (mTokenizer->isC() || (varType && varType->pointer))
+                if (varTok->isC() || (varType && varType->pointer))
                     suspiciousStringCompareError(tok, varTok->expressionString(), litTok->isLong());
             } else if (litTok->tokType() == Token::eChar && varType && varType->pointer) {
                 suspiciousStringCompareError_char(tok, varTok->expressionString());
@@ -223,6 +227,7 @@ static bool isChar(const Variable* var)
 
 void CheckString::strPlusChar()
 {
+    logChecker("CheckString::strPlusChar");
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -246,6 +251,28 @@ void CheckString::strPlusCharError(const Token *tok)
     reportError(tok, Severity::error, "strPlusChar", "Unusual pointer arithmetic. A value of type '" + charType +"' is added to a string literal.", CWE665, Certainty::normal);
 }
 
+static bool isMacroUsage(const Token* tok)
+{
+    if (const Token* parent = tok->astParent()) {
+        while (parent && (parent->isCast() || parent->str() == "&&")) {
+            if (parent->isExpandedMacro())
+                return true;
+            parent = parent->astParent();
+        }
+        if (!parent)
+            return false;
+        if (parent->isExpandedMacro())
+            return true;
+        if (parent->isUnaryOp("!") || parent->isComparisonOp()) {
+            int argn{};
+            const Token* ftok = getTokenArgumentFunction(parent, argn);
+            if (ftok && !ftok->function())
+                return true;
+        }
+    }
+    return false;
+}
+
 //---------------------------------------------------------------------------
 // Implicit casts of string literals to bool
 // Comparing string literal with strlen() with wrong length
@@ -255,17 +282,19 @@ void CheckString::checkIncorrectStringCompare()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckString::checkIncorrectStringCompare"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             // skip "assert(str && ..)" and "assert(.. && str)"
             if ((endsWith(tok->str(), "assert") || endsWith(tok->str(), "ASSERT")) &&
                 Token::Match(tok, "%name% (") &&
-                (Token::Match(tok->tokAt(2), "%str% &&") || Token::Match(tok->next()->link()->tokAt(-2), "&& %str% )")))
-                tok = tok->next()->link();
+                (Token::Match(tok->tokAt(2), "%str% &&") || Token::Match(tok->linkAt(1)->tokAt(-2), "&& %str% )")))
+                tok = tok->linkAt(1);
 
             if (Token::simpleMatch(tok, ". substr (") && Token::Match(tok->tokAt(3)->nextArgument(), "%num% )")) {
-                const MathLib::biguint clen = MathLib::toULongNumber(tok->linkAt(2)->strAt(-1));
+                const MathLib::biguint clen = MathLib::toBigUNumber(tok->linkAt(2)->tokAt(-1));
                 const Token* begin = tok->previous();
                 for (;;) { // Find start of statement
                     while (begin->link() && Token::Match(begin, "]|)|>"))
@@ -288,12 +317,11 @@ void CheckString::checkIncorrectStringCompare()
                         incorrectStringCompareError(tok->next(), "substr", end->strAt(1));
                     }
                 }
-            } else if (Token::Match(tok, "&&|%oror%|( %str%|%char% &&|%oror%|)") && !Token::Match(tok, "( %str%|%char% )")) {
-                incorrectStringBooleanError(tok->next(), tok->strAt(1));
-            } else if (Token::Match(tok, "if|while ( %str%|%char% )") && !tok->tokAt(2)->getValue(0)) {
-                incorrectStringBooleanError(tok->tokAt(2), tok->strAt(2));
-            } else if (tok->str() == "?" && Token::Match(tok->astOperand1(), "%str%|%char%"))
-                incorrectStringBooleanError(tok->astOperand1(), tok->astOperand1()->str());
+            } else if (Token::Match(tok, "%str%|%char%") &&
+                       !Token::Match(tok->next(), "%name%") &&
+                       isUsedAsBool(tok, *mSettings) &&
+                       !isMacroUsage(tok))
+                incorrectStringBooleanError(tok, tok->str());
         }
     }
 }
@@ -307,7 +335,7 @@ void CheckString::incorrectStringBooleanError(const Token *tok, const std::strin
 {
     const bool charLiteral = isCharLiteral(string);
     const std::string literalType = charLiteral ? "char" : "string";
-    const std::string result = getCharLiteral(string) == "\\0" ? "false" : "true";
+    const std::string result = bool_to_string(getCharLiteral(string) != "\\0");
     reportError(tok,
                 Severity::warning,
                 charLiteral ? "incorrectCharBooleanError" : "incorrectStringBooleanError",
@@ -323,6 +351,8 @@ void CheckString::overlappingStrcmp()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckString::overlappingStrcmp"); // warning
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -370,7 +400,7 @@ void CheckString::overlappingStrcmp()
                     if (args1[1]->isLiteral() &&
                         args2[1]->isLiteral() &&
                         args1[1]->str() != args2[1]->str() &&
-                        isSameExpression(mTokenizer->isCPP(), true, args1[0], args2[0], mSettings->library, true, false))
+                        isSameExpression(true, args1[0], args2[0], *mSettings, true, false))
                         overlappingStrcmpError(eq0, ne0);
                 }
             }
@@ -397,6 +427,8 @@ void CheckString::overlappingStrcmpError(const Token *eq0, const Token *ne0)
 //---------------------------------------------------------------------------
 void CheckString::sprintfOverlappingData()
 {
+    logChecker("CheckString::sprintfOverlappingData");
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
@@ -416,11 +448,10 @@ void CheckString::sprintfOverlappingData()
                 while (arg->isCast())
                     arg = arg->astOperand2() ? arg->astOperand2() : arg->astOperand1();
 
-                const bool same = isSameExpression(mTokenizer->isCPP(),
-                                                   false,
+                const bool same = isSameExpression(false,
                                                    dest,
                                                    arg,
-                                                   mSettings->library,
+                                                   *mSettings,
                                                    true,
                                                    false);
                 if (same) {
@@ -444,3 +475,33 @@ void CheckString::sprintfOverlappingDataError(const Token *funcTok, const Token
                 "\"If copying takes place between objects that overlap as a result of a call "
                 "to sprintf() or snprintf(), the results are undefined.\"", CWE628, Certainty::normal);
 }
+
+void CheckString::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckString checkString(&tokenizer, &tokenizer.getSettings(), errorLogger);
+
+    // Checks
+    checkString.strPlusChar();
+    checkString.checkSuspiciousStringCompare();
+    checkString.stringLiteralWrite();
+    checkString.overlappingStrcmp();
+    checkString.checkIncorrectStringCompare();
+    checkString.sprintfOverlappingData();
+    checkString.checkAlwaysTrueOrFalseStringCompare();
+}
+
+void CheckString::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckString c(nullptr, settings, errorLogger);
+    c.stringLiteralWriteError(nullptr, nullptr);
+    c.sprintfOverlappingDataError(nullptr, nullptr, "varname");
+    c.strPlusCharError(nullptr);
+    c.incorrectStringCompareError(nullptr, "substr", "\"Hello World\"");
+    c.suspiciousStringCompareError(nullptr, "foo", false);
+    c.suspiciousStringCompareError_char(nullptr, "foo");
+    c.incorrectStringBooleanError(nullptr, "\"Hello World\"");
+    c.incorrectStringBooleanError(nullptr, "\'x\'");
+    c.alwaysTrueFalseStringCompareError(nullptr, "str1", "str2");
+    c.alwaysTrueStringVariableCompareError(nullptr, "varname1", "varname2");
+    c.overlappingStrcmpError(nullptr, nullptr);
+}
diff --git a/lib/checkstring.h b/lib/checkstring.h
index 94826c25fc0..76002f8ed3d 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-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
@@ -43,23 +43,13 @@ class CPPCHECKLIB CheckString : public Check {
     /** @brief This constructor is used when registering the CheckClass */
     CheckString() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckString checkString(tokenizer, settings, errorLogger);
-
-        // Checks
-        checkString.strPlusChar();
-        checkString.checkSuspiciousStringCompare();
-        checkString.stringLiteralWrite();
-        checkString.overlappingStrcmp();
-        checkString.checkIncorrectStringCompare();
-        checkString.sprintfOverlappingData();
-        checkString.checkAlwaysTrueOrFalseStringCompare();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief undefined behaviour, writing string literal */
     void stringLiteralWrite();
@@ -82,7 +72,6 @@ class CPPCHECKLIB CheckString : public Check {
     /** @brief %Check for overlapping source and destination passed to sprintf() */
     void sprintfOverlappingData();
 
-private:
     void stringLiteralWriteError(const Token *tok, const Token *strValue);
     void sprintfOverlappingDataError(const Token *funcTok, const Token *tok, const std::string &varname);
     void strPlusCharError(const Token *tok);
@@ -94,20 +83,7 @@ class CPPCHECKLIB CheckString : public Check {
     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 {
-        CheckString c(nullptr, settings, errorLogger);
-        c.stringLiteralWriteError(nullptr, nullptr);
-        c.sprintfOverlappingDataError(nullptr, nullptr, "varname");
-        c.strPlusCharError(nullptr);
-        c.incorrectStringCompareError(nullptr, "substr", "\"Hello World\"");
-        c.suspiciousStringCompareError(nullptr, "foo", false);
-        c.suspiciousStringCompareError_char(nullptr, "foo");
-        c.incorrectStringBooleanError(nullptr, "\"Hello World\"");
-        c.incorrectStringBooleanError(nullptr, "\'x\'");
-        c.alwaysTrueFalseStringCompareError(nullptr, "str1", "str2");
-        c.alwaysTrueStringVariableCompareError(nullptr, "varname1", "varname2");
-        c.overlappingStrcmpError(nullptr, nullptr);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "String";
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
index 7cc2d4d7643..68b6580d270 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-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
@@ -20,6 +20,7 @@
 //---------------------------------------------------------------------------
 #include "checktype.h"
 
+#include "astutils.h"
 #include "errortypes.h"
 #include "mathlib.h"
 #include "platform.h"
@@ -29,10 +30,16 @@
 #include "token.h"
 #include "tokenize.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
+#include <algorithm>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
 #include <list>
 #include <sstream>
+#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------
@@ -48,23 +55,27 @@ namespace {
 //
 
 // CWE ids used:
-static const struct CWE CWE195(195U);   // Signed to Unsigned Conversion Error
-static const struct CWE CWE197(197U);   // Numeric Truncation Error
-static const struct CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
-static const struct CWE CWE190(190U);   // Integer Overflow or Wraparound
+static const CWE CWE195(195U);   // Signed to Unsigned Conversion Error
+static const CWE CWE197(197U);   // Numeric Truncation Error
+static const CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
+static const CWE CWE190(190U);   // Integer Overflow or Wraparound
 
 
 void CheckType::checkTooBigBitwiseShift()
 {
     // unknown sizeof(int) => can't run this checker
-    if (mSettings->platform.type == cppcheck::Platform::Type::Unspecified)
+    if (mSettings->platform.type == Platform::Type::Unspecified)
         return;
 
+    logChecker("CheckType::checkTooBigBitwiseShift"); // platform
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         // C++ and macro: OUT(x<<y)
-        if (mTokenizer->isCPP() && Token::Match(tok, "[;{}] %name% (") && Token::simpleMatch(tok->linkAt(2), ") ;") && tok->next()->isUpperCaseName() && !tok->next()->function())
+        if (tok->isCpp() && Token::Match(tok, "[;{}] %name% (") && Token::simpleMatch(tok->linkAt(2), ") ;") && tok->next()->isUpperCaseName() && !tok->next()->function())
             tok = tok->linkAt(2);
 
+        tok = skipUnreachableBranch(tok);
+
         if (!tok->astOperand1() || !tok->astOperand2())
             continue;
 
@@ -78,7 +89,7 @@ void CheckType::checkTooBigBitwiseShift()
         // C11 Standard, section 6.5.7 Bitwise shift operators, states:
         //   The integer promotions are performed on each of the operands.
         //   The type of the result is that of the promoted left operand.
-        int lhsbits;
+        std::uint8_t lhsbits;
         if ((lhstype->type == ValueType::Type::CHAR) ||
             (lhstype->type == ValueType::Type::SHORT) ||
             (lhstype->type == ValueType::Type::WCHAR_T) ||
@@ -93,11 +104,11 @@ void CheckType::checkTooBigBitwiseShift()
             continue;
 
         // Get biggest rhs value. preferably a value which doesn't have 'condition'.
-        const ValueFlow::Value * value = tok->astOperand2()->getValueGE(lhsbits, mSettings);
+        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);
+            value = tok->astOperand2()->getValueGE(lhsbits-1, *mSettings);
             if (value && mSettings->isEnabled(value, false))
                 tooBigSignedBitwiseShiftError(tok, lhsbits, *value);
         }
@@ -106,28 +117,28 @@ void CheckType::checkTooBigBitwiseShift()
 
 void CheckType::tooBigBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits)
 {
-    const char id[] = "shiftTooManyBits";
+    constexpr char id[] = "shiftTooManyBits";
 
     if (!tok) {
         reportError(tok, Severity::error, id, "Shifting 32-bit value by 40 bits is undefined behaviour", CWE758, Certainty::normal);
         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)
 {
-    const char id[] = "shiftTooManyBitsSigned";
+    constexpr char id[] = "shiftTooManyBitsSigned";
 
-    const bool cpp14 = 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)
@@ -138,20 +149,20 @@ void CheckType::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, con
     }
 
 
-    Severity::SeverityType severity = rhsbits.errorSeverity() ? Severity::error : Severity::warning;
+    Severity severity = rhsbits.errorSeverity() ? Severity::error : Severity::warning;
     if (cpp14)
         severity = 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);
 }
 
 //---------------------------------------------------------------------------
@@ -161,9 +172,11 @@ void CheckType::tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, con
 void CheckType::checkIntegerOverflow()
 {
     // unknown sizeof(int) => can't run this checker
-    if (mSettings->platform.type == cppcheck::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
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!tok->isArithmeticalOp())
             continue;
@@ -187,38 +200,42 @@ void CheckType::checkIntegerOverflow()
             continue;
 
         // max value according to platform settings.
-        const MathLib::bigint maxvalue = (((MathLib::biguint)1) << (bits - 1)) - 1;
+        const MathLib::bigint maxvalue = (static_cast<MathLib::biguint>(1) << (bits - 1)) - 1;
 
         // is there a overflow result value
-        const ValueFlow::Value *value = tok->getValueGE(maxvalue + 1, mSettings);
-        if (!value)
-            value = tok->getValueLE(-maxvalue - 2, mSettings);
+        bool isOverflow = true;
+        const ValueFlow::Value *value = tok->getValueGE(maxvalue + 1, *mSettings);
+        if (!value) {
+            value = tok->getValueLE(-maxvalue - 2, *mSettings);
+            isOverflow = false;
+        }
         if (!value || !mSettings->isEnabled(value,false))
             continue;
 
         // For left shift, it's common practice to shift into the sign bit
-        //if (tok->str() == "<<" && value->intvalue > 0 && value->intvalue < (((MathLib::bigint)1) << bits))
-        //    continue;
+        if (tok->str() == "<<" && value->intvalue > 0 && value->intvalue < (static_cast<MathLib::biguint>(1) << bits))
+            continue;
 
-        integerOverflowError(tok, *value);
+        integerOverflowError(tok, *value, isOverflow);
     }
 }
 
-void CheckType::integerOverflowError(const Token *tok, const ValueFlow::Value &value)
+void CheckType::integerOverflowError(const Token *tok, const ValueFlow::Value &value, bool isOverflow)
 {
     const std::string expr(tok ? tok->expressionString() : "");
+    const std::string type = isOverflow ? "overflow" : "underflow";
 
     std::string msg;
     if (value.condition)
         msg = ValueFlow::eitherTheConditionIsRedundant(value.condition) +
-              " or there is signed integer overflow for expression '" + expr + "'.";
+              " or there is signed integer " + type + " for expression '" + expr + "'.";
     else
-        msg = "Signed integer overflow for expression '" + expr + "'.";
+        msg = "Signed integer " + type + " for expression '" + expr + "'.";
 
     if (value.safe)
         msg = "Safe checks: " + msg;
 
-    reportError(getErrorPath(tok, &value, "Integer overflow"),
+    reportError(getErrorPath(tok, &value, "Integer " + type),
                 value.errorSeverity() ? Severity::error : Severity::warning,
                 getMessageId(value, "integerOverflow").c_str(),
                 msg,
@@ -235,6 +252,8 @@ void CheckType::checkSignConversion()
     if (!mSettings->severity.isEnabled(Severity::warning))
         return;
 
+    logChecker("CheckType::checkSignConversion"); // warning
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         if (!tok->isArithmeticalOp() || Token::Match(tok,"+|-"))
             continue;
@@ -249,7 +268,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)
@@ -275,8 +294,8 @@ 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(),
                     msg.str(),
@@ -289,20 +308,44 @@ void CheckType::signConversionError(const Token *tok, const ValueFlow::Value *ne
 //---------------------------------------------------------------------------
 // Checking for long cast of int result   const long x = var1 * var2;
 //---------------------------------------------------------------------------
+static bool checkTypeCombination(ValueType src, ValueType tgt, const Settings& settings)
+{
+    static const std::pair<ValueType::Type, ValueType::Type> typeCombinations[] = {
+        { ValueType::Type::INT, ValueType::Type::LONG },
+        { ValueType::Type::INT, ValueType::Type::LONGLONG },
+        { ValueType::Type::LONG, ValueType::Type::LONGLONG },
+        { ValueType::Type::FLOAT, ValueType::Type::DOUBLE },
+        { ValueType::Type::FLOAT, ValueType::Type::LONGDOUBLE },
+        { ValueType::Type::DOUBLE, ValueType::Type::LONGDOUBLE },
+    };
+
+    src.reference = Reference::None;
+    tgt.reference = Reference::None;
+
+    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;
+
+    return std::any_of(std::begin(typeCombinations), std::end(typeCombinations), [&](const std::pair<ValueType::Type, ValueType::Type>& p) {
+        return src.type == p.first && tgt.type == p.second;
+    });
+}
 
 void CheckType::checkLongCast()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("truncLongCastAssignment"))
         return;
 
+    logChecker("CheckType::checkLongCast"); // style
+
     // Assignments..
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
-        if (tok->str() != "=" || !Token::Match(tok->astOperand2(), "*|<<"))
+        if (tok->str() != "=" || !Token::Match(tok->astOperand2(), "*|<<") || tok->astOperand2()->isUnaryOp("*"))
             continue;
 
-        if (tok->astOperand2()->hasKnownIntValue()) {
-            const ValueFlow::Value &v = tok->astOperand2()->values().front();
-            if (mSettings->platform.isIntValue(v.intvalue))
+        if (const ValueFlow::Value* v = tok->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+            if (mSettings->platform.isIntValue(v->intvalue))
                 continue;
         }
 
@@ -311,16 +354,15 @@ void CheckType::checkLongCast()
 
         if (!lhstype || !rhstype)
             continue;
+        if (!checkTypeCombination(*rhstype, *lhstype, *mSettings))
+            continue;
 
         // assign int result to long/longlong const nonpointer?
-        if (rhstype->type == ValueType::Type::INT &&
-            rhstype->pointer == 0U &&
+        if (rhstype->pointer == 0U &&
             rhstype->originalTypeName.empty() &&
-            (lhstype->type == ValueType::Type::LONG || lhstype->type == ValueType::Type::LONGLONG) &&
             lhstype->pointer == 0U &&
-            lhstype->constness == 1U &&
             lhstype->originalTypeName.empty())
-            longCastAssignError(tok);
+            longCastAssignError(tok, rhstype, lhstype);
     }
 
     // Return..
@@ -329,16 +371,9 @@ void CheckType::checkLongCast()
 
         // function must return long data
         const Token * def = scope->classDef;
-        bool islong = false;
-        while (Token::Match(def, "%type%|::")) {
-            if (def->str() == "long" && def->originalName().empty()) {
-                islong = true;
-                break;
-            }
-            def = def->previous();
-        }
-        if (!islong)
+        if (!Token::Match(def, "%name% (") || !def->next()->valueType())
             continue;
+        const ValueType* retVt = def->next()->valueType();
 
         // return statements
         const Token *ret = nullptr;
@@ -346,7 +381,9 @@ void CheckType::checkLongCast()
             if (tok->str() == "return") {
                 if (Token::Match(tok->astOperand1(), "<<|*")) {
                     const ValueType *type = tok->astOperand1()->valueType();
-                    if (type && type->type == ValueType::Type::INT && type->pointer == 0U && type->originalTypeName.empty())
+                    if (type && checkTypeCombination(*type, *retVt, *mSettings) &&
+                        type->pointer == 0U &&
+                        type->originalTypeName.empty())
                         ret = tok;
                 }
                 // All return statements must have problem otherwise no warning
@@ -358,26 +395,41 @@ void CheckType::checkLongCast()
         }
 
         if (ret)
-            longCastReturnError(ret);
+            longCastReturnError(ret, ret->astOperand1()->valueType(), retVt);
     }
 }
 
-void CheckType::longCastAssignError(const Token *tok)
+static void makeBaseTypeString(std::string& typeStr)
 {
+    const auto pos = typeStr.find("signed");
+    if (pos != std::string::npos)
+        typeStr.erase(typeStr.begin(), typeStr.begin() + pos + 6 + 1);
+}
+
+void CheckType::longCastAssignError(const Token *tok, const ValueType* src, const ValueType* tgt)
+{
+    std::string srcStr = src ? src->str() : "int";
+    makeBaseTypeString(srcStr);
+    std::string tgtStr = tgt ? tgt->str() : "long";
+    makeBaseTypeString(tgtStr);
     reportError(tok,
                 Severity::style,
                 "truncLongCastAssignment",
-                "int result is assigned to long variable. If the variable is long to avoid loss of information, then you have loss of information.\n"
-                "int result is assigned to long variable. If the variable is long to avoid loss of information, then there is loss of information. To avoid loss of information you must cast a calculation operand to long, for example 'l = a * b;' => 'l = (long)a * b;'.", CWE197, Certainty::normal);
+                srcStr + " result is assigned to " + tgtStr + " variable. If the variable is " + tgtStr + " to avoid loss of information, then you have loss of information.\n" +
+                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)
+void CheckType::longCastReturnError(const Token *tok, const ValueType* src, const ValueType* tgt)
 {
+    std::string srcStr = src ? src->str() : "int";
+    makeBaseTypeString(srcStr);
+    std::string tgtStr = tgt ? tgt->str() : "long";
+    makeBaseTypeString(tgtStr);
     reportError(tok,
                 Severity::style,
                 "truncLongCastReturn",
-                "int result is returned as long value. If the return value is long to avoid loss of information, then you have loss of information.\n"
-                "int result is returned as long value. If the return value is long to avoid loss of information, then there is loss of information. To avoid loss of information you must cast a calculation operand to long, for example 'return a*b;' => 'return (long)a*b'.", CWE197, Certainty::normal);
+                srcStr +" result is returned as " + tgtStr + " value. If the return value is " + tgtStr + " to avoid loss of information, then you have loss of information.\n" +
+                srcStr +" result is returned as " + tgtStr + " value. If the return value 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 long, for example 'return a*b;' => 'return (long)a*b'.", CWE197, Certainty::normal);
 }
 
 //---------------------------------------------------------------------------
@@ -386,11 +438,15 @@ void CheckType::longCastReturnError(const Token *tok)
 
 void CheckType::checkFloatToIntegerOverflow()
 {
+    logChecker("CheckType::checkFloatToIntegerOverflow");
+
     for (const Token *tok = mTokenizer->tokens(); tok; tok = tok->next()) {
         const ValueType *vtint, *vtfloat;
 
         // Explicit cast
         if (Token::Match(tok, "( %name%") && tok->astOperand1() && !tok->astOperand2()) {
+            if (isUnreachableOperand(tok))
+                continue;
             vtint = tok->valueType();
             vtfloat = tok->astOperand1()->valueType();
             checkFloatToIntegerOverflow(tok, vtint, vtfloat, tok->astOperand1()->values());
@@ -398,17 +454,21 @@ void CheckType::checkFloatToIntegerOverflow()
 
         // Assignment
         else if (tok->str() == "=" && tok->astOperand1() && tok->astOperand2()) {
+            if (isUnreachableOperand(tok))
+                continue;
             vtint = tok->astOperand1()->valueType();
             vtfloat = tok->astOperand2()->valueType();
             checkFloatToIntegerOverflow(tok, vtint, vtfloat, tok->astOperand2()->values());
         }
 
         else if (tok->str() == "return" && tok->astOperand1() && tok->astOperand1()->valueType() && tok->astOperand1()->valueType()->isFloat()) {
+            if (isUnreachableOperand(tok))
+                continue;
             const Scope *scope = tok->scope();
-            while (scope && scope->type != Scope::ScopeType::eLambda && scope->type != Scope::ScopeType::eFunction)
+            while (scope && scope->type != ScopeType::eLambda && scope->type != ScopeType::eFunction)
                 scope = scope->nestedIn;
-            if (scope && scope->type == Scope::ScopeType::eFunction && scope->function && scope->function->retDef) {
-                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, *mSettings, mTokenizer->isCPP());
+            if (scope && scope->type == ScopeType::eFunction && scope->function && scope->function->retDef) {
+                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, *mSettings);
                 vtfloat = tok->astOperand1()->valueType();
                 checkFloatToIntegerOverflow(tok, &valueType, vtfloat, tok->astOperand1()->values());
             }
@@ -433,7 +493,7 @@ void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *v
             floatToIntegerOverflowError(tok, f);
         else if ((-f.floatValue) > std::exp2(mSettings->platform.long_long_bit - 1))
             floatToIntegerOverflowError(tok, f);
-        else if (mSettings->platform.type != cppcheck::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;
@@ -447,7 +507,7 @@ void CheckType::checkFloatToIntegerOverflow(const Token *tok, const ValueType *v
                 bits = mSettings->platform.long_long_bit;
             else
                 continue;
-            if (bits < MathLib::bigint_bits && f.floatValue >= (((MathLib::biguint)1) << bits))
+            if (bits < MathLib::bigint_bits && f.floatValue >= (1ULL << bits))
                 floatToIntegerOverflowError(tok, f);
         }
     }
@@ -462,3 +522,31 @@ void CheckType::floatToIntegerOverflowError(const Token *tok, const ValueFlow::V
                 "floatConversionOverflow",
                 errmsg.str(), CWE190, value.isInconclusive() ? Certainty::inconclusive : Certainty::normal);
 }
+
+void CheckType::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    // These are not "simplified" because casts can't be ignored
+    CheckType checkType(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkType.checkTooBigBitwiseShift();
+    checkType.checkIntegerOverflow();
+    checkType.checkSignConversion();
+    checkType.checkLongCast();
+    checkType.checkFloatToIntegerOverflow();
+}
+
+void CheckType::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckType 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;
+    f.valueType = ValueFlow::Value::ValueType::FLOAT;
+    f.floatValue = 1E100;
+    c.floatToIntegerOverflowError(nullptr, f);
+}
diff --git a/lib/checktype.h b/lib/checktype.h
index 34417b371f6..d90e11f6fd1 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-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
@@ -24,7 +24,6 @@
 
 #include "check.h"
 #include "config.h"
-#include "vfvalue.h"
 
 #include <list>
 #include <string>
@@ -32,8 +31,12 @@
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 class ValueType;
+class Tokenizer;
+namespace ValueFlow
+{
+    class Value;
+}
 
 /// @addtogroup Checks
 /// @{
@@ -46,20 +49,13 @@ class CPPCHECKLIB CheckType : public Check {
     /** @brief This constructor is used when registering the CheckClass */
     CheckType() : Check(myName()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        // These are not "simplified" because casts can't be ignored
-        CheckType checkType(tokenizer, settings, errorLogger);
-        checkType.checkTooBigBitwiseShift();
-        checkType.checkIntegerOverflow();
-        checkType.checkSignConversion();
-        checkType.checkLongCast();
-        checkType.checkFloatToIntegerOverflow();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief %Check for bitwise shift with too big right operand */
     void checkTooBigBitwiseShift();
@@ -77,30 +73,16 @@ class CPPCHECKLIB CheckType : public Check {
     void checkFloatToIntegerOverflow();
     void checkFloatToIntegerOverflow(const Token *tok, const ValueType *vtint, const ValueType *vtfloat, const std::list<ValueFlow::Value> &floatValues);
 
-private:
-
     // Error messages..
     void tooBigBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits);
     void tooBigSignedBitwiseShiftError(const Token *tok, int lhsbits, const ValueFlow::Value &rhsbits);
-    void integerOverflowError(const Token *tok, const ValueFlow::Value &value);
-    void signConversionError(const Token *tok, const ValueFlow::Value *negativeValue, const bool constvalue);
-    void longCastAssignError(const Token *tok);
-    void longCastReturnError(const Token *tok);
+    void integerOverflowError(const Token *tok, const ValueFlow::Value &value, bool isOverflow = true);
+    void signConversionError(const Token *tok, const ValueFlow::Value *negativeValue, bool constvalue);
+    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 {
-        CheckType 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));
-        c.signConversionError(nullptr, nullptr, false);
-        c.longCastAssignError(nullptr);
-        c.longCastReturnError(nullptr);
-        ValueFlow::Value f;
-        f.valueType = ValueFlow::Value::ValueType::FLOAT;
-        f.floatValue = 1E100;
-        c.floatToIntegerOverflowError(nullptr, f);
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Type";
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index aca9c6e87ce..dccce6ad348 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-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
@@ -21,6 +21,7 @@
 #include "checkuninitvar.h"
 
 #include "astutils.h"
+#include "ctu.h"
 #include "errorlogger.h"
 #include "library.h"
 #include "mathlib.h"
@@ -28,6 +29,9 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "tokenlist.h"
+#include "utils.h"
+#include "vfvalue.h"
 
 #include "checknullpointer.h"   // CheckNullPointer::isPointerDeref
 
@@ -41,15 +45,10 @@
 #include <utility>
 #include <vector>
 
-
-namespace tinyxml2 {
-    class XMLElement;
-}
-
 //---------------------------------------------------------------------------
 
 // CWE ids used:
-static const struct CWE CWE_USE_OF_UNINITIALIZED_VARIABLE(457U);
+static const CWE CWE_USE_OF_UNINITIALIZED_VARIABLE(457U);
 
 // Register this check class (by creating a static instance of it)
 namespace {
@@ -82,6 +81,27 @@ static const Token *getAstParentSkipPossibleCastAndAddressOf(const Token *vartok
     return parent;
 }
 
+static std::map<nonneg int, VariableValue> getVariableValues(const Token* tok) {
+    std::map<nonneg int, VariableValue> ret;
+    if (!tok || !tok->scope()->isExecutable())
+        return ret;
+    while (tok && tok->str() != "{") {
+        if (tok->str() == "}") {
+            if (tok->link()->isBinaryOp())
+                tok = tok->link()->previous();
+            else
+                break;
+        }
+        if (Token::Match(tok, "%var% =|{") && tok->next()->isBinaryOp() && tok->varId() && ret.count(tok->varId()) == 0) {
+            const Token* rhs = tok->next()->astOperand2();
+            if (rhs && rhs->hasKnownIntValue())
+                ret[tok->varId()] = VariableValue(rhs->getKnownIntValue());
+        }
+        tok = tok->previous();
+    }
+    return ret;
+}
+
 bool CheckUninitVar::diag(const Token* tok)
 {
     if (!tok)
@@ -93,6 +113,8 @@ bool CheckUninitVar::diag(const Token* tok)
 
 void CheckUninitVar::check()
 {
+    logChecker("CheckUninitVar::check");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     std::set<std::string> arrayTypeDefs;
@@ -124,11 +146,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;
         }
 
@@ -138,11 +160,11 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
                 tok = tok->next();
             while (Token::simpleMatch(tok->link(), "] ["))
                 tok = tok->link()->next();
-            if (Token::Match(tok->link(), "] =|{"))
+            if (Token::Match(tok->link(), "] =|{|("))
                 continue;
         }
 
-        bool stdtype = mTokenizer->isC() && arrayTypeDefs.find(var.typeStartToken()->str()) == arrayTypeDefs.end();
+        bool stdtype = var.typeStartToken()->isC() && arrayTypeDefs.find(var.typeStartToken()->str()) == arrayTypeDefs.end();
         const Token* tok = var.typeStartToken();
         for (; tok != var.nameToken() && tok->str() != "<"; tok = tok->next()) {
             if (tok->isStandardType() || tok->isEnumType())
@@ -159,8 +181,8 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
         if (!tok)
             continue;
 
-        if (tok->astParent() && Token::simpleMatch(tok->astParent()->previous(), "for (") &&
-            checkLoopBody(tok->astParent()->link()->next(), var, var.isArray() ? ARRAY : NO_ALLOC, emptyString, true))
+        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, "", true))
             continue;
 
         if (var.isArray()) {
@@ -173,15 +195,15 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
             }
             if (!init) {
                 Alloc alloc = ARRAY;
-                const std::map<nonneg int, VariableValue> variableValue;
-                checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, emptyString, variableValue);
+                std::map<nonneg int, VariableValue> variableValue = getVariableValues(var.typeStartToken());
+                checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, "", variableValue);
             }
             continue;
         }
         if (stdtype || var.isPointer()) {
             Alloc alloc = NO_ALLOC;
-            const std::map<nonneg int, VariableValue> variableValue;
-            checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, emptyString, variableValue);
+            std::map<nonneg int, VariableValue> variableValue = getVariableValues(var.typeStartToken());
+            checkScopeForVariable(tok, var, nullptr, nullptr, &alloc, "", variableValue);
         }
         if (var.type())
             checkStruct(tok, var);
@@ -205,8 +227,8 @@ void CheckUninitVar::checkScope(const Scope* scope, const std::set<std::string>
                         checkStruct(tok, arg);
                     else if (arg.typeStartToken()->isStandardType() || arg.typeStartToken()->isEnumType()) {
                         Alloc alloc = NO_ALLOC;
-                        const std::map<nonneg int, VariableValue> variableValue;
-                        checkScopeForVariable(tok->next(), arg, nullptr, nullptr, &alloc, emptyString, variableValue);
+                        std::map<nonneg int, VariableValue> variableValue;
+                        checkScopeForVariable(tok->next(), arg, nullptr, nullptr, &alloc, "", variableValue);
                     }
                 }
             }
@@ -230,7 +252,7 @@ void CheckUninitVar::checkStruct(const Token *tok, const Variable &structvar)
                 // is the variable declared in a inner union?
                 bool innerunion = false;
                 for (const Scope *innerScope : scope2->nestedList) {
-                    if (innerScope->type == Scope::eUnion) {
+                    if (innerScope->type == ScopeType::eUnion) {
                         if (var.typeStartToken()->linenr() >= innerScope->bodyStart->linenr() &&
                             var.typeStartToken()->linenr() <= innerScope->bodyEnd->linenr()) {
                             innerunion = true;
@@ -244,7 +266,7 @@ void CheckUninitVar::checkStruct(const Token *tok, const Variable &structvar)
                     const Token *tok2 = tok;
                     if (tok->str() == "}")
                         tok2 = tok2->next();
-                    const std::map<nonneg int, VariableValue> variableValue;
+                    std::map<nonneg int, VariableValue> variableValue = getVariableValues(structvar.typeStartToken());
                     checkScopeForVariable(tok2, structvar, nullptr, nullptr, &alloc, var.name(), variableValue);
                 }
             }
@@ -271,8 +293,8 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<nonneg i
     if (!tok)
         return;
 
-    if (tok->hasKnownIntValue()) {
-        if (tok->getKnownIntValue() == 0)
+    if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+        if (v->intvalue == 0)
             *alwaysFalse = true;
         else
             *alwaysTrue = true;
@@ -282,7 +304,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 std::map<nonneg int, VariableValue>::const_iterator it = variableValue.find(tok ? tok->varId() : ~0U);
+        const auto it = utils::as_const(variableValue).find(tok ? tok->varId() : ~0U);
         if (it != variableValue.end()) {
             *alwaysTrue = (it->second != 0LL);
             *alwaysFalse = (it->second == 0LL);
@@ -308,14 +330,14 @@ static void conditionAlwaysTrueOrFalse(const Token *tok, const std::map<nonneg i
         while (vartok && vartok->str() == ".")
             vartok = vartok->astOperand2();
 
-        const std::map<nonneg int, VariableValue>::const_iterator it = variableValue.find(vartok ? vartok->varId() : ~0U);
+        const auto it = utils::as_const(variableValue).find(vartok ? vartok->varId() : ~0U);
         if (it == variableValue.end())
             return;
 
         if (tok->str() == "==")
-            *alwaysTrue  = (it->second == MathLib::toLongNumber(numtok->str()));
+            *alwaysTrue  = (it->second == MathLib::toBigNumber(numtok));
         else if (tok->str() == "!=")
-            *alwaysTrue  = (it->second != MathLib::toLongNumber(numtok->str()));
+            *alwaysTrue  = (it->second != MathLib::toBigNumber(numtok));
         else
             return;
         *alwaysFalse = !(*alwaysTrue);
@@ -375,7 +397,7 @@ 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 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)
 {
     const bool suppressErrors(possibleInit && *possibleInit);  // Assume that this is a variable declaration, rather than a fundef
     const bool printDebug = mSettings->debugwarnings;
@@ -419,7 +441,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
         }
 
         // track values of other variables..
-        if (Token::Match(tok->previous(), "[;{}] %var% =")) {
+        if (Token::Match(tok->previous(), "[;{}.] %var% =")) {
             if (tok->next()->astOperand2() && tok->next()->astOperand2()->hasKnownIntValue())
                 variableValue[tok->varId()] = VariableValue(tok->next()->astOperand2()->getKnownIntValue());
             else if (Token::Match(tok->previous(), "[;{}] %var% = - %name% ;"))
@@ -444,7 +466,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
             conditionAlwaysTrueOrFalse(tok->next()->astOperand2(), variableValue, &alwaysTrue, &alwaysFalse);
 
             // initialization / usage in condition..
-            if (!alwaysTrue && checkIfForWhileHead(tok->next(), var, suppressErrors, bool(number_of_if == 0), *alloc, membervar))
+            if (!alwaysTrue && checkIfForWhileHead(tok->next(), var, suppressErrors, (number_of_if == 0), *alloc, membervar))
                 return true;
 
             // checking if a not-zero variable is zero => bail out
@@ -454,7 +476,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
             if (alwaysFalse)
                 ;
             else if (astIsVariableComparison(tok->next()->astOperand2(), "!=", "0", &condVarTok)) {
-                const std::map<nonneg int,VariableValue>::const_iterator it = variableValue.find(condVarTok->varId());
+                const auto it = utils::as_const(variableValue).find(condVarTok->varId());
                 if (it != variableValue.cend() && it->second != 0)
                     return true;   // this scope is not fully analysed => return true
 
@@ -469,7 +491,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 while (Token::simpleMatch(vartok, "."))
                     vartok = vartok->astOperand2();
                 if (vartok && vartok->varId() && numtok && numtok->hasKnownIntValue()) {
-                    const std::map<nonneg int,VariableValue>::const_iterator it = variableValue.find(vartok->varId());
+                    const auto it = utils::as_const(variableValue).find(vartok->varId());
                     if (it != variableValue.cend() && it->second != numtok->getKnownIntValue())
                         return true;   // this scope is not fully analysed => return true
                     condVarId = vartok->varId();
@@ -480,14 +502,15 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
             }
 
             // goto the {
-            tok = tok->next()->link()->next();
+            tok = tok->linkAt(1)->next();
 
             if (!tok)
                 break;
             if (tok->str() == "{") {
                 bool possibleInitIf((!alwaysTrue && number_of_if > 0) || suppressErrors);
                 bool noreturnIf = false;
-                const bool initif = !alwaysFalse && checkScopeForVariable(tok->next(), var, &possibleInitIf, &noreturnIf, alloc, membervar, variableValue);
+                std::map<nonneg int, VariableValue> varValueIf(variableValue);
+                const bool initif = !alwaysFalse && checkScopeForVariable(tok->next(), var, &possibleInitIf, &noreturnIf, alloc, membervar, varValueIf);
 
                 // bail out for such code:
                 //    if (a) x=0;    // conditional initialization
@@ -509,15 +532,8 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 if (alwaysTrue && (initif || noreturnIf))
                     return true;
 
-                std::map<nonneg int, VariableValue> varValueIf;
-                if (!alwaysFalse && !initif && !noreturnIf) {
-                    for (const Token *tok2 = tok; tok2 && tok2 != tok->link(); tok2 = tok2->next()) {
-                        if (Token::Match(tok2, "[;{}.] %name% = - %name% ;"))
-                            varValueIf[tok2->next()->varId()] = !VariableValue(0);
-                        else if (Token::Match(tok2, "[;{}.] %name% = %num% ;"))
-                            varValueIf[tok2->next()->varId()] = VariableValue(MathLib::toLongNumber(tok2->strAt(3)));
-                    }
-                }
+                if (!alwaysFalse && !initif && !noreturnIf)
+                    variableValue = varValueIf;
 
                 if (initif && condVarId > 0)
                     variableValue[condVarId] = !condVarValue;
@@ -537,17 +553,11 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
 
                     bool possibleInitElse((!alwaysFalse && number_of_if > 0) || suppressErrors);
                     bool noreturnElse = false;
-                    const bool initelse = !alwaysTrue && checkScopeForVariable(tok->next(), var, &possibleInitElse, &noreturnElse, alloc, membervar, variableValue);
-
-                    std::map<nonneg int, VariableValue> varValueElse;
-                    if (!alwaysTrue && !initelse && !noreturnElse) {
-                        for (const Token *tok2 = tok; tok2 && tok2 != tok->link(); tok2 = tok2->next()) {
-                            if (Token::Match(tok2, "[;{}.] %var% = - %name% ;"))
-                                varValueElse[tok2->next()->varId()] = !VariableValue(0);
-                            else if (Token::Match(tok2, "[;{}.] %var% = %num% ;"))
-                                varValueElse[tok2->next()->varId()] = VariableValue(MathLib::toLongNumber(tok2->strAt(3)));
-                        }
-                    }
+                    std::map<nonneg int, VariableValue> varValueElse(variableValue);
+                    const bool initelse = !alwaysTrue && checkScopeForVariable(tok->next(), var, &possibleInitElse, &noreturnElse, alloc, membervar, varValueElse);
+
+                    if (!alwaysTrue && !initelse && !noreturnElse)
+                        variableValue = varValueElse;
 
                     if (initelse && condVarId > 0 && !noreturnIf && !noreturnElse)
                         variableValue[condVarId] = condVarValue;
@@ -572,7 +582,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
         // = { .. }
         else if (Token::simpleMatch(tok, "= {") || (Token::Match(tok, "%name% {") && tok->variable() && tok == tok->variable()->nameToken())) {
             // end token
-            const Token *end = tok->next()->link();
+            const Token *end = tok->linkAt(1);
 
             // If address of variable is taken in the block then bail out
             if (var.isPointer() || var.isArray()) {
@@ -607,7 +617,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
         }
 
         // skip sizeof / offsetof
-        if (isSizeOfEtc(tok))
+        if (isUnevaluated(tok))
             tok = tok->linkAt(1);
 
         // for/while..
@@ -619,7 +629,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 return true;
 
             // goto the {
-            const Token *tok2 = forwhile ? tok->next()->link()->next() : tok->next();
+            const Token *tok2 = forwhile ? tok->linkAt(1)->next() : tok->next();
 
             if (tok2 && tok2->str() == "{") {
                 const bool init = checkLoopBody(tok2, var, *alloc, membervar, (number_of_if > 0) || suppressErrors);
@@ -631,8 +641,8 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                 // is variable used in for-head?
                 bool initcond = false;
                 if (!suppressErrors) {
-                    const Token *startCond = forwhile ? tok->next() : tok->next()->link()->tokAt(2);
-                    initcond = checkIfForWhileHead(startCond, var, false, bool(number_of_if == 0), *alloc, membervar);
+                    const Token *startCond = forwhile ? tok->next() : tok->linkAt(1)->tokAt(2);
+                    initcond = checkIfForWhileHead(startCond, var, false, (number_of_if == 0), *alloc, membervar);
                 }
 
                 // goto "}"
@@ -643,7 +653,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                     // Assert that the tokens are '} while ('
                     if (!Token::simpleMatch(tok, "} while (")) {
                         if (printDebug)
-                            reportError(tok,Severity::debug,emptyString,"assertion failed '} while ('");
+                            reportError(tok,Severity::debug,"","assertion failed '} while ('");
                         break;
                     }
 
@@ -685,6 +695,11 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
             return true;
         }
 
+        // bailout if there is a pointer to member
+        if (Token::Match(tok, "%varid% . *", var.declarationId())) {
+            return true;
+        }
+
         if (tok->str() == "?") {
             if (!tok->astOperand2())
                 return true;
@@ -709,8 +724,12 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                     if (!membervar.empty()) {
                         if (!suppressErrors && Token::Match(tok, "%name% . %name%") && tok->strAt(2) == membervar && Token::Match(tok->next()->astParent(), "%cop%|return|throw|?"))
                             uninitStructMemberError(tok, tok->str() + "." + membervar);
-                        else if (mTokenizer->isCPP() && !suppressErrors && Token::Match(tok, "%name%") && Token::Match(tok->astParent(), "return|throw|?"))
-                            uninitStructMemberError(tok, tok->str() + "." + membervar);
+                        else if (tok->isCpp() && !suppressErrors && Token::Match(tok, "%name%") && Token::Match(tok->astParent(), "return|throw|?")) {
+                            if (std::any_of(tok->values().cbegin(), tok->values().cend(), [](const ValueFlow::Value& v) {
+                                return v.isUninitValue() && !v.isInconclusive();
+                            }))
+                                uninitStructMemberError(tok, tok->str() + "." + membervar);
+                        }
                     }
 
                     // Use variable
@@ -720,7 +739,7 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                     return true;
                 }
 
-                if (isSizeOfEtc(tok))
+                if (isUnevaluated(tok))
                     tok = tok->linkAt(1);
 
                 else if (tok->str() == "?") {
@@ -778,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;
@@ -834,7 +856,7 @@ const Token* CheckUninitVar::checkExpr(const Token* tok, const Variable& var, co
 {
     if (!tok)
         return nullptr;
-    if (isSizeOfEtc(tok->previous()))
+    if (isUnevaluated(tok->previous()))
         return nullptr;
 
     if (tok->astOperand1()) {
@@ -887,7 +909,7 @@ bool CheckUninitVar::checkIfForWhileHead(const Token *startparentheses, const Va
             return true;
         }
         // skip sizeof / offsetof
-        if (isSizeOfEtc(tok))
+        if (isUnevaluated(tok))
             tok = tok->linkAt(1);
         if ((!isuninit || !membervar.empty()) && tok->str() == "&&")
             suppressErrors = true;
@@ -896,7 +918,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) const
+const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Variable& var, const Alloc alloc, const std::string &membervar, bool &bailout, bool &alwaysReturns) const
 {
     assert(start->str() == "{");
 
@@ -905,7 +927,7 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
     const Token *const end = start->link();
     for (const Token *tok = start->next(); tok != end; tok = tok->next()) {
         // skip sizeof / offsetof
-        if (isSizeOfEtc(tok)) {
+        if (isUnevaluated(tok)) {
             tok = tok->linkAt(1);
             continue;
         }
@@ -921,9 +943,10 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
             if (!Token::simpleMatch(top->previous(), "for (") || !Token::simpleMatch(top->link(), ") {"))
                 continue;
             const Token *bodyStart = top->link()->next();
-            const Token *errorToken1 = checkLoopBodyRecursive(bodyStart, var, alloc, membervar, bailout);
+            const Token *errorToken1 = checkLoopBodyRecursive(bodyStart, var, alloc, membervar, bailout, alwaysReturns);
             if (!errorToken)
                 errorToken = errorToken1;
+            bailout |= alwaysReturns;
             if (bailout)
                 return nullptr;
         }
@@ -937,16 +960,17 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
 
         if (tok->str() == "{") {
             // switch => bailout
-            if (tok->scope() && tok->scope()->type == Scope::ScopeType::eSwitch) {
+            if (tok->scope() && tok->scope()->type == ScopeType::eSwitch) {
                 bailout = true;
                 return nullptr;
             }
 
-            const Token *errorToken1 = checkLoopBodyRecursive(tok, var, alloc, membervar, bailout);
+            bool alwaysReturnsUnused = false;
+            const Token *errorToken1 = checkLoopBodyRecursive(tok, var, alloc, membervar, bailout, alwaysReturnsUnused);
             tok = tok->link();
             if (Token::simpleMatch(tok, "} else {")) {
                 const Token *elseBody = tok->tokAt(2);
-                const Token *errorToken2 = checkLoopBodyRecursive(elseBody, var, alloc, membervar, bailout);
+                const Token *errorToken2 = checkLoopBodyRecursive(elseBody, var, alloc, membervar, bailout, alwaysReturnsUnused);
                 tok = elseBody->link();
                 if (errorToken1 && errorToken2)
                     return errorToken1;
@@ -959,6 +983,23 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
                 errorToken = errorToken1;
         }
 
+        if (Token::simpleMatch(tok, "return")) {
+            bool returnWithoutVar = true;
+            while (tok && !Token::simpleMatch(tok, ";")) {
+                if (tok->isVariable() && tok->variable() == &var) {
+                    returnWithoutVar = false;
+                    break;
+                }
+                tok = tok->next();
+            }
+            if (returnWithoutVar) {
+                alwaysReturns = true;
+                return nullptr;
+            }
+        }
+        if (!tok)
+            break;
+
         if (tok->varId() != var.declarationId())
             continue;
 
@@ -1027,7 +1068,7 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
                         varIsUsedInRhs = true;
                         return ChildrenToVisit::done;
                     }
-                    if (isSizeOfEtc(t->previous()))
+                    if (isUnevaluated(t->previous()))
                         return ChildrenToVisit::none;
                     return ChildrenToVisit::op1_and_op2;
                 });
@@ -1048,9 +1089,10 @@ const Token* CheckUninitVar::checkLoopBodyRecursive(const Token *start, const Va
 bool CheckUninitVar::checkLoopBody(const Token *tok, const Variable& var, const Alloc alloc, const std::string &membervar, const bool suppressErrors)
 {
     bool bailout = false;
-    const Token *errorToken = checkLoopBodyRecursive(tok, var, alloc, membervar, bailout);
+    bool alwaysReturns = false;
+    const Token *errorToken = checkLoopBodyRecursive(tok, var, alloc, membervar, bailout, alwaysReturns);
 
-    if (!suppressErrors && !bailout && errorToken) {
+    if (!suppressErrors && !bailout && !alwaysReturns && errorToken) {
         if (membervar.empty())
             uninitvarError(errorToken, errorToken->expressionString(), alloc);
         else
@@ -1058,7 +1100,7 @@ bool CheckUninitVar::checkLoopBody(const Token *tok, const Variable& var, const
         return true;
     }
 
-    return bailout;
+    return bailout || alwaysReturns;
 }
 
 void CheckUninitVar::checkRhs(const Token *tok, const Variable &var, Alloc alloc, nonneg int number_of_if, const std::string &membervar)
@@ -1092,7 +1134,7 @@ void CheckUninitVar::checkRhs(const Token *tok, const Variable &var, Alloc alloc
             if (err)
                 uninitvarError(tok, var.nameToken()->str(), alloc);
             break;
-        } else if (isSizeOfEtc(tok))
+        } else if (isUnevaluated(tok))
             tok = tok->linkAt(1);
 
     }
@@ -1108,13 +1150,9 @@ 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(bool cpp, const Token *vartok, const Library& library, bool pointer, Alloc alloc, int indirect)
+const Token* CheckUninitVar::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
     while (Token::Match(valueExpr->astParent(), ".|::") && astIsRhs(valueExpr))
         valueExpr = valueExpr->astParent();
@@ -1248,7 +1286,7 @@ const Token* CheckUninitVar::isVariableUsage(bool cpp, const Token *vartok, cons
         }
         if (Token::simpleMatch(tok->astParent(), "=")) {
             if (astIsLhs(tok)) {
-                if (alloc == ARRAY || !derefValue || !derefValue->isUnaryOp("*"))
+                if (alloc == ARRAY || !derefValue || !derefValue->isUnaryOp("*") || !pointer)
                     return nullptr;
                 const Token* deref = derefValue->astOperand1();
                 while (deref && deref->isCast())
@@ -1265,7 +1303,7 @@ const Token* CheckUninitVar::isVariableUsage(bool cpp, const Token *vartok, cons
     if (Token::Match((derefValue ? derefValue : vartok)->astParent(), "(|=") && astIsRhs(derefValue ? derefValue : vartok)) {
         const Token *rhstok = derefValue ? derefValue : vartok;
         const Token *lhstok = rhstok->astParent()->astOperand1();
-        const Variable *lhsvar = lhstok->variable();
+        const Variable *lhsvar = lhstok ? lhstok->variable() : nullptr;
         if (lhsvar && lhsvar->isReference() && lhsvar->nameToken() == lhstok)
             return nullptr;
     }
@@ -1285,7 +1323,7 @@ const Token* CheckUninitVar::isVariableUsage(bool cpp, const Token *vartok, cons
     // Stream read/write
     // FIXME this code is a hack!!
     if (cpp && Token::Match(valueExpr->astParent(), "<<|>>")) {
-        if (isLikelyStreamRead(cpp, vartok->previous()))
+        if (isLikelyStreamRead(vartok->previous()))
             return nullptr;
 
         if (const auto* vt = valueExpr->valueType()) {
@@ -1296,7 +1334,7 @@ const Token* CheckUninitVar::isVariableUsage(bool cpp, const Token *vartok, cons
                 return nullptr;
         }
     }
-    if (astIsRhs(derefValue) && isLikelyStreamRead(cpp, derefValue->astParent()))
+    if (astIsRhs(derefValue) && isLikelyStreamRead(derefValue->astParent()))
         return nullptr;
 
     // Assignment with overloaded &
@@ -1318,7 +1356,7 @@ const Token* CheckUninitVar::isVariableUsage(bool cpp, const Token *vartok, cons
 
 const Token* CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect) const
 {
-    return CheckUninitVar::isVariableUsage(mTokenizer->isCPP(), vartok, mSettings->library, pointer, alloc, indirect);
+    return isVariableUsage(vartok, mSettings->library, pointer, alloc, indirect);
 }
 
 /***
@@ -1352,7 +1390,7 @@ int CheckUninitVar::isFunctionParUsage(const Token *vartok, const Library& libra
 
     // is this a function call?
     if (Token::Match(start->previous(), "%name% (")) {
-        const bool address(vartok->previous()->str() == "&");
+        const bool address(vartok->strAt(-1) == "&");
         const bool array(vartok->variable() && vartok->variable()->isArray());
         // check how function handle uninitialized data arguments..
         const Function *func = start->previous()->function();
@@ -1407,7 +1445,7 @@ bool CheckUninitVar::isMemberVariableAssignment(const Token *tok, const std::str
             return true;
         if (Token::Match(tok->tokAt(-2), "[(,=] &"))
             return true;
-        if (isLikelyStreamRead(mTokenizer->isCPP(), tok->previous()))
+        if (isLikelyStreamRead(tok->previous()))
             return true;
         if ((tok->previous() && tok->previous()->isConstOp()) || Token::Match(tok->previous(), "[|="))
             ; // member variable usage
@@ -1488,8 +1526,10 @@ bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, All
     if (!isPointer && !Token::simpleMatch(tok->astParent(), ".") && Token::Match(tok->previous(), "[(,] %name% [,)]") && isVariableUsage(tok, isPointer, alloc))
         return true;
 
-    if (!isPointer && Token::Match(tok->previous(), "= %name% ;"))
-        return true;
+    if (!isPointer && Token::Match(tok->previous(), "= %name% ;")) {
+        const Token* lhs = tok->previous()->astOperand1();
+        return !(lhs && lhs->variable() && lhs->variable()->isReference() && lhs == lhs->variable()->nameToken());
+    }
 
     // = *(&var);
     if (!isPointer &&
@@ -1519,7 +1559,7 @@ void CheckUninitVar::uninitvarError(const Token *tok, const std::string &varname
     if (diag(tok))
         return;
     errorPath.emplace_back(tok, "");
-    reportError(errorPath,
+    reportError(std::move(errorPath),
                 Severity::error,
                 "legacyUninitvar",
                 "$symbol:" + varname + "\nUninitialized variable: $symbol",
@@ -1542,7 +1582,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",
@@ -1556,7 +1596,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,
@@ -1572,20 +1612,10 @@ void CheckUninitVar::uninitStructMemberError(const Token *tok, const std::string
                 "$symbol:" + membername + "\nUninitialized struct member: $symbol", CWE_USE_OF_UNINITIALIZED_VARIABLE, Certainty::normal);
 }
 
-static bool isLeafDot(const Token* tok)
-{
-    if (!tok)
-        return false;
-    const Token * parent = tok->astParent();
-    if (!Token::simpleMatch(parent, "."))
-        return false;
-    if (parent->astOperand2() == tok)
-        return true;
-    return isLeafDot(parent);
-}
-
 void CheckUninitVar::valueFlowUninit()
 {
+    logChecker("CheckUninitVar::valueFlowUninit");
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     std::unordered_set<nonneg int> ids;
@@ -1593,7 +1623,7 @@ void CheckUninitVar::valueFlowUninit()
         // check every executable scope
         for (const Scope* scope : symbolDatabase->functionScopes) {
             for (const Token* tok = scope->bodyStart; tok != scope->bodyEnd; tok = tok->next()) {
-                if (isSizeOfEtc(tok)) {
+                if (isUnevaluated(tok)) {
                     tok = tok->linkAt(1);
                     continue;
                 }
@@ -1628,28 +1658,29 @@ void CheckUninitVar::valueFlowUninit()
                     const bool isarray = tok->variable()->isArray();
                     if (isarray && tok->variable()->isMember())
                         continue; // Todo: this is a bailout
-                    const bool ispointer = astIsPointer(tok) && !isarray;
-                    const bool deref = CheckNullPointer::isPointerDeRef(tok, unknown, mSettings);
-                    if (ispointer && v->indirect == 1 && !deref)
-                        continue;
-                    if (isarray && !deref)
-                        continue;
+                    if (isarray && tok->variable()->isStlType() && Token::simpleMatch(tok->astParent(), ".")) {
+                        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);
                     uninitderef = deref && v->indirect == 0;
                     const bool isleaf = isLeafDot(tok) || uninitderef;
-                    if (!isleaf && Token::Match(tok->astParent(), ". %name%") && (tok->astParent()->next()->varId() || tok->astParent()->next()->isEnumerator()))
+                    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, mTokenizer->isCPP()))
+                    if (!(Token::Match(tok->astParent(), ". %name% (|[") && uninitderef) &&
+                        isVariableChanged(tok, v->indirect, *mSettings))
                         continue;
                     bool inconclusive = false;
-                    if (isVariableChangedByFunctionCall(tok, v->indirect, mSettings, &inconclusive) || inconclusive)
+                    if (isVariableChangedByFunctionCall(tok, v->indirect, *mSettings, &inconclusive) || inconclusive)
                         continue;
                 }
                 uninitvarError(tok, *v);
@@ -1661,32 +1692,47 @@ void CheckUninitVar::valueFlowUninit()
     }
 }
 
-std::string CheckUninitVar::MyFileInfo::toString() const
+// NOLINTNEXTLINE(readability-non-const-parameter) - used as callback so we need to preserve the signature
+static bool isVariableUsage(const Settings &settings, const Token *vartok, MathLib::bigint *value)
 {
-    return CTU::toString(unsafeUsage);
+    (void)value;
+    return CheckUninitVar::isVariableUsage(vartok, settings.library, true, CheckUninitVar::Alloc::ARRAY);
 }
 
-Check::FileInfo *CheckUninitVar::getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const
+// a Clang-built executable will crash when using the anonymous MyFileInfo later on - so put it in a unique namespace for now
+// see https://trac.cppcheck.net/ticket/12108 for more details
+#ifdef __clang__
+inline namespace CheckUninitVar_internal
+#else
+namespace
+#endif
 {
-    const CheckUninitVar checker(tokenizer, settings, nullptr);
-    return checker.getFileInfo();
+    /* data for multifile checking */
+    class MyFileInfo : public Check::FileInfo {
+    public:
+        using Check::FileInfo::FileInfo;
+        /** function arguments that data are unconditionally read */
+        std::list<CTU::FileInfo::UnsafeUsage> unsafeUsage;
+
+        /** Convert data into xml string */
+        std::string toString() const override
+        {
+            return CTU::toString(unsafeUsage);
+        }
+    };
 }
 
-// NOLINTNEXTLINE(readability-non-const-parameter) - used as callback so we need to preserve the signature
-static bool isVariableUsage(const Check *check, const Token *vartok, MathLib::bigint *value)
-{
-    (void)value;
-    const CheckUninitVar *c = dynamic_cast<const CheckUninitVar *>(check);
-    return c && c->isVariableUsage(vartok, true, CheckUninitVar::Alloc::ARRAY);
+static bool isVariableUsage(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *value) {
+    return isVariableUsage(settings, argtok, &value->value);
 }
 
-Check::FileInfo *CheckUninitVar::getFileInfo() 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(mTokenizer, mSettings, this, ::isVariableUsage);
+    const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsage = CTU::getUnsafeUsage(tokenizer, settings, ::isVariableUsage);
     if (unsafeUsage.empty())
         return nullptr;
 
-    MyFileInfo *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo(tokenizer.list.getFiles()[0]);
     fileInfo->unsafeUsage = unsafeUsage;
     return fileInfo;
 }
@@ -1697,39 +1743,46 @@ Check::FileInfo * CheckUninitVar::loadFileInfoFromXml(const tinyxml2::XMLElement
     if (unsafeUsage.empty())
         return nullptr;
 
-    MyFileInfo *fileInfo = new MyFileInfo;
+    auto *fileInfo = new MyFileInfo;
     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<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
 {
-    if (!ctu)
+    (void)settings;
+
+    CheckUninitVar dummy(nullptr, &settings, &errorLogger);
+    dummy.
+    logChecker("CheckUninitVar::analyseWholeProgram");
+
+    if (fileInfo.empty())
         return false;
-    bool foundErrors = false;
-    (void)settings; // This argument is unused
 
-    const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> callsMap = ctu->getCallsMap();
+    const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> callsMap = ctu.getCallsMap();
+
+    bool foundErrors = false;
 
     for (const Check::FileInfo* fi1 : fileInfo) {
-        const MyFileInfo *fi = dynamic_cast<const MyFileInfo*>(fi1);
+        const auto *fi = dynamic_cast<const MyFileInfo*>(fi1);
         if (!fi)
             continue;
         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,
                                             "Using argument ARG",
                                             &functionCall,
-                                            false);
+                                            false,
+                                            settings.maxCtuDepth);
             if (locationList.empty())
                 continue;
 
-            const ErrorMessage errmsg(locationList,
-                                      emptyString,
+            const ErrorMessage errmsg(std::move(locationList),
+                                      fi->file0,
                                       Severity::error,
                                       "Using argument " + unsafeUsage.myArgumentName + " that points at uninitialized variable " + functionCall->callArgumentExpression,
                                       "ctuuninitvar",
@@ -1742,3 +1795,21 @@ bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo *ctu, const std::li
     }
     return foundErrors;
 }
+
+void CheckUninitVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+{
+    CheckUninitVar checkUninitVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    checkUninitVar.valueFlowUninit();
+    checkUninitVar.check();
+}
+
+void CheckUninitVar::getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const
+{
+    CheckUninitVar c(nullptr, settings, errorLogger);
+
+    ValueFlow::Value 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 8c4ccbccba0..b79e9c22be0 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-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
@@ -24,33 +24,30 @@
 
 #include "check.h"
 #include "config.h"
-#include "ctu.h"
 #include "mathlib.h"
 #include "errortypes.h"
-#include "vfvalue.h"
 
-#include <list>
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>
 
 class Scope;
 class Token;
-class Tokenizer;
 class Variable;
 class ErrorLogger;
 class Settings;
 class Library;
-
-namespace tinyxml2 {
-    class XMLElement;
+class Tokenizer;
+namespace ValueFlow
+{
+    class Value;
 }
 
-
 struct VariableValue {
-    explicit VariableValue(MathLib::bigint val = 0) : value(val), notEqual(false) {}
+    explicit VariableValue(MathLib::bigint val = 0) : value(val) {}
     MathLib::bigint value;
-    bool notEqual;
+    bool notEqual{};
 };
 
 /// @addtogroup Checks
@@ -60,35 +57,36 @@ 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()) {}
 
+    enum Alloc : std::uint8_t { NO_ALLOC, NO_CTOR_CALL, CTOR_CALL, ARRAY };
+
+    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;
+
+private:
     /** @brief This constructor is used when running checks. */
     CheckUninitVar(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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckUninitVar checkUninitVar(tokenizer, settings, errorLogger);
-        checkUninitVar.valueFlowUninit();
-        checkUninitVar.check();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     bool diag(const Token* tok);
     /** Check for uninitialized variables */
     void check();
     void checkScope(const Scope* scope, const std::set<std::string> &arrayTypeDefs);
     void checkStruct(const Token *tok, const Variable &structvar);
-    enum Alloc { NO_ALLOC, NO_CTOR_CALL, CTOR_CALL, ARRAY };
-    bool 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 Token* checkExpr(const Token* tok, const Variable& var, const Alloc alloc, bool known, bool* bailout = nullptr) const;
+    bool checkScopeForVariable(const Token *tok, const Variable& var, bool* possibleInit, bool* noreturn, Alloc* alloc, const std::string &membervar, std::map<nonneg int, VariableValue>& variableValue);
+    const Token* checkExpr(const Token* tok, const Variable& var, Alloc alloc, bool known, bool* bailout = nullptr) const;
     bool checkIfForWhileHead(const Token *startparentheses, const Variable& var, bool suppressErrors, bool isuninit, Alloc alloc, const std::string &membervar);
-    bool checkLoopBody(const Token *tok, const Variable& var, const Alloc alloc, const std::string &membervar, const bool suppressErrors);
-    const Token* checkLoopBodyRecursive(const Token *start, const Variable& var, const Alloc alloc, const std::string &membervar, bool &bailout) const;
+    bool checkLoopBody(const Token *tok, const Variable& var, Alloc alloc, const std::string &membervar, bool suppressErrors);
+    const Token* checkLoopBodyRecursive(const Token *start, const Variable& var, Alloc alloc, const std::string &membervar, bool &bailout, bool &alwaysReturns) const;
     void checkRhs(const Token *tok, const Variable &var, Alloc alloc, nonneg int number_of_if, const std::string &membervar);
-    static const Token *isVariableUsage(bool cpp, 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;
     static int isFunctionParUsage(const Token *vartok, const Library &library, bool pointer, Alloc alloc, int indirect = 0);
     int isFunctionParUsage(const Token *vartok, bool pointer, Alloc alloc, int indirect = 0) const;
     bool isMemberVariableAssignment(const Token *tok, const std::string &membervar) const;
@@ -97,30 +95,19 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     /** ValueFlow-based checking for uninitialized variables */
     void valueFlowUninit();
 
-    /* data for multifile checking */
-    class MyFileInfo : public Check::FileInfo {
-    public:
-        /** function arguments that data are unconditionally read */
-        std::list<CTU::FileInfo::UnsafeUsage> unsafeUsage;
-
-        /** Convert MyFileInfo data into xml string */
-        std::string toString() const override;
-    };
-
     /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const override;
+    Check::FileInfo *getFileInfo(const Tokenizer &tokenizer, const Settings &settings, const std::string& /*currentConfig*/) 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;
+    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);
     void uninitvarError(const Token *tok, const std::string &varname) {
-        ErrorPath errorPath;
-        uninitvarError(tok, varname, errorPath);
+        uninitvarError(tok, varname, ErrorPath{});
     }
     void uninitvarError(const Token *tok, const std::string &varname, Alloc alloc) {
         if (alloc == NO_CTOR_CALL || alloc == CTOR_CALL)
@@ -130,20 +117,9 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     }
     void uninitStructMemberError(const Token *tok, const std::string &membername);
 
-private:
     std::set<const Token*> mUninitDiags;
-    Check::FileInfo* getFileInfo() const;
-
-    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override
-    {
-        CheckUninitVar c(nullptr, settings, errorLogger);
 
-        ValueFlow::Value v{};
-
-        c.uninitvarError(nullptr, v);
-        c.uninitdataError(nullptr, "varname");
-        c.uninitStructMemberError(nullptr, "a.b");
-    }
+    void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override;
 
     static std::string myName() {
         return "Uninitialized variables";
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
index d9ca653be7f..7edaff6c241 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-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
@@ -20,6 +20,7 @@
 //---------------------------------------------------------------------------
 #include "checkunusedfunctions.h"
 
+#include "analyzerinfo.h"
 #include "astutils.h"
 #include "errorlogger.h"
 #include "errortypes.h"
@@ -33,29 +34,19 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstdlib>
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <functional>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <tuple>
 #include <utility>
 #include <vector>
 
-#include <tinyxml2.h>
-
-namespace CTU {
-    class FileInfo;
-}
+#include "xml.h"
 
 //---------------------------------------------------------------------------
 
-
-
-// Register this check class
-CheckUnusedFunctions CheckUnusedFunctions::instance;
-
-static const struct CWE CWE561(561U);   // Dead Code
+static const CWE CWE561(561U);   // Dead Code
 
 static std::string stripTemplateParameters(const std::string& funcName) {
     std::string name = funcName;
@@ -69,38 +60,69 @@ static std::string stripTemplateParameters(const std::string& funcName) {
 // FUNCTION USAGE - Check for unused functions etc
 //---------------------------------------------------------------------------
 
-void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char FileName[], const Settings *settings)
+static bool isRecursiveCall(const Token* ftok)
 {
-    const bool doMarkup = settings->library.markupFile(FileName);
+    return ftok->function() && ftok->function() == Scope::nestedInFunction(ftok->scope());
+}
+
+void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const Settings &settings)
+{
+    const char * const FileName = tokenizer.list.getFiles().front().c_str();
+
+    const bool doMarkup = settings.library.markupFile(FileName);
 
     // Function declarations..
     if (!doMarkup) {
         const SymbolDatabase* symbolDatabase = tokenizer.getSymbolDatabase();
         for (const Scope* scope : symbolDatabase->functionScopes) {
             const Function* func = scope->function;
-            if (!func || !func->token || scope->bodyStart->fileIndex() != 0)
+            if (!func || !func->token)
                 continue;
 
             // Don't warn about functions that are marked by __attribute__((constructor)) or __attribute__((destructor))
-            if (func->isAttributeConstructor() || func->isAttributeDestructor() || func->type != Function::eFunction || func->isOperator())
+            if (func->isAttributeConstructor() || func->isAttributeDestructor() || func->type != FunctionType::eFunction || func->isOperator())
+                continue;
+
+            if (func->isAttributeUnused() || func->isAttributeMaybeUnused())
                 continue;
 
             if (func->isExtern())
                 continue;
 
+            bool foundAllBaseClasses{};
+            if (const Function* ofunc = func->getOverriddenFunction(&foundAllBaseClasses)) {
+                if (!foundAllBaseClasses || ofunc->isPure())
+                    continue;
+            }
+            else if (func->isImplicitlyVirtual()) {
+                continue;
+            }
+
             mFunctionDecl.emplace_back(func);
 
             FunctionUsage &usage = mFunctions[stripTemplateParameters(func->name())];
 
-            if (!usage.lineNumber)
+            if (func->retDef && (func->retDef->isAttributeUnused() || func->retDef->isAttributeMaybeUnused())) {
+                usage.usedOtherFile = true;
+            }
+
+            if (!usage.lineNumber) {
                 usage.lineNumber = func->token->linenr();
+                usage.column = func->token->column();
+            }
+            usage.isC = func->token->isC();
+            usage.isStatic = func->isStatic();
+
+            // TODO: why always overwrite this but not the filename and line?
+            usage.fileIndex = func->token->fileIndex();
+            const std::string& fileName = tokenizer.list.file(func->token);
 
             // No filename set yet..
             if (usage.filename.empty()) {
-                usage.filename = tokenizer.list.getSourceFilePath();
+                usage.filename = fileName;
             }
             // Multiple files => filename = "+"
-            else if (usage.filename != tokenizer.list.getSourceFilePath()) {
+            else if (usage.filename != fileName) {
                 //func.filename = "+";
                 usage.usedOtherFile |= usage.usedSameFile;
             }
@@ -117,8 +139,8 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
             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 (settings.library.isexecutableblock(FileName, tok->str())) {
+            const Token * markupVarToken = tok->tokAt(settings.library.blockstartoffset(FileName));
             // not found
             if (!markupVarToken)
                 continue;
@@ -126,18 +148,18 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
             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() == settings.library.blockstart(FileName)) {
                     scope++;
                     start = false;
-                } else if (markupVarToken->str() == settings->library.blockend(FileName))
+                } else if (markupVarToken->str() == settings.library.blockend(FileName))
                     scope--;
-                else if (!settings->library.iskeyword(FileName, markupVarToken->str())) {
+                else if (!settings.library.iskeyword(FileName, markupVarToken->str())) {
                     mFunctionCalls.insert(markupVarToken->str());
                     if (mFunctions.find(markupVarToken->str()) != mFunctions.end())
                         mFunctions[markupVarToken->str()].usedOtherFile = true;
-                    else if (markupVarToken->next()->str() == "(") {
+                    else if (markupVarToken->strAt(1) == "(") {
                         FunctionUsage &func = mFunctions[markupVarToken->str()];
-                        func.filename = tokenizer.list.getSourceFilePath();
+                        func.filename = tokenizer.list.getFiles()[markupVarToken->fileIndex()];
                         if (func.filename.empty() || func.filename == "+")
                             func.usedOtherFile = true;
                         else
@@ -149,10 +171,10 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
         }
 
         if (!doMarkup // only check source files
-            && settings->library.isexporter(tok->str()) && tok->next() != nullptr) {
+            && settings.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 (settings.library.isexportedprefix(tok->str(), propToken->str())) {
                     const Token* nextPropToken = propToken->next();
                     const std::string& value = nextPropToken->str();
                     if (mFunctions.find(value) != mFunctions.end()) {
@@ -160,7 +182,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
                     }
                     mFunctionCalls.insert(value);
                 }
-                if (settings->library.isexportedsuffix(tok->str(), propToken->str())) {
+                if (settings.library.isexportedsuffix(tok->str(), propToken->str())) {
                     const Token* prevPropToken = propToken->previous();
                     const std::string& value = prevPropToken->str();
                     if (value != ")" && mFunctions.find(value) != mFunctions.end()) {
@@ -172,7 +194,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
             }
         }
 
-        if (doMarkup && settings->library.isimporter(FileName, tok->str()) && tok->next()) {
+        if (doMarkup && settings.library.isimporter(FileName, tok->str()) && tok->next()) {
             const Token * propToken = tok->next();
             if (propToken->next()) {
                 propToken = propToken->next();
@@ -188,8 +210,8 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
             }
         }
 
-        if (settings->library.isreflection(tok->str())) {
-            const int argIndex = settings->library.reflectionArgument(tok->str());
+        if (settings.library.isreflection(tok->str())) {
+            const int argIndex = settings.library.reflectionArgument(tok->str());
             if (argIndex >= 0) {
                 const Token * funcToken = tok->next();
                 int index = 0;
@@ -211,6 +233,13 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
             }
         }
 
+        if (tok->hasAttributeCleanup()) {
+            const std::string& funcname = tok->getAttributeCleanup();
+            mFunctions[funcname].usedOtherFile = true;
+            mFunctionCalls.insert(funcname);
+            continue;
+        }
+
         const Token *funcname = nullptr;
 
         if (doMarkup)
@@ -223,7 +252,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
             funcname = tok->next();
             while (Token::Match(funcname, "%name% :: %name%"))
                 funcname = funcname->tokAt(2);
-        } else if (tok->scope()->type != Scope::ScopeType::eEnum && (Token::Match(tok, "[;{}.,()[=+-/|!?:]") || Token::Match(tok, "return|throw"))) {
+        } else if (tok->scope()->type != ScopeType::eEnum && (Token::Match(tok, "[;{}.,()[=+-/|!?:]") || Token::Match(tok, "return|throw"))) {
             funcname = tok->next();
             if (funcname && funcname->str() == "&")
                 funcname = funcname->next();
@@ -232,15 +261,15 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
             while (Token::Match(funcname, "%name% :: %name%"))
                 funcname = funcname->tokAt(2);
 
-            if (!Token::Match(funcname, "%name% [(),;]:}>]") || funcname->varId())
+            if (!Token::Match(funcname, "%name% [(),;]:}<>]"))
                 continue;
         }
 
-        if (!funcname || funcname->isKeyword() || funcname->isStandardType())
+        if (!funcname || funcname->isKeyword() || funcname->isStandardType() || funcname->varId() || funcname->enumerator() || funcname->type())
             continue;
 
         // funcname ( => Assert that the end parentheses isn't followed by {
-        if (Token::Match(funcname, "%name% (|<")) {
+        if (Token::Match(funcname, "%name% (|<") && funcname->linkAt(1)) {
             const Token *ftok = funcname->next();
             if (ftok->str() == "<")
                 ftok = ftok->link();
@@ -249,16 +278,18 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
         }
 
         if (funcname) {
-            const auto baseName = stripTemplateParameters(funcname->str());
+            if (isRecursiveCall(funcname))
+                continue;
+            auto baseName = stripTemplateParameters(funcname->str());
             FunctionUsage &func = mFunctions[baseName];
-            const std::string& called_from_file = tokenizer.list.getSourceFilePath();
+            const std::string& called_from_file = tokenizer.list.getFiles()[funcname->fileIndex()];
 
             if (func.filename.empty() || func.filename == "+" || func.filename != called_from_file)
                 func.usedOtherFile = true;
             else
                 func.usedSameFile = true;
 
-            mFunctionCalls.insert(baseName);
+            mFunctionCalls.insert(std::move(baseName));
         }
     }
 }
@@ -311,12 +342,37 @@ static bool isOperatorFunction(const std::string & funcName)
     return std::find(additionalOperators.cbegin(), additionalOperators.cend(), funcName.substr(operatorPrefix.length())) != additionalOperators.cend();
 }
 
-bool CheckUnusedFunctions::check(ErrorLogger * const errorLogger, const Settings& settings) const
+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, column);
+        locationList.back().fileIndex = fileIndex;
+    }
+
+    const ErrorMessage errmsg(std::move(locationList), "", Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' should have static linkage since it is not used outside of its translation unit.", "staticFunction", Certainty::normal);
+    errorLogger.reportErr(errmsg);
+}
+
+
+#define logChecker(id) \
+    do { \
+        const ErrorMessage errmsg({}, nullptr, Severity::internal, "logChecker", (id), CWE(0U), Certainty::normal); \
+        errorLogger.reportErr(errmsg); \
+    } while (false)
+
+bool CheckUnusedFunctions::check(const Settings& settings, ErrorLogger& errorLogger) const
 {
-    using ErrorParams = std::tuple<std::string, unsigned int, std::string>;
+    logChecker("CheckUnusedFunctions::check"); // unusedFunction
+
+    // 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;
 
-    for (std::unordered_map<std::string, FunctionUsage>::const_iterator it = mFunctions.cbegin(); it != mFunctions.cend(); ++it) {
+    for (auto it = mFunctions.cbegin(); it != mFunctions.cend(); ++it) {
         const FunctionUsage &func = it->second;
         if (func.usedOtherFile || func.filename.empty())
             continue;
@@ -328,66 +384,57 @@ bool CheckUnusedFunctions::check(ErrorLogger * const errorLogger, const Settings
             std::string filename;
             if (func.filename != "+")
                 filename = func.filename;
-            errors.emplace_back(filename, func.lineNumber, it->first);
-        } else if (!func.usedOtherFile) {
-            /** @todo add error message "function is only used in <file> it can be static" */
-            /*
-               std::ostringstream errmsg;
-               errmsg << "The function '" << it->first << "' is only used in the file it was declared in so it should have local linkage.";
-               mErrorLogger->reportErr( errmsg.str() );
-               errors = true;
-             */
+            errors.emplace_back(filename, func.fileIndex, func.lineNumber, func.column, it->first);
+        } else if (func.isC && !func.isStatic && !func.usedOtherFile) {
+            std::string filename;
+            if (func.filename != "+")
+                filename = func.filename;
+            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));
+        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), std::get<4>(e));
+
     return !errors.empty();
 }
 
-void CheckUnusedFunctions::unusedFunctionError(ErrorLogger * const errorLogger,
-                                               const std::string &filename, unsigned int lineNumber,
+void CheckUnusedFunctions::unusedFunctionError(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);
+        locationList.emplace_back(filename, lineNumber, column);
+        locationList.back().fileIndex = fileIndex;
     }
 
-    const ErrorMessage errmsg(locationList, emptyString, Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' is never used.", "unusedFunction", CWE561, Certainty::normal);
-    if (errorLogger)
-        errorLogger->reportErr(errmsg);
-    else
-        reportError(errmsg);
-}
-
-Check::FileInfo *CheckUnusedFunctions::getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const
-{
-    if (!settings->checks.isEnabled(Checks::unusedFunction))
-        return nullptr;
-    if (settings->useSingleJob() && settings->buildDir.empty())
-        instance.parseTokens(*tokenizer, tokenizer->list.getFiles().front().c_str(), settings);
-    return nullptr;
-}
-
-bool CheckUnusedFunctions::analyseWholeProgram(const CTU::FileInfo *ctu, const std::list<Check::FileInfo*> &fileInfo, const Settings& settings, ErrorLogger &errorLogger)
-{
-    (void)ctu;
-    (void)fileInfo;
-    return check(&errorLogger, settings);
+    const ErrorMessage errmsg(std::move(locationList), "", Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' is never used.", "unusedFunction", CWE561, Certainty::normal);
+    errorLogger.reportErr(errmsg);
 }
 
 CheckUnusedFunctions::FunctionDecl::FunctionDecl(const Function *f)
-    : functionName(f->name()), lineNumber(f->token->linenr())
+    : functionName(f->name())
+    , fileIndex(f->token->fileIndex())
+    , lineNumber(f->token->linenr())
+    , column(f->token->column())
 {}
 
-std::string CheckUnusedFunctions::analyzerInfo() const
+std::string CheckUnusedFunctions::analyzerInfo(const Tokenizer &tokenizer) const
 {
     std::ostringstream ret;
     for (const FunctionDecl &functionDecl : mFunctionDecl) {
         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";
@@ -397,64 +444,47 @@ std::string CheckUnusedFunctions::analyzerInfo() 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;
     };
 }
 
-void CheckUnusedFunctions::analyseWholeProgram(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir)
+// 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;
-                if (std::strcmp(e2->Name(),"functioncall") == 0) {
-                    calls.insert(functionName);
-                    continue;
-                }
-                if (std::strcmp(e2->Name(),"functiondecl") == 0) {
-                    const char* lineNumber = e2->Attribute("lineNumber");
-                    if (lineNumber)
-                        decls[functionName] = Location(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));
                 }
             }
         }
-    }
+    };
 
-    for (std::map<std::string, Location>::const_iterator decl = decls.cbegin(); decl != decls.cend(); ++decl) {
+    AnalyzerInformation::processFilesTxt(buildDir, handler);
+
+    for (auto decl = decls.cbegin(); decl != decls.cend(); ++decl) {
         const std::string &functionName = stripTemplateParameters(decl->first);
 
         if (settings.library.isentrypoint(functionName))
@@ -462,7 +492,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, loc.lineNumber, functionName);
+            unusedFunctionError(errorLogger, loc.fileName, /*fileIndex*/ 0, loc.lineNumber, loc.column, functionName);
+        }
+    }
+}
+
+void CheckUnusedFunctions::updateFunctionData(const CheckUnusedFunctions& check)
+{
+    for (const auto& entry : check.mFunctions)
+    {
+        FunctionUsage &usage = mFunctions[entry.first];
+        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;
+        usage.usedOtherFile |= entry.second.usedOtherFile;
+        usage.usedSameFile |= entry.second.usedSameFile;
     }
+    mFunctionDecl.insert(mFunctionDecl.cend(), check.mFunctionDecl.cbegin(), check.mFunctionDecl.cend());
+    mFunctionCalls.insert(check.mFunctionCalls.cbegin(), check.mFunctionCalls.cend());
 }
diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
index d635b817d3e..6f10e3446eb 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-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
@@ -22,7 +22,6 @@
 #define checkunusedfunctionsH
 //---------------------------------------------------------------------------
 
-#include "check.h"
 #include "config.h"
 
 #include <list>
@@ -35,80 +34,50 @@ class Function;
 class Settings;
 class Tokenizer;
 
-namespace CTU {
-    class FileInfo;
-}
-
-/// @addtogroup Checks
 /** @brief Check for functions never called */
 /// @{
 
-class CPPCHECKLIB CheckUnusedFunctions : public Check {
+class CPPCHECKLIB CheckUnusedFunctions {
 public:
-    /** @brief This constructor is used when registering the CheckUnusedFunctions */
-    CheckUnusedFunctions() : Check(myName()) {}
-
-    /** @brief This constructor is used when running checks. */
-    CheckUnusedFunctions(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
-        : Check(myName(), tokenizer, settings, errorLogger) {}
-
-    static void clear() {
-        instance.mFunctions.clear();
-        instance.mFunctionCalls.clear();
-    }
+    CheckUnusedFunctions() = default;
 
     // Parse current tokens and determine..
     // * Check what functions are used
     // * What functions are declared
-    void parseTokens(const Tokenizer &tokenizer, const char FileName[], const Settings *settings);
+    void parseTokens(const Tokenizer &tokenizer, const Settings &settings);
 
-    // Return true if an error is reported.
-    bool check(ErrorLogger * const errorLogger, const Settings& settings) const;
+    std::string analyzerInfo(const Tokenizer &tokenizer) const;
 
-    /** @brief Parse current TU and extract file info */
-    Check::FileInfo *getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const override;
+    static void analyseWholeProgram(const Settings &settings, ErrorLogger& errorLogger, const std::string &buildDir);
 
-    /** @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;
-
-    static CheckUnusedFunctions instance;
+    static void getErrorMessages(ErrorLogger &errorLogger) {
+        unusedFunctionError(errorLogger, "", 0, 0, 0, "funcName");
+        staticFunctionError(errorLogger, "", 0, 0, 0, "funcName");
+    }
 
-    std::string analyzerInfo() const;
+    // Return true if an error is reported.
+    bool check(const Settings& settings, ErrorLogger& errorLogger) const;
 
-    /** @brief Combine and analyze all analyzerInfos for all TUs */
-    static void analyseWholeProgram(const Settings &settings, ErrorLogger * const errorLogger, const std::string &buildDir);
+    void updateFunctionData(const CheckUnusedFunctions& check);
 
 private:
-
-    void getErrorMessages(ErrorLogger *errorLogger, const Settings * /*settings*/) const override {
-        CheckUnusedFunctions::unusedFunctionError(errorLogger, emptyString, 0, "funcName");
-    }
-
-    void runChecks(const Tokenizer * /*tokenizer*/, const Settings * /*settings*/, ErrorLogger * /*errorLogger*/) override {}
-
-    /**
-     * Dummy implementation, just to provide error for --errorlist
-     */
-    static void unusedFunctionError(ErrorLogger * const errorLogger,
-                                    const std::string &filename, unsigned int lineNumber,
+    static void unusedFunctionError(ErrorLogger& errorLogger,
+                                    const std::string &filename, nonneg int fileIndex, nonneg int lineNumber, nonneg int column,
                                     const std::string &funcname);
 
-    static std::string myName() {
-        return "Unused functions";
-    }
-
-    std::string classInfo() const override {
-        return "Check for functions that are never called\n";
-    }
-
-    class CPPCHECKLIB FunctionUsage {
-    public:
-        FunctionUsage() : lineNumber(0), usedSameFile(false), usedOtherFile(false) {}
+    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;
-        bool usedSameFile;
-        bool usedOtherFile;
+        nonneg int lineNumber{};
+        nonneg int column{};
+        nonneg int fileIndex{};
+        bool usedSameFile{};
+        bool usedOtherFile{};
+        bool isC{};
+        bool isStatic{};
     };
 
     std::unordered_map<std::string, FunctionUsage> mFunctions;
@@ -117,7 +86,9 @@ class CPPCHECKLIB CheckUnusedFunctions : public Check {
     public:
         explicit FunctionDecl(const Function *f);
         std::string functionName;
-        unsigned int lineNumber;
+        nonneg int fileIndex;
+        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 7946f337f71..ddaffa0f817 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-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
@@ -24,16 +24,16 @@
 #include "errortypes.h"
 #include "fwdanalysis.h"
 #include "library.h"
-#include "preprocessor.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <list>
 #include <set>
 #include <utility>
@@ -45,8 +45,8 @@ namespace {
     CheckUnusedVar instance;
 }
 
-static const struct CWE CWE563(563U);   // Assignment to Variable without Use ('Unused Variable')
-static const struct CWE CWE665(665U);   // Improper Initialization
+static const CWE CWE563(563U);   // Assignment to Variable without Use ('Unused Variable')
+static const CWE CWE665(665U);   // Improper Initialization
 
 /** Is scope a raii class scope */
 static bool isRaiiClassScope(const Scope *classScope)
@@ -103,7 +103,7 @@ static bool isRaiiClass(const ValueType *valueType, bool cpp, bool defaultReturn
  */
 class Variables {
 public:
-    enum VariableType { standard, array, pointer, reference, pointerArray, referenceArray, pointerPointer, none };
+    enum VariableType : std::uint8_t { standard, array, pointer, reference, pointerArray, referenceArray, pointerPointer, none };
 
     /** Store information about variable usage */
     class VariableUsage {
@@ -148,6 +148,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;
     }
@@ -199,7 +208,7 @@ void Variables::alias(nonneg int varid1, nonneg int varid2, bool replace)
 
     if (replace) {
         // remove var1 from all aliases
-        for (std::set<nonneg int>::const_iterator i = var1->_aliases.cbegin(); i != var1->_aliases.cend(); ++i) {
+        for (auto i = var1->_aliases.cbegin(); i != var1->_aliases.cend(); ++i) {
             VariableUsage *temp = find(*i);
 
             if (temp)
@@ -211,7 +220,7 @@ void Variables::alias(nonneg int varid1, nonneg int varid2, bool replace)
     }
 
     // var1 gets all var2s aliases
-    for (std::set<nonneg int>::const_iterator i = var2->_aliases.cbegin(); i != var2->_aliases.cend(); ++i) {
+    for (auto i = var2->_aliases.cbegin(); i != var2->_aliases.cend(); ++i) {
         if (*i != varid1)
             var1->_aliases.insert(*i);
     }
@@ -231,9 +240,7 @@ void Variables::clearAliases(nonneg int varid)
 
     if (usage) {
         // remove usage from all aliases
-        std::set<nonneg int>::const_iterator i;
-
-        for (i = usage->_aliases.cbegin(); i != usage->_aliases.cend(); ++i) {
+        for (auto i = usage->_aliases.cbegin(); i != usage->_aliases.cend(); ++i) {
             VariableUsage *temp = find(*i);
 
             if (temp)
@@ -250,7 +257,7 @@ void Variables::eraseAliases(nonneg int varid)
     VariableUsage *usage = find(varid);
 
     if (usage) {
-        for (std::set<nonneg int>::const_iterator aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases)
+        for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases)
             erase(*aliases);
     }
 }
@@ -266,7 +273,7 @@ void Variables::addVar(const Variable *var,
                        bool write_)
 {
     if (var->declarationId() > 0) {
-        mVarUsage.insert(std::make_pair(var->declarationId(), VariableUsage(var, type, false, write_, false)));
+        mVarUsage.emplace(var->declarationId(), VariableUsage(var, type, false, write_, false));
     }
 }
 
@@ -330,7 +337,7 @@ void Variables::writeAliases(nonneg int varid, const Token* tok)
     VariableUsage *usage = find(varid);
 
     if (usage) {
-        for (std::set<nonneg int>::const_iterator aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
+        for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
             VariableUsage *aliased = find(*aliases);
 
             if (aliased) {
@@ -355,7 +362,7 @@ void Variables::use(nonneg int varid, const Token* tok)
         usage->use();
         usage->_lastAccess = tok;
 
-        for (std::set<nonneg int>::const_iterator aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
+        for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
             VariableUsage *aliased = find(*aliases);
 
             if (aliased) {
@@ -376,7 +383,7 @@ void Variables::modified(nonneg int varid, const Token* tok)
         usage->_modified = true;
         usage->_lastAccess = tok;
 
-        for (std::set<nonneg int>::const_iterator aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
+        for (auto aliases = usage->_aliases.cbegin(); aliases != usage->_aliases.cend(); ++aliases) {
             VariableUsage *aliased = find(*aliases);
 
             if (aliased) {
@@ -390,7 +397,7 @@ void Variables::modified(nonneg int varid, const Token* tok)
 Variables::VariableUsage *Variables::find(nonneg int varid)
 {
     if (varid) {
-        const std::map<nonneg int, VariableUsage>::iterator i = mVarUsage.find(varid);
+        const auto i = mVarUsage.find(varid);
         if (i != mVarUsage.end())
             return &i->second;
     }
@@ -476,6 +483,8 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
                     tok = tok->next();
 
                 tok = tok->next();
+                if (!tok)
+                    return tokOld;
                 if (tok->str() == "*")
                     tok = tok->next();
 
@@ -523,7 +532,7 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
                             else {
                                 // no other assignment in this scope
                                 if (var1->_assignments.find(scope) == var1->_assignments.end() ||
-                                    scope->type == Scope::eSwitch) {
+                                    scope->type == ScopeType::eSwitch) {
                                     // nothing to replace
                                     // cppcheck-suppress duplicateBranch - remove when TODO below is address
                                     if (var1->_assignments.empty())
@@ -635,7 +644,7 @@ static bool isPartOfClassStructUnion(const Token* tok)
         if (tok->str() == "}" || tok->str() == ")")
             tok = tok->link();
         else if (tok->str() == "(")
-            return (false);
+            return false;
         else if (tok->str() == "{") {
             return (tok->strAt(-1) == "struct" || tok->strAt(-2) == "struct" || tok->strAt(-1) == "class" || tok->strAt(-2) == "class" || tok->strAt(-1) == "union" || tok->strAt(-2) == "union");
         }
@@ -690,24 +699,24 @@ static void useFunctionArgs(const Token *tok, Variables& variables)
 //---------------------------------------------------------------------------
 // Usage of function variables
 //---------------------------------------------------------------------------
-void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const scope, Variables& variables)
+void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const scope, Variables& variables) const
 {
     // Find declarations if the scope is executable..
     if (scope->isExecutable()) {
         // Find declarations
-        for (std::list<Variable>::const_iterator i = scope->varlist.cbegin(); i != scope->varlist.cend(); ++i) {
+        for (auto i = scope->varlist.cbegin(); i != scope->varlist.cend(); ++i) {
             if (i->isThrow() || i->isExtern())
                 continue;
             Variables::VariableType type = Variables::none;
-            if (i->isArray() && (i->nameToken()->previous()->str() == "*" || i->nameToken()->strAt(-2) == "*"))
+            if (i->isArray() && (i->nameToken()->strAt(-1) == "*" || i->nameToken()->strAt(-2) == "*"))
                 type = Variables::pointerArray;
-            else if (i->isArray() && i->nameToken()->previous()->str() == "&")
+            else if (i->isArray() && i->nameToken()->strAt(-1) == "&")
                 type = Variables::referenceArray;
             else if (i->isArray())
-                type = (i->dimensions().size() == 1U) ? Variables::array : Variables::pointerArray;
+                type = Variables::array;
             else if (i->isReference() && !(i->valueType() && i->valueType()->type == ValueType::UNKNOWN_TYPE && Token::simpleMatch(i->typeStartToken(), "auto")))
                 type = Variables::reference;
-            else if (i->nameToken()->previous()->str() == "*" && i->nameToken()->strAt(-2) == "*")
+            else if (i->nameToken()->strAt(-1) == "*" && i->nameToken()->strAt(-2) == "*")
                 type = Variables::pointerPointer;
             else if (i->isPointerToArray())
                 type = Variables::pointerPointer;
@@ -715,10 +724,12 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                 type = Variables::pointer;
             else if (mTokenizer->isC() ||
                      i->typeEndToken()->isStandardType() ||
-                     isRecordTypeWithoutSideEffects(i->type()) ||
+                     i->isStlType() ||
+                     mTokenizer->getSymbolDatabase()->isRecordTypeWithoutSideEffects(i->type()) ||
                      mSettings->library.detectContainer(i->typeStartToken()) ||
-                     i->isStlType())
+                     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();
@@ -731,7 +742,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                     variables.addVar(&*i, type, true);
                     break;
                 } else if (defValTok->str() == ";" || defValTok->str() == "," || defValTok->str() == ")") {
-                    variables.addVar(&*i, type, i->isStatic() && i->scope()->type != Scope::eFunction);
+                    variables.addVar(&*i, type, i->isStatic() && i->scope()->type != ScopeType::eFunction);
                     break;
                 }
             }
@@ -743,7 +754,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
 
             if (defValTok && defValTok->next()) {
                 // simple assignment "var = 123"
-                if (defValTok->str() == "=" && defValTok->next()->str() != "{") {
+                if (defValTok->str() == "=" && defValTok->strAt(1) != "{") {
                     doAssignment(variables, i->nameToken(), false, scope);
                 } else {
                     // could be "var = {...}" OR "var{...}" (since C++11)
@@ -770,7 +781,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
 
     // Check variable usage
     const Token *tok;
-    if (scope->type == Scope::eFunction)
+    if (scope->type == ScopeType::eFunction)
         tok = scope->bodyStart->next();
     else
         tok = scope->classDef->next();
@@ -794,9 +805,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 +849,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)) ||
-            (mTokenizer->isCPP() && (Token::Match(tok, "delete %var% ;") || Token::Match(tok, "delete [ ] %var% ;")))) {
+            (tok->isCpp() && (Token::Match(tok, "delete %var% ;") || Token::Match(tok, "delete [ ] %var% ;")))) {
             nonneg int varid = 0;
             if (tok->str() != "delete") {
                 const Token *varTok = tok->tokAt(2);
@@ -955,14 +965,14 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
                         const Token *type = allocFuncCallToken->next();
 
                         // skip nothrow
-                        if (mTokenizer->isCPP() && (Token::simpleMatch(type, "( nothrow )") ||
-                                                    Token::simpleMatch(type, "( std :: nothrow )")))
+                        if (type->isCpp() && (Token::simpleMatch(type, "( nothrow )") ||
+                                              Token::simpleMatch(type, "( std :: nothrow )")))
                             type = type->link()->next();
 
                         // 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;
                         }
                     }
@@ -1009,7 +1019,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
 
         // assignment
         else if ((Token::Match(tok, "%name% [") && Token::simpleMatch(skipBracketsAndMembers(tok->next()), "=")) ||
-                 (Token::simpleMatch(tok, "* (") && Token::simpleMatch(tok->next()->link(), ") ="))) {
+                 (tok->isUnaryOp("*") && astIsLHS(tok) && Token::simpleMatch(tok->astParent(), "=") && Token::simpleMatch(tok->astOperand1(), "+"))) {
             const Token *eq = tok;
             while (eq && !eq->isAssignmentOp())
                 eq = eq->astParent();
@@ -1028,7 +1038,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             if (var) {
                 // Consider allocating memory separately because allocating/freeing alone does not constitute using the variable
                 if (var->mType == Variables::pointer &&
-                    ((mTokenizer->isCPP() && Token::simpleMatch(skipBrackets(tok->next()), "= new")) ||
+                    ((tok->isCpp() && Token::simpleMatch(skipBrackets(tok->next()), "= new")) ||
                      (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) {
@@ -1041,7 +1051,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             }
         }
 
-        else if (mTokenizer->isCPP() && Token::Match(tok, "[;{}] %var% <<")) {
+        else if (tok->isCpp() && Token::Match(tok, "[;{}] %var% <<")) {
             variables.erase(tok->next()->varId());
         }
 
@@ -1051,31 +1061,33 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             } else // addressof
                 variables.use(tok->next()->varId(), tok); // use = read + write
         } else if (Token::Match(tok, ">>|>>= %name%")) {
-            if (isLikelyStreamRead(mTokenizer->isCPP(), tok))
+            if (isLikelyStreamRead(tok))
                 variables.use(tok->next()->varId(), tok); // use = read + write
             else
                 variables.read(tok->next()->varId(), tok);
         } else if (Token::Match(tok, "%var% >>|&") && Token::Match(tok->previous(), "[{};:]")) {
             variables.read(tok->varId(), tok);
-        } else if (isLikelyStreamRead(mTokenizer->isCPP(),tok->previous())) {
+        } else if (isLikelyStreamRead(tok->previous())) {
             variables.use(tok->varId(), tok);
         }
 
         // function parameter
         else if (Token::Match(tok, "[(,] %var% [")) {
             variables.use(tok->next()->varId(), tok);   // use = read + write
-        } else if (Token::Match(tok, "[(,] %var% [,)]") && tok->previous()->str() != "*") {
+        } else if (Token::Match(tok, "[(,] %var% [,)]") && tok->strAt(-1) != "*") {
             variables.use(tok->next()->varId(), tok);   // use = read + write
         } else if (Token::Match(tok, "[(,] & %var% [,)]")) {
             variables.eraseAll(tok->tokAt(2)->varId());
         } else if (Token::Match(tok, "[(,] (") &&
-                   Token::Match(tok->next()->link(), ") %var% [,)]")) {
-            variables.use(tok->next()->link()->next()->varId(), tok);   // use = read + write
-        } else if (Token::Match(tok, "[(,] *| %var% =")) {
-            tok = tok->next();
-            if (tok->str() == "*")
-                tok = tok->next();
-            variables.use(tok->varId(), tok);
+                   Token::Match(tok->linkAt(1), ") %var% [,)[]")) {
+            variables.use(tok->linkAt(1)->next()->varId(), tok);   // use = read + write
+        } else if (Token::Match(tok, "[(,] *| *| %var%")) {
+            const Token* vartok = tok->next();
+            while (vartok->str() == "*")
+                vartok = vartok->next();
+            if (!(vartok->variable() && vartok == vartok->variable()->nameToken()) &&
+                !(tok->str() == "(" && !Token::Match(tok->previous(), "%name%")))
+                variables.use(vartok->varId(), vartok);
         }
 
         // function
@@ -1090,7 +1102,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
         }
 
         else if (Token::Match(tok->previous(), "[{,] %var% [,}]")) {
-            variables.read(tok->varId(), tok);
+            variables.use(tok->varId(), tok);
         }
 
         else if (tok->varId() && Token::Match(tok, "%var% .")) {
@@ -1108,7 +1120,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             variables.readAll(tok->next()->varId(), tok);
         }
 
-        else if (tok->varId() && !isVarDecl(tok) && tok->next() && (tok->next()->str() == ")" || tok->next()->isExtendedOp())) {
+        else if (tok->varId() && !isVarDecl(tok) && tok->next() && (tok->strAt(1) == ")" || tok->next()->isExtendedOp())) {
             if (Token::Match(tok->tokAt(-2), "%name% ( %var% [,)]") &&
                 !(tok->tokAt(-2)->variable() && tok->tokAt(-2)->variable()->isReference()))
                 variables.use(tok->varId(), tok);
@@ -1141,17 +1153,29 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             }
         } else if (tok->variable() && tok->variable()->isClass() && tok->variable()->type() &&
                    (tok->variable()->type()->needInitialization == Type::NeedInitialization::False) &&
-                   tok->next()->str() == ";") {
+                   tok->strAt(1) == ";") {
             variables.write(tok->varId(), tok);
         }
     }
 }
 
+static bool isReturnedByRef(const Variable* var, const Function* func)
+{
+    if (!func || !Function::returnsReference(func, true))
+        return false;
+    const std::vector<const Token*> returns = Function::findReturns(func);
+    return std::any_of(returns.begin(), returns.end(), [var](const Token* tok) {
+        return tok->varId() == var->declarationId();
+    });
+}
+
 void CheckUnusedVar::checkFunctionVariableUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->checkLibrary)
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->checkLibrary && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
+    logChecker("CheckUnusedVar::checkFunctionVariableUsage"); // style
+
     // Parse all executing scopes..
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
@@ -1168,10 +1192,27 @@ void CheckUnusedVar::checkFunctionVariableUsage()
     for (const Scope * scope : symbolDatabase->functionScopes) {
         // Bailout when there are lambdas or inline functions
         // TODO: Handle lambdas and inline functions properly
-        if (scope->hasInlineOrLambdaFunction())
-            continue;
+        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;
 
         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;
@@ -1181,6 +1222,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), ") ="))
@@ -1197,19 +1248,22 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             if (!isAssignment && !isInitialization && !isIncrementOrDecrement)
                 continue;
 
+            bool isTrivialInit = false;
             if (isInitialization && Token::Match(tok, "%var% { }")) // don't warn for trivial initialization
-                continue;
+                isTrivialInit = true;
 
             if (isIncrementOrDecrement && tok->astParent() && precedes(tok, tok->astOperand1()))
                 continue;
 
-            if (tok->str() == "=" && !(tok->valueType() && tok->valueType()->pointer) && isRaiiClass(tok->valueType(), mTokenizer->isCPP(), false))
+            if (tok->str() == "=" && !(tok->valueType() && tok->valueType()->pointer) && isRaiiClass(tok->valueType(), tok->isCpp(), false))
                 continue;
 
             const bool isPointer = tok->valueType() && (tok->valueType()->pointer || tok->valueType()->type == ValueType::SMART_POINTER);
 
             if (tok->isName()) {
-                if (isRaiiClass(tok->valueType(), mTokenizer->isCPP(), false))
+                if (isRaiiClass(tok->valueType(), tok->isCpp(), false) ||
+                    (tok->valueType() && tok->valueType()->type == ValueType::RECORD &&
+                     (!tok->valueType()->typeScope || !symbolDatabase->isRecordTypeWithoutSideEffects(tok->valueType()->typeScope->definedType))))
                     continue;
                 tok = tok->next();
             }
@@ -1229,12 +1283,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();
@@ -1246,6 +1294,13 @@ void CheckUnusedVar::checkFunctionVariableUsage()
             const Variable *op1Var = op1tok ? op1tok->variable() : nullptr;
             if (!op1Var && Token::Match(tok, "(|{") && tok->previous() && tok->previous()->variable())
                 op1Var = tok->previous()->variable();
+            if (hasLambdaOrInline) {
+                if (!op1Var || !lambdaOrInlineStart)
+                    continue;
+                if (precedes(op1Var->nameToken(), lambdaOrInlineStart))
+                    continue;
+            }
+
             std::string bailoutTypeName;
             if (op1Var) {
                 if (op1Var->isReference() && op1Var->nameToken() != tok->astOperand1())
@@ -1269,11 +1324,11 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                     (!op1Var->valueType() || op1Var->valueType()->type == ValueType::Type::UNKNOWN_TYPE)) {
                     // Check in the library if we should bailout or not..
                     std::string typeName = op1Var->getTypeName();
-                    if (typeName.compare(0, 2, "::") == 0)
+                    if (startsWith(typeName, "::"))
                         typeName.erase(typeName.begin(), typeName.begin() + 2);
                     switch (mSettings->library.getTypeCheck("unusedvar", typeName)) {
                     case Library::TypeCheck::def:
-                        bailoutTypeName = typeName;
+                        bailoutTypeName = std::move(typeName);
                         break;
                     case Library::TypeCheck::check:
                         break;
@@ -1293,10 +1348,10 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                 expr = tok->previous();
 
             // Is variable in lhs a union member?
-            if (tok->previous() && tok->previous()->variable() && tok->previous()->variable()->nameToken()->scope()->type == Scope::eUnion)
+            if (tok->previous() && tok->previous()->variable() && tok->previous()->variable()->nameToken()->scope()->type == ScopeType::eUnion)
                 continue;
 
-            FwdAnalysis fwdAnalysis(mTokenizer->isCPP(), mSettings->library);
+            FwdAnalysis fwdAnalysis(*mSettings);
             const Token* scopeEnd = ValueFlow::getEndOfExprScope(expr, scope, /*smallest*/ false);
             if (fwdAnalysis.unusedValue(expr, start, scopeEnd)) {
                 if (!bailoutTypeName.empty()) {
@@ -1304,10 +1359,16 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                         reportLibraryCfgError(tok, bailoutTypeName);
                     continue;
                 }
+                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);
+                }
             }
         }
 
@@ -1318,7 +1379,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
 
 
         // Check usage of all variables in the current scope..
-        for (std::map<nonneg int, Variables::VariableUsage>::const_iterator it = variables.varUsage().cbegin();
+        for (auto it = variables.varUsage().cbegin();
              it != variables.varUsage().cend();
              ++it) {
             const Variables::VariableUsage &usage = it->second;
@@ -1354,12 +1415,15 @@ void CheckUnusedVar::checkFunctionVariableUsage()
                 unassignedVariableError(usage._var->nameToken(), varname);
             }
             // variable has been read but not written
-            else if (!usage._write && !usage._allocateMemory && var && !var->isStlType() && !isEmptyType(var->type()))
+            else if (!usage._write && !usage._allocateMemory && var && !var->isStlType() && !isEmptyType(var->type()) &&
+                     !(var->type() && var->type()->needInitialization == Type::NeedInitialization::False) &&
+                     !(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) {
                 const Token* vnt = var->nameToken();
                 bool error = false;
-                if (vnt->next()->isSplittedVarDeclEq()) {
+                if (vnt->next()->isSplittedVarDeclEq() || (!var->isReference() && vnt->strAt(1) == "=")) {
                     const Token* nextStmt = vnt->tokAt(2);
                     if (nextStmt->isExpandedMacro()) {
                         const Token* parent = nextStmt;
@@ -1397,7 +1461,7 @@ void CheckUnusedVar::checkFunctionVariableUsage()
 
 void CheckUnusedVar::unusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     reportError(tok, Severity::style, "unusedVariable", "$symbol:" + varname + "\nUnused variable: $symbol", CWE563, Certainty::normal);
@@ -1405,7 +1469,7 @@ void CheckUnusedVar::unusedVariableError(const Token *tok, const std::string &va
 
 void CheckUnusedVar::allocatedButUnusedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    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);
@@ -1413,7 +1477,7 @@ void CheckUnusedVar::allocatedButUnusedVariableError(const Token *tok, const std
 
 void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &varname, bool modified)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
     if (modified)
@@ -1424,7 +1488,7 @@ void CheckUnusedVar::unreadVariableError(const Token *tok, const std::string &va
 
 void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string &varname)
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    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);
@@ -1435,13 +1499,15 @@ void CheckUnusedVar::unassignedVariableError(const Token *tok, const std::string
 //---------------------------------------------------------------------------
 void CheckUnusedVar::checkStructMemberUsage()
 {
-    if (!mSettings->severity.isEnabled(Severity::style))
+    if (!mSettings->severity.isEnabled(Severity::style) && !mSettings->isPremiumEnabled("unusedStructMember") && !mSettings->isPremiumEnabled("unusedVariable"))
         return;
 
+    logChecker("CheckUnusedVar::checkStructMemberUsage"); // style
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (scope.type != Scope::eStruct && scope.type != Scope::eClass && scope.type != Scope::eUnion)
+        if (scope.type != ScopeType::eStruct && scope.type != ScopeType::eClass && scope.type != ScopeType::eUnion)
             continue;
 
         if (scope.bodyStart->fileIndex() != 0 || scope.className.empty())
@@ -1453,14 +1519,8 @@ void CheckUnusedVar::checkStructMemberUsage()
         // Packed struct => possibly used by lowlevel code. Struct members might be required by hardware.
         if (scope.bodyEnd->isAttributePacked())
             continue;
-        if (const Preprocessor *preprocessor = mTokenizer->getPreprocessor()) {
-            const auto& directives = preprocessor->getDirectives();
-            const bool isPacked = std::any_of(directives.cbegin(), directives.cend(), [&](const Directive& d) {
-                return d.linenr < scope.bodyStart->linenr() && d.str == "#pragma pack(1)" && d.file == mTokenizer->list.getFiles().front();
-            });
-            if (isPacked)
-                continue;
-        }
+        if (mTokenizer->isPacked(scope.bodyStart))
+            continue;
 
         // Bail out for template struct, members might be used in non-matching instantiations
         if (scope.className.find('<') != std::string::npos)
@@ -1508,21 +1568,97 @@ void CheckUnusedVar::checkStructMemberUsage()
         if (bailout)
             continue;
 
+        // Bailout if struct is used in structured binding
+        for (const Variable *var : symbolDatabase->variableList()) {
+            if (!var || !Token::Match(var->typeStartToken(), "auto &|&&| [ %varid%", var->declarationId()))
+                continue;
+
+            const Token *tok = var->nameToken()->linkAt(-1);
+            if (Token::Match(tok, "] %assign%"))
+            {
+                tok = tok->next()->astOperand2();
+                const ValueType *valueType = tok->valueType();
+
+                if (valueType && valueType->typeScope == &scope) {
+                    bailout = true;
+                    break;
+                }
+            }
+
+            if (Token::simpleMatch(tok, "] :")) {
+                tok = tok->next()->astOperand2();
+                const ValueType *valueType = tok->valueType();
+
+                if (!valueType || !valueType->containerTypeToken)
+                    continue;
+
+                const Type *type = valueType->containerTypeToken->type();
+                if (type && type->classScope == &scope) {
+                    bailout = true;
+                    break;
+                }
+            }
+        }
+        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.typeStartToken()->isStandardType() && !var.isPointer() && !astIsContainer(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()) {
-                if (Token::Match(tok, ". %name%") && !tok->next()->variable() && !tok->next()->function() && tok->next()->str() == var.name()) {
+                if (Token::Match(tok, ". %name%") && !tok->next()->variable() && !tok->next()->function() && tok->strAt(1) == var.name()) {
                     // not known => assume variable is used
                     use = true;
                     break;
                 }
+                // Member referenced in offsetof
+                if (Token::Match(tok, ("offsetof ( struct| " + scope.className + " , %name%").c_str())) {
+                    tok = Token::simpleMatch(tok->tokAt(2), "struct") ? tok->tokAt(5) : tok->tokAt(4);
+                    if (tok->str() == var.name()) {
+                        use = true;
+                        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;
+                }
                 if (tok->variable() != &var)
                     continue;
                 if (tok != var.nameToken()) {
@@ -1532,9 +1668,9 @@ void CheckUnusedVar::checkStructMemberUsage()
             }
             if (!use) {
                 std::string prefix = "struct";
-                if (scope.type == Scope::ScopeType::eClass)
+                if (scope.type == ScopeType::eClass)
                     prefix = "class";
-                else if (scope.type == Scope::ScopeType::eUnion)
+                else if (scope.type == ScopeType::eUnion)
                     prefix = "union";
                 unusedStructMemberError(var.nameToken(), scope.className, var.name(), prefix);
             }
@@ -1547,102 +1683,6 @@ void CheckUnusedVar::unusedStructMemberError(const Token* tok, const std::string
     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->link();
-        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);
-        if (!withoutSideEffects) {
-            return withoutSideEffects;
-        }
-    }
-
-
-    return (withoutSideEffects = true);
-}
-
-bool CheckUnusedVar::isVariableWithoutSideEffects(const Variable& var)
-{
-    if (var.isPointer())
-        return true;
-
-    const Type* variableType = var.type();
-    if (variableType) {
-        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)
 {
     // a type that has no variables and no constructor
@@ -1664,81 +1704,21 @@ bool CheckUnusedVar::isEmptyType(const Type* type)
     return (emptyType = false);
 }
 
-bool CheckUnusedVar::isFunctionWithoutSideEffects(const Function& func, const Token* functionUsageToken,
-                                                  std::list<const Function*> checkedFuncs)
+void CheckUnusedVar::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
 {
-    // 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 depth = 20;
-                if (isVariableChanged(bodyToken, depth, mSettings, mTokenizer->isCPP())) {
-                    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());
-                    }
-                }
-            }
-        }
+    CheckUnusedVar checkUnusedVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
-        // 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;
-        }
-    }
+    // Coding style checks
+    checkUnusedVar.checkStructMemberUsage();
+    checkUnusedVar.checkFunctionVariableUsage();
+}
 
-    return !sideEffectReturnFound;
+void CheckUnusedVar::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckUnusedVar 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 743a732ba42..5ab79514cf9 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-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
@@ -24,7 +24,6 @@
 #include "check.h"
 #include "config.h"
 
-#include <list>
 #include <map>
 #include <string>
 
@@ -32,11 +31,9 @@ class ErrorLogger;
 class Scope;
 class Settings;
 class Token;
-class Tokenizer;
 class Type;
 class Variables;
-class Variable;
-class Function;
+class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -45,36 +42,28 @@ class Function;
 /** @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()) {}
 
+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, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckUnusedVar checkUnusedVar(tokenizer, settings, errorLogger);
-
-        // Coding style checks
-        checkUnusedVar.checkStructMemberUsage();
-        checkUnusedVar.checkFunctionVariableUsage();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     /** @brief %Check for unused function variables */
-    void checkFunctionVariableUsage_iterateScopes(const Scope* const scope, Variables& variables);
+    void checkFunctionVariableUsage_iterateScopes(const Scope* scope, Variables& variables) const;
     void checkFunctionVariableUsage();
 
     /** @brief %Check that all struct members are used */
     void checkStructMemberUsage();
 
-private:
-    bool isRecordTypeWithoutSideEffects(const Type* type);
-    bool isVariableWithoutSideEffects(const Variable& var);
     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");
@@ -83,14 +72,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 {
-        CheckUnusedVar 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");
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "UnusedVar";
@@ -107,8 +89,6 @@ class CPPCHECKLIB CheckUnusedVar : public Check {
                "- 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 9e6d244bee0..96c65ea41a2 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-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
@@ -26,6 +26,8 @@
 #include "tokenize.h"
 
 #include <cstddef>
+#include <iterator>
+#include <list>
 #include <vector>
 
 //---------------------------------------------------------------------------
@@ -41,9 +43,9 @@ namespace {
 //---------------------------------------------------------------------------
 
 // CWE ids used:
-static const struct CWE CWE664(664U);   // Improper Control of a Resource Through its Lifetime
-static const struct CWE CWE688(688U);   // Function Call With Incorrect Variable or Reference as Argument
-static const struct CWE CWE758(758U);   // Reliance on Undefined, Unspecified, or Implementation-Defined Behavior
+static const CWE CWE664(664U);   // Improper Control of a Resource Through its Lifetime
+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()
 {
@@ -51,6 +53,8 @@ void CheckVaarg::va_start_argument()
     const std::size_t functions = symbolDatabase->functionScopes.size();
     const bool printWarnings = mSettings->severity.isEnabled(Severity::warning);
 
+    logChecker("CheckVaarg::va_start_argument");
+
     for (std::size_t i = 0; i < functions; ++i) {
         const Scope* scope = symbolDatabase->functionScopes[i];
         const Function* function = scope->function;
@@ -67,7 +71,9 @@ void CheckVaarg::va_start_argument()
                 if (var && var->isReference())
                     referenceAs_va_start_error(param2, var->name());
                 if (var && var->index() + 2 < function->argCount() && printWarnings) {
-                    wrongParameterTo_va_start_error(tok, var->name(), function->argumentList[function->argumentList.size()-2].name());
+                    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()
                 }
                 tok = tok->linkAt(1);
             }
@@ -96,6 +102,9 @@ void CheckVaarg::va_list_usage()
 {
     if (mSettings->clang)
         return;
+
+    logChecker("CheckVaarg::va_list_usage"); // notclang
+
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || var->isPointer() || var->isReference() || var->isArray() || !var->scope() || var->typeStartToken()->str() != "va_list")
@@ -141,7 +150,7 @@ void CheckVaarg::va_list_usage()
                 tok = findNextTokenFromBreak(tok);
                 if (!tok)
                     return;
-            } else if (tok->str() == "goto" || (mTokenizer->isCPP() && tok->str() == "try")) {
+            } else if (tok->str() == "goto" || (tok->isCpp() && tok->str() == "try")) {
                 open = false;
                 break;
             } else if (!open && tok->varId() == var->declarationId())
@@ -171,3 +180,20 @@ void CheckVaarg::va_start_subsequentCallsError(const Token *tok, const std::stri
     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)
+{
+    CheckVaarg check(&tokenizer, &tokenizer.getSettings(), errorLogger);
+    check.va_start_argument();
+    check.va_list_usage();
+}
+
+void CheckVaarg::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const
+{
+    CheckVaarg 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");
+    c.va_list_usedBeforeStartedError(nullptr, "vl");
+    c.va_start_subsequentCallsError(nullptr, "vl");
+}
diff --git a/lib/checkvaarg.h b/lib/checkvaarg.h
index de8dd3b2239..7af5d98d66f 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-2022 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,33 +43,22 @@ class CPPCHECKLIB CheckVaarg : public Check {
 public:
     CheckVaarg() : Check(myName()) {}
 
+private:
     CheckVaarg(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckVaarg check(tokenizer, settings, errorLogger);
-        check.va_start_argument();
-        check.va_list_usage();
-    }
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override;
 
     void va_start_argument();
     void va_list_usage();
 
-private:
     void wrongParameterTo_va_start_error(const Token *tok, const std::string& paramIsName, const std::string& paramShouldName);
     void referenceAs_va_start_error(const Token *tok, const std::string& paramName);
     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 {
-        CheckVaarg 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");
-        c.va_list_usedBeforeStartedError(nullptr, "vl");
-        c.va_start_subsequentCallsError(nullptr, "vl");
-    }
+    void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override;
 
     static std::string myName() {
         return "Vaarg";
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index 0c10aba71ec..44d10f17c60 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-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
@@ -21,6 +21,7 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "settings.h"
+#include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
@@ -30,7 +31,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <iterator>
@@ -38,7 +38,7 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <string>
 #include <utility>
@@ -139,11 +139,11 @@ 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 < (int)line.size() - 3 && line.compare(pos2, 3, "\':\'", 0, 3) == 0)
+            if (pos2 < static_cast<int>(line.size()) - 3 && line.compare(pos2, 3, "\':\'", 0, 3) == 0)
                 pos2 = line.find('\'', pos2 + 3);
         } else {
             pos2 = pos1;
-            while (pos2 < line.size() && (line[pos2] == '_' || line[pos2] == ':' || std::isalnum((unsigned char)line[pos2])))
+            while (pos2 < line.size() && (line[pos2] == '_' || line[pos2] == ':' || std::isalnum(static_cast<unsigned char>(line[pos2]))))
                 ++pos2;
             if (pos2 > pos1 && pos2 < line.size() && line[pos2] == '<' && std::isalpha(line[pos1])) {
                 int tlevel = 1;
@@ -206,10 +206,10 @@ static std::vector<std::string> splitString(const std::string &line)
 namespace clangimport {
     struct Data {
         struct Decl {
-            explicit Decl(Scope *scope) : def(nullptr), enumerator(nullptr), function(nullptr), scope(scope), var(nullptr) {}
-            Decl(Token *def, Variable *var) : def(def), enumerator(nullptr), function(nullptr), scope(nullptr), var(var) {}
-            Decl(Token *def, Function *function) : def(def), enumerator(nullptr), function(function), scope(nullptr), var(nullptr) {}
-            Decl(Token *def, Enumerator *enumerator) : def(def), enumerator(enumerator), function(nullptr), scope(nullptr), var(nullptr) {}
+            explicit Decl(Scope *scope) : scope(scope) {}
+            Decl(Token *def, Variable *var) : def(def), var(var) {}
+            Decl(Token *def, Function *function) : def(def), function(function) {}
+            Decl(Token *def, Enumerator *enumerator) : def(def), enumerator(enumerator) {}
             void ref(Token *tok) const {
                 if (enumerator)
                     tok->enumerator(enumerator);
@@ -220,40 +220,45 @@ namespace clangimport {
                     tok->varId(var->declarationId());
                 }
             }
-            Token *def;
-            Enumerator *enumerator;
-            Function *function;
-            Scope *scope;
-            Variable *var;
+            Token* def{};
+            Enumerator* enumerator{};
+            Function* function{};
+            Scope* scope{};
+            Variable* var{};
         };
 
-        const Settings *mSettings = nullptr;
-        SymbolDatabase *mSymbolDatabase = nullptr;
+        Data(const Settings& settings, SymbolDatabase& symbolDatabase)
+            : mSettings(settings)
+            , mSymbolDatabase(symbolDatabase)
+        {}
+
+        const Settings &mSettings;
+        SymbolDatabase &mSymbolDatabase;
 
         int enumValue = 0;
 
         void enumDecl(const std::string &addr, Token *nameToken, Enumerator *enumerator) {
             Decl decl(nameToken, enumerator);
-            mDeclMap.insert(std::pair<std::string, Decl>(addr, decl));
+            mDeclMap.emplace(addr, decl);
             nameToken->enumerator(enumerator);
             notFound(addr);
         }
 
         void funcDecl(const std::string &addr, Token *nameToken, Function *function) {
             Decl decl(nameToken, function);
-            mDeclMap.insert(std::pair<std::string, Decl>(addr, decl));
+            mDeclMap.emplace(addr, decl);
             nameToken->function(function);
             notFound(addr);
         }
 
         void scopeDecl(const std::string &addr, Scope *scope) {
             Decl decl(scope);
-            mDeclMap.insert(std::pair<std::string, Decl>(addr, decl));
+            mDeclMap.emplace(addr, decl);
         }
 
         void varDecl(const std::string &addr, Token *def, Variable *var) {
             Decl decl(def, var);
-            mDeclMap.insert(std::pair<std::string, Decl>(addr, decl));
+            mDeclMap.emplace(addr, decl);
             def->varId(++mVarId);
             def->variable(var);
             if (def->valueType())
@@ -326,21 +331,31 @@ namespace clangimport {
         std::string nodeType;
         std::vector<AstNodePtr> children;
 
-        void setLocations(TokenList *tokenList, int file, int line, int col);
+        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;
-        void createTokens1(TokenList *tokenList) {
-            //dumpAst();
-            if (!tokenList->back())
+        void createTokens1(TokenList &tokenList) {
+            //dumpAst(); // TODO: reactivate or remove
+            if (isPrologueTypedefDecl())
+                return;
+            if (!tokenList.back()) {
                 setLocations(tokenList, 0, 1, 1);
+            }
             else
-                setLocations(tokenList, tokenList->back()->fileIndex(), tokenList->back()->linenr(), 1);
+                setLocations(tokenList, tokenList.back()->fileIndex(), tokenList.back()->linenr(), 1);
             createTokens(tokenList);
             if (nodeType == VarDecl || nodeType == RecordDecl || nodeType == TypedefDecl)
                 addtoken(tokenList, ";");
             mData->mNotScope.clear();
         }
 
+        /**
+         * @throws InternalError thrown if index is out of bounds
+         */
         AstNodePtr getChild(int c) {
             if (c >= children.size()) {
                 std::ostringstream err;
@@ -352,22 +367,25 @@ namespace clangimport {
             return children[c];
         }
     private:
-        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);
-        void addFullScopeNameTokens(TokenList *tokenList, const Scope *recordScope);
-        Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, AstNodePtr astNode, const Token *def);
-        Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> &children2, const Token *def);
-        Token *createTokensCall(TokenList *tokenList);
-        void createTokensFunctionDecl(TokenList *tokenList);
-        void createTokensForCXXRecord(TokenList *tokenList);
-        Token *createTokensVarDecl(TokenList *tokenList);
+        /**
+         * @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);
+        void addFullScopeNameTokens(TokenList &tokenList, const Scope *recordScope);
+        Scope *createScope(TokenList &tokenList, ScopeType scopeType, AstNodePtr astNode, const Token *def);
+        Scope *createScope(TokenList &tokenList, ScopeType scopeType, const std::vector<AstNodePtr> &children2, const Token *def);
+        RET_NONNULL Token *createTokensCall(TokenList &tokenList);
+        void createTokensFunctionDecl(TokenList &tokenList);
+        void createTokensForCXXRecord(TokenList &tokenList);
+        Token *createTokensVarDecl(TokenList &tokenList);
         std::string getSpelling() const;
         std::string getType(int index = 0) const;
         std::string getFullType(int index = 0) const;
         bool isDefinition() const;
         std::string getTemplateParameters() const;
-        const Scope *getNestedInScope(TokenList *tokenList);
+        const Scope *getNestedInScope(TokenList &tokenList);
         void setValueType(Token *tok);
 
         int mFile  = 0;
@@ -381,21 +399,21 @@ namespace clangimport {
 std::string clangimport::AstNode::getSpelling() const
 {
     if (nodeType == CompoundAssignOperator) {
-        int typeIndex = 1;
+        std::size_t typeIndex = 1;
         while (typeIndex < mExtTokens.size() && mExtTokens[typeIndex][0] != '\'')
             typeIndex++;
         // name is next quoted token
-        int nameIndex = typeIndex + 1;
+        std::size_t nameIndex = typeIndex + 1;
         while (nameIndex < mExtTokens.size() && mExtTokens[nameIndex][0] != '\'')
             nameIndex++;
         return (nameIndex < mExtTokens.size()) ? unquote(mExtTokens[nameIndex]) : "";
     }
 
     if (nodeType == UnaryExprOrTypeTraitExpr) {
-        int typeIndex = 1;
+        std::size_t typeIndex = 1;
         while (typeIndex < mExtTokens.size() && mExtTokens[typeIndex][0] != '\'')
             typeIndex++;
-        const int nameIndex = typeIndex + 1;
+        const std::size_t nameIndex = typeIndex + 1;
         return (nameIndex < mExtTokens.size()) ? unquote(mExtTokens[nameIndex]) : "";
     }
 
@@ -413,9 +431,9 @@ std::string clangimport::AstNode::getSpelling() const
             return "";
     }
     const std::string &str = mExtTokens[typeIndex - 1];
-    if (str.compare(0,4,"col:") == 0)
+    if (startsWith(str,"col:"))
         return "";
-    if (str.compare(0,8,"<invalid") == 0)
+    if (startsWith(str,"<invalid"))
         return "";
     if (nodeType == RecordDecl && str == "struct")
         return "";
@@ -445,7 +463,7 @@ std::string clangimport::AstNode::getType(int index) const
 
 std::string clangimport::AstNode::getFullType(int index) const
 {
-    int typeIndex = 1;
+    std::size_t typeIndex = 1;
     while (typeIndex < mExtTokens.size() && mExtTokens[typeIndex][0] != '\'')
         typeIndex++;
     if (typeIndex >= mExtTokens.size())
@@ -482,6 +500,7 @@ std::string clangimport::AstNode::getTemplateParameters() const
     return templateParameters + ">";
 }
 
+// cppcheck-suppress unusedFunction // only used in comment
 void clangimport::AstNode::dumpAst(int num, int indent) const
 {
     (void)num;
@@ -497,12 +516,46 @@ void clangimport::AstNode::dumpAst(int num, int indent) const
     }
 }
 
-void clangimport::AstNode::setLocations(TokenList *tokenList, int file, int line, int col)
+bool clangimport::AstNode::isPrologueTypedefDecl() const
+{
+    // these TypedefDecl are included in *any* AST dump and we should ignore them as they should not be of interest to us
+    // see https://github.com/llvm/llvm-project/issues/120228#issuecomment-2549212109 for an explanation
+    if (nodeType != TypedefDecl)
+        return false;
+
+    // TODO: use different values to indicate "<invalid sloc>"?
+    if (mFile != 0 || mLine != 1 || mCol != 1)
+        return false;
+
+    // TODO: match without using children
+    if (children.empty())
+        return false;
+
+    if (children[0].get()->mExtTokens.size() < 2)
+        return false;
+
+    const auto& type = children[0].get()->mExtTokens[1];
+    if (type == "'__int128'" ||
+        type == "'unsigned __int128'" ||
+        type == "'struct __NSConstantString_tag'" ||
+        type == "'char *'" ||
+        type == "'struct __va_list_tag[1]'")
+    {
+        // NOLINTNEXTLINE(readability-simplify-boolean-expr)
+        return true;
+    }
+
+    return false;
+}
+
+void clangimport::AstNode::setLocations(TokenList &tokenList, int file, int line, int col)
 {
-    for (const std::string &ext: mExtTokens) {
-        if (ext.compare(0, 5, "<col:") == 0)
+    if (mExtTokens.size() >= 2)
+    {
+        const std::string &ext = mExtTokens[1];
+        if (startsWith(ext, "<col:"))
             col = strToInt<int>(ext.substr(5, ext.find_first_of(",>", 5) - 5));
-        else if (ext.compare(0, 6, "<line:") == 0) {
+        else if (startsWith(ext, "<line:")) {
             line = strToInt<int>(ext.substr(6, ext.find_first_of(":,>", 6) - 6));
             const auto pos = ext.find(", col:");
             if (pos != std::string::npos)
@@ -510,12 +563,18 @@ void clangimport::AstNode::setLocations(TokenList *tokenList, int file, int line
         } else if (ext[0] == '<') {
             const std::string::size_type colon = ext.find(':');
             if (colon != std::string::npos) {
-                const bool windowsPath = colon == 2 && ext.size() > 4 && ext[3] == '\\';
+                const bool windowsPath = colon == 2 && ext.size() > 3 && ext[2] == ':';
                 const std::string::size_type sep1 = windowsPath ? ext.find(':', 4) : colon;
                 const std::string::size_type sep2 = ext.find(':', sep1 + 1);
-                file = tokenList->appendFileIfNew(ext.substr(1, sep1 - 1));
+                file = tokenList.appendFileIfNew(ext.substr(1, sep1 - 1));
                 line = strToInt<int>(ext.substr(sep1 + 1, sep2 - sep1 - 1));
             }
+            else {
+                // "<invalid sloc>" are encountered in every AST dump by some built-in TypedefDecl
+                // an completely empty location block was encountered with a CompoundStmt
+                if (ext != "<<invalid sloc>" && ext != "<>")
+                    throw InternalError(nullptr, "invalid AST location: " + ext, InternalError::AST);
+            }
         }
     }
     mFile = file;
@@ -527,23 +586,23 @@ void clangimport::AstNode::setLocations(TokenList *tokenList, int file, int line
     }
 }
 
-Token *clangimport::AstNode::addtoken(TokenList *tokenList, const std::string &str, bool valueType)
+Token *clangimport::AstNode::addtoken(TokenList &tokenList, const std::string &str, bool valueType)
 {
     const Scope *scope = getNestedInScope(tokenList);
-    tokenList->addtoken(str, mLine, mCol, mFile);
-    tokenList->back()->scope(scope);
+    tokenList.addtoken(str, mLine, mCol, mFile);
+    tokenList.back()->scope(scope);
     if (valueType)
-        setValueType(tokenList->back());
-    return tokenList->back();
+        setValueType(tokenList.back());
+    return tokenList.back();
 }
 
-const ::Type * clangimport::AstNode::addTypeTokens(TokenList *tokenList, const std::string &str, const Scope *scope)
+const ::Type * clangimport::AstNode::addTypeTokens(TokenList &tokenList, const std::string &str, const Scope *scope)
 {
     if (str.find("\':\'") != std::string::npos) {
         return addTypeTokens(tokenList, str.substr(0, str.find("\':\'") + 1), scope);
     }
 
-    if (str.compare(0, 16, "'enum (anonymous") == 0)
+    if (startsWith(str, "'enum (anonymous"))
         return nullptr;
 
     std::string type;
@@ -562,6 +621,7 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList *tokenList, const s
     if (type.find('(') != std::string::npos)
         type.erase(type.find('('));
 
+    // TODO: put in a helper?
     std::stack<Token *> lpar;
     for (const std::string &s: splitString(type)) {
         Token *tok = addtoken(tokenList, s, false);
@@ -575,14 +635,14 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList *tokenList, const s
 
     // Set Type
     if (!scope) {
-        scope = tokenList->back() ? tokenList->back()->scope() : nullptr;
+        scope = tokenList.back() ? tokenList.back()->scope() : nullptr;
         if (!scope)
             return nullptr;
     }
-    for (const Token *typeToken = tokenList->back(); Token::Match(typeToken, "&|*|%name%"); typeToken = typeToken->previous()) {
+    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;
@@ -591,12 +651,12 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList *tokenList, const s
     return nullptr;
 }
 
-void clangimport::AstNode::addFullScopeNameTokens(TokenList *tokenList, const Scope *recordScope)
+void clangimport::AstNode::addFullScopeNameTokens(TokenList &tokenList, const Scope *recordScope)
 {
     if (!recordScope)
         return;
     std::list<const Scope *> scopes;
-    while (recordScope && recordScope != tokenList->back()->scope() && !recordScope->isExecutable()) {
+    while (recordScope && recordScope != tokenList.back()->scope() && !recordScope->isExecutable()) {
         scopes.push_front(recordScope);
         recordScope = recordScope->nestedIn;
     }
@@ -608,13 +668,13 @@ void clangimport::AstNode::addFullScopeNameTokens(TokenList *tokenList, const Sc
     }
 }
 
-const Scope *clangimport::AstNode::getNestedInScope(TokenList *tokenList)
+const Scope *clangimport::AstNode::getNestedInScope(TokenList &tokenList)
 {
-    if (!tokenList->back())
-        return &mData->mSymbolDatabase->scopeList.front();
-    if (tokenList->back()->str() == "}" && mData->mNotScope.find(tokenList->back()) == mData->mNotScope.end())
-        return tokenList->back()->scope()->nestedIn;
-    return tokenList->back()->scope();
+    if (!tokenList.back())
+        return &mData->mSymbolDatabase.scopeList.front();
+    if (tokenList.back()->str() == "}" && mData->mNotScope.find(tokenList.back()) == mData->mNotScope.end())
+        return tokenList.back()->scope()->nestedIn;
+    return tokenList.back()->scope();
 }
 
 void clangimport::AstNode::setValueType(Token *tok)
@@ -626,39 +686,38 @@ void clangimport::AstNode::setValueType(Token *tok)
             // TODO
             continue;
 
-        TokenList decl(nullptr);
-        addTypeTokens(&decl, type, tok->scope());
+        TokenList decl(mData->mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
+        addTypeTokens(decl, type, tok->scope());
         if (!decl.front())
             break;
 
-        const ValueType valueType = ValueType::parseDecl(decl.front(), *mData->mSettings, true); // TODO: set isCpp
+        ValueType valueType = ValueType::parseDecl(decl.front(), mData->mSettings);
         if (valueType.type != ValueType::Type::UNKNOWN_TYPE) {
-            tok->setValueType(new ValueType(valueType));
+            tok->setValueType(new ValueType(std::move(valueType)));
             break;
         }
     }
 }
 
-Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType scopeType, AstNodePtr astNode, const Token *def)
+Scope *clangimport::AstNode::createScope(TokenList &tokenList, ScopeType scopeType, AstNodePtr astNode, const Token *def)
 {
     std::vector<AstNodePtr> children2{std::move(astNode)};
     return createScope(tokenList, scopeType, children2, def);
 }
 
-Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> & children2, const Token *def)
+Scope *clangimport::AstNode::createScope(TokenList &tokenList, ScopeType scopeType, const std::vector<AstNodePtr> & children2, const Token *def)
 {
-    SymbolDatabase *symbolDatabase = mData->mSymbolDatabase;
+    SymbolDatabase &symbolDatabase = mData->mSymbolDatabase;
 
-    Scope *nestedIn = const_cast<Scope *>(getNestedInScope(tokenList));
+    auto *nestedIn = const_cast<Scope *>(getNestedInScope(tokenList));
 
-    symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nestedIn);
-    Scope *scope = &symbolDatabase->scopeList.back();
-    if (scopeType == Scope::ScopeType::eEnum)
+    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()) {
@@ -675,7 +734,7 @@ Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType
                 const_cast<Token *>(vartok)->variable(replaceVar[vartok->variable()]);
         }
         std::list<Variable> &varlist = const_cast<Scope *>(def->scope())->varlist;
-        for (std::list<Variable>::iterator var = varlist.begin(); var != varlist.end();) {
+        for (auto var = varlist.cbegin(); var != varlist.cend();) {
             if (replaceVar.find(&(*var)) != replaceVar.end())
                 var = varlist.erase(var);
             else
@@ -683,7 +742,7 @@ Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType
         }
     }
     scope->bodyStart = addtoken(tokenList, "{");
-    tokenList->back()->scope(scope);
+    tokenList.back()->scope(scope);
     mData->scopeAccessControl[scope] = scope->defaultAccess();
     if (!children2.empty()) {
         for (const AstNodePtr &astNode: children2) {
@@ -699,9 +758,9 @@ Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType
                 continue;
             }
             astNode->createTokens(tokenList);
-            if (scopeType == Scope::ScopeType::eEnum)
+            if (scopeType == ScopeType::eEnum)
                 astNode->addtoken(tokenList, ",");
-            else if (!Token::Match(tokenList->back(), "[;{}]"))
+            else if (!Token::Match(tokenList.back(), "[;{}]"))
                 astNode->addtoken(tokenList, ";");
         }
     }
@@ -711,7 +770,7 @@ Scope *clangimport::AstNode::createScope(TokenList *tokenList, Scope::ScopeType
     return scope;
 }
 
-Token *clangimport::AstNode::createTokens(TokenList *tokenList)
+Token *clangimport::AstNode::createTokens(TokenList &tokenList)
 {
     if (nodeType == ArraySubscriptExpr) {
         Token *array = getChild(0)->createTokens(tokenList);
@@ -735,7 +794,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
     if (nodeType == BreakStmt)
         return addtoken(tokenList, "break");
     if (nodeType == CharacterLiteral) {
-        const int c = MathLib::toLongNumber(mExtTokens.back());
+        const int c = static_cast<int>(MathLib::toBigNumber(mExtTokens.back()));
         if (c == 0)
             return addtoken(tokenList, "\'\\0\'");
         if (c == '\r')
@@ -797,7 +856,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
     if (nodeType == CompoundStmt) {
         for (const AstNodePtr& child: children) {
             child->createTokens(tokenList);
-            if (!Token::Match(tokenList->back(), "[;{}]"))
+            if (!Token::Match(tokenList.back(), "[;{}]"))
                 child->addtoken(tokenList, ";");
         }
         return nullptr;
@@ -819,14 +878,14 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         return getChild(0)->createTokens(tokenList);
     if (nodeType == CXXBoolLiteralExpr) {
         addtoken(tokenList, mExtTokens.back());
-        tokenList->back()->setValueType(new ValueType(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::BOOL, 0));
-        return tokenList->back();
+        tokenList.back()->setValueType(new ValueType(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::BOOL, 0));
+        return tokenList.back();
     }
     if (nodeType == CXXConstructExpr) {
         if (!children.empty())
             return getChild(0)->createTokens(tokenList);
         addTypeTokens(tokenList, '\'' + getType() + '\'');
-        Token *type = tokenList->back();
+        Token *type = tokenList.back();
         Token *par1 = addtoken(tokenList, "(");
         Token *par2 = addtoken(tokenList, ")");
         par1->link(par2);
@@ -859,15 +918,14 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         varDecl->children.clear();
         Token *expr1 = varDecl->createTokens(tokenList);
         Token *colon = addtoken(tokenList, ":");
-        AstNodePtr range;
-        for (int i = 0; i < 2; i++) {
-            if (children[i] && children[i]->nodeType == DeclStmt && children[i]->getChild(0)->nodeType == VarDecl) {
-                range = children[i]->getChild(0)->getChild(0);
-                break;
-            }
-        }
-        if (!range)
-            throw InternalError(tokenList->back(), "Failed to import CXXForRangeStmt. Range?");
+
+        auto it = std::find_if(children.cbegin(), children.cbegin() + 2, [&](const AstNodePtr& c) {
+            return c && c->nodeType == DeclStmt && c->getChild(0)->nodeType == VarDecl;
+        });
+        if (it == children.cbegin() + 2)
+            throw InternalError(tokenList.back(), "Failed to import CXXForRangeStmt. Range?");
+        AstNodePtr range = (*it)->getChild(0)->getChild(0);
+
         Token *expr2 = range->createTokens(tokenList);
         Token *par2 = addtoken(tokenList, ")");
 
@@ -879,11 +937,11 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         par1->astOperand1(forToken);
         par1->astOperand2(colon);
 
-        createScope(tokenList, Scope::ScopeType::eFor, children.back(), forToken);
+        createScope(tokenList, ScopeType::eFor, children.back(), forToken);
         return nullptr;
     }
     if (nodeType == CXXMethodDecl) {
-        for (int i = 0; i+1 < mExtTokens.size(); ++i) {
+        for (std::size_t i = 0; i+1 < mExtTokens.size(); ++i) {
             if (mExtTokens[i] == "prev" && !mData->hasDecl(mExtTokens[i+1]))
                 return nullptr;
         }
@@ -944,7 +1002,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
     }
     if (nodeType == DeclRefExpr) {
         int addrIndex = mExtTokens.size() - 1;
-        while (addrIndex > 1 && mExtTokens[addrIndex].compare(0,2,"0x") != 0)
+        while (addrIndex > 1 && !startsWith(mExtTokens[addrIndex],"0x"))
             --addrIndex;
         const std::string addr = mExtTokens[addrIndex];
         std::string name = unquote(getSpelling());
@@ -962,7 +1020,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
     }
     if (nodeType == DoStmt) {
         addtoken(tokenList, "do");
-        createScope(tokenList, Scope::ScopeType::eDo, getChild(0), tokenList->back());
+        createScope(tokenList, ScopeType::eDo, getChild(0), tokenList.back());
         Token *tok1 = addtoken(tokenList, "while");
         Token *par1 = addtoken(tokenList, "(");
         Token *expr = children[1]->createTokens(tokenList);
@@ -975,7 +1033,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
     }
     if (nodeType == EnumConstantDecl) {
         Token *nameToken = addtoken(tokenList, getSpelling());
-        Scope *scope = const_cast<Scope *>(nameToken->scope());
+        auto *scope = const_cast<Scope *>(nameToken->scope());
         scope->enumeratorList.emplace_back(nameToken->scope());
         Enumerator *e = &scope->enumeratorList.back();
         e->name = nameToken;
@@ -986,14 +1044,14 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
     }
     if (nodeType == EnumDecl) {
         int colIndex = mExtTokens.size() - 1;
-        while (colIndex > 0 && mExtTokens[colIndex].compare(0,4,"col:") != 0 && mExtTokens[colIndex].compare(0,5,"line:") != 0)
+        while (colIndex > 0 && !startsWith(mExtTokens[colIndex],"col:") && !startsWith(mExtTokens[colIndex],"line:"))
             --colIndex;
         if (colIndex == 0)
             return nullptr;
 
         mData->enumValue = 0;
         Token *enumtok = addtoken(tokenList, "enum");
-        Token *nametok = nullptr;
+        const Token *nametok = nullptr;
         {
             int nameIndex = mExtTokens.size() - 1;
             while (nameIndex > colIndex && mExtTokens[nameIndex][0] == '\'')
@@ -1005,15 +1063,15 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
                 addTypeTokens(tokenList, mExtTokens.back());
             }
         }
-        Scope *enumscope = createScope(tokenList, Scope::ScopeType::eEnum, children, enumtok);
+        Scope *enumscope = createScope(tokenList, ScopeType::eEnum, children, enumtok);
         if (nametok)
             enumscope->className = nametok->str();
         if (enumscope->bodyEnd && Token::simpleMatch(enumscope->bodyEnd->previous(), ", }"))
             const_cast<Token *>(enumscope->bodyEnd)->deletePrevious();
 
         // Create enum type
-        mData->mSymbolDatabase->typeList.emplace_back(enumtok, enumscope, enumtok->scope());
-        enumscope->definedType = &mData->mSymbolDatabase->typeList.back();
+        mData->mSymbolDatabase.typeList.emplace_back(enumtok, enumscope, enumtok->scope());
+        enumscope->definedType = &mData->mSymbolDatabase.typeList.back();
         if (nametok)
             const_cast<Scope *>(enumtok->scope())->definedTypesMap[nametok->str()] = enumscope->definedType;
 
@@ -1042,7 +1100,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         sep1->astOperand2(sep2);
         sep2->astOperand1(expr2);
         sep2->astOperand2(expr3);
-        createScope(tokenList, Scope::ScopeType::eFor, children[4], forToken);
+        createScope(tokenList, ScopeType::eFor, children[4], forToken);
         return nullptr;
     }
     if (nodeType == FunctionDecl) {
@@ -1086,10 +1144,10 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         Token *par2 = addtoken(tokenList, ")");
         par1->link(par2);
         par2->link(par1);
-        createScope(tokenList, Scope::ScopeType::eIf, thenCode, iftok);
+        createScope(tokenList, ScopeType::eIf, std::move(thenCode), iftok);
         if (elseCode) {
             elseCode->addtoken(tokenList, "else");
-            createScope(tokenList, Scope::ScopeType::eElse, elseCode, tokenList->back());
+            createScope(tokenList, ScopeType::eElse, std::move(elseCode), tokenList.back());
         }
         return nullptr;
     }
@@ -1100,11 +1158,11 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         return expr;
     }
     if (nodeType == InitListExpr) {
-        const Scope *scope = tokenList->back()->scope();
+        const Scope *scope = tokenList.back()->scope();
         Token *start = addtoken(tokenList, "{");
         start->scope(scope);
         for (const AstNodePtr& child: children) {
-            if (tokenList->back()->str() != "{")
+            if (tokenList.back()->str() != "{")
                 addtoken(tokenList, ",");
             child->createTokens(tokenList);
         }
@@ -1132,10 +1190,10 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         Token *s = getChild(0)->createTokens(tokenList);
         Token *dot = addtoken(tokenList, ".");
         std::string memberName = getSpelling();
-        if (memberName.compare(0, 2, "->") == 0) {
+        if (startsWith(memberName, "->")) {
             dot->originalName("->");
             memberName = memberName.substr(2);
-        } else if (memberName.compare(0, 1, ".") == 0) {
+        } else if (startsWith(memberName, ".")) {
             memberName = memberName.substr(1);
         }
         if (memberName.empty())
@@ -1151,9 +1209,9 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
             return nullptr;
         const Token *defToken = addtoken(tokenList, "namespace");
         const std::string &s = mExtTokens[mExtTokens.size() - 2];
-        const Token* nameToken = (s.compare(0, 4, "col:") == 0 || s.compare(0, 5, "line:") == 0) ?
+        const Token* nameToken = (startsWith(s, "col:") || startsWith(s, "line:")) ?
                                  addtoken(tokenList, mExtTokens.back()) : nullptr;
-        Scope *scope = createScope(tokenList, Scope::ScopeType::eNamespace, children, defToken);
+        Scope *scope = createScope(tokenList, ScopeType::eNamespace, children, defToken);
         if (nameToken)
             scope->className = nameToken->str();
         return nullptr;
@@ -1178,9 +1236,9 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
             return nullptr;
         }
 
-        Scope *recordScope = createScope(tokenList, Scope::ScopeType::eStruct, children, classDef);
-        mData->mSymbolDatabase->typeList.emplace_back(classDef, recordScope, classDef->scope());
-        recordScope->definedType = &mData->mSymbolDatabase->typeList.back();
+        Scope *recordScope = createScope(tokenList, ScopeType::eStruct, children, classDef);
+        mData->mSymbolDatabase.typeList.emplace_back(classDef, recordScope, classDef->scope());
+        recordScope->definedType = &mData->mSymbolDatabase.typeList.back();
         if (!recordName.empty()) {
             recordScope->className = recordName;
             const_cast<Scope *>(classDef->scope())->definedTypesMap[recordName] = recordScope->definedType;
@@ -1207,7 +1265,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         par2->link(par1);
         par1->astOperand1(tok1);
         par1->astOperand2(expr);
-        createScope(tokenList, Scope::ScopeType::eSwitch, children.back(), tok1);
+        createScope(tokenList, ScopeType::eSwitch, children.back(), tok1);
         return nullptr;
     }
     if (nodeType == TypedefDecl) {
@@ -1216,7 +1274,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         return addtoken(tokenList, getSpelling());
     }
     if (nodeType == UnaryOperator) {
-        int index = (int)mExtTokens.size() - 1;
+        int index = static_cast<int>(mExtTokens.size()) - 1;
         while (index > 0 && mExtTokens[index][0] != '\'')
             --index;
         Token *unop = addtoken(tokenList, unquote(mExtTokens[index]));
@@ -1256,13 +1314,13 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
         Token *par2 = addtoken(tokenList, ")");
         par1->link(par2);
         par2->link(par1);
-        createScope(tokenList, Scope::ScopeType::eWhile, body, whiletok);
+        createScope(tokenList, ScopeType::eWhile, std::move(body), whiletok);
         return nullptr;
     }
     return addtoken(tokenList, "?" + nodeType + "?");
 }
 
-Token * clangimport::AstNode::createTokensCall(TokenList *tokenList)
+Token * clangimport::AstNode::createTokensCall(TokenList &tokenList)
 {
     int firstParam;
     Token *f;
@@ -1281,11 +1339,11 @@ Token * clangimport::AstNode::createTokensCall(TokenList *tokenList)
     f->setValueType(nullptr);
     Token *par1 = addtoken(tokenList, "(");
     par1->astOperand1(f);
-    int args = 0;
+    std::size_t args = 0;
     while (args < children.size() && children[args]->nodeType != CXXDefaultArgExpr)
         args++;
     Token *child = nullptr;
-    for (int c = firstParam; c < args; ++c) {
+    for (std::size_t c = firstParam; c < args; ++c) {
         if (child) {
             Token *comma = addtoken(tokenList, ",");
             comma->setValueType(nullptr);
@@ -1303,7 +1361,7 @@ Token * clangimport::AstNode::createTokensCall(TokenList *tokenList)
     return par1;
 }
 
-void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
+void clangimport::AstNode::createTokensFunctionDecl(TokenList &tokenList)
 {
     const bool prev = contains(mExtTokens, "prev");
     const bool hasBody = !children.empty() && children.back()->nodeType == CompoundStmt;
@@ -1312,22 +1370,22 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
 
     const Token *startToken = nullptr;
 
-    SymbolDatabase *symbolDatabase = mData->mSymbolDatabase;
+    SymbolDatabase &symbolDatabase = mData->mSymbolDatabase;
     if (nodeType != CXXConstructorDecl && nodeType != CXXDestructorDecl) {
         if (isStatic)
             addtoken(tokenList, "static");
         if (isInline)
             addtoken(tokenList, "inline");
-        const Token * const before = tokenList->back();
+        const Token * const before = tokenList.back();
         addTypeTokens(tokenList, '\'' + getType() + '\'');
-        startToken = before ? before->next() : tokenList->front();
+        startToken = before ? before->next() : tokenList.front();
     }
 
     if (mExtTokens.size() > 4 && mExtTokens[1] == "parent")
         addFullScopeNameTokens(tokenList, mData->getScope(mExtTokens[2]));
 
     Token *nameToken = addtoken(tokenList, getSpelling() + getTemplateParameters());
-    Scope *nestedIn = const_cast<Scope *>(nameToken->scope());
+    auto *nestedIn = const_cast<Scope *>(nameToken->scope());
 
     if (prev) {
         const std::string addr = *(std::find(mExtTokens.cbegin(), mExtTokens.cend(), "prev") + 1);
@@ -1337,29 +1395,28 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
         nestedIn->functionList.emplace_back(nameToken, unquote(getFullType()));
         mData->funcDecl(mExtTokens.front(), nameToken, &nestedIn->functionList.back());
         if (nodeType == CXXConstructorDecl)
-            nestedIn->functionList.back().type = Function::Type::eConstructor;
+            nestedIn->functionList.back().type = FunctionType::eConstructor;
         else if (nodeType == CXXDestructorDecl)
-            nestedIn->functionList.back().type = Function::Type::eDestructor;
+            nestedIn->functionList.back().type = FunctionType::eDestructor;
         else
             nestedIn->functionList.back().retDef = startToken;
     }
 
-    Function * const function = const_cast<Function*>(nameToken->function());
+    auto * const function = const_cast<Function*>(nameToken->function());
 
     if (!prev) {
-        auto accessControl = mData->scopeAccessControl.find(tokenList->back()->scope());
+        auto accessControl = mData->scopeAccessControl.find(tokenList.back()->scope());
         if (accessControl != mData->scopeAccessControl.end())
             function->access = accessControl->second;
     }
 
     Scope *scope = nullptr;
     if (hasBody) {
-        symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nestedIn);
-        scope = &symbolDatabase->scopeList.back();
-        scope->check = symbolDatabase;
+        symbolDatabase.scopeList.emplace_back(symbolDatabase, nullptr, nestedIn);
+        scope = &symbolDatabase.scopeList.back();
         scope->function = function;
-        scope->classDef = nameToken;
-        scope->type = Scope::ScopeType::eFunction;
+        scope->classDef = nameToken; // TODO: pass into ctor
+        scope->type = ScopeType::eFunction;
         scope->className = nameToken->str();
         nestedIn->nestedList.push_back(scope);
         function->hasBody(true);
@@ -1374,15 +1431,14 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
         function->nestedIn = nestedIn;
     function->argDef = par1;
     // Function arguments
-    function->argumentList.reserve(children.size());
     for (int i = 0; i < children.size(); ++i) {
         AstNodePtr child = children[i];
         if (child->nodeType != ParmVarDecl)
             continue;
-        if (tokenList->back() != par1)
+        if (tokenList.back() != par1)
             addtoken(tokenList, ",");
         const Type *recordType = addTypeTokens(tokenList, child->mExtTokens.back(), nestedIn);
-        const Token *typeEndToken = tokenList->back();
+        const Token *typeEndToken = tokenList.back();
         const std::string spelling = child->getSpelling();
         Token *vartok = nullptr;
         if (!spelling.empty())
@@ -1407,7 +1463,7 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
 
     // Function body
     if (hasBody) {
-        symbolDatabase->functionScopes.push_back(scope);
+        symbolDatabase.functionScopes.push_back(scope);
         Token *bodyStart = addtoken(tokenList, "{");
         bodyStart->scope(scope);
         children.back()->createTokens(tokenList);
@@ -1426,7 +1482,7 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
     }
 }
 
-void clangimport::AstNode::createTokensForCXXRecord(TokenList *tokenList)
+void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
 {
     const bool isStruct = contains(mExtTokens, "struct");
     Token * const classToken = addtoken(tokenList, isStruct ? "struct" : "class");
@@ -1452,26 +1508,26 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList *tokenList)
         std::vector<AstNodePtr> children2;
         std::copy_if(children.cbegin(), children.cend(), std::back_inserter(children2), [](const AstNodePtr& child) {
             return child->nodeType == CXXConstructorDecl ||
-            child->nodeType == CXXDestructorDecl ||
-            child->nodeType == CXXMethodDecl ||
-            child->nodeType == FieldDecl ||
-            child->nodeType == VarDecl ||
-            child->nodeType == AccessSpecDecl ||
-            child->nodeType == TypedefDecl;
+                   child->nodeType == CXXDestructorDecl ||
+                   child->nodeType == CXXMethodDecl ||
+                   child->nodeType == FieldDecl ||
+                   child->nodeType == VarDecl ||
+                   child->nodeType == AccessSpecDecl ||
+                   child->nodeType == TypedefDecl;
         });
-        Scope *scope = createScope(tokenList, isStruct ? Scope::ScopeType::eStruct : Scope::ScopeType::eClass, children2, classToken);
+        Scope *scope = createScope(tokenList, isStruct ? ScopeType::eStruct : ScopeType::eClass, children2, classToken);
         const std::string addr = mExtTokens[0];
         mData->scopeDecl(addr, scope);
         scope->className = className;
-        mData->mSymbolDatabase->typeList.emplace_back(classToken, scope, classToken->scope());
-        scope->definedType = &mData->mSymbolDatabase->typeList.back();
+        mData->mSymbolDatabase.typeList.emplace_back(classToken, scope, classToken->scope());
+        scope->definedType = &mData->mSymbolDatabase.typeList.back();
         const_cast<Scope *>(classToken->scope())->definedTypesMap[className] = scope->definedType;
     }
     addtoken(tokenList, ";");
-    const_cast<Token *>(tokenList->back())->scope(classToken->scope());
+    tokenList.back()->scope(classToken->scope());
 }
 
-Token * clangimport::AstNode::createTokensVarDecl(TokenList *tokenList)
+Token * clangimport::AstNode::createTokensVarDecl(TokenList &tokenList)
 {
     const std::string addr = mExtTokens.front();
     if (contains(mExtTokens, "static"))
@@ -1481,14 +1537,14 @@ Token * clangimport::AstNode::createTokensVarDecl(TokenList *tokenList)
         typeIndex--;
     const std::string type = mExtTokens[typeIndex];
     const std::string name = mExtTokens[typeIndex - 1];
-    const Token *startToken = tokenList->back();
+    const Token *startToken = tokenList.back();
     const ::Type *recordType = addTypeTokens(tokenList, type);
     if (!startToken)
-        startToken = tokenList->front();
+        startToken = tokenList.front();
     else if (startToken->str() != "static")
         startToken = startToken->next();
     Token *vartok1 = addtoken(tokenList, name);
-    Scope *scope = const_cast<Scope *>(tokenList->back()->scope());
+    auto *scope = const_cast<Scope *>(tokenList.back()->scope());
     scope->varlist.emplace_back(vartok1, unquote(type), startToken, vartok1->previous(), 0, scope->defaultAccess(), recordType, scope);
     mData->varDecl(addr, vartok1, &scope->varlist.back());
     if (mExtTokens.back() == "cinit" && !children.empty()) {
@@ -1512,9 +1568,9 @@ Token * clangimport::AstNode::createTokensVarDecl(TokenList *tokenList)
     return vartok1;
 }
 
-static void setTypes(TokenList *tokenList)
+static void setTypes(TokenList &tokenList)
 {
-    for (Token *tok = tokenList->front(); tok; tok = tok->next()) {
+    for (Token *tok = tokenList.front(); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
             for (Token *typeToken = tok->tokAt(2); typeToken->str() != ")"; typeToken = typeToken->next()) {
                 if (typeToken->type())
@@ -1525,30 +1581,30 @@ static void setTypes(TokenList *tokenList)
     }
 }
 
-static void setValues(const Tokenizer *tokenizer, const SymbolDatabase *symbolDatabase)
+static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDatabase)
 {
-    const Settings * const settings = tokenizer->getSettings();
+    const Settings & settings = tokenizer.getSettings();
 
     for (const Scope& scope : symbolDatabase->scopeList) {
         if (!scope.definedType)
             continue;
 
-        int typeSize = 0;
+        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;
     }
 
-    for (Token *tok = const_cast<Token*>(tokenizer->tokens()); tok; tok = tok->next()) {
+    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, tokenizer->isCPP());
-            const int sz = vt.typeSize(settings->platform, true);
-            if (sz <= 0)
+            ValueType vt = ValueType::parseDecl(tok->tokAt(2), settings);
+            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()) {
@@ -1565,19 +1621,16 @@ static void setValues(const Tokenizer *tokenizer, const SymbolDatabase *symbolDa
     }
 }
 
-void clangimport::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)
+void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
 {
-    TokenList *tokenList = &tokenizer->list;
+    TokenList &tokenList = tokenizer.list;
 
-    tokenizer->createSymbolDatabase();
-    SymbolDatabase *symbolDatabase = const_cast<SymbolDatabase *>(tokenizer->getSymbolDatabase());
-    symbolDatabase->scopeList.emplace_back(nullptr, nullptr, nullptr);
-    symbolDatabase->scopeList.back().type = Scope::ScopeType::eGlobal;
-    symbolDatabase->scopeList.back().check = symbolDatabase;
+    tokenizer.createSymbolDatabase();
+    auto *symbolDatabase = const_cast<SymbolDatabase *>(tokenizer.getSymbolDatabase());
+    symbolDatabase->scopeList.emplace_back(*symbolDatabase, nullptr, nullptr);
+    symbolDatabase->scopeList.back().type = ScopeType::eGlobal;
 
-    clangimport::Data data;
-    data.mSettings = tokenizer->getSettings();
-    data.mSymbolDatabase = symbolDatabase;
+    clangimport::Data data(tokenizer.getSettings(), *symbolDatabase);
     std::string line;
     std::vector<AstNodePtr> tree;
     while (std::getline(f,line)) {
@@ -1619,16 +1672,16 @@ void clangimport::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)
         tree[0]->createTokens1(tokenList);
 
     // Validation
-    for (const Token *tok = tokenList->front(); tok; tok = tok->next()) {
+    for (const Token *tok = tokenList.front(); tok; tok = tok->next()) {
         if (Token::Match(tok, "(|)|[|]|{|}") && !tok->link())
             throw InternalError(tok, "Token::link() is not set properly");
     }
 
-    if (tokenList->front())
-        tokenList->front()->assignIndexes();
+    if (tokenList.front())
+        tokenList.front()->assignIndexes();
     symbolDatabase->clangSetVariables(data.getVariableList());
     symbolDatabase->createSymbolDatabaseExprIds();
-    tokenList->clangSetOrigFiles();
+    tokenList.clangSetOrigFiles();
     setTypes(tokenList);
     setValues(tokenizer, symbolDatabase);
 }
diff --git a/lib/clangimport.h b/lib/clangimport.h
index 5aabe25fafe..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-2022 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,7 +29,10 @@
 class Tokenizer;
 
 namespace clangimport {
-    void CPPCHECKLIB parseClangAstDump(Tokenizer *tokenizer, std::istream &f);
+    /**
+     * @throws InternalError thrown on incorrectly linked tokens
+     */
+    void CPPCHECKLIB parseClangAstDump(Tokenizer &tokenizer, std::istream &f);
 }
 
 #endif
diff --git a/lib/color.cpp b/lib/color.cpp
index a8f10462eed..2a29fb61376 100644
--- a/lib/color.cpp
+++ b/lib/color.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -18,11 +18,12 @@
 
 #include "color.h"
 
+#include <cstdlib>
+#include <sstream>
+#include <iostream>
+
 #ifndef _WIN32
 #include <unistd.h>
-#include <cstddef>
-#include <sstream> // IWYU pragma: keep
-#include <iostream>
 #endif
 
 bool gDisableColors = false;
@@ -40,26 +41,39 @@ static bool isStreamATty(const std::ostream & os)
 }
 #endif
 
-std::ostream& operator<<(std::ostream & os, const Color& c)
+static bool isColorEnabled(const std::ostream & os)
 {
-#ifndef _WIN32
-    if (!gDisableColors && isStreamATty(os))
-        return os << "\033[" << static_cast<std::size_t>(c) << "m";
+    // See https://bixense.com/clicolors/
+    static const bool color_forced_off = (nullptr != std::getenv("NO_COLOR"));
+    if (color_forced_off)
+    {
+        return false;
+    }
+    static const bool color_forced_on = (nullptr != std::getenv("CLICOLOR_FORCE"));
+    if (color_forced_on)
+    {
+        return true;
+    }
+#ifdef _WIN32
+    (void)os;
+    return false;
 #else
-    (void)c;
+    return isStreamATty(os);
 #endif
+}
+
+std::ostream& operator<<(std::ostream & os, Color c)
+{
+    if (!gDisableColors && isColorEnabled(os))
+        return os << "\033[" << static_cast<std::size_t>(c) << "m";
+
     return os;
 }
 
-std::string toString(const Color& c)
+std::string toString(Color c)
 {
-#ifndef _WIN32
-    std::stringstream ss;
+    std::ostringstream ss;
     ss << c;
     return ss.str();
-#else
-    (void)c;
-    return "";
-#endif
 }
 
diff --git a/lib/color.h b/lib/color.h
index dfd47b56761..1a677e8393a 100644
--- a/lib/color.h
+++ b/lib/color.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -21,10 +21,11 @@
 
 #include "config.h"
 
+#include <cstdint>
 #include <ostream>
 #include <string>
 
-enum class Color {
+enum class Color : std::uint8_t {
     Reset      = 0,
     Bold       = 1,
     Dim        = 2,
@@ -34,9 +35,9 @@ enum class Color {
     FgMagenta  = 35,
     FgDefault  = 39
 };
-CPPCHECKLIB std::ostream& operator<<(std::ostream& os, const Color& c);
+CPPCHECKLIB std::ostream& operator<<(std::ostream& os, Color c);
 
-CPPCHECKLIB std::string toString(const Color& c);
+CPPCHECKLIB std::string toString(Color c);
 
 extern CPPCHECKLIB bool gDisableColors; // for testing
 
diff --git a/lib/config.h b/lib/config.h
index a0cbee51685..1b217e4546d 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-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
@@ -35,14 +35,26 @@
 #  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>
+// compatibility macros
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
+#ifndef __has_include
+#define __has_include(x) 0
+#endif
+
+#ifndef __has_cpp_attribute
+#define __has_cpp_attribute(x) 0
+#endif
+
+#ifndef __has_feature
+#define __has_feature(x) 0
 #endif
 
 // C++11 noexcept
-#if (defined(__GNUC__) && (__GNUC__ >= 5)) \
+#if defined(__cpp_noexcept_function_type) || \
+    (defined(__GNUC__) && (__GNUC__ >= 5)) \
     || defined(__clang__) \
     || defined(__CPPCHECK__)
 #  define NOEXCEPT noexcept
@@ -51,7 +63,8 @@
 #endif
 
 // C++11 noreturn
-#if (defined(__GNUC__) && (__GNUC__ >= 5)) \
+#if __has_cpp_attribute (noreturn) \
+    || (defined(__GNUC__) && (__GNUC__ >= 5)) \
     || defined(__clang__) \
     || defined(__CPPCHECK__)
 #  define NORETURN [[noreturn]]
@@ -62,7 +75,9 @@
 #endif
 
 // fallthrough
-#if defined(__clang__)
+#if __cplusplus >= 201703L && __has_cpp_attribute (fallthrough)
+#  define FALLTHROUGH [[fallthrough]]
+#elif defined(__clang__)
 #  define FALLTHROUGH [[clang::fallthrough]]
 #elif (defined(__GNUC__) && (__GNUC__ >= 7))
 #  define FALLTHROUGH __attribute__((fallthrough))
@@ -71,7 +86,9 @@
 #endif
 
 // unused
-#if defined(__GNUC__) \
+#if __cplusplus >= 201703L && __has_cpp_attribute (maybe_unused)
+#  define UNUSED [[maybe_unused]]
+#elif defined(__GNUC__) \
     || defined(__clang__) \
     || defined(__CPPCHECK__)
 #  define UNUSED __attribute__((unused))
@@ -79,10 +96,36 @@
 #  define UNUSED
 #endif
 
-#define REQUIRES(msg, ...) class=typename std::enable_if<__VA_ARGS__::value>::type
+// warn_unused
+#if __has_cpp_attribute (gnu::warn_unused) || \
+    (defined(__clang__) && (__clang_major__ >= 15))
+#  define WARN_UNUSED [[gnu::warn_unused]]
+#else
+#  define WARN_UNUSED
+#endif
+
+// deprecated
+#if defined(__GNUC__) \
+    || defined(__clang__) \
+    || defined(__CPPCHECK__)
+#  define DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+#  define DEPRECATED __declspec(deprecated)
+#else
+#  define DEPRECATED
+#endif
 
-#include <string>
-static const std::string emptyString;
+// returns_nonnull
+#if __has_cpp_attribute (gnu::returns_nonnull)
+#  define RET_NONNULL [[gnu::returns_nonnull]]
+#elif (defined(__clang__) && ((__clang_major__ > 3) || ((__clang_major__ == 3) && (__clang_minor__ >= 7)))) \
+    || (defined(__GNUC__) && (__GNUC__ >= 9))
+#  define RET_NONNULL __attribute__((returns_nonnull))
+#else
+#  define RET_NONNULL
+#endif
+
+#define REQUIRES(msg, ...) class=typename std::enable_if<__VA_ARGS__::value>::type
 
 // Use the nonneg macro when you want to assert that a variable/argument is not negative
 #ifdef __CPPCHECK__
@@ -96,11 +139,9 @@ static const std::string emptyString;
 #define nonneg
 #endif
 
-#if defined(__has_feature)
 #if __has_feature(address_sanitizer)
 #define ASAN 1
 #endif
-#endif
 
 #ifndef ASAN
 #ifdef  __SANITIZE_ADDRESS__
@@ -111,35 +152,61 @@ static const std::string emptyString;
 #endif
 
 #if defined(_WIN32)
-#define THREADING_MODEL_THREAD
+#define HAS_THREADING_MODEL_THREAD
 #define STDCALL __stdcall
-#elif defined(USE_THREADS)
-#define THREADING_MODEL_THREAD
-#define STDCALL
 #elif ((defined(__GNUC__) || defined(__sun)) && !defined(__MINGW32__)) || defined(__CPPCHECK__)
-#define THREADING_MODEL_FORK
+#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
 
 #define STRINGISIZE(...) #__VA_ARGS__
 
 #ifdef __clang__
-#define SUPPRESS_WARNING(warning, ...)_Pragma("clang diagnostic push") _Pragma(STRINGISIZE(clang diagnostic ignored warning)) __VA_ARGS__ _Pragma("clang diagnostic pop")
-#define SUPPRESS_DEPRECATED_WARNING(...) SUPPRESS_WARNING("-Wdeprecated", __VA_ARGS__)
-#define SUPPRESS_FLOAT_EQUAL_WARNING(...) SUPPRESS_WARNING("-Wfloat-equal", __VA_ARGS__)
+#define SUPPRESS_WARNING_PUSH(warning) _Pragma("clang diagnostic push") _Pragma(STRINGISIZE(clang diagnostic ignored warning))
+#define SUPPRESS_WARNING_POP _Pragma("clang diagnostic pop")
+#define SUPPRESS_WARNING_GCC_PUSH(warning)
+#define SUPPRESS_WARNING_GCC_POP
+#define SUPPRESS_WARNING_CLANG_PUSH(warning) SUPPRESS_WARNING_PUSH(warning)
+#define SUPPRESS_WARNING_CLANG_POP SUPPRESS_WARNING_POP
+#define FORCE_WARNING_PUSH(warn) _Pragma("clang diagnostic push") _Pragma(STRINGISIZE(clang diagnostic warning warn))
+#define FORCE_WARNING_CLANG_PUSH(warning) FORCE_WARNING_PUSH(warning)
+#define FORCE_WARNING_CLANG_POP SUPPRESS_WARNING_POP
+#elif defined(__GNUC__)
+#define SUPPRESS_WARNING_PUSH(warning) _Pragma("GCC diagnostic push") _Pragma(STRINGISIZE(GCC diagnostic ignored warning))
+#define SUPPRESS_WARNING_POP _Pragma("GCC diagnostic pop")
+#define SUPPRESS_WARNING_GCC_PUSH(warning) SUPPRESS_WARNING_PUSH(warning)
+#define SUPPRESS_WARNING_GCC_POP SUPPRESS_WARNING_POP
+#define SUPPRESS_WARNING_CLANG_PUSH(warning)
+#define SUPPRESS_WARNING_CLANG_POP
+#define FORCE_WARNING_PUSH(warning)
+#define FORCE_WARNING_CLANG_PUSH(warning)
+#define FORCE_WARNING_CLANG_POP
 #else
-#define SUPPRESS_WARNING(warning, ...) __VA_ARGS__
-#define SUPPRESS_DEPRECATED_WARNING(...) __VA_ARGS__
-#define SUPPRESS_FLOAT_EQUAL_WARNING(...) __VA_ARGS__
+#define SUPPRESS_WARNING_PUSH(warning)
+#define SUPPRESS_WARNING_POP
+#define SUPPRESS_WARNING_GCC_PUSH(warning)
+#define SUPPRESS_WARNING_GCC_POP
+#define SUPPRESS_WARNING_CLANG_PUSH(warning)
+#define SUPPRESS_WARNING_CLANG_POP
+#define FORCE_WARNING_PUSH(warning)
+#define FORCE_WARNING_CLANG_PUSH(warning)
+#define FORCE_WARNING_CLANG_POP
 #endif
 
 #if !defined(NO_WINDOWS_SEH) && defined(_WIN32) && defined(_MSC_VER)
 #define USE_WINDOWS_SEH
 #endif
 
-#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) && defined(__GNUC__) && !defined(__APPLE__) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__SVR4) && !defined(__QNX__) && !defined(_AIX)
 #define USE_UNIX_BACKTRACE_SUPPORT
 #endif
 
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 9be785315b0..399eb6d3d6e 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-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
@@ -15,199 +15,293 @@
  * 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 "cppcheck.h"
 
+#include "addoninfo.h"
+#include "analyzerinfo.h"
 #include "check.h"
 #include "checkunusedfunctions.h"
 #include "clangimport.h"
 #include "color.h"
 #include "ctu.h"
+#include "errorlogger.h"
 #include "errortypes.h"
+#include "filesettings.h"
 #include "library.h"
-#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
-#include "preprocessor.h" // Preprocessor
+#include "preprocessor.h"
+#include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
+#include "symboldatabase.h"
 #include "timer.h"
 #include "token.h"
-#include "tokenize.h" // Tokenizer
+#include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 #include "version.h"
 
+#ifdef HAVE_RULES
+#include "regex.h"
+#endif
+
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <cstdint>
 #include <cstring>
 #include <cctype>
 #include <cstdlib>
 #include <ctime>
-#include <exception>
+#include <exception> // IWYU pragma: keep
 #include <fstream>
-#include <iostream> // <- TEMPORARY
+#include <iostream>
+#include <map>
 #include <new>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
-#ifndef _WIN32
-#include <unistd.h>
-#else
-#include <process.h>
-#endif
-
-#define PICOJSON_USE_INT64
-#include <picojson.h>
+#include "json.h"
 
 #include <simplecpp.h>
 
-#include <tinyxml2.h>
+namespace tinyxml2 { class XMLElement; }
 
-#ifdef HAVE_RULES
-#ifdef _WIN32
-#define PCRE_STATIC
-#endif
-#include <pcre.h>
-#endif
+static constexpr char Version[] = CPPCHECK_VERSION_STRING;
+static constexpr char ExtraVersion[] = "";
 
-class SymbolDatabase;
+static constexpr char FILELIST[] = "cppcheck-addon-ctu-file-list";
 
-static const char Version[] = CPPCHECK_VERSION_STRING;
-static const char ExtraVersion[] = "";
+// CWE ids used
+static const CWE CWE398(398U);  // Indicator of Poor Code Quality
 
-static const char FILELIST[] = "cppcheck-addon-ctu-file-list";
+class CppCheck::CppCheckLogger : public ErrorLogger
+{
+public:
+    CppCheckLogger(ErrorLogger& errorLogger, const Settings& settings, Suppressions& suppressions, bool useGlobalSuppressions)
+        : mErrorLogger(errorLogger)
+        , mSettings(settings)
+        , mSuppressions(suppressions)
+        , mUseGlobalSuppressions(useGlobalSuppressions)
+    {}
+
+    ~CppCheckLogger() override
+    {
+        closePlist();
+    }
 
-static TimerResults s_timerResults;
+    void setRemarkComments(std::vector<RemarkComment> remarkComments)
+    {
+        mRemarkComments = std::move(remarkComments);
+    }
 
-// CWE ids used
-static const CWE CWE398(398U);  // Indicator of Poor Code Quality
+    void setLocationMacros(const Token* startTok, const std::vector<std::string>& files)
+    {
+        mLocationMacros.clear();
+        for (const Token* tok = startTok; tok; tok = tok->next()) {
+            if (!tok->getMacroName().empty())
+                mLocationMacros[Location(files[tok->fileIndex()], tok->linenr())].emplace(tok->getMacroName());
+        }
+    }
 
-namespace {
-    struct AddonInfo {
-        std::string name;
-        std::string scriptFile; // addon script
-        std::string executable; // addon executable
-        std::string args;       // special extra arguments
-        std::string python;     // script interpreter
-        bool ctu = false;
-        std::string runScript;
-
-        static std::string getFullPath(const std::string &fileName, const std::string &exename) {
-            if (Path::fileExists(fileName))
-                return fileName;
-
-            const std::string exepath = Path::getPathFromFilename(exename);
-            if (Path::fileExists(exepath + fileName))
-                return exepath + fileName;
-            if (Path::fileExists(exepath + "addons/" + fileName))
-                return exepath + "addons/" + fileName;
-
-#ifdef FILESDIR
-            if (Path::fileExists(FILESDIR + ("/" + fileName)))
-                return FILESDIR + ("/" + fileName);
-            if (Path::fileExists(FILESDIR + ("/addons/" + fileName)))
-                return FILESDIR + ("/addons/" + fileName);
-#endif
-            return "";
+    void resetExitCode()
+    {
+        mExitCode = 0;
+    }
+
+    void clear()
+    {
+        mErrorList.clear();
+    }
+
+    void openPlist(const std::string& filename, const std::vector<std::string>& files)
+    {
+        mPlistFile.open(filename);
+        mPlistFile << ErrorLogger::plistHeader(version(), files);
+    }
+
+    void closePlist()
+    {
+        if (mPlistFile.is_open()) {
+            mPlistFile << ErrorLogger::plistFooter();
+            mPlistFile.close();
         }
+    }
 
-        std::string parseAddonInfo(const picojson::value &json, const std::string &fileName, const std::string &exename) {
-            const std::string& json_error = picojson::get_last_error();
-            if (!json_error.empty()) {
-                return "Loading " + fileName + " failed. " + json_error;
-            }
-            if (!json.is<picojson::object>())
-                return "Loading " + fileName + " failed. Bad json.";
-            picojson::object obj = json.get<picojson::object>();
-            if (obj.count("args")) {
-                if (!obj["args"].is<picojson::array>())
-                    return "Loading " + fileName + " failed. args must be array.";
-                for (const picojson::value &v : obj["args"].get<picojson::array>())
-                    args += " " + v.get<std::string>();
-            }
+    unsigned int exitcode() const
+    {
+        return mExitCode;
+    }
 
-            if (obj.count("ctu")) {
-                // ctu is specified in the config file
-                if (!obj["ctu"].is<bool>())
-                    return "Loading " + fileName + " failed. ctu must be boolean.";
-                ctu = obj["ctu"].get<bool>();
-            } else {
-                ctu = false;
-            }
+    void setAnalyzerInfo(AnalyzerInformation* info)
+    {
+        mAnalyzerInformation = info;
+    }
+
+private:
+    /**
+     * @brief Errors and warnings are directed here.
+     *
+     * @param msg Errors messages are normally in format
+     * "[filepath:line number] Message", e.g.
+     * "[main.cpp:4] Uninitialized member variable"
+     */
+    // TODO: part of this logic is duplicated in Executor::hasToLog()
+    void reportErr(const ErrorMessage &msg) override
+    {
+        if (msg.severity == Severity::internal) {
+            mErrorLogger.reportErr(msg);
+            return;
+        }
+
+        if (!mSettings.library.reportErrors(msg.file0))
+            return;
+
+        std::set<std::string> macroNames;
+        if (!msg.callStack.empty()) {
+            const std::string &file = msg.callStack.back().getfile(false);
+            int lineNumber = msg.callStack.back().line;
+            const auto it = mLocationMacros.find(Location(file, lineNumber));
+            if (it != mLocationMacros.cend())
+                macroNames = it->second;
+        }
+
+        // TODO: only convert if necessary
+        const auto errorMessage = SuppressionList::ErrorMessage::fromErrorMessage(msg, macroNames);
 
-            if (obj.count("python")) {
-                // Python was defined in the config file
-                if (obj["python"].is<picojson::array>()) {
-                    return "Loading " + fileName +" failed. python must not be an array.";
+        if (mSuppressions.nomsg.isSuppressed(errorMessage, mUseGlobalSuppressions)) {
+            // Safety: Report critical errors to ErrorLogger
+            if (mSettings.safety && ErrorLogger::isCriticalErrorId(msg.id)) {
+                mExitCode = 1;
+
+                if (mSuppressions.nomsg.isSuppressedExplicitly(errorMessage, mUseGlobalSuppressions)) {
+                    // Report with internal severity to signal that there is this critical error but
+                    // it is suppressed
+                    ErrorMessage temp(msg);
+                    temp.severity = Severity::internal;
+                    mErrorLogger.reportErr(temp);
+                } else {
+                    // Report critical error that is not explicitly suppressed
+                    mErrorLogger.reportErr(msg);
                 }
-                python = obj["python"].get<std::string>();
-            } else {
-                python = "";
             }
+            return;
+        }
 
-            if (obj.count("executable")) {
-                if (!obj["executable"].is<std::string>())
-                    return "Loading " + fileName + " failed. executable must be a string.";
-                executable = getFullPath(obj["executable"].get<std::string>(), fileName);
-                return "";
-            }
+        // TODO: there should be no need for the verbose and default messages here
+        std::string errmsg = msg.toString(mSettings.verbose, mSettings.templateFormat, mSettings.templateLocation);
+        if (errmsg.empty())
+            return;
 
-            return getAddonInfo(obj["script"].get<std::string>(), exename);
+        // Alert only about unique errors.
+        // This makes sure the errors of a single check() call are unique.
+        // TODO: get rid of this? This is forwarded to another ErrorLogger which is also doing this
+        if (!mSettings.emitDuplicates && !mErrorList.emplace(std::move(errmsg)).second)
+            return;
+
+        if (mAnalyzerInformation)
+            mAnalyzerInformation->reportErr(msg);
+
+        if (!mSuppressions.nofail.isSuppressed(errorMessage) && !mSuppressions.nomsg.isSuppressed(errorMessage)) {
+            mExitCode = 1;
         }
 
-        std::string getAddonInfo(const std::string &fileName, const std::string &exename) {
-            if (fileName[0] == '{') {
-                std::istringstream in(fileName);
-                picojson::value json;
-                in >> json;
-                return parseAddonInfo(json, fileName, exename);
-            }
-            if (fileName.find('.') == std::string::npos)
-                return getAddonInfo(fileName + ".py", exename);
-
-            if (endsWith(fileName, ".py")) {
-                scriptFile = getFullPath(fileName, exename);
-                if (scriptFile.empty())
-                    return "Did not find addon " + fileName;
-
-                std::string::size_type pos1 = scriptFile.rfind('/');
-                if (pos1 == std::string::npos)
-                    pos1 = 0;
-                else
-                    pos1++;
-                std::string::size_type pos2 = scriptFile.rfind('.');
-                if (pos2 < pos1)
-                    pos2 = std::string::npos;
-                name = scriptFile.substr(pos1, pos2 - pos1);
-
-                runScript = getFullPath("runaddon.py", exename);
-
-                return "";
+        std::string remark;
+        if (!msg.callStack.empty()) {
+            for (const auto& r: mRemarkComments) {
+                if (r.file != msg.callStack.back().getfile(false))
+                    continue;
+                if (r.lineNumber != msg.callStack.back().line)
+                    continue;
+                remark = r.str;
+                break;
             }
+        }
 
-            if (!endsWith(fileName, ".json"))
-                return "Failed to open addon " + fileName;
+        if (!remark.empty()) {
+            ErrorMessage msg2(msg);
+            msg2.remark = std::move(remark);
+            mErrorLogger.reportErr(msg2);
+        } else {
+            mErrorLogger.reportErr(msg);
+        }
 
-            std::ifstream fin(fileName);
-            if (!fin.is_open())
-                return "Failed to open " + fileName;
-            picojson::value json;
-            fin >> json;
-            return parseAddonInfo(json, fileName, exename);
+        // check if plistOutput should be populated and the current output file is open and the error is not suppressed
+        if (!mSettings.plistOutput.empty() && mPlistFile.is_open() && !mSuppressions.nomsg.isSuppressed(errorMessage)) {
+            // add error to plist output file
+            mPlistFile << ErrorLogger::plistData(msg);
         }
+    }
+
+    /**
+     * @brief Information about progress is directed here.
+     *
+     * @param outmsg Message to show, e.g. "Checking main.cpp..."
+     */
+    void reportOut(const std::string &outmsg, Color c = Color::Reset) override
+    {
+        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);
+    }
+
+    ErrorLogger &mErrorLogger;
+    const Settings& mSettings;
+    Suppressions& mSuppressions;
+    bool mUseGlobalSuppressions;
+
+    // TODO: store hashes instead of the full messages
+    std::unordered_set<std::string> mErrorList;
+
+    std::vector<RemarkComment> mRemarkComments;
+
+    using Location = std::pair<std::string, int>;
+    std::map<Location, std::set<std::string>> mLocationMacros; // What macros are used on a location?
+
+    std::ofstream mPlistFile;
+
+    unsigned int mExitCode{};
+
+    AnalyzerInformation* mAnalyzerInformation{};
+};
+
+
+// File deleter
+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;
     };
 }
 
 static std::string cmdFileName(std::string f)
 {
-    f = Path::toNativeSeparators(f);
+    f = Path::toNativeSeparators(std::move(f));
     if (f.find(' ') != std::string::npos)
         return "\"" + f + "\"";
     return f;
@@ -236,28 +330,16 @@ static std::vector<std::string> split(const std::string &str, const std::string
     return ret;
 }
 
-static int getPid()
-{
-#ifndef _WIN32
-    return getpid();
-#else
-    return _getpid();
-#endif
-}
-
-static std::string getDumpFileName(const Settings& settings, const std::string& filename)
+static std::string getDumpFileName(const Settings& settings, const std::string& filename, int fileIndex)
 {
-    if (!settings.dumpFile.empty())
-        return settings.dumpFile;
-
-    std::string extension;
-    if (settings.dump)
-        extension = ".dump";
-    else
-        extension = "." + std::to_string(getPid()) + ".dump";
+    std::string extension = ".dump";
+    if (fileIndex > 0)
+        extension = "." + std::to_string(fileIndex) + 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, emptyString) + extension;
+        return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, filename, "", fileIndex) + extension;
     return filename + extension;
 }
 
@@ -267,58 +349,91 @@ static std::string getCtuInfoFileName(const std::string &dumpFile)
 }
 
 static void createDumpFile(const Settings& settings,
-                           const std::string& filename,
+                           const FileWithDetails& file,
+                           int fileIndex,
                            std::ofstream& fdump,
                            std::string& dumpFile)
 {
     if (!settings.dump && settings.addons.empty())
         return;
-    dumpFile = getDumpFileName(settings, filename);
+    dumpFile = getDumpFileName(settings, file.spath(), fileIndex);
 
     fdump.open(dumpFile);
     if (!fdump.is_open())
         return;
 
-    {
+    if (!settings.buildDir.empty()) {
         std::ofstream fout(getCtuInfoFileName(dumpFile));
     }
 
     std::string language;
-    switch (settings.enforcedLang) {
-    case Settings::Language::C:
+
+    assert(file.lang() != Standards::Language::None);
+
+    switch (file.lang()) {
+    case Standards::Language::C:
         language = " language=\"c\"";
         break;
-    case Settings::Language::CPP:
+    case Standards::Language::CPP:
         language = " language=\"cpp\"";
         break;
-    case Settings::Language::None:
-        if (Path::isCPP(filename))
-            language = " language=\"cpp\"";
-        else if (Path::isC(filename))
-            language = " language=\"c\"";
+    case Standards::Language::None:
         break;
     }
 
-    fdump << "<?xml version=\"1.0\"?>" << std::endl;
-    fdump << "<dumps" << language << ">" << std::endl;
+    fdump << "<?xml version=\"1.0\"?>\n";
+    fdump << "<dumps" << language << ">\n";
     fdump << "  <platform"
           << " name=\"" << settings.platform.toString() << '\"'
-          << " char_bit=\"" << settings.platform.char_bit << '\"'
-          << " short_bit=\"" << settings.platform.short_bit << '\"'
-          << " int_bit=\"" << settings.platform.int_bit << '\"'
-          << " long_bit=\"" << settings.platform.long_bit << '\"'
-          << " long_long_bit=\"" << settings.platform.long_long_bit << '\"'
+          << " char_bit=\"" << static_cast<unsigned>(settings.platform.char_bit) << '\"'
+          << " short_bit=\"" << static_cast<unsigned>(settings.platform.short_bit) << '\"'
+          << " 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) << '\"'
           << "/>\n";
 }
 
-static std::string executeAddon(const AddonInfo &addonInfo,
-                                const std::string &defaultPythonExe,
-                                const std::string &file,
-                                const std::string &premiumArgs,
-                                const std::function<bool(std::string,std::vector<std::string>,std::string,std::string&)> &executeCommand)
+static std::string detectPython(const CppCheck::ExecuteCmdFn &executeCommand)
+{
+#ifdef _WIN32
+    const char *py_exes[] = { "python3.exe", "python.exe" };
+#else
+    const char *py_exes[] = { "python3", "python" };
+#endif
+    for (const char* py_exe : py_exes) {
+        std::string out;
+#ifdef _MSC_VER
+        // FIXME: hack to avoid debug assertion with _popen() in executeCommand() for non-existing commands
+        const std::string cmd = std::string(py_exe) + " --version >NUL 2>&1";
+        if (system(cmd.c_str()) != 0) {
+            // TODO: get more detailed error?
+            continue;
+        }
+#endif
+        if (executeCommand(py_exe, split("--version"), "2>&1", out) == EXIT_SUCCESS && startsWith(out, "Python ") && std::isdigit(out[7])) {
+            return py_exe;
+        }
+    }
+    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)
 {
-    const std::string redirect = "2>&1";
+    if (!executeCommand)
+        throw InternalError(nullptr, "Failed to execute addon - no command callback provided");
 
     std::string pythonExe;
 
@@ -329,20 +444,11 @@ static std::string executeAddon(const AddonInfo &addonInfo,
     else if (!defaultPythonExe.empty())
         pythonExe = cmdFileName(defaultPythonExe);
     else {
-#ifdef _WIN32
-        const char *py_exes[] = { "python3.exe", "python.exe" };
-#else
-        const char *py_exes[] = { "python3", "python" };
-#endif
-        for (const char* py_exe : py_exes) {
-            std::string out;
-            if (executeCommand(py_exe, split("--version"), redirect, out) && out.compare(0, 7, "Python ") == 0 && std::isdigit(out[7])) {
-                pythonExe = py_exe;
-                break;
-            }
-        }
-        if (pythonExe.empty())
+        // 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");
+        pythonExe = detectedPythonExe;
     }
 
     std::string args;
@@ -352,31 +458,67 @@ static std::string executeAddon(const AddonInfo &addonInfo,
     if (!premiumArgs.empty() && !addonInfo.executable.empty())
         args += " " + premiumArgs;
 
-    const std::string fileArg = (endsWith(file, FILELIST, sizeof(FILELIST)-1) ? " --file-list " : " ") + cmdFileName(file);
+    const bool is_file_list = (file.find(FILELIST) != std::string::npos);
+    const std::string fileArg = (is_file_list ? " --file-list " : " ") + cmdFileName(file);
     args += fileArg;
 
     std::string result;
-    if (!executeCommand(pythonExe, split(args), redirect, result)) {
-        std::string message("Failed to execute addon (command: '" + pythonExe + " " + args + "'). Exitcode is nonzero.");
+    if (const int exitcode = executeCommand(pythonExe, split(args), "2>&1", result)) {
+        std::string message("Failed to execute addon '" + addonInfo.name + "' - exitcode is " + std::to_string(exitcode));
+        std::string details = pythonExe + " " + args;
         if (result.size() > 2) {
-            message = message + "\n" + message + "\nOutput:\n" + result;
-            message.resize(message.find_last_not_of("\n\r"));
+            details += "\nOutput:\n";
+            details += result;
+            const auto pos = details.find_last_not_of("\n\r");
+            if (pos != std::string::npos)
+                details.resize(pos + 1);
         }
-        throw InternalError(nullptr, message);
+        throw InternalError(nullptr, std::move(message), std::move(details));
     }
 
+    std::vector<picojson::value> addonResult;
+
     // Validate output..
     std::istringstream istr(result);
     std::string line;
     while (std::getline(istr, line)) {
-        if (line.compare(0,9,"Checking ", 0, 9) != 0 && !line.empty() && line[0] != '{') {
+        // TODO: also bail out?
+        if (line.empty()) {
+            //std::cout << "addon '" << addonInfo.name <<  "' result contains empty line" << std::endl;
+            continue;
+        }
+
+        // TODO: get rid of this
+        if (startsWith(line,"Checking ")) {
+            //std::cout << "addon '" << addonInfo.name <<  "' result contains 'Checking ' line" << std::endl;
+            continue;
+        }
+
+        if (line[0] != '{') {
+            //std::cout << "addon '" << addonInfo.name <<  "' result is not a JSON" << std::endl;
+
             result.erase(result.find_last_not_of('\n') + 1, std::string::npos); // Remove trailing newlines
             throw InternalError(nullptr, "Failed to execute '" + pythonExe + " " + args + "'. " + result);
         }
+
+        //std::cout << "addon '" << addonInfo.name <<  "' result is " << line << std::endl;
+
+        // TODO: make these failures?
+        picojson::value res;
+        const std::string err = picojson::parse(res, line);
+        if (!err.empty()) {
+            //std::cout << "addon '" << addonInfo.name <<  "' result is not a valid JSON (" << err << ")" << std::endl;
+            continue;
+        }
+        if (!res.is<picojson::object>()) {
+            //std::cout << "addon '" << addonInfo.name <<  "' result is not a JSON object" << std::endl;
+            continue;
+        }
+        addonResult.emplace_back(std::move(res));
     }
 
     // Valid results
-    return result;
+    return addonResult;
 }
 
 static std::string getDefinesFlags(const std::string &semicolonSeparatedString)
@@ -387,29 +529,30 @@ static std::string getDefinesFlags(const std::string &semicolonSeparatedString)
     return flags;
 }
 
-CppCheck::CppCheck(ErrorLogger &errorLogger,
+CppCheck::CppCheck(const Settings& settings,
+                   Suppressions& supprs,
+                   ErrorLogger &errorLogger,
+                   TimerResults *timerResults,
                    bool useGlobalSuppressions,
-                   std::function<bool(std::string,std::vector<std::string>,std::string,std::string&)> executeCommand)
-    : mErrorLogger(errorLogger)
-    , mExitCode(0)
+                   ExecuteCmdFn executeCommand)
+    : mSettings(settings)
+    , mSuppressions(supprs)
+    , mLogger(new CppCheckLogger(errorLogger, mSettings, mSuppressions, useGlobalSuppressions))
+    , mErrorLogger(*mLogger)
+    , mErrorLoggerDirect(errorLogger)
+    , mTimerResults(timerResults)
     , mUseGlobalSuppressions(useGlobalSuppressions)
-    , mTooManyConfigs(false)
-    , mSimplify(true)
     , mExecuteCommand(std::move(executeCommand))
 {}
 
 CppCheck::~CppCheck()
 {
+    mLogger->setAnalyzerInfo(nullptr);
+
     while (!mFileInfo.empty()) {
         delete mFileInfo.back();
         mFileInfo.pop_back();
     }
-    s_timerResults.showResults(mSettings.showtime);
-
-    if (mPlistFile.is_open()) {
-        mPlistFile << ErrorLogger::plistFooter();
-        mPlistFile.close();
-    }
 }
 
 const char * CppCheck::version()
@@ -444,18 +587,17 @@ static bool reportClangErrors(std::istream &is, const std::function<void(const E
         if (pos1 >= pos2 || pos2 >= pos3)
             continue;
 
-        const std::string filename = line.substr(0, pos1);
+        std::string filename = line.substr(0, pos1);
         const std::string linenr = line.substr(pos1+1, pos2-pos1-1);
         const std::string colnr = line.substr(pos2+1, pos3-pos2-1);
         const std::string msg = line.substr(line.find(':', pos3+1) + 2);
 
-        const std::string locFile = Path::toNativeSeparators(filename);
-        ErrorMessage::FileLocation loc;
-        loc.setfile(locFile);
-        loc.line = strToInt<int>(linenr);
-        loc.column = strToInt<unsigned int>(colnr);
+        std::string locFile = Path::toNativeSeparators(std::move(filename));
+        const int line_i = strToInt<int>(linenr);
+        const int column = strToInt<unsigned int>(colnr);
+        ErrorMessage::FileLocation loc(locFile, line_i, column);
         ErrorMessage errmsg({std::move(loc)},
-                            locFile,
+                            std::move(locFile),
                             Severity::error,
                             msg,
                             "syntaxError",
@@ -473,359 +615,474 @@ static bool reportClangErrors(std::istream &is, const std::function<void(const E
     return false;
 }
 
-unsigned int CppCheck::check(const std::string &path)
+std::string CppCheck::getLibraryDumpData() const {
+    std::string out;
+    for (const std::string &s : mSettings.libraries) {
+        out += "  <library lib=\"" + s + "\"/>\n";
+    }
+    return out;
+}
+
+/**
+ * @brief Get the clang command line flags using the Settings
+ * @param lang language guessed from filename
+ * @return Clang command line flags
+ */
+static std::string getClangFlags(const Settings& setting, Standards::Language lang) {
+    std::string flags;
+
+    assert(lang != Standards::Language::None);
+
+    switch (lang) {
+    case Standards::Language::C:
+        flags = "-x c ";
+        if (!setting.standards.stdValueC.empty())
+            flags += "-std=" + setting.standards.stdValueC + " ";
+        break;
+    case Standards::Language::CPP:
+        flags += "-x c++ ";
+        if (!setting.standards.stdValueCPP.empty())
+            flags += "-std=" + setting.standards.stdValueCPP + " ";
+        break;
+    case Standards::Language::None:
+        break;
+    }
+
+    for (const std::string &i: setting.includePaths)
+        flags += "-I" + i + " ";
+
+    flags += getDefinesFlags(setting.userDefines);
+
+    for (const std::string &i: setting.userIncludes)
+        flags += "--include " + cmdFileName(i) + " ";
+
+    return flags;
+}
+
+// TODO: clear error list before returning
+unsigned int CppCheck::checkClang(const FileWithDetails &file, int fileIndex)
 {
-    if (mSettings.clang) {
-        if (!mSettings.quiet)
-            mErrorLogger.reportOut(std::string("Checking ") + path + "...", Color::FgGreen);
-
-        const std::string lang = Path::isCPP(path) ? "-x c++" : "-x c";
-        const std::string analyzerInfo = mSettings.buildDir.empty() ? std::string() : AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, path, emptyString);
-        const std::string clangcmd = analyzerInfo + ".clang-cmd";
-        const std::string clangStderr = analyzerInfo + ".clang-stderr";
-        const std::string clangAst = analyzerInfo + ".clang-ast";
-        std::string exe = mSettings.clangExecutable;
+    // TODO: clear exitcode
+
+    if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mUnusedFunctionsCheck)
+        mUnusedFunctionsCheck.reset(new CheckUnusedFunctions());
+
+    if (!mSettings.quiet)
+        mErrorLogger.reportOut(std::string("Checking ") + file.spath() + " ...", Color::FgGreen);
+
+    // TODO: get language from FileWithDetails object
+    std::string clangStderr;
+    if (!mSettings.buildDir.empty())
+        clangStderr = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, file.spath(), "", fileIndex) + ".clang-stderr";
+
+    std::string exe = mSettings.clangExecutable;
 #ifdef _WIN32
-        // append .exe if it is not a path
-        if (Path::fromNativeSeparators(mSettings.clangExecutable).find('/') == std::string::npos) {
-            exe += ".exe";
-        }
+    // append .exe if it is not a path
+    if (Path::fromNativeSeparators(mSettings.clangExecutable).find('/') == std::string::npos) {
+        exe += ".exe";
+    }
 #endif
 
-        std::string flags(lang + " ");
-        if (Path::isCPP(path) && !mSettings.standards.stdValue.empty())
-            flags += "-std=" + mSettings.standards.stdValue + " ";
+    const std::string args2 = "-fsyntax-only -Xclang -ast-dump -fno-color-diagnostics " +
+                              getClangFlags(mSettings, file.lang()) +
+                              file.spath();
+    const std::string redirect2 = clangStderr.empty() ? "2>&1" : ("2> " + clangStderr);
+    if (mSettings.verbose && !mSettings.quiet) {
+        mErrorLogger.reportOut(exe + " " + args2, Color::Reset);
+    }
 
-        for (const std::string &i: mSettings.includePaths)
-            flags += "-I" + i + " ";
+    if (!mExecuteCommand) {
+        std::cerr << "Failed to execute '" << exe << " " << args2 << " " << redirect2 << "' - (no command callback provided)" << std::endl;
+        return 0; // TODO: report as failure?
+    }
 
-        flags += getDefinesFlags(mSettings.userDefines);
+    std::string output2;
+    const int exitcode = mExecuteCommand(exe,split(args2),redirect2,output2);
+    if (mSettings.debugClangOutput) {
+        std::cout << output2 << std::endl;
+    }
+    // TODO: this might also fail if compiler errors are encountered - we should report them properly
+    if (exitcode != EXIT_SUCCESS) {
+        // TODO: report as proper error
+        std::cerr << "Failed to execute '" << exe << " " << args2 << " " << redirect2 << "' - (exitcode: " << exitcode << " / output: " << output2 << ")" << std::endl;
+        return 0; // TODO: report as failure?
+    }
 
-        const std::string args2 = "-fsyntax-only -Xclang -ast-dump -fno-color-diagnostics " + flags + path;
-        const std::string redirect2 = analyzerInfo.empty() ? std::string("2>&1") : ("2> " + clangStderr);
-        if (!mSettings.buildDir.empty()) {
-            std::ofstream fout(clangcmd);
-            fout << exe << " " << args2 << " " << redirect2 << std::endl;
-        } else if (mSettings.verbose && !mSettings.quiet) {
-            mErrorLogger.reportOut(exe + " " + args2);
-        }
+    if (output2.find("TranslationUnitDecl") == std::string::npos) {
+        // TODO: report as proper error
+        std::cerr << "Failed to execute '" << exe << " " << args2 << " " << redirect2 << "' - (no TranslationUnitDecl in output)" << std::endl;
+        return 0; // TODO: report as failure?
+    }
 
-        std::string output2;
-        if (!mExecuteCommand(exe,split(args2),redirect2,output2) || output2.find("TranslationUnitDecl") == std::string::npos) {
-            std::cerr << "Failed to execute '" << exe << " " << args2 << " " << redirect2 << "'" << std::endl;
-            return 0;
-        }
+    const auto reportError = [this](const ErrorMessage& errorMessage) {
+        mErrorLogger.reportErr(errorMessage);
+    };
 
-        // Ensure there are not syntax errors...
-        std::vector<ErrorMessage> compilerWarnings;
-        if (!mSettings.buildDir.empty()) {
-            std::ifstream fin(clangStderr);
-            auto reportError = [this](const ErrorMessage& errorMessage) {
-                reportErr(errorMessage);
-            };
-            if (reportClangErrors(fin, reportError, compilerWarnings))
-                return 0;
-        } else {
-            std::istringstream istr(output2);
-            auto reportError = [this](const ErrorMessage& errorMessage) {
-                reportErr(errorMessage);
-            };
-            if (reportClangErrors(istr, reportError, compilerWarnings))
-                return 0;
-        }
+    // Ensure there are not syntax errors...
+    std::vector<ErrorMessage> compilerWarnings;
+    if (!clangStderr.empty()) {
+        std::ifstream fin(clangStderr);
+        if (reportClangErrors(fin, reportError, compilerWarnings))
+            return 0; // TODO: report as failure?
+    } else {
+        std::istringstream istr(output2);
+        if (reportClangErrors(istr, reportError, compilerWarnings))
+            return 0; // TODO: report as failure?
+    }
 
-        if (!mSettings.buildDir.empty()) {
-            std::ofstream fout(clangAst);
-            fout << output2 << std::endl;
+    try {
+        TokenList tokenlist{mSettings, file.lang()};
+        tokenlist.appendFileIfNew(file.spath());
+        Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
+        std::istringstream ast(output2);
+        clangimport::parseClangAstDump(tokenizer, ast);
+        ValueFlow::setValues(tokenizer.list,
+                             const_cast<SymbolDatabase&>(*tokenizer.getSymbolDatabase()),
+                             mErrorLogger,
+                             mSettings,
+                             mTimerResults);
+        tokenizer.printDebugOutput(std::cout);
+        checkNormalTokens(tokenizer, nullptr, ""); // TODO: provide analyzer information
+
+        // create dumpfile
+        std::ofstream fdump;
+        std::string dumpFile;
+        createDumpFile(mSettings, file, fileIndex, fdump, dumpFile);
+        if (fdump.is_open()) {
+            fdump << getLibraryDumpData();
+            // TODO: use tinyxml2 to create XML
+            fdump << "<dump cfg=\"\">\n";
+            for (const ErrorMessage& errmsg: compilerWarnings)
+                fdump << "  <clang-warning file=\"" << ErrorLogger::toxml(errmsg.callStack.front().getfile()) << "\" line=\"" << errmsg.callStack.front().line << "\" column=\"" << errmsg.callStack.front().column << "\" message=\"" << ErrorLogger::toxml(errmsg.shortMessage()) << "\"/>\n";
+            fdump << "  <standards>\n";
+            fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>\n";
+            fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>\n";
+            fdump << "  </standards>\n";
+            tokenizer.dump(fdump);
+            fdump << "</dump>\n";
+            fdump << "</dumps>\n";
+            fdump.close();
         }
 
-        try {
-            std::istringstream ast(output2);
-            Tokenizer tokenizer(&mSettings, this);
-            tokenizer.list.appendFileIfNew(path);
-            clangimport::parseClangAstDump(&tokenizer, ast);
-            ValueFlow::setValues(&tokenizer.list,
-                                 const_cast<SymbolDatabase*>(tokenizer.getSymbolDatabase()),
-                                 this,
-                                 &mSettings,
-                                 &s_timerResults);
-            if (mSettings.debugnormal)
-                tokenizer.printDebugOutput(1);
-            checkNormalTokens(tokenizer);
-
-            // create dumpfile
-            std::ofstream fdump;
-            std::string dumpFile;
-            createDumpFile(mSettings, path, fdump, dumpFile);
-            if (fdump.is_open()) {
-                fdump << "<dump cfg=\"\">" << std::endl;
-                for (const ErrorMessage& errmsg: compilerWarnings)
-                    fdump << "  <clang-warning file=\"" << toxml(errmsg.callStack.front().getfile()) << "\" line=\"" << errmsg.callStack.front().line << "\" column=\"" << errmsg.callStack.front().column << "\" message=\"" << toxml(errmsg.shortMessage()) << "\"/>\n";
-                fdump << "  <standards>" << std::endl;
-                fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
-                fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
-                fdump << "  </standards>" << std::endl;
-                tokenizer.dump(fdump);
-                fdump << "</dump>" << std::endl;
-                fdump << "</dumps>" << std::endl;
-                fdump.close();
-            }
+        // run addons
+        executeAddons(dumpFile, file);
 
-            // run addons
-            executeAddons(dumpFile);
-
-        } catch (const InternalError &e) {
-            internalError(path, e.errorMessage);
-            mExitCode = 1; // e.g. reflect a syntax error
-        } catch (const TerminateException &) {
-            // Analysis is terminated
-            return mExitCode;
-        } catch (const std::exception &e) {
-            internalError(path, e.what());
-        }
+    } catch (const InternalError &e) {
+        const ErrorMessage errmsg = ErrorMessage::fromInternalError(e, nullptr, file.spath(), "Bailing out from analysis: Processing Clang AST dump failed");
+        mErrorLogger.reportErr(errmsg);
+    } catch (const TerminateException &) {
+        // Analysis is terminated
+    } catch (const std::exception &e) {
+        internalError(file.spath(), std::string("Processing Clang AST dump failed: ") + e.what());
+    }
 
-        return mExitCode;
+    return mLogger->exitcode();
+}
+
+unsigned int CppCheck::check(const FileWithDetails &file)
+{
+    // TODO: handle differently?
+    // dummy call to make sure wildcards are being flagged as checked in case isSuppressed() is never called
+    {
+        // the empty ID is intentional for now - although it should not be allowed
+        ErrorMessage msg({}, file.spath(), Severity::information, "", "", Certainty::normal);
+        (void)mSuppressions.nomsg.isSuppressed(SuppressionList::ErrorMessage::fromErrorMessage(msg, {}), true);
     }
 
-    return checkFile(Path::simplifyPath(path), emptyString);
+    unsigned int returnValue;
+    if (mSettings.clang)
+        returnValue = checkClang(file, 0);
+    else
+        returnValue = checkFile(file, "", 0);
+
+    // TODO: call analyseClangTidy()
+
+    return returnValue;
 }
 
-unsigned int CppCheck::check(const std::string &path, const std::string &content)
+unsigned int CppCheck::checkBuffer(const FileWithDetails &file, const char* data, std::size_t size)
 {
-    std::istringstream iss(content);
-    return checkFile(Path::simplifyPath(path), emptyString, &iss);
+    return checkBuffer(file, "", 0, data, size);
 }
 
-unsigned int CppCheck::check(const ImportProject::FileSettings &fs)
+unsigned int CppCheck::check(const FileSettings &fs)
 {
-    CppCheck temp(mErrorLogger, mUseGlobalSuppressions, mExecuteCommand);
-    temp.mSettings = mSettings;
-    if (!temp.mSettings.userDefines.empty())
-        temp.mSettings.userDefines += ';';
+    // TODO: move to constructor when CppCheck no longer owns the settings
+    if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mUnusedFunctionsCheck)
+        mUnusedFunctionsCheck.reset(new CheckUnusedFunctions());
+
+    Settings tempSettings = mSettings; // this is a copy
+    if (!tempSettings.userDefines.empty())
+        tempSettings.userDefines += ';';
     if (mSettings.clang)
-        temp.mSettings.userDefines += fs.defines;
+        tempSettings.userDefines += fs.defines;
     else
-        temp.mSettings.userDefines += fs.cppcheckDefines();
-    temp.mSettings.includePaths = fs.includePaths;
-    temp.mSettings.userUndefs.insert(fs.undefs.cbegin(), fs.undefs.cend());
+        tempSettings.userDefines += fs.cppcheckDefines();
+    tempSettings.includePaths = fs.includePaths;
+    tempSettings.userUndefs.insert(fs.undefs.cbegin(), fs.undefs.cend());
     if (fs.standard.find("++") != std::string::npos)
-        temp.mSettings.standards.setCPP(fs.standard);
+        tempSettings.standards.setCPP(fs.standard);
     else if (!fs.standard.empty())
-        temp.mSettings.standards.setC(fs.standard);
-    if (fs.platformType != cppcheck::Platform::Type::Unspecified)
-        temp.mSettings.platform.set(fs.platformType);
+        tempSettings.standards.setC(fs.standard);
+    if (fs.platformType != Platform::Type::Unspecified)
+        tempSettings.platform.set(fs.platformType);
     if (mSettings.clang) {
-        temp.mSettings.includePaths.insert(temp.mSettings.includePaths.end(), fs.systemIncludePaths.cbegin(), fs.systemIncludePaths.cend());
-        return temp.check(Path::simplifyPath(fs.filename));
+        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, mTimerResults, mUseGlobalSuppressions, mExecuteCommand);
+        // TODO: propagate back mFileInfo
+        const unsigned int returnValue = temp.check(fs.file);
+        if (mUnusedFunctionsCheck)
+            mUnusedFunctionsCheck->updateFunctionData(*temp.mUnusedFunctionsCheck);
+        return returnValue;
+    }
+    // need to pass the externally provided ErrorLogger instead of our internal wrapper
+    CppCheck temp(tempSettings, mSuppressions, mErrorLoggerDirect, mTimerResults, mUseGlobalSuppressions, mExecuteCommand);
+    const unsigned int returnValue = temp.checkFile(fs.file, fs.cfg, fs.fileIndex);
+    if (mUnusedFunctionsCheck)
+        mUnusedFunctionsCheck->updateFunctionData(*temp.mUnusedFunctionsCheck);
+    while (!temp.mFileInfo.empty()) {
+        mFileInfo.push_back(temp.mFileInfo.back());
+        temp.mFileInfo.pop_back();
     }
-    const unsigned int returnValue = temp.checkFile(Path::simplifyPath(fs.filename), fs.cfg);
-    mSettings.nomsg.addSuppressions(temp.mSettings.nomsg.getSuppressions());
+    // TODO: propagate back more data?
+    if (mSettings.clangTidy)
+        analyseClangTidy(fs); // TODO: returnValue
     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, int fileIndex, const char* data, std::size_t size)
+{
+    const auto f = [&file, data, size](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
+        return simplecpp::TokenList{{data, size}, files, file.spath(), outputList};
+    };
+    return checkInternal(file, cfgname, fileIndex, f);
 }
 
-unsigned int CppCheck::checkFile(const std::string& filename, const std::string &cfgname, std::istream* fileStream)
+unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string &cfgname, int fileIndex)
 {
-    mExitCode = 0;
+    const auto f = [&file](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
+        return simplecpp::TokenList{file.spath(), files, outputList};
+    };
+    return checkInternal(file, cfgname, fileIndex, f);
+}
+
+void CppCheck::checkPlistOutput(const FileWithDetails& file, const std::vector<std::string>& files)
+{
+    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, files);
+    }
+}
+
+unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::string &cfgname, int fileIndex, 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 mExitCode;
+        return mLogger->exitcode();
 
-    const Timer fileTotalTimer(mSettings.showtime == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL, filename);
+    const Timer fileTotalTimer{file.spath(), mSettings.showtime, nullptr, Timer::Type::FILE};
 
     if (!mSettings.quiet) {
-        std::string fixedpath = Path::simplifyPath(filename);
-        fixedpath = Path::toNativeSeparators(fixedpath);
+        std::string fixedpath = Path::toNativeSeparators(file.spath());
         mErrorLogger.reportOut(std::string("Checking ") + fixedpath + ' ' + cfgname + std::string("..."), Color::FgGreen);
 
         if (mSettings.verbose) {
-            mErrorLogger.reportOut("Defines:" + mSettings.userDefines);
+            mErrorLogger.reportOut("Defines:" + mSettings.userDefines, Color::Reset);
             std::string undefs;
             for (const std::string& U : mSettings.userUndefs) {
                 if (!undefs.empty())
                     undefs += ';';
                 undefs += ' ' + U;
             }
-            mErrorLogger.reportOut("Undefines:" + undefs);
+            mErrorLogger.reportOut("Undefines:" + undefs, Color::Reset);
             std::string includePaths;
             for (const std::string &I : mSettings.includePaths)
                 includePaths += " -I" + I;
-            mErrorLogger.reportOut("Includes:" + includePaths);
-            mErrorLogger.reportOut(std::string("Platform:") + mSettings.platform.toString());
+            mErrorLogger.reportOut("Includes:" + includePaths, Color::Reset);
+            mErrorLogger.reportOut(std::string("Platform:") + mSettings.platform.toString(), Color::Reset);
         }
     }
 
-    if (mPlistFile.is_open()) {
-        mPlistFile << ErrorLogger::plistFooter();
-        mPlistFile.close();
-    }
+    mLogger->closePlist();
 
-    CheckUnusedFunctions checkUnusedFunctions(nullptr, nullptr, nullptr);
+    std::unique_ptr<AnalyzerInformation> analyzerInformation;
 
     try {
-        Preprocessor preprocessor(mSettings, this);
-        std::set<std::string> configurations;
+        if (mSettings.library.markupFile(file.spath())) {
+            // TODO: if an exception occurs in this block it will continue in an unexpected code path
+            if (!mSettings.buildDir.empty())
+            {
+                analyzerInformation.reset(new AnalyzerInformation);
+                mLogger->setAnalyzerInfo(analyzerInformation.get());
+            }
+
+            if (mUnusedFunctionsCheck && (mSettings.useSingleJob() || analyzerInformation)) {
+                std::size_t hash = 0;
+                // markup files are special and do not adhere to the enforced language
+                TokenList tokenlist{mSettings, Standards::Language::C};
+                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);
+
+                if (analyzerInformation) {
+                    mLogger->setAnalyzerInfo(nullptr);
+
+                    std::list<ErrorMessage> errors;
+                    analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors);
+                    analyzerInformation->setFileInfo("CheckUnusedFunctions", mUnusedFunctionsCheck->analyzerInfo(tokenizer));
+                    analyzerInformation->close();
+                }
+            }
+            return EXIT_SUCCESS;
+        }
 
         simplecpp::OutputList outputList;
         std::vector<std::string> files;
-        simplecpp::TokenList tokens1 = createTokenList(filename, files, &outputList, fileStream);
+        simplecpp::TokenList tokens1 = createTokenList(files, &outputList);
 
-        // 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 file = Path::fromNativeSeparators(output.location.file());
-            if (mSettings.relativePaths)
-                file = Path::getRelativePath(file, mSettings.basePaths);
-
-            const ErrorMessage::FileLocation loc1(file, output.location.line, output.location.col);
-            std::list<ErrorMessage::FileLocation> callstack(1, loc1);
-
-            ErrorMessage errmsg(callstack,
-                                "",
-                                Severity::error,
-                                output.msg,
-                                "syntaxError",
-                                Certainty::normal);
-            reportErr(errmsg);
-            return mExitCode;
-        }
+        Preprocessor preprocessor(tokens1, mSettings, mErrorLogger, file.lang());
 
-        if (mSettings.library.markupFile(filename)) {
-            Tokenizer tokenizer(&mSettings, this, &preprocessor);
-            tokenizer.createTokens(std::move(tokens1));
-            checkUnusedFunctions.getFileInfo(&tokenizer, &mSettings);
-            return EXIT_SUCCESS;
-        }
+        if (preprocessor.reportOutput(outputList, true))
+            return mLogger->exitcode();
 
-        if (!preprocessor.loadFiles(tokens1, files))
-            return mExitCode;
+        if (!preprocessor.loadFiles(files))
+            return mLogger->exitcode();
 
-        if (!mSettings.plistOutput.empty()) {
-            std::string filename2;
-            if (filename.find('/') != std::string::npos)
-                filename2 = filename.substr(filename.rfind('/') + 1);
-            else
-                filename2 = filename;
-            const std::size_t fileNameHash = std::hash<std::string> {}(filename);
-            filename2 = mSettings.plistOutput + filename2.substr(0, filename2.find('.')) + "_" + std::to_string(fileNameHash) + ".plist";
-            mPlistFile.open(filename2);
-            mPlistFile << ErrorLogger::plistHeader(version(), files);
-        }
+        checkPlistOutput(file, files);
 
-        std::ostringstream dumpProlog;
+        std::string dumpProlog;
         if (mSettings.dump || !mSettings.addons.empty()) {
-            dumpProlog << "  <rawtokens>" << std::endl;
-            for (unsigned int i = 0; i < files.size(); ++i)
-                dumpProlog << "    <file index=\"" << i << "\" name=\"" << ErrorLogger::toxml(files[i]) << "\"/>" << std::endl;
-            for (const simplecpp::Token *tok = tokens1.cfront(); tok; tok = tok->next) {
-                dumpProlog
-                    << "    <tok "
-                    << "fileIndex=\"" << tok->location.fileIndex << "\" "
-                    << "linenr=\"" << tok->location.line << "\" "
-                    << "column=\"" << tok->location.col << "\" "
-                    << "str=\"" << ErrorLogger::toxml(tok->str()) << "\""
-                    << "/>" << std::endl;
-            }
-            dumpProlog << "  </rawtokens>" << std::endl;
+            dumpProlog += getDumpFileContentsRawTokens(files, tokens1);
         }
 
         // Parse comments and then remove them
-        preprocessor.inlineSuppressions(tokens1, mSettings.nomsg);
+        mLogger->setRemarkComments(preprocessor.getRemarkComments());
+        preprocessor.inlineSuppressions(mSuppressions.nomsg);
         if (mSettings.dump || !mSettings.addons.empty()) {
-            mSettings.nomsg.dump(dumpProlog);
+            std::ostringstream oss;
+            mSuppressions.nomsg.dump(oss);
+            dumpProlog += oss.str();
         }
-        tokens1.removeComments();
         preprocessor.removeComments();
 
         if (!mSettings.buildDir.empty()) {
-            // Get toolinfo
-            std::ostringstream toolinfo;
-            toolinfo << CPPCHECK_VERSION_STRING;
-            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;
-            mSettings.nomsg.dump(toolinfo);
+            analyzerInformation.reset(new AnalyzerInformation);
+            mLogger->setAnalyzerInfo(analyzerInformation.get());
+        }
 
+        if (analyzerInformation) {
             // Calculate hash so it can be compared with old hash / future hashes
-            const std::size_t hash = preprocessor.calculateHash(tokens1, toolinfo.str());
+            const std::size_t hash = calculateHash(preprocessor, file.spath());
             std::list<ErrorMessage> errors;
-            if (!mAnalyzerInformation.analyzeFile(mSettings.buildDir, filename, cfgname, hash, errors)) {
+            if (!analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors)) {
                 while (!errors.empty()) {
-                    reportErr(errors.front());
+                    mErrorLogger.reportErr(errors.front());
                     errors.pop_front();
                 }
-                return mExitCode;  // known results => no need to reanalyze file
+                mLogger->setAnalyzerInfo(nullptr);
+                return mLogger->exitcode();  // known results => no need to reanalyze file
             }
         }
 
-        // write dump file xml prolog
-        std::ofstream fdump;
-        std::string dumpFile;
-        createDumpFile(mSettings, filename, fdump, dumpFile);
-        if (fdump.is_open()) {
-            fdump << dumpProlog.str();
-            dumpProlog.str("");
-        }
-
         // Get directives
-        preprocessor.setDirectives(tokens1);
-        preprocessor.simplifyPragmaAsm(&tokens1);
+        std::list<Directive> directives = preprocessor.createDirectives();
+        preprocessor.simplifyPragmaAsm();
 
-        preprocessor.setPlatformInfo(&tokens1);
+        preprocessor.setPlatformInfo();
 
         // Get configurations..
-        if ((mSettings.checkAllConfigurations && mSettings.userDefines.empty()) || mSettings.force) {
-            Timer t("Preprocessor::getConfigs", mSettings.showtime, &s_timerResults);
-            configurations = preprocessor.getConfigs(tokens1);
+        std::set<std::string> configurations;
+        if (maxConfigs > 1) {
+            Timer::run("Preprocessor::getConfigs", mSettings.showtime, mTimerResults, [&]() {
+                configurations = preprocessor.getConfigs();
+            });
         } else {
             configurations.insert(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);
             return 0;
         }
 
 #ifdef HAVE_RULES
         // Run define rules on raw code
-        const auto rules_it = std::find_if(mSettings.rules.cbegin(), mSettings.rules.cend(), [](const Settings::Rule& rule) {
-            return rule.tokenlist == "define";
-        });
-        if (rules_it != mSettings.rules.cend()) {
+        if (hasRule("define")) {
             std::string code;
-            const std::list<Directive> &directives = preprocessor.getDirectives();
             for (const Directive &dir : directives) {
-                if (dir.str.compare(0,8,"#define ") == 0 || dir.str.compare(0,9,"#include ") == 0)
-                    code += "#line " + MathLib::toString(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';
+                if (startsWith(dir.str,"#define ") || startsWith(dir.str,"#include "))
+                    code += "#line " + std::to_string(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';
             }
-            Tokenizer tokenizer2(&mSettings, this);
-            std::istringstream istr2(code);
-            tokenizer2.list.createTokens(istr2);
-            executeRules("define", tokenizer2);
+            TokenList tokenlist(mSettings, file.lang());
+            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(filename),configurations.size());
-            } else {
-                mTooManyConfigs = true;
-            }
+        FilesDeleter filesDeleter;
+
+        // write dump file xml prolog
+        std::ofstream fdump;
+        std::string dumpFile;
+        createDumpFile(mSettings, file, fileIndex, fdump, dumpFile);
+        if (fdump.is_open()) {
+            fdump << getLibraryDumpData();
+            fdump << dumpProlog;
+            if (!mSettings.dump)
+                filesDeleter.addFile(dumpFile);
         }
 
         std::set<unsigned long long> hashes;
@@ -839,27 +1096,39 @@ unsigned int CppCheck::checkFile(const std::string& filename, 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;
 
             if (!mSettings.userDefines.empty()) {
-                mCurrentConfig = mSettings.userDefines;
+                currentConfig = mSettings.userDefines;
                 const std::vector<std::string> v1(split(mSettings.userDefines, ";"));
                 for (const std::string &cfg: split(currCfg, ";")) {
                     if (std::find(v1.cbegin(), v1.cend(), cfg) == v1.cend()) {
-                        mCurrentConfig += ";" + cfg;
+                        currentConfig += ";" + cfg;
                     }
                 }
             } else {
-                mCurrentConfig = currCfg;
+                currentConfig = currCfg;
             }
 
             if (mSettings.preprocessOnly) {
-                Timer t("Preprocessor::getcode", mSettings.showtime, &s_timerResults);
-                std::string codeWithoutCfg = preprocessor.getcode(tokens1, mCurrentConfig, files, true);
-                t.stop();
+                std::string codeWithoutCfg;
+                Timer::run("Preprocessor::getcode", mSettings.showtime, mTimerResults, [&]() {
+                    codeWithoutCfg = preprocessor.getcode(currentConfig, files, true);
+                });
 
-                if (codeWithoutCfg.compare(0,5,"#file") == 0)
+                if (startsWith(codeWithoutCfg,"#file"))
                     codeWithoutCfg.insert(0U, "//");
                 std::string::size_type pos = 0;
                 while ((pos = codeWithoutCfg.find("\n#file",pos)) != std::string::npos)
@@ -870,28 +1139,52 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
                 pos = 0;
                 while ((pos = codeWithoutCfg.find(Preprocessor::macroChar,pos)) != std::string::npos)
                     codeWithoutCfg[pos] = ' ';
-                reportOut(codeWithoutCfg);
+                mErrorLogger.reportOut(codeWithoutCfg, Color::Reset);
                 continue;
             }
 
-            Tokenizer tokenizer(&mSettings, this, &preprocessor);
-            if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_NONE)
-                tokenizer.setTimerResults(&s_timerResults);
+            TokenList tokenlist{mSettings, file.lang()};
 
-            try {
+            {
+                bool skipCfg = false;
                 // Create tokens, skip rest of iteration if failed
-                {
-                    Timer timer("Tokenizer::createTokens", mSettings.showtime, &s_timerResults);
-                    simplecpp::TokenList tokensP = preprocessor.preprocess(tokens1, mCurrentConfig, files, true);
-                    tokenizer.createTokens(std::move(tokensP));
-                }
-                hasValidConfig = true;
+                Timer::run("Tokenizer::createTokens", mSettings.showtime, 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(tokensP.file(o->location), o->location.line, o->location.col, o->msg, o->type);
+                        }
+                        skipCfg = true;
+                    }
+                });
+                if (skipCfg)
+                    continue;
+            }
+            hasValidConfig = true;
+
+            Tokenizer tokenizer(std::move(tokenlist), mErrorLogger);
+            try {
+                if (mSettings.showtime != ShowTime::NONE)
+                    tokenizer.setTimerResults(mTimerResults);
+                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 && (!mCurrentConfig.empty() || checkCount > 1)) {
-                    std::string fixedpath = Path::simplifyPath(filename);
-                    fixedpath = Path::toNativeSeparators(fixedpath);
-                    mErrorLogger.reportOut("Checking " + fixedpath + ": " + mCurrentConfig + "...", Color::FgGreen);
+                if (!mSettings.quiet && (!currentConfig.empty() || checkCount > 1)) {
+                    std::string fixedpath = Path::toNativeSeparators(file.spath());
+                    mErrorLogger.reportOut("Checking " + fixedpath + ": " + currentConfig + "...", Color::FgGreen);
                 }
 
                 if (!tokenizer.tokens())
@@ -901,80 +1194,49 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
                 if (mSettings.checkConfiguration)
                     continue;
 
-                // Check raw tokens
-                checkRawTokens(tokenizer);
+#ifdef HAVE_RULES
+                // Execute rules for "raw" code
+                executeRules("raw", tokenizer.list);
+#endif
 
                 // Simplify tokens into normal form, skip rest of iteration if failed
-                if (!tokenizer.simplifyTokens1(mCurrentConfig))
+                if (!tokenizer.simplifyTokens1(currentConfig, fileIndex))
                     continue;
 
                 // dump xml if --dump
                 if ((mSettings.dump || !mSettings.addons.empty()) && fdump.is_open()) {
-                    fdump << "<dump cfg=\"" << ErrorLogger::toxml(mCurrentConfig) << "\">" << std::endl;
+                    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;
                 }
 
-                // Need to call this even if the hash will skip this configuration
-                mSettings.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer);
+                if (mSettings.inlineSuppressions) {
+                    // Need to call this even if the hash will skip this configuration
+                    mSuppressions.nomsg.markUnmatchedInlineSuppressionsAsChecked(tokenizer);
+                }
 
                 // Skip if we already met the same simplified token list
-                if (mSettings.force || mSettings.maxConfigs > 1) {
+                if (maxConfigs > 1) {
                     const std::size_t hash = tokenizer.list.calculateHash();
                     if (hashes.find(hash) != hashes.end()) {
                         if (mSettings.debugwarnings)
-                            purgedConfigurationMessage(filename, mCurrentConfig);
+                            purgedConfigurationMessage(file.spath(), currentConfig);
                         continue;
                     }
                     hashes.insert(hash);
                 }
 
                 // Check normal tokens
-                checkNormalTokens(tokenizer);
-
-                // Analyze info..
-                if (!mSettings.buildDir.empty())
-                    checkUnusedFunctions.parseTokens(tokenizer, filename.c_str(), &mSettings);
-
-#ifdef HAVE_RULES
-                // handling of "simple" rules has been removed.
-                if (mSimplify && hasRule("simple"))
-                    throw InternalError(nullptr, "Handling of \"simple\" rules has been removed in Cppcheck. Use --addon instead.");
-#endif
-
-            } catch (const simplecpp::Output &o) {
-                // #error etc during preprocessing
-                configurationError.push_back((mCurrentConfig.empty() ? "\'\'" : mCurrentConfig) + " : [" + o.location.file() + ':' + MathLib::toString(o.location.line) + "] " + o.msg);
-                --checkCount; // don't count invalid configurations
-                continue;
-
-            } catch (const TerminateException &) {
-                // Analysis is terminated
-                return mExitCode;
-
+                checkNormalTokens(tokenizer, analyzerInformation.get(), currentConfig);
             } catch (const InternalError &e) {
-                std::list<ErrorMessage::FileLocation> locationList;
-                if (e.token) {
-                    locationList.emplace_back(e.token, &tokenizer.list);
-                } else {
-                    locationList.emplace_back(filename, 0, 0);
-                    if (filename != tokenizer.list.getSourceFilePath()) {
-                        locationList.emplace_back(tokenizer.list.getSourceFilePath(), 0, 0);
-                    }
-                }
-                ErrorMessage errmsg(std::move(locationList),
-                                    tokenizer.list.getSourceFilePath(),
-                                    Severity::error,
-                                    e.errorMessage,
-                                    e.id,
-                                    Certainty::normal);
-
-                reportErr(errmsg);
+                ErrorMessage errmsg = ErrorMessage::fromInternalError(e, &tokenizer.list, file.spath());
+                mErrorLogger.reportErr(errmsg);
             }
         }
 
@@ -985,63 +1247,62 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
             for (const std::string &s : configurationError)
                 msg += '\n' + s;
 
-            const std::string locFile = Path::toNativeSeparators(filename);
-            ErrorMessage::FileLocation loc;
-            loc.setfile(locFile);
+            std::string locFile = Path::toNativeSeparators(file.spath());
+            ErrorMessage::FileLocation loc(locFile, 0, 0);
             ErrorMessage errmsg({std::move(loc)},
-                                locFile,
+                                std::move(locFile),
                                 Severity::information,
                                 msg,
                                 "noValidConfiguration",
                                 Certainty::normal);
-            reportErr(errmsg);
+            mErrorLogger.reportErr(errmsg);
         }
 
+        // TODO: will not be closed if we encountered an exception
         // dumped all configs, close root </dumps> element now
         if (fdump.is_open()) {
             fdump << "</dumps>" << std::endl;
             fdump.close();
         }
 
-        executeAddons(dumpFile);
-
+        executeAddons(dumpFile, file);
     } catch (const TerminateException &) {
         // Analysis is terminated
-        return mExitCode;
+        if (analyzerInformation)
+            mLogger->setAnalyzerInfo(nullptr);
+        return mLogger->exitcode();
     } catch (const std::runtime_error &e) {
-        internalError(filename, e.what());
-    } catch (const std::bad_alloc &e) {
-        internalError(filename, e.what());
+        internalError(file.spath(), std::string("Checking file failed: ") + e.what());
+    } catch (const std::bad_alloc &) {
+        internalError(file.spath(), "Checking file failed: out of memory");
     } catch (const InternalError &e) {
-        internalError(filename, e.errorMessage);
-        mExitCode=1; // e.g. reflect a syntax error
+        const ErrorMessage errmsg = ErrorMessage::fromInternalError(e, nullptr, file.spath(), "Bailing out from analysis: Checking file failed");
+        mErrorLogger.reportErr(errmsg);
     }
 
-    if (!mSettings.buildDir.empty()) {
-        mAnalyzerInformation.setFileInfo("CheckUnusedFunctions", checkUnusedFunctions.analyzerInfo());
-        mAnalyzerInformation.close();
+    if (analyzerInformation) {
+        mLogger->setAnalyzerInfo(nullptr);
+        analyzerInformation.reset();
     }
 
-    // In jointSuppressionReport mode, unmatched suppressions are
-    // collected after all files are processed
-    if (!mSettings.useSingleJob() && (mSettings.severity.isEnabled(Severity::information) || mSettings.checkConfiguration)) {
-        reportUnmatchedSuppressions(mSettings.nomsg.getUnmatchedLocalSuppressions(filename, isUnusedFunctionCheckEnabled()));
-    }
+    // TODO: clear earlier?
+    mLogger->clear();
 
-    mErrorList.clear();
+    if (mTimerResults && (mSettings.showtime == ShowTime::FILE || mSettings.showtime == ShowTime::TOP5_FILE))
+        mTimerResults->showResults(mSettings.showtime);
 
-    return mExitCode;
+    return mLogger->exitcode();
 }
 
+// TODO: replace with ErrorMessage::fromInternalError()
 void CppCheck::internalError(const std::string &filename, const std::string &msg)
 {
-    const std::string fullmsg("Bailing out from checking since there was an internal error: " + msg);
+    const std::string fullmsg("Bailing out from analysis: " + msg);
 
-    const ErrorMessage::FileLocation loc1(filename, 0, 0);
-    std::list<ErrorMessage::FileLocation> callstack(1, loc1);
+    ErrorMessage::FileLocation loc1(filename, 0, 0);
 
-    ErrorMessage errmsg(callstack,
-                        emptyString,
+    ErrorMessage errmsg({std::move(loc1)},
+                        "",
                         Severity::error,
                         fullmsg,
                         "internalError",
@@ -1050,90 +1311,92 @@ void CppCheck::internalError(const std::string &filename, const std::string &msg
     mErrorLogger.reportErr(errmsg);
 }
 
-//---------------------------------------------------------------------------
-// CppCheck - A function that checks a raw token list
-//---------------------------------------------------------------------------
-void CppCheck::checkRawTokens(const Tokenizer &tokenizer)
-{
-#ifdef HAVE_RULES
-    // Execute rules for "raw" code
-    executeRules("raw", tokenizer);
-#else
-    (void)tokenizer;
-#endif
-}
-
 //---------------------------------------------------------------------------
 // CppCheck - A function that checks a normal token list
 //---------------------------------------------------------------------------
 
-void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
+void CppCheck::checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation, const std::string& currentConfig)
 {
-    // TODO: this should actually be the behavior if only "--enable=unusedFunction" is specified - see #10648
-    const char* unusedFunctionOnly = std::getenv("UNUSEDFUNCTION_ONLY");
-    const bool doUnusedFunctionOnly = unusedFunctionOnly && (std::strcmp(unusedFunctionOnly, "1") == 0);
+    CheckUnusedFunctions unusedFunctionsChecker;
 
-    const std::time_t maxTime = mSettings.checksMaxTime > 0 ? std::time(nullptr) + mSettings.checksMaxTime : 0;
+    // TODO: this should actually be the behavior if only "--enable=unusedFunction" is specified - see #10648
+    // TODO: log message when this is active?
+    const bool doUnusedFunctionOnly = Settings::unusedFunctionOnly();
 
-    // call all "runChecks" in all registered Check classes
-    for (Check *check : Check::instances()) {
-        if (Settings::terminated())
-            return;
+    if (!doUnusedFunctionOnly) {
+        const std::time_t maxTime = mSettings.checksMaxTime > 0 ? std::time(nullptr) + mSettings.checksMaxTime : 0;
 
-        if (maxTime > 0 && std::time(nullptr) > maxTime) {
-            if (mSettings.debugwarnings) {
-                ErrorMessage::FileLocation loc;
-                loc.setfile(tokenizer.list.getFiles()[0]);
-                ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
-                                    Severity::debug,
-                                    "Checks maximum time exceeded",
-                                    "checksMaxTime",
-                                    Certainty::normal);
-                reportErr(errmsg);
+        // call all "runChecks" in all registered Check classes
+        // cppcheck-suppress shadowFunction - TODO: fix this
+        for (Check *check : Check::instances()) {
+            if (Settings::terminated())
+                return;
+
+            if (maxTime > 0 && std::time(nullptr) > maxTime) {
+                if (mSettings.debugwarnings) {
+                    ErrorMessage::FileLocation loc(tokenizer.list.getFiles()[0], 0, 0);
+                    ErrorMessage errmsg({std::move(loc)},
+                                        "",
+                                        Severity::debug,
+                                        "Checks maximum time exceeded",
+                                        "checksMaxTime",
+                                        Certainty::normal);
+                    mErrorLogger.reportErr(errmsg);
+                }
+                return;
             }
-            return;
-        }
 
-        if (doUnusedFunctionOnly && dynamic_cast<CheckUnusedFunctions*>(check) == nullptr)
-            continue;
+            Timer::run(check->name() + "::runChecks", mSettings.showtime, mTimerResults, [&]() {
+                check->runChecks(tokenizer, &mErrorLogger);
+            });
+        }
+    }
 
-        Timer timerRunChecks(check->name() + "::runChecks", mSettings.showtime, &s_timerResults);
-        check->runChecks(&tokenizer, &mSettings, this);
+    if (mSettings.checks.isEnabled(Checks::unusedFunction) && !mSettings.buildDir.empty()) {
+        unusedFunctionsChecker.parseTokens(tokenizer, mSettings);
+    }
+    if (mUnusedFunctionsCheck && mSettings.useSingleJob() && mSettings.buildDir.empty()) {
+        mUnusedFunctionsCheck->parseTokens(tokenizer, mSettings);
     }
 
-    if (mSettings.clang)
+    if (mSettings.clang) {
         // TODO: Use CTU for Clang analysis
         return;
+    }
 
-
-    if (mSettings.useSingleJob() || !mSettings.buildDir.empty()) {
+    if (mSettings.useSingleJob() || analyzerInformation) {
         // Analyse the tokens..
-
-        CTU::FileInfo *fi1 = CTU::getFileInfo(&tokenizer);
-        if (fi1) {
+        {
+            CTU::FileInfo * const fi1 = CTU::getFileInfo(tokenizer);
+            if (analyzerInformation)
+                analyzerInformation->setFileInfo("ctu", fi1->toString());
             if (mSettings.useSingleJob())
                 mFileInfo.push_back(fi1);
-            if (!mSettings.buildDir.empty())
-                mAnalyzerInformation.setFileInfo("ctu", fi1->toString());
+            else
+                delete fi1;
         }
 
-        for (const Check *check : Check::instances()) {
-            if (doUnusedFunctionOnly && dynamic_cast<const CheckUnusedFunctions*>(check) == nullptr)
-                continue;
-
-            Check::FileInfo *fi = check->getFileInfo(&tokenizer, &mSettings);
-            if (fi != nullptr) {
-                if (mSettings.useSingleJob())
-                    mFileInfo.push_back(fi);
-                if (!mSettings.buildDir.empty())
-                    mAnalyzerInformation.setFileInfo(check->name(), fi->toString());
+        if (!doUnusedFunctionOnly) {
+            // cppcheck-suppress shadowFunction - TODO: fix this
+            for (const Check *check : Check::instances()) {
+                if (Check::FileInfo * const fi = check->getFileInfo(tokenizer, mSettings, currentConfig)) {
+                    if (analyzerInformation)
+                        analyzerInformation->setFileInfo(check->name(), fi->toString());
+                    if (mSettings.useSingleJob())
+                        mFileInfo.push_back(fi);
+                    else
+                        delete fi;
+                }
             }
         }
     }
 
+    if (mSettings.checks.isEnabled(Checks::unusedFunction) && analyzerInformation) {
+        analyzerInformation->setFileInfo("CheckUnusedFunctions", unusedFunctionsChecker.analyzerInfo(tokenizer));
+    }
+
 #ifdef HAVE_RULES
-    executeRules("normal", tokenizer);
+    executeRules("normal", tokenizer.list);
 #endif
 }
 
@@ -1147,316 +1410,140 @@ bool CppCheck::hasRule(const std::string &tokenlist) const
     });
 }
 
-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 Tokenizer &tokenizer)
+void CppCheck::executeRules(const std::string &tokenlist, const TokenList &list)
 {
     // There is no rule to execute
     if (!hasRule(tokenlist))
         return;
 
     // Write all tokens in a string that can be parsed by pcre
-    std::ostringstream ostr;
-    for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
-        ostr << " " << tok->str();
-    const std::string str(ostr.str());
+    std::string str;
+    for (const Token *tok = list.front(); tok; tok = tok->next()) {
+        str += " ";
+        str += tok->str();
+    }
 
     for (const Settings::Rule &rule : mSettings.rules) {
-        if (rule.pattern.empty() || rule.id.empty() || rule.severity == Severity::none || rule.tokenlist != tokenlist)
+        if (rule.tokenlist != tokenlist)
             continue;
 
         if (!mSettings.quiet) {
-            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>(),
-                                          emptyString,
-                                          Severity::error,
-                                          msg,
-                                          "pcre_compile",
-                                          Certainty::normal);
-
-                reportErr(errmsg);
-            }
-            continue;
+            mErrorLogger.reportOut("Processing rule: " + rule.pattern, Color::FgGreen);
         }
 
-        // 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>(),
-                                      emptyString,
-                                      Severity::error,
-                                      msg,
-                                      "pcre_study",
-                                      Certainty::normal);
-
-            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 < (int)str.size()) {
-            const int pcreExecRet = pcre_exec(re, pcreExtra, str.c_str(), (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>(),
-                                              emptyString,
-                                              Severity::error,
-                                              std::string("pcre_exec failed: ") + errorMessage,
-                                              "pcre_exec",
-                                              Certainty::normal);
-
-                    reportErr(errmsg);
-                }
-                break;
-            }
-            const unsigned int pos1 = (unsigned int)ovector[0];
-            const unsigned int pos2 = (unsigned int)ovector[1];
-
-            // jump to the end of the match for the next pcre_exec
-            pos = (int)pos2;
-
+        auto f = [&](int pos1, int pos2) {
             // determine location..
-            ErrorMessage::FileLocation loc;
-            loc.setfile(tokenizer.list.getSourceFilePath());
-            loc.line = 0;
+            int fileIndex = 0;
+            int line = 0;
 
             std::size_t len = 0;
-            for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
+            for (const Token *tok = list.front(); tok; tok = tok->next()) {
                 len = len + 1U + tok->str().size();
                 if (len > pos1) {
-                    loc.setfile(tokenizer.list.getFiles().at(tok->fileIndex()));
-                    loc.line = tok->linenr();
+                    fileIndex = tok->fileIndex();
+                    line = tok->linenr();
                     break;
                 }
             }
 
-            const std::list<ErrorMessage::FileLocation> callStack(1, loc);
+            const std::string& file = list.getFiles()[fileIndex];
+
+            ErrorMessage::FileLocation loc(file, line, 0);
 
             // Create error message
-            std::string summary;
-            if (rule.summary.empty())
-                summary = "found '" + str.substr(pos1, pos2 - pos1) + "'";
-            else
-                summary = rule.summary;
-            const ErrorMessage errmsg(callStack, tokenizer.list.getSourceFilePath(), rule.severity, summary, rule.id, Certainty::normal);
+            const ErrorMessage errmsg({std::move(loc)},
+                                      list.getSourceFilePath(),
+                                      rule.severity,
+                                      !rule.summary.empty() ? rule.summary : "found '" + str.substr(pos1, pos2 - pos1) + "'",
+                                      rule.id,
+                                      Certainty::normal);
 
             // Report error
-            reportErr(errmsg);
-        }
+            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
 
-void CppCheck::executeAddons(const std::string& dumpFile)
+void CppCheck::executeAddons(const std::string& dumpFile, const FileWithDetails& file)
 {
     if (!dumpFile.empty()) {
         std::vector<std::string> f{dumpFile};
-        executeAddons(f);
-        if (!mSettings.dump)
-            std::remove(dumpFile.c_str());
+        Timer::run("CppCheck::executeAddons", mSettings.showtime, mTimerResults, [&]() {
+            executeAddons(f, file.spath());
+        });
     }
 }
 
-void CppCheck::executeAddons(const std::vector<std::string>& files)
+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");
+
+    FilesDeleter filesDeleter;
     std::string fileList;
 
-    if (files.size() >= 2 || endsWith(files[0], ".ctu-info")) {
-        fileList = Path::getPathFromFilename(files[0]) + FILELIST;
+    if (files.size() >= 2) {
+        fileList = Path::getPathFromFilename(files[0]) + FILELIST + ("-" + std::to_string(mSettings.pid)) + ".txt";
         std::ofstream fout(fileList);
+        filesDeleter.addFile(fileList);
+        // TODO: check if file could be created
         for (const std::string& f: files)
             fout << f << std::endl;
     }
 
-    for (const std::string &addon : mSettings.addons) {
-        struct AddonInfo addonInfo;
-        const std::string &failedToGetAddonInfo = addonInfo.getAddonInfo(addon, mSettings.exename);
-        if (!failedToGetAddonInfo.empty()) {
-            reportOut(failedToGetAddonInfo, Color::FgRed);
-            mExitCode = 1;
-            continue;
-        }
-        if (addonInfo.name != "misra" && !addonInfo.ctu && endsWith(files.back(), ".ctu-info"))
-            continue;
+    // ensure all addons have already been resolved - TODO: remove when settings are const after creation
+    assert(mSettings.addonInfos.size() == mSettings.addons.size());
 
-        const std::string results =
-            executeAddon(addonInfo, mSettings.addonPython, fileList.empty() ? files[0] : fileList, mSettings.premiumArgs, mExecuteCommand);
-        std::istringstream istr(results);
-        std::string line;
+    std::string ctuInfo;
 
-        while (std::getline(istr, line)) {
-            if (line.compare(0,1,"{") != 0)
-                continue;
+    for (const AddonInfo &addonInfo : mSettings.addonInfos) {
+        if (isCtuInfo && addonInfo.name != "misra" && !addonInfo.ctu)
+            continue;
 
-            picojson::value res;
-            std::istringstream istr2(line);
-            istr2 >> res;
-            if (!res.is<picojson::object>())
-                continue;
+        std::vector<picojson::value> results;
 
+        try {
+            results = executeAddon(addonInfo, mSettings.addonPython, fileList.empty() ? files[0] : fileList, mSettings.premiumArgs, mExecuteCommand);
+        } catch (const InternalError& e) {
+            const std::string ctx = isCtuInfo ? "Whole program analysis" : "Checking file";
+            const ErrorMessage errmsg = ErrorMessage::fromInternalError(e, nullptr, file0, "Bailing out from analysis: " + ctx + " failed");
+            mErrorLogger.reportErr(errmsg);
+        }
+
+        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
             picojson::object obj = res.get<picojson::object>();
 
             ErrorMessage errmsg;
 
+            if (obj.count("summary") > 0) {
+                if (!mSettings.buildDir.empty()) {
+                    ctuInfo += res.serialize() + "\n";
+                } else {
+                    errmsg.severity = Severity::internal;
+                    errmsg.id = "ctuinfo";
+                    errmsg.setmsg(res.serialize());
+                    mErrorLogger.reportErr(errmsg);
+                }
+                continue;
+            }
+
             if (obj.count("file") > 0) {
                 std::string fileName = obj["file"].get<std::string>();
                 const int64_t lineNumber = obj["linenr"].get<int64_t>();
@@ -1468,192 +1555,162 @@ void CppCheck::executeAddons(const std::vector<std::string>& files)
                     std::string fileName = loc["file"].get<std::string>();
                     const int64_t lineNumber = loc["linenr"].get<int64_t>();
                     const int64_t column = loc["column"].get<int64_t>();
-                    const std::string info = loc["info"].get<std::string>();
-                    errmsg.callStack.emplace_back(std::move(fileName), info, lineNumber, column);
+                    std::string info = loc["info"].get<std::string>();
+                    errmsg.callStack.emplace_back(std::move(fileName), std::move(info), lineNumber, column);
+                }
+            }
+
+            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>();
-            const std::string text = obj["message"].get<std::string>();
-            errmsg.setmsg(text);
+            errmsg.setmsg(obj["message"].get<std::string>());
             const std::string severity = obj["severity"].get<std::string>();
-            errmsg.severity = Severity::fromString(severity);
-            if (errmsg.severity == Severity::SeverityType::none)
-                continue;
-            if (!mSettings.severity.isEnabled(errmsg.severity))
-                continue;
-            errmsg.file0 = ((files.size() == 1) ? files[0] : "");
+            errmsg.severity = severityFromString(severity);
+            if (errmsg.severity == Severity::none || errmsg.severity == Severity::internal) {
+                if (!endsWith(errmsg.id, "-logChecker"))
+                    continue;
+                errmsg.severity = Severity::internal;
+            }
+            else if (!mSettings.severity.isEnabled(errmsg.severity)) {
+                // Do not filter out premium misra/cert/autosar messages that has been
+                // explicitly enabled with a --premium option
+                if (!isPremiumCodingStandardId(errmsg.id))
+                    continue;
+            }
+            errmsg.file0 = file0;
+
+            if (obj.count("cwe")>0)
+                errmsg.cwe = CWE(obj["cwe"].get<std::int64_t>());
 
-            reportErr(errmsg);
+            if (obj.count("hash")>0)
+                errmsg.hash = obj["hash"].get<std::int64_t>();
+
+            mErrorLogger.reportErr(errmsg);
         }
     }
 
-    if (!fileList.empty())
-        std::remove(fileList.c_str());
+    if (!mSettings.buildDir.empty() && !isCtuInfo) {
+        const std::string& ctuInfoFile = getCtuInfoFileName(files[0]);
+        std::ofstream fout(ctuInfoFile);
+        fout << ctuInfo;
+    }
 }
 
-void CppCheck::executeAddonsWholeProgram(const std::map<std::string, std::size_t> &files)
+void CppCheck::executeAddonsWholeProgram(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo)
 {
     if (mSettings.addons.empty())
         return;
 
+    if (mSettings.buildDir.empty()) {
+        std::string fileName = std::to_string(mSettings.pid) + ".ctu-info";
+        FilesDeleter filesDeleter;
+        filesDeleter.addFile(fileName);
+        std::ofstream fout(fileName);
+        fout << ctuInfo;
+        fout.close();
+        executeAddons({std::move(fileName)}, "");
+        return;
+    }
+
     std::vector<std::string> ctuInfoFiles;
     for (const auto &f: files) {
-        const std::string &dumpFileName = getDumpFileName(mSettings, f.first);
+        const std::string &dumpFileName = getDumpFileName(mSettings, f.path(), 0);
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
-    try {
-        executeAddons(ctuInfoFiles);
-    } catch (const InternalError& e) {
-        internalError("", "Internal error during whole program analysis: " + e.errorMessage);
-        mExitCode = 1;
-    }
-
-    if (mSettings.buildDir.empty()) {
-        for (const std::string &f: ctuInfoFiles)
-            std::remove(f.c_str());
+    for (const auto &f: fileSettings) {
+        const std::string &dumpFileName = getDumpFileName(mSettings, f.filename(), f.fileIndex);
+        ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
-}
 
-Settings &CppCheck::settings()
-{
-    return mSettings;
+    executeAddons(ctuInfoFiles, "");
 }
 
 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);
+        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.";
-
-
-    ErrorMessage errmsg(loclist,
-                        emptyString,
+    msg << "Too many #ifdef configurations - cppcheck only checks " << mSettings.getMaxConfigs()
+        << " of " << numberOfConfigurations << " configurations. Use --force to check all configurations.";
+
+    ErrorMessage errmsg(std::move(loclist),
+                        "",
                         Severity::information,
                         msg.str(),
                         "toomanyconfigs", CWE398,
                         Certainty::normal);
 
-    reportErr(errmsg);
+    mErrorLogger.reportErr(errmsg);
 }
 
 void CppCheck::purgedConfigurationMessage(const std::string &file, const std::string& configuration)
 {
-    mTooManyConfigs = false;
-
     if (mSettings.severity.isEnabled(Severity::information) && file.empty())
         return;
 
     std::list<ErrorMessage::FileLocation> loclist;
     if (!file.empty()) {
-        loclist.emplace_back(file);
+        loclist.emplace_back(file, 0, 0);
     }
 
-    ErrorMessage errmsg(loclist,
-                        emptyString,
+    ErrorMessage errmsg(std::move(loclist),
+                        "",
                         Severity::information,
                         "The configuration '" + configuration + "' was not checked because its code equals another one.",
                         "purgedConfiguration",
                         Certainty::normal);
 
-    reportErr(errmsg);
+    mErrorLogger.reportErr(errmsg);
 }
 
 //---------------------------------------------------------------------------
 
-void CppCheck::reportErr(const ErrorMessage &msg)
-{
-    if (!mSettings.library.reportErrors(msg.file0))
-        return;
-
-    const std::string errmsg = msg.toString(mSettings.verbose);
-    if (errmsg.empty())
-        return;
-
-    // Alert only about unique errors
-    if (std::find(mErrorList.cbegin(), mErrorList.cend(), errmsg) != mErrorList.cend())
-        return;
-
-    if (!mSettings.buildDir.empty())
-        mAnalyzerInformation.reportErr(msg);
-
-    // TODO: only convert if necessary
-    const Suppressions::ErrorMessage errorMessage = msg.toSuppressionsErrorMessage();
-
-    if (mSettings.nomsg.isSuppressed(errorMessage, mUseGlobalSuppressions)) {
-        return;
-    }
-
-    if (!mSettings.nofail.isSuppressed(errorMessage) && !mSettings.nomsg.isSuppressed(errorMessage)) {
-        mExitCode = 1;
-    }
-
-    mErrorList.push_back(errmsg);
-
-    mErrorLogger.reportErr(msg);
-    // check if plistOutput should be populated and the current output file is open and the error is not suppressed
-    if (!mSettings.plistOutput.empty() && mPlistFile.is_open() && !mSettings.nomsg.isSuppressed(errorMessage)) {
-        // add error to plist output file
-        mPlistFile << ErrorLogger::plistData(msg);
-    }
-}
-
-void CppCheck::reportOut(const std::string &outmsg, Color c)
+void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
 {
-    mErrorLogger.reportOut(outmsg, c);
-}
+    Settings settings;
+    settings.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: get rid of this
+    Suppressions supprs;
 
-void CppCheck::reportProgress(const std::string &filename, const char stage[], const std::size_t value)
-{
-    mErrorLogger.reportProgress(filename, stage, value);
-}
+    CppCheck cppcheck(settings, supprs, errorlogger, nullptr, true, nullptr);
+    cppcheck.purgedConfigurationMessage("","");
+    cppcheck.tooManyConfigsError("",0U);
+    // TODO: add functions to get remaining error messages
 
-void CppCheck::getErrorMessages(ErrorLogger &errorlogger)
-{
     Settings s;
-    s.severity.enable(Severity::warning);
-    s.severity.enable(Severity::style);
-    s.severity.enable(Severity::portability);
-    s.severity.enable(Severity::performance);
-    s.severity.enable(Severity::information);
-
-    CppCheck cppcheck(errorlogger, true, nullptr);
-    cppcheck.purgedConfigurationMessage(emptyString,emptyString);
-    cppcheck.mTooManyConfigs = true;
-    cppcheck.tooManyConfigsError(emptyString,0U);
-    // TODO: add functions to get remaining error messages
+    s.addEnabled("all");
 
     // call all "getErrorMessages" in all registered Check classes
-    for (std::list<Check *>::const_iterator it = Check::instances().cbegin(); it != Check::instances().cend(); ++it)
+    for (auto it = Check::instances().cbegin(); it != Check::instances().cend(); ++it)
         (*it)->getErrorMessages(&errorlogger, &s);
 
-    Preprocessor::getErrorMessages(&errorlogger, &s);
+    CheckUnusedFunctions::getErrorMessages(errorlogger);
+    Preprocessor::getErrorMessages(errorlogger, s);
+    Tokenizer::getErrorMessages(errorlogger, s);
+    SymbolDatabase::getErrorMessages(errorlogger);
 }
 
-void CppCheck::analyseClangTidy(const ImportProject::FileSettings &fileSettings)
+void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
 {
     std::string allIncludes;
     for (const std::string &inc : fileSettings.includePaths) {
@@ -1662,16 +1719,27 @@ void CppCheck::analyseClangTidy(const ImportProject::FileSettings &fileSettings)
 
     const std::string allDefines = getDefinesFlags(fileSettings.defines);
 
+    std::string exe = mSettings.clangTidyExecutable;
 #ifdef _WIN32
-    const char exe[] = "clang-tidy.exe";
-#else
-    const char exe[] = "clang-tidy";
+    // TODO: is this even necessary?
+    // append .exe if it is not a path
+    if (Path::fromNativeSeparators(mSettings.clangTidyExecutable).find('/') == std::string::npos) {
+        exe += ".exe";
+    }
 #endif
 
-    const std::string args = "-quiet -checks=*,-clang-analyzer-*,-llvm* \"" + fileSettings.filename + "\" -- " + allIncludes + allDefines;
+    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;
     std::string output;
-    if (!mExecuteCommand(exe, split(args), emptyString, output)) {
-        std::cerr << "Failed to execute '" << exe << "'" << std::endl;
+    if (const int exitcode = mExecuteCommand(exe, split(args), "2>&1", output)) {
+        // TODO: needs to be a proper error
+        std::cerr << "Failed to execute '" << exe << "' (exitcode: " << std::to_string(exitcode) << ")" << std::endl;
         return;
     }
 
@@ -1680,11 +1748,12 @@ void CppCheck::analyseClangTidy(const ImportProject::FileSettings &fileSettings)
     std::string line;
 
     if (!mSettings.buildDir.empty()) {
-        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename, emptyString);
+        const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename(), "", fileSettings.fileIndex);
         std::ofstream fcmd(analyzerInfoFile + ".clang-tidy-cmd");
         fcmd << istr.str();
     }
 
+    // TODO: log
     while (std::getline(istr, line)) {
         if (line.find("error") == std::string::npos && line.find("warning") == std::string::npos)
             continue;
@@ -1707,128 +1776,145 @@ void CppCheck::analyseClangTidy(const ImportProject::FileSettings &fileSettings)
         const std::string errorString = line.substr(endErrorPos, line.length());
 
         std::string fixedpath = Path::simplifyPath(line.substr(0, endNamePos));
-        const int64_t lineNumber = strToInt<int64_t>(lineNumString);
-        const int64_t column = strToInt<int64_t>(columnNumString);
-        fixedpath = Path::toNativeSeparators(fixedpath);
+        fixedpath = Path::toNativeSeparators(std::move(fixedpath));
+        const auto lineNumber = strToInt<int64_t>(lineNumString);
+        const auto column = strToInt<int64_t>(columnNumString);
 
         ErrorMessage errmsg;
         errmsg.callStack.emplace_back(fixedpath, lineNumber, column);
+        errmsg.file0 = std::move(fixedpath);
+        errmsg.setmsg(trim(messageString));
+
+        for (const auto& id : splitString(errorString.substr(1, errorString.length() - 2), ',')) {
+            errmsg.id = "clang-tidy-" + id;
+            if (startsWith(id, "performance-"))
+                errmsg.severity = Severity::performance;
+            else if (startsWith(id, "portability-"))
+                errmsg.severity = Severity::portability;
+            else if (startsWith(id, "cert-") || startsWith(id, "misc-") || startsWith(id, "bugprone-") || (id.find("-unused-") != std::string::npos))
+                errmsg.severity = Severity::warning;
+            else
+                errmsg.severity = Severity::style;
 
-        errmsg.id = "clang-tidy-" + errorString.substr(1, errorString.length() - 2);
-        if (errmsg.id.find("performance") != std::string::npos)
-            errmsg.severity = Severity::SeverityType::performance;
-        else if (errmsg.id.find("portability") != std::string::npos)
-            errmsg.severity = Severity::SeverityType::portability;
-        else if (errmsg.id.find("cert") != std::string::npos || errmsg.id.find("misc") != std::string::npos || errmsg.id.find("unused") != std::string::npos)
-            errmsg.severity = Severity::SeverityType::warning;
-        else
-            errmsg.severity = Severity::SeverityType::style;
-
-        errmsg.file0 = fixedpath;
-        errmsg.setmsg(messageString);
-        reportErr(errmsg);
+            mErrorLogger.reportErr(errmsg);
+        }
     }
 }
 
 bool CppCheck::analyseWholeProgram()
 {
     bool errors = false;
-    // Init CTU
-    CTU::maxCtuDepth = mSettings.maxCtuDepth;
-    // Analyse the tokens
-    CTU::FileInfo ctu;
-    for (const Check::FileInfo *fi : mFileInfo) {
-        const CTU::FileInfo *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 *check : Check::instances())
-        errors |= check->analyseWholeProgram(&ctu, mFileInfo, mSettings, *this);  // TODO: ctu
-    return errors && (mExitCode > 0);
+
+    if (mUnusedFunctionsCheck)
+        errors |= mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
+
+    return errors && (mLogger->exitcode() > 0);
 }
 
-void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::map<std::string, std::size_t> &files)
+unsigned int CppCheck::analyseWholeProgram(const std::string &buildDir, const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo)
 {
-    executeAddonsWholeProgram(files);
-    if (buildDir.empty()) {
-        removeCtuInfoFiles(files);
-        return;
-    }
     if (mSettings.checks.isEnabled(Checks::unusedFunction))
-        CheckUnusedFunctions::analyseWholeProgram(mSettings, this, buildDir);
-    std::list<Check::FileInfo*> fileInfoList;
-    CTU::FileInfo ctuFileInfo;
+        CheckUnusedFunctions::analyseWholeProgram(mSettings, mErrorLogger, buildDir);
 
-    // Load all analyzer info data..
-    const std::string filesTxt(buildDir + "/files.txt");
-    std::ifstream fin(filesTxt);
-    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 lastColon = filesTxtLine.rfind(':');
-        if (firstColon == lastColon)
-            continue;
-        const std::string xmlfile = buildDir + '/' + filesTxtLine.substr(0,firstColon);
-        //const std::string sourcefile = filesTxtLine.substr(lastColon+1);
+    if (mUnusedFunctionsCheck)
+        mUnusedFunctionsCheck->check(mSettings, mErrorLogger);
 
-        tinyxml2::XMLDocument doc;
-        const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
-        if (error != tinyxml2::XML_SUCCESS)
-            continue;
+    if (Settings::unusedFunctionOnly())
+        return mLogger->exitcode();
 
-        const tinyxml2::XMLElement * const rootNode = doc.FirstChildElement();
-        if (rootNode == nullptr)
-            continue;
+    executeAddonsWholeProgram(files, fileSettings, ctuInfo);
 
-        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;
-            }
-            for (const Check *check : Check::instances()) {
-                if (checkClassAttr == check->name())
-                    fileInfoList.push_back(check->loadFileInfoFromXml(e));
+    std::list<Check::FileInfo*> fileInfoList;
+    CTU::FileInfo ctuFileInfo;
+
+    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 : Check::instances()) {
+            if (checkattr == check->name()) {
+                if (Check::FileInfo* fi = check->loadFileInfoFromXml(e)) {
+                    fi->file0 = filesTxtInfo.sourceFile;
+                    fileInfoList.push_back(fi);
+                }
             }
         }
-    }
+    };
 
-    // Set CTU max depth
-    CTU::maxCtuDepth = mSettings.maxCtuDepth;
+    AnalyzerInformation::processFilesTxt(buildDir, handler);
 
     // Analyse the tokens
+    // cppcheck-suppress shadowFunction - TODO: fix this
     for (Check *check : Check::instances())
-        check->analyseWholeProgram(&ctuFileInfo, fileInfoList, mSettings, *this);
+        check->analyseWholeProgram(ctuFileInfo, fileInfoList, mSettings, mErrorLogger);
 
     for (Check::FileInfo *fi : fileInfoList)
         delete fi;
+
+    return mLogger->exitcode();
 }
 
-bool CppCheck::isUnusedFunctionCheckEnabled() const
-{
-    return (mSettings.useSingleJob() && mSettings.checks.isEnabled(Checks::unusedFunction));
+bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
+    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-"))
+        return true;
+    return false;
 }
 
-void CppCheck::removeCtuInfoFiles(const std::map<std::string, std::size_t> &files)
-{
-    if (mSettings.buildDir.empty()) {
-        for (const auto& f: files) {
-            const std::string &dumpFileName = getDumpFileName(mSettings, f.first);
-            const std::string &ctuInfoFileName = getCtuInfoFileName(dumpFileName);
-            std::remove(ctuInfoFileName.c_str());
-        }
-        for (const auto& fs: mSettings.project.fileSettings) {
-            const std::string &dumpFileName = getDumpFileName(mSettings, fs.filename);
-            const std::string &ctuInfoFileName = getCtuInfoFileName(dumpFileName);
-            std::remove(ctuInfoFileName.c_str());
-        }
+std::string CppCheck::getDumpFileContentsRawTokens(const std::vector<std::string>& files, const simplecpp::TokenList& tokens1) const {
+    std::string dumpProlog;
+    dumpProlog += "  <rawtokens>\n";
+    for (unsigned int i = 0; i < files.size(); ++i) {
+        dumpProlog += "    <file index=\"";
+        dumpProlog += std::to_string(i);
+        dumpProlog += "\" name=\"";
+        dumpProlog += ErrorLogger::toxml(Path::getRelativePath(files[i], mSettings.basePaths));
+        dumpProlog += "\"/>\n";
+    }
+    for (const simplecpp::Token *tok = tokens1.cfront(); tok; tok = tok->next) {
+        dumpProlog += "    <tok ";
+
+        dumpProlog += "fileIndex=\"";
+        dumpProlog += std::to_string(tok->location.fileIndex);
+        dumpProlog += "\" ";
+
+        dumpProlog += "linenr=\"";
+        dumpProlog += std::to_string(tok->location.line);
+        dumpProlog += "\" ";
+
+        dumpProlog +="column=\"";
+        dumpProlog += std::to_string(tok->location.col);
+        dumpProlog += "\" ";
+
+        dumpProlog += "str=\"";
+        dumpProlog += ErrorLogger::toxml(tok->str());
+        dumpProlog += "\"";
+
+        dumpProlog += "/>\n";
     }
+    dumpProlog += "  </rawtokens>\n";
+    return dumpProlog;
 }
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index d9b63f02fd7..22423689cdf 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-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
@@ -21,23 +21,32 @@
 #define cppcheckH
 //---------------------------------------------------------------------------
 
-#include "analyzerinfo.h"
 #include "check.h"
-#include "color.h"
 #include "config.h"
-#include "errorlogger.h"
-#include "importproject.h"
-#include "settings.h"
 
 #include <cstddef>
-#include <fstream> // IWYU pragma: keep
 #include <functional>
 #include <list>
-#include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
+class TokenList;
+struct FileSettings;
+class CheckUnusedFunctions;
 class Tokenizer;
+class FileWithDetails;
+class AnalyzerInformation;
+class ErrorLogger;
+class Settings;
+struct Suppressions;
+class Preprocessor;
+class TimerResults;
+
+namespace simplecpp {
+    class TokenList;
+    struct Output;
+}
 
 /// @addtogroup Core
 /// @{
@@ -48,19 +57,27 @@ class Tokenizer;
  * errors or places that could be improved.
  * Usage: See check() for more info.
  */
-class CPPCHECKLIB CppCheck : ErrorLogger {
+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&)>;
+
     /**
      * @brief Constructor.
      */
-    CppCheck(ErrorLogger &errorLogger,
+    CppCheck(const Settings& settings,
+             Suppressions& supprs,
+             ErrorLogger &errorLogger,
+             TimerResults* timerResults,
              bool useGlobalSuppressions,
-             std::function<bool(std::string,std::vector<std::string>,std::string,std::string&)> executeCommand);
+             ExecuteCmdFn executeCommand);
 
     /**
      * @brief Destructor.
      */
-    ~CppCheck() override;
+    ~CppCheck();
 
     /**
      * @brief This starts the actual checking. Note that you must call
@@ -71,38 +88,33 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     /**
      * @brief Check the file.
      * This function checks one given file for errors.
-     * @param path Path to the file to check.
+     * @param file The file to check.
      * @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 std::string &path);
-    unsigned int check(const ImportProject::FileSettings &fs);
+    unsigned int check(const FileWithDetails &file);
+    unsigned int check(const FileSettings &fs);
 
     /**
      * @brief Check the file.
      * This function checks one "virtual" file. The file is not read from
      * the disk but the content is given in @p content. In errors the @p path
      * is used as a filename.
-     * @param path Path to the file to check.
-     * @param content File content as a string.
+     * @param file The file to check.
+     * @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 std::string &path, const std::string &content);
-
-    /**
-     * @brief Get reference to current settings.
-     * @return a reference to current settings
-     */
-    Settings &settings();
+    unsigned int checkBuffer(const FileWithDetails &file, const char* data, std::size_t size);
 
     /**
      * @brief Returns current version number as a string.
      * @return version, e.g. "1.38"
      */
-    static const char * version();
+    RET_NONNULL static const char * version();
 
     /**
      * @brief Returns extra version info as a string.
@@ -110,7 +122,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
      * time/date etc.
      * @return extra version info, e.g. "04d42151" (Git commit id).
      */
-    static const char * extraVersion();
+    RET_NONNULL static const char * extraVersion();
 
     /**
      * @brief Call all "getErrorMessages" in all registered Check classes.
@@ -118,8 +130,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
      */
     static void getErrorMessages(ErrorLogger &errorlogger);
 
-    void tooManyConfigsError(const std::string &file, const int numberOfConfigurations);
-    void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
+    void tooManyConfigsError(const std::string &file, int numberOfConfigurations);
 
     /** Analyse whole program, run this after all TUs has been scanned.
      * This is deprecated and the plan is to remove this when
@@ -128,20 +139,24 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
      */
     bool analyseWholeProgram();
 
-    /** Analyze all files using clang-tidy */
-    void analyseClangTidy(const ImportProject::FileSettings &fileSettings);
+    /** 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);
+
+private:
+    void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
+
+    bool isPremiumCodingStandardId(const std::string& id) const;
 
-    /** analyse whole program use .analyzeinfo files */
-    void analyseWholeProgram(const std::string &buildDir, const std::map<std::string, std::size_t> &files);
+    /**
+     * @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;
 
-    /** Check if the user wants to check for unused functions
-     * and if it's possible at all */
-    bool isUnusedFunctionCheckEnabled() const;
+    std::string getLibraryDumpData() const;
 
-    /** Remove *.ctu-info files */
-    void removeCtuInfoFiles(const std::map<std::string, std::size_t>& files); // cppcheck-suppress functionConst // has side effects
+    /** Analyze all files using clang-tidy */
+    void analyseClangTidy(const FileSettings &fileSettings);
 
-private:
 #ifdef HAVE_RULES
     /** Are there "simple" rules */
     bool hasRule(const std::string &tokenlist) const;
@@ -151,91 +166,94 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     void internalError(const std::string &filename, const std::string &msg);
 
     /**
-     * @brief Check a file using stream
-     * @param filename file name
+     * @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
-     * @param fileStream stream the file content can be read from
      * @return number of errors found
      */
-    unsigned int checkFile(const std::string& filename, const std::string &cfgname, std::istream* fileStream = nullptr);
+    unsigned int checkFile(const FileWithDetails& file, const std::string &cfgname, int fileIndex);
+
+    void checkPlistOutput(const FileWithDetails& file, const std::vector<std::string>& files);
 
     /**
-     * @brief Check raw tokens
-     * @param tokenizer tokenizer instance
+     * @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
      */
-    void checkRawTokens(const Tokenizer &tokenizer);
+    unsigned int checkBuffer(const FileWithDetails& file, const std::string &cfgname, int fileIndex, 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 createTokenList a function to create the simplecpp::TokenList with
+     * @return number of errors found
+     */
+    unsigned int checkInternal(const FileWithDetails& file, const std::string &cfgname, int fileIndex, const CreateTokenListFn& createTokenList);
 
     /**
      * @brief Check normal tokens
      * @param tokenizer tokenizer instance
+     * @param analyzerInformation the analyzer infomation
      */
-    void checkNormalTokens(const Tokenizer &tokenizer);
+    void checkNormalTokens(const Tokenizer &tokenizer, AnalyzerInformation* analyzerInformation, const std::string& currentConfig);
 
     /**
      * Execute addons
      */
-    void executeAddons(const std::vector<std::string>& files);
-    void executeAddons(const std::string &dumpFile);
+    void executeAddons(const std::vector<std::string>& files, const std::string& file0);
+    void executeAddons(const std::string &dumpFile, const FileWithDetails& file);
 
     /**
      * Execute addons
      */
-    void executeAddonsWholeProgram(const std::map<std::string, std::size_t> &files);
+    void executeAddonsWholeProgram(const std::list<FileWithDetails> &files, const std::list<FileSettings>& fileSettings, const std::string& ctuInfo);
 
 #ifdef HAVE_RULES
     /**
      * @brief Execute rules, if any
-     * @param tokenlist token list to use (normal / simple)
-     * @param tokenizer tokenizer
+     * @param tokenlist token list to use (define / normal / raw)
+     * @param list token list
      */
-    void executeRules(const std::string &tokenlist, const Tokenizer &tokenizer);
+    void executeRules(const std::string &tokenlist, const TokenList &list);
 #endif
 
-    /**
-     * @brief Errors and warnings are directed here.
-     *
-     * @param msg Errors messages are normally in format
-     * "[filepath:line number] Message", e.g.
-     * "[main.cpp:4] Uninitialized member variable"
-     */
-    void reportErr(const ErrorMessage &msg) override;
-
-    /**
-     * @brief Information about progress is directed here.
-     *
-     * @param outmsg Message to show, e.g. "Checking main.cpp..."
-     */
-    void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
-
-    std::list<std::string> mErrorList;
-    Settings mSettings;
+    unsigned int checkClang(const FileWithDetails &file, int fileIndex);
 
-    void reportProgress(const std::string &filename, const char stage[], const std::size_t value) override;
+    const Settings& mSettings;
+    Suppressions& mSuppressions;
 
-    ErrorLogger &mErrorLogger;
-
-    /** @brief Current preprocessor configuration */
-    std::string mCurrentConfig;
-
-    unsigned int mExitCode;
+    class CppCheckLogger;
+    std::unique_ptr<CppCheckLogger> mLogger;
+    /** the internal ErrorLogger */
+    ErrorLogger& mErrorLogger;
+    /** the ErrorLogger provided to this instance */
+    ErrorLogger& mErrorLoggerDirect;
+    TimerResults* mTimerResults;
 
     bool mUseGlobalSuppressions;
 
-    /** Are there too many configs? */
-    bool mTooManyConfigs;
-
-    /** Simplify code? true by default */
-    bool mSimplify;
-
     /** File info used for whole program analysis */
     std::list<Check::FileInfo*> mFileInfo;
 
-    AnalyzerInformation mAnalyzerInformation;
-
     /** Callback for executing a shell command (exe, args, output) */
-    std::function<bool(std::string,std::vector<std::string>,std::string,std::string&)> mExecuteCommand;
+    ExecuteCmdFn mExecuteCommand;
 
-    std::ofstream mPlistFile;
+    std::unique_ptr<CheckUnusedFunctions> mUnusedFunctionsCheck;
 };
 
 /// @}
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 c64878713ba..d0175b2997f 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -1,33 +1,17 @@
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug-PCRE|Win32">
-      <Configuration>Debug-PCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-PCRE|x64">
       <Configuration>Debug-PCRE</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-PCRE|Win32">
-      <Configuration>Release-PCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-PCRE|x64">
       <Configuration>Release-PCRE</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -36,14 +20,14 @@
   <ItemGroup Label="SourceFiles">
     <ClCompile Include="..\externals\simplecpp\simplecpp.cpp" />
     <ClCompile Include="..\externals\tinyxml2\tinyxml2.cpp" />
+    <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|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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>
@@ -52,10 +36,12 @@
     <ClCompile Include="checkassert.cpp" />
     <ClCompile Include="checkautovariables.cpp" />
     <ClCompile Include="checkbool.cpp" />
-    <ClCompile Include="checkboost.cpp" />
     <ClCompile Include="checkbufferoverrun.cpp" />
     <ClCompile Include="checkclass.cpp" />
     <ClCompile Include="checkcondition.cpp" />
+    <ClCompile Include="checkers.cpp" />
+    <ClCompile Include="checkersidmapping.cpp" />
+    <ClCompile Include="checkersreport.cpp" />
     <ClCompile Include="checkexceptionsafety.cpp" />
     <ClCompile Include="checkfunctions.cpp" />
     <ClCompile Include="checkinternal.cpp" />
@@ -79,6 +65,7 @@
     <ClCompile Include="ctu.cpp" />
     <ClCompile Include="errorlogger.cpp" />
     <ClCompile Include="errortypes.cpp" />
+    <ClCompile Include="findtoken.cpp" />
     <ClCompile Include="forwardanalyzer.cpp" />
     <ClCompile Include="fwdanalysis.cpp" />
     <ClCompile Include="importproject.cpp" />
@@ -92,23 +79,27 @@
     <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" />
     <ClCompile Include="suppressions.cpp" />
-    <ClCompile Include="symboldatabase.cpp" />
     <ClCompile Include="templatesimplifier.cpp" />
     <ClCompile Include="timer.cpp" />
     <ClCompile Include="token.cpp" />
-    <ClCompile Include="tokenize.cpp" />
     <ClCompile Include="tokenlist.cpp" />
     <ClCompile Include="utils.cpp" />
-    <ClCompile Include="valueflow.cpp" />
+    <ClCompile Include="vf_analyzers.cpp" />
+    <ClCompile Include="vf_common.cpp" />
+    <ClCompile Include="vf_settokenvalue.cpp" />
     <ClCompile Include="vfvalue.cpp" />
   </ItemGroup>
   <ItemGroup Label="HeaderFiles">
     <ClInclude Include="..\externals\simplecpp\simplecpp.h" />
     <ClInclude Include="..\externals\tinyxml2\tinyxml2.h" />
+    <ClInclude Include="addoninfo.h" />
     <ClInclude Include="analyzer.h" />
     <ClInclude Include="analyzerinfo.h" />
     <ClInclude Include="astutils.h" />
@@ -118,10 +109,12 @@
     <ClInclude Include="checkassert.h" />
     <ClInclude Include="checkautovariables.h" />
     <ClInclude Include="checkbool.h" />
-    <ClInclude Include="checkboost.h" />
     <ClInclude Include="checkbufferoverrun.h" />
     <ClInclude Include="checkclass.h" />
     <ClInclude Include="checkcondition.h" />
+    <ClInclude Include="checkers.h" />
+    <ClInclude Include="checkersidmapping.h" />
+    <ClInclude Include="checkersreport.h" />
     <ClInclude Include="checkexceptionsafety.h" />
     <ClInclude Include="checkfunctions.h" />
     <ClInclude Include="checkinternal.h" />
@@ -146,12 +139,16 @@
     <ClInclude Include="ctu.h" />
     <ClInclude Include="errorlogger.h" />
     <ClInclude Include="errortypes.h" />
+    <ClInclude Include="filesettings.h" />
+    <ClInclude Include="findtoken.h" />
     <ClInclude Include="forwardanalyzer.h" />
     <ClInclude Include="fwdanalysis.h" />
     <ClInclude Include="importproject.h" />
     <ClInclude Include="infer.h" />
+    <ClInclude Include="json.h" />
     <ClInclude Include="keywords.h" />
     <ClInclude Include="library.h" />
+    <ClInclude Include="matchcompiler.h" />
     <ClInclude Include="mathlib.h" />
     <ClInclude Include="path.h" />
     <ClInclude Include="pathanalysis.h" />
@@ -160,9 +157,12 @@
     <ClInclude Include="precompiled.h" />
     <ClInclude Include="preprocessor.h" />
     <ClInclude Include="programmemory.h" />
+    <ClInclude Include="regex.h" />
     <ClInclude Include="reverseanalyzer.h" />
+    <ClInclude Include="sarifreport.h" />
     <ClInclude Include="settings.h" />
     <ClInclude Include="smallvector.h" />
+    <ClInclude Include="sourcelocation.h" />
     <ClInclude Include="standards.h" />
     <ClInclude Include="summaries.h" />
     <ClInclude Include="suppressions.h" />
@@ -177,7 +177,12 @@
     <ClInclude Include="valueflow.h" />
     <ClInclude Include="valueptr.h" />
     <ClInclude Include="version.h" />
+    <ClInclude Include="vf_analyze.h" />
+    <ClInclude Include="vf_analyzers.h" />
+    <ClInclude Include="vf_common.h" />
+    <ClInclude Include="vf_settokenvalue.h" />
     <ClInclude Include="vfvalue.h" />
+    <ClInclude Include="xml.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />
@@ -191,18 +196,6 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -215,18 +208,6 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -241,24 +222,12 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
@@ -267,117 +236,34 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\debug\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">$(SolutionDir)bin\debug\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\debug\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">$(SolutionDir)bin\debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cppcheck-core</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">cppcheck-core</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cppcheck-core</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">cppcheck-core</TargetName>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">false</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">false</IgnoreImportLibrary>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">$(SolutionDir)bin\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cppcheck-core</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">cppcheck-core</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cppcheck-core</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">cppcheck-core</TargetName>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">false</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">false</IgnoreImportLibrary>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">true</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>
-      </IgnoreAllDefaultLibraries>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(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>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">
-    <ClCompile>
-      <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;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(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>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <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>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <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>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
@@ -395,9 +281,12 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
+      <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'">
@@ -405,10 +294,10 @@ 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>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <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>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
@@ -427,90 +316,12 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(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>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <WarningLevel>Level4</WarningLevel>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(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>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <WarningLevel>Level4</WarningLevel>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AdditionalIncludeDirectories>..\externals;..\externals\picojson;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <PreprocessorDefinitions>CPPCHECKLIB_EXPORT;TINYXML2_EXPORT;SIMPLECPP_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-    <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
+      <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'">
@@ -523,9 +334,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>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;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>
+      <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;$(HaveBoost);NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -548,9 +359,12 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
+      <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'">
@@ -563,9 +377,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>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;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>
+      <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;$(HaveBoost);NDEBUG;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -589,9 +403,12 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y</Command>
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
     <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)addons" "$(OutDir)addons" /E /I /D /Y
+      <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 2bba20684fa..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">
@@ -89,9 +92,6 @@
     <ClCompile Include="token.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="checkboost.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="checkinternal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -194,6 +194,39 @@
     <ClCompile Include="vfvalue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="checkersreport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="keywords.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="addoninfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="checkers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="checkersidmapping.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="standards.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vf_analyzers.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vf_common.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="vf_settokenvalue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="findtoken.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="regex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup Label="HeaderFiles">
     <ClInclude Include="checkbufferoverrun.h">
@@ -277,9 +310,6 @@
     <ClInclude Include="checkautovariables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="checkboost.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="checkio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -406,11 +436,63 @@
     <ClInclude Include="vfvalue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="keywords.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="checkersreport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="json.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="addoninfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="checkers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="checkersidmapping.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="filesettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="findtoken.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="matchcompiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sourcelocation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vf_analyze.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vf_analyzers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vf_common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="vf_settokenvalue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="xml.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <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 ab3a7155d31..df8ee0f74b6 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-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
@@ -22,7 +22,6 @@
 
 #include "astutils.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
@@ -36,34 +35,33 @@
 #include <sstream>
 #include <utility>
 
-#include <tinyxml2.h>
+#include "xml.h"
 //---------------------------------------------------------------------------
 
-static const char ATTR_CALL_ID[] = "call-id";
-static const char ATTR_CALL_FUNCNAME[] = "call-funcname";
-static const char ATTR_CALL_ARGNR[] = "call-argnr";
-static const char ATTR_CALL_ARGEXPR[] = "call-argexpr";
-static const char ATTR_CALL_ARGVALUETYPE[] = "call-argvaluetype";
-static const char ATTR_CALL_ARGVALUE[] = "call-argvalue";
-static const char ATTR_WARNING[] = "warning";
-static const char ATTR_LOC_FILENAME[] = "file";
-static const char ATTR_LOC_LINENR[] = "line";
-static const char ATTR_LOC_COLUMN[] = "col";
-static const char ATTR_INFO[] = "info";
-static const char ATTR_MY_ID[] = "my-id";
-static const char ATTR_MY_ARGNR[] = "my-argnr";
-static const char ATTR_MY_ARGNAME[] = "my-argname";
-static const char ATTR_VALUE[] = "value";
-
-int CTU::maxCtuDepth = 2;
-
-std::string CTU::getFunctionId(const Tokenizer *tokenizer, const Function *function)
+static constexpr char ATTR_CALL_ID[] = "call-id";
+static constexpr char ATTR_CALL_FUNCNAME[] = "call-funcname";
+static constexpr char ATTR_CALL_ARGNR[] = "call-argnr";
+static constexpr char ATTR_CALL_ARGEXPR[] = "call-argexpr";
+static constexpr char ATTR_CALL_ARGVALUETYPE[] = "call-argvaluetype";
+static constexpr char ATTR_CALL_ARGVALUE[] = "call-argvalue";
+static constexpr char ATTR_CALL_UNKNOWN_FUNCTION_RETURN[] = "call-argvalue-ufr";
+static constexpr char ATTR_WARNING[] = "warning";
+static constexpr char ATTR_LOC_FILENAME[] = "file";
+static constexpr char ATTR_LOC_LINENR[] = "line";
+static constexpr char ATTR_LOC_COLUMN[] = "col";
+static constexpr char ATTR_INFO[] = "info";
+static constexpr char ATTR_MY_ID[] = "my-id";
+static constexpr char ATTR_MY_ARGNR[] = "my-argnr";
+static constexpr char ATTR_MY_ARGNAME[] = "my-argname";
+static constexpr char ATTR_VALUE[] = "value";
+
+std::string CTU::getFunctionId(const Tokenizer &tokenizer, const Function *function)
 {
-    return tokenizer->list.file(function->tokenDef) + ':' + MathLib::toString(function->tokenDef->linenr()) + ':' + MathLib::toString(function->tokenDef->column());
+    return tokenizer.list.file(function->tokenDef) + ':' + std::to_string(function->tokenDef->linenr()) + ':' + std::to_string(function->tokenDef->column());
 }
 
-CTU::FileInfo::Location::Location(const Tokenizer *tokenizer, const Token *tok)
-    : fileName(tokenizer->list.file(tok))
+CTU::FileInfo::Location::Location(const Tokenizer &tokenizer, const Token *tok)
+    : fileName(tokenizer.list.file(tok))
     , lineNumber(tok->linenr())
     , column(tok->column())
 {}
@@ -104,7 +102,8 @@ std::string CTU::FileInfo::FunctionCall::toXmlString() const
         << toBaseXmlString()
         << " " << ATTR_CALL_ARGEXPR << "=\"" << ErrorLogger::toxml(callArgumentExpression) << "\""
         << " " << ATTR_CALL_ARGVALUETYPE << "=\"" << static_cast<int>(callValueType) << "\""
-        << " " << ATTR_CALL_ARGVALUE << "=\"" << callArgValue << "\"";
+        << " " << ATTR_CALL_ARGVALUE << "=\"" << callArgValue.value << "\""
+        << " " << ATTR_CALL_UNKNOWN_FUNCTION_RETURN << "=\"" << static_cast<int>(callArgValue.unknownFunctionReturn) << "\"";
     if (warning)
         out << " " << ATTR_WARNING << "=\"true\"";
     if (callValuePath.empty())
@@ -156,17 +155,15 @@ std::string CTU::toString(const std::list<CTU::FileInfo::UnsafeUsage> &unsafeUsa
     return ret.str();
 }
 
-CTU::FileInfo::CallBase::CallBase(const Tokenizer *tokenizer, const Token *callToken)
+CTU::FileInfo::CallBase::CallBase(const Tokenizer &tokenizer, const Token *callToken)
     : callId(getFunctionId(tokenizer, callToken->function()))
-    , callArgNr(0)
     , callFunctionName(callToken->next()->astOperand1()->expressionString())
     , location(CTU::FileInfo::Location(tokenizer, callToken))
 {}
 
-CTU::FileInfo::NestedCall::NestedCall(const Tokenizer *tokenizer, const Function *myFunction, const Token *callToken)
+CTU::FileInfo::NestedCall::NestedCall(const Tokenizer &tokenizer, const Function *myFunction, const Token *callToken)
     : CallBase(tokenizer, callToken)
     , myId(getFunctionId(tokenizer, myFunction))
-    , myArgNr(0)
 {}
 
 static std::string readAttrString(const tinyxml2::XMLElement *e, const char *attr, bool *error)
@@ -174,7 +171,7 @@ static std::string readAttrString(const tinyxml2::XMLElement *e, const char *att
     const char *value = e->Attribute(attr);
     if (!value && error)
         *error = true;
-    return value ? value : "";
+    return empty_if_null(value);
 }
 
 static long long readAttrInt(const tinyxml2::XMLElement *e, const char *attr, bool *error)
@@ -204,18 +201,22 @@ bool CTU::FileInfo::FunctionCall::loadFromXml(const tinyxml2::XMLElement *xmlEle
         return false;
     bool error=false;
     callArgumentExpression = readAttrString(xmlElement, ATTR_CALL_ARGEXPR, &error);
-    callValueType = (ValueFlow::Value::ValueType)readAttrInt(xmlElement, ATTR_CALL_ARGVALUETYPE, &error);
-    callArgValue = readAttrInt(xmlElement, ATTR_CALL_ARGVALUE, &error);
+    callValueType = static_cast<ValueFlow::Value::ValueType>(readAttrInt(xmlElement, ATTR_CALL_ARGVALUETYPE, &error));
+    callArgValue.value = readAttrInt(xmlElement, ATTR_CALL_ARGVALUE, &error);
+    const auto ufr = readAttrInt(xmlElement, ATTR_CALL_UNKNOWN_FUNCTION_RETURN, &error);
+    // NOLINTNEXTLINE(clang-analyzer-optin.core.EnumCastOutOfRange) - TODO: fix this - #13726
+    callArgValue.unknownFunctionReturn = static_cast<ValueFlow::Value::UnknownFunctionReturn>(ufr>=0 && ufr <=0xff ? ufr : 0xff);
     const char *w = xmlElement->Attribute(ATTR_WARNING);
     warning = w && std::strcmp(w, "true") == 0;
     for (const tinyxml2::XMLElement *e2 = xmlElement->FirstChildElement(); !error && e2; e2 = e2->NextSiblingElement()) {
         if (std::strcmp(e2->Name(), "path") != 0)
             continue;
-        ErrorMessage::FileLocation loc;
-        loc.setfile(readAttrString(e2, ATTR_LOC_FILENAME, &error));
-        loc.line = readAttrInt(e2, ATTR_LOC_LINENR, &error);
-        loc.column = readAttrInt(e2, ATTR_LOC_COLUMN, &error);
-        loc.setinfo(readAttrString(e2, ATTR_INFO, &error));
+        std::string file = readAttrString(e2, ATTR_LOC_FILENAME, &error);
+        std::string info = readAttrString(e2, ATTR_INFO, &error);
+        const int line = readAttrInt(e2, ATTR_LOC_LINENR, &error);
+        const int column = readAttrInt(e2, ATTR_LOC_COLUMN, &error);
+        ErrorMessage::FileLocation loc(file, std::move(info), line, column);
+        callValuePath.emplace_back(std::move(loc));
     }
     return !error;
 }
@@ -230,14 +231,16 @@ 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()) {
-        if (std::strcmp(e->Name(), "function-call") == 0) {
+        const char* name = e->Name();
+        if (std::strcmp(name, "function-call") == 0) {
             FunctionCall functionCall;
             if (functionCall.loadFromXml(e))
                 functionCalls.push_back(std::move(functionCall));
-        } else if (std::strcmp(e->Name(), "nested-call") == 0) {
+        } else if (std::strcmp(name, "nested-call") == 0) {
             NestedCall nestedCall;
             if (nestedCall.loadFromXml(e))
                 nestedCalls.push_back(std::move(nestedCall));
@@ -277,7 +280,7 @@ std::list<CTU::FileInfo::UnsafeUsage> CTU::loadUnsafeUsageListFromXml(const tiny
     return ret;
 }
 
-static int isCallFunction(const Scope *scope, int argnr, const Token **tok)
+static int isCallFunction(const Scope *scope, int argnr, const Token *&tok)
 {
     const Variable * const argvar = scope->function->getArgumentVar(argnr);
     if (!argvar->isPointer())
@@ -300,22 +303,22 @@ static int isCallFunction(const Scope *scope, int argnr, const Token **tok)
             break;
         if (!prev->astOperand1() || !prev->astOperand1()->function())
             break;
-        *tok = prev->previous();
+        tok = prev->previous();
         return argnr2;
     }
     return -1;
 }
 
 
-CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
+CTU::FileInfo *CTU::getFileInfo(const Tokenizer &tokenizer)
 {
-    const SymbolDatabase * const symbolDatabase = tokenizer->getSymbolDatabase();
+    const SymbolDatabase * const symbolDatabase = tokenizer.getSymbolDatabase();
 
-    FileInfo *fileInfo = new FileInfo;
+    auto *fileInfo = new FileInfo;
 
     // Parse all functions in TU
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (!scope.isExecutable() || scope.type != Scope::eFunction || !scope.function)
+        if (!scope.isExecutable() || scope.type != ScopeType::eFunction || !scope.function)
             continue;
         const Function *const scopeFunction = scope.function;
 
@@ -344,14 +347,14 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
                     functionCall.location = FileInfo::Location(tokenizer,tok);
                     functionCall.callArgNr = argnr + 1;
                     functionCall.callArgumentExpression = argtok->expressionString();
-                    functionCall.callArgValue = value.intvalue;
+                    functionCall.callArgValue = value;
                     functionCall.warning = !value.errorSeverity();
                     for (const ErrorPathItem &i : value.errorPath) {
-                        ErrorMessage::FileLocation loc;
-                        loc.setfile(tokenizer->list.file(i.first));
-                        loc.line = i.first->linenr();
-                        loc.column = i.first->column();
-                        loc.setinfo(i.second);
+                        const std::string& file = tokenizer.list.file(i.first);
+                        const std::string& info = i.second;
+                        const int line = i.first->linenr();
+                        const int column = i.first->column();
+                        ErrorMessage::FileLocation loc(file, info, line, column);
                         functionCall.callValuePath.push_back(std::move(loc));
                     }
                     fileInfo->functionCalls.push_back(std::move(functionCall));
@@ -365,8 +368,8 @@ 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);
-                    functionCall.callArgValue = typeSize > 0 ? argtok->variable()->dimension(0) * typeSize : -1;
+                    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));
                 }
@@ -379,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 = 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));
                 }
@@ -413,7 +416,8 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
                     functionCall.callFunctionName = tok->astOperand1()->expressionString();
                     functionCall.location = FileInfo::Location(tokenizer, tok);
                     functionCall.callArgNr = argnr + 1;
-                    functionCall.callArgValue = 0;
+                    functionCall.callArgValue = v;
+                    functionCall.callArgValue.value = 0;
                     functionCall.callArgumentExpression = argtok->expressionString();
                     functionCall.warning = false;
                     fileInfo->functionCalls.push_back(std::move(functionCall));
@@ -425,7 +429,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
         // Nested function calls
         for (int argnr = 0; argnr < scopeFunction->argCount(); ++argnr) {
             const Token *tok;
-            const int argnr2 = isCallFunction(&scope, argnr, &tok);
+            const int argnr2 = isCallFunction(&scope, argnr, tok);
             if (argnr2 > 0) {
                 FileInfo::NestedCall nestedCall(tokenizer, scopeFunction, tok);
                 nestedCall.myArgNr = argnr + 1;
@@ -438,9 +442,9 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
     return fileInfo;
 }
 
-static std::list<std::pair<const Token *, MathLib::bigint>> getUnsafeFunction(const Tokenizer *tokenizer, const Settings *settings, const Scope *scope, int argnr, const Check *check, bool (*isUnsafeUsage)(const Check *check, const Token *argtok, MathLib::bigint *value))
+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))
 {
-    std::list<std::pair<const Token *, MathLib::bigint>> ret;
+    std::vector<std::pair<const Token *, CTU::FileInfo::Value>> ret;
     const Variable * const argvar = scope->function->getArgumentVar(argnr);
     if (!argvar->isArrayOrPointer() && !argvar->isReference())
         return ret;
@@ -452,7 +456,7 @@ static std::list<std::pair<const Token *, MathLib::bigint>> getUnsafeFunction(co
             int indirect = 0;
             if (argvar->valueType())
                 indirect = argvar->valueType()->pointer;
-            if (isVariableChanged(tok2->link(), tok2, indirect, argvar->declarationId(), false, settings, tokenizer->isCPP()))
+            if (isVariableChanged(tok2->link(), tok2, indirect, argvar->declarationId(), false, settings))
                 return ret;
         }
         if (Token::Match(tok2, "%oror%|&&|?")) {
@@ -461,8 +465,8 @@ static std::list<std::pair<const Token *, MathLib::bigint>> getUnsafeFunction(co
         }
         if (tok2->variable() != argvar)
             continue;
-        MathLib::bigint value = 0;
-        if (!isUnsafeUsage(check, tok2, &value))
+        CTU::FileInfo::Value value;
+        if (!isUnsafeUsage(settings, tok2, &value))
             return ret; // TODO: Is this a read? then continue..
         ret.emplace_back(tok2, value);
         return ret;
@@ -470,23 +474,23 @@ static std::list<std::pair<const Token *, MathLib::bigint>> getUnsafeFunction(co
     return ret;
 }
 
-std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer *tokenizer, const Settings *settings, const Check *check, bool (*isUnsafeUsage)(const Check *check, const Token *argtok, MathLib::bigint *value))
+std::list<CTU::FileInfo::UnsafeUsage> CTU::getUnsafeUsage(const Tokenizer &tokenizer, const Settings &settings, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, CTU::FileInfo::Value *value))
 {
     std::list<CTU::FileInfo::UnsafeUsage> unsafeUsage;
 
     // Parse all functions in TU
-    const SymbolDatabase * const symbolDatabase = tokenizer->getSymbolDatabase();
+    const SymbolDatabase * const symbolDatabase = tokenizer.getSymbolDatabase();
 
     for (const Scope &scope : symbolDatabase->scopeList) {
-        if (!scope.isExecutable() || scope.type != Scope::eFunction || !scope.function)
+        if (!scope.isExecutable() || scope.type != ScopeType::eFunction || !scope.function)
             continue;
         const Function *const function = scope.function;
 
         // "Unsafe" functions unconditionally reads data before it is written..
         for (int argnr = 0; argnr < function->argCount(); ++argnr) {
-            for (const std::pair<const Token *, MathLib::bigint> &v : getUnsafeFunction(tokenizer, settings, &scope, argnr, check, isUnsafeUsage)) {
+            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;
+                const MathLib::bigint val = v.second.value;
                 unsafeUsage.emplace_back(CTU::getFunctionId(tokenizer, function), argnr+1, tok->str(), CTU::FileInfo::Location(tokenizer,tok), val);
             }
         }
@@ -502,12 +506,13 @@ static bool findPath(const std::string &callId,
                      const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap,
                      const CTU::FileInfo::CallBase *path[10],
                      int index,
-                     bool warning)
+                     bool warning,
+                     int maxCtuDepth)
 {
-    if (index >= CTU::maxCtuDepth || index >= 10)
-        return false;
+    if (index >= maxCtuDepth)
+        return false; // TODO: add bailout message?
 
-    const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>>::const_iterator it = callsMap.find(callId);
+    const auto it = utils::as_const(callsMap).find(callId);
     if (it == callsMap.end())
         return false;
 
@@ -515,13 +520,15 @@ static bool findPath(const std::string &callId,
         if (c->callArgNr != callArgNr)
             continue;
 
-        const CTU::FileInfo::FunctionCall *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(c);
+        const auto *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(c);
         if (functionCall) {
             if (!warning && functionCall->warning)
                 continue;
+            if (!warning && functionCall->callArgValue.unknownFunctionReturn != ValueFlow::Value::UnknownFunctionReturn::no)
+                continue;
             switch (invalidValue) {
             case CTU::FileInfo::InvalidValueType::null:
-                if (functionCall->callValueType != ValueFlow::Value::ValueType::INT || functionCall->callArgValue != 0)
+                if (functionCall->callValueType != ValueFlow::Value::ValueType::INT || functionCall->callArgValue.value != 0)
                     continue;
                 break;
             case CTU::FileInfo::InvalidValueType::uninit:
@@ -531,7 +538,7 @@ static bool findPath(const std::string &callId,
             case CTU::FileInfo::InvalidValueType::bufferOverflow:
                 if (functionCall->callValueType != ValueFlow::Value::ValueType::BUFFER_SIZE)
                     continue;
-                if (unsafeValue < 0 || (unsafeValue >= functionCall->callArgValue && functionCall->callArgValue >= 0))
+                if (unsafeValue < 0 || (unsafeValue >= functionCall->callArgValue.value && functionCall->callArgValue.value >= 0))
                     break;
                 continue;
             }
@@ -539,11 +546,11 @@ static bool findPath(const std::string &callId,
             return true;
         }
 
-        const CTU::FileInfo::NestedCall *nestedCall = dynamic_cast<const CTU::FileInfo::NestedCall *>(c);
+        const auto *nestedCall = dynamic_cast<const CTU::FileInfo::NestedCall *>(c);
         if (!nestedCall)
             continue;
 
-        if (findPath(nestedCall->myId, nestedCall->myArgNr, unsafeValue, invalidValue, callsMap, path, index + 1, warning)) {
+        if (findPath(nestedCall->myId, nestedCall->myArgNr, unsafeValue, invalidValue, callsMap, path, index + 1, warning, maxCtuDepth)) {
             path[index] = nestedCall;
             return true;
         }
@@ -557,14 +564,22 @@ std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueTy
                                                                   const std::map<std::string, std::list<const CTU::FileInfo::CallBase *>> &callsMap,
                                                                   const char info[],
                                                                   const FunctionCall ** const functionCallPtr,
-                                                                  bool warning)
+                                                                  bool warning,
+                                                                  int maxCtuDepth,
+                                                                  ValueFlow::Value::UnknownFunctionReturn *unknownFunctionReturn)
 {
-    std::list<ErrorMessage::FileLocation> locationList;
-
     const CTU::FileInfo::CallBase *path[10] = {nullptr};
 
-    if (!findPath(unsafeUsage.myId, unsafeUsage.myArgNr, unsafeUsage.value, invalidValue, callsMap, path, 0, warning))
-        return locationList;
+    if (!findPath(unsafeUsage.myId, unsafeUsage.myArgNr, unsafeUsage.value, invalidValue, callsMap, path, 0, warning, maxCtuDepth))
+        return {};
+
+    if (unknownFunctionReturn && path[0]) {
+        const auto* functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(path[0]);
+        if (functionCall)
+            *unknownFunctionReturn = functionCall->callArgValue.unknownFunctionReturn;
+    }
+
+    std::list<ErrorMessage::FileLocation> locationList;
 
     const std::string value1 = (invalidValue == InvalidValueType::null) ? "null" : "uninitialized";
 
@@ -572,7 +587,7 @@ std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueTy
         if (!path[index])
             continue;
 
-        const CTU::FileInfo::FunctionCall *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(path[index]);
+        const auto *functionCall = dynamic_cast<const CTU::FileInfo::FunctionCall *>(path[index]);
 
         if (functionCall) {
             if (functionCallPtr)
@@ -580,13 +595,13 @@ std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueTy
             std::copy(functionCall->callValuePath.cbegin(), functionCall->callValuePath.cend(), std::back_inserter(locationList));
         }
 
-        ErrorMessage::FileLocation fileLoc(path[index]->location.fileName, path[index]->location.lineNumber, path[index]->location.column);
-        fileLoc.setinfo("Calling function " + path[index]->callFunctionName + ", " + MathLib::toString(path[index]->callArgNr) + getOrdinalText(path[index]->callArgNr) + " argument is " + value1);
+        std::string info_s = "Calling function " + path[index]->callFunctionName + ", " + std::to_string(path[index]->callArgNr) + getOrdinalText(path[index]->callArgNr) + " argument is " + value1;
+        ErrorMessage::FileLocation fileLoc(path[index]->location.fileName, std::move(info_s), path[index]->location.lineNumber, path[index]->location.column);
         locationList.push_back(std::move(fileLoc));
     }
 
-    ErrorMessage::FileLocation fileLoc2(unsafeUsage.location.fileName, unsafeUsage.location.lineNumber, unsafeUsage.location.column);
-    fileLoc2.setinfo(replaceStr(info, "ARG", unsafeUsage.myArgumentName));
+    std::string info_s = replaceStr(info, "ARG", unsafeUsage.myArgumentName);
+    ErrorMessage::FileLocation fileLoc2(unsafeUsage.location.fileName, std::move(info_s), unsafeUsage.location.lineNumber, unsafeUsage.location.column);
     locationList.push_back(std::move(fileLoc2));
 
     return locationList;
diff --git a/lib/ctu.h b/lib/ctu.h
index a353ac1d7d7..4f5e0b0294c 100644
--- a/lib/ctu.h
+++ b/lib/ctu.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * 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
@@ -28,6 +28,7 @@
 #include "mathlib.h"
 #include "vfvalue.h"
 
+#include <cstdint>
 #include <list>
 #include <map>
 #include <string>
@@ -51,22 +52,37 @@ namespace tinyxml2 {
 namespace CTU {
     class CPPCHECKLIB FileInfo : public Check::FileInfo {
     public:
-        enum class InvalidValueType { null, uninit, bufferOverflow };
+        enum class InvalidValueType : std::uint8_t { null, uninit, bufferOverflow };
 
         std::string toString() const override;
 
         struct Location {
             Location() = default;
-            Location(const Tokenizer *tokenizer, const Token *tok);
+            Location(const Tokenizer &tokenizer, const Token *tok);
             Location(std::string fileName, nonneg int lineNumber, nonneg int column) : fileName(std::move(fileName)), lineNumber(lineNumber), column(column) {}
             std::string fileName;
             nonneg int lineNumber{};
             nonneg int column{};
         };
 
+        struct Value {
+            Value& operator=(const ValueFlow::Value& val) & {
+                value = val.intvalue;
+                unknownFunctionReturn = val.unknownFunctionReturn;
+                return *this;
+            }
+            MathLib::bigint value{};
+            ValueFlow::Value::UnknownFunctionReturn unknownFunctionReturn{};
+        };
+
         struct UnsafeUsage {
             UnsafeUsage() = default;
-            UnsafeUsage(std::string myId, nonneg int 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) {}
+            UnsafeUsage(std::string myId, nonneg int 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{};
             std::string myArgumentName;
@@ -81,8 +97,8 @@ namespace CTU {
             CallBase(std::string callId, int 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() {}
+            CallBase(const Tokenizer &tokenizer, const Token *callToken);
+            virtual ~CallBase() = default;
             CallBase(const CallBase&) = default;
             std::string callId;
             int callArgNr{};
@@ -96,7 +112,7 @@ namespace CTU {
         class FunctionCall : public CallBase {
         public:
             std::string callArgumentExpression;
-            MathLib::bigint callArgValue;
+            Value callArgValue;
             ValueFlow::Value::ValueType callValueType;
             std::vector<ErrorMessage::FileLocation> callValuePath;
             bool warning;
@@ -114,7 +130,7 @@ namespace CTU {
                 myId(std::move(myId)),
                 myArgNr(myArgNr) {}
 
-            NestedCall(const Tokenizer *tokenizer, const Function *myFunction, const Token *callToken);
+            NestedCall(const Tokenizer &tokenizer, const Function *myFunction, const Token *callToken);
 
             std::string toXmlString() const;
             bool loadFromXml(const tinyxml2::XMLElement *xmlElement);
@@ -133,20 +149,20 @@ namespace CTU {
                                                                   const UnsafeUsage &unsafeUsage,
                                                                   const std::map<std::string, std::list<const CallBase *>> &callsMap,
                                                                   const char info[],
-                                                                  const FunctionCall ** const functionCallPtr,
-                                                                  bool warning);
+                                                                  const FunctionCall ** functionCallPtr,
+                                                                  bool warning,
+                                                                  int maxCtuDepth,
+                                                                  ValueFlow::Value::UnknownFunctionReturn *unknownFunctionReturn = nullptr);
     };
 
-    extern int maxCtuDepth;
-
     CPPCHECKLIB std::string toString(const std::list<FileInfo::UnsafeUsage> &unsafeUsage);
 
-    CPPCHECKLIB std::string getFunctionId(const Tokenizer *tokenizer, const Function *function);
+    CPPCHECKLIB std::string getFunctionId(const Tokenizer &tokenizer, const Function *function);
 
     /** @brief Parse current TU and extract file info */
-    CPPCHECKLIB FileInfo *getFileInfo(const Tokenizer *tokenizer);
+    CPPCHECKLIB RET_NONNULL FileInfo *getFileInfo(const Tokenizer &tokenizer);
 
-    CPPCHECKLIB std::list<FileInfo::UnsafeUsage> getUnsafeUsage(const Tokenizer *tokenizer, const Settings *settings, const Check *check, bool (*isUnsafeUsage)(const Check *check, const Token *argtok, MathLib::bigint *value));
+    CPPCHECKLIB std::list<FileInfo::UnsafeUsage> getUnsafeUsage(const Tokenizer &tokenizer, const Settings &settings, bool (*isUnsafeUsage)(const Settings &settings, const Token *argtok, FileInfo::Value *value));
 
     CPPCHECKLIB std::list<FileInfo::UnsafeUsage> loadUnsafeUsageListFromXml(const tinyxml2::XMLElement *xmlElement);
 }
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 61480228380..e62ed6b806d 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-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
@@ -20,63 +20,81 @@
 
 #include "color.h"
 #include "cppcheck.h"
-#include "mathlib.h"
 #include "path.h"
+#include "settings.h"
+#include "suppressions.h"
 #include "token.h"
 #include "tokenlist.h"
 #include "utils.h"
+#include "checkers.h"
 
 #include <algorithm>
 #include <array>
 #include <cassert>
 #include <cctype>
-#include <cstdlib>
 #include <cstring>
+#include <fstream>
 #include <iomanip>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include <tinyxml2.h>
+#include "xml.h"
+
+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)
 {}
 
-ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity::SeverityType severity, const std::string &msg, std::string id, Certainty certainty) :
+// TODO: id and msg are swapped compared to other calls
+ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity severity, const std::string &msg, std::string id, Certainty certainty) :
     callStack(std::move(callStack)), // locations for this error message
     id(std::move(id)),               // set the message id
     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);
 }
 
 
-
-ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity::SeverityType severity, const std::string &msg, std::string id, const CWE &cwe, Certainty certainty) :
+// TODO: id and msg are swapped compared to other calls
+ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity severity, const std::string &msg, std::string id, const CWE &cwe, Certainty certainty) :
     callStack(std::move(callStack)), // locations for this error message
     id(std::move(id)),               // set the message id
     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::SeverityType severity, std::string id, const std::string& msg, Certainty certainty)
-    : id(std::move(id)), severity(severity), cwe(0U), certainty(certainty), hash(0)
+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)
 {
     // Format callstack
-    for (std::list<const Token *>::const_iterator it = callstack.cbegin(); it != callstack.cend(); ++it) {
+    for (auto it = callstack.cbegin(); it != callstack.cend(); ++it) {
         // --errorlist can provide null values here
         if (!(*it))
             continue;
@@ -91,7 +109,7 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
 }
 
 
-ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const TokenList* list, Severity::SeverityType severity, std::string id, const std::string& msg, const CWE &cwe, Certainty certainty)
+ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const TokenList* list, Severity severity, std::string id, const std::string& msg, const CWE &cwe, Certainty certainty)
     : id(std::move(id)), severity(severity), cwe(cwe.id), certainty(certainty)
 {
     // Format callstack
@@ -108,28 +126,32 @@ ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack, const Token
 
     setmsg(msg);
 
-    hash = 0; // calculateWarningHash(list, hashWarning.str());
+    // hash = calculateWarningHash(list, hashWarning.str());
 }
 
-ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenList *tokenList, Severity::SeverityType 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;
 
-        std::string info = e.second;
+        std::string& path_info = e.second;
 
-        if (info.compare(0,8,"$symbol:") == 0 && info.find('\n') < info.size()) {
-            const std::string::size_type pos = info.find('\n');
-            const std::string &symbolName = info.substr(8, pos - 8);
-            info = replaceStr(info.substr(pos+1), "$symbol", symbolName);
+        std::string info;
+        if (startsWith(path_info,"$symbol:") && path_info.find('\n') < path_info.size()) {
+            const std::string::size_type pos = path_info.find('\n');
+            const std::string symbolName = path_info.substr(8, pos - 8);
+            info = replaceStr(path_info.substr(pos+1), "$symbol", symbolName);
+        }
+        else {
+            info = std::move(path_info);
         }
 
-        callStack.emplace_back(tok, info, tokenList);
+        callStack.emplace_back(tok, std::move(info), tokenList);
     }
 
     if (tokenList && !tokenList->getFiles().empty())
@@ -137,7 +159,7 @@ ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenList *tokenLis
 
     setmsg(msg);
 
-    hash = 0; // calculateWarningHash(tokenList, hashWarning.str());
+    // hash = calculateWarningHash(tokenList, hashWarning.str());
 }
 
 ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
@@ -150,10 +172,14 @@ ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     const char *attr = errmsg->Attribute("id");
     id = attr ? attr : unknown;
 
+    attr = errmsg->Attribute("file0");
+    file0 = attr ? attr : "";
+
     attr = errmsg->Attribute("severity");
-    severity = attr ? Severity::fromString(attr) : Severity::none;
+    severity = attr ? severityFromString(attr) : Severity::none;
 
     attr = errmsg->Attribute("cwe");
+    // cppcheck-suppress templateInstantiation - TODO: fix this - see #11631
     cwe.id = attr ? strToInt<unsigned short>(attr) : 0;
 
     attr = errmsg->Attribute("inconclusive");
@@ -169,18 +195,23 @@ ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     hash = attr ? strToInt<std::size_t>(attr) : 0;
 
     for (const tinyxml2::XMLElement *e = errmsg->FirstChildElement(); e; e = e->NextSiblingElement()) {
-        if (std::strcmp(e->Name(),"location")==0) {
+        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);
-        } else if (std::strcmp(e->Name(),"symbol")==0) {
+            callStack.emplace_front(origfile, info, line, column);
+            if (strorigfile)
+                callStack.front().setfile(file);
+        } else if (std::strcmp(name,"symbol")==0) {
             mSymbolNames += e->GetText();
         }
     }
@@ -203,7 +234,7 @@ void ErrorMessage::setmsg(const std::string &msg)
     if (pos == std::string::npos) {
         mShortMessage = replaceStr(msg, "$symbol", symbolName);
         mVerboseMessage = replaceStr(msg, "$symbol", symbolName);
-    } else if (msg.compare(0,8,"$symbol:") == 0) {
+    } else if (startsWith(msg,"$symbol:")) {
         mSymbolNames += msg.substr(8, pos-7);
         setmsg(msg.substr(pos + 1));
     } else {
@@ -212,51 +243,75 @@ void ErrorMessage::setmsg(const std::string &msg)
     }
 }
 
-Suppressions::ErrorMessage ErrorMessage::toSuppressionsErrorMessage() const
+static void serializeString(std::string &oss, const std::string & str)
 {
-    Suppressions::ErrorMessage ret;
-    ret.hash = hash;
-    ret.errorId = id;
-    if (!callStack.empty()) {
-        ret.setFileName(callStack.back().getfile(false));
-        ret.lineNumber = callStack.back().line;
+    oss += std::to_string(str.length());
+    oss += " ";
+    oss += str;
+}
+
+ErrorMessage ErrorMessage::fromInternalError(const InternalError &internalError, const TokenList *tokenList, const std::string &filename, const std::string& msg)
+{
+    if (internalError.token)
+        assert(tokenList != nullptr); // we need to make sure we can look up the provided token
+
+    std::list<ErrorMessage::FileLocation> locationList;
+    if (tokenList && internalError.token) {
+        locationList.emplace_back(internalError.token, tokenList);
     } else {
-        ret.lineNumber = Suppressions::Suppression::NO_LINE;
+        locationList.emplace_back(filename, 0, 0);
+        if (tokenList && (filename != tokenList->getSourceFilePath())) {
+            locationList.emplace_back(tokenList->getSourceFilePath(), 0, 0);
+        }
     }
-    ret.certainty = certainty;
-    ret.symbolNames = mSymbolNames;
-    return ret;
+    ErrorMessage errmsg(std::move(locationList),
+                        tokenList ? tokenList->getSourceFilePath() : filename,
+                        Severity::error,
+                        (msg.empty() ? "" : (msg + ": ")) + internalError.errorMessage,
+                        internalError.id,
+                        Certainty::normal);
+    // TODO: find a better way
+    if (!internalError.details.empty())
+        errmsg.mVerboseMessage = errmsg.mVerboseMessage + ": " + internalError.details;
+    return errmsg;
 }
 
-
 std::string ErrorMessage::serialize() const
 {
     // Serialize this message into a simple string
-    std::ostringstream oss;
-    oss << id.length() << " " << id;
-    oss << Severity::toString(severity).length() << " " << Severity::toString(severity);
-    oss << MathLib::toString(cwe.id).length() << " " << MathLib::toString(cwe.id);
-    oss << MathLib::toString(hash).length() << " " << MathLib::toString(hash);
-    oss << file0.size() << " " << file0;
-    if (certainty == Certainty::inconclusive) {
-        const std::string text("inconclusive");
-        oss << text.length() << " " << text;
-    }
+    std::string oss;
+    serializeString(oss, id);
+    serializeString(oss, severityToString(severity));
+    serializeString(oss, std::to_string(cwe.id));
+    serializeString(oss, std::to_string(hash));
+    serializeString(oss, fixInvalidChars(remark));
+    serializeString(oss, file0);
+    serializeString(oss, (certainty == Certainty::inconclusive) ? "1" : "0");
 
     const std::string saneShortMessage = fixInvalidChars(mShortMessage);
     const std::string saneVerboseMessage = fixInvalidChars(mVerboseMessage);
 
-    oss << saneShortMessage.length() << " " << saneShortMessage;
-    oss << saneVerboseMessage.length() << " " << saneVerboseMessage;
-    oss << callStack.size() << " ";
-
-    for (std::list<ErrorMessage::FileLocation>::const_iterator loc = callStack.cbegin(); loc != callStack.cend(); ++loc) {
-        std::ostringstream smallStream;
-        smallStream << (*loc).line << '\t' << (*loc).column << '\t' << (*loc).getfile(false) << '\t' << loc->getOrigFile(false) << '\t' << loc->getinfo();
-        oss << smallStream.str().length() << " " << smallStream.str();
+    serializeString(oss, saneShortMessage);
+    serializeString(oss, saneVerboseMessage);
+    serializeString(oss, mSymbolNames);
+    oss += std::to_string(callStack.size());
+    oss += " ";
+
+    for (auto loc = callStack.cbegin(); loc != callStack.cend(); ++loc) {
+        std::string frame;
+        frame += std::to_string(loc->line);
+        frame += '\t';
+        frame += std::to_string(loc->column);
+        frame += '\t';
+        frame += loc->getfile(false);
+        frame += '\t';
+        frame += loc->getOrigFile(false);
+        frame += '\t';
+        frame += loc->getinfo();
+        serializeString(oss, frame);
     }
 
-    return oss.str();
+    return oss;
 }
 
 void ErrorMessage::deserialize(const std::string &data)
@@ -266,9 +321,9 @@ void ErrorMessage::deserialize(const std::string &data)
     callStack.clear();
 
     std::istringstream iss(data);
-    std::array<std::string, 7> results;
+    std::array<std::string, 10> results;
     std::size_t elem = 0;
-    while (iss.good() && elem < 7) {
+    while (iss.good() && elem < 10) {
         unsigned int len = 0;
         if (!(iss >> len))
             throw InternalError(nullptr, "Internal Error: Deserialization of error message failed - invalid length");
@@ -286,24 +341,19 @@ void ErrorMessage::deserialize(const std::string &data)
 
             if (!iss.good())
                 throw InternalError(nullptr, "Internal Error: Deserialization of error message failed - premature end of data");
-
-            if (temp == "inconclusive") {
-                certainty = Certainty::inconclusive;
-                continue;
-            }
         }
 
-        results[elem++] = temp;
+        results[elem++] = std::move(temp);
     }
 
     if (!iss.good())
         throw InternalError(nullptr, "Internal Error: Deserialization of error message failed - premature end of data");
 
-    if (elem != 7)
+    if (elem != 10)
         throw InternalError(nullptr, "Internal Error: Deserialization of error message failed - insufficient elements");
 
     id = std::move(results[0]);
-    severity = Severity::fromString(results[1]);
+    severity = severityFromString(results[1]);
     cwe.id = 0;
     if (!results[2].empty()) {
         std::string err;
@@ -316,9 +366,13 @@ void ErrorMessage::deserialize(const std::string &data)
         if (!strToInt(results[3], hash, &err))
             throw InternalError(nullptr, "Internal Error: Deserialization of error message failed - invalid hash - " + err);
     }
-    file0 = std::move(results[4]);
-    mShortMessage = std::move(results[5]);
-    mVerboseMessage = std::move(results[6]);
+    remark = std::move(results[4]);
+    file0 = std::move(results[5]);
+    if (results[6] == "1")
+        certainty = Certainty::inconclusive;
+    mShortMessage = std::move(results[7]);
+    mVerboseMessage = std::move(results[8]);
+    mSymbolNames = std::move(results[9]);
 
     unsigned int stackSize = 0;
     if (!(iss >> stackSize))
@@ -367,10 +421,11 @@ void ErrorMessage::deserialize(const std::string &data)
 
         // (*loc).line << '\t' << (*loc).column << '\t' << (*loc).getfile(false) << '\t' << loc->getOrigFile(false) << '\t' << loc->getinfo();
 
-        ErrorMessage::FileLocation loc(substrings[3], strToInt<int>(substrings[0]), strToInt<unsigned int>(substrings[1]));
-        loc.setfile(std::move(substrings[2]));
+        std::string info;
         if (substrings.size() == 5)
-            loc.setinfo(substrings[4]);
+            info = std::move(substrings[4]);
+        ErrorMessage::FileLocation loc(substrings[3], std::move(info), strToInt<int>(substrings[0]), strToInt<unsigned int>(substrings[1]));
+        loc.setfile(std::move(substrings[2]));
 
         callStack.push_back(std::move(loc));
 
@@ -379,16 +434,12 @@ void ErrorMessage::deserialize(const std::string &data)
     }
 }
 
-std::string ErrorMessage::getXMLHeader(std::string productName)
+std::string ErrorMessage::getXMLHeader(std::string productName, int xmlVersion)
 {
-    std::string version = CppCheck::version();
-    if (!productName.empty() && std::isdigit(productName.back())) {
-        const std::string::size_type pos = productName.find_last_not_of(".0123456789");
-        if (pos > 1 && pos != std::string::npos && productName[pos] == ' ') {
-            version = productName.substr(pos+1);
-            productName.erase(pos);
-        }
-    }
+    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;
 
@@ -398,7 +449,7 @@ std::string ErrorMessage::getXMLHeader(std::string productName)
     // header
     printer.OpenElement("results", false);
 
-    printer.PushAttribute("version", 2);
+    printer.PushAttribute("version", xmlVersion);
     printer.OpenElement("cppcheck", false);
     if (!productName.empty())
         printer.PushAttribute("product-name", productName.c_str());
@@ -409,9 +460,9 @@ std::string ErrorMessage::getXMLHeader(std::string productName)
     return std::string(printer.CStr()) + '>';
 }
 
-std::string ErrorMessage::getXMLFooter()
+std::string ErrorMessage::getXMLFooter(int xmlVersion)
 {
-    return "    </errors>\n</results>";
+    return xmlVersion == 3 ? "</results>" : "    </errors>\n</results>";
 }
 
 // There is no utf-8 support around but the strings should at least be safe for to tinyxml2.
@@ -420,14 +471,14 @@ std::string ErrorMessage::fixInvalidChars(const std::string& raw)
 {
     std::string result;
     result.reserve(raw.length());
-    std::string::const_iterator from=raw.cbegin();
+    auto from=raw.cbegin();
     while (from!=raw.cend()) {
         if (std::isprint(static_cast<unsigned char>(*from))) {
             result.push_back(*from);
         } else {
             std::ostringstream es;
             // straight cast to (unsigned) doesn't work out.
-            const unsigned uFrom = (unsigned char)*from;
+            const unsigned uFrom = static_cast<unsigned char>(*from);
             es << '\\' << std::setbase(8) << std::setw(3) << std::setfill('0') << uFrom;
             result += es.str();
         }
@@ -441,24 +492,35 @@ std::string ErrorMessage::toXML() const
     tinyxml2::XMLPrinter printer(nullptr, false, 2);
     printer.OpenElement("error", false);
     printer.PushAttribute("id", id.c_str());
-    printer.PushAttribute("severity", Severity::toString(severity).c_str());
+    if (!guideline.empty())
+        printer.PushAttribute("guideline", guideline.c_str());
+    printer.PushAttribute("severity", severityToString(severity).c_str());
+    if (!classification.empty())
+        printer.PushAttribute("classification", classification.c_str());
     printer.PushAttribute("msg", fixInvalidChars(mShortMessage).c_str());
     printer.PushAttribute("verbose", fixInvalidChars(mVerboseMessage).c_str());
     if (cwe.id)
         printer.PushAttribute("cwe", cwe.id);
     if (hash)
-        printer.PushAttribute("hash", MathLib::toString(hash).c_str());
+        printer.PushAttribute("hash", std::to_string(hash).c_str());
     if (certainty == Certainty::inconclusive)
         printer.PushAttribute("inconclusive", "true");
 
     if (!file0.empty())
         printer.PushAttribute("file0", file0.c_str());
 
-    for (std::list<FileLocation>::const_reverse_iterator it = callStack.crbegin(); it != callStack.crend(); ++it) {
+    if (!remark.empty())
+        printer.PushAttribute("remark", fixInvalidChars(remark).c_str());
+
+    for (auto it = callStack.crbegin(); it != callStack.crend(); ++it) {
         printer.OpenElement("location", false);
-        printer.PushAttribute("file", (*it).getfile().c_str());
-        printer.PushAttribute("line", std::max((*it).line,0));
-        printer.PushAttribute("column", (*it).column);
+        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())
             printer.PushAttribute("info", fixInvalidChars(it->getinfo()).c_str());
         printer.CloseElement(false);
@@ -481,22 +543,6 @@ std::string ErrorMessage::toXML() const
     return printer.CStr();
 }
 
-/**
- * Replace all occurrences of searchFor with replaceWith in the
- * given source.
- * @param source The string to modify
- * @param searchFor What should be searched for
- * @param replaceWith What will replace the found item
- */
-static void findAndReplace(std::string &source, const std::string &searchFor, const std::string &replaceWith)
-{
-    std::string::size_type index = 0;
-    while ((index = source.find(searchFor, index)) != std::string::npos) {
-        source.replace(index, searchFor.length(), replaceWith);
-        index += replaceWith.length();
-    }
-}
-
 // TODO: read info from some shared resource instead?
 static std::string readCode(const std::string &file, int linenr, int column, const char endl[])
 {
@@ -558,9 +604,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)},
@@ -571,35 +617,36 @@ 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
 {
-    // Save this ErrorMessage in plain text.
-
-    // No template is given
-    if (templateFormat.empty()) {
-        std::string text;
-        if (!callStack.empty()) {
-            text += ErrorLogger::callStackToString(callStack);
-            text += ": ";
-        }
-        if (severity != Severity::none) {
-            text += '(';
-            text += Severity::toString(severity);
-            if (certainty == Certainty::inconclusive)
-                text += ", inconclusive";
-            text += ") ";
-        }
-        text += (verbose ? mVerboseMessage : mShortMessage);
-        return text;
-    }
+    assert(!templateFormat.empty());
 
     // template is given. Reformat the output according to it
     std::string result = templateFormat;
 
-    findAndReplace(result, "{id}", id);
+    // replace id with guideline if present
+    // replace severity with classification if present
+    const std::string idStr = guideline.empty() ? id : guideline;
+    const std::string severityStr = classification.empty() ? severityToString(severity) : classification;
+
+    findAndReplace(result, "{id}", idStr);
 
     std::string::size_type pos1 = result.find("{inconclusive:");
     while (pos1 != std::string::npos) {
@@ -609,15 +656,16 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
         findAndReplace(result, replaceFrom, replaceWith);
         pos1 = result.find("{inconclusive:", pos1);
     }
-    findAndReplace(result, "{severity}", Severity::toString(severity));
-    findAndReplace(result, "{cwe}", MathLib::toString(cwe.id));
+    findAndReplace(result, "{severity}", severityStr);
+    findAndReplace(result, "{cwe}", std::to_string(cwe.id));
     findAndReplace(result, "{message}", verbose ? mVerboseMessage : mShortMessage);
+    findAndReplace(result, "{remark}", remark);
     if (!callStack.empty()) {
         if (result.find("{callstack}") != std::string::npos)
             findAndReplace(result, "{callstack}", ErrorLogger::callStackToString(callStack));
         findAndReplace(result, "{file}", callStack.back().getfile());
-        findAndReplace(result, "{line}", MathLib::toString(callStack.back().line));
-        findAndReplace(result, "{column}", MathLib::toString(callStack.back().column));
+        findAndReplace(result, "{line}", std::to_string(callStack.back().line));
+        findAndReplace(result, "{column}", std::to_string(callStack.back().column));
         if (result.find("{code}") != std::string::npos) {
             const std::string::size_type pos = result.find('\r');
             const char *endl;
@@ -646,8 +694,8 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
             std::string text = templateLocation;
 
             findAndReplace(text, "{file}", fileLocation.getfile());
-            findAndReplace(text, "{line}", MathLib::toString(fileLocation.line));
-            findAndReplace(text, "{column}", MathLib::toString(fileLocation.column));
+            findAndReplace(text, "{line}", std::to_string(fileLocation.line));
+            findAndReplace(text, "{column}", std::to_string(fileLocation.column));
             findAndReplace(text, "{info}", fileLocation.getinfo().empty() ? mShortMessage : fileLocation.getinfo());
             if (text.find("{code}") != std::string::npos) {
                 const std::string::size_type pos = text.find('\r');
@@ -667,56 +715,30 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
     return result;
 }
 
-bool ErrorLogger::reportUnmatchedSuppressions(const std::list<Suppressions::Suppression> &unmatched)
-{
-    bool err = false;
-    // Report unmatched suppressions
-    for (const Suppressions::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 Suppressions::Suppression &s2 : unmatched) {
-            if (s2.errorId == "unmatchedSuppression") {
-                if ((s2.fileName.empty() || s2.fileName == "*" || s2.fileName == s.fileName) &&
-                    (s2.lineNumber == Suppressions::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);
-        reportErr(ErrorMessage(callStack, emptyString, Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
-        err = true;
-    }
-    return err;
-}
-
-std::string ErrorLogger::callStackToString(const std::list<ErrorMessage::FileLocation> &callStack)
+std::string ErrorLogger::callStackToString(const std::list<ErrorMessage::FileLocation> &callStack, bool addcolumn)
 {
     std::string str;
-    for (std::list<ErrorMessage::FileLocation>::const_iterator tok = callStack.cbegin(); tok != callStack.cend(); ++tok) {
+    for (auto tok = callStack.cbegin(); tok != callStack.cend(); ++tok) {
         str += (tok == callStack.cbegin() ? "" : " -> ");
-        str += tok->stringify();
+        str += tok->stringify(addcolumn);
     }
     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
@@ -735,18 +757,21 @@ std::string ErrorMessage::FileLocation::getOrigFile(bool convert) const
 
 void ErrorMessage::FileLocation::setfile(std::string file)
 {
-    mFileName = Path::fromNativeSeparators(std::move(file));
-    mFileName = Path::simplifyPath(std::move(mFileName));
+    mFileName = Path::simplifyPath(std::move(file));
 }
 
-std::string ErrorMessage::FileLocation::stringify() const
+std::string ErrorMessage::FileLocation::stringify(bool addcolumn) const
 {
     std::string str;
     str += '[';
     str += Path::toNativeSeparators(mFileName);
-    if (line != Suppressions::Suppression::NO_LINE) {
+    if (line != SuppressionList::Suppression::NO_LINE) { // TODO: should not depend on Suppression
         str += ':';
         str += std::to_string(line);
+        if (addcolumn) {
+            str += ':';
+            str += std::to_string(column);
+        }
     }
     str += ']';
     return str;
@@ -754,36 +779,45 @@ std::string ErrorMessage::FileLocation::stringify() const
 
 std::string ErrorLogger::toxml(const std::string &str)
 {
-    std::ostringstream xml;
+    std::string xml;
     for (const unsigned char c : str) {
         switch (c) {
         case '<':
-            xml << "&lt;";
+            xml += "&lt;";
             break;
         case '>':
-            xml << "&gt;";
+            xml += "&gt;";
             break;
         case '&':
-            xml << "&amp;";
+            xml += "&amp;";
             break;
         case '\"':
-            xml << "&quot;";
+            xml += "&quot;";
             break;
         case '\'':
-            xml << "&apos;";
+            xml += "&apos;";
             break;
         case '\0':
-            xml << "\\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;
+                xml += c;
             else
-                xml << 'x';
+                xml += 'x';
             break;
         }
     }
-    return xml.str();
+    return xml;
 }
 
 std::string ErrorLogger::plistHeader(const std::string &version, const std::vector<std::string> &files)
@@ -823,9 +857,9 @@ std::string ErrorLogger::plistData(const ErrorMessage &msg)
           << "   <key>path</key>\r\n"
           << "   <array>\r\n";
 
-    std::list<ErrorMessage::FileLocation>::const_iterator prev = msg.callStack.cbegin();
+    auto prev = msg.callStack.cbegin();
 
-    for (std::list<ErrorMessage::FileLocation>::const_iterator it = msg.callStack.cbegin(); it != msg.callStack.cend(); ++it) {
+    for (auto it = msg.callStack.cbegin(); it != msg.callStack.cend(); ++it) {
         if (prev != it) {
             plist << "    <dict>\r\n"
                   << "     <key>kind</key><string>control</string>\r\n"
@@ -848,7 +882,7 @@ std::string ErrorLogger::plistData(const ErrorMessage &msg)
             prev = it;
         }
 
-        std::list<ErrorMessage::FileLocation>::const_iterator next = it;
+        auto next = it;
         ++next;
         const std::string message = (it->getinfo().empty() && next == msg.callStack.cend() ? msg.shortMessage() : it->getinfo());
 
@@ -873,7 +907,7 @@ std::string ErrorLogger::plistData(const ErrorMessage &msg)
 
     plist << "   </array>\r\n"
           << "   <key>description</key><string>" << ErrorLogger::toxml(msg.shortMessage()) << "</string>\r\n"
-          << "   <key>category</key><string>" << Severity::toString(msg.severity) << "</string>\r\n"
+          << "   <key>category</key><string>" << severityToString(msg.severity) << "</string>\r\n"
           << "   <key>type</key><string>" << ErrorLogger::toxml(msg.shortMessage()) << "</string>\r\n"
           << "   <key>check_name</key><string>" << msg.id << "</string>\r\n"
           << "   <!-- This hash is experimental and going to change! -->\r\n"
@@ -912,14 +946,219 @@ 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) {
+    if (guideline.empty())
+        return "";
+
+    const auto getClassification = [](const std::vector<checkers::Info> &info, const std::string &guideline) -> std::string {
+        const auto it = std::find_if(info.cbegin(), info.cend(), [&](const checkers::Info &i) {
+            return caseInsensitiveStringCompare(i.guideline, guideline) == 0;
+        });
+        if (it == info.cend())
+            return "";
+        return it->classification;
+    };
+
+    switch (reportType) {
+    case ReportType::autosar:
+        return getClassification(checkers::autosarInfo, guideline);
+    case ReportType::certC:
+        return getClassification(checkers::certCInfo, guideline);
+    case ReportType::certCpp:
+        return getClassification(checkers::certCppInfo, guideline);
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
+    {
+        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 = 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;
+            });
+
+        return it == info->cend() ? "" : it->str;
+    }
+    case ReportType::misraCpp2008:
+    case ReportType::misraCpp2023:
+    {
+        const std::vector<checkers::MisraCppInfo> *info;
+        std::vector<std::string> components;
+
+        if (reportType == ReportType::misraCpp2008) {
+            info = &checkers::misraCpp2008Rules;
+            components = splitString(guideline, '-');
+        } else {
+            if (guideline.rfind("Dir ", 0) == 0) {
+                components = splitString(guideline.substr(4), '.');
+                info = &checkers::misraCpp2023Directives;
+            } else {
+                components = splitString(guideline, '.');
+                info = &checkers::misraCpp2023Rules;
+            }
+        }
+
+        if (components.size() != 3)
+            return "";
+
+        const int a = std::stoi(components[0]);
+        const int b = std::stoi(components[1]);
+        const int c = std::stoi(components[2]);
+
+        const auto it = std::find_if(info->cbegin(), info->cend(), [&](const checkers::MisraCppInfo &i) {
+                return i.a == a && i.b == b && i.c == c;
+            });
+
+        if (it == info->cend())
+            return "";
+
+        return it->classification;
+    }
+    default:
+        return "";
+    }
+}
+
+std::string getGuideline(const std::string &errId, ReportType reportType,
+                         const std::map<std::string, std::string> &guidelineMapping,
+                         Severity severity)
+{
+    std::string guideline;
+
+    switch (reportType) {
+    case ReportType::autosar:
+        if (errId.rfind("premium-autosar-", 0) == 0) {
+            guideline = errId.substr(16);
+            break;
+        }
+        if (errId.rfind("premium-misra-cpp-2008-", 0) == 0)
+            guideline = "M" + errId.substr(23);
+        break;
+    case ReportType::certC:
+    case ReportType::certCpp:
+        if (errId.rfind("premium-cert-", 0) == 0) {
+            guideline = errId.substr(13);
+            std::transform(guideline.begin(), guideline.end(),
+                           guideline.begin(), static_cast<int (*)(int)>(std::toupper));
+        }
+        break;
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
+        if (errId.rfind("misra-c20", 0) == 0 || errId.rfind("premium-misra-c-20", 0) == 0)
+            guideline = errId.substr(errId.rfind('-') + 1);
+        break;
+    case ReportType::misraCpp2008:
+        if (errId.rfind("premium-misra-cpp-2008", 0) == 0)
+            guideline = errId.substr(23);
+        break;
+    case ReportType::misraCpp2023:
+        if (errId.rfind("premium-misra-cpp-2023", 0) == 0)
+            guideline = errId.substr(errId.rfind('-') + 1);
+        break;
+    default:
+        break;
+    }
+
+    if (!guideline.empty()) {
+        if (errId.find("-dir-") != std::string::npos)
+            guideline = "Dir " + guideline;
+        return guideline;
+    }
+
+    auto it = guidelineMapping.find(errId);
+
+    if (it != guidelineMapping.cend())
+        return it->second;
+
+    if (severity == Severity::error || severity == Severity::warning) {
+        it = guidelineMapping.find("error");
+
+        if (it != guidelineMapping.cend())
+            return it->second;
+    }
+
+    return "";
+}
+
+std::map<std::string, std::string> createGuidelineMapping(ReportType reportType) {
+    std::map<std::string, std::string> guidelineMapping;
+    const std::vector<checkers::IdMapping> *idMapping1 = nullptr;
+    const std::vector<checkers::IdMapping> *idMapping2 = nullptr;
+    std::string ext1, ext2;
+
+    switch (reportType) {
+    case ReportType::autosar:
+        idMapping1 = &checkers::idMappingAutosar;
+        break;
+    case ReportType::certCpp:
+        idMapping2 = &checkers::idMappingCertCpp;
+        ext2 = "-CPP";
+        FALLTHROUGH;
+    case ReportType::certC:
+        idMapping1 = &checkers::idMappingCertC;
+        ext1 = "-C";
+        break;
+    case ReportType::misraC2012:
+    case ReportType::misraC2023:
+    case ReportType::misraC2025:
+        idMapping1 = &checkers::idMappingMisraC;
+        break;
+    case ReportType::misraCpp2008:
+        idMapping1 = &checkers::idMappingMisraCpp2008;
+        break;
+    case ReportType::misraCpp2023:
+        idMapping1 = &checkers::idMappingMisraCpp2023;
+        break;
+    default:
+        break;
+    }
+
+    if (idMapping1) {
+        for (const auto &i : *idMapping1)
+            for (const std::string &cppcheckId : splitString(i.cppcheckId, ','))
+                guidelineMapping[cppcheckId] = i.guideline + ext1;
+    }
+
+    if (idMapping2) {
+        for (const auto &i : *idMapping2)
+            for (const std::string &cppcheckId : splitString(i.cppcheckId, ','))
+                guidelineMapping[cppcheckId] = i.guideline + ext2;
+    }
+
+    return guidelineMapping;
 }
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index ef8d8a71937..f8806bbbdca 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-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
@@ -23,17 +23,19 @@
 
 #include "config.h"
 #include "errortypes.h"
-#include "suppressions.h"
-#include "color.h"
 
 #include <cstddef>
+#include <cstdint>
 #include <list>
+#include <set>
 #include <string>
-#include <utility>
 #include <vector>
+#include <map>
 
 class Token;
 class TokenList;
+enum class ReportType : std::uint8_t;
+enum class Color : std::uint8_t;
 
 namespace tinyxml2 {
     class XMLElement;
@@ -52,17 +54,10 @@ class CPPCHECKLIB ErrorMessage {
      * Internally paths are stored with / separator. When getting the filename
      * it is by default converted to native separators.
      */
-    class CPPCHECKLIB FileLocation {
+    class CPPCHECKLIB WARN_UNUSED FileLocation {
     public:
-        FileLocation()
-            : fileIndex(0), line(0), column(0) {}
-
-        explicit FileLocation(const std::string &file, int line = 0, unsigned int column = 0)
-            : 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);
 
@@ -89,18 +84,15 @@ class CPPCHECKLIB ErrorMessage {
         /**
          * @return the location as a string. Format: [file:line]
          */
-        std::string stringify() const;
+        std::string stringify(bool addcolumn = false) const;
 
         unsigned int fileIndex;
         int line; // negative value means "no line"
         unsigned int column;
 
-        std::string getinfo() const {
+        const std::string& getinfo() const {
             return mInfo;
         }
-        void setinfo(const std::string &i) {
-            mInfo = i;
-        }
 
     private:
         std::string mOrigFileName;
@@ -110,46 +102,46 @@ class CPPCHECKLIB ErrorMessage {
 
     ErrorMessage(std::list<FileLocation> callStack,
                  std::string file1,
-                 Severity::SeverityType severity,
+                 Severity severity,
                  const std::string &msg,
                  std::string id, Certainty certainty);
     ErrorMessage(std::list<FileLocation> callStack,
                  std::string file1,
-                 Severity::SeverityType severity,
+                 Severity severity,
                  const std::string &msg,
                  std::string id,
                  const CWE &cwe,
                  Certainty certainty);
     ErrorMessage(const std::list<const Token*>& callstack,
                  const TokenList* list,
-                 Severity::SeverityType severity,
+                 Severity severity,
                  std::string id,
                  const std::string& msg,
                  Certainty certainty);
     ErrorMessage(const std::list<const Token*>& callstack,
                  const TokenList* list,
-                 Severity::SeverityType severity,
+                 Severity severity,
                  std::string id,
                  const std::string& msg,
                  const CWE &cwe,
                  Certainty certainty);
-    ErrorMessage(const ErrorPath &errorPath,
+    ErrorMessage(ErrorPath errorPath,
                  const TokenList *tokenList,
-                 Severity::SeverityType severity,
+                 Severity severity,
                  const char id[],
                  const std::string &msg,
                  const CWE &cwe,
                  Certainty certainty);
     ErrorMessage();
-    explicit ErrorMessage(const tinyxml2::XMLElement * const errmsg);
+    explicit ErrorMessage(const tinyxml2::XMLElement * errmsg);
 
     /**
      * Format the error message in XML format
      */
     std::string toXML() const;
 
-    static std::string getXMLHeader(std::string productName);
-    static std::string getXMLFooter();
+    static std::string getXMLHeader(std::string productName, int xmlVersion = 2);
+    static std::string getXMLFooter(int xmlVersion);
 
     /**
      * Format the error message into a string.
@@ -161,10 +153,13 @@ class CPPCHECKLIB ErrorMessage {
      * @return formatted string
      */
     std::string toString(bool verbose,
-                         const std::string &templateFormat = emptyString,
-                         const std::string &templateLocation = emptyString) const;
+                         const std::string &templateFormat,
+                         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;
@@ -173,12 +168,21 @@ class CPPCHECKLIB ErrorMessage {
     /** For GUI rechecking; source file (not header) */
     std::string file0;
 
-    Severity::SeverityType severity;
+    Severity severity;
     CWE cwe;
     Certainty certainty;
 
+    /** remark from REMARK comment */
+    std::string remark;
+
+    /** misra/autosar/certc classification/level */
+    std::string classification;
+
+    /** misra/autosar/certc guideline */
+    std::string guideline;
+
     /** Warning hash */
-    std::size_t hash;
+    std::size_t hash{};
 
     /** set short and verbose messages */
     void setmsg(const std::string &msg);
@@ -198,7 +202,7 @@ class CPPCHECKLIB ErrorMessage {
         return mSymbolNames;
     }
 
-    Suppressions::ErrorMessage toSuppressionsErrorMessage() const;
+    static ErrorMessage fromInternalError(const InternalError &internalError, const TokenList *tokenList, const std::string &filename, const std::string& msg = "");
 
 private:
     static std::string fixInvalidChars(const std::string& raw);
@@ -219,8 +223,8 @@ class CPPCHECKLIB ErrorMessage {
  */
 class CPPCHECKLIB ErrorLogger {
 public:
-    ErrorLogger() {}
-    virtual ~ErrorLogger() {}
+    ErrorLogger() = default;
+    virtual ~ErrorLogger() = default;
 
     /**
      * Information about progress is directed here.
@@ -228,7 +232,7 @@ class CPPCHECKLIB ErrorLogger {
      *
      * @param outmsg Message to show e.g. "Checking main.cpp..."
      */
-    virtual void reportOut(const std::string &outmsg, Color c = Color::Reset) = 0;
+    virtual void reportOut(const std::string &outmsg, Color c) = 0;
 
     /**
      * Information about found errors and warnings is directed
@@ -238,6 +242,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
@@ -250,14 +261,7 @@ class CPPCHECKLIB ErrorLogger {
         (void)value;
     }
 
-    /**
-     * Report unmatched suppressions
-     * @param unmatched list of unmatched suppressions (from Settings::Suppressions::getUnmatched(Local|Global)Suppressions)
-     * @return true is returned if errors are reported
-     */
-    bool reportUnmatchedSuppressions(const std::list<Suppressions::Suppression> &unmatched);
-
-    static std::string callStackToString(const std::list<ErrorMessage::FileLocation> &callStack);
+    static std::string callStackToString(const std::list<ErrorMessage::FileLocation> &callStack, bool addcolumn = false);
 
     /**
      * Convert XML-sensitive characters into XML entities
@@ -273,16 +277,34 @@ class CPPCHECKLIB ErrorLogger {
                "</dict>\r\n"
                "</plist>";
     }
+
+    static bool isCriticalErrorId(const std::string& id) {
+        return mCriticalErrorIds.count(id) != 0;
+    }
+
+private:
+    static const std::set<std::string> mCriticalErrorIds;
 };
 
 /** 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 */
+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 */
+CPPCHECKLIB std::map<std::string, std::string> createGuidelineMapping(ReportType reportType);
 
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/errortypes.cpp b/lib/errortypes.cpp
index 09f6b0f731b..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-2022 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
@@ -18,72 +18,82 @@
 
 #include "errortypes.h"
 
-InternalError::InternalError(const Token *tok, std::string errorMsg, Type type) :
-    token(tok), errorMessage(std::move(errorMsg)), type(type)
+#include "utils.h"
+
+static std::string typeToString(InternalError::Type type)
 {
     switch (type) {
-    case AST:
-        id = "internalAstError";
-        break;
-    case SYNTAX:
-        id = "syntaxError";
-        break;
-    case UNKNOWN_MACRO:
-        id = "unknownMacro";
-        break;
-    case INTERNAL:
-        id = "cppcheckError";
-        break;
-    case LIMIT:
-        id = "cppcheckLimit";
-        break;
-    case INSTANTIATION:
-        id = "instantiationError";
-        break;
+    case InternalError::Type::AST:
+        return "internalAstError";
+    case InternalError::Type::SYNTAX:
+        return "syntaxError";
+    case InternalError::Type::UNKNOWN_MACRO:
+        return "unknownMacro";
+    case InternalError::Type::INTERNAL:
+        return "internalError";
+    case InternalError::Type::LIMIT:
+        return "cppcheckLimit";
+    case InternalError::Type::INSTANTIATION:
+        return "instantiationError";
     }
+    cppcheck::unreachable();
 }
 
-std::string Severity::toString(Severity::SeverityType severity)
+InternalError::InternalError(const Token *tok, std::string errorMsg, Type type) :
+    InternalError(tok, std::move(errorMsg), "", type)
+{}
+
+InternalError::InternalError(const Token *tok, std::string errorMsg, std::string details, Type type) :
+    token(tok), errorMessage(std::move(errorMsg)), details(std::move(details)), type(type), id(typeToString(type))
+{}
+
+std::string severityToString(Severity severity)
 {
     switch (severity) {
-    case none:
+    case Severity::none:
         return "";
-    case error:
+    case Severity::error:
         return "error";
-    case warning:
+    case Severity::warning:
         return "warning";
-    case style:
+    case Severity::style:
         return "style";
-    case performance:
+    case Severity::performance:
         return "performance";
-    case portability:
+    case Severity::portability:
         return "portability";
-    case information:
+    case Severity::information:
         return "information";
-    case debug:
+    case Severity::debug:
         return "debug";
+    case Severity::internal:
+        return "internal";
     }
-    throw InternalError(nullptr, "Unknown severity");
+    cppcheck::unreachable();
 }
-Severity::SeverityType Severity::fromString(const std::string& severity)
+
+// TODO: bail out on invalid severity
+Severity severityFromString(const std::string& severity)
 {
     if (severity.empty())
-        return none;
+        return Severity::none;
     if (severity == "none")
-        return none;
+        return Severity::none;
     if (severity == "error")
-        return error;
+        return Severity::error;
     if (severity == "warning")
-        return warning;
+        return Severity::warning;
     if (severity == "style")
-        return style;
+        return Severity::style;
     if (severity == "performance")
-        return performance;
+        return Severity::performance;
     if (severity == "portability")
-        return portability;
+        return Severity::portability;
     if (severity == "information")
-        return information;
+        return Severity::information;
     if (severity == "debug")
-        return debug;
-    return none;
+        return Severity::debug;
+    if (severity == "internal")
+        return Severity::internal;
+    return Severity::none;
 }
diff --git a/lib/errortypes.h b/lib/errortypes.h
index 554721ba961..e2fe6897447 100644
--- a/lib/errortypes.h
+++ b/lib/errortypes.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include <cstdint>
 #include <stdexcept>
 #include <list>
 #include <string>
@@ -33,11 +34,15 @@
 class Token;
 
 /** @brief Simple container to be thrown when internal error is detected. */
-struct InternalError {
-    enum Type {AST, SYNTAX, UNKNOWN_MACRO, INTERNAL, LIMIT, INSTANTIATION};
+struct CPPCHECKLIB InternalError {
+    enum Type : std::uint8_t {AST, SYNTAX, UNKNOWN_MACRO, INTERNAL, LIMIT, INSTANTIATION};
+
     InternalError(const Token *tok, std::string errorMsg, Type type = INTERNAL);
+    InternalError(const Token *tok, std::string errorMsg, std::string details, Type type = INTERNAL);
+
     const Token *token;
     std::string errorMessage;
+    std::string details;
     Type type;
     std::string id;
 };
@@ -47,76 +52,76 @@ class TerminateException : public std::runtime_error {
     TerminateException() : std::runtime_error("terminate") {}
 };
 
-enum class Certainty {
+enum class Certainty : std::uint8_t {
     normal, inconclusive
 };
 
-enum class Checks {
+enum class Checks : std::uint8_t {
     unusedFunction, missingInclude, internalCheck
 };
 
 /** @brief enum class for severity. Used when reporting errors. */
-class CPPCHECKLIB Severity {
-public:
+enum class Severity : std::uint8_t {
     /**
-     * Message severities.
+     * No severity (default value).
      */
-    enum SeverityType {
-        /**
-         * No severity (default value).
-         */
-        none,
-        /**
-         * Programming error.
-         * This indicates severe error like memory leak etc.
-         * The error is certain.
-         */
-        error,
-        /**
-         * Warning.
-         * Used for dangerous coding style that can cause severe runtime errors.
-         * For example: forgetting to initialize a member variable in a constructor.
-         */
-        warning,
-        /**
-         * Style warning.
-         * Used for general code cleanup recommendations. Fixing these
-         * will not fix any bugs but will make the code easier to maintain.
-         * For example: redundant code, unreachable code, etc.
-         */
-        style,
-        /**
-         * Performance warning.
-         * Not an error as is but suboptimal code and fixing it probably leads
-         * to faster performance of the compiled code.
-         */
-        performance,
-        /**
-         * Portability warning.
-         * This warning indicates the code is not properly portable for
-         * different platforms and bitnesses (32/64 bit). If the code is meant
-         * to compile in different platforms and bitnesses these warnings
-         * should be fixed.
-         */
-        portability,
-        /**
-         * Checking information.
-         * Information message about the checking (process) itself. These
-         * messages inform about header files not found etc issues that are
-         * not errors in the code but something user needs to know.
-         */
-        information,
-        /**
-         * Debug message.
-         * Debug-mode message useful for the developers.
-         */
-        debug
-    };
-
-    static std::string toString(SeverityType severity);
-    static SeverityType fromString(const std::string &severity);
+    none,
+    /**
+     * Programming error.
+     * This indicates severe error like memory leak etc.
+     * The error is certain.
+     */
+    error,
+    /**
+     * Warning.
+     * Used for dangerous coding style that can cause severe runtime errors.
+     * For example: forgetting to initialize a member variable in a constructor.
+     */
+    warning,
+    /**
+     * Style warning.
+     * Used for general code cleanup recommendations. Fixing these
+     * will not fix any bugs but will make the code easier to maintain.
+     * For example: redundant code, unreachable code, etc.
+     */
+    style,
+    /**
+     * Performance warning.
+     * Not an error as is but suboptimal code and fixing it probably leads
+     * to faster performance of the compiled code.
+     */
+    performance,
+    /**
+     * Portability warning.
+     * This warning indicates the code is not properly portable for
+     * different platforms and bitnesses (32/64 bit). If the code is meant
+     * to compile in different platforms and bitnesses these warnings
+     * should be fixed.
+     */
+    portability,
+    /**
+     * Checking information.
+     * Information message about the checking (process) itself. These
+     * messages inform about header files not found etc issues that are
+     * not errors in the code but something user needs to know.
+     */
+    information,
+    /**
+     * Debug message.
+     * Debug-mode message useful for the developers.
+     */
+    debug,
+    /**
+     * Internal message.
+     * Message will not be shown to the user.
+     * Tracking what checkers is executed, tracking suppressed critical errors, etc.
+     */
+    internal
 };
 
+CPPCHECKLIB std::string severityToString(Severity severity);
+CPPCHECKLIB Severity severityFromString(const std::string &severity);
+
 struct CWE {
     explicit CWE(unsigned short cweId) : id(cweId) {}
     unsigned short id;
diff --git a/lib/filesettings.h b/lib/filesettings.h
new file mode 100644
index 00000000000..3149421c629
--- /dev/null
+++ b/lib/filesettings.h
@@ -0,0 +1,140 @@
+/* -*- 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 fileSettingsH
+#define fileSettingsH
+
+#include "config.h"
+#include "path.h"
+#include "platform.h"
+#include "standards.h"
+
+#include <list>
+#include <set>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
+class FileWithDetails
+{
+public:
+    FileWithDetails(std::string path, Standards::Language lang, std::size_t size)
+        : mPath(std::move(path))
+        , mPathSimplified(Path::simplifyPath(mPath))
+        , mLang(lang)
+        , mSize(size)
+    {
+        if (mPath.empty())
+            throw std::runtime_error("empty path specified");
+    }
+
+    const std::string& path() const
+    {
+        return mPath;
+    }
+
+    const std::string& spath() const
+    {
+        return mPathSimplified;
+    }
+
+    std::size_t size() const
+    {
+        return mSize;
+    }
+
+    void setLang(Standards::Language lang)
+    {
+        mLang = lang;
+    }
+
+    Standards::Language lang() const
+    {
+        return mLang;
+    }
+private:
+    std::string mPath;
+    std::string mPathSimplified;
+    Standards::Language mLang = Standards::Language::None;
+    std::size_t mSize;
+};
+
+/** File settings. Multiple configurations for a file is allowed. */
+struct CPPCHECKLIB FileSettings {
+    FileSettings(std::string path, Standards::Language lang, std::size_t size)
+        : 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();
+    }
+    std::string defines;
+    // TODO: handle differently
+    std::string cppcheckDefines() const {
+        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;
+    // only used by clang mode
+    std::list<std::string> systemIncludePaths;
+    std::string standard;
+    Platform::Type platformType = Platform::Type::Unspecified;
+    // 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/findtoken.cpp b/lib/findtoken.cpp
new file mode 100644
index 00000000000..74848228a05
--- /dev/null
+++ b/lib/findtoken.cpp
@@ -0,0 +1,145 @@
+/*
+ * 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 "findtoken.h"
+
+#include "astutils.h"
+#include "token.h"
+
+class Library;
+
+template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+static bool findTokensSkipDeadCodeImpl(const Library& library,
+                                       T* start,
+                                       const Token* end,
+                                       const std::function<bool(const Token*)>& pred,
+                                       const std::function<bool(T*)>& found,
+                                       const std::function<std::vector<MathLib::bigint>(const Token*)>& evaluate,
+                                       bool skipUnevaluated)
+{
+    for (T* tok = start; precedes(tok, end); tok = tok->next()) {
+        if (pred(tok)) {
+            if (found(tok))
+                return true;
+        }
+        if (Token::Match(tok, "if|for|while (") && Token::simpleMatch(tok->linkAt(1), ") {")) {
+            const Token* condTok = getCondTok(tok);
+            if (!condTok)
+                continue;
+            auto result = evaluate(condTok);
+            if (result.empty())
+                continue;
+            if (internal::findTokensSkipDeadCodeImpl(library, tok->next(), tok->linkAt(1), pred, found, evaluate, skipUnevaluated))
+                return true;
+            T* thenStart = tok->linkAt(1)->next();
+            T* elseStart = nullptr;
+            if (Token::simpleMatch(thenStart->link(), "} else {"))
+                elseStart = thenStart->link()->tokAt(2);
+
+            auto r = result.front();
+            if (r == 0) {
+                if (elseStart) {
+                    if (internal::findTokensSkipDeadCodeImpl(library, elseStart, elseStart->link(), pred, found, evaluate, skipUnevaluated))
+                        return true;
+                    if (isReturnScope(elseStart->link(), library))
+                        return true;
+                    tok = elseStart->link();
+                } else {
+                    tok = thenStart->link();
+                }
+            } else {
+                if (internal::findTokensSkipDeadCodeImpl(library, thenStart, thenStart->link(), pred, found, evaluate, skipUnevaluated))
+                    return true;
+                if (isReturnScope(thenStart->link(), library))
+                    return true;
+                tok = thenStart->link();
+            }
+        } else if (Token::Match(tok->astParent(), "&&|?|%oror%") && astIsLHS(tok)) {
+            auto result = evaluate(tok);
+            if (result.empty())
+                continue;
+            const bool cond = result.front() != 0;
+            T* next = nullptr;
+            if ((cond && Token::simpleMatch(tok->astParent(), "||")) ||
+                (!cond && Token::simpleMatch(tok->astParent(), "&&"))) {
+                next = nextAfterAstRightmostLeaf(tok->astParent());
+            } else if (Token::simpleMatch(tok->astParent(), "?")) {
+                T* colon = tok->astParent()->astOperand2();
+                if (!cond) {
+                    next = colon;
+                } else {
+                    if (internal::findTokensSkipDeadCodeImpl(library, tok->astParent()->next(), colon, pred, found, evaluate, skipUnevaluated))
+                        return true;
+                    next = nextAfterAstRightmostLeaf(colon);
+                }
+            }
+            if (next)
+                tok = next;
+        } else if (Token::simpleMatch(tok, "} else {")) {
+            const Token* condTok = getCondTokFromEnd(tok);
+            if (!condTok)
+                continue;
+            auto result = evaluate(condTok);
+            if (result.empty())
+                continue;
+            if (isReturnScope(tok->link(), library))
+                return true;
+            auto r = result.front();
+            if (r != 0) {
+                tok = tok->linkAt(2);
+            }
+        } else if (Token::simpleMatch(tok, "[") && Token::Match(tok->link(), "] (|{")) {
+            T* afterCapture = tok->link()->next();
+            if (Token::simpleMatch(afterCapture, "(") && afterCapture->link())
+                tok = afterCapture->link()->next();
+            else
+                tok = afterCapture;
+        }
+        if (skipUnevaluated && isUnevaluated(tok)) {
+            T *next = tok->linkAt(1);
+            if (!next)
+                continue;
+            tok = next;
+        }
+    }
+    return false;
+}
+
+namespace internal {
+    bool findTokensSkipDeadCodeImpl(const Library& library,
+                                    Token* start,
+                                    const Token* end,
+                                    const std::function<bool(const Token*)>& pred,
+                                    const std::function<bool(Token*)>& found,
+                                    const std::function<std::vector<MathLib::bigint>(const Token*)>& evaluate,
+                                    bool skipUnevaluated)
+    {
+        return ::findTokensSkipDeadCodeImpl(library, start, end, pred, found, evaluate, skipUnevaluated);
+    }
+
+    bool findTokensSkipDeadCodeImpl(const Library& library,
+                                    const Token* start,
+                                    const Token* end,
+                                    const std::function<bool(const Token*)>& pred,
+                                    const std::function<bool(const Token*)>& found,
+                                    const std::function<std::vector<MathLib::bigint>(const Token*)>& evaluate,
+                                    bool skipUnevaluated)
+    {
+        return ::findTokensSkipDeadCodeImpl(library, start, end, pred, found, evaluate, skipUnevaluated);
+    }
+}
diff --git a/lib/findtoken.h b/lib/findtoken.h
new file mode 100644
index 00000000000..222c3ba5c8c
--- /dev/null
+++ b/lib/findtoken.h
@@ -0,0 +1,173 @@
+/* -*- 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 findtokenH
+#define findtokenH
+//---------------------------------------------------------------------------
+
+#include <functional>
+#include <type_traits>
+#include <vector>
+
+#include "config.h"
+#include "mathlib.h"
+#include "token.h"
+
+class Library;
+
+inline std::vector<MathLib::bigint> evaluateKnownValues(const Token* tok)
+{
+    if (!tok->hasKnownIntValue())
+        return {};
+    return {tok->getKnownIntValue()};
+}
+
+template<class T, class Predicate, class Found, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+void findTokensImpl(T* start, const Token* end, const Predicate& pred, Found found)
+{
+    for (T* tok = start; precedes(tok, end); tok = tok->next()) {
+        if (pred(tok)) {
+            if (found(tok))
+                break;
+        }
+    }
+}
+
+template<class T, class Predicate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+std::vector<T*> findTokens(T* start, const Token* end, const Predicate& pred)
+{
+    std::vector<T*> result;
+    findTokensImpl(start, end, pred, [&](T* tok) {
+        result.push_back(tok);
+        return false;
+    });
+    return result;
+}
+
+template<class T, class Predicate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+T* findToken(T* start, const Token* end, const Predicate& pred)
+{
+    T* result = nullptr;
+    findTokensImpl(start, end, pred, [&](T* tok) {
+        result = tok;
+        return true;
+    });
+    return result;
+}
+
+namespace internal {
+    bool findTokensSkipDeadCodeImpl(const Library &library,
+                                    Token *start,
+                                    const Token *end,
+                                    const std::function<bool(const Token *)> &pred,
+                                    const std::function<bool(Token *)>& found,
+                                    const std::function<std::vector<MathLib::bigint>(const Token *)> &evaluate,
+                                    bool skipUnevaluated);
+
+    bool findTokensSkipDeadCodeImpl(const Library &library,
+                                    const Token *start,
+                                    const Token *end,
+                                    const std::function<bool(const Token *)> &pred,
+                                    const std::function<bool(const Token *)>& found,
+                                    const std::function<std::vector<MathLib::bigint>(const Token *)> &evaluate,
+                                    bool skipUnevaluated);
+}
+
+template<class T, class Predicate, class Evaluate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+std::vector<T*> findTokensSkipDeadCode(const Library& library,
+                                       T* start,
+                                       const Token* end,
+                                       const Predicate& pred,
+                                       const Evaluate& evaluate)
+{
+    std::vector<T*> result;
+    (void)internal::findTokensSkipDeadCodeImpl(
+        library,
+        start,
+        end,
+        pred,
+        [&](T* tok) {
+        result.push_back(tok);
+        return false;
+    },
+        evaluate,
+        false);
+    return result;
+}
+
+template<class T, class Predicate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+std::vector<T*> findTokensSkipDeadCode(const Library& library, T* start, const Token* end, const Predicate& pred)
+{
+    return findTokensSkipDeadCode(library, start, end, pred, &evaluateKnownValues);
+}
+
+template<class T, class Predicate, class Evaluate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+std::vector<T*> findTokensSkipDeadAndUnevaluatedCode(const Library& library,
+                                                     T* start,
+                                                     const Token* end,
+                                                     const Predicate& pred,
+                                                     const Evaluate& evaluate)
+{
+    std::vector<T*> result;
+    (void)internal::findTokensSkipDeadCodeImpl(
+        library,
+        start,
+        end,
+        pred,
+        [&](T* tok) {
+        result.push_back(tok);
+        return false;
+    },
+        evaluate,
+        true);
+    return result;
+}
+
+template<class T, class Predicate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+std::vector<T*> findTokensSkipDeadAndUnevaluatedCode(const Library& library, T* start, const Token* end, const Predicate& pred)
+{
+    return findTokensSkipDeadAndUnevaluatedCode(library, start, end, pred, &evaluateKnownValues);
+}
+
+
+template<class T, class Predicate, class Evaluate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+T* findTokenSkipDeadCode(const Library& library, T* start, const Token* end, const Predicate& pred, const Evaluate& evaluate)
+{
+    T* result = nullptr;
+    (void)internal::findTokensSkipDeadCodeImpl(
+        library,
+        start,
+        end,
+        pred,
+        [&](T* tok) {
+        result = tok;
+        return true;
+    },
+        evaluate,
+        false);
+    return result;
+}
+
+template<class T, class Predicate, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+T* findTokenSkipDeadCode(const Library& library, T* start, const Token* end, const Predicate& pred)
+{
+    return findTokenSkipDeadCode(library, start, end, pred, &evaluateKnownValues);
+}
+
+#endif // findtokenH
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index dc31c76b3cb..5c97528372b 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-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
@@ -21,16 +21,20 @@
 #include "analyzer.h"
 #include "astutils.h"
 #include "config.h"
+#include "errorlogger.h"
 #include "errortypes.h"
 #include "mathlib.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
+#include "tokenlist.h"
+#include "utils.h"
 #include "valueptr.h"
-#include "vfvalue.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
+#include <cstdint>
 #include <functional>
 #include <list>
 #include <string>
@@ -39,878 +43,918 @@
 #include <utility>
 #include <vector>
 
-struct OnExit {
-    std::function<void()> f;
-
-    ~OnExit() {
-        f();
-    }
-};
-
-struct ForwardTraversal {
-    enum class Progress { Continue, Break, Skip };
-    enum class Terminate { None, Bail, Inconclusive };
-    ForwardTraversal(const ValuePtr<Analyzer>& analyzer, const Settings& settings)
-        : analyzer(analyzer), settings(settings), actions(Analyzer::Action::None), analyzeOnly(false), analyzeTerminate(false)
-    {}
-    ValuePtr<Analyzer> analyzer;
-    const Settings& settings;
-    Analyzer::Action actions;
-    bool analyzeOnly;
-    bool analyzeTerminate;
-    Analyzer::Terminate terminate = Analyzer::Terminate::None;
-    std::vector<Token*> loopEnds = {};
-
-    Progress Break(Analyzer::Terminate t = Analyzer::Terminate::None) {
-        if ((!analyzeOnly || analyzeTerminate) && t != Analyzer::Terminate::None)
-            terminate = t;
-        return Progress::Break;
-    }
-
-    struct Branch {
-        explicit Branch(Token* tok = nullptr) : endBlock(tok) {}
-        Token* endBlock = nullptr;
-        Analyzer::Action action = Analyzer::Action::None;
-        bool check = false;
-        bool escape = false;
-        bool escapeUnknown = false;
-        bool active = false;
-        bool isEscape() const {
-            return escape || escapeUnknown;
-        }
-        bool isConclusiveEscape() const {
-            return escape && !escapeUnknown;
-        }
-        bool isModified() const {
-            return action.isModified() && !isConclusiveEscape();
-        }
-        bool isInconclusive() const {
-            return action.isInconclusive() && !isConclusiveEscape();
-        }
-        bool isDead() const {
-            return action.isModified() || action.isInconclusive() || isEscape();
+namespace {
+    struct ForwardTraversal {
+        enum class Progress : std::uint8_t { Continue, Break, Skip };
+        ForwardTraversal(const ValuePtr<Analyzer>& analyzer, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings)
+            : analyzer(analyzer), tokenList(tokenList), errorLogger(errorLogger), settings(settings)
+        {}
+        ValuePtr<Analyzer> analyzer;
+        const TokenList& tokenList;
+        ErrorLogger& errorLogger;
+        const Settings& settings;
+        Analyzer::Action actions;
+        bool analyzeOnly{};
+        bool analyzeTerminate{};
+        Analyzer::Terminate terminate = Analyzer::Terminate::None;
+        std::vector<Token*> loopEnds;
+        int branchCount = 0;
+
+        Progress Break(Analyzer::Terminate t = Analyzer::Terminate::None) {
+            if ((!analyzeOnly || analyzeTerminate) && t != Analyzer::Terminate::None)
+                terminate = t;
+            return Progress::Break;
         }
-    };
 
-    bool stopUpdates() {
-        analyzeOnly = true;
-        return actions.isModified();
-    }
-
-    std::pair<bool, bool> evalCond(const Token* tok, const Token* ctx = nullptr) const {
-        if (!tok)
-            return std::make_pair(false, false);
-        std::vector<MathLib::bigint> result = analyzer->evaluate(tok, ctx);
-        // TODO: We should convert to bool
-        const bool checkThen = std::any_of(result.cbegin(), result.cend(), [](int x) {
-            return x != 0;
-        });
-        const bool checkElse = std::any_of(result.cbegin(), result.cend(), [](int x) {
-            return x == 0;
-        });
-        return std::make_pair(checkThen, checkElse);
-    }
-
-    bool isConditionTrue(const Token* tok, const Token* ctx = nullptr) const {
-        return evalCond(tok, ctx).first;
-    }
-
-    // cppcheck-suppress unusedFunction
-    bool isConditionFalse(const Token* tok, const Token* ctx = nullptr) const {
-        return evalCond(tok, ctx).second;
-    }
-
-    template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-    Progress traverseTok(T* tok, F f, bool traverseUnknown, T** out = nullptr) {
-        if (Token::Match(tok, "asm|goto"))
-            return Break(Analyzer::Terminate::Bail);
-        if (Token::Match(tok, "setjmp|longjmp (")) {
-            // Traverse the parameters of the function before escaping
-            traverseRecursive(tok->next()->astOperand2(), f, traverseUnknown);
-            return Break(Analyzer::Terminate::Bail);
-        }
-        if (Token::simpleMatch(tok, "continue")) {
-            if (loopEnds.empty())
-                return Break(Analyzer::Terminate::Escape);
-            // If we are in a loop then jump to the end
-            if (out)
-                *out = loopEnds.back();
-        } else if (Token::Match(tok, "return|throw")) {
-            traverseRecursive(tok->astOperand2(), f, traverseUnknown);
-            traverseRecursive(tok->astOperand1(), f, traverseUnknown);
-            return Break(Analyzer::Terminate::Escape);
-        } else if (Token::Match(tok, "%name% (") && isEscapeFunction(tok, &settings.library)) {
-            // Traverse the parameters of the function before escaping
-            traverseRecursive(tok->next()->astOperand2(), f, traverseUnknown);
-            return Break(Analyzer::Terminate::Escape);
-        } else if (isUnevaluated(tok)) {
-            if (out)
-                *out = tok->link();
-            return Progress::Skip;
-        } else if (tok->astOperand1() && tok->astOperand2() && Token::Match(tok, "?|&&|%oror%")) {
-            if (traverseConditional(tok, f, traverseUnknown) == Progress::Break)
-                return Break();
-            if (out)
-                *out = nextAfterAstRightmostLeaf(tok);
-            return Progress::Skip;
-            // Skip lambdas
-        } else if (T* lambdaEndToken = findLambdaEndToken(tok)) {
-            if (checkScope(lambdaEndToken).isModified())
-                return Break(Analyzer::Terminate::Bail);
-            if (out)
-                *out = lambdaEndToken->next();
-            // Skip class scope
-        } else if (tok->str() == "{" && tok->scope() && tok->scope()->isClassOrStruct()) {
-            if (out)
-                *out = tok->link();
-        } else {
-            if (f(tok) == Progress::Break)
-                return Break();
+        struct Branch {
+            explicit Branch(Token* tok = nullptr) : endBlock(tok) {}
+            Token* endBlock = nullptr;
+            Analyzer::Action action = Analyzer::Action::None;
+            bool check = false;
+            bool escape = false;
+            bool escapeUnknown = false;
+            bool active = false;
+            bool isEscape() const {
+                return escape || escapeUnknown;
+            }
+            bool isConclusiveEscape() const {
+                return escape && !escapeUnknown;
+            }
+            bool isModified() const {
+                return action.isModified() && !isConclusiveEscape();
+            }
+            bool isInconclusive() const {
+                return action.isInconclusive() && !isConclusiveEscape();
+            }
+            bool isDead() const {
+                return action.isModified() || action.isInconclusive() || isEscape();
+            }
+        };
+
+        bool stopUpdates() {
+            analyzeOnly = true;
+            return actions.isModified();
         }
-        return Progress::Continue;
-    }
 
-    template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-    Progress traverseRecursive(T* tok, F f, bool traverseUnknown, unsigned int recursion=0) {
-        if (!tok)
-            return Progress::Continue;
-        if (recursion > 10000)
-            return Progress::Skip;
-        T* firstOp = tok->astOperand1();
-        T* secondOp = tok->astOperand2();
-        // Evaluate:
-        //     1. RHS of assignment before LHS
-        //     2. Unary op before operand
-        //     3. Function arguments before function call
-        if (tok->isAssignmentOp() || !secondOp || isFunctionCall(tok))
-            std::swap(firstOp, secondOp);
-        if (firstOp && traverseRecursive(firstOp, f, traverseUnknown, recursion+1) == Progress::Break)
-            return Break();
-        const Progress p = tok->isAssignmentOp() ? Progress::Continue : traverseTok(tok, f, traverseUnknown);
-        if (p == Progress::Break)
-            return Break();
-        if (p == Progress::Continue && secondOp && traverseRecursive(secondOp, f, traverseUnknown, recursion+1) == Progress::Break)
-            return Break();
-        if (tok->isAssignmentOp() && traverseTok(tok, f, traverseUnknown) == Progress::Break)
-            return Break();
-        return Progress::Continue;
-    }
-
-    template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
-    Progress traverseConditional(T* tok, F f, bool traverseUnknown) {
-        if (Token::Match(tok, "?|&&|%oror%") && tok->astOperand1() && tok->astOperand2()) {
-            T* condTok = tok->astOperand1();
-            T* childTok = tok->astOperand2();
-            bool checkThen, checkElse;
-            std::tie(checkThen, checkElse) = evalCond(condTok);
-            if (!checkThen && !checkElse) {
-                if (!traverseUnknown && analyzer->stopOnCondition(condTok) && stopUpdates()) {
-                    return Progress::Continue;
-                }
-                checkThen = true;
-                checkElse = true;
+        bool stopOnCondition(const Token* condTok) const
+        {
+            if (analyzer->isConditional() && findAstNode(condTok, [](const Token* tok) {
+                return tok->isIncompleteVar();
+            }))
+                return true;
+            return analyzer->stopOnCondition(condTok);
+        }
+
+        std::pair<bool, bool> evalCond(const Token* tok, const Token* ctx = nullptr) const {
+            if (!tok)
+                return std::make_pair(false, false);
+            std::vector<MathLib::bigint> result = analyzer->evaluate(tok, ctx);
+            // TODO: We should convert to bool
+            const bool checkThen = std::any_of(result.cbegin(), result.cend(), [](MathLib::bigint x) {
+                return x != 0;
+            });
+            const bool checkElse = std::any_of(result.cbegin(), result.cend(), [](MathLib::bigint x) {
+                return x == 0;
+            });
+            return std::make_pair(checkThen, checkElse);
+        }
+
+        bool isConditionTrue(const Token* tok, const Token* ctx = nullptr) const {
+            return evalCond(tok, ctx).first;
+        }
+
+        template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+        Progress traverseTok(T* tok, const F &f, bool traverseUnknown, T** out = nullptr) {
+            if (Token::Match(tok, "asm|goto"))
+                return Break(Analyzer::Terminate::Bail);
+            if (Token::Match(tok, "setjmp|longjmp (")) {
+                // Traverse the parameters of the function before escaping
+                traverseRecursive(tok->next()->astOperand2(), f, traverseUnknown);
+                return Break(Analyzer::Terminate::Bail);
             }
-            if (childTok->str() == ":") {
-                if (checkThen && traverseRecursive(childTok->astOperand1(), f, traverseUnknown) == Progress::Break)
-                    return Break();
-                if (checkElse && traverseRecursive(childTok->astOperand2(), f, traverseUnknown) == Progress::Break)
+            if (Token::simpleMatch(tok, "continue")) {
+                if (loopEnds.empty())
+                    return Break(Analyzer::Terminate::Escape);
+                // If we are in a loop then jump to the end
+                if (out)
+                    *out = loopEnds.back();
+            } else if (Token::Match(tok, "return|throw")) {
+                traverseRecursive(tok->astOperand2(), f, traverseUnknown);
+                traverseRecursive(tok->astOperand1(), f, traverseUnknown);
+                return Break(Analyzer::Terminate::Escape);
+            } else if (Token::Match(tok, "%name% (") && isEscapeFunction(tok, settings.library)) {
+                // Traverse the parameters of the function before escaping
+                traverseRecursive(tok->next()->astOperand2(), f, traverseUnknown);
+                return Break(Analyzer::Terminate::Escape);
+            } else if (isUnevaluated(tok->previous())) {
+                if (out)
+                    *out = tok->link();
+                return Progress::Skip;
+            } else if (tok->astOperand1() && tok->astOperand2() && Token::Match(tok, "?|&&|%oror%")) {
+                if (traverseConditional(tok, f, traverseUnknown) == Progress::Break)
                     return Break();
+                if (out)
+                    *out = nextAfterAstRightmostLeaf(tok);
+                return Progress::Skip;
+                // Skip lambdas
+            } else if (T* lambdaEndToken = findLambdaEndToken(tok)) {
+                if (checkScope(lambdaEndToken).isModified())
+                    return Break(Analyzer::Terminate::Bail);
+                if (out)
+                    *out = lambdaEndToken->next();
+                // Skip class scope
+            } else if (tok->str() == "{" && tok->scope() && tok->scope()->isClassOrStruct()) {
+                if (out)
+                    *out = tok->link();
             } else {
-                if (!checkThen && tok->str() == "&&")
-                    return Progress::Continue;
-                if (!checkElse && tok->str() == "||")
-                    return Progress::Continue;
-                if (traverseRecursive(childTok, f, traverseUnknown) == Progress::Break)
+                if (f(tok) == Progress::Break)
                     return Break();
             }
+            return Progress::Continue;
         }
-        return Progress::Continue;
-    }
-
-    Progress update(Token* tok) {
-        Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Forward);
-        actions |= action;
-        if (!action.isNone() && !analyzeOnly)
-            analyzer->update(tok, action, Analyzer::Direction::Forward);
-        if (action.isInconclusive() && !analyzer->lowerToInconclusive())
-            return Break(Analyzer::Terminate::Inconclusive);
-        if (action.isInvalid())
-            return Break(Analyzer::Terminate::Modified);
-        if (action.isWrite() && !action.isRead())
-            // Analysis of this write will continue separately
-            return Break(Analyzer::Terminate::Modified);
-        return Progress::Continue;
-    }
-
-    Progress updateTok(Token* tok, Token** out = nullptr) {
-        auto f = [this](Token* tok2) {
-            return update(tok2);
-        };
-        return traverseTok(tok, f, false, out);
-    }
 
-    Progress updateRecursive(Token* tok) {
-        auto f = [this](Token* tok2) {
-            return update(tok2);
-        };
-        return traverseRecursive(tok, f, false);
-    }
-
-    Analyzer::Action analyzeRecursive(const Token* start) {
-        Analyzer::Action result = Analyzer::Action::None;
-        auto f = [&](const Token* tok) {
-            result = analyzer->analyze(tok, Analyzer::Direction::Forward);
-            if (result.isModified() || result.isInconclusive())
+        template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+        Progress traverseRecursive(T* tok, const F &f, bool traverseUnknown, unsigned int recursion=0) {
+            if (!tok)
+                return Progress::Continue;
+            if (recursion > 10000)
+                return Progress::Skip;
+            T* firstOp = tok->astOperand1();
+            T* secondOp = tok->astOperand2();
+            // Evaluate:
+            //     1. RHS of assignment before LHS
+            //     2. Unary op before operand
+            //     3. Function arguments before function call
+            if (tok->isAssignmentOp() || !secondOp || isFunctionCall(tok))
+                std::swap(firstOp, secondOp);
+            if (firstOp && traverseRecursive(firstOp, f, traverseUnknown, recursion+1) == Progress::Break)
+                return Break();
+            const Progress p = tok->isAssignmentOp() ? Progress::Continue : traverseTok(tok, f, traverseUnknown);
+            if (p == Progress::Break)
+                return Break();
+            if (p == Progress::Continue && secondOp && traverseRecursive(secondOp, f, traverseUnknown, recursion+1) == Progress::Break)
+                return Break();
+            if (tok->isAssignmentOp() && traverseTok(tok, f, traverseUnknown) == Progress::Break)
                 return Break();
             return Progress::Continue;
-        };
-        traverseRecursive(start, f, true);
-        return result;
-    }
+        }
 
-    Analyzer::Action analyzeRange(const Token* start, const Token* end) const {
-        Analyzer::Action result = Analyzer::Action::None;
-        for (const Token* tok = start; tok && tok != end; tok = tok->next()) {
+        template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+        Progress traverseConditional(T* tok, F f, bool traverseUnknown) {
             Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Forward);
-            if (action.isModified() || action.isInconclusive())
-                return action;
-            result |= action;
-        }
-        return result;
-    }
-
-    ForwardTraversal fork(bool analyze = false) const {
-        ForwardTraversal ft = *this;
-        if (analyze) {
-            ft.analyzeOnly = true;
-            ft.analyzeTerminate = true;
-        }
-        ft.actions = Analyzer::Action::None;
-        return ft;
-    }
-
-    std::vector<ForwardTraversal> tryForkScope(Token* endBlock, bool isModified = false) const {
-        if (analyzer->updateScope(endBlock, isModified)) {
-            ForwardTraversal ft = fork();
-            return {std::move(ft)};
-        }
-        return std::vector<ForwardTraversal> {};
-    }
-
-    std::vector<ForwardTraversal> tryForkUpdateScope(Token* endBlock, bool isModified = false) const {
-        std::vector<ForwardTraversal> result = tryForkScope(endBlock, isModified);
-        for (ForwardTraversal& ft : result)
-            ft.updateScope(endBlock);
-        return result;
-    }
-
-    static bool hasGoto(const Token* endBlock) {
-        return Token::findsimplematch(endBlock->link(), "goto", endBlock);
-    }
-
-    static bool hasJump(const Token* endBlock) {
-        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;
+            if (action.isNone() && Token::Match(tok, "?|&&|%oror%") && tok->astOperand1() && tok->astOperand2()) {
+                const T* condTok = tok->astOperand1();
+                T* childTok = tok->astOperand2();
+                bool checkThen, checkElse;
+                std::tie(checkThen, checkElse) = evalCond(condTok);
+                if (!checkThen && !checkElse) {
+                    if (!traverseUnknown && stopOnCondition(condTok) && tok->str() != "?" && stopUpdates()) {
+                        return Progress::Continue;
+                    }
+                    checkThen = true;
+                    checkElse = true;
+                }
+                if (childTok->str() == ":") {
+                    if (checkThen && traverseRecursive(childTok->astOperand1(), f, traverseUnknown) == Progress::Break)
+                        return Break();
+                    if (checkElse && traverseRecursive(childTok->astOperand2(), f, traverseUnknown) == Progress::Break)
+                        return Break();
+                } else {
+                    if (!checkThen && tok->str() == "&&")
+                        return Progress::Continue;
+                    if (!checkElse && tok->str() == "||")
+                        return Progress::Continue;
+                    if (traverseRecursive(childTok, f, traverseUnknown) == Progress::Break)
+                        return Break();
+                }
+            } else {
+                return f(tok, action);
             }
+            return Progress::Continue;
         }
-        return false;
-    }
 
-    bool isEscapeScope(const Token* endBlock, bool& unknown) const {
-        const Token* ftok = nullptr;
-        const bool r = isReturnScope(endBlock, &settings.library, &ftok);
-        if (!r && ftok)
-            unknown = true;
-        return r;
-    }
+        Progress update(Token* tok) {
+            Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Forward);
+            return update(tok, action);
+        }
 
-    enum class Status {
-        None,
-        Inconclusive,
-    };
+        Progress update(Token* tok, Analyzer::Action action)
+        {
+            actions |= action;
+            if (!action.isNone() && !analyzeOnly)
+                analyzer->update(tok, action, Analyzer::Direction::Forward);
+            if (action.isInconclusive() && !analyzer->lowerToInconclusive())
+                return Break(Analyzer::Terminate::Inconclusive);
+            if (action.isInvalid())
+                return Break(Analyzer::Terminate::Modified);
+            if (action.isWrite() && !action.isRead())
+                // Analysis of this write will continue separately
+                return Break(Analyzer::Terminate::Modified);
+            return Progress::Continue;
+        }
 
-    Analyzer::Action analyzeScope(const Token* endBlock) const {
-        return analyzeRange(endBlock->link(), endBlock);
-    }
-
-    Analyzer::Action checkScope(Token* endBlock) const {
-        Analyzer::Action a = analyzeScope(endBlock);
-        tryForkUpdateScope(endBlock, a.isModified());
-        return a;
-    }
-
-    Analyzer::Action checkScope(const Token* endBlock) const {
-        Analyzer::Action a = analyzeScope(endBlock);
-        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;
-                }
+        struct AsUpdate {
+            ForwardTraversal* self = nullptr;
+
+            explicit AsUpdate(ForwardTraversal* self) : self(self) {}
+
+            template<class... Ts>
+            Progress operator()(Ts... xs) const
+            {
+                assert(self);
+                return self->update(xs ...);
             }
+        };
+
+        Progress updateTok(Token* tok, Token** out = nullptr) {
+            return traverseTok(tok, AsUpdate{this}, false, out);
         }
-        return bail;
-    }
-
-    bool reentersLoop(Token* endBlock, const Token* condTok, const Token* stepTok) const {
-        if (!condTok)
-            return true;
-        if (Token::simpleMatch(condTok, ":"))
-            return true;
-        bool stepChangesCond = false;
-        if (stepTok) {
-            std::pair<const Token*, const Token*> exprToks = stepTok->findExpressionStartEndTokens();
-            if (exprToks.first != nullptr && exprToks.second != nullptr)
-                stepChangesCond |= isExpressionChanged(condTok, exprToks.first, exprToks.second->next(), &settings, true);
-        }
-        const bool bodyChangesCond = isExpressionChanged(condTok, endBlock->link(), endBlock, &settings, true);
-        // Check for mutation in the condition
-        const bool condChanged =
-            nullptr != findAstNode(condTok, [&](const Token* tok) {
-            return isVariableChanged(tok, 0, &settings, true);
-        });
-        const bool changed = stepChangesCond || bodyChangesCond || condChanged;
-        if (!changed)
-            return true;
-        ForwardTraversal ft = fork(true);
-        ft.updateScope(endBlock);
-        return ft.isConditionTrue(condTok) && bodyChangesCond;
-    }
-
-    Progress updateInnerLoop(Token* endBlock, Token* stepTok, Token* condTok) {
-        loopEnds.push_back(endBlock);
-        OnExit oe{[&] {
-                loopEnds.pop_back();
-            }};
-        if (endBlock && updateScope(endBlock) == Progress::Break)
-            return Break();
-        if (stepTok && updateRecursive(stepTok) == Progress::Break)
-            return Break();
-        if (condTok && !Token::simpleMatch(condTok, ":") && updateRecursive(condTok) == Progress::Break)
-            return Break();
-        return Progress::Continue;
-    }
-
-    Progress updateLoop(const Token* endToken,
-                        Token* endBlock,
-                        Token* condTok,
-                        Token* initTok = nullptr,
-                        Token* stepTok = nullptr,
-                        bool exit = false) {
-        if (initTok && updateRecursive(initTok) == Progress::Break)
-            return Break();
-        const bool isDoWhile = precedes(endBlock, condTok);
-        bool checkThen = true;
-        bool checkElse = false;
-        if (condTok && !Token::simpleMatch(condTok, ":"))
-            std::tie(checkThen, checkElse) = evalCond(condTok, isDoWhile ? endBlock->previous() : nullptr);
-        // exiting a do while(false)
-        if (checkElse && exit) {
-            if (hasJump(endBlock)) {
-                if (!analyzer->lowerToPossible())
-                    return Break(Analyzer::Terminate::Bail);
-                if (analyzer->isConditional() && stopUpdates())
-                    return Break(Analyzer::Terminate::Conditional);
-            }
-            return Progress::Continue;
+
+        Progress updateRecursive(Token* tok) {
+            return traverseRecursive(tok, AsUpdate{this}, false);
         }
-        Analyzer::Action bodyAnalysis = analyzeScope(endBlock);
-        Analyzer::Action allAnalysis = bodyAnalysis;
-        Analyzer::Action condAnalysis;
-        if (condTok) {
-            condAnalysis = analyzeRecursive(condTok);
-            allAnalysis |= condAnalysis;
-        }
-        if (stepTok)
-            allAnalysis |= analyzeRecursive(stepTok);
-        actions |= allAnalysis;
-        // do while(false) is not really a loop
-        if (checkElse && isDoWhile &&
-            (condTok->hasKnownIntValue() ||
-             (!bodyAnalysis.isModified() && !condAnalysis.isModified() && condAnalysis.isRead()))) {
-            if (updateRange(endBlock->link(), endBlock) == Progress::Break)
-                return Break();
-            return updateRecursive(condTok);
+
+        struct AsAnalyze {
+            ForwardTraversal* self = nullptr;
+            Analyzer::Action* result = nullptr;
+
+            AsAnalyze(ForwardTraversal* self, Analyzer::Action* result) : self(self), result(result) {}
+
+            Progress operator()(const Token* tok) const
+            {
+                assert(self);
+                assert(result);
+                return (*this)(tok, self->analyzer->analyze(tok, Analyzer::Direction::Forward));
+            }
+
+            Progress operator()(const Token* /*unused*/, Analyzer::Action action) const
+            {
+                assert(self);
+                assert(result);
+                *result = action;
+                if (result->isModified() || result->isInconclusive())
+                    return self->Break();
+                return Progress::Continue;
+            }
+        };
+
+        Analyzer::Action analyzeRecursive(const Token* start) {
+            Analyzer::Action result = Analyzer::Action::None;
+            traverseRecursive(start, AsAnalyze{this, &result}, true);
+            return result;
         }
-        if (allAnalysis.isInconclusive()) {
-            if (!analyzer->lowerToInconclusive())
-                return Break(Analyzer::Terminate::Bail);
-        } else if (allAnalysis.isModified() || (exit && allAnalysis.isIdempotent())) {
-            if (!analyzer->lowerToPossible())
-                return Break(Analyzer::Terminate::Bail);
+
+        Analyzer::Action analyzeRange(const Token* start, const Token* end) const {
+            Analyzer::Action result = Analyzer::Action::None;
+            for (const Token* tok = start; tok && tok != end; tok = tok->next()) {
+                Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Forward);
+                if (action.isModified() || action.isInconclusive())
+                    return action;
+                result |= action;
+            }
+            return result;
         }
 
-        if (condTok && !Token::simpleMatch(condTok, ":")) {
-            if (!isDoWhile || (!bodyAnalysis.isModified() && !bodyAnalysis.isIdempotent()))
-                if (updateRecursive(condTok) == Progress::Break)
-                    return Break();
+        ForwardTraversal fork(bool analyze = false) const {
+            ForwardTraversal ft = *this;
+            if (analyze) {
+                ft.analyzeOnly = true;
+                ft.analyzeTerminate = true;
+            }
+            ft.actions = Analyzer::Action::None;
+            return ft;
         }
-        if (!checkThen && !checkElse && !isDoWhile && analyzer->stopOnCondition(condTok) && stopUpdates())
-            return Break(Analyzer::Terminate::Conditional);
-        // condition is false, we don't enter the loop
-        if (checkElse)
-            return Progress::Continue;
-        if (checkThen || isDoWhile) {
-            // Since we are re-entering the loop then assume the condition is true to update the state
-            if (exit)
-                analyzer->assume(condTok, true, Analyzer::Assume::Quiet | Analyzer::Assume::Absolute);
-            if (updateInnerLoop(endBlock, stepTok, condTok) == Progress::Break)
-                return Break();
-            // If loop re-enters then it could be modified again
-            if (allAnalysis.isModified() && reentersLoop(endBlock, condTok, stepTok))
-                return Break(Analyzer::Terminate::Bail);
-            if (allAnalysis.isIncremental())
-                return Break(Analyzer::Terminate::Bail);
-        } else if (allAnalysis.isModified()) {
-            std::vector<ForwardTraversal> ftv = tryForkScope(endBlock, allAnalysis.isModified());
-            bool forkContinue = true;
-            for (ForwardTraversal& ft : ftv) {
-                if (condTok)
-                    ft.analyzer->assume(condTok, false, Analyzer::Assume::Quiet);
-                if (ft.updateInnerLoop(endBlock, stepTok, condTok) == Progress::Break)
-                    forkContinue = false;
+
+        std::vector<ForwardTraversal> tryForkScope(Token* endBlock, bool isModified = false) const {
+            if (analyzer->updateScope(endBlock, isModified)) {
+                ForwardTraversal ft = fork();
+                return {std::move(ft)};
             }
+            return std::vector<ForwardTraversal> {};
+        }
 
-            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);
+        std::vector<ForwardTraversal> tryForkUpdateScope(Token* endBlock, bool isModified = false) const {
+            std::vector<ForwardTraversal> result = tryForkScope(endBlock, isModified);
+            for (ForwardTraversal& ft : result)
+                ft.updateScope(endBlock);
+            return result;
+        }
+
+        static bool hasGoto(const Token* endBlock) {
+            return Token::findsimplematch(endBlock->link(), "goto", endBlock);
+        }
+
+        static bool hasJump(const Token* endBlock) {
+            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;
+                }
             }
-            if (forkContinue) {
-                for (ForwardTraversal& ft : ftv) {
-                    if (!ft.actions.isIncremental())
-                        ft.updateRange(endBlock, endToken);
+            return false;
+        }
+
+        bool isEscapeScope(const Token* endBlock, bool& unknown) const {
+            const Token* ftok = nullptr;
+            const bool r = isReturnScope(endBlock, settings.library, &ftok);
+            if (!r && ftok)
+                unknown = true;
+            return r;
+        }
+
+        Analyzer::Action analyzeScope(const Token* endBlock) const {
+            return analyzeRange(endBlock->link(), endBlock);
+        }
+
+        Analyzer::Action checkScope(Token* endBlock) const {
+            Analyzer::Action a = analyzeScope(endBlock);
+            tryForkUpdateScope(endBlock, a.isModified());
+            return a;
+        }
+
+        Analyzer::Action checkScope(const Token* endBlock) const {
+            Analyzer::Action a = analyzeScope(endBlock);
+            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;
+                    }
                 }
             }
-            if (allAnalysis.isIncremental())
-                return Break(Analyzer::Terminate::Bail);
-        } else {
-            if (updateInnerLoop(endBlock, stepTok, condTok) == Progress::Break)
-                return Progress::Break;
-            if (allAnalysis.isIncremental())
-                return Break(Analyzer::Terminate::Bail);
+            return bail;
         }
-        return Progress::Continue;
-    }
 
-    Progress updateLoopExit(const Token* endToken,
+        bool reentersLoop(Token* endBlock, const Token* condTok, const Token* stepTok) const {
+            if (!condTok)
+                return true;
+            if (Token::simpleMatch(condTok, ":"))
+                return true;
+            bool stepChangesCond = false;
+            if (stepTok) {
+                std::pair<const Token*, const Token*> exprToks = stepTok->findExpressionStartEndTokens();
+                if (exprToks.first != nullptr && exprToks.second != nullptr)
+                    stepChangesCond |=
+                        findExpressionChanged(condTok, exprToks.first, exprToks.second->next(), settings) != nullptr;
+            }
+            const bool bodyChangesCond = findExpressionChanged(condTok, endBlock->link(), endBlock, settings);
+            // Check for mutation in the condition
+            const bool condChanged =
+                nullptr != findAstNode(condTok, [&](const Token* tok) {
+                return isVariableChanged(tok, 0, settings);
+            });
+            const bool changed = stepChangesCond || bodyChangesCond || condChanged;
+            if (!changed)
+                return true;
+            ForwardTraversal ft = fork(true);
+            ft.updateScope(endBlock);
+            return ft.isConditionTrue(condTok) && bodyChangesCond;
+        }
+
+        Progress updateInnerLoop(Token* endBlock, Token* stepTok, Token* condTok) {
+            loopEnds.push_back(endBlock);
+            OnExit oe{[&] {
+                    loopEnds.pop_back();
+                }};
+            if (endBlock && updateScope(endBlock) == Progress::Break)
+                return Break();
+            if (stepTok && updateRecursive(stepTok) == Progress::Break)
+                return Break();
+            if (condTok && !Token::simpleMatch(condTok, ":") && updateRecursive(condTok) == Progress::Break)
+                return Break();
+            return Progress::Continue;
+        }
+
+        Progress updateLoop(const Token* endToken,
                             Token* endBlock,
                             Token* condTok,
                             Token* initTok = nullptr,
-                            Token* stepTok = nullptr) {
-        return updateLoop(endToken, endBlock, condTok, initTok, stepTok, true);
-    }
-
-    Progress updateScope(Token* endBlock) {
-        return updateRange(endBlock->link(), endBlock);
-    }
-
-    Progress updateRange(Token* start, const Token* end, int depth = 20) {
-        if (depth < 0)
-            return Break(Analyzer::Terminate::Bail);
-        std::size_t i = 0;
-        for (Token* tok = start; precedes(tok, end); tok = tok->next()) {
-            Token* next = nullptr;
-            if (tok->index() <= i)
-                throw InternalError(tok, "Cyclic forward analysis.");
-            i = tok->index();
-
-            if (tok->link()) {
-                // Skip casts..
-                if (tok->str() == "(" && !tok->astOperand2() && tok->isCast()) {
-                    tok = tok->link();
-                    continue;
-                }
-                // Skip template arguments..
-                if (tok->str() == "<") {
-                    tok = tok->link();
-                    continue;
-                }
-            }
-
-            // Evaluate RHS of assignment before LHS
-            if (Token* assignTok = assignExpr(tok)) {
-                if (updateRecursive(assignTok) == Progress::Break)
-                    return Break();
-                tok = nextAfterAstRightmostLeaf(assignTok);
-                if (!tok)
-                    return Break();
-            } else if (Token::simpleMatch(tok, ") {") && Token::Match(tok->link()->previous(), "for|while (") &&
-                       !Token::simpleMatch(tok->link()->astOperand2(), ":")) {
-                // In the middle of a loop structure so bail
-                return Break(Analyzer::Terminate::Bail);
-            } else if (tok->str() == ";" && tok->astParent()) {
-                Token* top = tok->astTop();
-                if (top && Token::Match(top->previous(), "for|while (") && Token::simpleMatch(top->link(), ") {")) {
-                    Token* endCond = top->link();
-                    Token* endBlock = endCond->linkAt(1);
-                    Token* condTok = getCondTok(top);
-                    Token* stepTok = getStepTok(top);
-                    // The semicolon should belong to the initTok otherwise something went wrong, so just bail
-                    if (tok->astOperand2() != condTok && !Token::simpleMatch(tok->astOperand2(), ";"))
+                            Token* stepTok = nullptr,
+                            bool exit = false) {
+            if (initTok && updateRecursive(initTok) == Progress::Break)
+                return Break();
+            const bool isDoWhile = precedes(endBlock, condTok);
+            bool checkThen = true;
+            bool checkElse = false;
+            if (condTok && !Token::simpleMatch(condTok, ":"))
+                std::tie(checkThen, checkElse) = evalCond(condTok, isDoWhile ? endBlock->previous() : nullptr);
+            // exiting a do while(false)
+            if (checkElse && exit) {
+                if (hasJump(endBlock)) {
+                    if (!analyzer->lowerToPossible())
                         return Break(Analyzer::Terminate::Bail);
-                    if (updateLoop(end, endBlock, condTok, nullptr, stepTok) == Progress::Break)
-                        return Break();
+                    if (analyzer->isConditional() && stopUpdates())
+                        return Break(Analyzer::Terminate::Conditional);
                 }
-            } else if (tok->str() == "break") {
-                const Token *scopeEndToken = findNextTokenFromBreak(tok);
-                if (!scopeEndToken)
+                return Progress::Continue;
+            }
+            Analyzer::Action bodyAnalysis = analyzeScope(endBlock);
+            Analyzer::Action allAnalysis = bodyAnalysis;
+            Analyzer::Action condAnalysis;
+            if (condTok) {
+                condAnalysis = analyzeRecursive(condTok);
+                allAnalysis |= condAnalysis;
+            }
+            if (stepTok)
+                allAnalysis |= analyzeRecursive(stepTok);
+            actions |= allAnalysis;
+            // do while(false) is not really a loop
+            if (checkElse && isDoWhile &&
+                (condTok->hasKnownIntValue() ||
+                 (!bodyAnalysis.isModified() && !condAnalysis.isModified() && condAnalysis.isRead()))) {
+                if (updateScope(endBlock) == Progress::Break)
                     return Break();
-                tok = skipTo(tok, scopeEndToken, end);
-                if (!precedes(tok, end))
-                    return Break(Analyzer::Terminate::Escape);
-                if (!analyzer->lowerToPossible())
+                return updateRecursive(condTok);
+            }
+            if (allAnalysis.isInconclusive()) {
+                if (!analyzer->lowerToInconclusive())
                     return Break(Analyzer::Terminate::Bail);
-                // TODO: Don't break, instead move to the outer scope
-                if (!tok)
-                    return Break();
-            } else if (Token::Match(tok, "%name% :") || tok->str() == "case") {
+            } else if (allAnalysis.isModified() || (exit && allAnalysis.isIdempotent())) {
                 if (!analyzer->lowerToPossible())
                     return Break(Analyzer::Terminate::Bail);
-            } else if (tok->link() && tok->str() == "}") {
-                const Scope* scope = tok->scope();
-                if (!scope)
+            }
+
+            if (condTok && !Token::simpleMatch(condTok, ":")) {
+                if (!isDoWhile || (!bodyAnalysis.isModified() && !bodyAnalysis.isIdempotent()))
+                    if (updateRecursive(condTok) == Progress::Break)
+                        return Break();
+            }
+            if (!checkThen && !checkElse && !isDoWhile && stopOnCondition(condTok) && stopUpdates())
+                return Break(Analyzer::Terminate::Conditional);
+            // condition is false, we don't enter the loop
+            if (checkElse && !isDoWhile)
+                return Progress::Continue;
+            if (checkThen || isDoWhile) {
+                // Since we are re-entering the loop then assume the condition is true to update the state
+                if (exit)
+                    analyzer->assume(condTok, true, Analyzer::Assume::Quiet | Analyzer::Assume::Absolute);
+                if (updateInnerLoop(endBlock, stepTok, condTok) == Progress::Break)
                     return Break();
-                if (Token::Match(tok->link()->previous(), ")|else {")) {
-                    const Token* tok2 = tok->link()->previous();
-                    const bool inElse = Token::simpleMatch(tok2, "else {");
-                    const bool inLoop = inElse ? false : Token::Match(tok2->link()->previous(), "while|for (");
-                    Token* condTok = getCondTokFromEnd(tok);
+                // If loop re-enters then it could be modified again
+                if (allAnalysis.isModified() && reentersLoop(endBlock, condTok, stepTok))
+                    return Break(Analyzer::Terminate::Bail);
+                if (allAnalysis.isIncremental())
+                    return Break(Analyzer::Terminate::Bail);
+            } else if (allAnalysis.isModified()) {
+                std::vector<ForwardTraversal> ftv = tryForkScope(endBlock, allAnalysis.isModified());
+                bool forkContinue = true;
+                for (ForwardTraversal& ft : ftv) {
+                    if (condTok)
+                        ft.analyzer->assume(condTok, false, Analyzer::Assume::Quiet);
+                    if (ft.updateInnerLoop(endBlock, stepTok, condTok) == Progress::Break)
+                        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);
+                }
+                if (forkContinue) {
+                    for (ForwardTraversal& ft : ftv) {
+                        if (!ft.actions.isIncremental())
+                            ft.updateRange(endBlock, endToken);
+                    }
+                }
+                if (allAnalysis.isIncremental())
+                    return Break(Analyzer::Terminate::Bail);
+            } else {
+                if (updateInnerLoop(endBlock, stepTok, condTok) == Progress::Break)
+                    return Progress::Break;
+                if (allAnalysis.isIncremental())
+                    return Break(Analyzer::Terminate::Bail);
+            }
+            return Progress::Continue;
+        }
+
+        Progress updateLoopExit(const Token* endToken,
+                                Token* endBlock,
+                                Token* condTok,
+                                Token* initTok = nullptr,
+                                Token* stepTok = nullptr) {
+            return updateLoop(endToken, endBlock, condTok, initTok, stepTok, true);
+        }
+
+        Progress updateScope(Token* endBlock, int depth = 20)
+        {
+            if (!endBlock)
+                return Break();
+            assert(endBlock->link());
+            Token* ctx = endBlock->link()->previous();
+            if (Token::simpleMatch(ctx, ")"))
+                ctx = ctx->link()->previous();
+            if (ctx)
+                analyzer->updateState(ctx);
+            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);
+            std::size_t i = 0;
+            for (Token* tok = start; precedes(tok, end); tok = tok->next()) {
+                Token* next = nullptr;
+                if (tok->index() <= i)
+                    throw InternalError(tok, "Cyclic forward analysis.");
+                i = tok->index();
+
+                if (tok->link()) {
+                    // Skip casts..
+                    if (tok->str() == "(" && !tok->astOperand2() && tok->isCast()) {
+                        tok = tok->link();
+                        continue;
+                    }
+                    // Skip template arguments..
+                    if (tok->str() == "<") {
+                        tok = tok->link();
+                        continue;
+                    }
+                }
+
+                // Evaluate RHS of assignment before LHS
+                if (Token* assignTok = assignExpr(tok)) {
+                    if (updateRecursive(assignTok) == Progress::Break)
                         return Break();
-                    if (!condTok->hasKnownIntValue() || inLoop) {
-                        if (!analyzer->lowerToPossible())
-                            return Break(Analyzer::Terminate::Bail);
-                    } else if (condTok->values().front().intvalue == inElse) {
+                    tok = nextAfterAstRightmostLeaf(assignTok);
+                    if (!tok)
                         return Break();
+                } else if (Token::simpleMatch(tok, ") {") && Token::Match(tok->link()->previous(), "for|while (") &&
+                           !Token::simpleMatch(tok->link()->astOperand2(), ":")) {
+                    // In the middle of a loop structure so bail
+                    return Break(Analyzer::Terminate::Bail);
+                } else if (tok->str() == ";" && tok->astParent()) {
+                    Token* top = tok->astTop();
+                    if (Token::Match(top->previous(), "for|while (") && Token::simpleMatch(top->link(), ") {")) {
+                        Token* endCond = top->link();
+                        Token* endBlock = endCond->linkAt(1);
+                        Token* condTok = getCondTok(top);
+                        Token* stepTok = getStepTok(top);
+                        // The semicolon should belong to the initTok otherwise something went wrong, so just bail
+                        if (tok->astOperand2() != condTok && !Token::simpleMatch(tok->astOperand2(), ";"))
+                            return Break(Analyzer::Terminate::Bail);
+                        if (updateLoop(end, endBlock, condTok, nullptr, stepTok) == Progress::Break)
+                            return Break();
                     }
-                    // Handle loop
-                    if (inLoop) {
-                        Token* stepTok = getStepTokFromEnd(tok);
-                        bool checkThen, checkElse;
-                        std::tie(checkThen, checkElse) = evalCond(condTok);
-                        if (stepTok && !checkElse) {
-                            if (updateRecursive(stepTok) == Progress::Break)
-                                return Break();
-                            if (updateRecursive(condTok) == Progress::Break)
-                                return Break();
-                            // Reevaluate condition
-                            std::tie(checkThen, checkElse) = evalCond(condTok);
-                        }
-                        if (!checkElse) {
-                            if (updateLoopExit(end, tok, condTok, nullptr, stepTok) == Progress::Break)
-                                return Break();
-                        }
-                    }
-                    analyzer->assume(condTok, !inElse, Analyzer::Assume::Quiet);
-                    if (Token::simpleMatch(tok, "} else {"))
-                        tok = tok->linkAt(2);
-                } else if (scope->type == Scope::eTry) {
+                } else if (tok->str() == "break") {
+                    const Token *scopeEndToken = findNextTokenFromBreak(tok);
+                    if (!scopeEndToken)
+                        return Break();
+                    tok = skipTo(tok, scopeEndToken, end);
+                    if (!precedes(tok, end))
+                        return Break(Analyzer::Terminate::Escape);
                     if (!analyzer->lowerToPossible())
                         return Break(Analyzer::Terminate::Bail);
-                } else if (scope->type == Scope::eLambda) {
-                    return Break();
-                } else if (scope->type == Scope::eDo && Token::simpleMatch(tok, "} while (")) {
-                    if (updateLoopExit(end, tok, tok->tokAt(2)->astOperand2()) == Progress::Break)
+                    // TODO: Don't break, instead move to the outer scope
+                    if (!tok)
                         return Break();
-                    tok = tok->linkAt(2);
-                } else if (Token::simpleMatch(tok->next(), "else {")) {
-                    tok = tok->linkAt(2);
-                }
-            } else if (tok->isControlFlowKeyword() && Token::Match(tok, "if|while|for (") &&
-                       Token::simpleMatch(tok->next()->link(), ") {")) {
-                Token* endCond = tok->next()->link();
-                Token* endBlock = endCond->next()->link();
-                Token* condTok = getCondTok(tok);
-                Token* initTok = getInitTok(tok);
-                if (initTok && updateRecursive(initTok) == Progress::Break)
-                    return Break();
-                if (Token::Match(tok, "for|while (")) {
-                    // For-range loop
-                    if (Token::simpleMatch(condTok, ":")) {
-                        Token* conTok = condTok->astOperand2();
-                        if (conTok && updateRecursive(conTok) == Progress::Break)
-                            return Break();
-                        bool isEmpty = false;
-                        std::vector<MathLib::bigint> result =
-                            analyzer->evaluate(Analyzer::Evaluate::ContainerEmpty, conTok);
-                        if (result.empty())
-                            analyzer->assume(conTok, false, Analyzer::Assume::ContainerEmpty);
-                        else
-                            isEmpty = result.front() != 0;
-                        if (!isEmpty && updateLoop(end, endBlock, condTok) == Progress::Break)
+                } else if (!tok->variable() && (Token::Match(tok, "%name% :") || tok->str() == "case")) {
+                    if (!analyzer->lowerToPossible())
+                        return Break(Analyzer::Terminate::Bail);
+                } else if (tok->link() && tok->str() == "}" && tok == tok->scope()->bodyEnd) { // might be an init list
+                    const Scope* scope = tok->scope();
+                    if (contains({ScopeType::eDo, ScopeType::eFor, ScopeType::eWhile, ScopeType::eIf, ScopeType::eElse, ScopeType::eSwitch}, scope->type)) {
+                        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);
+                        Token* condTok = getCondTokFromEnd(tok);
+                        if (!condTok)
                             return Break();
-                    } else {
-                        Token* stepTok = getStepTok(tok);
-                        // Dont pass initTok since it was already evaluated
-                        if (updateLoop(end, endBlock, condTok, nullptr, stepTok) == Progress::Break)
+                        if (!condTok->hasKnownIntValue() || inLoop) {
+                            if (!analyzer->lowerToPossible())
+                                return Break(Analyzer::Terminate::Bail);
+                        } else if (condTok->getKnownIntValue() == inElse) {
                             return Break();
+                        }
+                        // Handle loop
+                        if (inLoop) {
+                            Token* stepTok = getStepTokFromEnd(tok);
+                            bool checkThen, checkElse;
+                            std::tie(checkThen, checkElse) = evalCond(condTok);
+                            if (stepTok && !checkElse) {
+                                if (updateRecursive(stepTok) == Progress::Break)
+                                    return Break();
+                                if (updateRecursive(condTok) == Progress::Break)
+                                    return Break();
+                                // Reevaluate condition
+                                std::tie(checkThen, checkElse) = evalCond(condTok);
+                            }
+                            if (!checkElse) {
+                                if (updateLoopExit(end, tok, condTok, nullptr, stepTok) == Progress::Break)
+                                    return Break();
+                            }
+                        }
+                        analyzer->assume(condTok, !inElse, Analyzer::Assume::Quiet);
+                        assert(!inDoWhile || Token::simpleMatch(tok, "} while ("));
+                        if (Token::simpleMatch(tok, "} else {") || inDoWhile)
+                            tok = tok->linkAt(2);
+                    } else if (contains({ScopeType::eTry, ScopeType::eCatch}, scope->type)) {
+                        if (!analyzer->lowerToPossible())
+                            return Break(Analyzer::Terminate::Bail);
+                    } else if (scope->type == ScopeType::eLambda) {
+                        return Break();
                     }
-                    tok = endBlock;
-                } else {
-                    // Traverse condition
-                    if (updateRecursive(condTok) == Progress::Break)
+                } else if (tok->isControlFlowKeyword() && Token::Match(tok, "if|while|for (") &&
+                           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
+                        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);
+                    Token* endBlock = endCond->linkAt(1);
+                    Token* condTok = getCondTok(tok);
+                    Token* initTok = getInitTok(tok);
+                    if (initTok && updateRecursive(initTok) == Progress::Break)
                         return Break();
-                    Branch thenBranch{endBlock};
-                    Branch elseBranch{endBlock->tokAt(2) ? endBlock->linkAt(2) : nullptr};
-                    // Check if condition is true or false
-                    std::tie(thenBranch.check, elseBranch.check) = evalCond(condTok);
-                    if (!thenBranch.check && !elseBranch.check && analyzer->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);
-                    if (thenBranch.check) {
-                        thenBranch.active = true;
-                        if (updateRange(endCond->next(), endBlock, depth - 1) == Progress::Break)
+                    if (Token::Match(tok, "for|while (")) {
+                        // For-range loop
+                        if (Token::simpleMatch(condTok, ":")) {
+                            Token* conTok = condTok->astOperand2();
+                            if (conTok && updateRecursive(conTok) == Progress::Break)
+                                return Break();
+                            bool isEmpty = false;
+                            std::vector<MathLib::bigint> result =
+                                analyzer->evaluate(Analyzer::Evaluate::ContainerEmpty, conTok);
+                            if (result.empty())
+                                analyzer->assume(conTok, false, Analyzer::Assume::ContainerEmpty);
+                            else
+                                isEmpty = result.front() != 0;
+                            if (!isEmpty && updateLoop(end, endBlock, condTok) == Progress::Break)
+                                return Break();
+                        } else {
+                            Token* stepTok = getStepTok(tok);
+                            // Dont pass initTok since it was already evaluated
+                            if (updateLoop(end, endBlock, condTok, nullptr, stepTok) == Progress::Break)
+                                return Break();
+                        }
+                        tok = endBlock;
+                    } else {
+                        // Traverse condition
+                        if (updateRecursive(condTok) == 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 = updateRange(endBlock->tokAt(2), endBlock->linkAt(2), depth - 1);
-                            if (result == Progress::Break)
+                        Branch thenBranch{endBlock};
+                        Branch elseBranch{endBlock->tokAt(2) ? endBlock->linkAt(2) : nullptr};
+                        // Check if condition is true or false
+                        std::tie(thenBranch.check, elseBranch.check) = evalCond(condTok);
+                        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);
+                        if (thenBranch.check) {
+                            thenBranch.active = true;
+                            if (updateScope(endBlock, depth - 1) == Progress::Break)
                                 return Break();
-                        } else if (!thenBranch.check) {
-                            elseBranch.active = true;
-                            if (checkBranch(elseBranch))
+                        } else if (!elseBranch.check) {
+                            thenBranch.active = true;
+                            if (checkBranch(thenBranch))
                                 bail = true;
                         }
-                        tok = endBlock->linkAt(2);
-                    } else {
-                        tok = endBlock;
-                    }
-                    if (thenBranch.active)
-                        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()) {
+                        // 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)
+                            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);
+                            }
+                        }
+                        if (thenBranch.isInconclusive() || elseBranch.isInconclusive()) {
                             if (!analyzer->lowerToInconclusive())
                                 return Break(Analyzer::Terminate::Bail);
-                        } else if (thenBranch.check) {
-                            return Break();
-                        } else {
-                            if (analyzer->isConditional() && stopUpdates())
+                        } else if (thenBranch.isModified() || elseBranch.isModified()) {
+                            if (!hasElse && analyzer->isConditional() && stopUpdates())
                                 return Break(Analyzer::Terminate::Conditional);
-                            analyzer->assume(condTok, false);
+                            if (!analyzer->lowerToPossible())
+                                return Break(Analyzer::Terminate::Bail);
+                            analyzer->assume(condTok, elseBranch.isModified());
                         }
                     }
-                    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())
-                            return Break(Analyzer::Terminate::Bail);
-                        analyzer->assume(condTok, elseBranch.isModified());
+                } else if (Token::simpleMatch(tok, "try {")) {
+                    Token* endBlock = tok->linkAt(1);
+                    ForwardTraversal tryTraversal = fork();
+                    tryTraversal.updateScope(endBlock, depth - 1);
+                    bool bail = tryTraversal.actions.isModified();
+                    if (bail) {
+                        actions = tryTraversal.actions;
+                        terminate = tryTraversal.terminate;
+                        return Break();
                     }
-                }
-            } else if (Token::simpleMatch(tok, "try {")) {
-                Token* endBlock = tok->next()->link();
-                ForwardTraversal tryTraversal = fork();
-                tryTraversal.updateRange(tok->next(), endBlock, depth - 1);
-                bool bail = tryTraversal.actions.isModified();
-                if (bail)
-                    return Break();
 
-                while (Token::simpleMatch(endBlock, "} catch (")) {
-                    Token* endCatch = endBlock->linkAt(2);
-                    if (!Token::simpleMatch(endCatch, ") {"))
+                    while (Token::simpleMatch(endBlock, "} catch (")) {
+                        Token* endCatch = endBlock->linkAt(2);
+                        if (!Token::simpleMatch(endCatch, ") {"))
+                            return Break();
+                        endBlock = endCatch->linkAt(1);
+                        ForwardTraversal ft = fork();
+                        ft.updateScope(endBlock, depth - 1);
+                        bail |= ft.terminate != Analyzer::Terminate::None || ft.actions.isModified();
+                    }
+                    if (bail)
                         return Break();
-                    endBlock = endCatch->linkAt(1);
-                    ForwardTraversal ft = fork();
-                    ft.updateRange(endBlock->link(), endBlock, depth - 1);
-                    bail |= ft.terminate != Analyzer::Terminate::None || ft.actions.isModified();
-                }
-                if (bail)
-                    return Break();
-                tok = endBlock;
-            } else if (Token::simpleMatch(tok, "do {")) {
-                Token* endBlock = tok->next()->link();
-                Token* condTok = Token::simpleMatch(endBlock, "} while (") ? endBlock->tokAt(2)->astOperand2() : nullptr;
-                if (updateLoop(end, endBlock, condTok) == Progress::Break)
-                    return Break();
-                if (condTok)
-                    tok = endBlock->linkAt(2)->next();
-                else
                     tok = endBlock;
-            } else if (Token::Match(tok, "assert|ASSERT (")) {
-                const Token* condTok = tok->next()->astOperand2();
-                bool checkThen, checkElse;
-                std::tie(checkThen, checkElse) = evalCond(condTok);
-                if (checkElse)
-                    return Break();
-                if (!checkThen)
-                    analyzer->assume(condTok, true, Analyzer::Assume::Quiet | Analyzer::Assume::Absolute);
-            } else if (Token::simpleMatch(tok, "switch (")) {
-                if (updateRecursive(tok->next()->astOperand2()) == Progress::Break)
-                    return Break();
-                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)
-                    return Break();
-                // Since the call could be an unknown macro, traverse the tokens as a range instead of recursively
-                if (!Token::simpleMatch(callTok, "( )") &&
-                    updateRange(callTok->next(), callTok->link(), depth - 1) == Progress::Break)
-                    return Break();
-                if (updateTok(callTok) == Progress::Break)
-                    return Break();
-                tok = callTok->link();
-                if (!tok)
-                    return Break();
-            } else {
-                if (updateTok(tok, &next) == Progress::Break)
-                    return Break();
-                if (next) {
-                    if (precedes(next, end))
-                        tok = next->previous();
+                } else if (Token::simpleMatch(tok, "do {")) {
+                    Token* endBlock = tok->linkAt(1);
+                    Token* condTok = Token::simpleMatch(endBlock, "} while (") ? endBlock->tokAt(2)->astOperand2() : nullptr;
+                    if (updateLoop(end, endBlock, condTok) == Progress::Break)
+                        return Break();
+                    if (condTok)
+                        tok = endBlock->linkAt(2)->next();
                     else
-                        return Progress::Continue;
+                        tok = endBlock;
+                } else if (Token::Match(tok, "assert|ASSERT (")) {
+                    const Token* condTok = tok->next()->astOperand2();
+                    bool checkThen, checkElse;
+                    std::tie(checkThen, checkElse) = evalCond(condTok);
+                    if (checkElse)
+                        return Break();
+                    if (!checkThen)
+                        analyzer->assume(condTok, true, Analyzer::Assume::Quiet | Analyzer::Assume::Absolute);
+                } else if (Token::simpleMatch(tok, "switch (")) {
+                    if (updateRecursive(tok->next()->astOperand2()) == Progress::Break)
+                        return Break();
+                    actions |= Analyzer::Action::Write; // bailout for switch scope
+                    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)
+                        return Break();
+                    // Since the call could be an unknown macro, traverse the tokens as a range instead of recursively
+                    if (!Token::simpleMatch(callTok, "( )") &&
+                        updateRange(callTok->next(), callTok->link(), depth - 1) == Progress::Break)
+                        return Break();
+                    if (updateTok(callTok) == Progress::Break)
+                        return Break();
+                    tok = callTok->link();
+                    if (!tok)
+                        return Break();
+                } else {
+                    if (updateTok(tok, &next) == Progress::Break)
+                        return Break();
+                    if (next) {
+                        if (precedes(next, end))
+                            tok = next->previous();
+                        else
+                            return Progress::Continue;
+                    }
                 }
+                // Prevent infinite recursion
+                if (tok->next() == start)
+                    break;
             }
-            // Prevent infinite recursion
-            if (tok->next() == start)
-                break;
+            return Progress::Continue;
         }
-        return Progress::Continue;
-    }
 
-    static bool isUnevaluated(const Token* tok) {
-        return Token::Match(tok->previous(), "sizeof|decltype (");
-    }
+        void reportError(Severity severity, const std::string& id, const std::string& msg) {
+            ErrorMessage::FileLocation loc(tokenList.getSourceFilePath(), 0, 0);
+            const ErrorMessage errmsg({std::move(loc)}, tokenList.getSourceFilePath(), severity, msg, id, Certainty::normal);
+            errorLogger.reportErr(errmsg);
+        }
 
-    static bool isFunctionCall(const Token* tok)
-    {
-        if (!Token::simpleMatch(tok, "("))
-            return false;
-        if (tok->isCast())
-            return false;
-        if (!tok->isBinaryOp())
-            return false;
-        if (Token::simpleMatch(tok->link(), ") {"))
-            return false;
-        if (isUnevaluated(tok))
-            return false;
-        return Token::Match(tok->previous(), "%name%|)|]|>");
-    }
-
-    static Token* assignExpr(Token* tok) {
-        while (tok->astParent() && astIsLHS(tok)) {
-            if (tok->astParent()->isAssignmentOp())
-                return tok->astParent();
-            tok = tok->astParent();
-        }
-        return nullptr;
-    }
-
-    static Token* callExpr(Token* tok)
-    {
-        while (tok->astParent() && astIsLHS(tok)) {
-            if (!Token::Match(tok, "%name%|::|<|."))
-                break;
-            if (Token::simpleMatch(tok, "<") && !tok->link())
-                break;
-            tok = tok->astParent();
-        }
-        if (isFunctionCall(tok))
-            return tok;
-        return nullptr;
-    }
-
-    static Token* skipTo(Token* tok, const Token* dest, const Token* end = nullptr) {
-        if (end && dest->index() > end->index())
+        static bool isFunctionCall(const Token* tok)
+        {
+            if (!Token::simpleMatch(tok, "("))
+                return false;
+            if (tok->isCast())
+                return false;
+            if (!tok->isBinaryOp())
+                return false;
+            if (Token::simpleMatch(tok->link(), ") {"))
+                return false;
+            if (isUnevaluated(tok->previous()))
+                return false;
+            return Token::Match(tok->previous(), "%name%|)|]|>");
+        }
+
+        static Token* assignExpr(Token* tok) {
+            while (tok->astParent() && astIsLHS(tok)) {
+                if (tok->astParent()->isAssignmentOp())
+                    return tok->astParent();
+                tok = tok->astParent();
+            }
             return nullptr;
-        const int i = dest->index() - tok->index();
-        if (i > 0)
-            return tok->tokAt(dest->index() - tok->index());
-        return nullptr;
-    }
-
-    static bool isConditional(const Token* tok) {
-        const Token* parent = tok->astParent();
-        while (parent && !Token::Match(parent, "%oror%|&&|:")) {
-            tok = parent;
-            parent = parent->astParent();
-        }
-        return parent && (parent->str() == ":" || parent->astOperand2() == tok);
-    }
-
-    static Token* getStepTokFromEnd(Token* tok) {
-        if (!Token::simpleMatch(tok, "}"))
+        }
+
+        static Token* callExpr(Token* tok)
+        {
+            while (tok->astParent() && astIsLHS(tok)) {
+                if (!Token::Match(tok, "%name%|::|<|."))
+                    break;
+                if (Token::simpleMatch(tok, "<") && !tok->link())
+                    break;
+                tok = tok->astParent();
+            }
+            if (isFunctionCall(tok))
+                return tok;
             return nullptr;
-        Token* end = tok->link()->previous();
-        if (!Token::simpleMatch(end, ")"))
+        }
+
+        static Token* skipTo(Token* tok, const Token* dest, const Token* end = nullptr) {
+            if (end && dest->index() > end->index())
+                return nullptr;
+            const int i = dest->index() - tok->index();
+            if (i > 0)
+                return tok->tokAt(dest->index() - tok->index());
             return nullptr;
-        return getStepTok(end->link());
-    }
-};
+        }
+
+        static Token* getStepTokFromEnd(Token* tok) {
+            if (!Token::simpleMatch(tok, "}"))
+                return nullptr;
+            Token* end = tok->link()->previous();
+            if (!Token::simpleMatch(end, ")"))
+                return nullptr;
+            return getStepTok(end->link());
+        }
+    };
+}
 
-Analyzer::Result valueFlowGenericForward(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const Settings& settings)
+Analyzer::Result valueFlowGenericForward(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (a->invalid())
         return Analyzer::Result{Analyzer::Action::None, Analyzer::Terminate::Bail};
-    ForwardTraversal ft{a, settings};
+    ForwardTraversal ft{a, tokenList, errorLogger, settings};
+    if (start)
+        ft.analyzer->updateState(start);
     ft.updateRange(start, end);
     return Analyzer::Result{ ft.actions, ft.terminate };
 }
 
-Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const Settings& settings)
+Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (Settings::terminated())
         throw TerminateException();
     if (a->invalid())
         return Analyzer::Result{Analyzer::Action::None, Analyzer::Terminate::Bail};
-    ForwardTraversal ft{a, settings};
-    ft.updateRecursive(start);
+    ForwardTraversal ft{a, tokenList, errorLogger, settings};
+    (void)ft.updateRecursive(start);
     return Analyzer::Result{ ft.actions, ft.terminate };
 }
diff --git a/lib/forwardanalyzer.h b/lib/forwardanalyzer.h
index 16c01011dac..7b722f48c35 100644
--- a/lib/forwardanalyzer.h
+++ b/lib/forwardanalyzer.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -21,15 +21,19 @@
 
 #include "analyzer.h"
 
+class ErrorLogger;
 class Settings;
 class Token;
+class TokenList;
 template<class T> class ValuePtr;
 
 Analyzer::Result valueFlowGenericForward(Token* start,
                                          const Token* end,
                                          const ValuePtr<Analyzer>& a,
+                                         const TokenList& tokenList,
+                                         ErrorLogger& errorLogger,
                                          const Settings& settings);
 
-Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const Settings& settings);
+Analyzer::Result valueFlowGenericForward(Token* start, const ValuePtr<Analyzer>& a, const TokenList& tokenList, ErrorLogger& errorLogger, const Settings& settings);
 
 #endif
diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
index 93c06c62754..11434e5356d 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-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
@@ -21,12 +21,12 @@
 #include "astutils.h"
 #include "config.h"
 #include "library.h"
+#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "vfvalue.h"
 
 #include <list>
-#include <map>
 #include <string>
 #include <utility>
 
@@ -76,7 +76,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 +93,7 @@ static bool hasVolatileCastOrVar(const Token *expr)
     return ret;
 }
 
-struct 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)
 {
     // Parse the given tokens
     if (++depth > 1000)
@@ -182,7 +182,7 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
                 }
 
                 // check loop body again..
-                const struct FwdAnalysis::Result &result = checkRecursive(expr, tok->link(), tok, exprVarIds, local, inInnerClass, depth);
+                const FwdAnalysis::Result &result = checkRecursive(expr, tok->link(), tok, exprVarIds, local, inInnerClass, depth);
                 if (result.type == Result::Type::BAILOUT || result.type == Result::Type::READ)
                     return result;
             }
@@ -223,8 +223,8 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
             const Token *bodyStart = tok->linkAt(1)->next();
             const Token *conditionStart = tok->next();
             const Token *condTok = conditionStart->astOperand2();
-            if (condTok->hasKnownIntValue()) {
-                const bool cond = condTok->values().front().intvalue;
+            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)
@@ -237,7 +237,7 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
                 }
             }
             tok = bodyStart->link();
-            if (isReturnScope(tok, &mLibrary))
+            if (isReturnScope(tok, mSettings.library))
                 return Result(Result::Type::BAILOUT);
             if (Token::simpleMatch(tok, "} else {"))
                 tok = tok->linkAt(2);
@@ -273,12 +273,12 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
         if (exprVarIds.find(tok->varId()) != exprVarIds.end()) {
             const Token *parent = tok;
             bool other = false;
-            bool same = tok->astParent() && isSameExpression(mCpp, false, expr, tok, mLibrary, true, false, nullptr);
+            bool same = tok->astParent() && isSameExpression(false, expr, tok, mSettings, true, false, nullptr);
             while (!same && Token::Match(parent->astParent(), "*|.|::|[|(|%cop%")) {
                 parent = parent->astParent();
                 if (parent->str() == "(" && !parent->isCast())
                     break;
-                if (isSameExpression(mCpp, false, expr, parent, mLibrary, true, false, nullptr)) {
+                if (isSameExpression(false, expr, parent, mSettings, true, false, nullptr)) {
                     same = true;
                     if (mWhat == What::ValueFlow) {
                         KnownAndToken v;
@@ -288,7 +288,7 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
                     }
                 }
                 if (Token::Match(parent, ". %var%") && parent->next()->varId() && exprVarIds.find(parent->next()->varId()) == exprVarIds.end() &&
-                    isSameExpression(mCpp, false, expr->astOperand1(), parent->astOperand1(), mLibrary, true, false, nullptr)) {
+                    isSameExpression(false, expr->astOperand1(), parent->astOperand1(), mSettings, true, false, nullptr)) {
                     other = true;
                     break;
                 }
@@ -317,13 +317,31 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
                 // ({ .. })
                 if (hasGccCompoundStatement(parent->astParent()->astOperand2()))
                     return Result(Result::Type::BAILOUT);
-                const bool reassign = isSameExpression(mCpp, false, expr, parent, mLibrary, false, false, nullptr);
+                // cppcheck-suppress shadowFunction - TODO: fix this
+                const bool reassign = isSameExpression(false, expr, parent, mSettings, false, false, nullptr);
                 if (reassign)
                     return Result(Result::Type::WRITE, parent->astParent());
                 return Result(Result::Type::READ);
             }
-            if (mWhat == What::Reassign && parent->valueType() && parent->valueType()->pointer && Token::Match(parent->astParent(), "%assign%") && parent == parent->astParent()->astOperand1())
-                return Result(Result::Type::READ);
+            if (mWhat == What::Reassign) {
+                if (parent->variable() && parent->variable()->type() && parent->variable()->type()->isUnionType() && parent->varId() == expr->varId()) {
+                    while (parent && Token::simpleMatch(parent->astParent(), "."))
+                        parent = parent->astParent();
+                    if (parent && parent->valueType() && Token::simpleMatch(parent->astParent(), "=") && !Token::Match(parent->astParent()->astParent(), "%assign%") && parent->astParent()->astOperand1() == parent) {
+                        const Token * assignment = parent->astParent()->astOperand2();
+                        while (Token::simpleMatch(assignment, ".") && assignment->varId() != expr->varId())
+                            assignment = assignment->astOperand1();
+                        if (assignment && assignment->varId() != expr->varId()) {
+                            if (assignment->valueType() && assignment->valueType()->pointer) // Bailout
+                                return Result(Result::Type::BAILOUT);
+                            return Result(Result::Type::WRITE, parent->astParent());
+                        }
+                    }
+                    return Result(Result::Type::READ);
+                }
+                if (parent->valueType() && parent->valueType()->pointer && Token::Match(parent->astParent(), "%assign%"))
+                    return Result(Result::Type::READ);
+            }
 
             if (Token::Match(parent->astParent(), "%assign%") && !parent->astParent()->astParent() && parent == parent->astParent()->astOperand1()) {
                 if (mWhat == What::Reassign)
@@ -343,12 +361,8 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
                     while (argnr < args.size() && args[argnr] != parent)
                         argnr++;
                     if (argnr < args.size()) {
-                        const Library::Function* functionInfo = mLibrary.getFunction(ftok->astOperand1());
-                        if (functionInfo) {
-                            const auto it = functionInfo->argumentChecks.find(argnr + 1);
-                            if (it != functionInfo->argumentChecks.end() && it->second.direction == Library::ArgumentChecks::Direction::DIR_OUT)
-                                continue;
-                        }
+                        if (mSettings.library.getArgDirection(ftok->astOperand1(), argnr + 1) == Library::ArgumentChecks::Direction::DIR_OUT)
+                            continue;
                     }
                 }
                 return Result(Result::Type::BAILOUT, parent->astParent());
@@ -395,11 +409,6 @@ struct FwdAnalysis::Result FwdAnalysis::checkRecursive(const Token *expr, const
     return Result(Result::Type::NONE);
 }
 
-bool FwdAnalysis::isGlobalData(const Token *expr) const
-{
-    return ::isGlobalData(expr, mCpp);
-}
-
 std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOut, bool* unknownVarIdOut) const
 {
     // all variable ids in expr.
@@ -410,7 +419,7 @@ std::set<nonneg int> FwdAnalysis::getExprVarIds(const Token* expr, bool* localOu
                   [&](const Token *tok) {
         if (tok->str() == "[" && mWhat == What::UnusedValue)
             return ChildrenToVisit::op1;
-        if (tok->varId() == 0 && tok->isName() && tok->previous()->str() != ".") {
+        if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") {
             // unknown variable
             unknownVarId = true;
             return ChildrenToVisit::none;
@@ -469,7 +478,7 @@ bool FwdAnalysis::hasOperand(const Token *tok, const Token *lhs) const
 {
     if (!tok)
         return false;
-    if (isSameExpression(mCpp, false, tok, lhs, mLibrary, false, false, nullptr))
+    if (isSameExpression(false, tok, lhs, mSettings, false, false, nullptr))
         return true;
     return hasOperand(tok->astOperand1(), lhs) || hasOperand(tok->astOperand2(), lhs);
 }
@@ -498,7 +507,11 @@ bool FwdAnalysis::unusedValue(const Token *expr, const Token *startToken, const
 
 bool FwdAnalysis::possiblyAliased(const Token *expr, const Token *startToken) const
 {
-    if (expr->isUnaryOp("*"))
+    if (expr->isUnaryOp("*") && !expr->astOperand1()->isUnaryOp("&"))
+        return true;
+    if (Token::simpleMatch(expr, ". *"))
+        return true;
+    if (expr->str() == "(" && Token::simpleMatch(expr->astOperand1(), "."))
         return true;
 
     const bool macro = false;
@@ -515,7 +528,7 @@ bool FwdAnalysis::possiblyAliased(const Token *expr, const Token *startToken) co
                 if (tok->function() && tok->function()->getArgumentVar(argnr) && !tok->function()->getArgumentVar(argnr)->isReference() && !tok->function()->isConst())
                     continue;
                 for (const Token *subexpr = expr; subexpr; subexpr = subexpr->astOperand1()) {
-                    if (isSameExpression(mCpp, macro, subexpr, args[argnr], mLibrary, pure, followVar)) {
+                    if (isSameExpression(macro, subexpr, args[argnr], mSettings, pure, followVar)) {
                         const Scope* scope = expr->scope(); // if there is no other variable, assume no aliasing
                         if (scope->varlist.size() > 1)
                             return true;
@@ -540,7 +553,7 @@ bool FwdAnalysis::possiblyAliased(const Token *expr, const Token *startToken) co
             continue;
 
         for (const Token *subexpr = expr; subexpr; subexpr = subexpr->astOperand1()) {
-            if (isSameExpression(mCpp, macro, subexpr, addrOf, mLibrary, pure, followVar))
+            if (subexpr != addrOf && isSameExpression(macro, subexpr, addrOf, mSettings, pure, followVar))
                 return true;
         }
     }
diff --git a/lib/fwdanalysis.h b/lib/fwdanalysis.h
index 847d1464e0c..389ea195da2 100644
--- a/lib/fwdanalysis.h
+++ b/lib/fwdanalysis.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -23,11 +23,12 @@
 
 #include "config.h"
 
+#include <cstdint>
 #include <set>
 #include <vector>
 
 class Token;
-class Library;
+class Settings;
 
 /**
  * Forward data flow analysis for checks
@@ -37,7 +38,7 @@ class Library;
  */
 class FwdAnalysis {
 public:
-    FwdAnalysis(bool cpp, const Library &library) : mCpp(cpp), mLibrary(library), mWhat(What::Reassign), mValueFlowKnown(true) {}
+    explicit FwdAnalysis(const Settings &settings) : mSettings(settings) {}
 
     bool hasOperand(const Token *tok, const Token *lhs) const;
 
@@ -60,8 +61,8 @@ class FwdAnalysis {
     bool unusedValue(const Token *expr, const Token *startToken, const Token *endToken);
 
     struct KnownAndToken {
-        bool known;
-        const Token *token;
+        bool known{};
+        const Token* token{};
     };
 
     /** Is there some possible alias for given expression */
@@ -73,23 +74,19 @@ class FwdAnalysis {
 
     /** Result of forward analysis */
     struct Result {
-        enum class Type { NONE, READ, WRITE, BREAK, RETURN, BAILOUT } type;
-        explicit Result(Type type) : type(type), token(nullptr) {}
+        enum class Type : std::uint8_t { NONE, READ, WRITE, BREAK, RETURN, BAILOUT } type;
+        explicit Result(Type type) : type(type) {}
         Result(Type type, const Token *token) : type(type), token(token) {}
-        const Token *token;
+        const Token* token{};
     };
 
-    struct Result check(const Token *expr, const Token *startToken, const Token *endToken);
-    struct 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);
+    Result checkRecursive(const Token *expr, const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local, bool inInnerClass, int depth=0);
 
-    // Is expression a l-value global data?
-    bool isGlobalData(const Token *expr) const;
-
-    const bool mCpp;
-    const Library &mLibrary;
-    enum class What { Reassign, UnusedValue, ValueFlow } mWhat;
+    const Settings &mSettings;
+    enum class What : std::uint8_t { Reassign, UnusedValue, ValueFlow } mWhat = What::Reassign;
     std::vector<KnownAndToken> mValueFlow;
-    bool mValueFlowKnown;
+    bool mValueFlowKnown = true;
 };
 
 #endif // fwdanalysisH
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index c59bf288aa8..acd7842224f 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-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
@@ -19,58 +19,38 @@
 #include "importproject.h"
 
 #include "path.h"
+#include "pathmatch.h"
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
 #include "token.h"
-#include "tokenize.h"
+#include "tokenlist.h"
 #include "utils.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <iterator>
-#include <sstream> // IWYU pragma: keep
+#include <stack>
 #include <unordered_set>
 #include <utility>
+#include <vector>
 
-#include <tinyxml2.h>
+#include "xml.h"
 
-#include <simplecpp.h>
+#include "json.h"
 
-#define PICOJSON_USE_INT64
-#include <picojson.h>
-
-ImportProject::ImportProject()
-{
-    projectType = Type::UNKNOWN;
-}
-
-void ImportProject::ignorePaths(const std::vector<std::string> &ipaths)
+void ImportProject::ignorePaths(const std::vector<std::string> &ipaths, bool debug)
 {
-    for (std::list<FileSettings>::iterator it = fileSettings.begin(); it != fileSettings.end();) {
-        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;
-            }
-            if (isValidGlobPattern(i) && matchglob(i, it->filename)) {
-                ignore = true;
-                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;
-                }
-            }
-        }
-        if (ignore)
+    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);
+        }
         else
             ++it;
     }
@@ -78,7 +58,7 @@ void ImportProject::ignorePaths(const std::vector<std::string> &ipaths)
 
 void ImportProject::ignoreOtherConfigs(const std::string &cfg)
 {
-    for (std::list<FileSettings>::iterator it = fileSettings.begin(); it != fileSettings.end();) {
+    for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
         if (it->cfg != cfg)
             it = fileSettings.erase(it);
         else
@@ -86,7 +66,7 @@ void ImportProject::ignoreOtherConfigs(const std::string &cfg)
     }
 }
 
-void ImportProject::FileSettings::setDefines(std::string defs)
+void ImportProject::fsSetDefines(FileSettings& fs, std::string defs)
 {
     while (defs.find(";%(") != std::string::npos) {
         const std::string::size_type pos1 = defs.find(";%(");
@@ -98,7 +78,7 @@ void ImportProject::FileSettings::setDefines(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] == '=')
@@ -114,7 +94,7 @@ void ImportProject::FileSettings::setDefines(std::string defs)
     }
     if (!eq && !defs.empty())
         defs += "=1";
-    defines.swap(defs);
+    fs.defines.swap(defs);
 }
 
 static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std::string, cppcheck::stricmp> &variables)
@@ -129,7 +109,7 @@ static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std:
         if (expanded.find(var) != expanded.end())
             break;
         expanded.insert(var);
-        std::map<std::string, std::string, cppcheck::stricmp>::const_iterator it1 = variables.find(var);
+        auto it1 = utils::as_const(variables).find(var);
         // variable was not found within defined variables
         if (it1 == variables.end()) {
             const char *envValue = std::getenv(var.c_str());
@@ -144,20 +124,20 @@ static bool simplifyPathWithVariables(std::string &s, std::map<std::string, std:
     }
     if (s.find("$(") != std::string::npos)
         return false;
-    s = Path::simplifyPath(Path::fromNativeSeparators(s));
+    s = Path::simplifyPath(std::move(s));
     return true;
 }
 
-void ImportProject::FileSettings::setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables)
+void ImportProject::fsSetIncludePaths(FileSettings& fs, const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables)
 {
     std::set<std::string> found;
     // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
     const std::list<std::string> copyIn(in);
-    includePaths.clear();
+    fs.includePaths.clear();
     for (const std::string &ipath : copyIn) {
         if (ipath.empty())
             continue;
-        if (ipath.compare(0,2,"%(")==0)
+        if (startsWith(ipath,"%("))
             continue;
         std::string s(Path::fromNativeSeparators(ipath));
         if (!found.insert(s).second)
@@ -165,12 +145,12 @@ void ImportProject::FileSettings::setIncludePaths(const std::string &basepath, c
         if (s[0] == '/' || (s.size() > 1U && s.compare(1,2,":/") == 0)) {
             if (!endsWith(s,'/'))
                 s += '/';
-            includePaths.push_back(std::move(s));
+            fs.includePaths.push_back(std::move(s));
             continue;
         }
 
         if (endsWith(s,'/')) // this is a temporary hack, simplifyPath can crash if path ends with '/'
-            s.erase(s.size() - 1U); // TODO: Use std::string::pop_back() as soon as travis supports it
+            s.pop_back();
 
         if (s.find("$(") == std::string::npos) {
             s = Path::simplifyPath(basepath + s);
@@ -180,11 +160,11 @@ void ImportProject::FileSettings::setIncludePaths(const std::string &basepath, c
         }
         if (s.empty())
             continue;
-        includePaths.push_back(s + '/');
+        fs.includePaths.push_back(s.back() == '/' ? s : (s + '/'));
     }
 }
 
-ImportProject::Type ImportProject::import(const std::string &filename, Settings *settings)
+ImportProject::Type ImportProject::import(const std::string &filename, Settings *settings, Suppressions *supprs)
 {
     std::ifstream fin(filename);
     if (!fin.is_open())
@@ -209,7 +189,8 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
         }
     } else if (endsWith(filename, ".vcxproj")) {
         std::map<std::string, std::string, cppcheck::stricmp> variables;
-        if (importVcxproj(filename, variables, emptyString, fileFilters)) {
+        std::vector<SharedItemsProject> sharedItemsProjects;
+        if (importVcxproj(filename, variables, "", fileFilters, sharedItemsProjects)) {
             setRelativePaths(filename);
             return ImportProject::Type::VS_VCXPROJ;
         }
@@ -218,8 +199,8 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
             setRelativePaths(filename);
             return ImportProject::Type::BORLAND;
         }
-    } else if (settings && endsWith(filename, ".cppcheck")) {
-        if (importCppcheckGuiProject(fin, settings)) {
+    } else if (settings && supprs && endsWith(filename, ".cppcheck")) {
+        if (importCppcheckGuiProject(fin, *settings, *supprs)) {
             setRelativePaths(filename);
             return ImportProject::Type::CPPCHECK_GUI;
         }
@@ -229,11 +210,10 @@ 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[])
+static std::string readUntil(const std::string &command, std::string::size_type *pos, const char until[], bool str = false)
 {
     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)
@@ -274,7 +254,7 @@ static std::string unescape(const std::string &in)
     return out;
 }
 
-void ImportProject::FileSettings::parseCommand(const std::string& command)
+void ImportProject::fsParseCommand(FileSettings& fs, const std::string& command, bool doUnescape)
 {
     std::string defs;
 
@@ -285,6 +265,13 @@ void ImportProject::FileSettings::parseCommand(const std::string& command)
             pos++;
         if (pos >= command.size())
             break;
+        bool wholeArgQuoted = false;
+        if (command[pos] == '"') {
+            wholeArgQuoted = true;
+            pos++;
+            if (pos >= command.size())
+                break;
+        }
         if (command[pos] != '/' && command[pos] != '-')
             continue;
         pos++;
@@ -295,55 +282,36 @@ void ImportProject::FileSettings::parseCommand(const std::string& command)
             while (pos < command.size() && command[pos] == ' ')
                 ++pos;
         }
-        const std::string fval = readUntil(command, &pos, " =");
+        std::string fval = readUntil(command, &pos, " =", wholeArgQuoted);
+        if (wholeArgQuoted && fval.back() == '\"')
+            fval.resize(fval.size() - 1);
         if (F=='D') {
             std::string defval = readUntil(command, &pos, " ");
             defs += fval;
-            if (defval.size() >= 3 && defval.compare(0,2,"=\"")==0 && defval.back()=='\"')
-                defval = "=" + unescape(defval.substr(2, defval.size() - 3));
-            else if (defval.size() >= 5 && defval.compare(0, 3, "=\\\"") == 0 && endsWith(defval, "\\\""))
-                defval = "=\"" + unescape(defval.substr(3, defval.size() - 5)) + "\"";
+            if (doUnescape) {
+                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')
-            undefs.insert(fval);
+            fs.undefs.insert(std::move(fval));
         else if (F=='I') {
-            std::string i = fval;
+            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(includePaths.cbegin(), includePaths.cend(), i) == includePaths.cend())
-                includePaths.push_back(std::move(i));
-        } else if (F=='s' && fval.compare(0,2,"td") == 0) {
+            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;
-            const std::string stdval = readUntil(command, &pos, " ");
-            standard = stdval;
-            // TODO: use simplecpp::DUI::std instead of specifying it manually
-            if (standard.compare(0, 3, "c++") || standard.compare(0, 5, "gnu++")) {
-                const std::string stddef = simplecpp::getCppStdString(standard);
-                if (stddef.empty()) {
-                    // TODO: log error
-                    continue;
-                }
-
-                defs += "__cplusplus=";
-                defs += stddef;
-                defs += ";";
-            } else if (standard.compare(0, 1, "c") || standard.compare(0, 3, "gnu")) {
-                const std::string stddef = simplecpp::getCStdString(standard);
-                if (stddef.empty()) {
-                    // TODO: log error
-                    continue;
-                }
-
-                defs += "__STDC_VERSION__=";
-                defs += stddef;
-                defs += ";";
-            }
+            fs.standard = readUntil(command, &pos, " ");
         } else if (F == 'i' && fval == "system") {
             ++pos;
             std::string isystem = readUntil(command, &pos, " ");
-            systemIncludePaths.push_back(std::move(isystem));
+            fs.systemIncludePaths.push_back(std::move(isystem));
         } else if (F=='m') {
             if (fval == "unicode") {
                 defs += "UNICODE";
@@ -363,9 +331,11 @@ void ImportProject::FileSettings::parseCommand(const std::string& command)
                 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
         }
     }
-    setDefines(defs);
+    fsSetDefines(fs, std::move(defs));
 }
 
 bool ImportProject::importCompileCommands(std::istream &istr)
@@ -373,12 +343,25 @@ 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;
+
     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
@@ -386,10 +369,12 @@ bool ImportProject::importCompileCommands(std::istream &istr)
         if (!endsWith(dirpath, '/'))
             dirpath += '/';
 
-        const std::string directory = dirpath;
+        const std::string directory = std::move(dirpath);
 
+        bool doUnescape = false;
         std::string command;
         if (obj.count("arguments")) {
+            doUnescape = false;
             if (obj["arguments"].is<picojson::array>()) {
                 for (const picojson::value& arg : obj["arguments"].get<picojson::array>()) {
                     if (arg.is<std::string>()) {
@@ -400,51 +385,52 @@ bool ImportProject::importCompileCommands(std::istream &istr)
                     }
                 }
             } 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")) {
+            doUnescape = true;
             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;
             }
         } 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;
         }
 
-        const std::string file = Path::fromNativeSeparators(obj["file"].get<std::string>());
+        std::string file = Path::fromNativeSeparators(obj["file"].get<std::string>());
 
         // Accept file?
         if (!Path::acceptFile(file))
             continue;
 
-        struct FileSettings fs;
+        std::string path;
         if (Path::isAbsolute(file))
-            fs.filename = Path::simplifyPath(file);
+            path = Path::simplifyPath(std::move(file));
 #ifdef _WIN32
         else if (file[0] == '/' && directory.size() > 2 && std::isalpha(directory[0]) && directory[1] == ':')
             // directory: C:\foo\bar
             // file: /xy/z.c
             // => c:/xy/z.c
-            fs.filename = Path::simplifyPath(directory.substr(0,2) + file);
+            path = Path::simplifyPath(directory.substr(0,2) + file);
 #endif
         else
-            fs.filename = Path::simplifyPath(directory + file);
-        if (!sourceFileExists(fs.filename)) {
-            printError("'" + fs.filename + "' from compilation database does not exist");
-            return false;
-        }
-        fs.parseCommand(command); // read settings; -D, -I, -U, -std, -m*, -f*
+            path = Path::simplifyPath(directory + file);
+        FileSettings fs{path, Standards::Language::None, 0}; // file will be identified later on
+        fsParseCommand(fs, command, doUnescape); // read settings; -D, -I, -U, -std, -m*, -f*
         std::map<std::string, std::string, cppcheck::stricmp> variables;
-        fs.setIncludePaths(directory, fs.includePaths, 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]++;
         fileSettings.push_back(std::move(fs));
     }
 
@@ -456,14 +442,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 (line.find("Microsoft Visual Studio Solution File") != 0) {
+    if (!startsWith(line, "Microsoft Visual Studio Solution File")) {
         // Skip BOM
-        if (!std::getline(istr, line) || line.find("Microsoft Visual Studio Solution File") != 0) {
-            printError("Visual Studio solution file header not found");
+        if (!std::getline(istr, line) || !startsWith(line, "Microsoft Visual Studio Solution File")) {
+            errors.emplace_back("Visual Studio solution file header not found");
             return false;
         }
     }
@@ -472,9 +458,9 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
     variables["SolutionDir"] = path;
 
     bool found = false;
-
+    std::vector<SharedItemsProject> sharedItemsProjects;
     while (std::getline(istr,line)) {
-        if (line.compare(0,8,"Project(")!=0)
+        if (!startsWith(line,"Project("))
             continue;
         const std::string::size_type pos = line.find(".vcxproj");
         if (pos == std::string::npos)
@@ -483,17 +469,19 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
         if (pos1 == std::string::npos)
             continue;
         std::string vcxproj(line.substr(pos1+1, pos-pos1+7));
+        vcxproj = Path::toNativeSeparators(std::move(vcxproj));
         if (!Path::isAbsolute(vcxproj))
             vcxproj = path + vcxproj;
-        if (!importVcxproj(Path::fromNativeSeparators(vcxproj), variables, emptyString, fileFilters)) {
-            printError("failed to load '" + vcxproj + "' from Visual Studio solution");
+        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;
     }
 
     if (!found) {
-        printError("no projects found in Visual Studio solution file");
+        errors.emplace_back("no projects found in Visual Studio solution file");
         return false;
     }
 
@@ -502,17 +490,19 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
 
 namespace {
     struct ProjectConfiguration {
-        explicit ProjectConfiguration(const tinyxml2::XMLElement *cfg) : platform(Unknown) {
+        explicit ProjectConfiguration(const tinyxml2::XMLElement *cfg) {
             const char *a = cfg->Attribute("Include");
             if (a)
                 name = a;
             for (const tinyxml2::XMLElement *e = cfg->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                if (!e->GetText())
+                const char * const text = e->GetText();
+                if (!text)
                     continue;
-                if (std::strcmp(e->Name(),"Configuration")==0)
-                    configuration = e->GetText();
-                else if (std::strcmp(e->Name(),"Platform")==0) {
-                    platformStr = e->GetText();
+                const char * ename = e->Name();
+                if (std::strcmp(ename,"Configuration")==0)
+                    configuration = text;
+                else if (std::strcmp(ename,"Platform")==0) {
+                    platformStr = text;
                     if (platformStr == "Win32")
                         platform = Win32;
                     else if (platformStr == "x64")
@@ -524,51 +514,15 @@ namespace {
         }
         std::string name;
         std::string configuration;
-        enum { Win32, x64, Unknown } platform;
+        enum : std::uint8_t { Win32, x64, Unknown } platform = Unknown;
         std::string platformStr;
     };
 
-    struct ItemDefinitionGroup {
-        explicit ItemDefinitionGroup(const tinyxml2::XMLElement *idg, std::string includePaths) : additionalIncludePaths(std::move(includePaths)) {
+    struct ConditionalGroup {
+        explicit ConditionalGroup(const tinyxml2::XMLElement *idg){
             const char *condAttr = idg->Attribute("Condition");
             if (condAttr)
-                condition = condAttr;
-            for (const tinyxml2::XMLElement *e1 = idg->FirstChildElement(); e1; e1 = e1->NextSiblingElement()) {
-                if (std::strcmp(e1->Name(), "ClCompile") == 0) {
-                    enhancedInstructionSet = "StreamingSIMDExtensions2";
-                    for (const tinyxml2::XMLElement *e = e1->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                        if (e->GetText()) {
-                            if (std::strcmp(e->Name(), "PreprocessorDefinitions") == 0)
-                                preprocessorDefinitions = e->GetText();
-                            else if (std::strcmp(e->Name(), "AdditionalIncludeDirectories") == 0) {
-                                if (!additionalIncludePaths.empty())
-                                    additionalIncludePaths += ';';
-                                additionalIncludePaths += e->GetText();
-                            } else if (std::strcmp(e->Name(), "LanguageStandard") == 0) {
-                                if (std::strcmp(e->GetText(), "stdcpp14") == 0)
-                                    cppstd = Standards::CPP14;
-                                else if (std::strcmp(e->GetText(), "stdcpp17") == 0)
-                                    cppstd = Standards::CPP17;
-                                else if (std::strcmp(e->GetText(), "stdcpp20") == 0)
-                                    cppstd = Standards::CPP20;
-                                else if (std::strcmp(e->GetText(), "stdcpplatest") == 0)
-                                    cppstd = Standards::CPPLatest;
-                            } else if (std::strcmp(e->Name(), "EnableEnhancedInstructionSet") == 0) {
-                                enhancedInstructionSet = e->GetText();
-                            }
-                        }
-                    }
-                }
-                else if (std::strcmp(e1->Name(), "Link") == 0) {
-                    for (const tinyxml2::XMLElement *e = e1->FirstChildElement(); e; e = e->NextSiblingElement()) {
-                        if (!e->GetText())
-                            continue;
-                        if (std::strcmp(e->Name(), "EntryPointSymbol") == 0) {
-                            entryPointSymbol = e->GetText();
-                        }
-                    }
-                }
-            }
+                mCondition = condAttr;
         }
 
         static void replaceAll(std::string &c, const std::string &from, const std::string &to) {
@@ -579,20 +533,38 @@ namespace {
             }
         }
 
+        // 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())
+            if (mCondition.empty())
                 return true;
-            std::string c = '(' + condition + ");";
+            std::string c = '(' + mCondition + ");";
             replaceAll(c, "$(Configuration)", p.configuration);
             replaceAll(c, "$(Platform)", p.platformStr);
 
-            // TODO : Better evaluation
-            Settings s;
-            std::istringstream istr(c);
-            Tokenizer tokenizer(&s);
-            tokenizer.tokenize(istr,"vcxproj");
-            for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
+            // TODO: improve evaluation
+            const Settings s;
+            TokenList tokenlist(s, Standards::Language::C);
+            tokenlist.createTokensFromBuffer(c.data(), c.size()); // 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();
+                    }
+                }
+            }
+            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();
                 }
@@ -601,13 +573,75 @@ namespace {
             }
             return false;
         }
-        std::string condition;
+    private:
+        std::string mCondition;
+    };
+
+    struct ItemDefinitionGroup : ConditionalGroup {
+        explicit ItemDefinitionGroup(const tinyxml2::XMLElement *idg, std::string includePaths) : ConditionalGroup(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) {
+                    enhancedInstructionSet = "StreamingSIMDExtensions2";
+                    for (const tinyxml2::XMLElement *e = e1->FirstChildElement(); e; e = e->NextSiblingElement()) {
+                        const char * const text = e->GetText();
+                        if (!text)
+                            continue;
+                        const char * const ename = e->Name();
+                        if (std::strcmp(ename, "PreprocessorDefinitions") == 0)
+                            preprocessorDefinitions = text;
+                        else if (std::strcmp(ename, "AdditionalIncludeDirectories") == 0) {
+                            if (!additionalIncludePaths.empty())
+                                additionalIncludePaths += ';';
+                            additionalIncludePaths += text;
+                        } else if (std::strcmp(ename, "LanguageStandard") == 0) {
+                            if (std::strcmp(text, "stdcpp14") == 0)
+                                cppstd = Standards::CPP14;
+                            else if (std::strcmp(text, "stdcpp17") == 0)
+                                cppstd = Standards::CPP17;
+                            else if (std::strcmp(text, "stdcpp20") == 0)
+                                cppstd = Standards::CPP20;
+                            else if (std::strcmp(text, "stdcpplatest") == 0)
+                                cppstd = Standards::CPPLatest;
+                        } else if (std::strcmp(ename, "EnableEnhancedInstructionSet") == 0) {
+                            enhancedInstructionSet = text;
+                        }
+                    }
+                }
+                else if (std::strcmp(name, "Link") == 0) {
+                    for (const tinyxml2::XMLElement *e = e1->FirstChildElement(); e; e = e->NextSiblingElement()) {
+                        const char * const text = e->GetText();
+                        if (!text)
+                            continue;
+                        if (std::strcmp(e->Name(), "EntryPointSymbol") == 0) {
+                            entryPointSymbol = text;
+                        }
+                    }
+                }
+            }
+        }
+
         std::string enhancedInstructionSet;
         std::string preprocessorDefinitions;
         std::string additionalIncludePaths;
         std::string entryPointSymbol; // TODO: use this
         Standards::cppstd_t cppstd = Standards::CPPLatest;
     };
+
+    struct ConfigurationPropertyGroup : ConditionalGroup {
+        explicit ConfigurationPropertyGroup(const tinyxml2::XMLElement *idg) : ConditionalGroup(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;
+                }
+            }
+        }
+
+        bool useOfMfc = false;
+        bool useUnicode = false;
+    };
 }
 
 static std::list<std::string> toStringList(const std::string &s)
@@ -626,23 +660,14 @@ 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()) {
-            const std::string name(propertyGroup->Name());
-            const char *text = propertyGroup->GetText();
-            variables[name] = std::string(text ? text : "");
+            const char* name = propertyGroup->Name();
+            const char *text = empty_if_null(propertyGroup->GetText());
+            variables[name] = text;
         }
 
     } else if (!labelAttribute) {
@@ -656,7 +681,7 @@ static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::
             const std::string::size_type pos = path.find("$(IncludePath)");
             if (pos != std::string::npos)
                 path.replace(pos, 14U, includePath);
-            includePath = path;
+            includePath = std::move(path);
         }
     }
 }
@@ -679,7 +704,8 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s
     if (rootnode == nullptr)
         return;
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
-        if (std::strcmp(node->Name(), "ImportGroup") == 0) {
+        const char* name = node->Name();
+        if (std::strcmp(name, "ImportGroup") == 0) {
             const char *labelAttribute = node->Attribute("Label");
             if (labelAttribute == nullptr || std::strcmp(labelAttribute, "PropertySheets") != 0)
                 continue;
@@ -695,38 +721,48 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s
                     loadVisualStudioProperties(loadprj, variables, includePath, additionalIncludeDirectories, itemDefinitionGroupList);
                 }
             }
-        } else if (std::strcmp(node->Name(),"PropertyGroup")==0) {
-            importPropertyGroup(node, variables, includePath, nullptr);
-        } else if (std::strcmp(node->Name(),"ItemDefinitionGroup")==0) {
+        } else if (std::strcmp(name,"PropertyGroup")==0) {
+            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)
+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<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()) {
-        if (std::strcmp(node->Name(), "ItemGroup") == 0) {
+        const char* name = node->Name();
+        if (std::strcmp(name, "ItemGroup") == 0) {
             const char *labelAttribute = node->Attribute("Label");
             if (labelAttribute && std::strcmp(labelAttribute, "ProjectConfigurations") == 0) {
                 for (const tinyxml2::XMLElement *cfg = node->FirstChildElement(); cfg; cfg = cfg->NextSiblingElement()) {
@@ -742,16 +778,23 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                 for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
                     if (std::strcmp(e->Name(), "ClCompile") == 0) {
                         const char *include = e->Attribute("Include");
-                        if (include && Path::acceptFile(include))
-                            compileList.emplace_back(include);
+                        if (include && Path::acceptFile(include)) {
+                            std::string toInclude = Path::simplifyPath(Path::isAbsolute(include) ? include : Path::getPathFromFilename(filename) + include);
+                            compileList.emplace_back(toInclude);
+                        }
                     }
                 }
             }
-        } else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
+        } else if (std::strcmp(name, "ItemDefinitionGroup") == 0) {
             itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
-        } else if (std::strcmp(node->Name(), "PropertyGroup") == 0) {
-            importPropertyGroup(node, variables, includePath, &useOfMfc);
-        } else if (std::strcmp(node->Name(), "ImportGroup") == 0) {
+        } else if (std::strcmp(name, "PropertyGroup") == 0) {
+            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) {
                 for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
@@ -761,13 +804,56 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                             loadVisualStudioProperties(projectAttribute, variables, includePath, additionalIncludeDirectories, itemDefinitionGroupList);
                     }
                 }
+            } else if (labelAttribute && std::strcmp(labelAttribute, "Shared") == 0) {
+                for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
+                    if (std::strcmp(e->Name(), "Import") == 0) {
+                        const char *projectAttribute = e->Attribute("Project");
+                        if (projectAttribute) {
+                            // Path to shared items project is relative to current project directory,
+                            // unless the string starts with $(SolutionDir)
+                            std::string pathToSharedItemsFile;
+                            if (std::string(projectAttribute).rfind("$(SolutionDir)", 0) == 0) {
+                                pathToSharedItemsFile = projectAttribute;
+                            } else {
+                                pathToSharedItemsFile = variables["ProjectDir"] + projectAttribute;
+                            }
+                            if (!simplifyPathWithVariables(pathToSharedItemsFile, variables)) {
+                                errors.emplace_back("Could not simplify path to referenced shared items project");
+                                return false;
+                            }
+
+                            SharedItemsProject toAdd = importVcxitems(pathToSharedItemsFile, fileFilters, cache);
+                            if (!toAdd.successful) {
+                                errors.emplace_back("Could not load shared items project \"" + pathToSharedItemsFile + "\" from original path \"" + std::string(projectAttribute) + "\".");
+                                return false;
+                            }
+                            sharedItemsProjects.emplace_back(toAdd);
+                        }
+                    }
+                }
             }
         }
     }
+    // # TODO: support signedness of char via /J (and potential XML option for it)?
+    // we can only set it globally but in this context it needs to be treated per file
+
+    // Include shared items project files
+    std::vector<std::string> sharedItemsIncludePaths;
+    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));
+        }
+        for (const auto &p : sharedProject.includePaths) {
+            std::string path = Path::simplifyPath(Path::getPathFromFilename(sharedProject.pathToProjectFile) + p);
+            sharedItemsIncludePaths.emplace_back(std::move(path));
+        }
+    }
 
-    for (const std::string &c : compileList) {
-        const std::string cfilename = Path::simplifyPath(Path::isAbsolute(c) ? c : Path::getPathFromFilename(filename) + c);
-        if (!fileFilters.empty() && !matchglobs(fileFilters, cfilename))
+    // Project files
+    PathMatch filtermatcher(fileFilters, Path::getCurrentPath());
+    for (const std::string &cfilename : compileList) {
+        if (!fileFilters.empty() && !filtermatcher.match(cfilename))
             continue;
 
         for (const ProjectConfiguration &p : projectConfigurationList) {
@@ -780,16 +866,15 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                     continue;
             }
 
-            FileSettings fs;
-            fs.filename = cfilename;
+            FileSettings fs{cfilename, 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 = cppcheck::Platform::Type::Win32W;
+                fs.platformType = Platform::Type::Win32W;
             else if (p.platform == ProjectConfiguration::x64) {
-                fs.platformType = cppcheck::Platform::Type::Win64;
+                fs.platformType = Platform::Type::Win64;
                 fs.defines += ";_WIN64=1";
             }
             std::string additionalIncludePaths;
@@ -810,8 +895,22 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                     fs.defines += ";__AVX512__";
                 additionalIncludePaths += ';' + i.additionalIncludePaths;
             }
-            fs.setDefines(fs.defines);
-            fs.setIncludePaths(Path::getPathFromFilename(filename), toStringList(includePath + ';' + additionalIncludePaths), variables);
+            bool useUnicode = false;
+            for (const ConfigurationPropertyGroup &c : configurationPropertyGroups) {
+                if (!c.conditionIsTrue(p))
+                    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);
+            for (const auto &path : sharedItemsIncludePaths) {
+                fs.includePaths.emplace_back(path);
+            }
             fileSettings.push_back(std::move(fs));
         }
     }
@@ -819,17 +918,81 @@ bool ImportProject::importVcxproj(const std::string &filename, std::map<std::str
     return true;
 }
 
+ImportProject::SharedItemsProject ImportProject::importVcxitems(const std::string& filename, const std::vector<std::string>& fileFilters, std::vector<SharedItemsProject> &cache)
+{
+    auto isInCacheCheck = [filename](const ImportProject::SharedItemsProject& e) -> bool {
+        return filename == e.pathToProjectFile;
+    };
+    const auto iterator = std::find_if(cache.begin(), cache.end(), isInCacheCheck);
+    if (iterator != std::end(cache)) {
+        return *iterator;
+    }
+
+    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) {
+        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) {
+        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()) {
+        if (std::strcmp(node->Name(), "ItemGroup") == 0) {
+            for (const tinyxml2::XMLElement *e = node->FirstChildElement(); e; e = e->NextSiblingElement()) {
+                if (std::strcmp(e->Name(), "ClCompile") == 0) {
+                    const char* include = e->Attribute("Include");
+                    if (include && Path::acceptFile(include)) {
+                        std::string file(include);
+                        findAndReplace(file, "$(MSBuildThisFileDirectory)", "./");
+
+                        // Skip file if it doesn't match the filter
+                        if (!fileFilters.empty() && !filtermatcher.match(file))
+                            continue;
+
+                        result.sourceFiles.emplace_back(file);
+                    } else {
+                        errors.emplace_back("Could not find shared items source file");
+                        return result;
+                    }
+                }
+            }
+        } else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
+            ItemDefinitionGroup temp(node, "");
+            for (const auto& includePath : toStringList(temp.additionalIncludePaths)) {
+                if (includePath == "%(AdditionalIncludeDirectories)")
+                    continue;
+
+                std::string toAdd(includePath);
+                findAndReplace(toAdd, "$(MSBuildThisFileDirectory)", "./");
+                result.includePaths.emplace_back(toAdd);
+            }
+        }
+    }
+
+    result.successful = true;
+    cache.emplace_back(result);
+    return result;
+}
+
 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;
     }
 
@@ -842,7 +1005,8 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
     std::string cflag1;
 
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
-        if (std::strcmp(node->Name(), "FILELIST") == 0) {
+        const char* name = node->Name();
+        if (std::strcmp(name, "FILELIST") == 0) {
             for (const tinyxml2::XMLElement *f = node->FirstChildElement(); f; f = f->NextSiblingElement()) {
                 if (std::strcmp(f->Name(), "FILE") == 0) {
                     const char *filename = f->Attribute("FILENAME");
@@ -850,23 +1014,24 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
                         compileList.emplace_back(filename);
                 }
             }
-        } else if (std::strcmp(node->Name(), "MACROS") == 0) {
+        } else if (std::strcmp(name, "MACROS") == 0) {
             for (const tinyxml2::XMLElement *m = node->FirstChildElement(); m; m = m->NextSiblingElement()) {
-                if (std::strcmp(m->Name(), "INCLUDEPATH") == 0) {
+                const char* mname = m->Name();
+                if (std::strcmp(mname, "INCLUDEPATH") == 0) {
                     const char *v = m->Attribute("value");
                     if (v)
                         includePath = v;
-                } else if (std::strcmp(m->Name(), "USERDEFINES") == 0) {
+                } else if (std::strcmp(mname, "USERDEFINES") == 0) {
                     const char *v = m->Attribute("value");
                     if (v)
                         userdefines = v;
-                } else if (std::strcmp(m->Name(), "SYSDEFINES") == 0) {
+                } else if (std::strcmp(mname, "SYSDEFINES") == 0) {
                     const char *v = m->Attribute("value");
                     if (v)
                         sysdefines = v;
                 }
             }
-        } else if (std::strcmp(node->Name(), "OPTIONS") == 0) {
+        } else if (std::strcmp(name, "OPTIONS") == 0) {
             for (const tinyxml2::XMLElement *m = node->FirstChildElement(); m; m = m->NextSiblingElement()) {
                 if (std::strcmp(m->Name(), "CFLAG1") == 0) {
                     const char *v = m->Attribute("value");
@@ -893,7 +1058,7 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
         }
 
         if (!arg.empty()) {
-            cflags.insert(arg);
+            cflags.insert(std::move(arg));
         }
 
         // cleanup: -t is "An alternate name for the -Wxxx switches; there is no difference"
@@ -917,7 +1082,7 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
             { "-tWV","-WV" }
         };
 
-        for (std::map<std::string, std::string>::const_iterator i = synonyms.cbegin(); i != synonyms.cend(); ++i) {
+        for (auto i = synonyms.cbegin(); i != synonyms.cend(); ++i) {
             if (cflags.erase(i->first) > 0) {
                 cflags.insert(i->second);
             }
@@ -1075,10 +1240,10 @@ bool ImportProject::importBcb6Prj(const std::string &projectFilename)
         //
         // We can also force C++ compilation for all files using the -P command line switch.
         const bool cppMode = forceCppMode || Path::getFilenameExtensionInLowerCase(c) == ".cpp";
-        FileSettings fs;
-        fs.setIncludePaths(projectDir, toStringList(includePath), variables);
-        fs.setDefines(cppMode ? cppDefines : defines);
-        fs.filename = Path::simplifyPath(Path::isAbsolute(c) ? c : projectDir + c);
+        // TODO: needs to set language and ignore later identification and language enforcement
+        FileSettings fs{Path::simplifyPath(Path::isAbsolute(c) ? c : projectDir + c), Standards::Language::None, 0}; // file will be identified later on
+        fsSetIncludePaths(fs, projectDir, toStringList(includePath), variables);
+        fsSetDefines(fs, cppMode ? cppDefines : defines);
         fileSettings.push_back(std::move(fs));
     }
 
@@ -1100,7 +1265,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;
 }
@@ -1120,221 +1298,236 @@ static std::string istream_to_string(std::istream &istr)
     return std::string(std::istreambuf_iterator<char>(istr), eos);
 }
 
-static const char * readSafe(const char *s, const char *def) {
-    return s ? s : def;
-}
-
-bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *settings)
+bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs)
 {
     tinyxml2::XMLDocument doc;
     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;
     }
 
     const std::string &path = mPath;
 
     std::list<std::string> paths;
-    std::list<Suppressions::Suppression> suppressions;
+    std::list<SuppressionList::Suppression> suppressions;
     Settings temp;
 
-    guiProject.analyzeAllVsConfigs.clear();
-
-    bool checkLevelExhaustive = false;
+    // default to --check-level=normal for import for now
+    temp.setCheckLevel(Settings::CheckLevel::normal);
 
     // TODO: this should support all available command-line options
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
-        if (strcmp(node->Name(), CppcheckXml::RootPathName) == 0) {
-            if (node->Attribute(CppcheckXml::RootPathNameAttrib)) {
-                temp.basePaths.push_back(joinRelativePath(path, node->Attribute(CppcheckXml::RootPathNameAttrib)));
+        const char* name = node->Name();
+        if (strcmp(name, CppcheckXml::RootPathName) == 0) {
+            const char* attr = node->Attribute(CppcheckXml::RootPathNameAttrib);
+            if (attr) {
+                temp.basePaths.push_back(Path::fromNativeSeparators(joinRelativePath(path, attr)));
                 temp.relativePaths = true;
             }
-        } else if (strcmp(node->Name(), CppcheckXml::BuildDirElementName) == 0)
-            temp.buildDir = joinRelativePath(path, readSafe(node->GetText(), ""));
-        else if (strcmp(node->Name(), CppcheckXml::IncludeDirElementName) == 0)
-            temp.includePaths = readXmlStringList(node, path, CppcheckXml::DirElementName, CppcheckXml::DirNameAttrib);
-        else if (strcmp(node->Name(), CppcheckXml::DefinesElementName) == 0)
-            temp.userDefines = join(readXmlStringList(node, "", CppcheckXml::DefineName, CppcheckXml::DefineNameAttrib), ";");
-        else if (strcmp(node->Name(), CppcheckXml::UndefinesElementName) == 0) {
+        } 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); // TODO: append instead of overwrite
+        else if (strcmp(name, CppcheckXml::DefinesElementName) == 0)
+            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(node->Name(), CppcheckXml::ImportProjectElementName) == 0) {
-            const std::string t_str = readSafe(node->GetText(), "");
+        } else if (strcmp(name, CppcheckXml::ImportProjectElementName) == 0) {
+            const std::string t_str = empty_if_null(node->GetText());
             if (!t_str.empty())
                 guiProject.projectFile = path + t_str;
         }
-        else if (strcmp(node->Name(), CppcheckXml::PathsElementName) == 0)
+        else if (strcmp(name, CppcheckXml::PathsElementName) == 0)
             paths = readXmlStringList(node, path, CppcheckXml::PathName, CppcheckXml::PathNameAttrib);
-        else if (strcmp(node->Name(), CppcheckXml::ExcludeElementName) == 0)
-            guiProject.excludedPaths = readXmlStringList(node, "", CppcheckXml::ExcludePathName, CppcheckXml::ExcludePathNameAttrib);
-        else if (strcmp(node->Name(), CppcheckXml::FunctionContracts) == 0)
+        else if (strcmp(name, CppcheckXml::ExcludeElementName) == 0)
+            guiProject.excludedPaths = readXmlPathMatchList(node, path, CppcheckXml::ExcludePathName, CppcheckXml::ExcludePathNameAttrib); // TODO: append instead of overwrite
+        else if (strcmp(name, CppcheckXml::FunctionContracts) == 0)
             ;
-        else if (strcmp(node->Name(), CppcheckXml::VariableContractsElementName) == 0)
+        else if (strcmp(name, CppcheckXml::VariableContractsElementName) == 0)
             ;
-        else if (strcmp(node->Name(), CppcheckXml::IgnoreElementName) == 0)
-            guiProject.excludedPaths = readXmlStringList(node, "", CppcheckXml::IgnorePathName, CppcheckXml::IgnorePathNameAttrib);
-        else if (strcmp(node->Name(), CppcheckXml::LibrariesElementName) == 0)
-            guiProject.libraries = readXmlStringList(node, "", CppcheckXml::LibraryElementName, nullptr);
-        else if (strcmp(node->Name(), CppcheckXml::SuppressionsElementName) == 0) {
+        else if (strcmp(name, CppcheckXml::IgnoreElementName) == 0)
+            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); // 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)
                     continue;
-                Suppressions::Suppression s;
-                s.errorId = readSafe(child->GetText(), "");
-                s.fileName = readSafe(child->Attribute("fileName"), "");
+                SuppressionList::Suppression s;
+                s.errorId = empty_if_null(child->GetText());
+                s.fileName = empty_if_null(child->Attribute("fileName"));
                 if (!s.fileName.empty())
                     s.fileName = joinRelativePath(path, s.fileName);
-                s.lineNumber = child->IntAttribute("lineNumber", Suppressions::Suppression::NO_LINE);
-                s.symbolName = readSafe(child->Attribute("symbolName"), "");
-                s.hash = strToInt<std::size_t>(readSafe(child->Attribute("hash"), "0"));
+                s.lineNumber = child->IntAttribute("lineNumber", SuppressionList::Suppression::NO_LINE); // TODO: should not depend on Suppression
+                s.symbolName = empty_if_null(child->Attribute("symbolName"));
+                s.hash = strToInt<std::size_t>(default_if_null(child->Attribute("hash"), "0"));
                 suppressions.push_back(std::move(s));
             }
-        } else if (strcmp(node->Name(), CppcheckXml::VSConfigurationElementName) == 0)
-            guiProject.checkVsConfigs = readXmlStringList(node, emptyString, CppcheckXml::VSConfigurationName, nullptr);
-        else if (strcmp(node->Name(), CppcheckXml::PlatformElementName) == 0)
-            guiProject.platform = readSafe(node->GetText(), "");
-        else if (strcmp(node->Name(), CppcheckXml::AnalyzeAllVsConfigsElementName) == 0)
-            guiProject.analyzeAllVsConfigs = readSafe(node->GetText(), "");
-        else if (strcmp(node->Name(), CppcheckXml::Parser) == 0)
+        } else if (strcmp(name, CppcheckXml::VSConfigurationElementName) == 0)
+            guiProject.checkVsConfigs = readXmlStringList(node, "", CppcheckXml::VSConfigurationName, nullptr);
+        else if (strcmp(name, CppcheckXml::PlatformElementName) == 0)
+            guiProject.platform = empty_if_null(node->GetText());
+        else if (strcmp(name, CppcheckXml::AnalyzeAllVsConfigsElementName) == 0)
+            temp.analyzeAllVsConfigs = std::string(empty_if_null(node->GetText())) != "false";
+        else if (strcmp(name, CppcheckXml::Parser) == 0)
             temp.clang = true;
-        else if (strcmp(node->Name(), CppcheckXml::AddonsElementName) == 0) {
-            const auto& addons = readXmlStringList(node, emptyString, CppcheckXml::AddonElementName, nullptr);
+        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(node->Name(), CppcheckXml::TagsElementName) == 0)
+        else if (strcmp(name, CppcheckXml::TagsElementName) == 0)
             node->Attribute(CppcheckXml::TagElementName); // FIXME: Write some warning
-        else if (strcmp(node->Name(), CppcheckXml::ToolsElementName) == 0) {
-            const std::list<std::string> toolList = readXmlStringList(node, emptyString, CppcheckXml::ToolElementName, nullptr);
+        else if (strcmp(name, CppcheckXml::ToolsElementName) == 0) {
+            const std::list<std::string> toolList = readXmlStringList(node, "", CppcheckXml::ToolElementName, nullptr);
             for (const std::string &toolName : toolList) {
                 if (toolName == CppcheckXml::ClangTidy)
                     temp.clangTidy = true;
             }
-        } else if (strcmp(node->Name(), CppcheckXml::CheckHeadersElementName) == 0)
-            temp.checkHeaders = (strcmp(readSafe(node->GetText(), ""), "true") == 0);
-        else if (strcmp(node->Name(), CppcheckXml::CheckLevelExhaustiveElementName) == 0)
-            checkLevelExhaustive = true;
-        else if (strcmp(node->Name(), CppcheckXml::CheckUnusedTemplatesElementName) == 0)
-            temp.checkUnusedTemplates = (strcmp(readSafe(node->GetText(), ""), "true") == 0);
-        else if (strcmp(node->Name(), CppcheckXml::MaxCtuDepthElementName) == 0)
-            temp.maxCtuDepth = strToInt<int>(readSafe(node->GetText(), "2")); // TODO: bail out when missing?
-        else if (strcmp(node->Name(), CppcheckXml::MaxTemplateRecursionElementName) == 0)
-            temp.maxTemplateRecursion = strToInt<int>(readSafe(node->GetText(), "100")); // TODO: bail out when missing?
-        else if (strcmp(node->Name(), CppcheckXml::CheckUnknownFunctionReturn) == 0)
+        } else if (strcmp(name, CppcheckXml::CheckHeadersElementName) == 0)
+            temp.checkHeaders = (strcmp(default_if_null(node->GetText(), ""), "true") == 0);
+        else if (strcmp(name, CppcheckXml::CheckLevelReducedElementName) == 0)
+            temp.setCheckLevel(Settings::CheckLevel::reduced);
+        else if (strcmp(name, CppcheckXml::CheckLevelNormalElementName) == 0)
+            temp.setCheckLevel(Settings::CheckLevel::normal);
+        else if (strcmp(name, CppcheckXml::CheckLevelExhaustiveElementName) == 0)
+            temp.setCheckLevel(Settings::CheckLevel::exhaustive);
+        else if (strcmp(name, CppcheckXml::CheckUnusedTemplatesElementName) == 0)
+            temp.checkUnusedTemplates = (strcmp(default_if_null(node->GetText(), ""), "true") == 0);
+        else if (strcmp(name, CppcheckXml::InlineSuppression) == 0)
+            temp.inlineSuppressions = (strcmp(default_if_null(node->GetText(), ""), "true") == 0);
+        else if (strcmp(name, CppcheckXml::MaxCtuDepthElementName) == 0)
+            temp.maxCtuDepth = strToInt<int>(default_if_null(node->GetText(), "2")); // TODO: bail out when missing?
+        else if (strcmp(name, CppcheckXml::MaxTemplateRecursionElementName) == 0)
+            temp.maxTemplateRecursion = strToInt<int>(default_if_null(node->GetText(), "100")); // TODO: bail out when missing?
+        else if (strcmp(name, CppcheckXml::CheckUnknownFunctionReturn) == 0)
             ; // TODO
-        else if (strcmp(node->Name(), Settings::SafeChecks::XmlRootName) == 0) {
+        else if (strcmp(name, Settings::SafeChecks::XmlRootName) == 0) {
             for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) {
-                if (strcmp(child->Name(), Settings::SafeChecks::XmlClasses) == 0)
+                const char* childname = child->Name();
+                if (strcmp(childname, Settings::SafeChecks::XmlClasses) == 0)
                     temp.safeChecks.classes = true;
-                else if (strcmp(child->Name(), Settings::SafeChecks::XmlExternalFunctions) == 0)
+                else if (strcmp(childname, Settings::SafeChecks::XmlExternalFunctions) == 0)
                     temp.safeChecks.externalFunctions = true;
-                else if (strcmp(child->Name(), Settings::SafeChecks::XmlInternalFunctions) == 0)
+                else if (strcmp(childname, Settings::SafeChecks::XmlInternalFunctions) == 0)
                     temp.safeChecks.internalFunctions = true;
-                else if (strcmp(child->Name(), Settings::SafeChecks::XmlExternalVariables) == 0)
+                else if (strcmp(childname, Settings::SafeChecks::XmlExternalVariables) == 0)
                     temp.safeChecks.externalVariables = true;
                 else {
-                    printError("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + std::string(child->Name()) + "' in Cppcheck project file");
+                    errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck project file");
                     return false;
                 }
             }
-        } else if (strcmp(node->Name(), CppcheckXml::TagWarningsElementName) == 0)
+        } else if (strcmp(name, CppcheckXml::TagWarningsElementName) == 0)
             ; // TODO
         // Cppcheck Premium features
-        else if (strcmp(node->Name(), CppcheckXml::BughuntingElementName) == 0)
+        else if (strcmp(name, CppcheckXml::BughuntingElementName) == 0)
             temp.premiumArgs += " --bughunting";
-        else if (strcmp(node->Name(), CppcheckXml::CertIntPrecisionElementName) == 0)
-            temp.premiumArgs += std::string(" --cert-c-int-precision=") + readSafe(node->GetText(), "0");
-        else if (strcmp(node->Name(), CppcheckXml::CodingStandardsElementName) == 0) {
+        else if (strcmp(name, CppcheckXml::CertIntPrecisionElementName) == 0)
+            temp.premiumArgs += std::string(" --cert-c-int-precision=") + default_if_null(node->GetText(), "0");
+        else if (strcmp(name, CppcheckXml::CodingStandardsElementName) == 0) {
             for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) {
-                if (strcmp(child->Name(), CppcheckXml::CodingStandardElementName) == 0 && child->GetText())
-                    temp.premiumArgs += std::string(" --") + child->GetText();
+                if (strcmp(child->Name(), CppcheckXml::CodingStandardElementName) == 0) {
+                    const char* text = child->GetText();
+                    if (text)
+                        temp.premiumArgs += std::string(" --") + text;
+                }
             }
         }
+        else if (strcmp(name, CppcheckXml::ProjectNameElementName) == 0)
+            ; // no-op
         else {
-            printError("Unknown element '" + std::string(node->Name()) + "' in Cppcheck project file");
+            errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck project file");
             return false;
         }
     }
-    settings->basePaths = temp.basePaths;
-    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->clang = temp.clang;
-    settings->clangTidy = temp.clangTidy;
-
-    if (!settings->premiumArgs.empty())
-        settings->premiumArgs += temp.premiumArgs;
+    settings.basePaths = temp.basePaths; // TODO: append instead of overwrite
+    settings.relativePaths |= temp.relativePaths;
+    settings.buildDir = temp.buildDir;
+    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
+    for (const std::string &addon : temp.addons)
+        settings.addons.emplace(addon);
+    settings.clang = temp.clang;
+    settings.clangTidy = temp.clangTidy;
+    settings.analyzeAllVsConfigs = temp.analyzeAllVsConfigs;
+
+    if (!settings.premiumArgs.empty())
+        settings.premiumArgs += temp.premiumArgs;
     else if (!temp.premiumArgs.empty())
-        settings->premiumArgs = temp.premiumArgs.substr(1);
+        settings.premiumArgs = temp.premiumArgs.substr(1);
 
     for (const std::string &p : paths)
-        guiProject.pathNames.push_back(p);
-    settings->nomsg.addSuppressions(std::move(suppressions));
-    settings->checkHeaders = temp.checkHeaders;
-    settings->checkUnusedTemplates = temp.checkUnusedTemplates;
-    settings->maxCtuDepth = temp.maxCtuDepth;
-    settings->maxTemplateRecursion = temp.maxTemplateRecursion;
-    settings->safeChecks = temp.safeChecks;
-
-    if (checkLevelExhaustive)
-        settings->setCheckLevelExhaustive();
-    else
-        settings->setCheckLevelNormal();
+        guiProject.pathNames.push_back(Path::fromNativeSeparators(p));
+    supprs.nomsg.addSuppressions(std::move(suppressions)); // TODO: check result
+    settings.checkHeaders = temp.checkHeaders;
+    settings.checkUnusedTemplates = temp.checkUnusedTemplates;
+    settings.maxCtuDepth = temp.maxCtuDepth;
+    settings.maxTemplateRecursion = temp.maxTemplateRecursion;
+    settings.inlineSuppressions |= temp.inlineSuppressions;
+    settings.safeChecks = temp.safeChecks;
+    settings.setCheckLevel(temp.checkLevel);
 
     return true;
 }
 
-void ImportProject::selectOneVsConfig(cppcheck::Platform::Type platform)
+void ImportProject::selectOneVsConfig(Platform::Type platform)
 {
     std::set<std::string> filenames;
-    for (std::list<ImportProject::FileSettings>::iterator it = fileSettings.begin(); it != fileSettings.end();) {
+    for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
         if (it->cfg.empty()) {
             ++it;
             continue;
         }
-        const ImportProject::FileSettings &fs = *it;
+        const FileSettings &fs = *it;
         bool remove = false;
-        if (fs.cfg.compare(0,5,"Debug") != 0)
+        if (!startsWith(fs.cfg,"Debug"))
             remove = true;
-        if (platform == cppcheck::Platform::Type::Win64 && fs.platformType != platform)
+        if (platform == Platform::Type::Win64 && fs.platformType != platform)
             remove = true;
-        else if ((platform == cppcheck::Platform::Type::Win32A || platform == cppcheck::Platform::Type::Win32W) && fs.platformType == cppcheck::Platform::Type::Win64)
+        else if ((platform == Platform::Type::Win32A || platform == Platform::Type::Win32W) && fs.platformType == Platform::Type::Win64)
             remove = true;
-        else if (filenames.find(fs.filename) != filenames.end())
+        else if (filenames.find(fs.filename()) != filenames.end())
             remove = true;
         if (remove) {
             it = fileSettings.erase(it);
         } else {
-            filenames.insert(fs.filename);
+            filenames.insert(fs.filename());
             ++it;
         }
     }
 }
 
-void ImportProject::selectVsConfigurations(cppcheck::Platform::Type platform, const std::vector<std::string> &configurations)
+void ImportProject::selectVsConfigurations(Platform::Type platform, const std::vector<std::string> &configurations)
 {
-    for (std::list<ImportProject::FileSettings>::iterator it = fileSettings.begin(); it != fileSettings.end();) {
+    for (auto it = fileSettings.cbegin(); it != fileSettings.cend();) {
         if (it->cfg.empty()) {
             ++it;
             continue;
         }
-        const ImportProject::FileSettings &fs = *it;
+        const FileSettings &fs = *it;
         const auto config = fs.cfg.substr(0, fs.cfg.find('|'));
         bool remove = false;
         if (std::find(configurations.begin(), configurations.end(), config) == configurations.end())
             remove = true;
-        if (platform == cppcheck::Platform::Type::Win64 && fs.platformType != platform)
+        if (platform == Platform::Type::Win64 && fs.platformType != platform)
             remove = true;
-        else if ((platform == cppcheck::Platform::Type::Win32A || platform == cppcheck::Platform::Type::Win32W) && fs.platformType == cppcheck::Platform::Type::Win64)
+        else if ((platform == Platform::Type::Win32A || platform == Platform::Type::Win32W) && fs.platformType == Platform::Type::Win64)
             remove = true;
         if (remove) {
             it = fileSettings.erase(it);
@@ -1355,18 +1548,9 @@ void ImportProject::setRelativePaths(const std::string &filename)
         return;
     const std::vector<std::string> basePaths{Path::fromNativeSeparators(Path::getCurrentPath())};
     for (auto &fs: fileSettings) {
-        fs.filename = Path::getRelativePath(fs.filename, basePaths);
+        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);
     }
 }
 
-void ImportProject::printError(const std::string &message)
-{
-    std::cout << "cppcheck: error: " << message << std::endl;
-}
-
-bool ImportProject::sourceFileExists(const std::string &file)
-{
-    return Path::fileExists(file);
-}
diff --git a/lib/importproject.h b/lib/importproject.h
index 704722edc19..45d17a819f7 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-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
@@ -22,9 +22,11 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "filesettings.h"
 #include "platform.h"
 #include "utils.h"
 
+#include <cstdint>
 #include <iosfwd>
 #include <list>
 #include <map>
@@ -32,6 +34,12 @@
 #include <string>
 #include <vector>
 
+class Settings;
+struct Suppressions;
+namespace tinyxml2 {
+    class XMLDocument;
+}
+
 /// @addtogroup Core
 /// @{
 
@@ -43,14 +51,14 @@ namespace cppcheck {
     };
 }
 
-class Settings;
-
 /**
  * @brief Importing project settings.
  */
-class CPPCHECKLIB ImportProject {
+class CPPCHECKLIB WARN_UNUSED ImportProject {
+    friend class TestImporter;
 public:
-    enum class Type {
+    enum class Type : std::uint8_t {
+        NONE,
         UNKNOWN,
         MISSING,
         FAILURE,
@@ -61,43 +69,25 @@ class CPPCHECKLIB ImportProject {
         CPPCHECK_GUI
     };
 
-    /** File settings. Multiple configurations for a file is allowed. */
-    struct CPPCHECKLIB FileSettings {
-        FileSettings() : platformType(cppcheck::Platform::Type::Unspecified), msc(false), useMfc(false) {}
-        std::string cfg;
-        std::string filename;
-        std::string defines;
-        std::string cppcheckDefines() const {
-            return defines + (msc ? ";_MSC_VER=1900" : "") + (useMfc ? ";__AFXWIN_H__=1" : "");
-        }
-        std::set<std::string> undefs;
-        std::list<std::string> includePaths;
-        std::list<std::string> systemIncludePaths;
-        std::string standard;
-        cppcheck::Platform::Type platformType;
-        bool msc;
-        bool useMfc;
-
-        void parseCommand(const std::string& command);
-        void setDefines(std::string defs);
-        void setIncludePaths(const std::string &basepath, const std::list<std::string> &in, std::map<std::string, std::string, cppcheck::stricmp> &variables);
-    };
+    static void fsParseCommand(FileSettings& fs, const std::string& command, bool doUnescape);
+    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);
+
     std::list<FileSettings> fileSettings;
-    Type projectType;
+    std::vector<std::string> errors;
 
-    ImportProject();
+    ImportProject() = default;
     virtual ~ImportProject() = default;
     ImportProject(const ImportProject&) = default;
-    ImportProject& operator=(const ImportProject&) = default;
+    ImportProject& operator=(const ImportProject&) & = default;
 
-    void selectOneVsConfig(cppcheck::Platform::Type platform);
-    void selectVsConfigurations(cppcheck::Platform::Type platform, const std::vector<std::string> &configurations);
+    void selectOneVsConfig(Platform::Type platform);
+    void selectVsConfigurations(Platform::Type platform, const std::vector<std::string> &configurations);
 
     std::list<std::string> getVSConfigs();
 
     // Cppcheck GUI output
     struct {
-        std::string analyzeAllVsConfigs;
         std::vector<std::string> pathNames;
         std::list<std::string> libraries;
         std::list<std::string> excludedPaths;
@@ -106,21 +96,28 @@ class CPPCHECKLIB ImportProject {
         std::string platform;
     } guiProject;
 
-    void ignorePaths(const std::vector<std::string> &ipaths);
+    void ignorePaths(const std::vector<std::string> &ipaths, bool debug = false);
     void ignoreOtherConfigs(const std::string &cfg);
 
-    Type import(const std::string &filename, Settings *settings=nullptr);
+    Type import(const std::string &filename, Settings *settings=nullptr, Suppressions *supprs=nullptr);
 protected:
     bool importCompileCommands(std::istream &istr);
-    bool importCppcheckGuiProject(std::istream &istr, Settings *settings);
-    virtual bool sourceFileExists(const std::string &file);
+    bool importCppcheckGuiProject(std::istream &istr, Settings &settings, Suppressions &supprs);
+
 private:
+    struct SharedItemsProject {
+        bool successful = false;
+        std::string pathToProjectFile;
+        std::vector<std::string> includePaths;
+        std::vector<std::string> sourceFiles;
+    };
+
     bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
-    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);
+    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 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);
     bool importBcb6Prj(const std::string &projectFilename);
 
-    static void printError(const std::string &message);
-
     void setRelativePaths(const std::string &filename);
 
     std::string mPath;
@@ -129,65 +126,69 @@ class CPPCHECKLIB ImportProject {
 
 
 namespace CppcheckXml {
-    const char ProjectElementName[] = "project";
-    const char ProjectVersionAttrib[] = "version";
-    const char ProjectFileVersion[] = "1";
-    const char BuildDirElementName[] = "builddir";
-    const char ImportProjectElementName[] = "importproject";
-    const char AnalyzeAllVsConfigsElementName[] = "analyze-all-vs-configs";
-    const char Parser[] = "parser";
-    const char IncludeDirElementName[] = "includedir";
-    const char DirElementName[] = "dir";
-    const char DirNameAttrib[] = "name";
-    const char DefinesElementName[] = "defines";
-    const char DefineName[] = "define";
-    const char DefineNameAttrib[] = "name";
-    const char UndefinesElementName[] = "undefines";
-    const char UndefineName[] = "undefine";
-    const char PathsElementName[] = "paths";
-    const char PathName[] = "dir";
-    const char PathNameAttrib[] = "name";
-    const char RootPathName[] = "root";
-    const char RootPathNameAttrib[] = "name";
-    const char IgnoreElementName[] = "ignore";
-    const char IgnorePathName[] = "path";
-    const char IgnorePathNameAttrib[] = "name";
-    const char ExcludeElementName[] = "exclude";
-    const char ExcludePathName[] = "path";
-    const char ExcludePathNameAttrib[] = "name";
-    const char FunctionContracts[] = "function-contracts";
-    const char VariableContractsElementName[] = "variable-contracts";
-    const char LibrariesElementName[] = "libraries";
-    const char LibraryElementName[] = "library";
-    const char PlatformElementName[] = "platform";
-    const char SuppressionsElementName[] = "suppressions";
-    const char SuppressionElementName[] = "suppression";
-    const char AddonElementName[] = "addon";
-    const char AddonsElementName[] = "addons";
-    const char ToolElementName[] = "tool";
-    const char ToolsElementName[] = "tools";
-    const char TagsElementName[] = "tags";
-    const char TagElementName[] = "tag";
-    const char TagWarningsElementName[] = "tag-warnings";
-    const char TagAttributeName[] = "tag";
-    const char WarningElementName[] = "warning";
-    const char HashAttributeName[] = "hash";
-    const char CheckLevelExhaustiveElementName[] = "check-level-exhaustive";
-    const char CheckHeadersElementName[] = "check-headers";
-    const char CheckUnusedTemplatesElementName[] = "check-unused-templates";
-    const char MaxCtuDepthElementName[] = "max-ctu-depth";
-    const char MaxTemplateRecursionElementName[] = "max-template-recursion";
-    const char CheckUnknownFunctionReturn[] = "check-unknown-function-return-values";
-    const char ClangTidy[] = "clang-tidy";
-    const char Name[] = "name";
-    const char VSConfigurationElementName[] = "vs-configurations";
-    const char VSConfigurationName[] = "config";
+    static constexpr char ProjectElementName[] = "project";
+    static constexpr char ProjectVersionAttrib[] = "version";
+    static constexpr char ProjectFileVersion[] = "1";
+    static constexpr char BuildDirElementName[] = "builddir";
+    static constexpr char ImportProjectElementName[] = "importproject";
+    static constexpr char AnalyzeAllVsConfigsElementName[] = "analyze-all-vs-configs";
+    static constexpr char Parser[] = "parser";
+    static constexpr char IncludeDirElementName[] = "includedir";
+    static constexpr char DirElementName[] = "dir";
+    static constexpr char DirNameAttrib[] = "name";
+    static constexpr char DefinesElementName[] = "defines";
+    static constexpr char DefineName[] = "define";
+    static constexpr char DefineNameAttrib[] = "name";
+    static constexpr char UndefinesElementName[] = "undefines";
+    static constexpr char UndefineName[] = "undefine";
+    static constexpr char PathsElementName[] = "paths";
+    static constexpr char PathName[] = "dir";
+    static constexpr char PathNameAttrib[] = "name";
+    static constexpr char RootPathName[] = "root";
+    static constexpr char RootPathNameAttrib[] = "name";
+    static constexpr char IgnoreElementName[] = "ignore";
+    static constexpr char IgnorePathName[] = "path";
+    static constexpr char IgnorePathNameAttrib[] = "name";
+    static constexpr char ExcludeElementName[] = "exclude";
+    static constexpr char ExcludePathName[] = "path";
+    static constexpr char ExcludePathNameAttrib[] = "name";
+    static constexpr char FunctionContracts[] = "function-contracts";
+    static constexpr char VariableContractsElementName[] = "variable-contracts";
+    static constexpr char LibrariesElementName[] = "libraries";
+    static constexpr char LibraryElementName[] = "library";
+    static constexpr char PlatformElementName[] = "platform";
+    static constexpr char SuppressionsElementName[] = "suppressions";
+    static constexpr char SuppressionElementName[] = "suppression";
+    static constexpr char AddonElementName[] = "addon";
+    static constexpr char AddonsElementName[] = "addons";
+    static constexpr char ToolElementName[] = "tool";
+    static constexpr char ToolsElementName[] = "tools";
+    static constexpr char TagsElementName[] = "tags";
+    static constexpr char TagElementName[] = "tag";
+    static constexpr char TagWarningsElementName[] = "tag-warnings";
+    static constexpr char TagAttributeName[] = "tag";
+    static constexpr char WarningElementName[] = "warning";
+    static constexpr char HashAttributeName[] = "hash";
+    static constexpr char CheckLevelExhaustiveElementName[] = "check-level-exhaustive";
+    static constexpr char CheckLevelNormalElementName[] = "check-level-normal";
+    static constexpr char CheckLevelReducedElementName[] = "check-level-reduced";
+    static constexpr char CheckHeadersElementName[] = "check-headers";
+    static constexpr char CheckUnusedTemplatesElementName[] = "check-unused-templates";
+    static constexpr char MaxCtuDepthElementName[] = "max-ctu-depth";
+    static constexpr char MaxTemplateRecursionElementName[] = "max-template-recursion";
+    static constexpr char CheckUnknownFunctionReturn[] = "check-unknown-function-return-values";
+    static constexpr char InlineSuppression[] = "inline-suppression";
+    static constexpr char ClangTidy[] = "clang-tidy";
+    static constexpr char Name[] = "name";
+    static constexpr char VSConfigurationElementName[] = "vs-configurations";
+    static constexpr char VSConfigurationName[] = "config";
     // Cppcheck Premium
-    const char BughuntingElementName[] = "bug-hunting";
-    const char CodingStandardsElementName[] = "coding-standards";
-    const char CodingStandardElementName[] = "coding-standard";
-    const char CertIntPrecisionElementName[] = "cert-c-int-precision";
-    const char ProjectNameElementName[] = "project-name";
+    static constexpr char BughuntingElementName[] = "bug-hunting";
+    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";
 }
 
 /// @}
diff --git a/lib/infer.cpp b/lib/infer.cpp
index f3a2989f8be..cad0761f68b 100644
--- a/lib/infer.cpp
+++ b/lib/infer.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
@@ -20,7 +20,9 @@
 
 #include "calculate.h"
 #include "errortypes.h"
+#include "token.h"
 #include "valueptr.h"
+#include "vfvalue.h"
 
 #include <cassert>
 #include <algorithm>
@@ -29,8 +31,6 @@
 #include <unordered_set>
 #include <utility>
 
-class Token;
-
 template<class Predicate, class Compare>
 static const ValueFlow::Value* getCompareValue(const std::list<ValueFlow::Value>& values, Predicate pred, Compare compare)
 {
@@ -48,213 +48,193 @@ static const ValueFlow::Value* getCompareValue(const std::list<ValueFlow::Value>
     return result;
 }
 
-struct Interval {
-    std::vector<MathLib::bigint> minvalue = {};
-    std::vector<MathLib::bigint> maxvalue = {};
-    std::vector<const ValueFlow::Value*> minRef = {};
-    std::vector<const ValueFlow::Value*> maxRef = {};
-
-    std::string str() const
-    {
-        std::string result = "[";
-        if (minvalue.size() == 1)
-            result += std::to_string(minvalue.front());
-        else
-            result += "*";
-        result += ",";
-        if (maxvalue.size() == 1)
-            result += std::to_string(maxvalue.front());
-        else
-            result += "*";
-        result += "]";
-        return result;
-    }
-
-    void setMinValue(MathLib::bigint x, const ValueFlow::Value* ref = nullptr)
-    {
-        minvalue = {x};
-        if (ref)
-            minRef = {ref};
-    }
-
-    void setMaxValue(MathLib::bigint x, const ValueFlow::Value* ref = nullptr)
-    {
-        maxvalue = {x};
-        if (ref)
-            maxRef = {ref};
-    }
+namespace {
+    struct Interval {
+        std::vector<MathLib::bigint> minvalue, maxvalue;
+        std::vector<const ValueFlow::Value*> minRef, maxRef;
 
-    bool isLessThan(MathLib::bigint x, std::vector<const ValueFlow::Value*>* ref = nullptr) const
-    {
-        if (!this->maxvalue.empty() && this->maxvalue.front() < x) {
+        void setMinValue(MathLib::bigint x, const ValueFlow::Value* ref = nullptr)
+        {
+            minvalue = {x};
             if (ref)
-                *ref = maxRef;
-            return true;
+                minRef = {ref};
         }
-        return false;
-    }
 
-    bool isGreaterThan(MathLib::bigint x, std::vector<const ValueFlow::Value*>* ref = nullptr) const
-    {
-        if (!this->minvalue.empty() && this->minvalue.front() > x) {
+        void setMaxValue(MathLib::bigint x, const ValueFlow::Value* ref = nullptr)
+        {
+            maxvalue = {x};
             if (ref)
-                *ref = minRef;
-            return true;
+                maxRef = {ref};
         }
-        return false;
-    }
 
-    bool isScalar() const {
-        return minvalue.size() == 1 && minvalue == maxvalue;
-    }
+        bool isLessThan(MathLib::bigint x, std::vector<const ValueFlow::Value*>* ref = nullptr) const
+        {
+            if (!this->maxvalue.empty() && this->maxvalue.front() < x) {
+                if (ref)
+                    *ref = maxRef;
+                return true;
+            }
+            return false;
+        }
 
-    bool empty() const {
-        return minvalue.empty() && maxvalue.empty();
-    }
+        bool isGreaterThan(MathLib::bigint x, std::vector<const ValueFlow::Value*>* ref = nullptr) const
+        {
+            if (!this->minvalue.empty() && this->minvalue.front() > x) {
+                if (ref)
+                    *ref = minRef;
+                return true;
+            }
+            return false;
+        }
 
-    bool isScalarOrEmpty() const {
-        return empty() || isScalar();
-    }
+        bool isScalar() const {
+            return minvalue.size() == 1 && minvalue == maxvalue;
+        }
 
-    MathLib::bigint getScalar() const
-    {
-        assert(isScalar());
-        return minvalue.front();
-    }
+        bool empty() const {
+            return minvalue.empty() && maxvalue.empty();
+        }
 
-    std::vector<const ValueFlow::Value*> getScalarRef() const
-    {
-        assert(isScalar());
-        if (minRef != maxRef)
-            return merge(minRef, maxRef);
-        return minRef;
-    }
+        bool isScalarOrEmpty() const {
+            return empty() || isScalar();
+        }
 
-    static Interval fromInt(MathLib::bigint x, const ValueFlow::Value* ref = nullptr)
-    {
-        Interval result;
-        result.setMinValue(x, ref);
-        result.setMaxValue(x, ref);
-        return result;
-    }
+        MathLib::bigint getScalar() const
+        {
+            assert(isScalar());
+            return minvalue.front();
+        }
 
-    template<class Predicate>
-    static Interval fromValues(const std::list<ValueFlow::Value>& values, Predicate predicate)
-    {
-        Interval result;
-        const ValueFlow::Value* minValue = getCompareValue(values, predicate, std::less<MathLib::bigint>{});
-        if (minValue) {
-            if (minValue->isImpossible() && minValue->bound == ValueFlow::Value::Bound::Upper)
-                result.setMinValue(minValue->intvalue + 1, minValue);
-            if (minValue->isPossible() && minValue->bound == ValueFlow::Value::Bound::Lower)
-                result.setMinValue(minValue->intvalue, minValue);
-            if (!minValue->isImpossible() && (minValue->bound == ValueFlow::Value::Bound::Point || minValue->isKnown()) &&
-                std::count_if(values.begin(), values.end(), predicate) == 1)
-                return Interval::fromInt(minValue->intvalue, minValue);
+        std::vector<const ValueFlow::Value*> getScalarRef() const
+        {
+            assert(isScalar());
+            if (minRef != maxRef)
+                return merge(minRef, maxRef);
+            return minRef;
         }
-        const ValueFlow::Value* maxValue = getCompareValue(values, predicate, std::greater<MathLib::bigint>{});
-        if (maxValue) {
-            if (maxValue->isImpossible() && maxValue->bound == ValueFlow::Value::Bound::Lower)
-                result.setMaxValue(maxValue->intvalue - 1, maxValue);
-            if (maxValue->isPossible() && maxValue->bound == ValueFlow::Value::Bound::Upper)
-                result.setMaxValue(maxValue->intvalue, maxValue);
-            assert(!maxValue->isKnown());
+
+        static Interval fromInt(MathLib::bigint x, const ValueFlow::Value* ref = nullptr)
+        {
+            Interval result;
+            result.setMinValue(x, ref);
+            result.setMaxValue(x, ref);
+            return result;
         }
-        return result;
-    }
 
-    static Interval fromValues(const std::list<ValueFlow::Value>& values)
-    {
-        return Interval::fromValues(values, [](const ValueFlow::Value&) {
-            return true;
-        });
-    }
+        template<class Predicate>
+        static Interval fromValues(const std::list<ValueFlow::Value>& values, Predicate predicate)
+        {
+            Interval result;
+            const ValueFlow::Value* minValue = getCompareValue(values, predicate, std::less<MathLib::bigint>{});
+            if (minValue) {
+                if (minValue->isImpossible() && minValue->bound == ValueFlow::Value::Bound::Upper)
+                    result.setMinValue(minValue->intvalue + 1, minValue);
+                if (minValue->isPossible() && minValue->bound == ValueFlow::Value::Bound::Lower)
+                    result.setMinValue(minValue->intvalue, minValue);
+                if (!minValue->isImpossible() && (minValue->bound == ValueFlow::Value::Bound::Point || minValue->isKnown()) &&
+                    std::count_if(values.begin(), values.end(), predicate) == 1)
+                    return Interval::fromInt(minValue->intvalue, minValue);
+            }
+            const ValueFlow::Value* maxValue = getCompareValue(values, predicate, std::greater<MathLib::bigint>{});
+            if (maxValue) {
+                if (maxValue->isImpossible() && maxValue->bound == ValueFlow::Value::Bound::Lower)
+                    result.setMaxValue(maxValue->intvalue - 1, maxValue);
+                if (maxValue->isPossible() && maxValue->bound == ValueFlow::Value::Bound::Upper)
+                    result.setMaxValue(maxValue->intvalue, maxValue);
+                assert(!maxValue->isKnown());
+            }
+            return result;
+        }
 
-    template<class F>
-    static std::vector<MathLib::bigint> apply(const std::vector<MathLib::bigint>& x,
-                                              const std::vector<MathLib::bigint>& y,
-                                              F f)
-    {
-        if (x.empty())
-            return {};
-        if (y.empty())
-            return {};
-        return {f(x.front(), y.front())};
-    }
+        static Interval fromValues(const std::list<ValueFlow::Value>& values)
+        {
+            return Interval::fromValues(values, [](const ValueFlow::Value&) {
+                return true;
+            });
+        }
 
-    static std::vector<const ValueFlow::Value*> merge(std::vector<const ValueFlow::Value*> x,
-                                                      const std::vector<const ValueFlow::Value*>& y)
-    {
-        x.insert(x.end(), y.cbegin(), y.cend());
-        return x;
-    }
+        template<class F>
+        static std::vector<MathLib::bigint> apply(const std::vector<MathLib::bigint>& x,
+                                                  const std::vector<MathLib::bigint>& y,
+                                                  F f)
+        {
+            if (x.empty())
+                return {};
+            if (y.empty())
+                return {};
+            return {f(x.front(), y.front())};
+        }
 
-    friend Interval operator-(const Interval& lhs, const Interval& rhs)
-    {
-        Interval result;
-        result.minvalue = Interval::apply(lhs.minvalue, rhs.maxvalue, std::minus<MathLib::bigint>{});
-        result.maxvalue = Interval::apply(lhs.maxvalue, rhs.minvalue, std::minus<MathLib::bigint>{});
-        if (!result.minvalue.empty())
-            result.minRef = merge(lhs.minRef, rhs.maxRef);
-        if (!result.maxvalue.empty())
-            result.maxRef = merge(lhs.maxRef, rhs.minRef);
-        return result;
-    }
+        static std::vector<const ValueFlow::Value*> merge(std::vector<const ValueFlow::Value*> x,
+                                                          const std::vector<const ValueFlow::Value*>& y)
+        {
+            x.insert(x.end(), y.cbegin(), y.cend());
+            return x;
+        }
 
-    static std::vector<int> equal(const Interval& lhs,
-                                  const Interval& rhs,
-                                  std::vector<const ValueFlow::Value*>* ref = nullptr)
-    {
-        if (!lhs.isScalar())
-            return {};
-        if (!rhs.isScalar())
-            return {};
-        if (ref)
-            *ref = merge(lhs.getScalarRef(), rhs.getScalarRef());
-        return {lhs.minvalue == rhs.minvalue};
-    }
+        friend Interval operator-(const Interval& lhs, const Interval& rhs)
+        {
+            Interval result;
+            result.minvalue = Interval::apply(lhs.minvalue, rhs.maxvalue, std::minus<MathLib::bigint>{});
+            result.maxvalue = Interval::apply(lhs.maxvalue, rhs.minvalue, std::minus<MathLib::bigint>{});
+            if (!result.minvalue.empty())
+                result.minRef = merge(lhs.minRef, rhs.maxRef);
+            if (!result.maxvalue.empty())
+                result.maxRef = merge(lhs.maxRef, rhs.minRef);
+            return result;
+        }
 
-    static std::vector<int> compare(const Interval& lhs,
-                                    const Interval& rhs,
-                                    std::vector<const ValueFlow::Value*>* ref = nullptr)
-    {
-        Interval diff = lhs - rhs;
-        if (diff.isGreaterThan(0, ref))
-            return {1};
-        if (diff.isLessThan(0, ref))
-            return {-1};
-        std::vector<int> eq = Interval::equal(lhs, rhs, ref);
-        if (!eq.empty()) {
-            if (eq.front() == 0)
-                return {1, -1};
-            return {0};
+        static std::vector<int> equal(const Interval& lhs,
+                                      const Interval& rhs,
+                                      std::vector<const ValueFlow::Value*>* ref = nullptr)
+        {
+            if (!lhs.isScalar())
+                return {};
+            if (!rhs.isScalar())
+                return {};
+            if (ref)
+                *ref = merge(lhs.getScalarRef(), rhs.getScalarRef());
+            return {lhs.minvalue == rhs.minvalue};
         }
-        if (diff.isGreaterThan(-1, ref))
-            return {0, 1};
-        if (diff.isLessThan(1, ref))
-            return {0, -1};
-        return {};
-    }
 
-    static std::vector<bool> compare(const std::string& op,
-                                     const Interval& lhs,
-                                     const Interval& rhs,
-                                     std::vector<const ValueFlow::Value*>* ref = nullptr)
-    {
-        std::vector<int> r = compare(lhs, rhs, ref);
-        if (r.empty())
+        static std::vector<int> compare(const Interval& lhs,
+                                        const Interval& rhs,
+                                        std::vector<const ValueFlow::Value*>* ref = nullptr)
+        {
+            Interval diff = lhs - rhs;
+            if (diff.isGreaterThan(0, ref))
+                return {1};
+            if (diff.isLessThan(0, ref))
+                return {-1};
+            std::vector<int> eq = Interval::equal(lhs, rhs, ref);
+            if (!eq.empty()) {
+                if (eq.front() == 0)
+                    return {1, -1};
+                return {0};
+            }
+            if (diff.isGreaterThan(-1, ref))
+                return {0, 1};
+            if (diff.isLessThan(1, ref))
+                return {0, -1};
             return {};
-        bool b = calculate(op, r.front(), 0);
-        if (std::all_of(r.cbegin() + 1, r.cend(), [&](int i) {
-            return b == calculate(op, i, 0);
-        }))
-            return {b};
-        return {};
-    }
-};
+        }
 
-std::string toString(const Interval& i) {
-    return i.str();
+        static std::vector<bool> compare(const std::string& op,
+                                         const Interval& lhs,
+                                         const Interval& rhs,
+                                         std::vector<const ValueFlow::Value*>* ref = nullptr)
+        {
+            std::vector<int> r = compare(lhs, rhs, ref);
+            if (r.empty())
+                return {};
+            bool b = calculate(op, r.front(), 0);
+            if (std::all_of(r.cbegin() + 1, r.cend(), [&](int i) {
+                return b == calculate(op, i, 0);
+            }))
+                return {b};
+            return {};
+        }
+    };
 }
 
 static void addToErrorPath(ValueFlow::Value& value, const std::vector<const ValueFlow::Value*>& refs)
@@ -313,8 +293,10 @@ std::vector<ValueFlow::Value> infer(const ValuePtr<InferModel>& model,
         return !model->match(value);
     };
     lhsValues.remove_if(notMatch);
+    if (lhsValues.empty())
+        return result;
     rhsValues.remove_if(notMatch);
-    if (lhsValues.empty() || rhsValues.empty())
+    if (rhsValues.empty())
         return result;
 
     Interval lhs = Interval::fromValues(lhsValues);
@@ -368,7 +350,7 @@ std::vector<ValueFlow::Value> infer(const ValuePtr<InferModel>& model,
         std::vector<const ValueFlow::Value*> refs;
         std::vector<bool> r = Interval::compare(op, lhs, rhs, &refs);
         if (!r.empty()) {
-            ValueFlow::Value value(r.front());
+            ValueFlow::Value value(static_cast<int>(r.front()));
             addToErrorPath(value, refs);
             setValueKind(value, refs);
             result.push_back(std::move(value));
@@ -406,3 +388,35 @@ std::vector<MathLib::bigint> getMaxValue(const ValuePtr<InferModel>& model, cons
         return model->match(v);
     }).maxvalue;
 }
+
+namespace {
+    struct IntegralInferModel : InferModel {
+        bool match(const ValueFlow::Value& value) const override {
+            return value.isIntValue();
+        }
+        ValueFlow::Value yield(MathLib::bigint value) const override
+        {
+            ValueFlow::Value result(value);
+            result.valueType = ValueFlow::Value::ValueType::INT;
+            result.setKnown();
+            return result;
+        }
+    };
+}
+
+ValuePtr<InferModel> makeIntegralInferModel()
+{
+    return IntegralInferModel{};
+}
+
+ValueFlow::Value inferCondition(const std::string& op, const Token* varTok, MathLib::bigint val)
+{
+    if (!varTok)
+        return ValueFlow::Value{};
+    if (varTok->hasKnownIntValue())
+        return ValueFlow::Value{};
+    std::vector<ValueFlow::Value> r = infer(makeIntegralInferModel(), op, varTok->values(), val);
+    if (r.size() == 1 && r.front().isKnown())
+        return r.front();
+    return ValueFlow::Value{};
+}
diff --git a/lib/infer.h b/lib/infer.h
index 21ffcb22c25..8d66d7da016 100644
--- a/lib/infer.h
+++ b/lib/infer.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * 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
@@ -21,19 +21,23 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "vfvalue.h"
 
 #include <list>
 #include <string>
 #include <vector>
 
-struct Interval;
+class Token;
 template<class T> class ValuePtr;
 
+namespace ValueFlow
+{
+    class Value;
+}
+
 struct InferModel {
     virtual bool match(const ValueFlow::Value& value) const = 0;
     virtual ValueFlow::Value yield(MathLib::bigint value) const = 0;
-    virtual ~InferModel() {}
+    virtual ~InferModel() = default;
     InferModel(const InferModel&) = default;
 protected:
     InferModel() = default;
@@ -57,6 +61,8 @@ std::vector<ValueFlow::Value> infer(const ValuePtr<InferModel>& model,
 CPPCHECKLIB std::vector<MathLib::bigint> getMinValue(const ValuePtr<InferModel>& model, const std::list<ValueFlow::Value>& values);
 std::vector<MathLib::bigint> getMaxValue(const ValuePtr<InferModel>& model, const std::list<ValueFlow::Value>& values);
 
-std::string toString(const Interval& i);
+ValuePtr<InferModel> makeIntegralInferModel();
+
+ValueFlow::Value inferCondition(const std::string& op, const Token* varTok, MathLib::bigint val);
 
 #endif
diff --git a/lib/json.h b/lib/json.h
new file mode 100644
index 00000000000..2bcfe102071
--- /dev/null
+++ b/lib/json.h
@@ -0,0 +1,43 @@
+/* -*- 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 jsonH
+#define jsonH
+
+#include "config.h"
+
+SUPPRESS_WARNING_PUSH("-Wfloat-equal")
+SUPPRESS_WARNING_GCC_PUSH("-Wuseless-cast")
+SUPPRESS_WARNING_CLANG_PUSH("-Wtautological-type-limit-compare")
+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")
+
+#define PICOJSON_USE_INT64
+#include <picojson.h> // IWYU pragma: export
+
+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
+
+#endif // jsonH
diff --git a/lib/keywords.cpp b/lib/keywords.cpp
index 70fb2f6e341..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-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
@@ -18,6 +18,8 @@
 
 #include "keywords.h"
 
+#include "utils.h"
+
 // see https://en.cppreference.com/w/c/keyword
 
 #define C90_KEYWORDS \
@@ -32,24 +34,17 @@
 #define C11_KEYWORDS \
     "_Alignas", "_Alignof", "_Atomic", "_Generic", "_Noreturn", "_Static_assert", "_Thread_local"
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-macros"
-#endif
-
 #define C23_KEYWORDS \
     "alignas", "alignof", "bool", "constexpr", "false", "nullptr", "static_assert", "thread_local", "true", "typeof", "typeof_unqual", \
     "_BitInt", "_Decimal128", "_Decimal32", "_Decimal64"
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 static const std::unordered_set<std::string> c89_keywords_all = {
     C90_KEYWORDS
 };
 
-static const std::unordered_set<std::string> c89_keywords = c89_keywords_all;
+static const std::unordered_set<std::string> c89_keywords = {
+    C90_KEYWORDS
+};
 
 static const std::unordered_set<std::string> c99_keywords_all = {
     C90_KEYWORDS, C99_KEYWORDS
@@ -67,15 +62,27 @@ static const std::unordered_set<std::string> c11_keywords = {
     C11_KEYWORDS
 };
 
-/*
-   static const std::unordered_set<std::string> c23_keywords_all = {
+static const std::unordered_set<std::string> c17_keywords_all = {
+    C90_KEYWORDS, C99_KEYWORDS, C11_KEYWORDS
+};
+
+static const std::unordered_set<std::string> c17_keywords = {
+};
+
+static const std::unordered_set<std::string> c23_keywords_all = {
     C90_KEYWORDS, C99_KEYWORDS, C11_KEYWORDS, C23_KEYWORDS
-   };
+};
 
-   static const std::unordered_set<std::string> c23_keywords = {
+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
 
@@ -118,7 +125,9 @@ static const std::unordered_set<std::string> cpp03_keywords_all = {
     CPP03_KEYWORDS
 };
 
-static const std::unordered_set<std::string> cpp03_keywords = cpp03_keywords_all;
+static const std::unordered_set<std::string> cpp03_keywords = {
+    CPP03_KEYWORDS
+};
 
 static const std::unordered_set<std::string> cpp11_keywords_all = {
     CPP03_KEYWORDS, CPP11_KEYWORDS
@@ -128,13 +137,19 @@ static const std::unordered_set<std::string> cpp11_keywords = {
     CPP11_KEYWORDS
 };
 
-static const std::unordered_set<std::string> cpp14_keywords_all = cpp11_keywords_all;
+static const std::unordered_set<std::string> cpp14_keywords_all = {
+    CPP03_KEYWORDS, CPP11_KEYWORDS
+};
 
-static const std::unordered_set<std::string> cpp14_keywords;
+static const std::unordered_set<std::string> cpp14_keywords = {
+};
 
-static const std::unordered_set<std::string> cpp17_keywords_all = cpp11_keywords_all;
+static const std::unordered_set<std::string> cpp17_keywords_all = {
+    CPP03_KEYWORDS, CPP11_KEYWORDS
+};
 
-static const std::unordered_set<std::string> cpp17_keywords;
+static const std::unordered_set<std::string> cpp17_keywords = {
+};
 
 static const std::unordered_set<std::string> cpp20_keywords_all = {
     CPP03_KEYWORDS, CPP11_KEYWORDS, CPP20_KEYWORDS
@@ -144,14 +159,22 @@ static const std::unordered_set<std::string> cpp20_keywords = {
     CPP20_KEYWORDS
 };
 
-static const std::unordered_set<std::string> cpp23_keywords;
+static const std::unordered_set<std::string> cpp23_keywords = {
+};
+
+static const std::unordered_set<std::string> cpp23_keywords_all = {
+    CPP03_KEYWORDS, CPP11_KEYWORDS, CPP20_KEYWORDS
+};
 
-static const std::unordered_set<std::string> cpp23_keywords_all = cpp20_keywords_all;
+static const std::unordered_set<std::string> cpp26_keywords = {
+};
+
+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;
@@ -159,14 +182,17 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cstd_t cStd)
         return c99_keywords_all;
     case Standards::cstd_t::C11:
         return c11_keywords_all;
-        /*case Standards::cstd_t::C23:
-            return c23_keywords_all;*/
+    case Standards::cstd_t::C17:
+        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;
@@ -180,13 +206,15 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cppstd_t cppS
         return cpp20_keywords_all;
     case Standards::cppstd_t::CPP23:
         return cpp23_keywords_all;
+    case Standards::cppstd_t::CPP26:
+        return cpp26_keywords_all;
     }
+    cppcheck::unreachable();
 }
 
 // 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;
@@ -194,15 +222,18 @@ const std::unordered_set<std::string>& Keywords::getOnly(Standards::cstd_t cStd)
         return c99_keywords;
     case Standards::cstd_t::C11:
         return c11_keywords;
-        /*case Standards::cstd_t::C23:
-            return c23_keywords_all;*/
+    case Standards::cstd_t::C17:
+        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;
@@ -216,6 +247,9 @@ const std::unordered_set<std::string>& Keywords::getOnly(Standards::cppstd_t cpp
         return cpp20_keywords;
     case Standards::cppstd_t::CPP23:
         return cpp23_keywords;
+    case Standards::cppstd_t::CPP26:
+        return cpp26_keywords;
     }
+    cppcheck::unreachable();
 }
 
diff --git a/lib/keywords.h b/lib/keywords.h
index 4b03c18aa74..1460a5a776a 100644
--- a/lib/keywords.h
+++ b/lib/keywords.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/lib/lib.pri b/lib/lib.pri
deleted file mode 100644
index c6347fec6c6..00000000000
--- a/lib/lib.pri
+++ /dev/null
@@ -1,135 +0,0 @@
-# no manual edits - this file is autogenerated by dmake
-
-include($$PWD/pcrerules.pri)
-include($$PWD/../externals/externals.pri)
-INCLUDEPATH += $$PWD
-HEADERS += $${PWD}/analyzer.h \
-           $${PWD}/analyzerinfo.h \
-           $${PWD}/astutils.h \
-           $${PWD}/calculate.h \
-           $${PWD}/check.h \
-           $${PWD}/check64bit.h \
-           $${PWD}/checkassert.h \
-           $${PWD}/checkautovariables.h \
-           $${PWD}/checkbool.h \
-           $${PWD}/checkboost.h \
-           $${PWD}/checkbufferoverrun.h \
-           $${PWD}/checkclass.h \
-           $${PWD}/checkcondition.h \
-           $${PWD}/checkexceptionsafety.h \
-           $${PWD}/checkfunctions.h \
-           $${PWD}/checkinternal.h \
-           $${PWD}/checkio.h \
-           $${PWD}/checkleakautovar.h \
-           $${PWD}/checkmemoryleak.h \
-           $${PWD}/checknullpointer.h \
-           $${PWD}/checkother.h \
-           $${PWD}/checkpostfixoperator.h \
-           $${PWD}/checksizeof.h \
-           $${PWD}/checkstl.h \
-           $${PWD}/checkstring.h \
-           $${PWD}/checktype.h \
-           $${PWD}/checkuninitvar.h \
-           $${PWD}/checkunusedfunctions.h \
-           $${PWD}/checkunusedvar.h \
-           $${PWD}/checkvaarg.h \
-           $${PWD}/clangimport.h \
-           $${PWD}/color.h \
-           $${PWD}/config.h \
-           $${PWD}/cppcheck.h \
-           $${PWD}/ctu.h \
-           $${PWD}/errorlogger.h \
-           $${PWD}/errortypes.h \
-           $${PWD}/forwardanalyzer.h \
-           $${PWD}/fwdanalysis.h \
-           $${PWD}/importproject.h \
-           $${PWD}/infer.h \
-           $${PWD}/keywords.h \
-           $${PWD}/library.h \
-           $${PWD}/mathlib.h \
-           $${PWD}/path.h \
-           $${PWD}/pathanalysis.h \
-           $${PWD}/pathmatch.h \
-           $${PWD}/platform.h \
-           $${PWD}/precompiled.h \
-           $${PWD}/preprocessor.h \
-           $${PWD}/programmemory.h \
-           $${PWD}/reverseanalyzer.h \
-           $${PWD}/settings.h \
-           $${PWD}/smallvector.h \
-           $${PWD}/standards.h \
-           $${PWD}/summaries.h \
-           $${PWD}/suppressions.h \
-           $${PWD}/symboldatabase.h \
-           $${PWD}/templatesimplifier.h \
-           $${PWD}/timer.h \
-           $${PWD}/token.h \
-           $${PWD}/tokenize.h \
-           $${PWD}/tokenlist.h \
-           $${PWD}/tokenrange.h \
-           $${PWD}/utils.h \
-           $${PWD}/valueflow.h \
-           $${PWD}/valueptr.h \
-           $${PWD}/version.h \
-           $${PWD}/vfvalue.h
-
-SOURCES += $${PWD}/analyzerinfo.cpp \
-           $${PWD}/astutils.cpp \
-           $${PWD}/check.cpp \
-           $${PWD}/check64bit.cpp \
-           $${PWD}/checkassert.cpp \
-           $${PWD}/checkautovariables.cpp \
-           $${PWD}/checkbool.cpp \
-           $${PWD}/checkboost.cpp \
-           $${PWD}/checkbufferoverrun.cpp \
-           $${PWD}/checkclass.cpp \
-           $${PWD}/checkcondition.cpp \
-           $${PWD}/checkexceptionsafety.cpp \
-           $${PWD}/checkfunctions.cpp \
-           $${PWD}/checkinternal.cpp \
-           $${PWD}/checkio.cpp \
-           $${PWD}/checkleakautovar.cpp \
-           $${PWD}/checkmemoryleak.cpp \
-           $${PWD}/checknullpointer.cpp \
-           $${PWD}/checkother.cpp \
-           $${PWD}/checkpostfixoperator.cpp \
-           $${PWD}/checksizeof.cpp \
-           $${PWD}/checkstl.cpp \
-           $${PWD}/checkstring.cpp \
-           $${PWD}/checktype.cpp \
-           $${PWD}/checkuninitvar.cpp \
-           $${PWD}/checkunusedfunctions.cpp \
-           $${PWD}/checkunusedvar.cpp \
-           $${PWD}/checkvaarg.cpp \
-           $${PWD}/clangimport.cpp \
-           $${PWD}/color.cpp \
-           $${PWD}/cppcheck.cpp \
-           $${PWD}/ctu.cpp \
-           $${PWD}/errorlogger.cpp \
-           $${PWD}/errortypes.cpp \
-           $${PWD}/forwardanalyzer.cpp \
-           $${PWD}/fwdanalysis.cpp \
-           $${PWD}/importproject.cpp \
-           $${PWD}/infer.cpp \
-           $${PWD}/keywords.cpp \
-           $${PWD}/library.cpp \
-           $${PWD}/mathlib.cpp \
-           $${PWD}/path.cpp \
-           $${PWD}/pathanalysis.cpp \
-           $${PWD}/pathmatch.cpp \
-           $${PWD}/platform.cpp \
-           $${PWD}/preprocessor.cpp \
-           $${PWD}/programmemory.cpp \
-           $${PWD}/reverseanalyzer.cpp \
-           $${PWD}/settings.cpp \
-           $${PWD}/summaries.cpp \
-           $${PWD}/suppressions.cpp \
-           $${PWD}/symboldatabase.cpp \
-           $${PWD}/templatesimplifier.cpp \
-           $${PWD}/timer.cpp \
-           $${PWD}/token.cpp \
-           $${PWD}/tokenize.cpp \
-           $${PWD}/tokenlist.cpp \
-           $${PWD}/utils.cpp \
-           $${PWD}/valueflow.cpp \
-           $${PWD}/vfvalue.cpp
diff --git a/lib/library.cpp b/lib/library.cpp
index 53608226c9d..ad5ea13a3ed 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-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
@@ -19,27 +19,150 @@
 #include "library.h"
 
 #include "astutils.h"
+#include "errortypes.h"
 #include "mathlib.h"
 #include "path.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenlist.h"
 #include "utils.h"
-#include "valueflow.h"
 #include "vfvalue.h"
 
 #include <algorithm>
 #include <cctype>
 #include <climits>
-#include <cstdlib>
 #include <cstring>
+#include <iostream>
 #include <list>
 #include <memory>
-#include <sstream> // IWYU pragma: keep
-#include <stack>
+#include <stdexcept>
 #include <string>
+#include <unordered_set>
+#include <utility>
 
-#include <tinyxml2.h>
+#include "xml.h"
+
+struct Library::LibraryData
+{
+    struct Platform {
+        const PlatformType *platform_type(const std::string &name) const {
+            const auto it = utils::as_const(mPlatformTypes).find(name);
+            return (it != mPlatformTypes.end()) ? &(it->second) : nullptr;
+        }
+        std::map<std::string, PlatformType> mPlatformTypes;
+    };
+
+    class ExportedFunctions {
+    public:
+        void addPrefix(std::string prefix) {
+            mPrefixes.insert(std::move(prefix));
+        }
+        void addSuffix(std::string suffix) {
+            mSuffixes.insert(std::move(suffix));
+        }
+        bool isPrefix(const std::string& prefix) const {
+            return (mPrefixes.find(prefix) != mPrefixes.end());
+        }
+        bool isSuffix(const std::string& suffix) const {
+            return (mSuffixes.find(suffix) != mSuffixes.end());
+        }
+
+    private:
+        std::set<std::string> mPrefixes;
+        std::set<std::string> mSuffixes;
+    };
+
+    class CodeBlock {
+    public:
+        CodeBlock() = default;
+
+        void setStart(const char* s) {
+            mStart = s;
+        }
+        void setEnd(const char* e) {
+            mEnd = e;
+        }
+        void setOffset(const int o) {
+            mOffset = o;
+        }
+        void addBlock(const char* blockName) {
+            mBlocks.insert(blockName);
+        }
+        const std::string& start() const {
+            return mStart;
+        }
+        const std::string& end() const {
+            return mEnd;
+        }
+        int offset() const {
+            return mOffset;
+        }
+        bool isBlock(const std::string& blockName) const {
+            return mBlocks.find(blockName) != mBlocks.end();
+        }
+
+    private:
+        std::string mStart;
+        std::string mEnd;
+        int mOffset{};
+        std::set<std::string> mBlocks;
+    };
+
+    enum class FalseTrueMaybe : std::uint8_t { False, True, Maybe };
+
+    std::map<std::string, WarnInfo> mFunctionwarn;
+    std::set<std::string> mDefines;
+
+    std::unordered_map<std::string, Container> mContainers;
+    std::unordered_map<std::string, Function> mFunctions;
+    std::unordered_map<std::string, SmartPointer> mSmartPointers;
+
+    int mAllocId{};
+    std::set<std::string> mFiles;
+    std::map<std::string, AllocFunc> mAlloc; // allocation functions
+    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::map<std::string, std::vector<MathLib::bigint>> mUnknownReturnValues;
+    std::map<std::string, bool> mReportErrors;
+    std::map<std::string, bool> mProcessAfterCode;
+    std::set<std::string> mMarkupExtensions; // file extensions of markup files
+    std::map<std::string, std::set<std::string>> mKeywords;  // keywords for code in the library
+    std::unordered_map<std::string, CodeBlock> mExecutableBlocks; // keywords for blocks of executable code
+    std::map<std::string, ExportedFunctions> mExporters; // keywords that export variables/functions to libraries (meta-code/macros)
+    std::map<std::string, std::set<std::string>> mImporters;  // keywords that import variables/functions
+    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::map<std::pair<std::string,std::string>, TypeCheck> mTypeChecks;
+    std::unordered_map<std::string, NonOverlappingData> mNonOverlappingData;
+    std::unordered_set<std::string> mEntrypoints;
+};
+
+const std::string Library::mEmptyString;
+
+Library::Library()
+    : mData(new LibraryData())
+{}
+
+Library::~Library() = default;
+
+Library::Library(const Library& other)
+    : mData(new LibraryData(*other.mData))
+{}
+
+Library& Library::operator=(const Library& other) &
+{
+    if (this == &other)
+        return *this;
+
+    mData.reset(new LibraryData(*other.mData));
+    return *this;
+}
 
 static std::vector<std::string> getnames(const char *names)
 {
@@ -54,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);
+    const std::string str(valid + ',');
+    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));
@@ -64,82 +187,74 @@ static void gettokenlistfromvalid(const std::string& valid, TokenList& tokenList
     }
 }
 
-Library::Library() : mAllocId(0)
-{}
-
-Library::Error Library::load(const char exename[], const char path[])
+Library::Error Library::load(const char exename[], const char path[], bool debug)
 {
     if (std::strchr(path,',') != nullptr) {
-        std::string p(path);
-        for (;;) {
-            const std::string::size_type pos = p.find(',');
-            if (pos == std::string::npos)
-                break;
-            const Error &e = load(exename, p.substr(0,pos).c_str());
-            if (e.errorcode != ErrorCode::OK)
-                return e;
-            p = p.substr(pos+1);
-        }
-        if (!p.empty())
-            return load(exename, p.c_str());
-        return Error();
+        throw std::runtime_error("handling of multiple libraries not supported");
     }
 
+    const bool is_abs_path = Path::isAbsolute(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 - TODO: handle relative paths?
+    if (!is_abs_path && Path::getFilenameExtension(fullfilename).empty())
+        fullfilename += ".cfg";
+
     std::string absolute_path;
     // open file..
     tinyxml2::XMLDocument doc;
-    tinyxml2::XMLError error = doc.LoadFile(path);
-    if (error == tinyxml2::XML_ERROR_FILE_READ_ERROR && Path::getFilenameExtension(path).empty())
-        // Reading file failed, try again...
-        error = tinyxml2::XML_ERROR_FILE_NOT_FOUND;
+    if (debug)
+        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";
-            error = doc.LoadFile(fullfilename.c_str());
-            if (error != tinyxml2::XML_ERROR_FILE_NOT_FOUND)
-                absolute_path = Path::getAbsoluteFilePath(fullfilename);
-        }
-
-        std::list<std::string> cfgfolders;
-#ifdef FILESDIR
-        cfgfolders.emplace_back(FILESDIR "/cfg");
-#endif
-        if (exename) {
-            const std::string exepath(Path::fromNativeSeparators(Path::getPathFromFilename(Path::getCurrentExecutablePath(exename))));
-            cfgfolders.push_back(exepath + "cfg");
-            cfgfolders.push_back(exepath + "../cfg");
-            cfgfolders.push_back(exepath);
-        }
+        // only perform further lookups when the given path was not absolute
+        if (!is_abs_path && error == tinyxml2::XML_ERROR_FILE_NOT_FOUND)
+        {
+            std::list<std::string> cfgfolders;
+    #ifdef FILESDIR
+            cfgfolders.emplace_back(FILESDIR "/cfg");
+    #endif
+            if (exename) {
+                std::string exepath(Path::fromNativeSeparators(Path::getPathFromFilename(Path::getCurrentExecutablePath(exename))));
+                cfgfolders.push_back(exepath + "cfg");
+                cfgfolders.push_back(std::move(exepath));
+            }
 
-        while (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND && !cfgfolders.empty()) {
-            const std::string cfgfolder(cfgfolders.back());
-            cfgfolders.pop_back();
-            const char *sep = (!cfgfolder.empty() && endsWith(cfgfolder,'/') ? "" : "/");
-            const std::string filename(cfgfolder + sep + fullfilename);
-            error = doc.LoadFile(filename.c_str());
-            if (error != tinyxml2::XML_ERROR_FILE_NOT_FOUND)
-                absolute_path = Path::getAbsoluteFilePath(filename);
+            while (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND && !cfgfolders.empty()) {
+                const std::string cfgfolder(cfgfolders.back());
+                cfgfolders.pop_back();
+                const char *sep = (!cfgfolder.empty() && endsWith(cfgfolder,'/') ? "" : "/");
+                const std::string filename(cfgfolder + sep + fullfilename);
+                if (debug)
+                    std::cout << "looking for library '" + std::string(filename) + "'" << std::endl;
+                error = xml_LoadFile(doc, filename.c_str());
+                if (error != tinyxml2::XML_ERROR_FILE_NOT_FOUND)
+                    absolute_path = Path::getAbsoluteFilePath(filename);
+            }
         }
     } else
-        absolute_path = Path::getAbsoluteFilePath(path);
+        absolute_path = Path::getAbsoluteFilePath(fullfilename);
 
     if (error == tinyxml2::XML_SUCCESS) {
-        if (mFiles.find(absolute_path) == mFiles.end()) {
+        if (mData->mFiles.find(absolute_path) == mData->mFiles.end()) {
             Error err = load(doc);
             if (err.errorcode == ErrorCode::OK)
-                mFiles.insert(absolute_path);
+                mData->mFiles.insert(std::move(absolute_path));
             return err;
         }
 
         return Error(ErrorCode::OK); // ignore duplicates
     }
 
+    if (debug)
+        std::cout << "library not found: '" + std::string(path) + "'" << std::endl;
+
     if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND)
         return Error(ErrorCode::FILE_NOT_FOUND);
 
-    doc.PrintError();
+    doc.PrintError(); // TODO: do not print stray messages
     return Error(ErrorCode::BAD_XML);
 }
 
@@ -177,10 +292,14 @@ Library::Container::Action Library::Container::actionFrom(const std::string& act
         return Container::Action::POP;
     if (actionName == "find")
         return Container::Action::FIND;
+    if (actionName == "find-const")
+        return Container::Action::FIND_CONST;
     if (actionName == "insert")
         return Container::Action::INSERT;
     if (actionName == "erase")
         return Container::Action::ERASE;
+    if (actionName == "append")
+        return Container::Action::APPEND;
     if (actionName == "change-content")
         return Container::Action::CHANGE_CONTENT;
     if (actionName == "change-internal")
@@ -190,11 +309,64 @@ Library::Container::Action Library::Container::actionFrom(const std::string& act
     return Container::Action::NO_ACTION;
 }
 
-// cppcheck-suppress unusedFunction - only used in unit tests
-bool Library::loadxmldata(const char xmldata[], std::size_t len)
-{
-    tinyxml2::XMLDocument doc;
-    return (tinyxml2::XML_SUCCESS == doc.Parse(xmldata, len)) && (load(doc).errorcode == ErrorCode::OK);
+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)
@@ -223,28 +395,37 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             int allocationId = 0;
             for (const tinyxml2::XMLElement *memorynode = node->FirstChildElement(); memorynode; memorynode = memorynode->NextSiblingElement()) {
                 if (strcmp(memorynode->Name(),"dealloc")==0) {
-                    const std::map<std::string, AllocFunc>::const_iterator it = mDealloc.find(memorynode->GetText());
-                    if (it != mDealloc.end()) {
-                        allocationId = it->second.groupId;
-                        break;
+                    const auto names = getnames(memorynode->GetText());
+                    for (const auto& n : names) {
+                        const auto it = utils::as_const(mData->mDealloc).find(n);
+                        if (it != mData->mDealloc.end()) {
+                            allocationId = it->second.groupId;
+                            break;
+                        }
                     }
+                    if (allocationId != 0)
+                        break;
                 }
             }
             if (allocationId == 0) {
-                if (nodename == "memory")
-                    while (!ismemory(++mAllocId));
-                else
-                    while (!isresource(++mAllocId));
-                allocationId = mAllocId;
+                if (nodename == "memory") {
+                    while (!ismemory(++mData->mAllocId)) {}
+                }
+                else {
+                    while (!isresource(++mData->mAllocId)) {}
+                }
+                allocationId = mData->mAllocId;
             }
 
             // add alloc/dealloc/use functions..
             for (const tinyxml2::XMLElement *memorynode = node->FirstChildElement(); memorynode; memorynode = memorynode->NextSiblingElement()) {
                 const std::string memorynodename = memorynode->Name();
+                const auto names = getnames(memorynode->GetText());
                 if (memorynodename == "alloc" || memorynodename == "realloc") {
-                    AllocFunc temp = {0};
+                    AllocFunc temp;
                     temp.groupId = allocationId;
 
+                    temp.noFail = memorynode->BoolAttribute("no-fail", false);
                     temp.initData = memorynode->BoolAttribute("init", true);
                     temp.arg = memorynode->IntAttribute("arg", -1);
 
@@ -275,17 +456,18 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                     if (memorynodename == "realloc")
                         temp.reallocArg = memorynode->IntAttribute("realloc-arg", 1);
 
-                    if (memorynodename != "realloc")
-                        mAlloc[memorynode->GetText()] = temp;
-                    else
-                        mRealloc[memorynode->GetText()] = temp;
+                    auto& map = (memorynodename == "realloc") ? mData->mRealloc : mData->mAlloc;
+                    for (const auto& n : names)
+                        map[n] = temp;
                 } else if (memorynodename == "dealloc") {
-                    AllocFunc temp = {0};
+                    AllocFunc temp;
                     temp.groupId = allocationId;
                     temp.arg = memorynode->IntAttribute("arg", 1);
-                    mDealloc[memorynode->GetText()] = temp;
+                    for (const auto& n : names)
+                        mData->mDealloc[n] = temp;
                 } else if (memorynodename == "use")
-                    functions[memorynode->GetText()].use = true;
+                    for (const auto& n : names)
+                        mData->mFunctions[n].use = true;
                 else
                     unknown_elements.insert(memorynodename);
             }
@@ -298,9 +480,9 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             const char *value = node->Attribute("value");
             if (value == nullptr)
                 return Error(ErrorCode::MISSING_ATTRIBUTE, "value");
-            defines.push_back(std::string(name) +
-                              " " +
-                              value);
+            auto result = mData->mDefines.insert(std::string(name) + " " + value);
+            if (!result.second)
+                return Error(ErrorCode::DUPLICATE_DEFINE, name);
         }
 
         else if (nodename == "function") {
@@ -325,7 +507,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                 if (!argString)
                     return Error(ErrorCode::MISSING_ATTRIBUTE, "arg");
 
-                mReflection[reflectionnode->GetText()] = strToInt<int>(argString);
+                mData->mReflection[reflectionnode->GetText()] = strToInt<int>(argString);
             }
         }
 
@@ -333,10 +515,10 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             const char * const extension = node->Attribute("ext");
             if (!extension)
                 return Error(ErrorCode::MISSING_ATTRIBUTE, "ext");
-            mMarkupExtensions.insert(extension);
+            mData->mMarkupExtensions.insert(extension);
 
-            mReportErrors[extension] = (node->Attribute("reporterrors", "true") != nullptr);
-            mProcessAfterCode[extension] = (node->Attribute("aftercode", "true") != nullptr);
+            mData->mReportErrors[extension] = (node->Attribute("reporterrors", "true") != nullptr);
+            mData->mProcessAfterCode[extension] = (node->Attribute("aftercode", "true") != nullptr);
 
             for (const tinyxml2::XMLElement *markupnode = node->FirstChildElement(); markupnode; markupnode = markupnode->NextSiblingElement()) {
                 const std::string markupnodename = markupnode->Name();
@@ -346,7 +528,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                             const char* nodeName = librarynode->Attribute("name");
                             if (nodeName == nullptr)
                                 return Error(ErrorCode::MISSING_ATTRIBUTE, "name");
-                            mKeywords[extension].insert(nodeName);
+                            mData->mKeywords[extension].insert(nodeName);
                         } else
                             unknown_elements.insert(librarynode->Name());
                     }
@@ -366,9 +548,9 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                         for (const tinyxml2::XMLElement *e = exporter->FirstChildElement(); e; e = e->NextSiblingElement()) {
                             const std::string ename = e->Name();
                             if (ename == "prefix")
-                                mExporters[prefix].addPrefix(e->GetText());
+                                mData->mExporters[prefix].addPrefix(e->GetText());
                             else if (ename == "suffix")
-                                mExporters[prefix].addSuffix(e->GetText());
+                                mData->mExporters[prefix].addSuffix(e->GetText());
                             else
                                 unknown_elements.insert(ename);
                         }
@@ -378,7 +560,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                 else if (markupnodename == "imported") {
                     for (const tinyxml2::XMLElement *librarynode = markupnode->FirstChildElement(); librarynode; librarynode = librarynode->NextSiblingElement()) {
                         if (strcmp(librarynode->Name(), "importer") == 0)
-                            mImporters[extension].insert(librarynode->GetText());
+                            mData->mImporters[extension].insert(librarynode->GetText());
                         else
                             unknown_elements.insert(librarynode->Name());
                     }
@@ -390,17 +572,19 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                         if (blocknodename == "block") {
                             const char * blockName = blocknode->Attribute("name");
                             if (blockName)
-                                mExecutableBlocks[extension].addBlock(blockName);
+                                mData->mExecutableBlocks[extension].addBlock(blockName);
                         } else if (blocknodename == "structure") {
                             const char * start = blocknode->Attribute("start");
                             if (start)
-                                mExecutableBlocks[extension].setStart(start);
+                                mData->mExecutableBlocks[extension].setStart(start);
                             const char * end = blocknode->Attribute("end");
                             if (end)
-                                mExecutableBlocks[extension].setEnd(end);
+                                mData->mExecutableBlocks[extension].setEnd(end);
                             const char * offset = blocknode->Attribute("offset");
-                            if (offset)
-                                mExecutableBlocks[extension].setOffset(strToInt<int>(offset));
+                            if (offset) {
+                                // cppcheck-suppress templateInstantiation - TODO: fix this - see #11631
+                                mData->mExecutableBlocks[extension].setOffset(strToInt<int>(offset));
+                            }
                         }
 
                         else
@@ -418,12 +602,12 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             if (!id)
                 return Error(ErrorCode::MISSING_ATTRIBUTE, "id");
 
-            Container& container = containers[id];
+            Container& container = mData->mContainers[id];
 
             const char* const inherits = node->Attribute("inherits");
             if (inherits) {
-                const std::map<std::string, Container>::const_iterator i = containers.find(inherits);
-                if (i != containers.end())
+                const auto i = utils::as_const(mData->mContainers).find(inherits);
+                if (i != mData->mContainers.end())
                     container = i->second; // Take values from parent and overwrite them if necessary
                 else
                     return Error(ErrorCode::BAD_ATTRIBUTE_VALUE, inherits);
@@ -432,7 +616,9 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             const char* const startPattern = node->Attribute("startPattern");
             if (startPattern) {
                 container.startPattern = startPattern;
-                container.startPattern2 = container.startPattern + " !!::";
+                container.startPattern2 = startPattern;
+                if (!endsWith(container.startPattern, '<'))
+                    container.startPattern2 += " !!::";
             }
             const char* const endPattern = node->Attribute("endPattern");
             if (endPattern)
@@ -521,7 +707,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                     for (const tinyxml2::XMLElement* memberNode = node->FirstChildElement(); memberNode; memberNode = memberNode->NextSiblingElement()) {
                         const char *memberName = memberNode->Attribute("name");
                         const char *memberTemplateParameter = memberNode->Attribute("templateParameter");
-                        struct Container::RangeItemRecordTypeItem member;
+                        Container::RangeItemRecordTypeItem member;
                         member.name = memberName ? memberName : "";
                         member.templateParameter = memberTemplateParameter ? strToInt<int>(memberTemplateParameter) : -1;
                         container.rangeItemRecordType.emplace_back(std::move(member));
@@ -535,7 +721,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             const char *className = node->Attribute("class-name");
             if (!className)
                 return Error(ErrorCode::MISSING_ATTRIBUTE, "class-name");
-            SmartPointer& smartPointer = smartPointers[className];
+            SmartPointer& smartPointer = mData->mSmartPointers[className];
             smartPointer.name = className;
             for (const tinyxml2::XMLElement* smartPointerNode = node->FirstChildElement(); smartPointerNode;
                  smartPointerNode = smartPointerNode->NextSiblingElement()) {
@@ -554,11 +740,11 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                     if (!typeName)
                         continue;
                     if (checkTypeName == "check")
-                        mTypeChecks[std::pair<std::string,std::string>(checkName, typeName)] = TypeCheck::check;
+                        mData->mTypeChecks[std::pair<std::string,std::string>(checkName, typeName)] = TypeCheck::check;
                     else if (checkTypeName == "suppress")
-                        mTypeChecks[std::pair<std::string,std::string>(checkName, typeName)] = TypeCheck::suppress;
+                        mData->mTypeChecks[std::pair<std::string,std::string>(checkName, typeName)] = TypeCheck::suppress;
                     else if (checkTypeName == "checkFiniteLifetime")
-                        mTypeChecks[std::pair<std::string,std::string>(checkName, typeName)] = TypeCheck::checkFiniteLifetime;
+                        mData->mTypeChecks[std::pair<std::string,std::string>(checkName, typeName)] = TypeCheck::checkFiniteLifetime;
                 }
             }
         }
@@ -567,7 +753,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             const char * const name = node->Attribute("name");
             if (!name)
                 return Error(ErrorCode::MISSING_ATTRIBUTE, "name");
-            PodType podType = {0};
+            PodType podType;
             podType.stdtype = PodType::Type::NO;
             const char * const stdtype = node->Attribute("stdtype");
             if (stdtype) {
@@ -591,7 +777,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             if (sign)
                 podType.sign = *sign;
             for (const std::string &s : getnames(name))
-                mPodTypes[s] = podType;
+                mData->mPodTypes[s] = podType;
         }
 
         else if (nodename == "platformtype") {
@@ -627,13 +813,13 @@ 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);
                     return Error(ErrorCode::PLATFORM_TYPE_REDEFINED, type_name);
                 }
-                mPlatformTypes[type_name] = type;
+                mData->mPlatformTypes[type_name] = std::move(type);
             } else {
                 for (const std::string &p : platform) {
                     const PlatformType * const type_ptr = platform_type(type_name, p);
@@ -642,7 +828,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                             return Error(ErrorCode::DUPLICATE_PLATFORM_TYPE, type_name);
                         return Error(ErrorCode::PLATFORM_TYPE_REDEFINED, type_name);
                     }
-                    mPlatforms[p].mPlatformTypes[type_name] = type;
+                    mData->mPlatforms[p].mPlatformTypes[type_name] = type;
                 }
             }
         }
@@ -651,7 +837,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
             const char * const type_name = node->Attribute("name");
             if (type_name == nullptr)
                 return Error(ErrorCode::MISSING_ATTRIBUTE, "name");
-            mEntrypoints.emplace(type_name);
+            mData->mEntrypoints.emplace(type_name);
         }
 
         else
@@ -659,7 +845,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
     }
     if (!unknown_elements.empty()) {
         std::string str;
-        for (std::set<std::string>::const_iterator i = unknown_elements.cbegin(); i != unknown_elements.cend();) {
+        for (auto i = unknown_elements.cbegin(); i != unknown_elements.cend();) {
             str += *i;
             if (++i != unknown_elements.end())
                 str += ", ";
@@ -675,18 +861,18 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
         return Error(ErrorCode::OK);
 
     // TODO: write debug warning if we modify an existing entry
-    Function& func = functions[name];
+    Function& func = mData->mFunctions[name];
 
     for (const tinyxml2::XMLElement *functionnode = node->FirstChildElement(); functionnode; functionnode = functionnode->NextSiblingElement()) {
         const std::string functionnodename = functionnode->Name();
         if (functionnodename == "noreturn") {
             const char * const text = functionnode->GetText();
             if (strcmp(text, "false") == 0)
-                mNoReturn[name] = FalseTrueMaybe::False;
+                mData->mNoReturn[name] = LibraryData::FalseTrueMaybe::False;
             else if (strcmp(text, "maybe") == 0)
-                mNoReturn[name] = FalseTrueMaybe::Maybe;
+                mData->mNoReturn[name] = LibraryData::FalseTrueMaybe::Maybe;
             else
-                mNoReturn[name] = FalseTrueMaybe::True; // Safe
+                mData->mNoReturn[name] = LibraryData::FalseTrueMaybe::True; // Safe
         } else if (functionnodename == "pure")
             func.ispure = true;
         else if (functionnodename == "const") {
@@ -700,7 +886,8 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
             nonOverlappingData.ptr2Arg = functionnode->IntAttribute("ptr2-arg", -1);
             nonOverlappingData.sizeArg = functionnode->IntAttribute("size-arg", -1);
             nonOverlappingData.strlenArg = functionnode->IntAttribute("strlen-arg", -1);
-            mNonOverlappingData[name] = nonOverlappingData;
+            nonOverlappingData.countArg = functionnode->IntAttribute("count-arg", -1);
+            mData->mNonOverlappingData[name] = nonOverlappingData;
         } else if (functionnodename == "use-retval") {
             func.useretval = Library::UseRetValType::DEFAULT;
             if (const char *type = functionnode->Attribute("type"))
@@ -708,15 +895,16 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
                     func.useretval = Library::UseRetValType::ERROR_CODE;
         } else if (functionnodename == "returnValue") {
             if (const char *expr = functionnode->GetText())
-                mReturnValue[name] = expr;
+                mData->mReturnValue[name] = expr;
             if (const char *type = functionnode->Attribute("type"))
-                mReturnValueType[name] = type;
+                mData->mReturnValueType[name] = type;
             if (const char *container = functionnode->Attribute("container"))
-                mReturnValueContainer[name] = strToInt<int>(container);
+                mData->mReturnValueContainer[name] = strToInt<int>(container);
+            // cppcheck-suppress shadowFunction - TODO: fix this
             if (const char *unknownReturnValues = functionnode->Attribute("unknownValues")) {
                 if (std::strcmp(unknownReturnValues, "all") == 0) {
                     std::vector<MathLib::bigint> values{LLONG_MIN, LLONG_MAX};
-                    mUnknownReturnValues[name] = values;
+                    mData->mUnknownReturnValues[name] = std::move(values);
                 }
             }
         } else if (functionnodename == "arg") {
@@ -732,13 +920,20 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
             const char * const argDirection = functionnode->Attribute("direction");
             if (argDirection) {
                 const size_t argDirLen = strlen(argDirection);
+                ArgumentChecks::Direction dir = ArgumentChecks::Direction::DIR_UNKNOWN;
                 if (!strncmp(argDirection, "in", argDirLen)) {
-                    ac.direction = ArgumentChecks::Direction::DIR_IN;
+                    dir = ArgumentChecks::Direction::DIR_IN;
                 } else if (!strncmp(argDirection, "out", argDirLen)) {
-                    ac.direction = ArgumentChecks::Direction::DIR_OUT;
+                    dir = ArgumentChecks::Direction::DIR_OUT;
                 } else if (!strncmp(argDirection, "inout", argDirLen)) {
-                    ac.direction = ArgumentChecks::Direction::DIR_INOUT;
+                    dir = ArgumentChecks::Direction::DIR_INOUT;
+                }
+                if (const char* const argIndirect = functionnode->Attribute("indirect")) {
+                    const int indirect = strToInt<int>(argIndirect);
+                    ac.direction[indirect] = dir; // TODO: handle multiple directions/indirect levels
                 }
+                else
+                    ac.direction.fill(dir);
             }
             for (const tinyxml2::XMLElement *argnode = functionnode->FirstChildElement(); argnode; argnode = argnode->NextSiblingElement()) {
                 const std::string argnodename = argnode->Name();
@@ -801,7 +996,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);
@@ -810,7 +1005,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';
                         }
@@ -846,7 +1041,7 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
             const char* const severity = functionnode->Attribute("severity");
             if (severity == nullptr)
                 return Error(ErrorCode::MISSING_ATTRIBUTE, "severity");
-            wi.severity = Severity::fromString(severity);
+            wi.severity = severityFromString(severity);
 
             const char* const cstd = functionnode->Attribute("cstd");
             if (cstd) {
@@ -885,7 +1080,7 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
                 wi.message = message;
             }
 
-            functionwarn[name] = wi;
+            mData->mFunctionwarn[name] = std::move(wi);
         } else if (functionnodename == "container") {
             const char* const action_ptr = functionnode->Attribute("action");
             Container::Action action = Container::Action::NO_ACTION;
@@ -916,46 +1111,46 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
     return Error(ErrorCode::OK);
 }
 
-bool Library::isIntArgValid(const Token *ftok, int argnr, const MathLib::bigint argvalue) const
+bool Library::isIntArgValid(const Token *ftok, int argnr, const MathLib::bigint argvalue, const Settings& settings) const
 {
     const ArgumentChecks *ac = getarg(ftok, argnr);
     if (!ac || ac->valid.empty())
         return true;
     if (ac->valid.find('.') != std::string::npos)
-        return isFloatArgValid(ftok, argnr, argvalue);
-    TokenList tokenList(nullptr);
+        return isFloatArgValid(ftok, argnr, static_cast<double>(argvalue), settings);
+    TokenList tokenList(settings, ftok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
     gettokenlistfromvalid(ac->valid, tokenList);
     for (const Token *tok = tokenList.front(); tok; tok = tok->next()) {
-        if (tok->isNumber() && argvalue == MathLib::toLongNumber(tok->str()))
+        if (tok->isNumber() && argvalue == MathLib::toBigNumber(tok))
             return true;
-        if (Token::Match(tok, "%num% : %num%") && argvalue >= MathLib::toLongNumber(tok->str()) && argvalue <= MathLib::toLongNumber(tok->strAt(2)))
+        if (Token::Match(tok, "%num% : %num%") && argvalue >= MathLib::toBigNumber(tok) && argvalue <= MathLib::toBigNumber(tok->tokAt(2)))
             return true;
-        if (Token::Match(tok, "%num% : ,") && argvalue >= MathLib::toLongNumber(tok->str()))
+        if (Token::Match(tok, "%num% : ,") && argvalue >= MathLib::toBigNumber(tok))
             return true;
-        if ((!tok->previous() || tok->previous()->str() == ",") && Token::Match(tok,": %num%") && argvalue <= MathLib::toLongNumber(tok->strAt(1)))
+        if ((!tok->previous() || tok->strAt(-1) == ",") && Token::Match(tok,": %num%") && argvalue <= MathLib::toBigNumber(tok->tokAt(1)))
             return true;
     }
     return false;
 }
 
-bool Library::isFloatArgValid(const Token *ftok, int argnr, double argvalue) const
+bool Library::isFloatArgValid(const Token *ftok, int argnr, double argvalue, const Settings& settings) const
 {
     const ArgumentChecks *ac = getarg(ftok, argnr);
     if (!ac || ac->valid.empty())
         return true;
-    TokenList tokenList(nullptr);
+    TokenList tokenList(settings, ftok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
     gettokenlistfromvalid(ac->valid, tokenList);
     for (const Token *tok = tokenList.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "%num% : %num%") && argvalue >= MathLib::toDoubleNumber(tok->str()) && argvalue <= MathLib::toDoubleNumber(tok->strAt(2)))
+        if (Token::Match(tok, "%num% : %num%") && argvalue >= MathLib::toDoubleNumber(tok) && argvalue <= MathLib::toDoubleNumber(tok->tokAt(2)))
             return true;
-        if (Token::Match(tok, "%num% : ,") && argvalue >= MathLib::toDoubleNumber(tok->str()))
+        if (Token::Match(tok, "%num% : ,") && argvalue >= MathLib::toDoubleNumber(tok))
             return true;
-        if ((!tok->previous() || tok->previous()->str() == ",") && Token::Match(tok,": %num%") && argvalue <= MathLib::toDoubleNumber(tok->strAt(1)))
+        if ((!tok->previous() || tok->strAt(-1) == ",") && Token::Match(tok,": %num%") && argvalue <= MathLib::toDoubleNumber(tok->tokAt(1)))
             return true;
         if (Token::Match(tok, "%num%") && MathLib::isFloat(tok->str()) && MathLib::isEqual(tok->str(), MathLib::toString(argvalue)))
             return true;
-        if (Token::Match(tok, "! %num%") && MathLib::isFloat(tok->next()->str()))
-            return MathLib::isNotEqual(tok->next()->str(), MathLib::toString(argvalue));
+        if (Token::Match(tok, "! %num%") && MathLib::isFloat(tok->strAt(1)))
+            return MathLib::isNotEqual(tok->strAt(1), MathLib::toString(argvalue));
     }
     return false;
 }
@@ -967,6 +1162,8 @@ std::string Library::getFunctionName(const Token *ftok, bool &error) const
         return "";
     }
     if (ftok->isName()) {
+        if (Token::simpleMatch(ftok->astParent(), "::"))
+            return ftok->str();
         for (const Scope *scope = ftok->scope(); scope; scope = scope->nestedIn) {
             if (!scope->isClassOrStruct())
                 continue;
@@ -981,7 +1178,7 @@ std::string Library::getFunctionName(const Token *ftok, bool &error) const
                     tok = tok->next();
                 }
                 name += "::" + ftok->str();
-                if (functions.find(name) != functions.end() && matchArguments(ftok, name))
+                if (mData->mFunctions.find(name) != mData->mFunctions.end() && matchArguments(ftok, name))
                     return name;
             }
         }
@@ -1014,8 +1211,12 @@ std::string Library::getFunctionName(const Token *ftok) const
     if (ftok->astParent()) {
         bool error = false;
         const Token * tok = ftok->astParent()->isUnaryOp("&") ? ftok->astParent()->astOperand1() : ftok->next()->astOperand1();
-        const std::string ret = getFunctionName(tok, error);
-        return error ? std::string() : ret;
+        std::string ret = getFunctionName(tok, error);
+        if (error)
+            return {};
+        if (startsWith(ret, "::"))
+            ret.erase(0, 2);
+        return ret;
     }
 
     // Lookup function name without using AST..
@@ -1038,8 +1239,8 @@ bool Library::isnullargbad(const Token *ftok, int argnr) const
     if (!arg) {
         // scan format string argument should not be null
         const std::string funcname = getFunctionName(ftok);
-        const std::unordered_map<std::string, Function>::const_iterator it = functions.find(funcname);
-        if (it != functions.cend() && it->second.formatstr && it->second.formatstr_scan)
+        const auto it = utils::as_const(mData->mFunctions).find(funcname);
+        if (it != mData->mFunctions.cend() && it->second.formatstr && it->second.formatstr_scan)
             return true;
     }
     return arg && arg->notnull;
@@ -1051,8 +1252,8 @@ bool Library::isuninitargbad(const Token *ftok, int argnr, int indirect, bool *h
     if (!arg) {
         // non-scan format string argument should not be uninitialized
         const std::string funcname = getFunctionName(ftok);
-        const std::unordered_map<std::string, Function>::const_iterator it = functions.find(funcname);
-        if (it != functions.cend() && it->second.formatstr && !it->second.formatstr_scan)
+        const auto it = utils::as_const(mData->mFunctions).find(funcname);
+        if (it != mData->mFunctions.cend() && it->second.formatstr && !it->second.formatstr_scan)
             return true;
     }
     if (hasIndirect && arg && arg->notuninit >= 1)
@@ -1064,22 +1265,34 @@ bool Library::isuninitargbad(const Token *ftok, int argnr, int indirect, bool *h
 /** get allocation info for function */
 const Library::AllocFunc* Library::getAllocFuncInfo(const Token *tok) const
 {
+    while (Token::simpleMatch(tok, "::"))
+        tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
+    if (!tok)
+        return nullptr;
     const std::string funcname = getFunctionName(tok);
-    return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(mAlloc, funcname);
+    return isNotLibraryFunction(tok) && mData->mFunctions.find(funcname) != mData->mFunctions.end() ? nullptr : getAllocDealloc(mData->mAlloc, funcname);
 }
 
 /** get deallocation info for function */
 const Library::AllocFunc* Library::getDeallocFuncInfo(const Token *tok) const
 {
+    while (Token::simpleMatch(tok, "::"))
+        tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
+    if (!tok)
+        return nullptr;
     const std::string funcname = getFunctionName(tok);
-    return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(mDealloc, funcname);
+    return isNotLibraryFunction(tok) && mData->mFunctions.find(funcname) != mData->mFunctions.end() ? nullptr : getAllocDealloc(mData->mDealloc, funcname);
 }
 
 /** get reallocation info for function */
 const Library::AllocFunc* Library::getReallocFuncInfo(const Token *tok) const
 {
+    while (Token::simpleMatch(tok, "::"))
+        tok = tok->astOperand2() ? tok->astOperand2() : tok->astOperand1();
+    if (!tok)
+        return nullptr;
     const std::string funcname = getFunctionName(tok);
-    return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(mRealloc, funcname);
+    return isNotLibraryFunction(tok) && mData->mFunctions.find(funcname) != mData->mFunctions.end() ? nullptr : getAllocDealloc(mData->mRealloc, funcname);
 }
 
 /** get allocation id for function */
@@ -1106,16 +1319,14 @@ int Library::getReallocId(const Token *tok, int arg) const
 
 const Library::ArgumentChecks * Library::getarg(const Token *ftok, int argnr) const
 {
-    if (isNotLibraryFunction(ftok))
+    const Function* func = nullptr;
+    if (isNotLibraryFunction(ftok, &func))
         return nullptr;
-    const std::unordered_map<std::string, Function>::const_iterator it1 = functions.find(getFunctionName(ftok));
-    if (it1 == functions.cend())
-        return nullptr;
-    const std::map<int,ArgumentChecks>::const_iterator it2 = it1->second.argumentChecks.find(argnr);
-    if (it2 != it1->second.argumentChecks.cend())
+    const auto it2 = utils::as_const(func->argumentChecks).find(argnr);
+    if (it2 != func->argumentChecks.cend())
         return &it2->second;
-    const std::map<int,ArgumentChecks>::const_iterator it3 = it1->second.argumentChecks.find(-1);
-    if (it3 != it1->second.argumentChecks.cend())
+    const auto it3 = utils::as_const(func->argumentChecks).find(-1);
+    if (it3 != func->argumentChecks.cend())
         return &it3->second;
     return nullptr;
 }
@@ -1137,6 +1348,8 @@ bool Library::isScopeNoReturn(const Token *end, std::string *unknownFunc) const
         return false;
 
     const Token *funcname = end->linkAt(-2)->previous();
+    if (funcname->isCpp() && funcname->astTop()->str() == "throw")
+        return true;
     const Token *start = funcname;
     if (Token::Match(funcname->tokAt(-3),"( * %name% )")) {
         funcname = funcname->previous();
@@ -1161,14 +1374,33 @@ bool Library::isScopeNoReturn(const Token *end, std::string *unknownFunc) const
     return false;
 }
 
-const Library::Container* Library::detectContainerInternal(const Token* typeStart, DetectContainer detect, bool* isIterator, bool withoutStd) const
+// cppcheck-suppress unusedFunction - used in tests only
+const std::unordered_map<std::string, Library::Container>& Library::containers() const
 {
-    for (const std::pair<const std::string, Library::Container> & c : containers) {
+    return mData->mContainers;
+}
+
+const Library::Container* Library::detectContainerInternal(const Token* const typeStart, DetectContainer detect, bool* isIterator, bool withoutStd) const
+{
+    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())
+            continue;
+
+        firstLinkedTok = tok;
+        break;
+    }
+
+    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 && container.startPattern2.find("std :: ") == 0) ? 7 : 0;
+        const int offset = (withoutStd && startsWith(container.startPattern2, "std :: ")) ? 7 : 0;
 
         // If endPattern is undefined, it will always match, but itEndPattern has to be defined.
         if (detect != IteratorOnly && container.endPattern.empty()) {
@@ -1180,23 +1412,22 @@ const Library::Container* Library::detectContainerInternal(const Token* typeStar
             return &container;
         }
 
-        for (const Token* tok = typeStart; tok && !tok->varId(); tok = tok->next()) {
-            if (!tok->link())
-                continue;
+        if (!firstLinkedTok)
+            continue;
 
-            const bool matchedStartPattern = Token::Match(typeStart, container.startPattern2.c_str() + offset);
+        const bool matchedStartPattern = Token::Match(typeStart, container.startPattern2.c_str() + offset);
+        if (!matchedStartPattern)
+            continue;
 
-            if (detect != ContainerOnly && matchedStartPattern && Token::Match(tok->link(), container.itEndPattern.c_str())) {
-                if (isIterator)
-                    *isIterator = true;
-                return &container;
-            }
-            if (detect != IteratorOnly && matchedStartPattern && Token::Match(tok->link(), container.endPattern.c_str())) {
-                if (isIterator)
-                    *isIterator = false;
-                return &container;
-            }
-            break;
+        if (detect != ContainerOnly && Token::Match(firstLinkedTok->link(), container.itEndPattern.c_str())) {
+            if (isIterator)
+                *isIterator = true;
+            return &container;
+        }
+        if (detect != IteratorOnly && Token::Match(firstLinkedTok->link(), container.endPattern.c_str())) {
+            if (isIterator)
+                *isIterator = false;
+            return &container;
         }
     }
     return nullptr;
@@ -1233,57 +1464,84 @@ bool Library::isContainerYield(const Token * const cond, Library::Container::Yie
                     return tok->astOperand2() && y == container->getYield(tok->astOperand2()->str());
                 }
             } else if (!fallback.empty()) {
-                return Token::simpleMatch(cond, "( )") && cond->previous()->str() == fallback;
+                return Token::simpleMatch(cond, "( )") && cond->strAt(-1) == fallback;
             }
         }
     }
     return false;
 }
 
+Library::Container::Yield Library::getContainerYield(const Token* const cond)
+{
+    if (Token::simpleMatch(cond, "(")) {
+        const Token* tok = cond->astOperand1();
+        if (tok && tok->str() == ".") {
+            if (tok->astOperand1() && tok->astOperand1()->valueType()) {
+                if (const Library::Container *container = tok->astOperand1()->valueType()->container) {
+                    if (tok->astOperand2())
+                        return container->getYield(tok->astOperand2()->str());
+                }
+            }
+        }
+    }
+    return Library::Container::Yield::NO_YIELD;
+}
+
 // returns true if ftok is not a library function
-bool Library::isNotLibraryFunction(const Token *ftok) const
+bool Library::isNotLibraryFunction(const Token *ftok, const Function **func) const
 {
     if (ftok->isKeyword() || ftok->isStandardType())
         return true;
 
-    if (ftok->function() && ftok->function()->nestedIn && ftok->function()->nestedIn->type != Scope::eGlobal)
+    if (ftok->function() && ftok->function()->nestedIn && ftok->function()->nestedIn->type != ScopeType::eGlobal)
         return true;
 
     // variables are not library functions.
     if (ftok->varId())
         return true;
 
-    return !matchArguments(ftok, getFunctionName(ftok));
+    return !matchArguments(ftok, getFunctionName(ftok), func);
 }
 
-bool Library::matchArguments(const Token *ftok, const std::string &functionName) const
+bool Library::matchArguments(const Token *ftok, const std::string &functionName, const Function **func) const
 {
     if (functionName.empty())
         return false;
-    const int callargs = numberOfArgumentsWithoutAst(ftok);
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(functionName);
-    if (it == functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(functionName);
+    if (it == mData->mFunctions.cend())
         return false;
+    const int callargs = numberOfArgumentsWithoutAst(ftok);
     int args = 0;
     int firstOptionalArg = -1;
     for (const std::pair<const int, Library::ArgumentChecks> & argCheck : it->second.argumentChecks) {
-        if (argCheck.first > args)
-            args = argCheck.first;
+        args = std::max(argCheck.first, args);
         if (argCheck.second.optional && (firstOptionalArg == -1 || firstOptionalArg > argCheck.first))
             firstOptionalArg = argCheck.first;
 
-        if (argCheck.second.formatstr || argCheck.second.variadic)
-            return args <= callargs;
+        if (argCheck.second.formatstr || argCheck.second.variadic) {
+            const bool b = args <= callargs;
+            if (b && func)
+                *func = &it->second;
+            return b;
+        }
     }
-    return (firstOptionalArg < 0) ? args == callargs : (callargs >= firstOptionalArg-1 && callargs <= args);
+    const bool b = (firstOptionalArg < 0) ? args == callargs : (callargs >= firstOptionalArg-1 && callargs <= args);
+    if (b && func)
+        *func = &it->second;
+    return b;
+}
+
+const std::map<std::string, Library::WarnInfo>& Library::functionwarn() const
+{
+    return mData->mFunctionwarn;
 }
 
 const Library::WarnInfo* Library::getWarnInfo(const Token* ftok) const
 {
     if (isNotLibraryFunction(ftok))
         return nullptr;
-    const std::map<std::string, WarnInfo>::const_iterator i = functionwarn.find(getFunctionName(ftok));
-    if (i == functionwarn.cend())
+    const auto i = utils::as_const(mData->mFunctionwarn).find(getFunctionName(ftok));
+    if (i ==  mData->mFunctionwarn.cend())
         return nullptr;
     return &i->second;
 }
@@ -1304,6 +1562,7 @@ bool Library::isCompliantValidationExpression(const char* p)
             error |= (*(p + 1) == '-');
         }
         else if (*p == ':') {
+            // cppcheck-suppress bitwiseOnBoolean - TODO: fix this
             error |= range | (*(p + 1) == '.');
             range = true;
             has_dot = false;
@@ -1318,6 +1577,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)));
             has_dot = true;
         } else if (*p == 'E' || *p == 'e') {
@@ -1336,15 +1596,15 @@ bool Library::formatstr_function(const Token* ftok) const
     if (isNotLibraryFunction(ftok))
         return false;
 
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(getFunctionName(ftok));
-    if (it != functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(getFunctionName(ftok));
+    if (it != mData->mFunctions.cend())
         return it->second.formatstr;
     return false;
 }
 
 int Library::formatstr_argno(const Token* ftok) const
 {
-    const std::map<int, Library::ArgumentChecks>& argumentChecksFunc = functions.at(getFunctionName(ftok)).argumentChecks;
+    const std::map<int, Library::ArgumentChecks>& argumentChecksFunc = mData->mFunctions.at(getFunctionName(ftok)).argumentChecks;
     auto it = std::find_if(argumentChecksFunc.cbegin(), argumentChecksFunc.cend(), [](const std::pair<const int, Library::ArgumentChecks>& a) {
         return a.second.formatstr;
     });
@@ -1353,20 +1613,20 @@ int Library::formatstr_argno(const Token* ftok) const
 
 bool Library::formatstr_scan(const Token* ftok) const
 {
-    return functions.at(getFunctionName(ftok)).formatstr_scan;
+    return mData->mFunctions.at(getFunctionName(ftok)).formatstr_scan;
 }
 
 bool Library::formatstr_secure(const Token* ftok) const
 {
-    return functions.at(getFunctionName(ftok)).formatstr_secure;
+    return mData->mFunctions.at(getFunctionName(ftok)).formatstr_secure;
 }
 
 const Library::NonOverlappingData* Library::getNonOverlappingData(const Token *ftok) const
 {
     if (isNotLibraryFunction(ftok))
         return nullptr;
-    const std::unordered_map<std::string, NonOverlappingData>::const_iterator it = mNonOverlappingData.find(getFunctionName(ftok));
-    return (it != mNonOverlappingData.cend()) ? &it->second : nullptr;
+    const auto it = utils::as_const(mData->mNonOverlappingData).find(getFunctionName(ftok));
+    return (it != mData->mNonOverlappingData.cend()) ? &it->second : nullptr;
 }
 
 Library::UseRetValType Library::getUseRetValType(const Token *ftok) const
@@ -1375,16 +1635,16 @@ Library::UseRetValType Library::getUseRetValType(const Token *ftok) const
         if (Token::simpleMatch(ftok->astParent(), ".")) {
             const Token* contTok = ftok->astParent()->astOperand1();
             using Yield = Library::Container::Yield;
-            const Yield yield = astContainerYield(contTok);
+            const Yield yield = astContainerYield(contTok, *this);
             if (yield == Yield::START_ITERATOR || yield == Yield::END_ITERATOR || yield == Yield::AT_INDEX ||
                 yield == Yield::SIZE || yield == Yield::EMPTY || yield == Yield::BUFFER || yield == Yield::BUFFER_NT ||
-                ((yield == Yield::ITEM || yield == Yield::ITERATOR) && astContainerAction(contTok) == Library::Container::Action::NO_ACTION))
+                ((yield == Yield::ITEM || yield == Yield::ITERATOR) && astContainerAction(contTok, *this) == Library::Container::Action::NO_ACTION))
                 return Library::UseRetValType::DEFAULT;
         }
         return Library::UseRetValType::NONE;
     }
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(getFunctionName(ftok));
-    if (it != functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(getFunctionName(ftok));
+    if (it != mData->mFunctions.cend())
         return it->second.useretval;
     return Library::UseRetValType::NONE;
 }
@@ -1392,47 +1652,51 @@ Library::UseRetValType Library::getUseRetValType(const Token *ftok) const
 const std::string& Library::returnValue(const Token *ftok) const
 {
     if (isNotLibraryFunction(ftok))
-        return emptyString;
-    const std::map<std::string, std::string>::const_iterator it = mReturnValue.find(getFunctionName(ftok));
-    return it != mReturnValue.cend() ? it->second : emptyString;
+        return mEmptyString;
+    const auto it = utils::as_const(mData->mReturnValue).find(getFunctionName(ftok));
+    return it != mData->mReturnValue.cend() ? it->second : mEmptyString;
 }
 
 const std::string& Library::returnValueType(const Token *ftok) const
 {
+    while (Token::simpleMatch(ftok, "::"))
+        ftok = ftok->astOperand2() ? ftok->astOperand2() : ftok->astOperand1();
+    if (!ftok)
+        return mEmptyString;
     if (isNotLibraryFunction(ftok)) {
         if (Token::simpleMatch(ftok->astParent(), ".") && ftok->astParent()->astOperand1()) {
             const Token* contTok = ftok->astParent()->astOperand1();
             if (contTok->valueType() && contTok->valueType()->container)
                 return contTok->valueType()->container->getReturnType(ftok->str());
         }
-        return emptyString;
+        return mEmptyString;
     }
-    const std::map<std::string, std::string>::const_iterator it = mReturnValueType.find(getFunctionName(ftok));
-    return it != mReturnValueType.cend() ? it->second : emptyString;
+    const auto it = utils::as_const(mData->mReturnValueType).find(getFunctionName(ftok));
+    return it != mData->mReturnValueType.cend() ? it->second : mEmptyString;
 }
 
 int Library::returnValueContainer(const Token *ftok) const
 {
     if (isNotLibraryFunction(ftok))
         return -1;
-    const std::map<std::string, int>::const_iterator it = mReturnValueContainer.find(getFunctionName(ftok));
-    return it != mReturnValueContainer.cend() ? it->second : -1;
+    const auto it = utils::as_const(mData->mReturnValueContainer).find(getFunctionName(ftok));
+    return it != mData->mReturnValueContainer.cend() ? it->second : -1;
 }
 
 std::vector<MathLib::bigint> Library::unknownReturnValues(const Token *ftok) const
 {
     if (isNotLibraryFunction(ftok))
         return std::vector<MathLib::bigint>();
-    const std::map<std::string, std::vector<MathLib::bigint>>::const_iterator it = mUnknownReturnValues.find(getFunctionName(ftok));
-    return (it == mUnknownReturnValues.cend()) ? std::vector<MathLib::bigint>() : it->second;
+    const auto it = utils::as_const(mData->mUnknownReturnValues).find(getFunctionName(ftok));
+    return (it == mData->mUnknownReturnValues.cend()) ? std::vector<MathLib::bigint>() : it->second;
 }
 
 const Library::Function *Library::getFunction(const Token *ftok) const
 {
     if (isNotLibraryFunction(ftok))
         return nullptr;
-    const std::unordered_map<std::string, Function>::const_iterator it1 = functions.find(getFunctionName(ftok));
-    if (it1 == functions.cend())
+    const auto it1 = utils::as_const(mData->mFunctions).find(getFunctionName(ftok));
+    if (it1 == mData->mFunctions.cend())
         return nullptr;
     return &it1->second;
 }
@@ -1442,19 +1706,22 @@ bool Library::hasminsize(const Token *ftok) const
 {
     if (isNotLibraryFunction(ftok))
         return false;
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(getFunctionName(ftok));
-    if (it == functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(getFunctionName(ftok));
+    if (it == mData->mFunctions.cend())
         return false;
     return std::any_of(it->second.argumentChecks.cbegin(), it->second.argumentChecks.cend(), [](const std::pair<const int, Library::ArgumentChecks>& a) {
         return !a.second.minsizes.empty();
     });
 }
 
-Library::ArgumentChecks::Direction Library::getArgDirection(const Token* ftok, int argnr) const
+Library::ArgumentChecks::Direction Library::getArgDirection(const Token* ftok, int argnr, int indirect) const
 {
     const ArgumentChecks* arg = getarg(ftok, argnr);
-    if (arg)
-        return arg->direction;
+    if (arg) {
+        if (indirect < 0 || indirect >= arg->direction.size())
+            return ArgumentChecks::Direction::DIR_UNKNOWN; // TODO: don't generate bad indirect values
+        return arg->direction[indirect];
+    }
     if (formatstr_function(ftok)) {
         const int fs_argno = formatstr_argno(ftok);
         if (fs_argno >= 0 && argnr >= fs_argno) {
@@ -1468,29 +1735,33 @@ Library::ArgumentChecks::Direction Library::getArgDirection(const Token* ftok, i
 
 bool Library::ignorefunction(const std::string& functionName) const
 {
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(functionName);
-    if (it != functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(functionName);
+    if (it != mData->mFunctions.cend())
         return it->second.ignore;
     return false;
 }
+const std::unordered_map<std::string, Library::Function>& Library::functions() const
+{
+    return mData->mFunctions;
+}
 bool Library::isUse(const std::string& functionName) const
 {
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(functionName);
-    if (it != functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(functionName);
+    if (it != mData->mFunctions.cend())
         return it->second.use;
     return false;
 }
 bool Library::isLeakIgnore(const std::string& functionName) const
 {
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(functionName);
-    if (it != functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(functionName);
+    if (it != mData->mFunctions.cend())
         return it->second.leakignore;
     return false;
 }
 bool Library::isFunctionConst(const std::string& functionName, bool pure) const
 {
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(functionName);
-    if (it != functions.cend())
+    const auto it = utils::as_const(mData->mFunctions).find(functionName);
+    if (it != mData->mFunctions.cend())
         return pure ? it->second.ispure : it->second.isconst;
     return false;
 }
@@ -1501,35 +1772,37 @@ bool Library::isFunctionConst(const Token *ftok) const
     if (isNotLibraryFunction(ftok)) {
         if (Token::simpleMatch(ftok->astParent(), ".")) {
             using Yield = Library::Container::Yield;
-            const Yield yield = astContainerYield(ftok->astParent()->astOperand1());
+            const Yield yield = astContainerYield(ftok->astParent()->astOperand1(), *this);
             if (yield == Yield::EMPTY || yield == Yield::SIZE || yield == Yield::BUFFER_NT)
                 return true;
         }
         return false;
     }
-    const std::unordered_map<std::string, Function>::const_iterator it = functions.find(getFunctionName(ftok));
-    return (it != functions.cend() && it->second.isconst);
+    const auto it = utils::as_const(mData->mFunctions).find(getFunctionName(ftok));
+    return (it != mData->mFunctions.cend() && it->second.isconst);
 }
 
 bool Library::isnoreturn(const Token *ftok) const
 {
     if (ftok->function() && ftok->function()->isAttributeNoreturn())
         return true;
+    if (ftok->variable() && ftok->variable()->nameToken()->isAttributeNoreturn())
+        return true;
     if (isNotLibraryFunction(ftok)) {
         if (Token::simpleMatch(ftok->astParent(), ".")) {
             const Token* contTok = ftok->astParent()->astOperand1();
-            if (astContainerAction(contTok) != Library::Container::Action::NO_ACTION ||
-                astContainerYield(contTok) != Library::Container::Yield::NO_YIELD)
+            if (astContainerAction(contTok, *this) != Library::Container::Action::NO_ACTION ||
+                astContainerYield(contTok, *this) != Library::Container::Yield::NO_YIELD)
                 return false;
         }
         return false;
     }
-    const std::unordered_map<std::string, FalseTrueMaybe>::const_iterator it = mNoReturn.find(getFunctionName(ftok));
-    if (it == mNoReturn.end())
+    const auto it = utils::as_const(mData->mNoReturn).find(getFunctionName(ftok));
+    if (it == mData->mNoReturn.end())
         return false;
-    if (it->second == FalseTrueMaybe::Maybe)
+    if (it->second == LibraryData::FalseTrueMaybe::Maybe)
         return true;
-    return it->second == FalseTrueMaybe::True;
+    return it->second == LibraryData::FalseTrueMaybe::True;
 }
 
 bool Library::isnotnoreturn(const Token *ftok) const
@@ -1537,45 +1810,45 @@ bool Library::isnotnoreturn(const Token *ftok) const
     if (ftok->function() && ftok->function()->isAttributeNoreturn())
         return false;
     if (isNotLibraryFunction(ftok))
+        return hasAnyTypeCheck(getFunctionName(ftok));
+    const auto it = utils::as_const(mData->mNoReturn).find(getFunctionName(ftok));
+    if (it == mData->mNoReturn.end())
         return false;
-    const std::unordered_map<std::string, FalseTrueMaybe>::const_iterator it = mNoReturn.find(getFunctionName(ftok));
-    if (it == mNoReturn.end())
+    if (it->second == LibraryData::FalseTrueMaybe::Maybe)
         return false;
-    if (it->second == FalseTrueMaybe::Maybe)
-        return false;
-    return it->second == FalseTrueMaybe::False;
+    return it->second == LibraryData::FalseTrueMaybe::False;
 }
 
 bool Library::markupFile(const std::string &path) const
 {
-    return mMarkupExtensions.find(Path::getFilenameExtensionInLowerCase(path)) != mMarkupExtensions.end();
+    return mData->mMarkupExtensions.find(Path::getFilenameExtensionInLowerCase(path)) != mData->mMarkupExtensions.end();
 }
 
 bool Library::processMarkupAfterCode(const std::string &path) const
 {
-    const std::map<std::string, bool>::const_iterator it = mProcessAfterCode.find(Path::getFilenameExtensionInLowerCase(path));
-    return (it == mProcessAfterCode.cend() || it->second);
+    const auto it = utils::as_const(mData->mProcessAfterCode).find(Path::getFilenameExtensionInLowerCase(path));
+    return (it == mData->mProcessAfterCode.cend() || it->second);
 }
 
 bool Library::reportErrors(const std::string &path) const
 {
-    const std::map<std::string, bool>::const_iterator it = mReportErrors.find(Path::getFilenameExtensionInLowerCase(path));
-    return (it == mReportErrors.cend() || it->second);
+    const auto it = utils::as_const(mData->mReportErrors).find(Path::getFilenameExtensionInLowerCase(path));
+    return (it == mData->mReportErrors.cend() || it->second);
 }
 
 bool Library::isexecutableblock(const std::string &file, const std::string &token) const
 {
-    const std::unordered_map<std::string, CodeBlock>::const_iterator it = mExecutableBlocks.find(Path::getFilenameExtensionInLowerCase(file));
-    return (it != mExecutableBlocks.cend() && it->second.isBlock(token));
+    const auto it = utils::as_const(mData->mExecutableBlocks).find(Path::getFilenameExtensionInLowerCase(file));
+    return (it != mData->mExecutableBlocks.cend() && it->second.isBlock(token));
 }
 
 int Library::blockstartoffset(const std::string &file) const
 {
     int offset = -1;
-    const std::unordered_map<std::string, CodeBlock>::const_iterator map_it
-        = mExecutableBlocks.find(Path::getFilenameExtensionInLowerCase(file));
+    const auto map_it
+        = utils::as_const(mData->mExecutableBlocks).find(Path::getFilenameExtensionInLowerCase(file));
 
-    if (map_it != mExecutableBlocks.end()) {
+    if (map_it != mData->mExecutableBlocks.end()) {
         offset = map_it->second.offset();
     }
     return offset;
@@ -1583,38 +1856,38 @@ int Library::blockstartoffset(const std::string &file) const
 
 const std::string& Library::blockstart(const std::string &file) const
 {
-    const std::unordered_map<std::string, CodeBlock>::const_iterator map_it
-        = mExecutableBlocks.find(Path::getFilenameExtensionInLowerCase(file));
+    const auto map_it
+        = utils::as_const(mData->mExecutableBlocks).find(Path::getFilenameExtensionInLowerCase(file));
 
-    if (map_it != mExecutableBlocks.end()) {
+    if (map_it != mData->mExecutableBlocks.end()) {
         return map_it->second.start();
     }
-    return emptyString;
+    return mEmptyString;
 }
 
 const std::string& Library::blockend(const std::string &file) const
 {
-    const std::unordered_map<std::string, CodeBlock>::const_iterator map_it
-        = mExecutableBlocks.find(Path::getFilenameExtensionInLowerCase(file));
+    const auto map_it
+        = utils::as_const(mData->mExecutableBlocks).find(Path::getFilenameExtensionInLowerCase(file));
 
-    if (map_it != mExecutableBlocks.end()) {
+    if (map_it != mData->mExecutableBlocks.end()) {
         return map_it->second.end();
     }
-    return emptyString;
+    return mEmptyString;
 }
 
 bool Library::iskeyword(const std::string &file, const std::string &keyword) const
 {
-    const std::map<std::string, std::set<std::string>>::const_iterator it =
-        mKeywords.find(Path::getFilenameExtensionInLowerCase(file));
-    return (it != mKeywords.end() && it->second.count(keyword));
+    const auto it =
+        utils::as_const(mData->mKeywords).find(Path::getFilenameExtensionInLowerCase(file));
+    return (it != mData->mKeywords.end() && it->second.count(keyword));
 }
 
 bool Library::isimporter(const std::string& file, const std::string &importer) const
 {
-    const std::map<std::string, std::set<std::string>>::const_iterator it =
-        mImporters.find(Path::getFilenameExtensionInLowerCase(file));
-    return (it != mImporters.end() && it->second.count(importer) > 0);
+    const auto it =
+        utils::as_const(mData->mImporters).find(Path::getFilenameExtensionInLowerCase(file));
+    return (it != mData->mImporters.end() && it->second.count(importer) > 0);
 }
 
 const Token* Library::getContainerFromYield(const Token* tok, Library::Container::Yield yield) const
@@ -1666,6 +1939,11 @@ const Token* Library::getContainerFromAction(const Token* tok, Library::Containe
     return nullptr;
 }
 
+const std::unordered_map<std::string, Library::SmartPointer>& Library::smartPointers() const
+{
+    return mData->mSmartPointers;
+}
+
 bool Library::isSmartPointer(const Token* tok) const
 {
     return detectSmartPointer(tok);
@@ -1673,13 +1951,23 @@ bool Library::isSmartPointer(const Token* tok) const
 
 const Library::SmartPointer* Library::detectSmartPointer(const Token* tok, bool withoutStd) const
 {
+    if (!tok)
+        return nullptr;
+    if (tok->isKeyword())
+        return nullptr;
     std::string typestr = withoutStd ? "std::" : "";
-    while (Token::Match(tok, "%name%|::")) {
-        typestr += tok->str();
+    if (tok->str() == "::")
         tok = tok->next();
+    while (Token::Match(tok, "%name% ::")) {
+        typestr += tok->str();
+        typestr += "::";
+        tok = tok->tokAt(2);
+    }
+    if (tok && tok->isName()) {
+        typestr += tok->str();
     }
-    auto it = smartPointers.find(typestr);
-    if (it == smartPointers.end())
+    auto it = mData->mSmartPointers.find(typestr);
+    if (it == mData->mSmartPointers.end())
         return nullptr;
     return &it->second;
 }
@@ -1706,60 +1994,100 @@ const Library::Container * getLibraryContainer(const Token * tok)
 
 Library::TypeCheck Library::getTypeCheck(std::string check,  std::string typeName) const
 {
-    auto it = mTypeChecks.find(std::pair<std::string, std::string>(std::move(check), std::move(typeName)));
-    return it == mTypeChecks.end() ? TypeCheck::def : it->second;
+    auto it = mData->mTypeChecks.find(std::pair<std::string, std::string>(std::move(check), std::move(typeName)));
+    return it == mData->mTypeChecks.end() ? TypeCheck::def : it->second;
 }
 
 bool Library::hasAnyTypeCheck(const std::string& typeName) const
 {
-    return std::any_of(mTypeChecks.begin(), 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;
     });
 }
 
-std::shared_ptr<Token> createTokenFromExpression(const std::string& returnValue,
-                                                 const Settings* settings,
-                                                 std::unordered_map<nonneg int, const Token*>* lookupVarId)
+const Library::AllocFunc* Library::getAllocFuncInfo(const char name[]) const
 {
-    std::shared_ptr<TokenList> tokenList = std::make_shared<TokenList>(settings);
-    {
-        const std::string code = "return " + returnValue + ";";
-        std::istringstream istr(code);
-        if (!tokenList->createTokens(istr))
-            return nullptr;
-    }
+    return getAllocDealloc(mData->mAlloc, name);
+}
 
-    // combine operators, set links, etc..
-    std::stack<Token*> lpar;
-    for (Token* tok2 = tokenList->front(); tok2; tok2 = tok2->next()) {
-        if (Token::Match(tok2, "[!<>=] =")) {
-            tok2->str(tok2->str() + "=");
-            tok2->deleteNext();
-        } else if (tok2->str() == "(")
-            lpar.push(tok2);
-        else if (tok2->str() == ")") {
-            if (lpar.empty())
-                return nullptr;
-            Token::createMutualLinks(lpar.top(), tok2);
-            lpar.pop();
-        }
-    }
-    if (!lpar.empty())
-        return nullptr;
+const Library::AllocFunc* Library::getDeallocFuncInfo(const char name[]) const
+{
+    return getAllocDealloc(mData->mDealloc, name);
+}
 
-    // set varids
-    for (Token* tok2 = tokenList->front(); tok2; tok2 = tok2->next()) {
-        if (tok2->str().compare(0, 3, "arg") != 0)
-            continue;
-        nonneg int const id = strToInt<nonneg int>(tok2->str().c_str() + 3);
-        tok2->varId(id);
-        if (lookupVarId)
-            (*lookupVarId)[id] = tok2;
+// cppcheck-suppress unusedFunction
+int Library::allocId(const char name[]) const
+{
+    const AllocFunc* af = getAllocDealloc(mData->mAlloc, name);
+    return af ? af->groupId : 0;
+}
+
+int Library::deallocId(const char name[]) const
+{
+    const AllocFunc* af = getAllocDealloc(mData->mDealloc, name);
+    return af ? af->groupId : 0;
+}
+
+const std::set<std::string> &Library::markupExtensions() const
+{
+    return mData->mMarkupExtensions;
+}
+
+bool Library::isexporter(const std::string &prefix) const
+{
+    return mData->mExporters.find(prefix) != mData->mExporters.end();
+}
+
+bool Library::isexportedprefix(const std::string &prefix, const std::string &token) const
+{
+    const auto it = utils::as_const(mData->mExporters).find(prefix);
+    return (it != mData->mExporters.end() && it->second.isPrefix(token));
+}
+
+bool Library::isexportedsuffix(const std::string &prefix, const std::string &token) const
+{
+    const auto it = utils::as_const(mData->mExporters).find(prefix);
+    return (it != mData->mExporters.end() && it->second.isSuffix(token));
+}
+
+bool Library::isreflection(const std::string &token) const
+{
+    return mData->mReflection.find(token) != mData->mReflection.end();
+}
+
+int Library::reflectionArgument(const std::string &token) const
+{
+    const auto it = utils::as_const(mData->mReflection).find(token);
+    if (it != mData->mReflection.end())
+        return it->second;
+    return -1;
+}
+
+bool Library::isentrypoint(const std::string &func) const
+{
+    return func == "main" || mData->mEntrypoints.find(func) != mData->mEntrypoints.end();
+}
+
+const std::set<std::string>& Library::defines() const
+{
+    return mData->mDefines;
+}
+
+const Library::PodType *Library::podtype(const std::string &name) const
+{
+    const auto it = utils::as_const(mData->mPodTypes).find(name);
+    return (it != mData->mPodTypes.end()) ? &(it->second) : nullptr;
+}
+
+const Library::PlatformType *Library::platform_type(const std::string &name, const std::string & platform) const
+{
+    const auto it = utils::as_const(mData->mPlatforms).find(platform);
+    if (it != mData->mPlatforms.end()) {
+        const PlatformType * const type = it->second.platform_type(name);
+        if (type)
+            return type;
     }
 
-    // Evaluate expression
-    tokenList->createAst();
-    Token* expr = tokenList->front()->astOperand1();
-    ValueFlow::valueFlowConstantFoldAST(expr, settings);
-    return {tokenList, expr};
+    const auto it2 = utils::as_const(mData->mPlatformTypes).find(name);
+    return (it2 != mData->mPlatformTypes.end()) ? &(it2->second) : nullptr;
 }
diff --git a/lib/library.h b/lib/library.h
index 2e38a7332b0..b5b19a197b2 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-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
@@ -23,21 +23,21 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "errortypes.h"
 #include "standards.h"
+#include "utils.h"
 
-#include <cstddef>
+#include <array>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>
-#include <unordered_set>
-#include <utility>
 #include <vector>
 
 class Token;
-class Settings;
+class Settings; // TODO: remove dependency on settings
+enum class Severity : std::uint8_t;
 
 namespace tinyxml2 {
     class XMLDocument;
@@ -51,16 +51,22 @@ namespace tinyxml2 {
  * @brief Library definitions handling
  */
 class CPPCHECKLIB Library {
-    // TODO: get rid of this
-    friend class TestSymbolDatabase; // For testing only
-    friend class TestSingleExecutorBase; // For testing only
-    friend class TestThreadExecutor; // For testing only
-    friend class TestProcessExecutor; // For testing only
+    friend struct LibraryHelper; // for testing
+
+    static const std::string mEmptyString;
 
 public:
     Library();
+    ~Library();
 
-    enum class ErrorCode { OK, FILE_NOT_FOUND, BAD_XML, UNKNOWN_ELEMENT, MISSING_ATTRIBUTE, BAD_ATTRIBUTE_VALUE, UNSUPPORTED_FORMAT, DUPLICATE_PLATFORM_TYPE, PLATFORM_TYPE_REDEFINED };
+    Library(const Library& other);
+    Library& operator=(const Library& other) &;
+
+    enum class ErrorCode : std::uint8_t {
+        OK,
+        FILE_NOT_FOUND, BAD_XML, UNKNOWN_ELEMENT, MISSING_ATTRIBUTE, BAD_ATTRIBUTE_VALUE,
+        UNSUPPORTED_FORMAT, DUPLICATE_PLATFORM_TYPE, PLATFORM_TYPE_REDEFINED, DUPLICATE_DEFINE
+    };
 
     class Error {
     public:
@@ -72,21 +78,18 @@ class CPPCHECKLIB Library {
         std::string reason;
     };
 
-    Error load(const char exename[], const char path[]);
-    Error load(const tinyxml2::XMLDocument &doc);
-
-    /** this is used for unit tests */
-    bool loadxmldata(const char xmldata[], std::size_t len);
+    Error load(const char exename[], const char path[], bool debug = false);
 
     struct AllocFunc {
-        int groupId;
-        int arg;
-        enum class BufferSize {none,malloc,calloc,strdup};
-        BufferSize bufferSize;
-        int bufferSizeArg1;
-        int bufferSizeArg2;
-        int reallocArg;
-        bool initData;
+        int groupId{};
+        int arg{};
+        enum class BufferSize : std::uint8_t {none,malloc,calloc,strdup};
+        BufferSize bufferSize{BufferSize::none};
+        int bufferSizeArg1{};
+        int bufferSizeArg2{};
+        int reallocArg{};
+        bool initData{};
+        bool noFail{};
     };
 
     /** get allocation info for function */
@@ -107,49 +110,21 @@ class CPPCHECKLIB Library {
     /** get reallocation id for function */
     int getReallocId(const Token *tok, int arg) const;
 
+    // TODO: get rid of this
     /** get allocation info for function by name (deprecated, use other alloc) */
-    const AllocFunc* getAllocFuncInfo(const char name[]) const {
-        return getAllocDealloc(mAlloc, name);
-    }
+    const AllocFunc* getAllocFuncInfo(const char name[]) const;
 
+    // TODO: get rid of this
     /** get deallocation info for function by name (deprecated, use other alloc) */
-    const AllocFunc* getDeallocFuncInfo(const char name[]) const {
-        return getAllocDealloc(mDealloc, name);
-    }
+    const AllocFunc* getDeallocFuncInfo(const char name[]) const;
 
+    // TODO: get rid of this
     /** get allocation id for function by name (deprecated, use other alloc) */
-    int allocId(const char name[]) const {
-        const AllocFunc* af = getAllocDealloc(mAlloc, name);
-        return af ? af->groupId : 0;
-    }
+    int allocId(const char name[]) const;
 
+    // TODO: get rid of this
     /** get deallocation id for function by name (deprecated, use other alloc) */
-    int deallocId(const char name[]) const {
-        const AllocFunc* af = getAllocDealloc(mDealloc, name);
-        return af ? af->groupId : 0;
-    }
-
-    /** set allocation id for function */
-    void setalloc(const std::string &functionname, int id, int arg) {
-        mAlloc[functionname].groupId = id;
-        mAlloc[functionname].arg = arg;
-    }
-
-    void setdealloc(const std::string &functionname, int id, int arg) {
-        mDealloc[functionname].groupId = id;
-        mDealloc[functionname].arg = arg;
-    }
-
-    void setrealloc(const std::string &functionname, int id, int arg, int reallocArg = 1) {
-        mRealloc[functionname].groupId = id;
-        mRealloc[functionname].arg = arg;
-        mRealloc[functionname].reallocArg = reallocArg;
-    }
-
-    /** add noreturn function setting */
-    void setnoreturn(const std::string& funcname, bool noreturn) {
-        mNoReturn[funcname] = noreturn ? FalseTrueMaybe::True : FalseTrueMaybe::False;
-    }
+    int deallocId(const char name[]) const;
 
     static bool isCompliantValidationExpression(const char* p);
 
@@ -179,23 +154,26 @@ class CPPCHECKLIB Library {
         int ptr2Arg;
         int sizeArg;
         int strlenArg;
+        int countArg;
     };
     const NonOverlappingData* getNonOverlappingData(const Token *ftok) const;
 
     struct WarnInfo {
         std::string message;
         Standards standards;
-        Severity::SeverityType severity;
+        Severity severity;
     };
-    std::map<std::string, WarnInfo> functionwarn;
+    const std::map<std::string, WarnInfo>& functionwarn() const;
 
     const WarnInfo* getWarnInfo(const Token* ftok) const;
 
+    struct Function;
+
     // returns true if ftok is not a library function
-    bool isNotLibraryFunction(const Token *ftok) const;
-    bool matchArguments(const Token *ftok, const std::string &functionName) const;
+    bool isNotLibraryFunction(const Token *ftok, const Function **func = nullptr) const;
+    bool matchArguments(const Token *ftok, const std::string &functionName, const Function **func = nullptr) const;
 
-    enum class UseRetValType { NONE, DEFAULT, ERROR_CODE };
+    enum class UseRetValType : std::uint8_t { NONE, DEFAULT, ERROR_CODE };
     UseRetValType getUseRetValType(const Token* ftok) const;
 
     const std::string& returnValue(const Token *ftok) const;
@@ -210,33 +188,24 @@ class CPPCHECKLIB Library {
 
     class Container {
     public:
-        Container()
-            : type_templateArgNo(-1),
-            size_templateArgNo(-1),
-            arrayLike_indexOp(false),
-            stdStringLike(false),
-            stdAssociativeLike(false),
-            opLessAllowed(true),
-            hasInitializerListConstructor(false),
-            unstableErase(false),
-            unstableInsert(false),
-            view(false)
-        {}
-
-        enum class Action {
+        Container() = default;
+
+        enum class Action : std::uint8_t {
             RESIZE,
             CLEAR,
             PUSH,
             POP,
             FIND,
+            FIND_CONST,
             INSERT,
             ERASE,
+            APPEND,
             CHANGE_CONTENT,
             CHANGE,
             CHANGE_INTERNAL,
             NO_ACTION
         };
-        enum class Yield {
+        enum class Yield : std::uint8_t {
             AT_INDEX,
             ITEM,
             BUFFER,
@@ -259,130 +228,104 @@ class CPPCHECKLIB Library {
         };
         std::string startPattern, startPattern2, endPattern, itEndPattern;
         std::map<std::string, Function> functions;
-        int type_templateArgNo;
+        int type_templateArgNo = -1;
         std::vector<RangeItemRecordTypeItem> rangeItemRecordType;
-        int size_templateArgNo;
-        bool arrayLike_indexOp;
-        bool stdStringLike;
-        bool stdAssociativeLike;
-        bool opLessAllowed;
-        bool hasInitializerListConstructor;
-        bool unstableErase;
-        bool unstableInsert;
-        bool view;
+        int size_templateArgNo = -1;
+        bool arrayLike_indexOp{};
+        bool stdStringLike{};
+        bool stdAssociativeLike{};
+        bool opLessAllowed = true;
+        bool hasInitializerListConstructor{};
+        bool unstableErase{};
+        bool unstableInsert{};
+        bool view{};
 
         Action getAction(const std::string& function) const {
-            const std::map<std::string, Function>::const_iterator i = functions.find(function);
+            const auto i = utils::as_const(functions).find(function);
             if (i != functions.end())
                 return i->second.action;
             return Action::NO_ACTION;
         }
 
         Yield getYield(const std::string& function) const {
-            const std::map<std::string, Function>::const_iterator i = functions.find(function);
+            const auto i = utils::as_const(functions).find(function);
             if (i != functions.end())
                 return i->second.yield;
             return Yield::NO_YIELD;
         }
 
         const std::string& getReturnType(const std::string& function) const {
-            auto i = functions.find(function);
-            return (i != functions.end()) ? i->second.returnType : emptyString;
+            const auto i = utils::as_const(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);
     };
-    std::map<std::string, Container> containers;
+    const std::unordered_map<std::string, Container>& containers() const;
     const Container* detectContainer(const Token* typeStart) const;
     const Container* detectIterator(const Token* typeStart) const;
     const Container* detectContainerOrIterator(const Token* typeStart, bool* isIterator = nullptr, bool withoutStd = false) const;
 
-    class ArgumentChecks {
-    public:
-        ArgumentChecks() :
-            notbool(false),
-            notnull(false),
-            notuninit(-1),
-            formatstr(false),
-            strz(false),
-            optional(false),
-            variadic(false),
-            iteratorInfo(),
-            direction(Direction::DIR_UNKNOWN) {}
-
-        bool notbool;
-        bool notnull;
-        int notuninit;
-        bool formatstr;
-        bool strz;
-        bool optional;
-        bool variadic;
+    struct ArgumentChecks {
+        bool notbool{};
+        bool notnull{};
+        int notuninit = -1;
+        bool formatstr{};
+        bool strz{};
+        bool optional{};
+        bool variadic{};
         std::string valid;
 
-        class IteratorInfo {
-        public:
-            IteratorInfo() : container(0), it(false), first(false), last(false) {}
-
-            int container;
-            bool it;
-            bool first;
-            bool last;
+        struct IteratorInfo {
+            int container{};
+            bool it{};
+            bool first{};
+            bool last{};
         };
         IteratorInfo iteratorInfo;
 
-        class MinSize {
-        public:
-            enum class Type { NONE, STRLEN, ARGVALUE, SIZEOF, MUL, VALUE };
-            MinSize(Type t, int a) : type(t), arg(a), arg2(0), value(0) {}
+        struct MinSize {
+            enum class Type : std::uint8_t { NONE, STRLEN, ARGVALUE, SIZEOF, MUL, VALUE };
+            MinSize(Type t, int a) : type(t), arg(a) {}
             Type type;
             int arg;
-            int arg2;
-            long long value;
+            int arg2 = 0;
+            long long value = 0;
             std::string baseType;
         };
         std::vector<MinSize> minsizes;
 
-        enum class Direction {
+        enum class Direction : std::uint8_t {
             DIR_IN,     ///< Input to called function. Data is treated as read-only.
             DIR_OUT,    ///< Output to caller. Data is passed by reference or address and is potentially written.
             DIR_INOUT,  ///< Input to called function, and output to caller. Data is passed by reference or address and is potentially modified.
             DIR_UNKNOWN ///< direction not known / specified
         };
-        Direction direction;
+        // argument directions up to ** indirect level (only one can be configured explicitly at the moment)
+        std::array<Direction, 3> direction = { { Direction::DIR_UNKNOWN, Direction::DIR_UNKNOWN, Direction::DIR_UNKNOWN } };
     };
 
     struct Function {
         std::map<int, ArgumentChecks> argumentChecks; // argument nr => argument data
-        bool use;
-        bool leakignore;
-        bool isconst;
-        bool ispure;
-        UseRetValType useretval;
-        bool ignore;  // ignore functions/macros from a library (gtk, qt etc)
-        bool formatstr;
-        bool formatstr_scan;
-        bool formatstr_secure;
-        Container::Action containerAction;
-        Container::Yield containerYield;
+        bool use{};
+        bool leakignore{};
+        bool isconst{};
+        bool ispure{};
+        UseRetValType useretval = UseRetValType::NONE;
+        bool ignore{};  // ignore functions/macros from a library (gtk, qt etc)
+        bool formatstr{};
+        bool formatstr_scan{};
+        bool formatstr_secure{};
+        Container::Action containerAction = Container::Action::NO_ACTION;
+        Container::Yield containerYield = Container::Yield::NO_YIELD;
         std::string returnType;
-        Function()
-            : use(false),
-            leakignore(false),
-            isconst(false),
-            ispure(false),
-            useretval(UseRetValType::NONE),
-            ignore(false),
-            formatstr(false),
-            formatstr_scan(false),
-            formatstr_secure(false),
-            containerAction(Container::Action::NO_ACTION),
-            containerYield(Container::Yield::NO_YIELD)
-        {}
     };
 
     const Function *getFunction(const Token *ftok) const;
-    std::unordered_map<std::string, Function> functions;
+    const std::unordered_map<std::string, Function>& functions() const;
     bool isUse(const std::string& functionName) const;
     bool isLeakIgnore(const std::string& functionName) const;
     bool isFunctionConst(const std::string& functionName, bool pure) const;
@@ -406,12 +349,12 @@ class CPPCHECKLIB Library {
         return arg && arg->strz;
     }
 
-    bool isIntArgValid(const Token *ftok, int argnr, const MathLib::bigint argvalue) const;
-    bool isFloatArgValid(const Token *ftok, int argnr, double argvalue) const;
+    bool isIntArgValid(const Token *ftok, int argnr, MathLib::bigint argvalue, const Settings& settings) const;
+    bool isFloatArgValid(const Token *ftok, int argnr, double argvalue, const Settings& settings) const;
 
     const std::string& validarg(const Token *ftok, int argnr) const {
         const ArgumentChecks *arg = getarg(ftok, argnr);
-        return arg ? arg->valid : emptyString;
+        return arg ? arg->valid : mEmptyString;
     }
 
     const ArgumentChecks::IteratorInfo *getArgIteratorInfo(const Token *ftok, int argnr) const {
@@ -426,15 +369,13 @@ class CPPCHECKLIB Library {
         return arg ? &arg->minsizes : nullptr;
     }
 
-    ArgumentChecks::Direction getArgDirection(const Token* ftok, int argnr) const;
+    ArgumentChecks::Direction getArgDirection(const Token* ftok, int argnr, int indirect = 0) const;
 
     bool markupFile(const std::string &path) const;
 
     bool processMarkupAfterCode(const std::string &path) const;
 
-    const std::set<std::string> &markupExtensions() const {
-        return mMarkupExtensions;
-    }
+    const std::set<std::string> &markupExtensions() const;
 
     bool reportErrors(const std::string &path) const;
 
@@ -449,69 +390,45 @@ class CPPCHECKLIB Library {
 
     bool iskeyword(const std::string &file, const std::string &keyword) const;
 
-    bool isexporter(const std::string &prefix) const {
-        return mExporters.find(prefix) != mExporters.end();
-    }
+    bool isexporter(const std::string &prefix) const;
 
-    bool isexportedprefix(const std::string &prefix, const std::string &token) const {
-        const std::map<std::string, ExportedFunctions>::const_iterator it = mExporters.find(prefix);
-        return (it != mExporters.end() && it->second.isPrefix(token));
-    }
+    bool isexportedprefix(const std::string &prefix, const std::string &token) const;
 
-    bool isexportedsuffix(const std::string &prefix, const std::string &token) const {
-        const std::map<std::string, ExportedFunctions>::const_iterator it = mExporters.find(prefix);
-        return (it != mExporters.end() && it->second.isSuffix(token));
-    }
+    bool isexportedsuffix(const std::string &prefix, const std::string &token) const;
 
     bool isimporter(const std::string& file, const std::string &importer) const;
 
     const Token* getContainerFromYield(const Token* tok, Container::Yield yield) const;
     const Token* getContainerFromAction(const Token* tok, Container::Action action) const;
 
-    bool isreflection(const std::string &token) const {
-        return mReflection.find(token) != mReflection.end();
-    }
+    static bool isContainerYield(const Token* cond, Library::Container::Yield y, const std::string& fallback = "");
+    static Library::Container::Yield getContainerYield(const Token* cond);
 
-    int reflectionArgument(const std::string &token) const {
-        const std::map<std::string, int>::const_iterator it = mReflection.find(token);
-        if (it != mReflection.end())
-            return it->second;
-        return -1;
-    }
+    bool isreflection(const std::string &token) const;
 
-    bool isentrypoint(const std::string &func) const {
-        return func == "main" || mEntrypoints.find(func) != mEntrypoints.end();
-    }
+    int reflectionArgument(const std::string &token) const;
+
+    bool isentrypoint(const std::string &func) const;
 
-    std::vector<std::string> defines; // to provide some library defines
+    const std::set<std::string>& defines() const; // to provide some library defines
 
     struct SmartPointer {
         std::string name;
         bool unique = false;
     };
 
-    std::unordered_map<std::string, SmartPointer> smartPointers;
+    const std::unordered_map<std::string, SmartPointer>& smartPointers() const;
     bool isSmartPointer(const Token *tok) const;
     const SmartPointer* detectSmartPointer(const Token* tok, bool withoutStd = false) const;
 
     struct PodType {
-        unsigned int size;
-        char sign;
-        enum class Type { NO, BOOL, CHAR, SHORT, INT, LONG, LONGLONG } stdtype;
+        unsigned int size{};
+        char sign{};
+        enum class Type : std::uint8_t { NO, BOOL, CHAR, SHORT, INT, LONG, LONGLONG } stdtype = Type::NO;
     };
-    const struct PodType *podtype(const std::string &name) const {
-        const std::unordered_map<std::string, struct PodType>::const_iterator it = mPodTypes.find(name);
-        return (it != mPodTypes.end()) ? &(it->second) : nullptr;
-    }
+    const PodType *podtype(const std::string &name) const;
 
     struct PlatformType {
-        PlatformType()
-            : mSigned(false)
-            , mUnsigned(false)
-            , mLong(false)
-            , mPointer(false)
-            , mPtrPtr(false)
-            , mConstPtr(false) {}
         bool operator == (const PlatformType & type) const {
             return (mSigned == type.mSigned &&
                     mUnsigned == type.mUnsigned &&
@@ -525,153 +442,55 @@ class CPPCHECKLIB Library {
             return !(*this == type);
         }
         std::string mType;
-        bool mSigned;
-        bool mUnsigned;
-        bool mLong;
-        bool mPointer;
-        bool mPtrPtr;
-        bool mConstPtr;
-    };
-
-    struct Platform {
-        const PlatformType *platform_type(const std::string &name) const {
-            const std::map<std::string, struct PlatformType>::const_iterator it = mPlatformTypes.find(name);
-            return (it != mPlatformTypes.end()) ? &(it->second) : nullptr;
-        }
-        std::map<std::string, PlatformType> mPlatformTypes;
+        bool mSigned{};
+        bool mUnsigned{};
+        bool mLong{};
+        bool mPointer{};
+        bool mPtrPtr{};
+        bool mConstPtr{};
     };
 
-    const PlatformType *platform_type(const std::string &name, const std::string & platform) const {
-        const std::map<std::string, Platform>::const_iterator it = mPlatforms.find(platform);
-        if (it != mPlatforms.end()) {
-            const PlatformType * const type = it->second.platform_type(name);
-            if (type)
-                return type;
-        }
-
-        const std::map<std::string, PlatformType>::const_iterator it2 = mPlatformTypes.find(name);
-        return (it2 != mPlatformTypes.end()) ? &(it2->second) : nullptr;
-    }
+    const PlatformType *platform_type(const std::string &name, const std::string & platform) const;
 
     /**
      * Get function name for function call
      */
     std::string getFunctionName(const Token *ftok) const;
 
-    static bool isContainerYield(const Token * const cond, Library::Container::Yield y, const std::string& fallback=emptyString);
-
     /** Suppress/check a type */
-    enum class TypeCheck { def,
-                           check,
-                           suppress,
-                           checkFiniteLifetime, // (unusedvar) object has side effects, but immediate destruction is wrong
+    enum class TypeCheck : std::uint8_t {
+        def,
+        check,
+        suppress,
+        checkFiniteLifetime, // (unusedvar) object has side effects, but immediate destruction is wrong
     };
     TypeCheck getTypeCheck(std::string check, std::string typeName) const;
     bool hasAnyTypeCheck(const std::string& typeName) const;
 
 private:
-    // load a <function> xml node
-    Error loadFunction(const tinyxml2::XMLElement * const node, const std::string &name, std::set<std::string> &unknown_elements);
-
-    class ExportedFunctions {
-    public:
-        void addPrefix(std::string prefix) {
-            mPrefixes.insert(std::move(prefix));
-        }
-        void addSuffix(std::string suffix) {
-            mSuffixes.insert(std::move(suffix));
-        }
-        bool isPrefix(const std::string& prefix) const {
-            return (mPrefixes.find(prefix) != mPrefixes.end());
-        }
-        bool isSuffix(const std::string& suffix) const {
-            return (mSuffixes.find(suffix) != mSuffixes.end());
-        }
-
-    private:
-        std::set<std::string> mPrefixes;
-        std::set<std::string> mSuffixes;
-    };
-    class CodeBlock {
-    public:
-        CodeBlock() : mOffset(0) {}
+    Error load(const tinyxml2::XMLDocument &doc);
 
-        void setStart(const char* s) {
-            mStart = s;
-        }
-        void setEnd(const char* e) {
-            mEnd = e;
-        }
-        void setOffset(const int o) {
-            mOffset = o;
-        }
-        void addBlock(const char* blockName) {
-            mBlocks.insert(blockName);
-        }
-        const std::string& start() const {
-            return mStart;
-        }
-        const std::string& end() const {
-            return mEnd;
-        }
-        int offset() const {
-            return mOffset;
-        }
-        bool isBlock(const std::string& blockName) const {
-            return mBlocks.find(blockName) != mBlocks.end();
-        }
+    // load a <function> xml node
+    Error loadFunction(const tinyxml2::XMLElement * node, const std::string &name, std::set<std::string> &unknown_elements);
 
-    private:
-        std::string mStart;
-        std::string mEnd;
-        int mOffset;
-        std::set<std::string> mBlocks;
-    };
-    enum class FalseTrueMaybe { False, True, Maybe };
-    int mAllocId;
-    std::set<std::string> mFiles;
-    std::map<std::string, AllocFunc> mAlloc; // allocation functions
-    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::map<std::string, std::vector<MathLib::bigint>> mUnknownReturnValues;
-    std::map<std::string, bool> mReportErrors;
-    std::map<std::string, bool> mProcessAfterCode;
-    std::set<std::string> mMarkupExtensions; // file extensions of markup files
-    std::map<std::string, std::set<std::string>> mKeywords;  // keywords for code in the library
-    std::unordered_map<std::string, CodeBlock> mExecutableBlocks; // keywords for blocks of executable code
-    std::map<std::string, ExportedFunctions> mExporters; // keywords that export variables/functions to libraries (meta-code/macros)
-    std::map<std::string, std::set<std::string>> mImporters;  // keywords that import variables/functions
-    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::map<std::pair<std::string,std::string>, TypeCheck> mTypeChecks;
-    std::unordered_map<std::string, NonOverlappingData> mNonOverlappingData;
-    std::unordered_set<std::string> mEntrypoints;
+    struct LibraryData;
+    std::unique_ptr<LibraryData> mData;
 
     const ArgumentChecks * getarg(const Token *ftok, int argnr) const;
 
     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 std::map<std::string, AllocFunc>::const_iterator it = data.find(name);
+        const auto it = utils::as_const(data).find(name);
         return (it == data.end()) ? nullptr : &it->second;
     }
 
-    enum DetectContainer { ContainerOnly, IteratorOnly, Both };
+    enum DetectContainer : std::uint8_t { ContainerOnly, IteratorOnly, Both };
     const Library::Container* detectContainerInternal(const Token* typeStart, DetectContainer detect, bool* isIterator = nullptr, bool withoutStd = false) const;
 };
 
 CPPCHECKLIB const Library::Container * getLibraryContainer(const Token * tok);
 
-std::shared_ptr<Token> createTokenFromExpression(const std::string& returnValue,
-                                                 const Settings* settings,
-                                                 std::unordered_map<nonneg int, const Token*>* lookupVarId = nullptr);
-
 /// @}
 //---------------------------------------------------------------------------
 #endif // libraryH
diff --git a/lib/matchcompiler.h b/lib/matchcompiler.h
index 230453362a1..04797952a17 100644
--- a/lib/matchcompiler.h
+++ b/lib/matchcompiler.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2021 Cppcheck team.
+ * 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
@@ -27,7 +27,7 @@ namespace MatchCompiler {
     template<unsigned int n>
     class ConstString {
     public:
-        typedef const char(&StringRef)[n];
+        using StringRef = const char (&)[n];
         explicit ConstString(StringRef s)
             : _s(s) {}
 
@@ -46,7 +46,7 @@ namespace MatchCompiler {
     }
 
     template<>
-    inline bool equalN<0>(const char[], const char[])
+    inline bool equalN<0>(const char /*s1*/[], const char /*s2*/[])
     {
         return true;
     }
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index 501b6805b8f..f065d63a935 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-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
@@ -19,13 +19,13 @@
 
 #include "mathlib.h"
 #include "errortypes.h"
+#include "token.h"
 #include "utils.h"
 
 #include <cctype>
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
-#include <exception>
 #include <limits>
 #include <locale>
 #include <sstream>
@@ -37,8 +37,7 @@
 
 const int MathLib::bigint_bits = 64;
 
-MathLib::value::value(const std::string &s) :
-    mIntValue(0), mDoubleValue(0), mIsUnsigned(false)
+MathLib::value::value(const std::string &s)
 {
     if (MathLib::isFloat(s)) {
         mType = MathLib::value::Type::FLOAT;
@@ -50,7 +49,7 @@ MathLib::value::value(const std::string &s) :
         throw InternalError(nullptr, "Invalid value: " + s);
 
     mType = MathLib::value::Type::INT;
-    mIntValue = MathLib::toLongNumber(s);
+    mIntValue = MathLib::toBigNumber(s);
 
     if (isIntHex(s) && mIntValue < 0)
         mIsUnsigned = true;
@@ -117,7 +116,7 @@ void MathLib::value::promote(const MathLib::value &v)
         }
     } else if (!isFloat()) {
         mIsUnsigned = false;
-        mDoubleValue = mIntValue;
+        mDoubleValue = static_cast<double>(mIntValue);
         mType = MathLib::value::Type::FLOAT;
     }
 }
@@ -152,34 +151,34 @@ MathLib::value MathLib::value::calc(char op, const MathLib::value &v1, const Mat
     } else if (temp.mIsUnsigned) {
         switch (op) {
         case '+':
-            temp.mIntValue += (unsigned long long)v2.mIntValue;
+            temp.mIntValue += static_cast<unsigned long long>(v2.mIntValue);
             break;
         case '-':
-            temp.mIntValue -= (unsigned long long)v2.mIntValue;
+            temp.mIntValue -= static_cast<unsigned long long>(v2.mIntValue);
             break;
         case '*':
-            temp.mIntValue *= (unsigned long long)v2.mIntValue;
+            temp.mIntValue *= static_cast<unsigned long long>(v2.mIntValue);
             break;
         case '/':
             if (v2.mIntValue == 0)
                 throw InternalError(nullptr, "Internal Error: Division by zero");
             if (v1.mIntValue == std::numeric_limits<bigint>::min() && std::abs(v2.mIntValue)<=1)
                 throw InternalError(nullptr, "Internal Error: Division overflow");
-            temp.mIntValue /= (unsigned long long)v2.mIntValue;
+            temp.mIntValue /= static_cast<unsigned long long>(v2.mIntValue);
             break;
         case '%':
             if (v2.mIntValue == 0)
                 throw InternalError(nullptr, "Internal Error: Division by zero");
-            temp.mIntValue %= (unsigned long long)v2.mIntValue;
+            temp.mIntValue %= static_cast<unsigned long long>(v2.mIntValue);
             break;
         case '&':
-            temp.mIntValue &= (unsigned long long)v2.mIntValue;
+            temp.mIntValue &= static_cast<unsigned long long>(v2.mIntValue);
             break;
         case '|':
-            temp.mIntValue |= (unsigned long long)v2.mIntValue;
+            temp.mIntValue |= static_cast<unsigned long long>(v2.mIntValue);
             break;
         case '^':
-            temp.mIntValue ^= (unsigned long long)v2.mIntValue;
+            temp.mIntValue ^= static_cast<unsigned long long>(v2.mIntValue);
             break;
         default:
             throw InternalError(nullptr, "Unhandled calculation");
@@ -238,9 +237,9 @@ int MathLib::value::compare(const MathLib::value &v) const
     }
 
     if (temp.mIsUnsigned) {
-        if ((unsigned long long)mIntValue < (unsigned long long)v.mIntValue)
+        if (static_cast<unsigned long long>(mIntValue) < static_cast<unsigned long long>(v.mIntValue))
             return -1;
-        if ((unsigned long long)mIntValue > (unsigned long long)v.mIntValue)
+        if (static_cast<unsigned long long>(mIntValue) > static_cast<unsigned long long>(v.mIntValue))
             return 1;
         return 0;
     }
@@ -286,8 +285,13 @@ MathLib::value MathLib::value::shiftRight(const MathLib::value &v) const
     return ret;
 }
 
+MathLib::biguint MathLib::toBigUNumber(const Token * tok)
+{
+    return toBigUNumber(tok->str(), tok);
+}
+
 // TODO: remove handling of non-literal stuff
-MathLib::biguint MathLib::toULongNumber(const std::string & str)
+MathLib::biguint MathLib::toBigUNumber(const std::string & str, const Token * const tok)
 {
     // hexadecimal numbers:
     if (isIntHex(str)) {
@@ -295,9 +299,9 @@ MathLib::biguint MathLib::toULongNumber(const std::string & str)
             const biguint ret = std::stoull(str, nullptr, 16);
             return ret;
         } catch (const std::out_of_range& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toULongNumber: out_of_range: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: out_of_range: " + str);
         } catch (const std::invalid_argument& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toULongNumber: invalid_argument: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: invalid_argument: " + str);
         }
     }
 
@@ -307,9 +311,9 @@ MathLib::biguint MathLib::toULongNumber(const std::string & str)
             const biguint ret = std::stoull(str, nullptr, 8);
             return ret;
         } catch (const std::out_of_range& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toULongNumber: out_of_range: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: out_of_range: " + str);
         } catch (const std::invalid_argument& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toULongNumber: invalid_argument: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: invalid_argument: " + str);
         }
     }
 
@@ -332,15 +336,20 @@ MathLib::biguint MathLib::toULongNumber(const std::string & str)
         // Things are going to be less precise now: the value can't be represented in the biguint type.
         // Use min/max values as an approximation. See #5843
         // TODO: bail out when we are out of range?
-        const double doubleval = toDoubleNumber(str);
-        if (doubleval > (double)std::numeric_limits<biguint>::max())
+        const double doubleval = toDoubleNumber(str, tok);
+        if (doubleval > static_cast<double>(std::numeric_limits<biguint>::max()))
             return std::numeric_limits<biguint>::max();
         // cast to bigint to avoid UBSAN warning about negative double being out-of-range
         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;
@@ -348,13 +357,13 @@ MathLib::biguint MathLib::toULongNumber(const std::string & str)
         if (idx != str.size()) {
             const std::string s = str.substr(idx);
             if (!isValidIntegerSuffix(s, true))
-                throw InternalError(nullptr, "Internal Error. MathLib::toULongNumber: input was not completely consumed: " + str);
+                throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: input was not completely consumed: " + str);
         }
         return ret;
     } catch (const std::out_of_range& /*e*/) {
-        throw InternalError(nullptr, "Internal Error. MathLib::toULongNumber: out_of_range: " + str);
+        throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: out_of_range: " + str);
     } catch (const std::invalid_argument& /*e*/) {
-        throw InternalError(nullptr, "Internal Error. MathLib::toULongNumber: invalid_argument: " + str);
+        throw InternalError(tok, "Internal Error. MathLib::toBigUNumber: invalid_argument: " + str);
     }
 }
 
@@ -365,18 +374,23 @@ unsigned int MathLib::encodeMultiChar(const std::string& str)
     });
 }
 
+MathLib::bigint MathLib::toBigNumber(const Token * tok)
+{
+    return toBigNumber(tok->str(), tok);
+}
+
 // TODO: remove handling of non-literal stuff
-MathLib::bigint MathLib::toLongNumber(const std::string & str)
+MathLib::bigint MathLib::toBigNumber(const std::string & str, const Token * const tok)
 {
     // hexadecimal numbers:
     if (isIntHex(str)) {
         try {
             const biguint ret = std::stoull(str, nullptr, 16);
-            return (bigint)ret;
+            return static_cast<bigint>(ret);
         } catch (const std::out_of_range& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: out_of_range: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigNumber: out_of_range: " + str);
         } catch (const std::invalid_argument& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: invalid_argument: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigNumber: invalid_argument: " + str);
         }
     }
 
@@ -386,9 +400,9 @@ MathLib::bigint MathLib::toLongNumber(const std::string & str)
             const biguint ret = std::stoull(str, nullptr, 8);
             return ret;
         } catch (const std::out_of_range& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: out_of_range: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigNumber: out_of_range: " + str);
         } catch (const std::invalid_argument& /*e*/) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: invalid_argument: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toBigNumber: invalid_argument: " + str);
         }
     }
 
@@ -411,16 +425,21 @@ MathLib::bigint MathLib::toLongNumber(const std::string & str)
         // Things are going to be less precise now: the value can't be represented in the bigint type.
         // Use min/max values as an approximation. See #5843
         // TODO: bail out when we are out of range?
-        const double doubleval = toDoubleNumber(str);
-        if (doubleval > (double)std::numeric_limits<bigint>::max())
+        const double doubleval = toDoubleNumber(str, tok);
+        if (doubleval > static_cast<double>(std::numeric_limits<bigint>::max()))
             return std::numeric_limits<bigint>::max();
-        if (doubleval < (double)std::numeric_limits<bigint>::min())
+        if (doubleval < static_cast<double>(std::numeric_limits<bigint>::min()))
             return std::numeric_limits<bigint>::min();
         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;
@@ -428,13 +447,13 @@ MathLib::bigint MathLib::toLongNumber(const std::string & str)
         if (idx != str.size()) {
             const std::string s = str.substr(idx);
             if (!isValidIntegerSuffix(s, true))
-                throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: input was not completely consumed: " + str);
+                throw InternalError(tok, "Internal Error. MathLib::toBigNumber: input was not completely consumed: " + str);
         }
         return ret;
     } catch (const std::out_of_range& /*e*/) {
-        throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: out_of_range: " + str);
+        throw InternalError(tok, "Internal Error. MathLib::toBigNumber: out_of_range: " + str);
     } catch (const std::invalid_argument& /*e*/) {
-        throw InternalError(nullptr, "Internal Error. MathLib::toLongNumber: invalid_argument: " + str);
+        throw InternalError(tok, "Internal Error. MathLib::toBigNumber: invalid_argument: " + str);
     }
 }
 
@@ -485,17 +504,22 @@ static double floatHexToDoubleNumber(const std::string& str)
     return factor1 * factor2;
 }
 
-double MathLib::toDoubleNumber(const std::string &str)
+double MathLib::toDoubleNumber(const Token * tok)
+{
+    return toDoubleNumber(tok->str(), tok);
+}
+
+double MathLib::toDoubleNumber(const std::string &str, const Token * const tok)
 {
     if (isCharLiteral(str)) {
         try {
             return simplecpp::characterLiteralToLL(str);
-        } catch (const std::exception& e) {
-            throw InternalError(nullptr, "Internal Error. MathLib::toDoubleNumber: characterLiteralToLL(" + str + ") => " + e.what());
+        } catch (const std::runtime_error& e) {
+            throw InternalError(tok, "Internal Error. MathLib::toDoubleNumber: characterLiteralToLL(" + str + ") => " + e.what());
         }
     }
     if (isIntHex(str))
-        return static_cast<double>(toLongNumber(str));
+        return static_cast<double>(toBigNumber(str, tok));
 #ifdef _LIBCPP_VERSION
     if (isFloat(str)) // Workaround libc++ bug at https://github.com/llvm/llvm-project/issues/18156
         // TODO: handle locale
@@ -509,17 +533,39 @@ double MathLib::toDoubleNumber(const std::string &str)
     istr.imbue(std::locale::classic());
     double ret;
     if (!(istr >> ret))
-        throw InternalError(nullptr, "Internal Error. MathLib::toDoubleNumber: conversion failed: " + str);
+        throw InternalError(tok, "Internal Error. MathLib::toDoubleNumber: conversion failed: " + str);
     std::string s;
     if (istr >> s) {
         if (isDecimalFloat(str))
             return ret;
         if (!isValidIntegerSuffix(s, true))
-            throw InternalError(nullptr, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: " + str);
+            throw InternalError(tok, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: " + str);
     }
     return ret;
 }
 
+template<> std::string MathLib::toString<MathLib::bigint>(MathLib::bigint value)
+{
+#if defined(HAVE_BOOST) && defined(HAVE_BOOST_INT128)
+    std::ostringstream result;
+    result << value;
+    return result.str();
+#else
+    return std::to_string(value);
+#endif
+}
+
+template<> std::string MathLib::toString<MathLib::biguint>(MathLib::biguint value)
+{
+#if defined(HAVE_BOOST) && defined(HAVE_BOOST_INT128)
+    std::ostringstream result;
+    result << value;
+    return result.str();
+#else
+    return std::to_string(value);
+#endif
+}
+
 template<> std::string MathLib::toString<double>(double value)
 {
     std::ostringstream result;
@@ -542,10 +588,10 @@ bool MathLib::isDecimalFloat(const std::string &str)
 {
     if (str.empty())
         return false;
-    enum class State {
+    enum class State : std::uint8_t {
         START, BASE_DIGITS1, LEADING_DECIMAL, TRAILING_DECIMAL, BASE_DIGITS2, E, MANTISSA_PLUSMINUS, MANTISSA_DIGITS, SUFFIX_F, SUFFIX_L, SUFFIX_LITERAL_LEADER, SUFFIX_LITERAL
     } state = State::START;
-    std::string::const_iterator it = str.cbegin();
+    auto it = str.cbegin();
     if ('+' == *it || '-' == *it)
         ++it;
     for (; it != str.cend(); ++it) {
@@ -650,7 +696,7 @@ bool MathLib::isPositive(const std::string &str)
 
 static bool isValidIntegerSuffixIt(std::string::const_iterator it, std::string::const_iterator end, bool supportMicrosoftExtensions=true)
 {
-    enum class Status { START, SUFFIX_U, SUFFIX_UL, SUFFIX_ULL, SUFFIX_UZ, SUFFIX_L, SUFFIX_LU, SUFFIX_LL, SUFFIX_LLU, SUFFIX_I, SUFFIX_I6, SUFFIX_I64, SUFFIX_UI, SUFFIX_UI6, SUFFIX_UI64, SUFFIX_Z, SUFFIX_LITERAL_LEADER, SUFFIX_LITERAL } state = Status::START;
+    enum class Status : std::uint8_t { START, SUFFIX_U, SUFFIX_UL, SUFFIX_ULL, SUFFIX_UZ, SUFFIX_L, SUFFIX_LU, SUFFIX_LL, SUFFIX_LLU, SUFFIX_I, SUFFIX_I6, SUFFIX_I64, SUFFIX_UI, SUFFIX_UI6, SUFFIX_UI64, SUFFIX_Z, SUFFIX_LITERAL_LEADER, SUFFIX_LITERAL } state = Status::START;
     for (; it != end; ++it) {
         switch (state) {
         case Status::START:
@@ -752,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);
@@ -771,12 +816,12 @@ bool MathLib::isValidIntegerSuffix(const std::string& str, bool supportMicrosoft
  **/
 bool MathLib::isOct(const std::string& str)
 {
-    enum class Status {
+    enum class Status : std::uint8_t {
         START, OCTAL_PREFIX, DIGITS
     } state = Status::START;
     if (str.empty())
         return false;
-    std::string::const_iterator it = str.cbegin();
+    auto it = str.cbegin();
     if ('+' == *it || '-' == *it)
         ++it;
     for (; it != str.cend(); ++it) {
@@ -806,12 +851,12 @@ bool MathLib::isOct(const std::string& str)
 
 bool MathLib::isIntHex(const std::string& str)
 {
-    enum class Status {
+    enum class Status : std::uint8_t {
         START, HEX_0, HEX_X, DIGIT
     } state = Status::START;
     if (str.empty())
         return false;
-    std::string::const_iterator it = str.cbegin();
+    auto it = str.cbegin();
     if ('+' == *it || '-' == *it)
         ++it;
     for (; it != str.cend(); ++it) {
@@ -847,12 +892,12 @@ bool MathLib::isIntHex(const std::string& str)
 
 bool MathLib::isFloatHex(const std::string& str)
 {
-    enum class Status {
+    enum class Status : std::uint8_t {
         START, HEX_0, HEX_X, WHOLE_NUMBER_DIGIT, POINT, FRACTION, EXPONENT_P, EXPONENT_SIGN, EXPONENT_DIGITS, EXPONENT_SUFFIX
     } state = Status::START;
     if (str.empty())
         return false;
-    std::string::const_iterator it = str.cbegin();
+    auto it = str.cbegin();
     if ('+' == *it || '-' == *it)
         ++it;
     for (; it != str.cend(); ++it) {
@@ -937,12 +982,12 @@ bool MathLib::isFloatHex(const std::string& str)
  **/
 bool MathLib::isBin(const std::string& str)
 {
-    enum class Status {
+    enum class Status : std::uint8_t {
         START, GNU_BIN_PREFIX_0, GNU_BIN_PREFIX_B, DIGIT
     } state = Status::START;
     if (str.empty())
         return false;
-    std::string::const_iterator it = str.cbegin();
+    auto it = str.cbegin();
     if ('+' == *it || '-' == *it)
         ++it;
     for (; it != str.cend(); ++it) {
@@ -978,12 +1023,12 @@ bool MathLib::isBin(const std::string& str)
 
 bool MathLib::isDec(const std::string & str)
 {
-    enum class Status {
+    enum class Status : std::uint8_t {
         START, DIGIT
     } state = Status::START;
     if (str.empty())
         return false;
-    std::string::const_iterator it = str.cbegin();
+    auto it = str.cbegin();
     if ('+' == *it || '-' == *it)
         ++it;
     for (; it != str.cend(); ++it) {
@@ -1060,7 +1105,7 @@ std::string MathLib::add(const std::string & first, const std::string & second)
     return (value(first) + value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        return toString(toLongNumber(first) + toLongNumber(second)) + intsuffix(first, second);
+        return MathLib::toString(toBigNumber(first) + toBigNumber(second)) + intsuffix(first, second);
     }
 
     double d1 = toDoubleNumber(first);
@@ -1082,7 +1127,7 @@ std::string MathLib::subtract(const std::string &first, const std::string &secon
     return (value(first) - value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        return toString(toLongNumber(first) - toLongNumber(second)) + intsuffix(first, second);
+        return MathLib::toString(toBigNumber(first) - toBigNumber(second)) + intsuffix(first, second);
     }
 
     if (first == second)
@@ -1107,13 +1152,13 @@ std::string MathLib::divide(const std::string &first, const std::string &second)
     return (value(first) / value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        const bigint a = toLongNumber(first);
-        const bigint b = toLongNumber(second);
+        const bigint a = toBigNumber(first);
+        const bigint b = toBigNumber(second);
         if (b == 0)
             throw InternalError(nullptr, "Internal Error: Division by zero");
         if (a == std::numeric_limits<bigint>::min() && std::abs(b)<=1)
             throw InternalError(nullptr, "Internal Error: Division overflow");
-        return toString(toLongNumber(first) / b) + intsuffix(first, second);
+        return MathLib::toString(toBigNumber(first) / b) + intsuffix(first, second);
     }
     if (isNullValue(second)) {
         if (isNullValue(first))
@@ -1130,7 +1175,7 @@ std::string MathLib::multiply(const std::string &first, const std::string &secon
     return (value(first) * value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        return toString(toLongNumber(first) * toLongNumber(second)) + intsuffix(first, second);
+        return MathLib::toString(toBigNumber(first) * toBigNumber(second)) + intsuffix(first, second);
     }
     return toString(toDoubleNumber(first) * toDoubleNumber(second));
 #endif
@@ -1142,10 +1187,10 @@ std::string MathLib::mod(const std::string &first, const std::string &second)
     return (value(first) % value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        const bigint b = toLongNumber(second);
+        const bigint b = toBigNumber(second);
         if (b == 0)
             throw InternalError(nullptr, "Internal Error: Division by zero");
-        return toString(toLongNumber(first) % b) + intsuffix(first, second);
+        return MathLib::toString(toBigNumber(first) % b) + intsuffix(first, second);
     }
     return toString(std::fmod(toDoubleNumber(first),toDoubleNumber(second)));
 #endif
@@ -1170,13 +1215,13 @@ std::string MathLib::calculate(const std::string &first, const std::string &seco
         return MathLib::mod(first, second);
 
     case '&':
-        return MathLib::toString(MathLib::toLongNumber(first) & MathLib::toLongNumber(second)) + intsuffix(first,second);
+        return MathLib::toString(MathLib::toBigNumber(first) & MathLib::toBigNumber(second)) + intsuffix(first, second);
 
     case '|':
-        return MathLib::toString(MathLib::toLongNumber(first) | MathLib::toLongNumber(second)) + intsuffix(first,second);
+        return MathLib::toString(MathLib::toBigNumber(first) | MathLib::toBigNumber(second)) + intsuffix(first, second);
 
     case '^':
-        return MathLib::toString(MathLib::toLongNumber(first) ^ MathLib::toLongNumber(second)) + intsuffix(first,second);
+        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.");
@@ -1275,44 +1320,6 @@ bool MathLib::isOctalDigit(char c)
     return (c >= '0' && c <= '7');
 }
 
-bool MathLib::isDigitSeparator(const std::string& iCode, std::string::size_type iPos)
-{
-    if (iPos == 0 || iPos >= iCode.size() || iCode[iPos] != '\'')
-        return false;
-    std::string::size_type i = iPos - 1;
-    while (std::isxdigit(iCode[i])) {
-        if (i == 0)
-            return true; // Only xdigits before '
-        --i;
-    }
-    if (i == iPos - 1) // No xdigit before '
-        return false;
-
-    switch (iCode[i]) {
-    case ' ':
-    case '.':
-    case ',':
-    case 'x':
-    case '(':
-    case '{':
-    case '+':
-    case '-':
-    case '*':
-    case '%':
-    case '/':
-    case '&':
-    case '|':
-    case '^':
-    case '~':
-    case '=':
-        return true;
-    case '\'':
-        return isDigitSeparator(iCode, i);
-    default:
-        return false;
-    }
-}
-
 MathLib::value operator+(const MathLib::value &v1, const MathLib::value &v2)
 {
     return MathLib::value::calc('+',v1,v2);
diff --git a/lib/mathlib.h b/lib/mathlib.h
index 709fb0e0bf9..d4cc344ee7a 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-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
@@ -23,28 +23,44 @@
 
 #include "config.h"
 
+#include <cstdint>
 #include <string>
 
+#if defined(HAVE_BOOST) && defined(HAVE_BOOST_INT128)
+#include <boost/multiprecision/cpp_int.hpp>
+#endif
+
+class Token;
+
 /// @addtogroup Core
 /// @{
 
 /** @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;
+    using biguint = boost::multiprecision::uint128_t;
+#else
+    using bigint = long long;
+    using biguint = unsigned long long;
+#endif
+
     /** @brief value class */
     class value {
     private:
-        long long mIntValue;
-        double mDoubleValue;
-        enum class Type { INT, LONG, LONGLONG, FLOAT } mType;
-        bool mIsUnsigned;
+        bigint mIntValue{};
+        double mDoubleValue{};
+        enum class Type : std::uint8_t { INT, LONG, LONGLONG, FLOAT } mType;
+        bool mIsUnsigned{};
 
         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 {
@@ -55,30 +71,47 @@ class CPPCHECKLIB MathLib {
         }
 
         double getDoubleValue() const {
-            return isFloat() ? mDoubleValue : (double)mIntValue;
+            return isFloat() ? mDoubleValue : static_cast<double>(mIntValue);
         }
 
+        /**
+         * @throws InternalError thrown on invalid/unhandled calculation or divison 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;
     };
 
-    using bigint = long long;
-    using biguint = unsigned long long;
     static const int bigint_bits;
 
     /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt() */
-    static bigint toLongNumber(const std::string & str);
+    static bigint toBigNumber(const Token * tok);
+    /** @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 toULongNumber(const std::string & str);
+    static biguint toBigUNumber(const Token * tok);
+    /** @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) {
-        return std::to_string(value);
-    }
+    template<class T> static std::string toString(T value) = delete;
     /** @brief for conversion of numeric literals */
-    static double toDoubleNumber(const std::string & str);
+    static double toDoubleNumber(const Token * tok);
+    /** @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);
     static bool isFloat(const std::string &str);
@@ -104,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 divison 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);
@@ -127,13 +169,6 @@ class CPPCHECKLIB MathLib {
     static bool isOctalDigit(char c);
 
     static unsigned int encodeMultiChar(const std::string& str);
-
-    /**
-     * \param[in] iCode Code being considered
-     * \param[in] iPos A posision within iCode
-     * \return Whether iCode[iPos] is a C++14 digit separator
-     */
-    static bool isDigitSeparator(const std::string& iCode, std::string::size_type iPos);
 };
 
 MathLib::value operator+(const MathLib::value &v1, const MathLib::value &v2);
@@ -147,7 +182,9 @@ MathLib::value operator^(const MathLib::value &v1, const MathLib::value &v2);
 MathLib::value operator<<(const MathLib::value &v1, const MathLib::value &v2);
 MathLib::value operator>>(const MathLib::value &v1, const MathLib::value &v2);
 
-template<> CPPCHECKLIB std::string MathLib::toString<double>(double value); // Declare specialization to avoid linker problems
+template<> CPPCHECKLIB std::string MathLib::toString<MathLib::bigint>(MathLib::bigint value);
+template<> CPPCHECKLIB std::string MathLib::toString<MathLib::biguint>(MathLib::biguint value);
+template<> CPPCHECKLIB std::string MathLib::toString<double>(double value);
 
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/path.cpp b/lib/path.cpp
index 442d88f441f..4f18192c7c0 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-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
@@ -16,21 +16,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(__GNUC__) && (defined(_WIN32) || defined(__CYGWIN__))
-#undef __STRICT_ANSI__
+//#define LOG_EMACS_MARKER
+
+#if defined(__CYGWIN__)
+#define _POSIX_C_SOURCE 200112L // required to have readlink()
+#define _BSD_SOURCE // required to have realpath()
 #endif
 
 #include "path.h"
 #include "utils.h"
 
 #include <algorithm>
+#include <cstdio>
 #include <cstdlib>
-#include <fstream>
+#ifdef LOG_EMACS_MARKER
+#include <iostream>
+#endif
+#include <sys/stat.h>
+#include <unordered_set>
 #include <utility>
 
 #include <simplecpp.h>
 
 #ifndef _WIN32
+#include <stdexcept>
+#include <sys/types.h>
 #include <unistd.h>
 #else
 #include <direct.h>
@@ -45,12 +55,15 @@
 
 
 /** Is the filesystem case insensitive? */
-static bool caseInsensitiveFilesystem()
+static constexpr bool caseInsensitiveFilesystem()
 {
-#ifdef _WIN32
+#if defined(_WIN32) || (defined(__APPLE__) && defined(__MACH__))
+    // Windows is case insensitive
+    // MacOS is case insensitive by default (also supports case sensitivity)
     return true;
 #else
     // TODO: Non-windows filesystems might be case insensitive
+    // needs to be determined per filesystem and location - e.g. /sys/fs/ext4/features/casefold
     return false;
 #endif
 }
@@ -58,11 +71,11 @@ static bool caseInsensitiveFilesystem()
 std::string Path::toNativeSeparators(std::string path)
 {
 #if defined(_WIN32)
-    const char separ = '/';
-    const char native = '\\';
+    constexpr char separ = '/';
+    constexpr char native = '\\';
 #else
-    const char separ = '\\';
-    const char native = '/';
+    constexpr char separ = '\\';
+    constexpr char native = '/';
 #endif
     std::replace(path.begin(), path.end(), separ, native);
     return path;
@@ -70,8 +83,8 @@ std::string Path::toNativeSeparators(std::string path)
 
 std::string Path::fromNativeSeparators(std::string path)
 {
-    const char nonnative = '\\';
-    const char newsepar = '/';
+    constexpr char nonnative = '\\';
+    constexpr char newsepar = '/';
     std::replace(path.begin(), path.end(), nonnative, newsepar);
     return path;
 }
@@ -154,23 +167,25 @@ std::string Path::getCurrentExecutablePath(const char* fallback)
 #else // Linux
         "/proc/self/exe";
 #endif
-    success = (readlink(procPath, buf, sizeof(buf)) != -1);
+    // readlink does not null-terminate the string if the buffer is too small, therefore write bufsize - 1
+    success = (readlink(procPath, buf, sizeof(buf) - 1) != -1);
 #endif
     return success ? std::string(buf) : std::string(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 nativePath.compare(0, 2, "\\\\") == 0 || (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
 }
 
@@ -191,54 +206,190 @@ std::string Path::getRelativePath(const std::string& absolutePath, const std::ve
     return absolutePath;
 }
 
-bool Path::isC(const std::string &path)
+static const std::unordered_set<std::string> cpp_src_exts = {
+    ".cpp", ".cxx", ".cc", ".c++", ".tpp", ".txx", ".ipp", ".ixx"
+};
+
+static const std::unordered_set<std::string> c_src_exts = {
+    ".c", ".cl"
+};
+
+static const std::unordered_set<std::string> header_exts = {
+    ".h", ".hpp", ".h++", ".hxx", ".hh"
+};
+
+bool Path::acceptFile(const std::string &path, const std::set<std::string> &extra, Standards::Language* lang)
 {
-    // In unix, ".C" is considered C++ file
-    const std::string extension = getFilenameExtension(path);
-    return extension == ".c" ||
-           extension == ".cl";
+    bool header = false;
+    Standards::Language l = identify(path, false, &header);
+    if (lang)
+        *lang = l;
+    return (l != Standards::Language::None && !header) || extra.find(getFilenameExtension(path)) != extra.end();
 }
 
-bool Path::isCPP(const std::string &path)
+static bool hasEmacsCppMarker(const char* path)
 {
-    const std::string extension = getFilenameExtensionInLowerCase(path);
-    return extension == ".cpp" ||
-           extension == ".cxx" ||
-           extension == ".cc" ||
-           extension == ".c++" ||
-           extension == ".hpp" ||
-           extension == ".hxx" ||
-           extension == ".hh" ||
-           extension == ".tpp" ||
-           extension == ".txx" ||
-           extension == ".ipp" ||
-           extension == ".ixx" ||
-           getFilenameExtension(path) == ".C"; // In unix, ".C" is considered C++ file
+    // TODO: identify is called three times for each file
+    // Preprocessor::loadFiles() -> createDUI()
+    // Preprocessor::preprocess() -> createDUI()
+    // TokenList::createTokens() -> TokenList::determineCppC()
+#ifdef LOG_EMACS_MARKER
+    std::cout << path << '\n';
+#endif
+
+    FILE *fp = fopen(path, "rt");
+    if (!fp)
+        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(buf.data()), buf.size(), fp);
+#undef CONST_CAST
+        fclose(fp);
+        fp = nullptr;
+        if (!res)
+            return false; // failed to read file
+    }
+    // TODO: replace with regular expression
+    const auto pos1 = buf.find("-*-");
+    if (pos1 == std::string::npos)
+        return false; // no start marker
+    const auto pos_nl = buf.find_first_of("\r\n");
+    if (pos_nl != std::string::npos && (pos_nl < pos1)) {
+#ifdef LOG_EMACS_MARKER
+        std::cout << path << " - Emacs marker not on the first line" << '\n';
+#endif
+        return false; // not on first line
+    }
+    const auto pos2 = buf.find("-*-", pos1 + 3);
+    // TODO: make sure we have read the whole line before bailing out
+    if (pos2 == std::string::npos) {
+#ifdef LOG_EMACS_MARKER
+        std::cout << path << " - Emacs marker not terminated" << '\n';
+#endif
+        return false; // no end marker
+    }
+#ifdef LOG_EMACS_MARKER
+    std::cout << "Emacs marker: '"  << buf.substr(pos1, (pos2 + 3) - pos1) << "'" << '\n';
+#endif
+    // TODO: support /* */ comments
+    const std::string buf_trim = trim(buf); // trim whitespaces
+    if (buf_trim[0] == '/' && buf_trim[1] == '*') {
+        const auto pos_cmt = buf.find("*/", 2);
+        if (pos_cmt != std::string::npos && pos_cmt < (pos2 + 3))
+        {
+ #ifdef LOG_EMACS_MARKER
+            std::cout << path << " - Emacs marker not contained in C-style comment block: '"  << buf.substr(pos1, (pos2 + 3) - pos1) << "'" << '\n';
+ #endif
+            return false; // not in a comment
+        }
+    }
+    else if (buf_trim[0] != '/' || buf_trim[1] != '/') {
+#ifdef LOG_EMACS_MARKER
+        std::cout << path << " - Emacs marker not in a comment: '"  << buf.substr(pos1, (pos2 + 3) - pos1) << "'" << '\n';
+#endif
+        return false; // not in a comment
+    }
+
+    // there are more variations with lowercase and no whitespaces
+    // -*- C++ -*-
+    // -*- Mode: C++; -*-
+    // -*- Mode: C++; c-basic-offset: 8 -*-
+    std::string marker = trim(buf.substr(pos1 + 3, pos2 - pos1 - 3), " ;");
+    // cut off additional attributes
+    const auto pos_semi = marker.find(';');
+    if (pos_semi != std::string::npos)
+        marker.resize(pos_semi);
+    findAndReplace(marker, "mode:", "");
+    findAndReplace(marker, "Mode:", "");
+    marker = trim(marker);
+    if (marker == "C++" || marker == "c++") {
+        // NOLINTNEXTLINE(readability-simplify-boolean-expr) - TODO: FP
+        return true; // C++ marker found
+    }
+
+    //if (marker == "C" || marker == "c")
+    //    return false;
+#ifdef LOG_EMACS_MARKER
+    std::cout << path << " - unmatched Emacs marker: '"  << marker << "'" << '\n';
+#endif
+
+    return false; // marker is not a C++ one
 }
 
-bool Path::acceptFile(const std::string &path, const std::set<std::string> &extra)
+Standards::Language Path::identify(const std::string &path, bool cppHeaderProbe, bool *header)
 {
-    return !Path::isHeader(path) && (Path::isCPP(path) || Path::isC(path) || extra.find(getFilenameExtension(path)) != extra.end());
+    if (header)
+        *header = false;
+
+    std::string ext = getFilenameExtension(path);
+    // standard library headers have no extension
+    if (cppHeaderProbe && ext.empty()) {
+        if (hasEmacsCppMarker(path.c_str())) {
+            if (header)
+                *header = true;
+            return Standards::Language::CPP;
+        }
+        return Standards::Language::None;
+    }
+    if (ext == ".C")
+        return Standards::Language::CPP;
+    if (c_src_exts.find(ext) != c_src_exts.end())
+        return Standards::Language::C;
+    if (!caseInsensitiveFilesystem())
+        strTolower(ext);
+    if (ext == ".h") {
+        if (header)
+            *header = true;
+        if (cppHeaderProbe && hasEmacsCppMarker(path.c_str()))
+            return Standards::Language::CPP;
+        return Standards::Language::C;
+    }
+    if (cpp_src_exts.find(ext) != cpp_src_exts.end())
+        return Standards::Language::CPP;
+    if (header_exts.find(ext) != header_exts.end()) {
+        if (header)
+            *header = true;
+        return Standards::Language::CPP;
+    }
+    return Standards::Language::None;
 }
 
 bool Path::isHeader(const std::string &path)
 {
-    const std::string extension = getFilenameExtensionInLowerCase(path);
-    return (extension.compare(0, 2, ".h") == 0);
+    bool header;
+    (void)identify(path, false, &header);
+    return header;
 }
 
 std::string Path::getAbsoluteFilePath(const std::string& filePath)
 {
+    if (filePath.empty())
+        return "";
+
     std::string absolute_path;
 #ifdef _WIN32
     char absolute[_MAX_PATH];
     if (_fullpath(absolute, filePath.c_str(), _MAX_PATH))
         absolute_path = absolute;
+    if (!absolute_path.empty() && absolute_path.back() == '\\')
+        absolute_path.pop_back();
 #elif defined(__linux__) || defined(__sun) || defined(__hpux) || defined(__GNUC__) || defined(__CPPCHECK__)
-    char * absolute = realpath(filePath.c_str(), nullptr);
+    // simplify the path since any non-existent part has to exist even if discarded by ".."
+    std::string spath = Path::simplifyPath(filePath);
+    char * absolute = realpath(spath.c_str(), nullptr);
     if (absolute)
         absolute_path = absolute;
     free(absolute);
+    // only throw on realpath() fialure 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
 #error Platform absolute path function needed
 #endif
@@ -248,9 +399,9 @@ std::string Path::getAbsoluteFilePath(const std::string& filePath)
 std::string Path::stripDirectoryPart(const std::string &file)
 {
 #if defined(_WIN32) && !defined(__MINGW32__)
-    const char native = '\\';
+    constexpr char native = '\\';
 #else
-    const char native = '/';
+    constexpr char native = '/';
 #endif
 
     const std::string::size_type p = file.rfind(native);
@@ -260,15 +411,49 @@ std::string Path::stripDirectoryPart(const std::string &file)
     return file;
 }
 
-bool Path::fileExists(const std::string &file)
+#ifdef _WIN32
+using mode_t = unsigned short;
+#endif
+
+static mode_t file_type(const std::string &path)
 {
-    std::ifstream f(file.c_str());
-    return f.is_open();
+    struct stat file_stat;
+    if (stat(path.c_str(), &file_stat) == -1)
+        return 0;
+    return file_stat.st_mode & S_IFMT;
 }
 
-std::string Path::join(std::string path1, std::string path2) {
+bool Path::isFile(const std::string &path)
+{
+    return file_type(path) == S_IFREG;
+}
+
+bool Path::isDirectory(const std::string &path)
+{
+    return file_type(path) == S_IFDIR;
+}
+
+bool Path::exists(const std::string &path, bool* isdir)
+{
+    const auto type = file_type(path);
+    if (type == S_IFDIR)
+    {
+        if (isdir)
+            *isdir = true;
+        return true;
+    }
+    if (isdir)
+        *isdir = false;
+    return type == S_IFREG;
+}
+
+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;
diff --git a/lib/path.h b/lib/path.h
index 621360efeef..23db06c4e50 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-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
@@ -22,6 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "standards.h"
 
 #include <set>
 #include <string>
@@ -136,42 +137,39 @@ class CPPCHECKLIB Path {
      * @brief Check if the file extension indicates that it's a C/C++ source file.
      * Check if the file has source file extension: *.c;*.cpp;*.cxx;*.c++;*.cc;*.txx
      * @param filename filename to check. path info is optional
+     * @param lang the detected language
      * @return true if the file extension indicates it should be checked
      */
-    static bool acceptFile(const std::string &filename) {
+    static bool acceptFile(const std::string &filename, Standards::Language* lang = nullptr) {
         const std::set<std::string> extra;
-        return acceptFile(filename, extra);
+        return acceptFile(filename, extra, lang);
     }
 
     /**
      * @brief Check if the file extension indicates that it's a C/C++ source file.
      * Check if the file has source file extension: *.c;*.cpp;*.cxx;*.c++;*.cc;*.txx
      * @param path filename to check. path info is optional
-     * @param extra    extra file extensions
+     * @param extra extra file extensions
+     * @param lang the detected language
      * @return true if the file extension indicates it should be checked
      */
-    static bool acceptFile(const std::string &path, const std::set<std::string> &extra);
+    static bool acceptFile(const std::string &path, const std::set<std::string> &extra, Standards::Language* lang = nullptr);
 
     /**
-     * @brief Identify language based on file extension.
-     * @param path filename to check. path info is optional
-     * @return true if extension is meant for C files
-     */
-    static bool isC(const std::string &path);
-
-    /**
-     * @brief Identify language based on file extension.
+     * @brief Is filename a header based on file extension
      * @param path filename to check. path info is optional
-     * @return true if extension is meant for C++ files
+     * @return true if filename extension is meant for headers
      */
-    static bool isCPP(const std::string &path);
+    static bool isHeader(const std::string &path);
 
     /**
-     * @brief Is filename a header based on file extension
+     * @brief Identify the language based on the file extension
      * @param path filename to check. path info is optional
-     * @return true if filename extension is meant for headers
+     * @param cppHeaderProbe check optional Emacs marker to identify extension-less and *.h files as C++
+     * @param header if provided indicates if the file is a header
+     * @return the language type
      */
-    static bool isHeader(const std::string &path);
+    static Standards::Language identify(const std::string &path, bool cppHeaderProbe, bool *header = nullptr);
 
     /**
      * @brief Get filename without a directory path part.
@@ -181,14 +179,31 @@ class CPPCHECKLIB Path {
     static std::string stripDirectoryPart(const std::string &file);
 
     /**
-     * @brief Checks if a File exists
-     * @param file Path to be checked if it is a File
-     * @return true if given path is a File
+     * @brief Checks if given path is a file
+     * @param path Path to be checked
+     * @return true if given path is a file
+     */
+    static bool isFile(const std::string &path);
+
+    /**
+     * @brief Checks if a given path is a directory
+     * @param path Path to be checked
+     * @return true if given path is a directory
+     */
+    static bool isDirectory(const std::string &path);
+
+    /**
+     * @brief Checks if a given path exists (i.e. is a file or directory)
+     * @param path Path to be checked
+     * @param isdir Optional parameter which indicates if the existing path is a directory
+     * @return true if given path exists
      */
-    static bool fileExists(const std::string &file);
+    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);
 };
diff --git a/lib/pathanalysis.cpp b/lib/pathanalysis.cpp
index 0404dba58c4..8b2e1b61cbb 100644
--- a/lib/pathanalysis.cpp
+++ b/lib/pathanalysis.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
@@ -26,13 +26,12 @@
 #include <algorithm>
 #include <string>
 #include <tuple>
-#include <type_traits>
 
 const Scope* PathAnalysis::findOuterScope(const Scope * scope)
 {
     if (!scope)
         return nullptr;
-    if (scope->isLocal() && scope->type != Scope::eSwitch)
+    if (scope->isLocal() && scope->type != ScopeType::eSwitch)
         return findOuterScope(scope->nestedIn);
     return scope;
 }
@@ -49,9 +48,9 @@ static const Token* assignExpr(const Token* tok)
 
 std::pair<bool, bool> PathAnalysis::checkCond(const Token * tok, bool& known)
 {
-    if (tok->hasKnownIntValue()) {
+    if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT)) {
         known = true;
-        return std::make_pair(tok->values().front().intvalue, !tok->values().front().intvalue);
+        return std::make_pair(!!v->intvalue, !v->intvalue);
     }
     auto it = std::find_if(tok->values().cbegin(), tok->values().cend(), [](const ValueFlow::Value& v) {
         return v.isIntValue();
@@ -63,7 +62,7 @@ std::pair<bool, bool> PathAnalysis::checkCond(const Token * tok, bool& known)
         return true;
     })) {
         known = false;
-        return std::make_pair(it->intvalue, !it->intvalue);
+        return std::make_pair(!!it->intvalue, !it->intvalue);
     }
     return std::make_pair(true, true);
 }
@@ -77,7 +76,7 @@ PathAnalysis::Progress PathAnalysis::forwardRecursive(const Token* tok, Info inf
     info.tok = tok;
     if (f(info) == Progress::Break)
         return Progress::Break;
-    if (tok->astOperand2() && forwardRecursive(tok->astOperand2(), info, f) == Progress::Break)
+    if (tok->astOperand2() && forwardRecursive(tok->astOperand2(), std::move(info), f) == Progress::Break)
         return Progress::Break;
     return Progress::Continue;
 }
@@ -88,7 +87,7 @@ PathAnalysis::Progress PathAnalysis::forwardRange(const Token* startToken, const
         if (Token::Match(tok, "asm|goto|break|continue"))
             return Progress::Break;
         if (Token::Match(tok, "return|throw")) {
-            forwardRecursive(tok, info, f);
+            forwardRecursive(tok, std::move(info), f);
             return Progress::Break;
             // Evaluate RHS of assignment before LHS
         }
@@ -124,14 +123,14 @@ PathAnalysis::Progress PathAnalysis::forwardRange(const Token* startToken, const
             if (Token::simpleMatch(tok, "} else {")) {
                 tok = tok->linkAt(2);
             }
-        } else if (Token::Match(tok, "if|while|for (") && Token::simpleMatch(tok->next()->link(), ") {")) {
-            const Token * endCond = tok->next()->link();
-            const Token * endBlock = endCond->next()->link();
+        } else if (Token::Match(tok, "if|while|for (") && Token::simpleMatch(tok->linkAt(1), ") {")) {
+            const Token * endCond = tok->linkAt(1);
+            const Token * endBlock = endCond->linkAt(1);
             const Token * condTok = getCondTok(tok);
             if (!condTok)
                 continue;
             // Traverse condition
-            if (forwardRange(tok->next(), tok->next()->link(), info, f) == Progress::Break)
+            if (forwardRange(tok->next(), tok->linkAt(1), info, f) == Progress::Break)
                 return Progress::Break;
             Info i = info;
             i.known = false;
@@ -151,7 +150,7 @@ PathAnalysis::Progress PathAnalysis::forwardRange(const Token* startToken, const
             if (Token::simpleMatch(endBlock, "} else {")) {
                 if (checkElse) {
                     i.errorPath.back().second = "Assuming condition is false.";
-                    const Progress result = forwardRange(endCond->next(), endBlock, i, f);
+                    const Progress result = forwardRange(endCond->next(), endBlock, std::move(i), f);
                     if (result == Progress::Break)
                         return Progress::Break;
                 }
@@ -167,7 +166,7 @@ PathAnalysis::Progress PathAnalysis::forwardRange(const Token* startToken, const
                 return Progress::Break;
         }
         // Prevent infinite recursion
-        if (tok->next() == start)
+        if (tok->next() == mStart)
             break;
     }
     return Progress::Continue;
@@ -175,17 +174,17 @@ PathAnalysis::Progress PathAnalysis::forwardRange(const Token* startToken, const
 
 void PathAnalysis::forward(const std::function<Progress(const Info&)>& f) const
 {
-    const Scope * endScope = findOuterScope(start->scope());
+    const Scope * endScope = findOuterScope(mStart->scope());
     if (!endScope)
         return;
     const Token * endToken = endScope->bodyEnd;
-    Info info{start, ErrorPath{}, true};
-    forwardRange(start, endToken, info, f);
+    Info info{mStart, ErrorPath{}, true};
+    forwardRange(mStart, endToken, std::move(info), f);
 }
 
-bool reaches(const Token * start, const Token * dest, const Library& library, ErrorPath* errorPath)
+bool reaches(const Token * start, const Token * dest, ErrorPath* errorPath)
 {
-    PathAnalysis::Info info = PathAnalysis{start, library}.forwardFind([&](const PathAnalysis::Info& i) {
+    PathAnalysis::Info info = PathAnalysis{start}.forwardFind([&](const PathAnalysis::Info& i) {
         return (i.tok == dest);
     });
     if (!info.tok)
diff --git a/lib/pathanalysis.h b/lib/pathanalysis.h
index 94c3318a826..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-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
@@ -21,24 +21,22 @@
 
 #include "errortypes.h"
 
+#include <cstdint>
 #include <functional>
-#include <list>
 #include <utility>
 
-class Library;
 class Scope;
 class Token;
 
 struct PathAnalysis {
-    enum class Progress {
+    enum class Progress : std::uint8_t {
         Continue,
         Break
     };
-    PathAnalysis(const Token* start, const Library& library)
-        : start(start), library(&library)
+
+    explicit PathAnalysis(const Token* start)
+        : mStart(start)
     {}
-    const Token * start;
-    const Library * library;
 
     struct Info {
         const Token* tok;
@@ -46,8 +44,6 @@ struct PathAnalysis {
         bool known;
     };
 
-    void forward(const std::function<Progress(const Info&)>& f) const;
-
     Info forwardFind(std::function<bool(const Info&)> pred) const {
         Info result{};
         forward([&](const Info& info) {
@@ -60,6 +56,9 @@ struct PathAnalysis {
         return result;
     }
 private:
+    const Token * mStart;
+
+    void forward(const std::function<Progress(const Info&)>& f) const;
 
     static Progress forwardRecursive(const Token* tok, Info info, const std::function<PathAnalysis::Progress(const Info&)>& f);
     Progress forwardRange(const Token* startToken, const Token* endToken, Info info, const std::function<Progress(const Info&)>& f) const;
@@ -76,7 +75,7 @@ struct PathAnalysis {
  * @param dest The path destination
  * @param errorPath Adds the path traversal to the errorPath
  */
-bool reaches(const Token * start, const Token * dest, const Library& library, ErrorPath* errorPath);
+bool reaches(const Token * start, const Token * dest, ErrorPath* errorPath);
 
 #endif
 
diff --git a/lib/pathmatch.cpp b/lib/pathmatch.cpp
index 882ac03bf09..5dd11e1d755 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-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
@@ -19,66 +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> excludedPaths, bool caseSensitive)
-    : mExcludedPaths(std::move(excludedPaths)), 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
 {
-    if (!mCaseSensitive)
-        for (std::string& excludedPath : mExcludedPaths)
-            strTolower(excludedPath);
-    mWorkingDirectory.push_back(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;
 
-    for (std::vector<std::string>::const_iterator i = mExcludedPaths.cbegin(); i != mExcludedPaths.cend(); ++i) {
-        const std::string excludedPath((!Path::isAbsolute(path) && Path::isAbsolute(*i)) ? Path::getRelativePath(*i, mWorkingDirectory) : *i);
+    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;
 
-        std::string findpath = Path::fromNativeSeparators(path);
-        if (!mCaseSensitive)
-            strTolower(findpath);
+    if (!dir_mismatch && pattern == path)
+        return true;
 
-        // Filtering directory name
-        if (endsWith(excludedPath,'/')) {
-            if (!endsWith(findpath,'/'))
-                findpath = removeFilename(findpath);
+    /* 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);
+
+    /* Pattern iterator */
+    PathIterator s = PathIterator::fromPattern(pattern, basepath, syntax);
+    /* Path iterator */
+    PathIterator t = PathIterator::fromPath(path, basepath, syntax);
+
+    if (dir_mismatch) {
+        /* Final compponent can't match, so skip it. */
+        while (*t != '\0' && *t != '/')
+            ++t;
+    }
 
-            if (excludedPath.length() > findpath.length())
+    /* Pattern restart position */
+    PathIterator p = s;
+    /* Path restart position */
+    PathIterator q = t;
+
+    /* Backtrack stack */
+    std::stack<std::pair<PathIterator::Pos, PathIterator::Pos>> b;
+
+    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 (findpath.compare(0, excludedPath.size(), excludedPath) == 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 (findpath.find("/" + excludedPath) != 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 (excludedPath.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() - excludedPath.size(), findpath.size(), excludedPath) == 0)
-                return true;
+            }
+            break;
+        }
+        }
 
+        /* No match, try to backtrack */
+        if (!b.empty()) {
+            const auto bp = b.top();
+            b.pop();
+            s.setpos(bp.first);
+            t.setpos(bp.second);
+            continue;
         }
-    }
-    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);
+        /* 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 seperators to try from */
+        return false;
+    }
 }
diff --git a/lib/pathmatch.h b/lib/pathmatch.h
index 7c8df1edc83..b89ddcbe40b 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-2022 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,46 +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:
 
+    /**
+     * @brief Path syntax.
+     *
+     * windows: Case insensitive, forward and backward slashes, UNC or drive letter root.
+     * unix: Case sensitive, forward slashes, slash root.
+     *
+     */
+    enum class Syntax : std::uint8_t {
+        windows,
+        unix,
+    };
+
+    /**
+     * @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
+     *
+     * regular: File is a regular file.
+     * directory: File is a directory.
+     */
+    enum class Filemode : std::uint8_t {
+        regular,
+        directory,
+    };
+
     /**
      * The constructor.
-     * @param excludedPaths List of masks.
-     * @param caseSensitive Match the case of the characters when
-     *   matching paths?
+     *
+     * @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> excludedPaths, bool caseSensitive = true);
+    explicit PathMatch(std::vector<std::string> patterns = {}, std::string basepath = std::string(), Syntax syntax = platform_syntax);
 
     /**
-     * @brief Match path against list of masks.
+     * @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;
+
+    /**
+     * @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);
 
-protected:
+    /**
+     * @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 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 Remove filename part from the path.
-     * @param path Path to edit.
-     * @return path without filename part.
+     * @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 removeFilename(const std::string &path);
+    static std::string joinRelativePattern(const std::string &basepath, const std::string &pattern)
+    {
+        if (isRelativePattern(pattern))
+            return Path::join(basepath, pattern);
+        return pattern;
+    }
+
+private:
+    friend class TestPathMatch;
+    class PathIterator;
+
+    /* 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 chracter is a drive letter */
+    static bool isdrive(char c)
+    {
+        return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
+    }
 
 private:
-    std::vector<std::string> mExcludedPaths;
-    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/pcrerules.pri b/lib/pcrerules.pri
deleted file mode 100644
index 267b54ab34d..00000000000
--- a/lib/pcrerules.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-# If HAVE_RULES=yes is passed to qmake, use PCRE and enable rules
-contains(HAVE_RULES, [yY][eE][sS]) {
-    CONFIG += use_pcre_rules
-}
-
-use_pcre_rules {
-    DEFINES += HAVE_RULES
-    LIBS += -L../externals -lpcre
-    INCLUDEPATH += ../externals
-    message("Rules enabled - to disable them and remove the dependency on PCRE, pass HAVE_RULES=no to qmake.")
-} else {
-    message("Rules disabled - to enable them, make PCRE available and pass HAVE_RULES=yes to qmake.")
-}
diff --git a/lib/platform.cpp b/lib/platform.cpp
index cf6235c90c6..833c012ab8e 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-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
@@ -23,24 +23,18 @@
 #include <cstring>
 #include <iostream>
 #include <limits>
+#include <utility>
 #include <vector>
 
-#include <tinyxml2.h>
+#include "xml.h"
 
-cppcheck::Platform::Platform()
+Platform::Platform()
 {
-    // This assumes the code you are checking is for the same architecture this is compiled on.
-#if defined(_WIN64)
-    set(Type::Win64);
-#elif defined(_WIN32)
-    set(Type::Win32A);
-#else
     set(Type::Native);
-#endif
 }
 
 
-bool cppcheck::Platform::set(Type t)
+bool Platform::set(Type t)
 {
     switch (t) {
     case Type::Unspecified: // unknown type sizes (sizes etc are set but are not known)
@@ -63,10 +57,7 @@ bool cppcheck::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:
@@ -84,10 +75,7 @@ bool cppcheck::Platform::set(Type t)
         sizeof_pointer = 4;
         defaultSign = '\0';
         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;
@@ -104,10 +92,7 @@ bool cppcheck::Platform::set(Type t)
         sizeof_pointer = 8;
         defaultSign = '\0';
         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;
@@ -124,10 +109,7 @@ bool cppcheck::Platform::set(Type t)
         sizeof_pointer = 4;
         defaultSign = '\0';
         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;
@@ -144,10 +126,7 @@ bool cppcheck::Platform::set(Type t)
         sizeof_pointer = 8;
         defaultSign = '\0';
         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.
@@ -157,7 +136,7 @@ bool cppcheck::Platform::set(Type t)
     return false;
 }
 
-bool cppcheck::Platform::set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths, bool verbose)
+bool Platform::set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths, bool debug)
 {
     if (platformstr == "win32A")
         set(Type::Win32A);
@@ -177,63 +156,76 @@ bool cppcheck::Platform::set(const std::string& platformstr, std::string& errstr
         errstr = "unrecognized platform: '" + platformstr + "' (no lookup).";
         return false;
     }
-    else {
-        bool found = false;
-        for (const std::string& path : paths) {
-            if (verbose)
-                std::cout << "looking for platform '" + platformstr + "' in '" + path + "'" << std::endl;
-            if (loadFromFile(path.c_str(), platformstr, verbose)) {
-                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 cppcheck::Platform::loadFromFile(const char exename[], const std::string &filename, bool verbose)
+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);
+
+    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 && Path::getFilenameExtension(fullfilename).empty())
+        fullfilename += ".xml";
+
     // TODO: use native separators
     std::vector<std::string> filenames;
-    filenames.push_back(filename);
-    filenames.push_back(filename + ".xml");
-    filenames.push_back("platforms/" + filename);
-    filenames.push_back("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");
+    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 (verbose)
+        if (debug)
             std::cout << "try to load platform file '" << f << "' ... ";
-        if (doc.LoadFile(f.c_str()) == tinyxml2::XML_SUCCESS) {
-            if (verbose)
+        err = doc.LoadFile(f.c_str());
+        if (err == tinyxml2::XML_SUCCESS) {
+            if (debug)
                 std::cout << "Success" << std::endl;
-            success = true;
             break;
         }
-        if (verbose)
+        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);
@@ -247,7 +239,7 @@ static unsigned int xmlTextAsUInt(const tinyxml2::XMLElement* node, bool& error)
     return retval;
 }
 
-bool cppcheck::Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
+bool Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
 {
     const tinyxml2::XMLElement * const rootnode = doc->FirstChildElement();
 
@@ -256,47 +248,194 @@ bool cppcheck::Platform::loadFromXmlDocument(const tinyxml2::XMLDocument *doc)
 
     bool error = false;
     for (const tinyxml2::XMLElement *node = rootnode->FirstChildElement(); node; node = node->NextSiblingElement()) {
-        if (std::strcmp(node->Name(), "default-sign") == 0) {
+        const char* name = node->Name();
+        if (std::strcmp(name, "default-sign") == 0) {
             const char* str = node->GetText();
             if (str)
                 defaultSign = *str;
             else
                 error = true;
-        } else if (std::strcmp(node->Name(), "char_bit") == 0)
+        } else if (std::strcmp(name, "char_bit") == 0)
             char_bit = xmlTextAsUInt(node, error);
-        else if (std::strcmp(node->Name(), "sizeof") == 0) {
+        else if (std::strcmp(name, "sizeof") == 0) {
             for (const tinyxml2::XMLElement *sz = node->FirstChildElement(); sz; sz = sz->NextSiblingElement()) {
-                if (std::strcmp(sz->Name(), "short") == 0)
+                const char* szname = sz->Name();
+                if (std::strcmp(szname, "short") == 0)
                     sizeof_short = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "bool") == 0)
+                else if (std::strcmp(szname, "bool") == 0)
                     sizeof_bool = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "int") == 0)
+                else if (std::strcmp(szname, "int") == 0)
                     sizeof_int = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "long") == 0)
+                else if (std::strcmp(szname, "long") == 0)
                     sizeof_long = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "long-long") == 0)
+                else if (std::strcmp(szname, "long-long") == 0)
                     sizeof_long_long = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "float") == 0)
+                else if (std::strcmp(szname, "float") == 0)
                     sizeof_float = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "double") == 0)
+                else if (std::strcmp(szname, "double") == 0)
                     sizeof_double = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "long-double") == 0)
+                else if (std::strcmp(szname, "long-double") == 0)
                     sizeof_long_double = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "pointer") == 0)
+                else if (std::strcmp(szname, "pointer") == 0)
                     sizeof_pointer = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "size_t") == 0)
+                else if (std::strcmp(szname, "size_t") == 0)
                     sizeof_size_t = xmlTextAsUInt(sz, error);
-                else if (std::strcmp(sz->Name(), "wchar_t") == 0)
+                else if (std::strcmp(szname, "wchar_t") == 0)
                     sizeof_wchar_t = xmlTextAsUInt(sz, 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;
 }
+
+std::string Platform::getLimitsDefines(bool c99) const
+{
+    std::string s;
+
+    // climits / limits.h
+    s += "CHAR_BIT=";
+    s += std::to_string(char_bit);
+    s += ";SCHAR_MIN=";
+    s += std::to_string(min_value(char_bit));
+    s += ";SCHAR_MAX=";
+    s += std::to_string(max_value(char_bit));
+    s += ";UCHAR_MAX=";
+    s += std::to_string(max_value(char_bit+1));
+    s += ";CHAR_MIN=";
+    if (defaultSign == 'u')
+        s += std::to_string(min_value(char_bit));
+    else
+        s += std::to_string(0);
+    s += ";CHAR_MAX=";
+    if (defaultSign == 'u')
+        s += std::to_string(max_value(char_bit+1));
+    else
+        s += std::to_string(max_value(char_bit));
+    // TODO
+    //s += ";MB_LEN_MAX=";
+    s += ";SHRT_MIN=";
+    s += std::to_string(min_value(short_bit));
+    s += ";SHRT_MAX=";
+    s += std::to_string(max_value(short_bit));
+    s += ";USHRT_MAX=";
+    s += std::to_string(max_value(short_bit+1));
+    s += ";INT_MIN=";
+    s += "(-" + std::to_string(max_value(int_bit)) + " - 1)";
+    s += ";INT_MAX=";
+    s += std::to_string(max_value(int_bit));
+    s += ";UINT_MAX=";
+    s += std::to_string(max_value(int_bit+1));
+    s += ";LONG_MIN=";
+    s += "(-" + std::to_string(max_value(long_bit)) + "L - 1L)";
+    s += ";LONG_MAX=";
+    s += std::to_string(max_value(long_bit)) + "L";
+    s += ";ULONG_MAX=";
+    s += std::to_string(max_value_unsigned(long_bit)) + "UL";
+    if (c99) {
+        s += ";LLONG_MIN=";
+        s += "(-" + std::to_string(max_value(long_long_bit)) + "LL - 1LL)";
+        s += ";LLONG_MAX=";
+        s += std::to_string(max_value(long_long_bit)) + "LL";
+        s += ";ULLONG_MAX=";
+        s += std::to_string(max_value_unsigned(long_long_bit)) + "ULL";
+    }
+
+    // cstdint / stdint.h
+    // FIXME: these are currently hard-coded in std.cfg
+    /*
+        INTMAX_MIN
+        INTMAX_MAX
+        UINTMAX_MAX
+        INTN_MIN
+        INTN_MAX
+        UINTN_MAX
+        INT_LEASTN_MIN
+        INT_LEASTN_MAX
+        UINT_LEASTN_MAX
+        INT_FASTN_MIN
+        INT_FASTN_MAX
+        UINT_FASTN_MAX
+        INTPTR_MIN
+        INTPTR_MAX
+        UINTPTR_MAX
+        SIZE_MAX
+        PTRDIFF_MIN
+        PTRDIFF_MAX
+        SIG_ATOMIC_MIN
+        SIG_ATOMIC_MAX
+        WCHAR_MIN
+        WCHAR_MAX
+        WINT_MIN
+        WINT_MAX
+
+        // function-like macros
+        // implemented in std.cfg
+        INTMAX_C
+        UINTMAX_C
+        INTN_C
+        UINTN_C
+     */
+
+    // cfloat / float.h
+    /*
+        // TODO: implement
+        FLT_RADIX
+
+        FLT_MANT_DIG
+        DBL_MANT_DIG
+        LDBL_MANT_DIG
+
+        FLT_DIG
+        DBL_DIG
+        LDBL_DIG
+
+        FLT_MIN_EXP
+        DBL_MIN_EXP
+        LDBL_MIN_EXP
+
+        FLT_MIN_10_EXP
+        DBL_MIN_10_EXP
+        LDBL_MIN_10_EXP
+
+        FLT_MAX_EXP
+        DBL_MAX_EXP
+        LDBL_MAX_EXP
+
+        FLT_MAX_10_EXP
+        DBL_MAX_10_EXP
+        LDBL_MAX_10_EXP
+
+        FLT_MAX
+        DBL_MAX
+        LDBL_MAX
+
+        FLT_EPSILON
+        DBL_EPSILON
+        LDBL_EPSILON
+
+        FLT_MIN
+        DBL_MIN
+        LDBL_MIN
+
+        FLT_ROUNDS
+
+        // C99 / C++11 only
+        FLT_EVAL_METHOD
+
+        DECIMAL_DIG
+     */
+
+    return s;
+}
+
+std::string Platform::getLimitsDefines(Standards::cstd_t cstd) const
+{
+    return getLimitsDefines(cstd >= Standards::cstd_t::C99);
+}
+
+std::string Platform::getLimitsDefines(Standards::cppstd_t cppstd) const
+{
+    return getLimitsDefines(cppstd >= Standards::cppstd_t::CPP11);
+}
diff --git a/lib/platform.h b/lib/platform.h
index 6d9833240d2..4673c4859e6 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-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
@@ -22,8 +22,13 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "mathlib.h"
+#include "standards.h"
 
+#include <cassert>
 #include <climits>
+#include <cstddef>
+#include <cstdint>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -35,154 +40,182 @@ namespace tinyxml2 {
     class XMLDocument;
 }
 
-namespace cppcheck {
-
-    /**
-     * @brief Platform settings
-     */
-    class CPPCHECKLIB Platform {
-    private:
-        static long long min_value(int bit) {
-            if (bit >= 64)
-                return LLONG_MIN;
-            return -(1LL << (bit-1));
-        }
-
-        static long long max_value(int bit) {
-            if (bit >= 64)
-                return (~0ULL) >> 1;
-            return (1LL << (bit-1)) - 1LL;
-        }
-    public:
-        Platform();
-
-        bool isIntValue(long long value) const {
-            return value >= min_value(int_bit) && value <= max_value(int_bit);
-        }
-
-        bool isIntValue(unsigned long long value) const {
-            const unsigned long long intMax = max_value(int_bit);
-            return value <= intMax;
-        }
+/**
+ * @brief Platform settings
+ */
+class CPPCHECKLIB Platform {
+private:
+    static long long min_value(std::uint8_t bit) {
+        assert(bit > 0);
+        if (bit >= 64)
+            return LLONG_MIN;
+        return -(1LL << (bit-1));
+    }
+
+    static long long max_value(std::uint8_t bit) {
+        assert(bit > 0);
+        if (bit >= 64)
+            return (~0ULL) >> 1;
+        return (1LL << (bit-1)) - 1LL;
+    }
+
+    static unsigned long long max_value_unsigned(std::uint8_t bit) {
+        assert(bit > 0);
+        if (bit >= 64)
+            return ~0ULL;
+        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();
+
+    bool isIntValue(MathLib::bigint value) const {
+        return value >= min_value(int_bit) && value <= max_value(int_bit);
+    }
+
+    bool isIntValue(MathLib::biguint value) const {
+        const unsigned long long intMax = max_value(int_bit);
+        return value <= intMax;
+    }
+
+    bool isLongValue(MathLib::bigint value) const {
+        return value >= min_value(long_bit) && value <= max_value(long_bit);
+    }
+
+    bool isLongValue(MathLib::biguint value) const {
+        const MathLib::biguint longMax = max_value(long_bit);
+        return value <= longMax;
+    }
+
+    bool isLongLongValue(MathLib::biguint value) const {
+        const MathLib::biguint longLongMax = max_value(long_long_bit);
+        return value <= longLongMax;
+    }
+
+    std::uint8_t char_bit;       /// bits in char
+    std::uint8_t short_bit;      /// bits in short
+    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;
+    std::size_t sizeof_short;
+    std::size_t sizeof_int;
+    std::size_t sizeof_long;
+    std::size_t sizeof_long_long;
+    std::size_t sizeof_float;
+    std::size_t sizeof_double;
+    std::size_t sizeof_long_double;
+    std::size_t sizeof_wchar_t;
+    std::size_t sizeof_size_t;
+    std::size_t sizeof_pointer;
+
+    char defaultSign;  // unsigned:'u', signed:'s', unknown:'\0'
+
+    enum Type : std::uint8_t {
+        Unspecified, // No platform specified
+        Native, // whatever system this code was compiled on
+        Win32A,
+        Win32W,
+        Win64,
+        Unix32,
+        Unix64,
+        File
+    };
 
-        bool isLongValue(long long value) const {
-            return value >= min_value(long_bit) && value <= max_value(long_bit);
-        }
+    /** platform type */
+    Type type;
 
-        bool isLongValue(unsigned long long value) const {
-            const unsigned long long longMax = max_value(long_bit);
-            return value <= longMax;
-        }
+    /** set the platform type for predefined platforms - deprecated use set(const std::string&, std::string&) instead */
+    bool set(Type t);
 
-        bool isLongLongValue(unsigned long long value) const {
-            const unsigned long long longLongMax = max_value(long_long_bit);
-            return value <= longLongMax;
-        }
+    /** set the platform type */
+    bool set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths = {}, bool debug = false);
 
-        nonneg int char_bit;       /// bits in char
-        nonneg int short_bit;      /// bits in short
-        nonneg int int_bit;        /// bits in int
-        nonneg int long_bit;       /// bits in long
-        nonneg int long_long_bit;  /// bits in long long
-
-        /** size of standard types */
-        nonneg int sizeof_bool;
-        nonneg int sizeof_short;
-        nonneg int sizeof_int;
-        nonneg int sizeof_long;
-        nonneg int sizeof_long_long;
-        nonneg int sizeof_float;
-        nonneg int sizeof_double;
-        nonneg int sizeof_long_double;
-        nonneg int sizeof_wchar_t;
-        nonneg int sizeof_size_t;
-        nonneg int sizeof_pointer;
-
-        char defaultSign;  // unsigned:'u', signed:'s', unknown:'\0'
-
-        enum Type {
-            Unspecified, // No platform specified
-            Native, // whatever system this code was compiled on
-            Win32A,
-            Win32W,
-            Win64,
-            Unix32,
-            Unix64,
-            File
-        };
-
-        /** platform type */
-        Type type;
-
-        /** set the platform type for predefined platforms - deprecated use set(const std::string&, std::string&) instead */
-        bool set(Type t);
-
-        /** set the platform type */
-        bool set(const std::string& platformstr, std::string& errstr, const std::vector<std::string>& paths = {}, bool verbose = false);
-
-        /**
-         * load platform file
-         * @param exename application path
-         * @param filename platform filename
-         * @param verbose log verbose information about the lookup
-         * @return returns true if file was loaded successfully
-         */
-        bool loadFromFile(const char exename[], const std::string &filename, bool verbose = 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;
-        }
+    /**
+     * load platform file
+     * @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 std::vector<std::string>& paths, const std::string &filename, bool debug = false);
 
-        const char *toString() const {
-            return toString(type);
-        }
 
-        static const char *toString(Type pt) {
-            switch (pt) {
-            case Type::Unspecified:
-                return "unspecified";
-            case Type::Native:
-                return "native";
-            case Type::Win32A:
-                return "win32A";
-            case Type::Win32W:
-                return "win32W";
-            case Type::Win64:
-                return "win64";
-            case Type::Unix32:
-                return "unix32";
-            case Type::Unix64:
-                return "unix64";
-            case Type::File:
-                return "platformFile";
-            default:
-                throw std::runtime_error("unknown platform");
-            }
+    /**
+     * @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;
+    }
+
+    const char *toString() const {
+        return toString(type);
+    }
+
+    static const char *toString(Type pt) {
+        switch (pt) {
+        case Type::Unspecified:
+            return "unspecified";
+        case Type::Native:
+            return "native";
+        case Type::Win32A:
+            return "win32A";
+        case Type::Win32W:
+            return "win32W";
+        case Type::Win64:
+            return "win64";
+        case Type::Unix32:
+            return "unix32";
+        case Type::Unix64:
+            return "unix64";
+        case Type::File:
+            return "platformFile";
+        default:
+            throw std::runtime_error("unknown platform");
         }
+    }
 
-        long long unsignedCharMax() const {
-            return max_value(char_bit + 1);
-        }
+    long long unsignedCharMax() const {
+        return max_value(char_bit + 1);
+    }
 
-        long long signedCharMax() const {
-            return max_value(char_bit);
-        }
+    long long signedCharMax() const {
+        return max_value(char_bit);
+    }
 
-        long long signedCharMin() const {
-            return min_value(char_bit);
-        }
-    };
+    long long signedCharMin() const {
+        return min_value(char_bit);
+    }
 
-}
+    /** provides list of defines specified by the limit.h/climits includes */
+    std::string getLimitsDefines(Standards::cstd_t cstd) const;
+    /** provides list of defines specified by the limit.h/climits includes */
+    std::string getLimitsDefines(Standards::cppstd_t cppstd) const;
+};
 
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/precompiled.h b/lib/precompiled.h
index 872dd00e940..c1e4d0709e3 100644
--- a/lib/precompiled.h
+++ b/lib/precompiled.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index a2058de4bb5..123ef5ca898 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-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
@@ -27,12 +27,16 @@
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <array>
+#include <cassert>
 #include <cstddef>
-#include <iterator> // back_inserter
-#include <sstream> // IWYU pragma: keep
+#include <iterator>
+#include <memory>
+#include <stdexcept>
+#include <sstream>
 #include <utility>
 
 #include <simplecpp.h>
@@ -42,46 +46,40 @@ static bool sameline(const simplecpp::Token *tok1, const simplecpp::Token *tok2)
     return tok1 && tok2 && tok1->location.sameline(tok2->location);
 }
 
-/**
- * Remove heading and trailing whitespaces from the input parameter.
- * If string is all spaces/tabs, return empty string.
- * @param s The string to trim.
- */
-static std::string trim(const std::string& s)
-{
-    const std::string::size_type beg = s.find_first_not_of(" \t");
-    if (beg == std::string::npos)
-        return "";
-    const std::string::size_type end = s.find_last_not_of(" \t");
-    return s.substr(beg, end - beg + 1);
-}
+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, const std::string &_str) :
-    file(std::move(_file)),
-    linenr(_linenr),
-    str(trim(_str))
+Directive::DirectiveToken::DirectiveToken(const simplecpp::Token & _tok) :
+    line(_tok.location.line),
+    column(_tok.location.col),
+    tokStr(_tok.str())
 {}
 
 char Preprocessor::macroChar = char(1);
 
-Preprocessor::Preprocessor(const Settings& settings, ErrorLogger *errorLogger) : mSettings(settings), mErrorLogger(errorLogger)
-{}
-
-Preprocessor::~Preprocessor()
+Preprocessor::Preprocessor(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang)
+    : mTokens(tokens)
+    , mSettings(settings)
+    , mErrorLogger(errorLogger)
+    , mLang(lang)
 {
-    for (const std::pair<const std::string, simplecpp::TokenList*>& tokenList : mTokenLists)
-        delete tokenList.second;
+    assert(mLang != Standards::Language::None);
 }
 
 namespace {
     struct BadInlineSuppression {
-        BadInlineSuppression(const simplecpp::Location &l, std::string msg) : location(l), errmsg(std::move(msg)) {}
-        simplecpp::Location location;
+        BadInlineSuppression(std::string file, const int line, unsigned int col, std::string msg) : file(std::move(file)), line(line), col(col), errmsg(std::move(msg)) {}
+        std::string file;
+        int line; // TODO: needs to be unsigned
+        unsigned int col;
         std::string errmsg;
     };
 }
 
-static bool parseInlineSuppressionCommentToken(const simplecpp::Token *tok, std::list<Suppressions::Suppression> &inlineSuppressions, std::list<BadInlineSuppression> &bad)
+static bool parseInlineSuppressionCommentToken(const simplecpp::TokenList &tokens, const simplecpp::Token *tok, std::list<SuppressionList::Suppression> &inlineSuppressions, std::list<BadInlineSuppression> &bad)
 {
     const std::string cppchecksuppress("cppcheck-suppress");
 
@@ -91,125 +89,265 @@ 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(tokens.file(tok->location), tok->location.line, 0, "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"
-    const std::string::size_type pos2 = comment.find_first_not_of(' ', pos1+cppchecksuppress.size());
-    if (pos2 == std::string::npos)
+    // 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) {
+        bad.emplace_back(tokens.file(tok->location), tok->location.line, 0, "suppression without error ID");
         return false;
+    }
+
+    SuppressionList::Type errorType = SuppressionList::Type::unique;
+
+    // determine prefix if specified
+    if (posEndComment >= (pos1 + cppchecksuppress.size() + 1)) {
+        const std::string suppressCmdString = comment.substr(pos1, pos2-pos1-1);
+        if (comment.at(pos1 + cppchecksuppress.size()) != '-') {
+            bad.emplace_back(tokens.file(tok->location), tok->location.line, 0, "unknown suppression type '" + suppressCmdString + "'"); // TODO: set column
+            return false;
+        }
+
+        const unsigned int argumentLength =
+            posEndComment - (pos1 + cppchecksuppress.size() + 1);
+
+        const std::string suppressTypeString =
+            comment.substr(pos1 + cppchecksuppress.size() + 1, argumentLength);
+
+        if ("file" == suppressTypeString)
+            errorType = SuppressionList::Type::file;
+        else if ("begin" == suppressTypeString)
+            errorType = SuppressionList::Type::blockBegin;
+        else if ("end" == suppressTypeString)
+            errorType = SuppressionList::Type::blockEnd;
+        else if ("macro" == suppressTypeString)
+            errorType = SuppressionList::Type::macro;
+        else {
+            bad.emplace_back(tokens.file(tok->location), tok->location.line, 0, "unknown suppression type '" + suppressCmdString + "'"); // TODO: set column
+            return false;
+        }
+    }
 
     if (comment[pos2] == '[') {
         // multi suppress format
         std::string errmsg;
-        std::vector<Suppressions::Suppression> suppressions = Suppressions::parseMultiSuppressComment(comment, &errmsg);
+        std::vector<SuppressionList::Suppression> suppressions = SuppressionList::parseMultiSuppressComment(comment, &errmsg);
 
+        for (SuppressionList::Suppression &s : suppressions) {
+            s.isInline = true;
+            s.type = errorType;
+            s.lineNumber = tok->location.line;
+        }
+
+        // TODO: return false?
         if (!errmsg.empty())
-            bad.emplace_back(tok->location, std::move(errmsg));
+            bad.emplace_back(tokens.file(tok->location), tok->location.line, tok->location.col, std::move(errmsg));
 
-        std::copy_if(suppressions.cbegin(), suppressions.cend(), std::back_inserter(inlineSuppressions), [](const Suppressions::Suppression& s) {
+        // 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();
         });
     } else {
         //single suppress format
         std::string errmsg;
-        Suppressions::Suppression s;
+        SuppressionList::Suppression s;
         if (!s.parseComment(comment, &errmsg))
             return false;
 
+        s.isInline = true;
+        s.type = errorType;
+        s.lineNumber = tok->location.line;
+
+        // 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, std::move(errmsg));
+            bad.emplace_back(tokens.file(tok->location), tok->location.line, tok->location.col, std::move(errmsg));
     }
 
     return true;
 }
 
-static void addinlineSuppressions(const simplecpp::TokenList &tokens, const Settings &settings, Suppressions &suppressions, std::list<BadInlineSuppression> &bad)
+static std::string getRelativeFilename(const simplecpp::TokenList &tokens, const simplecpp::Token* tok, const Settings &settings) {
+    if (!tok)
+        return "";
+    std::string relativeFilename(tokens.file(tok->location));
+    if (settings.relativePaths) {
+        for (const std::string & basePath : settings.basePaths) {
+            const std::string bp = basePath + "/";
+            if (relativeFilename.compare(0,bp.size(),bp)==0) {
+                relativeFilename = relativeFilename.substr(bp.size());
+            }
+        }
+    }
+    return Path::simplifyPath(std::move(relativeFilename));
+}
+
+static void addInlineSuppressions(const simplecpp::TokenList &tokens, const Settings &settings, SuppressionList &suppressions, std::list<BadInlineSuppression> &bad)
 {
+    std::list<SuppressionList::Suppression> inlineSuppressionsBlockBegin;
+
+    bool onlyComments = true;
+
     for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
-        if (!tok->comment)
+        if (!tok->comment) {
+            onlyComments = false;
             continue;
+        }
 
-        std::list<Suppressions::Suppression> inlineSuppressions;
-        if (!parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad))
+        std::list<SuppressionList::Suppression> inlineSuppressions;
+        if (!parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad))
             continue;
 
         if (!sameline(tok->previous, tok)) {
             // find code after comment..
-            tok = tok->next;
-            while (tok && tok->comment) {
-                parseInlineSuppressionCommentToken(tok, inlineSuppressions, bad);
+            if (tok->next) {
                 tok = tok->next;
+
+                while (tok->comment) {
+                    parseInlineSuppressionCommentToken(tokens, tok, inlineSuppressions, bad);
+                    if (tok->next) {
+                        tok = tok->next;
+                    } else {
+                        break;
+                    }
+                }
             }
-            if (!tok)
-                break;
         }
 
         if (inlineSuppressions.empty())
             continue;
 
+        // It should never happen
+        if (!tok)
+            continue;
+
         // Relative filename
-        std::string relativeFilename(tok->location.file());
-        if (settings.relativePaths) {
-            for (const std::string & basePath : settings.basePaths) {
-                const std::string bp = basePath + "/";
-                if (relativeFilename.compare(0,bp.size(),bp)==0) {
-                    relativeFilename = relativeFilename.substr(bp.size());
-                }
+        const std::string relativeFilename = getRelativeFilename(tokens, tok, settings);
+
+        // Macro name
+        std::string macroName;
+        if (tok->str() == "#" && tok->next && tok->next->str() == "define") {
+            const simplecpp::Token *macroNameTok = tok->next->next;
+            if (sameline(tok, macroNameTok) && macroNameTok->name) {
+                macroName = macroNameTok->str();
             }
         }
-        relativeFilename = Path::simplifyPath(relativeFilename);
-
-        // special handling when suppressing { warnings for backwards compatibility
-        const bool thisAndNextLine = tok->previous &&
-                                     tok->previous->previous &&
-                                     tok->next &&
-                                     !sameline(tok->previous->previous, tok->previous) &&
-                                     tok->location.line + 1 == tok->next->location.line &&
-                                     tok->location.fileIndex == tok->next->location.fileIndex &&
-                                     tok->previous->str() == "{";
 
         // Add the suppressions.
-        for (Suppressions::Suppression &suppr : inlineSuppressions) {
+        for (SuppressionList::Suppression &suppr : inlineSuppressions) {
             suppr.fileName = relativeFilename;
-            suppr.lineNumber = tok->location.line;
-            suppr.thisAndNextLine = thisAndNextLine;
-            suppressions.addSuppression(std::move(suppr));
+
+            if (SuppressionList::Type::blockBegin == suppr.type)
+            {
+                inlineSuppressionsBlockBegin.push_back(std::move(suppr));
+            } else if (SuppressionList::Type::blockEnd == suppr.type) {
+                bool throwError = true;
+
+                if (!inlineSuppressionsBlockBegin.empty()) {
+                    const SuppressionList::Suppression lastBeginSuppression = inlineSuppressionsBlockBegin.back();
+
+                    auto supprBegin = inlineSuppressionsBlockBegin.begin();
+                    while (supprBegin != inlineSuppressionsBlockBegin.end())
+                    {
+                        if (lastBeginSuppression.lineNumber != supprBegin->lineNumber) {
+                            ++supprBegin;
+                            continue;
+                        }
+
+                        if (suppr.symbolName == supprBegin->symbolName && suppr.lineNumber > supprBegin->lineNumber) {
+                            suppr.lineBegin = supprBegin->lineNumber;
+                            suppr.lineEnd = suppr.lineNumber;
+                            suppr.lineNumber = supprBegin->lineNumber;
+                            suppr.type = SuppressionList::Type::block;
+                            inlineSuppressionsBlockBegin.erase(supprBegin);
+                            suppressions.addSuppression(std::move(suppr)); // TODO: check result
+                            throwError = false;
+                            break;
+                        }
+                        ++supprBegin;
+                    }
+                }
+
+                if (throwError) {
+                    // NOLINTNEXTLINE(bugprone-use-after-move) - moved only when thrownError is false
+                    bad.emplace_back(suppr.fileName, suppr.lineNumber, 0, "Suppress End: No matching begin"); // TODO: set column
+                }
+            } else if (SuppressionList::Type::unique == suppr.type || suppr.type == SuppressionList::Type::macro) {
+                // special handling when suppressing { warnings for backwards compatibility
+                const bool thisAndNextLine = tok->previous &&
+                                             tok->previous->previous &&
+                                             tok->next &&
+                                             !sameline(tok->previous->previous, tok->previous) &&
+                                             tok->location.line + 1 == tok->next->location.line &&
+                                             tok->location.fileIndex == tok->next->location.fileIndex &&
+                                             tok->previous->str() == "{";
+
+                suppr.thisAndNextLine = thisAndNextLine;
+                suppr.lineNumber = tok->location.line;
+                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, 0, "File suppression should be at the top of the file"); // TODO: set column
+            }
         }
     }
+
+    for (const SuppressionList::Suppression & suppr: inlineSuppressionsBlockBegin)
+        // cppcheck-suppress useStlAlgorithm
+        bad.emplace_back(suppr.fileName, suppr.lineNumber, 0, "Suppress Begin: No matching end"); // TODO: set column
 }
 
-void Preprocessor::inlineSuppressions(const simplecpp::TokenList &tokens, Suppressions &suppressions)
+void Preprocessor::inlineSuppressions(SuppressionList &suppressions)
 {
     if (!mSettings.inlineSuppressions)
         return;
     std::list<BadInlineSuppression> err;
-    ::addinlineSuppressions(tokens, mSettings, suppressions, err);
-    for (std::map<std::string,simplecpp::TokenList*>::const_iterator it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        if (it->second)
-            ::addinlineSuppressions(*it->second, mSettings, suppressions, err);
+    ::addInlineSuppressions(mTokens, mSettings, suppressions, err);
+    for (const auto &filedata : mFileCache) {
+        ::addInlineSuppressions(filedata->tokens, mSettings, suppressions, err);
     }
     for (const BadInlineSuppression &bad : err) {
-        error(bad.location.file(), bad.location.line, bad.errmsg);
+        invalidSuppression(bad.file, bad.line, bad.col, bad.errmsg); // TODO: column is always 0
     }
 }
 
-void Preprocessor::setDirectives(const simplecpp::TokenList &tokens)
+std::vector<RemarkComment> Preprocessor::getRemarkComments() const
+{
+    std::vector<RemarkComment> ret;
+    addRemarkComments(mTokens, ret);
+    for (const auto &filedata : mFileCache) {
+        addRemarkComments(filedata->tokens, ret);
+    }
+    return ret;
+}
+
+std::list<Directive> Preprocessor::createDirectives() const
 {
     // directive list..
-    mDirectives.clear();
+    std::list<Directive> directives;
 
     std::vector<const simplecpp::TokenList *> list;
-    list.reserve(1U + mTokenLists.size());
-    list.push_back(&tokens);
-    for (std::map<std::string, simplecpp::TokenList *>::const_iterator it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        list.push_back(it->second);
-    }
+    list.reserve(1U + mFileCache.size());
+    list.push_back(&mTokens);
+    std::transform(mFileCache.cbegin(), mFileCache.cend(), std::back_inserter(list),
+                   [](const std::unique_ptr<simplecpp::FileData> &filedata) {
+        return &filedata->tokens;
+    });
 
     for (const simplecpp::TokenList *tokenList : list) {
         for (const simplecpp::Token *tok = tokenList->cfront(); tok; tok = tok->next) {
@@ -217,7 +355,7 @@ void Preprocessor::setDirectives(const simplecpp::TokenList &tokens)
                 continue;
             if (tok->next && tok->next->str() == "endfile")
                 continue;
-            Directive directive(tok->location.file(), tok->location.line, emptyString);
+            Directive directive(mTokens, tok->location, "");
             for (const simplecpp::Token *tok2 = tok; tok2 && tok2->location.line == directive.linenr; tok2 = tok2->next) {
                 if (tok2->comment)
                     continue;
@@ -227,10 +365,14 @@ void Preprocessor::setDirectives(const simplecpp::TokenList &tokens)
                     directive.str += "include";
                 else
                     directive.str += tok2->str();
+
+                directive.strTokens.emplace_back(*tok2);
             }
-            mDirectives.push_back(std::move(directive));
+            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)
@@ -269,11 +411,22 @@ 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();
     }
 
+    if (len == 3 && cond->name && (next1->op == '<' || next1->op == '>') && next2->number) {
+        if (defined.find(cond->str()) == defined.end()) {
+            int v = strToInt<int>(cond->next->next->str());
+            if (next1->op == '<')
+                v -= 1;
+            else
+                v += 1;
+            return cond->str() + '=' + std::to_string(v);
+        }
+    }
+
     std::set<std::string> configset;
     for (; sameline(iftok,cond); cond = cond->next) {
         if (cond->op == '!') {
@@ -360,7 +513,7 @@ static bool isUndefined(const std::string &cfg, const std::set<std::string> &und
 static bool getConfigsElseIsFalse(const std::vector<std::string> &configs_if, const std::string &userDefines)
 {
     return std::any_of(configs_if.cbegin(), configs_if.cend(),
-                       [=](const std::string &cfg) {
+                       [&](const std::string &cfg) {
         return hasDefine(userDefines, cfg);
     });
 }
@@ -370,7 +523,7 @@ static const simplecpp::Token *gotoEndIf(const simplecpp::Token *cmdtok)
     int level = 0;
     while (nullptr != (cmdtok = cmdtok->next)) {
         if (cmdtok->op == '#' && !sameline(cmdtok->previous,cmdtok) && sameline(cmdtok, cmdtok->next)) {
-            if (cmdtok->next->str().compare(0,2,"if")==0)
+            if (startsWith(cmdtok->next->str(),"if"))
                 ++level;
             else if (cmdtok->next->str() == "endif") {
                 --level;
@@ -415,7 +568,7 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 ifndef = true;
             else {
                 const std::array<std::string, 6> match{"if", "!", "defined", "(", config, ")"};
-                int i = 0;
+                std::size_t i = 0;
                 ifndef = true;
                 for (const simplecpp::Token *t = cmdtok; i < match.size(); t = t->next) {
                     if (!t || t->str() != match[i++]) {
@@ -442,7 +595,7 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
             }
 
             configs_if.push_back((cmdtok->str() == "ifndef") ? std::string() : config);
-            configs_ifndef.push_back((cmdtok->str() == "ifndef") ? config : std::string());
+            configs_ifndef.push_back((cmdtok->str() == "ifndef") ? std::move(config) : std::string());
             ret.insert(cfg(configs_if,userDefines));
         } else if (cmdtok->str() == "elif" || cmdtok->str() == "else") {
             if (getConfigsElseIsFalse(configs_if,userDefines)) {
@@ -485,7 +638,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));
@@ -525,57 +678,35 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
 }
 
 
-std::set<std::string> Preprocessor::getConfigs(const simplecpp::TokenList &tokens) const
+std::set<std::string> Preprocessor::getConfigs() const
 {
     std::set<std::string> ret = { "" };
-    if (!tokens.cfront())
+    if (!mTokens.cfront())
         return ret;
 
     std::set<std::string> defined = { "__cplusplus" };
 
-    ::getConfigs(tokens, defined, mSettings.userDefines, mSettings.userUndefs, ret);
+    // Insert library defines
+    for (const auto &define : mSettings.library.defines()) {
 
-    for (std::map<std::string, simplecpp::TokenList*>::const_iterator it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        if (!mSettings.configurationExcluded(it->first))
-            ::getConfigs(*(it->second), defined, mSettings.userDefines, mSettings.userUndefs, ret);
-    }
-
-    return ret;
-}
-
-
-void Preprocessor::preprocess(std::istream &istr, std::map<std::string, std::string> &result, const std::string &filename, const std::list<std::string> &includePaths)
-{
-    (void)includePaths;
-
-    simplecpp::OutputList outputList;
-    std::vector<std::string> files;
-    const simplecpp::TokenList tokens1(istr, files, filename, &outputList);
+        const std::string::size_type paren = define.find("(");
+        const std::string::size_type space = define.find(" ");
+        std::string::size_type end = space;
 
-    const std::set<std::string> configs = getConfigs(tokens1);
+        if (paren != std::string::npos && paren < space)
+            end = paren;
 
-    for (const std::string &c : configs) {
-        if (mSettings.userUndefs.find(c) == mSettings.userUndefs.end()) {
-            result[c] = getcode(tokens1, c, files, false);
-        }
+        defined.insert(define.substr(0, end));
     }
-}
-
-void Preprocessor::preprocess(std::istream &srcCodeStream, std::string &processedFile, std::list<std::string> &resultConfigurations, const std::string &filename, const std::list<std::string> &includePaths)
-{
-    (void)includePaths;
-
-    if (mFile0.empty())
-        mFile0 = filename;
 
-    simplecpp::OutputList outputList;
-    std::vector<std::string> files;
-    const simplecpp::TokenList tokens1(srcCodeStream, files, filename, &outputList);
+    ::getConfigs(mTokens, defined, mSettings.userDefines, mSettings.userUndefs, ret);
 
-    const std::set<std::string> configs = getConfigs(tokens1);
-    std::copy(configs.cbegin(), configs.cend(), std::back_inserter(resultConfigurations));
+    for (const auto &filedata : mFileCache) {
+        if (!mSettings.configurationExcluded(filedata->filename))
+            ::getConfigs(filedata->tokens, defined, mSettings.userDefines, mSettings.userUndefs, ret);
+    }
 
-    processedFile = tokens1.stringify();
+    return ret;
 }
 
 static void splitcfg(const std::string &cfg, std::list<std::string> &defines, const std::string &defaultValue)
@@ -592,15 +723,16 @@ static void splitcfg(const std::string &cfg, std::list<std::string> &defines, co
     }
 }
 
-static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfg, const std::string &filename)
+static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cfg, 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, emptyString);
+        splitcfg(cfg, dui.defines, "");
 
-    for (const std::string &def : mSettings.library.defines) {
+    for (const std::string &def : mSettings.library.defines()) {
         const std::string::size_type pos = def.find_first_of(" (");
         if (pos == std::string::npos) {
             dui.defines.push_back(def);
@@ -618,120 +750,94 @@ 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 (Path::isCPP(filename))
-        dui.std = mSettings.standards.getCPP();
-    else
-        dui.std = mSettings.standards.getC();
+    if (lang == Standards::Language::CPP) {
+        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.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)
-{
-    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:
-        return true;
-    case simplecpp::Output::WARNING:
-    case simplecpp::Output::MISSING_HEADER:
-    case simplecpp::Output::PORTABILITY_BACKSLASH:
-        break;
-    }
-    return false;
-}
-
-bool Preprocessor::hasErrors(const simplecpp::OutputList &outputList)
-{
-    const auto it = std::find_if(outputList.cbegin(), outputList.cend(), [](const simplecpp::Output &output) {
-        return hasErrors(output);
-    });
-    return it != outputList.cend();
-}
-
-void Preprocessor::handleErrors(const simplecpp::OutputList& outputList, bool throwError)
+const simplecpp::Output* Preprocessor::handleErrors(const simplecpp::OutputList& outputList)
 {
     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;
-        }
-    }
+    return reportOutput(outputList, showerror);
 }
 
-bool Preprocessor::loadFiles(const simplecpp::TokenList &rawtokens, std::vector<std::string> &files)
+bool Preprocessor::loadFiles(std::vector<std::string> &files)
 {
-    const simplecpp::DUI dui = createDUI(mSettings, emptyString, files[0]);
+    const simplecpp::DUI dui = createDUI(mSettings, "", mLang);
 
     simplecpp::OutputList outputList;
-    mTokenLists = simplecpp::load(rawtokens, files, dui, &outputList);
-    handleErrors(outputList, false);
-    return !hasErrors(outputList);
+    mFileCache = simplecpp::load(mTokens, files, dui, &outputList);
+    return !handleErrors(outputList);
 }
 
 void Preprocessor::removeComments()
 {
-    for (std::pair<const std::string, simplecpp::TokenList*>& tokenList : mTokenLists) {
-        if (tokenList.second)
-            tokenList.second->removeComments();
+    mTokens.removeComments();
+    for (const auto &filedata : mFileCache) {
+        filedata->tokens.removeComments();
     }
 }
 
-void Preprocessor::setPlatformInfo(simplecpp::TokenList *tokens) const
+void Preprocessor::setPlatformInfo()
 {
-    tokens->sizeOfType["bool"]          = mSettings.platform.sizeof_bool;
-    tokens->sizeOfType["short"]         = mSettings.platform.sizeof_short;
-    tokens->sizeOfType["int"]           = mSettings.platform.sizeof_int;
-    tokens->sizeOfType["long"]          = mSettings.platform.sizeof_long;
-    tokens->sizeOfType["long long"]     = mSettings.platform.sizeof_long_long;
-    tokens->sizeOfType["float"]         = mSettings.platform.sizeof_float;
-    tokens->sizeOfType["double"]        = mSettings.platform.sizeof_double;
-    tokens->sizeOfType["long double"]   = mSettings.platform.sizeof_long_double;
-    tokens->sizeOfType["bool *"]        = mSettings.platform.sizeof_pointer;
-    tokens->sizeOfType["short *"]       = mSettings.platform.sizeof_pointer;
-    tokens->sizeOfType["int *"]         = mSettings.platform.sizeof_pointer;
-    tokens->sizeOfType["long *"]        = mSettings.platform.sizeof_pointer;
-    tokens->sizeOfType["long long *"]   = mSettings.platform.sizeof_pointer;
-    tokens->sizeOfType["float *"]       = mSettings.platform.sizeof_pointer;
-    tokens->sizeOfType["double *"]      = mSettings.platform.sizeof_pointer;
-    tokens->sizeOfType["long double *"] = mSettings.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 &cfg, std::vector<std::string> &files, simplecpp::OutputList& outputList)
 {
-    const simplecpp::DUI dui = createDUI(mSettings, cfg, files[0]);
+    const simplecpp::DUI dui = createDUI(mSettings, cfg, 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);
-    mMacroUsage = macroUsage;
-    mIfCond = ifCond;
-
-    handleErrors(outputList, throwError);
+    simplecpp::preprocess(tokens2, mTokens, files, mFileCache, dui, &outputList, &macroUsage, &ifCond);
+    mMacroUsage = std::move(macroUsage);
+    mIfCond = std::move(ifCond);
 
     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 &cfg, std::vector<std::string> &files, const bool writeLocations)
 {
-    simplecpp::TokenList tokens2 = preprocess(tokens1, cfg, files, false);
+    simplecpp::OutputList outputList;
+    simplecpp::TokenList tokens2 = preprocess(cfg, 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;
         }
@@ -750,37 +856,79 @@ 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:
-            if (out.msg.compare(0,6,"#error")!=0 || showerror)
-                error(out.location.file(), out.location.line, out.msg);
+            out_ret = &out;
+            if (!startsWith(out.msg,"#error") || showerror)
+                error(mTokens.file(out.location), out.location.line, out.location.col, out.msg, out.type);
             break;
         case simplecpp::Output::WARNING:
         case simplecpp::Output::PORTABILITY_BACKSLASH:
             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(mTokens.file(out.location), out.location.line, out.location.col, out.msg.substr(pos1+1, pos2-pos1-1), out.msg[pos1] == '\"' ? UserHeader : SystemHeader);
         }
         break;
         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(mTokens.file(out.location), out.location.line, out.location.col, out.msg, out.type);
             break;
         case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
-            error(emptyString, 0, out.msg);
+        case simplecpp::Output::FILE_NOT_FOUND:
+        case simplecpp::Output::DUI_ERROR:
+            out_ret = &out;
+            error("", 0, 0, 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:
+        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";
+    // should never occur
+    case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
+    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:
+        throw std::runtime_error("unexpected simplecpp::Output type " + std::to_string(type));
+    }
+
+    cppcheck::unreachable();
+}
+
+void Preprocessor::error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, simplecpp::Output::Type type)
+{
+    error(filename, linenr, col, msg, simplecppErrToId(type));
 }
 
-void Preprocessor::error(const std::string &filename, unsigned int linenr, const std::string &msg)
+void Preprocessor::error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, const std::string& id)
 {
     std::list<ErrorMessage::FileLocation> locationList;
     if (!filename.empty()) {
@@ -788,26 +936,26 @@ void Preprocessor::error(const std::string &filename, unsigned int linenr, const
         if (mSettings.relativePaths)
             file = Path::getRelativePath(file, mSettings.basePaths);
 
-        ErrorMessage::FileLocation loc(file, linenr, 0);
-        locationList.push_back(std::move(loc));
+        locationList.emplace_back(file, linenr, col);
     }
-    mErrorLogger->reportErr(ErrorMessage(locationList,
-                                         mFile0,
-                                         Severity::error,
-                                         msg,
-                                         "preprocessorErrorDirective",
-                                         Certainty::normal));
+    mErrorLogger.reportErr(ErrorMessage(std::move(locationList),
+                                        mFile0,
+                                        Severity::error,
+                                        msg,
+                                        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 std::string &filename, unsigned int linenr, unsigned int col, const std::string &header, HeaderTypes headerType)
 {
-    if (!mSettings.checks.isEnabled(Checks::missingInclude) || !mErrorLogger)
+    if (!mSettings.checks.isEnabled(Checks::missingInclude))
         return;
 
     std::list<ErrorMessage::FileLocation> locationList;
     if (!filename.empty()) {
-        locationList.emplace_back(filename, linenr);
+        // TODO: add relative path handling?
+        locationList.emplace_back(filename, linenr, col);
     }
     ErrorMessage errmsg(std::move(locationList), mFile0, Severity::information,
                         (headerType==SystemHeader) ?
@@ -815,45 +963,45 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line
                         "Include file: \"" + header + "\" not found.",
                         (headerType==SystemHeader) ? "missingIncludeSystem" : "missingInclude",
                         Certainty::normal);
-    mErrorLogger->reportErr(errmsg);
+    mErrorLogger.reportErr(errmsg);
 }
 
-void Preprocessor::getErrorMessages(ErrorLogger *errorLogger, const Settings *settings)
+void Preprocessor::invalidSuppression(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg)
 {
-    Settings settings2(*settings);
-    Preprocessor preprocessor(settings2, errorLogger);
-    preprocessor.missingInclude(emptyString, 1, emptyString, UserHeader);
-    preprocessor.missingInclude(emptyString, 1, emptyString, SystemHeader);
-    preprocessor.error(emptyString, 1, "#error message");   // #error ..
+    error(filename, linenr, col, msg, "invalidSuppression");
+}
+
+void Preprocessor::getErrorMessages(ErrorLogger &errorLogger, const Settings &settings)
+{
+    std::vector<std::string> files;
+    simplecpp::TokenList tokens(files);
+    Preprocessor preprocessor(tokens, settings, errorLogger, Standards::Language::CPP);
+    preprocessor.missingInclude("", 1, 2, "", UserHeader);
+    preprocessor.missingInclude("", 1, 2, "", SystemHeader);
+    preprocessor.error("", 1, 2, "message", simplecpp::Output::ERROR);
+    preprocessor.error("", 1, 2, "message", simplecpp::Output::SYNTAX_ERROR);
+    preprocessor.error("", 1, 2, "message", simplecpp::Output::UNHANDLED_CHAR_ERROR);
+    preprocessor.error("", 1, 2, "message", simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY);
+    preprocessor.error("", 1, 2, "message", simplecpp::Output::FILE_NOT_FOUND);
+    preprocessor.invalidSuppression("", 1, 2, "message");
 }
 
 void Preprocessor::dump(std::ostream &out) const
 {
     // Create a xml dump.
 
-    out << "  <directivelist>" << std::endl;
-    for (const Directive &dir : mDirectives) {
-        out << "    <directive "
-            << "file=\"" << ErrorLogger::toxml(dir.file) << "\" "
-            << "linenr=\"" << dir.linenr << "\" "
-            // str might contain characters such as '"', '<' or '>' which
-            // could result in invalid XML, so run it through toxml().
-            << "str=\"" << ErrorLogger::toxml(dir.str) << "\"/>" << std::endl;
-    }
-    out << "  </directivelist>" << std::endl;
-
     if (!mMacroUsage.empty()) {
         out << "  <macro-usage>" << std::endl;
         for (const simplecpp::MacroUsage &macroUsage: mMacroUsage) {
             out << "    <macro"
                 << " name=\"" << macroUsage.macroName << "\""
-                << " file=\"" << ErrorLogger::toxml(macroUsage.macroLocation.file()) << "\""
+                << " file=\"" << ErrorLogger::toxml(mTokens.file(macroUsage.macroLocation)) << "\""
                 << " line=\"" << macroUsage.macroLocation.line << "\""
                 << " column=\"" << macroUsage.macroLocation.col << "\""
-                << " usefile=\"" << ErrorLogger::toxml(macroUsage.useLocation.file()) << "\""
+                << " usefile=\"" << ErrorLogger::toxml(mTokens.file(macroUsage.useLocation)) << "\""
                 << " useline=\"" << macroUsage.useLocation.line << "\""
                 << " usecolumn=\"" << macroUsage.useLocation.col << "\""
-                << " is-known-value=\"" << (macroUsage.macroValueKnown ? "true" : "false") << "\""
+                << " is-known-value=\"" << bool_to_string(macroUsage.macroValueKnown) << "\""
                 << "/>" << std::endl;
         }
         out << "  </macro-usage>" << std::endl;
@@ -863,7 +1011,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(mTokens.file(ifCond.location)) << "\""
                 << " line=\"" << ifCond.location.line << "\""
                 << " column=\"" << ifCond.location.col << "\""
                 << " E=\"" << ErrorLogger::toxml(ifCond.E) << "\""
@@ -874,34 +1022,40 @@ 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) {
-        if (!tok->comment)
+    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 (std::map<std::string, simplecpp::TokenList *>::const_iterator it = mTokenLists.cbegin(); it != mTokenLists.cend(); ++it) {
-        for (const simplecpp::Token *tok = it->second->cfront(); tok; tok = tok->next) {
-            if (!tok->comment)
+    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);
+                hashData += static_cast<char>(tok->location.col);
+            }
         }
     }
     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);
+    Preprocessor::simplifyPragmaAsmPrivate(mTokens);
+    for (const auto &filedata : mFileCache) {
+        Preprocessor::simplifyPragmaAsmPrivate(filedata->tokens);
     }
 }
 
-void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList *tokenList)
+void Preprocessor::simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList)
 {
     // assembler code..
-    for (simplecpp::Token *tok = tokenList->front(); tok; tok = tok->next) {
+    for (simplecpp::Token *tok = tokenList.front(); tok; tok = tok->next) {
         if (tok->op != '#')
             continue;
         if (sameline(tok, tok->previousSkipComments()))
@@ -916,6 +1070,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;
@@ -927,15 +1082,70 @@ 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("(");
         const_cast<simplecpp::Token *>(tok3)->setstr(")");
         const_cast<simplecpp::Token *>(tok4)->setstr(";");
         while (tok4->next != endasm)
-            tokenList->deleteToken(tok4->next);
+            tokenList.deleteToken(tok4->next);
+    }
+}
+
+
+void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const
+{
+    for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
+        if (!tok->comment)
+            continue;
+
+        const std::string& comment = tok->str();
+
+        // is it a remark comment?
+        const std::string::size_type pos1 = comment.find_first_not_of("/* \t");
+        if (pos1 == std::string::npos)
+            continue;
+        const std::string::size_type pos2 = comment.find_first_of(": \t", pos1);
+        if (pos2 != pos1 + 6 || comment.compare(pos1, 6, "REMARK") != 0)
+            continue;
+        const std::string::size_type pos3 = comment.find_first_not_of(": \t", pos2);
+        if (pos3 == std::string::npos)
+            continue;
+        if (comment.compare(0,2,"/*") == 0 && pos3 + 2 >= tok->str().size())
+            continue;
+
+        const std::string::size_type pos4 = (comment.compare(0,2,"/*") == 0) ? comment.size()-2 : comment.size();
+        const std::string remarkText = comment.substr(pos3, pos4-pos3);
+
+        // Get remarked token
+        const simplecpp::Token* remarkedToken = nullptr;
+        for (const simplecpp::Token* after = tok->next; after; after = after->next) {
+            if (after->comment)
+                continue;
+            remarkedToken = after;
+            break;
+        }
+        for (const simplecpp::Token* prev = tok->previous; prev; prev = prev->previous) {
+            if (prev->comment)
+                continue;
+            if (sameline(prev, tok))
+                remarkedToken = prev;
+            break;
+        }
+        if (!remarkedToken)
+            continue;
+
+        // Relative filename
+        const std::string relativeFilename = getRelativeFilename(tokens, remarkedToken, mSettings);
+
+        // Add the suppressions.
+        remarkComments.emplace_back(relativeFilename, remarkedToken->location.line, remarkText);
     }
 }
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
index fdc63ed72b0..f8f213b13df 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-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
@@ -22,32 +22,33 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "standards.h"
 
 #include <cstddef>
+#include <cstdint>
 #include <istream>
 #include <list>
-#include <map>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <simplecpp.h>
 
 class ErrorLogger;
 class Settings;
-class Suppressions;
+class SuppressionList;
 
 /**
  * @brief A preprocessor directive
  * Each preprocessor directive (\#include, \#define, \#undef, \#if, \#ifdef, \#else, \#endif)
  * will be recorded as an instance of this class.
  *
- * file and linenr denote the location where where the directive is defined.
+ * file and linenr denote the location where the directive is defined.
  *
  */
 
-class CPPCHECKLIB Directive {
-public:
+struct CPPCHECKLIB Directive {
     /** name of (possibly included) file where directive is defined */
     std::string file;
 
@@ -57,8 +58,35 @@ class CPPCHECKLIB Directive {
     /** the actual directive text */
     std::string str;
 
+    struct DirectiveToken {
+        explicit DirectiveToken(const simplecpp::Token & _tok);
+        int line;
+        int column;
+        std::string tokStr;
+    };
+
+    std::vector<DirectiveToken> strTokens;
+
     /** record a directive (possibly filtering src) */
-    Directive(std::string _file, const int _linenr, const std::string &_str);
+    Directive(const simplecpp::TokenList &tokens, const simplecpp::Location & _loc, std::string _str);
+};
+
+class CPPCHECKLIB RemarkComment {
+public:
+    RemarkComment(std::string file, unsigned int lineNumber, std::string str)
+        : file(std::move(file))
+        , lineNumber(lineNumber)
+        , str(std::move(str))
+    {}
+
+    /** name of file */
+    std::string file;
+
+    /** line number for the code that the remark comment is about */
+    unsigned int lineNumber;
+
+    /** remark text */
+    std::string str;
 };
 
 /// @addtogroup Core
@@ -69,130 +97,83 @@ class CPPCHECKLIB Directive {
  * The preprocessor has special functionality for extracting the various ifdef
  * configurations that exist in a source file.
  */
-class CPPCHECKLIB Preprocessor {
-    // TODO: get rid of this
-    friend class PreprocessorHelper;
-    friend class TestPreprocessor;
-
+class CPPCHECKLIB WARN_UNUSED Preprocessor {
 public:
-
-    /**
-     * Include file types.
-     */
-    enum HeaderTypes {
-        UserHeader = 1,
-        SystemHeader
-    };
-
     /** character that is inserted in expanded macros */
     static char macroChar;
 
-    explicit Preprocessor(const Settings& settings, ErrorLogger *errorLogger = nullptr);
-    virtual ~Preprocessor();
+    Preprocessor(simplecpp::TokenList& tokens, const Settings& settings, ErrorLogger &errorLogger, Standards::Language lang);
 
-    void inlineSuppressions(const simplecpp::TokenList &tokens, Suppressions &suppressions);
+    void inlineSuppressions(SuppressionList &suppressions);
 
-    void setDirectives(const simplecpp::TokenList &tokens);
-    void setDirectives(const std::list<Directive> &directives) {
-        mDirectives = directives;
-    }
-
-    /** list of all directives met while preprocessing file */
-    const std::list<Directive> &getDirectives() const {
-        return mDirectives;
-    }
+    std::list<Directive> createDirectives() const;
 
-    std::set<std::string> getConfigs(const simplecpp::TokenList &tokens) const;
+    std::set<std::string> getConfigs() const;
 
-    void handleErrors(const simplecpp::OutputList &outputList, bool throwError);
+    std::vector<RemarkComment> getRemarkComments() const;
 
-    bool loadFiles(const simplecpp::TokenList &rawtokens, std::vector<std::string> &files);
+    bool loadFiles(std::vector<std::string> &files);
 
     void removeComments();
 
-    void setPlatformInfo(simplecpp::TokenList *tokens) const;
+    void setPlatformInfo();
 
-    /**
-     * Extract the code for each configuration
-     * @param istr The (file/string) stream to read from.
-     * @param result The map that will get the results
-     * @param filename The name of the file to check e.g. "src/main.cpp"
-     * @param includePaths List of paths where include files should be searched from,
-     * single path can be e.g. in format "include/".
-     * There must be a path separator at the end. Default parameter is empty list.
-     * Note that if path from given filename is also extracted and that is used as
-     * a last include path if include file was not found from earlier paths.
-     */
-    void preprocess(std::istream &istr, std::map<std::string, std::string> &result, const std::string &filename, const std::list<std::string> &includePaths = std::list<std::string>());
-
-    /**
-     * Extract the code for each configuration. Use this with getcode() to get the
-     * file data for each individual configuration.
-     *
-     * @param srcCodeStream The (file/string) stream to read from.
-     * @param processedFile Give reference to empty string as a parameter,
-     * function will fill processed file here. Use this also as a filedata parameter
-     * to getcode() if you received more than once configurations.
-     * @param resultConfigurations List of configurations. Pass these one by one
-     * to getcode() with processedFile.
-     * @param filename The name of the file to check e.g. "src/main.cpp"
-     * @param includePaths List of paths where include files should be searched from,
-     * single path can be e.g. in format "include/".
-     * There must be a path separator at the end. Default parameter is empty list.
-     * Note that if path from given filename is also extracted and that is used as
-     * a last include path if include file was not found from earlier paths.
-     */
-    void preprocess(std::istream &srcCodeStream, std::string &processedFile, std::list<std::string> &resultConfigurations, const std::string &filename, const std::list<std::string> &includePaths);
+    simplecpp::TokenList preprocess(const std::string &cfg, std::vector<std::string> &files, simplecpp::OutputList& outputList);
 
-    simplecpp::TokenList preprocess(const simplecpp::TokenList &tokens1, const std::string &cfg, std::vector<std::string> &files, bool throwError = false);
-
-    std::string getcode(const simplecpp::TokenList &tokens1, const std::string &cfg, std::vector<std::string> &files, const bool writeLocations);
+    std::string getcode(const std::string &cfg, 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;
-
-    void simplifyPragmaAsm(simplecpp::TokenList *tokenList) const;
-
-private:
-
-    static void simplifyPragmaAsmPrivate(simplecpp::TokenList *tokenList);
+    std::size_t calculateHash(const std::string &toolinfo) const;
 
-public:
+    void simplifyPragmaAsm();
 
-
-    static void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings);
+    static void getErrorMessages(ErrorLogger &errorLogger, const Settings &settings);
 
     /**
      * dump all directives present in source file
      */
     void dump(std::ostream &out) const;
 
-    void reportOutput(const simplecpp::OutputList &outputList, bool showerror);
+    const simplecpp::Output* reportOutput(const simplecpp::OutputList &outputList, bool showerror);
+
+    void error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, simplecpp::Output::Type type);
 
-    static bool hasErrors(const simplecpp::Output &output);
+    const simplecpp::Output* handleErrors(const simplecpp::OutputList &outputList);
 
 private:
-    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 void simplifyPragmaAsmPrivate(simplecpp::TokenList &tokenList);
+
+    /**
+     * Include file types.
+     */
+    enum HeaderTypes : std::uint8_t {
+        UserHeader = 1,
+        SystemHeader
+    };
+
+    void missingInclude(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &header, HeaderTypes headerType);
+    void invalidSuppression(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg);
+    void error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, const std::string& id);
+
+    void addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const;
 
-    static bool hasErrors(const simplecpp::OutputList &outputList);
+    simplecpp::TokenList& mTokens;
 
     const Settings& mSettings;
-    ErrorLogger *mErrorLogger;
+    ErrorLogger &mErrorLogger;
 
     /** list of all directives met while preprocessing file */
-    std::list<Directive> mDirectives;
 
-    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 */
     std::list<simplecpp::MacroUsage> mMacroUsage;
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
index a6db19e6431..750fd6653e0 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-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
@@ -24,8 +24,10 @@
 #include "library.h"
 #include "mathlib.h"
 #include "settings.h"
+#include "standards.h"
 #include "symboldatabase.h"
 #include "token.h"
+#include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 #include "valueptr.h"
@@ -34,14 +36,26 @@
 #include <cassert>
 #include <cmath>
 #include <functional>
+#include <iterator>
 #include <list>
 #include <memory>
+#include <stack>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
 
+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
@@ -50,32 +64,38 @@ std::size_t ExprIdToken::Hash::operator()(ExprIdToken etok) const
 }
 
 void ProgramMemory::setValue(const Token* expr, const ValueFlow::Value& value) {
-    mValues[expr] = value;
+    if (!expr)
+        return;
+
+    copyOnWrite();
+
     ValueFlow::Value subvalue = value;
     const Token* subexpr = solveExprValue(
         expr,
         [&](const Token* tok) -> std::vector<MathLib::bigint> {
-        if (tok->hasKnownIntValue())
-            return {tok->values().front().intvalue};
+        if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT))
+            return {v->intvalue};
         MathLib::bigint result = 0;
         if (getIntValue(tok->exprId(), result))
             return {result};
         return {};
     },
         subvalue);
+    if (expr != subexpr)
+        (*mValues)[expr] = value;
     if (subexpr)
-        mValues[subexpr] = subvalue;
+        (*mValues)[subexpr] = std::move(subvalue);
 }
+
 const ValueFlow::Value* ProgramMemory::getValue(nonneg int exprid, bool impossible) const
 {
-    const ProgramMemory::Map::const_iterator it = mValues.find(exprid);
-    const bool found = it != mValues.cend() && (impossible || !it->second.isImpossible());
+    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);
@@ -94,11 +114,11 @@ void ProgramMemory::setIntValue(const Token* expr, MathLib::bigint value, bool i
     setValue(expr, v);
 }
 
-bool ProgramMemory::getTokValue(nonneg int exprid, const Token** result) const
+bool ProgramMemory::getTokValue(nonneg int exprid, const Token*& result) const
 {
     const ValueFlow::Value* value = getValue(exprid);
     if (value && value->isTokValue()) {
-        *result = value->tokvalue;
+        result = value->tokvalue;
         return true;
     }
     return false;
@@ -140,87 +160,128 @@ void ProgramMemory::setContainerSizeValue(const Token* expr, MathLib::bigint val
 }
 
 void ProgramMemory::setUnknown(const Token* expr) {
-    mValues[expr].valueType = ValueFlow::Value::ValueType::UNINIT;
+    copyOnWrite();
+
+    (*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) {
-    return mValues.at(exprid);
+    copyOnWrite();
+
+    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)
 {
-    for (auto it = mValues.begin(); it != mValues.end();) {
+    if (mValues->empty())
+        return;
+
+    // TODO: how to delay until we actuallly modify?
+    copyOnWrite();
+
+    for (auto it = mValues->begin(); it != mValues->end();) {
         if (pred(it->first))
-            it = mValues.erase(it);
+            it = mValues->erase(it);
         else
             ++it;
     }
 }
 
-void ProgramMemory::swap(ProgramMemory &pm)
+void ProgramMemory::swap(ProgramMemory &pm) NOEXCEPT
 {
     mValues.swap(pm.mValues);
 }
 
 void ProgramMemory::clear()
 {
-    mValues.clear();
+    if (mValues->empty())
+        return;
+
+    copyOnWrite();
+
+    mValues->clear();
 }
 
 bool ProgramMemory::empty() const
 {
-    return mValues.empty();
+    return mValues->empty();
 }
 
-void ProgramMemory::replace(const ProgramMemory &pm)
+// NOLINTNEXTLINE(performance-unnecessary-value-param) - technically correct but we are moving the given values
+void ProgramMemory::replace(ProgramMemory pm, bool skipUnknown)
 {
-    for (auto&& p : pm.mValues) {
-        mValues[p.first] = p.second;
+    if (pm.empty())
+        return;
+
+    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);
     }
 }
 
-void ProgramMemory::insert(const ProgramMemory &pm)
+void ProgramMemory::copyOnWrite()
+{
+    if (mValues.use_count() == 1)
+        return;
+
+    mValues = std::make_shared<Map>(*mValues);
+}
+
+ProgramMemory::Map::const_iterator ProgramMemory::find(nonneg int exprid) const
+{
+    const auto& cvalues = utils::as_const(*mValues);
+    return cvalues.find(ExprIdToken::create(exprid));
+}
+
+ProgramMemory::Map::iterator ProgramMemory::find(nonneg int exprid)
 {
-    for (auto&& p : pm)
-        mValues.insert(p);
+    return mValues->find(ExprIdToken::create(exprid));
 }
 
-static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings* settings = nullptr);
+static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings& settings);
 
-static bool evaluateCondition(const std::string& op,
-                              MathLib::bigint r,
-                              const Token* condition,
-                              ProgramMemory& pm,
-                              const Settings* settings)
+static bool evaluateCondition(MathLib::bigint r, const Token* condition, ProgramMemory& pm, const Settings& settings)
 {
     if (!condition)
         return false;
-    if (condition->str() == op) {
-        return evaluateCondition(op, r, condition->astOperand1(), pm, settings) ||
-               evaluateCondition(op, r, condition->astOperand2(), pm, settings);
-    }
     MathLib::bigint result = 0;
     bool error = false;
     execute(condition, pm, &result, &error, settings);
     return !error && result == r;
 }
 
-bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings* settings)
+bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings)
 {
-    return evaluateCondition("&&", 0, condition, pm, settings);
+    return evaluateCondition(0, condition, pm, settings);
 }
 
-bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings* settings)
+bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings)
 {
-    return evaluateCondition("||", 1, condition, pm, settings);
+    return evaluateCondition(1, condition, pm, settings);
 }
 
 static bool frontIs(const std::vector<MathLib::bigint>& v, bool i)
@@ -234,6 +295,8 @@ static bool frontIs(const std::vector<MathLib::bigint>& v, bool i)
 
 static bool isTrue(const ValueFlow::Value& v)
 {
+    if (v.isUninitValue())
+        return false;
     if (v.isImpossible())
         return v.intvalue == 0;
     return v.intvalue != 0;
@@ -241,11 +304,20 @@ static bool isTrue(const ValueFlow::Value& v)
 
 static bool isFalse(const ValueFlow::Value& v)
 {
+    if (v.isUninitValue())
+        return false;
     if (v.isImpossible())
         return false;
     return v.intvalue == 0;
 }
 
+static bool isTrueOrFalse(const ValueFlow::Value& v, bool b)
+{
+    if (b)
+        return isTrue(v);
+    return isFalse(v);
+}
+
 // If the scope is a non-range for loop
 static bool isBasicForLoop(const Token* tok)
 {
@@ -265,14 +337,16 @@ static bool isBasicForLoop(const Token* tok)
     return true;
 }
 
-void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, const Token* endTok, const Settings* settings, bool then)
+static void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, const Token* endTok, const Settings& settings, bool then)
 {
     auto eval = [&](const Token* t) -> std::vector<MathLib::bigint> {
-        if (t->hasKnownIntValue())
-            return {t->values().front().intvalue};
+        if (!t)
+            return std::vector<MathLib::bigint>{};
+        if (const ValueFlow::Value* v = t->getKnownValue(ValueFlow::Value::ValueType::INT))
+            return {v->intvalue};
         MathLib::bigint result = 0;
         bool error = false;
-        execute(t, pm, &result, &error);
+        execute(t, pm, &result, &error, settings);
         if (!error)
             return {result};
         return std::vector<MathLib::bigint>{};
@@ -287,12 +361,12 @@ void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, const Toke
             return;
         if (!truevalue.isIntValue())
             return;
-        if (endTok && isExpressionChanged(vartok, tok->next(), endTok, settings, true))
+        if (endTok && findExpressionChanged(vartok, tok->next(), endTok, settings))
             return;
         const bool impossible = (tok->str() == "==" && !then) || (tok->str() == "!=" && then);
         const ValueFlow::Value& v = then ? truevalue : falsevalue;
         pm.setValue(vartok, impossible ? asImpossible(v) : v);
-        const Token* containerTok = settings->library.getContainerFromYield(vartok, Library::Container::Yield::SIZE);
+        const Token* containerTok = settings.library.getContainerFromYield(vartok, Library::Container::Yield::SIZE);
         if (containerTok)
             pm.setContainerSizeValue(containerTok, v.intvalue, !impossible);
     } else if (Token::simpleMatch(tok, "!")) {
@@ -309,20 +383,22 @@ void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, const Toke
         if (lhs.empty() || rhs.empty()) {
             if (frontIs(lhs, !then))
                 programMemoryParseCondition(pm, tok->astOperand2(), endTok, settings, then);
-            if (frontIs(rhs, !then))
+            else if (frontIs(rhs, !then))
                 programMemoryParseCondition(pm, tok->astOperand1(), endTok, settings, then);
+            else
+                pm.setIntValue(tok, 0, then);
         }
-    } else if (tok->exprId() > 0) {
-        if (endTok && isExpressionChanged(tok, tok->next(), endTok, settings, true))
+    } else if (tok && tok->exprId() > 0) {
+        if (endTok && findExpressionChanged(tok, tok->next(), endTok, settings))
             return;
         pm.setIntValue(tok, 0, then);
-        const Token* containerTok = settings->library.getContainerFromYield(tok, Library::Container::Yield::EMPTY);
+        const Token* containerTok = settings.library.getContainerFromYield(tok, Library::Container::Yield::EMPTY);
         if (containerTok)
             pm.setContainerSizeValue(containerTok, 0, then);
     }
 }
 
-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)
 {
     if (!scope)
         return;
@@ -330,24 +406,24 @@ static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Scope* scop
         return;
     assert(scope != scope->nestedIn);
     fillProgramMemoryFromConditions(pm, scope->nestedIn, endTok, settings);
-    if (scope->type == Scope::eIf || scope->type == Scope::eWhile || scope->type == Scope::eElse || scope->type == Scope::eFor) {
+    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)
             return;
         MathLib::bigint result = 0;
         bool error = false;
-        execute(condTok, pm, &result, &error);
+        execute(condTok, pm, &result, &error, settings);
         if (error)
-            programMemoryParseCondition(pm, condTok, endTok, settings, scope->type != Scope::eElse);
+            programMemoryParseCondition(pm, condTok, endTok, settings, scope->type != ScopeType::eElse);
     }
 }
 
-static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Token* tok, const Settings* settings)
+static void fillProgramMemoryFromConditions(ProgramMemory& pm, const Token* tok, const Settings& settings)
 {
     fillProgramMemoryFromConditions(pm, tok->scope(), tok, settings);
 }
 
-static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok, const Settings* settings, const ProgramMemory& state, const ProgramMemory::Map& vars)
+static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok, const Settings& settings, const ProgramMemory& state, const ProgramMemory::Map& vars)
 {
     int indentlevel = 0;
     for (const Token *tok2 = tok; tok2; tok2 = tok2->previous()) {
@@ -356,7 +432,7 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
             bool setvar = false;
             const Token* vartok = tok2->astOperand1();
             for (const auto& p:vars) {
-                if (p.first != vartok->exprId())
+                if (p.first.getExpressionId() != vartok->exprId())
                     continue;
                 if (vartok == tok)
                     continue;
@@ -366,11 +442,22 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
             if (!setvar) {
                 if (!pm.hasValue(vartok->exprId())) {
                     const Token* valuetok = tok2->astOperand2();
-                    pm.setValue(vartok, execute(valuetok, pm));
+                    ProgramMemory local = state;
+                    pm.setValue(vartok, execute(valuetok, local, 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, true)) {
+                   isVariableChanged(tok2, 0, settings)) {
             pm.setUnknown(tok2);
         }
 
@@ -378,7 +465,7 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
             if (indentlevel <= 0) {
                 const Token* cond = getCondTokFromEnd(tok2->link());
                 // Keep progressing with anonymous/do scopes and always true branches
-                if (!Token::Match(tok2->previous(), "do|; {") && !conditionIsTrue(cond, state) &&
+                if (!Token::Match(tok2->previous(), "do|; {") && !conditionIsTrue(cond, state, settings) &&
                     (cond || !isBasicForLoop(tok2)))
                     break;
             } else
@@ -386,16 +473,16 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
             if (Token::simpleMatch(tok2->previous(), "else {"))
                 tok2 = tok2->linkAt(-2)->previous();
         }
-        if (tok2->str() == "}") {
+        if (tok2->str() == "}" && !Token::Match(tok2->link()->previous(), "%var% {")) {
             const Token *cond = getCondTokFromEnd(tok2);
             const bool inElse = Token::simpleMatch(tok2->link()->previous(), "else {");
             if (cond) {
-                if (conditionIsFalse(cond, state)) {
+                if (conditionIsFalse(cond, state, settings)) {
                     if (inElse) {
                         ++indentlevel;
                         continue;
                     }
-                } else if (conditionIsTrue(cond, state)) {
+                } else if (conditionIsTrue(cond, state, settings)) {
                     if (inElse)
                         tok2 = tok2->link()->tokAt(-2);
                     ++indentlevel;
@@ -407,44 +494,37 @@ static void fillProgramMemoryFromAssignments(ProgramMemory& pm, const Token* tok
     }
 }
 
-static void removeModifiedVars(ProgramMemory& pm, const Token* tok, const Token* origin)
+static void removeModifiedVars(ProgramMemory& pm, const Token* tok, const Token* origin, const Settings& settings)
 {
     pm.erase_if([&](const ExprIdToken& e) {
-        return isVariableChanged(origin, tok, e.getExpressionId(), false, nullptr, true);
+        return isVariableChanged(origin, tok, e.getExpressionId(), false, settings);
     });
 }
 
 static ProgramMemory getInitialProgramState(const Token* tok,
                                             const Token* origin,
-                                            const Settings* settings,
+                                            const Settings& settings,
                                             const ProgramMemory::Map& vars = ProgramMemory::Map {})
 {
     ProgramMemory pm;
     if (origin) {
-        fillProgramMemoryFromConditions(pm, origin, nullptr);
+        fillProgramMemoryFromConditions(pm, origin, settings);
         const ProgramMemory state = pm;
         fillProgramMemoryFromAssignments(pm, tok, settings, state, vars);
-        removeModifiedVars(pm, tok, origin);
+        removeModifiedVars(pm, tok, origin, settings);
     }
     return pm;
 }
 
-ProgramMemoryState::ProgramMemoryState(const Settings* s) : state(), origins(), settings(s) {}
-
-void ProgramMemoryState::insert(const ProgramMemory &pm, const Token* origin)
-{
-    if (origin)
-        for (auto&& p : pm)
-            origins.insert(std::make_pair(p.first.getExpressionId(), origin));
-    state.insert(pm);
-}
+ProgramMemoryState::ProgramMemoryState(const Settings& s) : settings(s)
+{}
 
-void ProgramMemoryState::replace(const ProgramMemory &pm, const Token* origin)
+void ProgramMemoryState::replace(ProgramMemory pm, const Token* origin)
 {
     if (origin)
-        for (auto&& p : pm)
+        for (const auto& p : pm)
             origins[p.first.getExpressionId()] = origin;
-    state.replace(pm);
+    state.replace(std::move(pm), /*skipUnknown*/ true);
 }
 
 static void addVars(ProgramMemory& pm, const ProgramMemory::Map& vars)
@@ -457,13 +537,14 @@ 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);
+    ProgramMemory pm;
     fillProgramMemoryFromAssignments(pm, tok, settings, local, vars);
-    addVars(pm, vars);
-    replace(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)
@@ -475,21 +556,31 @@ void ProgramMemoryState::assume(const Token* tok, bool b, bool isEmpty)
         programMemoryParseCondition(pm, tok, nullptr, settings, b);
     const Token* origin = tok;
     const Token* top = tok->astTop();
-    if (top && Token::Match(top->previous(), "for|while|if (") && !Token::simpleMatch(tok->astParent(), "?")) {
+    if (Token::Match(top->previous(), "for|while|if (") && !Token::simpleMatch(tok->astParent(), "?")) {
         origin = top->link()->next();
         if (!b && origin->link()) {
             origin = origin->link();
         }
     }
-    replace(pm, origin);
+    replace(std::move(pm), origin);
 }
 
 void ProgramMemoryState::removeModifiedVars(const Token* tok)
 {
+    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 {};
+    };
     state.erase_if([&](const ExprIdToken& e) {
         const Token* start = origins[e.getExpressionId()];
         const Token* expr = e.tok;
-        if (!expr || isExpressionChanged(expr, start, tok, settings, true)) {
+        if (!expr || findExpressionChangedSkipDeadCode(expr, start, tok, settings, eval)) {
             origins.erase(e.getExpressionId());
             return true;
         }
@@ -515,7 +606,7 @@ ProgramMemory ProgramMemoryState::get(const Token* tok, const Token* ctx, const
     return local.state;
 }
 
-ProgramMemory getProgramMemory(const Token* tok, const Token* expr, const ValueFlow::Value& value, const Settings* settings)
+ProgramMemory getProgramMemory(const Token* tok, const Token* expr, const ValueFlow::Value& value, const Settings& settings)
 {
     ProgramMemory programMemory;
     programMemory.replace(getInitialProgramState(tok, value.tokvalue, settings));
@@ -533,20 +624,27 @@ static bool isNumericValue(const ValueFlow::Value& value) {
 
 static double asFloat(const ValueFlow::Value& value)
 {
-    return value.isFloatValue() ? value.floatValue : value.intvalue;
+    return value.isFloatValue() ? value.floatValue : static_cast<double>(value.intvalue);
+}
+
+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};
 }
 
-struct assign {
-    template<class T, class U>
-    void operator()(T& x, const U& y) const
-    {
-        x = y;
-    }
-};
+namespace {
+    struct assign {
+        template<class T, class U>
+        void operator()(T& x, const U& y) const
+        {
+            x = static_cast<T>(y);
+        }
+    };
+}
 
 static bool isIntegralValue(const ValueFlow::Value& value)
 {
@@ -556,7 +654,6 @@ static bool isIntegralValue(const ValueFlow::Value& value)
 static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value& lhs, const ValueFlow::Value& rhs)
 {
     ValueFlow::Value result;
-    combineValueProperties(lhs, rhs, result);
     if (lhs.isImpossible() && rhs.isImpossible())
         return ValueFlow::Value::unknown();
     if (lhs.isImpossible() || rhs.isImpossible()) {
@@ -621,16 +718,17 @@ static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value&
     return result;
 }
 
-using BuiltinLibraryFunction = std::function<ValueFlow::Value(const std::vector<ValueFlow::Value>&)>;
+using BuiltinLibraryFunction = std::function<ValueFlow::Value (const std::vector<ValueFlow::Value>&)>;
 static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibraryFunctions()
 {
     std::unordered_map<std::string, BuiltinLibraryFunction> functions;
     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;
@@ -669,77 +767,77 @@ 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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::sin(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::sin(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::lgamma(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::lgamma(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::cos(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::cos(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::tan(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::tan(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::asin(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::asin(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::acos(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::acos(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::atan(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::atan(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -748,10 +846,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::atan2(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::atan2(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -760,10 +857,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::remainder(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::remainder(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -772,10 +868,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::nextafter(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::nextafter(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -784,10 +879,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::nexttoward(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::nexttoward(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -796,10 +890,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::hypot(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::hypot(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -808,10 +901,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::fdim(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::fdim(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -820,10 +912,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::fmax(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::fmax(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -832,10 +923,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::fmin(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::fmin(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -844,10 +934,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::fmod(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::fmod(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -856,10 +945,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::pow(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::pow(asFloat(args[0]), asFloat(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -868,10 +956,9 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::scalbln(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::scalbln(asFloat(args[0]), asInt(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -880,296 +967,295 @@ static std::unordered_map<std::string, BuiltinLibraryFunction> createBuiltinLibr
             return v.isFloatValue() || v.isIntValue();
         }))
             return ValueFlow::Value::unknown();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
         ValueFlow::Value v;
         combineValueProperties(args[0], args[1], v);
-        v.floatValue = std::ldexp(value, args[1].isFloatValue() ? args[1].floatValue : args[1].intvalue);
+        v.floatValue = std::ldexp(asFloat(args[0]), asInt(args[1]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.intvalue = std::ilogb(value);
+        ValueFlow::Value v = v_ref;
+        v.intvalue = std::ilogb(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::INT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::erf(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::erf(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::erfc(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::erfc(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::floor(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::floor(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::sqrt(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::sqrt(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::cbrt(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::cbrt(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::ceil(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::ceil(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::exp(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::exp(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::exp2(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::exp2(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::expm1(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::expm1(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::fabs(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::fabs(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::log(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::log(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::log10(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::log10(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::log1p(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::log1p(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::log2(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::log2(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::logb(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::logb(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::nearbyint(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::nearbyint(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::sinh(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::sinh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::cosh(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::cosh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::tanh(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::tanh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::asinh(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::asinh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::acosh(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::acosh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::atanh(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::atanh(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::round(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::round(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::tgamma(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::tgamma(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
     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();
-        const double value = args[0].isFloatValue() ? args[0].floatValue : args[0].intvalue;
-        v.floatValue = std::trunc(value);
+        ValueFlow::Value v = v_ref;
+        v.floatValue = std::trunc(asFloat(args[0]));
         v.valueType = ValueFlow::Value::ValueType::FLOAT;
         return v;
     };
@@ -1184,383 +1270,628 @@ static BuiltinLibraryFunction getBuiltinLibraryFunction(const std::string& name)
         return nullptr;
     return it->second;
 }
+static bool TokenExprIdCompare(const Token* tok1, const Token* tok2) {
+    return tok1->exprId() < tok2->exprId();
+}
+static bool TokenExprIdEqual(const Token* tok1, const Token* tok2) {
+    return tok1->exprId() == tok2->exprId();
+}
 
-struct Executor {
-    ProgramMemory* pm = nullptr;
-    const Settings* settings = nullptr;
-    int fdepth = 4;
+static std::vector<const Token*> setDifference(const std::vector<const Token*>& v1, const std::vector<const Token*>& v2)
+{
+    std::vector<const Token*> result;
+    std::set_difference(v1.begin(), v1.end(), v2.begin(), v2.end(), std::back_inserter(result), &TokenExprIdCompare);
+    return result;
+}
 
-    explicit Executor(ProgramMemory* pm = nullptr, const Settings* settings = nullptr) : pm(pm), settings(settings) {}
+static bool evalSameCondition(const ProgramMemory& state,
+                              const Token* storedValue,
+                              const Token* cond,
+                              const Settings& settings)
+{
+    assert(!conditionIsTrue(cond, state, settings));
+    ProgramMemory pm = state;
+    programMemoryParseCondition(pm, storedValue, nullptr, settings, true);
+    if (pm == state)
+        return false;
+    return conditionIsTrue(cond, std::move(pm), settings);
+}
 
-    ValueFlow::Value executeImpl(const Token* expr)
-    {
-        ValueFlow::Value unknown = ValueFlow::Value::unknown();
-        const ValueFlow::Value* value = nullptr;
-        if (!expr)
-            return unknown;
-        if (expr->hasKnownIntValue() && !expr->isAssignmentOp() && expr->str() != ",")
-            return expr->values().front();
-        if ((value = expr->getKnownValue(ValueFlow::Value::ValueType::FLOAT)) ||
-            (value = expr->getKnownValue(ValueFlow::Value::ValueType::TOK)) ||
-            (value = expr->getKnownValue(ValueFlow::Value::ValueType::ITERATOR_START)) ||
-            (value = expr->getKnownValue(ValueFlow::Value::ValueType::ITERATOR_END)) ||
-            (value = expr->getKnownValue(ValueFlow::Value::ValueType::CONTAINER_SIZE))) {
-            return *value;
+static void pruneConditions(std::vector<const Token*>& conds,
+                            bool b,
+                            const std::unordered_map<nonneg int, ValueFlow::Value>& state)
+{
+    conds.erase(std::remove_if(conds.begin(),
+                               conds.end(),
+                               [&](const Token* cond) {
+        if (cond->exprId() == 0)
+            return false;
+        auto it = state.find(cond->exprId());
+        if (it == state.end())
+            return false;
+        const ValueFlow::Value& v = it->second;
+        return isTrueOrFalse(v, !b);
+    }),
+                conds.end());
+}
+
+namespace {
+    struct Executor {
+        ProgramMemory* pm;
+        const Settings& settings;
+        int fdepth = 4;
+        int depth = 10;
+
+        Executor(ProgramMemory* pm, const Settings& settings) : pm(pm), settings(settings)
+        {
+            assert(pm != nullptr);
         }
-        if (expr->isNumber()) {
-            if (MathLib::isFloat(expr->str()))
-                return unknown;
-            MathLib::bigint i = MathLib::toLongNumber(expr->str());
-            if (i < 0 && astIsUnsigned(expr))
-                return unknown;
-            return ValueFlow::Value{i};
+
+        static ValueFlow::Value unknown() {
+            return ValueFlow::Value::unknown();
         }
-        if (expr->isBoolean())
-            return ValueFlow::Value{expr->str() == "true"};
-        if (Token::Match(expr->tokAt(-2), ". %name% (") && astIsContainer(expr->tokAt(-2)->astOperand1())) {
-            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);
-                if (!v.isContainerSizeValue())
-                    return unknown;
-                v.valueType = ValueFlow::Value::ValueType::INT;
-                return v;
+
+        std::unordered_map<nonneg int, ValueFlow::Value> executeAll(const std::vector<const Token*>& toks,
+                                                                    const bool* b = nullptr) const
+        {
+            std::unordered_map<nonneg int, ValueFlow::Value> result;
+            auto state = *this;
+            for (const Token* tok : toks) {
+                ValueFlow::Value r = state.execute(tok);
+                if (r.isUninitValue())
+                    continue;
+                const bool brk = b && isTrueOrFalse(r, *b);
+                result.emplace(tok->exprId(), std::move(r));
+                // Short-circuit evaluation
+                if (brk)
+                    break;
             }
-            if (yield == Library::Container::Yield::EMPTY) {
-                ValueFlow::Value v = execute(containerTok);
-                if (!v.isContainerSizeValue())
-                    return unknown;
-                if (v.isImpossible() && v.intvalue == 0)
-                    return ValueFlow::Value{0};
-                if (!v.isImpossible())
-                    return ValueFlow::Value{v.intvalue == 0};
+            return result;
+        }
+
+        static std::vector<const Token*> flattenConditions(const Token* tok)
+        {
+            return astFlatten(tok, tok->str().c_str());
+        }
+        static bool sortConditions(std::vector<const Token*>& conditions)
+        {
+            if (std::any_of(conditions.begin(), conditions.end(), [](const Token* child) {
+                return Token::Match(child, "&&|%oror%");
+            }))
+                return false;
+            std::sort(conditions.begin(), conditions.end(), &TokenExprIdCompare);
+            conditions.erase(std::unique(conditions.begin(), conditions.end(), &TokenExprIdCompare), conditions.end());
+            return !conditions.empty() && conditions.front()->exprId() != 0;
+        }
+
+        ValueFlow::Value executeMultiCondition(bool b, const Token* expr)
+        {
+            if (pm->hasValue(expr->exprId())) {
+                const ValueFlow::Value& v = utils::as_const(*pm).at(expr->exprId());
+                if (v.isIntValue())
+                    return v;
             }
-        } else if (expr->isAssignmentOp() && expr->astOperand1() && expr->astOperand2() &&
-                   expr->astOperand1()->exprId() > 0) {
-            ValueFlow::Value rhs = execute(expr->astOperand2());
-            if (rhs.isUninitValue())
-                return unknown;
-            if (expr->str() != "=") {
+
+            // Evaluate recursively if there are no exprids
+            if ((expr->astOperand1() && expr->astOperand1()->exprId() == 0) ||
+                (expr->astOperand2() && expr->astOperand2()->exprId() == 0)) {
+                ValueFlow::Value lhs = execute(expr->astOperand1());
+                if (isTrueOrFalse(lhs, b))
+                    return lhs;
+                ValueFlow::Value rhs = execute(expr->astOperand2());
+                if (isTrueOrFalse(rhs, b))
+                    return rhs;
+                if (isTrueOrFalse(lhs, !b) && isTrueOrFalse(rhs, !b))
+                    return lhs;
+                return unknown();
+            }
+
+            nonneg int n = astCount(expr, expr->str().c_str());
+            if (n > 50)
+                return unknown();
+            std::vector<const Token*> conditions1 = flattenConditions(expr);
+            if (conditions1.empty())
+                return unknown();
+            std::unordered_map<nonneg int, ValueFlow::Value> condValues = executeAll(conditions1, &b);
+            bool allNegated = true;
+            ValueFlow::Value negatedValue = unknown();
+            for (const auto& p : condValues) {
+                const ValueFlow::Value& v = p.second;
+                if (isTrueOrFalse(v, b))
+                    return v;
+                allNegated &= isTrueOrFalse(v, !b);
+                if (allNegated && negatedValue.isUninitValue())
+                    negatedValue = v;
+            }
+            if (condValues.size() == conditions1.size() && allNegated)
+                return negatedValue;
+            if (n > 4)
+                return unknown();
+            if (!sortConditions(conditions1))
+                return unknown();
+
+            for (const auto& p : *pm) {
+                const Token* tok = p.first.tok;
+                if (!tok)
+                    continue;
+                const ValueFlow::Value& value = p.second;
+
+                if (tok->str() == expr->str() && !astHasExpr(tok, expr->exprId())) {
+                    // TODO: Handle when it is greater
+                    if (n != astCount(tok, expr->str().c_str()))
+                        continue;
+                    std::vector<const Token*> conditions2 = flattenConditions(tok);
+                    if (!sortConditions(conditions2))
+                        return unknown();
+                    if (conditions1.size() == conditions2.size() &&
+                        std::equal(conditions1.begin(), conditions1.end(), conditions2.begin(), &TokenExprIdEqual))
+                        return value;
+                    std::vector<const Token*> diffConditions1 = setDifference(conditions1, conditions2);
+                    pruneConditions(diffConditions1, !b, condValues);
+                    if (diffConditions1.size() == conditions1.size())
+                        continue;
+                    std::vector<const Token*> diffConditions2 = setDifference(conditions2, conditions1);
+                    pruneConditions(diffConditions2, !b, executeAll(diffConditions2));
+                    if (diffConditions1.size() != diffConditions2.size())
+                        continue;
+                    for (const Token* cond1 : diffConditions1) {
+                        auto it = std::find_if(diffConditions2.begin(), diffConditions2.end(), [&](const Token* cond2) {
+                            return evalSameCondition(*pm, cond2, cond1, settings);
+                        });
+                        if (it == diffConditions2.end())
+                            break;
+                        diffConditions2.erase(it);
+                    }
+                    if (diffConditions2.empty())
+                        return value;
+                }
+            }
+            return unknown();
+        }
+
+        ValueFlow::Value executeImpl(const Token* expr)
+        {
+            const ValueFlow::Value* value = nullptr;
+            if (!expr)
+                return unknown();
+            if (expr->hasKnownIntValue() && !expr->isAssignmentOp() && expr->str() != ",")
+                return *expr->getKnownValue(ValueFlow::Value::ValueType::INT);
+            if ((value = expr->getKnownValue(ValueFlow::Value::ValueType::FLOAT)) ||
+                (value = expr->getKnownValue(ValueFlow::Value::ValueType::TOK)) ||
+                (value = expr->getKnownValue(ValueFlow::Value::ValueType::ITERATOR_START)) ||
+                (value = expr->getKnownValue(ValueFlow::Value::ValueType::ITERATOR_END)) ||
+                (value = expr->getKnownValue(ValueFlow::Value::ValueType::CONTAINER_SIZE))) {
+                return *value;
+            }
+            if (expr->isNumber()) {
+                if (MathLib::isFloat(expr->str()))
+                    return unknown();
+                MathLib::bigint i = MathLib::toBigNumber(expr);
+                if (i < 0 && astIsUnsigned(expr))
+                    return unknown();
+                return ValueFlow::Value{i};
+            }
+            if (expr->isBoolean())
+                return ValueFlow::Value{expr->str() == "true"};
+            if (Token::Match(expr->tokAt(-2), ". %name% (") && astIsContainer(expr->tokAt(-2)->astOperand1())) {
+                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);
+                    if (!v.isContainerSizeValue())
+                        return unknown();
+                    v.valueType = ValueFlow::Value::ValueType::INT;
+                    return v;
+                }
+                if (yield == Library::Container::Yield::EMPTY) {
+                    ValueFlow::Value v = execute(containerTok);
+                    if (!v.isContainerSizeValue())
+                        return unknown();
+                    if (v.isImpossible() && v.intvalue == 0)
+                        return ValueFlow::Value{0};
+                    if (!v.isImpossible())
+                        return ValueFlow::Value{v.intvalue == 0};
+                }
+            } else if (expr->isAssignmentOp() && expr->astOperand1() && expr->astOperand2() &&
+                       expr->astOperand1()->exprId() > 0) {
+                ValueFlow::Value rhs = execute(expr->astOperand2());
+                if (rhs.isUninitValue())
+                    return unknown();
+                if (expr->str() != "=") {
+                    if (!pm->hasValue(expr->astOperand1()->exprId()))
+                        return unknown();
+                    ValueFlow::Value& lhs = pm->at(expr->astOperand1()->exprId());
+                    rhs = evaluate(removeAssign(expr->str()), lhs, rhs);
+                    if (lhs.isIntValue())
+                        ValueFlow::Value::visitValue(rhs, std::bind(assign{}, std::ref(lhs.intvalue), std::placeholders::_1));
+                    else if (lhs.isFloatValue())
+                        ValueFlow::Value::visitValue(rhs,
+                                                     std::bind(assign{}, std::ref(lhs.floatValue), std::placeholders::_1));
+                    else
+                        return unknown();
+                    return lhs;
+                }
+                pm->setValue(expr->astOperand1(), rhs);
+                return rhs;
+            } else if (expr->str() == "&&" && expr->astOperand1() && expr->astOperand2()) {
+                return executeMultiCondition(false, expr);
+            } else if (expr->str() == "||" && expr->astOperand1() && expr->astOperand2()) {
+                return executeMultiCondition(true, expr);
+            } else if (expr->str() == "," && expr->astOperand1() && expr->astOperand2()) {
+                execute(expr->astOperand1());
+                return execute(expr->astOperand2());
+            } else if (expr->tokType() == Token::eIncDecOp && expr->astOperand1() && expr->astOperand1()->exprId() != 0) {
                 if (!pm->hasValue(expr->astOperand1()->exprId()))
-                    return unknown;
+                    return ValueFlow::Value::unknown();
                 ValueFlow::Value& lhs = pm->at(expr->astOperand1()->exprId());
-                rhs = evaluate(removeAssign(expr->str()), lhs, rhs);
-                if (lhs.isIntValue())
-                    ValueFlow::Value::visitValue(rhs, std::bind(assign{}, std::ref(lhs.intvalue), std::placeholders::_1));
-                else if (lhs.isFloatValue())
-                    ValueFlow::Value::visitValue(rhs,
-                                                 std::bind(assign{}, std::ref(lhs.floatValue), std::placeholders::_1));
+                if (!lhs.isIntValue())
+                    return unknown();
+                // overflow
+                if (!lhs.isImpossible() && lhs.intvalue == 0 && expr->str() == "--" && astIsUnsigned(expr->astOperand1()))
+                    return unknown();
+
+                if (expr->str() == "++")
+                    lhs.intvalue++;
                 else
-                    return unknown;
+                    lhs.intvalue--;
                 return lhs;
-            }
-            pm->setValue(expr->astOperand1(), rhs);
-            return rhs;
-        } else if (expr->str() == "&&" && expr->astOperand1() && expr->astOperand2()) {
-            ValueFlow::Value lhs = execute(expr->astOperand1());
-            if (!lhs.isIntValue())
-                return unknown;
-            if (isFalse(lhs))
-                return lhs;
-            if (isTrue(lhs))
-                return execute(expr->astOperand2());
-            return unknown;
-        } else if (expr->str() == "||" && expr->astOperand1() && expr->astOperand2()) {
-            ValueFlow::Value lhs = execute(expr->astOperand1());
-            if (!lhs.isIntValue() || lhs.isImpossible())
-                return unknown;
-            if (isTrue(lhs))
-                return lhs;
-            if (isFalse(lhs))
-                return execute(expr->astOperand2());
-            return unknown;
-        } else if (expr->str() == "," && expr->astOperand1() && expr->astOperand2()) {
-            execute(expr->astOperand1());
-            return execute(expr->astOperand2());
-        } else if (expr->tokType() == Token::eIncDecOp && expr->astOperand1() && expr->astOperand1()->exprId() != 0) {
-            if (!pm->hasValue(expr->astOperand1()->exprId()))
-                return unknown;
-            ValueFlow::Value& lhs = pm->at(expr->astOperand1()->exprId());
-            if (!lhs.isIntValue())
-                return unknown;
-            // overflow
-            if (!lhs.isImpossible() && lhs.intvalue == 0 && expr->str() == "--" && astIsUnsigned(expr->astOperand1()))
-                return unknown;
-
-            if (expr->str() == "++")
-                lhs.intvalue++;
-            else
-                lhs.intvalue--;
-            return lhs;
-        } else if (expr->str() == "[" && expr->astOperand1() && expr->astOperand2()) {
-            const Token* tokvalue = nullptr;
-            if (!pm->getTokValue(expr->astOperand1()->exprId(), &tokvalue)) {
-                auto tokvalue_it = std::find_if(expr->astOperand1()->values().cbegin(),
-                                                expr->astOperand1()->values().cend(),
-                                                std::mem_fn(&ValueFlow::Value::isTokValue));
-                if (tokvalue_it == expr->astOperand1()->values().cend() || !tokvalue_it->isKnown()) {
-                    return unknown;
+            } else if (expr->str() == "[" && expr->astOperand1() && expr->astOperand2()) {
+                const Token* tokvalue = nullptr;
+                if (!pm->getTokValue(expr->astOperand1()->exprId(), tokvalue)) {
+                    auto tokvalue_it = std::find_if(expr->astOperand1()->values().cbegin(),
+                                                    expr->astOperand1()->values().cend(),
+                                                    std::mem_fn(&ValueFlow::Value::isTokValue));
+                    if (tokvalue_it == expr->astOperand1()->values().cend() || !tokvalue_it->isKnown()) {
+                        return unknown();
+                    }
+                    tokvalue = tokvalue_it->tokvalue;
                 }
-                tokvalue = tokvalue_it->tokvalue;
-            }
-            if (!tokvalue || !tokvalue->isLiteral()) {
-                return unknown;
-            }
-            const std::string strValue = tokvalue->strValue();
-            ValueFlow::Value rhs = execute(expr->astOperand2());
-            if (!rhs.isIntValue())
-                return unknown;
-            const MathLib::bigint index = rhs.intvalue;
-            if (index >= 0 && index < strValue.size())
-                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());
-            ValueFlow::Value rhs = execute(expr->astOperand2());
-            ValueFlow::Value r = unknown;
-            if (!lhs.isUninitValue() && !rhs.isUninitValue())
-                r = evaluate(expr->str(), lhs, rhs);
-            if (expr->isComparisonOp() && (r.isUninitValue() || r.isImpossible())) {
-                if (rhs.isIntValue()) {
-                    std::vector<ValueFlow::Value> result =
-                        infer(ValueFlow::makeIntegralInferModel(), expr->str(), expr->astOperand1()->values(), {rhs});
-                    if (!result.empty() && result.front().isKnown())
-                        return result.front();
+                if (!tokvalue || !tokvalue->isLiteral()) {
+                    return unknown();
                 }
-                if (lhs.isIntValue()) {
-                    std::vector<ValueFlow::Value> result =
-                        infer(ValueFlow::makeIntegralInferModel(), expr->str(), {lhs}, expr->astOperand2()->values());
-                    if (!result.empty() && result.front().isKnown())
-                        return result.front();
+                const std::string strValue = tokvalue->strValue();
+                ValueFlow::Value rhs = execute(expr->astOperand2());
+                if (!rhs.isIntValue())
+                    return unknown();
+                const MathLib::bigint index = rhs.intvalue;
+                if (index >= 0 && index < strValue.size())
+                    return ValueFlow::Value{strValue[static_cast<std::size_t>(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());
+                if (rhs.isUninitValue())
+                    return unknown();
+                ValueFlow::Value r = evaluate(expr->str(), lhs, rhs);
+                if (expr->isComparisonOp() && (r.isUninitValue() || r.isImpossible())) {
+                    if (rhs.isIntValue() && !expr->astOperand1()->values().empty()) {
+                        std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(),
+                                                                     expr->str(),
+                                                                     expr->astOperand1()->values(),
+                                                                     {std::move(rhs)});
+                        if (!result.empty() && result.front().isKnown())
+                            return std::move(result.front());
+                    }
+                    if (lhs.isIntValue() && !expr->astOperand2()->values().empty()) {
+                        std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(),
+                                                                     expr->str(),
+                                                                     {std::move(lhs)},
+                                                                     expr->astOperand2()->values());
+                        if (!result.empty() && result.front().isKnown())
+                            return std::move(result.front());
+                    }
+                    return unknown();
                 }
-                return unknown;
+                return r;
             }
-            return r;
-        }
-        // Unary ops
-        else if (Token::Match(expr, "!|+|-") && expr->astOperand1() && !expr->astOperand2()) {
-            ValueFlow::Value lhs = execute(expr->astOperand1());
-            if (!lhs.isIntValue())
-                return unknown;
-            if (expr->str() == "!") {
-                if (isTrue(lhs)) {
-                    lhs.intvalue = 0;
-                } else if (isFalse(lhs)) {
-                    lhs.intvalue = 1;
-                } else {
-                    return unknown;
+            // Unary ops
+            else if (Token::Match(expr, "!|+|-") && expr->astOperand1() && !expr->astOperand2()) {
+                ValueFlow::Value lhs = execute(expr->astOperand1());
+                if (!lhs.isIntValue())
+                    return unknown();
+                if (expr->str() == "!") {
+                    if (isTrue(lhs)) {
+                        lhs.intvalue = 0;
+                    } else if (isFalse(lhs)) {
+                        lhs.intvalue = 1;
+                    } else {
+                        return unknown();
+                    }
+                    lhs.setPossible();
+                    lhs.bound = ValueFlow::Value::Bound::Point;
                 }
-                lhs.setPossible();
-                lhs.bound = ValueFlow::Value::Bound::Point;
+                if (expr->str() == "-")
+                    lhs.intvalue = -lhs.intvalue;
+                return lhs;
+            } else if (expr->str() == "?" && expr->astOperand1() && expr->astOperand2()) {
+                ValueFlow::Value cond = execute(expr->astOperand1());
+                if (!cond.isIntValue())
+                    return unknown();
+                const Token* child = expr->astOperand2();
+                if (isFalse(cond))
+                    return execute(child->astOperand2());
+                if (isTrue(cond))
+                    return execute(child->astOperand1());
+
+                return unknown();
+            } else if (expr->str() == "(" && expr->isCast()) {
+                if (expr->astOperand2()) {
+                    if (expr->astOperand1()->str() != "dynamic_cast")
+                        return execute(expr->astOperand2());
+                    return unknown();
+                }
+                return execute(expr->astOperand1());
             }
-            if (expr->str() == "-")
-                lhs.intvalue = -lhs.intvalue;
-            return lhs;
-        } else if (expr->str() == "?" && expr->astOperand1() && expr->astOperand2()) {
-            ValueFlow::Value cond = execute(expr->astOperand1());
-            if (!cond.isIntValue())
-                return unknown;
-            const Token* child = expr->astOperand2();
-            if (isFalse(cond))
-                return execute(child->astOperand2());
-            if (isTrue(cond))
-                return execute(child->astOperand1());
-
-            return unknown;
-        } else if (expr->str() == "(" && expr->isCast()) {
-            if (Token::simpleMatch(expr->previous(), ">") && expr->previous()->link())
-                return execute(expr->astOperand2());
-            return execute(expr->astOperand1());
-        }
-        if (expr->exprId() > 0 && pm->hasValue(expr->exprId())) {
-            ValueFlow::Value result = pm->at(expr->exprId());
-            if (result.isImpossible() && result.isIntValue() && result.intvalue == 0 && isUsedAsBool(expr)) {
-                result.intvalue = !result.intvalue;
-                result.setKnown();
+            if (expr->exprId() > 0 && pm->hasValue(expr->exprId())) {
+                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;
+                    result.setKnown();
+                }
+                return result;
             }
-            return result;
-        }
 
-        if (Token::Match(expr->previous(), ">|%name% {|(")) {
-            const Token* ftok = expr->previous();
-            const Function* f = ftok->function();
-            ValueFlow::Value result = unknown;
-            if (settings && expr->str() == "(") {
-                std::vector<const Token*> tokArgs = getArguments(expr);
-                std::vector<ValueFlow::Value> args(tokArgs.size());
-                std::transform(tokArgs.cbegin(), tokArgs.cend(), args.begin(), [&](const Token* tok) {
-                    return execute(tok);
-                });
-                if (f) {
-                    if (fdepth >= 0) {
-                        ProgramMemory functionState;
-                        for (std::size_t i = 0; i < args.size(); ++i) {
-                            const Variable* const arg = f->getArgumentVar(i);
-                            if (!arg)
-                                return unknown;
-                            functionState.setValue(arg->nameToken(), args[i]);
+            if (Token::Match(expr->previous(), ">|%name% {|(")) {
+                const Token* ftok = expr->previous();
+                const Function* f = ftok->function();
+                ValueFlow::Value result = unknown();
+                if (expr->str() == "(") {
+                    std::vector<const Token*> tokArgs = getArguments(expr);
+                    std::vector<ValueFlow::Value> args(tokArgs.size());
+                    std::transform(
+                        tokArgs.cbegin(), tokArgs.cend(), args.begin(), [&](const Token* tok) {
+                        return execute(tok);
+                    });
+                    if (f) {
+                        if (fdepth >= 0 && !f->isImplicitlyVirtual()) {
+                            ProgramMemory functionState;
+                            for (std::size_t i = 0; i < args.size(); ++i) {
+                                const Variable* const arg = f->getArgumentVar(i);
+                                if (!arg)
+                                    return unknown();
+                                functionState.setValue(arg->nameToken(), args[i]);
+                            }
+                            Executor ex = *this;
+                            ex.pm = &functionState;
+                            ex.fdepth--;
+                            auto r = ex.execute(f->functionScope);
+                            if (!r.empty())
+                                result = std::move(r.front());
+                            // TODO: Track values changed by reference
                         }
-                        Executor ex = *this;
-                        ex.pm = &functionState;
-                        ex.fdepth--;
-                        auto r = ex.execute(f->functionScope);
-                        if (!r.empty())
-                            result = r.front();
-                        // TODO: Track values changed by reference
-                    }
-                } else {
-                    BuiltinLibraryFunction lf = getBuiltinLibraryFunction(ftok->str());
-                    if (lf)
-                        return lf(args);
-                    const std::string& returnValue = settings->library.returnValue(ftok);
-                    if (!returnValue.empty()) {
-                        std::unordered_map<nonneg int, ValueFlow::Value> arg_map;
-                        int argn = 0;
-                        for (const ValueFlow::Value& v : args) {
-                            if (!v.isUninitValue())
-                                arg_map[argn] = v;
-                            argn++;
+                    } else {
+                        BuiltinLibraryFunction lf = getBuiltinLibraryFunction(ftok->str());
+                        if (lf)
+                            return lf(args);
+                        const std::string& returnValue = settings.library.returnValue(ftok);
+                        if (!returnValue.empty()) {
+                            std::unordered_map<nonneg int, ValueFlow::Value> arg_map;
+                            int argn = 0;
+                            for (const ValueFlow::Value& v : args) {
+                                if (!v.isUninitValue())
+                                    arg_map[argn] = v;
+                                argn++;
+                            }
+                            return evaluateLibraryFunction(arg_map, returnValue, settings, ftok->isCpp());
                         }
-                        return evaluateLibraryFunction(arg_map, returnValue, settings);
                     }
                 }
-            }
-            // Check if function modifies argument
-            visitAstNodes(expr->astOperand2(), [&](const Token* child) {
-                if (child->exprId() > 0 && pm->hasValue(child->exprId())) {
-                    ValueFlow::Value& v = pm->at(child->exprId());
-                    if (v.valueType == ValueFlow::Value::ValueType::CONTAINER_SIZE) {
-                        if (ValueFlow::isContainerSizeChanged(child, v.indirect, settings))
-                            v = unknown;
-                    } else if (v.valueType != ValueFlow::Value::ValueType::UNINIT) {
-                        if (isVariableChanged(child, v.indirect, settings, true))
-                            v = unknown;
+                // Check if function modifies argument
+                visitAstNodes(expr->astOperand2(), [&](const Token* child) {
+                    if (child->exprId() > 0 && pm->hasValue(child->exprId())) {
+                        ValueFlow::Value& v = pm->at(child->exprId());
+                        if (v.valueType == ValueFlow::Value::ValueType::CONTAINER_SIZE) {
+                            if (ValueFlow::isContainerSizeChanged(child, v.indirect, settings))
+                                v = unknown();
+                        } else if (v.valueType != ValueFlow::Value::ValueType::UNINIT) {
+                            if (isVariableChanged(child, v.indirect, settings))
+                                v = unknown();
+                        }
                     }
+                    return ChildrenToVisit::op1_and_op2;
+                });
+                return result;
+            }
+
+            return unknown();
+        }
+        static const ValueFlow::Value* getImpossibleValue(const Token* tok)
+        {
+            if (!tok)
+                return nullptr;
+            std::vector<const ValueFlow::Value*> values;
+            for (const ValueFlow::Value& v : tok->values()) {
+                if (!v.isImpossible())
+                    continue;
+                if (v.isContainerSizeValue() || v.isIntValue()) {
+                    values.push_back(std::addressof(v));
                 }
-                return ChildrenToVisit::op1_and_op2;
+            }
+            auto it =
+                std::max_element(values.begin(), values.end(), [](const ValueFlow::Value* x, const ValueFlow::Value* y) {
+                return x->intvalue < y->intvalue;
             });
-            return result;
+            if (it == values.end())
+                return nullptr;
+            return *it;
         }
 
-        return unknown;
-    }
-    static const ValueFlow::Value* getImpossibleValue(const Token* tok)
-    {
-        if (!tok)
-            return nullptr;
-        std::vector<const ValueFlow::Value*> values;
-        for (const ValueFlow::Value& v : tok->values()) {
-            if (!v.isImpossible())
-                continue;
-            if (v.isContainerSizeValue() || v.isIntValue()) {
-                values.push_back(std::addressof(v));
-            }
+        static bool updateValue(ValueFlow::Value& v, ValueFlow::Value x)
+        {
+            const bool returnValue = !x.isUninitValue() && !x.isImpossible();
+            if (v.isUninitValue() || returnValue)
+                v = std::move(x);
+            return returnValue;
         }
-        auto it =
-            std::max_element(values.begin(), values.end(), [](const ValueFlow::Value* x, const ValueFlow::Value* y) {
-            return x->intvalue < y->intvalue;
-        });
-        if (it == values.end())
-            return nullptr;
-        return *it;
-    }
 
-    ValueFlow::Value execute(const Token* expr)
-    {
-        ValueFlow::Value v = executeImpl(expr);
-        if (!v.isUninitValue())
-            return v;
-        if (!expr)
+        ValueFlow::Value execute(const Token* expr)
+        {
+            depth--;
+            OnExit onExit{[&] {
+                    depth++;
+                }};
+            if (depth < 0)
+                return unknown();
+            ValueFlow::Value v = unknown();
+            if (updateValue(v, executeImpl(expr)))
+                return v;
+            if (!expr)
+                return v;
+            if (expr->exprId() > 0 && pm->hasValue(expr->exprId())) {
+                if (updateValue(v, utils::as_const(*pm).at(expr->exprId())))
+                    return v;
+            }
+            // Find symbolic values
+            for (const ValueFlow::Value& value : expr->values()) {
+                if (!value.isSymbolicValue())
+                    continue;
+                if (!value.isKnown())
+                    continue;
+                if (value.tokvalue->exprId() > 0 && !pm->hasValue(value.tokvalue->exprId()))
+                    continue;
+                const ValueFlow::Value& v_ref = utils::as_const(*pm).at(value.tokvalue->exprId());
+                if (!v_ref.isIntValue() && value.intvalue != 0)
+                    continue;
+                ValueFlow::Value v2 = v_ref;
+                v2.intvalue += value.intvalue;
+                return v2;
+            }
+            if (v.isImpossible() && v.isIntValue())
+                return v;
+            if (const ValueFlow::Value* value = getImpossibleValue(expr))
+                return *value;
             return v;
-        if (expr->exprId() > 0 && pm->hasValue(expr->exprId()))
-            return pm->at(expr->exprId());
-        if (const ValueFlow::Value* value = getImpossibleValue(expr))
-            return *value;
-        return v;
-    }
+        }
 
-    std::vector<ValueFlow::Value> execute(const Scope* scope)
-    {
-        static const std::vector<ValueFlow::Value> unknown = {ValueFlow::Value::unknown()};
-        if (!scope)
-            return unknown;
-        if (!scope->bodyStart)
-            return unknown;
-        for (const Token* tok = scope->bodyStart->next(); precedes(tok, scope->bodyEnd); tok = tok->next()) {
-            const Token* top = tok->astTop();
-            if (!top)
-                return unknown;
-
-            if (Token::simpleMatch(top, "return") && top->astOperand1())
-                return {execute(top->astOperand1())};
-
-            if (Token::Match(top, "%op%")) {
-                if (execute(top).isUninitValue())
-                    return unknown;
-                const Token* next = nextAfterAstRightmostLeaf(top);
-                if (!next)
-                    return unknown;
-                tok = next;
-            } else if (Token::simpleMatch(top->previous(), "if (")) {
-                const Token* condTok = top->astOperand2();
-                ValueFlow::Value v = execute(condTok);
-                if (!v.isIntValue())
-                    return unknown;
-                const Token* thenStart = top->link()->next();
-                const Token* next = thenStart->link();
-                const Token* elseStart = nullptr;
-                if (Token::simpleMatch(thenStart->link(), "} else {")) {
-                    elseStart = thenStart->link()->tokAt(2);
-                    next = elseStart->link();
-                }
-                std::vector<ValueFlow::Value> result;
-                if (isTrue(v)) {
-                    result = execute(thenStart->scope());
-                } else if (isFalse(v)) {
-                    if (elseStart)
-                        result = execute(elseStart->scope());
+        std::vector<ValueFlow::Value> execute(const Scope* scope)
+        {
+            if (!scope)
+                return {unknown()};
+            if (!scope->bodyStart)
+                return {unknown()};
+            for (const Token* tok = scope->bodyStart->next(); precedes(tok, scope->bodyEnd); tok = tok->next()) {
+                const Token* top = tok->astTop();
+
+                if (Token::simpleMatch(top, "return") && top->astOperand1())
+                    return {execute(top->astOperand1())};
+
+                if (Token::Match(top, "%op%")) {
+                    if (execute(top).isUninitValue())
+                        return {unknown()};
+                    const Token* next = nextAfterAstRightmostLeaf(top);
+                    if (!next)
+                        return {unknown()};
+                    tok = next;
+                } else if (Token::simpleMatch(top->previous(), "if (")) {
+                    const Token* condTok = top->astOperand2();
+                    ValueFlow::Value v = execute(condTok);
+                    if (!v.isIntValue())
+                        return {unknown()};
+                    const Token* thenStart = top->link()->next();
+                    const Token* next = thenStart->link();
+                    const Token* elseStart = nullptr;
+                    if (Token::simpleMatch(thenStart->link(), "} else {")) {
+                        elseStart = thenStart->link()->tokAt(2);
+                        next = elseStart->link();
+                    }
+                    std::vector<ValueFlow::Value> result;
+                    if (isTrue(v)) {
+                        result = execute(thenStart->scope());
+                    } else if (isFalse(v)) {
+                        if (elseStart)
+                            result = execute(elseStart->scope());
+                    } else {
+                        return {unknown()};
+                    }
+                    if (!result.empty())
+                        return result;
+                    tok = next;
                 } else {
-                    return unknown;
+                    return {unknown()};
                 }
-                if (!result.empty())
-                    return result;
-                tok = next;
-            } else {
-                return unknown;
             }
+            return {};
         }
-        return {};
-    }
-};
+    };
+}     // 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)
 {
     Executor ex{&pm, settings};
     return ex.execute(expr);
 }
 
-std::vector<ValueFlow::Value> execute(const Scope* scope, ProgramMemory& pm, const Settings* settings)
+std::vector<ValueFlow::Value> execute(const Scope* scope, ProgramMemory& pm, const Settings& settings)
 {
     Executor ex{&pm, settings};
     return ex.execute(scope);
 }
 
+static std::shared_ptr<Token> createTokenFromExpression(const std::string& returnValue,
+                                                        const Settings& settings,
+                                                        bool cpp,
+                                                        std::unordered_map<nonneg int, const Token*>& lookupVarId)
+{
+    std::shared_ptr<TokenList> tokenList = std::make_shared<TokenList>(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
+    {
+        const std::string code = "return " + returnValue + ";";
+        if (!tokenList->createTokensFromBuffer(code.data(), code.size()))
+            return nullptr;
+    }
+
+    // TODO: put in a helper?
+    // combine operators, set links, etc..
+    std::stack<Token*> lpar;
+    for (Token* tok2 = tokenList->front(); tok2; tok2 = tok2->next()) {
+        if (Token::Match(tok2, "[!<>=] =")) {
+            tok2->str(tok2->str() + "=");
+            tok2->deleteNext();
+        } else if (tok2->str() == "(")
+            lpar.push(tok2);
+        else if (tok2->str() == ")") {
+            if (lpar.empty())
+                return nullptr;
+            Token::createMutualLinks(lpar.top(), tok2);
+            lpar.pop();
+        }
+    }
+    if (!lpar.empty())
+        return nullptr;
+
+    // set varids
+    for (Token* tok2 = tokenList->front(); tok2; tok2 = tok2->next()) {
+        if (!startsWith(tok2->str(), "arg"))
+            continue;
+        nonneg int const id = strToInt<nonneg int>(tok2->str().c_str() + 3);
+        tok2->varId(id);
+        lookupVarId[id] = tok2;
+    }
+
+    // Evaluate expression
+    tokenList->createAst();
+    Token* expr = tokenList->front()->astOperand1();
+    ValueFlow::valueFlowConstantFoldAST(expr, settings);
+    return {tokenList, expr};
+}
+
 ValueFlow::Value evaluateLibraryFunction(const std::unordered_map<nonneg int, ValueFlow::Value>& args,
                                          const std::string& returnValue,
-                                         const Settings* settings)
+                                         const Settings& settings,
+                                         bool cpp)
 {
     thread_local static std::unordered_map<std::string,
-                                           std::function<ValueFlow::Value(const std::unordered_map<nonneg int, ValueFlow::Value>& arg)>>
+                                           std::function<ValueFlow::Value(const std::unordered_map<nonneg int, ValueFlow::Value>&, const Settings&)>>
     functions = {};
     if (functions.count(returnValue) == 0) {
 
         std::unordered_map<nonneg int, const Token*> lookupVarId;
-        std::shared_ptr<Token> expr = createTokenFromExpression(returnValue, settings, &lookupVarId);
+        std::shared_ptr<Token> expr = createTokenFromExpression(returnValue, settings, cpp, lookupVarId);
 
         functions[returnValue] =
-            [lookupVarId, expr, settings](const std::unordered_map<nonneg int, ValueFlow::Value>& xargs) {
+            [lookupVarId, expr](const std::unordered_map<nonneg int, ValueFlow::Value>& xargs, const Settings& settings) {
             if (!expr)
                 return ValueFlow::Value::unknown();
             ProgramMemory pm{};
@@ -1572,14 +1903,14 @@ ValueFlow::Value evaluateLibraryFunction(const std::unordered_map<nonneg int, Va
             return execute(expr.get(), pm, settings);
         };
     }
-    return functions.at(returnValue)(args);
+    return functions.at(returnValue)(args, settings);
 }
 
 void execute(const Token* expr,
              ProgramMemory& programMemory,
              MathLib::bigint* result,
              bool* error,
-             const Settings* settings)
+             const Settings& settings)
 {
     ValueFlow::Value v = execute(expr, programMemory, settings);
     if (!v.isIntValue() || v.isImpossible()) {
diff --git a/lib/programmemory.h b/lib/programmemory.h
index 1820b1770c7..adb0d1469ce 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-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
@@ -26,6 +26,7 @@
 #include <cstddef>
 #include <functional>
 #include <map>
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <utility>
@@ -40,14 +41,9 @@ struct ExprIdToken {
     const Token* tok = nullptr;
     nonneg int exprid = 0;
 
-    ExprIdToken() = default;
     // cppcheck-suppress noExplicitConstructor
     // NOLINTNEXTLINE(google-explicit-constructor)
-    ExprIdToken(const Token* tok) : tok(tok) {}
-    // TODO: Make this constructor only available from ProgramMemory
-    // cppcheck-suppress noExplicitConstructor
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    ExprIdToken(nonneg int exprid) : exprid(exprid) {}
+    ExprIdToken(const Token* tok);
 
     nonneg int getExpressionId() const;
 
@@ -55,23 +51,62 @@ struct ExprIdToken {
         return getExpressionId() == rhs.getExpressionId();
     }
 
+    bool operator<(const ExprIdToken& rhs) const {
+        return getExpressionId() < rhs.getExpressionId();
+    }
+
     template<class T, class U>
     friend bool operator!=(const T& lhs, const U& rhs)
     {
         return !(lhs == rhs);
     }
 
+    template<class T, class U>
+    friend bool operator<=(const T& lhs, const U& rhs)
+    {
+        return !(lhs > rhs);
+    }
+
+    template<class T, class U>
+    friend bool operator>(const T& lhs, const U& rhs)
+    {
+        return rhs < lhs;
+    }
+
+    template<class T, class U>
+    friend bool operator>=(const T& lhs, const U& rhs)
+    {
+        return !(lhs < rhs);
+    }
+
+    const Token& operator*() const NOEXCEPT {
+        return *tok;
+    }
+
+    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 ProgramMemory {
+struct CPPCHECKLIB ProgramMemory {
     using Map = std::unordered_map<ExprIdToken, ValueFlow::Value, ExprIdToken::Hash>;
 
-    ProgramMemory() = default;
+    ProgramMemory() : mValues(new Map()) {}
 
-    explicit ProgramMemory(Map values) : mValues(std::move(values)) {}
+    explicit ProgramMemory(Map values) : mValues(new Map(std::move(values))) {}
 
     void setValue(const Token* expr, const ValueFlow::Value& value);
     const ValueFlow::Value* getValue(nonneg int exprid, bool impossible = false) const;
@@ -85,55 +120,54 @@ struct ProgramMemory {
 
     void setUnknown(const Token* expr);
 
-    bool getTokValue(nonneg int exprid, const Token** result) const;
-    bool hasValue(nonneg int exprid);
+    bool getTokValue(nonneg int exprid, const Token*& result) const;
+    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);
+    void swap(ProgramMemory &pm) NOEXCEPT;
 
     void clear();
 
     bool empty() const;
 
-    void replace(const ProgramMemory &pm);
+    void replace(ProgramMemory pm, bool skipUnknown = false);
 
-    void insert(const ProgramMemory &pm);
-
-    Map::iterator begin() {
-        return mValues.begin();
+    Map::const_iterator begin() const {
+        return mValues->cbegin();
     }
 
-    Map::iterator end() {
-        return mValues.end();
+    Map::const_iterator end() const {
+        return mValues->cend();
     }
 
-    Map::const_iterator begin() const {
-        return mValues.begin();
+    friend bool operator==(const ProgramMemory& x, const ProgramMemory& y) {
+        return x.mValues == y.mValues;
     }
 
-    Map::const_iterator end() const {
-        return mValues.end();
+    friend bool operator!=(const ProgramMemory& x, const ProgramMemory& y) {
+        return x.mValues != y.mValues;
     }
 
 private:
-    Map mValues;
-};
+    void copyOnWrite();
+    Map::const_iterator find(nonneg int exprid) const;
+    Map::iterator find(nonneg int exprid);
 
-void programMemoryParseCondition(ProgramMemory& pm, const Token* tok, const Token* endTok, const Settings* settings, bool then);
+    std::shared_ptr<Map> mValues;
+};
 
 struct ProgramMemoryState {
     ProgramMemory state;
     std::map<nonneg int, const Token*> origins;
-    const Settings* settings;
+    const Settings& settings;
 
-    explicit ProgramMemoryState(const Settings* s);
+    explicit ProgramMemoryState(const Settings& s);
 
-    void insert(const ProgramMemory &pm, const Token* origin = nullptr);
-    void replace(const ProgramMemory &pm, const Token* origin = nullptr);
+    void replace(ProgramMemory pm, const Token* origin = nullptr);
 
     void addState(const Token* tok, const ProgramMemory::Map& vars);
 
@@ -144,36 +178,37 @@ struct ProgramMemoryState {
     ProgramMemory get(const Token* tok, const Token* ctx, const ProgramMemory::Map& vars) const;
 };
 
-std::vector<ValueFlow::Value> execute(const Scope* scope, ProgramMemory& pm, const Settings* settings);
+std::vector<ValueFlow::Value> execute(const Scope* scope, ProgramMemory& pm, const Settings& settings);
 
 void execute(const Token* expr,
              ProgramMemory& programMemory,
              MathLib::bigint* result,
              bool* error,
-             const Settings* settings = nullptr);
+             const Settings& settings);
 
 /**
  * Is condition always false when variable has given value?
  * \param condition   top ast token in condition
  * \param pm   program memory
  */
-bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings* settings = nullptr);
+bool conditionIsFalse(const Token* condition, ProgramMemory pm, const Settings& settings);
 
 /**
  * Is condition always true when variable has given value?
  * \param condition   top ast token in condition
  * \param pm   program memory
  */
-bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings* settings = nullptr);
+bool conditionIsTrue(const Token* condition, ProgramMemory pm, const Settings& settings);
 
 /**
  * Get program memory by looking backwards from given token.
  */
-ProgramMemory getProgramMemory(const Token* tok, const Token* expr, const ValueFlow::Value& value, const Settings* settings);
+ProgramMemory getProgramMemory(const Token* tok, const Token* expr, const ValueFlow::Value& value, const Settings& settings);
 
 ValueFlow::Value evaluateLibraryFunction(const std::unordered_map<nonneg int, ValueFlow::Value>& args,
                                          const std::string& returnValue,
-                                         const Settings* settings);
+                                         const Settings& settings,
+                                         bool cpp);
 
 #endif
 
diff --git a/lib/regex.cpp b/lib/regex.cpp
new file mode 100644
index 00000000000..6ad9ad440b0
--- /dev/null
+++ b/lib/regex.cpp
@@ -0,0 +1,260 @@
+/*
+ * 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/>.
+ */
+
+#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(mExtra);
+                mExtra = nullptr;
+            }
+            if (mRe) {
+                pcre_free(mRe);
+                mRe = nullptr;
+            }
+        }
+
+        std::string compile();
+        std::string match(const std::string& str, const MatchFn& match) const override;
+
+    private:
+        std::string mPattern;
+        pcre* mRe{};
+        pcre_extra* mExtra{};
+    };
+
+    std::string PcreRegex::compile()
+    {
+        if (mRe)
+            return "pcre_compile failed: 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 "pcre_compile failed: " + std::string(pcreCompileErrorStr);
+            return "pcre_compile failed: 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 "pcre_study failed: " + std::string(pcreStudyErrorStr);
+        }
+        mExtra = pcreExtra;
+#endif
+
+        mRe = re;
+
+        return "";
+    }
+
+    std::string PcreRegex::match(const std::string& str, const MatchFn& match) const
+    {
+        if (!mRe)
+            return "pcre_exec failed: 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 "pcre_exec failed (pos: " + std::to_string(pos) + "): " + pcreErrorCodeToString(pcreExecRet);
+            }
+            const auto pos1 = static_cast<unsigned int>(ovector[0]);
+            const auto pos2 = static_cast<unsigned int>(ovector[1]);
+
+            match(pos1, pos2);
+
+            // jump to the end of the match for the next pcre_exec
+            pos = static_cast<int>(pos2);
+        }
+
+        return "";
+    }
+}
+
+std::shared_ptr<Regex> Regex::create(std::string pattern, std::string& err)
+{
+    auto* regex = new PcreRegex(std::move(pattern));
+    err = regex->compile();
+    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..5d89dc52054
--- /dev/null
+++ b/lib/regex.h
@@ -0,0 +1,45 @@
+/* -*- 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 regexH
+#define regexH
+//---------------------------------------------------------------------------
+
+#ifdef HAVE_RULES
+
+#include "config.h"
+
+#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;
+
+    static std::shared_ptr<Regex> create(std::string pattern, std::string& err);
+};
+
+#endif // HAVE_RULES
+
+#endif // regexH
diff --git a/lib/reverseanalyzer.cpp b/lib/reverseanalyzer.cpp
index a243cc7eaa1..671426f5d2d 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-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
@@ -35,362 +35,381 @@
 #include <utility>
 #include <vector>
 
-struct ReverseTraversal {
-    ReverseTraversal(const ValuePtr<Analyzer>& analyzer, const Settings& settings)
-        : analyzer(analyzer), settings(settings)
-    {}
-    ValuePtr<Analyzer> analyzer;
-    const Settings& settings;
+namespace {
+    struct ReverseTraversal {
+        ReverseTraversal(const ValuePtr<Analyzer>& analyzer, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
+            : analyzer(analyzer), tokenlist(tokenlist), errorLogger(errorLogger), settings(settings)
+        {}
+        ValuePtr<Analyzer> analyzer;
+        const TokenList& tokenlist;
+        ErrorLogger& errorLogger;
+        const Settings& settings;
 
-    std::pair<bool, bool> evalCond(const Token* tok) const {
-        std::vector<MathLib::bigint> result = analyzer->evaluate(tok);
-        // TODO: We should convert to bool
-        const bool checkThen = std::any_of(result.cbegin(), result.cend(), [](int x) {
-            return x == 1;
-        });
-        const bool checkElse = std::any_of(result.cbegin(), result.cend(), [](int x) {
-            return x == 0;
-        });
-        return std::make_pair(checkThen, checkElse);
-    }
+        std::pair<bool, bool> evalCond(const Token* tok) const {
+            std::vector<MathLib::bigint> result = analyzer->evaluate(tok);
+            // TODO: We should convert to bool
+            const bool checkThen = std::any_of(result.cbegin(), result.cend(), [](MathLib::bigint x) {
+                return x == 1;
+            });
+            const bool checkElse = std::any_of(result.cbegin(), result.cend(), [](MathLib::bigint x) {
+                return x == 0;
+            });
+            return std::make_pair(checkThen, checkElse);
+        }
 
-    bool update(Token* tok) {
-        Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Reverse);
-        if (action.isInconclusive() && !analyzer->lowerToInconclusive())
-            return false;
-        if (action.isInvalid())
-            return false;
-        if (!action.isNone())
-            analyzer->update(tok, action, Analyzer::Direction::Reverse);
-        return true;
-    }
+        bool update(Token* tok) {
+            Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Reverse);
+            if (action.isInconclusive() && !analyzer->lowerToInconclusive())
+                return false;
+            if (action.isInvalid())
+                return false;
+            if (!action.isNone())
+                analyzer->update(tok, action, Analyzer::Direction::Reverse);
+            return true;
+        }
 
-    static Token* getParentFunction(Token* tok)
-    {
-        if (!tok)
-            return nullptr;
-        if (!tok->astParent())
-            return nullptr;
-        int argn = -1;
-        if (Token* ftok = getTokenArgumentFunction(tok, argn)) {
-            while (!Token::Match(ftok, "(|{")) {
-                if (!ftok)
-                    return nullptr;
-                if (ftok->index() >= tok->index())
+        static Token* getParentFunction(Token* tok)
+        {
+            if (!tok)
+                return nullptr;
+            if (!tok->astParent())
+                return nullptr;
+            int argn = -1;
+            if (Token* ftok = getTokenArgumentFunction(tok, argn)) {
+                while (!Token::Match(ftok, "(|{")) {
+                    if (!ftok)
+                        return nullptr;
+                    if (ftok->index() >= tok->index())
+                        return nullptr;
+                    if (!ftok->link() || ftok->str() == ")")
+                        ftok = ftok->next();
+                    else
+                        ftok = ftok->link()->next();
+                }
+                if (ftok == tok)
                     return nullptr;
-                if (!ftok->link() || ftok->str() == ")")
-                    ftok = ftok->next();
-                else
-                    ftok = ftok->link()->next();
+                return ftok;
             }
-            if (ftok == tok)
+            return nullptr;
+        }
+
+        static Token* getTopFunction(Token* tok)
+        {
+            if (!tok)
                 return nullptr;
-            return ftok;
+            if (!tok->astParent())
+                return tok;
+            Token* parent = tok;
+            Token* top = tok;
+            while ((parent = getParentFunction(parent)))
+                top = parent;
+            return top;
         }
-        return nullptr;
-    }
 
-    static Token* getTopFunction(Token* tok)
-    {
-        if (!tok)
-            return nullptr;
-        if (!tok->astParent())
+        static Token* jumpToStart(Token* tok)
+        {
+            if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
+                tok = tok->linkAt(-2);
+            if (Token::simpleMatch(tok->previous(), ") {"))
+                return tok->linkAt(-1);
+            if (Token::simpleMatch(tok->previous(), "do {"))
+                return tok->previous();
             return tok;
-        Token* parent = tok;
-        Token* top = tok;
-        while ((parent = getParentFunction(parent)))
-            top = parent;
-        return top;
-    }
-
-    bool updateRecursive(Token* start) {
-        bool continueB = true;
-        visitAstNodes(start, [&](Token* tok) {
-            const Token* parent = tok->astParent();
-            while (Token::simpleMatch(parent, ":"))
-                parent = parent->astParent();
-            if (isUnevaluated(tok) || isDeadCode(tok, parent))
-                return ChildrenToVisit::none;
-            continueB &= update(tok);
-            if (continueB)
-                return ChildrenToVisit::op1_and_op2;
-            return ChildrenToVisit::done;
-        });
-        return continueB;
-    }
+        }
 
-    Analyzer::Action analyzeRecursive(const Token* start) const {
-        Analyzer::Action result = Analyzer::Action::None;
-        visitAstNodes(start, [&](const Token* tok) {
-            result |= analyzer->analyze(tok, Analyzer::Direction::Reverse);
-            if (result.isModified())
+        bool updateRecursive(Token* start) {
+            bool continueB = true;
+            visitAstNodes(start, [&](Token* tok) {
+                const Token* parent = tok->astParent();
+                while (Token::simpleMatch(parent, ":"))
+                    parent = parent->astParent();
+                if (isUnevaluated(tok) || isDeadCode(tok, parent))
+                    return ChildrenToVisit::none;
+                continueB &= update(tok);
+                if (continueB)
+                    return ChildrenToVisit::op1_and_op2;
                 return ChildrenToVisit::done;
-            return ChildrenToVisit::op1_and_op2;
-        });
-        return result;
-    }
+            });
+            return continueB;
+        }
 
-    Analyzer::Action analyzeRange(const Token* start, const Token* end) const {
-        Analyzer::Action result = Analyzer::Action::None;
-        for (const Token* tok = start; tok && tok != end; tok = tok->next()) {
-            Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Reverse);
-            if (action.isModified())
-                return action;
-            result |= action;
+        Analyzer::Action analyzeRecursive(const Token* start) const {
+            Analyzer::Action result = Analyzer::Action::None;
+            visitAstNodes(start, [&](const Token* tok) {
+                result |= analyzer->analyze(tok, Analyzer::Direction::Reverse);
+                if (result.isModified())
+                    return ChildrenToVisit::done;
+                return ChildrenToVisit::op1_and_op2;
+            });
+            return result;
         }
-        return result;
-    }
 
-    Token* isDeadCode(Token* tok, const Token* end = nullptr) const {
-        int opSide = 0;
-        for (; tok && tok->astParent(); tok = tok->astParent()) {
-            if (tok == end)
-                break;
-            Token* parent = tok->astParent();
-            if (Token::simpleMatch(parent, ":")) {
-                if (astIsLHS(tok))
-                    opSide = 1;
-                else if (astIsRHS(tok))
-                    opSide = 2;
-                else
-                    opSide = 0;
+        Analyzer::Action analyzeRange(const Token* start, const Token* end) const {
+            Analyzer::Action result = Analyzer::Action::None;
+            for (const Token* tok = start; tok && tok != end; tok = tok->next()) {
+                Analyzer::Action action = analyzer->analyze(tok, Analyzer::Direction::Reverse);
+                if (action.isModified())
+                    return action;
+                result |= action;
             }
-            if (tok != parent->astOperand2())
-                continue;
-            if (Token::simpleMatch(parent, ":"))
-                parent = parent->astParent();
-            if (!Token::Match(parent, "%oror%|&&|?"))
-                continue;
-            const Token* condTok = parent->astOperand1();
-            if (!condTok)
-                continue;
-            bool checkThen, checkElse;
-            std::tie(checkThen, checkElse) = evalCond(condTok);
+            return result;
+        }
 
-            if (parent->str() == "?") {
-                if (checkElse && opSide == 1)
+        Token* isDeadCode(Token* tok, const Token* end = nullptr) const {
+            int opSide = 0;
+            for (; tok && tok->astParent(); tok = tok->astParent()) {
+                if (tok == end)
+                    break;
+                Token* parent = tok->astParent();
+                if (Token::simpleMatch(parent, ":")) {
+                    if (astIsLHS(tok))
+                        opSide = 1;
+                    else if (astIsRHS(tok))
+                        opSide = 2;
+                    else
+                        opSide = 0;
+                }
+                if (tok != parent->astOperand2())
+                    continue;
+                if (Token::simpleMatch(parent, ":"))
+                    parent = parent->astParent();
+                if (!Token::Match(parent, "%oror%|&&|?"))
+                    continue;
+                const Token* condTok = parent->astOperand1();
+                if (!condTok)
+                    continue;
+                bool checkThen, checkElse;
+                std::tie(checkThen, checkElse) = evalCond(condTok);
+
+                if (parent->str() == "?") {
+                    if (checkElse && opSide == 1)
+                        return parent;
+                    if (checkThen && opSide == 2)
+                        return parent;
+                }
+                if (!checkThen && parent->str() == "&&")
                     return parent;
-                if (checkThen && opSide == 2)
+                if (!checkElse && parent->str() == "||")
                     return parent;
             }
-            if (!checkThen && parent->str() == "&&")
-                return parent;
-            if (!checkElse && parent->str() == "||")
-                return parent;
+            return nullptr;
         }
-        return nullptr;
-    }
 
-    void traverse(Token* start, const Token* end = nullptr) {
-        if (start == end)
-            return;
-        std::size_t i = start->index();
-        for (Token* tok = start->previous(); succeeds(tok, end); tok = tok->previous()) {
-            if (tok->index() >= i)
-                throw InternalError(tok, "Cyclic reverse analysis.");
-            i = tok->index();
-            if (tok == start || (tok->str() == "{" && (tok->scope()->type == Scope::ScopeType::eFunction ||
-                                                       tok->scope()->type == Scope::ScopeType::eLambda))) {
-                const Function* f = tok->scope()->function;
-                if (f && f->isConstructor()) {
-                    if (const Token* initList = f->constructorMemberInitialization())
-                        traverse(tok->previous(), tok->tokAt(initList->index() - tok->index()));
+        /**
+         * @throws InternalError thrown on cyclic analysis
+         */
+        void traverse(Token* start, const Token* end = nullptr) {
+            if (start == end)
+                return;
+            std::size_t i = start->index();
+            for (Token* tok = start->previous(); succeeds(tok, end); tok = tok->previous()) {
+                if (tok->index() >= i)
+                    throw InternalError(tok, "Cyclic reverse analysis.");
+                i = tok->index();
+                if (tok == start || (tok->str() == "{" && (tok->scope()->type == ScopeType::eFunction ||
+                                                           tok->scope()->type == ScopeType::eLambda))) {
+                    const Function* f = tok->scope()->function;
+                    if (f && f->isConstructor()) {
+                        if (const Token* initList = f->constructorMemberInitialization())
+                            traverse(tok->previous(), tok->tokAt(initList->index() - tok->index()));
+                    }
+                    break;
                 }
-                break;
-            }
-            if (Token::Match(tok, "return|break|continue"))
-                break;
-            if (Token::Match(tok, "%name% :"))
-                break;
-            if (Token::simpleMatch(tok, ":"))
-                continue;
-            // Evaluate LHS of assignment before RHS
-            if (Token* assignTok = assignExpr(tok)) {
-                // If assignTok has broken ast then stop
-                if (!assignTok->astOperand1() || !assignTok->astOperand2())
+                if (Token::Match(tok, "return|break|continue"))
+                    break;
+                if (Token::Match(tok, "%name% :"))
                     break;
-                Token* assignTop = assignTok;
-                bool continueB = true;
-                while (assignTop->isAssignmentOp()) {
-                    if (!Token::Match(assignTop->astOperand1(), "%assign%")) {
-                        continueB &= updateRecursive(assignTop->astOperand1());
+                if (Token::simpleMatch(tok, ":"))
+                    continue;
+                // Evaluate LHS of assignment before RHS
+                if (Token* assignTok = assignExpr(tok)) {
+                    // If assignTok has broken ast then stop
+                    if (!assignTok->astOperand1() || !assignTok->astOperand2())
+                        break;
+                    Token* assignTop = assignTok;
+                    bool continueB = true;
+                    while (assignTop->isAssignmentOp()) {
+                        if (!Token::Match(assignTop->astOperand1(), "%assign%")) {
+                            continueB &= updateRecursive(assignTop->astOperand1());
+                        }
+                        if (!assignTop->astParent())
+                            break;
+                        assignTop = assignTop->astParent();
+                    }
+                    // Is assignment in dead code
+                    if (Token* parent = isDeadCode(assignTok)) {
+                        tok = parent;
+                        continue;
+                    }
+                    // Simple assign
+                    if (assignTok->str() == "=" && (assignTok->astParent() == assignTop || assignTok == assignTop)) {
+                        Analyzer::Action rhsAction =
+                            analyzer->analyze(assignTok->astOperand2(), Analyzer::Direction::Reverse);
+                        Analyzer::Action lhsAction =
+                            analyzer->analyze(assignTok->astOperand1(), Analyzer::Direction::Reverse);
+                        // Assignment from
+                        if (rhsAction.isRead() && !lhsAction.isInvalid() && assignTok->astOperand1()->exprId() > 0) {
+                            const std::string info = "Assignment from '" + assignTok->expressionString() + "'";
+                            ValuePtr<Analyzer> a = analyzer->reanalyze(assignTok->astOperand1(), info);
+                            if (a) {
+                                valueFlowGenericForward(nextAfterAstRightmostLeaf(assignTok->astOperand2()),
+                                                        assignTok->astOperand2()->scope()->bodyEnd,
+                                                        a,
+                                                        tokenlist,
+                                                        errorLogger,
+                                                        settings);
+                            }
+                            // Assignment to
+                        } else if (lhsAction.matches() && !assignTok->astOperand2()->hasKnownIntValue() &&
+                                   assignTok->astOperand2()->exprId() > 0 &&
+                                   isConstExpression(assignTok->astOperand2(), settings.library)) {
+                            const std::string info = "Assignment to '" + assignTok->expressionString() + "'";
+                            ValuePtr<Analyzer> a = analyzer->reanalyze(assignTok->astOperand2(), info);
+                            if (a) {
+                                valueFlowGenericForward(nextAfterAstRightmostLeaf(assignTok->astOperand2()),
+                                                        assignTok->astOperand2()->scope()->bodyEnd,
+                                                        a,
+                                                        tokenlist,
+                                                        errorLogger,
+                                                        settings);
+                                valueFlowGenericReverse(assignTok->astOperand1()->previous(), end, a, tokenlist, errorLogger, settings);
+                            }
+                        }
                     }
-                    if (!assignTop->astParent())
+                    if (!continueB)
                         break;
-                    assignTop = assignTop->astParent();
-                }
-                // Is assignment in dead code
-                if (Token* parent = isDeadCode(assignTok)) {
-                    tok = parent;
+                    if (!updateRecursive(assignTop->astOperand2()))
+                        break;
+                    tok = previousBeforeAstLeftmostLeaf(assignTop)->next();
                     continue;
                 }
-                // Simple assign
-                if (assignTok->str() == "=" && (assignTok->astParent() == assignTop || assignTok == assignTop)) {
-                    Analyzer::Action rhsAction =
-                        analyzer->analyze(assignTok->astOperand2(), Analyzer::Direction::Reverse);
-                    Analyzer::Action lhsAction =
-                        analyzer->analyze(assignTok->astOperand1(), Analyzer::Direction::Reverse);
-                    // Assignment from
-                    if (rhsAction.isRead() && !lhsAction.isInvalid() && assignTok->astOperand1()->exprId() > 0) {
-                        const std::string info = "Assignment from '" + assignTok->expressionString() + "'";
-                        ValuePtr<Analyzer> a = analyzer->reanalyze(assignTok->astOperand1(), info);
-                        if (a) {
-                            valueFlowGenericForward(nextAfterAstRightmostLeaf(assignTok->astOperand2()),
-                                                    assignTok->astOperand2()->scope()->bodyEnd,
-                                                    a,
-                                                    settings);
-                        }
-                        // Assignment to
-                    } else if (lhsAction.matches() && !assignTok->astOperand2()->hasKnownIntValue() &&
-                               assignTok->astOperand2()->exprId() > 0 &&
-                               isConstExpression(assignTok->astOperand2(), settings.library, true)) {
-                        const std::string info = "Assignment to '" + assignTok->expressionString() + "'";
-                        ValuePtr<Analyzer> a = analyzer->reanalyze(assignTok->astOperand2(), info);
-                        if (a) {
-                            valueFlowGenericForward(nextAfterAstRightmostLeaf(assignTok->astOperand2()),
-                                                    assignTok->astOperand2()->scope()->bodyEnd,
-                                                    a,
-                                                    settings);
-                            valueFlowGenericReverse(assignTok->astOperand1()->previous(), end, a, settings);
-                        }
+                if (tok->str() == ")" && !isUnevaluated(tok)) {
+                    if (Token* top = getTopFunction(tok->link())) {
+                        if (!updateRecursive(top))
+                            break;
+                        Token* next = previousBeforeAstLeftmostLeaf(top);
+                        if (next && precedes(next, tok))
+                            tok = next->next();
                     }
+                    continue;
                 }
-                if (!continueB)
-                    break;
-                if (!updateRecursive(assignTop->astOperand2()))
-                    break;
-                tok = previousBeforeAstLeftmostLeaf(assignTop)->next();
-                continue;
-            }
-            if (tok->str() == ")" && !isUnevaluated(tok)) {
-                if (Token* top = getTopFunction(tok->link())) {
-                    if (!updateRecursive(top))
+                if (tok->str() == "}") {
+                    Token* condTok = getCondTokFromEnd(tok);
+                    if (!condTok)
                         break;
-                    Token* next = previousBeforeAstLeftmostLeaf(top);
-                    if (next && precedes(next, tok))
-                        tok = next->next();
-                }
-                continue;
-            }
-            if (tok->str() == "}") {
-                Token* condTok = getCondTokFromEnd(tok);
-                if (!condTok)
-                    break;
-                Analyzer::Action condAction = analyzeRecursive(condTok);
-                const bool inLoop = condTok->astTop() && 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))
+                    Analyzer::Action condAction = analyzeRecursive(condTok);
+                    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;
+                    const bool hasElse = Token::simpleMatch(tok->link()->tokAt(-2), "} else {");
+                    if (hasElse) {
+                        thenEnd = tok->link()->tokAt(-2);
+                    } else {
+                        thenEnd = tok;
+                    }
+
+                    Analyzer::Action thenAction = analyzeRange(thenEnd->link(), thenEnd);
+                    Analyzer::Action elseAction = Analyzer::Action::None;
+                    if (hasElse) {
+                        elseAction = analyzeRange(tok->link(), tok);
+                    }
+                    if (thenAction.isModified() && inLoop)
+                        break;
+                    if (thenAction.isModified() && !elseAction.isModified())
+                        analyzer->assume(condTok, hasElse);
+                    else if (elseAction.isModified() && !thenAction.isModified())
+                        analyzer->assume(condTok, !hasElse);
+                    // Bail if one of the branches are read to avoid FPs due to over constraints
+                    else if (thenAction.isIdempotent() || elseAction.isIdempotent() || thenAction.isRead() ||
+                             elseAction.isRead())
+                        break;
+                    if (thenAction.isInvalid() || elseAction.isInvalid())
+                        break;
+
+                    if (!thenAction.isModified() && !elseAction.isModified())
+                        valueFlowGenericForward(condTok, analyzer, tokenlist, errorLogger, settings);
+                    else if (condAction.isRead())
                         break;
+                    // If the condition modifies the variable then bail
                     if (condAction.isModified())
                         break;
-                    valueFlowGenericForward(condTok, analyzer, settings);
+                    tok = jumpToStart(tok->link());
+                    continue;
                 }
-                Token* thenEnd;
-                const bool hasElse = Token::simpleMatch(tok->link()->tokAt(-2), "} else {");
-                if (hasElse) {
-                    thenEnd = tok->link()->tokAt(-2);
-                } else {
-                    thenEnd = tok;
+                if (tok->str() == "{") {
+                    if (tok->previous() &&
+                        (Token::simpleMatch(tok->previous(), "do") ||
+                         (tok->strAt(-1) == ")" && Token::Match(tok->linkAt(-1)->previous(), "for|while (")))) {
+                        Analyzer::Action action = analyzeRange(tok, tok->link());
+                        if (action.isModified())
+                            break;
+                    }
+                    Token* condTok = getCondTokFromEnd(tok->link());
+                    if (condTok) {
+                        Analyzer::Result r = valueFlowGenericForward(condTok, analyzer, tokenlist, errorLogger, settings);
+                        if (r.action.isModified())
+                            break;
+                    }
+                    tok = jumpToStart(tok);
+                    continue;
                 }
-
-                Analyzer::Action thenAction = analyzeRange(thenEnd->link(), thenEnd);
-                Analyzer::Action elseAction = Analyzer::Action::None;
-                if (hasElse) {
-                    elseAction = analyzeRange(tok->link(), tok);
+                if (Token* next = isUnevaluated(tok)) {
+                    tok = next;
+                    continue;
                 }
-                if (thenAction.isModified() && inLoop)
-                    break;
-                if (thenAction.isModified() && !elseAction.isModified())
-                    analyzer->assume(condTok, hasElse);
-                else if (elseAction.isModified() && !thenAction.isModified())
-                    analyzer->assume(condTok, !hasElse);
-                // Bail if one of the branches are read to avoid FPs due to over constraints
-                else if (thenAction.isIdempotent() || elseAction.isIdempotent() || thenAction.isRead() ||
-                         elseAction.isRead())
-                    break;
-                if (thenAction.isInvalid() || elseAction.isInvalid())
-                    break;
-
-                if (!thenAction.isModified() && !elseAction.isModified())
-                    valueFlowGenericForward(condTok, analyzer, settings);
-                else if (condAction.isRead())
-                    break;
-                // If the condition modifies the variable then bail
-                if (condAction.isModified())
-                    break;
-                tok = condTok->astTop()->previous();
-                continue;
-            }
-            if (tok->str() == "{") {
-                if (tok->previous() &&
-                    (Token::simpleMatch(tok->previous(), "do") ||
-                     (tok->strAt(-1) == ")" && Token::Match(tok->linkAt(-1)->previous(), "for|while (")))) {
-                    Analyzer::Action action = analyzeRange(tok, tok->link());
-                    if (action.isModified())
-                        break;
+                if (Token* parent = isDeadCode(tok)) {
+                    tok = parent;
+                    continue;
                 }
-                Token* condTok = getCondTokFromEnd(tok->link());
-                if (condTok) {
-                    Analyzer::Result r = valueFlowGenericForward(condTok, analyzer, settings);
-                    if (r.action.isModified())
+                if (tok->str() == "case") {
+                    const Scope* scope = tok->scope();
+                    while (scope && scope->type != ScopeType::eSwitch)
+                        scope = scope->nestedIn;
+                    if (!scope || scope->type != ScopeType::eSwitch)
                         break;
+                    tok = tok->tokAt(scope->bodyStart->index() - tok->index() - 1);
+                    continue;
                 }
-                if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
-                    tok = tok->linkAt(-2);
-                if (Token::simpleMatch(tok->previous(), ") {"))
-                    tok = tok->previous()->link();
-                continue;
-            }
-            if (Token* next = isUnevaluated(tok)) {
-                tok = next;
-                continue;
-            }
-            if (Token* parent = isDeadCode(tok)) {
-                tok = parent;
-                continue;
-            }
-            if (tok->str() == "case") {
-                const Scope* scope = tok->scope();
-                while (scope && scope->type != Scope::eSwitch)
-                    scope = scope->nestedIn;
-                if (!scope || scope->type != Scope::eSwitch)
+                if (!update(tok))
                     break;
-                tok = tok->tokAt(scope->bodyStart->index() - tok->index() - 1);
-                continue;
             }
-            if (!update(tok))
-                break;
         }
-    }
 
-    static Token* assignExpr(Token* tok) {
-        if (Token::Match(tok, ")|}"))
-            tok = tok->link();
-        while (tok->astParent() && (astIsRHS(tok) || !tok->astParent()->isBinaryOp())) {
-            if (tok->astParent()->isAssignmentOp())
-                return tok->astParent();
-            tok = tok->astParent();
+        static Token* assignExpr(Token* tok) {
+            if (Token::Match(tok, ")|}"))
+                tok = tok->link();
+            while (tok->astParent() && (astIsRHS(tok) || !tok->astParent()->isBinaryOp())) {
+                if (tok->astParent()->isAssignmentOp())
+                    return tok->astParent();
+                tok = tok->astParent();
+            }
+            return nullptr;
         }
-        return nullptr;
-    }
 
-    static Token* isUnevaluated(Token* tok) {
-        if (Token::Match(tok, ")|>") && tok->link()) {
-            Token* start = tok->link();
-            if (Token::Match(start->previous(), "sizeof|decltype ("))
-                return start->previous();
-            if (Token::simpleMatch(start, "<"))
-                return start;
+        static Token* isUnevaluated(Token* tok) {
+            if (Token::Match(tok, ")|>") && tok->link()) {
+                Token* start = tok->link();
+                if (::isUnevaluated(start->previous()))
+                    return start->previous();
+                if (Token::simpleMatch(start, "<"))
+                    return start;
+            }
+            return nullptr;
         }
-        return nullptr;
-    }
-};
+    };
+}
 
-void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const Settings& settings)
+void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (a->invalid())
         return;
-    ReverseTraversal rt{a, settings};
+    ReverseTraversal rt{a, tokenlist, errorLogger, settings};
     rt.traverse(start, end);
 }
diff --git a/lib/reverseanalyzer.h b/lib/reverseanalyzer.h
index 801b6276c86..2a9877fb337 100644
--- a/lib/reverseanalyzer.h
+++ b/lib/reverseanalyzer.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -20,11 +20,13 @@
 #define reverseanalyzerH
 
 struct Analyzer;
+class ErrorLogger;
 class Settings;
 class Token;
+class TokenList;
 template<class T>
 class ValuePtr;
 
-void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const Settings& settings);
+void valueFlowGenericReverse(Token* start, const Token* end, const ValuePtr<Analyzer>& a, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings);
 
 #endif
diff --git a/lib/sarifreport.cpp b/lib/sarifreport.cpp
new file mode 100644
index 00000000000..ce142430f54
--- /dev/null
+++ b/lib/sarifreport.cpp
@@ -0,0 +1,225 @@
+/*
+ * 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 "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..90667322b2f
--- /dev/null
+++ b/lib/sarifreport.h
@@ -0,0 +1,53 @@
+/*
+ * 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 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 c49ca23561e..8e4b8d2a6d4 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-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
@@ -16,107 +16,198 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
-#include "timer.h"
+#include "suppressions.h"
+#include "utils.h"
 #include "vfvalue.h"
 
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
+#include <iostream>
+#include <map>
 #include <utility>
 
-#define PICOJSON_USE_INT64
-#include <picojson.h>
+#include "json.h"
+
+#ifndef _WIN32
+#include <unistd.h> // for getpid()
+#else
+#include <process.h> // for getpid()
+#endif
+
 
 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";
 const char Settings::SafeChecks::XmlInternalFunctions[] = "internal-functions";
 const char Settings::SafeChecks::XmlExternalVariables[] = "external-variables";
 
+static int getPid()
+{
+#ifndef _WIN32
+    return getpid();
+#else
+    return _getpid();
+#endif
+}
+
 Settings::Settings()
-    : checkAllConfigurations(true),
-    checkConfiguration(false),
-    checkHeaders(true),
-    checkLibrary(false),
-    checksMaxTime(0),
-    checkUnusedTemplates(true),
-    clang(false),
-    clangExecutable("clang"),
-    clangTidy(false),
-    clearIncludeCache(false),
-    daca(false),
-    debugnormal(false),
-    debugSimplified(false),
-    debugtemplate(false),
-    debugwarnings(false),
-    dump(false),
-    enforcedLang(Language::None),
-    exceptionHandling(false),
-    exitCode(0),
-    force(false),
-    inlineSuppressions(false),
-    jobs(1),
-    loadAverage(0),
-    maxConfigs(12),
-    maxCtuDepth(2),
-    maxTemplateRecursion(100),
-    performanceValueFlowMaxTime(-1),
-    preprocessOnly(false),
-    quiet(false),
-    relativePaths(false),
-    reportProgress(false),
-    showtime(SHOWTIME_MODES::SHOWTIME_NONE),
-    templateMaxTime(0),
-    typedefMaxTime(0),
-    valueFlowMaxIterations(4),
-    verbose(false),
-    xml(false),
-    xml_version(2)
 {
     severity.setEnabled(Severity::error, true);
     certainty.setEnabled(Certainty::normal, true);
-    setCheckLevelNormal();
+    setCheckLevel(Settings::CheckLevel::exhaustive);
+    executor = defaultExecutor();
+    pid = getPid();
 }
 
-void Settings::loadCppcheckCfg()
+std::string Settings::loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug)
 {
-    std::string fileName = Path::getPathFromFilename(exename) + "cppcheck.cfg";
+    static const std::string cfgFilename = "cppcheck.cfg";
+    std::string fileName;
 #ifdef FILESDIR
-    if (Path::fileExists(FILESDIR "/cppcheck.cfg"))
-        fileName = FILESDIR "/cppcheck.cfg";
+    {
+        const std::string filesdirCfg = Path::join(FILESDIR, cfgFilename);
+        if (debug)
+            std::cout << "looking for '" << filesdirCfg << "'" << std::endl;
+        if (Path::isFile(filesdirCfg))
+            fileName = filesdirCfg;
+    }
 #endif
+    // cppcheck-suppress knownConditionTrueFalse
+    if (fileName.empty()) {
+        // TODO: make sure that exename is set
+        fileName = Path::join(Path::getPathFromFilename(settings.exename), cfgFilename);
+        if (debug)
+            std::cout << "looking for '" << fileName << "'" << std::endl;
+        if (!Path::isFile(fileName))
+        {
+            if (debug)
+                std::cout << "no configuration found" << std::endl;
+            return "";
+        }
+    }
 
     std::ifstream fin(fileName);
     if (!fin.is_open())
-        return;
+        return "could not open file";
     picojson::value json;
     fin >> json;
-    if (!picojson::get_last_error().empty())
-        return;
-    picojson::object obj = json.get<picojson::object>();
-    if (obj.count("productName") && obj["productName"].is<std::string>())
-        cppcheckCfgProductName = obj["productName"].get<std::string>();
-    if (obj.count("about") && obj["about"].is<std::string>())
-        cppcheckCfgAbout = obj["about"].get<std::string>();
-    if (obj.count("addons") && obj["addons"].is<picojson::array>()) {
-        for (const picojson::value &v : obj["addons"].get<picojson::array>()) {
-            const std::string &s = v.get<std::string>();
-            if (!Path::isAbsolute(s))
-                addons.emplace(Path::getPathFromFilename(fileName) + s);
-            else
-                addons.emplace(s);
+    {
+        const std::string& lastErr = picojson::get_last_error();
+        if (!lastErr.empty())
+            return "not a valid JSON - " + lastErr;
+    }
+    const picojson::object& obj = json.get<picojson::object>();
+    {
+        const auto it = utils::as_const(obj).find("productName");
+        if (it != obj.cend()) {
+            const auto& v = it->second;
+            if (!v.is<std::string>())
+                return "'productName' is not a string";
+            settings.cppcheckCfgProductName = v.get<std::string>();
         }
     }
-    if (obj.count("suppressions") && obj["suppressions"].is<picojson::array>()) {
-        for (const picojson::value &v : obj["suppressions"].get<picojson::array>())
-            nomsg.addSuppressionLine(v.get<std::string>());
+    {
+        const auto it = utils::as_const(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 = utils::as_const(obj).find("about");
+        if (it != obj.cend()) {
+            const auto& v = it->second;
+            if (!v.is<std::string>())
+                return "'about' is not a string";
+            settings.cppcheckCfgAbout = v.get<std::string>();
+        }
     }
+    {
+        const auto it = utils::as_const(obj).find("addons");
+        if (it != obj.cend()) {
+            const auto& entry = it->second;
+            if (!entry.is<picojson::array>())
+                return "'addons' is not an array";
+            for (const picojson::value &v : entry.get<picojson::array>())
+            {
+                if (!v.is<std::string>())
+                    return "'addons' array entry is not a string";
+                const std::string &s = v.get<std::string>();
+                if (!Path::isAbsolute(s))
+                    settings.addons.emplace(Path::join(Path::getPathFromFilename(fileName), s));
+                else
+                    settings.addons.emplace(s);
+            }
+        }
+    }
+    {
+        const auto it = utils::as_const(obj).find("suppressions");
+        if (it != obj.cend()) {
+            const auto& entry = it->second;
+            if (!entry.is<picojson::array>())
+                return "'suppressions' is not an array";
+            for (const picojson::value &v : entry.get<picojson::array>())
+            {
+                if (!v.is<std::string>())
+                    return "'suppressions' array entry is not a string";
+                const std::string &s = v.get<std::string>();
+                const std::string err = suppressions.nomsg.addSuppressionLine(s);
+                if (!err.empty())
+                    return "could not parse suppression '" + s + "' - " + err;
+            }
+        }
+    }
+    {
+        const auto it = utils::as_const(obj).find("safety");
+        if (it != obj.cend()) {
+            const auto& v = it->second;
+            if (!v.is<bool>())
+                return "'safety' is not a bool";
+            settings.safety = v.get<bool>();
+        }
+    }
+
+    settings.settingsFiles.emplace_back(std::move(fileName));
+
+    return "";
+}
+
+std::pair<std::string, std::string> Settings::getNameAndVersion(const std::string& productName) {
+    if (productName.empty())
+        return {};
+    const std::string::size_type pos1 = productName.rfind(' ');
+    if (pos1 == std::string::npos)
+        return {};
+    if (pos1 + 2 >= productName.length())
+        return {};
+    for (auto pos2 = pos1 + 1; pos2 < productName.length(); ++pos2) {
+        const char c = productName[pos2];
+        const char prev = productName[pos2-1];
+        if (std::isdigit(c))
+            continue;
+        if (c == '.' && std::isdigit(prev))
+            continue;
+        if (c == 's' && pos2 + 1 == productName.length() && std::isdigit(prev))
+            continue;
+        return {};
+    }
+    return {productName.substr(0, pos1), productName.substr(pos1+1)};
 }
 
-std::string Settings::parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity::SeverityType>, SimpleEnableGroup<Checks>> &groups)
+std::string Settings::parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity>, SimpleEnableGroup<Checks>> &groups)
 {
     // Enable parameters may be comma separated...
     if (str.find(',') != std::string::npos) {
@@ -141,9 +232,9 @@ std::string Settings::parseEnabled(const std::string &str, std::tuple<SimpleEnab
 
     if (str == "all") {
         // "error" is always enabled and cannot be controlled - so exclude it from "all"
-        SimpleEnableGroup<Severity::SeverityType> newSeverity;
+        SimpleEnableGroup<Severity> newSeverity;
         newSeverity.fill();
-        newSeverity.disable(Severity::SeverityType::error);
+        newSeverity.disable(Severity::error);
         severity.enable(newSeverity);
         checks.enable(Checks::missingInclude);
         checks.enable(Checks::unusedFunction);
@@ -189,7 +280,7 @@ std::string Settings::removeEnabled(const std::string &str)
 
 std::string Settings::applyEnabled(const std::string &str, bool enable)
 {
-    std::tuple<SimpleEnableGroup<Severity::SeverityType>, SimpleEnableGroup<Checks>> groups;
+    std::tuple<SimpleEnableGroup<Severity>, SimpleEnableGroup<Checks>> groups;
     std::string errmsg = parseEnabled(str, groups);
     if (!errmsg.empty())
         return (enable ? "--enable" : "--disable") + errmsg;
@@ -205,8 +296,8 @@ std::string Settings::applyEnabled(const std::string &str, bool enable)
         checks.disable(c);
     }
     // FIXME: hack to make sure "error" is always enabled
-    severity.enable(Severity::SeverityType::error);
-    return errmsg;
+    severity.enable(Severity::error);
+    return {};
 }
 
 bool Settings::isEnabled(const ValueFlow::Value *value, bool inconclusiveCheck) const
@@ -223,17 +314,424 @@ void Settings::loadSummaries()
     Summaries::loadReturn(buildDir, summaryReturn);
 }
 
+void Settings::setCheckLevel(CheckLevel level)
+{
+    if (level == CheckLevel::reduced) {
+        // Checking should finish quickly.
+        checkLevel = level;
+        vfOptions.maxSubFunctionArgs = 8;
+        vfOptions.maxIfCount = 100;
+        vfOptions.doConditionExpressionAnalysis = false;
+        vfOptions.maxForwardBranches = 4;
+        vfOptions.maxIterations = 1;
+    }
+    else if (level == CheckLevel::normal) {
+        // Checking should finish in reasonable time.
+        checkLevel = level;
+        vfOptions.maxSubFunctionArgs = 8;
+        vfOptions.maxIfCount = 100;
+        vfOptions.doConditionExpressionAnalysis = false;
+        vfOptions.maxForwardBranches = 4;
+    }
+    else if (level == CheckLevel::exhaustive) {
+        // Checking can take a little while. ~ 10 times slower than normal analysis is OK.
+        checkLevel = CheckLevel::exhaustive;
+        vfOptions.maxIfCount = -1;
+        vfOptions.maxSubFunctionArgs = 256;
+        vfOptions.doConditionExpressionAnalysis = true;
+        vfOptions.maxForwardBranches = -1;
+    }
+}
+
+// These tables are auto generated from Cppcheck Premium script
+
+static const std::set<std::string> autosarCheckers{
+    "accessMoved",
+    "argumentSize",
+    "arrayIndexOutOfBounds",
+    "arrayIndexOutOfBoundsCond",
+    "arrayIndexThenCheck",
+    "bufferAccessOutOfBounds",
+    "comparePointers",
+    "constParameter",
+    "cstyleCast",
+    "ctuOneDefinitionRuleViolation",
+    "doubleFree",
+    "duplInheritedMember",
+    "duplicateBreak",
+    "exceptThrowInDestructor",
+    "funcArgNamesDifferent",
+    "functionConst",
+    "functionStatic",
+    "invalidContainer",
+    "memleak",
+    "mismatchAllocDealloc",
+    "missingReturn",
+    "negativeIndex",
+    "noExplicitConstructor",
+    "nullPointer",
+    "nullPointerArithmetic",
+    "nullPointerArithmeticRedundantCheck",
+    "nullPointerDefaultArg",
+    "nullPointerRedundantCheck",
+    "objectIndex",
+    "overlappingWriteFunction",
+    "overlappingWriteUnion",
+    "pointerOutOfBounds",
+    "pointerOutOfBoundsCond",
+    "preprocessorErrorDirective",
+    "redundantAssignment",
+    "redundantInitialization",
+    "returnDanglingLifetime",
+    "shadowArgument",
+    "shadowFunction",
+    "shadowVariable",
+    "shiftTooManyBits",
+    "sizeofFunctionCall",
+    "throwInNoexceptFunction",
+    "uninitMemberVar",
+    "uninitdata",
+    "unreachableCode",
+    "unreadVariable",
+    "unsignedLessThanZero",
+    "unusedFunction",
+    "unusedStructMember",
+    "unusedValue",
+    "unusedVariable",
+    "useInitializationList",
+    "variableScope",
+    "virtualCallInConstructor",
+    "zerodiv",
+    "zerodivcond"
+};
 
-void Settings::setCheckLevelExhaustive()
+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",
+    "invalidScanfFormatWidth",
+    "invalidscanf",
+    "leakReturnValNotUsed",
+    "leakUnsafeArgAlloc",
+    "memleak",
+    "memleakOnRealloc",
+    "mismatchAllocDealloc",
+    "missingReturn",
+    "negativeIndex",
+    "nullPointer",
+    "nullPointerArithmetic",
+    "nullPointerArithmeticRedundantCheck",
+    "nullPointerDefaultArg",
+    "nullPointerRedundantCheck",
+    "objectIndex",
+    "pointerOutOfBounds",
+    "pointerOutOfBoundsCond",
+    "preprocessorErrorDirective",
+    "resourceLeak",
+    "returnDanglingLifetime",
+    "sizeofCalculation",
+    "stringLiteralWrite",
+    "uninitStructMember",
+    "uninitdata",
+    "uninitvar",
+    "unknownEvaluationOrder",
+    "useClosedFile",
+    "wrongPrintfScanfArgNum",
+    "wrongPrintfScanfParameterPositionError"
+};
+
+static const std::set<std::string> certCppCheckers{
+    "IOWithoutPositioning",
+    "accessMoved",
+    "comparePointers",
+    "containerOutOfBounds",
+    "ctuOneDefinitionRuleViolation",
+    "danglingLifetime",
+    "danglingReference",
+    "danglingTempReference",
+    "danglingTemporaryLifetime",
+    "deallocThrow",
+    "deallocuse",
+    "doubleFree",
+    "eraseDereference",
+    "exceptThrowInDestructor",
+    "initializerList",
+    "invalidContainer",
+    "memleak",
+    "mismatchAllocDealloc",
+    "missingReturn",
+    "nullPointer",
+    "operatorEqToSelf",
+    "returnDanglingLifetime",
+    "sizeofCalculation",
+    "uninitStructMember",
+    "uninitdata",
+    "uninitvar",
+    "virtualCallInConstructor",
+    "virtualDestructor"
+};
+
+static const std::set<std::string> misrac2012Checkers{
+    "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",
+    "unusedLabel",
+    "unusedVariable",
+    "useClosedFile",
+    "writeReadOnlyFile"
+};
+
+static const std::set<std::string> misrac2023Checkers{
+    "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",
+    "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",
+    "unusedLabel",
+    "unusedVariable",
+    "useClosedFile",
+    "writeReadOnlyFile"
+};
+
+static const std::set<std::string> misracpp2008Checkers{
+    "autoVariables",
+    "comparePointers",
+    "constParameter",
+    "constVariable",
+    "cstyleCast",
+    "ctuOneDefinitionRuleViolation",
+    "danglingLifetime",
+    "duplInheritedMember",
+    "duplicateBreak",
+    "exceptThrowInDestructor",
+    "funcArgNamesDifferent",
+    "functionConst",
+    "functionStatic",
+    "missingReturn",
+    "noExplicitConstructor",
+    "overlappingWriteFunction",
+    "overlappingWriteUnion",
+    "pointerOutOfBounds",
+    "preprocessorErrorDirective",
+    "redundantAssignment",
+    "redundantInitialization",
+    "returnReference",
+    "returnTempReference",
+    "shadowVariable",
+    "shiftTooManyBits",
+    "sizeofFunctionCall",
+    "uninitDerivedMemberVar",
+    "uninitDerivedMemberVarPrivate",
+    "uninitMemberVar",
+    "uninitMemberVarPrivate",
+    "uninitStructMember",
+    "uninitdata",
+    "uninitvar",
+    "unknownEvaluationOrder",
+    "unreachableCode",
+    "unreadVariable",
+    "unsignedLessThanZero",
+    "unusedFunction",
+    "unusedStructMember",
+    "unusedVariable",
+    "variableScope",
+    "virtualCallInConstructor"
+};
+
+static const std::set<std::string> misracpp2023Checkers{
+    "accessForwarded",
+    "accessMoved",
+    "autoVariables",
+    "compareBoolExpressionWithInt",
+    "comparePointers",
+    "compareValueOutOfTypeRangeError",
+    "constParameter",
+    "constParameterReference",
+    "ctuOneDefinitionRuleViolation",
+    "danglingLifetime",
+    "floatConversionOverflow",
+    "identicalConditionAfterEarlyExit",
+    "identicalInnerCondition",
+    "ignoredReturnValue",
+    "invalidFunctionArg",
+    "invalidFunctionArgBool",
+    "invalidFunctionArgStr",
+    "knownConditionTrueFalse",
+    "missingReturn",
+    "noExplicitConstructor",
+    "operatorEqToSelf",
+    "overlappingWriteUnion",
+    "pointerOutOfBounds",
+    "pointerOutOfBoundsCond",
+    "preprocessorErrorDirective",
+    "redundantAssignInSwitch",
+    "redundantAssignment",
+    "redundantCopy",
+    "redundantInitialization",
+    "shadowVariable",
+    "subtractPointers",
+    "syntaxError",
+    "uninitMemberVar",
+    "uninitvar",
+    "unknownEvaluationOrder",
+    "unreachableCode",
+    "unreadVariable",
+    "virtualCallInConstructor"
+};
+
+bool Settings::isPremiumEnabled(const char id[]) const
 {
-    // Checking can take a little while. ~ 10 times slower than normal analysis is OK.
-    performanceValueFlowMaxIfCount = -1;
-    performanceValueFlowMaxSubFunctionArgs = 256;
+    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) || misrac2025Checkers.count(id)))
+        return true;
+    if (premiumArgs.find("misra-c++-2008") != std::string::npos && misracpp2008Checkers.count(id))
+        return true;
+    if (premiumArgs.find("misra-c++-2023") != std::string::npos && misracpp2023Checkers.count(id))
+        return true;
+    return false;
+}
+
+Settings::ExecutorType Settings::defaultExecutor()
+{
+    static constexpr ExecutorType defaultExecutor =
+#if defined(HAS_THREADING_MODEL_FORK)
+        ExecutorType::Process;
+#elif defined(HAS_THREADING_MODEL_THREAD)
+        ExecutorType::Thread;
+#endif
+    return defaultExecutor;
 }
 
-void Settings::setCheckLevelNormal()
+bool Settings::unusedFunctionOnly()
 {
-    // Checking should finish in reasonable time.
-    performanceValueFlowMaxSubFunctionArgs = 8;
-    performanceValueFlowMaxIfCount = 100;
+    const char* unusedFunctionOnly = std::getenv("UNUSEDFUNCTION_ONLY");
+    return unusedFunctionOnly && (std::strcmp(unusedFunctionOnly, "1") == 0);
 }
diff --git a/lib/settings.h b/lib/settings.h
index c77ad2392cc..04541cda08c 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-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
@@ -21,17 +21,16 @@
 #define settingsH
 //---------------------------------------------------------------------------
 
+#include "addoninfo.h"
 #include "config.h"
 #include "errortypes.h"
-#include "importproject.h"
 #include "library.h"
 #include "platform.h"
 #include "standards.h"
-#include "suppressions.h"
+#include "checkers.h"
 
 #include <algorithm>
 #include <atomic>
-#include <cstddef>
 #include <cstdint>
 #include <list>
 #include <set>
@@ -39,8 +38,20 @@
 #include <tuple>
 #include <vector>
 #include <unordered_set>
+#include <utility>
 
-enum class SHOWTIME_MODES;
+#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
+#include <cstdio>
+#endif
+
+#ifdef HAVE_RULES
+#include <memory>
+
+class Regex;
+#endif
+
+struct Suppressions;
+enum class ShowTime : std::uint8_t;
 namespace ValueFlow {
     class Value;
 }
@@ -62,16 +73,16 @@ class SimpleEnableGroup {
         mFlags = 0xFFFFFFFF;
     }
     bool isEnabled(T flag) const {
-        return (mFlags & (1U << (uint32_t)flag)) != 0;
+        return (mFlags & (1U << static_cast<uint32_t>(flag))) != 0;
     }
     void enable(T flag) {
-        mFlags |= (1U << (uint32_t)flag);
+        mFlags |= (1U << static_cast<uint32_t>(flag));
     }
     void enable(SimpleEnableGroup<T> group) {
         mFlags |= group.intValue();
     }
     void disable(T flag) {
-        mFlags &= ~(1U << (uint32_t)flag);
+        mFlags &= ~(1U << static_cast<uint32_t>(flag));
     }
     void disable(SimpleEnableGroup<T> group) {
         mFlags &= ~(group.intValue());
@@ -90,7 +101,8 @@ class SimpleEnableGroup {
  * to pass individual values to functions or constructors now or in the
  * future when we might have even more detailed settings.
  */
-class CPPCHECKLIB Settings {
+// NOLINTNEXTLINE(clang-analyzer-optin.performance.Padding)
+class CPPCHECKLIB WARN_UNUSED Settings {
 private:
 
     /** @brief terminate checking */
@@ -99,54 +111,68 @@ class CPPCHECKLIB Settings {
 public:
     Settings();
 
-    void loadCppcheckCfg();
+    static std::string loadCppcheckCfg(Settings& settings, Suppressions& suppressions, bool debug = false);
+
+    static std::pair<std::string, std::string> getNameAndVersion(const std::string& productName);
+
+    /** @brief Report type */
+    ReportType reportType = ReportType::normal;
 
     /** @brief addons, either filename of python/json file or json data */
     std::unordered_set<std::string> addons;
 
+    /** @brief the loaded addons infos */
+    std::vector<AddonInfo> addonInfos;
+
     /** @brief Path to the python interpreter to be used to run addons. */
     std::string addonPython;
 
+    /** @brief Analyze all configuration in Visual Studio project. */
+    bool analyzeAllVsConfigs{true};
+
     /** @brief Paths used as base for conversion to relative paths. */
     std::vector<std::string> basePaths;
 
     /** @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;
-
     /** Is the 'configuration checking' wanted? */
-    bool checkConfiguration;
+    bool checkConfiguration{};
 
     /**
      * Check code in the headers, this is on by default but can
      * be turned off to save CPU */
-    bool checkHeaders;
+    bool checkHeaders = true;
 
     /** Check for incomplete info in library files? */
-    bool checkLibrary;
+    bool checkLibrary{};
 
     /** @brief The maximum time in seconds for the checks of a single file */
-    int checksMaxTime;
+    int checksMaxTime{};
+
+    /** @brief --checkers-report=<filename> : Generate report of executed checkers */
+    std::string checkersReportFilename;
 
     /** @brief check unknown function return values */
-    std::set<std::string> checkUnknownFunctionReturn;
+    std::set<std::string> checkUnknownFunctionReturn; // TODO: move to Library?
 
     /** Check unused/uninstantiated templates */
-    bool checkUnusedTemplates;
+    bool checkUnusedTemplates = true;
 
     /** Use Clang */
-    bool clang;
+    bool clang{};
 
     /** Custom Clang executable */
-    std::string clangExecutable;
+    std::string clangExecutable = "clang";
 
     /** Use clang-tidy */
-    bool clangTidy;
+    bool clangTidy{};
+
+    /** Custom clang-tidy executable */
+    std::string clangTidyExecutable = "clang-tidy";
 
     /** Internal: Clear the simplecpp non-existing include cache */
-    bool clearIncludeCache;
+    bool clearIncludeCache{}; // internal
 
     /** @brief include paths excluded from checking the configuration */
     std::set<std::string> configExcludePaths;
@@ -157,58 +183,102 @@ class CPPCHECKLIB Settings {
     /** cppcheck.cfg: About text */
     std::string cppcheckCfgAbout;
 
+    /** @brief check Emacs marker to detect extension-less and *.h files as C++ */
+    bool cppHeaderProbe{};
+
     /** @brief Are we running from DACA script? */
-    bool daca;
+    bool daca{};
+
+    /** @brief Is --debug-ast given? */
+    bool debugast{};
+
+    /** @brief Is --debug-clang-output given? */
+    bool debugClangOutput{};
+
+    /** @brief Is --debug-ignore given? */
+    bool debugignore{};
+
+    /** @brief Internal: Is --debug-lookup or --debug-lookup=all given? */
+    bool debuglookup{};
+
+    /** @brief Internal: Is --debug-lookup=addon given? */
+    bool debuglookupAddon{};
+
+    /** @brief Internal: Is --debug-lookup=config given? */
+    bool debuglookupConfig{};
+
+    /** @brief Internal: Is --debug-lookup=library given? */
+    bool debuglookupLibrary{};
+
+    /** @brief Internal: Is --debug-lookup=platform given? */
+    bool debuglookupPlatform{};
 
     /** @brief Is --debug-normal given? */
-    bool debugnormal;
+    bool debugnormal{};
 
     /** @brief Is --debug-simplified given? */
-    bool debugSimplified;
+    bool debugSimplified{};
+
+    /** @brief Is --debug-symdb given? */
+    bool debugsymdb{};
 
     /** @brief Is --debug-template given? */
-    bool debugtemplate;
+    bool debugtemplate{};
+
+    /** @brief Is --debug-valueflow given? */
+    bool debugvalueflow{};
 
     /** @brief Is --debug-warnings given? */
-    bool debugwarnings;
+    bool debugwarnings{};
 
     /** @brief Is --dump given? */
-    bool dump;
-    std::string dumpFile;
-
-    enum Language {
-        None, C, CPP
-    };
+    bool dump{};
 
-    /** @brief Name of the language that is enforced. Empty per default. */
-    Language enforcedLang;
+    /** @brief Do not filter duplicated errors. */
+    bool emitDuplicates{};
 
+#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
     /** @brief Is --exception-handling given */
-    bool exceptionHandling;
+    bool exceptionHandling{};
+
+    FILE* exceptionOutput = stdout;
+#endif
+
+    enum class ExecutorType : std::uint8_t
+    {
+#ifdef HAS_THREADING_MODEL_THREAD
+        Thread,
+#endif
+#ifdef HAS_THREADING_MODEL_FORK
+        Process
+#endif
+    };
+
+    ExecutorType executor;
 
     // argv[0]
     std::string exename;
 
     /** @brief If errors are found, this value is returned from main().
         Default value is 0. */
-    int exitCode;
+    int exitCode{};
 
     /** @brief List of --file-filter for analyzing special files */
     std::vector<std::string> fileFilters;
 
     /** @brief Force checking the files with "too many" configurations (--force). */
-    bool force;
+    bool force{};
 
     /** @brief List of include paths, e.g. "my/includes/" which should be used
         for finding include files inside source files. (-I) */
     std::list<std::string> includePaths;
 
     /** @brief Is --inline-suppr given? */
-    bool inlineSuppressions;
+    bool inlineSuppressions{};
 
     /** @brief How many processes/threads should do checking at the same
         time. Default is 1. (-j N) */
-    unsigned int jobs;
+    unsigned int jobs = 1;
 
     /** @brief --library= */
     std::list<std::string> libraries;
@@ -216,86 +286,108 @@ class CPPCHECKLIB Settings {
     /** Library */
     Library library;
 
+#ifdef HAS_THREADING_MODEL_FORK
     /** @brief Load average value */
-    int loadAverage;
+    int loadAverage{};
+#endif
 
-    /** @brief Maximum number of configurations to check before bailing.
-        Default is 12. (--max-configs=N) */
-    int maxConfigs;
+    std::string manualUrl{"https://cppcheck.sourceforge.io/manual.pdf"};
 
-    /** @brief --max-ctu-depth */
-    int maxCtuDepth;
+    /** --max-configs value */
+    int maxConfigsOption = 0; // "Not Assigned" value
 
-    /** @brief max template recursion */
-    int maxTemplateRecursion;
+    /** max configs from --project option */
+    int maxConfigsProject = 0; // "Not Assigned" value
 
-    /** @brief suppress exitcode */
-    Suppressions nofail;
+    static const int maxConfigsNotAssigned;
+    static const int maxConfigsDefault;
 
-    /** @brief suppress message (--suppressions) */
-    Suppressions nomsg;
+    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;
+
+    /** @brief max template recursion */
+    int maxTemplateRecursion = 100;
 
     /** @brief write results (--output-file=&lt;file&gt;) */
     std::string outputFile;
 
-    cppcheck::Platform platform;
+    enum class OutputFormat : std::uint8_t {text, plist, sarif, xml};
+    OutputFormat outputFormat = OutputFormat::text;
 
-    /** @brief Experimental: --performance-valueflow-max-time=T */
-    int performanceValueFlowMaxTime;
+    Platform platform;
 
-    /** @brief --performance-valueflow-max-if-count=C */
-    int performanceValueFlowMaxIfCount;
-
-    /** @brief max number of sets of arguments to pass to subfuncions in valueflow */
-    int performanceValueFlowMaxSubFunctionArgs;
+    /** @brief pid of cppcheck. Intention is that this is set in the main process. */
+    int pid; // internal
 
     /** @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;
 
-    /** @brief Using -E for debugging purposes */
-    bool preprocessOnly;
+    /** Is checker id enabled by premiumArgs */
+    bool isPremiumEnabled(const char id[]) const;
 
-    ImportProject project;
+    /** @brief Using -E for debugging purposes */
+    bool preprocessOnly{};
 
     /** @brief Is --quiet given? */
-    bool quiet;
+    bool quiet{};
 
     /** @brief Use relative paths in output. */
-    bool relativePaths;
+    bool relativePaths{};
 
     /** @brief --report-progress */
-    bool reportProgress;
+    int reportProgress{-1};
 
+#ifdef HAVE_RULES
     /** Rule */
-    class CPPCHECKLIB Rule {
-    public:
-        Rule()
-            : tokenlist("normal")         // use normal tokenlist
-            , id("rule")                  // default id
-            , severity(Severity::style) { // default severity
-        }
-
-        std::string tokenlist;
+    struct CPPCHECKLIB Rule {
+        std::string tokenlist = "normal"; // use normal tokenlist
         std::string pattern;
-        std::string id;
+        std::string id = "rule"; // default id
         std::string summary;
-        Severity::SeverityType severity;
+        Severity severity = Severity::style; // default severity
+        std::shared_ptr<Regex> regex;
     };
 
-#ifdef HAVE_RULES
     /**
      * @brief Extra rules
      */
     std::list<Rule> rules;
 #endif
 
+    /**
+     * @brief Safety certified behavior
+     * Show checkers report when Cppcheck finishes
+     * Make cppcheck checking more strict about critical errors
+     * - returns nonzero if there is critical errors
+     * - a critical error id is not suppressed (by mistake?) with glob pattern
+     */
+    bool safety = false;
+
     /** Do not only check how interface is used. Also check that interface is safe. */
-    class CPPCHECKLIB SafeChecks {
-    public:
-        SafeChecks() : classes(false), externalFunctions(false), internalFunctions(false), externalVariables(false) {}
+    struct CPPCHECKLIB SafeChecks {
 
         static const char XmlRootName[];
         static const char XmlClasses[];
@@ -313,36 +405,39 @@ class CPPCHECKLIB Settings {
          * - public functions can be called in any order
          * - public variables can have any value
          */
-        bool classes;
+        bool classes{};
 
         /**
          * External functions
          * - external functions can be called in any order
          * - function parameters can have any values
          */
-        bool externalFunctions;
+        bool externalFunctions{};
 
         /**
          * Experimental: assume that internal functions can be used in any way
          * This is only available in the GUI.
          */
-        bool internalFunctions;
+        bool internalFunctions{};
 
         /**
          * Global variables that can be modified outside the TU.
          * - Such variable can have "any" value
          */
-        bool externalVariables;
+        bool externalVariables{};
     };
 
     SafeChecks safeChecks;
 
-    SimpleEnableGroup<Severity::SeverityType> severity;
+    /** @brief the files we successfully loaded settings from */
+    std::vector<std::string> settingsFiles;
+
+    SimpleEnableGroup<Severity> severity;
     SimpleEnableGroup<Certainty> certainty;
     SimpleEnableGroup<Checks> checks;
 
     /** @brief show timing information (--showtime=file|summary|top5) */
-    SHOWTIME_MODES showtime;
+    ShowTime showtime{};
 
     /** Struct contains standards settings */
     Standards standards;
@@ -356,10 +451,13 @@ class CPPCHECKLIB Settings {
     std::string templateLocation;
 
     /** @brief The maximum time in seconds for the template instantiation */
-    std::size_t templateMaxTime;
+    std::size_t templateMaxTime{};
 
     /** @brief The maximum time in seconds for the typedef simplification */
-    std::size_t typedefMaxTime;
+    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;
@@ -370,17 +468,48 @@ class CPPCHECKLIB Settings {
     /** @brief forced includes given by the user */
     std::list<std::string> userIncludes;
 
-    /** @brief the maximum iterations of valueflow (--valueflow-max-iterations=T) */
-    std::size_t valueFlowMaxIterations;
+    // TODO: adjust all options so 0 means "disabled" and -1 "means "unlimited"
+    struct ValueFlowOptions
+    {
+        /** @brief the maximum iterations to execute */
+        std::size_t maxIterations = 4;
 
-    /** @brief Is --verbose given? */
-    bool verbose;
+        /** @brief maximum numer if-branches */
+        int maxIfCount = -1;
+
+        /** @brief maximum number of sets of arguments to pass to subfuncions */
+        int maxSubFunctionArgs = 256;
+
+        /** @brief Experimental: maximum execution time */
+        int maxTime = -1;
+
+        /** @brief Control if condition expression analysis is performed */
+        bool doConditionExpressionAnalysis = true;
+
+        /** @brief Maximum performed for-loop count */
+        int maxForLoopCount = 10000;
+
+        /** @brief Maximum performed forward branches */
+        int maxForwardBranches = -1;
+
+        /** @brief Maximum performed alignof recursion */
+        int maxAlignOfRecursion = 100;
 
-    /** @brief write XML results (--xml) */
-    bool xml;
+        /** @brief Maximum performed sizeof recursion */
+        int maxSizeOfRecursion = 100;
+
+        /** @brief Maximum expression varid depth */
+        int maxExprVarIdDepth = 4;
+    };
+
+    /** @brief The ValueFlow options */
+    ValueFlowOptions vfOptions;
+
+    /** @brief Is --verbose given? */
+    bool verbose{};
 
     /** @brief XML version (--xml-version=..) */
-    int xml_version;
+    int xml_version = 2; // TODO: integrate into outputFormat enum?
 
     /**
      * @brief return true if a included file is to be excluded in Preprocessor::getConfigs
@@ -437,11 +566,21 @@ class CPPCHECKLIB Settings {
         return jobs == 1;
     }
 
-    void setCheckLevelExhaustive();
-    void setCheckLevelNormal();
+    enum class CheckLevel : std::uint8_t {
+        reduced,
+        normal,
+        exhaustive
+    };
+    CheckLevel checkLevel = CheckLevel::exhaustive;
+
+    void setCheckLevel(CheckLevel level);
+
+    static ExecutorType defaultExecutor();
+
+    static bool unusedFunctionOnly();
 
 private:
-    static std::string parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity::SeverityType>, SimpleEnableGroup<Checks>> &groups);
+    static std::string parseEnabled(const std::string &str, std::tuple<SimpleEnableGroup<Severity>, SimpleEnableGroup<Checks>> &groups);
     std::string applyEnabled(const std::string &str, bool enable);
 };
 
diff --git a/lib/smallvector.h b/lib/smallvector.h
index b09a016dd18..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-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
@@ -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/sourcelocation.h b/lib/sourcelocation.h
index 10eb9878e65..2555157ed21 100644
--- a/lib/sourcelocation.h
+++ b/lib/sourcelocation.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -19,10 +19,14 @@
 #ifndef sourcelocationH
 #define sourcelocationH
 
+#include "config.h"
+
 #ifdef __CPPCHECK__
 #define CPPCHECK_HAS_SOURCE_LOCATION 0
 #define CPPCHECK_HAS_SOURCE_LOCATION_TS 0
-#elif defined(__has_include)
+#define CPPCHECK_HAS_SOURCE_LOCATION_INTRINSICS 0
+#else
+
 #if __has_include(<source_location>) && __cplusplus >= 202003L
 #define CPPCHECK_HAS_SOURCE_LOCATION 1
 #else
@@ -33,9 +37,16 @@
 #else
 #define CPPCHECK_HAS_SOURCE_LOCATION_TS 0
 #endif
+
+#if __has_builtin(__builtin_FILE)
+#define CPPCHECK_HAS_SOURCE_LOCATION_INTRINSICS 1
+#if !__has_builtin(__builtin_COLUMN)
+#define __builtin_COLUMN() 0
+#endif
 #else
-#define CPPCHECK_HAS_SOURCE_LOCATION 0
-#define CPPCHECK_HAS_SOURCE_LOCATION_TS 0
+#define CPPCHECK_HAS_SOURCE_LOCATION_INTRINSICS 0
+#endif
+
 #endif
 
 #if CPPCHECK_HAS_SOURCE_LOCATION
@@ -47,9 +58,24 @@ using SourceLocation = std::experimental::source_location;
 #else
 #include <cstdint>
 struct SourceLocation {
+#if CPPCHECK_HAS_SOURCE_LOCATION_INTRINSICS
+    static SourceLocation current(std::uint_least32_t line = __builtin_LINE(),
+                                  std::uint_least32_t column = __builtin_COLUMN(),
+                                  const char* file_name = __builtin_FILE(),
+                                  const char* function_name = __builtin_FUNCTION())
+    {
+        SourceLocation result{};
+        result.m_line = line;
+        result.m_column = column;
+        result.m_file_name = file_name;
+        result.m_function_name = function_name;
+        return result;
+    }
+#else
     static SourceLocation current() {
         return SourceLocation();
     }
+#endif
     std::uint_least32_t m_line = 0;
     std::uint_least32_t m_column = 0;
     const char* m_file_name = "";
diff --git a/lib/standards.cpp b/lib/standards.cpp
new file mode 100644
index 00000000000..a0ec72c1580
--- /dev/null
+++ b/lib/standards.cpp
@@ -0,0 +1,159 @@
+/*
+ * 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 "standards.h"
+#include "utils.h"
+
+#include <utility>
+
+#include <simplecpp.h>
+
+static Standards::cstd_t mapC(simplecpp::cstd_t cstd) {
+    switch (cstd)
+    {
+    case simplecpp::C89:
+        return Standards::C89;
+    case simplecpp::C99:
+        return Standards::C99;
+    case simplecpp::C11:
+        return Standards::C11;
+    case simplecpp::C17:
+        return Standards::C17;
+    case simplecpp::C23:
+        return Standards::C23;
+    case simplecpp::C2Y:
+        return Standards::C2Y;
+    case simplecpp::CUnknown:
+        return Standards::CLatest;
+    }
+    cppcheck::unreachable();
+}
+
+bool Standards::setC(std::string str)
+{
+    if (str.empty())
+        return false;
+    const simplecpp::cstd_t c_new = simplecpp::getCStd(str);
+    const bool b = (c_new != simplecpp::CUnknown);
+    if (b) {
+        c = mapC(c_new);
+        stdValueC = std::move(str);
+    }
+    return b;
+}
+
+std::string Standards::getC() const
+{
+    return getC(c);
+}
+
+std::string Standards::getC(cstd_t c_std)
+{
+    switch (c_std) {
+    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 "";
+}
+
+Standards::cstd_t Standards::getC(const std::string &std)
+{
+    return mapC(simplecpp::getCStd(std));
+}
+
+static Standards::cppstd_t mapCPP(simplecpp::cppstd_t cppstd) {
+    switch (cppstd)
+    {
+    case simplecpp::CPP03:
+        return Standards::CPP03;
+    case simplecpp::CPP11:
+        return Standards::CPP11;
+    case simplecpp::CPP14:
+        return Standards::CPP14;
+    case simplecpp::CPP17:
+        return Standards::CPP17;
+    case simplecpp::CPP20:
+        return Standards::CPP20;
+    case simplecpp::CPP23:
+        return Standards::CPP23;
+    case simplecpp::CPP26:
+        return Standards::CPP26;
+    case simplecpp::CPPUnknown:
+        return Standards::CPPLatest;
+    }
+    cppcheck::unreachable();
+}
+
+bool Standards::setCPP(std::string str)
+{
+    if (str.empty())
+        return false;
+    const simplecpp::cppstd_t cpp_new = simplecpp::getCppStd(str);
+    const bool b = (cpp_new != simplecpp::CPPUnknown);
+    if (b) {
+        cpp = mapCPP(cpp_new);
+        stdValueCPP = std::move(str);
+    }
+    return b;
+}
+
+std::string Standards::getCPP() const
+{
+    return getCPP(cpp);
+}
+
+std::string Standards::getCPP(cppstd_t std)
+{
+    switch (std) {
+    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 "";
+}
+
+Standards::cppstd_t Standards::getCPP(const std::string &std)
+{
+    return mapCPP(simplecpp::getCppStd(std));
+}
+
+bool Standards::setStd(const std::string& str)
+{
+    return setC(str) || setCPP(str);
+}
diff --git a/lib/standards.h b/lib/standards.h
index e92656287ad..d2c2a2b8e01 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-2022 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,9 @@
 #define standardsH
 //---------------------------------------------------------------------------
 
-#include "utils.h"
+#include "config.h"
 
+#include <cstdint>
 #include <string>
 
 /// @addtogroup Core
@@ -33,105 +34,30 @@
  * @brief This is just a container for standards settings.
  * This struct contains all possible standards that cppcheck recognize.
  */
-struct Standards {
+struct CPPCHECKLIB Standards {
+    enum Language : std::uint8_t { None, C, CPP };
+
     /** C code standard */
-    enum cstd_t { C89, C99, C11, CLatest=C11 } c;
+    enum cstd_t : std::uint8_t { C89, C99, C11, C17, C23, C2Y, CLatest = C2Y } c = CLatest;
 
     /** C++ code standard */
-    enum cppstd_t { CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPPLatest=CPP23 } cpp;
+    enum cppstd_t : std::uint8_t { CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26, CPPLatest = CPP26 } cpp = CPPLatest;
 
     /** --std value given on command line */
-    std::string stdValue;
+    std::string stdValueC;
 
-    /** This constructor clear all the variables **/
-    Standards() : c(CLatest), cpp(CPPLatest) {}
+    /** --std value given on command line */
+    std::string stdValueCPP;
 
-    bool setC(const std::string& str) {
-        stdValue = str;
-        if (str == "c89" || str == "C89") {
-            c = C89;
-            return true;
-        }
-        if (str == "c99" || str == "C99") {
-            c = C99;
-            return true;
-        }
-        if (str == "c11" || str == "C11") {
-            c = C11;
-            return true;
-        }
-        return false;
-    }
-    const std::string getC() const {
-        switch (c) {
-        case C89:
-            return "c89";
-        case C99:
-            return "c99";
-        case C11:
-            return "c11";
-        }
-        return "";
-    }
-    static cstd_t getC(const std::string &std) {
-        if (std == "c89") {
-            return Standards::C89;
-        }
-        if (std == "c99") {
-            return Standards::C99;
-        }
-        if (std == "c11") {
-            return Standards::C11;
-        }
-        return Standards::CLatest;
-    }
-    bool setCPP(std::string str) {
-        stdValue = str;
-        strTolower(str);
-        cpp = getCPP(str);
-        return !stdValue.empty() && str == getCPP();
-    }
-    std::string getCPP() const {
-        return getCPP(cpp);
-    }
-    static std::string getCPP(cppstd_t std) {
-        switch (std) {
-        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";
-        }
-        return "";
-    }
-    static cppstd_t getCPP(const std::string &std) {
-        if (std == "c++03") {
-            return Standards::CPP03;
-        }
-        if (std == "c++11") {
-            return Standards::CPP11;
-        }
-        if (std == "c++14") {
-            return Standards::CPP14;
-        }
-        if (std == "c++17") {
-            return Standards::CPP17;
-        }
-        if (std == "c++20") {
-            return Standards::CPP20;
-        }
-        if (std == "c++23") {
-            return Standards::CPP23;
-        }
-        return Standards::CPPLatest;
-    }
+    bool setC(std::string str);
+    std::string getC() const;
+    static std::string getC(cstd_t c_std);
+    static cstd_t getC(const std::string &std);
+    bool setCPP(std::string str);
+    std::string getCPP() const;
+    static std::string getCPP(cppstd_t std);
+    static cppstd_t getCPP(const std::string &std);
+    bool setStd(const std::string& str);
 };
 
 /// @}
diff --git a/lib/summaries.cpp b/lib/summaries.cpp
index 7ad8a0b1b01..a543fcc7065 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-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
@@ -26,18 +26,18 @@
 #include "tokenlist.h"
 
 #include <algorithm>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 #include <vector>
 
 
 
-std::string Summaries::create(const Tokenizer *tokenizer, const std::string &cfg)
+std::string Summaries::create(const Tokenizer &tokenizer, const std::string &cfg, int fileIndex)
 {
-    const SymbolDatabase *symbolDatabase = tokenizer->getSymbolDatabase();
-    const Settings *settings = tokenizer->getSettings();
+    const SymbolDatabase *symbolDatabase = tokenizer.getSymbolDatabase();
+    const Settings &settings = tokenizer.getSettings();
 
     std::ostringstream ostr;
     for (const Scope *scope : symbolDatabase->functionScopes) {
@@ -81,8 +81,8 @@ std::string Summaries::create(const Tokenizer *tokenizer, const std::string &cfg
         ostr << std::endl;
     }
 
-    if (!settings->buildDir.empty()) {
-        std::string filename = AnalyzerInformation::getAnalyzerInfoFile(settings->buildDir, tokenizer->list.getSourceFilePath(), cfg);
+    if (!settings.buildDir.empty()) {
+        std::string filename = AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, tokenizer.list.getSourceFilePath(), cfg, fileIndex);
         const std::string::size_type pos = filename.rfind(".a");
         if (pos != std::string::npos) {
             filename[pos+1] = 's';
@@ -171,11 +171,10 @@ void Summaries::loadReturn(const std::string &buildDir, std::set<std::string> &s
         std::string line;
         while (std::getline(fin, line)) {
             // Get function name
-            const std::string::size_type pos1 = 0;
+            constexpr std::string::size_type pos1 = 0;
             const std::string::size_type pos2 = line.find(' ', pos1);
-            const std::string functionName = (pos2 == std::string::npos) ? line : line.substr(0, pos2);
+            std::string functionName = (pos2 == std::string::npos) ? line : line.substr(0, pos2);
             std::vector<std::string> call = getSummaryData(line, "call");
-            functionCalls[functionName] = call;
             if (call.empty())
                 return1.push_back(functionName);
             else {
@@ -183,6 +182,7 @@ void Summaries::loadReturn(const std::string &buildDir, std::set<std::string> &s
                     functionCalledBy[c].push_back(functionName);
                 }
             }
+            functionCalls[functionName] = std::move(call);
         }
     }
     summaryReturn.insert(return1.cbegin(), return1.cend());
diff --git a/lib/summaries.h b/lib/summaries.h
index 0d9bd1da8b7..ac3d40d840f 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-2021 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,7 +29,7 @@
 class Tokenizer;
 
 namespace Summaries {
-    CPPCHECKLIB std::string create(const Tokenizer *tokenizer, const std::string &cfg);
+    CPPCHECKLIB std::string create(const Tokenizer &tokenizer, const std::string &cfg, int fileIndex);
     CPPCHECKLIB void loadReturn(const std::string &buildDir, std::set<std::string> &summaryReturn);
 }
 
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index 7403a3ec448..b91db635478 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-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
@@ -19,8 +19,9 @@
 #include "suppressions.h"
 
 #include "errorlogger.h"
-#include "mathlib.h"
+#include "filesettings.h"
 #include "path.h"
+#include "pathmatch.h"
 #include "utils.h"
 #include "token.h"
 #include "tokenize.h"
@@ -28,13 +29,32 @@
 
 #include <algorithm>
 #include <cctype>   // std::isdigit, std::isalnum, etc
-#include <cstdlib>
 #include <cstring>
 #include <functional> // std::bind, std::placeholders
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
-#include <tinyxml2.h>
+#include "xml.h"
+
+static const char ID_CHECKERSREPORT[] = "checkersReport";
+
+SuppressionList::ErrorMessage SuppressionList::ErrorMessage::fromErrorMessage(const ::ErrorMessage &msg, const std::set<std::string> &macroNames)
+{
+    SuppressionList::ErrorMessage ret;
+    ret.hash = msg.hash;
+    ret.errorId = msg.id;
+    if (!msg.callStack.empty()) {
+        ret.setFileName(msg.callStack.back().getfile(false));
+        ret.lineNumber = msg.callStack.back().line;
+    } else {
+        ret.setFileName(msg.file0);
+        ret.lineNumber = SuppressionList::Suppression::NO_LINE;
+    }
+    ret.certainty = msg.certainty;
+    ret.symbolNames = msg.symbolNames();
+    ret.macroNames = macroNames;
+    return ret;
+}
 
 static bool isAcceptedErrorIdChar(char c)
 {
@@ -42,13 +62,14 @@ static bool isAcceptedErrorIdChar(char c)
     case '_':
     case '-':
     case '.':
+    case '*':
         return true;
     default:
-        return std::isalnum(c);
+        return c > 0 && std::isalnum(c);
     }
 }
 
-std::string Suppressions::parseFile(std::istream &istr)
+std::string SuppressionList::parseFile(std::istream &istr)
 {
     // Change '\r' to '\n' in the istr
     std::string filedata;
@@ -64,13 +85,19 @@ std::string Suppressions::parseFile(std::istream &istr)
         if (line.empty())
             continue;
 
+        std::string::size_type pos = 0;
+        while (pos < line.size() && std::isspace(line[pos]))
+            ++pos;
+        if (pos == line.size())
+            continue;
+
         // Skip comments
-        if (line.length() > 1 && line[0] == '#')
+        if (line[pos] == '#')
             continue;
-        if (line.length() >= 2 && line[0] == '/' && line[1] == '/')
+        if (pos < line.size() - 1 && line[pos] == '/' && line[pos + 1] == '/')
             continue;
 
-        const std::string errmsg(addSuppressionLine(line));
+        std::string errmsg(addSuppressionLine(line));
         if (!errmsg.empty())
             return errmsg;
     }
@@ -79,38 +106,40 @@ std::string Suppressions::parseFile(std::istream &istr)
 }
 
 
-std::string Suppressions::parseXmlFile(const char *filename)
+std::string SuppressionList::parseXmlFile(const char *filename)
 {
     tinyxml2::XMLDocument doc;
     const tinyxml2::XMLError error = doc.LoadFile(filename);
-    if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND)
-        return "File not found";
     if (error != tinyxml2::XML_SUCCESS)
-        return "Failed to parse XML file";
+        return std::string("failed to load suppressions XML '") + filename + "' (" + tinyxml2::XMLDocument::ErrorIDToName(error) + ").";
 
     const tinyxml2::XMLElement * const rootnode = doc.FirstChildElement();
+    if (!rootnode)
+        return std::string("failed to load suppressions XML '") + filename + "' (no root node found).";
+    // TODO: check for proper root node 'suppressions'
     for (const tinyxml2::XMLElement * e = rootnode->FirstChildElement(); e; e = e->NextSiblingElement()) {
         if (std::strcmp(e->Name(), "suppress") != 0)
-            return "Invalid suppression xml file format, expected <suppress> element but got a \"" + std::string(e->Name()) + '\"';
+            return std::string("invalid suppression xml file '") + filename + "', expected 'suppress' element but got a '" + e->Name() + "'.";
 
         Suppression s;
         for (const tinyxml2::XMLElement * e2 = e->FirstChildElement(); e2; e2 = e2->NextSiblingElement()) {
-            const char *text = e2->GetText() ? e2->GetText() : "";
-            if (std::strcmp(e2->Name(), "id") == 0)
+            const char *name = e2->Name();
+            const char *text = empty_if_null(e2->GetText());
+            if (std::strcmp(name, "id") == 0)
                 s.errorId = text;
-            else if (std::strcmp(e2->Name(), "fileName") == 0)
-                s.fileName = text;
-            else if (std::strcmp(e2->Name(), "lineNumber") == 0)
+            else if (std::strcmp(name, "fileName") == 0)
+                s.fileName = Path::simplifyPath(text);
+            else if (std::strcmp(name, "lineNumber") == 0)
                 s.lineNumber = strToInt<int>(text);
-            else if (std::strcmp(e2->Name(), "symbolName") == 0)
+            else if (std::strcmp(name, "symbolName") == 0)
                 s.symbolName = text;
-            else if (*text && std::strcmp(e2->Name(), "hash") == 0)
+            else if (*text && std::strcmp(name, "hash") == 0)
                 s.hash = strToInt<std::size_t>(text);
             else
-                return "Unknown suppression element \"" + std::string(e2->Name()) + "\", expected id/fileName/lineNumber/symbolName/hash";
+                return std::string("unknown element '") + name + "' in suppressions XML '" + filename + "', expected id/fileName/lineNumber/symbolName/hash.";
         }
 
-        const std::string err = addSuppression(std::move(s));
+        std::string err = addSuppression(std::move(s));
         if (!err.empty())
             return err;
     }
@@ -118,7 +147,7 @@ std::string Suppressions::parseXmlFile(const char *filename)
     return "";
 }
 
-std::vector<Suppressions::Suppression> Suppressions::parseMultiSuppressComment(const std::string &comment, std::string *errorMessage)
+std::vector<SuppressionList::Suppression> SuppressionList::parseMultiSuppressComment(const std::string &comment, std::string *errorMessage)
 {
     std::vector<Suppression> suppressions;
 
@@ -150,6 +179,8 @@ std::vector<Suppressions::Suppression> Suppressions::parseMultiSuppressComment(c
             return suppressions;
         }
 
+        const std::string symbolNameString = "symbolName=";
+
         while (iss) {
             std::string word;
             iss >> word;
@@ -157,8 +188,8 @@ std::vector<Suppressions::Suppression> Suppressions::parseMultiSuppressComment(c
                 break;
             if (word.find_first_not_of("+-*/%#;") == std::string::npos)
                 break;
-            if (word.compare(0, 11, "symbolName=") == 0) {
-                s.symbolName = word.substr(11);
+            if (startsWith(word, symbolNameString)) {
+                s.symbolName = word.substr(symbolNameString.size());
             } else {
                 if (errorMessage && errorMessage->empty())
                     *errorMessage = "Bad multi suppression '" + comment + "'. legal format is cppcheck-suppress[errorId, errorId symbolName=arr, ...]";
@@ -173,10 +204,10 @@ std::vector<Suppressions::Suppression> Suppressions::parseMultiSuppressComment(c
     return suppressions;
 }
 
-std::string Suppressions::addSuppressionLine(const std::string &line)
+SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
 {
     std::istringstream lineStream;
-    Suppressions::Suppression suppression;
+    SuppressionList::Suppression suppression;
 
     // Strip any end of line comments
     std::string::size_type endpos = std::min(line.find('#'), line.find("//"));
@@ -206,10 +237,10 @@ std::string Suppressions::addSuppressionLine(const std::string &line)
                     std::istringstream istr1(suppression.fileName.substr(pos+1));
                     istr1 >> suppression.lineNumber;
                 } catch (...) {
-                    suppression.lineNumber = Suppressions::Suppression::NO_LINE;
+                    suppression.lineNumber = SuppressionList::Suppression::NO_LINE;
                 }
 
-                if (suppression.lineNumber != Suppressions::Suppression::NO_LINE) {
+                if (suppression.lineNumber != SuppressionList::Suppression::NO_LINE) {
                     suppression.fileName.erase(pos);
                 }
             }
@@ -218,33 +249,35 @@ std::string Suppressions::addSuppressionLine(const std::string &line)
 
     suppression.fileName = Path::simplifyPath(suppression.fileName);
 
-    return addSuppression(std::move(suppression));
+    return suppression;
+}
+
+std::string SuppressionList::addSuppressionLine(const std::string &line)
+{
+    return addSuppression(parseLine(line));
 }
 
-std::string Suppressions::addSuppression(Suppressions::Suppression suppression)
+std::string SuppressionList::addSuppression(SuppressionList::Suppression suppression)
 {
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
     // Check if suppression is already in list
     auto foundSuppression = std::find_if(mSuppressions.begin(), mSuppressions.end(),
                                          std::bind(&Suppression::isSameParameters, &suppression, std::placeholders::_1));
     if (foundSuppression != mSuppressions.end()) {
-        // Update matched state of existing global suppression
-        if (!suppression.isLocal() && suppression.matched)
-            foundSuppression->matched = suppression.matched;
-        return "";
+        return "suppression '" + suppression.toString() + "' already exists";
     }
 
     // Check that errorId is valid..
     if (suppression.errorId.empty() && suppression.hash == 0)
         return "Failed to add suppression. No id.";
 
-    if (suppression.errorId != "*") {
-        for (std::string::size_type pos = 0; pos < suppression.errorId.length(); ++pos) {
-            if (suppression.errorId[pos] < 0 || !isAcceptedErrorIdChar(suppression.errorId[pos])) {
-                return "Failed to add suppression. Invalid id \"" + suppression.errorId + "\"";
-            }
-            if (pos == 0 && std::isdigit(suppression.errorId[pos])) {
-                return "Failed to add suppression. Invalid id \"" + suppression.errorId + "\"";
-            }
+    for (std::string::size_type pos = 0; pos < suppression.errorId.length(); ++pos) {
+        if (!isAcceptedErrorIdChar(suppression.errorId[pos])) {
+            return "Failed to add suppression. Invalid id \"" + suppression.errorId + "\"";
+        }
+        if (pos == 0 && std::isdigit(suppression.errorId[pos])) {
+            return "Failed to add suppression. Invalid id \"" + suppression.errorId + "\"";
         }
     }
 
@@ -258,7 +291,7 @@ std::string Suppressions::addSuppression(Suppressions::Suppression suppression)
     return "";
 }
 
-std::string Suppressions::addSuppressions(std::list<Suppression> suppressions)
+std::string SuppressionList::addSuppressions(std::list<Suppression> suppressions)
 {
     for (auto &newSuppression : suppressions) {
         auto errmsg = addSuppression(std::move(newSuppression));
@@ -268,60 +301,112 @@ std::string Suppressions::addSuppressions(std::list<Suppression> suppressions)
     return "";
 }
 
-void Suppressions::ErrorMessage::setFileName(std::string s)
+bool SuppressionList::updateSuppressionState(const SuppressionList::Suppression& suppression)
+{
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
+    // Check if suppression is already in list
+    auto foundSuppression = std::find_if(mSuppressions.begin(), mSuppressions.end(),
+                                         std::bind(&Suppression::isSameParameters, &suppression, std::placeholders::_1));
+    if (foundSuppression != mSuppressions.end()) {
+        if (suppression.checked)
+            foundSuppression->checked = true;
+        if (suppression.matched)
+            foundSuppression->matched = true;
+        return true;
+    }
+
+    return false;
+}
+
+void SuppressionList::ErrorMessage::setFileName(std::string s)
 {
     mFileName = Path::simplifyPath(std::move(s));
 }
 
-bool Suppressions::Suppression::parseComment(std::string comment, std::string *errorMessage)
+bool SuppressionList::Suppression::parseComment(std::string comment, std::string *errorMessage)
 {
     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",
+        "cppcheck-suppress-end",
+        "cppcheck-suppress-file",
+        "cppcheck-suppress-macro"
+    };
+
     std::istringstream iss(comment.substr(2));
     std::string word;
     iss >> word;
-    if (word != "cppcheck-suppress")
+    if (!cppchecksuppress.count(word))
         return false;
+
     iss >> errorId;
     if (!iss)
         return false;
+
+    const std::string symbolNameString = "symbolName=";
+
     while (iss) {
         iss >> word;
         if (!iss)
             break;
         if (word.find_first_not_of("+-*/%#;") == std::string::npos)
             break;
-        if (word.compare(0,11,"symbolName=")==0)
-            symbolName = word.substr(11);
+        if (startsWith(word, symbolNameString))
+            symbolName = word.substr(symbolNameString.size());
         else if (errorMessage && errorMessage->empty())
             *errorMessage = "Bad suppression attribute '" + word + "'. You can write comments in the comment after a ; or //. Valid suppression attributes; symbolName=sym";
     }
     return true;
 }
 
-bool Suppressions::Suppression::isSuppressed(const Suppressions::ErrorMessage &errmsg) const
+SuppressionList::Suppression::Result SuppressionList::Suppression::isSuppressed(const SuppressionList::ErrorMessage &errmsg) const
 {
-    if (hash > 0 && hash != errmsg.hash)
-        return false;
-    if (!errorId.empty() && !matchglob(errorId, errmsg.errorId))
-        return false;
-    if (!fileName.empty() && !matchglob(fileName, errmsg.getFileName()))
-        return false;
-    if (lineNumber != NO_LINE && lineNumber != errmsg.lineNumber) {
-        if (!thisAndNextLine || lineNumber + 1 != errmsg.lineNumber)
-            return false;
+    if (type == SuppressionList::Type::macro) {
+        if (errmsg.macroNames.count(macroName) == 0)
+            return Result::None;
+        if (hash > 0 && hash != errmsg.hash)
+            return Result::Checked;
+        if (!errorId.empty() && !matchglob(errorId, errmsg.errorId))
+            return Result::Checked;
+    } else {
+        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
+        if (!errorId.empty() && (errmsg.errorId.empty() || !matchglob(errorId, errmsg.errorId)))
+            return Result::Checked;
+        if ((SuppressionList::Type::block == type) && ((errmsg.lineNumber < lineBegin) || (errmsg.lineNumber > lineEnd)))
+            return Result::Checked;
     }
     if (!symbolName.empty()) {
+        bool matchedSymbol = false;
         for (std::string::size_type pos = 0; pos < errmsg.symbolNames.size();) {
             const std::string::size_type pos2 = errmsg.symbolNames.find('\n',pos);
             std::string symname;
@@ -332,66 +417,84 @@ bool Suppressions::Suppression::isSuppressed(const Suppressions::ErrorMessage &e
                 symname = errmsg.symbolNames.substr(pos,pos2-pos);
                 pos = pos2+1;
             }
-            if (matchglob(symbolName, symname))
-                return true;
+            if (matchglob(symbolName, symname)) {
+                matchedSymbol = true;
+                break;
+            }
         }
-        return false;
+        if (!matchedSymbol)
+            return Result::Checked;
     }
-    return true;
+    return Result::Matched;
 }
 
-bool Suppressions::Suppression::isMatch(const Suppressions::ErrorMessage &errmsg)
+bool SuppressionList::Suppression::isMatch(const SuppressionList::ErrorMessage &errmsg)
 {
-    if (!isSuppressed(errmsg))
+    switch (isSuppressed(errmsg)) {
+    case Result::None:
         return false;
-    matched = true;
-    checked = true;
-    return true;
+    case Result::Checked:
+        checked = true;
+        return false;
+    case Result::Matched:
+        checked = true;
+        matched = true;
+        return true;
+    }
+    cppcheck::unreachable();
 }
 
-std::string Suppressions::Suppression::getText() const
+bool SuppressionList::isSuppressed(const SuppressionList::ErrorMessage &errmsg, bool global)
 {
-    std::string ret;
-    if (!errorId.empty())
-        ret = errorId;
-    if (!fileName.empty())
-        ret += " fileName=" + fileName;
-    if (lineNumber != NO_LINE)
-        ret += " lineNumber=" + MathLib::toString(lineNumber);
-    if (!symbolName.empty())
-        ret += " symbolName=" + symbolName;
-    if (hash > 0)
-        ret += " hash=" + MathLib::toString(hash);
-    if (ret.compare(0,1," ")==0)
-        return ret.substr(1);
-    return ret;
-}
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
 
-bool Suppressions::isSuppressed(const Suppressions::ErrorMessage &errmsg, bool global)
-{
     const bool unmatchedSuppression(errmsg.errorId == "unmatchedSuppression");
+    bool returnValue = false;
     for (Suppression &s : mSuppressions) {
         if (!global && !s.isLocal())
             continue;
         if (unmatchedSuppression && s.errorId != errmsg.errorId)
             continue;
+        if (s.isMatch(errmsg))
+            returnValue = true;
+    }
+    return returnValue;
+}
+
+bool SuppressionList::isSuppressedExplicitly(const SuppressionList::ErrorMessage &errmsg, bool global)
+{
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
+    for (Suppression &s : mSuppressions) {
+        if (!global && !s.isLocal())
+            continue;
+        if (s.errorId != errmsg.errorId) // Error id must match exactly
+            continue;
         if (s.isMatch(errmsg))
             return true;
     }
     return false;
 }
 
-bool Suppressions::isSuppressed(const ::ErrorMessage &errmsg)
+bool SuppressionList::isSuppressed(const ::ErrorMessage &errmsg, const std::set<std::string>& macroNames)
 {
-    if (mSuppressions.empty())
-        return false;
-    return isSuppressed(errmsg.toSuppressionsErrorMessage());
+    {
+        std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
+        if (mSuppressions.empty())
+            return false;
+    }
+    return isSuppressed(SuppressionList::ErrorMessage::fromErrorMessage(errmsg, macroNames));
 }
 
-void Suppressions::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())
@@ -402,38 +505,71 @@ void Suppressions::dump(std::ostream & out) const
             out << " symbolName=\"" << ErrorLogger::toxml(suppression.symbolName) << '\"';
         if (suppression.hash > 0)
             out << " hash=\"" << suppression.hash << '\"';
+        if (suppression.lineBegin != Suppression::NO_LINE)
+            out << " lineBegin=\"" << suppression.lineBegin << '"';
+        if (suppression.lineEnd != Suppression::NO_LINE)
+            out << " lineEnd=\"" << suppression.lineEnd << '"';
+        if (suppression.type == SuppressionList::Type::file)
+            out << " type=\"file\"";
+        else if (suppression.type == SuppressionList::Type::block)
+            out << " type=\"block\"";
+        else if (suppression.type == SuppressionList::Type::blockBegin)
+            out << " type=\"blockBegin\"";
+        else if (suppression.type == SuppressionList::Type::blockEnd)
+            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<Suppressions::Suppression> Suppressions::getUnmatchedLocalSuppressions(const std::string &file, const bool unusedFunctionChecking) const
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedLocalSuppressions(const FileWithDetails &file) const
 {
-    std::string tmpFile = Path::simplifyPath(file);
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
     std::list<Suppression> result;
     for (const Suppression &s : mSuppressions) {
-        if (s.matched || ((s.lineNumber != Suppression::NO_LINE) && !s.checked))
+        if (s.isInline)
+            continue;
+        if (s.matched)
+            continue;
+        if ((s.lineNumber != Suppression::NO_LINE) && !s.checked)
+            continue;
+        if (s.type == SuppressionList::Type::macro)
             continue;
         if (s.hash > 0)
             continue;
-        if (!unusedFunctionChecking && s.errorId == "unusedFunction")
+        if (s.errorId == ID_CHECKERSREPORT)
             continue;
-        if (tmpFile.empty() || !s.isLocal() || s.fileName != tmpFile)
+        if (!s.isLocal() || !PathMatch::match(s.fileName, file.spath()))
             continue;
         result.push_back(s);
     }
     return result;
 }
 
-std::list<Suppressions::Suppression> Suppressions::getUnmatchedGlobalSuppressions(const bool unusedFunctionChecking) const
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedGlobalSuppressions() const
 {
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
     std::list<Suppression> result;
     for (const Suppression &s : mSuppressions) {
-        if (s.matched || ((s.lineNumber != Suppression::NO_LINE) && !s.checked))
+        if (s.isInline)
+            continue;
+        if (s.matched)
+            continue;
+        if (!s.checked && s.isWildcard())
             continue;
         if (s.hash > 0)
             continue;
-        if (!unusedFunctionChecking && s.errorId == "unusedFunction")
+        if (s.errorId == ID_CHECKERSREPORT)
             continue;
         if (s.isLocal())
             continue;
@@ -442,12 +578,34 @@ std::list<Suppressions::Suppression> Suppressions::getUnmatchedGlobalSuppression
     return result;
 }
 
-const std::list<Suppressions::Suppression> &Suppressions::getSuppressions() const
+std::list<SuppressionList::Suppression> SuppressionList::getUnmatchedInlineSuppressions() const
 {
+    std::list<SuppressionList::Suppression> result;
+    for (const SuppressionList::Suppression &s : SuppressionList::mSuppressions) {
+        if (!s.isInline)
+            continue;
+        // TODO: remove this and markUnmatchedInlineSuppressionsAsChecked()?
+        if (!s.checked)
+            continue;
+        if (s.matched)
+            continue;
+        if (s.hash > 0)
+            continue;
+        result.push_back(s);
+    }
+    return result;
+}
+
+std::list<SuppressionList::Suppression> SuppressionList::getSuppressions() const
+{
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
     return mSuppressions;
 }
 
-void Suppressions::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer) {
+void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer) {
+    std::lock_guard<std::mutex> lg(mSuppressionsSync);
+
     int currLineNr = -1;
     int currFileIdx = -1;
     for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -455,10 +613,37 @@ void Suppressions::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tok
             currLineNr = tok->linenr();
             currFileIdx = tok->fileIndex();
             for (auto &suppression : mSuppressions) {
-                if (!suppression.checked && (suppression.lineNumber == currLineNr) && (suppression.fileName == tokenizer.list.file(tok))) {
+                if (suppression.type == SuppressionList::Type::unique) {
+                    if (!suppression.checked && (suppression.lineNumber == currLineNr) && (suppression.fileName == tokenizer.list.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)))) {
+                        suppression.checked = true;
+                    }
+                } else if (!suppression.checked && suppression.fileName == tokenizer.list.file(tok)) {
                     suppression.checked = true;
                 }
             }
         }
     }
 }
+
+std::string SuppressionList::Suppression::toString() const
+{
+    std::string s;
+    s+= errorId;
+    if (!fileName.empty()) {
+        s += ':';
+        s += fileName;
+        if (lineNumber != -1) {
+            s += ':';
+            s += std::to_string(lineNumber);
+        }
+    }
+    if (!symbolName.empty()) {
+        s += ':';
+        s += symbolName;
+    }
+    return s;
+}
diff --git a/lib/suppressions.h b/lib/suppressions.h
index 2f0b339ed81..022a492c51f 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-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
@@ -23,23 +23,31 @@
 #include "config.h"
 
 #include <cstddef>
+#include <cstdint>
 #include <istream>
 #include <list>
+#include <mutex>
+#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
-/// @addtogroup Core
-/// @{
-
 class Tokenizer;
 class ErrorMessage;
-enum class Certainty;
+enum class Certainty : std::uint8_t;
+class FileWithDetails;
+
+/// @addtogroup Core
+/// @{
 
 /** @brief class for handling suppressions */
-class CPPCHECKLIB Suppressions {
+class CPPCHECKLIB SuppressionList {
 public:
 
+    enum class Type : std::uint8_t {
+        unique, file, block, blockBegin, blockEnd, macro
+    };
+
     struct CPPCHECKLIB ErrorMessage {
         std::size_t hash;
         std::string errorId;
@@ -47,16 +55,19 @@ class CPPCHECKLIB Suppressions {
         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;
+
+        static SuppressionList::ErrorMessage fromErrorMessage(const ::ErrorMessage &msg, const std::set<std::string> &macroNames);
     private:
         std::string mFileName;
     };
 
     struct CPPCHECKLIB Suppression {
-        Suppression() : lineNumber(NO_LINE), hash(0), thisAndNextLine(false), matched(false), checked(false) {}
-        Suppression(std::string id, std::string file, int line=NO_LINE) : errorId(std::move(id)), fileName(std::move(file)), lineNumber(line), hash(0), thisAndNextLine(false), matched(false), checked(false) {}
+        Suppression() = default;
+        Suppression(std::string id, std::string file, int line=NO_LINE) : errorId(std::move(id)), fileName(std::move(file)), lineNumber(line) {}
 
         bool operator<(const Suppression &other) const {
             if (errorId != other.errorId)
@@ -67,6 +78,8 @@ class CPPCHECKLIB Suppressions {
                 return fileName < other.fileName;
             if (symbolName != other.symbolName)
                 return symbolName < other.symbolName;
+            if (macroName != other.macroName)
+                return macroName < other.macroName;
             if (hash != other.hash)
                 return hash < other.hash;
             if (thisAndNextLine != other.thisAndNextLine)
@@ -74,6 +87,28 @@ class CPPCHECKLIB Suppressions {
             return false;
         }
 
+        bool operator==(const Suppression &other) const {
+            if (errorId != other.errorId)
+                return false;
+            if (lineNumber < other.lineNumber)
+                return false;
+            if (fileName != other.fileName)
+                return false;
+            if (symbolName != other.symbolName)
+                return false;
+            if (macroName != other.macroName)
+                return false;
+            if (hash != other.hash)
+                return false;
+            if (type != other.type)
+                return false;
+            if (lineBegin != other.lineBegin)
+                return false;
+            if (lineEnd != other.lineEnd)
+                return false;
+            return true;
+        }
+
         /**
          * Parse inline suppression in comment
          * @param comment the full comment text
@@ -82,14 +117,22 @@ class CPPCHECKLIB Suppressions {
          */
         bool parseComment(std::string comment, std::string *errorMessage);
 
-        bool isSuppressed(const ErrorMessage &errmsg) const;
+        enum class Result : std::uint8_t {
+            None,
+            Checked,
+            Matched
+        };
+
+        Result isSuppressed(const ErrorMessage &errmsg) const;
 
         bool isMatch(const ErrorMessage &errmsg);
 
-        std::string getText() const;
+        bool isWildcard() const {
+            return fileName.find_first_of("?*") != std::string::npos;
+        }
 
         bool isLocal() const {
-            return !fileName.empty() && fileName.find_first_of("?*") == std::string::npos;
+            return !fileName.empty() && !isWildcard();
         }
 
         bool isSameParameters(const Suppression &other) const {
@@ -101,16 +144,24 @@ class CPPCHECKLIB Suppressions {
                    thisAndNextLine == other.thisAndNextLine;
         }
 
+        std::string toString() const;
+
         std::string errorId;
         std::string fileName;
-        int lineNumber;
+        std::string extraComment;
+        int lineNumber = NO_LINE; // TODO: needs to be unsigned
+        int lineBegin = NO_LINE;
+        int lineEnd = NO_LINE;
+        Type type = Type::unique;
         std::string symbolName;
-        std::size_t hash;
-        bool thisAndNextLine; // Special case for backwards compatibility: { // cppcheck-suppress something
-        bool matched;
-        bool checked; // for inline suppressions, checked or not
+        std::string macroName;
+        std::size_t hash{};
+        bool thisAndNextLine{}; // Special case for backwards compatibility: { // cppcheck-suppress something
+        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{};
 
-        enum { NO_LINE = -1 };
+        enum : std::int8_t { NO_LINE = -1 };
     };
 
     /**
@@ -135,6 +186,13 @@ class CPPCHECKLIB Suppressions {
      */
     static std::vector<Suppression> parseMultiSuppressComment(const std::string &comment, std::string *errorMessage);
 
+    /**
+     * Create a Suppression object from a suppression line
+     * @param line The line to parse.
+     * @return a suppression object
+     */
+    static Suppression parseLine(const std::string &line);
+
     /**
      * @brief Don't show the given error.
      * @param line Description of error to suppress (in id:file:line format).
@@ -157,6 +215,13 @@ class CPPCHECKLIB Suppressions {
      */
     std::string addSuppressions(std::list<Suppression> suppressions);
 
+    /**
+     * @brief Updates the state of the given suppression.
+     * @param suppression the suppression to update
+     * @return true if suppression to update was found
+     */
+    bool updateSuppressionState(const SuppressionList::Suppression& suppression);
+
     /**
      * @brief Returns true if this message should not be shown to the user.
      * @param errmsg error message
@@ -165,36 +230,50 @@ class CPPCHECKLIB Suppressions {
      */
     bool isSuppressed(const ErrorMessage &errmsg, bool global = true);
 
+    /**
+     * @brief Returns true if this message is "explicitly" suppressed. The suppression "id" must match textually exactly.
+     * @param errmsg error message
+     * @param global use global suppressions
+     * @return true if this error is explicitly suppressed.
+     */
+    bool isSuppressedExplicitly(const ErrorMessage &errmsg, bool global = true);
+
     /**
      * @brief Returns true if this message should not be shown to the user.
      * @param errmsg error message
      * @return true if this error is suppressed.
      */
-    bool isSuppressed(const ::ErrorMessage &errmsg);
+    bool isSuppressed(const ::ErrorMessage &errmsg, const std::set<std::string>& macroNames);
 
     /**
      * @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 std::string &file, const bool unusedFunctionChecking) 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(const bool unusedFunctionChecking) const;
+    std::list<Suppression> getUnmatchedGlobalSuppressions() const;
+
+    /**
+     * @brief Returns list of unmatched inline suppressions.
+     * @return list of unmatched suppressions
+     */
+    std::list<Suppression> getUnmatchedInlineSuppressions() const;
 
     /**
      * @brief Returns list of all suppressions.
      * @return list of suppressions
      */
-    const std::list<Suppression> &getSuppressions() const;
+    std::list<Suppression> getSuppressions() const;
 
     /**
      * @brief Marks Inline Suppressions as checked if source line is in the token stream
@@ -202,10 +281,19 @@ class CPPCHECKLIB Suppressions {
     void markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer);
 
 private:
+    mutable std::mutex mSuppressionsSync;
     /** @brief List of error which the user doesn't want to see. */
     std::list<Suppression> mSuppressions;
 };
 
+struct Suppressions
+{
+    /** @brief suppress message (--suppressions) */
+    SuppressionList nomsg;
+    /** @brief suppress exitcode */
+    SuppressionList nofail;
+};
+
 /// @}
 //---------------------------------------------------------------------------
 #endif // suppressionsH
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 41aa8456fc4..b6528d9a9e6 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-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
@@ -35,31 +35,35 @@
 #include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <cassert>
 #include <cstring>
+#include <functional>
 #include <initializer_list>
 #include <iomanip>
 #include <iostream>
-#include <limits>
-#include <sstream> // IWYU pragma: keep
+#include <iterator>
+#include <numeric>
+#include <sstream>
 #include <stack>
 #include <string>
 #include <tuple>
 #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;
 
-    mIsCpp = isCPP();
-
     if (mSettings.platform.defaultSign == 's' || mSettings.platform.defaultSign == 'S')
         mDefaultSignedness = ValueType::SIGNED;
     else if (mSettings.platform.defaultSign == 'u' || mSettings.platform.defaultSign == 'U')
@@ -78,8 +82,8 @@ SymbolDatabase::SymbolDatabase(Tokenizer& tokenizer, const Settings& settings, E
     createSymbolDatabaseVariableSymbolTable();
     createSymbolDatabaseSetScopePointers();
     createSymbolDatabaseSetVariablePointers();
-    setValueTypeInTokenList(false);
     createSymbolDatabaseSetTypePointers();
+    setValueTypeInTokenList(false);
     createSymbolDatabaseSetFunctionPointers(true);
     createSymbolDatabaseSetSmartPointerType();
     setValueTypeInTokenList(false);
@@ -125,10 +129,24 @@ static bool isExecutableScope(const Token* tok)
     return false;
 }
 
+const Token* SymbolDatabase::isEnumDefinition(const Token* tok)
+{
+    if (!Token::Match(tok, "enum class| %name%| {|:"))
+        return nullptr;
+    while (!Token::Match(tok, "[{:]"))
+        tok = tok->next();
+    if (tok->str() == "{")
+        return tok;
+    tok = tok->next(); // skip ':'
+    while (Token::Match(tok, "%name%|::"))
+        tok = tok->next();
+    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();
@@ -141,6 +159,8 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
         return endInitList.top().second == scope;
     };
 
+    std::stack<const Token*> inIfCondition;
+
     auto addLambda = [this, &scope](const Token* tok, const Token* lambdaEndToken) -> const Token* {
         const Token* lambdaStartToken = lambdaEndToken->link();
         const Token* argStart = lambdaStartToken->astParent();
@@ -154,25 +174,50 @@ 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<Scope *, std::set<std::string>> forwardDecls;
+
+    const std::function<Scope *(const Token *, Scope *)> findForwardDeclScope = [&](const Token *tok, 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<Scope *>(nullptr);
+
+            return findForwardDeclScope(tok->tokAt(2), *it);
+        }
+
+        auto it = forwardDecls.find(startScope);
+        if (it == forwardDecls.cend())
+            return static_cast<Scope *>(nullptr);
+
+        return it->second.count(tok->str()) > 0 ? startScope : nullptr;
+    };
+
     // find all scopes
     for (const Token *tok = mTokenizer.tokens(); tok; tok = tok ? tok->next() : nullptr) {
         // #5593 suggested to add here:
-        if (mErrorLogger)
-            mErrorLogger->reportProgress(mTokenizer.list.getSourceFilePath(),
-                                         "SymbolDatabase",
-                                         tok->progressValue());
+        if (doProgress)
+            mErrorLogger.reportProgress(mTokenizer.list.getSourceFilePath(),
+                                        "SymbolDatabase",
+                                        tok->progressValue());
         // Locate next class
-        if ((mTokenizer.isCPP() && tok->isKeyword() &&
+        if ((tok->isCpp() && tok->isKeyword() &&
              ((Token::Match(tok, "class|struct|union|namespace ::| %name% final| {|:|::|<") &&
                !Token::Match(tok->previous(), "new|friend|const|enum|typedef|mutable|volatile|using|)|(|<")) ||
-              (Token::Match(tok, "enum class| %name% {") ||
-               Token::Match(tok, "enum class| %name% : %name% {"))))
-            || (mTokenizer.isC() && tok->isKeyword() && Token::Match(tok, "struct|union|enum %name% {"))) {
+              isEnumDefinition(tok)))
+            || (tok->isC() && tok->isKeyword() && Token::Match(tok, "struct|union|enum %name% {"))) {
             const Token *tok2 = tok->tokAt(2);
 
             if (tok->strAt(1) == "::")
                 tok2 = tok2->next();
-            else if (mTokenizer.isCPP() && tok->strAt(1) == "class")
+            else if (tok->isCpp() && tok->strAt(1) == "class")
                 tok2 = tok2->next();
 
             while (Token::Match(tok2, ":: %name%"))
@@ -188,25 +233,25 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
             }
 
             // skip over final
-            if (mTokenizer.isCPP() && Token::simpleMatch(tok2, "final"))
+            if (tok2 && tok2->isCpp() && Token::simpleMatch(tok2, "final"))
                 tok2 = tok2->next();
 
             // make sure we have valid code
             if (!Token::Match(tok2, "{|:")) {
                 // check for qualified variable
                 if (tok2 && tok2->next()) {
-                    if (tok2->next()->str() == ";")
+                    if (tok2->strAt(1) == ";")
                         tok = tok2->next();
                     else if (Token::simpleMatch(tok2->next(), "= {") &&
                              Token::simpleMatch(tok2->linkAt(2), "} ;"))
                         tok = tok2->linkAt(2)->next();
                     else if (Token::Match(tok2->next(), "(|{") &&
-                             tok2->next()->link()->strAt(1) == ";")
-                        tok = tok2->next()->link()->next();
+                             tok2->linkAt(1)->strAt(1) == ";")
+                        tok = tok2->linkAt(1)->next();
                     // skip variable declaration
                     else if (Token::Match(tok2, "*|&|>"))
                         continue;
-                    else if (Token::Match(tok2, "%name% (") && mTokenizer.isFunctionHead(tok2->next(), "{;"))
+                    else if (Token::Match(tok2, "%name% (") && TokenList::isFunctionHead(tok2->next(), "{;"))
                         continue;
                     else if (Token::Match(tok2, "%name% [|="))
                         continue;
@@ -256,12 +301,12 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 }
 
                 // definition may be different than declaration
-                if (mTokenizer.isCPP() && tok->str() == "class") {
+                if (tok->isCpp() && tok->str() == "class") {
                     access[new_scope] = AccessControl::Private;
-                    new_scope->type = Scope::eClass;
+                    new_scope->type = ScopeType::eClass;
                 } else if (tok->str() == "struct") {
                     access[new_scope] = AccessControl::Public;
-                    new_scope->type = Scope::eStruct;
+                    new_scope->type = ScopeType::eStruct;
                 }
 
                 new_scope->classDef = tok;
@@ -273,7 +318,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")
@@ -282,10 +331,10 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     access[new_scope] = AccessControl::Public;
 
                 // fill typeList...
-                if (new_scope->isClassOrStructOrUnion() || new_scope->type == Scope::eEnum) {
+                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
@@ -302,9 +351,12 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     if (!tok2) {
                         mTokenizer.syntaxError(tok);
                     }
-                } else if (new_scope->type == Scope::eEnum) {
-                    if (tok2->str() == ":")
+                } else if (new_scope->type == ScopeType::eEnum) {
+                    if (tok2->str() == ":") {
                         tok2 = tok2->tokAt(2);
+                        while (Token::Match(tok2, "%name%|::"))
+                            tok2 = tok2->next();
+                    }
                 }
 
                 new_scope->setBodyStartEnd(tok2);
@@ -314,8 +366,8 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     mTokenizer.syntaxError(tok);
                 }
 
-                if (new_scope->type == Scope::eEnum) {
-                    tok2 = new_scope->addEnum(tok, mTokenizer.isCPP());
+                if (new_scope->type == ScopeType::eEnum) {
+                    tok2 = new_scope->addEnum(tok);
                     scope->nestedList.push_back(new_scope);
 
                     if (!tok2)
@@ -331,11 +383,11 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
         }
 
         // Namespace and unknown macro (#3854)
-        else if (mTokenizer.isCPP() && tok->isKeyword() &&
+        else if (tok->isCpp() && tok->isKeyword() &&
                  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;
@@ -365,12 +417,13 @@ 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);
         }
 
         // using namespace
-        else if (mTokenizer.isCPP() && tok->isKeyword() && Token::Match(tok, "using namespace ::| %type% ;|::")) {
+        else if (tok->isCpp() && tok->isKeyword() && Token::Match(tok, "using namespace ::| %type% ;|::")) {
             Scope::UsingInfo using_info;
 
             using_info.start = tok; // save location
@@ -390,7 +443,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
         }
 
         // using type alias
-        else if (mTokenizer.isCPP() && tok->isKeyword() && Token::Match(tok, "using %name% =")) {
+        else if (tok->isCpp() && tok->isKeyword() && Token::Match(tok, "using %name% =") && !tok->tokAt(2)->isSimplifiedTypedef()) {
             if (tok->strAt(-1) != ">" && !findType(tok->next(), scope)) {
                 // fill typeList..
                 typeList.emplace_back(tok, nullptr, scope);
@@ -410,13 +463,13 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
 
         // unnamed struct and union
         else if (tok->isKeyword() && Token::Match(tok, "struct|union {") &&
-                 Token::Match(tok->next()->link(), "} *|&| %name% ;|[|=")) {
-            scopeList.emplace_back(this, tok, scope);
+                 Token::Match(tok->linkAt(1), "} *|&| %name% ;|[|=")) {
+            scopeList.emplace_back(*this, tok, scope);
 
             Scope *new_scope = &scopeList.back();
             access[new_scope] = AccessControl::Public;
 
-            const Token* varNameTok = tok->next()->link()->next();
+            const Token* varNameTok = tok->linkAt(1)->next();
             if (varNameTok->str() == "*") {
                 varNameTok = varNameTok->next();
             } else if (varNameTok->str() == "&") {
@@ -430,7 +483,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();
 
@@ -451,9 +504,9 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
 
         // anonymous struct, union and namespace
         else if (tok->isKeyword() && ((Token::Match(tok, "struct|union {") &&
-                                       Token::simpleMatch(tok->next()->link(), "} ;")) ||
+                                       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;
@@ -495,7 +548,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
             do {
                 access.erase(scope);
                 scope = const_cast<Scope*>(scope->nestedIn);
-            } while (scope->type != Scope::eGlobal && succeeds(tok, scope->bodyEnd));
+            } while (scope->type != ScopeType::eGlobal && succeeds(tok, scope->bodyEnd));
             continue;
         }
         // check for end of init list
@@ -529,9 +582,9 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
             }
 
             // class function?
-            else if (isFunction(tok, scope, &funcStart, &argStart, &declEnd)) {
-                if (tok->previous()->str() != "::" || tok->strAt(-2) == scope->className) {
-                    Function function(&mTokenizer, tok, scope, funcStart, argStart);
+            else if (isFunction(tok, scope, funcStart, argStart, declEnd)) {
+                if (tok->strAt(-1) != "::" || tok->strAt(-2) == scope->className) {
+                    Function function(tok, scope, funcStart, argStart);
 
                     // save the access type
                     function.access = access[scope];
@@ -547,9 +600,9 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     function.arg = function.argDef;
 
                     // out of line function
-                    if (const Token *endTok = mTokenizer.isFunctionHead(end, ";")) {
+                    if (const Token *endTok = TokenList::isFunctionHead(end, ";")) {
                         tok = endTok;
-                        scope->addFunction(function);
+                        scope->addFunction(std::move(function));
                     }
 
                     // inline function
@@ -578,7 +631,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                         Function* funcptr = &scope->functionList.back();
                         const Token *tok2 = funcStart;
 
-                        addNewFunction(&scope, &tok2);
+                        addNewFunction(scope, tok2);
                         if (scope) {
                             scope->functionOf = function.nestedIn;
                             scope->function = funcptr;
@@ -595,7 +648,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                     const Scope * const nested = scope->findInNestedListRecursive(tok->strAt(-2));
 
                     if (nested)
-                        addClassFunction(&scope, &tok, argStart);
+                        addClassFunction(scope, tok, argStart);
                     else {
                         /** @todo handle friend functions */
                     }
@@ -603,7 +656,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
             }
 
             // friend class declaration?
-            else if (mTokenizer.isCPP() && tok->isKeyword() && Token::Match(tok, "friend class|struct| ::| %any% ;|::")) {
+            else if (tok->isCpp() && tok->isKeyword() && Token::Match(tok, "friend class|struct| ::| %any% ;|::")) {
                 Type::FriendInfo friendInfo;
 
                 // save the name start
@@ -626,26 +679,26 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
 
                 scope->definedType->friendList.push_back(friendInfo);
             }
-        } else if (scope->type == Scope::eNamespace || scope->type == Scope::eGlobal) {
+        } else if (scope->type == ScopeType::eNamespace || scope->type == ScopeType::eGlobal) {
             const Token *funcStart = nullptr;
             const Token *argStart = nullptr;
             const Token *declEnd = nullptr;
 
             // function?
-            if (isFunction(tok, scope, &funcStart, &argStart, &declEnd)) {
+            if (isFunction(tok, scope, funcStart, argStart, declEnd)) {
                 // has body?
                 if (declEnd && declEnd->str() == "{") {
                     tok = funcStart;
 
                     // class function
-                    if (tok->previous() && tok->previous()->str() == "::")
-                        addClassFunction(&scope, &tok, argStart);
+                    if (tok->previous() && tok->strAt(-1) == "::")
+                        addClassFunction(scope, tok, argStart);
 
                     // class destructor
                     else if (tok->previous() &&
-                             tok->previous()->str() == "~" &&
+                             tok->strAt(-1) == "~" &&
                              tok->strAt(-2) == "::")
-                        addClassFunction(&scope, &tok, argStart);
+                        addClassFunction(scope, tok, argStart);
 
                     // regular function
                     else {
@@ -663,14 +716,14 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
                 else if (declEnd && declEnd->str() == ";") {
                     if (tok->astParent() && tok->astParent()->str() == "::" &&
                         Token::Match(declEnd->previous(), "default|delete")) {
-                        addClassFunction(&scope, &tok, argStart);
+                        addClassFunction(scope, tok, argStart);
                         continue;
                     }
 
                     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;
                         }
@@ -691,51 +744,84 @@ 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, Scope::eElse, tok1);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eElse, tok1);
                 else if (tok->str() == "do")
-                    scopeList.emplace_back(this, tok, scope, Scope::eDo, tok1);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eDo, tok1);
                 else //if (tok->str() == "try")
-                    scopeList.emplace_back(this, tok, scope, Scope::eTry, tok1);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eTry, tok1);
 
                 tok = tok1;
                 scope->nestedList.push_back(&scopeList.back());
                 scope = &scopeList.back();
-            } else if (tok->isKeyword() && Token::Match(tok, "if|for|while|catch|switch (") && Token::simpleMatch(tok->next()->link(), ") {")) {
-                const Token *scopeStartTok = tok->next()->link()->next();
+            } 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, Scope::eIf, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eIf, scopeStartTok);
                 else if (tok->str() == "for") {
-                    scopeList.emplace_back(this, tok, scope, Scope::eFor, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eFor, scopeStartTok);
                 } else if (tok->str() == "while")
-                    scopeList.emplace_back(this, tok, scope, Scope::eWhile, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eWhile, scopeStartTok);
                 else if (tok->str() == "catch") {
-                    scopeList.emplace_back(this, tok, scope, Scope::eCatch, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eCatch, scopeStartTok);
                 } else // if (tok->str() == "switch")
-                    scopeList.emplace_back(this, tok, scope, Scope::eSwitch, scopeStartTok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eSwitch, scopeStartTok);
 
                 scope->nestedList.push_back(&scopeList.back());
                 scope = &scopeList.back();
-                if (scope->type == Scope::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 == Scope::eCatch)
-                    scope->checkVariable(tok->tokAt(2), AccessControl::Throw, &mSettings); // check for variable declaration and add it to new scope if found
-                tok = scopeStartTok;
+                if (scope->type == ScopeType::eFor)
+                    scope->checkVariable(tok->tokAt(2), AccessControl::Local); // 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); // check for variable declaration and add it to new scope if found
+                tok = tok->next();
+                inIfCondition.push(scopeStartTok);
             } else if (Token::Match(tok, "%var% {")) {
-                endInitList.emplace(tok->next()->link(), scope);
+                endInitList.emplace(tok->linkAt(1), scope);
                 tok = tok->next();
             } else if (const Token *lambdaEndToken = findLambdaEndToken(tok)) {
                 tok = addLambda(tok, lambdaEndToken);
             } else if (tok->str() == "{") {
                 if (inInitList()) {
                     endInitList.emplace(tok->link(), scope);
+                } else if (!inIfCondition.empty() && tok == inIfCondition.top()) {
+                    inIfCondition.pop();
                 } else if (isExecutableScope(tok)) {
-                    scopeList.emplace_back(this, tok, scope, Scope::eUnconditional, tok);
+                    scopeList.emplace_back(*this, tok, scope, ScopeType::eUnconditional, tok);
                     scope->nestedList.push_back(&scopeList.back());
                     scope = &scopeList.back();
-                } else if (scope->isExecutable()) {
-                    endInitList.emplace(tok->link(), scope);
                 } else {
-                    tok = tok->link();
+                    endInitList.emplace(tok->link(), scope);
+                }
+            } else if (Token::Match(tok, "extern %type%")) {
+                const Token * ftok = tok->next();
+                while (Token::Match(ftok, "%name%|*|&"))
+                    ftok = ftok->next();
+                if (!ftok || ftok->str() != "(")
+                    continue;
+                ftok = ftok->previous();
+                if (Token::simpleMatch(ftok->linkAt(1), ") ;")) {
+                    const Token *funcStart = nullptr;
+                    const Token *argStart = nullptr;
+                    const Token *declEnd = nullptr;
+                    if (isFunction(ftok, scope, funcStart, argStart, declEnd)) {
+                        if (declEnd && declEnd->str() == ";") {
+                            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, "", 0)) {
+                                    newFunc = false;
+                                    break;
+                                }
+                            }
+                            // save function prototype in database
+                            if (newFunc) {
+                                Function function(ftok, scope, funcStart, argStart);
+                                if (function.isExtern()) {
+                                    scope->addFunction(std::move(function));
+                                    tok = declEnd;
+                                }
+                            }
+                        }
+                    }
                 }
             }
             // syntax error?
@@ -797,16 +883,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) {
-        std::list<Function>::iterator func;
-
-        for (func = scope.functionList.begin(); func != scope.functionList.end(); ++func) {
+        for (auto func = scope.functionList.begin(); func != scope.functionList.end(); ++func) {
             // add arguments
-            func->addArguments(this, &scope);
+            func->addArguments(&scope);
         }
     }
 }
@@ -818,21 +902,20 @@ void SymbolDatabase::createSymbolDatabaseCopyAndMoveConstructors()
         if (!scope.isClassOrStruct())
             continue;
 
-        std::list<Function>::iterator func;
-        for (func = scope.functionList.begin(); func != scope.functionList.end(); ++func) {
+        for (auto func = scope.functionList.begin(); func != scope.functionList.end(); ++func) {
             if (!func->isConstructor() || func->minArgCount() != 1)
                 continue;
 
             const Variable* firstArg = func->getArgumentVar(0);
             if (firstArg->type() == scope.definedType) {
                 if (firstArg->isRValueReference())
-                    func->type = Function::eMoveConstructor;
+                    func->type = FunctionType::eMoveConstructor;
                 else if (firstArg->isReference() && !firstArg->isPointer())
-                    func->type = Function::eCopyConstructor;
+                    func->type = FunctionType::eCopyConstructor;
             }
 
-            if (func->type == Function::eCopyConstructor ||
-                func->type == Function::eMoveConstructor)
+            if (func->type == FunctionType::eCopyConstructor ||
+                func->type == FunctionType::eMoveConstructor)
                 scope.numCopyOrMoveConstructors++;
         }
     }
@@ -842,7 +925,7 @@ void SymbolDatabase::createSymbolDatabaseFunctionScopes()
 {
     // fill in function scopes
     for (const Scope & scope : scopeList) {
-        if (scope.type == Scope::eFunction)
+        if (scope.type == ScopeType::eFunction)
             functionScopes.push_back(&scope);
     }
 }
@@ -860,9 +943,7 @@ void SymbolDatabase::createSymbolDatabaseFunctionReturnTypes()
 {
     // fill in function return types
     for (Scope& scope : scopeList) {
-        std::list<Function>::iterator func;
-
-        for (func = scope.functionList.begin(); func != scope.functionList.end(); ++func) {
+        for (auto func = scope.functionList.begin(); func != scope.functionList.end(); ++func) {
             // add return types
             if (func->retDef) {
                 const Token *type = func->retDef;
@@ -910,7 +991,7 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                     bool hasDefaultConstructor = false;
 
                     for (const Function& func : scope.functionList) {
-                        if (func.type == Function::eConstructor) {
+                        if (func.type == FunctionType::eConstructor) {
                             // check for no arguments: func ( )
                             if (func.argCount() == 0) {
                                 hasDefaultConstructor = true;
@@ -937,7 +1018,9 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                         bool unknown = false;
 
                         for (const Variable& var: scope.varlist) {
-                            if (var.isClass()) {
+                            if (var.isStatic())
+                                continue;
+                            if (var.isClass() && !var.isReference()) {
                                 if (var.type()) {
                                     // does this type need initialization?
                                     if (var.type()->needInitialization == Type::NeedInitialization::True && !var.hasDefault() && !var.isStatic())
@@ -947,7 +1030,7 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                                             unknown = true;
                                     }
                                 }
-                            } else if (!var.hasDefault() && !var.isStatic()) {
+                            } else if (!var.hasDefault()) {
                                 needInitialization = true;
                                 break;
                             }
@@ -962,7 +1045,7 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
                                 unknowns++;
                         }
                     }
-                } else if (scope.type == Scope::eUnion && scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
+                } else if (scope.type == ScopeType::eUnion && scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
                     scope.definedType->needInitialization = Type::NeedInitialization::True;
             }
 
@@ -989,7 +1072,7 @@ void SymbolDatabase::createSymbolDatabaseVariableSymbolTable()
     for (Scope& scope : scopeList) {
         // add all variables
         for (Variable& var: scope.varlist) {
-            const unsigned int varId = var.declarationId();
+            const int varId = var.declarationId();
             if (varId)
                 mVariableList[varId] = &var;
             // fix up variables without type
@@ -1005,7 +1088,7 @@ void SymbolDatabase::createSymbolDatabaseVariableSymbolTable()
             for (Variable& arg: func.argumentList) {
                 // check for named parameters
                 if (arg.nameToken() && arg.declarationId()) {
-                    const unsigned int declarationId = arg.declarationId();
+                    const int declarationId = arg.declarationId();
                     mVariableList[declarationId] = &arg;
                     // fix up parameters without type
                     if (!arg.type() && !arg.typeStartToken()->isStandardType()) {
@@ -1052,7 +1135,7 @@ void SymbolDatabase::createSymbolDatabaseSetScopePointers()
 
         const_cast<Token *>(bodyEnd)->scope(&scope);
 
-        for (Token* tok = const_cast<Token *>(bodyStart); tok != bodyEnd; tok = tok->next()) {
+        for (auto* tok = const_cast<Token *>(bodyStart); tok != bodyEnd; tok = tok->next()) {
             if (bodyStart != bodyEnd && tok->str() == "{") {
                 bool isEndOfScope = false;
                 for (Scope* innerScope: scope.nestedList) {
@@ -1076,7 +1159,7 @@ void SymbolDatabase::createSymbolDatabaseSetScopePointers()
 
     // Set scope pointers
     for (const Scope& scope: scopeList) {
-        if (scope.type == Scope::eGlobal)
+        if (scope.type == ScopeType::eGlobal)
             setScopePointers(scope, mTokenizer.list.front(), mTokenizer.list.back());
         else {
             for (const Token *bodyStart: scope.bodyStartList)
@@ -1101,28 +1184,23 @@ void SymbolDatabase::createSymbolDatabaseSetFunctionPointers(bool firstPass)
     }
 
     // Set function call pointers
-    for (const Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
-        if (tok->isName() && !tok->function() && tok->varId() == 0 && Token::Match(tok, "%name% [{(,)>;]") && !isReservedName(tok->str())) {
-            if (tok->next()->str() == ">" && !tok->next()->link())
+    const Token* inTemplateArg = nullptr;
+    for (Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
+        if (inTemplateArg == nullptr && tok->link() && tok->str() == "<")
+            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->strAt(1) == ">" && !tok->linkAt(1))
                 continue;
 
-            bool isTemplateArg = false;
-            if (tok->next()->str() != "(") {
-                const Token *start = tok;
-                while (Token::Match(start->tokAt(-2), "%name% ::"))
-                    start = start->tokAt(-2);
-                if (!Token::Match(start->previous(), "[(,<=]") && !Token::simpleMatch(start->previous(), "::") && !Token::Match(start->tokAt(-2), "[(,<=] &") && !Token::Match(start, "%name% ;"))
-                    continue;
-                isTemplateArg = Token::simpleMatch(start->previous(), "<") || Token::simpleMatch(start->tokAt(-2), "<");
-            }
-
             const Function *function = findFunction(tok);
-            if (!function || (isTemplateArg && function->isConstructor()))
+            if (!function || (inTemplateArg && function->isConstructor()))
                 continue;
 
-            const_cast<Token *>(tok)->function(function);
+            tok->function(function);
 
-            if (tok->next()->str() != "(")
+            if (tok->strAt(1) != "(")
                 const_cast<Function *>(function)->functionPointerUsage = tok;
         }
     }
@@ -1169,16 +1247,19 @@ void SymbolDatabase::createSymbolDatabaseSetTypePointers()
     }
 
     // Set type pointers
-    for (const Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
+    for (Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
         if (!tok->isName() || tok->varId() || tok->function() || tok->type() || tok->enumerator())
             continue;
 
+        if (Token::simpleMatch(tok->next(), "<"))
+            continue;
+
         if (typenames.find(tok->str()) == typenames.end())
             continue;
 
         const Type *type = findVariableType(tok->scope(), tok);
         if (type)
-            const_cast<Token *>(tok)->type(type); // TODO: avoid const_cast
+            tok->type(type);
     }
 }
 
@@ -1197,21 +1278,21 @@ void SymbolDatabase::createSymbolDatabaseSetSmartPointerType()
 
 void SymbolDatabase::fixVarId(VarIdMap & varIds, const Token * vartok, Token * membertok, const Variable * membervar)
 {
-    VarIdMap::iterator varId = varIds.find(vartok->varId());
+    auto varId = varIds.find(vartok->varId());
     if (varId == varIds.end()) {
         MemberIdMap memberId;
         if (membertok->varId() == 0) {
-            memberId[membervar->nameToken()->varId()] = const_cast<Tokenizer &>(mTokenizer).newVarId();
+            memberId[membervar->nameToken()->varId()] = mTokenizer.newVarId();
             mVariableList.push_back(membervar);
         } else
             mVariableList[membertok->varId()] = membervar;
-        varIds.insert(std::make_pair(vartok->varId(), memberId));
+        varIds.emplace(vartok->varId(), memberId);
         varId = varIds.find(vartok->varId());
     }
-    MemberIdMap::iterator memberId = varId->second.find(membervar->nameToken()->varId());
-    if (memberId == varId->second.end()) {
+    auto memberId = utils::as_const(varId->second).find(membervar->nameToken()->varId());
+    if (memberId == varId->second.cend()) {
         if (membertok->varId() == 0) {
-            varId->second.insert(std::make_pair(membervar->nameToken()->varId(), const_cast<Tokenizer &>(mTokenizer).newVarId()));
+            varId->second.emplace(membervar->nameToken()->varId(), mTokenizer.newVarId());
             mVariableList.push_back(membervar);
             memberId = varId->second.find(membervar->nameToken()->varId());
         } else
@@ -1240,7 +1321,7 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
         if (!tok->isName() || tok->isKeyword() || tok->isStandardType())
             continue;
         if (tok->varId())
-            const_cast<Token*>(tok)->variable(getVariableFromVarId(tok->varId()));
+            tok->variable(getVariableFromVarId(tok->varId()));
 
         // Set Token::variable pointer for array member variable
         // Since it doesn't point at a fixed location it doesn't have varid
@@ -1252,16 +1333,16 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
         if (isVar && (isArrayAccess || isDirectAccess || isDerefAccess)) {
             Token* membertok{};
             if (isArrayAccess) {
-                membertok = const_cast<Token*>(tok->astParent());
+                membertok = tok->astParent();
                 while (Token::simpleMatch(membertok, "["))
                     membertok = membertok->astParent();
                 if (membertok)
                     membertok = membertok->astOperand2();
             }
             else if (isDirectAccess) {
-                membertok = const_cast<Token*>(tok->astParent()->astOperand2());
+                membertok = tok->astParent()->astOperand2();
                 if (membertok == tok) {
-                    Token* gptok = const_cast<Token*>(tok->astParent()->astParent());
+                    Token* gptok = tok->astParent()->astParent();
                     if (Token::simpleMatch(gptok, ".")) // chained access
                         membertok = gptok->astOperand2();
                     else if (Token::simpleMatch(gptok, "[") && Token::simpleMatch(gptok->astParent(), "."))
@@ -1269,7 +1350,7 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
                 }
             }
             else { // isDerefAccess
-                membertok = const_cast<Token*>(tok->astParent());
+                membertok = tok->astParent();
                 while (Token::simpleMatch(membertok, "*"))
                     membertok = membertok->astParent();
                 if (membertok)
@@ -1307,15 +1388,15 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
         // check for function returning record type
         // func(...).var
         // func(...)[...].var
-        else if (tok->function() && tok->next()->str() == "(" &&
-                 (Token::Match(tok->next()->link(), ") . %name% !!(") ||
-                  (Token::Match(tok->next()->link(), ") [") && Token::Match(tok->next()->link()->next()->link(), "] . %name% !!(")))) {
+        else if (tok->function() && tok->strAt(1) == "(" &&
+                 (Token::Match(tok->linkAt(1), ") . %name% !!(") ||
+                  (Token::Match(tok->linkAt(1), ") [") && Token::Match(tok->linkAt(1)->linkAt(1), "] . %name% !!(")))) {
             const Type *type = tok->function()->retType;
             Token* membertok;
-            if (tok->next()->link()->next()->str() == ".")
-                membertok = tok->next()->link()->next()->next();
+            if (tok->linkAt(1)->strAt(1) == ".")
+                membertok = tok->linkAt(1)->tokAt(2);
             else
-                membertok = tok->next()->link()->next()->link()->next()->next();
+                membertok = tok->linkAt(1)->linkAt(1)->tokAt(2);
             if (type) {
                 const Variable *membervar = membertok->variable();
                 if (!membervar) {
@@ -1335,13 +1416,13 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
                 }
             }
         }
-        else if (Token::simpleMatch(tok->astParent(), ".") && tok->next()->str() == "(" &&
-                 astIsContainer(tok->astParent()->astOperand1()) && Token::Match(tok->next()->link(), ") . %name% !!(")) {
+        else if (Token::simpleMatch(tok->astParent(), ".") && tok->strAt(1) == "(" &&
+                 astIsContainer(tok->astParent()->astOperand1()) && Token::Match(tok->linkAt(1), ") . %name% !!(")) {
             const ValueType* vt = tok->astParent()->astOperand1()->valueType();
             const Library::Container* cont = vt->container;
             auto it = cont->functions.find(tok->str());
             if (it != cont->functions.end() && isContainerYieldElement(it->second.yield) && vt->containerTypeToken) {
-                Token* memberTok = tok->next()->link()->tokAt(2);
+                Token* memberTok = tok->linkAt(1)->tokAt(2);
                 const Scope* scope = vt->containerTypeToken->scope();
                 const Type* contType{};
                 const std::string& typeStr = vt->containerTypeToken->str(); // TODO: handle complex type expressions
@@ -1362,7 +1443,7 @@ void SymbolDatabase::createSymbolDatabaseEnums()
 {
     // fill in enumerators in enum
     for (const Scope &scope : scopeList) {
-        if (scope.type != Scope::eEnum)
+        if (scope.type != ScopeType::eEnum)
             continue;
 
         // add enumerators to enumerator tokens
@@ -1373,7 +1454,7 @@ void SymbolDatabase::createSymbolDatabaseEnums()
     std::set<std::string> tokensThatAreNotEnumeratorValues;
 
     for (const Scope &scope : scopeList) {
-        if (scope.type != Scope::eEnum)
+        if (scope.type != ScopeType::eEnum)
             continue;
 
         for (const Enumerator & enumerator : scope.enumeratorList) {
@@ -1393,83 +1474,22 @@ void SymbolDatabase::createSymbolDatabaseEnums()
     }
 
     // find enumerators
-    for (const Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
+    for (Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
         const bool isVariable = (tok->tokType() == Token::eVariable && !tok->variable());
         if (tok->tokType() != Token::eName && !isVariable)
             continue;
         const Enumerator * enumerator = findEnumerator(tok, tokensThatAreNotEnumeratorValues);
         if (enumerator) {
             if (isVariable)
-                const_cast<Token*>(tok)->varId(0);
-            const_cast<Token*>(tok)->enumerator(enumerator);
+                tok->varId(0);
+            tok->enumerator(enumerator);
         }
     }
 }
 
 void SymbolDatabase::createSymbolDatabaseIncompleteVars()
 {
-    // TODO: replace with Keywords::getX()
-    static const std::unordered_set<std::string> cpp20keywords = {
-        "alignas",
-        "alignof",
-        "axiom",
-        "co_await",
-        "co_return",
-        "co_yield",
-        "concept",
-        "synchronized",
-        "consteval",
-        "reflexpr",
-        "requires",
-    };
-    static const std::unordered_set<std::string> cppkeywords = {
-        "asm",
-        "auto",
-        "catch",
-        "char",
-        "class",
-        "const",
-        "constexpr",
-        "decltype",
-        "default",
-        "do",
-        "enum",
-        "explicit",
-        "export",
-        "extern",
-        "final",
-        "friend",
-        "inline",
-        "mutable",
-        "namespace",
-        "new",
-        "noexcept",
-        "nullptr",
-        "override",
-        "private",
-        "protected",
-        "public",
-        "register",
-        "sizeof",
-        "static",
-        "static_assert",
-        "struct",
-        "template",
-        "this",
-        "thread_local",
-        "throw",
-        "try",
-        "typedef",
-        "typeid",
-        "typename",
-        "union",
-        "using",
-        "virtual",
-        "void",
-        "volatile",
-        "NULL",
-    };
-    for (const Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
+    for (Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
         const Scope * scope = tok->scope();
         if (!scope)
             continue;
@@ -1477,47 +1497,83 @@ void SymbolDatabase::createSymbolDatabaseIncompleteVars()
             continue;
         if (tok->varId() != 0)
             continue;
-        if (!tok->isNameOnly())
+        if (tok->isCast() && !isCPPCast(tok) && tok->link() && tok->str() == "(") {
+            tok = tok->link();
+            continue;
+        }
+        if (tok->isCpp()) {
+            if (Token::Match(tok, "catch|typeid (") ||
+                Token::Match(tok, "static_cast|dynamic_cast|const_cast|reinterpret_cast")) {
+                tok = tok->linkAt(1);
+                continue;
+            }
+            if (tok->str() == "using") {
+                Token* usingEnd = Token::findsimplematch(tok, ";");
+                if (!usingEnd)
+                    mTokenizer.syntaxError(tok);
+                tok = usingEnd;
+                continue;
+            }
+        }
+        if (tok->str() == "NULL")
+            continue;
+        if (tok->isKeyword() || !tok->isNameOnly())
             continue;
         if (tok->type())
             continue;
-        if (Token::Match(tok->next(), "::|.|(|:|%var%"))
+        if (Token::Match(tok->next(), "::|.|(|{|:|%var%"))
             continue;
-        if (Token::Match(tok->next(), "&|&&|* )|,|%var%"))
+        if (Token::Match(tok->next(), "&|&&|* *| *| )|,|%var%|const"))
             continue;
-        if (Token::simpleMatch(tok->next(), ")") && Token::simpleMatch(tok->next()->link()->previous(), "catch ("))
+        if (Token::Match(tok->previous(), "%str%"))
             continue;
         // Very likely a typelist
         if (Token::Match(tok->tokAt(-2), "%type% ,") || Token::Match(tok->next(), ", %type%"))
             continue;
         // Inside template brackets
-        if (Token::Match(tok->next(), "<|>") && tok->next()->link())
-            continue;
-        if (Token::simpleMatch(tok->previous(), "<") && tok->previous()->link())
+        if (Token::simpleMatch(tok->next(), "<") && tok->linkAt(1)) {
+            tok = tok->linkAt(1);
             continue;
+        }
         // Skip goto labels
         if (Token::simpleMatch(tok->previous(), "goto"))
             continue;
-        // TODO: handle all C/C++ standards
-        if (cppkeywords.count(tok->str()) > 0)
-            continue;
-        if (mSettings.standards.cpp >= Standards::CPP20 && cpp20keywords.count(tok->str()) > 0)
+        std::string fstr = tok->str();
+        const Token* ftok = tok->previous();
+        while (Token::simpleMatch(ftok, "::")) {
+            if (!Token::Match(ftok->previous(), "%name%"))
+                break;
+            fstr.insert(0, ftok->strAt(-1) + "::");
+            ftok = ftok->tokAt(-2);
+        }
+        if (mSettings.library.functions().find(fstr) != mSettings.library.functions().end())
             continue;
-        const_cast<Token *>(tok)->isIncompleteVar(true); // TODO: avoid const_cast
+        if (tok->isCpp()) {
+            const Token* parent = tok->astParent();
+            while (Token::Match(parent, "::|[|{"))
+                parent = parent->astParent();
+            if (Token::simpleMatch(parent, "new"))
+                continue;
+            // trailing return type
+            if (Token::simpleMatch(ftok, ".") && ftok->originalName() == "->" && Token::Match(ftok->tokAt(-1), "[])]"))
+                continue;
+        }
+        tok->isIncompleteVar(true);
     }
 }
 
+// cppcheck-suppress functionConst - has side effects
 void SymbolDatabase::createSymbolDatabaseEscapeFunctions()
 {
     for (const Scope& scope : scopeList) {
-        if (scope.type != Scope::eFunction)
+        if (scope.type != ScopeType::eFunction)
             continue;
         Function * function = scope.function;
         if (!function)
             continue;
         if (Token::findsimplematch(scope.bodyStart, "return", scope.bodyEnd))
             continue;
-        function->isEscapeFunction(isReturnScope(scope.bodyEnd, &mSettings.library, nullptr, true));
+        function->isEscapeFunction(isReturnScope(scope.bodyEnd, mSettings.library, nullptr, true));
     }
 }
 
@@ -1551,22 +1607,113 @@ static std::string getIncompleteNameID(const Token* tok)
     return result + tok->expressionString();
 }
 
+namespace {
+    struct ExprIdKey {
+        std::string parentOp;
+        nonneg int operand1;
+        nonneg int operand2;
+        bool operator<(const ExprIdKey& k) const {
+            return std::tie(parentOp, operand1, operand2) < std::tie(k.parentOp, k.operand1, k.operand2);
+        }
+    };
+    using ExprIdMap = std::map<ExprIdKey, nonneg int>;
+    void setParentExprId(Token* tok, ExprIdMap& exprIdMap, nonneg int &id) {
+        for (;;) {
+            if (!tok->astParent() || tok->astParent()->isControlFlowKeyword())
+                break;
+            const Token* op1 = tok->astParent()->astOperand1();
+            if (op1 && op1->exprId() == 0 && !Token::Match(op1, "[{[]"))
+                break;
+            const Token* op2 = tok->astParent()->astOperand2();
+            if (op2 && op2->exprId() == 0 &&
+                !((tok->astParent()->astParent() && tok->astParent()->isAssignmentOp() && tok->astParent()->astParent()->isAssignmentOp()) ||
+                  isLambdaCaptureList(op2) ||
+                  (op2->str() == "(" && isLambdaCaptureList(op2->astOperand1())) ||
+                  Token::simpleMatch(op2, "{ }") ||
+                  (Token::simpleMatch(tok->astParent(), "[") && op2->str() == "{")))
+                break;
+
+            if (tok->astParent()->isExpandedMacro() || Token::Match(tok->astParent(), "++|--")) {
+                tok->astParent()->exprId(id);
+                ++id;
+                tok = tok->astParent();
+                continue;
+            }
+
+            ExprIdKey key;
+            key.parentOp = tok->astParent()->str();
+            key.operand1 = op1 ? op1->exprId() : 0;
+            key.operand2 = op2 ? op2->exprId() : 0;
+
+            if (tok->astParent()->isCast() && tok->astParent()->str() == "(") {
+                const Token* typeStartToken;
+                const Token* typeEndToken;
+                if (tok->astParent()->astOperand2()) {
+                    typeStartToken = tok->astParent()->astOperand1();
+                    typeEndToken = tok;
+                } else {
+                    typeStartToken = tok->astParent()->next();
+                    typeEndToken = tok->astParent()->link();
+                }
+                std::string type;
+                for (const Token* t = typeStartToken; precedes(t, typeEndToken); t = t->next()) {
+                    type += " " + t->str();
+                }
+                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
+                if (!tok->isCpp() ||
+                    key.parentOp != "+" ||
+                    !tok->astParent()->valueType() ||
+                    tok->astParent()->valueType()->isIntegral() ||
+                    tok->astParent()->valueType()->isFloat() ||
+                    tok->astParent()->valueType()->pointer > 0)
+                    std::swap(key.operand1, key.operand2);
+            }
+
+            const auto it = exprIdMap.find(key);
+            if (it == exprIdMap.end()) {
+                exprIdMap[key] = id;
+                tok->astParent()->exprId(id);
+                ++id;
+            } else {
+                tok->astParent()->exprId(it->second);
+            }
+            tok = tok->astParent();
+        }
+    }
+}
+
 void SymbolDatabase::createSymbolDatabaseExprIds()
 {
-    nonneg int base = 0;
     // Find highest varId
-    for (const Variable *var : mVariableList) {
-        if (!var)
-            continue;
-        base = std::max<MathLib::bigint>(base, var->declarationId());
+    nonneg int maximumVarId = 0;
+    for (const Token* tok = mTokenizer.list.front(); tok; tok = tok->next()) {
+        maximumVarId = std::max(tok->varId(), maximumVarId);
     }
-    nonneg int id = base + 1;
+    nonneg int id = maximumVarId + 1;
     // Find incomplete vars that are used in constant context
     std::unordered_map<std::string, nonneg int> unknownConstantIds;
     const Token* inConstExpr = nullptr;
     for (const Token* tok = mTokenizer.list.front(); tok != mTokenizer.list.back(); tok = tok->next()) {
-        if (Token::Match(tok, "decltype|sizeof|typeof (") && tok->next()->link()) {
-            tok = tok->next()->link()->previous();
+        if (Token::Match(tok, "decltype|sizeof|typeof (") && tok->linkAt(1)) {
+            tok = tok->linkAt(1)->previous();
         } else if (tok == inConstExpr) {
             inConstExpr = nullptr;
         } else if (inConstExpr) {
@@ -1581,23 +1728,20 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
         } else if (tok->link() && tok->str() == "<") {
             inConstExpr = tok->link();
         } else if (Token::Match(tok, "%var% [") && tok->variable() && tok->variable()->nameToken() == tok) {
-            inConstExpr = tok->next()->link();
+            inConstExpr = tok->linkAt(1);
         }
     }
 
-    auto exprScopes = functionScopes; // functions + global lambdas
+    auto exprScopes = functionScopes; // functions + global lambdas + namespaces
     std::copy_if(scopeList.front().nestedList.begin(), scopeList.front().nestedList.end(), std::back_inserter(exprScopes), [](const Scope* scope) {
-        return scope && scope->type == Scope::eLambda;
+        return scope && (scope->type == ScopeType::eLambda || scope->type == ScopeType::eNamespace);
     });
 
     for (const Scope * scope : exprScopes) {
-        nonneg int thisId = 0;
-        std::unordered_map<std::string, std::vector<Token*>> exprs;
-
         std::unordered_map<std::string, nonneg int> unknownIds;
         // Assign IDs to incomplete vars which are part of an expression
         // Such variables should be assumed global
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (!tok->isIncompleteVar())
                 continue;
             if (!isExpression(tok->astParent()))
@@ -1618,65 +1762,71 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
         }
 
         // Assign IDs
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+        ExprIdMap exprIdMap;
+        std::map<std::string, std::pair<nonneg int, const Token*>> baseIds;
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (tok->varId() > 0) {
                 tok->exprId(tok->varId());
-            } else if (isExpression(tok)) {
-                exprs[tok->str()].push_back(tok);
-                tok->exprId(id++);
+                if (tok->astParent() && tok->astParent()->exprId() == 0)
+                    setParentExprId(tok, exprIdMap, id);
+            } else if (tok->astParent() && !tok->astOperand1() && !tok->astOperand2()) {
+                if (tok->tokType() == Token::Type::eBracket)
+                    continue;
+                if (tok->astParent()->str() == "=")
+                    continue;
+                if (tok->isControlFlowKeyword())
+                    continue;
+                if (Token::Match(tok->tokAt(-1), ". %name%") && Token::Match(tok->tokAt(-2), "[{,]")) // designated initializers
+                    continue;
 
-                if (id == std::numeric_limits<nonneg int>::max() / 4) {
-                    throw InternalError(nullptr, "Ran out of expression ids.", InternalError::INTERNAL);
-                }
-            } else if (isCPP() && Token::simpleMatch(tok, "this")) {
-                if (thisId == 0)
-                    thisId = id++;
-                tok->exprId(thisId);
-            }
-        }
-
-        // Apply CSE
-        for (const auto& p:exprs) {
-            const std::vector<Token*>& tokens = p.second;
-            const std::size_t N = tokens.size();
-            for (std::size_t i = 0; i < N; ++i) {
-                Token* const tok1 = tokens[i];
-                for (std::size_t j = i + 1; j < N; ++j) {
-                    Token* const tok2 = tokens[j];
-                    if (tok1->exprId() == tok2->exprId())
-                        continue;
-                    if (!isSameExpression(isCPP(), true, tok1, tok2, mSettings.library, false, false))
-                        continue;
-                    nonneg int const cid = std::min(tok1->exprId(), tok2->exprId());
-                    tok1->exprId(cid);
-                    tok2->exprId(cid);
+                if (Token::Match(tok, "%name% <") && tok->linkAt(1)) {
+                    tok->exprId(id);
+                    ++id;
+                } else {
+                    const auto it = baseIds.find(tok->str());
+                    if (it != baseIds.end() && compareTokenFlags(tok, it->second.second, /*macro*/ true)) {
+                        tok->exprId(it->second.first);
+                    } else {
+                        baseIds[tok->str()] = { id, tok };
+                        tok->exprId(id);
+                        ++id;
+                    }
                 }
+
+                setParentExprId(tok, exprIdMap, id);
             }
         }
-        // Mark expressions that are unique
-        std::unordered_map<nonneg int, Token*> exprMap;
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
-            if (tok->exprId() == 0)
-                continue;
-            auto p = exprMap.emplace(tok->exprId(), tok);
-            // Already exists so set it to null
-            if (!p.second) {
-                p.first->second = nullptr;
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+            if (tok->varId() == 0 && tok->exprId() > 0 && tok->astParent() && !tok->astOperand1() && !tok->astOperand2()) {
+                if (tok->isNumber() || tok->isKeyword() || Token::Match(tok->astParent(), ".|::") ||
+                    (Token::simpleMatch(tok->astParent(), "(") && precedes(tok, tok->astParent())))
+                    tok->exprId(0);
             }
         }
-        for (const auto& p : exprMap) {
-            if (!p.second)
+    }
+
+    // Mark expressions that are unique
+    std::vector<std::pair<Token*, int>> uniqueExprId(id);
+    for (Token* tok = mTokenizer.list.front(); tok; tok = tok->next()) {
+        const auto id2 = tok->exprId();
+        if (id2 == 0 || id2 <= maximumVarId)
+            continue;
+        uniqueExprId[id2].first = tok;
+        uniqueExprId[id2].second++;
+    }
+    for (const auto& p : uniqueExprId) {
+        if (!p.first || p.second != 1)
+            continue;
+        if (p.first->variable()) {
+            const Variable* var = p.first->variable();
+            if (var->nameToken() != p.first)
                 continue;
-            if (p.second->variable()) {
-                const Variable* var = p.second->variable();
-                if (var->nameToken() != p.second)
-                    continue;
-            }
-            p.second->setUniqueExprId();
         }
+        p.first->setUniqueExprId();
     }
 }
 
+// cppcheck-suppress functionConst - has side effects
 void SymbolDatabase::setArrayDimensionsUsingValueFlow()
 {
     // set all unknown array dimensions
@@ -1686,27 +1836,25 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
             continue;
         // check each array dimension
         for (const Dimension &const_dimension : var->dimensions()) {
-            Dimension &dimension = const_cast<Dimension &>(const_dimension);
+            auto &dimension = const_cast<Dimension &>(const_dimension);
             if (dimension.num != 0 || !dimension.tok)
                 continue;
 
             if (Token::Match(dimension.tok->previous(), "[<,]")) {
                 if (dimension.known)
                     continue;
-                if (!Token::Match(dimension.tok->previous(), "[<,]"))
-                    continue;
 
                 // In template arguments, there might not be AST
                 // Determine size by using the "raw tokens"
-                TokenList tokenList(&mSettings);
+                TokenList tokenList(mSettings, dimension.tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
                 tokenList.addtoken(";", 0, 0, 0, false);
                 bool fail = false;
                 for (const Token *tok = dimension.tok; tok && !Token::Match(tok, "[,>]"); tok = tok->next()) {
                     if (!tok->isName())
                         tokenList.addtoken(tok->str(), 0, 0, 0, false);
 
-                    else if (tok->hasKnownIntValue())
-                        tokenList.addtoken(std::to_string(tok->getKnownIntValue()), 0, 0, 0, false);
+                    else if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT))
+                        tokenList.addtoken(MathLib::toString(v->intvalue), 0, 0, 0, false);
 
                     else {
                         fail = true;
@@ -1728,7 +1876,7 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
 
                 if (Token::Match(tokenList.front(), "; %num% ;")) {
                     dimension.known = true;
-                    dimension.num = MathLib::toLongNumber(tokenList.front()->next()->str());
+                    dimension.num = MathLib::toBigNumber(tokenList.front()->tokAt(1));
                 }
 
                 continue;
@@ -1738,14 +1886,14 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
             dimension.known = false;
 
             // check for a single token dimension
-            if (dimension.tok->hasKnownIntValue()) {
+            if (const ValueFlow::Value* v = dimension.tok->getKnownValue(ValueFlow::Value::ValueType::INT)) {
                 dimension.known = true;
-                dimension.num = dimension.tok->getKnownIntValue();
+                dimension.num = v->intvalue;
                 continue;
             }
 
             if (dimension.tok->valueType() && dimension.tok->valueType()->pointer == 0) {
-                int bits = 0;
+                std::uint8_t bits = 0;
                 switch (dimension.tok->valueType()->type) {
                 case ValueType::Type::CHAR:
                     bits = mSettings.platform.char_bit;
@@ -1780,17 +1928,17 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
 SymbolDatabase::~SymbolDatabase()
 {
     // Clear scope, type, function and variable pointers
-    for (const Token* tok = mTokenizer.list.front(); tok; tok = tok->next()) {
-        const_cast<Token *>(tok)->scope(nullptr);
-        const_cast<Token *>(tok)->type(nullptr);
-        const_cast<Token *>(tok)->function(nullptr);
-        const_cast<Token *>(tok)->variable(nullptr);
-        const_cast<Token *>(tok)->enumerator(nullptr);
-        const_cast<Token *>(tok)->setValueType(nullptr);
+    for (Token* tok = mTokenizer.list.front(); tok; tok = tok->next()) {
+        tok->scope(nullptr);
+        tok->type(nullptr);
+        tok->function(nullptr);
+        tok->variable(nullptr);
+        tok->enumerator(nullptr);
+        tok->setValueType(nullptr);
     }
 }
 
-bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const Token **funcStart, const Token **argStart, const Token** declEnd) const
+bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const Token *&funcStart, const Token *&argStart, const Token*& declEnd) const
 {
     if (tok->varId())
         return false;
@@ -1799,17 +1947,17 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
     // function returning reference to array '... ( & %name% ( ... ))[ ... ] {'
     // TODO: Activate this again
     if ((false) && tok->str() == "(" && tok->strAt(1) != "*" && // NOLINT(readability-simplify-boolean-expr)
-        (tok->link()->previous()->str() == ")" || Token::simpleMatch(tok->link()->tokAt(-2), ") const"))) {
+        (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|=")) {
             const Token* argStartTok;
-            if (tok->link()->previous()->str() == "const")
+            if (tok->link()->strAt(-1) == "const")
                 argStartTok = tok->link()->linkAt(-2);
             else
                 argStartTok = tok->link()->linkAt(-1);
-            *funcStart = argStartTok->previous();
-            *argStart = argStartTok;
-            *declEnd = Token::findmatch(tok2->link()->next(), "{|;");
+            funcStart = argStartTok->previous();
+            argStart = argStartTok;
+            declEnd = Token::findmatch(tok2->link()->next(), "{|;");
             return true;
         }
         if (tok2 && tok2->str() == "[") {
@@ -1817,29 +1965,29 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
                 tok2 = tok2->link()->next();
             if (Token::Match(tok2, "{|;|const|=")) {
                 const Token* argStartTok;
-                if (tok->link()->previous()->str() == "const")
+                if (tok->link()->strAt(-1) == "const")
                     argStartTok = tok->link()->linkAt(-2);
                 else
                     argStartTok = tok->link()->linkAt(-1);
-                *funcStart = argStartTok->previous();
-                *argStart = argStartTok;
-                *declEnd = Token::findmatch(tok2, "{|;");
+                funcStart = argStartTok->previous();
+                argStart = argStartTok;
+                declEnd = Token::findmatch(tok2, "{|;");
                 return true;
             }
         }
     }
 
-    else if (!tok->isName() || !tok->next() || !tok->next()->link())
+    else if (!tok->isName() || !tok->next() || !tok->linkAt(1))
         return false;
 
     // regular function?
-    else if (Token::Match(tok, "%name% (") && !isReservedName(tok->str()) && tok->previous() &&
+    else if (Token::Match(tok, "%name% ( !!*") && !isReservedName(tok) && tok->previous() &&
              (Token::Match(tok->previous(), "%name%|>|&|&&|*|::|~") || // Either a return type or scope qualifier in front of tok
               outerScope->isClassOrStructOrUnion())) { // or a ctor/dtor
         const Token* tok1 = tok->previous();
-        const Token* tok2 = tok->next()->link()->next();
+        const Token* tok2 = tok->linkAt(1)->next();
 
-        if (!mTokenizer.isFunctionHead(tok->next(), ";:{"))
+        if (!TokenList::isFunctionHead(tok->next(), ";:{"))
             return false;
 
         // skip over destructor "~"
@@ -1863,7 +2011,9 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
         }
 
         // skip over trailing return type
+        bool hasTrailingRet = false;
         if (tok2 && tok2->str() == ".") {
+            hasTrailingRet = true;
             for (tok2 = tok2->next(); tok2; tok2 = tok2->next()) {
                 if (Token::Match(tok2, ";|{|=|override|final"))
                     break;
@@ -1875,7 +2025,7 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
         // done if constructor or destructor
         if (!Token::Match(tok1, "{|}|;|public:|protected:|private:") && tok1) {
             // skip over pointers and references
-            while (Token::Match(tok1, "%type%|*|&|&&") && !endsWith(tok1->str(), ':') && (!isReservedName(tok1->str()) || tok1->str() == "const"))
+            while (Token::Match(tok1, "%type%|*|&|&&") && !endsWith(tok1->str(), ':') && (!isReservedName(tok1) || tok1->str() == "const"))
                 tok1 = tok1->previous();
 
             // skip over decltype
@@ -1918,7 +2068,7 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
             // skip over modifiers and other stuff
             while (Token::Match(tok1, "const|static|extern|template|virtual|struct|class|enum|%name%")) {
                 // friend type func(); is not a function
-                if (isCPP() && tok1->str() == "friend" && tok2->str() == ";")
+                if (tok1->isCpp() && tok1->str() == "friend" && tok2->str() == ";")
                     return false;
                 tok1 = tok1->previous();
             }
@@ -1931,51 +2081,54 @@ bool SymbolDatabase::isFunction(const Token *tok, const Scope* outerScope, const
         if (tok2 &&
             (Token::Match(tok2, ";|{|=") ||
              (tok2->isUpperCaseName() && Token::Match(tok2, "%name% ;|{")) ||
-             (tok2->isUpperCaseName() && Token::Match(tok2, "%name% (") && tok2->next()->link()->strAt(1) == "{") ||
+             (tok2->isUpperCaseName() && Token::Match(tok2, "%name% (") && tok2->linkAt(1)->strAt(1) == "{") ||
              Token::Match(tok2, ": ::| %name% (|::|<|{") ||
              Token::Match(tok2, "&|&&| ;|{") ||
-             Token::Match(tok2, "= delete|default ;"))) {
-            *funcStart = tok;
-            *argStart = tok->next();
-            *declEnd = Token::findmatch(tok2, "{|;");
+             Token::Match(tok2, "= delete|default ;") ||
+             (hasTrailingRet && Token::Match(tok2, "final|override")))) {
+            funcStart = tok;
+            argStart = tok->next();
+            declEnd = Token::findmatch(tok2, "{|;");
             return true;
         }
     }
 
     // UNKNOWN_MACRO(a,b) { ... }
-    else if (outerScope->type == Scope::eGlobal &&
+    else if (outerScope->type == ScopeType::eGlobal &&
              Token::Match(tok, "%name% (") &&
              tok->isUpperCaseName() &&
              Token::simpleMatch(tok->linkAt(1), ") {") &&
              (!tok->previous() || Token::Match(tok->previous(), "[;{}]"))) {
-        *funcStart = tok;
-        *argStart = tok->next();
-        *declEnd = tok->linkAt(1)->next();
+        funcStart = tok;
+        argStart = tok->next();
+        declEnd = tok->linkAt(1)->next();
         return true;
     }
 
     // template constructor?
-    else if (Token::Match(tok, "%name% <") && Token::simpleMatch(tok->next()->link(), "> (")) {
-        const Token* tok2 = tok->next()->link()->next()->link();
+    else if (Token::Match(tok, "%name% <") && Token::simpleMatch(tok->linkAt(1), "> (")) {
+        if (tok->isKeyword() || tok->isStandardType() || !outerScope->isClassOrStructOrUnion())
+            return false;
+        const Token* tok2 = tok->linkAt(1)->linkAt(1);
         if (Token::Match(tok2, ") const| ;|{|=") ||
             Token::Match(tok2, ") : ::| %name% (|::|<|{") ||
             Token::Match(tok2, ") const| noexcept {|;|(")) {
-            *funcStart = tok;
-            *argStart = tok2->link();
-            *declEnd = Token::findmatch(tok2->next(), "{|;");
+            funcStart = tok;
+            argStart = tok2->link();
+            declEnd = Token::findmatch(tok2->next(), "{|;");
             return true;
         }
     }
 
     // regular C function with missing return or invalid C++ ?
-    else if (Token::Match(tok, "%name% (") && !isReservedName(tok->str()) &&
+    else if (Token::Match(tok, "%name% (") && !isReservedName(tok) &&
              Token::simpleMatch(tok->linkAt(1), ") {") &&
              (!tok->previous() || Token::Match(tok->previous(), ";|}"))) {
-        if (mTokenizer.isC()) {
-            debugMessage(tok, "debug", "SymbolDatabase::isFunction found C function '" + tok->str() + "' without a return type.");
-            *funcStart = tok;
-            *argStart = tok->next();
-            *declEnd = tok->linkAt(1)->next();
+        if (tok->isC()) {
+            returnImplicitIntError(tok);
+            funcStart = tok;
+            argStart = tok->next();
+            declEnd = tok->linkAt(1)->next();
             return true;
         }
         mTokenizer.syntaxError(tok);
@@ -1997,24 +2150,24 @@ void SymbolDatabase::validateExecutableScopes() const
                                       "symbolDatabaseWarning",
                                       msg,
                                       Certainty::normal);
-            mErrorLogger->reportErr(errmsg);
+            mErrorLogger.reportErr(errmsg);
         }
     }
 }
 
 namespace {
-    const Function* getFunctionForArgumentvariable(const Variable * const var, const std::vector<const Scope *>& functionScopes)
+    const Function* getFunctionForArgumentvariable(const Variable * const var)
     {
-        const std::size_t functions = functionScopes.size();
-        for (std::size_t i = 0; i < functions; ++i) {
-            const Scope* const scope = functionScopes[i];
-            const Function* const function = scope->function;
-            if (function) {
-                for (std::size_t arg=0; arg < function->argCount(); ++arg) {
-                    if (var==function->getArgumentVar(arg))
-                        return function;
+        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) {
+                    if (var == function.getArgumentVar(arg))
+                        return true;
                 }
-            }
+                return false;
+            });
+            if (it != scope->functionList.end())
+                return &*it;
         }
         return nullptr;
     }
@@ -2022,27 +2175,193 @@ namespace {
 
 void SymbolDatabase::validateVariables() const
 {
-    for (std::vector<const Variable *>::const_iterator iter = mVariableList.cbegin(); iter!=mVariableList.cend(); ++iter) {
+    for (auto iter = mVariableList.cbegin(); iter!=mVariableList.cend(); ++iter) {
         const Variable * const var = *iter;
         if (var) {
             if (!var->scope()) {
-                const Function* function = getFunctionForArgumentvariable(var, functionScopes);
-                if (!var->isArgument() || (function && function->hasBody())) {
+                const Function* function = getFunctionForArgumentvariable(var);
+                if (!var->isArgument() || (!function || function->hasBody())) { // variables which only appear in a function declaration do not have a scope
                     throw InternalError(var->nameToken(), "Analysis failed (variable without scope). If the code is valid then please report this failure.", InternalError::INTERNAL);
-                    //std::cout << "!!!Variable found without scope: " << var->nameToken()->str() << std::endl;
                 }
             }
         }
     }
 }
 
+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) {
         validateExecutableScopes();
     }
-    // TODO
-    //validateVariables();
+    validateVariables();
 }
 
 void SymbolDatabase::clangSetVariables(const std::vector<const Variable *> &variableList)
@@ -2069,8 +2388,8 @@ void SymbolDatabase::debugSymbolDatabase() const
                 msg += "missing";
             }
             errorPath.emplace_back(tok, "");
-            mErrorLogger->reportErr(
-                {errorPath, &mTokenizer.list, Severity::debug, "valueType", msg, CWE{0}, Certainty::normal});
+            mErrorLogger.reportErr(
+                {std::move(errorPath), &mTokenizer.list, Severity::debug, "valueType", msg, CWE{0}, Certainty::normal});
         }
     }
 }
@@ -2085,8 +2404,7 @@ Variable::Variable(const Token *name_, const std::string &clangType, const Token
     mAccess(access_),
     mFlags(0),
     mType(type_),
-    mScope(scope_),
-    mValueType(nullptr)
+    mScope(scope_)
 {
     if (!mTypeStartToken && mTypeEndToken) {
         mTypeStartToken = mTypeEndToken;
@@ -2117,7 +2435,7 @@ Variable::Variable(const Token *name_, const std::string &clangType, const Token
             dim.tok = nullptr;
             dim.known = pos > pos1;
             if (pos > pos1)
-                dim.num = MathLib::toLongNumber(clangType.substr(pos1, pos-pos1));
+                dim.num = MathLib::toBigNumber(clangType.substr(pos1, pos - pos1));
             else
                 dim.num = 0;
             mDimensions.push_back(dim);
@@ -2134,14 +2452,12 @@ Variable::Variable(const Token *name_, const std::string &clangType, const Token
 }
 
 Variable::Variable(const Variable &var, const Scope *scope)
-    : mValueType(nullptr)
 {
     *this = var;
     mScope = scope;
 }
 
 Variable::Variable(const Variable &var)
-    : mValueType(nullptr)
 {
     *this = var;
 }
@@ -2151,11 +2467,15 @@ Variable::~Variable()
     delete mValueType;
 }
 
-Variable& Variable::operator=(const Variable &var)
+Variable& Variable::operator=(const Variable &var) &
 {
     if (this == &var)
         return *this;
 
+    const ValueType* vt = nullptr;
+    if (var.mValueType)
+        vt = new ValueType(*var.mValueType);
+
     mNameToken = var.mNameToken;
     mTypeStartToken = var.mTypeStartToken;
     mTypeEndToken = var.mTypeEndToken;
@@ -2166,10 +2486,7 @@ Variable& Variable::operator=(const Variable &var)
     mScope = var.mScope;
     mDimensions = var.mDimensions;
     delete mValueType;
-    if (var.mValueType)
-        mValueType = new ValueType(*var.mValueType);
-    else
-        mValueType = nullptr;
+    mValueType = vt;
 
     return *this;
 }
@@ -2180,7 +2497,7 @@ bool Variable::isMember() const {
 
 bool Variable::isPointerArray() const
 {
-    return isArray() && nameToken() && nameToken()->previous() && (nameToken()->previous()->str() == "*");
+    return isArray() && nameToken() && nameToken()->previous() && (nameToken()->strAt(-1) == "*");
 }
 
 bool Variable::isUnsigned() const
@@ -2191,7 +2508,9 @@ bool Variable::isUnsigned() const
 const Token * Variable::declEndToken() const
 {
     Token const * declEnd = typeStartToken();
-    while (declEnd && !Token::Match(declEnd, "[;,)={]")) {
+    if (declEnd->tokAt(-1) && Token::simpleMatch(declEnd->tokAt(-2), "for ("))
+        declEnd = nameToken();
+    while (declEnd && !Token::Match(declEnd, "[;:,)={]")) {
         if (declEnd->link() && Token::Match(declEnd,"(|[|<"))
             declEnd = declEnd->link();
         declEnd = declEnd->next();
@@ -2199,29 +2518,29 @@ const Token * Variable::declEndToken() const
     return declEnd;
 }
 
-void Variable::evaluate(const Settings* settings)
+void Variable::evaluate(const Settings& settings)
 {
     // Is there initialization in variable declaration
     const Token *initTok = mNameToken ? mNameToken->next() : nullptr;
-    while (Token::Match(initTok, "[|(")) {
+    while (Token::Match(initTok, "[")) {
         initTok = initTok->link()->next();
         if (Token::simpleMatch(initTok, ")"))
             initTok = initTok->next();
     }
-    if (Token::Match(initTok, "=|{") || (initTok && initTok->isSplittedVarDeclEq()))
+    if (Token::Match(initTok, "[={(]") || (initTok && initTok->isSplittedVarDeclEq()))
         setFlag(fIsInit, true);
 
-    if (!settings)
-        return;
-
-    const Library * const lib = &settings->library;
+    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, true)); // TODO: set isCpp
+        setValueType(ValueType::parseDecl(mTypeStartToken,settings));
 
     const Token* tok = mTypeStartToken;
     while (tok && tok->previous() && tok->previous()->isName())
@@ -2244,7 +2563,7 @@ void Variable::evaluate(const Settings* settings)
             setFlag(fIsConst, true);
             setFlag(fIsStatic, true);
         } else if (tok->str() == "*") {
-            setFlag(fIsPointer, !isArray() || (isContainer && !Token::Match(tok->next(), "%name% [")) || Token::Match(tok->previous(), "( * %name% )"));
+            setFlag(fIsPointer, !isArray() || (isContainer && !Token::Match(tok->next(), "%name% [")) || Token::Match(tok, "* const| %name% )"));
             setFlag(fIsConst, false); // Points to const, isn't necessarily const itself
         } else if (tok->str() == "&") {
             if (isReference())
@@ -2255,10 +2574,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
@@ -2274,10 +2589,10 @@ void Variable::evaluate(const Settings* settings)
         std::string strtype = mTypeStartToken->str();
         for (const Token *typeToken = mTypeStartToken; Token::Match(typeToken, "%type% :: %type%"); typeToken = typeToken->tokAt(2))
             strtype += "::" + typeToken->strAt(2);
-        setFlag(fIsClass, !lib->podtype(strtype) && !mTypeStartToken->isStandardType() && !isEnumType() && !isPointer() && !isReference() && strtype != "...");
+        setFlag(fIsClass, !lib.podtype(strtype) && !mTypeStartToken->isStandardType() && !isEnumType() && !isPointer() && !isReference() && strtype != "...");
         setFlag(fIsStlType, Token::simpleMatch(mTypeStartToken, "std ::"));
         setFlag(fIsStlString, ::isStlStringType(mTypeStartToken));
-        setFlag(fIsSmartPointer, lib->isSmartPointer(mTypeStartToken));
+        setFlag(fIsSmartPointer, mTypeStartToken->isCpp() && lib.isSmartPointer(mTypeStartToken));
     }
     if (mAccess == AccessControl::Argument) {
         tok = mNameToken;
@@ -2288,7 +2603,7 @@ void Variable::evaluate(const Settings* settings)
             while (tok && tok->str() == "]")
                 tok = tok->link()->previous();
             // add array dimensions if present
-            if (tok && tok->next()->str() == "[")
+            if (tok && tok->strAt(1) == "[")
                 setFlag(fIsArray, arrayDimensions(settings, isContainer));
         }
         if (!tok)
@@ -2322,11 +2637,13 @@ void Variable::setValueType(const ValueType &valueType)
         if (declType && !declType->next()->valueType())
             return;
     }
+    const auto* vt = new ValueType(valueType);
     delete mValueType;
-    mValueType = new ValueType(valueType);
+    mValueType = vt;
     if ((mValueType->pointer > 0) && (!isArray() || Token::Match(mNameToken->previous(), "( * %name% )")))
         setFlag(fIsPointer, true);
     setFlag(fIsConst, mValueType->constness & (1U << mValueType->pointer));
+    setFlag(fIsVolatile, mValueType->volatileness & (1U << mValueType->pointer));
     if (mValueType->smartPointerType)
         setFlag(fIsSmartPointer, true);
 }
@@ -2344,10 +2661,11 @@ const Type* Variable::smartPointerType() const
     while (Token::Match(typeTok, "%name%|::"))
         typeTok = typeTok->next();
     if (Token::Match(typeTok, "< %name% >")) {
+        // cppcheck-suppress shadowFunction - TODO: fix this
         const Scope* scope = typeTok->scope();
         const Type* ptrType{};
         while (scope && !ptrType) {
-            ptrType = scope->findType(typeTok->next()->str());
+            ptrType = scope->findType(typeTok->strAt(1));
             scope = scope->nestedIn;
         }
         return ptrType;
@@ -2377,8 +2695,8 @@ std::string Variable::getTypeName() const
     // TODO: For known types, generate the full type name
     for (const Token *typeTok = mTypeStartToken; Token::Match(typeTok, "%name%|::") && typeTok->varId() == 0; typeTok = typeTok->next()) {
         ret += typeTok->str();
-        if (Token::simpleMatch(typeTok->next(), "<") && typeTok->next()->link()) // skip template arguments
-            typeTok = typeTok->next()->link();
+        if (Token::simpleMatch(typeTok->next(), "<") && typeTok->linkAt(1)) // skip template arguments
+            typeTok = typeTok->linkAt(1);
     }
     return ret;
 }
@@ -2390,30 +2708,23 @@ static bool isOperator(const Token *tokenDef)
     if (tokenDef->isOperatorKeyword())
         return true;
     const std::string &name = tokenDef->str();
-    return name.size() > 8 && name.compare(0,8,"operator")==0 && std::strchr("+-*/%&|~^<>!=[(", name[8]);
+    return name.size() > 8 && startsWith(name,"operator") && std::strchr("+-*/%&|~^<>!=[(", name[8]);
+}
+
+static bool isTrailingReturnType(const Token* tok)
+{
+    while (tok && tok->isKeyword())
+        tok = tok->next();
+    return Token::Match(tok, "&|&&| .");
 }
 
-Function::Function(const Tokenizer *mTokenizer,
-                   const Token *tok,
+Function::Function(const Token *tok,
                    const Scope *scope,
                    const Token *tokDef,
                    const Token *tokArgDef)
     : tokenDef(tokDef),
     argDef(tokArgDef),
-    token(nullptr),
-    arg(nullptr),
-    retDef(nullptr),
-    retType(nullptr),
-    functionScope(nullptr),
-    nestedIn(scope),
-    initArgCount(0),
-    type(eFunction),
-    noexceptArg(nullptr),
-    throwArg(nullptr),
-    templateDef(nullptr),
-    functionPointerUsage(nullptr),
-    access(AccessControl::Public),
-    mFlags(0)
+    nestedIn(scope)
 {
     // operator function
     if (::isOperator(tokenDef)) {
@@ -2421,27 +2732,27 @@ Function::Function(const Tokenizer *mTokenizer,
 
         // 'operator =' is special
         if (tokenDef->str() == "operator=")
-            type = Function::eOperatorEqual;
+            type = FunctionType::eOperatorEqual;
     }
 
     else if (tokenDef->str() == "[") {
-        type = Function::eLambda;
+        type = FunctionType::eLambda;
     }
 
     // class constructor/destructor
-    else if (((tokenDef->str() == scope->className) ||
+    else if (scope->isClassOrStructOrUnion() &&
+             ((tokenDef->str() == scope->className) ||
               (tokenDef->str().substr(0, scope->className.size()) == scope->className &&
                tokenDef->str().size() > scope->className.size() + 1 &&
-               tokenDef->str()[scope->className.size() + 1] == '<')) &&
-             scope->type != Scope::ScopeType::eNamespace) {
+               tokenDef->str()[scope->className.size() + 1] == '<'))) {
         // destructor
-        if (tokenDef->previous()->str() == "~")
-            type = Function::eDestructor;
+        if (tokenDef->strAt(-1) == "~") {
+            type = FunctionType::eDestructor;
+            isNoExcept(true);
+        }
         // constructor of any kind
         else
-            type = Function::eConstructor;
-
-        isExplicit(tokenDef->strAt(-1) == "explicit" || tokenDef->strAt(-2) == "explicit");
+            type = FunctionType::eConstructor;
     }
 
     const Token *tok1 = setFlags(tok, scope);
@@ -2450,7 +2761,7 @@ Function::Function(const Tokenizer *mTokenizer,
     if (!isConstructor() && !isDestructor()) {
         // @todo auto type deduction should be checked
         // @todo attributes and exception specification can also precede trailing return type
-        if (Token::Match(argDef->link()->next(), "const|volatile| &|&&| .")) { // Trailing return type
+        if (isTrailingReturnType(argDef->link()->next())) { // Trailing return type
             hasTrailingReturnType(true);
             if (argDef->link()->strAt(1) == ".")
                 retDef = argDef->link()->tokAt(2);
@@ -2486,7 +2797,7 @@ Function::Function(const Tokenizer *mTokenizer,
             isVolatile(true);
         else if (tok->str() == "noexcept") {
             isNoExcept(!Token::simpleMatch(tok->next(), "( false )"));
-            if (tok->next()->str() == "(")
+            if (tok->strAt(1) == "(")
                 tok = tok->linkAt(1);
         } else if (Token::simpleMatch(tok, "throw (")) {
             isThrow(true);
@@ -2508,32 +2819,25 @@ Function::Function(const Tokenizer *mTokenizer,
             tok = tok->next();
     }
 
-    if (mTokenizer->isFunctionHead(end, ":{")) {
+    if (TokenList::isFunctionHead(end, ":{")) {
         // assume implementation is inline (definition and implementation same)
         token = tokenDef;
         arg = argDef;
         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)
-    : tokenDef(tokenDef),
-    argDef(nullptr),
-    token(nullptr),
-    arg(nullptr),
-    retDef(nullptr),
-    retType(nullptr),
-    functionScope(nullptr),
-    nestedIn(nullptr),
-    initArgCount(0),
-    type(eFunction),
-    noexceptArg(nullptr),
-    throwArg(nullptr),
-    templateDef(nullptr),
-    functionPointerUsage(nullptr),
-    access(AccessControl::Public),
-    mFlags(0)
+    : tokenDef(tokenDef)
 {
     // operator function
     if (::isOperator(tokenDef)) {
@@ -2541,7 +2845,7 @@ Function::Function(const Token *tokenDef, const std::string &clangType)
 
         // 'operator =' is special
         if (tokenDef->str() == "operator=")
-            type = Function::eOperatorEqual;
+            type = FunctionType::eOperatorEqual;
     }
 
     setFlags(tokenDef, tokenDef->scope());
@@ -2555,6 +2859,9 @@ const Token *Function::setFlags(const Token *tok1, const Scope *scope)
     if (tok1->isInline())
         isInlineKeyword(true);
 
+    if (tok1->isExternC())
+        isExtern(true);
+
     // look for end of previous statement
     while (tok1->previous() && !Token::Match(tok1->previous(), ";|}|{|public:|protected:|private:")) {
         tok1 = tok1->previous();
@@ -2563,7 +2870,7 @@ const Token *Function::setFlags(const Token *tok1, const Scope *scope)
             isInlineKeyword(true);
 
         // extern function
-        if (tok1->isExternC() || tok1->str() == "extern") {
+        if (tok1->str() == "extern") {
             isExtern(true);
         }
 
@@ -2575,7 +2882,7 @@ const Token *Function::setFlags(const Token *tok1, const Scope *scope)
         // static function
         else if (tok1->str() == "static") {
             isStatic(true);
-            if (scope->type == Scope::eNamespace || scope->type == Scope::eGlobal)
+            if (scope->type == ScopeType::eNamespace || scope->type == ScopeType::eGlobal)
                 isStaticLocal(true);
         }
 
@@ -2696,14 +3003,14 @@ static bool typesMatch(
     const Token *first_token,
     const Scope *second_scope,
     const Token *second_token,
-    const Token **new_first,
-    const Token **new_second)
+    const Token *&new_first,
+    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;
@@ -2714,8 +3021,8 @@ static bool typesMatch(
                 tok2 = tok2->next();
             // update parser token positions
             if (tok1 && tok2) {
-                *new_first = tok1->previous();
-                *new_second = tok2->previous();
+                new_first = tok1->previous();
+                new_second = tok2->previous();
                 return true;
             }
         }
@@ -2725,8 +3032,7 @@ static bool typesMatch(
 
 bool Function::argsMatch(const Scope *scope, const Token *first, const Token *second, const std::string &path, nonneg int path_length) const
 {
-    const bool isCPP = scope->check->isCPP();
-    if (!isCPP) // C does not support overloads
+    if (!first->isCpp()) // C does not support overloads
         return true;
 
     int arg_path_length = path_length;
@@ -2775,11 +3081,11 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
         second = skipTopLevelConst(second);
 
         // skip default value assignment
-        if (oldSecond == second && first->next()->str() == "=") {
+        if (oldSecond == second && first->strAt(1) == "=") {
             first = first->nextArgument();
             if (first)
                 first = first->tokAt(-2);
-            if (second->next()->str() == "=") {
+            if (second->strAt(1) == "=") {
                 second = second->nextArgument();
                 if (second)
                     second = second->tokAt(-2);
@@ -2789,39 +3095,39 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
             } else if (!first) { // End of argument list (first)
                 return !second->nextArgument(); // End of argument list (second)
             }
-        } else if (oldSecond == second && second->next()->str() == "=") {
+        } else if (oldSecond == second && second->strAt(1) == "=") {
             second = second->nextArgument();
             if (second)
                 second = second->tokAt(-2);
             if (!second) { // End of argument list (second)
-                return false;
+                return !first->nextArgument();
             }
         }
 
         // definition missing variable name
-        else if ((first->next()->str() == "," && second->next()->str() != ",") ||
-                 (Token::Match(first, "!!( )") && second->next()->str() != ")")) {
+        else if ((first->strAt(1) == "," && second->strAt(1) != ",") ||
+                 (Token::Match(first, "!!( )") && second->strAt(1) != ")")) {
             second = second->next();
             // skip default value assignment
-            if (second->next()->str() == "=") {
+            if (second->strAt(1) == "=") {
                 do {
                     second = second->next();
                 } while (!Token::Match(second->next(), ",|)"));
             }
-        } else if (first->next()->str() == "[" && second->next()->str() != "[")
+        } else if (first->strAt(1) == "[" && second->strAt(1) != "[")
             second = second->next();
 
         // function missing variable name
-        else if ((second->next()->str() == "," && first->next()->str() != ",") ||
-                 (Token::Match(second, "!!( )") && first->next()->str() != ")")) {
+        else if ((second->strAt(1) == "," && first->strAt(1) != ",") ||
+                 (Token::Match(second, "!!( )") && first->strAt(1) != ")")) {
             first = first->next();
             // skip default value assignment
-            if (first->next()->str() == "=") {
+            if (first->strAt(1) == "=") {
                 do {
                     first = first->next();
                 } while (!Token::Match(first->next(), ",|)"));
             }
-        } else if (second->next()->str() == "[" && first->next()->str() != "[")
+        } else if (second->strAt(1) == "[" && first->strAt(1) != "[")
             first = first->next();
 
         // unnamed parameters
@@ -2837,7 +3143,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
         else if (openParen == 1 && second->str() == ")" && first->str() != ")")
             break;
 
-        // ckeck for type * x == type x[]
+        // check for type * x == type x[]
         else if (Token::Match(first->next(), "* %name%| ,|)|=") &&
                  Token::Match(second->next(), "%name%| [ ] ,|)")) {
             do {
@@ -2849,7 +3155,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
         }
 
         // const after *
-        else if (first->next()->str() == "*" && second->next()->str() == "*" &&
+        else if (first->strAt(1) == "*" && second->strAt(1) == "*" &&
                  ((first->strAt(2) != "const" && second->strAt(2) == "const") ||
                   (first->strAt(2) == "const" && second->strAt(2) != "const"))) {
             if (first->strAt(2) != "const") {
@@ -2874,13 +3180,13 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
         // variable names are different
         else if ((Token::Match(first->next(), "%name% ,|)|=|[") &&
                   Token::Match(second->next(), "%name% ,|)|[")) &&
-                 (first->next()->str() != second->next()->str())) {
+                 (first->strAt(1) != second->strAt(1))) {
             // skip variable names
             first = first->next();
             second = second->next();
 
             // skip default value assignment
-            if (first->next()->str() == "=") {
+            if (first->strAt(1) == "=") {
                 do {
                     first = first->next();
                 } while (!Token::Match(first->next(), ",|)"));
@@ -2892,7 +3198,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
             first = first->tokAt(offset);
 
         // same type with different qualification
-        else if (typesMatch(scope, first->next(), nestedIn, second->next(), &first, &second))
+        else if (typesMatch(scope, first->next(), nestedIn, second->next(), first, second))
             ;
 
         // variable with class path
@@ -2902,7 +3208,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
             if (Token::simpleMatch(second->next(), param.c_str(), param.size())) {
                 // check for redundant qualification before skipping it
                 if (!Token::simpleMatch(first->next(), param.c_str(), param.size())) {
-                    second = second->tokAt(int(arg_path_length));
+                    second = second->tokAt(arg_path_length);
                     arg_path_length = 0;
                 }
             }
@@ -2912,10 +3218,10 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
                      (Token::Match(second->next(), "%name% :: %name%") ||
                       (Token::Match(second->next(), "%name% <") &&
                        Token::Match(second->linkAt(1), "> :: %name%"))) &&
-                     ((second->next()->str() == scope->className) ||
-                      (scope->nestedIn && second->next()->str() == scope->nestedIn->className) ||
-                      (scope->definedType && scope->definedType->isDerivedFrom(second->next()->str()))) &&
-                     (first->next()->str() == second->strAt(3))) {
+                     ((second->strAt(1) == scope->className) ||
+                      (scope->nestedIn && second->strAt(1) == scope->nestedIn->className) ||
+                      (scope->definedType && scope->definedType->isDerivedFrom(second->strAt(1)))) &&
+                     (first->strAt(1) == second->strAt(3))) {
                 if (Token::Match(second->next(), "%name% <"))
                     second = second->linkAt(1)->next();
                 else
@@ -2925,7 +3231,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
             // remove class name
             else if (arg_path_length > 2 && first->strAt(1) != second->strAt(1)) {
                 std::string short_path = path;
-                unsigned int short_path_length = arg_path_length;
+                int short_path_length = arg_path_length;
 
                 // remove last " :: "
                 short_path.resize(short_path.size() - 4);
@@ -2946,9 +3252,9 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
                     }
                 }
 
-                param = short_path;
+                param = std::move(short_path);
                 if (Token::simpleMatch(second->next(), param.c_str(), param.size())) {
-                    second = second->tokAt(int(short_path_length));
+                    second = second->tokAt(short_path_length);
                     arg_path_length = 0;
                 }
             }
@@ -2998,7 +3304,7 @@ static bool checkReturns(const Function* function, bool unknown, bool emptyEnabl
 {
     if (!function)
         return false;
-    if (function->type != Function::eFunction && function->type != Function::eOperatorEqual)
+    if (function->type != FunctionType::eFunction && function->type != FunctionType::eOperatorEqual && function->type != FunctionType::eLambda)
         return false;
     const Token* defStart = function->retDef;
     if (!defStart)
@@ -3048,28 +3354,28 @@ bool Function::returnsConst(const Function* function, bool unknown)
 
 bool Function::returnsReference(const Function* function, bool unknown, bool includeRValueRef)
 {
-    return checkReturns(function, unknown, false, [includeRValueRef](UNUSED const Token* defStart, const Token* defEnd) {
+    return checkReturns(function, unknown, false, [includeRValueRef](const Token* /*defStart*/, const Token* defEnd) {
         return includeRValueRef ? Token::Match(defEnd->previous(), "&|&&") : Token::simpleMatch(defEnd->previous(), "&");
     });
 }
 
 bool Function::returnsPointer(const Function* function, bool unknown)
 {
-    return checkReturns(function, unknown, false, [](UNUSED const Token* defStart, const Token* defEnd) {
+    return checkReturns(function, unknown, false, [](const Token* /*defStart*/, const Token* defEnd) {
         return Token::simpleMatch(defEnd->previous(), "*");
     });
 }
 
 bool Function::returnsStandardType(const Function* function, bool unknown)
 {
-    return checkReturns(function, unknown, true, [](UNUSED const Token* defStart, const Token* defEnd) {
+    return checkReturns(function, unknown, true, [](const Token* /*defStart*/, const Token* defEnd) {
         return defEnd->previous() && defEnd->previous()->isStandardType();
     });
 }
 
 bool Function::returnsVoid(const Function* function, bool unknown)
 {
-    return checkReturns(function, unknown, true, [](UNUSED const Token* defStart, const Token* defEnd) {
+    return checkReturns(function, unknown, true, [](const Token* /*defStart*/, const Token* defEnd) {
         return Token::simpleMatch(defEnd->previous(), "void");
     });
 }
@@ -3086,7 +3392,7 @@ std::vector<const Token*> Function::findReturns(const Function* f)
         return result;
     for (const Token* tok = scope->bodyStart->next(); tok && tok != scope->bodyEnd; tok = tok->next()) {
         if (tok->str() == "{" && tok->scope() &&
-            (tok->scope()->type == Scope::eLambda || tok->scope()->type == Scope::eClass)) {
+            (tok->scope()->type == ScopeType::eLambda || tok->scope()->type == ScopeType::eClass)) {
             tok = tok->link();
             continue;
         }
@@ -3113,23 +3419,23 @@ const Token * Function::constructorMemberInitialization() const
     return nullptr;
 }
 
-bool Function::isSafe(const Settings *settings) const
+bool Function::isSafe(const Settings &settings) const
 {
-    if (settings->safeChecks.externalFunctions) {
-        if (nestedIn->type == Scope::ScopeType::eNamespace && token->fileIndex() != 0)
+    if (settings.safeChecks.externalFunctions) {
+        if (nestedIn->type == ScopeType::eNamespace && token->fileIndex() != 0)
             return true;
-        if (nestedIn->type == Scope::ScopeType::eGlobal && (token->fileIndex() != 0 || !isStatic()))
+        if (nestedIn->type == ScopeType::eGlobal && (token->fileIndex() != 0 || !isStatic()))
             return true;
     }
 
-    if (settings->safeChecks.internalFunctions) {
-        if (nestedIn->type == Scope::ScopeType::eNamespace && token->fileIndex() == 0)
+    if (settings.safeChecks.internalFunctions) {
+        if (nestedIn->type == ScopeType::eNamespace && token->fileIndex() == 0)
             return true;
-        if (nestedIn->type == Scope::ScopeType::eGlobal && (token->fileIndex() == 0 || isStatic()))
+        if (nestedIn->type == ScopeType::eGlobal && (token->fileIndex() == 0 || isStatic()))
             return true;
     }
 
-    if (settings->safeChecks.classes && access == AccessControl::Public && (nestedIn->type == Scope::ScopeType::eClass || nestedIn->type == Scope::ScopeType::eStruct))
+    if (settings.safeChecks.classes && access == AccessControl::Public && (nestedIn->type == ScopeType::eClass || nestedIn->type == ScopeType::eStruct))
         return true;
 
     return false;
@@ -3145,7 +3451,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;
             }
@@ -3159,7 +3465,7 @@ Function* SymbolDatabase::addGlobalFunction(Scope*& scope, const Token*& tok, co
     function->token = funcStart;
     function->hasBody(true);
 
-    addNewFunction(&scope, &tok);
+    addNewFunction(scope, tok);
 
     if (scope) {
         scope->function = function;
@@ -3171,27 +3477,27 @@ Function* SymbolDatabase::addGlobalFunction(Scope*& scope, const Token*& tok, co
 
 Function* SymbolDatabase::addGlobalFunctionDecl(Scope*& scope, const Token *tok, const Token *argStart, const Token* funcStart)
 {
-    Function function(&mTokenizer, tok, scope, funcStart, argStart);
+    Function function(tok, scope, funcStart, argStart);
     scope->addFunction(std::move(function));
     return &scope->functionList.back();
 }
 
-void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const Token *argStart)
+void SymbolDatabase::addClassFunction(Scope *&scope, const Token *&tok, const Token *argStart)
 {
-    const bool destructor((*tok)->previous()->str() == "~");
+    const bool destructor(tok->strAt(-1) == "~");
     const bool has_const(argStart->link()->strAt(1) == "const");
     const bool lval(argStart->link()->strAt(has_const ? 2 : 1) == "&");
     const bool rval(argStart->link()->strAt(has_const ? 2 : 1) == "&&");
     int count = 0;
     std::string path;
     unsigned int path_length = 0;
-    const Token *tok1 = (*tok);
+    const Token *tok1 = tok;
 
     if (destructor)
         tok1 = tok1->previous();
 
     // back up to head of path
-    while (tok1 && tok1->previous() && tok1->previous()->str() == "::" && tok1->tokAt(-2) &&
+    while (tok1 && tok1->previous() && tok1->strAt(-1) == "::" && tok1->tokAt(-2) &&
            ((tok1->tokAt(-2)->isName() && !tok1->tokAt(-2)->isStandardType()) ||
             (tok1->strAt(-2) == ">" && tok1->linkAt(-2) && Token::Match(tok1->linkAt(-2)->previous(), "%name%")))) {
         count++;
@@ -3201,7 +3507,7 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
 
         if (tok2) {
             do {
-                path = tok1->previous()->str() + " " + path;
+                path = tok1->strAt(-1) + " " + path;
                 tok1 = tok1->previous();
                 path_length++;
             } while (tok1 != tok2);
@@ -3219,38 +3525,35 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
         path.insert(0, ":: ");
     }
 
-    std::list<Scope>::iterator it1;
-
     // search for match
-    for (it1 = scopeList.begin(); it1 != scopeList.end(); ++it1) {
+    for (auto it1 = scopeList.begin(); it1 != scopeList.end(); ++it1) {
         Scope *scope1 = &(*it1);
 
         bool match = false;
 
         // check in namespace if using found
-        if (*scope == scope1 && !scope1->usingList.empty()) {
-            std::vector<Scope::UsingInfo>::const_iterator it2;
-            for (it2 = scope1->usingList.cbegin(); it2 != scope1->usingList.cend(); ++it2) {
+        if (scope == scope1 && !scope1->usingList.empty()) {
+            for (auto it2 = scope1->usingList.cbegin(); it2 != scope1->usingList.cend(); ++it2) {
                 if (it2->scope) {
                     Function * func = findFunctionInScope(tok1, it2->scope, path, path_length);
                     if (func) {
                         if (!func->hasBody()) {
-                            const Token *closeParen = (*tok)->next()->link();
+                            const Token *closeParen = tok->linkAt(1);
                             if (closeParen) {
-                                const Token *eq = mTokenizer.isFunctionHead(closeParen, ";");
+                                const Token *eq = TokenList::isFunctionHead(closeParen, ";");
                                 if (eq && Token::simpleMatch(eq->tokAt(-2), "= default ;")) {
                                     func->isDefault(true);
                                     return;
                                 }
                             }
                             func->hasBody(true);
-                            func->token = *tok;
+                            func->token = tok;
                             func->arg = argStart;
                             addNewFunction(scope, tok);
-                            if (*scope) {
-                                (*scope)->functionOf = func->nestedIn;
-                                (*scope)->function = func;
-                                (*scope)->function->functionScope = *scope;
+                            if (scope) {
+                                scope->functionOf = func->nestedIn;
+                                scope->function = func;
+                                scope->function->functionScope = scope;
                             }
                             return;
                         }
@@ -3259,16 +3562,17 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
             }
         }
 
-        if (scope1->className == tok1->str() && (scope1->type != Scope::eFunction)) {
+        const bool isAnonymousNamespace = (scope1->type == ScopeType::eNamespace && scope1->className.empty());
+        if ((scope1->className == tok1->str() && (scope1->type != ScopeType::eFunction)) || isAnonymousNamespace) {
             // do the scopes match (same scope) or do their names match (multiple namespaces)
-            if ((*scope == scope1->nestedIn) || (*scope &&
-                                                 (*scope)->className == scope1->nestedIn->className &&
-                                                 !(*scope)->className.empty() &&
-                                                 (*scope)->type == scope1->nestedIn->type)) {
+            if ((scope == scope1->nestedIn) || (scope &&
+                                                scope->className == scope1->nestedIn->className &&
+                                                !scope->className.empty() &&
+                                                scope->type == scope1->nestedIn->type)) {
 
                 // nested scopes => check that they match
                 {
-                    const Scope *s1 = *scope;
+                    const Scope *s1 = scope;
                     const Scope *s2 = scope1->nestedIn;
                     while (s1 && s2) {
                         if (s1->className != s2->className)
@@ -3291,6 +3595,8 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
                         tok1 = tok1->tokAt(2);
                     scope2 = scope2->findRecordInNestedList(tok1->str());
                 }
+                if (scope2 && isAnonymousNamespace)
+                    scope2 = scope2->findRecordInNestedList(tok1->str());
 
                 if (count == 1 && scope2) {
                     match = true;
@@ -3300,23 +3606,28 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
         }
 
         if (match) {
-            auto range = scope1->functionMap.equal_range((*tok)->str());
+            auto range = scope1->functionMap.equal_range(tok->str());
             for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
-                Function * func = const_cast<Function *>(it->second);
+                auto * func = const_cast<Function *>(it->second);
+                if (destructor && func->type != FunctionType::eDestructor)
+                    continue;
                 if (!func->hasBody()) {
-                    if (func->argsMatch(scope1, func->argDef, (*tok)->next(), path, path_length)) {
-                        const Token *closeParen = (*tok)->next()->link();
+                    if (func->argsMatch(scope1, func->argDef, tok->next(), path, path_length)) {
+                        const Token *closeParen = tok->linkAt(1);
                         if (closeParen) {
-                            const Token *eq = mTokenizer.isFunctionHead(closeParen, ";");
-                            if (eq && Token::simpleMatch(eq->tokAt(-2), "= default ;")) {
-                                func->isDefault(true);
+                            const Token *eq = TokenList::isFunctionHead(closeParen, ";");
+                            if (eq && Token::Match(eq->tokAt(-2), "= default|delete ;")) {
+                                if (eq->strAt(-1) == "default")
+                                    func->isDefault(true);
+                                else
+                                    func->isDelete(true);
                                 return;
                             }
-                            if (func->type == Function::eDestructor && destructor) {
+                            if (func->type == FunctionType::eDestructor && destructor) {
                                 func->hasBody(true);
-                            } else if (func->type != Function::eDestructor && !destructor) {
+                            } else if (func->type != FunctionType::eDestructor && !destructor) {
                                 // normal function?
-                                const bool hasConstKeyword = closeParen->next()->str() == "const";
+                                const bool hasConstKeyword = closeParen->strAt(1) == "const";
                                 if ((func->isConst() == hasConstKeyword) &&
                                     (func->hasLvalRefQualifier() == lval) &&
                                     (func->hasRvalRefQualifier() == rval)) {
@@ -3326,13 +3637,13 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
                         }
 
                         if (func->hasBody()) {
-                            func->token = *tok;
+                            func->token = tok;
                             func->arg = argStart;
                             addNewFunction(scope, tok);
-                            if (*scope) {
-                                (*scope)->functionOf = scope1;
-                                (*scope)->function = func;
-                                (*scope)->function->functionScope = *scope;
+                            if (scope) {
+                                scope->functionOf = scope1;
+                                scope->function = func;
+                                scope->function->functionScope = scope;
                             }
                             return;
                         }
@@ -3346,10 +3657,10 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
     addNewFunction(scope, tok);
 }
 
-void SymbolDatabase::addNewFunction(Scope **scope, const Token **tok)
+void SymbolDatabase::addNewFunction(Scope *&scope, const Token *&tok)
 {
-    const Token *tok1 = *tok;
-    scopeList.emplace_back(this, tok1, *scope);
+    const Token *tok1 = tok;
+    scopeList.emplace_back(*this, tok1, scope);
     Scope *newScope = &scopeList.back();
 
     // find start of function '{'
@@ -3373,37 +3684,37 @@ void SymbolDatabase::addNewFunction(Scope **scope, const Token **tok)
         if (!newScope->bodyEnd) {
             mTokenizer.unmatchedToken(tok1);
         } else {
-            (*scope)->nestedList.push_back(newScope);
-            *scope = newScope;
+            scope->nestedList.push_back(newScope);
+            scope = newScope;
         }
     } else if (tok1 && Token::Match(tok1->tokAt(-2), "= default|delete ;")) {
         scopeList.pop_back();
     } else {
-        throw InternalError(*tok, "Analysis failed (function not recognized). If the code is valid then please report this failure.");
+        throw InternalError(tok, "Analysis failed (function not recognized). If the code is valid then please report this failure.");
     }
-    *tok = tok1;
+    tok = tok1;
 }
 
 bool Type::isClassType() const
 {
-    return classScope && classScope->type == Scope::ScopeType::eClass;
+    return classScope && classScope->type == ScopeType::eClass;
 }
 
 bool Type::isEnumType() const
 {
     //We explicitly check for "enum" because a forward declared enum doesn't get its own scope
     return (classDef && classDef->str() == "enum") ||
-           (classScope && classScope->type == Scope::ScopeType::eEnum);
+           (classScope && classScope->type == ScopeType::eEnum);
 }
 
 bool Type::isStructType() const
 {
-    return classScope && classScope->type == Scope::ScopeType::eStruct;
+    return classScope && classScope->type == ScopeType::eStruct;
 }
 
 bool Type::isUnionType() const
 {
-    return classScope && classScope->type == Scope::ScopeType::eUnion;
+    return classScope && classScope->type == ScopeType::eUnion;
 }
 
 const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
@@ -3477,7 +3788,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;
 
@@ -3490,36 +3801,60 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
     return tok2;
 }
 
-const std::string& Type::name() const
+std::string Type::name() const
 {
-    const Token* next = classDef->next();
+    const Token* start = classDef->next();
     if (classScope && classScope->enumClass && isEnumType())
-        return next->strAt(1);
-    if (next->str() == "class")
-        return next->strAt(1);
-    if (next->isName())
-        return next->str();
-    return emptyString;
+        start = start->tokAt(1);
+    else if (start->str() == "class")
+        start = start->tokAt(1);
+    else if (!start->isName())
+        return "";
+    const Token* next = start;
+    while (Token::Match(next, "::|<|>|(|)|[|]|*|&|&&|%name%")) {
+        if (Token::Match(next, "<|(|[") && next->link())
+            next = next->link();
+        next = next->next();
+    }
+    std::string result;
+    for (const Token* tok = start; tok != next; tok = tok->next()) {
+        if (!result.empty())
+            result += ' ';
+        result += tok->str();
+    }
+    return result;
 }
 
 void SymbolDatabase::debugMessage(const Token *tok, const std::string &type, const std::string &msg) const
 {
-    if (tok && mSettings.debugwarnings && mErrorLogger) {
+    if (tok && mSettings.debugwarnings) {
         const std::list<const Token*> locationList(1, tok);
         const ErrorMessage errmsg(locationList, &mTokenizer.list,
                                   Severity::debug,
                                   type,
                                   msg,
                                   Certainty::normal);
-        mErrorLogger->reportErr(errmsg);
+        mErrorLogger.reportErr(errmsg);
+    }
+}
+
+void SymbolDatabase::returnImplicitIntError(const Token *tok) const
+{
+    if (tok && mSettings.severity.isEnabled(Severity::portability) && (tok->isC() && mSettings.standards.c != Standards::C89)) {
+        const std::list<const Token*> locationList(1, tok);
+        const ErrorMessage errmsg(locationList, &mTokenizer.list,
+                                  Severity::portability,
+                                  "returnImplicitInt",
+                                  "Omitted return type of function '" + tok->str() + "' defaults to int, this is not supported by ISO C99 and later standards.",
+                                  Certainty::normal);
+        mErrorLogger.reportErr(errmsg);
     }
 }
 
 const Function* Type::getFunction(const std::string& funcName) const
 {
     if (classScope) {
-        const std::multimap<std::string, const Function *>::const_iterator it = classScope->functionMap.find(funcName);
-
+        const auto it = utils::as_const(classScope->functionMap).find(funcName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
@@ -3540,7 +3875,7 @@ bool Type::hasCircularDependencies(std::set<BaseInfo>* ancestors) const
     if (!ancestors) {
         ancestors=&knownAncestors;
     }
-    for (std::vector<BaseInfo>::const_iterator parent=derivedFrom.cbegin(); parent!=derivedFrom.cend(); ++parent) {
+    for (auto parent=derivedFrom.cbegin(); parent!=derivedFrom.cend(); ++parent) {
         if (!parent->type)
             continue;
         if (this==parent->type)
@@ -3564,7 +3899,7 @@ bool Type::findDependency(const Type* ancestor) const
 
 bool Type::isDerivedFrom(const std::string & ancestor) const
 {
-    for (std::vector<BaseInfo>::const_iterator parent=derivedFrom.cbegin(); parent!=derivedFrom.cend(); ++parent) {
+    for (auto parent=derivedFrom.cbegin(); parent!=derivedFrom.cend(); ++parent) {
         if (parent->name == ancestor)
             return true;
         if (parent->type && parent->type->isDerivedFrom(ancestor))
@@ -3573,13 +3908,15 @@ bool Type::isDerivedFrom(const std::string & ancestor) const
     return false;
 }
 
-bool Variable::arrayDimensions(const Settings* settings, bool& isContainer)
+bool Variable::arrayDimensions(const Settings& settings, bool& isContainer)
 {
     isContainer = false;
-    const Library::Container* container = settings->library.detectContainer(mTypeStartToken);
+    const Library::Container* container = (mTypeStartToken && mTypeStartToken->isCpp()) ? settings.library.detectContainer(mTypeStartToken) : nullptr;
     if (container && container->arrayLike_indexOp && container->size_templateArgNo > 0) {
-        const Token* tok = Token::findsimplematch(mTypeStartToken, "<");
-        if (tok) {
+        const Token* tok = mTypeStartToken;
+        while (Token::Match(tok, "%name%|::"))
+            tok = tok->next();
+        if (tok && tok->str() == "<") {
             isContainer = true;
             Dimension dimension_;
             tok = tok->next();
@@ -3589,7 +3926,7 @@ bool Variable::arrayDimensions(const Settings* settings, bool& isContainer)
             if (Token::Match(tok, "%num% [,>]")) {
                 dimension_.tok = tok;
                 dimension_.known = true;
-                dimension_.num = MathLib::toLongNumber(tok->str());
+                dimension_.num = MathLib::toBigNumber(tok);
             } else if (tok) {
                 dimension_.tok = tok;
                 dimension_.known = false;
@@ -3617,12 +3954,21 @@ bool Variable::arrayDimensions(const Settings* settings, bool& isContainer)
         Dimension dimension_;
         dimension_.known = false;
         // check for empty array dimension []
-        if (dim->next()->str() != "]") {
+        if (dim->strAt(1) != "]") {
             dimension_.tok = dim->astOperand2();
+            // TODO: only perform when ValueFlow is enabled
+            // TODO: collect timing information for this call?
             ValueFlow::valueFlowConstantFoldAST(const_cast<Token *>(dimension_.tok), settings);
-            if (dimension_.tok && dimension_.tok->hasKnownIntValue()) {
-                dimension_.num = dimension_.tok->getKnownIntValue();
-                dimension_.known = true;
+            if (dimension_.tok) {
+                if (const ValueFlow::Value* v = dimension_.tok->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+                    dimension_.num = v->intvalue;
+                    dimension_.known = true;
+                }
+                else if (dimension_.tok->isTemplateArg() && !dimension_.tok->values().empty()) {
+                    assert(dimension_.tok->values().size() == 1);
+                    dimension_.num = dimension_.tok->values().front().intvalue;
+                    dimension_.known = true;
+                }
             }
         }
         mDimensions.push_back(dimension_);
@@ -3632,34 +3978,58 @@ bool Variable::arrayDimensions(const Settings* settings, bool& isContainer)
     return arr;
 }
 
-static std::ostream & operator << (std::ostream & s, Scope::ScopeType type)
-{
-    s << (type == Scope::eGlobal ? "Global" :
-          type == Scope::eClass ? "Class" :
-          type == Scope::eStruct ? "Struct" :
-          type == Scope::eUnion ? "Union" :
-          type == Scope::eNamespace ? "Namespace" :
-          type == Scope::eFunction ? "Function" :
-          type == Scope::eIf ? "If" :
-          type == Scope::eElse ? "Else" :
-          type == Scope::eFor ? "For" :
-          type == Scope::eWhile ? "While" :
-          type == Scope::eDo ? "Do" :
-          type == Scope::eSwitch ? "Switch" :
-          type == Scope::eTry ? "Try" :
-          type == Scope::eCatch ? "Catch" :
-          type == Scope::eUnconditional ? "Unconditional" :
-          type == Scope::eLambda ? "Lambda" :
-          type == Scope::eEnum ? "Enum" :
-          "Unknown");
-    return s;
-}
-
-static std::string accessControlToString(const AccessControl& access)
+static std::string scopeTypeToString(ScopeType type)
 {
-    switch (access) {
-    case AccessControl::Public:
-        return "Public";
+    switch (type) {
+    case ScopeType::eGlobal:
+        return "Global";
+    case ScopeType::eClass:
+        return "Class";
+    case ScopeType::eStruct:
+        return "Struct";
+    case ScopeType::eUnion:
+        return "Union";
+    case ScopeType::eNamespace:
+        return "Namespace";
+    case ScopeType::eFunction:
+        return "Function";
+    case ScopeType::eIf:
+        return "If";
+    case ScopeType::eElse:
+        return "Else";
+    case ScopeType::eFor:
+        return "For";
+    case ScopeType::eWhile:
+        return "While";
+    case ScopeType::eDo:
+        return "Do";
+    case ScopeType::eSwitch:
+        return "Switch";
+    case ScopeType::eTry:
+        return "Try";
+    case ScopeType::eCatch:
+        return "Catch";
+    case ScopeType::eUnconditional:
+        return "Unconditional";
+    case ScopeType::eLambda:
+        return "Lambda";
+    case ScopeType::eEnum:
+        return "Enum";
+    }
+    return "Unknown";
+}
+
+static std::ostream & operator << (std::ostream & s, ScopeType type)
+{
+    s << scopeTypeToString(type);
+    return s;
+}
+
+static std::string accessControlToString(AccessControl access)
+{
+    switch (access) {
+    case AccessControl::Public:
+        return "Public";
     case AccessControl::Protected:
         return "Protected";
     case AccessControl::Private:
@@ -3678,6 +4048,28 @@ static std::string accessControlToString(const AccessControl& access)
     return "Unknown";
 }
 
+static const char* functionTypeToString(FunctionType type)
+{
+    switch (type) {
+    case FunctionType::eConstructor:
+        return "Constructor";
+    case FunctionType::eCopyConstructor:
+        return "CopyConstructor";
+    case FunctionType::eMoveConstructor:
+        return "MoveConstructor";
+    case FunctionType::eOperatorEqual:
+        return "OperatorEqual";
+    case FunctionType::eDestructor:
+        return "Destructor";
+    case FunctionType::eFunction:
+        return "Function";
+    case FunctionType::eLambda:
+        return "Lambda";
+    default:
+        return "Unknown";
+    }
+}
+
 static std::string tokenToString(const Token* tok, const Tokenizer& tokenizer)
 {
     std::ostringstream oss;
@@ -3796,7 +4188,7 @@ void SymbolDatabase::printOut(const char *title) const
     if (title)
         std::cout << "\n### " << title << " ###\n";
 
-    for (std::list<Scope>::const_iterator scope = scopeList.cbegin(); scope != scopeList.cend(); ++scope) {
+    for (auto scope = scopeList.cbegin(); scope != scopeList.cend(); ++scope) {
         std::cout << "Scope: " << &*scope << " " << scope->type << std::endl;
         std::cout << "    className: " << scope->className << std::endl;
         std::cout << "    classDef: " << tokenToString(scope->classDef, mTokenizer) << std::endl;
@@ -3807,14 +4199,7 @@ void SymbolDatabase::printOut(const char *title) const
         for (auto func = scope->functionList.cbegin(); func != scope->functionList.cend(); ++func) {
             std::cout << "    Function: " << &*func << std::endl;
             std::cout << "        name: " << tokenToString(func->tokenDef, mTokenizer) << std::endl;
-            std::cout << "        type: " << (func->type == Function::eConstructor? "Constructor" :
-                                              func->type == Function::eCopyConstructor ? "CopyConstructor" :
-                                              func->type == Function::eMoveConstructor ? "MoveConstructor" :
-                                              func->type == Function::eOperatorEqual ? "OperatorEqual" :
-                                              func->type == Function::eDestructor ? "Destructor" :
-                                              func->type == Function::eFunction ? "Function" :
-                                              func->type == Function::eLambda ? "Lambda" :
-                                              "Unknown") << std::endl;
+            std::cout << "        type: " << functionTypeToString(func->type) << std::endl;
             std::cout << "        access: " << accessControlToString(func->access) << std::endl;
             std::cout << "        hasBody: " << func->hasBody() << std::endl;
             std::cout << "        isInline: " << func->isInline() << std::endl;
@@ -3868,12 +4253,9 @@ void SymbolDatabase::printOut(const char *title) const
             }
             std::cout << "        retType: " << func->retType << std::endl;
 
-            if (func->tokenDef->next()->valueType()) {
-                const ValueType * valueType = func->tokenDef->next()->valueType();
+            if (const ValueType* valueType = func->tokenDef->next()->valueType()) {
                 std::cout << "        valueType: " << valueType << std::endl;
-                if (valueType) {
-                    std::cout << "            " << valueType->str() << std::endl;
-                }
+                std::cout << "            " << valueType->str() << std::endl;
             }
 
             if (func->hasBody()) {
@@ -3894,7 +4276,7 @@ void SymbolDatabase::printOut(const char *title) const
             printVariable(&*var, "        ");
         }
 
-        if (scope->type == Scope::eEnum) {
+        if (scope->type == ScopeType::eEnum) {
             std::cout << "    enumType: ";
             if (scope->enumType) {
                 std::cout << scope->enumType->stringify(false, true, false);
@@ -3912,7 +4294,7 @@ void SymbolDatabase::printOut(const char *title) const
                     std::cout << (enumerator.value_known ? " " : "") << "[" << tok->str();
                     while (tok && tok != enumerator.end) {
                         if (tok->next())
-                            std::cout << " " << tok->next()->str();
+                            std::cout << " " << tok->strAt(1);
                         tok = tok->next();
                     }
 
@@ -3935,7 +4317,7 @@ void SymbolDatabase::printOut(const char *title) const
         std::cout << "    nestedList[" << scope->nestedList.size() << "] = (";
 
         std::size_t count = scope->nestedList.size();
-        for (std::vector<Scope*>::const_iterator nsi = scope->nestedList.cbegin(); nsi != scope->nestedList.cend(); ++nsi) {
+        for (auto nsi = scope->nestedList.cbegin(); nsi != scope->nestedList.cend(); ++nsi) {
             std::cout << " " << (*nsi) << " " << (*nsi)->type << " " << (*nsi)->className;
             if (count-- > 1)
                 std::cout << ",";
@@ -3961,7 +4343,7 @@ void SymbolDatabase::printOut(const char *title) const
         std::cout << std::endl;
     }
 
-    for (std::list<Type>::const_iterator type = typeList.cbegin(); type != typeList.cend(); ++type) {
+    for (auto type = typeList.cbegin(); type != typeList.cend(); ++type) {
         std::cout << "Type: " << &(*type) << std::endl;
         std::cout << "    name: " << type->name() << std::endl;
         std::cout << "    classDef: " << tokenToString(type->classDef, mTokenizer) << std::endl;
@@ -4030,144 +4412,241 @@ void SymbolDatabase::printOut(const char *title) const
 
 void SymbolDatabase::printXml(std::ostream &out) const
 {
-    out << std::setiosflags(std::ios::boolalpha);
+    std::string outs;
 
     std::set<const Variable *> variables;
 
     // Scopes..
-    out << "  <scopes>" << std::endl;
-    for (std::list<Scope>::const_iterator scope = scopeList.cbegin(); scope != scopeList.cend(); ++scope) {
-        out << "    <scope";
-        out << " id=\"" << &*scope << "\"";
-        out << " type=\"" << scope->type << "\"";
-        if (!scope->className.empty())
-            out << " className=\"" << ErrorLogger::toxml(scope->className) << "\"";
-        if (scope->bodyStart)
-            out << " bodyStart=\"" << scope->bodyStart << '\"';
-        if (scope->bodyEnd)
-            out << " bodyEnd=\"" << scope->bodyEnd << '\"';
-        if (scope->nestedIn)
-            out << " nestedIn=\"" << scope->nestedIn << "\"";
-        if (scope->function)
-            out << " function=\"" << scope->function << "\"";
-        if (scope->definedType)
-            out << " definedType=\"" << scope->definedType << "\"";
+    outs += "  <scopes>\n";
+    for (auto scope = scopeList.cbegin(); scope != scopeList.cend(); ++scope) {
+        outs += "    <scope";
+        outs += " id=\"";
+        outs += id_string(&*scope);
+        outs += "\"";
+        outs += " type=\"";
+        outs += scopeTypeToString(scope->type);
+        outs += "\"";
+        if (!scope->className.empty()) {
+            outs += " className=\"";
+            outs += ErrorLogger::toxml(scope->className);
+            outs += "\"";
+        }
+        if (scope->bodyStart) {
+            outs += " bodyStart=\"";
+            outs += id_string(scope->bodyStart);
+            outs += '\"';
+        }
+        if (scope->bodyEnd) {
+            outs += " bodyEnd=\"";
+            outs += id_string(scope->bodyEnd);
+            outs += '\"';
+        }
+        if (scope->nestedIn) {
+            outs += " nestedIn=\"";
+            outs += id_string(scope->nestedIn);
+            outs += "\"";
+        }
+        if (scope->function) {
+            outs += " function=\"";
+            outs += id_string(scope->function);
+            outs += "\"";
+        }
+        if (scope->definedType) {
+            outs += " definedType=\"";
+            outs += id_string(scope->definedType);
+            outs += "\"";
+        }
         if (scope->functionList.empty() && scope->varlist.empty())
-            out << "/>" << std::endl;
+            outs += "/>\n";
         else {
-            out << '>' << std::endl;
+            outs += ">\n";
             if (!scope->functionList.empty()) {
-                out << "      <functionList>" << std::endl;
-                for (std::list<Function>::const_iterator function = scope->functionList.cbegin(); function != scope->functionList.cend(); ++function) {
-                    out << "        <function id=\"" << &*function
-                        << "\" token=\"" << function->token
-                        << "\" tokenDef=\"" << function->tokenDef
-                        << "\" name=\"" << ErrorLogger::toxml(function->name()) << '\"';
-                    out << " type=\"" << (function->type == Function::eConstructor? "Constructor" :
-                                          function->type == Function::eCopyConstructor ? "CopyConstructor" :
-                                          function->type == Function::eMoveConstructor ? "MoveConstructor" :
-                                          function->type == Function::eOperatorEqual ? "OperatorEqual" :
-                                          function->type == Function::eDestructor ? "Destructor" :
-                                          function->type == Function::eFunction ? "Function" :
-                                          function->type == Function::eLambda ? "Lambda" :
-                                          "Unknown") << '\"';
+                outs += "      <functionList>\n";
+                for (auto function = scope->functionList.cbegin(); function != scope->functionList.cend(); ++function) {
+                    outs += "        <function id=\"";
+                    outs += id_string(&*function);
+                    outs += "\" token=\"";
+                    outs += id_string(function->token);
+                    outs += "\" tokenDef=\"";
+                    outs += id_string(function->tokenDef);
+                    outs += "\" name=\"";
+                    outs += ErrorLogger::toxml(function->name());
+                    outs += '\"';
+                    outs += " type=\"";
+                    outs += functionTypeToString(function->type);
+                    outs += '\"';
                     if (function->nestedIn->definedType) {
                         if (function->hasVirtualSpecifier())
-                            out << " hasVirtualSpecifier=\"true\"";
+                            outs += " hasVirtualSpecifier=\"true\"";
                         else if (function->isImplicitlyVirtual())
-                            out << " isImplicitlyVirtual=\"true\"";
+                            outs += " isImplicitlyVirtual=\"true\"";
+                    }
+                    if (function->access == AccessControl::Public || function->access == AccessControl::Protected || function->access == AccessControl::Private) {
+                        outs += " access=\"";
+                        outs += accessControlToString(function->access);
+                        outs +="\"";
                     }
-                    if (function->access == AccessControl::Public || function->access == AccessControl::Protected || function->access == AccessControl::Private)
-                        out << " access=\"" << accessControlToString(function->access) << "\"";
+                    if (function->isOperator())
+                        outs += " isOperator=\"true\"";
+                    if (function->isExplicit())
+                        outs += " isExplicit=\"true\"";
+                    if (function->hasOverrideSpecifier())
+                        outs += " hasOverrideSpecifier=\"true\"";
+                    if (function->hasFinalSpecifier())
+                        outs += " hasFinalSpecifier=\"true\"";
                     if (function->isInlineKeyword())
-                        out << " isInlineKeyword=\"true\"";
+                        outs += " isInlineKeyword=\"true\"";
                     if (function->isStatic())
-                        out << " isStatic=\"true\"";
+                        outs += " isStatic=\"true\"";
+                    if (function->isFriend())
+                        outs += " isFriend=\"true\"";
                     if (function->isAttributeNoreturn())
-                        out << " isAttributeNoreturn=\"true\"";
-                    if (const Function* overriddenFunction = function->getOverriddenFunction())
-                        out << " overriddenFunction=\"" << overriddenFunction << "\"";
+                        outs += " isAttributeNoreturn=\"true\"";
+                    if (const Function* overriddenFunction = function->getOverriddenFunction()) {
+                        outs += " overriddenFunction=\"";
+                        outs += id_string(overriddenFunction);
+                        outs += "\"";
+                    }
+                    if (function->isAttributeConst())
+                        outs += " isAttributeConst=\"true\"";
+                    if (function->isAttributePure())
+                        outs += " isAttributePure=\"true\"";
                     if (function->argCount() == 0U)
-                        out << "/>" << std::endl;
+                        outs += "/>\n";
                     else {
-                        out << ">" << std::endl;
+                        outs += ">\n";
                         for (unsigned int argnr = 0; argnr < function->argCount(); ++argnr) {
                             const Variable *arg = function->getArgumentVar(argnr);
-                            out << "          <arg nr=\"" << argnr+1 << "\" variable=\"" << arg << "\"/>" << std::endl;
+                            outs += "          <arg nr=\"";
+                            outs += std::to_string(argnr+1);
+                            outs += "\" variable=\"";
+                            outs += id_string(arg);
+                            outs += "\"/>\n";
                             variables.insert(arg);
                         }
-                        out << "        </function>" << std::endl;
+                        outs += "        </function>\n";
                     }
                 }
-                out << "      </functionList>" << std::endl;
+                outs += "      </functionList>\n";
             }
             if (!scope->varlist.empty()) {
-                out << "      <varlist>" << std::endl;
-                for (std::list<Variable>::const_iterator var = scope->varlist.cbegin(); var != scope->varlist.cend(); ++var)
-                    out << "        <var id=\""   << &*var << "\"/>" << std::endl;
-                out << "      </varlist>" << std::endl;
+                outs += "      <varlist>\n";
+                for (auto var = scope->varlist.cbegin(); var != scope->varlist.cend(); ++var) {
+                    outs += "        <var id=\"";
+                    outs += id_string(&*var);
+                    outs += "\"/>\n";
+                }
+                outs += "      </varlist>\n";
             }
-            out << "    </scope>" << std::endl;
+            outs += "    </scope>\n";
         }
     }
-    out << "  </scopes>" << std::endl;
+    outs += "  </scopes>\n";
 
     if (!typeList.empty()) {
-        out << "  <types>\n";
+        outs += "  <types>\n";
         for (const Type& type:typeList) {
-            out << "    <type id=\"" << &type << "\" classScope=\"" << type.classScope << "\"";
+            outs += "    <type id=\"";
+            outs += id_string(&type);
+            outs += "\" classScope=\"";
+            outs += id_string(type.classScope);
+            outs += "\"";
             if (type.derivedFrom.empty()) {
-                out << "/>\n";
+                outs += "/>\n";
                 continue;
             }
-            out << ">\n";
+            outs += ">\n";
             for (const Type::BaseInfo& baseInfo: type.derivedFrom) {
-                out << "      <derivedFrom"
-                    << " access=\"" << accessControlToString(baseInfo.access) << "\""
-                    << " type=\""   << baseInfo.type << "\""
-                    << " isVirtual=\"" << (baseInfo.isVirtual ? "true" : "false") << "\""
-                    << " nameTok=\"" << baseInfo.nameTok << "\""
-                    << "/>\n";
-            }
-            out << "    </type>\n";
-        }
-        out << "  </types>\n";
+                outs += "      <derivedFrom";
+                outs += " access=\"";
+                outs += accessControlToString(baseInfo.access);
+                outs += "\"";
+                outs += " type=\"";
+                outs += id_string(baseInfo.type);
+                outs += "\"";
+                outs += " isVirtual=\"";
+                outs += bool_to_string(baseInfo.isVirtual);
+                outs += "\"";
+                outs += " nameTok=\"";
+                outs += id_string(baseInfo.nameTok);
+                outs += "\"";
+                outs += "/>\n";
+            }
+            outs += "    </type>\n";
+        }
+        outs += "  </types>\n";
     }
 
     // Variables..
     for (const Variable *var : mVariableList)
         variables.insert(var);
-    out << "  <variables>" << std::endl;
+    outs += "  <variables>\n";
     for (const Variable *var : variables) {
         if (!var)
             continue;
-        out << "    <var id=\""   << var << '\"';
-        out << " nameToken=\""      << var->nameToken() << '\"';
-        out << " typeStartToken=\"" << var->typeStartToken() << '\"';
-        out << " typeEndToken=\""   << var->typeEndToken() << '\"';
-        out << " access=\""         << accessControlToString(var->mAccess) << '\"';
-        out << " scope=\""          << var->scope() << '\"';
-        if (var->valueType())
-            out << " constness=\""      << var->valueType()->constness << '\"';
-        out << " isArray=\""        << var->isArray() << '\"';
-        out << " isClass=\""        << var->isClass() << '\"';
-        out << " isConst=\""        << var->isConst() << '\"';
-        out << " isExtern=\""       << var->isExtern() << '\"';
-        out << " isPointer=\""      << var->isPointer() << '\"';
-        out << " isReference=\""    << var->isReference() << '\"';
-        out << " isStatic=\""       << var->isStatic() << '\"';
-        out << " isVolatile=\""     << var->isVolatile() << '\"';
-        out << "/>" << std::endl;
-    }
-    out << "  </variables>" << std::endl;
-    out << std::resetiosflags(std::ios::boolalpha);
+        outs += "    <var id=\"";
+        outs += id_string(var);
+        outs += '\"';
+        outs += " nameToken=\"";
+        outs += id_string(var->nameToken());
+        outs += '\"';
+        outs += " typeStartToken=\"";
+        outs += id_string(var->typeStartToken());
+        outs += '\"';
+        outs += " typeEndToken=\"";
+        outs += id_string(var->typeEndToken());
+        outs += '\"';
+        outs += " access=\"";
+        outs += accessControlToString(var->mAccess);
+        outs += '\"';
+        outs += " scope=\"";
+        outs += id_string(var->scope());
+        outs += '\"';
+        if (var->valueType()) {
+            outs += " constness=\"";
+            outs += std::to_string(var->valueType()->constness);
+            outs += '\"';
+
+            outs += " volatileness=\"";
+            outs += std::to_string(var->valueType()->volatileness);
+            outs += '\"';
+        }
+        outs += " isArray=\"";
+        outs += bool_to_string(var->isArray());
+        outs += '\"';
+        outs += " isClass=\"";
+        outs += bool_to_string(var->isClass());
+        outs += '\"';
+        outs += " isConst=\"";
+        outs += bool_to_string(var->isConst());
+        outs += '\"';
+        outs += " isExtern=\"";
+        outs += bool_to_string(var->isExtern());
+        outs += '\"';
+        outs += " isPointer=\"";
+        outs += bool_to_string(var->isPointer());
+        outs += '\"';
+        outs += " isReference=\"";
+        outs += bool_to_string(var->isReference());
+        outs += '\"';
+        outs += " isStatic=\"";
+        outs += bool_to_string(var->isStatic());
+        outs += '\"';
+        outs += " isVolatile=\"";
+        outs += bool_to_string(var->isVolatile());
+        outs += '\"';
+        outs += "/>\n";
+    }
+    outs += "  </variables>\n";
+
+    out << outs;
 }
 
 //---------------------------------------------------------------------------
 
-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;
 
@@ -4175,7 +4654,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;
             }
@@ -4187,7 +4666,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;
@@ -4215,8 +4694,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% ) [")) {
@@ -4229,8 +4708,8 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
             } else if (tok->str() == "[") {
                 // skip array dimension(s)
                 tok = tok->link();
-                while (tok->next()->str() == "[")
-                    tok = tok->next()->link();
+                while (tok->strAt(1) == "[")
+                    tok = tok->linkAt(1);
             } else if (tok->str() == "<") {
                 tok = tok->link();
                 if (!tok) // something is wrong so just bail out
@@ -4248,11 +4727,16 @@ 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);
         // skip over qualification
-        while (Token::Match(typeTok, "%type% ::"))
+        while (Token::Match(typeTok, "%type% ::")) {
             typeTok = typeTok->tokAt(2);
+            if (Token::Match(typeTok, "%type% <") && Token::Match(typeTok->linkAt(1), "> :: %type%"))
+                typeTok = typeTok->linkAt(1)->tokAt(2);
+        }
 
         // check for argument with no name or missing varid
         if (!endTok) {
@@ -4262,7 +4746,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
@@ -4271,7 +4755,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);
@@ -4293,7 +4777,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
@@ -4310,7 +4794,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
             initArgCount++;
             if (tok->strAt(1) == "[") {
                 const Token* lambdaStart = tok->next();
-                if (type == eLambda)
+                if (type == FunctionType::eLambda)
                     tok = findLambdaEndTokenWithoutAST(lambdaStart);
                 else {
                     tok = findLambdaEndToken(lambdaStart);
@@ -4324,15 +4808,15 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
     }
 }
 
-bool Function::isImplicitlyVirtual(bool defaultVal) const
+bool Function::isImplicitlyVirtual(bool defaultVal, bool* pFoundAllBaseClasses) const
 {
-    if (hasVirtualSpecifier()) //If it has the virtual specifier it's definitely virtual
-        return true;
-    if (hasOverrideSpecifier()) //If it has the override specifier then it's either virtual or not going to compile
+    if (hasVirtualSpecifier() || hasOverrideSpecifier() || hasFinalSpecifier())
         return true;
     bool foundAllBaseClasses = true;
     if (getOverriddenFunction(&foundAllBaseClasses)) //If it overrides a base class's method then it's virtual
         return true;
+    if (pFoundAllBaseClasses)
+        *pFoundAllBaseClasses = foundAllBaseClasses;
     if (foundAllBaseClasses) //If we've seen all the base classes and none of the above were true then it must not be virtual
         return false;
     return defaultVal; //If we can't see all the bases classes then we can't say conclusively
@@ -4345,11 +4829,11 @@ std::vector<const Function*> Function::getOverloadedFunctions() const
 
     while (scope) {
         const bool isMemberFunction = scope->isClassOrStruct() && !isStatic();
-        for (std::multimap<std::string, const Function*>::const_iterator it = scope->functionMap.find(tokenDef->str());
+        for (auto it = utils::as_const(scope->functionMap).find(tokenDef->str());
              it != scope->functionMap.end() && it->first == tokenDef->str();
              ++it) {
             const Function* func = it->second;
-            if (isMemberFunction == func->isStatic())
+            if (isMemberFunction && isMemberFunction == func->isStatic())
                 continue;
             result.push_back(func);
         }
@@ -4370,6 +4854,17 @@ const Function *Function::getOverriddenFunction(bool *foundAllBaseClasses) const
     return getOverriddenFunctionRecursive(nestedIn->definedType, foundAllBaseClasses);
 }
 
+// prevent recursion if base is the same except for different template parameters
+static bool isDerivedFromItself(const std::string& thisName, const std::string& baseName)
+{
+    if (thisName.back() != '>')
+        return false;
+    const auto pos = thisName.find('<');
+    if (pos == std::string::npos)
+        return false;
+    return thisName.compare(0, pos + 1, baseName, 0, pos + 1) == 0;
+}
+
 const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType, bool *foundAllBaseClasses) const
 {
     // check each base class
@@ -4385,8 +4880,8 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
         const Scope *parent = derivedFromType->classScope;
 
         // check if function defined in base class
-        auto range = parent->functionMap.equal_range(tokenDef->str());
-        for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
+        auto range = utils::as_const(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
                 const Token *temp1 = func->tokenDef->previous();
@@ -4396,8 +4891,7 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
                 // check for matching return parameters
                 while (!Token::Match(temp1, "virtual|public:|private:|protected:|{|}|;")) {
                     if (temp1->str() != temp2->str() &&
-                        !(temp1->str() == derivedFromType->name() &&
-                          temp2->str() == baseType->name())) {
+                        !(temp1->type() && temp2->type() && temp2->type()->isDerivedFrom(temp1->type()->name()))) {
                         match = false;
                         break;
                     }
@@ -4407,7 +4901,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
@@ -4423,7 +4917,15 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
             }
         }
 
-        if (!derivedFromType->derivedFrom.empty() && !derivedFromType->hasCircularDependencies()) {
+        if (isDestructor()) {
+            auto it = std::find_if(parent->functionList.begin(), parent->functionList.end(), [](const Function& f) {
+                return f.isDestructor() && f.isImplicitlyVirtual();
+            });
+            if (it != parent->functionList.end())
+                return &*it;
+        }
+
+        if (!derivedFromType->derivedFrom.empty() && !derivedFromType->hasCircularDependencies() && !isDerivedFromItself(baseType->classScope->className, i.name)) {
             // avoid endless recursion, see #5289 Crash: Stack overflow in isImplicitlyVirtual_rec when checking SVN and
             // #5590 with a loop within the class hierarchy.
             const Function *func = getOverriddenFunctionRecursive(derivedFromType, foundAllBaseClasses);
@@ -4437,89 +4939,76 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
 
 const Variable* Function::getArgumentVar(nonneg int num) const
 {
-    if (num < argumentList.size())
-        return &argumentList[num];
+    if (num < argumentList.size()) {
+        auto it = argumentList.begin();
+        std::advance(it, num);
+        return &*it;
+    }
     return nullptr;
 }
 
 
 //---------------------------------------------------------------------------
 
-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_),
-    numConstructors(0),
-    numCopyOrMoveConstructors(0),
-    type(type_),
-    definedType(nullptr),
-    functionOf(nullptr),
-    function(nullptr),
-    enumType(nullptr),
-    enumClass(false)
+    type(type_)
 {
     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_),
-    bodyStart(nullptr),
-    bodyEnd(nullptr),
-    nestedIn(nestedIn_),
-    numConstructors(0),
-    numCopyOrMoveConstructors(0),
-    definedType(nullptr),
-    functionOf(nullptr),
-    function(nullptr),
-    enumType(nullptr),
-    enumClass(false)
+    nestedIn(nestedIn_)
 {
     const Token *nameTok = classDef;
     if (!classDef) {
-        type = Scope::eGlobal;
-    } else if (classDef->str() == "class" && check && check->isCPP()) {
-        type = Scope::eClass;
+        type = ScopeType::eGlobal;
+    } else if (classDef->str() == "class" && classDef->isCpp()) {
+        type = ScopeType::eClass;
         nameTok = nameTok->next();
     } else if (classDef->str() == "struct") {
-        type = Scope::eStruct;
+        type = ScopeType::eStruct;
         nameTok = nameTok->next();
     } else if (classDef->str() == "union") {
-        type = Scope::eUnion;
+        type = ScopeType::eUnion;
         nameTok = nameTok->next();
     } else if (classDef->str() == "namespace") {
-        type = Scope::eNamespace;
+        type = ScopeType::eNamespace;
         nameTok = nameTok->next();
     } else if (classDef->str() == "enum") {
-        type = Scope::eEnum;
+        type = ScopeType::eEnum;
         nameTok = nameTok->next();
         if (nameTok->str() == "class") {
             enumClass = true;
             nameTok = nameTok->next();
         }
     } else if (classDef->str() == "[") {
-        type = Scope::eLambda;
+        type = ScopeType::eLambda;
     } else {
-        type = Scope::eFunction;
+        type = ScopeType::eFunction;
     }
     // skip over qualification if present
     nameTok = skipScopeIdentifiers(nameTok);
-    if (nameTok && ((type == Scope::eEnum && Token::Match(nameTok, ":|{")) || nameTok->str() != "{")) // anonymous and unnamed structs/unions don't have a name
+    if (nameTok && ((type == ScopeType::eEnum && Token::Match(nameTok, ":|{")) || nameTok->str() != "{")) // anonymous and unnamed structs/unions don't have a name
         className = nameTok->str();
 }
 
 AccessControl Scope::defaultAccess() const
 {
     switch (type) {
-    case eGlobal:
+    case ScopeType::eGlobal:
         return AccessControl::Global;
-    case eClass:
+    case ScopeType::eClass:
         return AccessControl::Private;
-    case eStruct:
+    case ScopeType::eStruct:
         return AccessControl::Public;
-    case eUnion:
+    case ScopeType::eUnion:
         return AccessControl::Public;
-    case eNamespace:
+    case ScopeType::eNamespace:
         return AccessControl::Namespace;
     default:
         return AccessControl::Local;
@@ -4527,36 +5016,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 == Scope::eGlobal)
-        getVariableList(settings, check->mTokenizer.tokens(), nullptr);
+    else if (type == ScopeType::eGlobal)
+        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);
+        checkVariable(classDef->tokAt(2), defaultAccess());
     }
 
     AccessControl varaccess = defaultAccess();
@@ -4584,11 +5073,11 @@ void Scope::getVariableList(const Settings* settings, const Token* start, const
             break;
         }
         if (tok->isKeyword() && Token::Match(tok, "struct|union {")) {
-            if (Token::Match(tok->next()->link(), "} %name% ;|[")) {
-                tok = tok->next()->link()->tokAt(2);
+            if (Token::Match(tok->linkAt(1), "} %name% ;|[")) {
+                tok = tok->linkAt(1)->tokAt(2);
                 continue;
             }
-            if (Token::simpleMatch(tok->next()->link(), "} ;")) {
+            if (Token::simpleMatch(tok->linkAt(1), "} ;")) {
                 tok = tok->next();
                 continue;
             }
@@ -4633,8 +5122,8 @@ void Scope::getVariableList(const Settings* settings, const Token* start, const
         // skip return, goto and delete
         else if (tok->isKeyword() && Token::Match(tok, "return|delete|goto")) {
             while (tok->next() &&
-                   tok->next()->str() != ";" &&
-                   tok->next()->str() != "}" /* ticket #4994 */) {
+                   tok->strAt(1) != ";" &&
+                   tok->strAt(1) != "}" /* ticket #4994 */) {
                 tok = tok->next();
             }
             continue;
@@ -4653,14 +5142,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% (") &&
@@ -4690,11 +5179,11 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
     const Token *typestart = tok;
 
     // C++17 structured bindings
-    if (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);
     }
@@ -4708,6 +5197,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
     const Token *typetok = nullptr;
 
     if (tok && isVariableDeclaration(tok, vartok, typetok)) {
+        const Token* const orig = tok;
         // If the vartok was set in the if-blocks above, create a entry for this variable..
         tok = vartok->next();
         while (Token::Match(tok, "[|{"))
@@ -4715,14 +5205,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);
         }
@@ -4731,7 +5221,23 @@ 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()) {
+                if (tok2->link() && precedes(tok2, tok2->link())) {
+                    tok2 = tok2->link();
+                    continue;
+                }
+                if (Token::Match(tok2, ", %name%")) {
+                    if (tok2->next()->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);
+                }
+            }
+        }
     }
 
     return tok;
@@ -4760,11 +5266,12 @@ static const Token* skipPointers(const Token* tok)
 {
     while (Token::Match(tok, "*|&|&&") || (Token::Match(tok, "( [*&]") && Token::Match(tok->link()->next(), "(|["))) {
         tok = tok->next();
-        if (tok->strAt(-1) == "(" && Token::Match(tok, "%type% ::"))
+        if (tok && tok->strAt(-1) == "(" && Token::Match(tok, "%type% ::"))
             tok = tok->tokAt(2);
     }
 
-    if (Token::simpleMatch(tok, "( *") && Token::simpleMatch(tok->link()->previous(), "] ) ;")) {
+    if (Token::simpleMatch(tok, "( *") && Token::simpleMatch(tok->link()->previous(), "] ) ;") &&
+        (tok->tokAt(-1)->isStandardType() || tok->tokAt(-1)->isKeyword() || tok->strAt(-1) == "*")) {
         const Token *tok2 = skipPointers(tok->next());
         if (Token::Match(tok2, "%name% [") && Token::simpleMatch(tok2->linkAt(1), "] ) ;"))
             return tok2;
@@ -4789,12 +5296,12 @@ bool Scope::isVariableDeclaration(const Token* const tok, const Token*& vartok,
     if (!tok)
         return false;
 
-    const bool isCPP = check && check->mTokenizer.isCPP();
+    const bool isCPP = tok->isCpp();
 
     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;
@@ -4809,7 +5316,7 @@ bool Scope::isVariableDeclaration(const Token* const tok, const Token*& vartok,
         if (Token::Match(tok, "const_cast|dynamic_cast|reinterpret_cast|static_cast <"))
             return false;
 
-        const Token* closeTok = localTypeTok->next()->link();
+        const Token* closeTok = localTypeTok->linkAt(1);
         if (closeTok) {
             localVarTok = skipPointers(closeTok->next());
 
@@ -4835,6 +5342,8 @@ bool Scope::isVariableDeclaration(const Token* const tok, const Token*& vartok,
     if (!localVarTok)
         return false;
 
+    if (Token::simpleMatch(localVarTok, "( *") && Token::Match(localTypeTok->previous(), "class|struct|union|enum")) // not a function call
+        localVarTok = localVarTok->next();
     while (Token::Match(localVarTok, "const|*|&"))
         localVarTok = localVarTok->next();
 
@@ -4845,10 +5354,10 @@ bool Scope::isVariableDeclaration(const Token* const tok, const Token*& vartok,
         vartok = localVarTok;
         typetok = localTypeTok;
     } else if (localVarTok && localVarTok->varId() && Token::Match(localVarTok, "%name% (|{") &&
-               Token::Match(localVarTok->next()->link(), ")|} ;")) {
+               Token::Match(localVarTok->linkAt(1), ")|} ;")) {
         vartok = localVarTok;
         typetok = localTypeTok;
-    } else if (type == eCatch &&
+    } else if (type == ScopeType::eCatch &&
                Token::Match(localVarTok, "%name% )")) {
         vartok = localVarTok;
         typetok = localTypeTok;
@@ -4857,12 +5366,12 @@ bool Scope::isVariableDeclaration(const Token* const tok, const Token*& vartok,
     return nullptr != vartok;
 }
 
-const Token * Scope::addEnum(const Token * tok, bool isCpp)
+const Token * Scope::addEnum(const Token * tok)
 {
     const Token * tok2 = tok->next();
 
     // skip over class if present
-    if (isCpp && tok2->str() == "class")
+    if (tok2->isCpp() && tok2->str() == "class")
         tok2 = tok2->next();
 
     // skip over name
@@ -4873,7 +5382,8 @@ const Token * Scope::addEnum(const Token * tok, bool isCpp)
         tok2 = tok2->next();
 
         enumType = tok2;
-        tok2 = tok2->next();
+        while (Token::Match(tok2, "%name%|::"))
+            tok2 = tok2->next();
     }
 
     // add enumerators
@@ -4923,7 +5433,7 @@ const Token * Scope::addEnum(const Token * tok, bool isCpp)
         if (tok2 == end) {
             tok2 = tok2->next();
 
-            if (tok2 && tok2->str() != ";" && (isCpp || tok2->str() != ")"))
+            if (tok2 && tok2->str() != ";" && (tok2->isCpp() || tok2->str() != ")"))
                 tok2 = nullptr;
         } else
             tok2 = nullptr;
@@ -4933,16 +5443,43 @@ const Token * Scope::addEnum(const Token * tok, bool isCpp)
     return tok2;
 }
 
+static const Scope* findEnumScopeInBase(const Scope* scope, const std::string& tokStr)
+{
+    if (scope->definedType) {
+        const std::vector<Type::BaseInfo>& derivedFrom = scope->definedType->derivedFrom;
+        for (const Type::BaseInfo& i : derivedFrom) {
+            const Type *derivedFromType = i.type;
+            if (derivedFromType && derivedFromType->classScope) {
+                if (const Scope* enumScope = derivedFromType->classScope->findRecordInNestedList(tokStr))
+                    return enumScope;
+            }
+        }
+    }
+    return nullptr;
+}
+
+static const Enumerator* findEnumeratorInUsingList(const Scope* scope, const std::string& name)
+{
+    for (const auto& u : scope->usingList) {
+        if (!u.scope)
+            continue;
+        for (const Scope* nested : u.scope->nestedList) {
+            if (nested->type != ScopeType::eEnum)
+                continue;
+            const Enumerator* e = nested->findEnumerator(name);
+            if (e && !(e->scope && e->scope->enumClass))
+                return e;
+        }
+    }
+    return nullptr;
+}
+
 const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<std::string>& tokensThatAreNotEnumeratorValues) const
 {
     if (tok->isKeyword())
         return nullptr;
 
     const std::string& tokStr = tok->str();
-
-    if (tokensThatAreNotEnumeratorValues.find(tokStr) != tokensThatAreNotEnumeratorValues.end())
-        return nullptr;
-
     const Scope* scope = tok->scope();
 
     // check for qualified name
@@ -4955,11 +5492,23 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
         if (tok1->strAt(-1) == "::")
             scope = &scopeList.front();
         else {
-            // FIXME search base class here
-
+            const Scope* temp = nullptr;
+            if (scope)
+                temp = scope->findRecordInNestedList(tok1->str());
             // find first scope
             while (scope && scope->nestedIn) {
-                const Scope * temp = scope->nestedIn->findRecordInNestedList(tok1->str());
+                if (!temp)
+                    temp = scope->nestedIn->findRecordInNestedList(tok1->str());
+                if (!temp && scope->functionOf) {
+                    temp = scope->functionOf->findRecordInNestedList(tok1->str());
+                    const Scope* nested = scope->functionOf->nestedIn;
+                    while (!temp && nested) {
+                        temp = nested->findRecordInNestedList(tok1->str());
+                        nested = nested->nestedIn;
+                    }
+                }
+                if (!temp)
+                    temp = findEnumScopeInBase(scope, tok1->str());
                 if (temp) {
                     scope = temp;
                     break;
@@ -4981,7 +5530,7 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
                 if (enumerator) // enum class
                     return enumerator;
                 // enum
-                for (std::vector<Scope *>::const_iterator it = scope->nestedList.cbegin(), end = scope->nestedList.cend(); it != end; ++it) {
+                for (auto it = scope->nestedList.cbegin(), end = scope->nestedList.cend(); it != end; ++it) {
                     enumerator = (*it)->findEnumerator(tokStr);
 
                     if (enumerator && !(enumerator->scope && enumerator->scope->enumClass))
@@ -4990,7 +5539,21 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
             }
         }
     } else { // unqualified name
+
+        if (tokensThatAreNotEnumeratorValues.find(tokStr) != tokensThatAreNotEnumeratorValues.end())
+            return nullptr;
+
+        if (tok->scope()->type == ScopeType::eGlobal) {
+            const Token* astTop = tok->astTop();
+            if (Token::simpleMatch(astTop, ":") && Token::simpleMatch(astTop->astOperand1(), "(")) { // ctor init list
+                const Token* ctor = astTop->astOperand1()->previous();
+                if (ctor && ctor->function() && ctor->function()->nestedIn)
+                    scope = ctor->function()->nestedIn;
+            }
+        }
         const Enumerator * enumerator = scope->findEnumerator(tokStr);
+        if (!enumerator)
+            enumerator = findEnumeratorInUsingList(scope, tokStr);
 
         if (enumerator && !(enumerator->scope && enumerator->scope->enumClass))
             return enumerator;
@@ -5006,7 +5569,7 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
                 scope = varTok->variable()->scope();
         }
 
-        for (std::vector<Scope *>::const_iterator s = scope->nestedList.cbegin(); s != scope->nestedList.cend(); ++s) {
+        for (auto s = scope->nestedList.cbegin(); s != scope->nestedList.cend(); ++s) {
             enumerator = (*s)->findEnumerator(tokStr);
 
             if (enumerator && !(enumerator->scope && enumerator->scope->enumClass))
@@ -5027,21 +5590,34 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
         }
 
         while (scope->nestedIn) {
-            if (scope->type == Scope::eFunction && scope->functionOf)
+            if (scope->type == ScopeType::eFunction && scope->functionOf)
                 scope = scope->functionOf;
             else
                 scope = scope->nestedIn;
 
             enumerator = scope->findEnumerator(tokStr);
+            if (!enumerator)
+                enumerator = findEnumeratorInUsingList(scope, tokStr);
 
             if (enumerator && !(enumerator->scope && enumerator->scope->enumClass))
                 return enumerator;
 
-            for (std::vector<Scope*>::const_iterator s = scope->nestedList.cbegin(); s != scope->nestedList.cend(); ++s) {
+            for (auto s = scope->nestedList.cbegin(); s != scope->nestedList.cend(); ++s) {
                 enumerator = (*s)->findEnumerator(tokStr);
 
                 if (enumerator && !(enumerator->scope && enumerator->scope->enumClass))
                     return enumerator;
+
+                if (tok->isCpp() && (*s)->type == ScopeType::eNamespace && Token::simpleMatch((*s)->classDef, "namespace {")) {
+                    for (const Scope* nested : (*s)->nestedList) {
+                        if (nested->type != ScopeType::eEnum)
+                            continue;
+                        enumerator = nested->findEnumerator(tokStr);
+
+                        if (enumerator && !(enumerator->scope && enumerator->scope->enumClass))
+                            return enumerator;
+                    }
+                }
             }
         }
     }
@@ -5103,7 +5679,7 @@ const Type* SymbolDatabase::findVariableType(const Scope *start, const Token *ty
             }
 
             // check if in member function class to see if it's present in class
-            if (scope->type == Scope::eFunction && scope->functionOf) {
+            if (scope->type == ScopeType::eFunction && scope->functionOf) {
                 const Scope *scope1 = scope->functionOf;
 
                 type = scope1->findType(typeTok->str());
@@ -5157,7 +5733,7 @@ const Type* SymbolDatabase::findVariableType(const Scope *start, const Token *ty
                     scope = scope1;
                     break;
                 }
-                if (scope->type == Scope::eFunction && scope->functionOf)
+                if (scope->type == ScopeType::eFunction && scope->functionOf)
                     scope = scope->functionOf;
                 else
                     scope = scope->nestedIn;
@@ -5200,22 +5776,28 @@ static bool hasEmptyCaptureList(const Token* tok) {
     return Token::simpleMatch(listTok, "[ ]");
 }
 
-bool Scope::hasInlineOrLambdaFunction() const
+bool Scope::hasInlineOrLambdaFunction(const Token** tokStart, bool onlyInline) const
 {
     return std::any_of(nestedList.begin(), nestedList.end(), [&](const Scope* s) {
         // Inline function
-        if (s->type == Scope::eUnconditional && Token::simpleMatch(s->bodyStart->previous(), ") {"))
+        if (s->type == ScopeType::eUnconditional && Token::simpleMatch(s->bodyStart->previous(), ") {")) {
+            if (tokStart)
+                *tokStart = nullptr; // bailout for e.g. loop-like macros
             return true;
+        }
         // Lambda function
-        if (s->type == Scope::eLambda && !hasEmptyCaptureList(s->bodyStart))
+        if (!onlyInline && s->type == ScopeType::eLambda && !hasEmptyCaptureList(s->bodyStart)) {
+            if (tokStart)
+                *tokStart = s->bodyStart;
             return true;
-        if (s->hasInlineOrLambdaFunction())
+        }
+        if (s->hasInlineOrLambdaFunction(tokStart, onlyInline))
             return true;
         return false;
     });
 }
 
-void Scope::findFunctionInBase(const std::string & name, nonneg int args, std::vector<const Function *> & matches) const
+void Scope::findFunctionInBase(const Token* tok, nonneg int args, std::vector<const Function *> & matches) const
 {
     if (isClassOrStruct() && definedType && !definedType->derivedFrom.empty()) {
         const std::vector<Type::BaseInfo> &derivedFrom = definedType->derivedFrom;
@@ -5225,16 +5807,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 = base->classScope->functionMap.equal_range(name);
-                for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
+                auto range = utils::as_const(base->classScope->functionMap).equal_range(tok->str());
+                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(tok, args, matches);
             }
         }
     }
@@ -5355,7 +5939,25 @@ static std::string getTypeString(const Token *typeToken)
     return "";
 }
 
-const Function* Scope::findFunction(const Token *tok, bool requireConst) const
+static bool hasMatchingConstructor(const Scope* classScope, const ValueType* argType) {
+    if (!classScope || !argType)
+        return false;
+    return std::any_of(classScope->functionList.cbegin(),
+                       classScope->functionList.cend(),
+                       [&](const Function& f) {
+        if (!f.isConstructor() || f.argCount() != 1 || !f.getArgumentVar(0))
+            return false;
+        const ValueType* vt = f.getArgumentVar(0)->valueType();
+        return vt &&
+               vt->type == argType->type &&
+               (argType->sign == ValueType::Sign::UNKNOWN_SIGN || vt->sign == argType->sign) &&
+               vt->pointer == argType->pointer &&
+               (vt->constness & 1) >= (argType->constness & 1) &&
+               (vt->volatileness & 1) >= (argType->volatileness & 1);
+    });
+}
+
+const Function* Scope::findFunction(const Token *tok, bool requireConst, Reference ref) const
 {
     const bool isCall = Token::Match(tok->next(), "(|{");
 
@@ -5367,9 +5969,22 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
     const std::size_t args = arguments.size();
 
     auto addMatchingFunctions = [&](const Scope *scope) {
-        auto range = scope->functionMap.equal_range(tok->str());
-        for (std::multimap<std::string, const Function *>::const_iterator it = range.first; it != range.second; ++it) {
+        auto range = utils::as_const(scope->functionMap).equal_range(tok->str());
+        for (auto it = range.first; it != range.second; ++it) {
             const Function *func = it->second;
+            if (ref == Reference::LValue && func->hasRvalRefQualifier())
+                continue;
+            if (ref == Reference::None && func->hasRvalRefQualifier()) {
+                if (Token::simpleMatch(tok->astParent(), ".")) {
+                    const Token* obj = tok->astParent()->astOperand1();
+                    while (obj && obj->str() == "[")
+                        obj = obj->astOperand1();
+                    if (!obj || obj->isName())
+                        continue;
+                }
+            }
+            if (func->isDestructor() && !Token::simpleMatch(tok->tokAt(-1), "~"))
+                continue;
             if (!isCall || args == func->argCount() ||
                 (func->isVariadic() && args >= (func->minArgCount() - 1)) ||
                 (args < func->argCount() && args >= func->minArgCount())) {
@@ -5380,24 +5995,30 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
 
     addMatchingFunctions(this);
 
-    // check in anonumous namespaces
+    // check in anonymous namespaces
     for (const Scope *nestedScope : nestedList) {
-        if (nestedScope->type == eNamespace && nestedScope->className.empty())
+        if (nestedScope->type == ScopeType::eNamespace && nestedScope->className.empty())
             addMatchingFunctions(nestedScope);
     }
 
+    const std::size_t numberOfMatchesNonBase = matches.size();
+
     // check in base classes
-    findFunctionInBase(tok->str(), args, matches);
+    findFunctionInBase(tok, args, matches);
 
     // Non-call => Do not match parameters
     if (!isCall) {
         return matches.empty() ? nullptr : matches[0];
     }
 
-    std::vector<const Function*> fallback1Func, fallback2Func;
+    // store function and number of matching arguments
+    std::vector<std::pair<const Function*, size_t>> fallback1Func, fallback2Func;
 
     // check each function against the arguments in the function call for a match
     for (std::size_t i = 0; i < matches.size();) {
+        if (i > 0 && i == numberOfMatchesNonBase && fallback1Func.empty() && !fallback2Func.empty())
+            break;
+
         bool constFallback = false;
         const Function * func = matches[i];
         size_t same = 0;
@@ -5455,6 +6076,8 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
                         {
                             if (typeToken->str() == "const")
                                 ret.constness |= (1 << ret.pointer);
+                            else if (typeToken->str() == "volatile")
+                                ret.volatileness |= (1 << ret.pointer);
                             else if (typeToken->str() == "*")
                                 ret.pointer++;
                             else if (typeToken->str() == "<") {
@@ -5505,8 +6128,11 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
             else if (funcarg->isPointer() && MathLib::isNullValue(arguments[j]->str()))
                 fallback1++;
 
+            else if (!funcarg->isPointer() && funcarg->type() && hasMatchingConstructor(funcarg->type()->classScope, arguments[j]->valueType()))
+                fallback2++;
+
             // Try to evaluate the apparently more complex expression
-            else if (check->isCPP()) {
+            else if (arguments[j]->isCpp()) {
                 const Token *vartok = arguments[j];
                 if (vartok->str() == ".") {
                     const Token* rml = nextAfterAstRightmostLeaf(vartok);
@@ -5526,7 +6152,7 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
                 }
                 const Token* valuetok = arguments[j];
                 if (valuetok->str() == "::") {
-                    const Token* rml = nextAfterAstRightmostLeaf(vartok);
+                    const Token* rml = nextAfterAstRightmostLeaf(valuetok);
                     if (rml)
                         valuetok = rml->previous();
                 }
@@ -5559,16 +6185,16 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
         // check if all arguments matched
         if (same == hasToBe) {
             if (constFallback || (!requireConst && func->isConst()))
-                fallback1Func.emplace_back(func);
+                fallback1Func.emplace_back(func, same);
             else
                 return func;
         }
 
         else {
             if (same + fallback1 == hasToBe)
-                fallback1Func.emplace_back(func);
+                fallback1Func.emplace_back(func, same);
             else if (same + fallback2 + fallback1 == hasToBe)
-                fallback2Func.emplace_back(func);
+                fallback2Func.emplace_back(func, same);
         }
 
         if (!erased)
@@ -5576,14 +6202,25 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
     }
 
     // Fallback cases
-    for (const auto& fb : { fallback1Func, fallback2Func }) {
+    auto fb_pred = [](const std::pair<const Function*, size_t>& a, const std::pair<const Function*, size_t>& b) {
+        return a.second > b.second;
+    };
+    // sort according to matching arguments
+    std::sort(fallback1Func.begin(), fallback1Func.end(), fb_pred);
+    std::sort(fallback2Func.begin(), fallback2Func.end(), fb_pred);
+    const auto fallbackFuncs = { std::move(fallback1Func), std::move(fallback2Func) };
+    for (const auto& fb : fallbackFuncs) {
         if (fb.size() == 1)
-            return fb.front();
+            return fb[0].first;
+        if (fb.size() >= 2) {
+            if (fb[0].second > fb[1].second)
+                return fb[0].first;
+        }
         if (fb.size() == 2) {
-            if (fb[0]->isConst() && !fb[1]->isConst())
-                return fb[1];
-            if (fb[1]->isConst() && !fb[0]->isConst())
-                return fb[0];
+            if (fb[0].first->isConst() && !fb[1].first->isConst())
+                return fb[1].first;
+            if (fb[1].first->isConst() && !fb[0].first->isConst())
+                return fb[0].first;
         }
     }
 
@@ -5597,9 +6234,30 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
         matches.erase(itPure);
 
     // Only one candidate left
-    if (matches.size() == 1)
+    if (matches.size() == 1 && std::none_of(functionList.begin(), functionList.end(), [tok](const Function& f) {
+        return startsWith(f.name(), tok->str() + " <");
+    }))
         return matches[0];
 
+    // Prioritize matches in derived scopes
+    for (const auto& fb : fallbackFuncs) {
+        const Function* ret = nullptr;
+        for (std::size_t i = 0; i < fb.size(); ++i) {
+            if (std::find(matches.cbegin(), matches.cend(), fb[i].first) == matches.cend())
+                continue;
+            if (this == fb[i].first->nestedIn) {
+                if (!ret)
+                    ret = fb[i].first;
+                else {
+                    ret = nullptr;
+                    break;
+                }
+            }
+        }
+        if (ret)
+            return ret;
+    }
+
     return nullptr;
 }
 
@@ -5607,9 +6265,15 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst) const
 
 const Function* SymbolDatabase::findFunction(const Token* const tok) const
 {
+    if (tok->tokType() == Token::Type::eEnumerator)
+        return nullptr;
+
     // find the scope this function is in
     const Scope *currScope = tok->scope();
     while (currScope && currScope->isExecutable()) {
+        if (const Function* f = currScope->findFunction(tok)) {
+            return f;
+        }
         if (currScope->functionOf)
             currScope = currScope->functionOf;
         else
@@ -5679,8 +6343,11 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
             if (tok1)
                 tok1 = tok1->tokAt(2);
 
-            if (currScope && tok1)
-                return currScope->findFunction(tok1);
+            if (currScope && tok1) {
+                const Function* func = currScope->findFunction(tok1);
+                if (func)
+                    return func;
+            }
         }
     }
 
@@ -5688,10 +6355,10 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
     else if (Token::Match(tok->tokAt(-2), "!!this .")) {
         const Token* tok1 = tok->previous()->astOperand1();
         if (tok1 && tok1->valueType() && tok1->valueType()->typeScope)
-            return tok1->valueType()->typeScope->findFunction(tok, tok1->valueType()->constness == 1);
+            return tok1->valueType()->typeScope->findFunction(tok, tok1->valueType()->constness == 1, tok1->valueType()->reference);
         if (tok1 && Token::Match(tok1->previous(), "%name% (") && tok1->previous()->function() &&
             tok1->previous()->function()->retDef) {
-            ValueType vt = ValueType::parseDecl(tok1->previous()->function()->retDef, mSettings, mIsCpp);
+            ValueType vt = ValueType::parseDecl(tok1->previous()->function()->retDef, mSettings);
             if (vt.typeScope)
                 return vt.typeScope->findFunction(tok, vt.constness == 1);
         } else if (Token::Match(tok1, "%var% .")) {
@@ -5705,7 +6372,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
         } else if (Token::simpleMatch(tok->previous()->astOperand1(), "(")) {
             const Token *castTok = tok->previous()->astOperand1();
             if (castTok->isCast()) {
-                ValueType vt = ValueType::parseDecl(castTok->next(),mSettings, mIsCpp);
+                ValueType vt = ValueType::parseDecl(castTok->next(),mSettings);
                 if (vt.typeScope)
                     return vt.typeScope->findFunction(tok, vt.constness == 1);
             }
@@ -5735,7 +6402,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
     }
     // Check for constructor
     if (Token::Match(tok, "%name% (|{")) {
-        ValueType vt = ValueType::parseDecl(tok, mSettings, mIsCpp);
+        ValueType vt = ValueType::parseDecl(tok, mSettings);
         if (vt.typeScope)
             return vt.typeScope->findFunction(tok, false);
     }
@@ -5744,6 +6411,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) {
@@ -5754,47 +6422,70 @@ const Scope *SymbolDatabase::findScopeByName(const std::string& name) const
 
 //---------------------------------------------------------------------------
 
-const Scope *Scope::findRecordInNestedList(const std::string & name, bool isC) const
+template<class S, class T, REQUIRES("S must be a Scope class", std::is_convertible<S*, const Scope*> ), REQUIRES("T must be a Type class", std::is_convertible<T*, const Type*> )>
+static S* findRecordInNestedListImpl(S& thisScope, const std::string& name, bool isC, std::set<const Scope*>& visited)
 {
-    for (const Scope* scope: nestedList) {
-        if (scope->className == name && scope->type != eFunction)
+    for (S* scope: thisScope.nestedList) {
+        if (scope->className == name && scope->type != ScopeType::eFunction)
             return scope;
         if (isC) {
-            const Scope* nestedScope = scope->findRecordInNestedList(name, isC);
+            S* nestedScope = scope->findRecordInNestedList(name, isC);
             if (nestedScope)
                 return nestedScope;
         }
     }
 
-    const Type * nested_type = findType(name);
+    for (const auto& u : thisScope.usingList) {
+        if (!u.scope || u.scope == &thisScope || visited.find(u.scope) != visited.end())
+            continue;
+        visited.emplace(u.scope);
+        S* nestedScope = findRecordInNestedListImpl<S, T>(const_cast<S&>(*u.scope), name, false, visited);
+        if (nestedScope)
+            return nestedScope;
+    }
+
+    T * nested_type = thisScope.findType(name);
 
     if (nested_type) {
         if (nested_type->isTypeAlias()) {
             if (nested_type->typeStart == nested_type->typeEnd)
-                return findRecordInNestedList(nested_type->typeStart->str());
+                return thisScope.findRecordInNestedList(nested_type->typeStart->str()); // TODO: pass isC?
         } else
-            return nested_type->classScope;
+            return const_cast<S*>(nested_type->classScope);
     }
 
     return nullptr;
 }
 
+const Scope* Scope::findRecordInNestedList(const std::string & name, bool isC) const
+{
+    std::set<const Scope*> visited;
+    return findRecordInNestedListImpl<const Scope, const Type>(*this, name, isC, visited);
+}
+
+Scope* Scope::findRecordInNestedList(const std::string & name, bool isC)
+{
+    std::set<const Scope*> visited;
+    return findRecordInNestedListImpl<Scope, Type>(*this, name, isC, visited);
+}
+
 //---------------------------------------------------------------------------
 
-const Type* Scope::findType(const std::string & name) const
+template<class S, class T, REQUIRES("S must be a Scope class", std::is_convertible<S*, const Scope*> ), REQUIRES("T must be a Type class", std::is_convertible<T*, const Type*> )>
+static T* findTypeImpl(S& thisScope, const std::string & name)
 {
-    auto it = definedTypesMap.find(name);
+    auto it = thisScope.definedTypesMap.find(name);
 
     // Type was found
-    if (definedTypesMap.end() != it)
-        return (*it).second;
+    if (thisScope.definedTypesMap.end() != it)
+        return it->second;
 
     // is type defined in anonymous namespace..
-    it = definedTypesMap.find(emptyString);
-    if (it != definedTypesMap.end()) {
-        for (const Scope *scope : nestedList) {
-            if (scope->className.empty() && (scope->type == eNamespace || scope->isClassOrStructOrUnion())) {
-                const Type *t = scope->findType(name);
+    it = thisScope.definedTypesMap.find("");
+    if (it != thisScope.definedTypesMap.end()) {
+        for (S *scope : thisScope.nestedList) {
+            if (scope->className.empty() && (scope->type == ScopeType::eNamespace || scope->isClassOrStructOrUnion())) {
+                T *t = scope->findType(name);
                 if (t)
                     return t;
             }
@@ -5805,6 +6496,16 @@ const Type* Scope::findType(const std::string & name) const
     return nullptr;
 }
 
+const Type* Scope::findType(const std::string& name) const
+{
+    return findTypeImpl<const Scope, const Type>(*this, name);
+}
+
+Type* Scope::findType(const std::string& name)
+{
+    return findTypeImpl<Scope, Type>(*this, name);
+}
+
 //---------------------------------------------------------------------------
 
 Scope *Scope::findInNestedListRecursive(const std::string & name)
@@ -5828,20 +6529,13 @@ Scope *Scope::findInNestedListRecursive(const std::string & name)
 const Function *Scope::getDestructor() const
 {
     auto it = std::find_if(functionList.cbegin(), functionList.cend(), [](const Function& f) {
-        return f.type == Function::eDestructor;
+        return f.type == FunctionType::eDestructor;
     });
     return it == functionList.end() ? nullptr : &*it;
 }
 
 //---------------------------------------------------------------------------
 
-bool SymbolDatabase::isCPP() const
-{
-    return mTokenizer.isCPP();
-}
-
-//---------------------------------------------------------------------------
-
 const Scope *SymbolDatabase::findScope(const Token *tok, const Scope *startScope) const
 {
     const Scope *scope = nullptr;
@@ -5859,10 +6553,9 @@ const Scope *SymbolDatabase::findScope(const Token *tok, const Scope *startScope
         if (tok->strAt(1) == "::") {
             scope = scope->findRecordInNestedList(tok->str());
             tok = tok->tokAt(2);
-        } else if (tok->strAt(1) == "<" && Token::simpleMatch(tok->linkAt(1), "> ::")) {
-            scope = scope->findRecordInNestedList(tok->str());
-            tok = tok->linkAt(1)->tokAt(2);
-        } else
+        } else if (tok->strAt(1) == "<")
+            return nullptr;
+        else
             return scope->findRecordInNestedList(tok->str());
     }
 
@@ -5882,23 +6575,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 (mTokenizer.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
@@ -5934,7 +6610,7 @@ const Type* SymbolDatabase::findType(const Token *startTok, const Scope *startSc
                 type = scope1->definedType;
                 if (type)
                     return type;
-            } else if (lookOutside && scope->type == Scope::ScopeType::eNamespace) {
+            } else if (lookOutside && scope->type == ScopeType::eNamespace) {
                 scope = scope->nestedIn;
                 continue;
             } else
@@ -5944,7 +6620,7 @@ const Type* SymbolDatabase::findType(const Token *startTok, const Scope *startSc
 
     // check using namespaces
     while (startScope) {
-        for (std::vector<Scope::UsingInfo>::const_iterator it = startScope->usingList.cbegin();
+        for (auto it = startScope->usingList.cbegin();
              it != startScope->usingList.cend(); ++it) {
             tok = startTok;
             scope = it->scope;
@@ -5994,7 +6670,7 @@ const Type* SymbolDatabase::findTypeInNested(const Token *startTok, const Scope
         startTok = startTok->next();
 
     // type same as scope
-    if (startTok->str() == startScope->className && startScope->isClassOrStruct())
+    if (startScope->isClassOrStruct() && startTok->str() == startScope->className && !Token::simpleMatch(startTok->next(), "::"))
         return startScope->definedType;
 
     bool hasPath = false;
@@ -6061,8 +6737,8 @@ Function * SymbolDatabase::findFunctionInScope(const Token *func, const Scope *n
     const Function * function = nullptr;
     const bool destructor = func->strAt(-1) == "~";
 
-    auto range = ns->functionMap.equal_range(func->str());
-    for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
+    auto range = utils::as_const(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) {
             function = it->second;
@@ -6090,9 +6766,10 @@ Function * SymbolDatabase::findFunctionInScope(const Token *func, const Scope *n
 
 //---------------------------------------------------------------------------
 
-bool SymbolDatabase::isReservedName(const std::string& iName) const
+bool SymbolDatabase::isReservedName(const Token* tok)
 {
-    if (isCPP()) {
+    const std::string& iName = tok->str();
+    if (tok->isCpp()) {
         static const auto& cpp_keywords = Keywords::getAll(Standards::cppstd_t::CPPLatest);
         return cpp_keywords.find(iName) != cpp_keywords.cend();
     }
@@ -6115,13 +6792,12 @@ nonneg int SymbolDatabase::sizeOfType(const Token *type) const
 }
 
 static const Token* parsedecl(const Token* type,
-                              ValueType* const valuetype,
+                              ValueType* valuetype,
                               ValueType::Sign defaultSignedness,
                               const Settings& settings,
-                              bool isCpp,
                               SourceLocation loc = SourceLocation::current());
 
-void SymbolDatabase::setValueType(Token* tok, const Variable& var, SourceLocation loc)
+void SymbolDatabase::setValueType(Token* tok, const Variable& var, const SourceLocation &loc)
 {
     ValueType valuetype;
     if (mSettings.debugnormal || mSettings.debugwarnings)
@@ -6140,27 +6816,41 @@ void SymbolDatabase::setValueType(Token* tok, const Variable& var, SourceLocatio
         valuetype.containerTypeToken = var.valueType()->containerTypeToken;
     }
     valuetype.smartPointerType = var.smartPointerType();
-    if (parsedecl(var.typeStartToken(), &valuetype, mDefaultSignedness, mSettings, mIsCpp)) {
+    if (parsedecl(var.typeStartToken(), &valuetype, mDefaultSignedness, mSettings)) {
         if (tok->str() == "." && tok->astOperand1()) {
             const ValueType * const vt = tok->astOperand1()->valueType();
-            if (vt && (vt->constness & 1) != 0)
-                valuetype.constness |= 1;
+            if (vt && (vt->constness & 1) != 0) {
+                if (var.isArray()) // constness propagates to arrays, but not to regular pointers
+                    valuetype.constness |= 1;
+                else
+                    valuetype.constness |= (1 << valuetype.pointer);
+            }
+            if (vt && (vt->volatileness & 1) != 0) {
+                if (var.isArray())
+                    valuetype.volatileness |= 1;
+                else
+                    valuetype.volatileness |= (1 << valuetype.pointer);
+            }
         }
         setValueType(tok, valuetype);
     }
 }
 
-void SymbolDatabase::setValueType(Token* tok, const Enumerator& enumerator, SourceLocation loc)
+static ValueType::Type getEnumType(const Scope* scope, const Platform& platform);
+
+void SymbolDatabase::setValueType(Token* tok, const Enumerator& enumerator, const SourceLocation &loc)
 {
     ValueType valuetype;
     if (mSettings.debugnormal || mSettings.debugwarnings)
         valuetype.setDebugPath(tok, loc);
     valuetype.typeScope = enumerator.scope;
     const Token * type = enumerator.scope->enumType;
+    if (type && type->astParent())
+        type = type->astParent();
     if (type) {
         valuetype.type = ValueType::typeFromString(type->str(), type->isLong());
-        if (valuetype.type == ValueType::Type::UNKNOWN_TYPE && type->isStandardType())
-            valuetype.fromLibraryType(type->str(), mSettings);
+        if (valuetype.type == ValueType::Type::UNKNOWN_TYPE)
+            valuetype.fromLibraryType(type->expressionString(), mSettings);
 
         if (valuetype.isIntegral()) {
             if (type->isSigned())
@@ -6176,7 +6866,7 @@ void SymbolDatabase::setValueType(Token* tok, const Enumerator& enumerator, Sour
         setValueType(tok, valuetype);
     } else {
         valuetype.sign = ValueType::SIGNED;
-        valuetype.type = ValueType::INT;
+        valuetype.type = getEnumType(enumerator.scope, mSettings.platform);
         setValueType(tok, valuetype);
     }
 }
@@ -6188,7 +6878,7 @@ static void setAutoTokenProperties(Token * const autoTok)
         autoTok->isStandardType(true);
 }
 
-bool isContainerYieldElement(Library::Container::Yield yield)
+static bool isContainerYieldElement(Library::Container::Yield yield)
 {
     return yield == Library::Container::Yield::ITEM || yield == Library::Container::Yield::AT_INDEX ||
            yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT;
@@ -6199,9 +6889,9 @@ static bool isContainerYieldPointer(Library::Container::Yield yield)
     return yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT;
 }
 
-void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, SourceLocation loc)
+void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, const SourceLocation &loc)
 {
-    ValueType* valuetypePtr = new ValueType(valuetype);
+    auto* valuetypePtr = new ValueType(valuetype);
     if (mSettings.debugnormal || mSettings.debugwarnings)
         valuetypePtr->setDebugPath(tok, loc);
     tok->setValueType(valuetypePtr);
@@ -6215,7 +6905,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
     const ValueType *vt2 = parent->astOperand2() ? parent->astOperand2()->valueType() : nullptr;
 
     if (vt1 && Token::Match(parent, "<<|>>")) {
-        if (!mIsCpp || (vt2 && vt2->isIntegral())) {
+        if (!parent->isCpp() || (vt2 && vt2->isIntegral())) {
             if (vt1->type < ValueType::Type::BOOL || vt1->type >= ValueType::Type::INT) {
                 ValueType vt(*vt1);
                 vt.reference = Reference::None;
@@ -6233,12 +6923,14 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
     }
 
     if (vt1 && vt1->container && vt1->containerTypeToken && Token::Match(parent, ". %name% (") &&
-        isContainerYieldElement(vt1->container->getYield(parent->next()->str()))) {
+        isContainerYieldElement(vt1->container->getYield(parent->strAt(1)))) {
         ValueType item;
-        if (parsedecl(vt1->containerTypeToken, &item, mDefaultSignedness, mSettings, mIsCpp)) {
+        if (parsedecl(vt1->containerTypeToken, &item, mDefaultSignedness, mSettings)) {
             if (item.constness == 0)
                 item.constness = vt1->constness;
-            if (isContainerYieldPointer(vt1->container->getYield(parent->next()->str())))
+            if (item.volatileness == 0)
+                item.volatileness = vt1->volatileness;
+            if (isContainerYieldPointer(vt1->container->getYield(parent->strAt(1))))
                 item.pointer += 1;
             else
                 item.reference = Reference::LValue;
@@ -6258,8 +6950,8 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
             auto vt = *vt1;
             vt.reference = Reference::None;
             setValueType(parent, vt);
-        } else if (mIsCpp && ((Token::Match(parent->tokAt(-3), "%var% ; %var% =") && parent->strAt(-3) == parent->strAt(-1)) ||
-                              Token::Match(parent->tokAt(-1), "%var% ="))) {
+        } else if (parent->isCpp() && ((Token::Match(parent->tokAt(-3), "%var% ; %var% =") && parent->strAt(-3) == parent->strAt(-1)) ||
+                                       Token::Match(parent->tokAt(-1), "%var% ="))) {
             Token *var1Tok = parent->strAt(-2) == ";" ? parent->tokAt(-3) : parent->tokAt(-1);
             Token *autoTok = nullptr;
             if (Token::simpleMatch(var1Tok->tokAt(-1), "auto"))
@@ -6272,10 +6964,14 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                 ValueType vt(*vt2);
                 if (vt.constness & (1 << vt.pointer))
                     vt.constness &= ~(1 << vt.pointer);
+                if (vt.volatileness & (1 << vt.pointer))
+                    vt.volatileness &= ~(1 << vt.pointer);
                 if (autoTok->strAt(1) == "*" && vt.pointer)
                     vt.pointer--;
                 if (Token::Match(autoTok->tokAt(-1), "const|constexpr"))
                     vt.constness |= (1 << vt.pointer);
+                if (Token::simpleMatch(autoTok->tokAt(-1), "volatile"))
+                    vt.volatileness |= (1 << vt.pointer);
                 setValueType(autoTok, vt);
                 setAutoTokenProperties(autoTok);
                 if (vt2->pointer > vt.pointer)
@@ -6283,17 +6979,23 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                 setValueType(var1Tok, vt);
                 if (var1Tok != parent->previous())
                     setValueType(parent->previous(), vt);
-                Variable *var = const_cast<Variable *>(parent->previous()->variable());
+                auto *var = const_cast<Variable *>(parent->previous()->variable());
                 if (var) {
                     ValueType vt2_(*vt2);
                     if (vt2_.pointer == 0 && autoTok->strAt(1) == "*")
                         vt2_.pointer = 1;
                     if ((vt.constness & (1 << vt2->pointer)) != 0)
                         vt2_.constness |= (1 << vt2->pointer);
-                    if (!Token::Match(autoTok->tokAt(1), "*|&"))
+                    if ((vt.volatileness & (1 << vt2->pointer)) != 0)
+                        vt2_.volatileness |= (1 << vt2->pointer);
+                    if (!Token::Match(autoTok->tokAt(1), "*|&")) {
                         vt2_.constness = vt.constness;
+                        vt2_.volatileness = vt.volatileness;
+                    }
                     if (Token::simpleMatch(autoTok->tokAt(1), "* const"))
                         vt2_.constness |= (1 << vt2->pointer);
+                    if (Token::simpleMatch(autoTok->tokAt(1), "* volatile"))
+                        vt2_.volatileness |= (1 << vt2->pointer);
                     var->setValueType(vt2_);
                     if (vt2->typeScope && vt2->typeScope->definedType) {
                         var->type(vt2->typeScope->definedType);
@@ -6306,7 +7008,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
         return;
     }
 
-    if (parent->str() == "[" && (!mIsCpp || parent->astOperand1() == tok) && valuetype.pointer > 0U && !Token::Match(parent->previous(), "[{,]")) {
+    if (parent->str() == "[" && (!parent->isCpp() || parent->astOperand1() == tok) && valuetype.pointer > 0U && !Token::Match(parent->previous(), "[{,]")) {
         const Token *op1 = parent->astOperand1();
         while (op1 && op1->str() == "[")
             op1 = op1->astOperand1();
@@ -6318,7 +7020,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
         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 > 0U) {
         ValueType vt(valuetype);
         vt.pointer -= 1U;
         setValueType(parent, vt);
@@ -6341,9 +7043,11 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
     if (parent->str() == "*" && !parent->astOperand2() && valuetype.type == ValueType::Type::ITERATOR &&
         valuetype.containerTypeToken) {
         ValueType vt;
-        if (parsedecl(valuetype.containerTypeToken, &vt, mDefaultSignedness, mSettings, mIsCpp)) {
+        if (parsedecl(valuetype.containerTypeToken, &vt, mDefaultSignedness, mSettings)) {
             if (vt.constness == 0)
                 vt.constness = valuetype.constness;
+            if (vt.volatileness == 0)
+                vt.volatileness = valuetype.volatileness;
             vt.reference = Reference::LValue;
             setValueType(parent, vt);
             return;
@@ -6353,9 +7057,11 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
     if (parent->str() == "*" && !parent->astOperand2() && valuetype.type == ValueType::Type::SMART_POINTER &&
         valuetype.smartPointerTypeToken) {
         ValueType vt;
-        if (parsedecl(valuetype.smartPointerTypeToken, &vt, mDefaultSignedness, mSettings, mIsCpp)) {
+        if (parsedecl(valuetype.smartPointerTypeToken, &vt, mDefaultSignedness, mSettings)) {
             if (vt.constness == 0)
                 vt.constness = valuetype.constness;
+            if (vt.volatileness == 0)
+                vt.volatileness = valuetype.volatileness;
             setValueType(parent, vt);
             return;
         }
@@ -6402,8 +7108,12 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
             if (it != typeScope->varlist.end())
                 var = &*it;
         }
-        if (var)
+        if (var) {
             setValueType(parent, *var);
+            return;
+        }
+        if (const Enumerator* enu = parent->astOperand2()->enumerator())
+            setValueType(parent, *enu);
         return;
     }
 
@@ -6414,11 +7124,13 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
         !parent->previous()->valueType() &&
         Token::simpleMatch(parent->astParent()->astOperand1(), "for")) {
         const bool isconst = Token::simpleMatch(parent->astParent()->next(), "const");
+        const bool isvolatile = Token::simpleMatch(parent->astParent()->next(), "volatile");
         Token * const autoToken = parent->astParent()->tokAt(isconst ? 2 : 1);
         if (vt2->pointer) {
             ValueType autovt(*vt2);
             autovt.pointer--;
             autovt.constness = 0;
+            autovt.volatileness = 0;
             setValueType(autoToken, autovt);
             setAutoTokenProperties(autoToken);
             ValueType varvt(*vt2);
@@ -6431,8 +7143,14 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                 else
                     varvt.constness |= 1;
             }
+            if (isvolatile) {
+                if (varvt.pointer && varvt.reference != Reference::None)
+                    varvt.volatileness |= (1 << varvt.pointer);
+                else
+                    varvt.volatileness |= 1;
+            }
             setValueType(parent->previous(), varvt);
-            Variable *var = const_cast<Variable *>(parent->previous()->variable());
+            auto *var = const_cast<Variable *>(parent->previous()->variable());
             if (var) {
                 var->setValueType(varvt);
                 if (vt2->typeScope && vt2->typeScope->definedType) {
@@ -6472,19 +7190,25 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                             autovt.type = ValueType::Type::NONSTD;
                         }
                     }
-                } else if (parsedecl(vt2->containerTypeToken, &autovt, mDefaultSignedness, mSettings, mIsCpp)) {
+                } else if (parsedecl(vt2->containerTypeToken, &autovt, mDefaultSignedness, mSettings)) {
                     setType = true;
                     templateArgType = vt2->containerTypeToken->type();
                     if (Token::simpleMatch(autoToken->next(), "&"))
                         autovt.reference = Reference::LValue;
                     else if (Token::simpleMatch(autoToken->next(), "&&"))
                         autovt.reference = Reference::RValue;
-                    if (autoToken->previous()->str() == "const") {
+                    if (autoToken->strAt(-1) == "const") {
                         if (autovt.pointer && autovt.reference != Reference::None)
                             autovt.constness |= 2;
                         else
                             autovt.constness |= 1;
                     }
+                    if (autoToken->strAt(-1) == "volatile") {
+                        if (autovt.pointer && autovt.reference != Reference::None)
+                            autovt.volatileness |= 2;
+                        else
+                            autovt.volatileness |= 1;
+                    }
                 }
             }
 
@@ -6497,8 +7221,10 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                     autovt.pointer--;
                 if (isconst)
                     varvt.constness |= (1 << autovt.pointer);
+                if (isvolatile)
+                    varvt.volatileness |= (1 << autovt.pointer);
                 setValueType(parent->previous(), varvt);
-                Variable * var = const_cast<Variable *>(parent->previous()->variable());
+                auto * var = const_cast<Variable *>(parent->previous()->variable());
                 if (var) {
                     var->setValueType(varvt);
                     if (templateArgType && templateArgType->classScope && templateArgType->classScope->definedType) {
@@ -6512,19 +7238,19 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
 
     if (vt1 && vt1->containerTypeToken && parent->str() == "[") {
         ValueType vtParent;
-        if (parsedecl(vt1->containerTypeToken, &vtParent, mDefaultSignedness, mSettings, mIsCpp)) {
+        if (parsedecl(vt1->containerTypeToken, &vtParent, mDefaultSignedness, mSettings)) {
             setValueType(parent, vtParent);
             return;
         }
     }
 
-    if (mIsCpp && vt2 && Token::simpleMatch(parent->previous(), "decltype (")) {
+    if (parent->isCpp() && vt2 && Token::simpleMatch(parent->previous(), "decltype (")) {
         setValueType(parent, *vt2);
         return;
     }
 
     // c++17 auto type deduction of braced init list
-    if (mIsCpp && mSettings.standards.cpp >= Standards::CPP17 && vt2 && Token::Match(parent->tokAt(-2), "auto %var% {")) {
+    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);
@@ -6586,6 +7312,11 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                     setValueType(parent, *vt1);
                 return;
             }
+
+            if (vt1->isTypeEqual(vt2)) {
+                setValueType(parent, *vt1);
+                return;
+            }
         }
 
         if (vt1->pointer != 0U) {
@@ -6656,25 +7387,54 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
     }
 }
 
+static ValueType::Type getEnumType(const Scope* scope, const Platform& platform) // TODO: also determine sign?
+{
+    ValueType::Type type = ValueType::Type::INT;
+    for (const Token* tok = scope->bodyStart; tok && tok != scope->bodyEnd; tok = tok->next()) {
+        if (const Token* lam = findLambdaEndToken(tok)) {
+            tok = lam;
+            continue;
+        }
+        if (!tok->isAssignmentOp())
+            continue;
+        const Token* vTok = tok->astOperand2();
+        if (!vTok->hasKnownIntValue()) {
+            if (!vTok->isLiteral())
+                continue;
+            if (const ValueType* vt = vTok->valueType()) {
+                if ((vt->type > type && (vt->type == ValueType::Type::LONG || vt->type == ValueType::Type::LONGLONG)))
+                    type = vt->type;
+            }
+            continue;
+        }
+        const MathLib::bigint value = vTok->getKnownIntValue();
+        if (!platform.isIntValue(value)) {
+            type = ValueType::Type::LONG;
+            if (!platform.isLongValue(value))
+                type = ValueType::Type::LONGLONG;
+        }
+    }
+    return type;
+}
+
 static const Token* parsedecl(const Token* type,
                               ValueType* const valuetype,
                               ValueType::Sign defaultSignedness,
                               const Settings& settings,
-                              bool isCpp,
                               SourceLocation loc)
 {
     if (settings.debugnormal || settings.debugwarnings)
         valuetype->setDebugPath(type, loc);
     const Token * const previousType = type;
-    const unsigned int pointer0 = valuetype->pointer;
-    while (Token::Match(type->previous(), "%name%") && !endsWith(type->previous()->str(), ':'))
+    const int pointer0 = valuetype->pointer;
+    while (Token::Match(type->previous(), "%name%") && !endsWith(type->strAt(-1), ':'))
         type = type->previous();
     valuetype->sign = ValueType::Sign::UNKNOWN_SIGN;
     if (!valuetype->typeScope && !valuetype->smartPointerType)
         valuetype->type = ValueType::Type::UNKNOWN_TYPE;
     else if (valuetype->smartPointerType)
         valuetype->type = ValueType::Type::SMART_POINTER;
-    else if (valuetype->typeScope->type == Scope::eEnum) {
+    else if (valuetype->typeScope->type == ScopeType::eEnum) {
         const Token * enum_type = valuetype->typeScope->enumType;
         if (enum_type) {
             if (enum_type->isSigned())
@@ -6682,21 +7442,24 @@ static const Token* parsedecl(const Token* type,
             else if (enum_type->isUnsigned())
                 valuetype->sign = ValueType::Sign::UNSIGNED;
             else
-                valuetype->sign = defaultSignedness;
+                valuetype->sign = defaultSignedness; // TODO: this is implementation-dependent might be separate from char
             const ValueType::Type t = ValueType::typeFromString(enum_type->str(), enum_type->isLong());
             if (t != ValueType::Type::UNKNOWN_TYPE)
                 valuetype->type = t;
             else if (enum_type->isStandardType())
                 valuetype->fromLibraryType(enum_type->str(), settings);
         } else
-            valuetype->type = ValueType::Type::INT;
+            valuetype->type = getEnumType(valuetype->typeScope, settings.platform);
     } else
         valuetype->type = ValueType::Type::RECORD;
+    const bool cpp = type->isCpp();
     bool par = false;
     while (Token::Match(type, "%name%|*|&|&&|::|(") && !Token::Match(type, "typename|template") && type->varId() == 0 &&
            !type->variable() && !type->function()) {
         bool isIterator = false;
         if (type->str() == "(") {
+            if (!Token::simpleMatch(type, "( *"))
+                break;
             if (Token::Match(type->link(), ") const| {"))
                 break;
             if (par)
@@ -6722,11 +7485,13 @@ static const Token* parsedecl(const Token* type,
         if (valuetype->type == ValueType::Type::UNKNOWN_TYPE &&
             type->type() && type->type()->isTypeAlias() && type->type()->typeStart &&
             type->type()->typeStart->str() != type->str() && type->type()->typeStart != previousType)
-            parsedecl(type->type()->typeStart, valuetype, defaultSignedness, settings, isCpp);
+            parsedecl(type->type()->typeStart, valuetype, defaultSignedness, settings);
         else if (Token::Match(type, "const|constexpr"))
             valuetype->constness |= (1 << (valuetype->pointer - pointer0));
+        else if (Token::simpleMatch(type, "volatile"))
+            valuetype->volatileness |= (1 << (valuetype->pointer - pointer0));
         else if (settings.clang && type->str().size() > 2 && type->str().find("::") < type->str().find('<')) {
-            TokenList typeTokens(&settings);
+            TokenList typeTokens(settings, type->isCpp() ? Standards::Language::CPP : Standards::Language::C);
             std::string::size_type pos1 = 0;
             do {
                 const std::string::size_type pos2 = type->str().find("::", pos1);
@@ -6748,11 +7513,61 @@ 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 == Scope::ScopeType::eClass) ? ValueType::Type::RECORD : ValueType::Type::NONSTD;
+                    valuetype->type = (scope->type == ScopeType::eClass) ? ValueType::Type::RECORD : ValueType::Type::NONSTD;
+            }
+        } else if (ValueType::Type type_s = ValueType::typeFromString(type->str(), type->isLong())) { // != UNKNOWN_TYPE
+            const ValueType::Type t0 = valuetype->type;
+            valuetype->type = type_s;
+            if (t0 == ValueType::Type::LONG) {
+                if (valuetype->type == ValueType::Type::LONG)
+                    valuetype->type = ValueType::Type::LONGLONG;
+                else if (valuetype->type == ValueType::Type::DOUBLE)
+                    valuetype->type = ValueType::Type::LONGDOUBLE;
             }
-        } else if (const Library::Container* container = (isCpp ? settings.library.detectContainerOrIterator(type, &isIterator) : nullptr)) {
+        } else if (type->str() == "auto") {
+            const ValueType *vt = type->valueType();
+            if (!vt)
+                return nullptr;
+            valuetype->type = vt->type;
+            valuetype->pointer = vt->pointer;
+            valuetype->reference = vt->reference;
+            if (vt->sign != ValueType::Sign::UNKNOWN_SIGN)
+                valuetype->sign = vt->sign;
+            valuetype->constness = vt->constness;
+            valuetype->volatileness = vt->volatileness;
+            valuetype->originalTypeName = vt->originalTypeName;
+            const bool hasConst = Token::simpleMatch(type->previous(), "const");
+            const bool hasVolatile = Token::simpleMatch(type->previous(), "volatile");
+            while (Token::Match(type, "%name%|*|&|&&|::") && !type->variable()) {
+                if (type->str() == "*") {
+                    valuetype->pointer = 1;
+                    if (hasConst)
+                        valuetype->constness = 1;
+                    if (hasVolatile)
+                        valuetype->volatileness = 1;
+                } else if (type->str() == "&") {
+                    valuetype->reference = Reference::LValue;
+                } else if (type->str() == "&&") {
+                    valuetype->reference = Reference::RValue;
+                }
+                if (type->str() == "const")
+                    valuetype->constness |= (1 << valuetype->pointer);
+                if (type->str() == "volatile")
+                    valuetype->volatileness |= (1 << valuetype->pointer);
+                type = type->next();
+            }
+            break;
+        } else if (type->str() == "*")
+            valuetype->pointer++;
+        else if (type->str() == "&")
+            valuetype->reference = Reference::LValue;
+        else if (type->str() == "&&")
+            valuetype->reference = Reference::RValue;
+        else if (type->isStandardType())
+            valuetype->fromLibraryType(type->str(), settings);
+        else if (const Library::Container* container = (cpp ? settings.library.detectContainerOrIterator(type, &isIterator) : nullptr)) {
             if (isIterator)
                 valuetype->type = ValueType::Type::ITERATOR;
             else
@@ -6774,7 +7589,7 @@ static const Token* parsedecl(const Token* type,
                 // we are past the end of the type
                 type = type->previous();
             continue;
-        } else if (const Library::SmartPointer* smartPointer = (isCpp ? settings.library.detectSmartPointer(type) : nullptr)) {
+        } else if (const Library::SmartPointer* smartPointer = (cpp ? settings.library.detectSmartPointer(type) : nullptr)) {
             const Token* argTok = Token::findsimplematch(type, "<");
             if (!argTok)
                 break;
@@ -6796,63 +7611,27 @@ static const Token* parsedecl(const Token* type,
             typestr += end->str();
             if (valuetype->fromLibraryType(typestr, settings))
                 type = end;
-        } else if (ValueType::Type::UNKNOWN_TYPE != ValueType::typeFromString(type->str(), type->isLong())) {
-            const ValueType::Type t0 = valuetype->type;
-            valuetype->type = ValueType::typeFromString(type->str(), type->isLong());
-            if (t0 == ValueType::Type::LONG) {
-                if (valuetype->type == ValueType::Type::LONG)
-                    valuetype->type = ValueType::Type::LONGLONG;
-                else if (valuetype->type == ValueType::Type::DOUBLE)
-                    valuetype->type = ValueType::Type::LONGDOUBLE;
-            }
-        } else if (type->str() == "auto") {
-            const ValueType *vt = type->valueType();
-            if (!vt)
-                return nullptr;
-            valuetype->type = vt->type;
-            valuetype->pointer = vt->pointer;
-            valuetype->reference = vt->reference;
-            if (vt->sign != ValueType::Sign::UNKNOWN_SIGN)
-                valuetype->sign = vt->sign;
-            valuetype->constness = vt->constness;
-            valuetype->originalTypeName = vt->originalTypeName;
-            const bool hasConst = Token::simpleMatch(type->previous(), "const");
-            while (Token::Match(type, "%name%|*|&|::") && !type->variable()) {
-                if (type->str() == "*") {
-                    valuetype->pointer = 1;
-                    if (hasConst)
-                        valuetype->constness = 1;
-                }
-                if (type->str() == "const")
-                    valuetype->constness |= (1 << valuetype->pointer);
-                type = type->next();
-            }
-            break;
-        } else if (!valuetype->typeScope && (type->str() == "struct" || type->str() == "enum"))
+        } else if (!valuetype->typeScope && (type->str() == "struct" || type->str() == "enum") && valuetype->type != ValueType::Type::SMART_POINTER)
             valuetype->type = type->str() == "struct" ? ValueType::Type::RECORD : ValueType::Type::NONSTD;
-        else if (!valuetype->typeScope && type->type() && type->type()->classScope) {
-            if (type->type()->classScope->type == Scope::ScopeType::eEnum) {
-                valuetype->type = ValueType::Type::INT;
+        else if (!valuetype->typeScope && type->type() && type->type()->classScope && valuetype->type != ValueType::Type::SMART_POINTER) {
+            if (type->type()->classScope->type == ScopeType::eEnum) {
                 valuetype->sign = ValueType::Sign::SIGNED;
+                valuetype->type = getEnumType(type->type()->classScope, settings.platform);
             } else {
                 valuetype->type = ValueType::Type::RECORD;
             }
             valuetype->typeScope = type->type()->classScope;
         } else if (type->isName() && valuetype->sign != ValueType::Sign::UNKNOWN_SIGN && valuetype->pointer == 0U)
             return nullptr;
-        else if (type->str() == "*")
-            valuetype->pointer++;
-        else if (type->str() == "&")
-            valuetype->reference = Reference::LValue;
-        else if (type->str() == "&&")
-            valuetype->reference = Reference::RValue;
-        else if (type->isStandardType())
-            valuetype->fromLibraryType(type->str(), settings);
-        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();
+        if (type && type->link() && type->str() == "<")
+            type = type->link()->next();
     }
 
     // Set signedness for integral types..
@@ -6876,18 +7655,17 @@ static const Scope *getClassScope(const Token *tok)
 static const Function *getOperatorFunction(const Token * const tok)
 {
     const std::string functionName("operator" + tok->str());
-    std::multimap<std::string, const Function *>::const_iterator it;
 
     const Scope *classScope = getClassScope(tok->astOperand1());
     if (classScope) {
-        it = classScope->functionMap.find(functionName);
+        auto it = utils::as_const(classScope->functionMap).find(functionName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
 
     classScope = getClassScope(tok->astOperand2());
     if (classScope) {
-        it = classScope->functionMap.find(functionName);
+        auto it = utils::as_const(classScope->functionMap).find(functionName);
         if (it != classScope->functionMap.end())
             return it->second;
     }
@@ -6912,10 +7690,44 @@ static const Function* getFunction(const Token* tok) {
     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)
-        tokens = const_cast<Tokenizer &>(mTokenizer).list.front();
+        tokens = mTokenizer.list.front();
 
     for (Token *tok = tokens; tok; tok = tok->next())
         tok->setValueType(nullptr);
@@ -6935,7 +7747,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 const bool unsignedSuffix = (tokStr.find_last_of("uU") != std::string::npos);
                 ValueType::Sign sign = unsignedSuffix ? ValueType::Sign::UNSIGNED : ValueType::Sign::SIGNED;
                 ValueType::Type type = ValueType::Type::INT;
-                const MathLib::biguint value = MathLib::toULongNumber(tokStr);
+                const MathLib::biguint value = MathLib::toBigUNumber(tokStr, tok);
                 for (std::size_t pos = tokStr.size() - 1U; pos > 0U; --pos) {
                     const char suffix = tokStr[pos];
                     if (suffix == 'u' || suffix == 'U')
@@ -6947,7 +7759,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                         pos -= 2;
                     } else break;
                 }
-                if (mSettings.platform.type != cppcheck::Platform::Type::Unspecified) {
+                if (mSettings.platform.type != Platform::Type::Unspecified) {
                     if (type <= ValueType::Type::INT && mSettings.platform.isIntValue(unsignedSuffix ? (value >> 1) : value))
                         type = ValueType::Type::INT;
                     else if (type <= ValueType::Type::INT && !MathLib::isDec(tokStr) && mSettings.platform.isIntValue(value >> 2)) {
@@ -6969,11 +7781,11 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 setValueType(tok, ValueType(sign, type, 0U));
             }
         } else if (tok->isComparisonOp() || tok->tokType() == Token::eLogicalOp) {
-            if (mIsCpp && tok->isComparisonOp() && (getClassScope(tok->astOperand1()) || getClassScope(tok->astOperand2()))) {
+            if (tok->isCpp() && tok->isComparisonOp() && (getClassScope(tok->astOperand1()) || getClassScope(tok->astOperand2()))) {
                 const Function *function = getOperatorFunction(tok);
                 if (function) {
                     ValueType vt;
-                    parsedecl(function->retDef, &vt, mDefaultSignedness, mSettings, mIsCpp);
+                    parsedecl(function->retDef, &vt, mDefaultSignedness, mSettings);
                     setValueType(tok, vt);
                     continue;
                 }
@@ -6982,11 +7794,12 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
         } else if (tok->isBoolean()) {
             setValueType(tok, ValueType(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::BOOL, 0U));
         } else if (tok->tokType() == Token::eChar || tok->tokType() == Token::eString) {
-            nonneg int const pointer = tok->tokType() == Token::eChar ? 0U : 1U;
-            nonneg int const constness = tok->tokType() == Token::eChar ? 0U : 1U;
-            ValueType valuetype(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::CHAR, pointer, constness);
+            nonneg int const pointer = tok->tokType() == Token::eChar ? 0 : 1;
+            nonneg int const constness = tok->tokType() == Token::eChar ? 0 : 1;
+            nonneg int const volatileness = 0;
+            ValueType valuetype(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::CHAR, pointer, constness, volatileness);
 
-            if (mIsCpp && mSettings.standards.cpp >= Standards::CPP20 && tok->isUtf8()) {
+            if (tok->isCpp() && mSettings.standards.cpp >= Standards::CPP20 && tok->isUtf8()) {
                 valuetype.originalTypeName = "char8_t";
                 valuetype.fromLibraryType(valuetype.originalTypeName, mSettings);
             } else if (tok->isUtf16()) {
@@ -6998,7 +7811,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             } else if (tok->isLong()) {
                 valuetype.originalTypeName = "wchar_t";
                 valuetype.type = ValueType::Type::WCHAR_T;
-            } else if ((tok->tokType() == Token::eChar) && ((tok->isCChar() && !mIsCpp) || (tok->isCMultiChar()))) {
+            } else if ((tok->tokType() == Token::eChar) && ((!tok->isCpp() && tok->isCChar()) || (tok->isCMultiChar()))) {
                 valuetype.type = ValueType::Type::INT;
                 valuetype.sign = ValueType::Sign::SIGNED;
             }
@@ -7008,21 +7821,21 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             // cast
             if (tok->isCast() && !tok->astOperand2() && Token::Match(tok, "( %name%")) {
                 ValueType valuetype;
-                if (Token::simpleMatch(parsedecl(tok->next(), &valuetype, mDefaultSignedness, mSettings, mIsCpp), ")"))
+                if (Token::simpleMatch(parsedecl(tok->next(), &valuetype, mDefaultSignedness, mSettings), ")"))
                     setValueType(tok, valuetype);
             }
 
             // C++ cast
             else if (tok->astOperand2() && Token::Match(tok->astOperand1(), "static_cast|const_cast|dynamic_cast|reinterpret_cast < %name%") && tok->astOperand1()->linkAt(1)) {
                 ValueType valuetype;
-                if (Token::simpleMatch(parsedecl(tok->astOperand1()->tokAt(2), &valuetype, mDefaultSignedness, mSettings, mIsCpp), ">"))
+                if (Token::simpleMatch(parsedecl(tok->astOperand1()->tokAt(2), &valuetype, mDefaultSignedness, mSettings), ">"))
                     setValueType(tok, valuetype);
             }
 
             // Construct smart pointer
-            else if (mSettings.library.isSmartPointer(start)) {
+            else if (start && start->isCpp() && mSettings.library.isSmartPointer(start)) {
                 ValueType valuetype;
-                if (parsedecl(start, &valuetype, mDefaultSignedness, mSettings, mIsCpp)) {
+                if (parsedecl(start, &valuetype, mDefaultSignedness, mSettings)) {
                     setValueType(tok, valuetype);
                     setValueType(tok->astOperand1(), valuetype);
                 }
@@ -7032,13 +7845,13 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             // function or lambda
             else if (const Function* f = getFunction(tok->previous())) {
                 ValueType valuetype;
-                if (parsedecl(f->retDef, &valuetype, mDefaultSignedness, mSettings, mIsCpp))
+                if (parsedecl(f->retDef, &valuetype, mDefaultSignedness, mSettings))
                     setValueType(tok, valuetype);
             }
 
             else if (Token::simpleMatch(tok->previous(), "sizeof (")) {
                 ValueType valuetype(ValueType::Sign::UNSIGNED, ValueType::Type::LONG, 0U);
-                if (mSettings.platform.type == cppcheck::Platform::Type::Win64)
+                if (mSettings.platform.type == Platform::Type::Win64)
                     valuetype.type = ValueType::Type::LONGLONG;
 
                 valuetype.originalTypeName = "size_t";
@@ -7046,12 +7859,35 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
 
                 if (Token::Match(tok, "( %type% %type%| *| *| )")) {
                     ValueType vt;
-                    if (parsedecl(tok->next(), &vt, mDefaultSignedness, mSettings, mIsCpp)) {
+                    if (parsedecl(tok->next(), &vt, mDefaultSignedness, mSettings)) {
                         setValueType(tok->next(), vt);
                     }
                 }
             }
 
+            // 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;
@@ -7060,13 +7896,13 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                     continue;
                 }
 
-                valuetype.type = ValueType::typeFromString(tok->previous()->str(), tok->previous()->isLong());
+                valuetype.type = ValueType::typeFromString(tok->strAt(-1), tok->previous()->isLong());
                 if (tok->previous()->isUnsigned())
                     valuetype.sign = ValueType::Sign::UNSIGNED;
                 else if (tok->previous()->isSigned())
                     valuetype.sign = ValueType::Sign::SIGNED;
                 else if (valuetype.isIntegral() && valuetype.type != ValueType::UNKNOWN_INT)
-                    valuetype.sign = mDefaultSignedness;
+                    valuetype.sign = (valuetype.type == ValueType::Type::CHAR) ? mDefaultSignedness : ValueType::Sign::SIGNED;
                 setValueType(tok, valuetype);
             }
 
@@ -7074,7 +7910,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             else if (tok->previous() && tok->previous()->function() && tok->previous()->function()->isConstructor()) {
                 ValueType valuetype;
                 valuetype.type = ValueType::RECORD;
-                valuetype.typeScope = tok->previous()->function()->token->scope();
+                valuetype.typeScope = tok->previous()->function()->tokenDef->scope();
                 setValueType(tok, valuetype);
             }
 
@@ -7088,21 +7924,21 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 // Aggregate constructor
                 if (Token::Match(tok->previous(), "%name%")) {
                     ValueType valuetype;
-                    if (parsedecl(tok->previous(), &valuetype, mDefaultSignedness, mSettings, mIsCpp)) {
+                    if (parsedecl(tok->previous(), &valuetype, mDefaultSignedness, mSettings)) {
                         if (valuetype.typeScope) {
                             setValueType(tok, valuetype);
                             continue;
                         }
                     }
                 }
-                if (tok->astParent() && Token::Match(tok->astOperand1(), "%name%|::")) {
+                if (tok->isCpp() && tok->astParent() && Token::Match(tok->astOperand1(), "%name%|::")) {
                     const Token *typeStartToken = tok->astOperand1();
                     while (typeStartToken && typeStartToken->str() == "::")
                         typeStartToken = typeStartToken->astOperand1();
                     if (mSettings.library.detectContainerOrIterator(typeStartToken) ||
                         mSettings.library.detectSmartPointer(typeStartToken)) {
                         ValueType vt;
-                        if (parsedecl(typeStartToken, &vt, mDefaultSignedness, mSettings, mIsCpp)) {
+                        if (parsedecl(typeStartToken, &vt, mDefaultSignedness, mSettings)) {
                             setValueType(tok, vt);
                             continue;
                         }
@@ -7112,15 +7948,15 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
 
                     if ((e == "std::make_shared" || e == "std::make_unique") && Token::Match(tok->astOperand1(), ":: %name% < %name%")) {
                         ValueType vt;
-                        parsedecl(tok->astOperand1()->tokAt(3), &vt, mDefaultSignedness, mSettings, mIsCpp);
+                        parsedecl(tok->astOperand1()->tokAt(3), &vt, mDefaultSignedness, mSettings);
                         if (vt.typeScope) {
                             vt.smartPointerType = vt.typeScope->definedType;
                             vt.typeScope = nullptr;
                         }
-                        if (e == "std::make_shared" && mSettings.library.smartPointers.count("std::shared_ptr") > 0)
-                            vt.smartPointer = &mSettings.library.smartPointers.at("std::shared_ptr");
-                        if (e == "std::make_unique" && mSettings.library.smartPointers.count("std::unique_ptr") > 0)
-                            vt.smartPointer = &mSettings.library.smartPointers.at("std::unique_ptr");
+                        if (e == "std::make_shared" && mSettings.library.smartPointers().count("std::shared_ptr") > 0)
+                            vt.smartPointer = &mSettings.library.smartPointers().at("std::shared_ptr");
+                        if (e == "std::make_unique" && mSettings.library.smartPointers().count("std::unique_ptr") > 0)
+                            vt.smartPointer = &mSettings.library.smartPointers().at("std::unique_ptr");
                         vt.type = ValueType::Type::SMART_POINTER;
                         vt.smartPointerTypeToken = tok->astOperand1()->tokAt(3);
                         setValueType(tok, vt);
@@ -7137,11 +7973,11 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 const std::string& typestr(mSettings.library.returnValueType(tok->previous()));
                 if (!typestr.empty()) {
                     ValueType valuetype;
-                    TokenList tokenList(&mSettings);
-                    std::istringstream istr(typestr+";");
-                    tokenList.createTokens(istr);
+                    TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
+                    const std::string str(typestr+";");
+                    tokenList.createTokensFromBuffer(str.data(), str.size()); // TODO: check result?
                     tokenList.simplifyStdType();
-                    if (parsedecl(tokenList.front(), &valuetype, mDefaultSignedness, mSettings, mIsCpp)) {
+                    if (parsedecl(tokenList.front(), &valuetype, mDefaultSignedness, mSettings)) {
                         valuetype.originalTypeName = typestr;
                         setValueType(tok, valuetype);
                     }
@@ -7181,7 +8017,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                             continue;
                         }
 
-                        const auto yield = astFunctionYield(tok->previous(), &mSettings);
+                        const auto yield = astFunctionYield(tok->previous(), mSettings);
                         if (yield == Library::Container::Yield::START_ITERATOR ||
                             yield == Library::Container::Yield::END_ITERATOR ||
                             yield == Library::Container::Yield::ITERATOR) {
@@ -7227,13 +8063,13 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                     }
                     continue;
                 }
-                TokenList tokenList(&mSettings);
-                std::istringstream istr(typestr+";");
-                if (tokenList.createTokens(istr)) {
+                TokenList tokenList(mSettings, tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
+                const std::string str(typestr+";");
+                if (tokenList.createTokensFromBuffer(str.data(), str.size())) {
                     ValueType vt;
                     tokenList.simplifyPlatformTypes();
                     tokenList.simplifyStdType();
-                    if (parsedecl(tokenList.front(), &vt, mDefaultSignedness, mSettings, mIsCpp)) {
+                    if (parsedecl(tokenList.front(), &vt, mDefaultSignedness, mSettings)) {
                         vt.originalTypeName = typestr;
                         setValueType(tok, vt);
                     }
@@ -7241,11 +8077,11 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             }
         } else if (tok->str() == "return") {
             const Scope *functionScope = tok->scope();
-            while (functionScope && functionScope->isExecutable() && functionScope->type != Scope::eLambda && functionScope->type != Scope::eFunction)
+            while (functionScope && functionScope->isExecutable() && functionScope->type != ScopeType::eLambda && functionScope->type != ScopeType::eFunction)
                 functionScope = functionScope->nestedIn;
-            if (functionScope && functionScope->type == Scope::eFunction && functionScope->function &&
+            if (functionScope && functionScope->type == ScopeType::eFunction && functionScope->function &&
                 functionScope->function->retDef) {
-                ValueType vt = ValueType::parseDecl(functionScope->function->retDef, mSettings, mIsCpp);
+                ValueType vt = ValueType::parseDecl(functionScope->function->retDef, mSettings);
                 setValueType(tok, vt);
                 if (Token::simpleMatch(tok, "return {"))
                     setValueType(tok->next(), vt);
@@ -7306,7 +8142,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 fscope = fscope->nestedIn;
             if (fscope && fscope->function && fscope->function->retDef) {
                 ValueType vt;
-                parsedecl(fscope->function->retDef, &vt, mDefaultSignedness, mSettings, mIsCpp);
+                parsedecl(fscope->function->retDef, &vt, mDefaultSignedness, mSettings);
                 setValueType(tok, vt);
             }
         } else if (tok->isKeyword() && tok->str() == "this" && tok->scope()->isExecutable()) {
@@ -7319,6 +8155,8 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 vt.typeScope = defScope;
                 if (fscope->function->isConst())
                     vt.constness = 1;
+                if (fscope->function->isVolatile())
+                    vt.volatileness = 1;
                 setValueType(tok, vt);
             }
         }
@@ -7343,10 +8181,10 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
     createSymbolDatabaseSetVariablePointers();
 }
 
-ValueType ValueType::parseDecl(const Token *type, const Settings &settings, bool isCpp)
+ValueType ValueType::parseDecl(const Token *type, const Settings &settings)
 {
     ValueType vt;
-    parsedecl(type, &vt, settings.platform.defaultSign == 'u' ? Sign::UNSIGNED : Sign::SIGNED, settings, isCpp);
+    parsedecl(type, &vt, settings.platform.defaultSign == 'u' ? Sign::UNSIGNED : Sign::SIGNED, settings);
     return vt;
 }
 
@@ -7453,64 +8291,67 @@ bool ValueType::fromLibraryType(const std::string &typestr, const Settings &sett
 
 std::string ValueType::dump() const
 {
-    std::ostringstream ret;
+    std::string ret;
     switch (type) {
     case UNKNOWN_TYPE:
         return "";
     case NONSTD:
-        ret << "valueType-type=\"nonstd\"";
+        ret += "valueType-type=\"nonstd\"";
         break;
     case POD:
-        ret << "valueType-type=\"pod\"";
+        ret += "valueType-type=\"pod\"";
         break;
     case RECORD:
-        ret << "valueType-type=\"record\"";
+        ret += "valueType-type=\"record\"";
         break;
     case SMART_POINTER:
-        ret << "valueType-type=\"smart-pointer\"";
+        ret += "valueType-type=\"smart-pointer\"";
         break;
-    case CONTAINER:
-        ret << "valueType-type=\"container\"";
-        ret << " valueType-containerId=\"" << container << "\"";
+    case CONTAINER: {
+        ret += "valueType-type=\"container\"";
+        ret += " valueType-containerId=\"";
+        ret += id_string(container);
+        ret += "\"";
         break;
+    }
     case ITERATOR:
-        ret << "valueType-type=\"iterator\"";
+        ret += "valueType-type=\"iterator\"";
         break;
     case VOID:
-        ret << "valueType-type=\"void\"";
+        ret += "valueType-type=\"void\"";
         break;
     case BOOL:
-        ret << "valueType-type=\"bool\"";
+        ret += "valueType-type=\"bool\"";
         break;
     case CHAR:
-        ret << "valueType-type=\"char\"";
+        ret += "valueType-type=\"char\"";
         break;
     case SHORT:
-        ret << "valueType-type=\"short\"";
+        ret += "valueType-type=\"short\"";
         break;
     case WCHAR_T:
-        ret << "valueType-type=\"wchar_t\"";
+        ret += "valueType-type=\"wchar_t\"";
         break;
     case INT:
-        ret << "valueType-type=\"int\"";
+        ret += "valueType-type=\"int\"";
         break;
     case LONG:
-        ret << "valueType-type=\"long\"";
+        ret += "valueType-type=\"long\"";
         break;
     case LONGLONG:
-        ret << "valueType-type=\"long long\"";
+        ret += "valueType-type=\"long long\"";
         break;
     case UNKNOWN_INT:
-        ret << "valueType-type=\"unknown int\"";
+        ret += "valueType-type=\"unknown int\"";
         break;
     case FLOAT:
-        ret << "valueType-type=\"float\"";
+        ret += "valueType-type=\"float\"";
         break;
     case DOUBLE:
-        ret << "valueType-type=\"double\"";
+        ret += "valueType-type=\"double\"";
         break;
     case LONGDOUBLE:
-        ret << "valueType-type=\"long double\"";
+        ret += "valueType-type=\"long double\"";
         break;
     }
 
@@ -7518,36 +8359,57 @@ std::string ValueType::dump() const
     case Sign::UNKNOWN_SIGN:
         break;
     case Sign::SIGNED:
-        ret << " valueType-sign=\"signed\"";
+        ret += " valueType-sign=\"signed\"";
         break;
     case Sign::UNSIGNED:
-        ret << " valueType-sign=\"unsigned\"";
+        ret += " valueType-sign=\"unsigned\"";
         break;
     }
 
-    if (bits > 0)
-        ret << " valueType-bits=\"" << bits << '\"';
+    if (bits >= 0) {
+        ret += " valueType-bits=\"";
+        ret += std::to_string(bits);
+        ret += '\"';
+    }
 
-    if (pointer > 0)
-        ret << " valueType-pointer=\"" << pointer << '\"';
+    if (pointer > 0) {
+        ret += " valueType-pointer=\"";
+        ret += std::to_string(pointer);
+        ret += '\"';
+    }
 
-    if (constness > 0)
-        ret << " valueType-constness=\"" << constness << '\"';
+    if (constness > 0) {
+        ret += " valueType-constness=\"";
+        ret += std::to_string(constness);
+        ret += '\"';
+    }
+
+    if (volatileness > 0) {
+        ret += " valueType-volatileness=\"";
+        ret += std::to_string(volatileness);
+        ret += '\"';
+    }
 
     if (reference == Reference::None)
-        ret << " valueType-reference=\"None\"";
+        ret += " valueType-reference=\"None\"";
     else if (reference == Reference::LValue)
-        ret << " valueType-reference=\"LValue\"";
+        ret += " valueType-reference=\"LValue\"";
     else if (reference == Reference::RValue)
-        ret << " valueType-reference=\"RValue\"";
+        ret += " valueType-reference=\"RValue\"";
 
-    if (typeScope)
-        ret << " valueType-typeScope=\"" << typeScope << '\"';
+    if (typeScope) {
+        ret += " valueType-typeScope=\"";
+        ret += id_string(typeScope);
+        ret += '\"';
+    }
 
-    if (!originalTypeName.empty())
-        ret << " valueType-originalTypeName=\"" << ErrorLogger::toxml(originalTypeName) << '\"';
+    if (!originalTypeName.empty()) {
+        ret += " valueType-originalTypeName=\"";
+        ret += ErrorLogger::toxml(originalTypeName);
+        ret += '\"';
+    }
 
-    return ret.str();
+    return ret;
 }
 
 bool ValueType::isConst(nonneg int indirect) const
@@ -7557,40 +8419,193 @@ bool ValueType::isConst(nonneg int indirect) const
     return constness & (1 << (pointer - indirect));
 }
 
-MathLib::bigint ValueType::typeSize(const cppcheck::Platform &platform, bool p) const
+bool ValueType::isVolatile(nonneg int indirect) const
 {
-    if (p && pointer)
-        return platform.sizeof_pointer;
+    if (indirect > pointer)
+        return false;
+    return volatileness & (1 << (pointer - indirect));
+}
+
+namespace {
+    struct Result
+    {
+        size_t total;
+        bool success;
+    };
+}
+
+template<class F>
+static Result accumulateStructMembers(const Scope* scope, F f, ValueType::Accuracy accuracy)
+{
+    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
+                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;
-    case ValueType::Type::SHORT:
+    --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);
+        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).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;
+    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);
+        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).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;
 }
 
@@ -7609,6 +8624,8 @@ std::string ValueType::str() const
     std::string ret;
     if (constness & 1)
         ret = " const";
+    if (volatileness & 1)
+        ret = " volatile";
     if (type == VOID)
         ret += " void";
     else if (isIntegral()) {
@@ -7641,8 +8658,8 @@ std::string ValueType::str() const
     else if ((type == ValueType::Type::NONSTD || type == ValueType::Type::RECORD) && typeScope) {
         std::string className(typeScope->className);
         const Scope *scope = typeScope->definedType ? typeScope->definedType->enclosingScope : typeScope->nestedIn;
-        while (scope && scope->type != Scope::eGlobal) {
-            if (scope->type == Scope::eClass || scope->type == Scope::eStruct || scope->type == Scope::eNamespace)
+        while (scope && scope->type != ScopeType::eGlobal) {
+            if (scope->type == ScopeType::eClass || scope->type == ScopeType::eStruct || scope->type == ScopeType::eNamespace)
                 className = scope->className + "::" + className;
             scope = (scope->definedType && scope->definedType->enclosingScope) ? scope->definedType->enclosingScope : scope->nestedIn;
         }
@@ -7658,20 +8675,24 @@ std::string ValueType::str() const
         ret += " *";
         if (constness & (2 << p))
             ret += " const";
+        if (volatileness & (2 << p))
+            ret += " volatile";
     }
     if (reference == Reference::LValue)
         ret += " &";
     else if (reference == Reference::RValue)
         ret += " &&";
-    return ret.empty() ? ret : ret.substr(1);
+    if (ret.empty())
+        return {};
+    return ret.substr(1);
 }
 
-void ValueType::setDebugPath(const Token* tok, SourceLocation ctx, SourceLocation local)
+void ValueType::setDebugPath(const Token* tok, SourceLocation ctx, const SourceLocation &local)
 {
     std::string file = ctx.file_name();
     if (file.empty())
         return;
-    std::string s = Path::stripDirectoryPart(file) + ":" + MathLib::toString(ctx.line()) + ": " + ctx.function_name() +
+    std::string s = Path::stripDirectoryPart(file) + ":" + std::to_string(ctx.line()) + ": " + ctx.function_name() +
                     " => " + local.function_name();
     debugPath.emplace_back(tok, std::move(s));
 }
@@ -7690,10 +8711,15 @@ 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;
         if (call->constness == 0 && func->constness != 0 && func->reference != Reference::None)
             return ValueType::MatchResult::NOMATCH;
+        if (call->volatileness == 0 && func->volatileness != 0 && func->reference != Reference::None)
+            return ValueType::MatchResult::NOMATCH;
     }
     if (call->type != func->type || (call->isEnum() && !func->isEnum())) {
         if (call->type == ValueType::Type::VOID || func->type == ValueType::Type::VOID)
@@ -7714,7 +8740,8 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
     }
 
     if (call->typeScope != nullptr || func->typeScope != nullptr) {
-        if (call->typeScope != func->typeScope)
+        if (call->typeScope != func->typeScope &&
+            !(call->typeScope && func->typeScope && call->typeScope->definedType && call->typeScope->definedType->isDerivedFrom(func->typeScope->className)))
             return ValueType::MatchResult::NOMATCH;
     }
 
@@ -7731,7 +8758,7 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
     if (call->isIntegral() && func->isIntegral() && call->sign != ValueType::Sign::UNKNOWN_SIGN && func->sign != ValueType::Sign::UNKNOWN_SIGN && call->sign != func->sign)
         return ValueType::MatchResult::FALLBACK1;
 
-    if (func->reference != Reference::None && func->constness > call->constness)
+    if (func->reference != Reference::None && (func->constness > call->constness || func->volatileness > call->volatileness))
         return ValueType::MatchResult::FALLBACK1;
 
     return ValueType::MatchResult::SAME;
@@ -7744,9 +8771,16 @@ ValueType::MatchResult ValueType::matchParameter(const ValueType *call, const Va
     if (pvt && funcVar->isArray() && !(funcVar->isStlType() && Token::simpleMatch(funcVar->typeStartToken(), "std :: array"))) { // std::array doesn't decay to a pointer
         vt = *pvt;
         if (vt.pointer == 0) // don't bump array of pointers
-            ++vt.pointer;
+            vt.pointer = funcVar->dimensions().size();
         pvt = &vt;
     }
+    ValueType cvt;
+    if (call && callVar && callVar->isArray() && !(callVar->isStlType() && Token::simpleMatch(callVar->typeStartToken(), "std :: array"))) {
+        cvt = *call;
+        if (cvt.pointer == 0) // don't bump array of pointers
+            cvt.pointer = callVar->dimensions().size();
+        call = &cvt;
+    }
     const ValueType::MatchResult res = ValueType::matchParameter(call, pvt);
     if (callVar && ((res == ValueType::MatchResult::SAME && call->container) || res == ValueType::MatchResult::UNKNOWN)) {
         const std::string type1 = getTypeString(callVar->typeStartToken());
@@ -7760,3 +8794,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 ffd3217634e..954b31cc05b 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-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
@@ -27,44 +27,46 @@
 #include "mathlib.h"
 #include "sourcelocation.h"
 #include "token.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <cctype>
+#include <cstddef>
+#include <cstdint>
 #include <iosfwd>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
-namespace cppcheck {
-    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,
+    LValue,
+    RValue
+};
 
 /**
  * @brief Access control enumerations.
  */
-enum class AccessControl { Public, Protected, Private, Global, Namespace, Argument, Local, Throw };
+enum class AccessControl : std::uint8_t { Public, Protected, Private, Global, Namespace, Argument, Local, Throw };
 
 /**
  * @brief Array dimension information.
  */
 struct Dimension {
-    Dimension() : tok(nullptr), num(0), known(true) {}
-
-    const Token *tok;    ///< size token
-    MathLib::bigint num; ///< (assumed) dimension length when size is a number, 0 if not known
-    bool known;          ///< Known size
+    const Token* tok{};    ///< size token
+    MathLib::bigint num{}; ///< (assumed) dimension length when size is a number, 0 if not known
+    bool known = true;     ///< Known size
 };
 
 /** @brief Information about a class type. */
@@ -73,20 +75,16 @@ class CPPCHECKLIB Type {
     const Token* classDef;     ///< Points to "class" token
     const Scope* classScope;
     const Scope* enclosingScope;
-    enum class NeedInitialization {
+    enum class NeedInitialization : std::uint8_t {
         Unknown, True, False
-    } needInitialization;
-
-    class BaseInfo {
-    public:
-        BaseInfo() :
-            type(nullptr), nameTok(nullptr), access(AccessControl::Public), isVirtual(false) {}
+    } needInitialization = NeedInitialization::Unknown;
 
+    struct BaseInfo {
         std::string name;
-        const Type* type;
-        const Token* nameTok;
-        AccessControl access;  // public/protected/private
-        bool isVirtual;
+        const Type* type{};
+        const Token* nameTok{};
+        AccessControl access{};  // public/protected/private
+        bool isVirtual{};
         // allow ordering within containers
         bool operator<(const BaseInfo& rhs) const {
             return this->type < rhs.type;
@@ -94,35 +92,28 @@ class CPPCHECKLIB Type {
     };
 
     struct FriendInfo {
-        FriendInfo() :
-            nameStart(nullptr), nameEnd(nullptr), type(nullptr) {}
-
-        const Token* nameStart;
-        const Token* nameEnd;
-        const Type* type;
+        const Token* nameStart{};
+        const Token* nameEnd{};
+        const Type* type{};
     };
 
     std::vector<BaseInfo> derivedFrom;
     std::vector<FriendInfo> friendList;
 
-    const Token * typeStart;
-    const Token * typeEnd;
-    MathLib::bigint sizeOf;
+    const Token* typeStart{};
+    const Token* typeEnd{};
+    MathLib::bigint sizeOf{};
 
     explicit Type(const Token* classDef_ = nullptr, const Scope* classScope_ = nullptr, const Scope* enclosingScope_ = nullptr) :
         classDef(classDef_),
         classScope(classScope_),
-        enclosingScope(enclosingScope_),
-        needInitialization(NeedInitialization::Unknown),
-        typeStart(nullptr),
-        typeEnd(nullptr),
-        sizeOf(0) {
+        enclosingScope(enclosingScope_) {
         if (classDef_ && classDef_->str() == "enum")
             needInitialization = NeedInitialization::True;
         else if (classDef_ && classDef_->str() == "using") {
             typeStart = classDef->tokAt(3);
             typeEnd = typeStart;
-            while (typeEnd->next() && typeEnd->next()->str() != ";") {
+            while (typeEnd->next() && typeEnd->strAt(1) != ";") {
                 if (Token::simpleMatch(typeEnd, "decltype ("))
                     typeEnd = typeEnd->linkAt(1);
                 else
@@ -131,10 +122,11 @@ class CPPCHECKLIB Type {
         }
     }
 
-    const std::string& name() const;
+    std::string name() const;
 
     const std::string& type() const {
-        return classDef ? classDef->str() : emptyString;
+        static const std::string s_empty_string;
+        return classDef ? classDef->str() : s_empty_string;
     }
 
     bool isClassType() const;
@@ -167,15 +159,14 @@ class CPPCHECKLIB Type {
     bool isDerivedFrom(const std::string & ancestor) const;
 };
 
-class CPPCHECKLIB Enumerator {
-public:
-    explicit Enumerator(const Scope * scope_) : scope(scope_), name(nullptr), value(0), start(nullptr), end(nullptr), value_known(false) {}
+struct CPPCHECKLIB Enumerator {
+    explicit Enumerator(const Scope * scope_) : scope(scope_) {}
     const Scope * scope;
-    const Token * name;
-    MathLib::bigint value;
-    const Token * start;
-    const Token * end;
-    bool value_known;
+    const Token* name{};
+    MathLib::bigint value{};
+    const Token* start{};
+    const Token* end{};
+    bool value_known{};
 };
 
 /** @brief Information about a member variable. */
@@ -225,12 +216,12 @@ class CPPCHECKLIB Variable {
      * @param isContainer Is the array container-like?
      * @return true if array, false if not
      */
-    bool arrayDimensions(const Settings* settings, bool& isContainer);
+    bool arrayDimensions(const Settings& settings, bool& isContainer);
 
 public:
     Variable(const Token *name_, const Token *start_, const Token *end_,
              nonneg int index_, AccessControl access_, const Type *type_,
-             const Scope *scope_, const Settings* settings)
+             const Scope *scope_, const Settings& settings)
         : mNameToken(name_),
         mTypeStartToken(start_),
         mTypeEndToken(end_),
@@ -238,8 +229,7 @@ class CPPCHECKLIB Variable {
         mAccess(access_),
         mFlags(0),
         mType(type_),
-        mScope(scope_),
-        mValueType(nullptr) {
+        mScope(scope_) {
         evaluate(settings);
     }
 
@@ -253,7 +243,7 @@ class CPPCHECKLIB Variable {
 
     ~Variable();
 
-    Variable &operator=(const Variable &var);
+    Variable &operator=(const Variable &var) &;
 
     /**
      * Get name token.
@@ -305,7 +295,8 @@ class CPPCHECKLIB Variable {
         if (mNameToken)
             return mNameToken->str();
 
-        return emptyString;
+        static const std::string s_empty_string;
+        return s_empty_string;
     }
 
     /**
@@ -364,6 +355,7 @@ class CPPCHECKLIB Variable {
      * Is variable in a namespace.
      * @return true if in a namespace, false if not
      */
+    // cppcheck-suppress unusedFunction
     bool isNamespace() const {
         return mAccess == AccessControl::Namespace;
     }
@@ -559,7 +551,7 @@ class CPPCHECKLIB Variable {
      * @return length of dimension
      */
     MathLib::bigint dimension(nonneg int index_) const {
-        return mDimensions[index_].num;
+        return mDimensions.at(index_).num;
     }
 
     /**
@@ -567,7 +559,11 @@ class CPPCHECKLIB Variable {
      * @return length of dimension known
      */
     bool dimensionKnown(nonneg int index_) const {
-        return mDimensions[index_].known;
+        return mDimensions.at(index_).known;
+    }
+
+    void setDimensions(const std::vector<Dimension> &dimensions_) {
+        mDimensions = dimensions_;
     }
 
     /**
@@ -699,15 +695,17 @@ class CPPCHECKLIB Variable {
     /** @brief pointer to scope this variable is in */
     const Scope *mScope;
 
-    const ValueType *mValueType;
+    const ValueType* mValueType{};
 
     /** @brief array dimensions */
     std::vector<Dimension> mDimensions;
 
     /** @brief fill in information, depending on Tokens given at instantiation */
-    void evaluate(const Settings* settings);
+    void evaluate(const Settings& settings);
 };
 
+enum class FunctionType : std::uint8_t { eConstructor, eCopyConstructor, eMoveConstructor, eOperatorEqual, eDestructor, eFunction, eLambda };
+
 class CPPCHECKLIB Function {
     // only symbol database can change this
     friend class SymbolDatabase;
@@ -760,9 +758,7 @@ class CPPCHECKLIB Function {
     }
 
 public:
-    enum Type { eConstructor, eCopyConstructor, eMoveConstructor, eOperatorEqual, eDestructor, eFunction, eLambda };
-
-    Function(const Tokenizer *mTokenizer, const Token *tok, const Scope *scope, const Token *tokDef, const Token *tokArgDef);
+    Function(const Token *tok, const Scope *scope, const Token *tokDef, const Token *tokArgDef);
     Function(const Token *tokenDef, const std::string &clangType);
 
     const std::string &name() const {
@@ -781,10 +777,13 @@ class CPPCHECKLIB Function {
     nonneg int 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) const;
+    bool isImplicitlyVirtual(bool defaultVal = false, bool* pFoundAllBaseClasses = nullptr) const;
 
     std::vector<const Function*> getOverloadedFunctions() const;
 
@@ -792,17 +791,17 @@ class CPPCHECKLIB Function {
     const Function *getOverriddenFunction(bool *foundAllBaseClasses = nullptr) const;
 
     bool isLambda() const {
-        return type==eLambda;
+        return type==FunctionType::eLambda;
     }
 
     bool isConstructor() const {
-        return type==eConstructor ||
-               type==eCopyConstructor ||
-               type==eMoveConstructor;
+        return type==FunctionType::eConstructor ||
+               type==FunctionType::eCopyConstructor ||
+               type==FunctionType::eMoveConstructor;
     }
 
     bool isDestructor() const {
-        return type==eDestructor;
+        return type==FunctionType::eDestructor;
     }
     bool isAttributeConstructor() const {
         return tokenDef->isAttributeConstructor();
@@ -825,6 +824,12 @@ class CPPCHECKLIB Function {
     bool isAttributeNodiscard() const {
         return tokenDef->isAttributeNodiscard();
     }
+    bool isAttributeUnused() const {
+        return tokenDef->isAttributeUnused();
+    }
+    bool isAttributeMaybeUnused() const {
+        return tokenDef->isAttributeMaybeUnused();
+    }
 
     bool hasBody() const {
         return getFlag(fHasBody);
@@ -912,24 +917,24 @@ class CPPCHECKLIB Function {
     void isConstexpr(bool state) {
         setFlag(fIsConstexpr, state);
     }
-    bool isSafe(const Settings *settings) const;
-
-    const Token *tokenDef;            ///< function name token in class definition
-    const Token *argDef;              ///< function argument start '(' in class definition
-    const Token *token;               ///< function name token in implementation
-    const Token *arg;                 ///< function argument start '('
-    const Token *retDef;              ///< function return type token
-    const ::Type *retType;            ///< function return type
-    const Scope *functionScope;       ///< scope of function body
-    const Scope* nestedIn;            ///< Scope the function is declared in
-    std::vector<Variable> argumentList; ///< argument list
-    nonneg int initArgCount;        ///< number of args with default values
-    Type type;                        ///< constructor, destructor, ...
-    const Token *noexceptArg;         ///< noexcept token
-    const Token *throwArg;            ///< throw token
-    const Token *templateDef;         ///< points to 'template <' before function
-    const Token *functionPointerUsage; ///< function pointer usage
-    AccessControl access;             ///< public/protected/private
+    bool isSafe(const Settings &settings) const;
+
+    const Token* tokenDef{};          ///< function name token in class definition
+    const Token* argDef{};            ///< function argument start '(' in class definition
+    const Token* token{};             ///< function name token in implementation
+    const Token* arg{};               ///< function argument start '('
+    const Token* retDef{};            ///< function return type token
+    const ::Type* retType{};          ///< function return type
+    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
+    FunctionType type = FunctionType::eFunction; ///< constructor, destructor, ...
+    const Token* noexceptArg{};       ///< noexcept token
+    const Token* throwArg{};          ///< throw token
+    const Token* templateDef{};       ///< points to 'template <' before function
+    const Token* functionPointerUsage{}; ///< function pointer usage
+    AccessControl access{};           ///< public/protected/private
 
     bool argsMatch(const Scope *scope, const Token *first, const Token *second, const std::string &path, nonneg int path_length) const;
 
@@ -959,7 +964,7 @@ class CPPCHECKLIB Function {
     /** Recursively determine if this function overrides a virtual function in a base class */
     const Function * getOverriddenFunctionRecursive(const ::Type* baseType, bool *foundAllBaseClasses) const;
 
-    unsigned int mFlags;
+    unsigned int mFlags{};
 
     void isInline(bool state) {
         setFlag(fIsInline, state);
@@ -1016,14 +1021,16 @@ class CPPCHECKLIB Function {
         setFlag(fIsVolatile, state);
     }
     void hasTrailingReturnType(bool state) {
-        return setFlag(fHasTrailingReturnType, state);
+        setFlag(fHasTrailingReturnType, state);
     }
     void isInlineKeyword(bool state) {
         setFlag(fIsInlineKeyword, state);
     }
-    const Token *setFlags(const Token *tok1, const Scope *scope);
+    RET_NONNULL const Token *setFlags(const Token *tok1, const Scope *scope);
 };
 
+enum class ScopeType : std::uint8_t { eGlobal, eClass, eStruct, eUnion, eNamespace, eFunction, eIf, eElse, eFor, eWhile, eDo, eSwitch, eUnconditional, eTry, eCatch, eLambda, eEnum };
+
 class CPPCHECKLIB Scope {
     // let tests access private function for testing
     friend class TestSymbolDatabase;
@@ -1034,36 +1041,34 @@ class CPPCHECKLIB Scope {
         const Scope *scope;
     };
 
-    enum ScopeType { eGlobal, eClass, eStruct, eUnion, eNamespace, eFunction, eIf, eElse, eFor, eWhile, eDo, eSwitch, eUnconditional, eTry, eCatch, eLambda, eEnum };
+    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_);
 
-    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_);
-
-    const SymbolDatabase *check;
+    const SymbolDatabase& symdb;
     std::string className;
-    const Token *classDef;   ///< class/struct/union/namespace token
-    const Token *bodyStart;  ///< '{' token
-    const Token *bodyEnd;    ///< '}' token
+    const Token* classDef{};   ///< class/struct/union/namespace token
+    const Token* bodyStart{};  ///< '{' token
+    const Token* bodyEnd{};    ///< '}' token
     std::list<Function> functionList;
     std::multimap<std::string, const Function *> functionMap;
     std::list<Variable> varlist;
-    const Scope *nestedIn;
+    const Scope* nestedIn{};
     std::vector<Scope *> nestedList;
-    nonneg int numConstructors;
-    nonneg int numCopyOrMoveConstructors;
+    nonneg int numConstructors{};
+    nonneg int numCopyOrMoveConstructors{};
     std::vector<UsingInfo> usingList;
-    ScopeType type;
-    Type* definedType;
+    ScopeType type{};
+    Type* definedType{};
     std::map<std::string, Type*> definedTypesMap;
     std::vector<const Token *> bodyStartList;
 
     // function specific fields
-    const Scope *functionOf; ///< scope this function belongs to
-    Function *function; ///< function info for this function
+    const Scope* functionOf{}; ///< scope this function belongs to
+    Function* function{}; ///< function info for this function
 
     // enum specific fields
-    const Token * enumType;
-    bool enumClass;
+    const Token* enumType{};
+    bool enumClass{};
 
     std::vector<Enumerator> enumeratorList;
 
@@ -1076,7 +1081,7 @@ class CPPCHECKLIB Scope {
 
     bool isAnonymous() const {
         // TODO: Check if class/struct is anonymous
-        return className.size() > 9 && className.compare(0,9,"Anonymous") == 0 && std::isdigit(className[9]);
+        return className.size() > 9 && startsWith(className,"Anonymous") && std::isdigit(className[9]);
     }
 
     const Enumerator * findEnumerator(const std::string & name) const {
@@ -1099,7 +1104,7 @@ class CPPCHECKLIB Scope {
 
     static Function* nestedInFunction(const Scope* scope) {
         while (scope) {
-            if (scope->type == Scope::eFunction)
+            if (scope->type == ScopeType::eFunction)
                 break;
             scope = scope->nestedIn;
         }
@@ -1109,30 +1114,30 @@ class CPPCHECKLIB Scope {
     }
 
     bool isClassOrStruct() const {
-        return (type == eClass || type == eStruct);
+        return (type == ScopeType::eClass || type == ScopeType::eStruct);
     }
 
     bool isClassOrStructOrUnion() const {
-        return (type == eClass || type == eStruct || type == eUnion);
+        return (type == ScopeType::eClass || type == ScopeType::eStruct || type == ScopeType::eUnion);
     }
 
     bool isExecutable() const {
-        return type != eClass && type != eStruct && type != eUnion && type != eGlobal && type != eNamespace && type != eEnum;
+        return type != ScopeType::eClass && type != ScopeType::eStruct && type != ScopeType::eUnion && type != ScopeType::eGlobal && type != ScopeType::eNamespace && type != ScopeType::eEnum;
     }
 
     bool isLoopScope() const {
-        return type == Scope::ScopeType::eFor || type == Scope::ScopeType::eWhile || type == Scope::ScopeType::eDo;
+        return type == ScopeType::eFor || type == ScopeType::eWhile || type == ScopeType::eDo;
     }
 
     bool isLocal() const {
-        return (type == eIf || type == eElse ||
-                type == eFor || type == eWhile || type == eDo ||
-                type == eSwitch || type == eUnconditional ||
-                type == eTry || type == eCatch);
+        return (type == ScopeType::eIf || type == ScopeType::eElse ||
+                type == ScopeType::eFor || type == ScopeType::eWhile || type == ScopeType::eDo ||
+                type == ScopeType::eSwitch || type == ScopeType::eUnconditional ||
+                type == ScopeType::eTry || type == ScopeType::eCatch);
     }
 
     // Is there lambda/inline function(s) in this scope?
-    bool hasInlineOrLambdaFunction() const;
+    bool hasInlineOrLambdaFunction(const Token** tokStart = nullptr, bool onlyInline = false) const;
 
     /**
      * @brief find a function
@@ -1140,17 +1145,13 @@ class CPPCHECKLIB Scope {
      * @param requireConst if const refers to a const variable only const methods should be matched
      * @return pointer to function if found or NULL if not found
      */
-    const Function *findFunction(const Token *tok, bool requireConst=false) const;
+    const Function *findFunction(const Token *tok, bool requireConst=false, Reference ref=Reference::None) const;
 
     const Scope *findRecordInNestedList(const std::string & name, bool isC = false) const;
-    Scope *findRecordInNestedList(const std::string & name) {
-        return const_cast<Scope *>(const_cast<const Scope *>(this)->findRecordInNestedList(name));
-    }
+    Scope *findRecordInNestedList(const std::string & name, bool isC = false);
 
     const Type* findType(const std::string& name) const;
-    Type* findType(const std::string& name) {
-        return const_cast<Type*>(const_cast<const Scope *>(this)->findType(name));
-    }
+    Type* findType(const std::string& name);
 
     /**
      * @brief find if name is in nested list
@@ -1160,10 +1161,10 @@ class CPPCHECKLIB Scope {
 
     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;
 
@@ -1172,7 +1173,7 @@ class CPPCHECKLIB Scope {
 
         const Function * back = &functionList.back();
 
-        functionMap.insert(make_pair(back->tokenDef->str(), back));
+        functionMap.emplace(back->tokenDef->str(), back);
     }
 
     AccessControl defaultAccess() const;
@@ -1181,10 +1182,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
@@ -1193,7 +1193,7 @@ class CPPCHECKLIB Scope {
      */
     const Variable *getVariable(const std::string &varname) const;
 
-    const Token * addEnum(const Token * tok, bool isCpp);
+    const Token * addEnum(const Token * tok);
 
     const Scope *findRecordInBase(const std::string &name) const;
 
@@ -1207,25 +1207,19 @@ class CPPCHECKLIB Scope {
      * @param typetok populated with pointer to the type token, if found
      * @return true if tok points to a variable declaration, false otherwise
      */
-    bool isVariableDeclaration(const Token* const tok, const Token*& vartok, const Token*& typetok) const;
+    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 Token* tok, nonneg int args, std::vector<const Function *> & matches) const;
 
     /** @brief initialize varlist */
-    void getVariableList(const Settings* settings, const Token *start, const Token *end);
-};
-
-enum class Reference {
-    None,
-    LValue,
-    RValue
+    void getVariableList(const Token *start, const Token *end);
 };
 
 /** Value type */
 class CPPCHECKLIB ValueType {
 public:
-    enum Sign { UNKNOWN_SIGN, SIGNED, UNSIGNED } sign;
-    enum Type {
+    enum Sign : std::uint8_t { UNKNOWN_SIGN, SIGNED, UNSIGNED } sign = UNKNOWN_SIGN;
+    enum Type : std::uint8_t {
         UNKNOWN_TYPE,
         POD,
         NONSTD,
@@ -1245,87 +1239,57 @@ class CPPCHECKLIB ValueType {
         FLOAT,
         DOUBLE,
         LONGDOUBLE
-    } type;
-    nonneg int bits;                           ///< bitfield bitcount
-    nonneg int pointer;                        ///< 0=>not pointer, 1=>*, 2=>**, 3=>***, etc
-    nonneg int constness;                      ///< bit 0=data, bit 1=*, bit 2=**
+    } type = UNKNOWN_TYPE;
+    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=**
     Reference reference = Reference::None;     ///< Is the outermost indirection of this type a reference or rvalue
     ///< reference or not? pointer=2, Reference=LValue would be a T**&
-    const Scope* typeScope;                    ///< if the type definition is seen this point out the type scope
-    const ::Type* smartPointerType;            ///< Smart pointer type
-    const Token* smartPointerTypeToken;        ///< Smart pointer type token
-    const Library::SmartPointer* smartPointer; ///< Smart pointer
-    const Library::Container* container;       ///< If the type is a container defined in a cfg file, this is the used
+    const Scope* typeScope{};                  ///< if the type definition is seen this point out the type scope
+    const ::Type* smartPointerType{};          ///< Smart pointer type
+    const Token* smartPointerTypeToken{};      ///< Smart pointer type token
+    const Library::SmartPointer* smartPointer{}; ///< Smart pointer
+    const Library::Container* container{};     ///< If the type is a container defined in a cfg file, this is the used
     ///< container
-    const Token* containerTypeToken; ///< The container type token. the template argument token that defines the
+    const Token* containerTypeToken{}; ///< The container type token. the template argument token that defines the
     ///< container element type.
     std::string originalTypeName;    ///< original type name as written in the source code. eg. this might be "uint8_t"
     ///< when type is CHAR.
     ErrorPath debugPath; ///< debug path to the type
 
-    ValueType()
-        : sign(UNKNOWN_SIGN),
-        type(UNKNOWN_TYPE),
-        bits(0),
-        pointer(0U),
-        constness(0U),
-        typeScope(nullptr),
-        smartPointerType(nullptr),
-        smartPointerTypeToken(nullptr),
-        smartPointer(nullptr),
-        container(nullptr),
-        containerTypeToken(nullptr),
-        debugPath()
+    ValueType() = default;
+    ValueType(Sign s, Type t, nonneg int p)
+        : sign(s),
+        type(t),
+        pointer(p)
     {}
-    ValueType(enum Sign s, enum Type t, nonneg int p)
+    ValueType(Sign s, Type t, nonneg int p, nonneg int c)
         : sign(s),
         type(t),
-        bits(0),
         pointer(p),
-        constness(0U),
-        typeScope(nullptr),
-        smartPointerType(nullptr),
-        smartPointerTypeToken(nullptr),
-        smartPointer(nullptr),
-        container(nullptr),
-        containerTypeToken(nullptr),
-        debugPath()
+        constness(c)
     {}
-    ValueType(enum Sign s, enum Type t, nonneg int p, nonneg int c)
+    ValueType(Sign s, Type t, nonneg int p, nonneg int c, nonneg int v)
         : sign(s),
         type(t),
-        bits(0),
         pointer(p),
         constness(c),
-        typeScope(nullptr),
-        smartPointerType(nullptr),
-        smartPointerTypeToken(nullptr),
-        smartPointer(nullptr),
-        container(nullptr),
-        containerTypeToken(nullptr),
-        debugPath()
+        volatileness(v)
     {}
-    ValueType(enum Sign s, enum Type t, nonneg int p, nonneg int c, std::string otn)
+    ValueType(Sign s, Type t, nonneg int p, nonneg int c, std::string otn)
         : sign(s),
         type(t),
-        bits(0),
         pointer(p),
         constness(c),
-        typeScope(nullptr),
-        smartPointerType(nullptr),
-        smartPointerTypeToken(nullptr),
-        smartPointer(nullptr),
-        container(nullptr),
-        containerTypeToken(nullptr),
-        originalTypeName(std::move(otn)),
-        debugPath()
+        originalTypeName(std::move(otn))
     {}
 
-    static ValueType parseDecl(const Token *type, const Settings &settings, bool isCpp);
+    static ValueType parseDecl(const Token *type, const Settings &settings);
 
     static Type typeFromString(const std::string &typestr, bool longType);
 
-    enum class MatchResult { UNKNOWN, SAME, FALLBACK1, FALLBACK2, NOMATCH };
+    enum class MatchResult : std::uint8_t { UNKNOWN, SAME, FALLBACK1, FALLBACK2, NOMATCH };
     static MatchResult matchParameter(const ValueType *call, const ValueType *func);
     static MatchResult matchParameter(const ValueType *call, const Variable *callVar, const Variable *funcVar);
 
@@ -1344,12 +1308,22 @@ class CPPCHECKLIB ValueType {
     bool fromLibraryType(const std::string &typestr, const Settings &settings);
 
     bool isEnum() const {
-        return typeScope && typeScope->type == Scope::eEnum;
+        return typeScope && typeScope->type == ScopeType::eEnum;
     }
 
     bool isConst(nonneg int indirect = 0) const;
 
-    MathLib::bigint typeSize(const cppcheck::Platform &platform, bool p=false) const;
+    bool isVolatile(nonneg int indirect = 0) 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;
@@ -1357,14 +1331,14 @@ class CPPCHECKLIB ValueType {
     std::string str() const;
     std::string dump() const;
 
-    void setDebugPath(const Token* tok, SourceLocation ctx, SourceLocation local = SourceLocation::current());
+    void setDebugPath(const Token* tok, SourceLocation ctx, const SourceLocation &local = SourceLocation::current());
 };
 
 
 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 */
@@ -1400,14 +1374,15 @@ class CPPCHECKLIB SymbolDatabase {
     const Type* findType(const Token* startTok, const Scope* startScope, bool lookOutside = false) const;
     Type* findType(const Token* startTok, Scope* startScope, bool lookOutside = false)
     {
-        return const_cast<Type*>(this->findType(startTok, const_cast<const Scope*>(startScope), lookOutside));
+        return const_cast<Type*>(this->findType(startTok, static_cast<const Scope*>(startScope), lookOutside));
     }
 
     const Scope *findScope(const Token *tok, const Scope *startScope) const;
     Scope *findScope(const Token *tok, Scope *startScope) {
-        return const_cast<Scope *>(this->findScope(tok, const_cast<const Scope *>(startScope)));
+        return const_cast<Scope *>(this->findScope(tok, static_cast<const Scope *>(startScope)));
     }
 
+    // cppcheck-suppress unusedFunction
     bool isVarId(nonneg int varid) const {
         return varid < mVariableList.size();
     }
@@ -1425,23 +1400,17 @@ class CPPCHECKLIB SymbolDatabase {
      */
     void debugMessage(const Token *tok, const std::string &type, const std::string &msg) const;
 
+    void returnImplicitIntError(const Token *tok) const;
+
     void printOut(const char * title = nullptr) const;
     void printVariable(const Variable *var, const char *indent) const;
     void printXml(std::ostream &out) const;
 
-    bool isCPP() const;
-
     /*
      * @brief Do a sanity check
      */
     void validate() const;
 
-    void validateExecutableScopes() const;
-    /**
-     * @brief Check variable list, e.g. variables w/o scope
-     */
-    void validateVariables() const;
-
     /** Set valuetype in provided tokenlist */
     void setValueTypeInTokenList(bool reportDebugWarnings, Token *tokens=nullptr);
 
@@ -1453,16 +1422,28 @@ class CPPCHECKLIB SymbolDatabase {
     nonneg int sizeOfType(const Token *type) const;
 
     /** Set array dimensions when valueflow analysis is completed */
-    void setArrayDimensionsUsingValueFlow(); // cppcheck-suppress functionConst // has side effects
+    void setArrayDimensionsUsingValueFlow();
 
     void clangSetVariables(const std::vector<const Variable *> &variableList);
     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();
@@ -1473,23 +1454,24 @@ class CPPCHECKLIB SymbolDatabase {
     void createSymbolDatabaseNeedInitialization();
     void createSymbolDatabaseVariableSymbolTable();
     void createSymbolDatabaseSetScopePointers();
-    void createSymbolDatabaseSetFunctionPointers(bool firstPass); // cppcheck-suppress functionConst // has side effects
+    void createSymbolDatabaseSetFunctionPointers(bool firstPass);
     void createSymbolDatabaseSetVariablePointers();
-    // cppcheck-suppress functionConst
     void createSymbolDatabaseSetTypePointers();
     void createSymbolDatabaseSetSmartPointerType();
-    void createSymbolDatabaseEnums(); // cppcheck-suppress functionConst // has side effects
-    void createSymbolDatabaseEscapeFunctions(); // cppcheck-suppress functionConst // has side effects
-    // cppcheck-suppress functionConst
+    void createSymbolDatabaseEnums();
+    void createSymbolDatabaseEscapeFunctions();
     void createSymbolDatabaseIncompleteVars();
 
     void debugSymbolDatabase() const;
 
-    void addClassFunction(Scope **scope, const Token **tok, const Token *argStart);
-    Function *addGlobalFunctionDecl(Scope*& scope, const Token* tok, const Token *argStart, const Token* funcStart);
+    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);
-    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;
+    /**
+     * @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;
     const Scope *findNamespace(const Token * tok, const Scope * scope) const;
     static Function *findFunctionInScope(const Token *func, const Scope *ns, const std::string & path, nonneg int path_length);
@@ -1500,18 +1482,29 @@ class CPPCHECKLIB SymbolDatabase {
 
     void fixVarId(VarIdMap & varIds, const Token * vartok, Token * membertok, const Variable * membervar);
 
-    /** Whether iName is a keyword as defined in http://en.cppreference.com/w/c/keyword and http://en.cppreference.com/w/cpp/keyword*/
-    bool isReservedName(const std::string& iName) const;
+    /** Whether the token is a keyword as defined in http://en.cppreference.com/w/c/keyword and http://en.cppreference.com/w/cpp/keyword*/
+    static bool isReservedName(const Token* tok);
 
     const Enumerator * findEnumerator(const Token * tok, std::set<std::string>& tokensThatAreNotEnumeratorValues) const;
 
-    void setValueType(Token* tok, const ValueType& valuetype, SourceLocation loc = SourceLocation::current());
-    void setValueType(Token* tok, const Variable& var, SourceLocation loc = SourceLocation::current());
-    void setValueType(Token* tok, const Enumerator& enumerator, SourceLocation loc = SourceLocation::current());
+    void setValueType(Token* tok, const ValueType& valuetype, const SourceLocation &loc = SourceLocation::current());
+    void setValueType(Token* tok, const Variable& var, const SourceLocation &loc = SourceLocation::current());
+    void setValueType(Token* tok, const Enumerator& enumerator, const SourceLocation &loc = SourceLocation::current());
+
+    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;
+    ErrorLogger &mErrorLogger;
 
     /** variable symbol table */
     std::vector<const Variable *> mVariableList;
@@ -1519,8 +1512,9 @@ class CPPCHECKLIB SymbolDatabase {
     /** list for missing types */
     std::list<Type> mBlankTypes;
 
-    bool mIsCpp;
     ValueType::Sign mDefaultSignedness;
+
+    mutable std::map<const Type*, bool> mIsRecordTypeWithoutSideEffectsMap;
 };
 
 
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index 3ff539ae067..e7a096932cf 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-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
@@ -26,6 +26,7 @@
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <cassert>
@@ -33,6 +34,7 @@
 #include <map>
 #include <memory>
 #include <stack>
+#include <type_traits>
 #include <utility>
 
 static Token *skipRequires(Token *tok)
@@ -217,9 +219,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);
@@ -233,14 +234,6 @@ TemplateSimplifier::TokenAndName::TokenAndName(const TokenAndName& other) :
         mToken->templateSimplifierPointer(this);
 }
 
-TemplateSimplifier::TokenAndName::TokenAndName(TokenAndName&& other) NOEXCEPT :
-    mToken(other.mToken), mScope(std::move(other.mScope)), mName(std::move(other.mName)), mFullName(std::move(other.mFullName)),
-    mNameToken(other.mNameToken), mParamEnd(other.mParamEnd), mFlags(other.mFlags)
-{
-    if (mToken)
-        mToken->templateSimplifierPointer(this);
-}
-
 TemplateSimplifier::TokenAndName::~TokenAndName()
 {
     if (mToken && mToken->templateSimplifierPointers())
@@ -280,11 +273,8 @@ bool TemplateSimplifier::TokenAndName::isAliasToken(const Token *tok) const
 }
 
 TemplateSimplifier::TemplateSimplifier(Tokenizer &tokenizer)
-    : mTokenizer(tokenizer), mTokenList(mTokenizer.list), mSettings(*mTokenizer.mSettings),
-    mErrorLogger(mTokenizer.mErrorLogger), mChanged(false)
-{}
-
-TemplateSimplifier::~TemplateSimplifier()
+    : mTokenizer(tokenizer), mTokenList(mTokenizer.list), mSettings(mTokenizer.getSettings()),
+    mErrorLogger(mTokenizer.getErrorLogger())
 {}
 
 void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates()
@@ -305,11 +295,11 @@ void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates()
 
         // skip executing scopes (ticket #1985)..
         else if (Token::simpleMatch(tok, "try {")) {
-            tok = tok->next()->link();
+            tok = tok->linkAt(1);
             while (Token::simpleMatch(tok, "} catch (")) {
                 tok = tok->linkAt(2);
                 if (Token::simpleMatch(tok, ") {"))
-                    tok = tok->next()->link();
+                    tok = tok->linkAt(1);
             }
         }
 
@@ -356,9 +346,9 @@ void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates()
                         inclevel = true;
                     else if (Token::simpleMatch(tok2, "< typename"))
                         inclevel = true;
-                    else if (Token::Match(tok2->tokAt(-2), "<|, %type% <") && usedtypes.find(tok2->previous()->str()) != usedtypes.end())
+                    else if (Token::Match(tok2->tokAt(-2), "<|, %type% <") && usedtypes.find(tok2->strAt(-1)) != usedtypes.end())
                         inclevel = true;
-                    else if (Token::Match(tok2, "< %type%") && usedtypes.find(tok2->next()->str()) != usedtypes.end())
+                    else if (Token::Match(tok2, "< %type%") && usedtypes.find(tok2->strAt(1)) != usedtypes.end())
                         inclevel = true;
                     else if (Token::Match(tok2, "< %type%")) {
                         // is the next token a type and not a variable/constant?
@@ -374,7 +364,7 @@ void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates()
                     if (inclevel) {
                         ++level;
                         if (Token::Match(tok2->tokAt(-2), "<|, %type% <"))
-                            usedtypes.insert(tok2->previous()->str());
+                            usedtypes.insert(tok2->strAt(-1));
                     }
                 } else if (tok2->str() == ">") {
                     if (level > 0)
@@ -457,8 +447,9 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
                 if (level == 1)
                     return numberOfParameters;
                 level -= 2;
-            } else if (tok->str() == "," && level == 0) {
-                ++numberOfParameters;
+            } else if (tok->str() == ",") {
+                if (level == 0)
+                    ++numberOfParameters;
                 tok = tok->next();
                 continue;
             }
@@ -501,7 +492,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
             return 0;
 
         // num/type ..
-        if (!tok->isNumber() && tok->tokType() != Token::eChar && !tok->isName() && !tok->isOp())
+        if (!tok->isNumber() && tok->tokType() != Token::eChar && tok->tokType() != Token::eString && !tok->isName() && !tok->isOp())
             return 0;
         tok = tok->next();
         if (!tok)
@@ -563,12 +554,8 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
     return 0;
 }
 
-const Token *TemplateSimplifier::findTemplateDeclarationEnd(const Token *tok)
-{
-    return const_cast<const Token *>(findTemplateDeclarationEnd(const_cast<Token *>(tok)));
-}
-
-Token *TemplateSimplifier::findTemplateDeclarationEnd(Token *tok)
+template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+static T *findTemplateDeclarationEndImpl(T *tok)
 {
     if (Token::simpleMatch(tok, "template <")) {
         tok = tok->next()->findClosingBracket();
@@ -579,7 +566,7 @@ Token *TemplateSimplifier::findTemplateDeclarationEnd(Token *tok)
     if (!tok)
         return nullptr;
 
-    Token * tok2 = tok;
+    T * tok2 = tok;
     bool in_init = false;
     while (tok2 && !Token::Match(tok2, ";|{")) {
         if (tok2->str() == "<")
@@ -608,6 +595,16 @@ Token *TemplateSimplifier::findTemplateDeclarationEnd(Token *tok)
     return tok;
 }
 
+Token *TemplateSimplifier::findTemplateDeclarationEnd(Token *tok)
+{
+    return findTemplateDeclarationEndImpl(tok);
+}
+
+const Token *TemplateSimplifier::findTemplateDeclarationEnd(const Token *tok)
+{
+    return findTemplateDeclarationEndImpl(tok);
+}
+
 void TemplateSimplifier::eraseTokens(Token *begin, const Token *end)
 {
     if (!begin || begin == end)
@@ -692,6 +689,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
@@ -718,9 +717,9 @@ void TemplateSimplifier::addInstantiation(Token *token, const std::string &scope
     TokenAndName instantiation(token, scope);
 
     // check if instantiation already exists before adding it
-    const std::list<TokenAndName>::const_iterator it = std::find(mTemplateInstantiations.cbegin(),
-                                                                 mTemplateInstantiations.cend(),
-                                                                 instantiation);
+    const auto it = std::find(mTemplateInstantiations.cbegin(),
+                              mTemplateInstantiations.cend(),
+                              instantiation);
 
     if (it == mTemplateInstantiations.cend())
         mTemplateInstantiations.emplace_back(std::move(instantiation));
@@ -776,18 +775,31 @@ static bool areAllParamsTypes(const std::vector<const Token *> &params)
     });
 }
 
+static bool isTemplateInstantion(const Token* tok)
+{
+    if (!tok->isName() || (tok->isKeyword() && !tok->isOperatorKeyword()))
+        return false;
+    if (Token::Match(tok->tokAt(-1), "%type% %name% ::|<"))
+        return true;
+    if (Token::Match(tok->tokAt(-2), "[,:] private|protected|public %name% ::|<"))
+        return true;
+    if (Token::Match(tok->tokAt(-1), "(|{|}|;|=|>|<<|:|.|*|&|return|<|,|!|[ %name% ::|<|("))
+        return true;
+    return Token::Match(tok->tokAt(-2), "(|{|}|;|=|<<|:|.|*|&|return|<|,|!|[ :: %name% ::|<|(");
+}
+
 void TemplateSimplifier::getTemplateInstantiations()
 {
     std::multimap<std::string, const TokenAndName *> functionNameMap;
 
     for (const auto & decl : mTemplateDeclarations) {
         if (decl.isFunction())
-            functionNameMap.insert(std::make_pair(decl.name(), &decl));
+            functionNameMap.emplace(decl.name(), &decl);
     }
 
     for (const auto & decl : mTemplateForwardDeclarations) {
         if (decl.isFunction())
-            functionNameMap.insert(std::make_pair(decl.name(), &decl));
+            functionNameMap.emplace(decl.name(), &decl);
     }
 
     const Token *skip = nullptr;
@@ -810,7 +822,7 @@ void TemplateSimplifier::getTemplateInstantiations()
                 // Don't ignore user specialization but don't consider it an instantiation.
                 // Instantiations in return type, function parameters, and executable code
                 // are not ignored.
-                const unsigned int pos = getTemplateNamePosition(tok);
+                const int pos = getTemplateNamePosition(tok);
                 if (pos > 0)
                     skip = tok->tokAt(pos);
             } else {
@@ -832,9 +844,9 @@ void TemplateSimplifier::getTemplateInstantiations()
             Token *tok2 = Token::findsimplematch(tok->tokAt(2), ";");
             if (tok2)
                 tok = tok2;
-        } else if (Token::Match(tok->previous(), "(|{|}|;|=|>|<<|:|.|*|&|return|<|,|!|[ %name% ::|<|(") ||
-                   Token::Match(tok->previous(), "%type% %name% ::|<") ||
-                   Token::Match(tok->tokAt(-2), "[,:] private|protected|public %name% ::|<")) {
+        } else if (isTemplateInstantion(tok)) {
+            if (!tok->scopeInfo())
+                syntaxError(tok);
             std::string scopeName = tok->scopeInfo()->name;
             std::string qualification;
             Token * qualificationTok = tok;
@@ -885,7 +897,7 @@ void TemplateSimplifier::getTemplateInstantiations()
                         size_t match = 0;
                         size_t argMatch = 0;
                         for (size_t i = 0; i < declarationParams.size(); ++i) {
-                            // fixme: only type deducton from literals is supported
+                            // fixme: only type deduction from literals is supported
                             const bool isArgLiteral = Token::Match(instantiationArgs[i], "%num%|%str%|%char%|%bool% ,|)");
                             if (isArgLiteral && Token::Match(declarationParams[i], "const| %type% &| %name%| ,|)")) {
                                 match++;
@@ -972,7 +984,7 @@ void TemplateSimplifier::getTemplateInstantiations()
             // parse backwards and add template instantiations
             // TODO
             for (; tok2 && tok2 != tok; tok2 = tok2->previous()) {
-                if (Token::Match(tok2, ",|< %name% <") &&
+                if (Token::Match(tok2, ",|< %name% <") && !tok2->next()->isKeyword() &&
                     (tok2->strAt(3) == ">" || templateParameters(tok2->tokAt(2)))) {
                     addInstantiation(tok2->next(), tok->scopeInfo()->name);
                 } else if (Token::Match(tok2->next(), "class|struct"))
@@ -982,9 +994,9 @@ void TemplateSimplifier::getTemplateInstantiations()
             // Add outer template..
             if (templateParameters(tok->next()) || tok->strAt(2) == ">") {
                 while (true) {
-                    const std::string fullName = scopeName + (scopeName.empty()?"":" :: ") +
-                                                 qualification + (qualification.empty()?"":" :: ") + tok->str();
-                    const std::list<TokenAndName>::const_iterator it = std::find_if(mTemplateDeclarations.cbegin(), mTemplateDeclarations.cend(), FindFullName(fullName));
+                    std::string fullName = scopeName + (scopeName.empty()?"":" :: ") +
+                                           qualification + (qualification.empty()?"":" :: ") + tok->str();
+                    const auto it = std::find_if(mTemplateDeclarations.cbegin(), mTemplateDeclarations.cend(), FindFullName(std::move(fullName)));
                     if (it != mTemplateDeclarations.end()) {
                         // full name matches
                         addInstantiation(tok, it->scope());
@@ -996,17 +1008,17 @@ void TemplateSimplifier::getTemplateInstantiations()
                         std::string fullNameSpace = scopeName + (scopeName.empty()?"":" :: ") +
                                                     nameSpace + (qualification.empty()?"":" :: ") + qualification;
                         std::string newFullName = fullNameSpace + " :: " + tok->str();
-                        const std::list<TokenAndName>::const_iterator it1 = std::find_if(mTemplateDeclarations.cbegin(), mTemplateDeclarations.cend(), FindFullName(newFullName));
+                        const auto it1 = std::find_if(mTemplateDeclarations.cbegin(), mTemplateDeclarations.cend(), FindFullName(std::move(newFullName)));
                         if (it1 != mTemplateDeclarations.end()) {
                             // insert using namespace into token stream
                             std::string::size_type offset = 0;
                             std::string::size_type pos = 0;
                             while ((pos = nameSpace.find(' ', offset)) != std::string::npos) {
-                                qualificationTok->insertToken(nameSpace.substr(offset, pos - offset), emptyString, true);
+                                qualificationTok->insertTokenBefore(nameSpace.substr(offset, pos - offset));
                                 offset = pos + 1;
                             }
-                            qualificationTok->insertToken(nameSpace.substr(offset), emptyString, true);
-                            qualificationTok->insertToken("::", emptyString, true);
+                            qualificationTok->insertTokenBefore(nameSpace.substr(offset));
+                            qualificationTok->insertTokenBefore("::");
                             addInstantiation(tok, it1->scope());
                             found = true;
                             break;
@@ -1140,6 +1152,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() &&
@@ -1149,6 +1163,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;
@@ -1165,21 +1181,21 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
 
         if (tok && tok->str() == ">") {
             tok = tok->previous();
-            std::list<Default>::const_iterator it = eq.cbegin();
+            auto it = eq.cbegin();
             for (std::size_t i = (templatepar - eq.size()); it != eq.cend() && i < usedpar; ++i)
                 ++it;
             int count = 0;
             while (it != eq.cend()) {
                 // check for end
                 if (!it->end) {
-                    if (mSettings.debugwarnings && mErrorLogger && mSettings.severity.isEnabled(Severity::debug)) {
+                    if (mSettings.debugwarnings && mSettings.severity.isEnabled(Severity::debug)) {
                         const std::list<const Token*> locationList(1, it->eq);
                         const ErrorMessage errmsg(locationList, &mTokenizer.list,
                                                   Severity::debug,
                                                   "noparamend",
                                                   "TemplateSimplifier couldn't find end of template parameter.",
                                                   Certainty::normal);
-                        mErrorLogger->reportErr(errmsg);
+                        mErrorLogger.reportErr(errmsg);
                     }
                     break;
                 }
@@ -1236,9 +1252,9 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
             if (Token::Match(tok2, "(|{|["))
                 tok2 = tok2->link();
             else if (Token::Match(tok2, "%type% <") && (tok2->strAt(2) == ">" || templateParameters(tok2->next()))) {
-                const std::list<TokenAndName>::iterator ti = std::find_if(mTemplateInstantiations.begin(),
-                                                                          mTemplateInstantiations.end(),
-                                                                          FindToken(tok2));
+                const auto ti = std::find_if(mTemplateInstantiations.cbegin(),
+                                             mTemplateInstantiations.cend(),
+                                             FindToken(tok2));
                 if (ti != mTemplateInstantiations.end())
                     mTemplateInstantiations.erase(ti);
                 ++indentlevel;
@@ -1255,9 +1271,9 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
             continue;
 
         // don't strip args from uninstantiated templates
-        const std::list<TokenAndName>::iterator ti2 = std::find_if(mTemplateInstantiations.begin(),
-                                                                   mTemplateInstantiations.end(),
-                                                                   FindName(declaration.name()));
+        const auto ti2 = std::find_if(mTemplateInstantiations.cbegin(),
+                                      mTemplateInstantiations.cend(),
+                                      FindName(declaration.name()));
 
         if (ti2 == mTemplateInstantiations.end())
             continue;
@@ -1272,7 +1288,7 @@ void TemplateSimplifier::useDefaultArgumentValues(TokenAndName &declaration)
 
 void TemplateSimplifier::simplifyTemplateAliases()
 {
-    for (std::list<TokenAndName>::iterator it1 = mTemplateDeclarations.begin(); it1 != mTemplateDeclarations.end();) {
+    for (auto it1 = mTemplateDeclarations.cbegin(); it1 != mTemplateDeclarations.cend();) {
         const TokenAndName &aliasDeclaration = *it1;
 
         if (!aliasDeclaration.isAlias()) {
@@ -1289,7 +1305,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
 
         // Look for alias usages..
         bool found = false;
-        for (std::list<TokenAndName>::iterator it2 = mTemplateInstantiations.begin(); it2 != mTemplateInstantiations.end();) {
+        for (auto it2 = mTemplateInstantiations.cbegin(); it2 != mTemplateInstantiations.cend();) {
             const TokenAndName &aliasUsage = *it2;
             if (!aliasUsage.token() || aliasUsage.fullName() != aliasDeclaration.fullName()) {
                 ++it2;
@@ -1346,7 +1362,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
                     const Token * const fromStart = args[argnr].first;
                     const Token * const fromEnd   = args[argnr].second->previous();
                     Token *temp = TokenList::copyTokens(tok1, fromStart, fromEnd, true);
-                    const bool tempOK(temp && temp != tok1->next());
+                    const bool tempOK(temp != tok1->next());
                     tok1->deleteThis();
                     if (tempOK)
                         tok1 = temp; // skip over inserted parameters
@@ -1361,9 +1377,9 @@ void TemplateSimplifier::simplifyTemplateAliases()
                 if (aliasParameterNames.find(tok2->str()) == aliasParameterNames.end()) {
                     // Create template instance..
                     if (Token::Match(tok1, "%name% <")) {
-                        const std::list<TokenAndName>::const_iterator it = std::find_if(mTemplateInstantiations.cbegin(),
-                                                                                        mTemplateInstantiations.cend(),
-                                                                                        FindToken(tok1));
+                        const auto it = std::find_if(mTemplateInstantiations.cbegin(),
+                                                     mTemplateInstantiations.cend(),
+                                                     FindToken(tok1));
                         if (it != mTemplateInstantiations.cend())
                             addInstantiation(tok2, it->scope());
                     }
@@ -1379,7 +1395,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
         }
 
         if (found) {
-            Token *end = const_cast<Token *>(aliasDeclaration.aliasEndToken());
+            auto *end = const_cast<Token *>(aliasDeclaration.aliasEndToken());
 
             // remove declaration tokens
             if (aliasDeclaration.token()->previous())
@@ -1431,14 +1447,14 @@ bool TemplateSimplifier::getTemplateNamePositionTemplateFunction(const Token *to
         } else if (Token::Match(tok->next(), "%type% <")) {
             const Token *closing = tok->tokAt(2)->findClosingBracket();
             if (closing) {
-                if (closing->strAt(1) == "(" && Tokenizer::isFunctionHead(closing->next(), ";|{|:", true))
+                if (closing->strAt(1) == "(" && TokenList::isFunctionHead(closing->next(), ";{:"))
                     return true;
                 while (tok->next() && tok->next() != closing) {
                     tok = tok->next();
                     namepos++;
                 }
             }
-        } else if (Token::Match(tok->next(), "%type% (") && Tokenizer::isFunctionHead(tok->tokAt(2), ";|{|:", true)) {
+        } else if (Token::Match(tok->next(), "%type% (") && TokenList::isFunctionHead(tok->tokAt(2), ";{:")) {
             return true;
         }
         tok = tok->next();
@@ -1510,7 +1526,8 @@ bool TemplateSimplifier::getTemplateNamePositionTemplateClass(const Token *tok,
 
 int TemplateSimplifier::getTemplateNamePosition(const Token *tok)
 {
-    assert(tok && tok->str() == ">");
+    if (!tok || tok->str() != ">")
+        syntaxError(tok);
 
     auto it = mTemplateNamePos.find(tok);
     if (!mSettings.debugtemplate && it != mTemplateNamePos.end()) {
@@ -1569,7 +1586,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());
         }
@@ -1580,10 +1597,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());
@@ -1635,11 +1652,17 @@ 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()->insertToken(templateDeclarationToken->strAt(1), emptyString, true);
-        templateDeclaration.token()->insertToken(newName, emptyString, true);
-        templateDeclaration.token()->insertToken(";", emptyString, true);
+        templateDeclaration.token()->insertTokenBefore(templateDeclarationToken->strAt(1));
+        templateDeclaration.token()->insertTokenBefore(newName);
+        templateDeclaration.token()->insertTokenBefore(";");
     } else if ((isFunction && (copy || isSpecialization)) ||
                (isVariable && !isSpecialization) ||
                (isClass && isSpecialization && mTemplateSpecializationMap.find(templateDeclaration.token()) != mTemplateSpecializationMap.end())) {
@@ -1659,9 +1682,9 @@ void TemplateSimplifier::expandTemplate(
             end = temp2->linkAt(1)->next();
         } else {
             if (it != mTemplateForwardDeclarationsMap.end()) {
-                const std::list<TokenAndName>::const_iterator it1 = std::find_if(mTemplateForwardDeclarations.cbegin(),
-                                                                                 mTemplateForwardDeclarations.cend(),
-                                                                                 FindToken(it->second));
+                const auto it1 = std::find_if(mTemplateForwardDeclarations.cbegin(),
+                                              mTemplateForwardDeclarations.cend(),
+                                              FindToken(it->second));
                 if (it1 != mTemplateForwardDeclarations.cend())
                     mMemberFunctionsToDelete.push_back(*it1);
             }
@@ -1703,7 +1726,7 @@ void TemplateSimplifier::expandTemplate(
         }
 
         if (isStatic) {
-            dst->insertToken("static", emptyString, true);
+            dst->insertTokenBefore("static");
             if (start) {
                 dst->previous()->linenr(start->linenr());
                 dst->previous()->column(start->column());
@@ -1744,11 +1767,11 @@ void TemplateSimplifier::expandTemplate(
                         ++typeindentlevel;
                     else if (typetok->str() == ")")
                         --typeindentlevel;
-                    dst->insertToken(typetok->str(), typetok->originalName(), 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());
@@ -1772,7 +1795,7 @@ void TemplateSimplifier::expandTemplate(
                     }
                 }
                 if (pointerType && Token::simpleMatch(dst1, "const")) {
-                    dst->insertToken("const", dst1->originalName(), true);
+                    dst->insertTokenBefore("const", dst1->originalName(), dst1->getMacroName());
                     dst->previous()->linenr(start->linenr());
                     dst->previous()->column(start->column());
                     dst1->deleteThis();
@@ -1786,13 +1809,13 @@ void TemplateSimplifier::expandTemplate(
                            !(templateDeclaration.isFunction() && templateDeclaration.scope().empty() &&
                              (start->strAt(-1) == "." || Token::simpleMatch(start->tokAt(-2), ". template")))) {
                     if (start->strAt(1) != "<" || Token::Match(start, newName.c_str()) || !inAssignment) {
-                        dst->insertToken(newName, emptyString, true);
+                        dst->insertTokenBefore(newName);
                         dst->previous()->linenr(start->linenr());
                         dst->previous()->column(start->column());
                         if (start->strAt(1) == "<")
                             start = start->next()->findClosingBracket();
                     } else {
-                        dst->insertToken(start->str(), emptyString, true);
+                        dst->insertTokenBefore(start->str());
                         dst->previous()->linenr(start->linenr());
                         dst->previous()->column(start->column());
                         newInstantiations.emplace_back(dst->previous(), templateDeclaration.scope());
@@ -1816,7 +1839,7 @@ void TemplateSimplifier::expandTemplate(
                                 return Token::simpleMatch(inst.token(), name.c_str(), name.size());
                             })) {
                                 // use the instantiated name
-                                dst->insertToken(name, "", true);
+                                dst->insertTokenBefore(name);
                                 dst->previous()->linenr(start->linenr());
                                 dst->previous()->column(start->column());
                                 start = closing;
@@ -1824,7 +1847,7 @@ void TemplateSimplifier::expandTemplate(
                         }
                         // just copy the token if it wasn't instantiated
                         if (start != closing) {
-                            dst->insertToken(start->str(), start->originalName(), true);
+                            dst->insertTokenBefore(start->str(), start->originalName(), start->getMacroName());
                             dst->previous()->linenr(start->linenr());
                             dst->previous()->column(start->column());
                             dst->previous()->isSigned(start->isSigned());
@@ -1832,7 +1855,7 @@ void TemplateSimplifier::expandTemplate(
                             dst->previous()->isLong(start->isLong());
                         }
                     } else {
-                        dst->insertToken(start->str(), start->originalName(), true);
+                        dst->insertTokenBefore(start->str(), start->originalName(), start->getMacroName());
                         dst->previous()->linenr(start->linenr());
                         dst->previous()->column(start->column());
                         dst->previous()->isSigned(start->isSigned());
@@ -1848,9 +1871,9 @@ void TemplateSimplifier::expandTemplate(
                     if (Token::Match(start, "[|{|(")) {
                         links[start->link()] = dst->previous();
                     } else if (Token::Match(start, "]|}|)")) {
-                        std::map<const Token *, Token *>::iterator link = links.find(start);
+                        const auto link = utils::as_const(links).find(start);
                         // make sure link is valid
-                        if (link != links.end()) {
+                        if (link != links.cend()) {
                             Token::createMutualLinks(link->second, dst->previous());
                             links.erase(start);
                         }
@@ -1860,7 +1883,7 @@ void TemplateSimplifier::expandTemplate(
 
             start = start->next();
         }
-        dst->insertToken(";", emptyString, true);
+        dst->insertTokenBefore(";");
         dst->previous()->linenr(dst->tokAt(-2)->linenr());
         dst->previous()->column(dst->tokAt(-2)->column() + 1);
 
@@ -1903,7 +1926,7 @@ void TemplateSimplifier::expandTemplate(
         }
 
         if (tok3->str()=="template") {
-            if (tok3->next() && tok3->next()->str()=="<") {
+            if (tok3->next() && tok3->strAt(1)=="<") {
                 std::vector<const Token *> localTypeParametersInDeclaration;
                 getTemplateParametersInDeclaration(tok3->tokAt(2), localTypeParametersInDeclaration);
                 inTemplateDefinition = localTypeParametersInDeclaration.size() == typeParametersInDeclaration.size(); // Partial specialization
@@ -1943,7 +1966,7 @@ void TemplateSimplifier::expandTemplate(
             const Token *tok4 = tok3->next()->findClosingBracket();
             while (tok4 && tok4->str() != "(")
                 tok4 = tok4->next();
-            if (!Tokenizer::isFunctionHead(tok4, ":{", true))
+            if (!TokenList::isFunctionHead(tok4, ":{"))
                 continue;
             // find function return type start
             tok5 = tok5->next()->findClosingBracket();
@@ -1998,7 +2021,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());
@@ -2043,9 +2066,9 @@ void TemplateSimplifier::expandTemplate(
             while (tok3 && tok3->str() != "::")
                 tok3 = tok3->next();
 
-            const std::list<TokenAndName>::const_iterator it = std::find_if(mTemplateDeclarations.cbegin(),
-                                                                            mTemplateDeclarations.cend(),
-                                                                            FindToken(startOfTemplateDeclaration));
+            const auto it = std::find_if(mTemplateDeclarations.cbegin(),
+                                         mTemplateDeclarations.cend(),
+                                         FindToken(startOfTemplateDeclaration));
             if (it != mTemplateDeclarations.cend())
                 mMemberFunctionsToDelete.push_back(*it);
         }
@@ -2060,8 +2083,15 @@ void TemplateSimplifier::expandTemplate(
         const std::string lastName = (templateInstantiation.name().find(' ') != std::string::npos) ? templateInstantiation.name().substr(templateInstantiation.name().rfind(' ')+1) : templateInstantiation.name();
 
         std::stack<const Token *> templates;
+        int scopeCount = 0;
         for (; tok3; tok3 = tok3->next()) {
-            if (tok3->isName() && !Token::Match(tok3, "class|typename|struct") && !tok3->isStandardType()) {
+            if (tok3->str() == "{")
+                ++scopeCount;
+            else if (tok3->str() == "}")
+                --scopeCount;
+            if (scopeCount < 0)
+                break;
+            if (tok3->isName() && !Token::Match(tok3, "class|typename|struct") && !tok3->isStandardType() && !Token::Match(tok3->previous(), ".|::")) {
                 // search for this token in the type vector
                 unsigned int itype = 0;
                 while (itype < typeParametersInDeclaration.size() && typeParametersInDeclaration[itype]->str() != tok3->str())
@@ -2074,10 +2104,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(), "..."))
+                    if (isVariadicTemplateArg && mTypesUsedInTemplateInstantiation.size() > 1 && !Token::Match(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 ? ">" : ",>");
                     for (Token *typetok = mTypesUsedInTemplateInstantiation[itype].token();
                          typetok && (typeindentlevel > 0 || endStr.find(typetok->str()[0]) == std::string::npos);
@@ -2128,7 +2179,7 @@ void TemplateSimplifier::expandTemplate(
                             brackets1.pop();
                         }
                         if (copy)
-                            back->isTemplateArg(true);
+                            back->templateArgFrom(typetok);
                     }
                     if (pointerType && Token::simpleMatch(beforeTypeToken, "const")) {
                         mTokenList.addtoken(beforeTypeToken);
@@ -2174,7 +2225,7 @@ void TemplateSimplifier::expandTemplate(
                             addNamespace(templateDeclaration, tok3);
                         }
                         mTokenList.addtoken(newName, tok3);
-                    } else if (!Token::Match(tok3->next(), ":|{|=|;|[|]"))
+                    } else if (!Token::Match(tok3->next(), "[:{=;[]),]"))
                         tok3->str(newName);
                     continue;
                 }
@@ -2231,7 +2282,7 @@ void TemplateSimplifier::expandTemplate(
                     if (end != std::string::npos) {
                         token_scope.resize(end);
                         if (scope.empty())
-                            scope = token_scope;
+                            scope = std::move(token_scope);
                         else
                             scope = token_scope + " :: " + scope;
                     }
@@ -2255,13 +2306,13 @@ void TemplateSimplifier::expandTemplate(
                     assert(brackets.empty() == false);
                     assert(brackets.top()->str() == "{");
                     Token::createMutualLinks(brackets.top(), mTokenList.back());
-                    if (tok3->strAt(1) == ";") {
-                        const Token * tokSemicolon = tok3->next();
-                        mTokenList.addtoken(tokSemicolon, tokSemicolon->linenr(), tokSemicolon->column(), tokSemicolon->fileIndex());
-                    }
                     brackets.pop();
                     if (brackets.empty() && !Token::Match(tok3, "} >|,|{")) {
                         inTemplateDefinition = false;
+                        if (isClass && tok3->strAt(1) == ";") {
+                            const Token* tokSemicolon = tok3->next();
+                            mTokenList.addtoken(tokSemicolon, tokSemicolon->linenr(), tokSemicolon->column(), tokSemicolon->fileIndex());
+                        }
                         break;
                     }
                 } else if (tok3->str() == ")") {
@@ -2337,8 +2388,8 @@ bool TemplateSimplifier::simplifyNumericCalculations(Token *tok, bool isTemplate
             break;
         const Token* op = tok->next();
         const Token* after = tok->tokAt(3);
-        const std::string &num1 = op->previous()->str();
-        const std::string &num2 = op->next()->str();
+        const std::string &num1 = op->strAt(-1);
+        const std::string &num2 = op->strAt(1);
         if (Token::Match(before, "* %num% /") && (num2 != "0") && num1 == MathLib::multiply(num2, MathLib::divide(num1, num2))) {
             // Division where result is a whole number
         } else if (!((op->str() == "*" && (isLowerThanMulDiv(before) || before->str() == "*") && isLowerEqualThanMulDiv(after)) || // associative
@@ -2486,17 +2537,17 @@ void TemplateSimplifier::simplifyTemplateArgs(Token *start, const Token *end, st
                 }
 
                 else if (Token::Match(tok->next(), "( %type% * )")) {
-                    tok->str(MathLib::toString(mTokenizer.sizeOfType(tok->tokAt(3))));
+                    tok->str(std::to_string(mTokenizer.sizeOfType(tok->tokAt(3))));
                     tok->deleteNext(4);
                     again = true;
                 } else if (Token::simpleMatch(tok->next(), "( * )")) {
-                    tok->str(MathLib::toString(mTokenizer.sizeOfType(tok->tokAt(2))));
+                    tok->str(std::to_string(mTokenizer.sizeOfType(tok->tokAt(2))));
                     tok->deleteNext(3);
                     again = true;
                 } else if (Token::Match(tok->next(), "( %type% )")) {
                     const unsigned int size = mTokenizer.sizeOfType(tok->tokAt(2));
                     if (size > 0) {
-                        tok->str(MathLib::toString(size));
+                        tok->str(std::to_string(size));
                         tok->deleteNext(3);
                         again = true;
                     }
@@ -2508,30 +2559,34 @@ void TemplateSimplifier::simplifyTemplateArgs(Token *start, const Token *end, st
                        MathLib::isInt(tok->strAt(2))) {
                 if ((Token::Match(tok->previous(), "(|&&|%oror%|,") || tok == start) &&
                     (Token::Match(tok->tokAt(3), ")|&&|%oror%|?") || tok->tokAt(3) == end)) {
-                    const MathLib::bigint op1(MathLib::toLongNumber(tok->str()));
-                    const std::string &cmp(tok->next()->str());
-                    const MathLib::bigint op2(MathLib::toLongNumber(tok->strAt(2)));
+                    const MathLib::bigint op1(MathLib::toBigNumber(tok));
+                    const std::string &cmp(tok->strAt(1));
+                    const MathLib::bigint op2(MathLib::toBigNumber(tok->tokAt(2)));
 
                     std::string result;
 
                     if (cmp == "==")
-                        result = (op1 == op2) ? "true" : "false";
+                        result = bool_to_string(op1 == op2);
                     else if (cmp == "!=")
-                        result = (op1 != op2) ? "true" : "false";
+                        result = bool_to_string(op1 != op2);
                     else if (cmp == "<=")
-                        result = (op1 <= op2) ? "true" : "false";
+                        result = bool_to_string(op1 <= op2);
                     else if (cmp == ">=")
-                        result = (op1 >= op2) ? "true" : "false";
+                        result = bool_to_string(op1 >= op2);
                     else if (cmp == "<")
-                        result = (op1 < op2) ? "true" : "false";
+                        result = bool_to_string(op1 < op2);
                     else
-                        result = (op1 > op2) ? "true" : "false";
+                        result = bool_to_string(op1 > op2);
 
                     tok->str(result);
                     tok->deleteNext(2);
                     again = true;
                     tok = tok->previous();
                 }
+            } else if (Token::Match(tok, "( %type% ) %num%")) {
+                tok = tok->previous();
+                again = true;
+                tok->deleteNext(3);
             }
         }
 
@@ -2542,11 +2597,11 @@ void TemplateSimplifier::simplifyTemplateArgs(Token *start, const Token *end, st
             if (tok->str() == "?" &&
                 ((tok->previous()->isNumber() || tok->previous()->isBoolean()) ||
                  Token::Match(tok->tokAt(-3), "( %bool%|%num% )"))) {
-                const int offset = (tok->previous()->str() == ")") ? 2 : 1;
+                const int offset = (tok->strAt(-1) == ")") ? 2 : 1;
 
                 // Find the token ":" then go to the next token
                 Token *colon = skipTernaryOp(tok, end);
-                if (!colon || colon->previous()->str() != ":" || !colon->next())
+                if (!colon || colon->strAt(-1) != ":" || !colon->next())
                     continue;
 
                 //handle the GNU extension: "x ? : y" <-> "x ? x : y"
@@ -2603,6 +2658,13 @@ void TemplateSimplifier::simplifyTemplateArgs(Token *start, const Token *end, st
         }
 
         for (Token *tok = first->next(); tok && tok != end; tok = tok->next()) {
+            if (tok->isKeyword() && endsWith(tok->str(), "_cast")) {
+                Token* tok2 = tok->next()->findClosingBracket();
+                if (!Token::simpleMatch(tok2, "> ("))
+                    syntaxError(tok);
+                tok = tok2->linkAt(1);
+                continue;
+            }
             if (Token::Match(tok, "( %num%|%bool% )") &&
                 (tok->previous() && !tok->previous()->isName())) {
                 tok->deleteThis();
@@ -2681,7 +2743,7 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
 
         if (validTokenEnd(bounded, tok, backToken, 3) &&
             Token::Match(tok->previous(), "(|&&|%oror% %char% %comp% %num% &&|%oror%|)")) {
-            tok->str(MathLib::toString(MathLib::toLongNumber(tok->str())));
+            tok->str(MathLib::toString(MathLib::toBigNumber(tok)));
         }
 
         if (validTokenEnd(bounded, tok, backToken, 5) &&
@@ -2756,7 +2818,7 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                  Token::Match(tok->previous(), "[(=,] 1 %oror%"))) {
                 unsigned int par = 0;
                 const Token *tok2 = tok;
-                const bool andAnd = (tok->next()->str() == "&&");
+                const bool andAnd = (tok->strAt(1) == "&&");
                 for (; tok2; tok2 = tok2->next()) {
                     if (tok2->str() == "(" || tok2->str() == "[")
                         ++par;
@@ -2780,7 +2842,7 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                      (Token::Match(tok->previous(), "%or% 0 %cop%|;") && isLowerThanXor(tok->next())))) {
                     tok = tok->previous();
                     if (Token::Match(tok->tokAt(-4), "[;{}] %name% = %name% [+-|] 0 ;") &&
-                        tok->strAt(-3) == tok->previous()->str()) {
+                        tok->strAt(-3) == tok->strAt(-1)) {
                         tok = tok->tokAt(-4);
                         tok->deleteNext(5);
                     } else {
@@ -2801,8 +2863,8 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                                Token::Match(tok->previous(), "return|case 0 *|&& (")) &&
                               validTokenEnd(bounded, tok, backToken, 2))))) {
                     tok->deleteNext();
-                    if (tok->next()->str() == "(")
-                        eraseTokens(tok, tok->next()->link());
+                    if (tok->strAt(1) == "(")
+                        eraseTokens(tok, tok->linkAt(1));
                     tok->deleteNext();
                     ret = true;
                 } else if (validTokenEnd(bounded, tok, backToken, 4) &&
@@ -2810,8 +2872,8 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                             Token::Match(tok->previous(), "return|case 0 && *|& %any% ,|:|;|=|%cop%"))) {
                     tok->deleteNext();
                     tok->deleteNext();
-                    if (tok->next()->str() == "(")
-                        eraseTokens(tok, tok->next()->link());
+                    if (tok->strAt(1) == "(")
+                        eraseTokens(tok, tok->linkAt(1));
                     tok->deleteNext();
                     ret = true;
                 }
@@ -2822,8 +2884,8 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                     (Token::Match(tok->previous(), "[=[(,] 1 %oror% %any% ,|]|)|;|=|%cop%") ||
                      Token::Match(tok->previous(), "return|case 1 %oror% %any% ,|:|;|=|%cop%"))) {
                     tok->deleteNext();
-                    if (tok->next()->str() == "(")
-                        eraseTokens(tok, tok->next()->link());
+                    if (tok->strAt(1) == "(")
+                        eraseTokens(tok, tok->linkAt(1));
                     tok->deleteNext();
                     ret = true;
                 } else if (validTokenEnd(bounded, tok, backToken, 4) &&
@@ -2831,8 +2893,8 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                             Token::Match(tok->previous(), "return|case 1 %oror% *|& %any% ,|:|;|=|%cop%"))) {
                     tok->deleteNext();
                     tok->deleteNext();
-                    if (tok->next()->str() == "(")
-                        eraseTokens(tok, tok->next()->link());
+                    if (tok->strAt(1) == "(")
+                        eraseTokens(tok, tok->linkAt(1));
                     tok->deleteNext();
                     ret = true;
                 }
@@ -2877,9 +2939,9 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
                 if (validTokenStart(bounded, tok, frontToken, -1) &&
                     Token::Match(tok->previous(), "(|&&|%oror%") &&
                     Token::Match(tok->tokAt(3), ")|&&|%oror%|?")) {
-                    const MathLib::bigint op1(MathLib::toLongNumber(tok->str()));
-                    const std::string &cmp(tok->next()->str());
-                    const MathLib::bigint op2(MathLib::toLongNumber(tok->strAt(2)));
+                    const MathLib::bigint op1(MathLib::toBigNumber(tok));
+                    const std::string &cmp(tok->strAt(1));
+                    const MathLib::bigint op2(MathLib::toBigNumber(tok->tokAt(2)));
 
                     std::string result;
 
@@ -2947,7 +3009,7 @@ bool TemplateSimplifier::matchSpecialization(
     const std::list<const Token *> & specializations)
 {
     // Is there a matching specialization?
-    for (std::list<const Token *>::const_iterator it = specializations.cbegin(); it != specializations.cend(); ++it) {
+    for (auto it = specializations.cbegin(); it != specializations.cend(); ++it) {
         if (!Token::Match(*it, "%name% <"))
             continue;
         const Token *startToken = (*it);
@@ -2955,6 +3017,7 @@ bool TemplateSimplifier::matchSpecialization(
             startToken = startToken->previous();
         if (!Token::simpleMatch(startToken, "template <"))
             continue;
+        // cppcheck-suppress shadowFunction - TODO: fix this
         std::vector<const Token *> templateParameters;
         getTemplateParametersInDeclaration(startToken->tokAt(2), templateParameters);
 
@@ -3078,7 +3141,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
             numberOfTemplateInstantiations = mTemplateInstantiations.size();
             ++recursiveCount;
             if (recursiveCount > mSettings.maxTemplateRecursion) {
-                if (mErrorLogger && mSettings.severity.isEnabled(Severity::information)) {
+                if (mSettings.severity.isEnabled(Severity::information)) {
                     std::list<std::string> typeStringsUsedInTemplateInstantiation;
                     const std::string typeForNewName = templateDeclaration.name() + "<" + getNewName(instantiation.token(), typeStringsUsedInTemplateInstantiation) + ">";
 
@@ -3088,10 +3151,10 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                                               Severity::information,
                                               "templateRecursion",
                                               "TemplateSimplifier: max template recursion ("
-                                              + MathLib::toString(mSettings.maxTemplateRecursion)
+                                              + std::to_string(mSettings.maxTemplateRecursion)
                                               + ") reached for template '"+typeForNewName+"'. You might want to limit Cppcheck recursion.",
                                               Certainty::normal);
-                    mErrorLogger->reportErr(errmsg);
+                    mErrorLogger.reportErr(errmsg);
                 }
 
                 // bail out..
@@ -3159,20 +3222,19 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
             continue;
 
         Token * const tok2 = instantiation.token();
-        if (mErrorLogger && !mTokenList.getFiles().empty())
-            mErrorLogger->reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue());
+        if ((mSettings.reportProgress != -1) && !mTokenList.getFiles().empty())
+            mErrorLogger.reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue());
 
         if (maxtime > 0 && std::time(nullptr) > maxtime) {
             if (mSettings.debugwarnings) {
-                ErrorMessage::FileLocation loc;
-                loc.setfile(mTokenList.getFiles()[0]);
+                ErrorMessage::FileLocation loc(mTokenList.getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
+                                    "",
                                     Severity::debug,
                                     "Template instantiation maximum time exceeded",
                                     "templateMaxTime",
                                     Certainty::normal);
-                mErrorLogger->reportErr(errmsg);
+                mErrorLogger.reportErr(errmsg);
             }
             return false;
         }
@@ -3191,9 +3253,15 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                 startToken = startToken->tokAt(-2);
         }
 
-        if (Token::Match(startToken->previous(), ";|{|}|=|const") &&
-            (!specialized && !instantiateMatch(tok2, typeParametersInDeclaration.size(), templateDeclaration.isVariadic(), isfunc ? "(" : isVar ? ";|%op%|(" : "*|&|::| %name%")))
-            continue;
+        if (Token::Match(startToken->previous(), ";|{|}|=|const")) {
+            const char* patternAfter = isfunc ? "(" : isVar ? ";|%op%|(" : "*|&|::| %name%";
+            if (!isfunc && !isVar)
+                if (const Token* end = startToken->next()->findClosingBracket())
+                    if (Token::Match(end, "> (|{"))
+                        patternAfter = "(|{";
+            if (!specialized && !instantiateMatch(tok2, typeParametersInDeclaration.size(), templateDeclaration.isVariadic(), patternAfter))
+                continue;
+        }
 
         // New type..
         mTypesUsedInTemplateInstantiation.clear();
@@ -3202,10 +3270,10 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
 
         if ((typeForNewName.empty() && !templateDeclaration.isVariadic()) ||
             (!typeParametersInDeclaration.empty() && !instantiateMatch(tok2, typeParametersInDeclaration.size(), templateDeclaration.isVariadic(), nullptr))) {
-            if (printDebug && mErrorLogger) {
+            if (printDebug) {
                 std::list<const Token *> callstack(1, tok2);
-                mErrorLogger->reportErr(ErrorMessage(callstack, &mTokenList, Severity::debug, "templateInstantiation",
-                                                     "Failed to instantiate template \"" + instantiation.name() + "\". The checking continues anyway.", Certainty::normal));
+                mErrorLogger.reportErr(ErrorMessage(callstack, &mTokenList, Severity::debug, "templateInstantiation",
+                                                    "Failed to instantiate template \"" + instantiation.name() + "\". The checking continues anyway.", Certainty::normal));
             }
             if (typeForNewName.empty())
                 continue;
@@ -3214,9 +3282,9 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
 
         // New classname/funcname..
         const std::string newName(templateDeclaration.name() + " < " + typeForNewName + " >");
-        const std::string newFullName(templateDeclaration.scope() + (templateDeclaration.scope().empty() ? "" : " :: ") + newName);
+        std::string newFullName(templateDeclaration.scope() + (templateDeclaration.scope().empty() ? "" : " :: ") + newName);
 
-        if (expandedtemplates.insert(newFullName).second) {
+        if (expandedtemplates.insert(std::move(newFullName)).second) {
             expandTemplate(templateDeclaration, instantiation, typeParametersInDeclaration, newName, !specialized && !isVar);
             instantiated = true;
             mChanged = true;
@@ -3229,21 +3297,20 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
     // process uninstantiated templates
     // TODO: remove the specialized check and handle all uninstantiated templates someday.
     if (!instantiated && specialized) {
-        Token * tok2 = const_cast<Token *>(templateDeclaration.nameToken());
-        if (mErrorLogger && !mTokenList.getFiles().empty())
-            mErrorLogger->reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue());
+        auto * tok2 = const_cast<Token *>(templateDeclaration.nameToken());
+        if ((mSettings.reportProgress != -1) && !mTokenList.getFiles().empty())
+            mErrorLogger.reportProgress(mTokenList.getFiles()[0], "TemplateSimplifier::simplifyTemplateInstantiations()", tok2->progressValue());
 
         if (maxtime > 0 && std::time(nullptr) > maxtime) {
             if (mSettings.debugwarnings) {
-                ErrorMessage::FileLocation loc;
-                loc.setfile(mTokenList.getFiles()[0]);
+                ErrorMessage::FileLocation loc(mTokenList.getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
+                                    "",
                                     Severity::debug,
                                     "Template instantiation maximum time exceeded",
                                     "templateMaxTime",
                                     Certainty::normal);
-                mErrorLogger->reportErr(errmsg);
+                mErrorLogger.reportErr(errmsg);
             }
             return false;
         }
@@ -3280,19 +3347,19 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
         std::string typeForNewName = getNewName(tok2, typeStringsUsedInTemplateInstantiation);
 
         if (typeForNewName.empty()) {
-            if (printDebug && mErrorLogger) {
+            if (printDebug) {
                 std::list<const Token *> callstack(1, tok2);
-                mErrorLogger->reportErr(ErrorMessage(callstack, &mTokenList, Severity::debug, "templateInstantiation",
-                                                     "Failed to instantiate template \"" + templateDeclaration.name() + "\". The checking continues anyway.", Certainty::normal));
+                mErrorLogger.reportErr(ErrorMessage(callstack, &mTokenList, Severity::debug, "templateInstantiation",
+                                                    "Failed to instantiate template \"" + templateDeclaration.name() + "\". The checking continues anyway.", Certainty::normal));
             }
             return false;
         }
 
         // New classname/funcname..
         const std::string newName(templateDeclaration.name() + " < " + typeForNewName + " >");
-        const std::string newFullName(templateDeclaration.scope() + (templateDeclaration.scope().empty() ? "" : " :: ") + newName);
+        std::string newFullName(templateDeclaration.scope() + (templateDeclaration.scope().empty() ? "" : " :: ") + newName);
 
-        if (expandedtemplates.insert(newFullName).second) {
+        if (expandedtemplates.insert(std::move(newFullName)).second) {
             expandTemplate(templateDeclaration, templateDeclaration, typeParametersInDeclaration, newName, !specialized && !isVar);
             instantiated = true;
             mChanged = true;
@@ -3308,11 +3375,11 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
 
 static bool matchTemplateParameters(const Token *nameTok, const std::list<std::string> &strings)
 {
-    std::list<std::string>::const_iterator it = strings.cbegin();
     const Token *tok = nameTok->tokAt(2);
     const Token *end = nameTok->next()->findClosingBracket();
     if (!end)
         return false;
+    auto it = strings.cbegin();
     while (tok && tok != end && it != strings.cend()) {
         if (tok->isUnsigned()) {
             if (*it != "unsigned")
@@ -3359,7 +3426,7 @@ void TemplateSimplifier::replaceTemplateUsage(
         std::set<TemplateSimplifier::TokenAndName*>* pointers = nameTok->templateSimplifierPointers();
 
         // check if instantiation matches token instantiation from pointer
-        if (pointers && pointers->size()) {
+        if (pointers && !pointers->empty()) {
             // check full name
             if (instantiation.fullName() != (*pointers->begin())->fullName()) {
                 // FIXME:  fallback to just matching name
@@ -3389,10 +3456,9 @@ void TemplateSimplifier::replaceTemplateUsage(
         // Foo < int >  =>  Foo<int>
         for (const Token *tok = nameTok1->next(); tok != tok2; tok = tok->next()) {
             if (tok->isName() && tok->templateSimplifierPointers() && !tok->templateSimplifierPointers()->empty()) {
-                std::list<TokenAndName>::iterator ti;
-                for (ti = mTemplateInstantiations.begin(); ti != mTemplateInstantiations.end();) {
+                for (auto ti = mTemplateInstantiations.cbegin(); ti != mTemplateInstantiations.cend();) {
                     if (ti->token() == tok) {
-                        ti = mTemplateInstantiations.erase(ti);
+                        mTemplateInstantiations.erase(ti);
                         break;
                     }
                     ++ti;
@@ -3725,9 +3791,7 @@ void TemplateSimplifier::printOut(const std::string & text) const
     }
 }
 
-void TemplateSimplifier::simplifyTemplates(
-    const std::time_t maxtime,
-    bool &codeWithTemplates)
+void TemplateSimplifier::simplifyTemplates(const std::time_t maxtime)
 {
     // convert "sizeof ..." to "sizeof..."
     for (Token *tok = mTokenList.front(); tok; tok = tok->next()) {
@@ -3774,7 +3838,7 @@ void TemplateSimplifier::simplifyTemplates(
     mTokenizer.calculateScopes();
 
     unsigned int passCount = 0;
-    const unsigned int passCountMax = 10;
+    constexpr unsigned int passCountMax = 10;
     for (; passCount < passCountMax; ++passCount) {
         if (passCount) {
             // it may take more than one pass to simplify type aliases
@@ -3797,10 +3861,9 @@ void TemplateSimplifier::simplifyTemplates(
             mTemplateNamePos.clear();
         }
 
-        const bool hasTemplates = getTemplateDeclarations();
+        getTemplateDeclarations();
 
         if (passCount == 0) {
-            codeWithTemplates = hasTemplates;
             mDump.clear();
             for (const TokenAndName& t: mTemplateDeclarations)
                 mDump += t.dump(mTokenizer.list.getFiles());
@@ -3816,7 +3879,7 @@ void TemplateSimplifier::simplifyTemplates(
 
         if (mSettings.debugtemplate && mSettings.debugnormal) {
             std::string title("Template Simplifier pass " + std::to_string(passCount + 1));
-            mTokenList.front()->printOut(title.c_str(), mTokenList.getFiles());
+            mTokenList.front()->printOut(std::cout, false, title.c_str(), mTokenList.getFiles());
         }
 
         // Copy default argument values from forward declaration to declaration
@@ -3892,13 +3955,13 @@ void TemplateSimplifier::simplifyTemplates(
 
         std::set<std::string> expandedtemplates;
 
-        for (std::list<TokenAndName>::const_reverse_iterator iter1 = mTemplateDeclarations.crbegin(); iter1 != mTemplateDeclarations.crend(); ++iter1) {
+        for (auto iter1 = mTemplateDeclarations.crbegin(); iter1 != mTemplateDeclarations.crend(); ++iter1) {
             if (iter1->isAlias() || iter1->isFriend())
                 continue;
 
             // get specializations..
             std::list<const Token *> specializations;
-            for (std::list<TokenAndName>::const_iterator iter2 = mTemplateDeclarations.cbegin(); iter2 != mTemplateDeclarations.cend(); ++iter2) {
+            for (auto iter2 = mTemplateDeclarations.cbegin(); iter2 != mTemplateDeclarations.cend(); ++iter2) {
                 if (iter2->isAlias() || iter2->isFriend())
                     continue;
 
@@ -3917,7 +3980,7 @@ void TemplateSimplifier::simplifyTemplates(
             }
         }
 
-        for (std::list<TokenAndName>::const_iterator it = mInstantiatedTemplates.cbegin(); it != mInstantiatedTemplates.cend(); ++it) {
+        for (auto it = mInstantiatedTemplates.cbegin(); it != mInstantiatedTemplates.cend(); ++it) {
             auto decl = std::find_if(mTemplateDeclarations.begin(), mTemplateDeclarations.end(), [&it](const TokenAndName& decl) {
                 return decl.token() == it->token();
             });
@@ -3940,17 +4003,17 @@ void TemplateSimplifier::simplifyTemplates(
 
         // remove out of line member functions
         while (!mMemberFunctionsToDelete.empty()) {
-            const std::list<TokenAndName>::iterator it = std::find_if(mTemplateDeclarations.begin(),
-                                                                      mTemplateDeclarations.end(),
-                                                                      FindToken(mMemberFunctionsToDelete.cbegin()->token()));
+            const auto it = std::find_if(mTemplateDeclarations.begin(),
+                                         mTemplateDeclarations.end(),
+                                         FindToken(mMemberFunctionsToDelete.cbegin()->token()));
             // multiple functions can share the same declaration so make sure it hasn't already been deleted
             if (it != mTemplateDeclarations.end()) {
                 removeTemplate(it->token());
                 mTemplateDeclarations.erase(it);
             } else {
-                const std::list<TokenAndName>::iterator it1 = std::find_if(mTemplateForwardDeclarations.begin(),
-                                                                           mTemplateForwardDeclarations.end(),
-                                                                           FindToken(mMemberFunctionsToDelete.cbegin()->token()));
+                const auto it1 = std::find_if(mTemplateForwardDeclarations.begin(),
+                                              mTemplateForwardDeclarations.end(),
+                                              FindToken(mMemberFunctionsToDelete.cbegin()->token()));
                 // multiple functions can share the same declaration so make sure it hasn't already been deleted
                 if (it1 != mTemplateForwardDeclarations.end()) {
                     removeTemplate(it1->token());
@@ -3977,14 +4040,14 @@ void TemplateSimplifier::simplifyTemplates(
     }
 
     if (passCount == passCountMax) {
-        if (mSettings.debugwarnings && mErrorLogger) {
+        if (mSettings.debugwarnings) {
             const std::list<const Token*> locationList(1, mTokenList.front());
             const ErrorMessage errmsg(locationList, &mTokenizer.list,
                                       Severity::debug,
                                       "debug",
                                       "TemplateSimplifier: pass count limit hit before simplifications were finished.",
                                       Certainty::normal);
-            mErrorLogger->reportErr(errmsg);
+            mErrorLogger.reportErr(errmsg);
         }
     }
 
@@ -4003,7 +4066,7 @@ void TemplateSimplifier::simplifyTemplates(
             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 23dad621bdd..b5285071841 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-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
@@ -24,6 +24,7 @@
 
 #include "config.h"
 
+#include <cstdint>
 #include <ctime>
 #include <list>
 #include <map>
@@ -44,16 +45,17 @@ struct newInstantiation;
 
 /** @brief Simplify templates from the preprocessed and partially simplified code. */
 class CPPCHECKLIB TemplateSimplifier {
-    friend class TestSimplifyTemplate;
-
 public:
     explicit TemplateSimplifier(Tokenizer &tokenizer);
-    ~TemplateSimplifier();
 
-    std::string dump() const {
+    const std::string& dump() const {
         return mDump;
     }
 
+    const std::map<std::string, std::set<std::string>>& getUsedVariables() const {
+        return mUsedVariables;
+    }
+
     /**
      */
     void checkComplicatedSyntaxErrorsInTemplates();
@@ -78,7 +80,7 @@ class CPPCHECKLIB TemplateSimplifier {
         const Token *mParamEnd;
         unsigned int mFlags;
 
-        enum {
+        enum : std::uint16_t {
             fIsClass                 = (1 << 0), // class template
             fIsFunction              = (1 << 1), // function template
             fIsVariable              = (1 << 2), // variable template
@@ -146,14 +148,14 @@ 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);
-        TokenAndName(TokenAndName&& other) NOEXCEPT;
         ~TokenAndName();
 
         bool operator == (const TokenAndName & rhs) const {
@@ -263,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
@@ -271,8 +274,9 @@ class CPPCHECKLIB TemplateSimplifier {
      * @param patternAfter pattern that must match the tokens after the ">"
      * @return match => true
      */
-    static bool instantiateMatch(const Token *instance, const std::size_t numberOfArguments, bool variadic, const char patternAfter[]);
+    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"
@@ -281,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"
@@ -305,23 +310,23 @@ class CPPCHECKLIB TemplateSimplifier {
      * */
     static bool getTemplateNamePositionTemplateVariable(const Token *tok, int &namepos);
 
+public:
     /**
      * Simplify templates
      * @param maxtime time when the simplification should be stopped
-     * @param codeWithTemplates output parameter that is set if code contains templates
      */
-    void simplifyTemplates(
-        const std::time_t maxtime,
-        bool &codeWithTemplates);
+    void simplifyTemplates(std::time_t maxtime);
 
     /**
      * Simplify constant calculations such as "1+2" => "3"
      * @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.
@@ -336,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.
@@ -400,7 +404,7 @@ class CPPCHECKLIB TemplateSimplifier {
     bool simplifyTemplateInstantiations(
         const TokenAndName &templateDeclaration,
         const std::list<const Token *> &specializations,
-        const std::time_t maxtime,
+        std::time_t maxtime,
         std::set<std::string> &expandedtemplates);
 
     /**
@@ -443,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 >
@@ -454,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);
 
-    /** Syntax error */
+    /** Syntax error
+     * @throws InternalError thrown unconditionally
+     */
     NORETURN static void syntaxError(const Token *tok);
 
     static bool matchSpecialization(
@@ -494,13 +502,13 @@ class CPPCHECKLIB TemplateSimplifier {
     void printOut(
         const TokenAndName &tokenAndName,
         const std::string &indent = "    ") const;
-    void printOut(const std::string &text = emptyString) const;
+    void printOut(const std::string &text = "") const;
 
     Tokenizer &mTokenizer;
     TokenList &mTokenList;
     const Settings &mSettings;
-    ErrorLogger *mErrorLogger;
-    bool mChanged;
+    ErrorLogger &mErrorLogger;
+    bool mChanged{};
 
     std::list<TokenAndName> mTemplateDeclarations;
     std::list<TokenAndName> mTemplateForwardDeclarations;
@@ -514,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 c5d3dfd1282..9e2dd901bea 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-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
@@ -19,92 +19,74 @@
 #include "timer.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <iostream>
 #include <utility>
 #include <vector>
-/*
-    TODO:
-    - rename "file" to "single"
-    - add unit tests
-        - for --showtime (needs input file)
-        - for Timer* classes
- */
 
 namespace {
-    using dataElementType = std::pair<std::string, struct TimerResultsData>;
+    using dataElementType = std::pair<std::string, TimerResultsData>;
     bool more_second_sec(const dataElementType& lhs, const dataElementType& rhs)
     {
-        return lhs.second.seconds() > rhs.second.seconds();
+        return lhs.second.getSeconds() > rhs.second.getSeconds();
     }
+
+    // TODO: remove and print through (synchronized) ErrorLogger instead
+    std::mutex stdCoutLock;
 }
 
-void TimerResults::showResults(SHOWTIME_MODES mode) const
+// 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 mode) const
 {
-    if (mode == SHOWTIME_MODES::SHOWTIME_NONE || mode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL)
+    if (mode == ShowTime::NONE || mode == ShowTime::FILE_TOTAL)
         return;
-
-    std::cout << std::endl;
-    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);
 
+    // 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 (std::vector<dataElementType>::const_iterator iter=data.cbegin(); iter!=data.cend(); ++iter) {
-        const double sec = iter->second.seconds();
-        const double secAverage = sec / (double)(iter->second.mNumberOfResults);
-        bool hasParent = false;
-        {
-            // Do not use valueFlow.. in "Overall time" because those are included in Tokenizer already
-            if (iter->first.compare(0,9,"valueFlow") == 0)
-                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) || (ordinal<=5)) {
+    for (auto iter=data.cbegin(); iter!=data.cend(); ++iter) {
+        const double sec = iter->second.getSeconds().count();
+        const double secAverage = sec / static_cast<double>(iter->second.mNumberOfResults);
+        if ((mode != ShowTime::TOP5_FILE && mode != ShowTime::TOP5_SUMMARY) || (ordinal<=5)) {
             std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults  << " result(s))" << 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& str, std::chrono::milliseconds duration)
 {
     std::lock_guard<std::mutex> l(mResultsSync);
 
-    mResults[str].mClocks += clocks;
+    mResults[str].mDuration += duration;
     mResults[str].mNumberOfResults++;
 }
 
-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)
-{}
+void TimerResults::reset()
+{
+    std::lock_guard<std::mutex> l(mResultsSync);
+    mResults.clear();
+}
 
-Timer::Timer(bool fileTotal, std::string filename)
-    : mStr(std::move(filename))
-    , mTimerResults(nullptr)
-    , mStart(std::clock())
-    , mShowTimeMode(SHOWTIME_MODES::SHOWTIME_FILE_TOTAL)
-    , mStopped(!fileTotal)
+Timer::Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults, Type type)
+    : mName(std::move(str))
+    , mMode(showtimeMode)
+    , mType(type)
+    , mStart(Clock::now())
+    , mResults(timerResults)
 {}
 
 Timer::~Timer()
@@ -114,21 +96,49 @@ 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 (mShowTimeMode == SHOWTIME_MODES::SHOWTIME_FILE) {
-            const double sec = (double)diff / CLOCKS_PER_SEC;
-            std::cout << mStr << ": " << sec << "s" << std::endl;
-        } else if (mShowTimeMode == SHOWTIME_MODES::SHOWTIME_FILE_TOTAL) {
-            const double sec = (double)diff / CLOCKS_PER_SEC;
-            std::cout << "Check time: " << mStr << ": " << sec << "s" << std::endl;
+    if (mMode == ShowTime::NONE)
+        return;
+    if (mType == Type::OVERALL && mMode != ShowTime::TOP5_SUMMARY && mMode != ShowTime::SUMMARY) {
+        mMode = ShowTime::NONE;
+        return;
+    }
+    if (mType == Type::FILE && mMode != ShowTime::TOP5_FILE && mMode != ShowTime::FILE && mMode != ShowTime::FILE_TOTAL) {
+        mMode = ShowTime::NONE;
+        return;
+    }
+    if (mStart != TimePoint{}) {
+        auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStart);
+        if (!mResults) {
+            std::lock_guard<std::mutex> l(stdCoutLock);
+            std::cout << (mType == Type::OVERALL ? "Overall time: " : "Check time: " + mName + ": ") << TimerResultsData::durationToString(diff) << std::endl;
         } else {
-            if (mTimerResults)
-                mTimerResults->addResults(mStr, diff);
+            mResults->addResults(mName, diff);
         }
     }
+    mMode = ShowTime::NONE; // prevent multiple stops
+}
 
-    mStopped = true;
+std::string TimerResultsData::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");
 }
diff --git a/lib/timer.h b/lib/timer.h
index 4bd8884c242..c3d477d5802 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-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
@@ -22,56 +22,66 @@
 
 #include "config.h"
 
-#include <ctime>
+#include <chrono>
+#include <cstdint>
 #include <map>
 #include <mutex>
 #include <string>
+#include <utility>
 
-enum class SHOWTIME_MODES {
-    SHOWTIME_NONE,
-    SHOWTIME_FILE,
-    SHOWTIME_FILE_TOTAL,
-    SHOWTIME_SUMMARY,
-    SHOWTIME_TOP5
+enum class ShowTime : std::uint8_t {
+    NONE,
+    FILE,
+    FILE_TOTAL,
+    SUMMARY,
+    TOP5_SUMMARY,
+    TOP5_FILE
 };
 
 class CPPCHECKLIB TimerResultsIntf {
 public:
-    virtual ~TimerResultsIntf() {}
+    virtual ~TimerResultsIntf() = default;
 
-    virtual void addResults(const std::string& str, std::clock_t clocks) = 0;
+    virtual void addResults(const std::string& timerName, std::chrono::milliseconds duation) = 0;
 };
 
 struct TimerResultsData {
-    std::clock_t mClocks;
-    long mNumberOfResults;
+    std::chrono::milliseconds mDuration;
+    long mNumberOfResults{};
 
-    TimerResultsData()
-        : mClocks(0)
-        , mNumberOfResults(0) {}
-
-    double seconds() const {
-        const double ret = (double)((unsigned long)mClocks) / (double)CLOCKS_PER_SEC;
-        return ret;
+    std::chrono::duration<double> getSeconds() const {
+        return std::chrono::duration_cast<std::chrono::duration<double>>(mDuration);
     }
+
+    static std::string durationToString(std::chrono::milliseconds duration);
 };
 
-class CPPCHECKLIB TimerResults : public TimerResultsIntf {
+class CPPCHECKLIB WARN_UNUSED TimerResults : public TimerResultsIntf {
 public:
-    TimerResults() {}
+    TimerResults() = default;
 
-    void showResults(SHOWTIME_MODES mode) const;
-    void addResults(const std::string& str, std::clock_t clocks) override;
+    void showResults(ShowTime mode) const;
+    void addResults(const std::string& str, std::chrono::milliseconds duration) override;
+
+    void reset();
 
 private:
-    std::map<std::string, struct TimerResultsData> mResults;
+    std::map<std::string, TimerResultsData> 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>;
+
+    enum class Type : std::uint8_t {
+        FILE,
+        OVERALL,
+        OTHER
+    };
+
+    Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults = nullptr, Type type = Type::OTHER);
     ~Timer();
 
     Timer(const Timer&) = delete;
@@ -79,12 +89,19 @@ class CPPCHECKLIB Timer {
 
     void stop();
 
+    template<class TFunc>
+    static void run(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults, const TFunc& f) {
+        Timer t(std::move(str), showtimeMode, timerResults);
+        f();
+    }
+
 private:
-    const std::string mStr;
-    TimerResultsIntf* mTimerResults;
-    std::clock_t mStart;
-    const SHOWTIME_MODES mShowTimeMode;
-    bool mStopped;
+    const std::string mName;
+    ShowTime mMode{};
+    Type mType{};
+    TimePoint mStart;
+    TimerResultsIntf* mResults{};
 };
+
 //---------------------------------------------------------------------------
 #endif // timerH
diff --git a/lib/token.cpp b/lib/token.cpp
index f24dc6f2773..5633f291083 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-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
@@ -21,6 +21,7 @@
 #include "astutils.h"
 #include "errortypes.h"
 #include "library.h"
+#include "mathlib.h"
 #include "settings.h"
 #include "symboldatabase.h"
 #include "tokenlist.h"
@@ -32,19 +33,22 @@
 #include <cassert>
 #include <cctype>
 #include <climits>
+#include <cmath>
 #include <cstdio>
-#include <cstdint>
 #include <cstring>
 #include <functional>
 #include <iostream>
 #include <iterator>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
+#include <type_traits>
 #include <unordered_set>
 #include <utility>
 
+#include <simplecpp.h>
+
 namespace {
     struct less {
         template<class T, class U>
@@ -54,17 +58,22 @@ 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())
+{}
 
-Token::Token(TokensFrontBack *tokensFrontBack) :
-    mTokensFrontBack(tokensFrontBack),
-    mNext(nullptr),
-    mPrevious(nullptr),
-    mLink(nullptr),
-    mTokType(eNone),
-    mFlags(0)
+Token::Token(const Token* tok)
+    : Token(tok->mList, const_cast<Token*>(tok)->mTokensFrontBack)
 {
-    mImpl = new TokenImpl();
+    fileIndex(tok->fileIndex());
+    linenr(tok->linenr());
 }
 
 Token::~Token()
@@ -97,62 +106,56 @@ static const std::unordered_set<std::string> controlFlowKeywords = {
     "return"
 };
 
-// TODO: replace with Keywords::getX()?
-// Another list of keywords
-static const std::unordered_set<std::string> baseKeywords = {
-    "asm",
-    "auto",
-    "break",
-    "case",
-    "const",
-    "continue",
-    "default",
-    "do",
-    "else",
-    "enum",
-    "extern",
-    "for",
-    "goto",
-    "if",
-    "inline",
-    "register",
-    "restrict",
-    "return",
-    "sizeof",
-    "static",
-    "struct",
-    "switch",
-    "typedef",
-    "union",
-    "volatile",
-    "while",
-    "void"
-};
-
 void Token::update_property_info()
 {
-    setFlag(fIsControlFlowKeyword, controlFlowKeywords.find(mStr) != controlFlowKeywords.end());
+    assert(mImpl);
+
+    setFlag(fIsControlFlowKeyword, false);
+    // TODO: clear fIsLong
+    isStandardType(false);
 
     if (!mStr.empty()) {
-        if (mStr == "true" || mStr == "false")
-            tokType(eBoolean);
-        else if (isStringLiteral(mStr))
+        if (mStr == "true" || mStr == "false") {
+            if (mImpl->mVarId) {
+                if (mIsCpp)
+                    throw InternalError(this, "Internal error. VarId set for bool literal.");
+                tokType(eVariable);
+            }
+            else
+                tokType(eBoolean);
+        }
+        else if (isStringLiteral(mStr)) {
             tokType(eString);
-        else if (isCharLiteral(mStr))
+            isLong(isPrefixStringCharLiteral(mStr, '"', "L"));
+        }
+        else if (isCharLiteral(mStr)) {
             tokType(eChar);
-        else if (std::isalpha((unsigned char)mStr[0]) || mStr[0] == '_' || mStr[0] == '$') { // Name
+            isLong(isPrefixStringCharLiteral(mStr, '\'', "L"));
+        }
+        else if (std::isalpha(static_cast<unsigned char>(mStr[0])) || mStr[0] == '_' || mStr[0] == '$') { // Name
             if (mImpl->mVarId)
                 tokType(eVariable);
-            else if (mTokensFrontBack && mTokensFrontBack->list && mTokensFrontBack->list->isKeyword(mStr))
+            else if (mList.isKeyword(mStr)) {
                 tokType(eKeyword);
-            else if (baseKeywords.count(mStr) > 0)
+                update_property_isStandardType();
+                if (mTokType != eType) // cannot be a control-flow keyword when it is a type
+                    setFlag(fIsControlFlowKeyword, controlFlowKeywords.find(mStr) != controlFlowKeywords.end());
+            }
+            else if (mStr == "asm") { // TODO: not a keyword
                 tokType(eKeyword);
-            else if (mTokType != eVariable && mTokType != eFunction && mTokType != eType && mTokType != eKeyword)
+            }
+            else {
                 tokType(eName);
-        } else if (std::isdigit((unsigned char)mStr[0]) || (mStr.length() > 1 && mStr[0] == '-' && std::isdigit((unsigned char)mStr[1])))
-            tokType(eNumber);
-        else if (mStr == "=" || mStr == "<<=" || mStr == ">>=" ||
-                 (mStr.size() == 2U && mStr[1] == '=' && std::strchr("+-*/%&^|", mStr[0])))
+                // some types are not being treated as keywords
+                update_property_isStandardType();
+            }
+        } else if (simplecpp::Token::isNumberLike(mStr)) {
+            if ((MathLib::isInt(mStr) || MathLib::isFloat(mStr)) && mStr.find('_') == std::string::npos)
+                tokType(eNumber);
+            else
+                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);
         else if (mStr.size() == 1 && mStr.find_first_of(",[]()?:") != std::string::npos)
             tokType(eExtendedOp);
@@ -165,6 +168,7 @@ void Token::update_property_info()
                   mStr == "||" ||
                   mStr == "!"))
             tokType(eLogicalOp);
+        // TODO: should link check only apply to < and >? Token::link() suggests so
         else if (mStr.size() <= 2 && !mLink &&
                  (mStr == "==" ||
                   mStr == "!=" ||
@@ -188,9 +192,8 @@ void Token::update_property_info()
     } else {
         tokType(eNone);
     }
-
-    update_property_char_string_literal();
-    update_property_isStandardType();
+    assert(!mImpl->mVarId || mTokType == eVariable);
+    // TODO: validate type for linked token?
 }
 
 static const std::unordered_set<std::string> stdTypes = { "bool"
@@ -204,30 +207,26 @@ static const std::unordered_set<std::string> stdTypes = { "bool"
                                                           , "size_t"
                                                           , "void"
                                                           , "wchar_t"
+                                                          , "signed"
+                                                          , "unsigned"
 };
 
-void Token::update_property_isStandardType()
+bool Token::isStandardType(const std::string& str)
 {
-    isStandardType(false);
+    return stdTypes.find(str) != stdTypes.end();
+}
 
-    if (mStr.size() < 3)
+void Token::update_property_isStandardType()
+{
+    if (mStr.size() < 3 || mStr.size() > 7)
         return;
 
-    if (stdTypes.find(mStr)!=stdTypes.end()) {
+    if (isStandardType(mStr)) {
         isStandardType(true);
         tokType(eType);
     }
 }
 
-void Token::update_property_char_string_literal()
-{
-    if (mTokType != Token::eString && mTokType != Token::eChar)
-        return;
-
-    isLong(((mTokType == Token::eString) && isPrefixStringCharLiteral(mStr, '"', "L")) ||
-           ((mTokType == Token::eChar) && isPrefixStringCharLiteral(mStr, '\'', "L")));
-}
-
 bool Token::isUpperCaseName() const
 {
     if (!isName())
@@ -286,7 +285,7 @@ void Token::deleteNext(nonneg int count)
 
     if (mNext)
         mNext->previous(this);
-    else if (mTokensFrontBack)
+    else
         mTokensFrontBack->back = this;
 }
 
@@ -306,7 +305,7 @@ void Token::deletePrevious(nonneg int count)
 
     if (mPrevious)
         mPrevious->next(this);
-    else if (mTokensFrontBack)
+    else
         mTokensFrontBack->front = this;
 }
 
@@ -318,11 +317,13 @@ void Token::swapWithNext()
         std::swap(mFlags, mNext->mFlags);
         std::swap(mImpl, mNext->mImpl);
         if (mImpl->mTemplateSimplifierPointers)
+            // cppcheck-suppress shadowFunction - TODO: fix this
             for (auto *templateSimplifierPointer : *mImpl->mTemplateSimplifierPointers) {
                 templateSimplifierPointer->token(this);
             }
 
         if (mNext->mImpl->mTemplateSimplifierPointers)
+            // cppcheck-suppress shadowFunction - TODO: fix this
             for (auto *templateSimplifierPointer : *mNext->mImpl->mTemplateSimplifierPointers) {
                 templateSimplifierPointer->token(mNext);
             }
@@ -343,6 +344,7 @@ void Token::takeData(Token *fromToken)
     mImpl = fromToken->mImpl;
     fromToken->mImpl = nullptr;
     if (mImpl->mTemplateSimplifierPointers)
+        // cppcheck-suppress shadowFunction - TODO: fix this
         for (auto *templateSimplifierPointer : *mImpl->mTemplateSimplifierPointers) {
             templateSimplifierPointer->token(this);
         }
@@ -387,7 +389,7 @@ void Token::replace(Token *replaceThis, Token *start, Token *end)
     start->previous(replaceThis->previous());
     end->next(replaceThis->next());
 
-    if (end->mTokensFrontBack && end->mTokensFrontBack->back == end) {
+    if (end->mTokensFrontBack->back == end) {
         while (end->next())
             end = end->next();
         end->mTokensFrontBack->back = end;
@@ -401,36 +403,16 @@ void Token::replace(Token *replaceThis, Token *start, Token *end)
     delete replaceThis;
 }
 
-const Token *Token::tokAt(int index) const
-{
-    const Token *tok = this;
-    while (index > 0 && tok) {
-        tok = tok->next();
-        --index;
-    }
-    while (index < 0 && tok) {
-        tok = tok->previous();
-        ++index;
-    }
-    return tok;
-}
-
-const Token *Token::linkAt(int index) const
-{
-    const Token *tok = this->tokAt(index);
-    if (!tok) {
-        throw InternalError(this, "Internal error. Token::linkAt called with index outside the tokens range.");
-    }
-    return tok->link();
-}
-
-const std::string &Token::strAt(int index) const
-{
-    const Token *tok = this->tokAt(index);
-    return tok ? tok->mStr : emptyString;
-}
-
-static int multiComparePercent(const Token *tok, const char*& haystack, nonneg int varid)
+/**
+ * @throws InternalError thrown on unexpected command or missing varid with %varid%
+ */
+static
+#if defined(__GNUC__)
+// GCC does not inline this by itself
+// need to use the old syntax since the C++11 [[xxx:always_inline]] cannot be used here
+inline __attribute__((always_inline))
+#endif
+int multiComparePercent(const Token *tok, const char*& haystack, nonneg int varid)
 {
     ++haystack;
     // Compare only the first character of the string for optimization reasons
@@ -455,7 +437,7 @@ static int multiComparePercent(const Token *tok, const char*& haystack, nonneg i
         // Type (%type%)
     {
         haystack += 5;
-        if (tok->isName() && tok->varId() == 0 && (tok->str() != "delete" || !tok->isKeyword())) // HACK: this is legacy behaviour, it should return false for all keywords, except types
+        if (tok->isName() && tok->varId() == 0)
             return 1;
     }
     break;
@@ -562,7 +544,12 @@ static int multiComparePercent(const Token *tok, const char*& haystack, nonneg i
     return 0xFFFF;
 }
 
-int Token::multiCompare(const Token *tok, const char *haystack, nonneg int varid)
+static
+#if defined(__GNUC__)
+// need to use the old syntax since the C++11 [[xxx:always_inline]] cannot be used here
+inline __attribute__((always_inline))
+#endif
+int multiCompareImpl(const Token *tok, const char *haystack, nonneg int varid)
 {
     const char *needle = tok->str().c_str();
     const char *needlePointer = needle;
@@ -615,12 +602,19 @@ int Token::multiCompare(const Token *tok, const char *haystack, nonneg int varid
     return -1;
 }
 
+// cppcheck-suppress unusedFunction - used in tests only
+int Token::multiCompare(const Token *tok, const char *haystack, nonneg int varid)
+{
+    return multiCompareImpl(tok, haystack, varid);
+}
+
 bool Token::simpleMatch(const Token *tok, const char pattern[], size_t pattern_len)
 {
     if (!tok)
         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;
@@ -736,7 +730,7 @@ bool Token::Match(const Token *tok, const char pattern[], nonneg int varid)
 
         // Parse multi options, such as void|int|char (accept token which is one of these 3)
         else {
-            const int res = multiCompare(tok, p, varid);
+            const int res = multiCompareImpl(tok, p, varid);
             if (res == 0) {
                 // Empty alternative matches, use the same token on next round
                 while (*p && *p != ' ')
@@ -765,37 +759,20 @@ nonneg int Token::getStrLength(const Token *tok)
     assert(tok != nullptr);
     assert(tok->mTokType == eString);
 
-    int len = 0;
-    const std::string str(getStringLiteral(tok->str()));
-    std::string::const_iterator it = str.cbegin();
-    const std::string::const_iterator end = str.cend();
-
-    while (it != end) {
-        if (*it == '\\') {
-            ++it;
-
-            // string ends at '\0'
-            if (*it == '0')
-                return len;
-        }
-
-        if (*it == '\0')
-            return len;
-
-        ++it;
-        ++len;
-    }
+    const std::string s(replaceEscapeSequences(getStringLiteral(tok->str())));
 
-    return len;
+    const auto pos = s.find('\0');
+    return pos < s.size() ? pos : s.size();
 }
 
 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 < (int)str.size(); i++) {
+    for (int i = 0; i < static_cast<int>(str.size()); i++) {
         if (str[i] == '\\')
             ++i;
         ++sizeofstring;
@@ -803,14 +780,14 @@ nonneg int Token::getStrArraySize(const Token *tok)
     return sizeofstring;
 }
 
-nonneg int Token::getStrSize(const Token *tok, const Settings *settings)
+nonneg int Token::getStrSize(const Token *tok, const Settings &settings)
 {
     assert(tok != nullptr && tok->tokType() == eString);
     nonneg int sizeofType = 1;
     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;
 }
@@ -836,9 +813,10 @@ void Token::move(Token *srcStart, Token *srcEnd, Token *newLocation)
         tok->mImpl->mProgressValue = newLocation->mImpl->mProgressValue;
 }
 
-const Token* Token::nextArgument() const
+template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+static T* nextArgumentImpl(T *thisTok)
 {
-    for (const Token* tok = this; tok; tok = tok->next()) {
+    for (T* tok = thisTok; tok; tok = tok->next()) {
         if (tok->str() == ",")
             return tok->next();
         if (tok->link() && Token::Match(tok, "(|{|[|<"))
@@ -849,6 +827,16 @@ const Token* Token::nextArgument() const
     return nullptr;
 }
 
+const Token* Token::nextArgument() const
+{
+    return nextArgumentImpl(this);
+}
+
+Token *Token::nextArgument()
+{
+    return nextArgumentImpl(this);
+}
+
 const Token* Token::nextArgumentBeforeCreateLinks2() const
 {
     for (const Token* tok = this; tok; tok = tok->next()) {
@@ -895,7 +883,7 @@ const Token * Token::findClosingBracket() const
     if (!mPrevious)
         return nullptr;
 
-    if (!(mPrevious->isName() ||
+    if (!(mPrevious->isName() || Token::simpleMatch(mPrevious, "]") ||
           Token::Match(mPrevious->previous(), "operator %op% <") ||
           Token::Match(mPrevious->tokAt(-2), "operator [([] [)]] <")))
         return nullptr;
@@ -924,7 +912,7 @@ const Token * Token::findClosingBracket() const
             return nullptr;
         // we can make some guesses for template parameters
         else if (closing->str() == "<" && closing->previous() &&
-                 (closing->previous()->isName() || isOperator(closing->previous())) &&
+                 (closing->previous()->isName() || Token::simpleMatch(closing->previous(), "]") || isOperator(closing->previous())) &&
                  (templateParameter ? templateParameters.find(closing->strAt(-1)) == templateParameters.end() : true))
             ++depth;
         else if (closing->str() == ">") {
@@ -938,8 +926,8 @@ const Token * Token::findClosingBracket() const
             depth -= 2;
         }
         // save named template parameter
-        else if (templateParameter && depth == 1 && closing->str() == "," &&
-                 closing->previous()->isName() && !Match(closing->previous(), "class|typename|."))
+        else if (templateParameter && depth == 1 && Token::Match(closing, "[,=]") &&
+                 closing->previous()->isName() && !Token::Match(closing->previous(), "class|typename|.") && !Token::Match(closing->tokAt(-2), "=|::"))
             templateParameters.insert(closing->strAt(-1));
     }
 
@@ -949,7 +937,7 @@ const Token * Token::findClosingBracket() const
 Token * Token::findClosingBracket()
 {
     // return value of const function
-    return const_cast<Token*>(const_cast<const Token*>(this)->findClosingBracket());
+    return const_cast<Token*>(static_cast<const Token*>(this)->findClosingBracket());
 }
 
 const Token * Token::findOpeningBracket() const
@@ -981,47 +969,88 @@ const Token * Token::findOpeningBracket() const
 Token * Token::findOpeningBracket()
 {
     // return value of const function
-    return const_cast<Token*>(const_cast<const Token*>(this)->findOpeningBracket());
+    return const_cast<Token*>(static_cast<const Token*>(this)->findOpeningBracket());
 }
 
 //---------------------------------------------------------------------------
 
-const Token *Token::findsimplematch(const Token * const startTok, const char pattern[], size_t pattern_len)
+template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+static T *findsimplematchImpl(T * const startTok, const char pattern[], size_t pattern_len)
 {
-    for (const Token* tok = startTok; tok; tok = tok->next()) {
+    for (T* tok = startTok; tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, pattern, pattern_len))
             return tok;
     }
     return nullptr;
 }
 
-const Token *Token::findsimplematch(const Token * const startTok, const char pattern[], size_t pattern_len, const Token * const end)
+const Token *Token::findsimplematch(const Token * const startTok, const char pattern[], size_t pattern_len)
+{
+    return findsimplematchImpl(startTok, pattern, pattern_len);
+}
+
+Token *Token::findsimplematch(Token * const startTok, const char pattern[], size_t pattern_len)
 {
-    for (const Token* tok = startTok; tok && tok != end; tok = tok->next()) {
+    return findsimplematchImpl(startTok, pattern, pattern_len);
+}
+
+template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*> )>
+static T *findsimplematchImpl(T * const startTok, const char pattern[], size_t pattern_len, const Token * const end)
+{
+    for (T* tok = startTok; tok && tok != end; tok = tok->next()) {
         if (Token::simpleMatch(tok, pattern, pattern_len))
             return tok;
     }
     return nullptr;
 }
 
-const Token *Token::findmatch(const Token * const startTok, const char pattern[], const nonneg int varId)
+const Token *Token::findsimplematch(const Token * const startTok, const char pattern[], size_t pattern_len, const Token * const end)
 {
-    for (const Token* tok = startTok; tok; tok = tok->next()) {
+    return findsimplematchImpl(startTok, pattern, pattern_len, end);
+}
+
+Token *Token::findsimplematch(Token * const startTok, const char pattern[], size_t pattern_len, const Token * const end) {
+    return findsimplematchImpl(startTok, pattern, pattern_len, end);
+}
+
+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)
+{
+    for (T* tok = startTok; tok; tok = tok->next()) {
         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 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)
 {
-    for (const Token* tok = startTok; tok && tok != end; tok = tok->next()) {
+    for (T* tok = startTok; tok && tok != end; tok = tok->next()) {
         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)
+{
+    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)
 {
     mImpl->mFunction = f;
@@ -1034,16 +1063,14 @@ void Token::function(const Function *f)
         tokType(eName);
 }
 
-Token* Token::insertToken(const std::string& tokenStr, const std::string& originalNameStr, bool prepend)
+Token* Token::insertToken(const std::string& tokenStr, bool prepend)
 {
     Token *newToken;
     if (mStr.empty())
         newToken = this;
     else
-        newToken = new Token(mTokensFrontBack);
+        newToken = new Token(mList, mTokensFrontBack);
     newToken->str(tokenStr);
-    if (!originalNameStr.empty())
-        newToken->originalName(originalNameStr);
 
     if (newToken != this) {
         newToken->mImpl->mLineNumber = mImpl->mLineNumber;
@@ -1054,7 +1081,7 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
             if (this->previous()) {
                 newToken->previous(this->previous());
                 newToken->previous()->next(newToken);
-            } else if (mTokensFrontBack) {
+            } else {
                 mTokensFrontBack->front = newToken;
             }
             this->previous(newToken);
@@ -1063,7 +1090,7 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
             if (this->next()) {
                 newToken->next(this->next());
                 newToken->next()->previous(newToken);
-            } else if (mTokensFrontBack) {
+            } else {
                 mTokensFrontBack->back = newToken;
             }
             this->next(newToken);
@@ -1095,6 +1122,7 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
                         tok1 = tok1->previous()->findOpeningBracket();
                     if (tok1 && Token::Match(tok1->tokAt(-3), "%name% :: %name%")) {
                         tok1 = tok1->tokAt(-2);
+                        // cppcheck-suppress shadowFunction - TODO: fix this
                         std::string scope = tok1->strAt(-1);
                         while (Token::Match(tok1->tokAt(-2), ":: %name%")) {
                             scope = tok1->strAt(-3) + " :: " + scope;
@@ -1127,7 +1155,7 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
                 newScopeInfo->name.append(nextScopeNameAddition);
                 nextScopeNameAddition = "";
 
-                newToken->scopeInfo(newScopeInfo);
+                newToken->scopeInfo(std::move(newScopeInfo));
             } else if (newToken->str() == "}") {
                 Token* matchingTok = newToken->previous();
                 int depth = 0;
@@ -1146,8 +1174,10 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
                     newToken->mImpl->mScopeInfo = mImpl->mScopeInfo;
                 }
                 if (newToken->str() == ";") {
-                    const Token* statementStart;
-                    for (statementStart = newToken; statementStart->previous() && !Token::Match(statementStart->previous(), ";|{"); statementStart = statementStart->previous());
+                    const Token* statementStart = newToken;
+                    while (statementStart->previous() && !Token::Match(statementStart->previous(), ";|{")) {
+                        statementStart = statementStart->previous();
+                    }
                     if (Token::Match(statementStart, "using namespace %name% ::|;")) {
                         const Token * tok1 = statementStart->tokAt(2);
                         std::string nameSpace;
@@ -1157,7 +1187,7 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
                             nameSpace += tok1->str();
                             tok1 = tok1->next();
                         }
-                        mImpl->mScopeInfo->usingNamespaces.insert(nameSpace);
+                        mImpl->mScopeInfo->usingNamespaces.insert(std::move(nameSpace));
                     }
                 }
             }
@@ -1166,6 +1196,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)
@@ -1185,27 +1231,42 @@ void Token::createMutualLinks(Token *begin, Token *end)
     end->link(begin);
 }
 
-void Token::printOut(const char *title) const
+void Token::printOut() const
+{
+    printOut(std::cout, "");
+}
+
+void Token::printOut(std::ostream& out, const char *title) const
 {
     if (title && title[0])
-        std::cout << "\n### " << title << " ###\n";
-    std::cout << stringifyList(stringifyOptions::forPrintOut(), nullptr, nullptr) << std::endl;
+        out << "\n### " << title << " ###\n";
+    out << stringifyList(stringifyOptions::forPrintOut(), nullptr, nullptr) << std::endl;
 }
 
-void Token::printOut(const char *title, const std::vector<std::string> &fileNames) const
+void Token::printOut(std::ostream& out, bool xml, const char *title, const std::vector<std::string> &fileNames) const
 {
+    if (xml)
+    {
+        out << "<file>" << std::endl;
+        out << "<![CDATA[";
+    }
     if (title && title[0])
-        std::cout << "\n### " << title << " ###\n";
-    std::cout << stringifyList(stringifyOptions::forPrintOut(), &fileNames, nullptr) << std::endl;
+        out << "\n### " << title << " ###\n";
+    out << stringifyList(stringifyOptions::forPrintOut(), &fileNames, nullptr) << std::endl;
+    if (xml)
+    {
+        out << "]]>" << std::endl;
+        out << "</file>" << std::endl;
+    }
 }
 
 // cppcheck-suppress unusedFunction - used for debugging
-void Token::printLines(int lines) const
+void Token::printLines(std::ostream& out, int lines) const
 {
     const Token *end = this;
     while (end && end->linenr() < lines + linenr())
         end = end->next();
-    std::cout << stringifyList(stringifyOptions::forDebugExprId(), nullptr, end) << std::endl;
+    out << stringifyList(stringifyOptions::forDebugExprId(), nullptr, end) << std::endl;
 }
 
 std::string Token::stringify(const stringifyOptions& options) const
@@ -1247,7 +1308,10 @@ std::string Token::stringify(const stringifyOptions& options) const
     } else if (options.exprid && mImpl->mExprId != 0) {
         ret += '@';
         ret += (options.idtype ? "expr" : "");
-        ret += std::to_string(mImpl->mExprId);
+        if ((mImpl->mExprId & (1U << efIsUnique)) != 0)
+            ret += "UNIQUE";
+        else
+            ret += std::to_string(mImpl->mExprId);
     }
 
     return ret;
@@ -1270,6 +1334,7 @@ std::string Token::stringifyList(const stringifyOptions& options, const std::vec
     std::string ret;
 
     unsigned int lineNumber = mImpl->mLineNumber - (options.linenumbers ? 1U : 0U);
+    // cppcheck-suppress shadowFunction - TODO: fix this
     unsigned int fileIndex = options.files ? ~0U : mImpl->mFileIndex;
     std::map<int, unsigned int> lineNumbers;
     for (const Token *tok = this; tok != end; tok = tok->next()) {
@@ -1471,6 +1536,12 @@ std::pair<const Token *, const Token *> Token::findExpressionStartEndTokens() co
     end = goToRightParenthesis(start, end);
     if (Token::simpleMatch(end, "{"))
         end = end->link();
+
+    if (precedes(top, start))
+        throw InternalError(start, "Cannot find start of expression");
+    if (succeeds(top, end))
+        throw InternalError(end, "Cannot find end of expression");
+
     return std::pair<const Token *, const Token *>(start,end);
 }
 
@@ -1550,8 +1621,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;
                 }
             }
@@ -1577,7 +1648,7 @@ static void astStringXml(const Token *tok, nonneg int indent, std::ostream &out)
 
     out << strindent << "<token str=\"" << tok->str() << '\"';
     if (tok->varId())
-        out << " varId=\"" << MathLib::toString(tok->varId()) << '\"';
+        out << " varId=\"" << tok->varId() << '\"';
     if (tok->variable())
         out << " variable=\"" << tok->variable() << '\"';
     if (tok->function())
@@ -1599,7 +1670,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;
@@ -1616,10 +1687,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();
         }
@@ -1673,6 +1742,7 @@ std::string Token::astStringVerbose() const
     return ret;
 }
 
+// cppcheck-suppress unusedFunction // used in test
 std::string Token::astStringZ3() const
 {
     if (!astOperand1())
@@ -1682,124 +1752,187 @@ std::string Token::astStringZ3() const
     return "(" + str() + " " + astOperand1()->astStringZ3() + " " + astOperand2()->astStringZ3() + ")";
 }
 
-void Token::printValueFlow(bool xml, std::ostream &out) const
+void Token::printValueFlow(const std::vector<std::string>& files, bool xml, std::ostream &out) const
 {
+    std::string outs;
+
+    // cppcheck-suppress shadowFunction
+    int fileIndex = -1;
     int line = 0;
     if (xml)
-        out << "  <valueflow>" << std::endl;
+        outs += "  <valueflow>\n";
     else
-        out << "\n\n##Value flow" << std::endl;
+        outs += "\n\n##Value flow\n";
     for (const Token *tok = this; tok; tok = tok->next()) {
+        // cppcheck-suppress shadowFunction - TODO: fix this
         const auto* const values = tok->mImpl->mValues;
         if (!values)
             continue;
         if (values->empty()) // Values might be removed by removeContradictions
             continue;
-        if (xml)
-            out << "    <values id=\"" << values << "\">" << std::endl;
-        else if (line != tok->linenr())
-            out << "Line " << tok->linenr() << std::endl;
+        if (xml) {
+            outs += "    <values id=\"";
+            outs += id_string(values);
+            outs +=  "\">";
+            outs += '\n';
+        }
+        else {
+            if (fileIndex != tok->fileIndex()) {
+                outs += "File ";
+                outs += files[tok->fileIndex()];
+                outs += '\n';
+                line = 0;
+            }
+            if (line != tok->linenr()) {
+                outs += "Line ";
+                outs += std::to_string(tok->linenr());
+                outs += '\n';
+            }
+        }
+        fileIndex = tok->fileIndex();
         line = tok->linenr();
         if (!xml) {
             ValueFlow::Value::ValueKind valueKind = values->front().valueKind;
             const bool same = std::all_of(values->begin(), values->end(), [&](const ValueFlow::Value& value) {
                 return value.valueKind == valueKind;
             });
-            out << "  " << tok->str() << " ";
+            outs += "  ";
+            outs += tok->str();
+            outs += " ";
             if (same) {
                 switch (valueKind) {
                 case ValueFlow::Value::ValueKind::Impossible:
                 case ValueFlow::Value::ValueKind::Known:
-                    out << "always ";
+                    outs += "always ";
                     break;
                 case ValueFlow::Value::ValueKind::Inconclusive:
-                    out << "inconclusive ";
+                    outs += "inconclusive ";
                     break;
                 case ValueFlow::Value::ValueKind::Possible:
-                    out << "possible ";
+                    outs += "possible ";
                     break;
                 }
             }
             if (values->size() > 1U)
-                out << '{';
+                outs += '{';
         }
         for (const ValueFlow::Value& value : *values) {
             if (xml) {
-                out << "      <value ";
+                outs += "      <value ";
                 switch (value.valueType) {
                 case ValueFlow::Value::ValueType::INT:
-                    if (tok->valueType() && tok->valueType()->sign == ValueType::UNSIGNED)
-                        out << "intvalue=\"" << (MathLib::biguint)value.intvalue << '\"';
-                    else
-                        out << "intvalue=\"" << value.intvalue << '\"';
+                    if (tok->valueType() && tok->valueType()->sign == ValueType::UNSIGNED) {
+                        outs += "intvalue=\"";
+                        outs += MathLib::toString(static_cast<MathLib::biguint>(value.intvalue));
+                        outs += '\"';
+                    }
+                    else {
+                        outs += "intvalue=\"";
+                        outs += MathLib::toString(value.intvalue);
+                        outs += '\"';
+                    }
                     break;
                 case ValueFlow::Value::ValueType::TOK:
-                    out << "tokvalue=\"" << value.tokvalue << '\"';
+                    outs +=  "tokvalue=\"";
+                    outs += id_string(value.tokvalue);
+                    outs += '\"';
                     break;
                 case ValueFlow::Value::ValueType::FLOAT:
-                    out << "floatvalue=\"" << value.floatValue << '\"';
+                    outs += "floatvalue=\"";
+                    outs += MathLib::toString(value.floatValue);
+                    outs += '\"';
                     break;
                 case ValueFlow::Value::ValueType::MOVED:
-                    out << "movedvalue=\"" << ValueFlow::Value::toString(value.moveKind) << '\"';
+                    outs += "movedvalue=\"";
+                    outs += ValueFlow::Value::toString(value.moveKind);
+                    outs += '\"';
                     break;
                 case ValueFlow::Value::ValueType::UNINIT:
-                    out << "uninit=\"1\"";
+                    outs +=  "uninit=\"1\"";
                     break;
                 case ValueFlow::Value::ValueType::BUFFER_SIZE:
-                    out << "buffer-size=\"" << value.intvalue << "\"";
+                    outs += "buffer-size=\"";
+                    outs += MathLib::toString(value.intvalue);
+                    outs += "\"";
                     break;
                 case ValueFlow::Value::ValueType::CONTAINER_SIZE:
-                    out << "container-size=\"" << value.intvalue << '\"';
+                    outs += "container-size=\"";
+                    outs += MathLib::toString(value.intvalue);
+                    outs += '\"';
                     break;
                 case ValueFlow::Value::ValueType::ITERATOR_START:
-                    out << "iterator-start=\"" << value.intvalue << '\"';
+                    outs +=  "iterator-start=\"";
+                    outs += MathLib::toString(value.intvalue);
+                    outs += '\"';
                     break;
                 case ValueFlow::Value::ValueType::ITERATOR_END:
-                    out << "iterator-end=\"" << value.intvalue << '\"';
+                    outs +=  "iterator-end=\"";
+                    outs += MathLib::toString(value.intvalue);
+                    outs += '\"';
                     break;
                 case ValueFlow::Value::ValueType::LIFETIME:
-                    out << "lifetime=\"" << value.tokvalue << '\"';
-                    out << " lifetime-scope=\"" << ValueFlow::Value::toString(value.lifetimeScope) << "\"";
-                    out << " lifetime-kind=\"" << ValueFlow::Value::toString(value.lifetimeKind) << "\"";
+                    outs += "lifetime=\"";
+                    outs += id_string(value.tokvalue);
+                    outs += '\"';
+                    outs += " lifetime-scope=\"";
+                    outs += ValueFlow::Value::toString(value.lifetimeScope);
+                    outs += "\"";
+                    outs += " lifetime-kind=\"";
+                    outs += ValueFlow::Value::toString(value.lifetimeKind);
+                    outs += "\"";
                     break;
                 case ValueFlow::Value::ValueType::SYMBOLIC:
-                    out << "symbolic=\"" << value.tokvalue << '\"';
-                    out << " symbolic-delta=\"" << value.intvalue << '\"';
+                    outs += "symbolic=\"";
+                    outs += id_string(value.tokvalue);
+                    outs += '\"';
+                    outs += " symbolic-delta=\"";
+                    outs += MathLib::toString(value.intvalue);
+                    outs += '\"';
                     break;
                 }
-                out << " bound=\"" << ValueFlow::Value::toString(value.bound) << "\"";
-                if (value.condition)
-                    out << " condition-line=\"" << value.condition->linenr() << '\"';
+                outs += " bound=\"";
+                outs += ValueFlow::Value::toString(value.bound);
+                outs += "\"";
+                if (value.condition) {
+                    outs += " condition-line=\"";
+                    outs += std::to_string(value.condition->linenr());
+                    outs += '\"';
+                }
                 if (value.isKnown())
-                    out << " known=\"true\"";
+                    outs += " known=\"true\"";
                 else if (value.isPossible())
-                    out << " possible=\"true\"";
+                    outs += " possible=\"true\"";
                 else if (value.isImpossible())
-                    out << " impossible=\"true\"";
+                    outs += " impossible=\"true\"";
                 else if (value.isInconclusive())
-                    out << " inconclusive=\"true\"";
-                out << " path=\"" << value.path << "\"";
-                out << "/>" << std::endl;
-            }
+                    outs += " inconclusive=\"true\"";
 
+                outs += " path=\"";
+                outs += MathLib::toString(value.path);
+                outs += "\"";
+
+                outs += "/>\n";
+            }
             else {
                 if (&value != &values->front())
-                    out << ",";
-                out << value.toString();
+                    outs += ",";
+                outs += value.toString();
             }
         }
         if (xml)
-            out << "    </values>" << std::endl;
+            outs += "    </values>\n";
         else if (values->size() > 1U)
-            out << '}' << std::endl;
+            outs += "}\n";
         else
-            out << std::endl;
+            outs += '\n';
     }
     if (xml)
-        out << "  </valueflow>" << std::endl;
+        outs += "  </valueflow>\n";
+
+    out << outs;
 }
 
-const ValueFlow::Value * Token::getValueLE(const MathLib::bigint val, const Settings *settings) const
+const ValueFlow::Value * Token::getValueLE(const MathLib::bigint val, const Settings &settings) const
 {
     if (!mImpl->mValues)
         return nullptr;
@@ -1808,7 +1941,7 @@ const ValueFlow::Value * Token::getValueLE(const MathLib::bigint val, const Sett
     });
 }
 
-const ValueFlow::Value * Token::getValueGE(const MathLib::bigint val, const Settings *settings) const
+const ValueFlow::Value * Token::getValueGE(const MathLib::bigint val, const Settings &settings) const
 {
     if (!mImpl->mValues)
         return nullptr;
@@ -1817,17 +1950,26 @@ const ValueFlow::Value * Token::getValueGE(const MathLib::bigint val, const Sett
     });
 }
 
-const ValueFlow::Value * Token::getInvalidValue(const Token *ftok, nonneg int argnr, const Settings *settings) const
+const ValueFlow::Value * Token::getValueNE(MathLib::bigint val) const
+{
+    if (!mImpl->mValues)
+        return nullptr;
+    const auto it = std::find_if(mImpl->mValues->cbegin(), mImpl->mValues->cend(), [=](const ValueFlow::Value& value) {
+        return value.isIntValue() && !value.isImpossible() && value.intvalue != val;
+    });
+    return it == mImpl->mValues->end() ? nullptr : &*it;
+}
+
+const ValueFlow::Value * Token::getInvalidValue(const Token *ftok, nonneg int argnr, const Settings &settings) const
 {
-    if (!mImpl->mValues || !settings)
+    if (!mImpl->mValues)
         return nullptr;
     const ValueFlow::Value *ret = nullptr;
-    std::list<ValueFlow::Value>::const_iterator it;
-    for (it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
+    for (auto it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
         if (it->isImpossible())
             continue;
-        if ((it->isIntValue() && !settings->library.isIntArgValid(ftok, argnr, it->intvalue)) ||
-            (it->isFloatValue() && !settings->library.isFloatArgValid(ftok, argnr, it->floatValue))) {
+        if ((it->isIntValue() && !settings.library.isIntArgValid(ftok, argnr, it->intvalue, settings)) ||
+            (it->isFloatValue() && !settings.library.isFloatArgValid(ftok, argnr, it->floatValue, settings))) {
             if (!ret || ret->isInconclusive() || (ret->condition && !it->isInconclusive()))
                 ret = &(*it);
             if (!ret->isInconclusive() && !ret->condition)
@@ -1835,22 +1977,21 @@ const ValueFlow::Value * Token::getInvalidValue(const Token *ftok, nonneg int ar
         }
     }
     if (ret) {
-        if (ret->isInconclusive() && !settings->certainty.isEnabled(Certainty::inconclusive))
+        if (ret->isInconclusive() && !settings.certainty.isEnabled(Certainty::inconclusive))
             return nullptr;
-        if (ret->condition && !settings->severity.isEnabled(Severity::warning))
+        if (ret->condition && !settings.severity.isEnabled(Severity::warning))
             return nullptr;
     }
     return ret;
 }
 
-const Token *Token::getValueTokenMinStrSize(const Settings *settings, MathLib::bigint* path) const
+const Token *Token::getValueTokenMinStrSize(const Settings &settings, MathLib::bigint* path) const
 {
     if (!mImpl->mValues)
         return nullptr;
     const Token *ret = nullptr;
     int minsize = INT_MAX;
-    std::list<ValueFlow::Value>::const_iterator it;
-    for (it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
+    for (auto it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
         if (it->isTokValue() && it->tokvalue && it->tokvalue->tokType() == Token::eString) {
             const int size = getStrSize(it->tokvalue, settings);
             if (!ret || size < minsize) {
@@ -1870,8 +2011,7 @@ const Token *Token::getValueTokenMaxStrLength() const
         return nullptr;
     const Token *ret = nullptr;
     int maxlength = 0;
-    std::list<ValueFlow::Value>::const_iterator it;
-    for (it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
+    for (auto it = mImpl->mValues->cbegin(); it != mImpl->mValues->end(); ++it) {
         if (it->isTokValue() && it->tokvalue && it->tokvalue->tokType() == Token::eString) {
             const int length = getStrLength(it->tokvalue);
             if (!ret || length > maxlength) {
@@ -1892,64 +2032,68 @@ static bool isAdjacent(const ValueFlow::Value& x, const ValueFlow::Value& y)
     return std::abs(x.intvalue - y.intvalue) == 1;
 }
 
-static bool removePointValue(std::list<ValueFlow::Value>& values, ValueFlow::Value& x)
+static bool removePointValue(std::list<ValueFlow::Value>& values, std::list<ValueFlow::Value>::iterator& x)
 {
-    const bool isPoint = x.bound == ValueFlow::Value::Bound::Point;
+    const bool isPoint = x->bound == ValueFlow::Value::Bound::Point;
     if (!isPoint)
-        x.decreaseRange();
+        x->decreaseRange();
     else
-        values.remove(x);
+        x = values.erase(x);
     return isPoint;
 }
 
 static bool removeContradiction(std::list<ValueFlow::Value>& values)
 {
     bool result = false;
-    for (ValueFlow::Value& x : values) {
-        if (x.isNonValue())
+    for (auto itx = values.begin(); itx != values.end(); ++itx) {
+        if (itx->isNonValue())
             continue;
-        for (ValueFlow::Value& y : values) {
-            if (y.isNonValue())
+
+        auto ity = itx;
+        ++ity;
+        for (; ity != values.end(); ++ity) {
+            if (ity->isNonValue())
                 continue;
-            if (x == y)
+            if (*itx == *ity)
                 continue;
-            if (x.valueType != y.valueType)
+            if (itx->valueType != ity->valueType)
                 continue;
-            if (x.isImpossible() == y.isImpossible())
+            if (itx->isImpossible() == ity->isImpossible())
                 continue;
-            if (x.isSymbolicValue() && !ValueFlow::Value::sameToken(x.tokvalue, y.tokvalue))
+            if (itx->isSymbolicValue() && !ValueFlow::Value::sameToken(itx->tokvalue, ity->tokvalue))
                 continue;
-            if (!x.equalValue(y)) {
-                auto compare = [](const ValueFlow::Value& x, const ValueFlow::Value& y) {
-                    return x.compareValue(y, less{});
+            if (!itx->equalValue(*ity)) {
+                auto compare = [](const std::list<ValueFlow::Value>::const_iterator& x, const std::list<ValueFlow::Value>::const_iterator& y) {
+                    return x->compareValue(*y, less{});
                 };
-                const ValueFlow::Value& maxValue = std::max(x, y, compare);
-                const ValueFlow::Value& minValue = std::min(x, y, compare);
+                auto itMax = std::max(itx, ity, compare);
+                auto itMin = std::min(itx, ity, compare);
                 // TODO: Adjust non-points instead of removing them
-                if (maxValue.isImpossible() && maxValue.bound == ValueFlow::Value::Bound::Upper) {
-                    values.remove(minValue);
+                if (itMax->isImpossible() && itMax->bound == ValueFlow::Value::Bound::Upper) {
+                    values.erase(itMin);
                     return true;
                 }
-                if (minValue.isImpossible() && minValue.bound == ValueFlow::Value::Bound::Lower) {
-                    values.remove(maxValue);
+                if (itMin->isImpossible() && itMin->bound == ValueFlow::Value::Bound::Lower) {
+                    values.erase(itMax);
                     return true;
                 }
                 continue;
             }
-            const bool removex = !x.isImpossible() || y.isKnown();
-            const bool removey = !y.isImpossible() || x.isKnown();
-            if (x.bound == y.bound) {
+            const bool removex = !itx->isImpossible() || ity->isKnown();
+            const bool removey = !ity->isImpossible() || itx->isKnown();
+            if (itx->bound == ity->bound) {
                 if (removex)
-                    values.remove(x);
+                    values.erase(itx);
                 if (removey)
-                    values.remove(y);
+                    values.erase(ity);
+                // itx and ity are invalidated
                 return true;
             }
             result = removex || removey;
             bool bail = false;
-            if (removex && removePointValue(values, x))
+            if (removex && removePointValue(values, itx))
                 bail = true;
-            if (removey && removePointValue(values, y))
+            if (removey && removePointValue(values, ity))
                 bail = true;
             if (bail)
                 return true;
@@ -1961,6 +2105,7 @@ static bool removeContradiction(std::list<ValueFlow::Value>& values)
 using ValueIterator = std::list<ValueFlow::Value>::iterator;
 
 template<class Iterator>
+// NOLINTNEXTLINE(performance-unnecessary-value-param) - false positive
 static ValueIterator removeAdjacentValues(std::list<ValueFlow::Value>& values, ValueIterator x, Iterator start, Iterator last)
 {
     if (!isAdjacent(*x, **start))
@@ -1971,7 +2116,7 @@ static ValueIterator removeAdjacentValues(std::list<ValueFlow::Value>& values, V
     if (it == last)
         it--;
     (*it)->bound = x->bound;
-    std::for_each(start, it, [&](ValueIterator y) {
+    std::for_each(std::move(start), std::move(it), [&](ValueIterator y) {
         values.erase(y);
     });
     return values.erase(x);
@@ -2035,10 +2180,10 @@ static void mergeAdjacent(std::list<ValueFlow::Value>& values)
 
 static void removeOverlaps(std::list<ValueFlow::Value>& values)
 {
-    for (ValueFlow::Value& x : values) {
+    for (const ValueFlow::Value& x : values) {
         if (x.isNonValue())
             continue;
-        values.remove_if([&](ValueFlow::Value& y) {
+        values.remove_if([&](const ValueFlow::Value& y) {
             if (y.isNonValue())
                 return false;
             if (&x == &y)
@@ -2109,8 +2254,8 @@ bool Token::addValue(const ValueFlow::Value &value)
             return false;
 
         // if value already exists, don't add it again
-        std::list<ValueFlow::Value>::iterator it;
-        for (it = mImpl->mValues->begin(); it != mImpl->mValues->end(); ++it) {
+        auto it = mImpl->mValues->begin();
+        for (; it != mImpl->mValues->end(); ++it) {
             // different types => continue
             if (it->valueType != value.valueType)
                 continue;
@@ -2172,6 +2317,7 @@ void Token::assignProgressValues(Token *tok)
 
 void Token::assignIndexes()
 {
+    // cppcheck-suppress shadowFunction - TODO: fix this
     int index = (mPrevious ? mPrevious->mImpl->mIndex : 0) + 1;
     for (Token *tok = this; tok; tok = tok->next())
         tok->mImpl->mIndex = index++;
@@ -2185,6 +2331,13 @@ void Token::setValueType(ValueType *vt)
     }
 }
 
+const ValueType *Token::argumentType() const {
+    const Token *top = this;
+    while (top && !Token::Match(top->astParent(), ",|("))
+        top = top->astParent();
+    return top ? top->mImpl->mValueType : nullptr;
+}
+
 void Token::type(const ::Type *t)
 {
     mImpl->mType = t;
@@ -2209,9 +2362,11 @@ const ::Type* Token::typeOf(const Token* tok, const Token** typeTok)
     if (tok->function())
         return tok->function()->retType;
     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;
@@ -2286,8 +2441,6 @@ 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);
-                if (Token::simpleMatch(varTok, "(") && Token::simpleMatch(varTok->astOperand1(), "."))
-                    varTok = varTok->astOperand1()->astOperand1();
                 std::pair<const Token*, const Token*> r = typeDecl(varTok);
                 if (r.first)
                     return r;
@@ -2309,7 +2462,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
@@ -2323,15 +2476,18 @@ 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()};
     }
@@ -2368,13 +2524,15 @@ std::shared_ptr<ScopeInfo2> Token::scopeInfo() const
     return mImpl->mScopeInfo;
 }
 
+// if there is a known INT value it will always be the first entry
 bool Token::hasKnownIntValue() const
 {
     if (!mImpl->mValues)
         return false;
-    return std::any_of(mImpl->mValues->begin(), mImpl->mValues->end(), [](const ValueFlow::Value& value) {
-        return value.isKnown() && value.isIntValue();
-    });
+    if (mImpl->mValues->empty())
+        return false;
+    const ValueFlow::Value& value = mImpl->mValues->front();
+    return value.isIntValue() && value.isKnown();
 }
 
 bool Token::hasKnownValue() const
@@ -2397,7 +2555,7 @@ bool Token::hasKnownSymbolicValue(const Token* tok) const
     return mImpl->mValues &&
            std::any_of(mImpl->mValues->begin(), mImpl->mValues->end(), [&](const ValueFlow::Value& value) {
         return value.isKnown() && value.isSymbolicValue() && value.tokvalue &&
-        value.tokvalue->exprId() == tok->exprId();
+               value.tokvalue->exprId() == tok->exprId();
     });
 }
 
@@ -2405,6 +2563,15 @@ const ValueFlow::Value* Token::getKnownValue(ValueFlow::Value::ValueType t) cons
 {
     if (!mImpl->mValues)
         return nullptr;
+    if (mImpl->mValues->empty())
+        return nullptr;
+    // known INT values are always the first entry
+    if (t == ValueFlow::Value::ValueType::INT) {
+        const auto& v = mImpl->mValues->front();
+        if (!v.isKnown() || !v.isIntValue())
+            return nullptr;
+        return &v;
+    }
     auto it = std::find_if(mImpl->mValues->begin(), mImpl->mValues->end(), [&](const ValueFlow::Value& value) {
         return value.isKnown() && value.valueType == t;
     });
@@ -2421,37 +2588,51 @@ const ValueFlow::Value* Token::getValue(const MathLib::bigint val) const
     return it == mImpl->mValues->end() ? nullptr : &*it;
 }
 
-const ValueFlow::Value* Token::getMaxValue(bool condition, MathLib::bigint path) const
+template<class Compare>
+static const ValueFlow::Value* getCompareValue(const std::list<ValueFlow::Value>& values,
+                                               bool condition,
+                                               MathLib::bigint path,
+                                               Compare compare)
 {
-    if (!mImpl->mValues)
-        return nullptr;
     const ValueFlow::Value* ret = nullptr;
-    for (const ValueFlow::Value& value : *mImpl->mValues) {
+    for (const ValueFlow::Value& value : values) {
         if (!value.isIntValue())
             continue;
         if (value.isImpossible())
             continue;
         if (path > -0 && value.path != 0 && value.path != path)
             continue;
-        if ((!ret || value.intvalue > ret->intvalue) &&
-            ((value.condition != nullptr) == condition))
+        if ((!ret || compare(value.intvalue, ret->intvalue)) && ((value.condition != nullptr) == condition))
             ret = &value;
     }
     return ret;
 }
 
+const ValueFlow::Value* Token::getMaxValue(bool condition, MathLib::bigint path) const
+{
+    if (!mImpl->mValues)
+        return nullptr;
+    return getCompareValue(*mImpl->mValues, condition, path, std::greater<MathLib::bigint>{});
+}
+
+const ValueFlow::Value* Token::getMinValue(bool condition, MathLib::bigint path) const
+{
+    if (!mImpl->mValues)
+        return nullptr;
+    return getCompareValue(*mImpl->mValues, condition, path, std::less<MathLib::bigint>{});
+}
+
 const ValueFlow::Value* Token::getMovedValue() const
 {
     if (!mImpl->mValues)
         return nullptr;
     const auto it = std::find_if(mImpl->mValues->begin(), mImpl->mValues->end(), [](const ValueFlow::Value& value) {
         return value.isMovedValue() && !value.isImpossible() &&
-        value.moveKind != ValueFlow::Value::MoveKind::NonMovedVariable;
+               value.moveKind != ValueFlow::Value::MoveKind::NonMovedVariable;
     });
     return it == mImpl->mValues->end() ? nullptr : &*it;
 }
 
-// cppcheck-suppress unusedFunction
 const ValueFlow::Value* Token::getContainerSizeValue(const MathLib::bigint val) const
 {
     if (!mImpl->mValues)
@@ -2462,29 +2643,30 @@ 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;
     delete mValueType;
     delete mValues;
 
     if (mTemplateSimplifierPointers) {
-        for (auto *templateSimplifierPointer : *mTemplateSimplifierPointers) {
-            templateSimplifierPointer->token(nullptr);
+        for (auto *p : *mTemplateSimplifierPointers) {
+            p->token(nullptr);
         }
     }
     delete mTemplateSimplifierPointers;
 
     while (mCppcheckAttributes) {
-        struct CppcheckAttributes *c = mCppcheckAttributes;
+        CppcheckAttributes *c = mCppcheckAttributes;
         mCppcheckAttributes = mCppcheckAttributes->next;
         delete c;
     }
 }
 
-void TokenImpl::setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint value)
+void Token::Impl::setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value)
 {
-    struct CppcheckAttributes *attr = mCppcheckAttributes;
+    CppcheckAttributes *attr = mCppcheckAttributes;
     while (attr && attr->type != type)
         attr = attr->next;
     if (attr)
@@ -2498,9 +2680,9 @@ void TokenImpl::setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, M
     }
 }
 
-bool TokenImpl::getCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint &value) const
+bool Token::Impl::getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const
 {
-    struct CppcheckAttributes *attr = mCppcheckAttributes;
+    const CppcheckAttributes *attr = mCppcheckAttributes;
     while (attr && attr->type != type)
         attr = attr->next;
     if (attr)
@@ -2551,3 +2733,23 @@ 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;
+}
diff --git a/lib/token.h b/lib/token.h
index 5864a0db972..d26c7ac7640 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-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
@@ -22,144 +22,49 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "errortypes.h"
 #include "mathlib.h"
+#include "smallvector.h"
 #include "templatesimplifier.h"
 #include "utils.h"
 #include "vfvalue.h"
 
+#include <algorithm>
+#include <cassert>
 #include <cstdint>
 #include <cstddef>
 #include <functional>
+#include <limits>
 #include <list>
 #include <memory>
 #include <ostream>
 #include <set>
 #include <string>
+#include <type_traits>
 #include <utility>
 #include <vector>
 
-class Enumerator;
+struct Enumerator;
 class Function;
 class Scope;
 class Settings;
 class Type;
 class ValueType;
 class Variable;
-class TokenList;
 class ConstTokenRange;
 class Token;
-
-/**
- * @brief This struct stores pointers to the front and back tokens of the list this token is in.
- */
-struct TokensFrontBack {
-    Token *front;
-    Token *back;
-    const TokenList* list;
-};
+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_)) {}
     std::string name;
-    const Token * const bodyEnd;
+    const Token* const bodyEnd{};
     std::set<std::string> usingNamespaces;
 };
 
-enum class TokenDebug { 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;
-
-    // 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 {LOW,HIGH} type;
-        MathLib::bigint value;
-        struct CppcheckAttributes *next;
-    };
-    struct CppcheckAttributes *mCppcheckAttributes;
-
-    // For memoization, to speed up parsing of huge arrays #8897
-    enum class Cpp11init {UNKNOWN, CPP11INIT, NOINIT} mCpp11init;
-
-    TokenDebug mDebug;
-
-    void setCppcheckAttribute(CppcheckAttributes::Type type, MathLib::bigint value);
-    bool getCppcheckAttribute(CppcheckAttributes::Type type, MathLib::bigint &value) const;
-
-    TokenImpl()
-        : mVarId(0),
-        mFileIndex(0),
-        mLineNumber(0),
-        mColumn(0),
-        mExprId(0),
-        mProgressValue(0),
-        mIndex(0),
-        mBits(0),
-        mAstOperand1(nullptr),
-        mAstOperand2(nullptr),
-        mAstParent(nullptr),
-        mScope(nullptr),
-        mFunction(nullptr),   // Initialize whole union
-        mOriginalName(nullptr),
-        mValueType(nullptr),
-        mValues(nullptr),
-        mTemplateSimplifierPointers(nullptr),
-        mScopeInfo(nullptr),
-        mCppcheckAttributes(nullptr),
-        mCpp11init(Cpp11init::UNKNOWN),
-        mDebug(TokenDebug::None)
-    {}
-
-    ~TokenImpl();
-};
+enum class TokenDebug : std::uint8_t { None, ValueFlow, ValueType };
 
 /// @addtogroup Core
 /// @{
@@ -175,14 +80,119 @@ 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:
-    TokensFrontBack* mTokensFrontBack;
+    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;
+
+        void setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value);
+        bool getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const;
+
+        Impl() = default;
+        ~Impl();
+
+        Impl(const Impl &) = delete;
+        Impl operator=(const Impl &) = delete;
+    };
+
+    const TokenList& mList;
+    std::shared_ptr<TokensFrontBack> mTokensFrontBack;
+
+    static const std::string mEmptyString;
 
 public:
     Token(const Token &) = delete;
     Token& operator=(const Token &) = delete;
 
-    enum Type {
+    enum Type : std::uint8_t {
         eVariable, eType, eFunction, eKeyword, eName, // Names: Variable (varId), Type (typeId, later), Function (FuncId, later), Language keyword, Name (unknown identifier)
         eNumber, eString, eChar, eBoolean, eLiteral, eEnumerator, // Literals: Number, String, Character, Boolean, User defined literal (C++11), Enumerator
         eArithmeticalOp, eComparisonOp, eAssignmentOp, eLogicalOp, eBitOp, eIncDecOp, eExtendedOp, // Operators: Arithmetical, Comparison, Assignment, Logical, Bitwise, ++/--, Extended
@@ -193,7 +203,9 @@ class CPPCHECKLIB Token {
         eNone
     };
 
-    explicit Token(TokensFrontBack *tokensFrontBack = nullptr);
+    Token(const TokenList& tokenlist, std::shared_ptr<TokensFrontBack> tokensFrontBack);
+    // for usage in CheckIO::ArgumentInfo only
+    explicit Token(const Token *tok);
     ~Token();
 
     ConstTokenRange until(const Token * t) const;
@@ -236,25 +248,37 @@ 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;
-    Token *tokAt(int index) {
-        return const_cast<Token *>(const_cast<const Token *>(this)->tokAt(index));
+    const Token *tokAt(int index) const
+    {
+        return tokAtImpl(this, index);
+    }
+    Token *tokAt(int index)
+    {
+        return tokAtImpl(this, index);
     }
 
     /**
      * @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;
-    Token *linkAt(int index) {
-        return const_cast<Token *>(const_cast<const Token *>(this)->linkAt(index));
+    const Token *linkAt(int index) const
+    {
+        return linkAtImpl(this, index);
+    }
+    Token *linkAt(int index)
+    {
+        return linkAtImpl(this, index);
     }
 
     /**
      * @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 index) const
+    {
+        const Token *tok = this->tokAt(index);
+        return tok ? tok->mStr : mEmptyString;
+    }
 
     /**
      * Match given token (or list of tokens) to a pattern list.
@@ -292,18 +316,18 @@ class CPPCHECKLIB Token {
      * - "%char%" Any token enclosed in &apos;-character.
      * - "%comp%" Any token such that isComparisonOp() returns true.
      * - "%cop%" Any token such that isConstOp() returns true.
-     * - "%name%" any token which is a name, variable or type e.g. "hello" or "int"
+     * - "%name%" any token which is a name, variable or type e.g. "hello" or "int". Also matches keywords.
      * - "%num%" Any numeric token, e.g. "23"
      * - "%op%" Any token such that isOp() returns true.
      * - "%or%" A bitwise-or operator '|'
      * - "%oror%" A logical-or operator '||'
-     * - "%type%" Anything that can be a variable type, e.g. "int", but not "delete".
+     * - "%type%" Anything that can be a variable type, e.g. "int". Also matches keywords.
      * - "%str%" Any token starting with &quot;-character (C-string).
      * - "%var%" Match with token with varId > 0
      * - "%varid%" Match with parameter varid
      * - "[abc]" Any of the characters 'a' or 'b' or 'c'
      * - "int|void|char" Any of the strings, int, void or char
-     * - "int|void|char|" Any of the strings, int, void or char or empty string
+     * - "int|void|char|" Any of the strings, int, void or char or no token
      * - "!!else" No tokens or any token that is not "else".
      * - "someRandomText" If token contains "someRandomText".
      *
@@ -353,19 +377,14 @@ class CPPCHECKLIB Token {
      * @param tok token with C-string
      * @param settings Settings
      **/
-    static nonneg int getStrSize(const Token *tok, const Settings *const settings);
+    static nonneg int getStrSize(const Token *tok, const Settings & settings);
 
     const ValueType *valueType() const {
         return mImpl->mValueType;
     }
     void setValueType(ValueType *vt);
 
-    const ValueType *argumentType() const {
-        const Token *top = this;
-        while (top && !Token::Match(top->astParent(), ",|("))
-            top = top->astParent();
-        return top ? top->mImpl->mValueType : nullptr;
-    }
+    const ValueType *argumentType() const;
 
     Token::Type tokType() const {
         return mTokType;
@@ -460,6 +479,7 @@ class CPPCHECKLIB Token {
     void isSigned(const bool sign) {
         setFlag(fIsSigned, sign);
     }
+    // cppcheck-suppress unusedFunction
     bool isPointerCompare() const {
         return getFlag(fIsPointerCompare);
     }
@@ -479,10 +499,7 @@ class CPPCHECKLIB Token {
         setFlag(fIsStandardType, b);
     }
     bool isExpandedMacro() const {
-        return getFlag(fIsExpandedMacro);
-    }
-    void isExpandedMacro(const bool m) {
-        setFlag(fIsExpandedMacro, m);
+        return !!mImpl->mMacroName;
     }
     bool isCast() const {
         return getFlag(fIsCast);
@@ -562,12 +579,37 @@ class CPPCHECKLIB Token {
     void isAttributeMaybeUnused(const bool value) {
         setFlag(fIsAttributeMaybeUnused, value);
     }
-    void setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint value) {
+    bool isAttributeFallthrough() const {
+        return getFlag(fIsAttributeFallthrough);
+    }
+    void isAttributeFallthrough(const bool value) {
+        setFlag(fIsAttributeFallthrough, value);
+    }
+    std::vector<std::string> getAttributeAlignas() const {
+        return mImpl->mAttributeAlignas ? *mImpl->mAttributeAlignas : std::vector<std::string>();
+    }
+    bool hasAttributeAlignas() const {
+        return !!mImpl->mAttributeAlignas;
+    }
+    void addAttributeAlignas(const std::string& a) {
+        mImpl->addAttributeAlignas(a);
+    }
+    void addAttributeCleanup(const std::string& funcname) {
+        mImpl->mAttributeCleanup = funcname;
+    }
+    const std::string& getAttributeCleanup() const {
+        return mImpl->mAttributeCleanup;
+    }
+    bool hasAttributeCleanup() const {
+        return !mImpl->mAttributeCleanup.empty();
+    }
+    void setCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint value) {
         mImpl->setCppcheckAttribute(type, value);
     }
-    bool getCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint &value) const {
+    bool getCppcheckAttribute(CppcheckAttributesType type, MathLib::bigint &value) const {
         return mImpl->getCppcheckAttribute(type, value);
     }
+    // cppcheck-suppress unusedFunction
     bool hasCppcheckAttributes() const {
         return nullptr != mImpl->mCppcheckAttributes;
     }
@@ -703,10 +745,32 @@ class CPPCHECKLIB Token {
         setFlag(fIsFinalType, b);
     }
 
+    bool isInitComma() const {
+        return getFlag(fIsInitComma);
+    }
+    void isInitComma(bool b) {
+        setFlag(fIsInitComma, b);
+    }
+
+    bool isInitBracket() const {
+        return getFlag(fIsInitBracket);
+    }
+    void isInitBracket(bool b) {
+        setFlag(fIsInitBracket, b);
+    }
+
+    bool isAnonymous() const {
+        return getFlag(fIsAnonymous);
+    }
+    void isAnonymous(bool b) {
+        setFlag(fIsAnonymous, b);
+    }
+
+    // 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 {
@@ -720,8 +784,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 {
@@ -740,14 +810,14 @@ class CPPCHECKLIB Token {
     }
 
     bool isCChar() const {
-        return (((mTokType == eString) && isPrefixStringCharLiteral(mStr, '"', emptyString)) ||
-                ((mTokType ==  eChar) && isPrefixStringCharLiteral(mStr, '\'', emptyString) && mStr.length() == 3));
+        return (((mTokType == eString) && isPrefixStringCharLiteral(mStr, '"', "")) ||
+                ((mTokType == eChar) && isPrefixStringCharLiteral(mStr, '\'', "") && (replaceEscapeSequences(getCharLiteral(mStr)).size() == 1)));
     }
 
     bool isCMultiChar() const {
-        return (((mTokType ==  eChar) && isPrefixStringCharLiteral(mStr, '\'', emptyString)) &&
-                (mStr.length() > 3));
+        return (mTokType == eChar) && isPrefixStringCharLiteral(mStr, '\'', "") && (replaceEscapeSequences(getCharLiteral(mStr)).size() > 1);
     }
+
     /**
      * @brief Is current token a template argument?
      *
@@ -768,45 +838,82 @@ 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 {
+        return mImpl->mMacroName ? *mImpl->mMacroName : mEmptyString;
+    }
+    void setMacroName(std::string name) {
+        if (!mImpl->mMacroName)
+            mImpl->mMacroName = new std::string(std::move(name));
+        else
+            *mImpl->mMacroName = std::move(name);
     }
 
     template<size_t count>
     static const Token *findsimplematch(const Token * const startTok, const char (&pattern)[count]) {
         return findsimplematch(startTok, pattern, count-1);
     }
-    static const Token *findsimplematch(const Token * const startTok, const char pattern[], size_t pattern_len);
+    static const Token *findsimplematch(const Token * startTok, const char pattern[], size_t pattern_len);
 
     template<size_t count>
     static const Token *findsimplematch(const Token * const startTok, const char (&pattern)[count], const Token * const end) {
         return findsimplematch(startTok, pattern, count-1, end);
     }
-    static const Token *findsimplematch(const Token * const startTok, const char pattern[], size_t pattern_len, const Token * const end);
+    static const Token *findsimplematch(const Token * startTok, const char pattern[], size_t pattern_len, const Token * end);
 
-    static const Token *findmatch(const Token * const startTok, const char pattern[], const nonneg int varId = 0);
-    static const Token *findmatch(const Token * const startTok, const char pattern[], const Token * const end, const 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]) {
         return findsimplematch(startTok, pattern, count-1);
     }
-    static Token *findsimplematch(Token * const startTok, const char pattern[], size_t pattern_len) {
-        return const_cast<Token *>(findsimplematch(const_cast<const Token *>(startTok), pattern, pattern_len));
-    }
+    static Token *findsimplematch(Token * startTok, const char pattern[], size_t pattern_len);
     template<size_t count>
     static Token *findsimplematch(Token * const startTok, const char (&pattern)[count], const Token * const end) {
         return findsimplematch(startTok, pattern, count-1, end);
     }
-    static Token *findsimplematch(Token * const startTok, const char pattern[], size_t pattern_len, const Token * const end) {
-        return const_cast<Token *>(findsimplematch(const_cast<const Token *>(startTok), pattern, pattern_len, end));
-    }
+    static Token *findsimplematch(Token * startTok, const char pattern[], size_t pattern_len, const Token * end);
 
-    static Token *findmatch(Token * const startTok, const char pattern[], const nonneg int varId = 0) {
-        return const_cast<Token *>(findmatch(const_cast<const Token *>(startTok), pattern, varId));
+    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)
+    {
+        while (index > 0 && tok) {
+            tok = tok->next();
+            --index;
+        }
+        while (index < 0 && tok) {
+            tok = tok->previous();
+            ++index;
+        }
+        return tok;
     }
-    static Token *findmatch(Token * const startTok, const char pattern[], const Token * const end, const nonneg int varId = 0) {
-        return const_cast<Token *>(findmatch(const_cast<const Token *>(startTok), pattern, end, varId));
+
+    /**
+     * @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)
+    {
+        T *tok = thisTok->tokAt(index);
+        if (!tok) {
+            throw InternalError(thisTok, "Internal error. Token::linkAt called with index outside the tokens range.");
+        }
+        return tok->link();
     }
 
     /**
@@ -825,6 +932,7 @@ class CPPCHECKLIB Token {
      */
     static int multiCompare(const Token *tok, const char *haystack, nonneg int varid);
 
+public:
     nonneg int fileIndex() const {
         return mImpl->mFileIndex;
     }
@@ -863,20 +971,49 @@ 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().
-     * @param prepend Insert the new token before this token when it's not
-     * the first one on the tokens list.
      */
-    Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr = emptyString, bool prepend = false);
+    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 macroNameStr String used for Token::getMacroName().
+     */
+    RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr, const std::string& macroNameStr)
+    {
+        return insertToken(tokenStr, originalNameStr, macroNameStr, false);
+    }
 
-    Token* insertTokenBefore(const std::string& tokenStr, const std::string& originalNameStr = 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);
+    }
 
     Token* previous() {
         return mPrevious;
@@ -890,13 +1027,11 @@ class CPPCHECKLIB Token {
         return mImpl->mVarId;
     }
     void varId(nonneg int id) {
+        if (mImpl->mVarId == id)
+            return;
+
         mImpl->mVarId = id;
-        if (id != 0) {
-            tokType(eVariable);
-            isStandardType(false);
-        } else {
-            update_property_info();
-        }
+        update_property_info();
     }
 
     nonneg int exprId() const {
@@ -916,34 +1051,35 @@ class CPPCHECKLIB Token {
 
     bool isUniqueExprId() const
     {
-        if (mImpl->mExprId > 0) {
-            return (mImpl->mExprId & (1 << efIsUnique)) != 0;
-        }
-        return false;
+        return (mImpl->mExprId & (1 << efIsUnique)) != 0;
     }
 
     /**
-     * For debugging purposes, prints token and all tokens
-     * followed by it.
+     * For debugging purposes, prints token and all tokens followed by it.
+     */
+    void printOut() const;
+
+    /**
+     * For debugging purposes, prints token and all tokens followed by it.
      * @param title Title for the printout or use default parameter or 0
      * for no title.
      */
-    void printOut(const char *title = nullptr) const;
+    void printOut(std::ostream& out, const char *title = nullptr) const;
 
     /**
-     * For debugging purposes, prints token and all tokens
-     * followed by it.
+     * For debugging purposes, prints token and all tokens followed by it.
+     * @param xml print in XML format
      * @param title Title for the printout or use default parameter or 0
      * for no title.
      * @param fileNames Prints out file name instead of file index.
      * File index should match the index of the string in this vector.
      */
-    void printOut(const char *title, const std::vector<std::string> &fileNames) const;
+    void printOut(std::ostream& out, bool xml, const char *title, const std::vector<std::string> &fileNames) const;
 
     /**
      * print out tokens - used for debugging
      */
-    void printLines(int lines=5) const;
+    void printLines(std::ostream& out, int lines=5) const;
 
     /**
      * Replace token replaceThis with tokens between start and end,
@@ -972,6 +1108,7 @@ class CPPCHECKLIB Token {
             options.files = true;
             return options;
         }
+        // cppcheck-suppress unusedFunction
         static stringifyOptions forDebugVarId() {
             stringifyOptions options = forDebug();
             options.varid = true;
@@ -1034,6 +1171,9 @@ class CPPCHECKLIB Token {
      * to.
      */
     void link(Token *linkToToken) {
+        if (mLink == linkToToken)
+            return;
+
         mLink = linkToToken;
         if (mStr == "<" || mStr == ">")
             update_property_info();
@@ -1126,6 +1266,8 @@ class CPPCHECKLIB Token {
 
     static std::string typeStr(const Token* tok);
 
+    static bool isStandardType(const std::string& str);
+
     /**
      * @return a pointer to the Enumerator associated with this token.
      */
@@ -1178,24 +1320,22 @@ class CPPCHECKLIB Token {
     /**
      * @return the first token of the next argument. Does only work on argument
      * lists. Requires that Tokenizer::createLinks2() has been called before.
-     * Returns 0, if there is no next argument.
+     * Returns nullptr, if there is no next argument.
      */
     const Token* nextArgument() const;
-    Token *nextArgument() {
-        return const_cast<Token *>(const_cast<const Token *>(this)->nextArgument());
-    }
+    Token *nextArgument();
 
     /**
      * @return the first token of the next argument. Does only work on argument
      * lists. Should be used only before Tokenizer::createLinks2() was called.
-     * Returns 0, if there is no next argument.
+     * Returns nullptr, if there is no next argument.
      */
     const Token* nextArgumentBeforeCreateLinks2() const;
 
     /**
      * @return the first token of the next template argument. Does only work on template argument
      * lists. Requires that Tokenizer::createLinks2() has been called before.
-     * Returns 0, if there is no next argument.
+     * Returns nullptr, if there is no next argument.
      */
     const Token* nextTemplateArgument() const;
 
@@ -1214,13 +1354,16 @@ class CPPCHECKLIB Token {
      * @return the original name.
      */
     const std::string & originalName() const {
-        return mImpl->mOriginalName ? *mImpl->mOriginalName : emptyString;
+        return mImpl->mOriginalName ? *mImpl->mOriginalName : mEmptyString;
     }
 
     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;
+
     /**
      * Sets the original name.
      */
@@ -1239,24 +1382,29 @@ class CPPCHECKLIB Token {
 
     const ValueFlow::Value* getKnownValue(ValueFlow::Value::ValueType t) const;
     MathLib::bigint getKnownIntValue() const {
+        assert(!mImpl->mValues->empty());
+        assert(mImpl->mValues->front().isKnown());
+        assert(mImpl->mValues->front().valueType == ValueFlow::Value::ValueType::INT);
         return mImpl->mValues->front().intvalue;
     }
 
-    const ValueFlow::Value* getValue(const MathLib::bigint val) const;
+    const ValueFlow::Value* getValue(MathLib::bigint val) const;
 
     const ValueFlow::Value* getMaxValue(bool condition, MathLib::bigint path = 0) const;
+    const ValueFlow::Value* getMinValue(bool condition, MathLib::bigint path = 0) const;
 
     const ValueFlow::Value* getMovedValue() const;
 
-    const ValueFlow::Value * getValueLE(const MathLib::bigint val, const Settings *settings) const;
-    const ValueFlow::Value * getValueGE(const MathLib::bigint val, const Settings *settings) const;
+    const ValueFlow::Value * getValueLE(MathLib::bigint val, const Settings &settings) const;
+    const ValueFlow::Value * getValueGE(MathLib::bigint val, const Settings &settings) const;
+    const ValueFlow::Value * getValueNE(MathLib::bigint val) const;
 
-    const ValueFlow::Value * getInvalidValue(const Token *ftok, nonneg int argnr, const Settings *settings) const;
+    const ValueFlow::Value * getInvalidValue(const Token *ftok, nonneg int argnr, const Settings &settings) const;
 
-    const ValueFlow::Value* getContainerSizeValue(const MathLib::bigint val) const;
+    const ValueFlow::Value* getContainerSizeValue(MathLib::bigint val) const;
 
     const Token *getValueTokenMaxStrLength() const;
-    const Token *getValueTokenMinStrSize(const Settings *settings, MathLib::bigint* path = nullptr) const;
+    const Token *getValueTokenMinStrSize(const Settings &settings, MathLib::bigint* path = nullptr) const;
 
     /** Add token value. Return true if value is added. */
     bool addValue(const ValueFlow::Value &value);
@@ -1273,6 +1421,7 @@ class CPPCHECKLIB Token {
     void assignIndexes();
 
 private:
+    static const std::list<ValueFlow::Value> mEmptyValueList;
 
     void next(Token *nextToken) {
         mNext = nextToken;
@@ -1298,11 +1447,15 @@ class CPPCHECKLIB Token {
      */
     static const char *chrInFirstWord(const char *str, 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;
 
-    Token *mNext;
-    Token *mPrevious;
-    Token *mLink;
+    Token* mNext{};
+    Token* mPrevious{};
+    Token* mLink{};
 
     enum : uint64_t {
         fIsUnsigned             = (1ULL << 0),
@@ -1310,7 +1463,7 @@ class CPPCHECKLIB Token {
         fIsPointerCompare       = (1ULL << 2),
         fIsLong                 = (1ULL << 3),
         fIsStandardType         = (1ULL << 4),
-        fIsExpandedMacro        = (1ULL << 5),
+        //fIsExpandedMacro        = (1ULL << 5),
         fIsCast                 = (1ULL << 6),
         fIsAttributeConstructor = (1ULL << 7),  // __attribute__((constructor)) __attribute__((constructor(priority)))
         fIsAttributeDestructor  = (1ULL << 8),  // __attribute__((destructor))  __attribute__((destructor(priority)))
@@ -1322,43 +1475,47 @@ class CPPCHECKLIB Token {
         fIsAttributeUsed        = (1ULL << 14), // __attribute__((used))
         fIsAttributePacked      = (1ULL << 15), // __attribute__((packed))
         fIsAttributeExport      = (1ULL << 16), // __attribute__((__visibility__("default"))), __declspec(dllexport)
-        fIsAttributeMaybeUnused = (1ULL << 17), // [[maybe_unsed]]
-        fIsControlFlowKeyword   = (1ULL << 18), // if/switch/while/...
-        fIsOperatorKeyword      = (1ULL << 19), // operator=, etc
-        fIsComplex              = (1ULL << 20), // complex/_Complex type
-        fIsEnumType             = (1ULL << 21), // enumeration type
-        fIsName                 = (1ULL << 22),
-        fIsLiteral              = (1ULL << 23),
-        fIsTemplateArg          = (1ULL << 24),
-        fIsAttributeNodiscard   = (1ULL << 25), // __attribute__ ((warn_unused_result)), [[nodiscard]]
-        fAtAddress              = (1ULL << 26), // @ 0x4000
-        fIncompleteVar          = (1ULL << 27),
-        fConstexpr              = (1ULL << 28),
-        fExternC                = (1ULL << 29),
-        fIsSplitVarDeclComma    = (1ULL << 30), // set to true when variable declarations are split up ('int a,b;' => 'int a; int b;')
-        fIsSplitVarDeclEq       = (1ULL << 31), // set to true when variable declaration with initialization is split up ('int a=5;' => 'int a; a=5;')
-        fIsImplicitInt          = (1ULL << 32), // Is "int" token implicitly added?
-        fIsInline               = (1ULL << 33), // Is this a inline type
-        fIsTemplate             = (1ULL << 34),
-        fIsSimplifedScope       = (1ULL << 35), // scope added when simplifying e.g. if (int i = ...; ...)
-        fIsRemovedVoidParameter = (1ULL << 36), // A void function parameter has been removed
-        fIsIncompleteConstant   = (1ULL << 37),
-        fIsRestrict             = (1ULL << 38), // Is this a restrict pointer type
-        fIsAtomic               = (1ULL << 39), // Is this a _Atomic declaration
-        fIsSimplifiedTypedef    = (1ULL << 40),
-        fIsFinalType            = (1ULL << 41), // Is this a type with final specifier
+        fIsAttributeMaybeUnused = (1ULL << 17), // [[maybe_unused]]
+        fIsAttributeNodiscard   = (1ULL << 18), // __attribute__ ((warn_unused_result)), [[nodiscard]]
+        fIsAttributeFallthrough = (1ULL << 19), // [[__fallthrough__]], [[fallthrough]]
+        fIsControlFlowKeyword   = (1ULL << 20), // if/switch/while/...
+        fIsOperatorKeyword      = (1ULL << 21), // operator=, etc
+        fIsComplex              = (1ULL << 22), // complex/_Complex type
+        fIsEnumType             = (1ULL << 23), // enumeration type
+        fIsName                 = (1ULL << 24),
+        fIsLiteral              = (1ULL << 25),
+        fIsTemplateArg          = (1ULL << 26),
+        fAtAddress              = (1ULL << 27), // @ 0x4000
+        fIncompleteVar          = (1ULL << 28),
+        fConstexpr              = (1ULL << 29),
+        fExternC                = (1ULL << 30),
+        fIsSplitVarDeclComma    = (1ULL << 31), // set to true when variable declarations are split up ('int a,b;' => 'int a; int b;')
+        fIsSplitVarDeclEq       = (1ULL << 32), // set to true when variable declaration with initialization is split up ('int a=5;' => 'int a; a=5;')
+        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 = ...; ...)
+        fIsRemovedVoidParameter = (1ULL << 37), // A void function parameter has been removed
+        fIsIncompleteConstant   = (1ULL << 38),
+        fIsRestrict             = (1ULL << 39), // Is this a restrict pointer type
+        fIsAtomic               = (1ULL << 40), // Is this a _Atomic declaration
+        fIsSimplifiedTypedef    = (1ULL << 41),
+        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
     };
 
-    enum : uint64_t {
+    enum : std::uint8_t {
         efMaxSize = sizeof(nonneg int) * 8,
         efIsUnique = efMaxSize - 2,
     };
 
-    Token::Type mTokType;
+    Token::Type mTokType = eNone;
 
-    uint64_t mFlags;
+    uint64_t mFlags{};
 
-    TokenImpl *mImpl;
+    Impl* mImpl{};
 
     /**
      * Get specified flag state.
@@ -1379,22 +1536,31 @@ 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() */
     void update_property_isStandardType();
 
-    /** Update internal property cache about string and char literals */
-    void update_property_char_string_literal();
-
     /** Internal helper function to avoid excessive string allocations */
-    void astStringVerboseRecursive(std::string& ret, const nonneg int indent1 = 0, const nonneg int indent2 = 0) const;
+    void astStringVerboseRecursive(std::string& ret, nonneg int indent1 = 0, nonneg int indent2 = 0) const;
+
+    // cppcheck-suppress premium-misra-cpp-2023-12.2.1
+    bool mIsC : 1;
+    bool mIsCpp : 1;
 
 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;
@@ -1434,20 +1600,29 @@ class CPPCHECKLIB Token {
         return nullptr;
 
     }
-    Token *astTop() {
+    RET_NONNULL Token *astTop() {
+        if (mImpl->mAstTop) {
+            return mImpl->mAstTop;
+        }
         Token *ret = this;
         while (ret->mImpl->mAstParent)
             ret = ret->mImpl->mAstParent;
         return ret;
     }
 
-    const Token *astTop() const {
+    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;
 
     /**
@@ -1464,6 +1639,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)
@@ -1479,17 +1655,17 @@ 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(bool xml, std::ostream &out) const;
+    void printValueFlow(const std::vector<std::string>& files, bool xml, std::ostream &out) const;
 
     void scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo);
     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;
     }
 
@@ -1499,6 +1675,16 @@ class CPPCHECKLIB Token {
     void setTokenDebug(TokenDebug td) {
         mImpl->mDebug = td;
     }
+
+    bool isCpp() const
+    {
+        return mIsCpp;
+    }
+
+    bool isC() const
+    {
+        return mIsC;
+    }
 };
 
 Token* findTypeEnd(Token* tok);
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 9b5c4f07850..96c69bb4dd9 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-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
@@ -19,10 +19,12 @@
 //---------------------------------------------------------------------------
 #include "tokenize.h"
 
-#include "check.h"
+#include "astutils.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "library.h"
 #include "mathlib.h"
+#include "path.h"
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
@@ -34,8 +36,10 @@
 #include "token.h"
 #include "utils.h"
 #include "valueflow.h"
+#include "vfvalue.h"
 
 #include <algorithm>
+#include <array>
 #include <cassert>
 #include <cctype>
 #include <cstdlib>
@@ -43,13 +47,12 @@
 #include <ctime>
 #include <iostream>
 #include <iterator>
-#include <exception>
+#include <limits>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <stdexcept>
-#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -63,83 +66,38 @@ namespace {
     // local struct used in setVarId
     // in order to store information about the scope
     struct VarIdScopeInfo {
-        VarIdScopeInfo()
-            : isExecutable(false), isStructInit(false), isEnum(false), startVarid(0) {}
+        VarIdScopeInfo() = default;
         VarIdScopeInfo(bool isExecutable, bool isStructInit, bool isEnum, nonneg int startVarid)
             : isExecutable(isExecutable), isStructInit(isStructInit), isEnum(isEnum), startVarid(startVarid) {}
 
-        const bool isExecutable;
-        const bool isStructInit;
-        const bool isEnum;
-        const nonneg int startVarid;
+        const bool isExecutable{};
+        const bool isStructInit{};
+        const bool isEnum{};
+        const nonneg int startVarid{};
     };
 }
 
 /** Return whether tok is the "{" that starts an enumerator list */
 static bool isEnumStart(const Token* tok)
 {
-    if (!tok || tok->str() != "{")
+    if (!Token::simpleMatch(tok, "{"))
         return false;
-    return (tok->strAt(-1) == "enum") || (tok->strAt(-2) == "enum") || Token::Match(tok->tokAt(-3), "enum class %name%");
+    tok = tok->previous();
+    while (tok && (!tok->isKeyword() || Token::isStandardType(tok->str())) && Token::Match(tok, "%name%|::|:"))
+        tok = tok->previous();
+    if (Token::simpleMatch(tok, "class"))
+        tok = tok->previous();
+    return Token::simpleMatch(tok, "enum");
 }
 
 template<typename T>
-static void skipEnumBody(T **tok)
+static void skipEnumBody(T *&tok)
 {
-    T *defStart = *tok;
+    T *defStart = tok;
     while (Token::Match(defStart, "%name%|::|:"))
         defStart = defStart->next();
     if (defStart && defStart->str() == "{")
-        *tok = defStart->link()->next();
-}
-
-const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &endsWith) const
-{
-    return Tokenizer::isFunctionHead(tok, endsWith, isCPP());
-}
-
-const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &endsWith, bool cpp)
-{
-    if (!tok)
-        return nullptr;
-    if (tok->str() == "(")
-        tok = tok->link();
-    if (Token::Match(tok, ") ;|{|[")) {
-        tok = tok->next();
-        while (tok && tok->str() == "[" && tok->link()) {
-            if (endsWith.find(tok->str()) != std::string::npos)
-                return tok;
-            tok = tok->link()->next();
-        }
-        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
-    }
-    if (cpp && tok->str() == ")") {
-        tok = tok->next();
-        while (Token::Match(tok, "const|noexcept|override|final|volatile|mutable|&|&& !!(") ||
-               (Token::Match(tok, "%name% !!(") && tok->isUpperCaseName()))
-            tok = tok->next();
-        if (tok && tok->str() == ")")
-            tok = tok->next();
-        while (tok && tok->str() == "[")
-            tok = tok->link()->next();
-        if (Token::Match(tok, "throw|noexcept ("))
-            tok = tok->linkAt(1)->next();
-        if (Token::Match(tok, "%name% (") && tok->isUpperCaseName())
-            tok = tok->linkAt(1)->next();
-        if (tok && tok->originalName() == "->") { // trailing return type
-            for (tok = tok->next(); tok && !Token::Match(tok, ";|{|override|final"); tok = tok->next())
-                if (tok->link() && Token::Match(tok, "<|[|("))
-                    tok = tok->link();
-        }
-        while (Token::Match(tok, "override|final !!(") ||
-               (Token::Match(tok, "%name% !!(") && tok->isUpperCaseName()))
-            tok = tok->next();
-        if (Token::Match(tok, "= 0|default|delete ;"))
-            tok = tok->tokAt(2);
-
-        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
-    }
-    return nullptr;
+        tok = defStart->link()->next();
 }
 
 /**
@@ -150,28 +108,19 @@ static bool isClassStructUnionEnumStart(const Token * tok)
     if (!Token::Match(tok->previous(), "class|struct|union|enum|%name%|>|>> {"))
         return false;
     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");
 }
 
 //---------------------------------------------------------------------------
 
-Tokenizer::Tokenizer(const Settings *settings, ErrorLogger *errorLogger, const Preprocessor *preprocessor) :
-    list(settings),
-    mSettings(settings),
+Tokenizer::Tokenizer(TokenList tokenList, ErrorLogger &errorLogger) :
+    list(std::move(tokenList)),
+    mSettings(list.getSettings()),
     mErrorLogger(errorLogger),
-    mSymbolDatabase(nullptr),
-    mTemplateSimplifier(new TemplateSimplifier(*this)),
-    mVarId(0),
-    mUnnamedCount(0),
-    mCodeWithTemplates(false), //is there any templates?
-    mTimerResults(nullptr),
-    mPreprocessor(preprocessor)
-{
-    // make sure settings are specified
-    assert(mSettings);
-}
+    mTemplateSimplifier(new TemplateSimplifier(*this))
+{}
 
 Tokenizer::~Tokenizer()
 {
@@ -186,9 +135,9 @@ Tokenizer::~Tokenizer()
 
 nonneg int Tokenizer::sizeOfType(const std::string& type) const
 {
-    const std::map<std::string, int>::const_iterator it = mTypeSize.find(type);
+    const auto it = utils::as_const(mTypeSize).find(type);
     if (it == mTypeSize.end()) {
-        const Library::PodType* podtype = mSettings->library.podtype(type);
+        const Library::PodType* podtype = mSettings.library.podtype(type);
         if (!podtype)
             return 0;
 
@@ -205,9 +154,9 @@ nonneg int Tokenizer::sizeOfType(const Token *type) const
     if (type->tokType() == Token::eString)
         return Token::getStrLength(type) + 1U;
 
-    const std::map<std::string, int>::const_iterator it = mTypeSize.find(type->str());
+    const auto it = utils::as_const(mTypeSize).find(type->str());
     if (it == mTypeSize.end()) {
-        const Library::PodType* podtype = mSettings->library.podtype(type->str());
+        const Library::PodType* podtype = mSettings.library.podtype(type->str());
         if (!podtype)
             return 0;
 
@@ -215,9 +164,9 @@ nonneg int Tokenizer::sizeOfType(const Token *type) const
     }
     if (type->isLong()) {
         if (type->str() == "double")
-            return mSettings->platform.sizeof_long_double;
+            return mSettings.platform.sizeof_long_double;
         if (type->str() == "long")
-            return mSettings->platform.sizeof_long_long;
+            return mSettings.platform.sizeof_long_long;
     }
 
     return it->second;
@@ -225,10 +174,10 @@ nonneg int Tokenizer::sizeOfType(const Token *type) const
 //---------------------------------------------------------------------------
 
 // check if this statement is a duplicate definition
-bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token *typeDef) const
+bool Tokenizer::duplicateTypedef(Token *&tokPtr, const Token *name, const Token *typeDef) const
 {
     // check for an end of definition
-    Token * tok = *tokPtr;
+    Token * tok = tokPtr;
     if (tok && Token::Match(tok->next(), ";|,|[|=|)|>|(|{")) {
         Token * end = tok->next();
 
@@ -243,7 +192,7 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token
 
             // find end of definition
             while (end && end->next() && !Token::Match(end->next(), ";|)|>")) {
-                if (end->next()->str() == "(")
+                if (end->strAt(1) == "(")
                     end = end->linkAt(1);
 
                 end = (end)?end->next():nullptr;
@@ -251,22 +200,22 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token
             if (end)
                 end = end->next();
         } else if (end->str() == "(") {
-            if (tok->previous()->str().compare(0, 8, "operator")  == 0)
+            if (startsWith(tok->strAt(-1), "operator"))
                 // conversion operator
                 return false;
-            if (tok->previous()->str() == "typedef")
+            if (tok->strAt(-1) == "typedef")
                 // typedef of function returning this type
                 return false;
             if (Token::Match(tok->previous(), "public:|private:|protected:"))
                 return false;
-            if (tok->previous()->str() == ">") {
+            if (tok->strAt(-1) == ">") {
                 if (!Token::Match(tok->tokAt(-2), "%type%"))
                     return false;
 
                 if (!Token::Match(tok->tokAt(-3), ",|<"))
                     return false;
 
-                *tokPtr = end->link();
+                tokPtr = end->link();
                 return true;
             }
         }
@@ -277,7 +226,7 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token
                 if (Token::Match(tok->previous(), "%type%") &&
                     !Token::Match(tok->previous(), "return|new|const|struct")) {
                     // duplicate definition so skip entire function
-                    *tokPtr = end->next()->link();
+                    tokPtr = end->linkAt(1);
                     return true;
                 }
             } else if (end->str() == ">") { // template parameter ?
@@ -288,52 +237,52 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token
                     while (end && end->str() != "{")
                         end = end->next();
                     if (end) {
-                        *tokPtr = end->link();
+                        tokPtr = end->link();
                         return true;
                     }
                 }
             } else {
                 // look backwards
                 if (Token::Match(tok->previous(), "typedef|}|>") ||
-                    (end->str() == ";" && tok->previous()->str() == ",") ||
-                    (tok->previous()->str() == "*" && tok->next()->str() != "(") ||
+                    (end->str() == ";" && tok->strAt(-1) == ",") ||
+                    (tok->strAt(-1) == "*" && tok->strAt(1) != "(") ||
                     (Token::Match(tok->previous(), "%type%") &&
                      (!Token::Match(tok->previous(), "return|new|const|friend|public|private|protected|throw|extern") &&
                       !Token::simpleMatch(tok->tokAt(-2), "friend class")))) {
                     // scan backwards for the end of the previous statement
                     while (tok && tok->previous() && !Token::Match(tok->previous(), ";|{")) {
-                        if (tok->previous()->str() == "}") {
-                            tok = tok->previous()->link();
-                        } else if (tok->previous()->str() == "typedef") {
+                        if (tok->strAt(-1) == "}") {
+                            tok = tok->linkAt(-1);
+                        } else if (tok->strAt(-1) == "typedef") {
                             return true;
-                        } else if (tok->previous()->str() == "enum") {
+                        } else if (tok->strAt(-1) == "enum") {
                             return true;
-                        } else if (tok->previous()->str() == "struct") {
+                        } else if (tok->strAt(-1) == "struct") {
                             if (tok->strAt(-2) == "typedef" &&
-                                tok->next()->str() == "{" &&
+                                tok->strAt(1) == "{" &&
                                 typeDef->strAt(3) != "{") {
                                 // declaration after forward declaration
                                 return true;
                             }
-                            if (tok->next()->str() == "{")
+                            if (tok->strAt(1) == "{")
                                 return true;
                             if (Token::Match(tok->next(), ")|*"))
                                 return true;
-                            if (tok->next()->str() == name->str())
+                            if (tok->strAt(1) == name->str())
                                 return true;
-                            if (tok->next()->str() != ";")
+                            if (tok->strAt(1) != ";")
                                 return true;
                             return false;
-                        } else if (tok->previous()->str() == "union") {
-                            return tok->next()->str() != ";";
-                        } else if (isCPP() && tok->previous()->str() == "class") {
-                            return tok->next()->str() != ";";
+                        } else if (tok->strAt(-1) == "union") {
+                            return tok->strAt(1) != ";";
+                        } else if (tok->isCpp() && tok->strAt(-1) == "class") {
+                            return tok->strAt(1) != ";";
                         }
                         if (tok)
                             tok = tok->previous();
                     }
 
-                    if ((*tokPtr)->strAt(1) != "(" || !Token::Match((*tokPtr)->linkAt(1), ") .|(|["))
+                    if (tokPtr->strAt(1) != "(" || !Token::Match(tokPtr->linkAt(1), ") .|(|["))
                         return true;
                 }
             }
@@ -345,7 +294,7 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token
 
 void Tokenizer::unsupportedTypedef(const Token *tok) const
 {
-    if (!mSettings->debugwarnings)
+    if (!mSettings.debugwarnings)
         return;
 
     std::ostringstream str;
@@ -380,13 +329,13 @@ Token * Tokenizer::deleteInvalidTypedef(Token *typeDef)
 
     // remove typedef but leave ;
     while (typeDef->next()) {
-        if (typeDef->next()->str() == ";") {
+        if (typeDef->strAt(1) == ";") {
             typeDef->deleteNext();
             break;
         }
-        if (typeDef->next()->str() == "{")
+        if (typeDef->strAt(1) == "{")
             Token::eraseTokens(typeDef, typeDef->linkAt(1));
-        else if (typeDef->next()->str() == "}")
+        else if (typeDef->strAt(1) == "}")
             break;
         typeDef->deleteNext();
     }
@@ -404,11 +353,10 @@ Token * Tokenizer::deleteInvalidTypedef(Token *typeDef)
 
 namespace {
     struct Space {
-        Space() : bodyEnd(nullptr), bodyEnd2(nullptr), isNamespace(false) {}
         std::string className;
-        const Token * bodyEnd;  // for body contains typedef define
-        const Token * bodyEnd2; // for body contains typedef using
-        bool isNamespace;
+        const Token* bodyEnd{};  // for body contains typedef define
+        const Token* bodyEnd2{}; // for body contains typedef using
+        bool isNamespace{};
         std::set<std::string> recordTypes;
     };
 }
@@ -416,17 +364,15 @@ namespace {
 static Token *splitDefinitionFromTypedef(Token *tok, nonneg int *unnamedCount)
 {
     std::string name;
-    bool isConst = false;
-    Token *tok1 = tok->next();
+    std::set<std::string> qualifiers;
 
-    // skip const if present
-    if (tok1->str() == "const") {
-        tok1->deleteThis();
-        isConst = true;
+    while (Token::Match(tok->next(), "const|volatile")) {
+        qualifiers.insert(tok->strAt(1));
+        tok->deleteNext();
     }
 
     // skip "class|struct|union|enum"
-    tok1 = tok1->next();
+    Token *tok1 = tok->tokAt(2);
 
     const bool hasName = Token::Match(tok1, "%name%");
 
@@ -452,9 +398,9 @@ static Token *splitDefinitionFromTypedef(Token *tok, nonneg int *unnamedCount)
         if (tok1->next()) {
             // use typedef name if available
             if (Token::Match(tok1->next(), "%type%"))
-                name = tok1->next()->str();
+                name = tok1->strAt(1);
             else // create a unique name
-                name = "Unnamed" + MathLib::toString((*unnamedCount)++);
+                name = "Unnamed" + std::to_string((*unnamedCount)++);
             tok->next()->insertToken(name);
         } else
             return nullptr;
@@ -463,7 +409,7 @@ static Token *splitDefinitionFromTypedef(Token *tok, nonneg int *unnamedCount)
     tok1->insertToken(";");
     tok1 = tok1->next();
 
-    if (tok1->next() && tok1->next()->str() == ";" && tok1->previous()->str() == "}") {
+    if (tok1->next() && tok1->strAt(1) == ";" && tok1->strAt(-1) == "}") {
         tok->deleteThis();
         tok1->deleteThis();
         return nullptr;
@@ -471,11 +417,11 @@ static Token *splitDefinitionFromTypedef(Token *tok, nonneg int *unnamedCount)
     tok1->insertToken("typedef");
     tok1 = tok1->next();
     Token * tok3 = tok1;
-    if (isConst) {
-        tok1->insertToken("const");
+    for (const std::string &qualifier : qualifiers) {
+        tok1->insertToken(qualifier);
         tok1 = tok1->next();
     }
-    tok1->insertToken(tok->next()->str()); // struct, union or enum
+    tok1->insertToken(tok->strAt(1)); // struct, union or enum
     tok1 = tok1->next();
     tok1->insertToken(name);
     tok->deleteThis();
@@ -491,8 +437,8 @@ static Token *splitDefinitionFromTypedef(Token *tok, nonneg int *unnamedCount)
  * related pattern */
 const Token *Tokenizer::processFunc(const Token *tok2, bool inOperator) const
 {
-    if (tok2->next() && tok2->next()->str() != ")" &&
-        tok2->next()->str() != ",") {
+    if (tok2->next() && tok2->strAt(1) != ")" &&
+        tok2->strAt(1) != ",") {
         // skip over tokens for some types of canonicalization
         if (Token::Match(tok2->next(), "( * %type% ) ("))
             tok2 = tok2->linkAt(5);
@@ -509,39 +455,42 @@ const Token *Tokenizer::processFunc(const Token *tok2, bool inOperator) const
                  Token::simpleMatch(tok2->linkAt(2), "] ;"))
             tok2 = tok2->next();
         else {
-            if (tok2->next()->str() == "(")
-                tok2 = tok2->next()->link();
+            if (tok2->strAt(1) == "(")
+                tok2 = tok2->linkAt(1);
             else if (!inOperator && !Token::Match(tok2->next(), "[|>|;")) {
                 tok2 = tok2->next();
 
                 while (Token::Match(tok2, "*|&") &&
-                       !Token::Match(tok2->next(), ")|>"))
+                       !Token::Match(tok2->next(), "[)>,]"))
                     tok2 = tok2->next();
 
                 // skip over namespace
                 while (Token::Match(tok2, "%name% ::"))
                     tok2 = tok2->tokAt(2);
 
+                if (Token::simpleMatch(tok2, "const"))
+                    tok2 = tok2->next();
+
                 if (!tok2)
                     return nullptr;
 
                 if (tok2->str() == "(" &&
                     tok2->link()->next() &&
-                    tok2->link()->next()->str() == "(") {
+                    tok2->link()->strAt(1) == "(") {
                     tok2 = tok2->link();
 
-                    if (tok2->next()->str() == "(")
-                        tok2 = tok2->next()->link();
+                    if (tok2->strAt(1) == "(")
+                        tok2 = tok2->linkAt(1);
                 }
 
                 // skip over typedef parameter
-                if (tok2->next() && tok2->next()->str() == "(") {
-                    tok2 = tok2->next()->link();
+                if (tok2->next() && tok2->strAt(1) == "(") {
+                    tok2 = tok2->linkAt(1);
                     if (!tok2->next())
                         syntaxError(tok2);
 
-                    if (tok2->next()->str() == "(")
-                        tok2 = tok2->next()->link();
+                    if (tok2->strAt(1) == "(")
+                        tok2 = tok2->linkAt(1);
                 }
             }
         }
@@ -554,29 +503,6 @@ Token *Tokenizer::processFunc(Token *tok2, bool inOperator)
     return const_cast<Token*>(processFunc(const_cast<const Token*>(tok2), inOperator));
 }
 
-void Tokenizer::simplifyUsingToTypedef()
-{
-    if (!isCPP() || mSettings->standards.cpp < Standards::CPP11)
-        return;
-
-    for (Token *tok = list.front(); tok; tok = tok->next()) {
-        // using a::b;  =>   typedef  a::b  b;
-        if ((Token::Match(tok, "[;{}] using %name% :: %name% ::|;") && !tok->tokAt(2)->isKeyword()) ||
-            (Token::Match(tok, "[;{}] using :: %name% :: %name% ::|;") && !tok->tokAt(3)->isKeyword())) {
-            Token *endtok = tok->tokAt(5);
-            if (Token::Match(endtok, "%name%"))
-                endtok = endtok->next();
-            while (Token::Match(endtok, ":: %name%"))
-                endtok = endtok->tokAt(2);
-            if (endtok && endtok->str() == ";") {
-                tok->next()->str("typedef");
-                endtok = endtok->previous();
-                endtok->insertToken(endtok->str());
-            }
-        }
-    }
-}
-
 void Tokenizer::simplifyTypedefLHS()
 {
     if (!list.front())
@@ -626,20 +552,19 @@ namespace {
         std::pair<Token*, Token*> mRangeType;
         std::pair<Token*, Token*> mRangeTypeQualifiers;
         std::pair<Token*, Token*> mRangeAfterVar;
-        std::string mTypedefName;  // Name of typedef type
         Token* mNameToken{nullptr};
         bool mFail = false;
         bool mReplaceFailed = false;
         bool mUsed = false;
 
     public:
-        TypedefSimplifier(Token* typedefToken, int &num) : mTypedefToken(typedefToken) {
+        explicit TypedefSimplifier(Token* typedefToken) : mTypedefToken(typedefToken) {
             Token* start = typedefToken->next();
             if (Token::simpleMatch(start, "typename"))
                 start = start->next();
 
             // TODO handle unnamed structs etc
-            if (Token::Match(start, "const| enum|struct|union|class %name% {")) {
+            if (Token::Match(start, "const| enum|struct|union|class %name%| {")) {
                 const std::pair<Token*, Token*> rangeBefore(start, Token::findsimplematch(start, "{"));
 
                 // find typedef name token
@@ -649,12 +574,12 @@ namespace {
                 const std::pair<Token*, Token*> rangeQualifiers(rangeBefore.second->link()->next(), nameToken);
 
                 if (Token::Match(nameToken, "%name% ;")) {
+                    if (Token::Match(rangeBefore.second->previous(), "enum|struct|union|class {"))
+                        rangeBefore.second->previous()->insertToken(nameToken->str());
                     mRangeType = rangeBefore;
                     mRangeTypeQualifiers = rangeQualifiers;
-                    mTypedefName = nameToken->str();
                     Token* typeName = rangeBefore.second->previous();
                     if (typeName->isKeyword()) {
-                        (void)num;
                         // TODO typeName->insertToken("T:" + std::to_string(num++));
                         typeName->insertToken(nameToken->str());
                     }
@@ -664,7 +589,7 @@ namespace {
                 }
             }
 
-            for (Token* type = start; Token::Match(type, "%name%|*|&"); type = type->next()) {
+            for (Token* type = start; Token::Match(type, "%name%|*|&|&&"); type = type->next()) {
                 if (type != start && Token::Match(type, "%name% ;") && !type->isStandardType()) {
                     mRangeType.first = start;
                     mRangeType.second = type;
@@ -695,7 +620,7 @@ namespace {
                     mRangeAfterVar.second = mEndToken;
                     return;
                 }
-                if (Token::Match(type, "%name% ( !!(") && Token::simpleMatch(type->linkAt(1), ") ;") && !type->isStandardType()) {
+                if (type != start && Token::Match(type, "%name% ( !!(") && Token::simpleMatch(type->linkAt(1), ") ;") && !type->isStandardType()) {
                     mNameToken = type;
                     mEndToken = type->linkAt(1)->next();
                     mRangeType.first = start;
@@ -707,7 +632,7 @@ namespace {
             }
             // TODO: handle all typedefs
             if ((false))
-                printTypedef(typedefToken);
+                printTypedef(typedefToken, std::cout);
             mFail = true;
         }
 
@@ -744,14 +669,18 @@ 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 = Tokenizer::isFunctionPointer(mNameToken);
 
-            // Special handling for T() when T is a pointer
-            if (Token::Match(tok, "%name% ( )")) {
+            // Special handling for T(...) when T is a pointer
+            if (Token::Match(tok, "%name% [({]") && !isFunctionPointer && !Token::simpleMatch(tok->linkAt(1), ") (")) {
                 bool pointerType = false;
                 for (const Token* type = mRangeType.first; type != mRangeType.second; type = type->next()) {
                     if (type->str() == "*" || type->str() == "&") {
@@ -766,34 +695,52 @@ namespace {
                     }
                 }
                 if (pointerType) {
-                    tok->deleteThis();
-                    tok->next()->insertToken("0");
-                    Token* tok2 = insertTokens(tok, mRangeType);
-                    insertTokens(tok2, mRangeTypeQualifiers);
+                    tok->tokAt(1)->str("(");
+                    tok->linkAt(1)->str(")");
+                    if (tok->linkAt(1) == tok->tokAt(2)) { // T() or T{}
+                        tok->deleteThis();
+                        tok->next()->insertToken("0");
+                        Token* tok2 = insertTokens(tok, mRangeType);
+                        insertTokens(tok2, mRangeTypeQualifiers);
+                    }
+                    else { // functional-style cast
+                        tok->originalName(originalname);
+                        tok->isSimplifiedTypedef(true);
+                        tok->str("(");
+                        Token* tok2 = insertTokens(tok, mRangeType);
+                        tok2 = insertTokens(tok2, mRangeTypeQualifiers);
+                        Token* tok3 = tok2->insertToken(")");
+                        Token::createMutualLinks(tok, tok3);
+                        tok->insertTokenBefore("(");
+                        tok3 = tok3->linkAt(1);
+                        tok3 = tok3->insertToken(")");
+                        Token::createMutualLinks(tok->tokAt(-1), tok3);
+                    }
                     return;
                 }
             }
 
             // Special handling of function pointer cast
-            const bool isFunctionPointer = Token::Match(mNameToken, "%name% )");
             if (isFunctionPointer && isCast(tok->previous())) {
                 tok->insertToken("*");
-                insertTokens(tok, std::pair<Token*, Token*>(mRangeType.first, mNameToken->linkAt(1)));
+                Token* const tok_1 = insertTokens(tok, std::pair<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->str(mRangeType.second->previous()->str());
+            if (Token::Match(mRangeType.first, "const| struct|class %name% {") && Token::Match(tok->previous(), "public|protected|private|<")) {
+                tok->originalName(originalname);
+                tok->str(mRangeType.second->strAt(-1));
                 return;
             }
 
             if (Token::Match(tok, "%name% ::")) {
-                if (Token::Match(mRangeType.first, "const| struct|class %name% %name% ;")) {
-                    tok->originalName(tok->str());
-                    tok->str(mRangeType.second->previous()->str());
+                if (Token::Match(mRangeType.first, "const| struct|class|union|enum %name% %name%|{") ||
+                    Token::Match(mRangeType.first, "%name% %name% ;")) {
+                    tok->originalName(originalname);
+                    tok->str(mRangeType.second->strAt(-1));
                 } else {
                     mReplaceFailed = true;
                 }
@@ -812,7 +759,8 @@ namespace {
                 if (pointerType) {
                     tok->insertToken("const");
                     tok->next()->column(tok->column());
-                    tok->next()->isExpandedMacro(tok->previous()->isExpandedMacro());
+                    if (!tok->previous()->getMacroName().empty())
+                        tok->next()->setMacroName(tok->previous()->getMacroName());
                     tok->deletePrevious();
                 }
             }
@@ -820,7 +768,7 @@ namespace {
             // Do not duplicate class/struct/enum/union
             if (Token::Match(tok->previous(), "enum|union|struct|class")) {
                 bool found = false;
-                const std::string &kw = tok->previous()->str();
+                const std::string &kw = tok->strAt(-1);
                 for (const Token* type = mRangeType.first; type != mRangeType.second; type = type->next()) {
                     if (type->str() == kw) {
                         found = true;
@@ -835,13 +783,22 @@ namespace {
                 }
             }
 
-            Token* const tok2 = insertTokens(tok, mRangeType);
+            // don't add class|struct|union in inheritance list
+            auto rangeType = mRangeType;
+            if (Token::Match(tok->previous(), "public|private|protected")) {
+                while (Token::Match(rangeType.first, "const|class|struct|union"))
+                    rangeType.first = rangeType.first->next();
+            }
+
+            Token* const tok2 = insertTokens(tok, rangeType);
             Token* const tok3 = insertTokens(tok2, mRangeTypeQualifiers);
 
+            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) {
@@ -850,6 +807,10 @@ namespace {
                     Token::createMutualLinks(tok3->next(), after->previous());
                 }
             }
+            if (!after) {
+                mReplaceFailed = true;
+                return;
+            }
 
             bool useAfterVarRange = true;
             if (Token::simpleMatch(mRangeAfterVar.first, "[")) {
@@ -880,6 +841,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() == "[")
@@ -894,10 +857,20 @@ namespace {
             if (!after)
                 throw InternalError(tok, "Failed to simplify typedef. Is the code valid?");
 
-            const Token* const tok4 = useAfterVarRange ? insertTokens(after->previous(), mRangeAfterVar)->next() : tok3->next();
+            Token* const tok4 = useAfterVarRange ? insertTokens(after->previous(), mRangeAfterVar)->next() : tok3->next();
+
+            if (tok->next() == tok4)
+                throw InternalError(tok, "Failed to simplify typedef. Is the code valid?");
 
             tok->deleteThis();
 
+            // Unsplit variable declarations
+            if (tok4 && tok4->isSplittedVarDeclEq() &&
+                ((tok4->isCpp() && Token::Match(tok4->tokAt(-2), "&|&& %name% ;")) || Token::Match(tok4->previous(), "] ; %name% = {"))) {
+                tok4->deleteNext();
+                tok4->deleteThis();
+            }
+
             // Set links
             std::stack<Token*> brackets;
             for (; tok != tok4; tok = tok->next()) {
@@ -921,11 +894,7 @@ namespace {
             }
         }
 
-        bool canReplace(const Token* tok) {
-            if (mNameToken == tok)
-                return false;
-            if (!Token::Match(tok->previous(), "%name%|;|{|}|(|,|<") && !Token::Match(tok->previous(), "!!. %name% ("))
-                return false;
+        static int canReplaceStatic(const Token* tok) {
             if (!Token::Match(tok, "%name% %name%|*|&|&&|;|(|)|,|::")) {
                 if (Token::Match(tok->previous(), "( %name% =") && Token::Match(tok->linkAt(-1), ") %name%|{") && !tok->tokAt(-2)->isKeyword())
                     return true;
@@ -933,8 +902,19 @@ namespace {
                     return true;
                 if (Token::Match(tok->previous(), "new %name% ["))
                     return true;
-                if (Token::Match(tok->previous(), "< %name% >"))
+                if (Token::Match(tok->previous(), "< %name%") && tok->previous()->findClosingBracket())
+                    return true;
+                if (Token::Match(tok->previous(), ", %name% >|>>")) {
+                    for (const Token* prev = tok->previous(); prev; prev = prev->previous()) {
+                        if (Token::Match(prev, "[;{}(]"))
+                            break;
+                        if (prev->str() == "<" && prev->findClosingBracket() == tok->next())
+                            return true;
+                        if (prev->str() == ")")
+                            prev = prev->link();
+                    }
                     return true;
+                }
                 if (Token::Match(tok->previous(), "public|protected|private"))
                     return true;
                 if (Token::Match(tok->previous(), ", %name% :")) {
@@ -951,13 +931,26 @@ namespace {
                 }
                 return false;
             }
+            return -1;
+        }
+
+        bool canReplace(const Token* tok) {
+            if (mNameToken == tok)
+                return false;
+            if (!Token::Match(tok->previous(), "%name%|;|{|}|(|,|<") && !Token::Match(tok->previous(), "!!. %name% ("))
+                return false;
+            {
+                const int res = canReplaceStatic(tok);
+                if (res == 0 || res == 1)
+                    return res != 0;
+            }
             if (Token::Match(tok->previous(), "%name%") && !tok->previous()->isKeyword())
                 return false;
             if (Token::simpleMatch(tok->next(), "(") && Token::Match(tok->linkAt(1), ") %name%|{"))
                 return false;
             if (Token::Match(tok->previous(), "struct|union|class|enum %name% %name%") &&
                 Token::simpleMatch(mRangeType.second, "{") &&
-                tok->str() != mRangeType.second->previous()->str())
+                tok->str() != mRangeType.second->strAt(-1))
                 return true;
             if (Token::Match(tok->previous(), "; %name% ;"))
                 return false;
@@ -992,11 +985,15 @@ namespace {
             return mEndToken;
         }
 
+        Token* nameToken() const {
+            return mNameToken;
+        }
+
     private:
         static bool isCast(const Token* tok) {
-            if (Token::Match(tok, "( %name% ) (|%name%"))
-                return !tok->tokAt(2)->isKeyword();
-            if (Token::Match(tok, "< %name% > (") && tok->previous() && endsWith(tok->previous()->str(), "_cast", 5))
+            if (Token::Match(tok, "( %name% ) (|%name%|%num%"))
+                return !tok->tokAt(3)->isKeyword();
+            if (Token::Match(tok, "< %name% > (") && tok->previous() && endsWith(tok->strAt(-1), "_cast", 5))
                 return true;
             return false;
         }
@@ -1012,38 +1009,46 @@ namespace {
             return to;
         }
 
-        static void printTypedef(const Token *tok) {
+        static void printTypedef(const Token *tok, std::ostream& out) {
             int indent = 0;
             while (tok && (indent > 0 || tok->str() != ";")) {
                 if (tok->str() == "{")
                     ++indent;
                 else if (tok->str() == "}")
                     --indent;
-                std::cout << " " << tok->str();
+                out << " " << tok->str();
                 tok = tok->next();
             }
-            std::cout << "\n";
+            out << "\n";
         }
     };
 }
 
+bool Tokenizer::isFunctionPointer(const Token* tok) {
+    return Token::Match(tok, "%name% ) (");
+}
+
 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") {
-            int dummy = 0;
-            TypedefSimplifier ts(tok, dummy);
-            if (!ts.fail())
-                numberOfTypedefs[ts.name()]++;
+            TypedefSimplifier ts(tok);
+            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()].insert(existing_data_type);
             continue;
         }
     }
 
     int indentlevel = 0;
-    int typeNum = 1;
     std::map<std::string, TypedefSimplifier> typedefs;
     for (Token* tok = list.front(); tok; tok = tok->next()) {
         if (!tok->isName()) {
@@ -1055,11 +1060,10 @@ void Tokenizer::simplifyTypedef()
         }
 
         if (indentlevel == 0 && tok->str() == "typedef") {
-            TypedefSimplifier ts(tok, typeNum);
-            if (!ts.fail() && numberOfTypedefs[ts.name()] == 1) {
-                if (mSettings->severity.isEnabled(Severity::portability) && ts.isInvalidConstFunctionType(typedefs))
-                    reportError(tok->next(), Severity::portability, "invalidConstFunctionType",
-                                "It is unspecified behavior to const qualify a function type.");
+            TypedefSimplifier ts(tok);
+            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);
                 if (!ts.isStructEtc())
                     tok = ts.endToken();
@@ -1070,8 +1074,11 @@ void Tokenizer::simplifyTypedef()
         auto it = typedefs.find(tok->str());
         if (it != typedefs.end() && it->second.canReplace(tok)) {
             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") {
@@ -1088,7 +1095,9 @@ void Tokenizer::simplifyTypedef()
     {
         // remove typedefs
         for (auto &t: typedefs) {
-            if (!t.second.replaceFailed()) {
+            if (t.second.replaceFailed()) {
+                syntaxError(t.second.getTypedefToken());
+            } else {
                 const Token* const typedefToken = t.second.getTypedefToken();
                 TypedefInfo typedefInfo;
                 typedefInfo.name = t.second.name();
@@ -1096,6 +1105,18 @@ void Tokenizer::simplifyTypedef()
                 typedefInfo.lineNumber = typedefToken->linenr();
                 typedefInfo.column = typedefToken->column();
                 typedefInfo.used = t.second.isUsed();
+                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();
@@ -1106,44 +1127,61 @@ void Tokenizer::simplifyTypedef()
             list.front()->deleteThis();
     }
 
+    validate();
+
     simplifyTypedefCpp();
 }
 
+static Token* simplifyTypedefCopyTokens(Token* to, const Token* fromStart, const Token* toEnd, const Token* location) {
+    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);
+    }
+    return ret;
+}
+
+static Token* simplifyTypedefInsertToken(Token* tok, const std::string& str, const Token* location) {
+    tok = tok->insertToken(str);
+    tok->linenr(location->linenr());
+    tok->column(location->column());
+    tok->isSimplifiedTypedef(true);
+    return tok;
+}
+
+// TODO: rename - it is not C++ specific
 void Tokenizer::simplifyTypedefCpp()
 {
-    std::vector<Space> spaceInfo;
+    const bool cpp = isCPP();
     bool isNamespace = false;
-    std::string className;
-    std::string fullClassName;
+    std::string className, fullClassName;
     bool hasClass = false;
     bool goback = false;
 
     // add global namespace
-    spaceInfo.emplace_back(/*Space{}*/);
+    std::vector<Space> spaceInfo(1);
 
-    // Convert "using a::b;" to corresponding typedef statements
-    simplifyUsingToTypedef();
-
-    const std::time_t maxTime = mSettings->typedefMaxTime > 0 ? std::time(nullptr) + mSettings->typedefMaxTime: 0;
+    const std::time_t maxTime = mSettings.typedefMaxTime > 0 ? std::time(nullptr) + mSettings.typedefMaxTime: 0;
+    const bool doProgress = (mSettings.reportProgress != -1) && !list.getFiles().empty();
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (mErrorLogger && !list.getFiles().empty())
-            mErrorLogger->reportProgress(list.getFiles()[0], "Tokenize (typedef)", tok->progressValue());
+        if (doProgress)
+            mErrorLogger.reportProgress(list.getFiles()[0], "Tokenize (typedef)", tok->progressValue());
 
         if (Settings::terminated())
             return;
 
         if (maxTime > 0 && std::time(nullptr) > maxTime) {
-            if (mSettings->debugwarnings) {
-                ErrorMessage::FileLocation loc;
-                loc.setfile(list.getFiles()[0]);
+            if (mSettings.debugwarnings) {
+                ErrorMessage::FileLocation loc(list.getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
+                                    "",
                                     Severity::debug,
                                     "Typedef simplification instantiation maximum time exceeded",
                                     "typedefMaxTime",
                                     Certainty::normal);
-                mErrorLogger->reportErr(errmsg);
+                mErrorLogger.reportErr(errmsg);
             }
             return;
         }
@@ -1159,10 +1197,10 @@ void Tokenizer::simplifyTypedefCpp()
                 // Skip typedefs inside parentheses (#2453 and #4002)
                 tok = tok->next();
             } else if (Token::Match(tok, "class|struct|namespace %any%") &&
-                       (!tok->previous() || tok->previous()->str() != "enum")) {
+                       (!tok->previous() || tok->strAt(-1) != "enum")) {
                 isNamespace = (tok->str() == "namespace");
                 hasClass = true;
-                className = tok->next()->str();
+                className = tok->strAt(1);
                 const Token *tok1 = tok->next();
                 fullClassName = className;
                 while (Token::Match(tok1, "%name% :: %name%")) {
@@ -1191,7 +1229,10 @@ void Tokenizer::simplifyTypedefCpp()
 
         // pull struct, union, enum or class definition out of typedef
         // use typedef name for unnamed struct, union, enum or class
-        if (Token::Match(tok->next(), "const| struct|enum|union|class %type%| {|:")) {
+        const Token* tokClass = tok->next();
+        while (Token::Match(tokClass, "const|volatile"))
+            tokClass = tokClass->next();
+        if (Token::Match(tokClass, "struct|enum|union|class %type%| {|:")) {
             Token *tok1 = splitDefinitionFromTypedef(tok, &mUnnamedCount);
             if (!tok1)
                 continue;
@@ -1232,14 +1273,13 @@ 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
-        if (!tokOffset)
+        if (!tokOffset || tokOffset->isControlFlowKeyword())
             syntaxError(tok);
 
-
         if (tokOffset->str() == "::") {
             typeStart = tokOffset;
             tokOffset = tokOffset->next();
@@ -1387,9 +1427,9 @@ void Tokenizer::simplifyTypedefCpp()
                 }
 
                 // function
-                else if (isFunctionHead(tokOffset->link(), ";,")) {
+                else if (TokenList::isFunctionHead(tokOffset->link(), ";,")) {
                     function = true;
-                    if (tokOffset->link()->next()->str() == "const") {
+                    if (tokOffset->link()->strAt(1) == "const") {
                         specStart = tokOffset->link()->next();
                         specEnd = specStart;
                     }
@@ -1431,14 +1471,14 @@ void Tokenizer::simplifyTypedefCpp()
         //           typedef ... ( * ( ... type )( ... ));
         else if (tokOffset->str() == "(" && (
                      (tokOffset->link() && Token::Match(tokOffset->link()->previous(), "%type% ) (") &&
-                      Token::Match(tokOffset->link()->next()->link(), ") const|volatile|;")) ||
+                      Token::Match(tokOffset->link()->linkAt(1), ") const|volatile|;")) ||
                      (Token::simpleMatch(tokOffset, "( (") &&
-                      tokOffset->next() && Token::Match(tokOffset->next()->link()->previous(), "%type% ) (") &&
-                      Token::Match(tokOffset->next()->link()->next()->link(), ") const|volatile| ) ;|,")) ||
+                      tokOffset->next() && Token::Match(tokOffset->linkAt(1)->previous(), "%type% ) (") &&
+                      Token::Match(tokOffset->linkAt(1)->linkAt(1), ") const|volatile| ) ;|,")) ||
                      (Token::simpleMatch(tokOffset, "( * (") &&
                       tokOffset->linkAt(2) && Token::Match(tokOffset->linkAt(2)->previous(), "%type% ) (") &&
-                      Token::Match(tokOffset->linkAt(2)->next()->link(), ") const|volatile| ) ;|,")))) {
-            if (tokOffset->next()->str() == "(")
+                      Token::Match(tokOffset->linkAt(2)->linkAt(1), ") const|volatile| ) ;|,")))) {
+            if (tokOffset->strAt(1) == "(")
                 tokOffset = tokOffset->next();
             else if (Token::simpleMatch(tokOffset, "( * (")) {
                 pointers.emplace_back("*");
@@ -1454,9 +1494,14 @@ void Tokenizer::simplifyTypedefCpp()
             funcEnd = tokOffset->tokAt(-2);
             typeName = tokOffset->previous();
             argStart = tokOffset->next();
-            argEnd = tokOffset->next()->link();
+            argEnd = tokOffset->linkAt(1);
             if (!argEnd)
                 syntaxError(argStart);
+            const Token* tok2 = argEnd->next();
+            while (tok2 && (tok2->isKeyword() || tok2->str() == ")"))
+                tok2 = tok2->next();
+            if (!Token::simpleMatch(tok2, ";"))
+                syntaxError(tok2);
 
             tok = argEnd->next();
             Token *spec = tok;
@@ -1554,7 +1599,7 @@ void Tokenizer::simplifyTypedefCpp()
 
         // pointer/reference to array
         else if (Token::Match(tokOffset, "( *|& %type% ) [")) {
-            ptrToArray = (tokOffset->next()->str() == "*");
+            ptrToArray = (tokOffset->strAt(1) == "*");
             refToArray = !ptrToArray;
             tokOffset = tokOffset->tokAt(2);
             typeName = tokOffset;
@@ -1596,6 +1641,18 @@ void Tokenizer::simplifyTypedefCpp()
         typedefInfo.lineNumber = typeName->linenr();
         typedefInfo.column = typeName->column();
         typedefInfo.used = false;
+        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) {
@@ -1607,7 +1664,7 @@ void Tokenizer::simplifyTypedefCpp()
             bool globalScope = false;
             int classLevel = spaceInfo.size();
             bool inTypeDef = false;
-            bool inEnumClass = false;
+            bool inEnum = false;
             std::string removed;
             std::string classPath;
             for (size_t i = 1; i < spaceInfo.size(); ++i) {
@@ -1661,29 +1718,29 @@ void Tokenizer::simplifyTypedefCpp()
                             if (memberScope == 0)
                                 inMemberFunc = false;
                         }
-                        inEnumClass = false;
+                        inEnum = false;
 
                         if (classLevel > 1 && tok2 == spaceInfo[classLevel - 1].bodyEnd2) {
                             --classLevel;
                             pattern.clear();
 
-                            for (int i = classLevel; i < spaceInfo.size(); ++i)
+                            for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
                                 pattern += (spaceInfo[i].className + " :: ");
 
                             pattern += typeName->str();
                         } else {
-                            if (scope == 0)
+                            if (scope == 0 && !(classLevel > 1 && tok2 == spaceInfo[classLevel - 1].bodyEnd))
                                 break;
-                            --scope;
+                            scope = std::max(scope - 1, 0);
                         }
                     }
 
                     // check for member functions
-                    else if (isCPP() && tok2->str() == "(" && isFunctionHead(tok2, "{")) {
+                    else if (cpp && tok2->str() == "(" && TokenList::isFunctionHead(tok2, "{:")) {
                         const Token *func = tok2->previous();
 
                         /** @todo add support for multi-token operators */
-                        if (func->previous()->str() == "operator")
+                        if (func->strAt(-1) == "operator")
                             func = func->previous();
 
                         if (!func->previous())
@@ -1706,23 +1763,23 @@ void Tokenizer::simplifyTypedefCpp()
                     // check for entering a new scope
                     else if (tok2->str() == "{") {
                         // check for entering a new namespace
-                        if (isCPP()) {
+                        if (cpp) {
                             if (tok2->strAt(-2) == "namespace") {
                                 if (classLevel < spaceInfo.size() &&
                                     spaceInfo[classLevel].isNamespace &&
-                                    spaceInfo[classLevel].className == tok2->previous()->str()) {
+                                    spaceInfo[classLevel].className == tok2->strAt(-1)) {
                                     spaceInfo[classLevel].bodyEnd2 = tok2->link();
                                     ++classLevel;
                                     pattern.clear();
-                                    for (int i = classLevel; i < spaceInfo.size(); ++i)
+                                    for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
                                         pattern += spaceInfo[i].className + " :: ";
 
                                     pattern += typeName->str();
                                 }
                                 ++scope;
                             }
-                            if (Token::Match(tok2->tokAt(-3), "enum class %name%"))
-                                inEnumClass = true;
+                            if (isEnumStart(tok2))
+                                inEnum = true;
                         }
 
                         // keep track of scopes within member function
@@ -1735,15 +1792,15 @@ void Tokenizer::simplifyTypedefCpp()
 
                 // check for operator typedef
                 /** @todo add support for multi-token operators */
-                else if (isCPP() &&
+                else if (cpp &&
                          tok2->str() == "operator" &&
                          tok2->next() &&
-                         tok2->next()->str() == typeName->str() &&
+                         tok2->strAt(1) == typeName->str() &&
                          tok2->linkAt(2) &&
                          tok2->strAt(2) == "(" &&
                          Token::Match(tok2->linkAt(2), ") const| {")) {
                     // check for qualifier
-                    if (tok2->previous()->str() == "::") {
+                    if (tok2->strAt(-1) == "::") {
                         // check for available and matching class name
                         if (spaceInfo.size() > 1 && classLevel < spaceInfo.size() &&
                             tok2->strAt(-2) == spaceInfo[classLevel].className) {
@@ -1758,7 +1815,7 @@ void Tokenizer::simplifyTypedefCpp()
                 }
 
                 // check for typedef that can be substituted
-                else if ((tok2->isNameOnly() || (tok2->isName() && (tok2->isExpandedMacro() || tok2->isInline()))) &&
+                else if ((tok2->isNameOnly() || (tok2->isName() && (tok2->isExpandedMacro() || tok2->isInline() || tok2->isExternC()))) &&
                          (Token::simpleMatch(tok2, pattern.c_str(), pattern.size()) ||
                           (inMemberFunc && tok2->str() == typeName->str()))) {
                     // member function class variables don't need qualification
@@ -1803,7 +1860,7 @@ void Tokenizer::simplifyTypedefCpp()
                             }
 
                             // remove qualification if present
-                            for (int i = classLevel; i < spaceInfo.size(); ++i) {
+                            for (std::size_t i = classLevel; i < spaceInfo.size(); ++i) {
                                 if (!removed.empty())
                                     removed += " ";
                                 removed += (tok2->str() + " " + tok2->strAt(1));
@@ -1828,13 +1885,13 @@ void Tokenizer::simplifyTypedefCpp()
                             }
                         } else if (Token::Match(tok2->previous(), "case|;|{|} %type% :")) {
                             tok2 = tok2->next();
-                        } else if (duplicateTypedef(&tok2, typeName, typeDef)) {
+                        } else if (duplicateTypedef(tok2, typeName, typeDef)) {
                             // skip to end of scope if not already there
                             if (tok2->str() != "}") {
                                 while (tok2->next()) {
-                                    if (tok2->next()->str() == "{")
+                                    if (tok2->strAt(1) == "{")
                                         tok2 = tok2->linkAt(1)->previous();
-                                    else if (tok2->next()->str() == "}")
+                                    else if (tok2->strAt(1) == "}")
                                         break;
 
                                     tok2 = tok2->next();
@@ -1842,20 +1899,21 @@ void Tokenizer::simplifyTypedefCpp()
                             }
                         } else if (Token::Match(tok2->tokAt(-2), "%type% *|&")) {
                             // Ticket #5868: Don't substitute variable names
-                        } else if (tok2->previous()->str() != ".") {
-                            simplifyType = true;
+                        } else if (tok2->strAt(-1) != ".") {
+                            simplifyType = (TypedefSimplifier::canReplaceStatic(tok2) != 0);
                         }
                     }
                 }
 
-                simplifyType = simplifyType && (!inEnumClass || Token::simpleMatch(tok2->previous(), "="));
+                simplifyType = simplifyType && (!inEnum || !Token::simpleMatch(tok2->next(), "="));
+                simplifyType = simplifyType && !(Token::simpleMatch(tok2->next(), "<") && Token::simpleMatch(typeEnd, ">"));
 
                 if (simplifyType) {
                     mTypedefInfo.back().used = true;
 
                     // can't simplify 'operator functionPtr ()' and 'functionPtr operator ... ()'
-                    if (functionPtr && (tok2->previous()->str() == "operator" ||
-                                        (tok2->next() && tok2->next()->str() == "operator"))) {
+                    if (functionPtr && (tok2->strAt(-1) == "operator" ||
+                                        (tok2->next() && tok2->strAt(1) == "operator"))) {
                         simplifyType = false;
                         tok2 = tok2->next();
                         continue;
@@ -1880,8 +1938,8 @@ void Tokenizer::simplifyTypedefCpp()
 
                     // check for cast: (some_typedef) A or static_cast<some_typedef>(A)
                     // todo: check for more complicated casts like: (const some_typedef *)A
-                    if ((tok2->previous()->str() == "(" && tok2->next()->str() == ")" && tok2->strAt(-2) != "sizeof") ||
-                        (tok2->previous()->str() == "<" && Token::simpleMatch(tok2->next(), "> (")) ||
+                    if ((tok2->strAt(-1) == "(" && tok2->strAt(1) == ")" && tok2->strAt(-2) != "sizeof") ||
+                        (tok2->strAt(-1) == "<" && Token::simpleMatch(tok2->next(), "> (")) ||
                         Token::Match(tok2->tokAt(-2), "( const %name% )"))
                         inCast = true;
 
@@ -1920,32 +1978,35 @@ void Tokenizer::simplifyTypedefCpp()
                     const bool isPointerTypeCall = !inOperator && Token::Match(tok2, "%name% ( )") && !pointers.empty();
 
                     // start substituting at the typedef name by replacing it with the type
-                    Token* replStart = tok2; // track first replaced token
-                    for (Token* tok3 = typeStart; tok3->str() != ";"; tok3 = tok3->next())
+                    const Token* location = tok2;
+                    for (Token* tok3 = typeStart; tok3 && (tok3->str() != ";"); tok3 = tok3->next())
                         tok3->isSimplifiedTypedef(true);
                     if (isPointerTypeCall) {
                         tok2->deleteThis();
-                        tok2->insertToken("0");
-                        tok2 = tok2->next();
-                        tok2->next()->insertToken("0");
+                        tok2 = simplifyTypedefInsertToken(tok2, "0", location);
+                        simplifyTypedefInsertToken(tok2->next(), "0", location);
+                    }
+                    if (Token::Match(tok2->tokAt(-1), "class|struct|union") && tok2->strAt(-1) == typeStart->str())
+                        tok2->deletePrevious();
+
+                    if (cpp && Token::Match(tok2->previous(), "using %name% ::|;")) {
+                        tok2->previous()->str("typedef");
+                        tok2->insertToken(tok2->str());
                     }
                     tok2->str(typeStart->str());
 
                     // restore qualification if it was removed
-                    if (typeStart->str() == "struct" || structRemoved) {
+                    if (Token::Match(typeStart, "class|struct|union") || structRemoved) {
                         if (structRemoved)
                             tok2 = tok2->previous();
 
                         if (globalScope) {
-                            replStart = tok2->insertToken("::");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "::", location);
                         }
 
-                        for (int i = classLevel; i < spaceInfo.size(); ++i) {
-                            tok2->insertToken(spaceInfo[i].className);
-                            tok2 = tok2->next();
-                            tok2->insertToken("::");
-                            tok2 = tok2->next();
+                        for (std::size_t i = classLevel; i < spaceInfo.size(); ++i) {
+                            tok2 = simplifyTypedefInsertToken(tok2, spaceInfo[i].className, location);
+                            tok2 = simplifyTypedefInsertToken(tok2, "::", location);
                         }
                     }
 
@@ -1957,16 +2018,16 @@ void Tokenizer::simplifyTypedefCpp()
                     if (idx != std::string::npos)
                         removed1.resize(idx);
                     if (removed1 == classPath && !removed1.empty()) {
-                        for (std::vector<Space>::const_reverse_iterator it = spaceInfo.crbegin(); it != spaceInfo.crend(); ++it) {
+                        for (auto it = spaceInfo.crbegin(); it != spaceInfo.crend(); ++it) {
                             if (it->recordTypes.find(start->str()) != it->recordTypes.end()) {
                                 std::string::size_type spaceIdx = 0;
                                 std::string::size_type startIdx = 0;
                                 while ((spaceIdx = removed1.find(' ', startIdx)) != std::string::npos) {
-                                    tok2->previous()->insertToken(removed1.substr(startIdx, spaceIdx - startIdx));
+                                    simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx, spaceIdx - startIdx), location);
                                     startIdx = spaceIdx + 1;
                                 }
-                                tok2->previous()->insertToken(removed1.substr(startIdx));
-                                replStart = tok2->previous()->insertToken("::");
+                                simplifyTypedefInsertToken(tok2->previous(), removed1.substr(startIdx), location);
+                                simplifyTypedefInsertToken(tok2->previous(), "::", location);
                                 break;
                             }
                             idx = removed1.rfind(" ::");
@@ -1976,30 +2037,25 @@ void Tokenizer::simplifyTypedefCpp()
                             removed1.resize(idx);
                         }
                     }
-                    replStart->isSimplifiedTypedef(true);
                     Token* constTok = Token::simpleMatch(tok2->previous(), "const") ? tok2->previous() : nullptr;
                     // add remainder of type
-                    tok2 = TokenList::copyTokens(tok2, typeStart->next(), typeEnd);
+                    tok2 = simplifyTypedefCopyTokens(tok2, typeStart->next(), typeEnd, location);
 
                     if (!pointers.empty()) {
-                        for (const std::string &p : pointers) {
-                            tok2->insertToken(p);
-                            tok2->isSimplifiedTypedef(true);
-                            tok2 = tok2->next();
-                        }
-                        if (constTok) {
+                        for (const std::string &p : pointers)
+                            // cppcheck-suppress useStlAlgorithm
+                            tok2 = simplifyTypedefInsertToken(tok2, p, location);
+                        if (constTok && !functionPtr) {
+                            tok2 = simplifyTypedefInsertToken(tok2, "const", location);
                             constTok->deleteThis();
-                            tok2->insertToken("const");
-                            tok2->isSimplifiedTypedef(true);
-                            tok2 = tok2->next();
+                            location = constTok;
                         }
                     }
 
                     if (funcStart && funcEnd) {
-                        tok2->insertToken("(");
-                        tok2 = tok2->next();
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
                         Token *paren = tok2;
-                        tok2 = TokenList::copyTokens(tok2, funcStart, funcEnd);
+                        tok2 = simplifyTypedefCopyTokens(tok2, funcStart, funcEnd, location);
 
                         if (!inCast)
                             tok2 = processFunc(tok2, inOperator);
@@ -2010,20 +2066,17 @@ void Tokenizer::simplifyTypedefCpp()
                         while (Token::Match(tok2, "%name%|] ["))
                             tok2 = tok2->linkAt(1);
 
-                        tok2->insertToken(")");
-                        tok2 = tok2->next();
+                        tok2 = simplifyTypedefInsertToken(tok2, ")", location);
                         Token::createMutualLinks(tok2, paren);
 
-                        tok2 = TokenList::copyTokens(tok2, argStart, argEnd);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
 
                         if (specStart) {
                             Token *spec = specStart;
-                            tok2->insertToken(spec->str());
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
                             while (spec != specEnd) {
                                 spec = spec->next();
-                                tok2->insertToken(spec->str());
-                                tok2 = tok2->next();
+                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
                             }
                         }
                     }
@@ -2032,27 +2085,23 @@ void Tokenizer::simplifyTypedefCpp()
                         // don't add parentheses around function names because it
                         // confuses other simplifications
                         bool needParen = true;
-                        if (!inTemplate && function && tok2->next() && tok2->next()->str() != "*")
+                        if (!inTemplate && function && tok2->next() && tok2->strAt(1) != "*")
                             needParen = false;
                         if (needParen) {
-                            tok2->insertToken("(");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "(", location);
                         }
                         Token *tok3 = tok2;
                         if (namespaceStart) {
                             const Token *tok4 = namespaceStart;
 
                             while (tok4 != namespaceEnd) {
-                                tok2->insertToken(tok4->str());
-                                tok2 = tok2->next();
+                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location);
                                 tok4 = tok4->next();
                             }
-                            tok2->insertToken(namespaceEnd->str());
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location);
                         }
                         if (functionPtr) {
-                            tok2->insertToken("*");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
                         }
 
                         if (!inCast)
@@ -2062,45 +2111,35 @@ void Tokenizer::simplifyTypedefCpp()
                             if (!tok2)
                                 syntaxError(nullptr);
 
-                            tok2->insertToken(")");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, ")", location);
                             Token::createMutualLinks(tok2, tok3);
                         }
                         if (!tok2)
                             syntaxError(nullptr);
 
-                        tok2 = TokenList::copyTokens(tok2, argStart, argEnd);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
                         if (inTemplate) {
-                            if (!tok2)
-                                syntaxError(nullptr);
-
                             tok2 = tok2->next();
                         }
 
                         if (specStart) {
                             Token *spec = specStart;
-                            tok2->insertToken(spec->str());
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
                             while (spec != specEnd) {
                                 spec = spec->next();
-                                tok2->insertToken(spec->str());
-                                tok2 = tok2->next();
+                                tok2 = simplifyTypedefInsertToken(tok2, spec->str(), location);
                             }
                         }
                     } else if (functionRetFuncPtr || functionPtrRetFuncPtr) {
-                        tok2->insertToken("(");
-                        tok2 = tok2->next();
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
                         Token *tok3 = tok2;
-                        tok2->insertToken("*");
-                        tok2 = tok2->next();
+                        tok2 = simplifyTypedefInsertToken(tok2, "*", location);
 
                         Token * tok4 = nullptr;
                         if (functionPtrRetFuncPtr) {
-                            tok2->insertToken("(");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "(", location);
                             tok4 = tok2;
-                            tok2->insertToken("*");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
                         }
 
                         // skip over variable name if there
@@ -2108,60 +2147,55 @@ void Tokenizer::simplifyTypedefCpp()
                             if (!tok2 || !tok2->next())
                                 syntaxError(nullptr);
 
-                            if (tok2->next()->str() != ")")
+                            if (tok2->strAt(1) != ")")
                                 tok2 = tok2->next();
                         }
 
                         if (tok4 && functionPtrRetFuncPtr) {
-                            tok2->insertToken(")");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2,")", location);
                             Token::createMutualLinks(tok2, tok4);
                         }
 
-                        tok2 = TokenList::copyTokens(tok2, argStart, argEnd);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
 
-                        tok2->insertToken(")");
-                        tok2 = tok2->next();
+                        tok2 = simplifyTypedefInsertToken(tok2, ")", location);
                         Token::createMutualLinks(tok2, tok3);
 
-                        tok2 = TokenList::copyTokens(tok2, argFuncRetStart, argFuncRetEnd);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argFuncRetStart, argFuncRetEnd, location);
                     } else if (ptrToArray || refToArray) {
-                        tok2->insertToken("(");
-                        tok2 = tok2->next();
+                        tok2 = simplifyTypedefInsertToken(tok2, "(", location);
                         Token *tok3 = tok2;
 
                         if (ptrToArray)
-                            tok2->insertToken("*");
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
                         else
-                            tok2->insertToken("&");
-                        tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "&", location);
 
                         bool hasName = false;
                         // skip over name
-                        if (tok2->next() && tok2->next()->str() != ")" && tok2->next()->str() != "," &&
-                            tok2->next()->str() != ">") {
+                        if (tok2->next() && tok2->strAt(1) != ")" && tok2->strAt(1) != "," &&
+                            tok2->strAt(1) != ">") {
                             hasName = true;
-                            if (tok2->next()->str() != "(")
+                            if (tok2->strAt(1) != "(")
                                 tok2 = tok2->next();
 
                             // check for function and skip over args
-                            if (tok2 && tok2->next() && tok2->next()->str() == "(")
-                                tok2 = tok2->next()->link();
+                            if (tok2 && tok2->next() && tok2->strAt(1) == "(")
+                                tok2 = tok2->linkAt(1);
 
                             // check for array
-                            if (tok2 && tok2->next() && tok2->next()->str() == "[")
-                                tok2 = tok2->next()->link();
+                            if (tok2 && tok2->next() && tok2->strAt(1) == "[")
+                                tok2 = tok2->linkAt(1);
                         }
 
-                        tok2->insertToken(")");
+                        simplifyTypedefInsertToken(tok2, ")", location);
                         Token::createMutualLinks(tok2->next(), tok3);
 
                         if (!hasName)
                             tok2 = tok2->next();
                     } else if (ptrMember) {
                         if (Token::simpleMatch(tok2, "* (")) {
-                            tok2->insertToken("*");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
                         } else {
                             // This is the case of casting operator.
                             // Name is not available, and () should not be
@@ -2170,8 +2204,7 @@ void Tokenizer::simplifyTypedefCpp()
                             Token *openParenthesis = nullptr;
 
                             if (!castOperator) {
-                                tok2->insertToken("(");
-                                tok2 = tok2->next();
+                                tok2 = simplifyTypedefInsertToken(tok2, "(", location);
 
                                 openParenthesis = tok2;
                             }
@@ -2179,29 +2212,25 @@ void Tokenizer::simplifyTypedefCpp()
                             const Token *tok4 = namespaceStart;
 
                             while (tok4 != namespaceEnd) {
-                                tok2->insertToken(tok4->str());
-                                tok2 = tok2->next();
+                                tok2 = simplifyTypedefInsertToken(tok2, tok4->str(), location);
                                 tok4 = tok4->next();
                             }
-                            tok2->insertToken(namespaceEnd->str());
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, namespaceEnd->str(), location);
 
-                            tok2->insertToken("*");
-                            tok2 = tok2->next();
+                            tok2 = simplifyTypedefInsertToken(tok2, "*", location);
 
                             if (openParenthesis) {
                                 // Skip over name, if any
                                 if (Token::Match(tok2->next(), "%name%"))
                                     tok2 = tok2->next();
 
-                                tok2->insertToken(")");
-                                tok2 = tok2->next();
+                                tok2 = simplifyTypedefInsertToken(tok2, ")", location);
 
                                 Token::createMutualLinks(tok2, openParenthesis);
                             }
                         }
                     } else if (typeOf) {
-                        tok2 = TokenList::copyTokens(tok2, argStart, argEnd);
+                        tok2 = simplifyTypedefCopyTokens(tok2, argStart, argEnd, location);
                     } else if (Token::Match(tok2, "%name% [")) {
                         while (Token::Match(tok2, "%name%|] [")) {
                             tok2 = tok2->linkAt(1);
@@ -2223,14 +2252,15 @@ void Tokenizer::simplifyTypedefCpp()
                             // reference or pointer to array?
                             if (Token::Match(tok2, "&|*|&&")) {
                                 tok2 = tok2->previous();
-                                tok2->insertToken("(");
-                                Token *tok3 = tok2->next();
+                                Token *tok3 = simplifyTypedefInsertToken(tok2, "(", location);
 
                                 // handle missing variable name
                                 if (Token::Match(tok3, "( *|&|&& *|&|&& %name%"))
                                     tok2 = tok3->tokAt(3);
                                 else if (Token::Match(tok2->tokAt(3), "[(),;]"))
                                     tok2 = tok2->tokAt(2);
+                                else if (Token::simpleMatch(tok2->tokAt(3), ">"))
+                                    tok2 = tok2->tokAt(2);
                                 else
                                     tok2 = tok2->tokAt(3);
                                 if (!tok2)
@@ -2253,8 +2283,7 @@ void Tokenizer::simplifyTypedefCpp()
                                         tok2 = tok2->tokAt(3);
                                 }
 
-                                tok2->insertToken(")");
-                                tok2 = tok2->next();
+                                tok2 = simplifyTypedefInsertToken(tok2, ")", location);
                                 Token::createMutualLinks(tok2, tok3);
                             }
 
@@ -2262,17 +2291,20 @@ void Tokenizer::simplifyTypedefCpp()
                                 syntaxError(tok2); // can't recover so quit
 
                             // skip over array dimensions
-                            while (tok2->next()->str() == "[")
+                            while (tok2->strAt(1) == "[")
                                 tok2 = tok2->linkAt(1);
 
-                            tok2 = TokenList::copyTokens(tok2, arrayStart, arrayEnd);
+                            tok2 = simplifyTypedefCopyTokens(tok2, arrayStart, arrayEnd, location);
                             if (!tok2->next())
                                 syntaxError(tok2);
 
+                            if (Token::Match(tok2, "] ; %name% = {") && tok2->next()->isSplittedVarDeclEq())
+                                tok2->deleteNext(2);
+
                             if (tok2->str() == "=") {
-                                if (tok2->next()->str() == "{")
-                                    tok2 = tok2->next()->link()->next();
-                                else if (tok2->next()->str().at(0) == '\"')
+                                if (tok2->strAt(1) == "{")
+                                    tok2 = tok2->linkAt(1)->next();
+                                else if (tok2->strAt(1).at(0) == '\"')
                                     tok2 = tok2->tokAt(2);
                             }
                         } while (Token::Match(tok2, ", %name% ;|=|,"));
@@ -2313,7 +2345,7 @@ void Tokenizer::simplifyTypedefCpp()
 
                             if (!tokOffset->next())
                                 return; // invalid input
-                            if (tokOffset->next()->str() == ";")
+                            if (tokOffset->strAt(1) == ";")
                                 break;
                             if (tokOffset->str() == "]")
                                 break;
@@ -2368,7 +2400,7 @@ void Tokenizer::simplifyTypedefCpp()
 
 namespace {
     struct ScopeInfo3 {
-        enum Type { Global, Namespace, Record, MemberFunction, Other };
+        enum Type : std::uint8_t { Global, Namespace, Record, MemberFunction, Other };
         ScopeInfo3() : parent(nullptr), type(Global), bodyStart(nullptr), bodyEnd(nullptr) {}
         ScopeInfo3(ScopeInfo3 *parent_, Type type_, std::string name_, const Token *bodyStart_, const Token *bodyEnd_)
             : parent(parent_), type(type_), name(std::move(name_)), bodyStart(bodyStart_), bodyEnd(bodyEnd_) {
@@ -2394,8 +2426,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();
         }
 
@@ -2473,22 +2505,22 @@ namespace {
         }
     };
 
-    void setScopeInfo(Token *tok, ScopeInfo3 **scopeInfo, bool debug=false)
+    void setScopeInfo(Token *tok, ScopeInfo3 *&scopeInfo, bool debug=false)
     {
         if (!tok)
             return;
-        if (tok->str() == "{" && (*scopeInfo)->parent && tok == (*scopeInfo)->bodyStart)
+        if (tok->str() == "{" && scopeInfo->parent && tok == scopeInfo->bodyStart)
             return;
         if (tok->str() == "}") {
-            if ((*scopeInfo)->parent && tok == (*scopeInfo)->bodyEnd)
-                *scopeInfo = (*scopeInfo)->parent;
+            if (scopeInfo->parent && tok == scopeInfo->bodyEnd)
+                scopeInfo = scopeInfo->parent;
             else {
                 // Try to find parent scope
-                ScopeInfo3 *parent = (*scopeInfo)->parent;
+                ScopeInfo3 *parent = scopeInfo->parent;
                 while (parent && parent->bodyEnd != tok)
                     parent = parent->parent;
                 if (parent) {
-                    *scopeInfo = parent;
+                    scopeInfo = parent;
                     if (debug)
                         throw std::runtime_error("Internal error: unmatched }");
                 }
@@ -2506,7 +2538,7 @@ namespace {
                     nameSpace += tok1->str();
                     tok1 = tok1->next();
                 }
-                (*scopeInfo)->usingNamespaces.insert(std::move(nameSpace));
+                scopeInfo->usingNamespaces.insert(std::move(nameSpace));
             }
             // check for member function
             else if (tok->str() == "{") {
@@ -2543,13 +2575,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% (")) {
+                        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;
         }
@@ -2564,7 +2602,7 @@ namespace {
 
         // add record type to scope info
         if (record)
-            (*scopeInfo)->recordTypes.insert(classname);
+            scopeInfo->recordTypes.insert(classname);
         tok = tok->next();
 
         // skip template parameters
@@ -2604,8 +2642,8 @@ namespace {
         }
 
         if (tok && tok->str() == "{") {
-            *scopeInfo = (*scopeInfo)->addChild(record ? ScopeInfo3::Record : ScopeInfo3::Namespace, classname, tok, tok->link());
-            (*scopeInfo)->baseTypes = baseTypes;
+            scopeInfo = scopeInfo->addChild(record ? ScopeInfo3::Record : ScopeInfo3::Namespace, std::move(classname), tok, tok->link());
+            scopeInfo->baseTypes = std::move(baseTypes);
         }
     }
 
@@ -2626,19 +2664,19 @@ namespace {
     bool usingMatch(
         const Token *nameToken,
         const std::string &scope,
-        Token **tok,
+        Token *&tok,
         const std::string &scope1,
         const ScopeInfo3 *currentScope,
         const ScopeInfo3 *memberClassScope)
     {
-        Token *tok1 = *tok;
+        Token *tok1 = tok;
 
         if (tok1 && tok1->str() != nameToken->str())
             return false;
 
         // skip this using
         if (tok1 == nameToken) {
-            *tok = findSemicolon(tok1);
+            tok = findSemicolon(tok1);
             return false;
         }
 
@@ -2647,7 +2685,7 @@ namespace {
             // fixme: this is wrong
             // skip to end of scope
             if (currentScope->bodyEnd)
-                *tok = const_cast<Token*>(currentScope->bodyEnd->previous());
+                tok = const_cast<Token*>(currentScope->bodyEnd->previous());
             return false;
         }
 
@@ -2656,6 +2694,26 @@ namespace {
             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;
+            if (Token::Match(tok1->previous(), ">|>>") && tok1->linkAt(-1))
+                return false;
+            if (Token::Match(tok1->previous(), "*|&|&&")) {
+                const Token* prev = tok1->previous();
+                while (Token::Match(prev, "%name%|*|&|&&|::") && !prev->isControlFlowKeyword())
+                    prev = prev->previous();
+                if (Token::Match(prev, ">|>>") && tok1->linkAt(-1))
+                    return false;
+                if (Token::Match(prev, "[;{}] %name%"))
+                    return false;
+            }
+        }
+
         // get qualification
         std::string qualification;
         const Token* tok2 = tok1;
@@ -2770,11 +2828,11 @@ namespace {
     }
 } // namespace
 
-bool Tokenizer::isMemberFunction(const Token *openParen) const
+bool Tokenizer::isMemberFunction(const Token *openParen)
 {
     return (Token::Match(openParen->tokAt(-2), ":: %name% (") ||
             Token::Match(openParen->tokAt(-3), ":: ~ %name% (")) &&
-           isFunctionHead(openParen, "{|:");
+           TokenList::isFunctionHead(openParen, "{:");
 }
 
 static bool scopesMatch(const std::string &scope1, const std::string &scope2, const ScopeInfo3 *globalScope)
@@ -2804,7 +2862,7 @@ static bool scopesMatch(const std::string &scope1, const std::string &scope2, co
     return false;
 }
 
-static unsigned int tokDistance(const Token* tok1, const Token* tok2) {
+static unsigned int tokDistance(const Token* tok1, const Token* tok2) { // use when index() is not available yet
     unsigned int dist = 0;
     const Token* tok = tok1;
     while (tok != tok2) {
@@ -2814,11 +2872,43 @@ static unsigned int tokDistance(const Token* tok1, const Token* tok2) {
     return dist;
 }
 
+static const Token* skipConstVolatileBackwards(const Token* tok) {
+    while (Token::Match(tok, "const|volatile"))
+        tok = tok->previous();
+    return tok;
+}
+
 bool Tokenizer::simplifyUsing()
 {
-    if (!isCPP() || mSettings->standards.cpp < Standards::CPP11)
+    if (!isCPP() || mSettings.standards.cpp < Standards::CPP11)
         return false;
 
+    // simplify using N::x; to using x = N::x;
+    for (Token* tok = list.front(); tok; tok = tok->next()) {
+        if (!Token::Match(tok, "using ::| %name% ::"))
+            continue;
+        const Token* ns = tok->tokAt(tok->strAt(1) == "::" ? 2 : 1);
+        if (ns->isKeyword())
+            continue;
+        Token* end = tok->tokAt(3);
+        while (end && !Token::Match(end, "[;,]")) {
+            if (end->str() == "<") // skip template args
+                end = end->findClosingBracket();
+            else
+                end = end->next();
+        }
+        if (!end)
+            continue;
+        if (!end->tokAt(-1)->isNameOnly() || end->tokAt(-2)->isLiteral()) // e.g. operator=, operator""sv
+            continue;
+        tok->insertToken(end->strAt(-1))->insertToken("=")->isSimplifiedTypedef(true);
+        if (end->str() == ",") { // comma-separated list
+            end->str(";");
+            end->insertToken("using");
+        }
+        tok = end;
+    }
+
     const unsigned int maxReplacementTokens = 1000; // limit the number of tokens we replace
 
     bool substitute = false;
@@ -2831,9 +2921,11 @@ bool Tokenizer::simplifyUsing()
     };
     std::list<Using> usingList;
 
+    const bool doProgress = (mSettings.reportProgress != -1) && !list.getFiles().empty();
+
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (mErrorLogger && !list.getFiles().empty())
-            mErrorLogger->reportProgress(list.getFiles()[0], "Tokenize (using)", tok->progressValue());
+        if (doProgress)
+            mErrorLogger.reportProgress(list.getFiles()[0], "Tokenize (using)", tok->progressValue());
 
         if (Settings::terminated())
             return substitute;
@@ -2853,7 +2945,7 @@ bool Tokenizer::simplifyUsing()
         if (Token::Match(tok, "{|}|namespace|class|struct|union") ||
             Token::Match(tok, "using namespace %name% ;|::")) {
             try {
-                setScopeInfo(tok, &currentScope, mSettings->debugwarnings);
+                setScopeInfo(tok, currentScope, mSettings.debugwarnings);
             } catch (const std::runtime_error &) {
                 reportError(tok, Severity::debug, "simplifyUsingUnmatchedBodyEnd",
                             "simplifyUsing: unmatched body end");
@@ -2886,8 +2978,11 @@ bool Tokenizer::simplifyUsing()
         std::string scope = currentScope->fullName;
         Token *usingStart = tok;
         Token *start;
-        if (tok->strAt(2) == "=")
+        if (tok->strAt(2) == "=") {
+            if (currentScope->type == ScopeInfo3::Record && tok->tokAt(2)->isSimplifiedTypedef())  // don't simplify within class definition
+                continue;
             start = tok->tokAt(3);
+        }
         else
             start = tok->linkAt(2)->tokAt(3);
         Token *usingEnd = findSemicolon(start);
@@ -2918,7 +3013,7 @@ bool Tokenizer::simplifyUsing()
             structEnd = structEnd->link();
 
             // add ';' after end of struct
-            structEnd->insertToken(";", emptyString);
+            structEnd->insertToken(";");
 
             // add name for anonymous struct
             if (!hasName) {
@@ -2926,10 +3021,10 @@ bool Tokenizer::simplifyUsing()
                 if (structEnd->strAt(2) == ";")
                     newName = name;
                 else
-                    newName = "Unnamed" + MathLib::toString(mUnnamedCount++);
+                    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());
 
@@ -2962,13 +3057,16 @@ bool Tokenizer::simplifyUsing()
         if (usingEnd)
             tok = usingEnd;
 
+        if (Token::Match(start, "class|struct|union|enum"))
+            start = start->next();
+
         // Unfortunately we have to start searching from the beginning
         // of the token stream because templates are instantiated at
         // the end of the token stream and it may be used before then.
         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;
@@ -2982,7 +3080,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) {
@@ -2993,6 +3091,8 @@ bool Tokenizer::simplifyUsing()
             }
         }
 
+        bool isTypedefInfoAdded = false; // TODO should we add a separate mUsingInfo?
+
         std::string scope1 = currentScope1->fullName;
         bool skip = false; // don't erase type aliases we can't parse
         Token *enumOpenBrace = nullptr;
@@ -3007,7 +3107,7 @@ bool Tokenizer::simplifyUsing()
             if ((Token::Match(tok1, "{|}|namespace|class|struct|union") && tok1->strAt(-1) != "using") ||
                 Token::Match(tok1, "using namespace %name% ;|::")) {
                 try {
-                    setScopeInfo(tok1, &currentScope1, mSettings->debugwarnings);
+                    setScopeInfo(tok1, currentScope1, mSettings.debugwarnings);
                 } catch (const std::runtime_error &) {
                     reportError(tok1, Severity::debug, "simplifyUsingUnmatchedBodyEnd",
                                 "simplifyUsing: unmatched body end");
@@ -3058,11 +3158,23 @@ bool Tokenizer::simplifyUsing()
                 continue;
             }
             if (inMemberFunc && memberFuncScope) {
-                if (!usingMatch(nameToken, scope, &tok1, scope1, currentScope1, memberFuncScope))
+                if (!usingMatch(nameToken, scope, tok1, scope1, currentScope1, memberFuncScope))
                     continue;
-            } else if (!usingMatch(nameToken, scope, &tok1, scope1, currentScope1, nullptr))
+            } else if (!usingMatch(nameToken, scope, tok1, scope1, currentScope1, nullptr))
                 continue;
 
+            if (!isTypedefInfoAdded && Token::Match(tok1, "%name% (")) {
+                isTypedefInfoAdded = true;
+                TypedefInfo usingInfo;
+                usingInfo.name = name;
+                usingInfo.filename = list.file(nameToken);
+                usingInfo.lineNumber = nameToken->linenr();
+                usingInfo.column = nameToken->column();
+                usingInfo.used = true;
+                usingInfo.isFunctionPointer = false;
+                mTypedefInfo.push_back(std::move(usingInfo));
+            }
+
             const auto nReplace = tokDistance(start, usingEnd);
             if (nReplace > maxReplacementTokens) {
                 simplifyUsingError(usingStart, usingEnd);
@@ -3186,7 +3298,7 @@ bool Tokenizer::simplifyUsing()
 
                         if (!type->next())
                             syntaxError(type); // invalid input
-                        else if (type->next()->str() == ";")
+                        else if (type->strAt(1) == ";")
                             atEnd = true;
                         else if (type->str() == "]")
                             atEnd = true;
@@ -3215,7 +3327,7 @@ bool Tokenizer::simplifyUsing()
                     }
                 } else {
                     // add some qualification back if needed
-                    std::string removed1 = removed;
+                    std::string removed1 = std::move(removed);
                     std::string::size_type idx = removed1.rfind(" ::");
                     if (idx != std::string::npos)
                         removed1.resize(idx);
@@ -3242,9 +3354,32 @@ bool Tokenizer::simplifyUsing()
                         }
                     }
 
-                    // just replace simple type aliases
-                    TokenList::copyTokens(tok1, start, usingEnd->previous());
-                    tok1->deleteThis();
+                    // Is this a "T(...)" expression where T is a pointer type?
+                    if (Token::Match(tok1, "%name% [({]") && !pointers.empty() && !Token::simpleMatch(skipConstVolatileBackwards(tok1->tokAt(-1)), ".")) {
+                        tok1->tokAt(1)->str("(");
+                        tok1->linkAt(1)->str(")");
+                        if (tok1->linkAt(1) == tok1->tokAt(2)) { // T() or T{}
+                            Token* tok2 = tok1->linkAt(1);
+                            tok1->deleteThis();
+                            TokenList::copyTokens(tok1, start, usingEnd->previous());
+                            tok2->insertToken("0");
+                            after = tok2->next();
+                        }
+                        else { // functional-style cast
+                            Token* tok2 = tok1->linkAt(1);
+                            tok1->originalName(tok1->str());
+                            tok1->isSimplifiedTypedef(true);
+                            tok1->str("(");
+                            Token* tok3 = TokenList::copyTokens(tok1, start, usingEnd->previous());
+                            tok3->insertToken(")");
+                            Token::createMutualLinks(tok1, tok3->next());
+                            after = tok2->next();
+                        }
+                    }
+                    else { // just replace simple type aliases
+                        TokenList::copyTokens(tok1, start, usingEnd->previous());
+                        tok1->deleteThis();
+                    }
                     substitute = true;
                 }
             } else {
@@ -3259,16 +3394,11 @@ bool Tokenizer::simplifyUsing()
     }
 
     // delete all used type alias definitions
-    for (std::list<Using>::reverse_iterator it = usingList.rbegin(); it != usingList.rend(); ++it) {
+    for (auto it = usingList.rbegin(); it != usingList.rend(); ++it) {
         Token *usingStart = it->startTok;
         Token *usingEnd = it->endTok;
         if (usingStart->previous()) {
-            if (usingEnd->next())
-                Token::eraseTokens(usingStart->previous(), usingEnd->next());
-            else {
-                Token::eraseTokens(usingStart->previous(), usingEnd);
-                usingEnd->deleteThis();
-            }
+            Token::eraseTokens(usingStart->previous(), usingEnd->next());
         } else {
             if (usingEnd->next()) {
                 Token::eraseTokens(usingStart, usingEnd->next());
@@ -3286,7 +3416,7 @@ bool Tokenizer::simplifyUsing()
 
 void Tokenizer::simplifyUsingError(const Token* usingStart, const Token* usingEnd)
 {
-    if (mSettings->debugwarnings && mErrorLogger) {
+    if (mSettings.debugwarnings) {
         std::string str;
         for (const Token *tok = usingStart; tok && tok != usingEnd; tok = tok->next()) {
             if (!str.empty())
@@ -3295,23 +3425,12 @@ void Tokenizer::simplifyUsingError(const Token* usingStart, const Token* usingEn
         }
         str += " ;";
         std::list<const Token *> callstack(1, usingStart);
-        mErrorLogger->reportErr(ErrorMessage(callstack, &list, Severity::debug, "simplifyUsing",
-                                             "Failed to parse \'" + str + "\'. The checking continues anyway.", Certainty::normal));
+        mErrorLogger.reportErr(ErrorMessage(callstack, &list, Severity::debug, "simplifyUsing",
+                                            "Failed to parse \'" + str + "\'. The checking continues anyway.", Certainty::normal));
     }
 }
 
-bool Tokenizer::createTokens(std::istream &code,
-                             const std::string& FileName)
-{
-    return list.createTokens(code, FileName);
-}
-
-void Tokenizer::createTokens(simplecpp::TokenList&& tokenList)
-{
-    list.createTokens(std::move(tokenList));
-}
-
-bool Tokenizer::simplifyTokens1(const std::string &configuration)
+bool Tokenizer::simplifyTokens1(const std::string &configuration, int fileIndex)
 {
     // Fill the map mTypeSize..
     fillTypeSizes();
@@ -3319,7 +3438,7 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
     mConfiguration = configuration;
 
     if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1", mSettings->showtime, mTimerResults);
+        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1", mSettings.showtime, mTimerResults);
         if (!simplifyTokenList1(list.getFiles().front().c_str()))
             return false;
     } else {
@@ -3327,52 +3446,46 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
             return false;
     }
 
-    if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::createAst", mSettings->showtime, mTimerResults);
-        list.createAst();
-        list.validateAst();
-    } else {
+    const ShowTime showTime = mTimerResults ? mSettings.showtime : ShowTime::NONE;
+
+    Timer::run("Tokenizer::simplifyTokens1::createAst", showTime, mTimerResults, [&]() {
         list.createAst();
-        list.validateAst();
-    }
+        list.validateAst(mSettings.debugnormal);
+    });
 
-    if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::createSymbolDatabase", mSettings->showtime, mTimerResults);
+    Timer::run("Tokenizer::simplifyTokens1::createSymbolDatabase", showTime, mTimerResults, [&]() {
         createSymbolDatabase();
-    } else {
-        createSymbolDatabase();
-    }
+    });
 
-    if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::setValueType", mSettings->showtime, mTimerResults);
-        mSymbolDatabase->setValueTypeInTokenList(true);
-    } else {
+    Timer::run("Tokenizer::simplifyTokens1::setValueType", showTime, mTimerResults, [&]() {
+        mSymbolDatabase->setValueTypeInTokenList(false);
         mSymbolDatabase->setValueTypeInTokenList(true);
-    }
+    });
 
-    if (!mSettings->buildDir.empty())
-        Summaries::create(this, configuration);
+    if (!mSettings.buildDir.empty())
+        Summaries::create(*this, configuration, fileIndex);
 
+    // TODO: apply this through Settings::ValueFlowOptions
     // TODO: do not run valueflow if no checks are being performed at all - e.g. unusedFunctions only
+    // TODO: log message when this is active?
     const char* disableValueflowEnv = std::getenv("DISABLE_VALUEFLOW");
     const bool doValueFlow = !disableValueflowEnv || (std::strcmp(disableValueflowEnv, "1") != 0);
 
     if (doValueFlow) {
-        if (mTimerResults) {
-            Timer t("Tokenizer::simplifyTokens1::ValueFlow", mSettings->showtime, mTimerResults);
-            ValueFlow::setValues(&list, mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
-        } else {
-            ValueFlow::setValues(&list, mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
-        }
+        Timer::run("Tokenizer::simplifyTokens1::ValueFlow", showTime, mTimerResults, [&]() {
+            ValueFlow::setValues(list, *mSymbolDatabase, mErrorLogger, mSettings, mTimerResults);
+        });
+
+        arraySizeAfterValueFlow();
     }
 
     // Warn about unhandled character literals
-    if (mSettings->severity.isEnabled(Severity::portability)) {
+    if (mSettings.severity.isEnabled(Severity::portability)) {
         for (const Token *tok = tokens(); tok; tok = tok->next()) {
             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());
                 }
             }
@@ -3383,20 +3496,11 @@ bool Tokenizer::simplifyTokens1(const std::string &configuration)
         mSymbolDatabase->setArrayDimensionsUsingValueFlow();
     }
 
-    printDebugOutput(1);
+    printDebugOutput(std::cout);
 
     return true;
 }
 
-bool Tokenizer::tokenize(std::istream &code,
-                         const char FileName[],
-                         const std::string &configuration)
-{
-    if (!createTokens(code, FileName))
-        return false;
-
-    return simplifyTokens1(configuration);
-}
 //---------------------------------------------------------------------------
 
 void Tokenizer::findComplicatedSyntaxErrorsInTemplates()
@@ -3422,16 +3526,18 @@ void Tokenizer::fillTypeSizes()
 {
     mTypeSize.clear();
     mTypeSize["char"] = 1;
-    mTypeSize["_Bool"] = mSettings->platform.sizeof_bool;
-    mTypeSize["bool"] = mSettings->platform.sizeof_bool;
-    mTypeSize["short"] = mSettings->platform.sizeof_short;
-    mTypeSize["int"] = mSettings->platform.sizeof_int;
-    mTypeSize["long"] = mSettings->platform.sizeof_long;
-    mTypeSize["float"] = mSettings->platform.sizeof_float;
-    mTypeSize["double"] = mSettings->platform.sizeof_double;
-    mTypeSize["wchar_t"] = mSettings->platform.sizeof_wchar_t;
-    mTypeSize["size_t"] = mSettings->platform.sizeof_size_t;
-    mTypeSize["*"] = mSettings->platform.sizeof_pointer;
+    mTypeSize["_Bool"] = mSettings.platform.sizeof_bool;
+    mTypeSize["bool"] = mSettings.platform.sizeof_bool;
+    mTypeSize["short"] = mSettings.platform.sizeof_short;
+    mTypeSize["int"] = mSettings.platform.sizeof_int;
+    mTypeSize["long"] = mSettings.platform.sizeof_long;
+    mTypeSize["long long"] = mSettings.platform.sizeof_long_long;
+    mTypeSize["float"] = mSettings.platform.sizeof_float;
+    mTypeSize["double"] = mSettings.platform.sizeof_double;
+    mTypeSize["long double"] = mSettings.platform.sizeof_long_double;
+    mTypeSize["wchar_t"] = mSettings.platform.sizeof_wchar_t;
+    mTypeSize["size_t"] = mSettings.platform.sizeof_size_t;
+    mTypeSize["*"] = mSettings.platform.sizeof_pointer;
 }
 
 void Tokenizer::combineOperators()
@@ -3442,8 +3548,8 @@ void Tokenizer::combineOperators()
     for (Token *tok = list.front(); tok && tok->next(); tok = tok->next()) {
         const char c1 = tok->str()[0];
 
-        if (tok->str().length() == 1 && tok->next()->str().length() == 1) {
-            const char c2 = tok->next()->str()[0];
+        if (tok->str().length() == 1 && tok->strAt(1).length() == 1) {
+            const char c2 = tok->strAt(1)[0];
 
             // combine +-*/ and =
             if (c2 == '=' && (std::strchr("+-*/%|^=!<>", c1)) && !Token::Match(tok->previous(), "%type% *")) {
@@ -3458,7 +3564,7 @@ void Tokenizer::combineOperators()
                 tok->deleteNext();
                 continue;
             }
-        } else if (tok->next()->str() == "=") {
+        } else if (tok->strAt(1) == "=") {
             if (tok->str() == ">>") {
                 tok->str(">>=");
                 tok->deleteNext();
@@ -3492,11 +3598,12 @@ void Tokenizer::combineOperators()
             }
             if (simplify) {
                 tok->str(tok->str() + ":");
+                tok->tokType(Token::Type::eKeyword); // we need to preserve the keyword type after setting a non-keyword string
                 tok->deleteNext();
             }
         } else if (tok->str() == "->") {
             // If the preceding sequence is "( & %name% )", replace it by "%name%"
-            Token *t = tok->tokAt(-4);
+            Token* t = tok->tokAt(-4);
             if (Token::Match(t, "( & %name% )") && !Token::simpleMatch(t->previous(), ">")) {
                 t->deleteThis();
                 t->deleteThis();
@@ -3521,13 +3628,13 @@ void Tokenizer::combineStringAndCharLiterals()
 
         while (Token::Match(tok->next(), "%str%") || Token::Match(tok->next(), "_T|_TEXT|TEXT ( %str% )")) {
             if (tok->next()->isName()) {
-                if (!mSettings->platform.isWindows())
+                if (!mSettings.platform.isWindows())
                     break;
                 tok->deleteNext(2);
                 tok->next()->deleteNext();
             }
             // Two strings after each other, combine them
-            tok->concatStr(simplifyString(tok->next()->str()));
+            tok->concatStr(simplifyString(tok->strAt(1)));
             tok->deleteNext();
         }
     }
@@ -3539,12 +3646,16 @@ void Tokenizer::concatenateNegativeNumberAndAnyPositive()
         if (!Token::Match(tok, "?|:|,|(|[|{|return|case|sizeof|%op% +|-") || tok->tokType() == Token::eIncDecOp)
             continue;
 
-        while (tok->str() != ">" && tok->next() && tok->next()->str() == "+" && (!Token::Match(tok->tokAt(2), "%name% (|;") || Token::Match(tok, "%op%")))
+        if (tok->findOpeningBracket())
+            continue;
+
+        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%")) {
+        if (Token::Match(tok->next(), "+|- %num%")) {
+            std::string prefix = tok->strAt(1);
             tok->deleteNext();
-            tok->next()->str("-" + tok->next()->str());
+            tok->next()->str(prefix + tok->strAt(1));
         }
     }
 }
@@ -3556,17 +3667,18 @@ void Tokenizer::simplifyExternC()
 
     // Add attributes to all tokens within `extern "C"` inlines and blocks, and remove the `extern "C"` tokens.
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::simpleMatch(tok, "extern \"C\"")) {
+        if (Token::Match(tok, "extern \"C\"|\"C++\"")) {
             Token *tok2 = tok->next();
+            const bool isExtC = tok->strAt(1).size() == 3;
             if (tok->strAt(2) == "{") {
                 tok2 = tok2->next(); // skip {
                 while ((tok2 = tok2->next()) && tok2 != tok->linkAt(2))
-                    tok2->isExternC(true);
+                    tok2->isExternC(isExtC);
                 tok->linkAt(2)->deleteThis(); // }
                 tok->deleteNext(2); // "C" {
             } else {
                 while ((tok2 = tok2->next()) && !Token::Match(tok2, "[;{]"))
-                    tok2->isExternC(true);
+                    tok2->isExternC(isExtC);
                 tok->deleteNext(); // "C"
             }
             tok->deleteThis(); // extern
@@ -3574,7 +3686,7 @@ void Tokenizer::simplifyExternC()
     }
 }
 
-void Tokenizer::simplifyRoundCurlyParentheses()
+void Tokenizer::simplifyCompoundStatements()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         while (Token::Match(tok, "[;{}:] ( {") &&
@@ -3592,6 +3704,8 @@ void Tokenizer::simplifyRoundCurlyParentheses()
             tok->deleteThis();
             tok->deleteNext(3);
         }
+        else if (tok->str() == "(")
+            tok = tok->link();
     }
 }
 
@@ -3622,6 +3736,22 @@ void Tokenizer::simplifySQL()
     }
 }
 
+void Tokenizer::simplifyParenthesizedLibraryFunctions()
+{
+    for (Token *tok = list.front(); tok; tok = tok->next()) {
+        if (!Token::simpleMatch(tok, ") ("))
+            continue;
+        Token *rpar = tok, *lpar = tok->link();
+        if (!lpar || Token::Match(lpar->previous(), "%name%"))
+            continue;
+        const Token *ftok = rpar->previous();
+        if (mSettings.library.isNotLibraryFunction(ftok))
+            continue;
+        lpar->deleteThis();
+        rpar->deleteThis();
+    }
+}
+
 void Tokenizer::simplifyArrayAccessSyntax()
 {
     // 0[a] -> a[0]
@@ -3652,9 +3782,9 @@ 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->next()->link(), "} }")) {
+        } else if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->linkAt(1), "} }")) {
             //remove internal parentheses
-            tok->next()->link()->deleteThis();
+            tok->linkAt(1)->deleteThis();
             tok->deleteNext();
         } else
             tok = tok->next();
@@ -3667,7 +3797,7 @@ void Tokenizer::simplifyDoublePlusAndDoubleMinus()
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         while (tok->next()) {
             if (tok->str() == "+") {
-                if (tok->next()->str()[0] == '-') {
+                if (tok->strAt(1)[0] == '-') {
                     tok = tok->next();
                     if (tok->str().size() == 1) {
                         tok = tok->previous();
@@ -3681,7 +3811,7 @@ void Tokenizer::simplifyDoublePlusAndDoubleMinus()
                     continue;
                 }
             } else if (tok->str() == "-") {
-                if (tok->next()->str()[0] == '-') {
+                if (tok->strAt(1)[0] == '-') {
                     tok = tok->next();
                     if (tok->str().size() == 1) {
                         tok = tok->previous();
@@ -3705,9 +3835,9 @@ void Tokenizer::simplifyDoublePlusAndDoubleMinus()
 
 void Tokenizer::arraySize()
 {
-    auto getStrTok = [](Token* tok, bool addLength, Token** endStmt) -> Token* {
+    auto getStrTok = [](Token* tok, bool addLength, Token*& endStmt) -> Token* {
         if (addLength) {
-            *endStmt = tok->tokAt(5);
+            endStmt = tok->tokAt(5);
             return tok->tokAt(4);
         }
         if (Token::Match(tok, "%var% [ ] =")) {
@@ -3718,7 +3848,7 @@ void Tokenizer::arraySize()
                 tok = tok->next();
             }
             if (Token::Match(tok, "%str%")) {
-                *endStmt = tok->tokAt(parCount + 1);
+                endStmt = tok->tokAt(parCount + 1);
                 return tok;
             }
         }
@@ -3737,9 +3867,9 @@ void Tokenizer::arraySize()
         }
 
         Token* endStmt{};
-        if (const Token* strTok = getStrTok(tok, addlength, &endStmt)) {
+        if (const Token* strTok = getStrTok(tok, addlength, endStmt)) {
             const int sz = Token::getStrArraySize(strTok);
-            tok->next()->insertToken(MathLib::toString(sz));
+            tok->next()->insertToken(std::to_string(sz));
             tok = endStmt;
         }
 
@@ -3751,7 +3881,7 @@ void Tokenizer::arraySize()
                 if (tok2->link() && Token::Match(tok2, "{|(|[|<")) {
                     if (tok2->str() == "[" && tok2->link()->strAt(1) == "=") { // designated initializer
                         if (Token::Match(tok2, "[ %num% ]"))
-                            sz = std::max(sz, MathLib::toULongNumber(tok2->strAt(1)) + 1U);
+                            sz = std::max(sz, MathLib::toBigUNumber(tok2->tokAt(1)) + 1U);
                         else {
                             sz = 0;
                             break;
@@ -3776,6 +3906,46 @@ void Tokenizer::arraySize()
     }
 }
 
+// cppcheck-suppress functionConst
+void Tokenizer::arraySizeAfterValueFlow()
+{
+    // After ValueFlow, adjust array sizes.
+    for (const Variable* var: mSymbolDatabase->variableList()) {
+        if (!var || !var->isArray())
+            continue;
+        if (!Token::Match(var->nameToken(), "%name% [ ] = { ["))
+            continue;
+        MathLib::bigint maxIndex = -1;
+        const Token* const startToken = var->nameToken()->tokAt(4);
+        const Token* const endToken = startToken->link();
+        for (const Token* tok = startToken; tok != endToken; tok = tok->next()) {
+            if (!Token::Match(tok, "[{,] [") || !Token::simpleMatch(tok->linkAt(1), "] ="))
+                continue;
+            const Token* expr = tok->next()->astOperand1();
+            if (expr && expr->hasKnownIntValue())
+                maxIndex = std::max(maxIndex, expr->getKnownIntValue());
+        }
+        if (maxIndex >= 0) {
+            // insert array size
+            auto* tok = const_cast<Token*>(var->nameToken()->next());
+            tok->insertToken(MathLib::toString(maxIndex + 1));
+            // ast
+            tok->astOperand2(tok->next());
+            // Token::scope
+            tok->next()->scope(tok->scope());
+            // Value flow
+            ValueFlow::Value value(maxIndex + 1);
+            value.setKnown();
+            tok->next()->addValue(value);
+            // Set array dimensions
+            Dimension d;
+            d.num = maxIndex + 1;
+            std::vector<Dimension> dimensions{d};
+            const_cast<Variable*>(var)->setDimensions(dimensions);
+        }
+    }
+}
+
 static Token *skipTernaryOp(Token *tok)
 {
     int colonLevel = 1;
@@ -3825,7 +3995,7 @@ const Token * Tokenizer::startOfExecutableScope(const Token * tok)
     if (tok->str() != ")")
         return nullptr;
 
-    tok = isFunctionHead(tok, ":{", true);
+    tok = TokenList::isFunctionHead(tok, ":{");
 
     if (Token::Match(tok, ": %name% [({]")) {
         while (Token::Match(tok, "[:,] %name% [({]"))
@@ -3845,7 +4015,7 @@ void Tokenizer::simplifyLabelsCaseDefault()
     int indentLevel = 0;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         // Simplify labels in the executable scope..
-        Token *start = const_cast<Token *>(startOfExecutableScope(tok));
+        auto *start = const_cast<Token *>(startOfExecutableScope(tok));
         if (start) {
             tok = start;
             executablescope = true;
@@ -3855,7 +4025,7 @@ void Tokenizer::simplifyLabelsCaseDefault()
             continue;
 
         if (tok->str() == "{") {
-            if (tok->previous()->str() == "=")
+            if (tok->strAt(-1) == "=")
                 tok = tok->link();
             else
                 ++indentLevel;
@@ -3874,7 +4044,7 @@ void Tokenizer::simplifyLabelsCaseDefault()
                 break;
             if (tok->str() != ":" || tok->strAt(-1) == "case" || !tok->next())
                 syntaxError(tok);
-            if (tok->next()->str() != ";" && tok->next()->str() != "case")
+            if (tok->strAt(1) != ";" && tok->strAt(1) != "case")
                 tok->insertToken(";");
             else
                 tok = tok->previous();
@@ -3892,8 +4062,8 @@ void Tokenizer::simplifyCaseRange()
 {
     for (Token* tok = list.front(); tok; tok = tok->next()) {
         if (Token::Match(tok, "case %num%|%char% ... %num%|%char% :")) {
-            const MathLib::bigint start = MathLib::toLongNumber(tok->strAt(1));
-            MathLib::bigint end = MathLib::toLongNumber(tok->strAt(3));
+            const MathLib::bigint start = MathLib::toBigNumber(tok->tokAt(1));
+            MathLib::bigint end = MathLib::toBigNumber(tok->tokAt(3));
             end = std::min(start + 50, end); // Simplify it 50 times at maximum
             if (start < end) {
                 tok = tok->tokAt(2);
@@ -3916,7 +4086,7 @@ void Tokenizer::calculateScopes()
 
     std::string nextScopeNameAddition;
     std::shared_ptr<ScopeInfo2> primaryScope = std::make_shared<ScopeInfo2>("", nullptr);
-    list.front()->scopeInfo(primaryScope);
+    list.front()->scopeInfo(std::move(primaryScope));
 
     for (Token* tok = list.front(); tok; tok = tok->next()) {
         if (tok == list.front() || !tok->scopeInfo()) {
@@ -3994,7 +4164,7 @@ void Tokenizer::calculateScopes()
 
                 if (tok->link())
                     tok->link()->scopeInfo(tok->scopeInfo());
-                tok->scopeInfo(newScopeInfo);
+                tok->scopeInfo(std::move(newScopeInfo));
             }
         }
     }
@@ -4005,40 +4175,38 @@ void Tokenizer::simplifyTemplates()
     if (isC())
         return;
 
-    const std::time_t maxTime = mSettings->templateMaxTime > 0 ? std::time(nullptr) + mSettings->templateMaxTime : 0;
+    const std::time_t maxTime = mSettings.templateMaxTime > 0 ? std::time(nullptr) + mSettings.templateMaxTime : 0;
     mTemplateSimplifier->simplifyTemplates(
-        maxTime,
-        mCodeWithTemplates);
+        maxTime);
 }
 //---------------------------------------------------------------------------
 
 
-/** Class used in Tokenizer::setVarIdPass1 */
-class VariableMap {
-private:
-    std::map<std::string, nonneg int> mVariableId;
-    std::map<std::string, nonneg int> mVariableId_global;
-    std::stack<std::vector<std::pair<std::string, nonneg int>>> mScopeInfo;
-    mutable nonneg int mVarId;
-public:
-    VariableMap() : mVarId(0) {}
-    void enterScope();
-    bool leaveScope();
-    void addVariable(const std::string& varname, bool globalNamespace);
-    bool hasVariable(const std::string& varname) const {
-        return mVariableId.find(varname) != mVariableId.end();
-    }
+namespace {
+    /** Class used in Tokenizer::setVarIdPass1 */
+    class VariableMap {
+    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;
+        mutable nonneg int mVarId{};
+    public:
+        VariableMap() = default;
+        void enterScope();
+        bool leaveScope();
+        void addVariable(const std::string& varname, bool globalNamespace);
+        bool hasVariable(const std::string& varname) const {
+            return mVariableId.find(varname) != mVariableId.end();
+        }
 
-    const std::map<std::string, nonneg int>& map(bool global) const {
-        return global ? mVariableId_global : mVariableId;
-    }
-    nonneg int getVarId() const {
-        return mVarId;
-    }
-    nonneg int& getVarId() {
-        return mVarId;
-    }
-};
+        const std::unordered_map<std::string, nonneg int>& map(bool global) const {
+            return global ? mVariableId_global : mVariableId;
+        }
+        nonneg int& getVarId() {
+            return mVarId;
+        }
+    };
+}
 
 
 void VariableMap::enterScope()
@@ -4069,7 +4237,7 @@ void VariableMap::addVariable(const std::string& varname, bool globalNamespace)
             mVariableId_global[varname] = mVariableId[varname];
         return;
     }
-    std::map<std::string, nonneg int>::iterator it = mVariableId.find(varname);
+    const auto it = mVariableId.find(varname);
     if (it == mVariableId.end()) {
         mScopeInfo.top().emplace_back(varname, 0);
         mVariableId[varname] = ++mVarId;
@@ -4081,11 +4249,14 @@ void VariableMap::addVariable(const std::string& varname, bool globalNamespace)
     it->second = ++mVarId;
 }
 
-static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap, bool executableScope, bool cpp, bool c)
+/**
+ * @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())
+    const Token* const tok1 = tok;
+    Token* tok2 = tok;
+    if (!tok2->isName() || (tok2->tokType() != Token::eType && tok2->tokType() != Token::eName && tok2->tokType() != Token::eKeyword))
         return false;
 
     nonneg int typeCount = 0;
@@ -4099,20 +4270,22 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
                 tok2 = tok2->linkAt(1)->next();
                 continue;
             }
-            if (cpp && Token::Match(tok2, "namespace|public|private|protected"))
+            if (tok2->isCpp() && Token::Match(tok2, "namespace|public|private|protected"))
                 return false;
-            if (cpp && 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;
             }
-            if (Token::Match(tok2, "struct|union|enum") || (!c && Token::Match(tok2, "class|typename"))) {
+            if (Token::Match(tok2, "struct|union|enum") || (tok2->isCpp() && Token::Match(tok2, "class|typename"))) {
                 hasstruct = true;
                 typeCount = 0;
                 singleNameCount = 0;
             } else if (Token::Match(tok2, "const|extern")) {
                 // just skip "const", "extern"
-            } else if (!hasstruct && variableMap.map(false).count(tok2->str()) && tok2->previous()->str() != "::") {
+            } else if (!hasstruct && variableMap.map(false).count(tok2->str()) && tok2->strAt(-1) != "::") {
                 ++typeCount;
                 tok2 = tok2->next();
                 if (!tok2 || tok2->str() != "::")
@@ -4122,9 +4295,9 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
                     ++typeCount;
                 ++singleNameCount;
             }
-        } else if (!c && ((TemplateSimplifier::templateParameters(tok2) > 0) ||
-                          Token::simpleMatch(tok2, "< >") /* Ticket #4764 */)) {
-            const Token *start = *tok;
+        } else if (tok2->isCpp() && ((TemplateSimplifier::templateParameters(tok2) > 0) ||
+                                     Token::simpleMatch(tok2, "< >") /* Ticket #4764 */)) {
+            const Token *start = tok;
             if (Token::Match(start->previous(), "%or%|%oror%|&&|&|^|+|-|*|/"))
                 return false;
             Token* const closingBracket = tok2->findClosingBracket();
@@ -4153,13 +4326,13 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
                     return false;
             }
             bracket = true; // Skip: Seems to be valid pointer to array or function pointer
-        } else if (singleNameCount >= 1 && Token::Match(tok2, "( * %name% [") && Token::Match(tok2->linkAt(3), "] ) [;,]")) {
+        } else if (singleNameCount >= 1 && Token::Match(tok2, "( * %name% [") && Token::Match(tok2->linkAt(3), "] ) [;,]") && !variableMap.map(false).count(tok2->strAt(2))) {
             bracket = true;
         } else if (singleNameCount >= 1 && tok2->previous() && tok2->previous()->isStandardType() && Token::Match(tok2, "( *|&| %name% ) ;")) {
             bracket = true;
         } else if (tok2->str() == "::") {
             singleNameCount = 0;
-        } else if (tok2->str() != "*" && tok2->str() != "::" && tok2->str() != "...") {
+        } else if (tok2->str() != "*" && tok2->str() != "...") {
             break;
         }
         tok2 = tok2->next();
@@ -4168,7 +4341,7 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
     if (tok2) {
         bool isLambdaArg = false;
         {
-            const Token *tok3 = (*tok)->previous();
+            const Token *tok3 = tok->previous();
             if (tok3 && tok3->str() == ",") {
                 while (tok3 && !Token::Match(tok3,";|(|[|{")) {
                     if (Token::Match(tok3, ")|]"))
@@ -4188,13 +4361,13 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
                 }
             }
 
-            if (cpp && tok3 && Token::simpleMatch(tok3->previous(), "] (") &&
+            if (tok3 && tok3->isCpp() && Token::simpleMatch(tok3->previous(), "] (") &&
                 (Token::simpleMatch(tok3->link(), ") {") || Token::Match(tok3->link(), ") . %name%")))
                 isLambdaArg = true;
         }
 
 
-        *tok = tok2;
+        tok = tok2;
 
         // In executable scopes, references must be assigned
         // Catching by reference is an exception
@@ -4215,7 +4388,7 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
         }
         if (Token::Match(tok3, "= %num%"))
             return false;
-        if (bracket && Token::Match(tok1->previous(), "[(,]") && Token::Match(tok3, "[,)]"))
+        if (bracket && Token::Match(tok1->previous(), "[(,]") && Token::Match(tok3, ",|)|%cop%"))
             return false;
     }
 
@@ -4223,11 +4396,11 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
 }
 
 
-void Tokenizer::setVarIdStructMembers(Token **tok1,
-                                      std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers,
-                                      nonneg int &varId) const
+static void setVarIdStructMembers(Token *&tok1,
+                                  std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers,
+                                  nonneg int &varId)
 {
-    Token *tok = *tok1;
+    Token *tok = tok1;
 
     if (Token::Match(tok, "%name% = { . %name% =|{")) {
         const nonneg int struct_varid = tok->varId();
@@ -4242,8 +4415,8 @@ void Tokenizer::setVarIdStructMembers(Token **tok1,
                 tok = tok->link();
             if (Token::Match(tok->previous(), "[,{] . %name% =|{")) {
                 tok = tok->next();
-                const std::map<std::string, nonneg int>::iterator it = members.find(tok->str());
-                if (it == members.end()) {
+                const auto it = utils::as_const(members).find(tok->str());
+                if (it == members.cend()) {
                     members[tok->str()] = ++varId;
                     tok->varId(varId);
                 } else {
@@ -4258,8 +4431,8 @@ void Tokenizer::setVarIdStructMembers(Token **tok1,
 
     while (Token::Match(tok->next(), ")| . %name% !!(")) {
         // Don't set varid for trailing return type
-        if (tok->strAt(1) == ")" && (tok->linkAt(1)->previous()->isName() || tok->linkAt(1)->strAt(-1) == "]") &&
-            isFunctionHead(tok->linkAt(1), "{|;")) {
+        if (tok->strAt(1) == ")" && Token::Match(tok->linkAt(1)->tokAt(-1), "%name%|]") && !tok->linkAt(1)->tokAt(-1)->isKeyword() &&
+            TokenList::isFunctionHead(tok->linkAt(1), "{;")) {
             tok = tok->tokAt(3);
             continue;
         }
@@ -4276,8 +4449,8 @@ void Tokenizer::setVarIdStructMembers(Token **tok1,
             break;
 
         std::map<std::string, nonneg int>& members = structMembers[struct_varid];
-        const std::map<std::string, nonneg int>::iterator it = members.find(tok->str());
-        if (it == members.end()) {
+        const auto it = utils::as_const(members).find(tok->str());
+        if (it == members.cend()) {
             members[tok->str()] = ++varId;
             tok->varId(varId);
         } else {
@@ -4285,13 +4458,29 @@ void Tokenizer::setVarIdStructMembers(Token **tok1,
         }
     }
     // tok can't be null
-    *tok1 = tok;
+    tok1 = tok;
 }
 
-void Tokenizer::setVarIdClassDeclaration(Token* const startToken,
-                                         VariableMap& variableMap,
-                                         const nonneg int scopeStartVarId,
-                                         std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers)
+static void addTemplateVarIdUsage(const std::string &tokstr,
+                                  const std::map<std::string, std::set<std::string>>& templateVarUsage,
+                                  const std::unordered_map<std::string, nonneg int>& 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);
+        }
+    }
+}
+
+static bool setVarIdClassDeclaration(Token* const startToken,
+                                     VariableMap& variableMap,
+                                     const nonneg int scopeStartVarId,
+                                     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();
@@ -4302,7 +4491,7 @@ void Tokenizer::setVarIdClassDeclaration(Token* const startToken,
         if (!tok->isName() && tok->str() != ":")
             break;
         if (Token::Match(tok, "class|struct|enum %type% [:{]")) {
-            className = tok->next()->str();
+            className = tok->strAt(1);
             break;
         }
     }
@@ -4314,7 +4503,7 @@ void Tokenizer::setVarIdClassDeclaration(Token* const startToken,
     const Token *initListArgLastToken = nullptr;
     for (Token *tok = startToken->next(); tok != endToken; tok = tok->next()) {
         if (!tok)
-            syntaxError(nullptr);
+            return false;
         if (initList) {
             if (tok == initListArgLastToken)
                 initListArgLastToken = nullptr;
@@ -4325,6 +4514,10 @@ void Tokenizer::setVarIdClassDeclaration(Token* const startToken,
         }
         if (tok->str() == "{") {
             inEnum = isEnumStart(tok);
+            if (!inEnum && isClassStructUnionEnumStart(tok)) { // nested type
+                tok = tok->link();
+                continue;
+            }
             if (initList && !initListArgLastToken)
                 initList = false;
             ++indentlevel;
@@ -4332,7 +4525,7 @@ void Tokenizer::setVarIdClassDeclaration(Token* const startToken,
             --indentlevel;
             inEnum = false;
         } else if (initList && indentlevel == 0 && Token::Match(tok->previous(), "[,:] %name% [({]")) {
-            const std::map<std::string, nonneg int>::const_iterator it = variableMap.map(false).find(tok->str());
+            const auto it = variableMap.map(false).find(tok->str());
             if (it != variableMap.map(false).end()) {
                 tok->varId(it->second);
             }
@@ -4341,8 +4534,8 @@ void Tokenizer::setVarIdClassDeclaration(Token* const startToken,
                 if (Token::Match(tok->previous(), "::|.") && tok->strAt(-2) != "this" && !Token::simpleMatch(tok->tokAt(-5), "( * this ) ."))
                     continue;
                 if (!tok->next())
-                    syntaxError(nullptr);
-                if (tok->next()->str() == "::") {
+                    return false;
+                if (tok->strAt(1) == "::") {
                     if (tok->str() == className)
                         tok = tok->tokAt(2);
                     else
@@ -4350,16 +4543,19 @@ void Tokenizer::setVarIdClassDeclaration(Token* const startToken,
                 }
 
                 if (!inEnum) {
-                    const std::map<std::string, nonneg int>::const_iterator it = variableMap.map(false).find(tok->str());
+                    const auto it = variableMap.map(false).find(tok->str());
                     if (it != variableMap.map(false).end()) {
                         tok->varId(it->second);
-                        setVarIdStructMembers(&tok, structMembers, variableMap.getVarId());
+                        setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
+                    } else if (tok->str().back() == '>') {
+                        addTemplateVarIdUsage(tok->str(), templateVarUsage, variableMap.map(false), templateVarIdUsage);
                     }
                 }
             }
         } else if (indentlevel == 0 && tok->str() == ":" && !initListArgLastToken)
             initList = true;
     }
+    return true;
 }
 
 
@@ -4373,10 +4569,12 @@ void Tokenizer::setVarIdClassFunction(const std::string &classname,
                                       std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers,
                                       nonneg int &varId_)
 {
+    const auto pos = classname.rfind(' '); // TODO handle multiple scopes
+    const std::string lastScope = classname.substr(pos == std::string::npos ? 0 : pos + 1);
     for (Token *tok2 = startToken; tok2 && tok2 != endToken; tok2 = tok2->next()) {
         if (tok2->varId() != 0 || !tok2->isName())
             continue;
-        if (Token::Match(tok2->tokAt(-2), ("!!" + classname + " ::").c_str()))
+        if (Token::Match(tok2->tokAt(-2), ("!!" + lastScope + " ::").c_str()))
             continue;
         if (Token::Match(tok2->tokAt(-4), "%name% :: %name% ::")) // Currently unsupported
             continue;
@@ -4385,10 +4583,10 @@ void Tokenizer::setVarIdClassFunction(const std::string &classname,
         if (Token::Match(tok2, "%name% ::"))
             continue;
 
-        const std::map<std::string, nonneg int>::const_iterator it = varlist.find(tok2->str());
+        const auto it = utils::as_const(varlist).find(tok2->str());
         if (it != varlist.end()) {
             tok2->varId(it->second);
-            setVarIdStructMembers(&tok2, structMembers, varId_);
+            setVarIdStructMembers(tok2, structMembers, varId_);
         }
     }
 }
@@ -4420,6 +4618,7 @@ static const std::unordered_set<std::string> notstart_cpp = { NOTSTART_C,
 
 void Tokenizer::setVarIdPass1()
 {
+    const bool cpp = isCPP();
     // Variable declarations can't start with "return" etc.
     const std::unordered_set<std::string>& notstart = (isC()) ? notstart_c : notstart_cpp;
 
@@ -4436,7 +4635,7 @@ void Tokenizer::setVarIdPass1()
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->isOp())
             continue;
-        if (isCPP() && Token::simpleMatch(tok, "template <")) {
+        if (cpp && Token::simpleMatch(tok, "template <")) {
             Token* closingBracket = tok->next()->findClosingBracket();
             if (closingBracket)
                 tok = closingBracket;
@@ -4470,7 +4669,7 @@ void Tokenizer::setVarIdPass1()
         } else if (!initlist && tok->str()=="(") {
             const Token * newFunctionDeclEnd = nullptr;
             if (!scopeStack.top().isExecutable)
-                newFunctionDeclEnd = isFunctionHead(tok, "{:;");
+                newFunctionDeclEnd = TokenList::isFunctionHead(tok, "{:;");
             else {
                 const Token* tokenLinkNext = tok->link()->next();
                 if (Token::simpleMatch(tokenLinkNext, ".")) { // skip trailing return type
@@ -4496,7 +4695,7 @@ void Tokenizer::setVarIdPass1()
 
             // parse anonymous namespaces as part of the current scope
             if (!Token::Match(startToken->previous(), "union|struct|enum|namespace {") &&
-                !(initlist && Token::Match(startToken->previous(), "%name%|>|>>") && Token::Match(startToken->link(), "} ,|{"))) {
+                !(initlist && Token::Match(startToken->previous(), "%name%|>|>>|(") && Token::Match(startToken->link(), "} ,|{|)|..."))) {
 
                 if (tok->str() == "{") {
                     bool isExecutable;
@@ -4513,8 +4712,9 @@ void Tokenizer::setVarIdPass1()
                         if (!(scopeStack.top().isStructInit || tok->strAt(-1) == "="))
                             variableMap.enterScope();
                     }
+                    const bool isStructInit = scopeStack.top().isStructInit || tok->strAt(-1) == "=" || (initlist && !Token::Match(tok->tokAt(-1), ")|}|..."));
+                    scopeStack.emplace(isExecutable, isStructInit, isEnumStart(tok), variableMap.getVarId());
                     initlist = false;
-                    scopeStack.emplace(isExecutable, scopeStack.top().isStructInit || tok->strAt(-1) == "=", isEnumStart(tok), variableMap.getVarId());
                 } else { /* if (tok->str() == "}") */
                     bool isNamespace = false;
                     for (const Token *tok1 = tok->link()->previous(); tok1 && tok1->isName(); tok1 = tok1->previous()) {
@@ -4525,10 +4725,14 @@ void Tokenizer::setVarIdPass1()
                     }
                     // Set variable ids in class declaration..
                     if (!initlist && !isC() && !scopeStack.top().isExecutable && tok->link() && !isNamespace) {
-                        setVarIdClassDeclaration(tok->link(),
-                                                 variableMap,
-                                                 scopeStack.top().startVarid,
-                                                 structMembers);
+                        if (!setVarIdClassDeclaration(tok->link(),
+                                                      variableMap,
+                                                      scopeStack.top().startVarid,
+                                                      mTemplateSimplifier->getUsedVariables(),
+                                                      structMembers,
+                                                      mTemplateVarIdUsage)) {
+                            syntaxError(nullptr);
+                        }
                     }
 
                     if (!scopeStack.top().isStructInit) {
@@ -4554,13 +4758,13 @@ void Tokenizer::setVarIdPass1()
             }
         }
 
-        if (!scopeStack.top().isStructInit &&
-            (tok == list.front() ||
-             Token::Match(tok, "[;{}]") ||
-             (tok->str() == "(" && isFunctionHead(tok,"{")) ||
-             (tok->str() == "(" && !scopeStack.top().isExecutable && isFunctionHead(tok,";:")) ||
-             (tok->str() == "," && (!scopeStack.top().isExecutable || inlineFunction || !tok->previous()->varId())) ||
-             (tok->isName() && endsWith(tok->str(), ':')))) {
+        if ((!scopeStack.top().isStructInit &&
+             (tok == list.front() ||
+              Token::Match(tok, "[;{}]") ||
+              (tok->str() == "(" && !scopeStack.top().isExecutable && TokenList::isFunctionHead(tok,";:")) ||
+              (tok->str() == "," && (!scopeStack.top().isExecutable || inlineFunction || !tok->previous()->varId())) ||
+              (tok->isName() && endsWith(tok->str(), ':')))) ||
+            (tok->str() == "(" && TokenList::isFunctionHead(tok, "{"))) {
 
             // No variable declarations in sizeof
             if (Token::simpleMatch(tok->previous(), "sizeof (")) {
@@ -4588,7 +4792,7 @@ void Tokenizer::setVarIdPass1()
                 continue;
 
             bool decl;
-            if (isCPP() && mSettings->standards.cpp >= Standards::CPP17 && Token::Match(tok, "[(;{}] const| auto &|&&| [")) {
+            if (cpp && mSettings.standards.cpp >= Standards::CPP17 && Token::Match(tok, "[(;{}] const| auto &|&&| [")) {
                 // Structured bindings
                 tok2 = Token::findsimplematch(tok, "[");
                 if ((Token::simpleMatch(tok->previous(), "for (") && Token::simpleMatch(tok2->link(), "] :")) ||
@@ -4603,31 +4807,50 @@ void Tokenizer::setVarIdPass1()
             }
 
             try { /* Ticket #8151 */
-                decl = setVarIdParseDeclaration(&tok2, variableMap, scopeStack.top().isExecutable, isCPP(), isC());
+                decl = setVarIdParseDeclaration(tok2, variableMap, scopeStack.top().isExecutable, mSettings.standards.c);
             } catch (const Token * errTok) {
                 syntaxError(errTok);
             }
+
+            if (tok->str() == "(" && TokenList::isFunctionHead(tok, "{") && scopeStack.top().isExecutable)
+                inlineFunction = true;
+
             if (decl) {
-                if (isCPP()) {
-                    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);
-                        }
+                if (cpp) {
+                    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 (tok->str() == "(" && isFunctionHead(tok,"{") && scopeStack.top().isExecutable)
-                    inlineFunction = true;
+                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);
+                    }
+                }
 
                 const Token* prev2 = tok2->previous();
-                if (Token::Match(prev2, "%type% [;[=,)]") && tok2->previous()->str() != "const")
+                if (Token::Match(prev2, "%type% [;[=,)]") && tok2->strAt(-1) != "const")
                     ;
-                else if (Token::Match(prev2, "%type% :") && tok->strAt(-1) == "for")
+                else if (Token::Match(prev2, "%type% [:({]") && tok->strAt(-1) == "for")
                     ;
                 else if (Token::Match(prev2, "%type% ( !!)") && Token::simpleMatch(tok2->link(), ") ;")) {
                     // In C++ , a variable can't be called operator+ or something like that.
-                    if (isCPP() &&
+                    if (cpp &&
                         prev2->isOperatorKeyword())
                         continue;
 
@@ -4664,7 +4887,7 @@ void Tokenizer::setVarIdPass1()
                         }
                     } else
                         decl = false;
-                } else if (isCPP() && Token::Match(prev2, "%type% {") && Token::simpleMatch(tok2->link(), "} ;")) { // C++11 initialization style
+                } 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|:")))
                         continue;
@@ -4676,12 +4899,12 @@ void Tokenizer::setVarIdPass1()
                         syntaxErrorC(prev2, prev2->strAt(-2) + prev2->strAt(-1) + " " + prev2->str());
                     variableMap.addVariable(prev2->str(), scopeStack.size() <= 1);
 
-                    if (Token::simpleMatch(tok->previous(), "for (") && Token::Match(prev2, "%name% [=,]")) {
+                    if (Token::simpleMatch(tok->previous(), "for (") && Token::Match(prev2, "%name% [=[({,]")) {
                         for (const Token *tok3 = prev2->next(); tok3 && tok3->str() != ";"; tok3 = tok3->next()) {
                             if (Token::Match(tok3, "[([]"))
                                 tok3 = tok3->link();
-                            if (Token::Match(tok3, ", %name% [,=;]"))
-                                variableMap.addVariable(tok3->next()->str(), false);
+                            if (Token::Match(tok3, ", %name% [=[({,;]"))
+                                variableMap.addVariable(tok3->strAt(1), false);
                         }
                     }
 
@@ -4694,7 +4917,7 @@ void Tokenizer::setVarIdPass1()
                         while (tok != end) {
                             if (tok->isName() && !(Token::simpleMatch(tok->next(), "<") &&
                                                    Token::Match(tok->tokAt(-1), ":: %name%"))) {
-                                const std::map<std::string, nonneg int>::const_iterator it = variableMap.map(false).find(tok->str());
+                                const auto it = variableMap.map(false).find(tok->str());
                                 if (it != variableMap.map(false).end())
                                     tok->varId(it->second);
                             }
@@ -4709,26 +4932,34 @@ void Tokenizer::setVarIdPass1()
 
         if (tok->isName() && !tok->isKeyword() && !tok->isStandardType()) {
             // don't set variable id after a struct|enum|union
-            if (Token::Match(tok->previous(), "struct|enum|union") || (isCPP() && tok->strAt(-1) == "class"))
+            if (Token::Match(tok->previous(), "struct|enum|union") || (cpp && tok->strAt(-1) == "class"))
                 continue;
 
             bool globalNamespace = false;
             if (!isC()) {
-                if (tok->previous() && tok->previous()->str() == "::") {
+                if (tok->previous() && tok->strAt(-1) == "::") {
                     if (Token::Match(tok->tokAt(-2), ")|]|%name%"))
                         continue;
                     globalNamespace = true;
                 }
-                if (tok->next() && tok->next()->str() == "::")
+                if (tok->next() && tok->strAt(1) == "::")
                     continue;
                 if (Token::simpleMatch(tok->tokAt(-2), ":: template"))
                     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 && Token::Match(tok, "%name% [,)]")) {
+            if (scopeStack.top().isExecutable && !scopeStack.top().isStructInit && Token::Match(tok, "%name% [,)[]")) {
                 bool par = false;
-                const Token *start, *end;
+                const Token* start;
+                Token* end;
 
                 // search begin of function declaration
                 for (start = tok; Token::Match(start, "%name%|*|&|,|("); start = start->previous()) {
@@ -4746,22 +4977,25 @@ void Tokenizer::setVarIdPass1()
                 }
 
                 // search end of function declaration
-                for (end = tok->next(); Token::Match(end, "%name%|*|&|,"); end = end->next()) {}
+                for (end = tok->next(); Token::Match(end, "%name%|*|&|,|[|]|%num%"); end = end->next()) {}
 
                 // 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->next()->str()) != notstart.end();
+                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)
+                if (Token::Match(start, "[;{}] %type% %name%|*") && par && Token::simpleMatch(end, ") ;") && !isNotstartKeyword) {
                     // function declaration => don't set varid
+                    tok = end;
                     continue;
+                }
             }
 
-            if (!scopeStack.top().isEnum || !(Token::Match(tok->previous(), "{|,") && Token::Match(tok->next(), ",|=|}"))) {
-                const std::map<std::string, nonneg int>::const_iterator it = variableMap.map(globalNamespace).find(tok->str());
+            if (tok->varId() == 0 && (!scopeStack.top().isEnum || !(Token::Match(tok->previous(), "{|,") && Token::Match(tok->next(), ",|=|}"))) &&
+                !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());
+                    setVarIdStructMembers(tok, structMembers, variableMap.getVarId());
                 }
             }
         } else if (Token::Match(tok, "::|. %name%") && Token::Match(tok->previous(), ")|]|>|%name%")) {
@@ -4799,10 +5033,10 @@ static std::string getScopeName(const std::list<ScopeInfo2> &scopeInfo)
 
 static Token * matchMemberName(const std::list<std::string> &scope, const Token *nsToken, Token *memberToken, const std::list<ScopeInfo2> &scopeInfo)
 {
-    std::list<ScopeInfo2>::const_iterator scopeIt = scopeInfo.cbegin();
+    auto scopeIt = scopeInfo.cbegin();
 
     // Current scope..
-    for (std::list<std::string>::const_iterator it = scope.cbegin(); it != scope.cend(); ++it) {
+    for (auto it = scope.cbegin(); it != scope.cend(); ++it) {
         if (scopeIt == scopeInfo.cend() || scopeIt->name != *it)
             return nullptr;
         ++scopeIt;
@@ -4831,7 +5065,7 @@ static Token * matchMemberName(const std::list<std::string> &scope, const Token
             return nullptr;
         if (memberToken->str() != scopeIt->name)
             return nullptr;
-        if (memberToken->next()->str() == "<") {
+        if (memberToken->strAt(1) == "<") {
             memberToken = memberToken->next()->findClosingBracket();
             if (!Token::simpleMatch(memberToken, "> ::"))
                 return nullptr;
@@ -4879,6 +5113,24 @@ static Token * matchMemberFunctionName(const Member &func, const std::list<Scope
     return Token::Match(tok, "~| %name% (") ? tok : nullptr;
 }
 
+template<typename T>
+static T* skipInitializerList(T* tok)
+{
+    T* const start = tok;
+    while (Token::Match(tok, "[:,] ::| %name%")) {
+        tok = tok->tokAt(tok->strAt(1) == "::" ? 1 : 2);
+        while (Token::Match(tok, ":: %name%"))
+            tok = tok->tokAt(2);
+        if (!Token::Match(tok, "[({<]") || !tok->link())
+            return start;
+        const bool isTemplate = tok->str() == "<";
+        tok = tok->link()->next();
+        if (isTemplate && tok && tok->link())
+            tok = tok->link()->next();
+    }
+    return tok;
+}
+
 void Tokenizer::setVarIdPass2()
 {
     std::map<nonneg int, std::map<std::string, nonneg int>> structMembers;
@@ -4908,8 +5160,8 @@ void Tokenizer::setVarIdPass2()
             }
 
             if (tok->str() == "}") {
-                const std::map<const Token *, std::string>::iterator it = endOfScope.find(tok);
-                if (it != endOfScope.end())
+                const auto it = utils::as_const(endOfScope).find(tok);
+                if (it != endOfScope.cend())
                     scope.remove(it->second);
             }
 
@@ -4960,8 +5212,7 @@ void Tokenizer::setVarIdPass2()
         const std::string &scopeName(getScopeName(scopeInfo));
         const std::string scopeName2(scopeName.empty() ? std::string() : (scopeName + " :: "));
 
-        std::list<const Token *> classnameTokens;
-        classnameTokens.push_back(tok->next());
+        std::list<const Token*> classnameTokens{ tok->next() };
         Token* tokStart = tok->tokAt(2);
         while (Token::Match(tokStart, ":: %name%") || tokStart->str() == "<") {
             if (tokStart->str() == "<") {
@@ -4974,6 +5225,8 @@ void Tokenizer::setVarIdPass2()
                 classnameTokens.push_back(tokStart->next());
                 tokStart = tokStart->tokAt(2);
             }
+            if (!tokStart)
+                syntaxError(tok);
         }
 
         std::string classname;
@@ -4997,9 +5250,9 @@ void Tokenizer::setVarIdPass2()
                 }
                 std::string scopeName3(scopeName2);
                 while (!scopeName3.empty()) {
-                    const std::string name = scopeName3 + baseClassName;
+                    std::string name = scopeName3 + baseClassName;
                     if (varsByClass.find(name) != varsByClass.end()) {
-                        baseClassName = name;
+                        baseClassName = std::move(name);
                         break;
                     }
                     // Remove last scope name
@@ -5028,23 +5281,26 @@ void Tokenizer::setVarIdPass2()
             // skip parentheses..
             if (tok2->link()) {
                 if (tok2->str() == "(") {
-                    Token *funcstart = const_cast<Token*>(isFunctionHead(tok2, "{"));
+                    Token *funcstart = const_cast<Token*>(TokenList::isFunctionHead(tok2, "{"));
                     if (funcstart) {
                         setVarIdClassFunction(scopeName2 + classname, funcstart, funcstart->link(), thisClassVars, structMembers, mVarId);
                         tok2 = funcstart->link();
                         continue;
                     }
                 }
-                if (tok2->str() == "{") {
+                if (tok2->str() == "{" && !Token::simpleMatch(tok2->previous(), "union")) {
                     if (tok2->strAt(-1) == ")")
                         setVarIdClassFunction(scopeName2 + classname, tok2, tok2->link(), thisClassVars, structMembers, mVarId);
                     tok2 = tok2->link();
-                } else if (Token::Match(tok2, "( %name%|)") && !Token::Match(tok2->link(), "(|[")) {
+                } else if (Token::Match(tok2, "( %name%|)")) {
                     tok2 = tok2->link();
 
                     // Skip initialization list
-                    while (Token::Match(tok2, ") [:,] %name% ("))
-                        tok2 = tok2->linkAt(3);
+                    if (Token::simpleMatch(tok2, ") :")) {
+                        tok2 = skipInitializerList(tok2->next());
+                        if (Token::simpleMatch(tok2, "{"))
+                            tok2 = tok2->link();
+                    }
                 }
             }
 
@@ -5081,7 +5337,7 @@ void Tokenizer::setVarIdPass2()
                 tok2 = tok2->linkAt(1);
 
             // If this is a function implementation.. add it to funclist
-            Token * start = const_cast<Token *>(isFunctionHead(tok2, "{"));
+            Token * start = const_cast<Token *>(TokenList::isFunctionHead(tok2, "{"));
             if (start) {
                 setVarIdClassFunction(classname, start, start->link(), thisClassVars, structMembers, mVarId);
             }
@@ -5104,26 +5360,26 @@ void Tokenizer::setVarIdPass2()
                     break;
 
                 // set varid
-                const std::map<std::string, nonneg int>::const_iterator varpos = thisClassVars.find(tok3->str());
+                const auto varpos = utils::as_const(thisClassVars).find(tok3->str());
                 if (varpos != thisClassVars.end())
                     tok3->varId(varpos->second);
 
                 // goto end of var
                 if (tok3->strAt(1) == "<") {
                     tok3 = tok3->next()->findClosingBracket();
-                    if (tok3 && tok3->next() && tok3->next()->link())
-                        tok3 = tok3->next()->link();
+                    if (tok3 && tok3->next() && tok3->linkAt(1))
+                        tok3 = tok3->linkAt(1);
                 } else
                     tok3 = tok3->linkAt(1);
             }
             if (Token::Match(tok3, ")|} {")) {
-                setVarIdClassFunction(classname, tok2, tok3->next()->link(), thisClassVars, structMembers, mVarId);
+                setVarIdClassFunction(classname, tok2, tok3->linkAt(1), thisClassVars, structMembers, mVarId);
             }
         }
     }
 }
 
-static void linkBrackets(const Tokenizer * const tokenizer, std::stack<const Token*>& type, std::stack<Token*>& links, Token * const token, const char open, const char close)
+static void linkBrackets(const Tokenizer & tokenizer, std::stack<const Token*>& type, std::stack<Token*>& links, Token * const token, const char open, const char close)
 {
     if (token->str()[0] == open) {
         links.push(token);
@@ -5131,10 +5387,10 @@ static void linkBrackets(const Tokenizer * const tokenizer, std::stack<const Tok
     } else if (token->str()[0] == close) {
         if (links.empty()) {
             // Error, { and } don't match.
-            tokenizer->unmatchedToken(token);
+            tokenizer.unmatchedToken(token);
         }
         if (type.top()->str()[0] != open) {
-            tokenizer->unmatchedToken(type.top());
+            tokenizer.unmatchedToken(type.top());
         }
         type.pop();
 
@@ -5154,11 +5410,11 @@ void Tokenizer::createLinks()
             token->link(nullptr);
         }
 
-        linkBrackets(this, type, links1, token, '{', '}');
+        linkBrackets(*this, type, links1, token, '{', '}');
 
-        linkBrackets(this, type, links2, token, '(', ')');
+        linkBrackets(*this, type, links2, token, '(', ')');
 
-        linkBrackets(this, type, links3, token, '[', ']');
+        linkBrackets(*this, type, links3, token, '[', ']');
     }
 
     if (!links1.empty()) {
@@ -5239,7 +5495,7 @@ 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;
                 // Variable declaration
                 if (Token::Match(end, "> %var% ;") && (type.top()->tokAt(-2) == nullptr || Token::Match(type.top()->tokAt(-2), ";|}|{")))
@@ -5249,10 +5505,11 @@ void Tokenizer::createLinks2()
         } else if (token->str() == "<" &&
                    ((token->previous() && (token->previous()->isTemplate() ||
                                            (token->previous()->isName() && !token->previous()->varId()) ||
-                                           (token->strAt(-1) == "]" && (!Token::Match(token->linkAt(-1)->previous(), "%name%|)") || token->linkAt(-1)->previous()->isKeyword())))) ||
+                                           (token->strAt(-1) == "]" && (!Token::Match(token->linkAt(-1)->previous(), "%name%|)") || token->linkAt(-1)->previous()->isKeyword())) ||
+                                           (token->strAt(-1) == ")" && token->linkAt(-1)->strAt(-1) == "operator"))) ||
                     Token::Match(token->next(), ">|>>"))) {
             type.push(token);
-            if (token->previous()->str() == "template")
+            if (token->strAt(-1) == "template")
                 templateTokens.push(token);
         } else if (token->str() == ">" || token->str() == ">>") {
             if (type.empty() || type.top()->str() != "<") // < and > don't match.
@@ -5264,7 +5521,7 @@ void Tokenizer::createLinks2()
             if (!top2 || top2->str() != "<") {
                 if (token->str() == ">>")
                     continue;
-                if (!Token::Match(token->next(), "%name%|%cop%|%assign%|::|,|(|)|{|}|;|[|]|:|.|=|...") &&
+                if (!Token::Match(token->next(), "%name%|%cop%|%assign%|::|,|(|)|{|}|;|[|]|:|.|=|?|...") &&
                     !Token::Match(token->next(), "&& %name% ="))
                     continue;
             }
@@ -5294,6 +5551,21 @@ void Tokenizer::createLinks2()
     }
 }
 
+void Tokenizer::markCppCasts()
+{
+    if (isC())
+        return;
+    for (Token* tok = list.front(); tok; tok = tok->next()) {
+        if (Token::Match(tok, "const_cast|dynamic_cast|reinterpret_cast|static_cast")) {
+            if (!Token::simpleMatch(tok->next(), "<") || !Token::simpleMatch(tok->linkAt(1), "> ("))
+                syntaxError(tok);
+            tok = tok->linkAt(1)->next();
+            tok->isCast(true);
+        }
+    }
+
+}
+
 void Tokenizer::sizeofAddParentheses()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
@@ -5325,10 +5597,11 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     // if MACRO
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "if|for|while|BOOST_FOREACH %name% (")) {
+        if (Token::Match(tok, "if|for|while %name% (")) {
             if (Token::simpleMatch(tok, "for each")) {
-                // 'for each ( )' -> 'asm ( )'
-                tok->str("asm");
+                // 'for each (x in y )' -> 'for (x : y)'
+                if (Token* in = Token::findsimplematch(tok->tokAt(2), "in", tok->linkAt(2)))
+                    in->str(":");
                 tok->deleteNext();
             } else if (tok->strAt(1) == "constexpr") {
                 tok->deleteNext();
@@ -5350,6 +5623,9 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     createLinks();
 
+    // replace library function calls such as (std::min)(a, b) with std::min(a, b)
+    simplifyParenthesizedLibraryFunctions();
+
     // Simplify debug intrinsics
     simplifyDebug();
 
@@ -5366,7 +5642,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     simplifyAsm();
 
     // foo < bar < >> => foo < bar < > >
-    if (isCPP() || mSettings->daca)
+    if (isCPP() || mSettings.daca)
         splitTemplateRightAngleBrackets(!isCPP());
 
     // Remove extra "template" tokens that are not used by cppcheck
@@ -5374,20 +5650,34 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     simplifySpaceshipOperator();
 
+    // @..
+    simplifyAt();
+
+    // Remove __declspec()
+    simplifyDeclspec();
+
+    // Remove "inline", "register", and "restrict"
+    simplifyKeyword();
+
+    // Remove [[attribute]]
+    simplifyCPPAttribute();
+
+    // remove __attribute__((?))
+    simplifyAttribute();
+
+    validate();
+
+    const ShowTime showTime = mTimerResults ? mSettings.showtime : ShowTime::NONE;
+
     // Bail out if code is garbage
-    if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1::findGarbageCode", mSettings->showtime, mTimerResults);
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::findGarbageCode", showTime, mTimerResults, [&]() {
         findGarbageCode();
-    } else {
-        findGarbageCode();
-    }
-
-    checkConfiguration();
+    });
 
     // if (x) MACRO() ..
     for (const Token *tok = list.front(); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "if (")) {
-            tok = tok->next()->link();
+            tok = tok->linkAt(1);
             if (Token::Match(tok, ") %name% (") &&
                 tok->next()->isUpperCaseName() &&
                 Token::Match(tok->linkAt(2), ") {|else")) {
@@ -5408,12 +5698,6 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     // simplify namespace aliases
     simplifyNamespaceAliases();
 
-    // Remove [[attribute]]
-    simplifyCPPAttribute();
-
-    // remove __attribute__((?))
-    simplifyAttribute();
-
     // simplify cppcheck attributes __cppcheck_?__(?)
     simplifyCppcheckAttribute();
 
@@ -5427,8 +5711,10 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     if (isCPP())
         simplifyExternC();
 
-    // simplify weird but legal code: "[;{}] ( { code; } ) ;"->"[;{}] code;"
-    simplifyRoundCurlyParentheses();
+    validate();
+
+    // simplify compound statements: "[;{}] ( { code; } ) ;"->"[;{}] code;"
+    simplifyCompoundStatements();
 
     // check for simple syntax errors..
     for (const Token *tok = list.front(); tok; tok = tok->next()) {
@@ -5455,13 +5741,8 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     if (Settings::terminated())
         return false;
 
-    // Remove __declspec()
-    simplifyDeclspec();
     validate();
 
-    // Remove "inline", "register", and "restrict"
-    simplifyKeyword();
-
     // simplify simple calculations inside <..>
     if (isCPP()) {
         Token *lt = nullptr;
@@ -5491,7 +5772,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     // simplify labels and 'case|default'-like syntaxes
     simplifyLabelsCaseDefault();
 
-    if (!isC() && !mSettings->library.markupFile(FileName)) {
+    if (!isC() && !mSettings.library.markupFile(FileName)) {
         findComplicatedSyntaxErrorsInTemplates();
     }
 
@@ -5546,12 +5827,9 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     simplifyTypedefLHS();
 
     // typedef..
-    if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTypedef", mSettings->showtime, mTimerResults);
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTypedef", showTime, mTimerResults, [&]() {
         simplifyTypedef();
-    } else {
-        simplifyTypedef();
-    }
+    });
 
     // using A = B;
     while (simplifyUsing())
@@ -5562,18 +5840,11 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     // If typedef handling is refactored and moved to symboldatabase someday we can remove this
     prepareTernaryOpForAST();
 
-    for (Token* tok = list.front(); tok;) {
-        if (Token::Match(tok, "union|struct|class union|struct|class"))
-            tok->deleteNext();
-        else
-            tok = tok->next();
-    }
-
     // class x y {
-    if (isCPP() && mSettings->severity.isEnabled(Severity::information)) {
+    if (isCPP() && mSettings.severity.isEnabled(Severity::information)) {
         for (const Token *tok = list.front(); tok; tok = tok->next()) {
             if (Token::Match(tok, "class %type% %type% [:{]")) {
-                unhandled_macro_class_x_y(tok);
+                unhandled_macro_class_x_y(tok, tok->str(), tok->strAt(1), tok->strAt(2), tok->strAt(3));
             }
         }
     }
@@ -5592,9 +5863,6 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     // Put ^{} statements in asm()
     simplifyAsm2();
 
-    // @..
-    simplifyAt();
-
     // When the assembly code has been cleaned up, no @ is allowed
     for (const Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->str() == "(") {
@@ -5649,17 +5917,13 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     // Remove redundant parentheses
     simplifyRedundantParentheses();
 
-    if (isCPP())
+    if (isCPP()) {
         simplifyTypeIntrinsics();
 
-    if (!isC()) {
         // Handle templates..
-        if (mTimerResults) {
-            Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTemplates", mSettings->showtime, mTimerResults);
-            simplifyTemplates();
-        } else {
+        Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::simplifyTemplates", showTime, mTimerResults, [&]() {
             simplifyTemplates();
-        }
+        });
 
         // The simplifyTemplates have inner loops
         if (Settings::terminated())
@@ -5684,23 +5948,15 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 
     validate(); // #6772 "segmentation fault (invalid code) in Tokenizer::setVarId"
 
-    if (mTimerResults) {
-        Timer t("Tokenizer::simplifyTokens1::simplifyTokenList1::setVarId", mSettings->showtime, mTimerResults);
+    Timer::run("Tokenizer::simplifyTokens1::simplifyTokenList1::setVarId", showTime, mTimerResults, [&](){
         setVarId();
-    } else {
-        setVarId();
-    }
+    });
 
     // Link < with >
     createLinks2();
 
     // Mark C++ casts
-    for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "const_cast|dynamic_cast|reinterpret_cast|static_cast <") && Token::simpleMatch(tok->linkAt(1), "> (")) {
-            tok = tok->linkAt(1)->next();
-            tok->isCast(true);
-        }
-    }
+    markCppCasts();
 
     // specify array size
     arraySize();
@@ -5741,54 +5997,38 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
 }
 //---------------------------------------------------------------------------
 
-void Tokenizer::printDebugOutput(int simplification) const
+void Tokenizer::printDebugOutput(std::ostream &out) const
 {
-    const bool debug = (simplification != 1U && mSettings->debugSimplified) ||
-                       (simplification != 2U && mSettings->debugnormal);
-
-    if (debug && list.front()) {
-        list.front()->printOut(nullptr, list.getFiles());
+    if (!list.front())
+        return;
 
-        if (mSettings->xml)
-            std::cout << "<debug>" << std::endl;
+    const bool debug = mSettings.debugSimplified || mSettings.debugnormal || mSettings.debugsymdb || mSettings.debugast || mSettings.debugvalueflow;
+    if (!debug)
+        return;
 
-        if (mSymbolDatabase) {
-            if (mSettings->xml)
-                mSymbolDatabase->printXml(std::cout);
-            else if (mSettings->verbose) {
-                mSymbolDatabase->printOut("Symbol database");
-            }
-        }
+    const bool xml = (mSettings.outputFormat == Settings::OutputFormat::xml);
 
-        if (mSettings->verbose)
-            list.front()->printAst(mSettings->verbose, mSettings->xml, list.getFiles(), std::cout);
+    if (xml)
+        out << "<debug>" << std::endl;
 
-        list.front()->printValueFlow(mSettings->xml, std::cout);
+    if (mSettings.debugSimplified || mSettings.debugnormal)
+        list.front()->printOut(out, xml, nullptr, list.getFiles());
 
-        if (mSettings->xml)
-            std::cout << "</debug>" << std::endl;
+    if (mSymbolDatabase) {
+        if (xml)
+            mSymbolDatabase->printXml(out);
+        else if (mSettings.debugsymdb)
+            mSymbolDatabase->printOut("Symbol database");
     }
 
-    if (mSymbolDatabase && simplification == 2U && mSettings->debugwarnings) {
-        printUnknownTypes();
-
-        // the typeStartToken() should come before typeEndToken()
-        for (const Variable *var : mSymbolDatabase->variableList()) {
-            if (!var)
-                continue;
+    if (mSettings.debugast)
+        list.front()->printAst(xml, list.getFiles(), out);
 
-            const Token * typetok = var->typeStartToken();
-            while (typetok && typetok != var->typeEndToken())
-                typetok = typetok->next();
+    if (mSettings.debugvalueflow)
+        list.front()->printValueFlow(list.getFiles(), xml, out);
 
-            if (typetok != var->typeEndToken()) {
-                reportError(var->typeStartToken(),
-                            Severity::debug,
-                            "debug",
-                            "Variable::typeStartToken() of variable '" + var->name() + "' is not located before Variable::typeEndToken(). The location of the typeStartToken() is '" + var->typeStartToken()->str() + "' at line " + MathLib::toString(var->typeStartToken()->linenr()));
-            }
-        }
-    }
+    if (xml)
+        out << "</debug>" << std::endl;
 }
 
 void Tokenizer::dump(std::ostream &out) const
@@ -5797,147 +6037,341 @@ void Tokenizer::dump(std::ostream &out) const
     // The idea is not that this will be readable for humans. It's a
     // data dump that 3rd party tools could load and get useful info from.
 
+    std::string outs;
+
     std::set<const Library::Container*> containers;
 
+    outs += "  <directivelist>";
+    outs += '\n';
+    for (const Directive &dir : mDirectives) {
+        outs += "    <directive ";
+        outs += "file=\"";
+        outs += ErrorLogger::toxml(Path::getRelativePath(dir.file, mSettings.basePaths));
+        outs += "\" ";
+        outs += "linenr=\"";
+        outs += std::to_string(dir.linenr);
+        outs += "\" ";
+        // str might contain characters such as '"', '<' or '>' which
+        // could result in invalid XML, so run it through toxml().
+        outs += "str=\"";
+        outs += ErrorLogger::toxml(dir.str);
+        outs +="\">";
+        outs += '\n';
+        for (const auto & strToken : dir.strTokens) {
+            outs += "      <token ";
+            outs += "column=\"";
+            outs += std::to_string(strToken.column);
+            outs += "\" ";
+            outs += "str=\"";
+            outs += ErrorLogger::toxml(strToken.tokStr);
+            outs +="\"/>";
+            outs += '\n';
+        }
+        outs += "    </directive>";
+        outs += '\n';
+    }
+    outs += "  </directivelist>";
+    outs += '\n';
+
     // tokens..
-    out << "  <tokenlist>" << std::endl;
+    outs += "  <tokenlist>";
+    outs += '\n';
     for (const Token *tok = list.front(); tok; tok = tok->next()) {
-        out << "    <token id=\"" << tok << "\" file=\"" << ErrorLogger::toxml(list.file(tok)) << "\" linenr=\"" << tok->linenr() << "\" column=\"" << tok->column() << "\"";
-        out << " str=\"" << ErrorLogger::toxml(tok->str()) << '\"';
-        out << " scope=\"" << tok->scope() << '\"';
+        outs += "    <token id=\"";
+        outs += id_string(tok);
+        outs += "\" file=\"";
+        outs += ErrorLogger::toxml(list.file(tok));
+        outs += "\" linenr=\"";
+        outs += std::to_string(tok->linenr());
+        outs += "\" column=\"";
+        outs += std::to_string(tok->column());
+        outs += "\"";
+
+        outs += " str=\"";
+        outs += ErrorLogger::toxml(tok->str());
+        outs += '\"';
+
+        outs += " scope=\"";
+        outs += id_string(tok->scope());
+        outs += '\"';
         if (tok->isName()) {
-            out << " type=\"name\"";
+            outs += " type=\"name\"";
             if (tok->isUnsigned())
-                out << " isUnsigned=\"true\"";
+                outs += " isUnsigned=\"true\"";
             else if (tok->isSigned())
-                out << " isSigned=\"true\"";
+                outs += " isSigned=\"true\"";
         } else if (tok->isNumber()) {
-            out << " type=\"number\"";
+            outs += " type=\"number\"";
             if (MathLib::isInt(tok->str()))
-                out << " isInt=\"true\"";
+                outs += " isInt=\"true\"";
             if (MathLib::isFloat(tok->str()))
-                out << " isFloat=\"true\"";
-        } else if (tok->tokType() == Token::eString)
-            out << " type=\"string\" strlen=\"" << Token::getStrLength(tok) << '\"';
+                outs += " isFloat=\"true\"";
+        } else if (tok->tokType() == Token::eString) {
+            outs += " type=\"string\" strlen=\"";
+            outs += std::to_string(Token::getStrLength(tok));
+            outs += '\"';
+        }
         else if (tok->tokType() == Token::eChar)
-            out << " type=\"char\"";
+            outs += " type=\"char\"";
         else if (tok->isBoolean())
-            out << " type=\"boolean\"";
+            outs += " type=\"boolean\"";
         else if (tok->isOp()) {
-            out << " type=\"op\"";
+            outs += " type=\"op\"";
             if (tok->isArithmeticalOp())
-                out << " isArithmeticalOp=\"true\"";
+                outs += " isArithmeticalOp=\"true\"";
             else if (tok->isAssignmentOp())
-                out << " isAssignmentOp=\"true\"";
+                outs += " isAssignmentOp=\"true\"";
             else if (tok->isComparisonOp())
-                out << " isComparisonOp=\"true\"";
+                outs += " isComparisonOp=\"true\"";
             else if (tok->tokType() == Token::eLogicalOp)
-                out << " isLogicalOp=\"true\"";
+                outs += " isLogicalOp=\"true\"";
         }
         if (tok->isCast())
-            out << " isCast=\"true\"";
+            outs += " isCast=\"true\"";
         if (tok->isExternC())
-            out << " externLang=\"C\"";
+            outs += " externLang=\"C\"";
         if (tok->isExpandedMacro())
-            out << " isExpandedMacro=\"true\"";
-        if (tok->isTemplateArg())
-            out << " isTemplateArg=\"true\"";
+            outs += " macroName=\"" + tok->getMacroName() + "\"";
+        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())
-            out << " isRemovedVoidParameter=\"true\"";
+            outs += " isRemovedVoidParameter=\"true\"";
         if (tok->isSplittedVarDeclComma())
-            out << " isSplittedVarDeclComma=\"true\"";
+            outs += " isSplittedVarDeclComma=\"true\"";
         if (tok->isSplittedVarDeclEq())
-            out << " isSplittedVarDeclEq=\"true\"";
+            outs += " isSplittedVarDeclEq=\"true\"";
         if (tok->isImplicitInt())
-            out << " isImplicitInt=\"true\"";
+            outs += " isImplicitInt=\"true\"";
         if (tok->isComplex())
-            out << " isComplex=\"true\"";
+            outs += " isComplex=\"true\"";
         if (tok->isRestrict())
-            out << " isRestrict=\"true\"";
+            outs += " isRestrict=\"true\"";
         if (tok->isAtomic())
-            out << " isAtomic=\"true\"";
+            outs += " isAtomic=\"true\"";
         if (tok->isAttributeExport())
-            out << " isAttributeExport=\"true\"";
-        if (tok->link())
-            out << " link=\"" << tok->link() << '\"';
-        if (tok->varId() > 0)
-            out << " varId=\"" << MathLib::toString(tok->varId()) << '\"';
-        if (tok->exprId() > 0)
-            out << " exprId=\"" << MathLib::toString(tok->exprId()) << '\"';
-        if (tok->variable())
-            out << " variable=\"" << tok->variable() << '\"';
-        if (tok->function())
-            out << " function=\"" << tok->function() << '\"';
-        if (!tok->values().empty())
-            out << " values=\"" << &tok->values() << '\"';
-        if (tok->type())
-            out << " type-scope=\"" << tok->type()->classScope << '\"';
-        if (tok->astParent())
-            out << " astParent=\"" << tok->astParent() << '\"';
-        if (tok->astOperand1())
-            out << " astOperand1=\"" << tok->astOperand1() << '\"';
-        if (tok->astOperand2())
-            out << " astOperand2=\"" << tok->astOperand2() << '\"';
-        if (!tok->originalName().empty())
-            out << " originalName=\"" << tok->originalName() << '\"';
+            outs += " isAttributeExport=\"true\"";
+        if (tok->isAttributeMaybeUnused())
+            outs += " isAttributeMaybeUnused=\"true\"";
+        if (tok->isAttributeUnused())
+            outs += " isAttributeUnused=\"true\"";
+        if (tok->isAttributeFallthrough())
+            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]) + "\"";
+            if (a.size() > 1)
+                // we could write all alignas expressions but currently we only need 2
+                outs += " alignas2=\"" + ErrorLogger::toxml(a[1]) + "\"";
+        }
+        if (tok->link()) {
+            outs += " link=\"";
+            outs += id_string(tok->link());
+            outs += '\"';
+        }
+        if (tok->varId() > 0) {
+            outs += " varId=\"";
+            outs += std::to_string(tok->varId());
+            outs += '\"';
+        }
+        if (tok->exprId() > 0) {
+            outs += " exprId=\"";
+            outs += std::to_string(tok->exprId());
+            outs += '\"';
+        }
+        if (tok->variable()) {
+            outs += " variable=\"";
+            outs += id_string(tok->variable());
+            outs += '\"';
+        }
+        if (tok->function()) {
+            outs += " function=\"";
+            outs += id_string(tok->function());
+            outs += '\"';
+        }
+        if (!tok->values().empty()) {
+            outs += " values=\"";
+            outs += id_string(&tok->values());
+            outs += '\"';
+        }
+        if (tok->type()) {
+            outs += " type-scope=\"";
+            outs += id_string(tok->type()->classScope);
+            outs += '\"';
+        }
+        if (tok->astParent()) {
+            outs += " astParent=\"";
+            outs += id_string(tok->astParent());
+            outs += '\"';
+        }
+        if (tok->astOperand1()) {
+            outs += " astOperand1=\"";
+            outs += id_string(tok->astOperand1());
+            outs += '\"';
+        }
+        if (tok->astOperand2()) {
+            outs += " astOperand2=\"";
+            outs += id_string(tok->astOperand2());
+            outs += '\"';
+        }
+        if (!tok->originalName().empty()) {
+            outs += " originalName=\"";
+            outs += tok->originalName();
+            outs += '\"';
+        }
         if (tok->valueType()) {
             const std::string vt = tok->valueType()->dump();
-            if (!vt.empty())
-                out << ' ' << vt;
+            if (!vt.empty()) {
+                outs += ' ';
+                outs += vt;
+            }
             containers.insert(tok->valueType()->container);
         }
         if (!tok->varId() && tok->scope()->isExecutable() && Token::Match(tok, "%name% (")) {
-            if (mSettings->library.isnoreturn(tok))
-                out << " noreturn=\"true\"";
+            if (mSettings.library.isnoreturn(tok))
+                outs += " noreturn=\"true\"";
         }
 
-        out << "/>" << std::endl;
+        outs += "/>";
+        outs += '\n';
     }
-    out << "  </tokenlist>" << std::endl;
+    outs += "  </tokenlist>";
+    outs += '\n';
+
+    out << outs;
+    outs.clear();
 
-    mSymbolDatabase->printXml(out);
+    if (mSymbolDatabase)
+        mSymbolDatabase->printXml(out);
 
     containers.erase(nullptr);
     if (!containers.empty()) {
-        out << "  <containers>\n";
+        outs += "  <containers>";
+        outs += '\n';
         for (const Library::Container* c: containers) {
-            out << "    <container id=\"" << c << "\" array-like-index-op=\""
-                << (c->arrayLike_indexOp ? "true" : "false") << "\" "
-                << "std-string-like=\"" << (c->stdStringLike ? "true" : "false") << "\"/>\n";
+            outs += "    <container id=\"";
+            outs += id_string(c);
+            outs += "\" array-like-index-op=\"";
+            outs += bool_to_string(c->arrayLike_indexOp);
+            outs += "\" ";
+            outs += "std-string-like=\"";
+            outs += bool_to_string(c->stdStringLike);
+            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";
         }
-        out << "  </containers>\n";
+        outs += "  </containers>";
+        outs += '\n';
     }
 
     if (list.front())
-        list.front()->printValueFlow(true, out);
+        list.front()->printValueFlow(list.getFiles(), true, out);
 
-    if (!mTypedefInfo.empty()) {
-        out << "  <typedef-info>" << std::endl;
-        for (const TypedefInfo &typedefInfo: mTypedefInfo) {
-            out << "    <info"
-                << " name=\"" << typedefInfo.name << "\""
-                << " file=\"" << typedefInfo.filename << "\""
-                << " line=\"" << typedefInfo.lineNumber << "\""
-                << " column=\"" << typedefInfo.column << "\""
-                << " used=\"" << (typedefInfo.used?1:0) << "\""
-                << "/>" << std::endl;
-        }
-        out << "  </typedef-info>" << std::endl;
+    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 << mTemplateSimplifier->dump();
+
+    out << outs;
+}
+
+std::string Tokenizer::dumpTypedefInfo() const
+{
+    if (mTypedefInfo.empty())
+        return "";
+    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 += "\"";
+
+        outs += " file=\"";
+        outs += ErrorLogger::toxml(typedefInfo.filename);
+        outs += "\"";
+
+        outs += " line=\"";
+        outs += std::to_string(typedefInfo.lineNumber);
+        outs += "\"";
+
+        outs += " column=\"";
+        outs += std::to_string(typedefInfo.column);
+        outs += "\"";
+
+        outs += " used=\"";
+        outs += std::to_string(typedefInfo.used?1:0);
+        outs += "\"";
+
+        outs += " isFunctionPointer=\"";
+        outs += std::to_string(typedefInfo.isFunctionPointer);
+        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';
+
+    return outs;
 }
 
 void Tokenizer::simplifyHeadersAndUnusedTemplates()
 {
-    if (mSettings->checkHeaders && mSettings->checkUnusedTemplates)
+    if (mSettings.checkHeaders && mSettings.checkUnusedTemplates)
         // Full analysis. All information in the headers are kept.
         return;
 
-    const bool checkHeaders = mSettings->checkHeaders;
-    const bool removeUnusedIncludedFunctions = !mSettings->checkHeaders;
-    const bool removeUnusedIncludedClasses   = !mSettings->checkHeaders;
-    const bool removeUnusedIncludedTemplates = !mSettings->checkUnusedTemplates || !mSettings->checkHeaders;
-    const bool removeUnusedTemplates = !mSettings->checkUnusedTemplates;
+    const bool checkHeaders = mSettings.checkHeaders;
+    const bool removeUnusedIncludedFunctions = !mSettings.checkHeaders;
+    const bool removeUnusedIncludedClasses   = !mSettings.checkHeaders;
+    const bool removeUnusedIncludedTemplates = !mSettings.checkUnusedTemplates || !mSettings.checkHeaders;
+    const bool removeUnusedTemplates = !mSettings.checkUnusedTemplates;
 
     // checkHeaders:
     //
@@ -5953,7 +6387,7 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
     // functions and types to keep
     std::set<std::string> keep;
     for (const Token *tok = list.front(); tok; tok = tok->next()) {
-        if (isCPP() && Token::simpleMatch(tok, "template <")) {
+        if (tok->isCpp() && Token::simpleMatch(tok, "template <")) {
             const Token *closingBracket = tok->next()->findClosingBracket();
             if (Token::Match(closingBracket, "> class|struct %name% {"))
                 tok = closingBracket->linkAt(3);
@@ -5976,12 +6410,18 @@ 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() == "{") {
+        if (isIncluded && !mSettings.checkHeaders && tok->str() == "{") {
             // TODO: We probably need to keep the executable code if this function is called from the source file.
             const Token *prev = tok->previous();
             while (prev && prev->isName())
@@ -6045,6 +6485,7 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates()
                         const Token *endToken = closingBracket->linkAt(3)->linkAt(1)->next();
                         Token::eraseTokens(tok, endToken);
                         tok->deleteThis();
+                        goBack = true;
                     }
                 }
             }
@@ -6063,6 +6504,8 @@ void Tokenizer::removeExtraTemplateKeywords()
                     templateName->isTemplate(true);
                     templateName = templateName->next();
                 }
+                if (!templateName)
+                    syntaxError(tok);
                 if (Token::Match(templateName->previous(), "operator %op%|(")) {
                     templateName->isTemplate(true);
                     if (templateName->str() == "(" && templateName->link())
@@ -6103,7 +6546,7 @@ void Tokenizer::splitTemplateRightAngleBrackets(bool check)
 
         // Ticket #6181: normalize C++11 template parameter list closing syntax
         if (tok->previous() && tok->str() == "<" && TemplateSimplifier::templateParameters(tok) && std::none_of(vars.begin(), vars.end(), [&](const std::pair<std::string, int>& v) {
-            return v.first == tok->previous()->str();
+            return v.first == tok->strAt(-1);
         })) {
             Token *endTok = tok->findClosingBracket();
             if (check) {
@@ -6120,7 +6563,7 @@ void Tokenizer::splitTemplateRightAngleBrackets(bool check)
                 endTok->insertToken(">");
             }
         } else if (Token::Match(tok, "class|struct|union|=|:|public|protected|private %name% <") && std::none_of(vars.begin(), vars.end(), [&](const std::pair<std::string, int>& v) {
-            return v.first == tok->next()->str();
+            return v.first == tok->strAt(1);
         })) {
             Token *endTok = tok->tokAt(2)->findClosingBracket();
             if (check) {
@@ -6150,7 +6593,7 @@ void Tokenizer::removeMacrosInGlobalScope()
         }
 
         if (Token::Match(tok, "%type%") && tok->isUpperCaseName() &&
-            (!tok->previous() || Token::Match(tok->previous(), "[;{}]") || (tok->previous()->isName() && endsWith(tok->previous()->str(), ':')))) {
+            (!tok->previous() || Token::Match(tok->previous(), "[;{}]") || (tok->previous()->isName() && endsWith(tok->strAt(-1), ':')))) {
             const Token *tok2 = tok->next();
             if (tok2 && tok2->str() == "(")
                 tok2 = tok2->link()->next();
@@ -6159,10 +6602,11 @@ void Tokenizer::removeMacrosInGlobalScope()
             while (Token::Match(tok2, "%type% (") && tok2->isUpperCaseName())
                 tok2 = tok2->linkAt(1)->next();
 
-            if (Token::Match(tok, "%name% (") && Token::Match(tok2, "%name% *|&|::|<| %name%") && !Token::Match(tok2, "namespace|class|struct|union|private:|protected:|public:"))
+            if (Token::Match(tok, "%name% (") && Token::Match(tok2, "%name% *|&|::|<| %name%") &&
+                !Token::Match(tok2, "requires|namespace|class|struct|union|private:|protected:|public:"))
                 unknownMacroError(tok);
 
-            if (Token::Match(tok, "%type% (") && Token::Match(tok2, "%type% (") && !Token::Match(tok2, "noexcept|throw") && isFunctionHead(tok2->next(), ":;{"))
+            if (Token::Match(tok, "%type% (") && Token::Match(tok2, "%type% (") && !Token::Match(tok2, "noexcept|throw") && TokenList::isFunctionHead(tok2->next(), ":;{"))
                 unknownMacroError(tok);
 
             // remove unknown macros before namespace|class|struct|union
@@ -6180,7 +6624,7 @@ void Tokenizer::removeMacrosInGlobalScope()
 
             // replace unknown macros before foo(
             /*
-                        if (Token::Match(tok2, "%type% (") && isFunctionHead(tok2->next(), "{")) {
+                        if (Token::Match(tok2, "%type% (") && TokenList::isFunctionHead(tok2->next(), "{")) {
                             std::string typeName;
                             for (const Token* tok3 = tok; tok3 != tok2; tok3 = tok3->next())
                                 typeName += tok3->str();
@@ -6216,9 +6660,9 @@ void Tokenizer::removeMacrosInGlobalScope()
 
 void Tokenizer::removePragma()
 {
-    if (isC() && mSettings->standards.c == Standards::C89)
+    if (isC() && mSettings.standards.c == Standards::C89)
         return;
-    if (isCPP() && mSettings->standards.cpp == Standards::CPP03)
+    if (isCPP() && mSettings.standards.cpp == Standards::CPP03)
         return;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         while (Token::simpleMatch(tok, "_Pragma (")) {
@@ -6435,6 +6879,7 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
         }
         tokEnd->insertToken("}");
         Token * tokCloseBrace = tokEnd->next();
+        tokCloseBrace->column(tokEnd->column());
 
         Token::createMutualLinks(tokOpenBrace, tokCloseBrace);
         tokBracesEnd = tokCloseBrace;
@@ -6457,7 +6902,10 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
             }
             if (!tokEnd || tokEnd->str() != ";") {
                 // No trailing ;
-                return tok;
+                if (tokStatement->isUpperCaseName())
+                    unknownMacroError(tokStatement);
+                else
+                    syntaxError(tokStatement);
             }
         }
 
@@ -6466,6 +6914,7 @@ Token *Tokenizer::simplifyAddBracesPair(Token *tok, bool commandWithCondition)
 
         tokEnd->insertToken("}");
         Token * tokCloseBrace=tokEnd->next();
+        tokCloseBrace->column(tokEnd->column());
 
         Token::createMutualLinks(tokOpenBrace,tokCloseBrace);
         tokBracesEnd=tokCloseBrace;
@@ -6489,7 +6938,7 @@ void Tokenizer::simplifyFunctionParameters()
             // First step: Get list of argument names in parentheses
             std::map<std::string, Token *> argumentNames;
             bool bailOut = false;
-            Token * tokparam = nullptr;
+            const Token * tokparam = nullptr;
 
             //take count of the function name..
             const std::string& funcName(tok->str());
@@ -6509,8 +6958,8 @@ void Tokenizer::simplifyFunctionParameters()
                 else if (tok1->str() != funcName)
                     argumentNames[tok1->str()] = tok1;
                 else {
-                    if (tok1->next()->str() == ")") {
-                        if (tok1->previous()->str() == ",") {
+                    if (tok1->strAt(1) == ")") {
+                        if (tok1->strAt(-1) == ",") {
                             tok1 = tok1->tokAt(-2);
                             tok1->deleteNext(2);
                         } else {
@@ -6525,7 +6974,7 @@ void Tokenizer::simplifyFunctionParameters()
                     }
                 }
 
-                if (tok1->next()->str() == ")") {
+                if (tok1->strAt(1) == ")") {
                     tok1 = tok1->tokAt(2);
                     //expect at least a type name after round brace..
                     if (!tok1 || !tok1->isName())
@@ -6620,11 +7069,11 @@ void Tokenizer::simplifyFunctionParameters()
 
             while (tok->str() != ")") {
                 //initialize start and end tokens to be moved
-                Token *declStart = argumentNames2[tok->next()->str()];
+                Token *declStart = argumentNames2[tok->strAt(1)];
                 Token *declEnd = declStart;
-                while (declStart->previous()->str() != ";" && declStart->previous()->str() != ")")
+                while (declStart->strAt(-1) != ";" && declStart->strAt(-1) != ")")
                     declStart = declStart->previous();
-                while (declEnd->next()->str() != ";" && declEnd->next()->str() != "{")
+                while (declEnd->strAt(1) != ";" && declEnd->strAt(1) != "{")
                     declEnd = declEnd->next();
 
                 //remove ';' after declaration
@@ -6641,7 +7090,7 @@ void Tokenizer::simplifyFunctionParameters()
                     tok->linenr(tok->previous()->linenr());
             }
             //goto forward and continue
-            tok = tok->next()->link();
+            tok = tok->linkAt(1);
         }
     }
 }
@@ -6674,7 +7123,7 @@ void Tokenizer::simplifyFunctionPointers()
         // #2873 - do not simplify function pointer usage here:
         // (void)(xy(*p)(0));
         if (Token::simpleMatch(tok, ") (")) {
-            tok = tok->next()->link();
+            tok = tok->linkAt(1);
             continue;
         }
 
@@ -6683,7 +7132,7 @@ void Tokenizer::simplifyFunctionPointers()
             Token::Match(tok, "static_cast < %type% %type%| *| *| ( * ) (")) {
             Token *tok1 = tok;
 
-            if (isCPP() && tok1->str() == "static_cast")
+            if (tok1->isCpp() && tok1->str() == "static_cast")
                 tok1 = tok1->next();
 
             tok1 = tok1->next();
@@ -6691,7 +7140,7 @@ void Tokenizer::simplifyFunctionPointers()
             if (Token::Match(tok1->next(), "%type%"))
                 tok1 = tok1->next();
 
-            while (tok1->next()->str() == "*")
+            while (tok1->strAt(1) == "*")
                 tok1 = tok1->next();
 
             // check that the cast ends
@@ -6730,7 +7179,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;
@@ -6742,7 +7191,7 @@ void Tokenizer::simplifyFunctionPointers()
         if (!tok || !tok->link() || !tok->link()->next()) {
             syntaxError(nullptr);
         }
-        Token *endTok = tok->link()->next()->link();
+        Token *endTok = tok->link()->linkAt(1);
         if (Token::simpleMatch(endTok, ") throw ("))
             endTok = endTok->linkAt(2);
         if (!Token::Match(endTok, ") const|volatile| const|volatile| ;|,|)|=|[|{"))
@@ -6794,9 +7243,11 @@ void Tokenizer::simplifyVarDecl(const bool only_k_r_fpar)
     simplifyVarDecl(list.front(), nullptr, only_k_r_fpar);
 }
 
+// cppcheck-suppress functionConst - has side effects
 void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, const bool only_k_r_fpar)
 {
-    const bool isCPP11  = mSettings->standards.cpp >= Standards::CPP11;
+    const bool cpp = isCPP();
+    const bool isCPP11 = cpp && (mSettings.standards.cpp >= Standards::CPP11);
 
     // Split up variable declarations..
     // "int a=4;" => "int a; a=4;"
@@ -6805,18 +7256,18 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
     for (Token *tok = tokBegin; tok != tokEnd; tok = tok->next()) {
         if (Token::Match(tok, "{|;"))
             scopeDecl = false;
-        if (isCPP()) {
+        if (cpp) {
             if (Token::Match(tok, "class|struct|namespace|union"))
                 scopeDecl = true;
             if (Token::Match(tok, "decltype|noexcept (")) {
-                tok = tok->next()->link();
+                tok = tok->linkAt(1);
                 // skip decltype(...){...}
                 if (tok && Token::simpleMatch(tok->previous(), ") {"))
                     tok = tok->link();
             } else if (Token::simpleMatch(tok, "= {") ||
                        (!scopeDecl && Token::Match(tok, "%name%|> {") &&
                         !Token::Match(tok, "else|try|do|const|constexpr|override|volatile|noexcept"))) {
-                if (!tok->next()->link())
+                if (!tok->linkAt(1))
                     syntaxError(tokBegin);
                 // Check for lambdas before skipping
                 if (Token::Match(tok->tokAt(-2), ") . %name%")) { // trailing return type
@@ -6828,18 +7279,18 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
                     if (lambdaEnd)
                         simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
                 } else {
-                    for (Token* tok2 = tok->next(); tok2 != tok->next()->link(); tok2 = tok2->next()) {
+                    for (Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
                         Token* lambdaEnd = findLambdaEndScope(tok2);
                         if (!lambdaEnd)
                             continue;
                         simplifyVarDecl(lambdaEnd->link()->next(), lambdaEnd, only_k_r_fpar);
                     }
                 }
-                tok = tok->next()->link();
+                tok = tok->linkAt(1);
             }
 
         } else if (Token::simpleMatch(tok, "= {")) {
-            tok = tok->next()->link();
+            tok = tok->linkAt(1);
         }
         if (!tok) {
             syntaxError(tokBegin);
@@ -6854,7 +7305,7 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
             } else
                 continue;
         } else if (tok->str() == "(") {
-            if (isCPP()) {
+            if (cpp) {
                 for (Token * tok2 = tok; tok2 && tok2 != tok->link(); tok2 = tok2->next()) {
                     if (Token::Match(tok2, "[(,] [")) {
                         // lambda function at tok2->next()
@@ -6884,7 +7335,7 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
             continue;
         if (isCPP11 && type0->str() == "using")
             continue;
-        if (isCPP() && type0->str() == "namespace")
+        if (cpp && Token::Match(type0, "namespace|delete"))
             continue;
 
         bool isconst = false;
@@ -6945,13 +7396,13 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
 
         //skip combinations of templates and namespaces
         while (!isC() && (Token::Match(tok2, "%type% <") || Token::Match(tok2, "%type% ::"))) {
-            if (tok2->next()->str() == "<" && !TemplateSimplifier::templateParameters(tok2->next())) {
+            if (tok2->strAt(1) == "<" && !TemplateSimplifier::templateParameters(tok2->next())) {
                 tok2 = nullptr;
                 break;
             }
             typelen += 2;
             tok2 = tok2->tokAt(2);
-            if (tok2 && tok2->previous()->str() == "::")
+            if (tok2 && tok2->strAt(-1) == "::")
                 continue;
             int indentlevel = 0;
             int parens = 0;
@@ -6998,13 +7449,13 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
 
         //pattern: "%type% *| ... *| const| %name% ,|="
         if (Token::Match(tok2, "%type%") ||
-            (tok2 && tok2->previous() && tok2->previous()->str() == ">")) {
+            (tok2 && tok2->previous() && tok2->strAt(-1) == ">")) {
             Token *varName = tok2;
-            if (!tok2->previous() || tok2->previous()->str() != ">")
+            if (!tok2->previous() || tok2->strAt(-1) != ">")
                 varName = varName->next();
             else
                 --typelen;
-            if (isCPP() && Token::Match(varName, "public:|private:|protected:|using"))
+            if (cpp && Token::Match(varName, "public:|private:|protected:|using"))
                 continue;
             //skip all the pointer part
             bool isPointerOrRef = false;
@@ -7021,7 +7472,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();
@@ -7029,7 +7480,8 @@ void Tokenizer::simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, co
                 endDecl = endDecl->next();
                 endDecl->next()->isSplittedVarDeclEq(true);
                 endDecl->insertToken(varName->str());
-                endDecl->next()->isExpandedMacro(varName->isExpandedMacro());
+                if (!varName->getMacroName().empty())
+                    endDecl->next()->setMacroName(varName->getMacroName());
                 continue;
             }
             //non-VLA case
@@ -7061,9 +7513,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() != ";") {
@@ -7133,9 +7585,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() == ",") {
@@ -7157,28 +7611,25 @@ void Tokenizer::simplifyStaticConst()
 {
     // This function will simplify the token list so that the qualifiers "extern", "static"
     // and "const" appear in the same order as in the array below.
-    const std::string qualifiers[] = {"extern", "static", "const"};
+    static const std::array<std::string, 3> qualifiers = {"extern", "static", "const"};
 
     // Move 'const' before all other qualifiers and types and then
     // move 'static' before all other qualifiers and types, ...
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         bool continue2 = false;
-        for (int i = 0; i < sizeof(qualifiers)/sizeof(qualifiers[0]); i++) {
+        for (std::size_t i = 0; i < qualifiers.size(); i++) {
 
             // Keep searching for a qualifier
-            if (!tok->next() || tok->next()->str() != qualifiers[i])
+            if (!tok->next() || tok->strAt(1) != qualifiers[i])
                 continue;
 
             // Look backwards to find the beginning of the declaration
             Token* leftTok = tok;
             bool behindOther = false;
             for (; leftTok; leftTok = leftTok->previous()) {
-                for (int j = 0; j <= i; j++) {
-                    if (leftTok->str() == qualifiers[j]) {
-                        behindOther = true;
-                        break;
-                    }
-                }
+                behindOther = std::any_of(qualifiers.cbegin(), qualifiers.cbegin() + i + 1, [&](const std::string& q) {
+                    return q == leftTok->str();
+                });
                 if (behindOther)
                     break;
                 if (isCPP() && Token::simpleMatch(leftTok, ">")) {
@@ -7204,16 +7655,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], emptyString, false);
+                list.front()->insertToken(qualifiers[i]);
                 list.front()->swapWithNext();
+                list.front()->column(column);
                 tok = list.front();
             } else if (leftTok->next()) {
-                leftTok->next()->insertToken(qualifiers[i], emptyString, true);
+                leftTok->next()->insertTokenBefore(qualifiers[i]);
+                leftTok->next()->column(column);
                 tok = leftTok->next();
             } else {
                 leftTok->insertToken(qualifiers[i]);
+                leftTok->next()->column(column);
                 tok = leftTok;
             }
         }
@@ -7287,7 +7742,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->str() == ")") {
-            if (const Token *end = isFunctionHead(tok, "{")) {
+            if (const Token *end = TokenList::isFunctionHead(tok, "{")) {
                 ++executableScopeLevel;
                 tok = const_cast<Token *>(end);
                 continue;
@@ -7309,7 +7764,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
         if (!tok->isName())
             continue;
 
-        const std::unordered_map<std::string, std::string>::const_iterator cOpIt = cAlternativeTokens.find(tok->str());
+        const auto cOpIt = utils::as_const(cAlternativeTokens).find(tok->str());
         if (cOpIt != cAlternativeTokens.end()) {
             alt.push_back(tok);
 
@@ -7317,7 +7772,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
             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;
@@ -7332,7 +7787,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
         } else if (Token::Match(tok, "not|compl")) {
             alt.push_back(tok);
 
-            if (Token::Match(tok->previous(), "%assign%") || Token::Match(tok->next(), "%num%")) {
+            if ((Token::Match(tok->previous(), "%assign%") || Token::Match(tok->next(), "%num%")) && !Token::Match(tok->next(), ".|->")) {
                 replaceAll = true;
                 continue;
             }
@@ -7351,7 +7806,7 @@ bool Tokenizer::simplifyCAlternativeTokens()
         return false;
 
     for (Token *tok: alt) {
-        const std::unordered_map<std::string, std::string>::const_iterator cOpIt = cAlternativeTokens.find(tok->str());
+        const auto cOpIt = utils::as_const(cAlternativeTokens).find(tok->str());
         if (cOpIt != cAlternativeTokens.end())
             tok->str(cOpIt->second);
         else if (tok->str() == "not")
@@ -7377,23 +7832,30 @@ void Tokenizer::simplifyInitVar()
         if (tok->str() == "return")
             continue;
 
-        if (Token::Match(tok, "class|struct|union| %type% *| %name% ( &| %any% ) ;")) {
-            tok = initVar(tok);
-        } else if (Token::Match(tok, "%type% *| %name% ( %type% (")) {
-            const Token* tok2 = tok->tokAt(2);
-            if (!tok2->link())
+        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);
+               } else if (Token::Match(tok, "%type% *| %name% ( %type% (")) {
+               const Token* tok2 = tok->tokAt(2);
+               if (!tok2->link())
                 tok2 = tok2->next();
-            if (!tok2->link() || (tok2->link()->strAt(1) == ";" && !Token::simpleMatch(tok2->linkAt(2), ") (")))
+               if (!tok2->link() || (tok2->link()->strAt(1) == ";" && !Token::simpleMatch(tok2->linkAt(2), ") (")))
                 tok = initVar(tok);
-        } else if (Token::Match(tok, "class|struct|union| %type% *| %name% ( &| %any% ) ,") && tok->str() != "new") {
-            Token *tok1 = tok->tokAt(5);
-            while (tok1->str() != ",")
+               } else if (Token::Match(tok, "class|struct|union| %type% *| %name% ( &| %any% ) ,") && tok->str() != "new") {
+               Token *tok1 = tok->tokAt(5);
+               while (tok1->str() != ",")
                 tok1 = tok1->next();
-            tok1->str(";");
+               tok1->str(";");
 
-            const int numTokens = (Token::Match(tok, "class|struct|union")) ? 2U : 1U;
-            TokenList::insertTokens(tok1, tok, numTokens);
-            tok = initVar(tok);
+               const int numTokens = (Token::Match(tok, "class|struct|union")) ? 2 : 1;
+               TokenList::insertTokens(tok1, tok, numTokens);
+               tok = initVar(tok); */
         }
     }
 }
@@ -7406,7 +7868,7 @@ Token * Tokenizer::initVar(Token * tok)
             return tok;
 
         tok = tok->next();
-    } else if (!tok->isStandardType() && tok->str() != "auto" && tok->next()->str() != "*")
+    } else if (!tok->isStandardType() && tok->str() != "auto" && tok->strAt(1) != "*")
         return tok;
 
     // goto variable name..
@@ -7421,12 +7883,13 @@ Token * Tokenizer::initVar(Token * tok)
     // check initializer..
     if (tok->tokAt(2)->isStandardType() || tok->strAt(2) == "void")
         return tok;
-    if (!tok->tokAt(2)->isNumber() && !Token::Match(tok->tokAt(2), "%type% (") && tok->strAt(2) != "&" && tok->tokAt(2)->varId() == 0)
+    if (!tok->tokAt(2)->isNumber() && !Token::Match(tok->tokAt(2), "%type% (|{") && tok->strAt(2) != "&" && tok->tokAt(2)->varId() == 0)
         return tok;
 
     // insert '; var ='
     tok->insertToken(";");
     tok->next()->insertToken(tok->str());
+    tok->next()->isSplittedVarDeclEq(true);
     tok->tokAt(2)->varId(tok->varId());
     tok = tok->tokAt(2);
     tok->insertToken("=");
@@ -7463,7 +7926,7 @@ void Tokenizer::elseif()
                 tok2 = tok2->link();
 
             if (Token::Match(tok2, "}|;")) {
-                if (tok2->next() && tok2->next()->str() != "else") {
+                if (tok2->next() && tok2->strAt(1) != "else") {
                     tok->insertToken("{");
                     tok2->insertToken("}");
                     Token::createMutualLinks(tok->next(), tok2->next());
@@ -7477,10 +7940,10 @@ void Tokenizer::elseif()
 
 void Tokenizer::simplifyIfSwitchForInit()
 {
-    if (!isCPP() || mSettings->standards.cpp < Standards::CPP17)
+    if (!isCPP() || mSettings.standards.cpp < Standards::CPP17)
         return;
 
-    const bool forInit = (mSettings->standards.cpp >= Standards::CPP20);
+    const bool forInit = (mSettings.standards.cpp >= Standards::CPP20);
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (!Token::Match(tok, "if|switch|for ("))
@@ -7526,7 +7989,7 @@ void Tokenizer::simplifyIfSwitchForInit()
         // Simplify, the initialization expression is broken out..
         semicolon->insertToken(tok->str());
         semicolon->next()->insertToken("(");
-        Token::createMutualLinks(semicolon->next()->next(), endpar);
+        Token::createMutualLinks(semicolon->tokAt(2), endpar);
         tok->deleteNext();
         tok->str("{");
         endscope->insertToken("}");
@@ -7543,8 +8006,8 @@ bool Tokenizer::simplifyRedundantParentheses()
         if (tok->str() != "(")
             continue;
 
-        if (isCPP() && Token::simpleMatch(tok->previous(), "} (")) {
-            const Token* plp = tok->previous()->link()->previous();
+        if (tok->isCpp() && Token::simpleMatch(tok->previous(), "} (")) {
+            const Token* plp = tok->linkAt(-1)->previous();
             if (Token::Match(plp, "%name%|>|] {") || (Token::simpleMatch(plp, ")") && Token::simpleMatch(plp->link()->previous(), "]")))
                 continue;
         }
@@ -7574,23 +8037,14 @@ bool Tokenizer::simplifyRedundantParentheses()
 
         // !!operator = ( x ) ;
         if (tok->strAt(-2) != "operator" &&
-            tok->previous() && tok->previous()->str() == "=" &&
-            tok->next() && tok->next()->str() != "{" &&
+            tok->previous() && tok->strAt(-1) == "=" &&
+            tok->next() && tok->strAt(1) != "{" &&
             Token::simpleMatch(tok->link(), ") ;")) {
             tok->link()->deleteThis();
             tok->deleteThis();
             continue;
         }
 
-        while (Token::simpleMatch(tok, "( (") &&
-               tok->link() && tok->link()->previous() == tok->next()->link()) {
-            // We have "(( *something* ))", remove the inner
-            // parentheses
-            tok->deleteNext();
-            tok->link()->tokAt(-2)->deleteNext();
-            ret = true;
-        }
-
         if (isCPP() && Token::Match(tok->tokAt(-2), "[;{}=(] new (") && Token::Match(tok->link(), ") [;,{}[]")) {
             // Remove the parentheses in "new (type)" constructs
             tok->link()->deleteThis();
@@ -7631,7 +8085,7 @@ bool Tokenizer::simplifyRedundantParentheses()
 
         if (!Token::simpleMatch(tok->tokAt(-2), "operator delete") &&
             Token::Match(tok->previous(), "delete|; (") &&
-            (tok->previous()->str() != "delete" || tok->next()->varId() > 0) &&
+            (tok->strAt(-1) != "delete" || tok->next()->varId() > 0) &&
             Token::Match(tok->link(), ") ;|,")) {
             tok->link()->deleteThis();
             tok->deleteThis();
@@ -7660,20 +8114,8 @@ bool Tokenizer::simplifyRedundantParentheses()
             ret = true;
         }
 
-        if (Token::simpleMatch(tok->previous(), "? (") && Token::simpleMatch(tok->link(), ") :")) {
-            const Token *tok2 = tok->next();
-            while (tok2 && (Token::Match(tok2,"%bool%|%num%|%name%") || tok2->isArithmeticalOp()))
-                tok2 = tok2->next();
-            if (tok2 && tok2->str() == ")") {
-                tok->link()->deleteThis();
-                tok->deleteThis();
-                ret = true;
-                continue;
-            }
-        }
-
         while (Token::Match(tok->previous(), "[{([,] ( !!{") &&
-               Token::Match(tok->link(), ") [;,])]") &&
+               Token::Match(tok->link(), ") [;,])] !!{") &&
                !Token::simpleMatch(tok->tokAt(-2), "operator ,") && // Ticket #5709
                !Token::findsimplematch(tok, ",", tok->link())) {
             // We have "( ... )", remove the parentheses
@@ -7706,7 +8148,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();
@@ -7754,7 +8196,7 @@ void Tokenizer::simplifyTypeIntrinsics()
         auto p = intrinsics.find(tok->str());
         if (p == intrinsics.end())
             continue;
-        Token * end = tok->next()->link();
+        Token * end = tok->linkAt(1);
         Token * prev = tok->previous();
         tok->str(p->second);
         prev->insertToken("::");
@@ -7776,13 +8218,13 @@ void Tokenizer::simplifyTypeIntrinsics()
 bool Tokenizer::isScopeNoReturn(const Token *endScopeToken, bool *unknown) const
 {
     std::string unknownFunc;
-    const bool ret = mSettings->library.isScopeNoReturn(endScopeToken,&unknownFunc);
-    if (!unknownFunc.empty() && mSettings->summaryReturn.find(unknownFunc) != mSettings->summaryReturn.end()) {
+    const bool ret = mSettings.library.isScopeNoReturn(endScopeToken,&unknownFunc);
+    if (!unknownFunc.empty() && mSettings.summaryReturn.find(unknownFunc) != mSettings.summaryReturn.end()) {
         return false;
     }
     if (unknown)
         *unknown = !unknownFunc.empty();
-    if (!unknownFunc.empty() && mSettings->checkLibrary) {
+    if (!unknownFunc.empty() && mSettings.checkLibrary) {
         bool warn = true;
         if (Token::simpleMatch(endScopeToken->tokAt(-2), ") ; }")) {
             const Token * const ftok = endScopeToken->linkAt(-2)->previous();
@@ -7804,13 +8246,15 @@ bool Tokenizer::isScopeNoReturn(const Token *endScopeToken, bool *unknown) const
 
 void Tokenizer::syntaxError(const Token *tok, const std::string &code) const
 {
-    printDebugOutput(0);
+    if (mSettings.debugSimplified || mSettings.debugnormal)
+        printDebugOutput(std::cout);
     throw InternalError(tok, code.empty() ? "syntax error" : "syntax error: " + code, InternalError::SYNTAX);
 }
 
 void Tokenizer::unmatchedToken(const Token *tok) const
 {
-    printDebugOutput(0);
+    if (mSettings.debugSimplified || mSettings.debugnormal)
+        printDebugOutput(std::cout);
     throw InternalError(tok,
                         "Unmatched '" + tok->str() + "'. Configuration: '" + mConfiguration + "'.",
                         InternalError::SYNTAX);
@@ -7818,47 +8262,49 @@ void Tokenizer::unmatchedToken(const Token *tok) const
 
 void Tokenizer::syntaxErrorC(const Token *tok, const std::string &what) const
 {
-    printDebugOutput(0);
-    throw InternalError(tok, "Code '"+what+"' is invalid C code. Use --std or --language to configure the language.", InternalError::SYNTAX);
+    if (mSettings.debugSimplified || mSettings.debugnormal)
+        printDebugOutput(std::cout);
+    throw InternalError(tok, "Code '"+what+"' is invalid C code.", "Use --std, -x or --language to enforce C++. Or --cpp-header-probe to identify C++ headers via the Emacs marker.", InternalError::SYNTAX);
 }
 
 void Tokenizer::unknownMacroError(const Token *tok1) const
 {
-    printDebugOutput(0);
+    if (mSettings.debugSimplified || mSettings.debugnormal)
+        printDebugOutput(std::cout);
     throw InternalError(tok1, "There is an unknown macro here somewhere. Configuration is required. If " + tok1->str() + " is a macro then please configure it.", InternalError::UNKNOWN_MACRO);
 }
 
-void Tokenizer::unhandled_macro_class_x_y(const Token *tok) const
+void Tokenizer::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
 {
     reportError(tok,
                 Severity::information,
                 "class_X_Y",
                 "The code '" +
-                tok->str() + " " +
-                tok->strAt(1) + " " +
-                tok->strAt(2) + " " +
-                tok->strAt(3) + "' is not handled. You can use -I or --include to add handling of this code.");
+                type + " " +
+                x + " " +
+                y + " " +
+                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
+void Tokenizer::invalidConstFunctionTypeError(const Token *tok) const
 {
     reportError(tok,
-                Severity::information,
-                "macroWithSemicolon",
-                "Ensure that '" + macroName + "' is defined either using -I, --include or -D.");
+                Severity::portability,
+                "invalidConstFunctionType",
+                "It is unspecified behavior to const qualify a function type.");
 }
 
 void Tokenizer::cppcheckError(const Token *tok) const
 {
-    printDebugOutput(0);
+    printDebugOutput(std::cout);
     throw InternalError(tok, "Analysis failed. If the code is valid then please report this failure.", InternalError::INTERNAL);
 }
 
 void Tokenizer::unhandledCharLiteral(const Token *tok, const std::string& msg) const
 {
     std::string s = tok ? (" " + tok->str()) : "";
-    for (int i = 0; i < s.size(); ++i) {
-        if ((unsigned char)s[i] >= 0x80)
+    for (std::size_t i = 0; i < s.size(); ++i) {
+        if (static_cast<unsigned char>(s[i]) >= 0x80)
             s.clear();
     }
 
@@ -7876,10 +8322,10 @@ void Tokenizer::unhandledCharLiteral(const Token *tok, const std::string& msg) c
  * @param floatConstant the string with stringified float constant to check against
  * @return true in case s is equal to X or X.0 and false otherwise.
  */
-static bool isNumberOneOf(const std::string &s, const MathLib::bigint& intConstant, const char* floatConstant)
+static bool isNumberOneOf(const std::string &s, MathLib::bigint intConstant, const char* floatConstant)
 {
     if (MathLib::isInt(s)) {
-        if (MathLib::toLongNumber(s) == intConstant)
+        if (MathLib::toBigNumber(s) == intConstant)
             return true;
     } else if (MathLib::isFloat(s)) {
         if (MathLib::toString(MathLib::toDoubleNumber(s)) == floatConstant)
@@ -7900,25 +8346,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
 {
@@ -7944,7 +8371,7 @@ void Tokenizer::validateC() const
             syntaxErrorC(tok, "template<...");
         if (Token::Match(tok, "%name% :: %name%"))
             syntaxErrorC(tok, tok->str() + tok->strAt(1) + tok->strAt(2));
-        if (Token::Match(tok, "class|namespace %name% [:{]"))
+        if (Token::Match(tok, "class|namespace %name% :|::|{"))
             syntaxErrorC(tok, tok->str() + tok->strAt(1) + tok->strAt(2));
     }
 }
@@ -8015,7 +8442,7 @@ static bool isCPPAttribute(const Token * tok)
 
 static bool isAlignAttribute(const Token * tok)
 {
-    return Token::simpleMatch(tok, "alignas (") && tok->next()->link();
+    return Token::simpleMatch(tok, "alignas (") && tok->linkAt(1);
 }
 
 template<typename T>
@@ -8024,18 +8451,18 @@ static T* skipCPPOrAlignAttribute(T * tok)
     if (isCPPAttribute(tok))
         return tok->link();
     if (isAlignAttribute(tok)) {
-        return tok->next()->link();
+        return tok->linkAt(1);
     }
     return tok;
 }
 
 static bool isNonMacro(const Token* tok)
 {
-    if (tok->isKeyword())
+    if (tok->isKeyword() || tok->isStandardType())
         return true;
     if (cAlternativeTokens.count(tok->str()) > 0)
         return true;
-    if (tok->str().compare(0, 2, "__") == 0) // attribute/annotation
+    if (startsWith(tok->str(), "__")) // attribute/annotation
         return true;
     if (Token::simpleMatch(tok, "alignas ("))
         return true;
@@ -8059,6 +8486,8 @@ void Tokenizer::reportUnknownMacros() const
     // Report unknown macros before } "{ .. if (x) MACRO }"
     for (const Token *tok = tokens(); tok; tok = tok->next()) {
         if (Token::Match(tok, ")|; %name% } !!)")) {
+            if (tok->link() && !Token::simpleMatch(tok->link()->tokAt(-1), "if"))
+                continue;
             const Token* prev = tok->linkAt(2);
             while (Token::simpleMatch(prev, "{"))
                 prev = prev->previous();
@@ -8078,7 +8507,7 @@ void Tokenizer::reportUnknownMacros() const
             if (Token::Match(inner, "[[({]"))
                 inner = inner->link();
             else if (inner->str() == ";")
-                unknownMacroError(inner);
+                unknownMacroError(tok);
         }
     }
 
@@ -8095,6 +8524,8 @@ void Tokenizer::reportUnknownMacros() const
         }
     }
 
+    const bool cpp = isCPP();
+
     // Report unknown macros in non-executable scopes..
     std::set<std::string> possible;
     for (const Token *tok = tokens(); tok; tok = tok->next()) {
@@ -8128,14 +8559,15 @@ void Tokenizer::reportUnknownMacros() const
                 else
                     unknownMacroError(tok);
             }
-        } else if (isCPP() && Token::Match(tok, "public|private|protected %name% :")) {
+        } else if (cpp && Token::Match(tok, "public|private|protected %name% :")) {
             unknownMacroError(tok->next());
         }
     }
 
     // String concatenation with unknown macros
     for (const Token *tok = tokens(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "%str% %name% (") && Token::Match(tok->linkAt(2), ") %str%")) {
+        if ((Token::Match(tok, "%str% %name% (") && Token::Match(tok->linkAt(2), ") %str%")) ||
+            (Token::Match(tok, "%str% %name% %str%") && !(startsWith(tok->strAt(1), "PRI") || startsWith(tok->strAt(1), "SCN")))) { // TODO: implement macros in std.cfg
             if (tok->next()->isKeyword())
                 continue;
             unknownMacroError(tok->next());
@@ -8143,11 +8575,14 @@ void Tokenizer::reportUnknownMacros() const
         if (Token::Match(tok, "[(,] %name% (") && Token::Match(tok->linkAt(2), ") %name% %name%|,|)")) {
             if (tok->next()->isKeyword() || tok->linkAt(2)->next()->isKeyword())
                 continue;
-            if (cAlternativeTokens.count(tok->linkAt(2)->next()->str()) > 0)
+            if (cAlternativeTokens.count(tok->linkAt(2)->strAt(1)) > 0)
                 continue;
-            if (tok->next()->str().compare(0, 2, "__") == 0) // attribute/annotation
+            if (startsWith(tok->strAt(1), "__")) // attribute/annotation
                 continue;
-            unknownMacroError(tok->next());
+            if (tok->next()->isStandardType() && !tok->linkAt(2)->next()->isStandardType())
+                unknownMacroError(tok->linkAt(2)->next());
+            else
+                unknownMacroError(tok->next());
         }
     }
 
@@ -8155,7 +8590,7 @@ void Tokenizer::reportUnknownMacros() const
     for (const Token* tok = tokens(); tok; tok = tok->next()) {
         if (!Token::Match(tok, "%name% ("))
             continue;
-        if (isNonMacro(tok))
+        if (isNonMacro(tok) && !tok->isStandardType())
             continue;
 
         const Token* endTok = tok->linkAt(1);
@@ -8166,18 +8601,19 @@ void Tokenizer::reportUnknownMacros() const
         if (isNonMacro(tok2))
             continue;
 
-        if (tok2->next()->str() == "(") {
+        if (tok2->strAt(1) == "(") {
             if (Token::Match(tok->previous(), "%name%|::|>"))
                 continue;
         }
 
-        unknownMacroError(tok);
+        unknownMacroError(tok->isStandardType() ? tok2 : tok);
     }
 }
 
 void Tokenizer::findGarbageCode() const
 {
-    const bool isCPP11 = isCPP() && mSettings->standards.cpp >= Standards::CPP11;
+    const bool cpp = isCPP();
+    const bool isCPP11 = cpp && mSettings.standards.cpp >= Standards::CPP11;
 
     static const std::unordered_set<std::string> nonConsecutiveKeywords{ "break",
                                                                          "continue",
@@ -8209,18 +8645,27 @@ void Tokenizer::findGarbageCode() const
         else if (Token::Match(tok, "%assign% [") && Token::simpleMatch(tok->linkAt(1), "] ;"))
             syntaxError(tok, tok->str() + "[...];");
 
+        else if (Token::Match(tok, "[({<] %assign%"))
+            syntaxError(tok);
+
+        else if (Token::Match(tok, "%assign% >"))
+            syntaxError(tok);
+
+        else if (Token::Match(tok, "[`\\@]"))
+            syntaxError(tok);
+
         // UNKNOWN_MACRO(return)
         if (tok->isKeyword() && Token::Match(tok, "throw|return )") && Token::Match(tok->linkAt(1)->previous(), "%name% ("))
             unknownMacroError(tok->linkAt(1)->previous());
 
         // UNKNOWN_MACRO(return)
-        else if (Token::Match(tok, "%name% throw|return") && std::isupper(tok->str()[0]))
+        else if (!tok->isKeyword() && (Token::Match(tok, "%name% return") || (isCPP() && Token::Match(tok, "%name% throw"))))
             unknownMacroError(tok);
 
         // Assign/increment/decrement literal
         else if (Token::Match(tok, "!!) %num%|%str%|%char% %assign%|++|--")) {
-            if (!isCPP() || mSettings->standards.cpp < Standards::CPP20 || !Token::Match(tok->previous(), "%name% : %num% ="))
-                syntaxError(tok, tok->next()->str() + " " + tok->strAt(2));
+            if (!cpp || mSettings.standards.cpp < Standards::CPP20 || !Token::Match(tok->previous(), "%name% : %num% ="))
+                syntaxError(tok, tok->strAt(1) + " " + tok->strAt(2));
         }
         else if (Token::simpleMatch(tok, ") return") && !Token::Match(tok->link()->previous(), "if|while|for (")) {
             if (tok->link()->previous() && tok->link()->previous()->isUpperCaseName())
@@ -8229,32 +8674,43 @@ void Tokenizer::findGarbageCode() const
                 syntaxError(tok);
         }
 
-        if (tok->isControlFlowKeyword() && Token::Match(tok, "if|while|for|switch")) { // if|while|for|switch (EXPR) { ... }
-            if (tok->previous() && !Token::Match(tok->previous(), "%name%|:|;|{|}|)")) {
-                if (Token::Match(tok->previous(), "[,(]")) {
-                    const Token *prev = tok->previous();
-                    while (prev && prev->str() != "(") {
-                        if (prev->str() == ")")
-                            prev = prev->link();
-                        prev = prev->previous();
+        if (tok->isControlFlowKeyword()) {
+            if (Token::Match(tok, "if|while|for|switch")) { // if|while|for|switch (EXPR) { ... }
+                if (tok->previous() && !Token::Match(tok->previous(), "%name%|:|;|{|}|)")) {
+                    if (Token::Match(tok->previous(), "[,(]")) {
+                        const Token *prev = tok->previous();
+                        while (prev && prev->str() != "(") {
+                            if (prev->str() == ")")
+                                prev = prev->link();
+                            prev = prev->previous();
+                        }
+                        if (prev && Token::Match(prev->previous(), "%name% ("))
+                            unknownMacroError(prev->previous());
                     }
-                    if (prev && Token::Match(prev->previous(), "%name% ("))
-                        unknownMacroError(prev->previous());
+                    if (!Token::simpleMatch(tok->tokAt(-2), "operator \"\" if"))
+                        syntaxError(tok);
                 }
-                if (!Token::simpleMatch(tok->tokAt(-2), "operator \"\" if"))
+                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);
+                }
             }
-            if (!Token::Match(tok->next(), "( !!)"))
-                syntaxError(tok);
-            if (tok->str() != "for") {
-                if (isGarbageExpr(tok->next(), tok->linkAt(1), mSettings->standards.cpp>=Standards::cppstd_t::CPP17))
-                    syntaxError(tok);
+            if (Token::simpleMatch(tok, "do {")) {
+                if (!Token::simpleMatch(tok->linkAt(1), "} while ("))
+                    syntaxError(tok->linkAt(1));
+                if (!Token::simpleMatch(tok->linkAt(1)->linkAt(2), ") ;"))
+                    syntaxError(tok->linkAt(1)->linkAt(2));
             }
         }
 
         // keyword keyword
         if (tok->isKeyword() && nonConsecutiveKeywords.count(tok->str()) != 0) {
-            if (Token::Match(tok, "%name% %name%") && nonConsecutiveKeywords.count(tok->next()->str()) == 1)
+            if (Token::Match(tok, "%name% %name%") && nonConsecutiveKeywords.count(tok->strAt(1)) == 1)
                 syntaxError(tok);
             const Token* prev = tok;
             while (prev && prev->isName())
@@ -8282,8 +8738,31 @@ void Tokenizer::findGarbageCode() const
                     syntaxError(tok2, "Unexpected token '" + (tok2 ? tok2->str() : "") + "'");
             }
         }
-        if (Token::Match(tok, "enum : %num%| {"))
-            syntaxError(tok->tokAt(2), "Unexpected token '" + tok->strAt(2) + "'");
+        if (tok->str() == "enum") {
+            if (Token::Match(tok->next(), ": %num%| {"))
+                syntaxError(tok->tokAt(2), "Unexpected token '" + tok->strAt(2) + "'");
+            if (const Token* start = SymbolDatabase::isEnumDefinition(tok)) {
+                int nEquals = 0;
+                for (const Token* tok2 = start->next(); tok2 && tok2 != start->link(); tok2 = tok2->next()) {
+                    if (Token::simpleMatch(tok2, "sizeof (")) {
+                        tok2 = tok2->linkAt(1);
+                        continue;
+                    }
+                    if (const Token* lam = findLambdaEndTokenWithoutAST(tok2)) {
+                        tok2 = lam;
+                        continue;
+                    }
+                    if (tok2->str() == ";")
+                        syntaxError(tok2);
+                    if (tok2->str() == "=")
+                        ++nEquals;
+                    else if (tok2->str() == ",")
+                        nEquals = 0;
+                    if (nEquals > 1)
+                        syntaxError(tok2);
+                }
+            }
+        }
     }
 
     // Keywords in global scope
@@ -8303,6 +8782,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()) {
@@ -8340,13 +8829,17 @@ void Tokenizer::findGarbageCode() const
         if (!Token::simpleMatch(tok, "for (")) // find for loops
             continue;
         // count number of semicolons
-        int semicolons = 0;
+        int semicolons = 0, colons = 0;
         const Token* const startTok = tok;
-        tok = tok->next()->link()->previous(); // find ")" of the for-loop
+        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()) {
             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 ( )
                 tok = tok->link();
             }
@@ -8354,7 +8847,9 @@ void Tokenizer::findGarbageCode() const
         // if we have an invalid number of semicolons inside for( ), assume syntax error
         if (semicolons > 2)
             syntaxError(tok);
-        if (semicolons == 1 && !(isCPP() && mSettings->standards.cpp >= Standards::CPP20))
+        if (semicolons == 1 && !(cpp && mSettings.standards.cpp >= Standards::CPP20))
+            syntaxError(tok);
+        if (semicolons == 0 && colons == 0)
             syntaxError(tok);
     }
 
@@ -8362,7 +8857,7 @@ void Tokenizer::findGarbageCode() const
     const Token *templateEndToken = nullptr;
     for (const Token *tok = tokens(); tok; tok = tok->next()) {
         if (!templateEndToken) {
-            if (tok->str() == "<" && isCPP())
+            if (tok->str() == "<" && cpp)
                 templateEndToken = tok->findClosingBracket();
         } else {
             if (templateEndToken == tok)
@@ -8378,17 +8873,20 @@ void Tokenizer::findGarbageCode() const
         {
             bool match1 = Token::Match(tok, "%or%|%oror%|==|!=|+|-|/|!|>=|<=|~|^|++|--|::|sizeof");
             bool match2 = Token::Match(tok->next(), "{|if|else|while|do|for|return|switch|break");
-            if (isCPP()) {
-                match1 = match1 || Token::Match(tok, "::|throw|decltype|typeof");
+            if (cpp) {
+                match1 = match1 || Token::Match(tok, "throw|decltype|typeof");
                 match2 = match2 || Token::Match(tok->next(), "try|catch|namespace");
             }
+            if (match1 && !tok->isIncDecOp()) {
+                match2 = match2 || Token::Match(tok->next(), "%assign%");
+            }
             if (match1 && match2)
                 syntaxError(tok);
         }
         if (Token::Match(tok, "%or%|%oror%|~|^|!|%comp%|+|-|/|%")) {
             std::string code;
             if (Token::Match(tok->next(), ")|]|}"))
-                code = tok->str() + tok->next()->str();
+                code = tok->str() + tok->strAt(1);
             if (Token::simpleMatch(tok->next(), "( )"))
                 code = tok->str() + "()";
             if (!code.empty()) {
@@ -8396,23 +8894,38 @@ 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) == "(")
+                syntaxError(tok);
+            else if (!(tok->tokType() == Token::Type::eString && Token::simpleMatch(tok->tokAt(-1), "extern")) &&
+                     !(tok->tokType() == Token::Type::eBoolean && cpp && Token::simpleMatch(tok->tokAt(-1), "requires")))
+                syntaxError(tok);
+        }
+        if (Token::Match(tok, "( ) %num%|%bool%|%char%|%str%"))
             syntaxError(tok);
         if (Token::Match(tok, "%assign% typename|class %assign%"))
             syntaxError(tok);
+        if (Token::Match(tok, "%assign% [;)}]") && (!cpp || !Token::simpleMatch(tok->previous(), "operator")))
+            syntaxError(tok);
+        if (Token::Match(tok, "; %assign%"))
+            syntaxError(tok);
+        if (Token::Match(tok, "%assign% %name%") && tok->next()->isControlFlowKeyword())
+            syntaxError(tok);
         if (Token::Match(tok, "%cop%|=|,|[ %or%|%oror%|/|%"))
             syntaxError(tok);
-        if (Token::Match(tok, ";|(|[ %comp%"))
+        if (Token::Match(tok, "[;([{] %comp%|%oror%|%or%|%|/"))
             syntaxError(tok);
-        if (Token::Match(tok, "%cop%|= ]") && !(isCPP() && 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, "[+-] [;,)]}]") && !(isCPP() && Token::Match(tok->previous(), "operator [+-] ;")))
+        if (Token::Match(tok, "[+-] [;,)]}]") && !(cpp && Token::simpleMatch(tok->previous(), "operator")))
             syntaxError(tok);
         if (Token::simpleMatch(tok, ",") &&
             !Token::Match(tok->tokAt(-2), "[ = , &|%name%")) {
             if (Token::Match(tok->previous(), "(|[|{|<|%assign%|%or%|%oror%|==|!=|+|-|/|!|>=|<=|~|^|::|sizeof"))
                 syntaxError(tok);
-            if (isCPP() && Token::Match(tok->previous(), "throw|decltype|typeof"))
+            if (cpp && Token::Match(tok->previous(), "throw|decltype|typeof"))
                 syntaxError(tok);
             if (Token::Match(tok->next(), ")|]|>|%assign%|%or%|%oror%|==|!=|/|>=|<=|&&"))
                 syntaxError(tok);
@@ -8421,16 +8934,103 @@ 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, "[{,] . %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())
+            syntaxError(tok);
         if (Token::Match(tok, "[!|+-/%^~] )|]"))
             syntaxError(tok);
         if (Token::Match(tok, "==|!=|<=|>= %comp%") && tok->strAt(-1) != "operator")
             syntaxError(tok, tok->str() + " " + tok->strAt(1));
+        if (Token::simpleMatch(tok, "::") && (!Token::Match(tok->next(), "%name%|*|~") ||
+                                              (tok->next()->isKeyword() && !Token::Match(tok->next(), "new|delete|operator"))))
+            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, "? %assign%"))
+            syntaxError(tok);
+        if (Token::Match(tok, "!|~ %comp%") &&
+            !(cpp && tok->strAt(1) == ">" && 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)->isKeyword() || (tok->tokAt(-1) && Token::simpleMatch(tok->tokAt(-2), "delete ["))))) {
+            if (tok->next()->isUpperCaseName())
+                unknownMacroError(tok->next());
+            else
+                syntaxError(tok);
+        }
+
+        if (tok->link() && Token::Match(tok, "[([]") && (!tok->tokAt(-1) || !tok->tokAt(-1)->isControlFlowKeyword())) {
+            const Token* const end = tok->link();
+            for (const Token* inner = tok->next(); inner != end; inner = inner->next()) {
+                if (inner->str() == "{")
+                    inner = inner->link();
+                else if (inner->str() == ";" || (Token::simpleMatch(inner, ", ,") && (!cpp || !Token::simpleMatch(inner->previous(), "operator")))) {
+                    if (tok->tokAt(-1) && tok->tokAt(-1)->isUpperCaseName())
+                        unknownMacroError(tok->tokAt(-1));
+                    else
+                        syntaxError(inner);
+                }
+            }
+        }
+
+        if ((!cpp || !Token::simpleMatch(tok->previous(), "operator")) && Token::Match(tok, "[,;] ,"))
+            syntaxError(tok);
+        if (tok->str() == "typedef") {
+            for (const Token* tok2 = tok->next(); tok2 && tok2->str() != ";"; tok2 = tok2->next()) {
+                if (tok2->str() == "{") {
+                    tok2 = tok2->link();
+                    continue;
+                }
+                if (isUnevaluated(tok2)) {
+                    tok2 = tok2->linkAt(1);
+                    continue;
+                }
+                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 (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())
+                    unknownMacroError(tok->linkAt(-1)->tokAt(-1));
+                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);
     }
 
     // ternary operator without :
@@ -8454,24 +9054,29 @@ void Tokenizer::findGarbageCode() const
         syntaxError(list.back()->previous());
 
     // Garbage templates..
-    if (isCPP()) {
+    if (cpp) {
         for (const Token *tok = tokens(); tok; tok = tok->next()) {
+            if (Token::simpleMatch(tok, "< >") && !(Token::Match(tok->tokAt(-1), "%name%") || (tok->tokAt(-1) && Token::Match(tok->tokAt(-2), "operator %op%"))))
+                syntaxError(tok);
+            if (Token::simpleMatch(tok, ": template") && !Token::Match(tok->tokAt(-1), "public|private|protected"))
+                syntaxError(tok);
             if (!Token::simpleMatch(tok, "template <"))
                 continue;
-            if (tok->previous() && !Token::Match(tok->previous(), ":|;|{|}|)|>|\"C++\"")) {
+            if (!tok->tokAt(2) || tok->tokAt(2)->isLiteral())
+                syntaxError(tok);
+            if (tok->previous() && !Token::Match(tok->previous(), ":|,|;|{|}|)|<|>|\"C++\"")) {
                 if (tok->previous()->isUpperCaseName())
                     unknownMacroError(tok->previous());
                 else
                     syntaxError(tok);
             }
-            const Token * const tok1 = tok;
-            tok = tok->next()->findClosingBracket();
-            if (!tok)
-                syntaxError(tok1);
-            if (!Token::Match(tok, ">|>> ::|...| %name%") &&
-                !Token::Match(tok, ">|>> [ [ %name%") &&
-                !Token::Match(tok, "> >|*"))
-                syntaxError(tok->next() ? tok->next() : tok1);
+            const Token * const tok1 = tok->next()->findClosingBracket();
+            if (!tok1)
+                syntaxError(tok);
+            if (!Token::Match(tok1, ">|>> ::|...| %name%") &&
+                !Token::Match(tok1, ">|>> [ [ %name%") &&
+                !Token::Match(tok1, "> >|*"))
+                syntaxError(tok1->next() ? tok1->next() : tok);
         }
     }
 
@@ -8508,7 +9113,7 @@ std::string Tokenizer::simplifyString(const std::string &source)
         int sz = 0;    // size of stringdata
         if (str[i+1] == 'x') {
             sz = 2;
-            while (sz < 4 && std::isxdigit((unsigned char)str[i+sz]))
+            while (sz < 4 && std::isxdigit(static_cast<unsigned char>(str[i+sz])))
                 sz++;
             if (sz > 2) {
                 std::istringstream istr(str.substr(i+2, sz-2));
@@ -8520,14 +9125,14 @@ std::string Tokenizer::simplifyString(const std::string &source)
                 sz++;
             std::istringstream istr(str.substr(i+1, sz-1));
             istr >> std::oct >> c;
-            str = str.replace(i, sz, std::string(1U, (char)c));
+            str = str.replace(i, sz, std::string(1U, static_cast<char>(c)));
             continue;
         }
 
         if (sz <= 2)
             i++;
         else if (i+sz < str.size())
-            str.replace(i, sz, std::string(1U, (char)c));
+            str.replace(i, sz, std::string(1U, static_cast<char>(c)));
         else
             str.replace(i, str.size() - i - 1U, "a");
     }
@@ -8543,12 +9148,13 @@ void Tokenizer::simplifyFunctionTryCatch()
     for (Token * tok = list.front(); tok; tok = tok->next()) {
         if (!Token::Match(tok, "try {|:"))
             continue;
-        if (!isFunctionHead(tok->previous(), "try"))
+        const Token* par = tok->previous();
+        while (par && par->isKeyword())
+            par = par->previous();
+        if (!TokenList::isFunctionHead(par, "try")) // TODO: this is supposed to a list of characters and not strings
             continue;
 
-        Token* tryStartToken = tok->next();
-        while (Token::Match(tryStartToken, "[:,] %name% (|{")) // skip init list
-            tryStartToken = tryStartToken->linkAt(2)->next();
+        Token* tryStartToken = skipInitializerList(tok->next());
 
         if (!Token::simpleMatch(tryStartToken, "{"))
             syntaxError(tryStartToken, "Invalid function-try-catch block code. Did not find '{' for try body.");
@@ -8575,6 +9181,20 @@ void Tokenizer::simplifyFunctionTryCatch()
     }
 }
 
+static bool isAnonymousEnum(const Token* tok)
+{
+    if (!Token::Match(tok, "enum {|:"))
+        return false;
+    if (tok->index() > 2 && Token::Match(tok->tokAt(-3), "using %name% ="))
+        return false;
+    const Token* end = tok->next();
+    if (end->str() == ":") {
+        end = end->next();
+        while (Token::Match(end, "%name%|::"))
+            end = end->next();
+    }
+    return end && Token::Match(end->link(), "} (| %type%| )| [*,;[({=]");
+}
 
 void Tokenizer::simplifyStructDecl()
 {
@@ -8589,28 +9209,25 @@ void Tokenizer::simplifyStructDecl()
             continue;
         // check for anonymous struct/union
         if (Token::Match(tok, "struct|union {")) {
-            if (Token::Match(tok->next()->link(), "} const| *|&| const| %type% ,|;|[|(|{|=")) {
-                tok->insertToken("Anonymous" + MathLib::toString(count++));
+            if (Token::Match(tok->linkAt(1), "} const| *|&| const| %type% ,|;|[|(|{|=")) {
+                tok->insertToken("Anonymous" + std::to_string(count++));
             }
         }
         // check for derived anonymous class/struct
         else if (cpp && Token::Match(tok, "class|struct :")) {
             const Token *tok1 = Token::findsimplematch(tok, "{");
             if (tok1 && Token::Match(tok1->link(), "} const| *|&| const| %type% ,|;|[|(|{")) {
-                tok->insertToken("Anonymous" + MathLib::toString(count++));
+                tok->insertToken("Anonymous" + std::to_string(count++));
             }
         }
         // check for anonymous enum
-        else if ((Token::simpleMatch(tok, "enum {") &&
-                  !Token::Match(tok->tokAt(-3), "using %name% =") &&
-                  Token::Match(tok->next()->link(), "} (| %type%| )| ,|;|[|(|{")) ||
-                 (Token::Match(tok, "enum : %type% {") && Token::Match(tok->linkAt(3), "} (| %type%| )| ,|;|[|(|{"))) {
+        else if (isAnonymousEnum(tok)) {
             Token *start = tok->strAt(1) == ":" ? tok->linkAt(3) : tok->linkAt(1);
             if (start && Token::Match(start->next(), "( %type% )")) {
-                start->next()->link()->deleteThis();
+                start->linkAt(1)->deleteThis();
                 start->next()->deleteThis();
             }
-            tok->insertToken("Anonymous" + MathLib::toString(count++));
+            tok->insertToken("Anonymous" + std::to_string(count++));
         }
     }
 
@@ -8643,9 +9260,9 @@ void Tokenizer::simplifyStructDecl()
             const Token * const type = tok->next();
             Token *next = tok->tokAt(2);
 
-            while (next && next->str() != "{")
+            while (next && !Token::Match(next, "[{;]"))
                 next = next->next();
-            if (!next)
+            if (!next || next->str() == ";")
                 continue;
             Token* after = next->link();
             if (!after)
@@ -8658,15 +9275,18 @@ void Tokenizer::simplifyStructDecl()
                 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);
@@ -8677,7 +9297,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";
@@ -8729,7 +9350,7 @@ void Tokenizer::simplifyStructDecl()
 
 void Tokenizer::simplifyCallingConvention()
 {
-    const bool windows = mSettings->platform.isWindows();
+    const bool windows = mSettings.platform.isWindows();
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         while (Token::Match(tok, "__cdecl|__stdcall|__fastcall|__thiscall|__clrcall|__syscall|__pascal|__fortran|__far|__near") || (windows && Token::Match(tok, "WINAPI|APIENTRY|CALLBACK"))) {
@@ -8749,6 +9370,33 @@ static Token* getTokenAfterAttributes(Token* tok, bool gccattr) {
     return after;
 }
 
+static Token* getVariableTokenAfterAttributes(Token* tok) {
+    Token *vartok = nullptr;
+    Token *after = getTokenAfterAttributes(tok, true);
+
+    // check if after variable name
+    if (Token::Match(after, "[;={]")) {
+        Token *prev = tok->previous();
+        while (Token::simpleMatch(prev, "]"))
+            prev = prev->link()->previous();
+        if (Token::Match(prev, "%type%"))
+            vartok = prev;
+    }
+
+
+    // check if before variable name
+    else {
+        while (Token::Match(after->next(), "const|volatile|static|*|&|&&|%type%")) {
+            after = after->next();
+        }
+        if (Token::Match(after, "%name%")) {
+            vartok = after;
+        }
+    }
+
+    return vartok;
+}
+
 Token* Tokenizer::getAttributeFuncTok(Token* tok, bool gccattr) const {
     if (!Token::Match(tok, "%name% ("))
         return nullptr;
@@ -8774,8 +9422,12 @@ Token* Tokenizer::getAttributeFuncTok(Token* tok, bool gccattr) const {
         Token *prev = tok->previous();
         while (Token::Match(prev, "%name%"))
             prev = prev->previous();
-        if (Token::simpleMatch(prev, ")") && Token::Match(prev->link()->previous(), "%name% ("))
-            return prev->link()->previous();
+        if (Token::simpleMatch(prev, ")")) {
+            if (Token::Match(prev->link()->previous(), "%name% ("))
+                return prev->link()->previous();
+            if (isFunctionPointer(prev->link()->tokAt(-2)))
+                return prev->link()->tokAt(-2);
+        }
         if (Token::simpleMatch(prev, ")") && Token::Match(prev->link()->tokAt(-2), "operator %op% (") && isCPP())
             return prev->link()->tokAt(-2);
         if ((!prev || Token::Match(prev, "[;{}*]")) && Token::Match(tok->previous(), "%name%"))
@@ -8788,8 +9440,8 @@ void Tokenizer::simplifyDeclspec()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         while (isAttribute(tok, false)) {
-            Token *functok = getAttributeFuncTok(tok, false);
             if (Token::Match(tok->tokAt(2), "noreturn|nothrow|dllexport")) {
+                Token *functok = getAttributeFuncTok(tok, false);
                 if (functok) {
                     if (tok->strAt(2) == "noreturn")
                         functok->isAttributeNoreturn(true);
@@ -8799,9 +9451,9 @@ void Tokenizer::simplifyDeclspec()
                         functok->isAttributeExport(true);
                 }
             } else if (tok->strAt(2) == "property")
-                tok->next()->link()->insertToken("__property");
+                tok->linkAt(1)->insertToken("__property");
 
-            Token::eraseTokens(tok, tok->next()->link()->next());
+            Token::eraseTokens(tok, tok->linkAt(1)->next());
             tok->deleteThis();
         }
     }
@@ -8810,10 +9462,10 @@ void Tokenizer::simplifyDeclspec()
 void Tokenizer::simplifyAttribute()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (!tok->isKeyword() && Token::Match(tok, "%type% (") && !mSettings->library.isNotLibraryFunction(tok)) {
-            if (mSettings->library.isFunctionConst(tok->str(), true))
+        if (!tok->isKeyword() && Token::Match(tok, "%type% (") && !mSettings.library.isNotLibraryFunction(tok)) {
+            if (mSettings.library.isFunctionConst(tok->str(), true))
                 tok->isAttributePure(true);
-            if (mSettings->library.isFunctionConst(tok->str(), false))
+            if (mSettings.library.isFunctionConst(tok->str(), false))
                 tok->isAttributeConst(true);
         }
         while (isAttribute(tok, true)) {
@@ -8836,21 +9488,11 @@ void Tokenizer::simplifyAttribute()
                 }
 
                 else if (Token::Match(attr, "[(,] unused|__unused__|used|__used__ [,)]")) {
-                    Token *vartok = nullptr;
-                    Token *after = getTokenAfterAttributes(tok, true);
-
-                    // check if after variable name
-                    if (Token::Match(after, ";|=")) {
-                        if (Token::Match(tok->previous(), "%type%"))
-                            vartok = tok->previous();
-                    }
-
-                    // check if before variable name
-                    else if (Token::Match(after, "%type%"))
-                        vartok = after;
-
+                    Token *vartok = getVariableTokenAfterAttributes(tok);
+                    if (!vartok)
+                        vartok = functok;
                     if (vartok) {
-                        const std::string &attribute(attr->next()->str());
+                        const std::string &attribute(attr->strAt(1));
                         if (attribute.find("unused") != std::string::npos)
                             vartok->isAttributeUnused(true);
                         else
@@ -8862,7 +9504,7 @@ void Tokenizer::simplifyAttribute()
                     if (!functok)
                         syntaxError(tok);
 
-                    const std::string &attribute(attr->next()->str());
+                    const std::string &attribute(attr->strAt(1));
                     if (attribute.find("pure") != std::string::npos)
                         functok->isAttributePure(true);
                     else if (attribute.find("const") != std::string::npos)
@@ -8880,6 +9522,14 @@ void Tokenizer::simplifyAttribute()
 
                 else if (functok && Token::simpleMatch(attr, "( __visibility__ ( \"default\" ) )"))
                     functok->isAttributeExport(true);
+
+                else if (Token::Match(attr, "[(,] cleanup ( %name% )")) {
+                    Token *vartok = getVariableTokenAfterAttributes(tok);
+                    if (vartok) {
+                        const std::string& funcname = attr->strAt(3);
+                        vartok->addAttributeCleanup(funcname);
+                    }
+                }
             }
 
             Token::eraseTokens(tok, tok->linkAt(1)->next());
@@ -8895,8 +9545,8 @@ void Tokenizer::simplifyCppcheckAttribute()
             continue;
         if (!tok->previous())
             continue;
-        const std::string &attr = tok->previous()->str();
-        if (attr.compare(0, 11, "__cppcheck_") != 0) // TODO: starts_with("__cppcheck_")
+        const std::string &attr = tok->strAt(-1);
+        if (!startsWith(attr, "__cppcheck_"))
             continue;
         if (attr.compare(attr.size()-2, 2, "__") != 0) // TODO: ends_with("__")
             continue;
@@ -8904,15 +9554,17 @@ void Tokenizer::simplifyCppcheckAttribute()
         Token *vartok = tok->link();
         while (Token::Match(vartok->next(), "%name%|*|&|::")) {
             vartok = vartok->next();
-            if (Token::Match(vartok, "%name% (") && vartok->str().compare(0,11,"__cppcheck_") == 0)
+            if (Token::Match(vartok, "%name% (") && startsWith(vartok->str(),"__cppcheck_"))
                 vartok = vartok->linkAt(1);
         }
 
         if (vartok->isName()) {
             if (Token::Match(tok->previous(), "__cppcheck_low__ ( %num% )"))
-                vartok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::LOW, MathLib::toLongNumber(tok->next()->str()));
+                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, MathLib::toLongNumber(tok->next()->str()));
+                vartok->setCppcheckAttribute(Token::CppcheckAttributesType::HIGH,
+                                             MathLib::toBigNumber(tok->tokAt(1)));
         }
 
         // Delete cppcheck attribute..
@@ -8929,7 +9581,13 @@ void Tokenizer::simplifyCppcheckAttribute()
 
 void Tokenizer::simplifyCPPAttribute()
 {
-    if (mSettings->standards.cpp < Standards::CPP11 || isC())
+    // According to cppreference alignas is a c21 feature however the macro is often available when compiling c11
+    const bool hasAlignas = ((isCPP() && mSettings.standards.cpp >= Standards::CPP11) || (isC() && mSettings.standards.c >= Standards::C11));
+    const bool hasCppAttribute = ((isCPP() && mSettings.standards.cpp >= Standards::CPP11) || (isC() && mSettings.standards.c >= Standards::C23));
+    const bool hasMaybeUnused =((isCPP() && mSettings.standards.cpp >= Standards::CPP17) || (isC() && mSettings.standards.c >= Standards::C23));
+    const bool hasMaybeUnusedUnderscores = (isC() && mSettings.standards.c >= Standards::C23);
+
+    if (!hasAlignas && !hasCppAttribute)
         return;
 
     for (Token *tok = list.front(); tok;) {
@@ -8938,13 +9596,17 @@ void Tokenizer::simplifyCPPAttribute()
             continue;
         }
         if (isCPPAttribute(tok)) {
+            if (!hasCppAttribute) {
+                tok = skipCPPOrAlignAttribute(tok)->next();
+                continue;
+            }
             if (Token::findsimplematch(tok->tokAt(2), "noreturn", tok->link())) {
                 Token * head = skipCPPOrAlignAttribute(tok)->next();
                 while (isCPPAttribute(head) || isAlignAttribute(head))
                     head = skipCPPOrAlignAttribute(head)->next();
                 while (Token::Match(head, "%name%|::|*|&|<|>|,")) // skip return type
                     head = head->next();
-                if (head && head->str() == "(" && 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())) {
@@ -8953,14 +9615,60 @@ void Tokenizer::simplifyCPPAttribute()
                     head = skipCPPOrAlignAttribute(head)->next();
                 while (Token::Match(head, "%name%|::|*|&|<|>|,"))
                     head = head->next();
-                if (head && head->str() == "(" && isFunctionHead(head, "{|;")) {
+                if (head && head->str() == "(" && TokenList::isFunctionHead(head, "{;")) {
                     head->previous()->isAttributeNodiscard(true);
                 }
-            } else if (Token::findsimplematch(tok->tokAt(2), "maybe_unused", tok->link())) {
+            } else if (Token::findsimplematch(tok->tokAt(2), "fallthrough", tok->link()) || Token::findsimplematch(tok->tokAt(2), "__fallthrough__", tok->link())) {
+                Token * head = skipCPPOrAlignAttribute(tok)->next();
+                while (isCPPAttribute(head) || isAlignAttribute(head))
+                    head = skipCPPOrAlignAttribute(head)->next();
+                while (head && head->str() == ";") // we have semicollon after the attribute which would be removed in 'removeRedundantSemicolons()' so we skip it
+                    head = head->next();
+                if (head)
+                    head->isAttributeFallthrough(true);
+            } else if ((hasMaybeUnusedUnderscores && Token::findsimplematch(tok->tokAt(2), "__maybe_unused__", tok->link()))
+                       || (hasMaybeUnused && Token::findsimplematch(tok->tokAt(2), "maybe_unused", tok->link()))) {
+                Token* head = skipCPPOrAlignAttribute(tok)->next();
+                while (isCPPAttribute(head) || isAlignAttribute(head))
+                    head = skipCPPOrAlignAttribute(head)->next();
+
+                if (!head)
+                    syntaxError(tok);
+
+                if (Token::simpleMatch(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();
-                head->isAttributeMaybeUnused(true);
+                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);
                 if (vartok->str() == ":")
@@ -8974,19 +9682,44 @@ void Tokenizer::simplifyCPPAttribute()
                     argtok = argtok->previous();
                 }
                 if (argtok && argtok->str() == vartok->str()) {
-                    if (vartok->next()->str() == ">=")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::LOW, MathLib::toLongNumber(vartok->strAt(2)));
-                    else if (vartok->next()->str() == ">")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::LOW, MathLib::toLongNumber(vartok->strAt(2))+1);
-                    else if (vartok->next()->str() == "<=")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::HIGH, MathLib::toLongNumber(vartok->strAt(2)));
-                    else if (vartok->next()->str() == "<")
-                        argtok->setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type::HIGH, MathLib::toLongNumber(vartok->strAt(2))-1);
+                    if (vartok->strAt(1) == ">=")
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::LOW,
+                                                     MathLib::toBigNumber(vartok->tokAt(2)));
+                    else if (vartok->strAt(1) == ">")
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::LOW,
+                                                     MathLib::toBigNumber(vartok->tokAt(2)) + 1);
+                    else if (vartok->strAt(1) == "<=")
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::HIGH,
+                                                     MathLib::toBigNumber(vartok->tokAt(2)));
+                    else if (vartok->strAt(1) == "<")
+                        argtok->setCppcheckAttribute(Token::CppcheckAttributesType::HIGH,
+                                                     MathLib::toBigNumber(vartok->tokAt(2)) - 1);
                 }
             }
         } else {
-            if (Token::simpleMatch(tok, "alignas (")) {
-                // alignment requirements could be checked here
+            // alignas(expr)
+
+            if (!hasAlignas) {
+                tok = skipCPPOrAlignAttribute(tok)->next();
+                continue;
+            }
+
+            // alignment requirements could be checked here
+
+            Token* atok = nullptr;
+            if (Token::Match(tok->previous(), "%name%"))
+                atok = tok->previous();
+            else {
+                atok = tok;
+                while (isCPPAttribute(atok) || isAlignAttribute(atok))
+                    atok = skipCPPOrAlignAttribute(atok)->next();
+            }
+            if (atok) {
+                std::string a;
+                for (const Token* t = tok->tokAt(2); t && t->str() != ")"; t = t->next())
+                    a += " " + t->str();
+                if (a.size() > 1)
+                    atok->addAttributeAlignas(a.substr(1));
             }
         }
         Token::eraseTokens(tok, skipCPPOrAlignAttribute(tok)->next());
@@ -8996,7 +9729,7 @@ void Tokenizer::simplifyCPPAttribute()
 
 void Tokenizer::simplifySpaceshipOperator()
 {
-    if (isCPP() && mSettings->standards.cpp >= Standards::CPP20) {
+    if (isCPP() && mSettings.standards.cpp >= Standards::CPP20) {
         for (Token *tok = list.front(); tok && tok->next(); tok = tok->next()) {
             if (Token::simpleMatch(tok, "<= >")) {
                 tok->str("<=>");
@@ -9028,9 +9761,9 @@ void Tokenizer::simplifyKeyword()
     // linux kernel code at least uses "_inline" as struct member name at some
     // places.
 
-    const bool c99 = isC() && mSettings->standards.c >= Standards::C99;
-    const bool cpp11 = isCPP() && mSettings->standards.cpp >= Standards::CPP11;
-    const bool cpp20 = isCPP() && mSettings->standards.cpp >= Standards::CPP20;
+    const bool c99 = isC() && mSettings.standards.c >= Standards::C99;
+    const bool cpp11 = isCPP() && mSettings.standards.cpp >= Standards::CPP11;
+    const bool cpp20 = isCPP() && mSettings.standards.cpp >= Standards::CPP20;
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (keywords.find(tok->str()) != keywords.end()) {
@@ -9050,7 +9783,7 @@ void Tokenizer::simplifyKeyword()
             }
         }
 
-        if (isC() || mSettings->standards.cpp == Standards::CPP03) {
+        if (isC() || mSettings.standards.cpp == Standards::CPP03) {
             if (tok->str() == "auto")
                 tok->deleteThis();
         }
@@ -9080,8 +9813,12 @@ void Tokenizer::simplifyKeyword()
                 tok->deleteThis();
             }
 
-            if (mSettings->standards.c >= Standards::C11) {
+            if (mSettings.standards.c >= Standards::C11) {
                 while (tok->str() == "_Atomic") {
+                    if (Token::simpleMatch(tok->next(), "(")) {
+                        tok->linkAt(1)->deleteThis();
+                        tok->next()->deleteThis();
+                    }
                     for (Token* temp: getTypeTokens())
                         temp->isAtomic(true);
                     tok->deleteThis();
@@ -9158,7 +9895,7 @@ static Token* setTokenDebug(Token* start, TokenDebug td)
 
 void Tokenizer::simplifyDebug()
 {
-    if (!mSettings->debugnormal && !mSettings->debugwarnings)
+    if (!mSettings.debugnormal && !mSettings.debugwarnings)
         return;
     static const std::unordered_map<std::string, TokenDebug> m = {{"debug_valueflow", TokenDebug::ValueFlow},
         {"debug_valuetype", TokenDebug::ValueType}};
@@ -9177,7 +9914,7 @@ void Tokenizer::simplifyAssignmentBlock()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (Token::Match(tok, "[;{}] %name% = ( {")) {
-            const std::string &varname = tok->next()->str();
+            const std::string &varname = tok->strAt(1);
 
             // goto the "} )"
             int indentlevel = 0;
@@ -9197,7 +9934,7 @@ void Tokenizer::simplifyAssignmentBlock()
                 tok2 = tok2->tokAt(-3);
                 if (Token::Match(tok2, "[;{}] %num%|%name% ;")) {
                     tok2->insertToken("=");
-                    tok2->insertToken(tok->next()->str());
+                    tok2->insertToken(tok->strAt(1));
                     tok2->next()->varId(tok->next()->varId());
                     tok->deleteNext(3);
                     tok2->tokAt(5)->deleteNext();
@@ -9213,12 +9950,12 @@ void Tokenizer::simplifyAsm()
     std::string instruction;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (Token::Match(tok, "__asm|_asm|asm {") &&
-            tok->next()->link()->next()) {
-            instruction = tok->tokAt(2)->stringifyList(tok->next()->link());
-            Token::eraseTokens(tok, tok->next()->link()->next());
+            tok->linkAt(1)->next()) {
+            instruction = tok->tokAt(2)->stringifyList(tok->linkAt(1));
+            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() != "(")
@@ -9231,7 +9968,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() == ";") {
@@ -9239,6 +9976,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")) {
@@ -9249,7 +9991,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(";");
@@ -9278,7 +10028,7 @@ void Tokenizer::simplifyAsm()
 
         //move the new tokens in the same line as ";" if available
         tok = tok->tokAt(2);
-        if (tok->next() && tok->next()->str() == ";" &&
+        if (tok->next() && tok->strAt(1) == ";" &&
             tok->next()->linenr() != tok->linenr()) {
             const int endposition = tok->next()->linenr();
             tok = tok->tokAt(-3);
@@ -9308,7 +10058,7 @@ void Tokenizer::simplifyAsm2()
                 start = start->previous();
             }
 
-            const Token *last = tok->next()->link();
+            const Token *last = tok->linkAt(1);
             if (Token::simpleMatch(last, ") {"))
                 last = last->linkAt(1);
             last = last->next();
@@ -9321,7 +10071,7 @@ void Tokenizer::simplifyAsm2()
             if (start && last) {
                 std::string asmcode;
                 while (start->next() != last) {
-                    asmcode += start->next()->str();
+                    asmcode += start->strAt(1);
                     start->deleteNext();
                 }
                 if (last->str() == "}")
@@ -9343,9 +10093,9 @@ void Tokenizer::simplifyAt()
     std::set<std::string> var;
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "%name%|] @ %num%|%name%|(")) {
+        if (Token::Match(tok, "%name%|]|) @ %num%|%name%|%str%|(")) {
             const Token *end = tok->tokAt(2);
-            if (end->isNumber())
+            if (end->isLiteral())
                 end = end->next();
             else if (end->str() == "(") {
                 int par = 0;
@@ -9366,7 +10116,7 @@ void Tokenizer::simplifyAt()
             if (Token::Match(end, ": %num% ;"))
                 end = end->tokAt(2);
 
-            if (end && end->str() == ";") {
+            if (Token::Match(end, "[;=]")) {
                 if (tok->isName())
                     var.insert(tok->str());
                 tok->isAtAddress(true);
@@ -9377,7 +10127,7 @@ void Tokenizer::simplifyAt()
         // keywords in compiler from cosmic software for STM8
         // TODO: Should use platform configuration.
         if (Token::Match(tok, "@ builtin|eeprom|far|inline|interrupt|near|noprd|nostack|nosvf|packed|stack|svlreg|tiny|vector")) {
-            tok->str(tok->next()->str() + "@");
+            tok->str(tok->strAt(1) + "@");
             tok->deleteNext();
         }
     }
@@ -9386,12 +10136,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 ("))
@@ -9400,49 +10146,62 @@ 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();
-            }
-        }
-
-        if (Token::Match(tok->next(), "const| %type% %name% :") &&
+        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 = (tok->next()->str() == "const") ? tok->tokAt(3) : tok->tokAt(2);
-            if (Token::Match(tok1, "%name% : %num% [;=]"))
-                tok1->setBits(MathLib::toLongNumber(tok1->strAt(2)));
+            Token *tok1 = typeTok->next();
+            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% ::|<|,|{|;"))) {
                 while (tok1->next() && !Token::Match(tok1->next(), "[;,)]{}=]")) {
                     if (Token::Match(tok1->next(), "[([]"))
-                        Token::eraseTokens(tok1, tok1->next()->link());
+                        Token::eraseTokens(tok1, tok1->linkAt(1));
                     tok1->deleteNext();
                 }
 
                 last = tok1->next();
             }
         } else if (isEnum && Token::Match(tok, "} %name%| : %num% ;")) {
-            if (tok->next()->str() == ":") {
+            if (tok->strAt(1) == ":") {
                 tok->deleteNext(2);
                 tok->insertToken("Anonymous");
             } else {
                 tok->next()->deleteNext(2);
             }
-        } else if (Token::Match(tok->next(), "const| %type% : %num%|%bool% ;") &&
-                   tok->next()->str() != "default") {
-            const int offset = (tok->next()->str() == "const") ? 1 : 0;
-            if (!Token::Match(tok->tokAt(3 + offset), "[{};()]")) {
-                tok->deleteNext(4 + offset);
-                goback = true;
-            }
+        } else if (Token::Match(typeTok, "%type% : %num%|%bool% ;") &&
+                   typeTok->str() != "default") {
+            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() == ",") {
@@ -9459,6 +10218,18 @@ void Tokenizer::simplifyBitfields()
     }
 }
 
+static bool isStdContainerOrIterator(const Token* tok, const Settings& settings)
+{
+    const Library::Container* ctr = settings.library.detectContainerOrIterator(tok, nullptr, /*withoutStd*/ true);
+    return ctr && startsWith(ctr->startPattern, "std ::");
+}
+
+static bool isStdSmartPointer(const Token* tok, const Settings& settings)
+{
+    const Library::SmartPointer* ptr = settings.library.detectSmartPointer(tok, /*withoutStd*/ true);
+    return ptr && startsWith(ptr->name, "std::");
+}
+
 // Add std:: in front of std classes, when using namespace std; was given
 void Tokenizer::simplifyNamespaceStd()
 {
@@ -9470,30 +10241,30 @@ void Tokenizer::simplifyNamespaceStd()
     for (Token* tok = Token::findsimplematch(list.front(), "using namespace std ;"); tok; tok = tok->next()) {
         bool insert = false;
         if (Token::Match(tok, "enum class|struct| %name%| :|{")) { // Don't replace within enum definitions
-            skipEnumBody(&tok);
+            skipEnumBody(tok);
         }
         if (!tok->isName() || tok->isKeyword() || tok->isStandardType() || tok->varId())
             continue;
         if (Token::Match(tok->previous(), ".|::|namespace"))
             continue;
         if (Token::simpleMatch(tok->next(), "(")) {
-            if (isFunctionHead(tok->next(), "{"))
+            if (TokenList::isFunctionHead(tok->next(), "{"))
                 userFunctions.insert(tok->str());
-            else if (isFunctionHead(tok->next(), ";")) {
+            else if (TokenList::isFunctionHead(tok->next(), ";")) {
                 const Token *start = tok;
                 while (Token::Match(start->previous(), "%type%|*|&"))
                     start = start->previous();
                 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()))
                 insert = true;
         } else if (Token::simpleMatch(tok->next(), "<") &&
-                   (mSettings->library.detectContainerOrIterator(tok, nullptr, /*withoutStd*/ true) || mSettings->library.detectSmartPointer(tok, /*withoutStd*/ true)))
+                   (isStdContainerOrIterator(tok, mSettings) || isStdSmartPointer(tok, mSettings)))
             insert = true;
-        else if (mSettings->library.hasAnyTypeCheck("std::" + tok->str()) ||
-                 mSettings->library.podtype("std::" + tok->str()) ||
-                 mSettings->library.detectContainerOrIterator(tok, nullptr, /*withoutStd*/ true))
+        else if (mSettings.library.hasAnyTypeCheck("std::" + tok->str()) ||
+                 mSettings.library.podtype("std::" + tok->str()) ||
+                 isStdContainerOrIterator(tok, mSettings))
             insert = true;
 
         if (insert) {
@@ -9516,7 +10287,7 @@ void Tokenizer::simplifyNamespaceStd()
 void Tokenizer::simplifyMicrosoftMemoryFunctions()
 {
     // skip if not Windows
-    if (!mSettings->platform.isWindows())
+    if (!mSettings.platform.isWindows())
         return;
 
     for (Token *tok = list.front(); tok; tok = tok->next()) {
@@ -9538,7 +10309,7 @@ void Tokenizer::simplifyMicrosoftMemoryFunctions()
                 Token *tok2 = tok1->nextArgument(); // Third argument
 
                 if (tok2)
-                    Token::move(tok1->previous(), tok2->tokAt(-2), tok->next()->link()->previous()); // Swap third with second argument
+                    Token::move(tok1->previous(), tok2->tokAt(-2), tok->linkAt(1)->previous()); // Swap third with second argument
             }
         } else if (Token::Match(tok, "ZeroMemory|RtlZeroMemory|RtlZeroBytes|RtlSecureZeroMemory")) {
             // ZeroMemory(dst, len) -> memset(dst, 0, len)
@@ -9611,15 +10382,15 @@ namespace {
 void Tokenizer::simplifyMicrosoftStringFunctions()
 {
     // skip if not Windows
-    if (!mSettings->platform.isWindows())
+    if (!mSettings.platform.isWindows())
         return;
 
-    const bool ansi = mSettings->platform.type == cppcheck::Platform::Type::Win32A;
+    const bool ansi = mSettings.platform.type == Platform::Type::Win32A;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (tok->strAt(1) != "(")
             continue;
 
-        const std::map<std::string, triplet>::const_iterator match = apis.find(tok->str());
+        const auto match = utils::as_const(apis).find(tok->str());
         if (match!=apis.end()) {
             tok->str(ansi ? match->second.mbcs : match->second.unicode);
             tok->originalName(match->first);
@@ -9636,7 +10407,7 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
                 tok->next()->deleteNext();
                 tok->next()->deleteThis();
                 tok->next()->deleteNext();
-                tok->concatStr(tok->next()->str());
+                tok->concatStr(tok->strAt(1));
                 tok->deleteNext();
             }
         }
@@ -9647,7 +10418,7 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
 void Tokenizer::simplifyBorland()
 {
     // skip if not Windows
-    if (!mSettings->platform.isWindows())
+    if (!mSettings.platform.isWindows())
         return;
     if (isC())
         return;
@@ -9698,18 +10469,18 @@ void Tokenizer::simplifyBorland()
 void Tokenizer::createSymbolDatabase()
 {
     if (!mSymbolDatabase)
-        mSymbolDatabase = new SymbolDatabase(*this, *mSettings, mErrorLogger);
+        mSymbolDatabase = new SymbolDatabase(*this);
     mSymbolDatabase->validate();
 }
 
-bool Tokenizer::operatorEnd(const Token * tok) const
+bool Tokenizer::operatorEnd(const Token * tok)
 {
     if (tok && tok->str() == ")") {
-        if (isFunctionHead(tok, "{|;|?|:|["))
+        if (TokenList::isFunctionHead(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") {
@@ -9717,8 +10488,8 @@ bool Tokenizer::operatorEnd(const Token * tok) const
                 if (tok && tok->str() == "(") {
                     tok = tok->link()->next();
                 }
-            } else if (tok->str() == "throw" && tok->next() && tok->next()->str() == "(") {
-                tok = tok->next()->link()->next();
+            } else if (tok->str() == "throw" && tok->next() && tok->strAt(1) == "(") {
+                tok = tok->linkAt(1)->next();
             }
             // unknown macros ") MACRO {" and ") MACRO(...) {"
             else if (tok->isUpperCaseName()) {
@@ -9727,7 +10498,7 @@ bool Tokenizer::operatorEnd(const Token * tok) const
                     tok = tok->link()->next();
                 }
             } else if (Token::Match(tok, "%op% !!(") ||
-                       (Token::Match(tok, "%op% (") && !isFunctionHead(tok->next(), "{")))
+                       (Token::Match(tok, "%op% (") && !TokenList::isFunctionHead(tok->next(), "{")))
                 break;
             else
                 return false;
@@ -9747,6 +10518,8 @@ void Tokenizer::simplifyOperatorName()
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (Token::Match(tok, "using|:: operator %op%|%name% ;")) {
             tok->next()->str("operator" + tok->strAt(2));
+            tok->next()->tokType(Token::Type::eKeyword); // we need to preserve the keyword type after setting a non-keyword string
+            // TODO: tok->next()->isOperatorKeyword(true);
             tok->next()->deleteNext();
             continue;
         }
@@ -9755,7 +10528,9 @@ void Tokenizer::simplifyOperatorName()
             continue;
         // operator op
         if (Token::Match(tok, "operator %op% (") && !operatorEnd(tok->linkAt(2))) {
-            tok->str(tok->str() + tok->next()->str());
+            tok->str(tok->str() + tok->strAt(1));
+            tok->tokType(Token::Type::eKeyword); // we need to preserve the keyword type after setting a non-keyword string
+            // TODO: tok->isOperatorKeyword(true);
             tok->deleteNext();
             continue;
         }
@@ -9778,7 +10553,7 @@ void Tokenizer::simplifyOperatorName()
                 if (par->str() == "," && !op.empty())
                     break;
                 if (!(Token::Match(par, "<|>") && !op.empty())) {
-                    op += par->str();
+                    op += par->str() == "." ? par->originalName() : par->str();
                     par = par->next();
                     done = false;
                 }
@@ -9825,12 +10600,23 @@ void Tokenizer::simplifyOperatorName()
             }
         }
 
+        const bool returnsRef = Token::simpleMatch(par, "( & (") && tok->next()->isName();
         if (par && !op.empty()) {
-            tok->str("operator" + op);
-            Token::eraseTokens(tok, par);
+            if (returnsRef) {
+                Token* tok_op = par->next()->insertToken("operator" + op);
+                // TODO: tok_op->tokType(Token::Type::eKeyword); // the given token is not a keyword but should be treated as such
+                tok_op->isOperatorKeyword(true);
+                tok->deleteThis();
+            }
+            else {
+                tok->str("operator" + op);
+                tok->tokType(Token::Type::eKeyword); // we need to preserve the keyword type after setting a non-keyword string
+                // TODO: tok->isOperatorKeyword(true);
+                Token::eraseTokens(tok, par);
+            }
         }
 
-        if (!op.empty())
+        if (!op.empty() && !returnsRef)
             tok->isOperatorKeyword(true);
     }
 
@@ -9845,12 +10631,12 @@ void Tokenizer::simplifyOperatorName()
             tok->insertToken("(");
             str->insertToken(")");
             Token::createMutualLinks(tok->next(), str->next());
-            str->insertToken(MathLib::toString(Token::getStrLength(str)));
+            str->insertToken(std::to_string(Token::getStrLength(str)));
             str->insertToken(",");
         }
     }
 
-    if (mSettings->debugwarnings) {
+    if (mSettings.debugwarnings) {
         const Token *tok = list.front();
 
         while ((tok = Token::findsimplematch(tok, "operator")) != nullptr) {
@@ -9891,7 +10677,7 @@ void Tokenizer::simplifyOverloadedOperators()
                         ++indent;
                     else
                         tok2 = tok2->link();
-                } else if (indent == 1 && Token::simpleMatch(tok2, "operator() (") && isFunctionHead(tok2->next(), ";{")) {
+                } else if (indent == 1 && Token::simpleMatch(tok2, "operator() (") && TokenList::isFunctionHead(tok2->next(), ";{")) {
                     classNames.insert(tok->strAt(1));
                     break;
                 }
@@ -9945,7 +10731,7 @@ void Tokenizer::removeUnnecessaryQualification()
     std::vector<Space> classInfo;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (Token::Match(tok, "class|struct|namespace %type% :|{") &&
-            (!tok->previous() || tok->previous()->str() != "enum")) {
+            (!tok->previous() || tok->strAt(-1) != "enum")) {
             Space info;
             info.isNamespace = tok->str() == "namespace";
             tok = tok->next();
@@ -9961,7 +10747,7 @@ void Tokenizer::removeUnnecessaryQualification()
             if (tok == classInfo.back().bodyEnd)
                 classInfo.pop_back();
             else if (tok->str() == classInfo.back().className &&
-                     !classInfo.back().isNamespace && tok->previous()->str() != ":" &&
+                     !classInfo.back().isNamespace && tok->strAt(-1) != ":" &&
                      (Token::Match(tok, "%type% :: ~| %type% (") ||
                       Token::Match(tok, "%type% :: operator"))) {
                 const Token *tok1 = tok->tokAt(3);
@@ -10007,84 +10793,6 @@ void Tokenizer::removeUnnecessaryQualification()
     }
 }
 
-void Tokenizer::printUnknownTypes() const
-{
-    if (!mSymbolDatabase)
-        return;
-
-    std::vector<std::pair<std::string, const Token *>> unknowns;
-
-    for (int i = 1; i <= mVarId; ++i) {
-        const Variable *var = mSymbolDatabase->getVariableFromVarId(i);
-        if (!var)
-            continue;
-        // is unknown type?
-        if (var->type() || var->typeStartToken()->isStandardType())
-            continue;
-
-        std::string name;
-        const Token * nameTok;
-
-        // single token type?
-        if (var->typeStartToken() == var->typeEndToken()) {
-            nameTok = var->typeStartToken();
-            name = nameTok->str();
-        }
-
-        // complicated type
-        else {
-            const Token *tok = var->typeStartToken();
-            int level = 0;
-
-            nameTok =  tok;
-
-            while (tok) {
-                // skip pointer and reference part of type
-                if (level == 0 && Token::Match(tok, "*|&"))
-                    break;
-
-                name += tok->str();
-
-                if (Token::Match(tok, "struct|union|enum"))
-                    name += " ";
-
-                // pointers and references are OK in template
-                else if (tok->str() == "<")
-                    ++level;
-                else if (tok->str() == ">")
-                    --level;
-
-                if (tok == var->typeEndToken())
-                    break;
-
-                tok = tok->next();
-            }
-        }
-
-        unknowns.emplace_back(std::move(name), nameTok);
-    }
-
-    if (!unknowns.empty()) {
-        std::string last;
-        int count = 0;
-
-        for (auto it = unknowns.cbegin(); it != unknowns.cend(); ++it) {
-            // skip types is std namespace because they are not interesting
-            if (it->first.find("std::") != 0) {
-                if (it->first != last) {
-                    last = it->first;
-                    count = 1;
-                    reportError(it->second, Severity::debug, "debug", "Unknown type \'" + it->first + "\'.");
-                } else {
-                    if (count < 3) // limit same type to 3
-                        reportError(it->second, Severity::debug, "debug", "Unknown type \'" + it->first + "\'.");
-                    count++;
-                }
-            }
-        }
-    }
-}
-
 void Tokenizer::prepareTernaryOpForAST()
 {
     // http://en.cppreference.com/w/cpp/language/operator_precedence says about ternary operator:
@@ -10115,38 +10823,33 @@ void Tokenizer::prepareTernaryOpForAST()
             }
             if (parenthesesNeeded && tok2 && tok2->str() == ":") {
                 tok->insertToken("(");
-                tok2->insertToken(")", emptyString, true);
+                tok2->insertTokenBefore(")");
                 Token::createMutualLinks(tok->next(), tok2->previous());
             }
         }
     }
 }
 
-void Tokenizer::reportError(const Token* tok, const Severity::SeverityType severity, const std::string& id, const std::string& msg, bool inconclusive) const
+void Tokenizer::reportError(const Token* tok, const Severity severity, const std::string& id, const std::string& msg, bool inconclusive) const
 {
     const std::list<const Token*> callstack(1, tok);
     reportError(callstack, severity, id, msg, inconclusive);
 }
 
-void Tokenizer::reportError(const std::list<const Token*>& callstack, Severity::SeverityType severity, const std::string& id, const std::string& msg, bool inconclusive) const
+void Tokenizer::reportError(const std::list<const Token*>& callstack, Severity severity, const std::string& id, const std::string& msg, bool inconclusive) const
 {
     const ErrorMessage errmsg(callstack, &list, severity, id, msg, inconclusive ? Certainty::inconclusive : Certainty::normal);
-    if (mErrorLogger)
-        mErrorLogger->reportErr(errmsg);
-    else
-        Check::reportError(errmsg);
+    mErrorLogger.reportErr(errmsg);
 }
 
 void Tokenizer::setPodTypes()
 {
-    if (!mSettings)
-        return;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (!tok->isName() || tok->varId())
             continue;
 
         // pod type
-        const struct Library::PodType *podType = mSettings->library.podtype(tok->str());
+        const Library::PodType *podType = mSettings.library.podtype(tok->str());
         if (podType) {
             const Token *prev = tok->previous();
             while (prev && prev->isName())
@@ -10218,7 +10921,7 @@ void Tokenizer::simplifyNestedNamespace()
 
 void Tokenizer::simplifyCoroutines()
 {
-    if (!isCPP() || mSettings->standards.cpp < Standards::CPP20)
+    if (!isCPP() || mSettings.standards.cpp < Standards::CPP20)
         return;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         if (!tok->isName() || !Token::Match(tok, "co_return|co_yield|co_await"))
@@ -10292,11 +10995,13 @@ void Tokenizer::simplifyNamespaceAliases()
         else if (Token::Match(tok, "namespace %name% =") || (isPrev = Token::Match(tok->previous(), "namespace %name% ="))) {
             if (isPrev)
                 tok = tok->previous();
-            const std::string name(tok->next()->str());
+            if (tok->tokAt(-1) && !Token::Match(tok->tokAt(-1), "[;{}]"))
+                syntaxError(tok->tokAt(-1));
+            const std::string name(tok->strAt(1));
             Token * tokNameStart = tok->tokAt(3);
             Token * tokNameEnd = tokNameStart;
 
-            while (tokNameEnd && tokNameEnd->next() && tokNameEnd->next()->str() != ";") {
+            while (tokNameEnd && tokNameEnd->next() && tokNameEnd->strAt(1) != ";") {
                 if (tokNameEnd->str() == "(") {
                     if (tokNameEnd->previous()->isName())
                         unknownMacroError(tokNameEnd->previous());
@@ -10311,6 +11016,8 @@ void Tokenizer::simplifyNamespaceAliases()
 
             int endScope = scope;
             Token * tokLast = tokNameEnd->next();
+            if (!tokLast)
+                return;
             Token * tokNext = tokLast->next();
             Token * tok2 = tokNext;
 
@@ -10343,10 +11050,12 @@ void Tokenizer::simplifyNamespaceAliases()
                     }
 
                     if (tok2->strAt(1) == "::" && !alreadyHasNamespace(tokNameStart, tokNameEnd, tok2)) {
+                        if (Token::simpleMatch(tok2->tokAt(-1), "::") && tokNameStart->str() == "::")
+                            tok2->deletePrevious();
                         tok2->str(tokNameStart->str());
                         Token * tok3 = tokNameStart;
                         while (tok3 != tokNameEnd) {
-                            tok2->insertToken(tok3->next()->str());
+                            tok2->insertToken(tok3->strAt(1));
                             tok2 = tok2->next();
                             tok3 = tok3->next();
                         }
@@ -10372,15 +11081,38 @@ void Tokenizer::simplifyNamespaceAliases()
     }
 }
 
+void Tokenizer::setDirectives(std::list<Directive> directives)
+{
+    mDirectives = std::move(directives);
+}
+
 bool Tokenizer::hasIfdef(const Token *start, const Token *end) const
 {
-    assert(mPreprocessor);
+    const auto& directives = mDirectives;
+    return std::any_of(directives.cbegin(), directives.cend(), [&](const Directive& d) {
+        return startsWith(d.str, "#if") &&
+               d.linenr >= start->linenr() &&
+               d.linenr <= end->linenr() &&
+               start->fileIndex() < list.getFiles().size() &&
+               d.file == list.getFiles()[start->fileIndex()];
+    });
+}
 
-    return std::any_of(mPreprocessor->getDirectives().cbegin(), mPreprocessor->getDirectives().cend(), [&](const Directive& d) {
-        return d.str.compare(0, 3, "#if") == 0 &&
-        d.linenr >= start->linenr() &&
-        d.linenr <= end->linenr() &&
-        start->fileIndex() < list.getFiles().size() &&
-        d.file == list.getFiles()[start->fileIndex()];
+bool Tokenizer::isPacked(const Token * bodyStart) const
+{
+    const auto& directives = mDirectives;
+    // TODO: should this return true if the #pragma exists in any line before the start token?
+    return std::any_of(directives.cbegin(), directives.cend(), [&](const Directive& d) {
+        return d.linenr < bodyStart->linenr() && d.str == "#pragma pack(1)" && d.file == list.getFiles().front();
     });
 }
+
+void Tokenizer::getErrorMessages(ErrorLogger& errorLogger, const Settings& settings)
+{
+    TokenList tokenlist{settings, Standards::Language::C};
+    Tokenizer tokenizer(std::move(tokenlist), errorLogger);
+    tokenizer.invalidConstFunctionTypeError(nullptr);
+    // checkLibraryNoReturn
+    tokenizer.unhandled_macro_class_x_y(nullptr, "", "", "", "");
+    tokenizer.unhandledCharLiteral(nullptr, "");
+}
diff --git a/lib/tokenize.h b/lib/tokenize.h
index f296f10ae04..616290e7e2a 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-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
@@ -22,13 +22,13 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "errortypes.h"
 #include "tokenlist.h"
 
-#include <cassert>
+#include <cstdint>
 #include <iosfwd>
 #include <list>
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -38,12 +38,8 @@ class TimerResults;
 class Token;
 class TemplateSimplifier;
 class ErrorLogger;
-class Preprocessor;
-class VariableMap;
-
-namespace simplecpp {
-    class TokenList;
-}
+struct Directive;
+enum class Severity : std::uint8_t;
 
 /// @addtogroup Core
 /// @{
@@ -51,16 +47,10 @@ namespace simplecpp {
 /** @brief The main purpose is to tokenize the source code. It also has functions that simplify the token list */
 class CPPCHECKLIB Tokenizer {
 
-    friend class TestSimplifyTokens;
-    friend class TestSimplifyTypedef;
-    friend class TestSimplifyUsing;
-    friend class TestTokenizer;
     friend class SymbolDatabase;
-    friend class TestSimplifyTemplate;
-    friend class TemplateSimplifier;
 
 public:
-    explicit Tokenizer(const Settings * settings, ErrorLogger *errorLogger = nullptr, const Preprocessor *preprocessor = nullptr);
+    Tokenizer(TokenList tokenList, ErrorLogger &errorLogger);
     ~Tokenizer();
 
     void setTimerResults(TimerResults *tr) {
@@ -85,35 +75,13 @@ class CPPCHECKLIB Tokenizer {
      */
     bool isScopeNoReturn(const Token *endScopeToken, bool *unknown = nullptr) const;
 
-    bool createTokens(std::istream &code, const std::string& FileName);
-    void createTokens(simplecpp::TokenList&& tokenList);
+    bool simplifyTokens1(const std::string &configuration, int fileIndex=0);
 
-    bool simplifyTokens1(const std::string &configuration);
-    /**
-     * Tokenize code
-     * @param code input stream for code, e.g.
-     * \code
-     * #file "p.h"
-     * class Foo
-     * {
-     * private:
-     * void Bar();
-     * };
-     *
-     * #endfile
-     * void Foo::Bar()
-     * {
-     * }
-     * \endcode
-     *
-     * @param FileName The filename
-     * @param configuration E.g. "A" for code where "#ifdef A" is true
-     * @return false if source code contains syntax errors
-     */
-    bool tokenize(std::istream &code,
-                  const char FileName[],
-                  const std::string &configuration = emptyString);
+    bool isVarUsedInTemplate(nonneg int id) const {
+        return mTemplateVarIdUsage.count(id) != 0;
+    }
 
+private:
     /** Set variable id */
     void setVarId();
     void setVarIdPass1();
@@ -143,12 +111,13 @@ class CPPCHECKLIB Tokenizer {
     void removeExtraTemplateKeywords();
 
 
+protected:
     /** Split up template right angle brackets.
      * foo < bar < >> => foo < bar < > >
      */
     void splitTemplateRightAngleBrackets(bool check);
 
-
+public:
     /**
      * Calculates sizeof value for given type.
      * @param type Token which will contain e.g. "int", "*", or string.
@@ -157,6 +126,7 @@ class CPPCHECKLIB Tokenizer {
     nonneg int sizeOfType(const Token* type) const;
     nonneg int sizeOfType(const std::string& type) const;
 
+private:
     void simplifyDebug();
 
     /** Simplify assignment where rhs is a block : "x=({123;});" => "{x=123;}" */
@@ -164,6 +134,7 @@ class CPPCHECKLIB Tokenizer {
 
     /** Insert array size where it isn't given */
     void arraySize();
+    void arraySizeAfterValueFlow();
 
     /** Simplify labels and 'case|default' syntaxes.
      */
@@ -194,15 +165,15 @@ class CPPCHECKLIB Tokenizer {
      * Simplify variable declarations (split up)
      * \param only_k_r_fpar Only simplify K&R function parameters
      */
-    void simplifyVarDecl(const bool only_k_r_fpar);
-    void simplifyVarDecl(Token * tokBegin, const Token * const tokEnd, const bool only_k_r_fpar); // cppcheck-suppress functionConst // has side effects
+    void simplifyVarDecl( bool only_k_r_fpar);
+    void simplifyVarDecl(Token * tokBegin, const Token * tokEnd, bool only_k_r_fpar);
 
     /**
      * Simplify variable initialization
      * '; int *p(0);' => '; int *p = 0;'
      */
     void simplifyInitVar();
-    static Token* initVar(Token* tok);
+    RET_NONNULL static Token* initVar(Token* tok);
 
     /**
      * Simplify the location of "static" and "const" qualifiers in
@@ -218,6 +189,7 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyVariableMultipleAssign();
 
+protected:
     /**
      * Simplify the 'C Alternative Tokens'
      * Examples:
@@ -227,6 +199,7 @@ class CPPCHECKLIB Tokenizer {
      */
     bool simplifyCAlternativeTokens();
 
+private:
     /** Add braces to an if-block, for-block, etc.
      * @return true if no syntax errors
      */
@@ -248,9 +221,6 @@ class CPPCHECKLIB Tokenizer {
      */
     Token * simplifyAddBracesPair(Token *tok, bool commandWithCondition);
 
-    // Convert "using ...;" to corresponding typedef
-    void simplifyUsingToTypedef();
-
     /**
      * typedef A mytype;
      * mytype c;
@@ -259,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
@@ -268,11 +240,13 @@ class CPPCHECKLIB Tokenizer {
 
     /**
      */
-    bool isMemberFunction(const Token *openParen) const;
+    static bool isMemberFunction(const Token *openParen);
 
     /**
      */
+public:
     bool simplifyUsing();
+private:
     void simplifyUsingError(const Token* usingStart, const Token* usingEnd);
 
     /** Simplify useless C++ empty namespaces, like: 'namespace %name% { }'*/
@@ -333,24 +307,29 @@ class CPPCHECKLIB Tokenizer {
 
     void fillTypeSizes();
 
+protected:
     void combineOperators();
 
     void combineStringAndCharLiterals();
 
+private:
     void concatenateNegativeNumberAndAnyPositive();
 
     void simplifyExternC();
 
-    void simplifyRoundCurlyParentheses();
+    void simplifyCompoundStatements();
 
     void simplifyTypeIntrinsics();
 
     void simplifySQL();
 
+    void simplifyParenthesizedLibraryFunctions();
+
     void checkForEnumsWithTypedef();
 
     void findComplicatedSyntaxErrorsInTemplates();
 
+protected:
     /**
      * Modify strings in the token list by replacing hex and oct
      * values. E.g. "\x61" -> "a" and "\000" -> "\0"
@@ -359,30 +338,11 @@ class CPPCHECKLIB Tokenizer {
      */
     static std::string simplifyString(const std::string &source);
 
-    /**
-     * 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
-     */
-    const Token * isFunctionHead(const Token *tok, const std::string &endsWith) const;
-
-    /**
-     * is token pointing at function head?
-     * @param tok         A '(' or ')' token in a possible function head
-     * @param endsWith    string after function head
-     * @param cpp         c++ code
-     * @return token matching with endsWith if syntax seems to be a function head else nullptr
-     */
-    static const Token * isFunctionHead(const Token *tok, const std::string &endsWith, bool cpp);
-
-    const Preprocessor *getPreprocessor() const {
-        assert(mPreprocessor);
-        return mPreprocessor;
-    }
-
+public:
     bool hasIfdef(const Token *start, const Token *end) const;
 
+    bool isPacked(const Token * bodyStart) const;
+
 private:
 
     /** Simplify pointer to standard type (C only) */
@@ -397,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().
      */
@@ -407,42 +368,55 @@ class CPPCHECKLIB Tokenizer {
      */
     void createLinks2();
 
+private:
+    /**
+     * Set isCast() for C++ casts
+     */
+    void markCppCasts();
+
 public:
 
-    /** Syntax error */
-    NORETURN void syntaxError(const Token *tok, const std::string &code = emptyString) const;
+    /** 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;
+    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;
 
     /**
      * Is there C++ code in C file?
      */
     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;
 
@@ -475,9 +449,11 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyCppcheckAttribute();
 
+protected:
     /** Simplify c++20 spaceship operator */
     void simplifySpaceshipOperator();
 
+private:
     /**
      * Remove keywords "volatile", "inline", "register", and "restrict"
      */
@@ -543,7 +519,7 @@ class CPPCHECKLIB Tokenizer {
     void simplifyOverloadedOperators();
 
     /**
-     * Remove [[attribute]] (C++11 and later) from TokenList
+     * Remove [[attribute]] (C++11, C23) from TokenList
      */
     void simplifyCPPAttribute();
 
@@ -564,70 +540,51 @@ class CPPCHECKLIB Tokenizer {
      */
     void simplifyCoroutines();
 
+protected:
     /**
      * Prepare ternary operators with parentheses so that the AST can be created
      * */
     void prepareTernaryOpForAST();
 
+private:
     /**
      * report error message
      */
-    void reportError(const Token* tok, const Severity::SeverityType severity, const std::string& id, const std::string& msg, bool inconclusive = false) const;
-    void reportError(const std::list<const Token*>& callstack, Severity::SeverityType severity, const std::string& id, const std::string& msg, bool inconclusive = false) const;
+    void reportError(const Token* tok, Severity severity, const std::string& id, const std::string& msg, bool inconclusive = false) const;
+    void reportError(const std::list<const Token*>& callstack, Severity severity, const std::string& id, const std::string& msg, bool inconclusive = false) const;
 
-    bool duplicateTypedef(Token **tokPtr, const Token *name, const Token *typeDef) const;
+    bool duplicateTypedef(Token *&tokPtr, const Token *name, const Token *typeDef) const;
 
     void unsupportedTypedef(const Token *tok) const;
 
-    void setVarIdClassDeclaration(Token* const startToken, // cppcheck-suppress functionConst // has side effects
-                                  VariableMap& variableMap,
-                                  const nonneg int scopeStartVarId,
-                                  std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers);
-
-    void setVarIdStructMembers(Token **tok1,
-                               std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers,
-                               nonneg int &varId) const;
-
-    void setVarIdClassFunction(const std::string &classname, // cppcheck-suppress functionConst // has side effects
-                               Token * const startToken,
-                               const Token * const endToken,
-                               const std::map<std::string, nonneg int> &varlist,
-                               std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers,
-                               nonneg int &varId_);
-
-    /**
-     * Output list of unknown types.
-     */
-    void printUnknownTypes() const;
+    static void setVarIdClassFunction(const std::string &classname,
+                                      Token * startToken,
+                                      const Token * endToken,
+                                      const std::map<std::string, nonneg int> &varlist,
+                                      std::map<nonneg int, std::map<std::string, nonneg int>>& structMembers,
+                                      nonneg int &varId_);
 
     /** Find end of SQL (or PL/SQL) block */
     static const Token *findSQLBlockEnd(const Token *tokSQLStart);
 
-    bool operatorEnd(const Token * tok) const;
+    static bool operatorEnd(const Token * tok);
 
 public:
-
-    /** Was there templates in the code? */
-    bool codeWithTemplates() const {
-        return mCodeWithTemplates;
-    }
-
     const SymbolDatabase *getSymbolDatabase() const {
         return mSymbolDatabase;
     }
     void createSymbolDatabase();
 
     /** print --debug output if debug flags match the simplification:
-     * 0=unknown/both simplifications
-     * 1=1st simplifications
-     * 2=2nd simplifications
      */
-    void printDebugOutput(int simplification) const;
+    void printDebugOutput(std::ostream &out) const;
 
     void dump(std::ostream &out) const;
 
+private:
     Token *deleteInvalidTypedef(Token *typeDef);
 
+public:
     /**
      * Get variable count.
      * @return number of variables
@@ -652,7 +609,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);
 
@@ -664,10 +621,21 @@ class CPPCHECKLIB Tokenizer {
      */
     static const Token * startOfExecutableScope(const Token * tok);
 
-    const Settings *getSettings() const {
+    /**
+     * 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 */
@@ -676,6 +644,11 @@ class CPPCHECKLIB Tokenizer {
     /** Disable assignment operator */
     Tokenizer &operator=(const Tokenizer &) = delete;
 
+    void setDirectives(std::list<Directive> directives);
+
+    std::string dumpTypedefInfo() const;
+
+    static void getErrorMessages(ErrorLogger& errorLogger, const Settings& settings);
 private:
     const Token *processFunc(const Token *tok2, bool inOperator) const;
     Token *processFunc(Token *tok2, bool inOperator);
@@ -692,16 +665,20 @@ class CPPCHECKLIB Tokenizer {
     void setPodTypes();
 
     /** settings */
-    const Settings * const mSettings;
+    const Settings & mSettings;
 
     /** errorlogger */
-    ErrorLogger* const mErrorLogger;
+    ErrorLogger& mErrorLogger;
 
     /** Symbol database that all checks etc can use */
-    SymbolDatabase *mSymbolDatabase;
+    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;
@@ -709,33 +686,34 @@ class CPPCHECKLIB Tokenizer {
     /** sizeof information for known types */
     std::map<std::string, int> mTypeSize;
 
+    struct TypedefToken {
+        std::string name;
+        int lineNumber;
+        int column;
+    };
     struct TypedefInfo {
         std::string name;
         std::string filename;
         int lineNumber;
         int column;
         bool used;
+        bool isFunctionPointer;
+        std::vector<TypedefToken> typedefInfoTokens;
     };
     std::vector<TypedefInfo> mTypedefInfo;
 
+    std::list<Directive> mDirectives;
+
     /** variable count */
-    nonneg int mVarId;
+    nonneg int mVarId{};
 
     /** unnamed count "Unnamed0", "Unnamed1", "Unnamed2", ... */
-    nonneg int mUnnamedCount;
-
-    /**
-     * was there any templates? templates that are "unused" are
-     * removed from the token list
-     */
-    bool mCodeWithTemplates;
+    nonneg int mUnnamedCount{};
 
     /**
      * TimerResults
      */
-    TimerResults *mTimerResults;
-
-    const Preprocessor * const mPreprocessor;
+    TimerResults* mTimerResults{};
 };
 
 /// @}
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index b4af023ba0d..7fccbb89f1d 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-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
@@ -17,6 +17,7 @@
  */
 
 //---------------------------------------------------------------------------
+
 #include "tokenlist.h"
 
 #include "astutils.h"
@@ -24,7 +25,6 @@
 #include "errortypes.h"
 #include "keywords.h"
 #include "library.h"
-#include "mathlib.h"
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
@@ -32,9 +32,13 @@
 #include "token.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cctype>
+#include <cstdint>
 #include <exception>
 #include <functional>
+#include <iostream>
+#include <iterator>
 #include <utility>
 #include <set>
 #include <stack>
@@ -45,16 +49,15 @@
 // How many compileExpression recursions are allowed?
 // For practical code this could be endless. But in some special torture test
 // there needs to be a limit.
-static const int AST_MAX_DEPTH = 150;
+static constexpr int AST_MAX_DEPTH = 150;
 
 
-TokenList::TokenList(const Settings* settings) :
-    mTokensFrontBack(),
-    mSettings(settings),
-    mIsC(false),
-    mIsCpp(false)
+TokenList::TokenList(const Settings& settings, Standards::Language lang)
+    : mTokensFrontBack(new TokensFrontBack)
+    , mSettings(settings)
 {
-    mTokensFrontBack.list = this;
+    assert(lang != Standards::Language::None);
+    mLang = lang;
 }
 
 TokenList::~TokenList()
@@ -67,7 +70,8 @@ TokenList::~TokenList()
 const std::string& TokenList::getSourceFilePath() const
 {
     if (getFiles().empty()) {
-        return emptyString;
+        static const std::string s_empty_string;
+        return s_empty_string;
     }
     return getFiles()[0];
 }
@@ -77,37 +81,32 @@ const std::string& TokenList::getSourceFilePath() const
 // Deallocate lists..
 void TokenList::deallocateTokens()
 {
-    deleteTokens(mTokensFrontBack.front);
-    mTokensFrontBack.front = nullptr;
-    mTokensFrontBack.back = nullptr;
-    mFiles.clear();
-}
-
-void TokenList::determineCppC()
-{
-    if (!mSettings) {
-        mIsC = Path::isC(getSourceFilePath());
-        mIsCpp = Path::isCPP(getSourceFilePath());
-    } else {
-        mIsC = mSettings->enforcedLang == Settings::Language::C || (mSettings->enforcedLang == Settings::Language::None && Path::isC(getSourceFilePath()));
-        mIsCpp = mSettings->enforcedLang == Settings::Language::CPP || (mSettings->enforcedLang == Settings::Language::None && Path::isCPP(getSourceFilePath()));
+    if (mTokensFrontBack) {
+        deleteTokens(mTokensFrontBack->front);
+        mTokensFrontBack->front = nullptr;
+        mTokensFrontBack->back = nullptr;
     }
+    // TODO: clear mOrigFiles?
+    mFiles.clear();
 }
 
+// TODO: also update mOrigFiles?
 int TokenList::appendFileIfNew(std::string fileName)
 {
+    assert(!fileName.empty());
+
     // Has this file been tokenized already?
-    for (int i = 0; i < mFiles.size(); ++i)
-        if (Path::sameFileName(mFiles[i], fileName))
-            return i;
+    auto it = std::find_if(mFiles.cbegin(), mFiles.cend(), [&](const std::string& f) {
+        return Path::sameFileName(f, 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));
 
-    // Update mIsC and mIsCpp properties
-    if (mFiles.size() == 1) { // Update only useful if first file added to _files
-        determineCppC();
-    }
     return mFiles.size() - 1;
 }
 
@@ -149,17 +148,17 @@ void TokenList::addtoken(const std::string& str, const nonneg int lineno, const
         }
     }
 
-    if (mTokensFrontBack.back) {
-        mTokensFrontBack.back->insertToken(str);
+    if (mTokensFrontBack->back) {
+        mTokensFrontBack->back->insertToken(str);
     } else {
-        mTokensFrontBack.front = new Token(&mTokensFrontBack);
-        mTokensFrontBack.back = mTokensFrontBack.front;
-        mTokensFrontBack.back->str(str);
+        mTokensFrontBack->front = new Token(*this, mTokensFrontBack);
+        mTokensFrontBack->back = mTokensFrontBack->front;
+        mTokensFrontBack->back->str(str);
     }
 
-    mTokensFrontBack.back->linenr(lineno);
-    mTokensFrontBack.back->column(column);
-    mTokensFrontBack.back->fileIndex(fileno);
+    mTokensFrontBack->back->linenr(lineno);
+    mTokensFrontBack->back->column(column);
+    mTokensFrontBack->back->fileIndex(fileno);
 }
 
 void TokenList::addtoken(const std::string& str, const Token *locationTok)
@@ -167,17 +166,17 @@ void TokenList::addtoken(const std::string& str, const Token *locationTok)
     if (str.empty())
         return;
 
-    if (mTokensFrontBack.back) {
-        mTokensFrontBack.back->insertToken(str);
+    if (mTokensFrontBack->back) {
+        mTokensFrontBack->back->insertToken(str);
     } else {
-        mTokensFrontBack.front = new Token(&mTokensFrontBack);
-        mTokensFrontBack.back = mTokensFrontBack.front;
-        mTokensFrontBack.back->str(str);
+        mTokensFrontBack->front = new Token(*this, mTokensFrontBack);
+        mTokensFrontBack->back = mTokensFrontBack->front;
+        mTokensFrontBack->back->str(str);
     }
 
-    mTokensFrontBack.back->linenr(locationTok->linenr());
-    mTokensFrontBack.back->column(locationTok->column());
-    mTokensFrontBack.back->fileIndex(locationTok->fileIndex());
+    mTokensFrontBack->back->linenr(locationTok->linenr());
+    mTokensFrontBack->back->column(locationTok->column());
+    mTokensFrontBack->back->fileIndex(locationTok->fileIndex());
 }
 
 void TokenList::addtoken(const Token * tok, const nonneg int lineno, const nonneg int column, const nonneg int fileno)
@@ -185,20 +184,20 @@ void TokenList::addtoken(const Token * tok, const nonneg int lineno, const nonne
     if (tok == nullptr)
         return;
 
-    if (mTokensFrontBack.back) {
-        mTokensFrontBack.back->insertToken(tok->str(), tok->originalName());
+    if (mTokensFrontBack->back) {
+        mTokensFrontBack->back->insertToken(tok->str(), tok->originalName());
     } else {
-        mTokensFrontBack.front = new Token(&mTokensFrontBack);
-        mTokensFrontBack.back = mTokensFrontBack.front;
-        mTokensFrontBack.back->str(tok->str());
+        mTokensFrontBack->front = new Token(*this, mTokensFrontBack);
+        mTokensFrontBack->back = mTokensFrontBack->front;
+        mTokensFrontBack->back->str(tok->str());
         if (!tok->originalName().empty())
-            mTokensFrontBack.back->originalName(tok->originalName());
+            mTokensFrontBack->back->originalName(tok->originalName());
     }
 
-    mTokensFrontBack.back->linenr(lineno);
-    mTokensFrontBack.back->column(column);
-    mTokensFrontBack.back->fileIndex(fileno);
-    mTokensFrontBack.back->flags(tok->flags());
+    mTokensFrontBack->back->linenr(lineno);
+    mTokensFrontBack->back->column(column);
+    mTokensFrontBack->back->fileIndex(fileno);
+    mTokensFrontBack->back->flags(tok->flags());
 }
 
 void TokenList::addtoken(const Token *tok, const Token *locationTok)
@@ -206,20 +205,20 @@ void TokenList::addtoken(const Token *tok, const Token *locationTok)
     if (tok == nullptr || locationTok == nullptr)
         return;
 
-    if (mTokensFrontBack.back) {
-        mTokensFrontBack.back->insertToken(tok->str(), tok->originalName());
+    if (mTokensFrontBack->back) {
+        mTokensFrontBack->back->insertToken(tok->str(), tok->originalName());
     } else {
-        mTokensFrontBack.front = new Token(&mTokensFrontBack);
-        mTokensFrontBack.back = mTokensFrontBack.front;
-        mTokensFrontBack.back->str(tok->str());
+        mTokensFrontBack->front = new Token(*this, mTokensFrontBack);
+        mTokensFrontBack->back = mTokensFrontBack->front;
+        mTokensFrontBack->back->str(tok->str());
         if (!tok->originalName().empty())
-            mTokensFrontBack.back->originalName(tok->originalName());
+            mTokensFrontBack->back->originalName(tok->originalName());
     }
 
-    mTokensFrontBack.back->flags(tok->flags());
-    mTokensFrontBack.back->linenr(locationTok->linenr());
-    mTokensFrontBack.back->column(locationTok->column());
-    mTokensFrontBack.back->fileIndex(locationTok->fileIndex());
+    mTokensFrontBack->back->flags(tok->flags());
+    mTokensFrontBack->back->linenr(locationTok->linenr());
+    mTokensFrontBack->back->column(locationTok->column());
+    mTokensFrontBack->back->fileIndex(locationTok->fileIndex());
 }
 
 void TokenList::addtoken(const Token *tok)
@@ -227,20 +226,22 @@ void TokenList::addtoken(const Token *tok)
     if (tok == nullptr)
         return;
 
-    if (mTokensFrontBack.back) {
-        mTokensFrontBack.back->insertToken(tok->str(), tok->originalName());
+    if (mTokensFrontBack->back) {
+        mTokensFrontBack->back->insertToken(tok->str(), tok->originalName(), tok->getMacroName());
     } else {
-        mTokensFrontBack.front = new Token(&mTokensFrontBack);
-        mTokensFrontBack.back = mTokensFrontBack.front;
-        mTokensFrontBack.back->str(tok->str());
+        mTokensFrontBack->front = new Token(*this, mTokensFrontBack);
+        mTokensFrontBack->back = mTokensFrontBack->front;
+        mTokensFrontBack->back->str(tok->str());
         if (!tok->originalName().empty())
-            mTokensFrontBack.back->originalName(tok->originalName());
+            mTokensFrontBack->back->originalName(tok->originalName());
+        if (!tok->getMacroName().empty())
+            mTokensFrontBack->back->setMacroName(tok->getMacroName());
     }
 
-    mTokensFrontBack.back->flags(tok->flags());
-    mTokensFrontBack.back->linenr(tok->linenr());
-    mTokensFrontBack.back->column(tok->column());
-    mTokensFrontBack.back->fileIndex(tok->fileIndex());
+    mTokensFrontBack->back->flags(tok->flags());
+    mTokensFrontBack->back->linenr(tok->linenr());
+    mTokensFrontBack->back->column(tok->column());
+    mTokensFrontBack->back->fileIndex(tok->fileIndex());
 }
 
 
@@ -290,9 +291,12 @@ Token *TokenList::copyTokens(Token *dest, const Token *first, const Token *last,
 
 void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)
 {
+    // TODO: put the linking in a helper?
     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();
 
@@ -310,21 +314,26 @@ void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)
         dest->varId(src->varId());
         dest->tokType(src->tokType());
         dest->flags(src->flags());
+        if (!src->getMacroName().empty())
+            dest->setMacroName(src->getMacroName());
         src  = src->next();
         --n;
     }
 }
 
-//---------------------------------------------------------------------------
-// Tokenize - tokenizes a given file.
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokens(std::istream &code, const std::string& file0)
+bool TokenList::createTokensFromBuffer(const char* data, size_t size)
 {
-    appendFileIfNew(file0);
+    return createTokensFromBufferInternal(data, size, mFiles.empty() ? "" : *mFiles.cbegin());
+}
+
+//---------------------------------------------------------------------------
 
+bool TokenList::createTokensFromBufferInternal(const char* data, size_t size, const std::string& file0)
+{
     simplecpp::OutputList outputList;
-    simplecpp::TokenList tokens(code, mFiles, file0, &outputList);
+    simplecpp::TokenList tokens({data, size}, mFiles, file0, &outputList);
 
     createTokens(std::move(tokens));
 
@@ -333,47 +342,56 @@ bool TokenList::createTokens(std::istream &code, const std::string& file0)
 
 //---------------------------------------------------------------------------
 
+// NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
 void TokenList::createTokens(simplecpp::TokenList&& tokenList)
 {
-    if (tokenList.cfront())
-        mOrigFiles = mFiles = tokenList.cfront()->location.files;
-    else
-        mFiles.clear();
+    // TODO: what to do if the list has been filled already? clear mTokensFrontBack?
 
-    determineCppC();
+    // tokenList.cfront() might be NULL if the file contained nothing to tokenize so we need to check the files instead
+    if (!tokenList.getFiles().empty()) {
+        // this is a copy
+        // TODO: this points to mFiles when called from createTokens(std::istream &, const std::string&)
+        mOrigFiles = mFiles = tokenList.getFiles();
+    }
+    else {
+        // TODO: clear mOrigFiles?
+        mFiles.clear();
+    }
 
     for (const simplecpp::Token *tok = tokenList.cfront(); tok;) {
 
+        // TODO: move from TokenList
         std::string str = tok->str();
 
         // Float literal
         if (str.size() > 1 && str[0] == '.' && std::isdigit(str[1]))
             str = '0' + str;
 
-        if (mTokensFrontBack.back) {
-            mTokensFrontBack.back->insertToken(str);
+        if (mTokensFrontBack->back) {
+            mTokensFrontBack->back->insertToken(str);
         } else {
-            mTokensFrontBack.front = new Token(&mTokensFrontBack);
-            mTokensFrontBack.back = mTokensFrontBack.front;
-            mTokensFrontBack.back->str(str);
+            mTokensFrontBack->front = new Token(*this, mTokensFrontBack);
+            mTokensFrontBack->back = mTokensFrontBack->front;
+            mTokensFrontBack->back->str(str);
         }
 
-        mTokensFrontBack.back->fileIndex(tok->location.fileIndex);
-        mTokensFrontBack.back->linenr(tok->location.line);
-        mTokensFrontBack.back->column(tok->location.col);
-        mTokensFrontBack.back->isExpandedMacro(!tok->macro.empty());
+        mTokensFrontBack->back->fileIndex(tok->location.fileIndex);
+        mTokensFrontBack->back->linenr(tok->location.line);
+        mTokensFrontBack->back->column(tok->location.col);
+        if (!tok->macro.empty())
+            mTokensFrontBack->back->setMacroName(tok->macro);
 
         tok = tok->next;
         if (tok)
             tokenList.deleteToken(tok->previous);
     }
 
-    if (mSettings && mSettings->relativePaths) {
+    if (mSettings.relativePaths) {
         for (std::string & mFile : mFiles)
-            mFile = Path::getRelativePath(mFile, mSettings->basePaths);
+            mFile = Path::getRelativePath(mFile, mSettings.basePaths);
     }
 
-    Token::assignProgressValues(mTokensFrontBack.front);
+    Token::assignProgressValues(mTokensFrontBack->front);
 }
 
 //---------------------------------------------------------------------------
@@ -382,9 +400,9 @@ std::size_t TokenList::calculateHash() const
 {
     std::string hashData;
     for (const Token* tok = front(); tok; tok = tok->next()) {
-        hashData += MathLib::toString(tok->flags());
-        hashData += MathLib::toString(tok->varId());
-        hashData += MathLib::toString(tok->tokType());
+        hashData += std::to_string(tok->flags());
+        hashData += std::to_string(tok->varId());
+        hashData += std::to_string(tok->tokType());
         hashData += tok->str();
         hashData += tok->originalName();
     }
@@ -394,17 +412,20 @@ std::size_t TokenList::calculateHash() const
 
 //---------------------------------------------------------------------------
 
-struct AST_state {
-    std::stack<Token*> op;
-    int depth;
-    int inArrayAssignment;
-    bool cpp;
-    int assign;
-    bool inCase; // true from case to :
-    bool stopAtColon; // help to properly parse ternary operators
-    const Token *functionCallEndPar;
-    explicit AST_state(bool cpp) : depth(0), inArrayAssignment(0), cpp(cpp), assign(0), inCase(false),stopAtColon(false), functionCallEndPar(nullptr) {}
-};
+namespace {
+    struct AST_state {
+        std::stack<Token*> op;
+        int depth{};
+        int inArrayAssignment{};
+        bool cpp;
+        int assign{};
+        bool inCase{}; // true from case to :
+        bool inGeneric{};
+        bool stopAtColon{}; // help to properly parse ternary operators
+        const Token* functionCallEndPar{};
+        explicit AST_state(bool cpp) : cpp(cpp) {}
+    };
+}
 
 static Token* skipDecl(Token* tok, std::vector<Token*>* inner = nullptr)
 {
@@ -428,7 +449,7 @@ static Token* skipDecl(Token* tok, std::vector<Token*>* inner = nullptr)
                 vartok = vartok->link();
             else
                 return tok;
-        } else if (Token::Match(vartok, "%var% [:=(]")) {
+        } else if (Token::Match(vartok, "%var% [:=({]")) {
             return vartok;
         } else if (Token::Match(vartok, "decltype|typeof (") && !isDecltypeFuncParam(tok->linkAt(1))) {
             if (inner)
@@ -448,11 +469,14 @@ static bool iscast(const Token *tok, bool cpp)
     if (Token::simpleMatch(tok->link(), ") ( )"))
         return false;
 
-    if (tok->previous() && tok->previous()->isName() && tok->previous()->str() != "return" &&
+    if (Token::Match(tok->link(), ") %assign%|,|..."))
+        return false;
+
+    if (tok->previous() && tok->previous()->isName() && !Token::Match(tok->previous(), "return|case") &&
         (!cpp || !Token::Match(tok->previous(), "delete|throw")))
         return false;
 
-    if (Token::simpleMatch(tok->previous(), ">") && tok->previous()->link())
+    if (Token::simpleMatch(tok->previous(), ">") && tok->linkAt(-1))
         return false;
 
     if (Token::Match(tok, "( (| typeof (") && Token::Match(tok->link(), ") %num%"))
@@ -461,6 +485,9 @@ static bool iscast(const Token *tok, bool cpp)
     if (Token::Match(tok->link(), ") }|)|]|;"))
         return false;
 
+    if (Token::Match(tok->link(), ") ++|-- [;)]"))
+        return false;
+
     if (Token::Match(tok->link(), ") %cop%") && !Token::Match(tok->link(), ") [&*+-~!]"))
         return false;
 
@@ -499,7 +526,7 @@ static bool iscast(const Token *tok, bool cpp)
         if (!Token::Match(tok2, "%name%|*|::"))
             return false;
 
-        if (tok2->isStandardType() && (tok2->next()->str() != "(" || Token::Match(tok2->next(), "( * *| )")))
+        if (tok2->isStandardType() && (tok2->strAt(1) != "(" || Token::Match(tok2->next(), "( * *| )")))
             type = true;
     }
 
@@ -531,12 +558,12 @@ static Token * findCppTypeInitPar(Token *tok)
 }
 
 // X{} X<Y>{} etc
-static bool iscpp11init_impl(const Token * const 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)
@@ -545,11 +572,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;
@@ -569,8 +594,16 @@ static bool iscpp11init_impl(const Token * const tok)
     }
 
     auto isCaseStmt = [](const Token* colonTok) {
-        if (!Token::Match(colonTok->tokAt(-1), "%name%|%num%|%char% :"))
+        if (!Token::Match(colonTok->tokAt(-1), "%name%|%num%|%char%|) :"))
             return false;
+        if (const Token* castTok = colonTok->linkAt(-1)) {
+            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);
@@ -625,6 +658,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;
@@ -638,18 +674,41 @@ static void compileUnaryOp(Token *&tok, AST_state& state, void (*f)(Token *&tok,
         state.depth--;
     }
 
-    if (!state.op.empty()) {
+    if (!state.op.empty() && (!precedes(state.op.top(), unaryop) || unaryop->isIncDecOp() || Token::Match(unaryop, "[({[]"))) { // nullary functions, empty lists/arrays
         unaryop->astOperand1(state.op.top());
         state.op.pop();
     }
     state.op.push(unaryop);
 }
 
+static void skipGenericType(Token *&tok)
+{
+    Token *skip = tok;
+    while (Token::Match(skip, "%name%|*|:|(")) {
+        if (skip->link()) {
+            skip = skip->link()->next();
+            continue;
+        }
+        if (Token::simpleMatch(skip, ":")) {
+            tok = skip->next();
+            return;
+        }
+        skip = skip->next();
+    }
+}
+
+/**
+ * @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;
     if (f) {
         tok = tok->next();
+        if (Token::simpleMatch(binop, ",") && state.inGeneric)
+            skipGenericType(tok);
+        const bool inGenericSaved = state.inGeneric;
+        state.inGeneric = false;
         if (Token::Match(binop, "::|. ~"))
             tok = tok->next();
         state.depth++;
@@ -658,6 +717,7 @@ static void compileBinOp(Token *&tok, AST_state& state, void (*f)(Token *&tok, A
         if (state.depth > AST_MAX_DEPTH)
             throw InternalError(tok, "maximum AST depth exceeded", InternalError::AST);
         state.depth--;
+        state.inGeneric = inGenericSaved;
     }
 
     // TODO: Should we check if op is empty.
@@ -676,6 +736,9 @@ static void compileBinOp(Token *&tok, AST_state& state, void (*f)(Token *&tok, A
 
 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)
@@ -698,7 +761,7 @@ static void compileTerm(Token *&tok, AST_state& state)
             tok = tok->next();
         } while (Token::Match(tok, "%name%|%str%"));
     } else if (tok->isName()) {
-        if (Token::Match(tok, "return|case") || (state.cpp && tok->str() == "throw")) {
+        if (Token::Match(tok, "return|case") || (state.cpp && (tok->str() == "throw"))) {
             if (tok->str() == "case")
                 state.inCase = true;
             const bool tokIsReturn = tok->str() == "return";
@@ -751,7 +814,7 @@ static void compileTerm(Token *&tok, AST_state& state)
                     repeat = true;
                 }
                 if (Token::simpleMatch(tok->next(), "<") && Token::Match(tok->linkAt(1), "> %name%")) {
-                    tok = tok->next()->link()->next();
+                    tok = tok->linkAt(1)->next();
                     repeat = true;
                 }
             }
@@ -777,7 +840,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, "{ . %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);
@@ -790,6 +853,10 @@ static void compileTerm(Token *&tok, AST_state& state)
                     if (precedes(tok,end)) // typically for something like `MACRO(x, { if (c) { ... } })`, where end is the last curly, and tok is the open curly for the if
                         tok = end;
                 }
+            } else if (tok->next() == end) {
+                tok->astOperand1(state.op.top());
+                state.op.pop();
+                tok = tok->next();
             } else
                 compileBinOp(tok, state, compileExpression);
             if (tok != end)
@@ -856,11 +923,11 @@ static bool isPrefixUnary(const Token* tok, bool cpp)
         }
     }
     if (!tok->previous()
-        || ((Token::Match(tok->previous(), "(|[|{|%op%|;|?|:|,|.|return|::") || (cpp && tok->strAt(-1) == "throw"))
+        || ((Token::Match(tok->previous(), "(|[|{|%op%|;|?|:|,|.|case|return|::") || (cpp && tok->strAt(-1) == "throw"))
             && (tok->previous()->tokType() != Token::eIncDecOp || tok->tokType() == Token::eIncDecOp)))
         return true;
 
-    if (tok->previous()->str() == "}") {
+    if (tok->strAt(-1) == "}") {
         const Token* parent = tok->linkAt(-1)->tokAt(-1);
         return !Token::Match(parent, "%type%") || parent->isKeyword();
     }
@@ -871,6 +938,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 {
@@ -907,9 +977,12 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
                 tok = tok->tokAt(3);
                 break;
             }
-            compileBinOp(tok, state, compileScope);
+            if (!Token::Match(tok->tokAt(-1), "[{,]"))
+                compileBinOp(tok, state, compileScope);
+            else
+                compileUnaryOp(tok, state, compileScope);
         } else if (tok->str() == "[") {
-            if (state.cpp && isPrefixUnary(tok, state.cpp) && Token::Match(tok->link(), "] (|{|<")) { // Lambda
+            if (state.cpp && isPrefixUnary(tok, /*cpp*/ true) && Token::Match(tok->link(), "] (|{|<")) { // Lambda
                 // What we do here:
                 // - Nest the round bracket under the square bracket.
                 // - Nest what follows the lambda (if anything) with the lambda opening [
@@ -927,20 +1000,29 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
                 }
 
                 const bool hasTemplateArg = Token::simpleMatch(squareBracket->link(), "] <") &&
-                                            Token::simpleMatch(squareBracket->link()->next()->link(), "> (");
+                                            Token::simpleMatch(squareBracket->link()->linkAt(1), "> (");
                 if (Token::simpleMatch(squareBracket->link(), "] (") || hasTemplateArg) {
-                    Token* const roundBracket = hasTemplateArg ? squareBracket->link()->next()->link()->next() : squareBracket->link()->next();
+                    Token* const roundBracket = hasTemplateArg ? squareBracket->link()->linkAt(1)->next() : squareBracket->link()->next();
                     Token* curlyBracket = roundBracket->link()->next();
                     while (Token::Match(curlyBracket, "mutable|const|constexpr|consteval"))
                         curlyBracket = curlyBracket->next();
                     if (Token::simpleMatch(curlyBracket, "noexcept")) {
-                        if (Token::simpleMatch(curlyBracket->next(), "("))
+                        if (Token::simpleMatch(curlyBracket->next(), "(")) {
+                            AST_state state2(state.cpp);
+                            Token *tok2 = curlyBracket->tokAt(2);
+                            compileExpression(tok2, state2);
                             curlyBracket = curlyBracket->linkAt(1)->next();
-                        else
+                        } else
                             curlyBracket = curlyBracket->next();
                     }
-                    if (curlyBracket && curlyBracket->originalName() == "->")
+                    if (curlyBracket && curlyBracket->originalName() == "->") {
+                        if (Token::simpleMatch(curlyBracket->next(), "decltype (")) {
+                            AST_state state2(state.cpp);
+                            Token *tok2 = curlyBracket->tokAt(3);
+                            compileExpression(tok2, state2);
+                        }
                         curlyBracket = findTypeEnd(curlyBracket->next());
+                    }
                     if (curlyBracket && curlyBracket->str() == "{") {
                         squareBracket->astOperand1(roundBracket);
                         roundBracket->astOperand1(curlyBracket);
@@ -952,7 +1034,7 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
                     Token* const curlyBracket = squareBracket->link()->next();
                     squareBracket->astOperand1(curlyBracket);
                     state.op.push(squareBracket);
-                    tok = curlyBracket->link()->next();
+                    tok = curlyBracket->link() ? curlyBracket->link()->next() : nullptr;
                     continue;
                 }
             }
@@ -973,11 +1055,22 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
             else
                 compileUnaryOp(tok, state, compileExpression);
             tok = tok2->link()->next();
-        } else if (Token::simpleMatch(tok, "( {") && Token::simpleMatch(tok->linkAt(1)->previous(), "; } )") && !Token::Match(tok->previous(), "%name% (")) {
+        } else if (Token::simpleMatch(tok->previous(), "requires {")) {
+            tok->astOperand1(state.op.top());
+            state.op.pop();
+            state.op.push(tok);
+            tok = tok->link()->next();
+            continue;
+        } else if (Token::simpleMatch(tok, "( {") && Token::simpleMatch(tok->linkAt(1)->previous(), "; } )") &&
+                   !Token::Match(tok->previous(), "%name% (")) {
             state.op.push(tok->next());
             tok = tok->link()->next();
             continue;
-        } else if (tok->str() == "(" && (!iscast(tok, state.cpp) || Token::Match(tok->previous(), "if|while|for|switch|catch"))) {
+        } else if (tok->str() == "(" &&
+                   (!iscast(tok, state.cpp) || Token::Match(tok->previous(), "if|while|for|switch|catch"))) {
+            const bool inGenericSaved = state.inGeneric;
+            if (Token::simpleMatch(tok->previous(), "_Generic"))
+                state.inGeneric = true;
             Token* tok2 = tok;
             tok = tok->next();
             const bool opPrevTopSquare = !state.op.empty() && state.op.top() && state.op.top()->str() == "[";
@@ -996,8 +1089,12 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
                 else
                     compileUnaryOp(tok, state, nullptr);
             }
+            state.inGeneric = inGenericSaved;
             tok = tok->link()->next();
-        } else if (iscast(tok, state.cpp) && Token::simpleMatch(tok->link(), ") {") && Token::simpleMatch(tok->link()->linkAt(1), "} [")) {
+            if (Token::simpleMatch(tok, "::"))
+                compileBinOp(tok, state, compileScope);
+        } else if (iscast(tok, state.cpp) && Token::simpleMatch(tok->link(), ") {") &&
+                   Token::simpleMatch(tok->link()->linkAt(1), "} [")) {
             Token *cast = tok;
             tok = tok->link()->next();
             Token *tok1 = tok;
@@ -1019,7 +1116,8 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
                 tok = end->next();
             else
                 throw InternalError(tok, "Syntax error. Unexpected tokens in initializer.", InternalError::AST);
-        } else break;
+        } else
+            break;
     }
 }
 
@@ -1107,6 +1205,10 @@ static void compilePrecedence3(Token *&tok, AST_state& state)
                 compilePrecedence2(tok, state);
             }
             compileUnaryOp(newtok, state, nullptr);
+            if (Token::simpleMatch(newtok->previous(), ":: new")) {
+                newtok->previous()->astOperand1(newtok);
+                state.op.pop();
+            }
             if (innertype && Token::simpleMatch(tok, ") ,"))
                 tok = tok->next();
         } else if (state.cpp && Token::Match(tok, "delete %name%|*|&|::|(|[")) {
@@ -1116,6 +1218,10 @@ static void compilePrecedence3(Token *&tok, AST_state& state)
                 tok = tok->link()->next();
             compilePrecedence3(tok, state);
             compileUnaryOp(tok2, state, nullptr);
+            if (Token::simpleMatch(tok2->previous(), ":: delete")) {
+                tok2->previous()->astOperand1(tok2);
+                state.op.pop();
+            }
         }
         // TODO: Handle sizeof
         else break;
@@ -1325,6 +1431,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)
@@ -1360,12 +1469,23 @@ const Token* findLambdaEndTokenWithoutAST(const Token* tok) {
     tok = tok->link()->next();
     if (Token::simpleMatch(tok, "(") && tok->link())
         tok = tok->link()->next();
+    if (Token::simpleMatch(tok, "mutable"))
+        tok = tok->next();
+    if (Token::Match(tok, ".|->")) { // trailing return type
+        tok = tok->next();
+        while (Token::Match(tok, "%type%|%name%|::|&|&&|*|<|(")) {
+            if (tok->link())
+                tok = tok->link()->next();
+            else
+                tok = tok->next();
+        }
+    }
     if (!(Token::simpleMatch(tok, "{") && tok->link()))
         return nullptr;
     return tok->link()->next();
 }
 
-static Token * createAstAtToken(Token *tok, bool cpp);
+static Token * createAstAtToken(Token *tok);
 
 // Compile inner expressions inside inner ({..}) and lambda bodies
 static void createAstAtTokenInner(Token * const tok1, const Token *endToken, bool cpp)
@@ -1386,7 +1506,7 @@ static void createAstAtTokenInner(Token * const tok1, const Token *endToken, boo
             }
             if (!hasAst) {
                 for (; tok && tok != endToken && tok != endToken2; tok = tok ? tok->next() : nullptr)
-                    tok = createAstAtToken(tok, cpp);
+                    tok = createAstAtToken(tok);
             }
         } else if (cpp && tok->str() == "[") {
             if (isLambdaCaptureList(tok)) {
@@ -1396,7 +1516,7 @@ static void createAstAtTokenInner(Token * const tok1, const Token *endToken, boo
                 const Token * const endToken2 = tok->link();
                 tok = tok->next();
                 for (; tok && tok != endToken && tok != endToken2; tok = tok ? tok->next() : nullptr)
-                    tok = createAstAtToken(tok, cpp);
+                    tok = createAstAtToken(tok);
             }
         }
         else if (Token::simpleMatch(tok, "( * ) [")) {
@@ -1438,12 +1558,53 @@ static Token * findAstTop(Token *tok1, const Token *tok2)
     return nullptr;
 }
 
-static Token * createAstAtToken(Token *tok, bool cpp)
+static Token *skipMethodDeclEnding(Token *tok)
+{
+    if (tok->str() != ")")
+        tok = tok->previous();
+    if (!tok || tok->str() != ")")
+        return nullptr;
+    Token *const tok2 = const_cast<Token*>(TokenList::isFunctionHead(tok, ";{"));
+    if (tok2 && tok->next() != tok2)
+        return tok2;
+    return nullptr;
+}
+
+/**
+ * @throws InternalError thrown in case of syntax error
+ */
+static Token * createAstAtToken(Token *tok)
 {
+    const bool cpp = tok->isCpp();
     // skip function pointer declaration
+    if (Token::Match(tok, "%type% %type%") && !Token::Match(tok, "return|throw|new|delete")) {
+        Token* tok2 = tok->tokAt(2);
+        // skip type tokens and qualifiers etc
+        while (Token::Match(tok2, "%type%|*|&"))
+            tok2 = tok2->next();
+        if (Token::Match(tok2, "%var% [;,)]"))
+            return tok2;
+    }
+    if (Token *const endTok = skipMethodDeclEnding(tok)) {
+        Token *tok2 = tok;
+        do {
+            tok2 = tok2->next();
+            tok2->setCpp11init(false);
+            if (Token::Match(tok2, "decltype|noexcept (")) {
+                AST_state state(cpp);
+                Token *tok3 = tok2->tokAt(2);
+                compileExpression(tok3, state);
+                tok2 = tok2->linkAt(1);
+            }
+        } while (tok2 != endTok && !precedes(endTok, tok2));
+        return endTok;
+    }
     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%|*|&|<")) {
+            if (type->isName() && (type->isStandardType() || Token::Match(type, "const|mutable|static|volatile")))
+                isStandardTypeOrQualifier = true;
             if (type->str() == "<") {
                 if (type->link())
                     type = type->link();
@@ -1452,6 +1613,8 @@ static Token * createAstAtToken(Token *tok, bool cpp)
             }
             type = type->next();
         }
+        if (isStandardTypeOrQualifier && Token::Match(type, "%var% [;,)]"))
+            return type;
         if (Token::Match(type, "( * *| %var%") &&
             Token::Match(type->link()->previous(), "%var%|] ) (") &&
             Token::Match(type->link()->linkAt(1), ") [;,)]"))
@@ -1503,13 +1666,13 @@ static Token * createAstAtToken(Token *tok, bool cpp)
             compileExpression(tok3, state1);
         }
         Token *init1 = nullptr;
-        Token * const endPar = tok->next()->link();
+        Token * const endPar = tok->linkAt(1);
         if (tok2 == tok->tokAt(2) && Token::Match(tok2, "%op%|(")) {
             init1 = tok2;
             AST_state state1(cpp);
             compileExpression(tok2, state1);
             if (Token::Match(init1, "( !!{")) {
-                for (Token *tok3 = init1; tok3 != tok3->link(); tok3 = tok3->next()) {
+                for (Token *tok3 = init1; tok3 && tok3 != tok3->link(); tok3 = tok3->next()) {
                     if (tok3->astParent()) {
                         while (tok3->astParent())
                             tok3 = tok3->astParent();
@@ -1524,7 +1687,7 @@ static Token * createAstAtToken(Token *tok, bool cpp)
             while (tok2 && tok2 != endPar && tok2->str() != ";") {
                 if (tok2->str() == "<" && tok2->link()) {
                     tok2 = tok2->link();
-                } else if (Token::Match(tok2, "%name% )| %op%|(|[|.|:|::") || Token::Match(tok2->previous(), "[(;{}] %cop%|(")) {
+                } else if (Token::Match(tok2, "%name% )| %op%|(|[|{|.|:|::") || Token::Match(tok2->previous(), "[(;{}] %cop%|(")) {
                     init1 = tok2;
                     AST_state state1(cpp);
                     compileExpression(tok2, state1);
@@ -1617,12 +1780,19 @@ static Token * createAstAtToken(Token *tok, bool cpp)
         }
     }
 
-    if (Token::Match(tok, "%type% %name%|*|&|::") && !Token::Match(tok, "return|new")) {
+    if (Token::Match(tok, "%type% %name%|*|&|&&|::") && !Token::Match(tok, "return|new|delete")) {
         int typecount = 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())
@@ -1635,7 +1805,7 @@ static Token * createAstAtToken(Token *tok, bool cpp)
             Token::Match(typetok->previous(), "%name% ( !!*") &&
             typetok->previous()->varId() == 0 &&
             !typetok->previous()->isKeyword() &&
-            (Token::Match(typetok->link(), ") const|;|{") || Token::Match(typetok->link(), ") const| = delete ;")))
+            (skipMethodDeclEnding(typetok->link()) || Token::Match(typetok->link(), ") ;|{")))
             return typetok;
     }
 
@@ -1644,9 +1814,10 @@ static Token * createAstAtToken(Token *tok, bool cpp)
         !tok->previous() ||
         Token::Match(tok, "%name% %op%|(|[|.|::|<|?|;") ||
         (cpp && Token::Match(tok, "%name% {") && iscpp11init(tok->next())) ||
-        Token::Match(tok->previous(), "[;{}] %cop%|++|--|( !!{") ||
+        Token::Match(tok->previous(), "[;{}:] %cop%|++|--|( !!{") ||
         Token::Match(tok->previous(), "[;{}] %num%|%str%|%char%") ||
-        Token::Match(tok->previous(), "[;{}] delete new")) {
+        Token::Match(tok->previous(), "[;{}] delete new") ||
+        (cpp && Token::Match(tok->previous(), "[;{}] ["))) {
         if (cpp && (Token::Match(tok->tokAt(-2), "[;{}] new|delete %name%") || Token::Match(tok->tokAt(-3), "[;{}] :: new|delete %name%")))
             tok = tok->previous();
 
@@ -1654,6 +1825,8 @@ static Token * createAstAtToken(Token *tok, bool cpp)
         AST_state state(cpp);
         if (Token::Match(tok, "%name% ("))
             state.functionCallEndPar = tok->linkAt(1);
+        if (Token::simpleMatch(tok->tokAt(-1), "::") && (!tok->tokAt(-2) || !tok->tokAt(-2)->isName()))
+            tok = tok->tokAt(-1);
         compileExpression(tok, state);
         Token * const endToken = tok;
         if (endToken == tok1 || !endToken)
@@ -1681,31 +1854,51 @@ static Token * createAstAtToken(Token *tok, bool cpp)
 
 void TokenList::createAst() const
 {
-    for (Token *tok = mTokensFrontBack.front; tok; tok = tok ? tok->next() : nullptr) {
-        tok = createAstAtToken(tok, isCPP());
+    for (Token *tok = mTokensFrontBack->front; tok; tok = tok ? tok->next() : nullptr) {
+        Token* const nextTok = createAstAtToken(tok);
+        if (precedes(nextTok, tok))
+            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;
+        });
     }
 }
 
-struct OnException {
-    std::function<void()> f;
+namespace {
+    struct OnException {
+        std::function<void()> f;
 
-    ~OnException() {
+        ~OnException() {
 #ifndef _MSC_VER
-        if (std::uncaught_exception())
-            f();
+#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
+        }
+    };
+}
 
-void TokenList::validateAst() const
+void TokenList::validateAst(bool print) const
 {
     OnException oe{[&] {
-            if (mSettings && mSettings->debugnormal)
-                mTokensFrontBack.front->printOut();
+            if (print)
+                mTokensFrontBack->front->printOut(std::cout);
         }};
     // Check for some known issues in AST to avoid crash/hang later on
     std::set<const Token*> safeAstTokens;    // list of "safe" AST tokens without endless recursion
-    for (const Token *tok = mTokensFrontBack.front; tok; tok = tok->next()) {
+    for (const Token *tok = mTokensFrontBack->front; tok; tok = tok->next()) {
         // Syntax error if binary operator only has 1 operand
         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);
@@ -1742,12 +1935,16 @@ void TokenList::validateAst() const
             tok = tok->link();
             continue;
         }
-        if (tok->isCast() && tok->astOperand1() && tok->link()) { // skip casts (not part of the AST)
-            tok = tok->link();
-            continue;
+        if (tok->isCast()) {
+            if (!tok->astOperand2() && precedes(tok->astOperand1(), tok))
+                throw InternalError(tok, "AST broken: '" + tok->str() + "' has improper operand.", InternalError::AST);
+            if (tok->astOperand1() && tok->link()) { // skip casts (not part of the AST)
+                tok = tok->link();
+                continue;
+            }
         }
 
-        if (const Token* lambdaEnd = findLambdaEndToken(tok)) { // skip lambda captures
+        if (findLambdaEndToken(tok)) { // skip lambda captures
             tok = tok->link();
             continue;
         }
@@ -1773,14 +1970,23 @@ void TokenList::validateAst() const
                 throw InternalError(tok, "Syntax Error: AST broken, binary operator '" + tok->str() + "' doesn't have two operands.", InternalError::AST);
         }
 
+        if (Token::Match(tok, "++|--") && !tok->astOperand1()) {
+            throw InternalError(tok, "Syntax Error: AST broken, operator '" + tok->str() + "' doesn't have an operand.", InternalError::AST);
+        }
+
         // Check control blocks and asserts
         if (Token::Match(tok->previous(), "if|while|for|switch|assert|ASSERT (")) {
             if (!tok->astOperand1() || !tok->astOperand2())
                 throw InternalError(tok,
-                                    "Syntax Error: AST broken, '" + tok->previous()->str() +
+                                    "Syntax Error: AST broken, '" + tok->strAt(-1) +
                                     "' doesn't have two operands.",
                                     InternalError::AST);
         }
+        if (tok->str() == "case" && !tok->astOperand1()) {
+            throw InternalError(tok,
+                                "Syntax Error: AST broken, 'case' doesn't have an operand.",
+                                InternalError::AST);
+        }
 
         // Check member access
         if (Token::Match(tok, "%var% .")) {
@@ -1790,7 +1996,7 @@ void TokenList::validateAst() const
             }
             if (!tok->next()->astOperand1() || !tok->next()->astOperand2()) {
                 const std::string& op =
-                    tok->next()->originalName().empty() ? tok->next()->str() : tok->next()->originalName();
+                    tok->next()->originalName().empty() ? tok->strAt(1) : tok->next()->originalName();
                 throw InternalError(
                           tok, "Syntax Error: AST broken, '" + op + "' doesn't have two operands.", InternalError::AST);
             }
@@ -1817,7 +2023,7 @@ bool TokenList::validateToken(const Token* tok) const
 {
     if (!tok)
         return true;
-    for (const Token *t = mTokensFrontBack.front; t; t = t->next()) {
+    for (const Token *t = mTokensFrontBack->front; t; t = t->next()) {
         if (tok==t)
             return true;
     }
@@ -1826,20 +2032,17 @@ bool TokenList::validateToken(const Token* tok) const
 
 void TokenList::simplifyPlatformTypes()
 {
-    if (!mSettings)
-        return;
+    const bool isCPP11 = isCPP() && (mSettings.standards.cpp >= Standards::CPP11);
 
-    const bool isCPP11  = mSettings->standards.cpp >= Standards::CPP11;
-
-    enum { isLongLong, isLong, isInt } type;
+    enum : std::uint8_t { isLongLong, isLong, isInt } type;
 
     /** @todo This assumes a flat address space. Not true for segmented address space (FAR *). */
 
-    if (mSettings->platform.sizeof_size_t == mSettings->platform.sizeof_long)
+    if (mSettings.platform.sizeof_size_t == mSettings.platform.sizeof_long)
         type = isLong;
-    else if (mSettings->platform.sizeof_size_t == mSettings->platform.sizeof_long_long)
+    else if (mSettings.platform.sizeof_size_t == mSettings.platform.sizeof_long_long)
         type = isLongLong;
-    else if (mSettings->platform.sizeof_size_t == mSettings->platform.sizeof_int)
+    else if (mSettings.platform.sizeof_size_t == mSettings.platform.sizeof_int)
         type = isInt;
     else
         return;
@@ -1864,7 +2067,7 @@ void TokenList::simplifyPlatformTypes()
         if (tok->str() == "::") {
             tok->deleteThis();
         } else if (tok->str() == "std") {
-            if (tok->next()->str() != "::")
+            if (tok->strAt(1) != "::")
                 continue;
             inStd = true;
             tok->deleteNext();
@@ -1892,13 +2095,13 @@ void TokenList::simplifyPlatformTypes()
         }
     }
 
-    const std::string platform_type(mSettings->platform.toString());
+    const std::string platform_type(mSettings.platform.toString());
 
     for (Token *tok = front(); tok; tok = tok->next()) {
         if (tok->tokType() != Token::eType && tok->tokType() != Token::eName)
             continue;
 
-        const Library::PlatformType * const platformtype = mSettings->library.platform_type(tok->str(), platform_type);
+        const Library::PlatformType * const platformtype = mSettings.library.platform_type(tok->str(), platform_type);
 
         if (platformtype) {
             // check for namespace
@@ -1910,24 +2113,32 @@ void TokenList::simplifyPlatformTypes()
                 tok = tok->previous();
                 tok->deleteThis();
             }
+            tok->originalName(tok->str());
+            const bool isFunctionalPtrCast = (platformtype->mConstPtr || platformtype->mPointer || platformtype->mPtrPtr) &&
+                                             Token::Match(tok, "%name% [({]") && !Token::simpleMatch(tok->linkAt(1), ") (");
+            Token* start = isFunctionalPtrCast ? tok->tokAt(1) : nullptr;
+            Token* end = isFunctionalPtrCast ? tok->linkAt(1) : nullptr;
             Token *typeToken;
             if (platformtype->mConstPtr) {
                 tok->str("const");
-                tok->insertToken("*");
-                tok->insertToken(platformtype->mType);
+                tok->isSimplifiedTypedef(true);
+                tok->insertToken("*")->isSimplifiedTypedef(true);
+                tok->insertToken(platformtype->mType)->isSimplifiedTypedef(true);
                 typeToken = tok;
             } else if (platformtype->mPointer) {
                 tok->str(platformtype->mType);
+                tok->isSimplifiedTypedef(true);
                 typeToken = tok;
-                tok->insertToken("*");
+                tok->insertToken("*")->isSimplifiedTypedef(true);
             } else if (platformtype->mPtrPtr) {
                 tok->str(platformtype->mType);
+                tok->isSimplifiedTypedef(true);
                 typeToken = tok;
-                tok->insertToken("*");
-                tok->insertToken("*");
+                tok->insertToken("*")->isSimplifiedTypedef(true);
+                tok->insertToken("*")->isSimplifiedTypedef(true);
             } else {
-                tok->originalName(tok->str());
                 tok->str(platformtype->mType);
+                tok->isSimplifiedTypedef(true);
                 typeToken = tok;
             }
             if (platformtype->mSigned)
@@ -1936,6 +2147,17 @@ void TokenList::simplifyPlatformTypes()
                 typeToken->isUnsigned(true);
             if (platformtype->mLong)
                 typeToken->isLong(true);
+
+            if (isFunctionalPtrCast) {
+                start->str("(");
+                end->str(")");
+                if (end == start->tokAt(1))
+                    end->insertTokenBefore("0");
+                end = start->insertTokenBefore(")");
+                start = tok->insertTokenBefore("(");
+                start->isSimplifiedTypedef(true);
+                Token::createMutualLinks(start, end);
+            }
         }
     }
 }
@@ -1967,7 +2189,7 @@ void TokenList::simplifyStdType()
             continue;
         }
 
-        if (Token::Match(tok, "char|short|int|long|unsigned|signed|double|float") || (mSettings->standards.c >= Standards::C99 && Token::Match(tok, "complex|_Complex"))) {
+        if (Token::Match(tok, "char|short|int|long|unsigned|signed|double|float") || (isC() && (mSettings.standards.c >= Standards::C99) && Token::Match(tok, "complex|_Complex"))) {
             bool isFloat= false;
             bool isSigned = false;
             bool isUnsigned = false;
@@ -1990,7 +2212,7 @@ void TokenList::simplifyStdType()
                 else if (Token::Match(tok2, "float|double")) {
                     isFloat = true;
                     typeSpec = tok2;
-                } else if (mSettings->standards.c >= Standards::C99 && Token::Match(tok2, "complex|_Complex"))
+                } else if (isC() && (mSettings.standards.c >= Standards::C99) && Token::Match(tok2, "complex|_Complex"))
                     isComplex = !isFloat || tok2->str() == "_Complex" || Token::Match(tok2->next(), "*|&|%name%"); // Ensure that "complex" is not the variables name
                 else if (Token::Match(tok2, "char|int")) {
                     if (!typeSpec)
@@ -2028,30 +2250,94 @@ void TokenList::simplifyStdType()
 
 bool TokenList::isKeyword(const std::string &str) const
 {
-    if (mIsCpp) {
-        // TODO: integrate into keywords?
-        // types and literals are not handled as keywords
-        static const std::unordered_set<std::string> cpp_types = {"bool", "false", "true"};
-        if (cpp_types.find(str) != cpp_types.end())
-            return false;
-
-        // TODO: properly apply configured standard
-        if (!mSettings || mSettings->standards.cpp >= Standards::CPP20) {
-            static const auto& cpp20_keywords = Keywords::getAll(Standards::cppstd_t::CPP20);
-            return cpp20_keywords.find(str) != cpp20_keywords.end();
+    if (isCPP()) {
+        const auto &cpp_keywords = Keywords::getAll(mSettings.standards.cpp);
+        const bool b = cpp_keywords.find(str) != cpp_keywords.end();
+        if (b) {
+            // TODO: integrate into keywords?
+            // types and literals are not handled as keywords
+            static const std::unordered_set<std::string> cpp_types = {"bool", "false", "true"};
+            if (cpp_types.find(str) != cpp_types.end())
+                return false;
         }
+        return b;
+    }
 
-        static const auto& cpp_keywords = Keywords::getAll(Standards::cppstd_t::CPP11);
-        return cpp_keywords.find(str) != cpp_keywords.end();
+    const auto &c_keywords = Keywords::getAll(mSettings.standards.c);
+    const bool b = c_keywords.find(str) != c_keywords.end();
+    if (b) {
+        // TODO: integrate into Keywords?
+        // types are not handled as keywords
+        static const std::unordered_set<std::string> c_types = {"char", "double", "float", "int", "long", "short"};
+        if (c_types.find(str) != c_types.end())
+            return false;
     }
+    return b;
+}
 
-    // TODO: integrate into Keywords?
-    // types are not handled as keywords
-    static const std::unordered_set<std::string> c_types = {"char", "double", "float", "int", "long", "short"};
-    if (c_types.find(str) != c_types.end())
-        return false;
+bool TokenList::isC() const
+{
+    return mLang == Standards::Language::C;
+}
 
-    // TODO: use configured standard
-    static const auto& c_keywords = Keywords::getAll(Standards::cstd_t::C99);
-    return c_keywords.find(str) != c_keywords.end();
+bool TokenList::isCPP() const
+{
+    return mLang == Standards::Language::CPP;
+}
+
+const Token * TokenList::isFunctionHead(const Token *tok, const std::string &endsWith)
+{
+    if (!tok)
+        return nullptr;
+    if (tok->str() == "(")
+        tok = tok->link();
+    if (tok->str() != ")")
+        return nullptr;
+    if (!tok->isCpp() && !Token::Match(tok->link()->previous(), "%name%|(|)"))
+        return nullptr;
+    if (Token::Match(tok, ") ;|{|[")) {
+        tok = tok->next();
+        while (tok && tok->str() == "[" && tok->link()) {
+            if (endsWith.find(tok->str()) != std::string::npos)
+                return tok;
+            tok = tok->link()->next();
+        }
+        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
+    }
+    if (tok->isCpp() && tok->str() == ")") {
+        tok = tok->next();
+        while (Token::Match(tok, "const|noexcept|override|final|volatile|mutable|&|&& !!(") ||
+               (Token::Match(tok, "%name% !!(") && tok->isUpperCaseName()))
+            tok = tok->next();
+        if (tok && tok->str() == ")")
+            tok = tok->next();
+        while (tok && tok->str() == "[")
+            tok = tok->link()->next();
+        if (Token::Match(tok, "throw|noexcept ("))
+            tok = tok->linkAt(1)->next();
+        if (Token::Match(tok, "%name% (") && tok->isUpperCaseName())
+            tok = tok->linkAt(1)->next();
+        if (tok && tok->originalName() == "->") { // trailing return type
+            for (tok = tok->next(); tok && !Token::Match(tok, ";|{|override|final|}|)|]"); tok = tok->next())
+                if (tok->link() && Token::Match(tok, "<|[|("))
+                    tok = tok->link();
+        }
+        while (Token::Match(tok, "override|final !!(") ||
+               (Token::Match(tok, "%name% !!(") && tok->isUpperCaseName()))
+            tok = tok->next();
+        if (Token::Match(tok, "= 0|default|delete ;"))
+            tok = tok->tokAt(2);
+        if (Token::simpleMatch(tok, "requires")) {
+            for (tok = tok->next(); tok && !Token::Match(tok, ";|{|}|)|]"); tok = tok->next()) {
+                if (tok->link() && Token::Match(tok, "<|[|("))
+                    tok = tok->link();
+                if (Token::simpleMatch(tok, "bool {"))
+                    tok = tok->linkAt(1);
+            }
+        }
+        if (tok && tok->str() == ":" && !Token::Match(tok->next(), "%name%|::"))
+            return nullptr;
+        return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
+    }
+    return nullptr;
 }
diff --git a/lib/tokenlist.h b/lib/tokenlist.h
index 68b14523d8e..764eb67bdee 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-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
@@ -22,13 +22,15 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "token.h"
+#include "standards.h"
 
 #include <cstddef>
-#include <iosfwd>
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
 
+class Token;
 class Settings;
 
 namespace simplecpp {
@@ -38,30 +40,32 @@ namespace simplecpp {
 /// @addtogroup Core
 /// @{
 
+/**
+ * @brief This struct stores pointers to the front and back tokens of the list this token is in.
+ */
+struct TokensFrontBack {
+    Token *front{};
+    Token* back{};
+};
+
 class CPPCHECKLIB TokenList {
 public:
-    explicit TokenList(const Settings* settings);
+    explicit TokenList(const Settings& settings, Standards::Language lang);
     ~TokenList();
 
     TokenList(const TokenList &) = delete;
     TokenList &operator=(const TokenList &) = delete;
 
-    void setSettings(const Settings *settings) {
-        mSettings = settings;
-    }
+    TokenList(TokenList&& other) NOEXCEPT = default;
 
     /** @return the source file path. e.g. "file.cpp" */
     const std::string& getSourceFilePath() const;
 
-    /** Is the code C. Used for bailouts */
-    bool isC() const {
-        return mIsC;
-    }
+    /** @return true if the code is C */
+    bool isC() const;
 
-    /** Is the code CPP. Used for bailouts */
-    bool isCPP() const {
-        return mIsCpp;
-    }
+    /** @return true if the code is C++ */
+    bool isCPP() const;
 
     /**
      * Delete all tokens in given token list
@@ -69,10 +73,10 @@ class CPPCHECKLIB TokenList {
      */
     static void deleteTokens(Token *tok);
 
-    void addtoken(const std::string& str, const nonneg int lineno, const nonneg int column, const nonneg int fileno, bool split = false);
+    void addtoken(const std::string& str, nonneg int lineno, nonneg int column, nonneg int fileno, bool split = false);
     void addtoken(const std::string& str, const Token *locationTok);
 
-    void addtoken(const Token *tok, const nonneg int lineno, const nonneg int column, const nonneg int fileno);
+    void addtoken(const Token *tok, nonneg int lineno, nonneg int column, nonneg int fileno);
     void addtoken(const Token *tok, const Token *locationTok);
     void addtoken(const Token *tok);
 
@@ -86,7 +90,7 @@ class CPPCHECKLIB TokenList {
      * @param one_line true=>copy all tokens to the same line as dest. false=>copy all tokens to dest while keeping the 'line breaks'
      * @return new location of last token copied
      */
-    static Token *copyTokens(Token *dest, const Token *first, const Token *last, bool one_line = true);
+    RET_NONNULL static Token *copyTokens(Token *dest, const Token *first, const Token *last, bool one_line = true);
 
     /**
      * Create tokens from code.
@@ -94,10 +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
-     * @param file0 source file name
      */
-    bool createTokens(std::istream &code, const std::string& file0 = emptyString);
+    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);
 
@@ -109,20 +119,20 @@ class CPPCHECKLIB TokenList {
 
     /** get first token of list */
     const Token *front() const {
-        return mTokensFrontBack.front;
+        return mTokensFrontBack->front;
     }
     // NOLINTNEXTLINE(readability-make-member-function-const) - do not allow usage of mutable pointer from const object
     Token *front() {
-        return mTokensFrontBack.front;
+        return mTokensFrontBack->front;
     }
 
     /** get last token of list */
     const Token *back() const {
-        return mTokensFrontBack.back;
+        return mTokensFrontBack->back;
     }
     // NOLINTNEXTLINE(readability-make-member-function-const) - do not allow usage of mutable pointer from const object
     Token *back() {
-        return mTokensFrontBack.back;
+        return mTokensFrontBack->back;
     }
 
     /**
@@ -158,14 +168,15 @@ 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() const;
+    void validateAst(bool print) const;
 
     /**
      * Verify that the given token is an element of the tokenlist.
@@ -192,11 +203,23 @@ class CPPCHECKLIB TokenList {
 
     bool isKeyword(const std::string &str) const;
 
+    /**
+     * 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
+     */
+    static const Token * isFunctionHead(const Token *tok, const std::string &endsWith);
+
+    const Settings& getSettings() const {
+        return mSettings;
+    }
+
 private:
-    void determineCppC();
+    bool createTokensFromBufferInternal(const char* data, std::size_t size, const std::string& file0);
 
     /** Token list */
-    TokensFrontBack mTokensFrontBack;
+    std::shared_ptr<TokensFrontBack> mTokensFrontBack;
 
     /** filenames for the tokenized source code (source + included) */
     std::vector<std::string> mFiles;
@@ -205,11 +228,10 @@ class CPPCHECKLIB TokenList {
     std::vector<std::string> mOrigFiles;
 
     /** settings */
-    const Settings* mSettings;
+    const Settings& mSettings;
 
     /** File is known to be C/C++ code */
-    bool mIsC;
-    bool mIsCpp;
+    Standards::Language mLang{Standards::Language::None};
 };
 
 /// @}
diff --git a/lib/tokenrange.h b/lib/tokenrange.h
index dda2710e881..f4b462534f9 100644
--- a/lib/tokenrange.h
+++ b/lib/tokenrange.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/lib/utils.cpp b/lib/utils.cpp
index cf8c0d0cb67..b840fc3194b 100644
--- a/lib/utils.cpp
+++ b/lib/utils.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
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <iterator>
 #include <stack>
 #include <utility>
 
@@ -40,18 +39,25 @@ int caseInsensitiveStringCompare(const std::string &lhs, const std::string &rhs)
 
 bool isValidGlobPattern(const std::string& pattern)
 {
-    for (std::string::const_iterator i = pattern.cbegin(); i != pattern.cend(); ++i) {
-        if (*i == '*' || *i == '?') {
-            const std::string::const_iterator j = i + 1;
-            if (j != pattern.cend() && (*j == '*' || *j == '?')) {
+    int consecutiveAsterisks = 0;
+    for (auto i = pattern.cbegin(); i != pattern.cend(); ++i) {
+        if (*i == '*') {
+            ++consecutiveAsterisks;
+            if (consecutiveAsterisks > 2) {
                 return false;
             }
+        } else if (*i == '?') {
+            if (consecutiveAsterisks > 0) {
+                return false;
+            }
+        } else {
+            consecutiveAsterisks = 0;
         }
     }
     return true;
 }
 
-bool matchglob(const std::string& pattern, const std::string& name)
+bool matchglob(const std::string& pattern, const std::string& name, bool caseInsensitive)
 {
     const char* p = pattern.c_str();
     const char* n = name.c_str();
@@ -83,9 +89,7 @@ bool matchglob(const std::string& pattern, const std::string& name)
                 // Non-wildcard characters match literally
                 if (*n == *p) {
                     n++;
-                } else if (*n == '\\' && *p == '/') {
-                    n++;
-                } else if (*n == '/' && *p == '\\') {
+                } else if (caseInsensitive && tolower(*n) == tolower(*p)) {
                     n++;
                 } else {
                     matching = false;
@@ -115,12 +119,6 @@ bool matchglob(const std::string& pattern, const std::string& name)
     }
 }
 
-bool matchglobs(const std::vector<std::string> &patterns, const std::string &name) {
-    return std::any_of(begin(patterns), end(patterns), [&name](const std::string &pattern) {
-        return matchglob(pattern, name);
-    });
-}
-
 void strTolower(std::string& str)
 {
     // This wrapper exists because Sun's CC does not allow a static_cast
@@ -129,3 +127,74 @@ void strTolower(std::string& str)
         return std::tolower(c);
     });
 }
+
+std::string trim(const std::string& s, const std::string& t)
+{
+    const std::string::size_type beg = s.find_first_not_of(t);
+    if (beg == std::string::npos)
+        return "";
+    const std::string::size_type end = s.find_last_not_of(t);
+    return s.substr(beg, end - beg + 1);
+}
+
+void findAndReplace(std::string &source, const std::string &searchFor, const std::string &replaceWith)
+{
+    std::string::size_type index = 0;
+    while ((index = source.find(searchFor, index)) != std::string::npos) {
+        source.replace(index, searchFor.length(), replaceWith);
+        index += replaceWith.length();
+    }
+}
+
+std::string replaceEscapeSequences(const std::string &source) {
+    std::string result;
+    result.reserve(source.size());
+    for (std::size_t i = 0; i < source.size(); ++i) {
+        if (source[i] != '\\' || i + 1 >= source.size())
+            result += source[i];
+        else {
+            ++i;
+            if (source[i] == 'n') {
+                result += '\n';
+            } else if (source[i] == 'r') {
+                result += '\r';
+            } else if (source[i] == 't') {
+                result += '\t';
+            } else if (source[i] == 'x') {
+                std::string value = "0";
+                if (i + 1 < source.size() && std::isxdigit(source[i+1]))
+                    value += source[i++ + 1];
+                if (i + 1 < source.size() && std::isxdigit(source[i+1]))
+                    value += source[i++ + 1];
+                result += static_cast<char>(std::stoi(value, nullptr, 16));
+            } else if (source[i] == '0') {
+                std::string value = "0";
+                if (i + 1 < source.size() && source[i+1] >= '0' && source[i+1] <= '7')
+                    value += source[i++ + 1];
+                if (i + 1 < source.size() && source[i+1] >= '0' && source[i+1] <= '7')
+                    value += source[i++ + 1];
+                result += static_cast<char>(std::stoi(value, nullptr, 8));
+            } else {
+                result += source[i];
+            }
+        }
+    }
+    return result;
+}
+
+
+std::vector<std::string> splitString(const std::string& str, char sep)
+{
+    std::vector<std::string> l;
+
+    std::string::size_type pos1 = 0;
+    std::string::size_type pos2;
+    while (true) {
+        pos2 = str.find(sep, pos1);
+        l.push_back(str.substr(pos1, pos2 - pos1));
+        if (pos2 == std::string::npos)
+            break;
+        pos1 = pos2 + 1;
+    }
+    return l;
+}
diff --git a/lib/utils.h b/lib/utils.h
index e942c82f1da..c59e4d3a32c 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-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
@@ -26,14 +26,19 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <initializer_list>
 #include <limits>
 #include <stdexcept>
 #include <string>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 struct SelectMapKeys {
     template<class Pair>
+    // NOLINTNEXTLINE(readability-const-return-type) - false positive
     typename Pair::first_type operator()(const Pair& p) const {
         return p.first;
     }
@@ -46,6 +51,14 @@ struct SelectMapValues {
     }
 };
 
+struct OnExit {
+    std::function<void()> f;
+
+    ~OnExit() {
+        f();
+    }
+};
+
 template<class Range, class T>
 bool contains(const Range& r, const T& x)
 {
@@ -79,6 +92,22 @@ struct EnumClassHash {
     }
 };
 
+inline bool startsWith(const std::string& str, const char start[], std::size_t startlen)
+{
+    return str.compare(0, startlen, start) == 0;
+}
+
+template<std::size_t N>
+bool startsWith(const std::string& str, const char (&start)[N])
+{
+    return startsWith(str, start, N - 1);
+}
+
+inline bool startsWith(const std::string& str, const std::string& start)
+{
+    return startsWith(str, start.c_str(), start.length());
+}
+
 inline bool endsWith(const std::string &str, char c)
 {
     return !str.empty() && str.back() == c;
@@ -173,9 +202,7 @@ CPPCHECKLIB int caseInsensitiveStringCompare(const std::string& lhs, const std::
 
 CPPCHECKLIB bool isValidGlobPattern(const std::string& pattern);
 
-CPPCHECKLIB bool matchglob(const std::string& pattern, const std::string& name);
-
-CPPCHECKLIB bool matchglobs(const std::vector<std::string> &patterns, const std::string &name);
+CPPCHECKLIB bool matchglob(const std::string& pattern, const std::string& name, bool caseInsensitive = false);
 
 CPPCHECKLIB void strTolower(std::string& str);
 
@@ -269,4 +296,134 @@ std::size_t getArrayLength(const T (& /*unused*/)[size])
     return size;
 }
 
+/**
+ * @brief get id string. i.e. for dump files
+ * it will be a hexadecimal output.
+ */
+static inline std::string id_string_i(std::uintptr_t l)
+{
+    if (!l)
+        return "0";
+
+    static constexpr int ptr_size = sizeof(void*);
+
+    // two characters of each byte / contains terminating \0
+    static constexpr int buf_size = (ptr_size * 2) + 1;
+
+    char buf[buf_size];
+
+    // needs to be signed so we don't underflow in padding loop
+    int idx = buf_size - 1;
+    buf[idx] = '\0';
+
+    while (l != 0)
+    {
+        char c;
+        const std::uintptr_t temp = l % 16; // get the remainder
+        if (temp < 10) {
+            // 0-9
+            c = '0' + temp;
+        }
+        else {
+            // a-f
+            c = 'a' + (temp - 10);
+        }
+        buf[--idx] = c; // store in reverse order
+        l = l / 16;
+    }
+
+    return &buf[idx];
+}
+
+static inline std::string id_string(const void* p)
+{
+    return id_string_i(reinterpret_cast<std::uintptr_t>(p));
+}
+
+static inline const char* bool_to_string(bool b)
+{
+    return b ? "true" : "false";
+}
+
+/**
+ * Remove heading and trailing whitespaces from the input parameter.
+ * If string is all spaces/tabs, return empty string.
+ * @param s The string to trim.
+ * @param t The characters to trim.
+ */
+CPPCHECKLIB std::string trim(const std::string& s, const std::string& t = " \t");
+
+/**
+ * Replace all occurrences of searchFor with replaceWith in the
+ * given source.
+ * @param source The string to modify
+ * @param searchFor What should be searched for
+ * @param replaceWith What will replace the found item
+ */
+CPPCHECKLIB void findAndReplace(std::string &source, const std::string &searchFor, const std::string &replaceWith);
+
+/**
+ * Replace all escape sequences in the given string.
+ * @param source The string that contains escape sequences
+ */
+CPPCHECKLIB std::string replaceEscapeSequences(const std::string &source);
+
+namespace cppcheck
+{
+    NORETURN inline void unreachable()
+    {
+#if defined(__GNUC__)
+        __builtin_unreachable();
+#elif defined(_MSC_VER)
+        __assume(false);
+#else
+#error "no unreachable implementation"
+#endif
+    }
+}
+
+template<typename T>
+static inline T* default_if_null(T* p, T* def)
+{
+    return p ? p : def;
+}
+
+template<typename T>
+static inline T* empty_if_null(T* p)
+{
+    return default_if_null(p, "");
+}
+
+/**
+ * Split string by given sperator.
+ * @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.
+ */
+CPPCHECKLIB std::vector<std::string> splitString(const std::string& str, char sep);
+
+namespace utils {
+    template<class T>
+    constexpr typename std::add_const<T>::type & as_const(T& t) noexcept
+    {
+        // NOLINTNEXTLINE(bugprone-return-const-ref-from-parameter) - potential false positive
+        return t;
+    }
+
+    // Thread-unsafe memoization
+    template<class F, class R=decltype(std::declval<F>()())>
+    static inline std::function<R()> memoize(F f)
+    {
+        bool init = false;
+        R result{};
+        return [=]() mutable -> R {
+            if (init)
+                return result;
+            result = f();
+            init = true;
+            return result;
+        };
+    }
+}
+
 #endif
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 2c6bdac7e31..023d2ebde31 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-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
@@ -84,6 +84,7 @@
 #include "config.h"
 #include "errorlogger.h"
 #include "errortypes.h"
+#include "findtoken.h"
 #include "forwardanalyzer.h"
 #include "infer.h"
 #include "library.h"
@@ -104,16 +105,16 @@
 #include "valueptr.h"
 #include "vfvalue.h"
 
+#include "vf_analyzers.h"
+#include "vf_common.h"
+#include "vf_settokenvalue.h"
+
 #include <algorithm>
 #include <array>
 #include <cassert>
 #include <chrono>
-#include <climits>
 #include <cstdint>
-#include <cstdlib>
 #include <cstring>
-#include <ctime>
-#include <exception>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
@@ -121,64 +122,46 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
 #include <string>
-#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
-static void bailoutInternal(const std::string& type, TokenList *tokenlist, ErrorLogger *errorLogger, const Token *tok, const std::string &what, const std::string &file, int line, std::string function)
+static void bailoutInternal(const std::string& type,
+                            const TokenList& tokenlist,
+                            ErrorLogger& errorLogger,
+                            const Token* tok,
+                            const std::string& what,
+                            const std::string& file,
+                            int line,
+                            std::string function)
 {
     if (function.find("operator") != std::string::npos)
         function = "(valueFlow)";
-    std::list<ErrorMessage::FileLocation> callstack(1, ErrorMessage::FileLocation(tok, tokenlist));
-    ErrorMessage errmsg(callstack, tokenlist->getSourceFilePath(), Severity::debug,
-                        Path::stripDirectoryPart(file) + ":" + MathLib::toString(line) + ":" + function + " bailout: " + what, type, Certainty::normal);
-    errorLogger->reportErr(errmsg);
+    ErrorMessage::FileLocation loc(tok, &tokenlist);
+    const std::string location = Path::stripDirectoryPart(file) + ":" + std::to_string(line) + ":";
+    ErrorMessage errmsg({std::move(loc)},
+                        tokenlist.getSourceFilePath(),
+                        Severity::debug,
+                        (file.empty() ? "" : location) + function + " bailout: " + what,
+                        type,
+                        Certainty::normal);
+    errorLogger.reportErr(errmsg);
 }
 
-#define bailout2(type, tokenlist, errorLogger, tok, what) bailoutInternal(type, tokenlist, errorLogger, tok, what, __FILE__, __LINE__, __func__)
-
-#define bailout(tokenlist, errorLogger, tok, what) bailout2("valueFlowBailout", tokenlist, errorLogger, tok, what)
-
-#define bailoutIncompleteVar(tokenlist, errorLogger, tok, what) bailout2("valueFlowBailoutIncompleteVar", tokenlist, errorLogger, tok, what)
-
-static std::string debugString(const ValueFlow::Value& v)
-{
-    std::string kind;
-    switch (v.valueKind) {
+#define bailout2(type, tokenlist, errorLogger, tok, what)                                                              \
+    bailoutInternal((type), (tokenlist), (errorLogger), (tok), (what), __FILE__, __LINE__, __func__)
 
-    case ValueFlow::Value::ValueKind::Impossible:
-    case ValueFlow::Value::ValueKind::Known:
-        kind = "always";
-        break;
-    case ValueFlow::Value::ValueKind::Inconclusive:
-        kind = "inconclusive";
-        break;
-    case ValueFlow::Value::ValueKind::Possible:
-        kind = "possible";
-        break;
-    }
-    return kind + " " + v.toString();
-}
+#define bailout(tokenlist, errorLogger, tok, what)                                                                     \
+    bailout2("valueFlowBailout", (tokenlist), (errorLogger), (tok), (what))
 
-static void setSourceLocation(ValueFlow::Value& v,
-                              SourceLocation ctx,
-                              const Token* tok,
-                              SourceLocation local = SourceLocation::current())
-{
-    std::string file = ctx.file_name();
-    if (file.empty())
-        return;
-    std::string s = Path::stripDirectoryPart(file) + ":" + MathLib::toString(ctx.line()) + ": " + ctx.function_name() +
-                    " => " + local.function_name() + ": " + debugString(v);
-    v.debugPath.emplace_back(tok, std::move(s));
-}
+#define bailoutIncompleteVar(tokenlist, errorLogger, tok, what)                                                        \
+    bailoutInternal("valueFlowBailoutIncompleteVar", (tokenlist), (errorLogger), (tok), (what), "", 0, __func__)
 
-static void changeKnownToPossible(std::list<ValueFlow::Value> &values, int indirect=-1)
+static void changeKnownToPossible(std::list<ValueFlow::Value>& values, int indirect = -1)
 {
-    for (ValueFlow::Value& v: values) {
+    for (ValueFlow::Value& v : values) {
         if (indirect >= 0 && v.indirect != indirect)
             continue;
         v.changeKnownToPossible();
@@ -309,18 +292,18 @@ static void parseCompareEachInt(
                 value1.clear();
         }
         for (const ValueFlow::Value& v1 : value1) {
-            ValueFlow::Value true_value = v1;
-            ValueFlow::Value false_value = v1;
             if (isSaturated(v1.intvalue) || astIsFloat(tok->astOperand2(), /*unknown*/ false))
                 continue;
+            ValueFlow::Value true_value = v1;
+            ValueFlow::Value false_value = v1;
             setConditionalValues(tok, true, v1.intvalue, true_value, false_value);
             each(tok->astOperand2(), std::move(true_value), std::move(false_value));
         }
         for (const ValueFlow::Value& v2 : value2) {
-            ValueFlow::Value true_value = v2;
-            ValueFlow::Value false_value = v2;
             if (isSaturated(v2.intvalue) || astIsFloat(tok->astOperand1(), /*unknown*/ false))
                 continue;
+            ValueFlow::Value true_value = v2;
+            ValueFlow::Value false_value = v2;
             setConditionalValues(tok, false, v2.intvalue, true_value, false_value);
             each(tok->astOperand1(), std::move(true_value), std::move(false_value));
         }
@@ -332,8 +315,8 @@ static void parseCompareEachInt(
     const std::function<void(const Token* varTok, ValueFlow::Value true_value, ValueFlow::Value false_value)>& each)
 {
     parseCompareEachInt(tok, each, [](const Token* t) -> std::vector<ValueFlow::Value> {
-        if (t->hasKnownIntValue())
-            return {t->values().front()};
+        if (const ValueFlow::Value* v = t->getKnownValue(ValueFlow::Value::ValueType::INT))
+            return {*v};
         std::vector<ValueFlow::Value> result;
         std::copy_if(t->values().cbegin(), t->values().cend(), std::back_inserter(result), [&](const ValueFlow::Value& v) {
             if (v.path < 1)
@@ -376,50 +359,26 @@ const Token* ValueFlow::parseCompareInt(const Token* tok,
 const Token *ValueFlow::parseCompareInt(const Token *tok, ValueFlow::Value &true_value, ValueFlow::Value &false_value)
 {
     return parseCompareInt(tok, true_value, false_value, [](const Token* t) -> std::vector<MathLib::bigint> {
-        if (t->hasKnownIntValue())
-            return {t->values().front().intvalue};
+        if (const ValueFlow::Value* v = t->getKnownValue(Value::ValueType::INT))
+            return {v->intvalue};
         return std::vector<MathLib::bigint>{};
     });
 }
 
-static bool isEscapeScope(const Token* tok, const TokenList * tokenlist, const Settings* settings, bool unknown = false)
+static bool isEscapeScope(const Token* tok, const Settings& settings, bool unknown = false)
 {
     if (!Token::simpleMatch(tok, "{"))
         return false;
     // TODO this search for termTok in all subscopes. It should check the end of the scope.
-    const Token * termTok = Token::findmatch(tok, "return|continue|break|throw|goto", tok->link());
+    const Token* termTok = Token::findmatch(tok, "return|continue|break|throw|goto", tok->link());
     if (termTok && termTok->scope() == tok->scope())
         return true;
     std::string unknownFunction;
-    if (tokenlist && settings->library.isScopeNoReturn(tok->link(), &unknownFunction))
+    if (settings.library.isScopeNoReturn(tok->link(), &unknownFunction))
         return unknownFunction.empty() || unknown;
     return false;
 }
 
-static ValueFlow::Value castValue(ValueFlow::Value value, const ValueType::Sign sign, nonneg int bit)
-{
-    if (value.isFloatValue()) {
-        value.valueType = ValueFlow::Value::ValueType::INT;
-        if (value.floatValue >= std::numeric_limits<int>::min() && value.floatValue <= std::numeric_limits<int>::max()) {
-            value.intvalue = value.floatValue;
-        } else { // don't perform UB
-            value.intvalue = 0;
-        }
-    }
-    if (bit < MathLib::bigint_bits) {
-        const MathLib::biguint one = 1;
-        value.intvalue &= (one << bit) - 1;
-        if (sign == ValueType::Sign::SIGNED && value.intvalue & (one << (bit - 1))) {
-            value.intvalue |= ~((one << bit) - 1ULL);
-        }
-    }
-    return value;
-}
-
-static bool isNumeric(const ValueFlow::Value& value) {
-    return value.isIntValue() || value.isFloatValue();
-}
-
 void ValueFlow::combineValueProperties(const ValueFlow::Value &value1, const ValueFlow::Value &value2, ValueFlow::Value &result)
 {
     if (value1.isKnown() && value2.isKnown())
@@ -463,1058 +422,330 @@ void ValueFlow::combineValueProperties(const ValueFlow::Value &value1, const Val
         result.path = value1.path;
 }
 
-static const Token *getCastTypeStartToken(const Token *parent, const Settings* settings)
+static void valueFlowNumber(TokenList &tokenlist, const Settings& settings)
 {
-    // TODO: This might be a generic utility function?
-    if (!Token::Match(parent, "{|("))
-        return nullptr;
-    // Functional cast
-    if (parent->isBinaryOp() && Token::Match(parent->astOperand1(), "%type% (|{") &&
-        parent->astOperand1()->tokType() == Token::eType && astIsPrimitive(parent))
-        return parent->astOperand1();
-    if (parent->str() != "(")
-        return nullptr;
-    if (!parent->astOperand2() && Token::Match(parent, "( %name%|::")) {
-        const Token* ftok = parent->next();
-        if (ftok->isStandardType())
-            return ftok;
-        if (Token::simpleMatch(ftok, "::"))
-            ftok = ftok->next();
-        while (Token::Match(ftok, "%name% ::"))
-            ftok = ftok->tokAt(2);
-        if (settings->library.isNotLibraryFunction(ftok))
-            return parent->next();
-    }
-    if (parent->astOperand2() && Token::Match(parent->astOperand1(), "const_cast|dynamic_cast|reinterpret_cast|static_cast <"))
-        return parent->astOperand1()->tokAt(2);
-    return nullptr;
+    for (Token *tok = tokenlist.front(); tok;) {
+        tok = ValueFlow::valueFlowSetConstantValue(tok, 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 [,)]")) {
+                // NULL function parameters are not simplified in the
+                // normal tokenlist
+                ValueFlow::Value value(0);
+                if (!tok->isTemplateArg())
+                    value.setKnown();
+                setTokenValue(tok->next(), std::move(value), settings);
+            }
+        }
+    }
 }
 
-// does the operation cause a loss of information?
-static bool isNonInvertibleOperation(const Token* tok)
+static void valueFlowString(TokenList& tokenlist, const Settings& settings)
 {
-    return !Token::Match(tok, "+|-");
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
+        if (tok->tokType() == Token::eString) {
+            ValueFlow::Value strvalue;
+            strvalue.valueType = ValueFlow::Value::ValueType::TOK;
+            strvalue.tokvalue = tok;
+            strvalue.setKnown();
+            setTokenValue(tok, std::move(strvalue), settings);
+        }
+    }
 }
 
-static bool isComputableValue(const Token* parent, const ValueFlow::Value& value)
+static const Token* findTypeEnd(const Token* tok)
 {
-    const bool noninvertible = isNonInvertibleOperation(parent);
-    if (noninvertible && value.isImpossible())
-        return false;
-    if (!value.isIntValue() && !value.isFloatValue() && !value.isTokValue() && !value.isIteratorValue())
-        return false;
-    if (value.isIteratorValue() && !Token::Match(parent, "+|-"))
-        return false;
-    if (value.isTokValue() && (!parent->isComparisonOp() || !Token::Match(value.tokvalue, "{|%str%")))
-        return false;
-    return true;
+    while (Token::Match(tok, "%name%|::|<|(|*|&|&&") && !tok->isVariable()) {
+        if (tok->link())
+            tok = tok->link();
+        tok = tok->next();
+    }
+    return tok;
 }
 
-static Library::Container::Yield getContainerYield(Token* tok, const Settings* settings, Token** parent = nullptr)
+static std::vector<const Token*> evaluateType(const Token* start, const Token* end)
 {
-    if (Token::Match(tok, ". %name% (") && tok->astParent() == tok->tokAt(2) && tok->astOperand1() &&
-        tok->astOperand1()->valueType()) {
-        const Library::Container* c = getLibraryContainer(tok->astOperand1());
-        if (parent)
-            *parent = tok->astParent();
-        return c ? c->getYield(tok->strAt(1)) : Library::Container::Yield::NO_YIELD;
-    }
-    if (Token::Match(tok->previous(), "%name% (")) {
-        if (parent)
-            *parent = tok;
-        if (const Library::Function* f = settings->library.getFunction(tok->previous())) {
-            return f->containerYield;
+    if (!start)
+        return {};
+    if (!end)
+        return {};
+    std::vector<const Token*> result;
+    for (const Token* tok = start; tok != end; tok = tok->next()) {
+        if (!Token::Match(tok, "%name%|::|<|(|*|&|&&"))
+            return {};
+        if (Token::simpleMatch(tok, "decltype (")) {
+            if (Token::Match(tok->next(), "( %name% )")) {
+                const Token* vartok = tok->tokAt(2);
+                if (vartok->function() && !vartok->variable()) {
+                    result.push_back(vartok);
+                } else {
+                    auto t = Token::typeDecl(vartok);
+                    if (!t.first || !t.second)
+                        return {};
+                    auto inner = evaluateType(t.first, t.second);
+                    if (inner.empty())
+                        return {};
+                    result.insert(result.end(), inner.begin(), inner.end());
+                }
+            } else if (Token::Match(tok->next(), "( %name% (|{") && Token::Match(tok->linkAt(3), "}|) )")) {
+                const Token* ftok = tok->tokAt(3);
+                auto t = Token::typeDecl(ftok);
+                if (!t.first || !t.second)
+                    return {};
+                auto inner = evaluateType(t.first, t.second);
+                if (inner.empty())
+                    return {};
+                result.insert(result.end(), inner.begin(), inner.end());
+            } else {
+                // We cant evaluate the decltype so bail
+                return {};
+            }
+            tok = tok->linkAt(1);
+
+        } else {
+            if (tok->link()) {
+                auto inner = evaluateType(tok->next(), tok->link());
+                if (inner.empty())
+                    return {};
+                result.push_back(tok);
+                result.insert(result.end(), inner.begin(), inner.end());
+                tok = tok->link();
+            }
+            result.push_back(tok);
         }
     }
-    return Library::Container::Yield::NO_YIELD;
+    return result;
 }
 
-/** Set token value for cast */
-static void setTokenValueCast(Token *parent, const ValueType &valueType, const ValueFlow::Value &value, const Settings *settings);
-
-static bool isCompatibleValueTypes(ValueFlow::Value::ValueType x, ValueFlow::Value::ValueType y)
+static bool hasUnknownType(const std::vector<const Token*>& toks)
 {
-    static const std::unordered_map<ValueFlow::Value::ValueType,
-                                    std::unordered_set<ValueFlow::Value::ValueType, EnumClassHash>,
-                                    EnumClassHash>
-    compatibleTypes = {
-        {ValueFlow::Value::ValueType::INT,
-         {ValueFlow::Value::ValueType::FLOAT,
-          ValueFlow::Value::ValueType::SYMBOLIC,
-          ValueFlow::Value::ValueType::TOK}},
-        {ValueFlow::Value::ValueType::FLOAT, {ValueFlow::Value::ValueType::INT}},
-        {ValueFlow::Value::ValueType::TOK, {ValueFlow::Value::ValueType::INT}},
-        {ValueFlow::Value::ValueType::ITERATOR_START, {ValueFlow::Value::ValueType::INT}},
-        {ValueFlow::Value::ValueType::ITERATOR_END, {ValueFlow::Value::ValueType::INT}},
-    };
-    if (x == y)
+    if (toks.empty())
         return true;
-    auto it = compatibleTypes.find(x);
-    if (it == compatibleTypes.end())
-        return false;
-    return it->second.count(y) > 0;
+    return std::any_of(toks.begin(), toks.end(), [&](const Token* tok) {
+        if (!tok)
+            return true;
+        if (Token::Match(tok, "const|volatile|&|*|&&|%type%|::"))
+            return false;
+        if (Token::Match(tok, "%name% :: %name%"))
+            return false;
+        if (tok->type())
+            return false;
+        return true;
+    });
 }
 
-static bool isCompatibleValues(const ValueFlow::Value& value1, const ValueFlow::Value& value2)
+static void stripCV(std::vector<const Token*>& toks)
 {
-    if (value1.isSymbolicValue() && value2.isSymbolicValue() && value1.tokvalue->exprId() != value2.tokvalue->exprId())
-        return false;
-    if (!isCompatibleValueTypes(value1.valueType, value2.valueType))
-        return false;
-    if (value1.isKnown() || value2.isKnown())
-        return true;
-    if (value1.isImpossible() || value2.isImpossible())
-        return false;
-    if (value1.varId == 0 || value2.varId == 0)
-        return true;
-    if (value1.varId == value2.varId && value1.varvalue == value2.varvalue && value1.isIntValue() && value2.isIntValue())
-        return true;
-    return false;
+    auto it =
+        std::find_if(toks.begin(), toks.end(), [&](const Token* tok) {
+        return !Token::Match(tok, "const|volatile");
+    });
+    if (it == toks.begin())
+        return;
+    toks.erase(toks.begin(), it);
 }
 
-static ValueFlow::Value truncateImplicitConversion(Token* parent, const ValueFlow::Value& value, const Settings* settings)
+static std::vector<std::vector<const Token*>> evaluateTemplateArgs(const Token* tok)
 {
-    if (!value.isIntValue() && !value.isFloatValue())
-        return value;
-    if (!parent)
-        return value;
-    if (!parent->isBinaryOp())
-        return value;
-    if (!parent->isConstOp())
-        return value;
-    if (!astIsIntegral(parent->astOperand1(), false))
-        return value;
-    if (!astIsIntegral(parent->astOperand2(), false))
-        return value;
-    const ValueType* vt1 = parent->astOperand1()->valueType();
-    const ValueType* vt2 = parent->astOperand2()->valueType();
-    // If the sign is the same there is no truncation
-    if (vt1->sign == vt2->sign)
-        return value;
-    const size_t n1 = ValueFlow::getSizeOf(*vt1, settings);
-    const size_t n2 = ValueFlow::getSizeOf(*vt2, settings);
-    ValueType::Sign sign = ValueType::Sign::UNSIGNED;
-    if (n1 < n2)
-        sign = vt2->sign;
-    else if (n1 > n2)
-        sign = vt1->sign;
-    ValueFlow::Value v = castValue(value, sign, std::max(n1, n2) * 8);
-    v.wideintvalue = value.intvalue;
-    return v;
+    std::vector<std::vector<const Token*>> result;
+    while (tok) {
+        const Token* next = tok->nextTemplateArgument();
+        const Token* end = next ? next->previous() : findTypeEnd(tok);
+        result.push_back(evaluateType(tok, end));
+        tok = next;
+    }
+    return result;
 }
 
-/** set ValueFlow value and perform calculations if possible */
-static void setTokenValue(Token* tok,
-                          ValueFlow::Value value,
-                          const Settings* settings,
-                          bool isInitList = false,
-                          SourceLocation loc = SourceLocation::current())
+static void valueFlowTypeTraits(TokenList& tokenlist, const Settings& settings)
 {
-    // Skip setting values that are too big since its ambiguous
-    if (!value.isImpossible() && value.isIntValue() && value.intvalue < 0 && astIsUnsigned(tok) &&
-        ValueFlow::getSizeOf(*tok->valueType(), settings) >= sizeof(MathLib::bigint))
-        return;
-
-    if (!value.isImpossible() && value.isIntValue())
-        value = truncateImplicitConversion(tok->astParent(), value, settings);
-
-    if (settings->debugnormal)
-        setSourceLocation(value, loc, tok);
-
-    if (!tok->addValue(value))
-        return;
-
-    if (value.path < 0)
-        return;
-
-    Token *parent = tok->astParent();
-    if (!parent)
-        return;
-
-    if (!isInitList && Token::simpleMatch(parent, ",") && astIsRHS(tok)) {
-        const Token* callParent = findParent(parent, [](const Token* p) {
-            return !Token::simpleMatch(p, ",");
-        });
-        // Ensure that the comma isn't a function call
-        if (!callParent || (!Token::Match(callParent->previous(), "%name%|> (") && !Token::simpleMatch(callParent, "{") &&
-                            (!Token::Match(callParent, "( %name%") || settings->library.isNotLibraryFunction(callParent->next())))) {
-            setTokenValue(parent, std::move(value), settings);
-            return;
-        }
-    }
+    std::unordered_map<std::string, std::function<ValueFlow::Value(std::vector<std::vector<const Token*>> args)>> eval;
+    eval["is_void"] = [&](std::vector<std::vector<const Token*>> args) {
+        if (args.size() != 1)
+            return ValueFlow::Value::unknown();
+        stripCV(args[0]);
+        if (args[0].size() == 1 && args[0][0]->str() == "void")
+            return ValueFlow::Value(1);
+        if (!hasUnknownType(args[0]))
+            return ValueFlow::Value(0);
+        return ValueFlow::Value::unknown();
+    };
+    eval["is_lvalue_reference"] = [&](const std::vector<std::vector<const Token*>>& args) {
+        if (args.size() != 1)
+            return ValueFlow::Value::unknown();
+        if (args[0].back()->str() == "&")
+            return ValueFlow::Value(1);
+        if (!hasUnknownType(args[0]))
+            return ValueFlow::Value(0);
+        return ValueFlow::Value::unknown();
+    };
+    eval["is_rvalue_reference"] = [&](const std::vector<std::vector<const Token*>>& args) {
+        if (args.size() != 1)
+            return ValueFlow::Value::unknown();
+        if (args[0].back()->str() == "&&")
+            return ValueFlow::Value(1);
+        if (!hasUnknownType(args[0]))
+            return ValueFlow::Value(0);
+        return ValueFlow::Value::unknown();
+    };
+    eval["is_reference"] = [&](const std::vector<std::vector<const Token*>>& args) {
+        if (args.size() != 1)
+            return ValueFlow::Value::unknown();
+        ValueFlow::Value isRValue = eval["is_rvalue_reference"](args);
+        if (isRValue.isUninitValue() || isRValue.intvalue == 1)
+            return isRValue;
+        return eval["is_lvalue_reference"](args);
+    };
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
 
-    if (Token::simpleMatch(parent, "=") && astIsRHS(tok) && !value.isLifetimeValue()) {
-        setTokenValue(parent, std::move(value), settings);
-        return;
+        if (!Token::Match(tok, "std :: %name% <"))
+            continue;
+        Token* templateTok = tok->tokAt(3);
+        Token* updateTok = nullptr;
+        std::string traitName = tok->strAt(2);
+        if (endsWith(traitName, "_v")) {
+            traitName.pop_back();
+            traitName.pop_back();
+            updateTok = tok->next();
+        } else if (Token::simpleMatch(templateTok->link(), "> { }") ||
+                   Token::simpleMatch(templateTok->link(), "> :: value")) {
+            updateTok = templateTok->link()->next();
+        }
+        if (!updateTok)
+            continue;
+        if (updateTok->hasKnownIntValue())
+            continue;
+        if (eval.count(traitName) == 0)
+            continue;
+        auto args = evaluateTemplateArgs(templateTok->next());
+        if (std::any_of(args.begin(), args.end(), [](const std::vector<const Token*>& arg) {
+            return arg.empty();
+        }))
+            continue;
+        ValueFlow::Value value = eval[traitName](std::move(args));
+        if (value.isUninitValue())
+            continue;
+        value.setKnown();
+        ValueFlow::setTokenValue(updateTok, std::move(value), settings);
     }
+}
 
-    if (value.isContainerSizeValue() && astIsContainer(tok)) {
-        // .empty, .size, +"abc", +'a'
-        if (Token::Match(parent, "+|==|!=") && parent->astOperand1() && parent->astOperand2()) {
-            for (const ValueFlow::Value &value1 : parent->astOperand1()->values()) {
-                if (value1.isImpossible())
-                    continue;
-                for (const ValueFlow::Value &value2 : parent->astOperand2()->values()) {
-                    if (value2.isImpossible())
-                        continue;
-                    if (value1.path != value2.path)
-                        continue;
-                    ValueFlow::Value result;
-                    if (Token::Match(parent, "%comp%"))
-                        result.valueType = ValueFlow::Value::ValueType::INT;
-                    else
-                        result.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
-
-                    if (value1.isContainerSizeValue() && value2.isContainerSizeValue())
-                        result.intvalue = calculate(parent->str(), value1.intvalue, value2.intvalue);
-                    else if (value1.isContainerSizeValue() && value2.isTokValue() && value2.tokvalue->tokType() == Token::eString)
-                        result.intvalue = calculate(parent->str(), value1.intvalue, MathLib::bigint(Token::getStrLength(value2.tokvalue)));
-                    else if (value2.isContainerSizeValue() && value1.isTokValue() && value1.tokvalue->tokType() == Token::eString)
-                        result.intvalue = calculate(parent->str(), MathLib::bigint(Token::getStrLength(value1.tokvalue)), value2.intvalue);
-                    else
-                        continue;
-
-                    combineValueProperties(value1, value2, result);
+static void valueFlowArray(TokenList& tokenlist, const Settings& settings)
+{
+    std::map<nonneg int, const Token*> constantArrays;
 
-                    if (Token::simpleMatch(parent, "==") && result.intvalue)
-                        continue;
-                    if (Token::simpleMatch(parent, "!=") && !result.intvalue)
-                        continue;
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
+        if (tok->varId() > 0) {
+            // array
+            const auto it = utils::as_const(constantArrays).find(tok->varId());
+            if (it != constantArrays.end()) {
+                ValueFlow::Value value;
+                value.valueType = ValueFlow::Value::ValueType::TOK;
+                value.tokvalue = it->second;
+                value.setKnown();
+                setTokenValue(tok, std::move(value), settings);
+            }
 
-                    setTokenValue(parent, std::move(result), settings);
-                }
+            // const array decl
+            else if (tok->variable() && tok->variable()->isArray() && tok->variable()->isConst() &&
+                     tok->variable()->nameToken() == tok && Token::Match(tok, "%var% [ %num%| ] = {")) {
+                Token* rhstok = tok->linkAt(1)->tokAt(2);
+                constantArrays[tok->varId()] = rhstok;
+                tok = rhstok->link();
             }
-        }
-        Token* next = nullptr;
-        const Library::Container::Yield yields = getContainerYield(parent, settings, &next);
-        if (yields == Library::Container::Yield::SIZE) {
-            ValueFlow::Value v(value);
-            v.valueType = ValueFlow::Value::ValueType::INT;
-            setTokenValue(next, std::move(v), settings);
-        } else if (yields == Library::Container::Yield::EMPTY) {
-            ValueFlow::Value v(value);
-            v.valueType = ValueFlow::Value::ValueType::INT;
-            v.bound = ValueFlow::Value::Bound::Point;
-            if (value.isImpossible()) {
-                if (value.intvalue == 0)
-                    v.setKnown();
-                else
-                    v.setPossible();
-            } else {
-                v.intvalue = !v.intvalue;
+
+            // pointer = array
+            else if (tok->variable() && tok->variable()->isArray() && Token::simpleMatch(tok->astParent(), "=") &&
+                     astIsRHS(tok) && tok->astParent()->astOperand1() && tok->astParent()->astOperand1()->variable() &&
+                     tok->astParent()->astOperand1()->variable()->isPointer()) {
+                ValueFlow::Value value;
+                value.valueType = ValueFlow::Value::ValueType::TOK;
+                value.tokvalue = tok;
+                value.setKnown();
+                setTokenValue(tok, std::move(value), settings);
             }
-            setTokenValue(next, std::move(v), settings);
+            continue;
         }
-        return;
-    }
 
-    if (value.isLifetimeValue()) {
-        if (!ValueFlow::isLifetimeBorrowed(parent, settings))
-            return;
-        if (value.lifetimeKind == ValueFlow::Value::LifetimeKind::Iterator && astIsIterator(parent)) {
-            setTokenValue(parent,std::move(value),settings);
-        } else if (astIsPointer(tok) && astIsPointer(parent) && !parent->isUnaryOp("*") &&
-                   (parent->isArithmeticalOp() || parent->isCast())) {
-            setTokenValue(parent,std::move(value),settings);
+        if (Token::Match(tok, "const %type% %var% [ %num%| ] = {")) {
+            Token* vartok = tok->tokAt(2);
+            Token* rhstok = vartok->linkAt(1)->tokAt(2);
+            constantArrays[vartok->varId()] = rhstok;
+            tok = rhstok->link();
+            continue;
         }
-        return;
-    }
 
-    if (value.isUninitValue()) {
-        if (Token::Match(tok, ". %var%"))
-            setTokenValue(tok->next(), value, settings);
-        if (parent->isCast()) {
-            setTokenValue(parent, std::move(value), settings);
-            return;
-        }
-        ValueFlow::Value pvalue = value;
-        if (!value.subexpressions.empty() && Token::Match(parent, ". %var%")) {
-            if (contains(value.subexpressions, parent->next()->str()))
-                pvalue.subexpressions.clear();
-            else
-                return;
-        }
-        if (parent->isUnaryOp("&")) {
-            pvalue.indirect++;
-            setTokenValue(parent, std::move(pvalue), 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);
-        } 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 (Token::Match(tok, "const char %var% [ %num%| ] = %str% ;")) {
+            Token* vartok = tok->tokAt(2);
+            Token* strtok = vartok->linkAt(1)->tokAt(2);
+            constantArrays[vartok->varId()] = strtok;
+            tok = strtok->next();
+            continue;
         }
-        return;
-    }
-
-    // cast..
-    if (const Token *castType = getCastTypeStartToken(parent, settings)) {
-        if (contains({ValueFlow::Value::ValueType::INT, ValueFlow::Value::ValueType::SYMBOLIC}, value.valueType) &&
-            Token::simpleMatch(parent->astOperand1(), "dynamic_cast"))
-            return;
-        const ValueType &valueType = ValueType::parseDecl(castType, *settings, true); // TODO: set isCpp
-        if (value.isImpossible() && value.isIntValue() && value.intvalue < 0 && astIsUnsigned(tok) &&
-            valueType.sign == ValueType::SIGNED && tok->valueType() &&
-            ValueFlow::getSizeOf(*tok->valueType(), settings) >= ValueFlow::getSizeOf(valueType, settings))
-            return;
-        setTokenValueCast(parent, valueType, value, settings);
-    }
-
-    else if (parent->str() == ":") {
-        setTokenValue(parent,value,settings);
     }
+}
 
-    else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2() && parent->astOperand1()) {
-        // is condition always true/false?
-        if (parent->astOperand1()->hasKnownValue()) {
-            const ValueFlow::Value &condvalue = parent->astOperand1()->values().front();
-            const bool cond(condvalue.isTokValue() || (condvalue.isIntValue() && condvalue.intvalue != 0));
-            if (cond && !tok->astOperand1()) { // true condition, no second operator
-                setTokenValue(parent, condvalue, settings);
-            } else {
-                const Token *op = cond ? tok->astOperand1() : tok->astOperand2();
-                if (!op) // #7769 segmentation fault at setTokenValue()
-                    return;
-                const std::list<ValueFlow::Value> &values = op->values();
-                if (std::find(values.cbegin(), values.cend(), value) != values.cend())
-                    setTokenValue(parent, value, settings);
-            }
-        } 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(),
-                          [&](const Token *t) {
-                if (t->varId()) {
-                    if (varId > 0 || value.varId != 0)
-                        ret = true;
-                    varId = t->varId();
-                } else if (t->str() == "(" && Token::Match(t->previous(), "%name%"))
-                    ret = true; // function call
-                return ret ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
-            });
-            if (ret)
-                return;
+static bool isNonZero(const Token* tok)
+{
+    return tok && (!tok->hasKnownIntValue() || tok->getKnownIntValue() != 0);
+}
 
-            ValueFlow::Value v(value);
-            v.conditional = true;
-            v.changeKnownToPossible();
+static const Token* getOtherOperand(const Token* tok)
+{
+    if (!tok)
+        return nullptr;
+    if (!tok->astParent())
+        return nullptr;
+    if (tok->astParent()->astOperand1() != tok)
+        return tok->astParent()->astOperand1();
+    if (tok->astParent()->astOperand2() != tok)
+        return tok->astParent()->astOperand2();
+    return nullptr;
+}
 
-            setTokenValue(parent, v, settings);
+static void valueFlowArrayBool(TokenList& tokenlist, const Settings& settings)
+{
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
+        if (tok->hasKnownIntValue())
+            continue;
+        const Variable* var = nullptr;
+        bool known = false;
+        const auto val =
+            std::find_if(tok->values().cbegin(), tok->values().cend(), std::mem_fn(&ValueFlow::Value::isTokValue));
+        if (val == tok->values().end()) {
+            var = tok->variable();
+            known = true;
+        } else {
+            var = val->tokvalue->variable();
+            known = val->isKnown();
+        }
+        if (!var)
+            continue;
+        if (!var->isArray() || var->isArgument() || var->isStlType())
+            continue;
+        if (isNonZero(getOtherOperand(tok)) && Token::Match(tok->astParent(), "%comp%"))
+            continue;
+        // TODO: Check for function argument
+        if ((astIsBool(tok->astParent()) && !Token::Match(tok->astParent(), "(|%name%")) ||
+            (tok->astParent() && Token::Match(tok->astParent()->previous(), "if|while|for ("))) {
+            ValueFlow::Value value{1};
+            if (known)
+                value.setKnown();
+            setTokenValue(tok, std::move(value), settings);
         }
     }
+}
 
-    else if (parent->str() == "?" && value.isIntValue() && tok == parent->astOperand1() && value.isKnown() &&
-             parent->astOperand2() && parent->astOperand2()->astOperand1() && parent->astOperand2()->astOperand2()) {
-        const std::list<ValueFlow::Value> &values = (value.intvalue == 0
-                ? parent->astOperand2()->astOperand2()->values()
-                : parent->astOperand2()->astOperand1()->values());
-
-        for (const ValueFlow::Value &v : values)
-            setTokenValue(parent, v, settings);
-    }
-
-    // Calculations..
-    else if ((parent->isArithmeticalOp() || parent->isComparisonOp() || (parent->tokType() == Token::eBitOp) || (parent->tokType() == Token::eLogicalOp)) &&
-             parent->astOperand1() &&
-             parent->astOperand2()) {
-
-        const bool noninvertible = isNonInvertibleOperation(parent);
-
-        // Skip operators with impossible values that are not invertible
-        if (noninvertible && value.isImpossible())
-            return;
-
-        // known result when a operand is 0.
-        if (Token::Match(parent, "[&*]") && astIsIntegral(parent, true) && value.isKnown() && value.isIntValue() &&
-            value.intvalue == 0) {
-            setTokenValue(parent, std::move(value), settings);
-            return;
-        }
-
-        // known result when a operand is true.
-        if (Token::simpleMatch(parent, "&&") && value.isKnown() && value.isIntValue() && value.intvalue==0) {
-            setTokenValue(parent, std::move(value), settings);
-            return;
-        }
-
-        // known result when a operand is false.
-        if (Token::simpleMatch(parent, "||") && value.isKnown() && value.isIntValue() && value.intvalue!=0) {
-            setTokenValue(parent, std::move(value), settings);
-            return;
-        }
-
-        for (const ValueFlow::Value &value1 : parent->astOperand1()->values()) {
-            if (!isComputableValue(parent, value1))
-                continue;
-            for (const ValueFlow::Value &value2 : parent->astOperand2()->values()) {
-                if (value1.path != value2.path)
-                    continue;
-                if (!isComputableValue(parent, value2))
-                    continue;
-                if (value1.isIteratorValue() && value2.isIteratorValue())
-                    continue;
-                if (!isCompatibleValues(value1, value2))
-                    continue;
-                ValueFlow::Value result(0);
-                combineValueProperties(value1, value2, result);
-                if (astIsFloat(parent, false)) {
-                    if (!result.isIntValue() && !result.isFloatValue())
-                        continue;
-                    result.valueType = ValueFlow::Value::ValueType::FLOAT;
-                }
-                const double floatValue1 = value1.isFloatValue() ? value1.floatValue : value1.intvalue;
-                const double floatValue2 = value2.isFloatValue() ? value2.floatValue : value2.intvalue;
-                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() == "==")
-                            result.intvalue = 0;
-                        else if (parent->str() == "!=")
-                            result.intvalue = 1;
-                    } else if (value1.isIntValue() && value2.isIntValue()) {
-                        bool error = false;
-                        result.intvalue = calculate(parent->str(), intValue1(), intValue2(), &error);
-                        if (error)
-                            continue;
-                    } else if (value1.isTokValue() && value2.isTokValue() &&
-                               (astIsContainer(parent->astOperand1()) || astIsContainer(parent->astOperand2()))) {
-                        const Token* tok1 = value1.tokvalue;
-                        const Token* tok2 = value2.tokvalue;
-                        bool equal = false;
-                        if (Token::Match(tok1, "%str%") && Token::Match(tok2, "%str%")) {
-                            equal = tok1->str() == tok2->str();
-                        } else if (Token::simpleMatch(tok1, "{") && Token::simpleMatch(tok2, "{")) {
-                            std::vector<const Token*> args1 = getArguments(tok1);
-                            std::vector<const Token*> args2 = getArguments(tok2);
-                            if (args1.size() == args2.size()) {
-                                if (!std::all_of(args1.begin(), args1.end(), std::mem_fn(&Token::hasKnownIntValue)))
-                                    continue;
-                                if (!std::all_of(args2.begin(), args2.end(), std::mem_fn(&Token::hasKnownIntValue)))
-                                    continue;
-                                equal = std::equal(args1.begin(),
-                                                   args1.end(),
-                                                   args2.begin(),
-                                                   [&](const Token* atok, const Token* btok) {
-                                    return atok->values().front().intvalue ==
-                                    btok->values().front().intvalue;
-                                });
-                            } else {
-                                equal = false;
-                            }
-                        } else {
-                            continue;
-                        }
-                        result.intvalue = parent->str() == "==" ? equal : !equal;
-                    } else {
-                        continue;
-                    }
-                    setTokenValue(parent, result, settings);
-                } else if (Token::Match(parent, "%op%")) {
-                    if (Token::Match(parent, "%comp%")) {
-                        if (!result.isFloatValue() && !value1.isIntValue() && !value2.isIntValue())
-                            continue;
-                    } else {
-                        if (value1.isTokValue() || value2.isTokValue())
-                            break;
-                    }
-                    bool error = false;
-                    if (result.isFloatValue()) {
-                        result.floatValue = calculate(parent->str(), floatValue1, floatValue2, &error);
-                    } else {
-                        result.intvalue = calculate(parent->str(), intValue1(), intValue2(), &error);
-                    }
-                    if (error)
-                        continue;
-                    // If the bound comes from the second value then invert the bound when subtracting
-                    if (Token::simpleMatch(parent, "-") && value2.bound == result.bound &&
-                        value2.bound != ValueFlow::Value::Bound::Point)
-                        result.invertBound();
-                    setTokenValue(parent, result, settings, isInitList);
-                }
-            }
-        }
-    }
-
-    // !
-    else if (parent->str() == "!") {
-        for (const ValueFlow::Value &val : tok->values()) {
-            if (!val.isIntValue())
-                continue;
-            if (val.isImpossible() && val.intvalue != 0)
-                continue;
-            ValueFlow::Value v(val);
-            if (val.isImpossible())
-                v.setKnown();
-            else
-                v.intvalue = !v.intvalue;
-            setTokenValue(parent, std::move(v), settings);
-        }
-    }
-
-    // ~
-    else if (parent->str() == "~") {
-        for (const ValueFlow::Value &val : tok->values()) {
-            if (!val.isIntValue())
-                continue;
-            ValueFlow::Value v(val);
-            v.intvalue = ~v.intvalue;
-            int bits = 0;
-            if (tok->valueType() &&
-                tok->valueType()->sign == ValueType::Sign::UNSIGNED &&
-                tok->valueType()->pointer == 0) {
-                if (tok->valueType()->type == ValueType::Type::INT)
-                    bits = settings->platform.int_bit;
-                else if (tok->valueType()->type == ValueType::Type::LONG)
-                    bits = settings->platform.long_bit;
-            }
-            if (bits > 0 && bits < MathLib::bigint_bits)
-                v.intvalue &= (((MathLib::biguint)1)<<bits) - 1;
-            setTokenValue(parent, std::move(v), settings);
-        }
-    }
-
-    // unary minus
-    else if (parent->isUnaryOp("-")) {
-        for (const ValueFlow::Value &val : tok->values()) {
-            if (!val.isIntValue() && !val.isFloatValue())
-                continue;
-            ValueFlow::Value v(val);
-            if (v.isIntValue()) {
-                if (v.intvalue == LLONG_MIN)
-                    // Value can't be inverted
-                    continue;
-                v.intvalue = -v.intvalue;
-            } else
-                v.floatValue = -v.floatValue;
-            v.invertBound();
-            setTokenValue(parent, std::move(v), settings);
-        }
-    }
-
-    // increment
-    else if (parent->str() == "++") {
-        for (const ValueFlow::Value &val : tok->values()) {
-            if (!val.isIntValue() && !val.isFloatValue() && !val.isSymbolicValue())
-                continue;
-            ValueFlow::Value v(val);
-            if (parent == tok->previous()) {
-                if (v.isIntValue() || v.isSymbolicValue())
-                    v.intvalue = v.intvalue + 1;
-                else
-                    v.floatValue = v.floatValue + 1.0;
-            }
-            setTokenValue(parent, std::move(v), settings);
-        }
-    }
-
-    // decrement
-    else if (parent->str() == "--") {
-        for (const ValueFlow::Value &val : tok->values()) {
-            if (!val.isIntValue() && !val.isFloatValue() && !val.isSymbolicValue())
-                continue;
-            ValueFlow::Value v(val);
-            if (parent == tok->previous()) {
-                if (v.isIntValue() || v.isSymbolicValue())
-                    v.intvalue = v.intvalue - 1;
-                else
-                    v.floatValue = v.floatValue - 1.0;
-            }
-            setTokenValue(parent, std::move(v), settings);
-        }
-    }
-
-    else if (Token::Match(parent, ":: %name%") && parent->astOperand2() == tok) {
-        setTokenValue(parent, value, settings);
-    }
-    // Calling std::size or std::empty on an array
-    else if (value.isTokValue() && Token::simpleMatch(value.tokvalue, "{") && tok->variable() &&
-             tok->variable()->isArray() && Token::Match(parent->previous(), "%name% (") && astIsRHS(tok)) {
-        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) {
-                ValueFlow::Value v(value);
-                v.valueType = ValueFlow::Value::ValueType::INT;
-                v.intvalue = args.size();
-                setTokenValue(parent, std::move(v), settings);
-            } else if (f->containerYield == Library::Container::Yield::EMPTY) {
-                ValueFlow::Value v(value);
-                v.intvalue = args.empty();
-                v.valueType = ValueFlow::Value::ValueType::INT;
-                setTokenValue(parent, std::move(v), settings);
-            }
-        }
-    }
-}
-
-static void setTokenValueCast(Token *parent, const ValueType &valueType, const ValueFlow::Value &value, const Settings *settings)
-{
-    if (valueType.pointer || value.isImpossible())
-        setTokenValue(parent,value,settings);
-    else if (valueType.type == ValueType::Type::CHAR)
-        setTokenValue(parent, castValue(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);
-    else if (valueType.type == ValueType::Type::INT)
-        setTokenValue(parent, castValue(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);
-    else if (valueType.type == ValueType::Type::LONGLONG)
-        setTokenValue(parent, castValue(value, valueType.sign, settings->platform.long_long_bit), settings);
-    else if (valueType.isFloat() && isNumeric(value)) {
-        ValueFlow::Value floatValue = value;
-        floatValue.valueType = ValueFlow::Value::ValueType::FLOAT;
-        if (value.isIntValue())
-            floatValue.floatValue = value.intvalue;
-        setTokenValue(parent, std::move(floatValue), 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);
-        }
-    }
-}
-
-static nonneg int getSizeOfType(const Token *typeTok, const Settings *settings)
-{
-    const ValueType &valueType = ValueType::parseDecl(typeTok, *settings, true); // TODO: set isCpp
-    if (valueType.pointer > 0)
-        return settings->platform.sizeof_pointer;
-    if (valueType.type == ValueType::Type::BOOL || valueType.type == ValueType::Type::CHAR)
-        return 1;
-    if (valueType.type == ValueType::Type::SHORT)
-        return settings->platform.sizeof_short;
-    if (valueType.type == ValueType::Type::INT)
-        return settings->platform.sizeof_int;
-    if (valueType.type == ValueType::Type::LONG)
-        return settings->platform.sizeof_long;
-    if (valueType.type == ValueType::Type::LONGLONG)
-        return settings->platform.sizeof_long_long;
-    if (valueType.type == ValueType::Type::WCHAR_T)
-        return settings->platform.sizeof_wchar_t;
-
-    return 0;
-}
-
-size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings *settings)
-{
-    if (vt.pointer)
-        return settings->platform.sizeof_pointer;
-    if (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;
-
-    return 0;
-}
-
-
-static bool getMinMaxValues(const ValueType* vt, const cppcheck::Platform& platform, MathLib::bigint& minValue, MathLib::bigint& maxValue);
-
-// Handle various constants..
-static Token * valueFlowSetConstantValue(Token *tok, const Settings *settings, bool cpp, bool isInitList = false)
-{
-    if ((tok->isNumber() && MathLib::isInt(tok->str())) || (tok->tokType() == Token::eChar)) {
-        try {
-            MathLib::bigint signedValue = MathLib::toLongNumber(tok->str());
-            const ValueType* vt = tok->valueType();
-            if (vt && vt->sign == ValueType::UNSIGNED && signedValue < 0 && ValueFlow::getSizeOf(*vt, settings) < sizeof(MathLib::bigint)) {
-                MathLib::bigint minValue{}, maxValue{};
-                if (getMinMaxValues(tok->valueType(), settings->platform, minValue, maxValue))
-                    signedValue += maxValue + 1;
-            }
-            ValueFlow::Value value(signedValue);
-            if (!tok->isTemplateArg())
-                value.setKnown();
-            setTokenValue(tok, std::move(value), settings, isInitList);
-        } catch (const std::exception & /*e*/) {
-            // Bad character literal
-        }
-    } else if (tok->isNumber() && MathLib::isFloat(tok->str())) {
-        ValueFlow::Value value;
-        value.valueType = ValueFlow::Value::ValueType::FLOAT;
-        value.floatValue = MathLib::toDoubleNumber(tok->str());
-        if (!tok->isTemplateArg())
-            value.setKnown();
-        setTokenValue(tok, std::move(value), settings, isInitList);
-    } else if (tok->enumerator() && tok->enumerator()->value_known) {
-        ValueFlow::Value value(tok->enumerator()->value);
-        if (!tok->isTemplateArg())
-            value.setKnown();
-        setTokenValue(tok, std::move(value), settings, isInitList);
-    } else if (tok->str() == "NULL" || (cpp && tok->str() == "nullptr")) {
-        ValueFlow::Value value(0);
-        if (!tok->isTemplateArg())
-            value.setKnown();
-        setTokenValue(tok, std::move(value), settings, isInitList);
-    } 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 = ValueFlow::getSizeOf(*tok->next()->astOperand2()->valueType(), settings);
-            if (sz) {
-                ValueFlow::Value value(sz);
-                value.setKnown();
-                setTokenValue(tok->next(), std::move(value), settings);
-                return tok->linkAt(1);
-            }
-        }
-
-        const Token *tok2 = tok->tokAt(2);
-        // skip over tokens to find variable or type
-        while (tok2 && !tok2->isStandardType() && Token::Match(tok2, "%name% ::|.|[")) {
-            if (tok2->next()->str() == "[")
-                tok2 = tok2->linkAt(1)->next();
-            else
-                tok2 = tok2->tokAt(2);
-        }
-        if (Token::simpleMatch(tok, "sizeof ( *")) {
-            const ValueType *vt = tok->tokAt(2)->valueType();
-            const size_t sz = vt ? ValueFlow::getSizeOf(*vt, settings) : 0;
-            if (sz > 0) {
-                ValueFlow::Value value(sz);
-                if (!tok2->isTemplateArg() && settings->platform.type != cppcheck::Platform::Type::Unspecified)
-                    value.setKnown();
-                setTokenValue(tok->next(), std::move(value), settings);
-            }
-        } else if (tok2->enumerator() && tok2->enumerator()->scope) {
-            long long size = settings->platform.sizeof_int;
-            const Token * type = tok2->enumerator()->scope->enumType;
-            if (type) {
-                size = getSizeOfType(type, settings);
-                if (size == 0)
-                    tok->linkAt(1);
-            }
-            ValueFlow::Value value(size);
-            if (!tok2->isTemplateArg() && settings->platform.type != cppcheck::Platform::Type::Unspecified)
-                value.setKnown();
-            setTokenValue(tok, value, settings);
-            setTokenValue(tok->next(), std::move(value), settings);
-        } else if (tok2->type() && tok2->type()->isEnumType()) {
-            long long size = settings->platform.sizeof_int;
-            if (tok2->type()->classScope) {
-                const Token * type = tok2->type()->classScope->enumType;
-                if (type) {
-                    size = getSizeOfType(type, settings);
-                }
-            }
-            ValueFlow::Value value(size);
-            if (!tok2->isTemplateArg() && settings->platform.type != cppcheck::Platform::Type::Unspecified)
-                value.setKnown();
-            setTokenValue(tok, value, settings);
-            setTokenValue(tok->next(), std::move(value), settings);
-        } else if (Token::Match(tok, "sizeof ( %var% ) /") && tok->next()->astParent() == tok->tokAt(4) &&
-                   tok->tokAt(4)->astOperand2() && Token::simpleMatch(tok->tokAt(4)->astOperand2()->previous(), "sizeof (")) {
-            // Get number of elements in array
-            const Token *sz1 = tok->tokAt(2);
-            const Token *sz2 = tok->tokAt(4)->astOperand2(); // left parenthesis of sizeof on rhs
-            const nonneg int varid1 = sz1->varId();
-            if (varid1 &&
-                sz1->variable() &&
-                sz1->variable()->isArray() &&
-                !sz1->variable()->dimensions().empty() &&
-                sz1->variable()->dimensionKnown(0) &&
-                Token::Match(sz2->astOperand2(), "*|[") && Token::Match(sz2->astOperand2()->astOperand1(), "%varid%", varid1)) {
-                ValueFlow::Value value(sz1->variable()->dimension(0));
-                if (!tok2->isTemplateArg() && settings->platform.type != cppcheck::Platform::Type::Unspecified)
-                    value.setKnown();
-                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()) {
-                // find the size of the type
-                size_t size = 0;
-                if (var->isEnumType()) {
-                    size = settings->platform.sizeof_int;
-                    if (var->type()->classScope && var->type()->classScope->enumType)
-                        size = getSizeOfType(var->type()->classScope->enumType, settings);
-                } else if (var->valueType()) {
-                    size = ValueFlow::getSizeOf(*var->valueType(), settings);
-                } else if (!var->type()) {
-                    size = getSizeOfType(var->typeStartToken(), settings);
-                }
-                // find the number of elements
-                size_t count = 1;
-                for (size_t i = 0; i < var->dimensions().size(); ++i) {
-                    if (var->dimensionKnown(i))
-                        count *= var->dimension(i);
-                    else
-                        count = 0;
-                }
-                if (size && count > 0) {
-                    ValueFlow::Value value(count * size);
-                    if (settings->platform.type != cppcheck::Platform::Type::Unspecified)
-                        value.setKnown();
-                    setTokenValue(tok, value, settings);
-                    setTokenValue(tok->next(), std::move(value), settings);
-                }
-            }
-        } else if (tok2->tokType() == Token::eString) {
-            const size_t sz = Token::getStrSize(tok2, settings);
-            if (sz > 0) {
-                ValueFlow::Value value(sz);
-                value.setKnown();
-                setTokenValue(const_cast<Token *>(tok->next()), std::move(value), settings);
-            }
-        } else if (tok2->tokType() == Token::eChar) {
-            nonneg int sz = 0;
-            if (cpp && settings->standards.cpp >= Standards::CPP20 && tok2->isUtf8())
-                sz = 1;
-            else if (tok2->isUtf16())
-                sz = 2;
-            else if (tok2->isUtf32())
-                sz = 4;
-            else if (tok2->isLong())
-                sz = settings->platform.sizeof_wchar_t;
-            else if ((tok2->isCChar() && !cpp) || (tok2->isCMultiChar()))
-                sz = settings->platform.sizeof_int;
-            else
-                sz = 1;
-
-            if (sz > 0) {
-                ValueFlow::Value value(sz);
-                value.setKnown();
-                setTokenValue(tok->next(), std::move(value), settings);
-            }
-        } else if (!tok2->type()) {
-            const ValueType& vt = ValueType::parseDecl(tok2, *settings, true); // TODO: set isCpp
-            size_t sz = ValueFlow::getSizeOf(vt, settings);
-            const Token* brac = tok2->astParent();
-            while (Token::simpleMatch(brac, "[")) {
-                const Token* num = brac->astOperand2();
-                if (num && ((num->isNumber() && MathLib::isInt(num->str())) || num->tokType() == Token::eChar)) {
-                    try {
-                        const MathLib::biguint dim = MathLib::toULongNumber(num->str());
-                        sz *= dim;
-                        brac = brac->astParent();
-                        continue;
-                    }
-                    catch (const std::exception& /*e*/) {
-                        // Bad integer literal
-                    }
-                }
-                sz = 0;
-                break;
-            }
-            if (sz > 0) {
-                ValueFlow::Value value(sz);
-                if (!tok2->isTemplateArg() && settings->platform.type != cppcheck::Platform::Type::Unspecified)
-                    value.setKnown();
-                setTokenValue(tok->next(), std::move(value), settings);
-            }
-        }
-        // skip over enum
-        tok = tok->linkAt(1);
-    } else if (Token::Match(tok, "%name% [{(] [)}]") && (tok->isStandardType() ||
-                                                         (tok->variable() && tok->variable()->nameToken() == tok &&
-                                                          (tok->variable()->isPointer() || (tok->variable()->valueType() && tok->variable()->valueType()->isIntegral()))))) {
-        ValueFlow::Value value(0);
-        if (!tok->isTemplateArg())
-            value.setKnown();
-        setTokenValue(tok->next(), std::move(value), settings, isInitList);
-    } else if (Token::Match(tok, "%name% = {") && tok->variable() &&
-               (tok->variable()->isPointer() || (tok->variable()->valueType() && tok->variable()->valueType()->isIntegral()))) {
-        if (Token::simpleMatch(tok->tokAt(3), "}")) {
-            ValueFlow::Value value(0);
-            value.setKnown();
-            setTokenValue(tok->tokAt(2), std::move(value), settings, isInitList);
-        } else if (tok->tokAt(2)->astOperand1() && tok->tokAt(2)->astOperand1()->hasKnownIntValue()) {
-            ValueFlow::Value value(tok->tokAt(2)->astOperand1()->getKnownIntValue());
-            value.setKnown();
-            setTokenValue(tok->tokAt(2), std::move(value), settings, isInitList);
-        }
-    }
-    return tok->next();
-}
-
-static void valueFlowNumber(TokenList *tokenlist, const Settings* settings)
-{
-    bool isInitList = false;
-    const Token* endInit{};
-    for (Token *tok = tokenlist->front(); tok;) {
-        if (!isInitList && tok->str() == "{" && (Token::simpleMatch(tok->astOperand1(), ",") || Token::simpleMatch(tok->astOperand2(), ","))) {
-            isInitList = true;
-            endInit = tok->link();
-        }
-        tok = valueFlowSetConstantValue(tok, settings, tokenlist->isCPP(), isInitList);
-        if (isInitList && tok == endInit)
-            isInitList = false;
-    }
-
-    if (tokenlist->isCPP()) {
-        for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
-            if (tok->isName() && !tok->varId() && Token::Match(tok, "false|true")) {
-                ValueFlow::Value value(tok->str() == "true");
-                if (!tok->isTemplateArg())
-                    value.setKnown();
-                setTokenValue(tok, std::move(value), settings);
-            } else if (Token::Match(tok, "[(,] NULL [,)]")) {
-                // NULL function parameters are not simplified in the
-                // normal tokenlist
-                ValueFlow::Value value(0);
-                if (!tok->isTemplateArg())
-                    value.setKnown();
-                setTokenValue(tok->next(), std::move(value), settings);
-            }
-        }
-    }
-}
-
-static void valueFlowString(TokenList *tokenlist, const Settings* settings)
-{
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
-        if (tok->tokType() == Token::eString) {
-            ValueFlow::Value strvalue;
-            strvalue.valueType = ValueFlow::Value::ValueType::TOK;
-            strvalue.tokvalue = tok;
-            strvalue.setKnown();
-            setTokenValue(tok, std::move(strvalue), settings);
-        }
-    }
-}
-
-static void valueFlowArray(TokenList *tokenlist, const Settings *settings)
-{
-    std::map<nonneg int, const Token *> constantArrays;
-
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
-        if (tok->varId() > 0) {
-            // array
-            const std::map<nonneg int, const Token *>::const_iterator it = constantArrays.find(tok->varId());
-            if (it != constantArrays.end()) {
-                ValueFlow::Value value;
-                value.valueType = ValueFlow::Value::ValueType::TOK;
-                value.tokvalue = it->second;
-                value.setKnown();
-                setTokenValue(tok, std::move(value), settings);
-            }
-
-            // const array decl
-            else if (tok->variable() && tok->variable()->isArray() && tok->variable()->isConst() &&
-                     tok->variable()->nameToken() == tok && Token::Match(tok, "%var% [ %num%| ] = {")) {
-                Token* rhstok = tok->next()->link()->tokAt(2);
-                constantArrays[tok->varId()] = rhstok;
-                tok = rhstok->link();
-            }
-
-            // pointer = array
-            else if (tok->variable() && tok->variable()->isArray() && Token::simpleMatch(tok->astParent(), "=") &&
-                     astIsRHS(tok) && tok->astParent()->astOperand1() &&
-                     tok->astParent()->astOperand1()->variable() &&
-                     tok->astParent()->astOperand1()->variable()->isPointer()) {
-                ValueFlow::Value value;
-                value.valueType = ValueFlow::Value::ValueType::TOK;
-                value.tokvalue = tok;
-                value.setKnown();
-                setTokenValue(tok, std::move(value), settings);
-            }
-            continue;
-        }
-
-        if (Token::Match(tok, "const %type% %var% [ %num%| ] = {")) {
-            Token *vartok = tok->tokAt(2);
-            Token *rhstok = vartok->next()->link()->tokAt(2);
-            constantArrays[vartok->varId()] = rhstok;
-            tok = rhstok->link();
-            continue;
-        }
-
-        if (Token::Match(tok, "const char %var% [ %num%| ] = %str% ;")) {
-            Token *vartok = tok->tokAt(2);
-            Token *strtok = vartok->next()->link()->tokAt(2);
-            constantArrays[vartok->varId()] = strtok;
-            tok = strtok->next();
-            continue;
-        }
-    }
-}
-
-static bool isNonZero(const Token *tok)
-{
-    return tok && (!tok->hasKnownIntValue() || tok->values().front().intvalue != 0);
-}
-
-static const Token *getOtherOperand(const Token *tok)
-{
-    if (!tok)
-        return nullptr;
-    if (!tok->astParent())
-        return nullptr;
-    if (tok->astParent()->astOperand1() != tok)
-        return tok->astParent()->astOperand1();
-    if (tok->astParent()->astOperand2() != tok)
-        return tok->astParent()->astOperand2();
-    return nullptr;
-}
-
-static void valueFlowArrayBool(TokenList *tokenlist, const Settings *settings)
-{
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
-        if (tok->hasKnownIntValue())
-            continue;
-        const Variable *var = nullptr;
-        bool known = false;
-        const std::list<ValueFlow::Value>::const_iterator val =
-            std::find_if(tok->values().cbegin(), tok->values().cend(), std::mem_fn(&ValueFlow::Value::isTokValue));
-        if (val == tok->values().end()) {
-            var = tok->variable();
-            known = true;
-        } else {
-            var = val->tokvalue->variable();
-            known = val->isKnown();
-        }
-        if (!var)
-            continue;
-        if (!var->isArray() || var->isArgument() || var->isStlType())
-            continue;
-        if (isNonZero(getOtherOperand(tok)) && Token::Match(tok->astParent(), "%comp%"))
-            continue;
-        // TODO: Check for function argument
-        if ((astIsBool(tok->astParent()) && !Token::Match(tok->astParent(), "(|%name%")) ||
-            (tok->astParent() && Token::Match(tok->astParent()->previous(), "if|while|for ("))) {
-            ValueFlow::Value value{1};
-            if (known)
-                value.setKnown();
-            setTokenValue(tok, std::move(value), settings);
-        }
-    }
-}
-
-static void valueFlowArrayElement(TokenList* tokenlist, const Settings* settings)
+static void valueFlowArrayElement(TokenList& tokenlist, const Settings& settings)
 {
-    for (Token* tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         if (tok->hasKnownIntValue())
             continue;
         const Token* indexTok = nullptr;
@@ -1558,8 +789,12 @@ static void valueFlowArrayElement(TokenList* tokenlist, const Settings* settings
                 if (arrayValue.valueKind == indexValue.valueKind)
                     result.valueKind = arrayValue.valueKind;
 
-                result.errorPath.insert(result.errorPath.end(), arrayValue.errorPath.cbegin(), arrayValue.errorPath.cend());
-                result.errorPath.insert(result.errorPath.end(), indexValue.errorPath.cbegin(), indexValue.errorPath.cend());
+                result.errorPath.insert(result.errorPath.end(),
+                                        arrayValue.errorPath.cbegin(),
+                                        arrayValue.errorPath.cend());
+                result.errorPath.insert(result.errorPath.end(),
+                                        indexValue.errorPath.cbegin(),
+                                        indexValue.errorPath.cend());
 
                 const MathLib::bigint index = indexValue.intvalue;
 
@@ -1567,31 +802,31 @@ static void valueFlowArrayElement(TokenList* tokenlist, const Settings* settings
                     const std::string s = arrayValue.tokvalue->strValue();
                     if (index == s.size()) {
                         result.intvalue = 0;
-                        setTokenValue(tok, result, settings);
+                        setTokenValue(tok, std::move(result), settings);
                     } else if (index >= 0 && index < s.size()) {
-                        result.intvalue = s[index];
-                        setTokenValue(tok, result, settings);
+                        result.intvalue = s[static_cast<std::size_t>(index)];
+                        setTokenValue(tok, std::move(result), settings);
                     }
                 } else if (Token::simpleMatch(arrayValue.tokvalue, "{")) {
                     std::vector<const Token*> args = getArguments(arrayValue.tokvalue);
                     if (index < 0 || index >= args.size())
                         continue;
-                    const Token* arg = args[index];
-                    if (!arg->hasKnownIntValue())
-                        continue;
-                    const ValueFlow::Value& v = arg->values().front();
-                    result.intvalue = v.intvalue;
-                    result.errorPath.insert(result.errorPath.end(), v.errorPath.cbegin(), v.errorPath.cend());
-                    setTokenValue(tok, result, settings);
+                    const Token* arg = args[static_cast<std::size_t>(index)];
+                    const ValueFlow::Value* v = arg->getKnownValue(ValueFlow::Value::ValueType::INT);
+                    if (v) {
+                        result.intvalue = v->intvalue;
+                        result.errorPath.insert(result.errorPath.end(), v->errorPath.cbegin(), v->errorPath.cend());
+                        setTokenValue(tok, std::move(result), settings);
+                    }
                 }
             }
         }
     }
 }
 
-static void valueFlowPointerAlias(TokenList *tokenlist, const Settings* settings)
+static void valueFlowPointerAlias(TokenList& tokenlist, const Settings& settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         // not address of
         if (!tok->isUnaryOp("&"))
             continue;
@@ -1601,7 +836,7 @@ static void valueFlowPointerAlias(TokenList *tokenlist, const Settings* settings
             continue;
 
         // child should be some buffer or variable
-        const Token *vartok = tok->astOperand1();
+        const Token* vartok = tok->astOperand1();
         while (vartok) {
             if (vartok->str() == "[")
                 vartok = vartok->astOperand1();
@@ -1620,9 +855,9 @@ static void valueFlowPointerAlias(TokenList *tokenlist, const Settings* settings
     }
 }
 
-static void valueFlowBitAnd(TokenList *tokenlist, const Settings* settings)
+static void valueFlowBitAnd(TokenList& tokenlist, const Settings& settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         if (tok->str() != "&")
             continue;
 
@@ -1634,26 +869,26 @@ static void valueFlowBitAnd(TokenList *tokenlist, const Settings* settings)
 
         MathLib::bigint number;
         if (MathLib::isInt(tok->astOperand1()->str()))
-            number = MathLib::toLongNumber(tok->astOperand1()->str());
+            number = MathLib::toBigNumber(tok->astOperand1());
         else if (MathLib::isInt(tok->astOperand2()->str()))
-            number = MathLib::toLongNumber(tok->astOperand2()->str());
+            number = MathLib::toBigNumber(tok->astOperand2());
         else
             continue;
 
         int bit = 0;
-        while (bit <= (MathLib::bigint_bits - 2) && ((((MathLib::bigint)1) << bit) < number))
+        while (bit <= (MathLib::bigint_bits - 2) && ((static_cast<MathLib::bigint>(1) << bit) < number))
             ++bit;
 
-        if ((((MathLib::bigint)1) << bit) == number) {
+        if ((static_cast<MathLib::bigint>(1) << bit) == number) {
             setTokenValue(tok, ValueFlow::Value(0), settings);
             setTokenValue(tok, ValueFlow::Value(number), settings);
         }
     }
 }
 
-static void valueFlowSameExpressions(TokenList *tokenlist, const Settings* settings)
+static void valueFlowSameExpressions(TokenList& tokenlist, const Settings& settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         if (tok->hasKnownIntValue())
             continue;
 
@@ -1666,34 +901,33 @@ static void valueFlowSameExpressions(TokenList *tokenlist, const Settings* setti
         if (!astIsIntegral(tok->astOperand1(), false) && !astIsIntegral(tok->astOperand2(), false))
             continue;
 
-        ValueFlow::Value val;
+        long long val;
 
         if (Token::Match(tok, "==|>=|<=|/")) {
-            val = ValueFlow::Value(1);
-            val.setKnown();
+            val = 1;
         }
-
-        if (Token::Match(tok, "!=|>|<|%|-")) {
-            val = ValueFlow::Value(0);
-            val.setKnown();
+        else if (Token::Match(tok, "!=|>|<|%|-")) {
+            val = 0;
         }
-
-        if (!val.isKnown())
+        else
             continue;
 
-        if (isSameExpression(tokenlist->isCPP(), false, tok->astOperand1(), tok->astOperand2(), settings->library, true, true, &val.errorPath)) {
-            setTokenValue(tok, std::move(val), settings);
+        ValueFlow::Value value(val);
+        value.setKnown();
+
+        if (isSameExpression(false, tok->astOperand1(), tok->astOperand2(), settings, true, true, &value.errorPath)) {
+            setTokenValue(tok, std::move(value), settings);
         }
     }
 }
 
-static bool getExpressionRange(const Token *expr, MathLib::bigint *minvalue, MathLib::bigint *maxvalue)
+static bool getExpressionRange(const Token* expr, MathLib::bigint* minvalue, MathLib::bigint* maxvalue)
 {
-    if (expr->hasKnownIntValue()) {
+    if (const ValueFlow::Value* v = expr->getKnownValue(ValueFlow::Value::ValueType::INT)) {
         if (minvalue)
-            *minvalue = expr->values().front().intvalue;
+            *minvalue = v->intvalue;
         if (maxvalue)
-            *maxvalue = expr->values().front().intvalue;
+            *maxvalue = v->intvalue;
         return true;
     }
 
@@ -1727,7 +961,8 @@ static bool getExpressionRange(const Token *expr, MathLib::bigint *minvalue, Mat
         if (lhsHasKnownRange && vals[0] < 0)
             return false;
         // If lhs has unknown value, it must be unsigned
-        if (!lhsHasKnownRange && (!expr->astOperand1()->valueType() || expr->astOperand1()->valueType()->sign != ValueType::Sign::UNSIGNED))
+        if (!lhsHasKnownRange &&
+            (!expr->astOperand1()->valueType() || expr->astOperand1()->valueType()->sign != ValueType::Sign::UNSIGNED))
             return false;
         if (minvalue)
             *minvalue = 0;
@@ -1739,22 +974,22 @@ static bool getExpressionRange(const Token *expr, MathLib::bigint *minvalue, Mat
     return false;
 }
 
-static void valueFlowRightShift(TokenList *tokenList, const Settings* settings)
+static void valueFlowRightShift(TokenList& tokenList, const Settings& settings)
 {
-    for (Token *tok = tokenList->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenList.front(); tok; tok = tok->next()) {
         if (tok->str() != ">>")
             continue;
 
-        if (tok->hasKnownValue())
+        if (tok->hasKnownIntValue())
             continue;
 
         if (!tok->astOperand1() || !tok->astOperand2())
             continue;
 
-        if (!tok->astOperand2()->hasKnownValue())
+        if (!tok->astOperand2()->hasKnownIntValue())
             continue;
 
-        const MathLib::bigint rhsvalue = tok->astOperand2()->values().front().intvalue;
+        const MathLib::bigint rhsvalue = tok->astOperand2()->getKnownIntValue();
         if (rhsvalue < 0)
             continue;
 
@@ -1764,22 +999,22 @@ static void valueFlowRightShift(TokenList *tokenList, const Settings* settings)
         if (!tok->astOperand2()->valueType() || !tok->astOperand2()->valueType()->isIntegral())
             continue;
 
-        MathLib::bigint lhsmax=0;
+        MathLib::bigint lhsmax = 0;
         if (!getExpressionRange(tok->astOperand1(), nullptr, &lhsmax))
             continue;
         if (lhsmax < 0)
             continue;
-        int lhsbits;
+        std::uint8_t lhsbits;
         if ((tok->astOperand1()->valueType()->type == ValueType::Type::CHAR) ||
             (tok->astOperand1()->valueType()->type == ValueType::Type::SHORT) ||
             (tok->astOperand1()->valueType()->type == ValueType::Type::WCHAR_T) ||
             (tok->astOperand1()->valueType()->type == ValueType::Type::BOOL) ||
             (tok->astOperand1()->valueType()->type == ValueType::Type::INT))
-            lhsbits = settings->platform.int_bit;
+            lhsbits = settings.platform.int_bit; // TODO: needs to use the proper *_bit fo each type
         else if (tok->astOperand1()->valueType()->type == ValueType::Type::LONG)
-            lhsbits = settings->platform.long_bit;
+            lhsbits = settings.platform.long_bit;
         else if (tok->astOperand1()->valueType()->type == ValueType::Type::LONGLONG)
-            lhsbits = settings->platform.long_long_bit;
+            lhsbits = settings.platform.long_long_bit;
         else
             continue;
         if (rhsvalue >= lhsbits || rhsvalue >= MathLib::bigint_bits || (1ULL << rhsvalue) <= lhsmax)
@@ -1793,18 +1028,20 @@ static void valueFlowRightShift(TokenList *tokenList, const Settings* settings)
 
 static std::vector<MathLib::bigint> minUnsignedValue(const Token* tok, int depth = 8)
 {
-    std::vector<MathLib::bigint> result = {};
+    std::vector<MathLib::bigint> result;
     if (!tok)
         return result;
     if (depth < 0)
         return result;
-    if (tok->hasKnownIntValue()) {
-        result = {tok->values().front().intvalue};
+    if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+        result = {v->intvalue};
     } else if (!Token::Match(tok, "-|%|&|^") && tok->isConstOp() && tok->astOperand1() && tok->astOperand2()) {
         std::vector<MathLib::bigint> op1 = minUnsignedValue(tok->astOperand1(), depth - 1);
-        std::vector<MathLib::bigint> op2 = minUnsignedValue(tok->astOperand2(), depth - 1);
-        if (!op1.empty() && !op2.empty()) {
-            result = calculate<std::vector<MathLib::bigint>>(tok->str(), op1.front(), op2.front());
+        if (!op1.empty()) {
+            std::vector<MathLib::bigint> op2 = minUnsignedValue(tok->astOperand2(), depth - 1);
+            if (!op2.empty()) {
+                result = calculate<std::vector<MathLib::bigint>>(tok->str(), op1.front(), op2.front());
+            }
         }
     }
     if (result.empty() && astIsUnsigned(tok))
@@ -1812,7 +1049,7 @@ static std::vector<MathLib::bigint> minUnsignedValue(const Token* tok, int depth
     return result;
 }
 
-static bool isConvertedToIntegral(const Token* tok, const Settings* settings)
+static bool isConvertedToIntegral(const Token* tok, const Settings& settings)
 {
     if (!tok)
         return false;
@@ -1830,16 +1067,16 @@ static bool isSameToken(const Token* tok1, const Token* tok2)
     if (tok1->exprId() != 0 && tok1->exprId() == tok2->exprId())
         return true;
     if (tok1->hasKnownIntValue() && tok2->hasKnownIntValue())
-        return tok1->values().front().intvalue == tok2->values().front().intvalue;
+        return tok1->getKnownIntValue() == tok2->getKnownIntValue();
     return false;
 }
 
-static void valueFlowImpossibleValues(TokenList* tokenList, const Settings* settings)
+static void valueFlowImpossibleValues(TokenList& tokenList, const Settings& settings)
 {
-    for (Token* tok = tokenList->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenList.front(); tok; tok = tok->next()) {
         if (tok->hasKnownIntValue())
             continue;
-        if (Token::Match(tok, "true|false"))
+        if (Token::Match(tok, "%bool%"))
             continue;
         if (astIsBool(tok) || Token::Match(tok, "%comp%")) {
             ValueFlow::Value lower{-1};
@@ -1871,16 +1108,15 @@ static void valueFlowImpossibleValues(TokenList* tokenList, const Settings* sett
                 flipped = true;
             else if (!std::equal(tokens.cbegin(), tokens.cend(), branches.cbegin(), &isSameToken))
                 continue;
-            const bool isMin = Token::Match(condTok, "<|<=") ^ flipped;
             std::vector<ValueFlow::Value> values;
             for (const Token* tok2 : tokens) {
-                if (tok2->hasKnownIntValue()) {
-                    values.emplace_back();
+                if (const ValueFlow::Value* v = tok2->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+                    values.emplace_back(*v);
                 } else {
                     ValueFlow::Value symValue{};
                     symValue.valueType = ValueFlow::Value::ValueType::SYMBOLIC;
                     symValue.tokvalue = tok2;
-                    values.push_back(symValue);
+                    values.push_back(std::move(symValue));
                     std::copy_if(tok2->values().cbegin(),
                                  tok2->values().cend(),
                                  std::back_inserter(values),
@@ -1891,6 +1127,7 @@ static void valueFlowImpossibleValues(TokenList* tokenList, const Settings* sett
                     });
                 }
             }
+            const bool isMin = Token::Match(condTok, "<|<=") ^ flipped;
             for (ValueFlow::Value& value : values) {
                 value.setImpossible();
                 if (isMin) {
@@ -1904,7 +1141,7 @@ static void valueFlowImpossibleValues(TokenList* tokenList, const Settings* sett
             }
 
         } else if (Token::simpleMatch(tok, "%") && tok->astOperand2() && tok->astOperand2()->hasKnownIntValue()) {
-            ValueFlow::Value value{tok->astOperand2()->values().front()};
+            ValueFlow::Value value{tok->astOperand2()->getKnownIntValue()};
             value.bound = ValueFlow::Value::Bound::Lower;
             value.setImpossible();
             setTokenValue(tok, std::move(value), settings);
@@ -1928,7 +1165,12 @@ static void valueFlowImpossibleValues(TokenList* tokenList, const Settings* sett
             ValueFlow::Value value{0};
             value.setImpossible();
             setTokenValue(tok->linkAt(1)->next(), std::move(value), settings);
-        } else if ((tokenList->isCPP() && Token::simpleMatch(tok, "this")) || tok->isUnaryOp("&")) {
+        } else if ((tokenList.isCPP() && Token::simpleMatch(tok, "this")) || tok->isUnaryOp("&")) {
+            ValueFlow::Value value{0};
+            value.setImpossible();
+            setTokenValue(tok, std::move(value), settings);
+        } else if (tok->variable() && tok->variable()->isArray() && !tok->variable()->isArgument() &&
+                   !tok->variable()->isStlType()) {
             ValueFlow::Value value{0};
             value.setImpossible();
             setTokenValue(tok, std::move(value), settings);
@@ -1941,21 +1183,20 @@ static void valueFlowImpossibleValues(TokenList* tokenList, const Settings* sett
     }
 }
 
-static void valueFlowEnumValue(SymbolDatabase * symboldatabase, const Settings * settings)
+static void valueFlowEnumValue(SymbolDatabase & symboldatabase, const Settings & settings)
 {
-
-    for (Scope & scope : symboldatabase->scopeList) {
-        if (scope.type != Scope::eEnum)
+    for (Scope & scope : symboldatabase.scopeList) {
+        if (scope.type != ScopeType::eEnum)
             continue;
         MathLib::bigint value = 0;
         bool prev_enum_is_known = true;
 
         for (Enumerator & enumerator : scope.enumeratorList) {
             if (enumerator.start) {
-                Token* rhs = const_cast<Token*>(enumerator.start->previous()->astOperand2());
+                auto* rhs = const_cast<Token*>(enumerator.start->previous()->astOperand2());
                 ValueFlow::valueFlowConstantFoldAST(rhs, settings);
                 if (rhs && rhs->hasKnownIntValue()) {
-                    enumerator.value = rhs->values().front().intvalue;
+                    enumerator.value = rhs->getKnownIntValue();
                     enumerator.value_known = true;
                     value = enumerator.value + 1;
                     prev_enum_is_known = true;
@@ -1969,59 +1210,46 @@ static void valueFlowEnumValue(SymbolDatabase * symboldatabase, const Settings *
     }
 }
 
-static void valueFlowGlobalConstVar(TokenList* tokenList, const Settings *settings)
+static void valueFlowGlobalConstVar(TokenList& tokenList, const Settings& settings)
 {
     // Get variable values...
     std::map<const Variable*, ValueFlow::Value> vars;
-    for (const Token* tok = tokenList->front(); tok; tok = tok->next()) {
+    for (const Token* tok = tokenList.front(); tok; tok = tok->next()) {
         if (!tok->variable())
             continue;
         // Initialization...
-        if (tok == tok->variable()->nameToken() &&
-            !tok->variable()->isVolatile() &&
-            !tok->variable()->isArgument() &&
-            tok->variable()->isConst() &&
-            tok->valueType() &&
-            tok->valueType()->isIntegral() &&
-            tok->valueType()->pointer == 0 &&
-            tok->valueType()->constness == 1 &&
-            Token::Match(tok, "%name% =") &&
-            tok->next()->astOperand2() &&
-            tok->next()->astOperand2()->hasKnownIntValue()) {
-            vars[tok->variable()] = tok->next()->astOperand2()->values().front();
+        if (tok == tok->variable()->nameToken() && !tok->variable()->isVolatile() && !tok->variable()->isArgument() &&
+            tok->variable()->isConst() && tok->valueType() && tok->valueType()->isIntegral() &&
+            tok->valueType()->pointer == 0 && tok->valueType()->constness == 1 && Token::Match(tok, "%name% =") &&
+            tok->next()->astOperand2() && tok->next()->astOperand2()->hasKnownIntValue()) {
+            vars[tok->variable()] = *tok->next()->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT);
         }
     }
 
     // Set values..
-    for (Token* tok = tokenList->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenList.front(); tok; tok = tok->next()) {
         if (!tok->variable())
             continue;
-        const std::map<const Variable*, ValueFlow::Value>::const_iterator var = vars.find(tok->variable());
+        const auto var = utils::as_const(vars).find(tok->variable());
         if (var == vars.end())
             continue;
         setTokenValue(tok, var->second, settings);
     }
 }
 
-static void valueFlowGlobalStaticVar(TokenList *tokenList, const Settings *settings)
+static void valueFlowGlobalStaticVar(TokenList& tokenList, const Settings& settings)
 {
     // Get variable values...
-    std::map<const Variable *, ValueFlow::Value> vars;
-    for (const Token *tok = tokenList->front(); tok; tok = tok->next()) {
+    std::map<const Variable*, ValueFlow::Value> vars;
+    for (const Token* tok = tokenList.front(); tok; tok = tok->next()) {
         if (!tok->variable())
             continue;
         // Initialization...
-        if (tok == tok->variable()->nameToken() &&
-            tok->variable()->isStatic() &&
-            !tok->variable()->isConst() &&
-            tok->valueType() &&
-            tok->valueType()->isIntegral() &&
-            tok->valueType()->pointer == 0 &&
-            tok->valueType()->constness == 0 &&
-            Token::Match(tok, "%name% =") &&
-            tok->next()->astOperand2() &&
+        if (tok == tok->variable()->nameToken() && tok->variable()->isStatic() && !tok->variable()->isConst() &&
+            tok->valueType() && tok->valueType()->isIntegral() && tok->valueType()->pointer == 0 &&
+            tok->valueType()->constness == 0 && Token::Match(tok, "%name% =") && tok->next()->astOperand2() &&
             tok->next()->astOperand2()->hasKnownIntValue()) {
-            vars[tok->variable()] = tok->next()->astOperand2()->values().front();
+            vars[tok->variable()] = *tok->next()->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT);
         } else {
             // If variable is written anywhere in TU then remove it from vars
             if (!tok->astParent())
@@ -2031,9 +1259,9 @@ static void valueFlowGlobalStaticVar(TokenList *tokenList, const Settings *setti
             else if (tok->astParent()->isAssignmentOp()) {
                 if (tok == tok->astParent()->astOperand1())
                     vars.erase(tok->variable());
-                else if (tokenList->isCPP() && Token::Match(tok->astParent()->tokAt(-2), "& %name% ="))
+                else if (tok->isCpp() && Token::Match(tok->astParent()->tokAt(-2), "& %name% ="))
                     vars.erase(tok->variable());
-            } else if (isLikelyStreamRead(tokenList->isCPP(), tok->astParent())) {
+            } else if (isLikelyStreamRead(tok->astParent())) {
                 vars.erase(tok->variable());
             } else if (Token::Match(tok->astParent(), "[(,]"))
                 vars.erase(tok->variable());
@@ -2041,1319 +1269,156 @@ static void valueFlowGlobalStaticVar(TokenList *tokenList, const Settings *setti
     }
 
     // Set values..
-    for (Token *tok = tokenList->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenList.front(); tok; tok = tok->next()) {
         if (!tok->variable())
             continue;
-        const std::map<const Variable *, ValueFlow::Value>::const_iterator var = vars.find(tok->variable());
+        const auto var = utils::as_const(vars).find(tok->variable());
         if (var == vars.end())
             continue;
         setTokenValue(tok, var->second, settings);
-    }
-}
-
-static ValuePtr<Analyzer> makeAnalyzer(const Token* exprTok, ValueFlow::Value value, const TokenList* tokenlist, const Settings* settings);
-static ValuePtr<Analyzer> makeReverseAnalyzer(const Token* exprTok, ValueFlow::Value value, const TokenList* tokenlist, const Settings* settings);
-
-static Analyzer::Result valueFlowForward(Token* startToken,
-                                         const Token* endToken,
-                                         const Token* exprTok,
-                                         ValueFlow::Value value,
-                                         const TokenList* const tokenlist,
-                                         const Settings* settings,
-                                         SourceLocation loc = SourceLocation::current())
-{
-    if (settings->debugnormal)
-        setSourceLocation(value, loc, startToken);
-    return valueFlowGenericForward(startToken,
-                                   endToken,
-                                   makeAnalyzer(exprTok, std::move(value), tokenlist, settings),
-                                   *settings);
-}
-
-static Analyzer::Result valueFlowForward(Token* startToken,
-                                         const Token* endToken,
-                                         const Token* exprTok,
-                                         std::list<ValueFlow::Value> values,
-                                         const TokenList* const tokenlist,
-                                         const Settings* settings,
-                                         SourceLocation loc = SourceLocation::current())
-{
-    Analyzer::Result result{};
-    for (ValueFlow::Value& v : values) {
-        result.update(valueFlowForward(startToken, endToken, exprTok, std::move(v), tokenlist, settings, loc));
-    }
-    return result;
-}
-
-template<class ValueOrValues>
-static Analyzer::Result valueFlowForward(Token* startToken,
-                                         const Token* exprTok,
-                                         ValueOrValues v,
-                                         TokenList* tokenlist,
-                                         const Settings* settings,
-                                         SourceLocation loc = SourceLocation::current())
-{
-    const Token* endToken = nullptr;
-    const Function* f = Scope::nestedInFunction(startToken->scope());
-    if (f && f->functionScope)
-        endToken = f->functionScope->bodyEnd;
-    return valueFlowForward(startToken, endToken, exprTok, std::move(v), tokenlist, settings, loc);
-}
-
-static Analyzer::Result valueFlowForwardRecursive(Token* top,
-                                                  const Token* exprTok,
-                                                  std::list<ValueFlow::Value> values,
-                                                  const TokenList* const tokenlist,
-                                                  const Settings* settings,
-                                                  SourceLocation loc = SourceLocation::current())
-{
-    Analyzer::Result result{};
-    for (ValueFlow::Value& v : values) {
-        if (settings->debugnormal)
-            setSourceLocation(v, loc, top);
-        result.update(
-            valueFlowGenericForward(top, makeAnalyzer(exprTok, std::move(v), tokenlist, settings), *settings));
-    }
-    return result;
-}
-
-static void valueFlowReverse(Token* tok,
-                             const Token* const endToken,
-                             const Token* const varToken,
-                             std::list<ValueFlow::Value> values,
-                             const TokenList* tokenlist,
-                             const Settings* settings,
-                             SourceLocation loc = SourceLocation::current())
-{
-    for (ValueFlow::Value& v : values) {
-        if (settings->debugnormal)
-            setSourceLocation(v, loc, tok);
-        valueFlowGenericReverse(tok, endToken, makeReverseAnalyzer(varToken, std::move(v), tokenlist, settings), *settings);
-    }
-}
-
-// Deprecated
-static void valueFlowReverse(const TokenList* tokenlist,
-                             Token* tok,
-                             const Token* const varToken,
-                             ValueFlow::Value val,
-                             const ValueFlow::Value& val2,
-                             ErrorLogger* /*errorLogger*/,
-                             const Settings* settings = nullptr,
-                             SourceLocation loc = SourceLocation::current())
-{
-    std::list<ValueFlow::Value> values = {std::move(val)};
-    if (val2.varId != 0)
-        values.push_back(val2);
-    valueFlowReverse(tok, nullptr, varToken, std::move(values), tokenlist, settings, loc);
-}
-
-static bool isConditionKnown(const Token* tok, bool then)
-{
-    const char* op = "||";
-    if (then)
-        op = "&&";
-    const Token* parent = tok->astParent();
-    while (parent && (parent->str() == op || parent->str() == "!" || parent->isCast()))
-        parent = parent->astParent();
-    const Token* top = tok->astTop();
-    if (top && Token::Match(top->previous(), "if|while|for ("))
-        return parent == top || Token::simpleMatch(parent, ";");
-    return parent && parent->str() != op;
-}
-
-static const std::string& invertAssign(const std::string& assign)
-{
-    static std::unordered_map<std::string, std::string> lookup = {{"=", "="},
-        {"+=", "-="},
-        {"-=", "+="},
-        {"*=", "/="},
-        {"/=", "*="},
-        {"<<=", ">>="},
-        {">>=", "<<="},
-        {"^=", "^="}};
-    auto it = lookup.find(assign);
-    if (it == lookup.end()) {
-        return emptyString;
-    }
-    return it->second;
-}
-
-static std::string removeAssign(const std::string& assign) {
-    return std::string{assign.cbegin(), assign.cend() - 1};
-}
-
-template<class T, class U>
-static T calculateAssign(const std::string& assign, const T& x, const U& y, bool* error = nullptr)
-{
-    if (assign.empty() || assign.back() != '=') {
-        if (error)
-            *error = true;
-        return T{};
-    }
-    if (assign == "=")
-        return y;
-    return calculate<T, T>(removeAssign(assign), x, y, error);
-}
-
-template<class T, class U>
-static void assignValueIfMutable(T& x, const U& y)
-{
-    x = y;
-}
-
-template<class T, class U>
-static void assignValueIfMutable(const T& /*unused*/, const U& /*unused*/)
-{}
-
-template<class Value, REQUIRES("Value must ValueFlow::Value", std::is_convertible<Value&, const ValueFlow::Value&> )>
-static bool evalAssignment(Value& lhsValue, const std::string& assign, const ValueFlow::Value& rhsValue)
-{
-    bool error = false;
-    if (lhsValue.isSymbolicValue() && rhsValue.isIntValue()) {
-        if (assign != "+=" && assign != "-=")
-            return false;
-        assignValueIfMutable(lhsValue.intvalue, calculateAssign(assign, lhsValue.intvalue, rhsValue.intvalue, &error));
-    } else if (lhsValue.isIntValue() && rhsValue.isIntValue()) {
-        assignValueIfMutable(lhsValue.intvalue, calculateAssign(assign, lhsValue.intvalue, rhsValue.intvalue, &error));
-    } else if (lhsValue.isFloatValue() && rhsValue.isIntValue()) {
-        assignValueIfMutable(lhsValue.floatValue,
-                             calculateAssign(assign, lhsValue.floatValue, rhsValue.intvalue, &error));
-    } else {
-        return false;
-    }
-    return !error;
-}
-
-static ValueFlow::Value::MoveKind isMoveOrForward(const Token* tok)
-{
-    if (!tok)
-        return ValueFlow::Value::MoveKind::NonMovedVariable;
-    const Token* parent = tok->astParent();
-    if (!Token::simpleMatch(parent, "("))
-        return ValueFlow::Value::MoveKind::NonMovedVariable;
-    const Token* ftok = parent->astOperand1();
-    if (!ftok)
-        return ValueFlow::Value::MoveKind::NonMovedVariable;
-    if (Token::simpleMatch(ftok->astOperand1(), "std :: move"))
-        return ValueFlow::Value::MoveKind::MovedVariable;
-    if (Token::simpleMatch(ftok->astOperand1(), "std :: forward"))
-        return ValueFlow::Value::MoveKind::ForwardedVariable;
-    // TODO: Check for cast
-    return ValueFlow::Value::MoveKind::NonMovedVariable;
-}
-
-template<class T>
-struct SingleRange {
-    T* x;
-    T* begin() const {
-        return x;
-    }
-    T* end() const {
-        return x+1;
-    }
-};
-
-template<class T>
-SingleRange<T> MakeSingleRange(T& x)
-{
-    return {&x};
-}
-
-class SelectValueFromVarIdMapRange {
-    using M = std::unordered_map<nonneg int, ValueFlow::Value>;
-
-    struct Iterator {
-        using iterator_category = std::forward_iterator_tag;
-        using value_type = const ValueFlow::Value;
-        using pointer = value_type *;
-        using reference = value_type &;
-        using difference_type = std::ptrdiff_t;
-
-        explicit Iterator(const M::const_iterator & it)
-            : mIt(it) {}
-
-        reference operator*() const {
-            return mIt->second;
-        }
-
-        pointer operator->() const {
-            return &mIt->second;
-        }
-
-        Iterator &operator++() {
-            // cppcheck-suppress postfixOperator - forward iterator needs to perform post-increment
-            mIt++;
-            return *this;
-        }
-
-        friend bool operator==(const Iterator &a, const Iterator &b) {
-            return a.mIt == b.mIt;
-        }
-
-        friend bool operator!=(const Iterator &a, const Iterator &b) {
-            return a.mIt != b.mIt;
-        }
-
-    private:
-        M::const_iterator mIt;
-    };
-
-public:
-    explicit SelectValueFromVarIdMapRange(const M *m)
-        : mMap(m) {}
-
-    Iterator begin() const {
-        return Iterator(mMap->begin());
-    }
-    Iterator end() const {
-        return Iterator(mMap->end());
-    }
-
-private:
-    const M *mMap;
-};
-
-// Check if its an alias of the variable or is being aliased to this variable
-template<typename V>
-static bool isAliasOf(const Variable * var, const Token *tok, nonneg int varid, const V& values, bool* inconclusive = nullptr)
-{
-    if (tok->varId() == varid)
-        return false;
-    if (tok->varId() == 0)
-        return false;
-    if (isAliasOf(tok, varid, inconclusive))
-        return true;
-    if (var && !var->isPointer())
-        return false;
-    // Search through non value aliases
-    return std::any_of(values.begin(), values.end(), [&](const ValueFlow::Value& val) {
-        if (!val.isNonValue())
-            return false;
-        if (val.isInconclusive())
-            return false;
-        if (val.isLifetimeValue() && !val.isLocalLifetimeValue())
-            return false;
-        if (val.isLifetimeValue() && val.lifetimeKind != ValueFlow::Value::LifetimeKind::Address)
-            return false;
-        if (!Token::Match(val.tokvalue, ".|&|*|%var%"))
-            return false;
-        return astHasVar(val.tokvalue, tok->varId());
-    });
-}
-
-static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, const Settings* settings, int depth = 20);
-
-static bool bifurcateVariableChanged(const Variable* var,
-                                     const std::set<nonneg int>& varids,
-                                     const Token* start,
-                                     const Token* end,
-                                     const Settings* settings,
-                                     int depth = 20)
-{
-    bool result = false;
-    const Token* tok = start;
-    while ((tok = findVariableChanged(
-                tok->next(), end, var->isPointer(), var->declarationId(), var->isGlobal(), settings, true))) {
-        if (Token::Match(tok->astParent(), "%assign%")) {
-            if (!bifurcate(tok->astParent()->astOperand2(), varids, settings, depth - 1))
-                return true;
-        } else {
-            result = true;
-        }
-    }
-    return result;
-}
-
-static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, const Settings* settings, int depth)
-{
-    if (depth < 0)
-        return false;
-    if (!tok)
-        return true;
-    if (tok->hasKnownIntValue())
-        return true;
-    if (tok->isConstOp())
-        return bifurcate(tok->astOperand1(), varids, settings, depth) && bifurcate(tok->astOperand2(), varids, settings, depth);
-    if (tok->varId() != 0) {
-        if (varids.count(tok->varId()) > 0)
-            return true;
-        const Variable* var = tok->variable();
-        if (!var)
-            return false;
-        const Token* start = var->declEndToken();
-        if (!start)
-            return false;
-        if (start->strAt(-1) == ")" || start->strAt(-1) == "}")
-            return false;
-        if (Token::Match(start, "; %varid% =", var->declarationId()))
-            start = start->tokAt(2);
-        if (var->isConst() || !bifurcateVariableChanged(var, varids, start, tok, settings, depth))
-            return var->isArgument() || bifurcate(start->astOperand2(), varids, settings, depth - 1);
-        return false;
-    }
-    return false;
-}
-
-struct ValueFlowAnalyzer : Analyzer {
-    const TokenList* tokenlist;
-    const Settings* settings;
-    ProgramMemoryState pms;
-
-    explicit ValueFlowAnalyzer(const TokenList* t = nullptr, const Settings* s = nullptr) : tokenlist(t), settings(s), pms(settings) {}
-
-    virtual const ValueFlow::Value* getValue(const Token* tok) const = 0;
-    virtual ValueFlow::Value* getValue(const Token* tok) = 0;
-
-    virtual void makeConditional() = 0;
-
-    virtual void addErrorPath(const Token* tok, const std::string& s) = 0;
-
-    virtual bool match(const Token* tok) const = 0;
-
-    virtual bool internalMatch(const Token* /*tok*/) const {
-        return false;
-    }
-
-    virtual bool isAlias(const Token* tok, bool& inconclusive) const = 0;
-
-    using ProgramState = ProgramMemory::Map;
-
-    virtual ProgramState getProgramState() const = 0;
-
-    virtual int getIndirect(const Token* tok) const {
-        const ValueFlow::Value* value = getValue(tok);
-        if (value)
-            return value->indirect;
-        return 0;
-    }
-
-    virtual bool isGlobal() const {
-        return false;
-    }
-    virtual bool dependsOnThis() const {
-        return false;
-    }
-    virtual bool isVariable() const {
-        return false;
-    }
-
-    bool isCPP() const {
-        return tokenlist->isCPP();
-    }
-
-    const Settings* getSettings() const {
-        return settings;
-    }
-
-    struct ConditionState {
-        bool dependent = true;
-        bool unknown = true;
-
-        bool isUnknownDependent() const {
-            return unknown && dependent;
-        }
-    };
-
-    std::unordered_map<nonneg int, const Token*> getSymbols(const Token* tok) const
-    {
-        std::unordered_map<nonneg int, const Token*> result;
-        if (!tok)
-            return result;
-        for (const ValueFlow::Value& v : tok->values()) {
-            if (!v.isSymbolicValue())
-                continue;
-            if (v.isImpossible())
-                continue;
-            if (!v.tokvalue)
-                continue;
-            if (v.tokvalue->exprId() == 0)
-                continue;
-            if (match(v.tokvalue))
-                continue;
-            result[v.tokvalue->exprId()] = v.tokvalue;
-        }
-        return result;
-    }
-
-    ConditionState analyzeCondition(const Token* tok, int depth = 20) const
-    {
-        ConditionState result;
-        if (!tok)
-            return result;
-        if (depth < 0)
-            return result;
-        depth--;
-        if (analyze(tok, Direction::Forward).isRead()) {
-            result.dependent = true;
-            result.unknown = false;
-            return result;
-        }
-        if (tok->hasKnownIntValue() || tok->isLiteral()) {
-            result.dependent = false;
-            result.unknown = false;
-            return result;
-        }
-        if (Token::Match(tok, "%cop%")) {
-            if (isLikelyStream(isCPP(), tok->astOperand1())) {
-                result.dependent = false;
-                return result;
-            }
-            ConditionState lhs = analyzeCondition(tok->astOperand1(), depth - 1);
-            if (lhs.isUnknownDependent())
-                return lhs;
-            ConditionState rhs = analyzeCondition(tok->astOperand2(), depth - 1);
-            if (rhs.isUnknownDependent())
-                return rhs;
-            if (Token::Match(tok, "%comp%"))
-                result.dependent = lhs.dependent && rhs.dependent;
-            else
-                result.dependent = lhs.dependent || rhs.dependent;
-            result.unknown = lhs.unknown || rhs.unknown;
-            return result;
-        }
-        if (Token::Match(tok->previous(), "%name% (")) {
-            std::vector<const Token*> args = getArguments(tok->previous());
-            if (Token::Match(tok->tokAt(-2), ". %name% (")) {
-                args.push_back(tok->tokAt(-2)->astOperand1());
-            }
-            result.dependent = std::any_of(args.cbegin(), args.cend(), [&](const Token* arg) {
-                ConditionState cs = analyzeCondition(arg, depth - 1);
-                return cs.dependent;
-            });
-            if (result.dependent) {
-                // Check if we can evaluate the function
-                if (!evaluate(Evaluate::Integral, tok).empty())
-                    result.unknown = false;
-            }
-            return result;
-        }
-
-        std::unordered_map<nonneg int, const Token*> symbols = getSymbols(tok);
-        result.dependent = false;
-        for (auto&& p : symbols) {
-            const Token* arg = p.second;
-            ConditionState cs = analyzeCondition(arg, depth - 1);
-            result.dependent = cs.dependent;
-            if (result.dependent)
-                break;
-        }
-        if (result.dependent) {
-            // Check if we can evaluate the token
-            if (!evaluate(Evaluate::Integral, tok).empty())
-                result.unknown = false;
-        }
-        return result;
-    }
-
-    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;
-            // Inserting elements to container won't change the lifetime
-            if (astIsContainer(tok) && value->isLifetimeValue() &&
-                contains({Library::Container::Action::PUSH,
-                          Library::Container::Action::INSERT,
-                          Library::Container::Action::CHANGE_INTERNAL},
-                         astContainerAction(tok)))
-                return read;
-        }
-        bool inconclusive = false;
-        if (isVariableChangedByFunctionCall(tok, getIndirect(tok), getSettings(), &inconclusive))
-            return read | Action::Invalid;
-        if (inconclusive)
-            return read | Action::Inconclusive;
-        if (isVariableChanged(tok, getIndirect(tok), getSettings(), isCPP())) {
-            if (Token::Match(tok->astParent(), "*|[|.|++|--"))
-                return 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)) {
-                std::vector<MathLib::bigint> result = evaluateInt(tok->astParent()->astOperand2());
-                if (!result.empty() && value->equalTo(result.front()))
-                    return Action::Idempotent;
-            }
-            return Action::Invalid;
-        }
-        return read;
-    }
-
-    virtual Action isAliasModified(const Token* tok) const {
-        // Lambda function call
-        if (Token::Match(tok, "%var% ("))
-            // TODO: Check if modified in the lambda function
-            return Action::Invalid;
-        int indirect = 0;
-        if (const ValueType* vt = tok->valueType()) {
-            indirect = vt->pointer;
-            if (vt->type == ValueType::ITERATOR)
-                ++indirect;
-        }
-        if (isVariableChanged(tok, indirect, getSettings(), isCPP()))
-            return Action::Invalid;
-        return Action::None;
-    }
-
-    virtual Action isThisModified(const Token* tok) const {
-        if (isThisChanged(tok, 0, getSettings(), isCPP()))
-            return Action::Invalid;
-        return Action::None;
-    }
-
-    Action isGlobalModified(const Token* tok) const
-    {
-        if (tok->function()) {
-            if (!tok->function()->isConstexpr() && !isConstFunctionCall(tok, getSettings()->library))
-                return Action::Invalid;
-        } else if (getSettings()->library.getFunction(tok)) {
-            // Assume library function doesn't modify user-global variables
-            return Action::None;
-        } else if (Token::simpleMatch(tok->astParent(), ".") && astIsContainer(tok->astParent()->astOperand1())) {
-            // Assume container member function doesn't modify user-global variables
-            return Action::None;
-        } else if (tok->tokType() == Token::eType && astIsPrimitive(tok->next())) {
-            // Function cast does not modify global variables
-            return Action::None;
-        } else if (!tok->isKeyword() && Token::Match(tok, "%name% (")) {
-            return Action::Invalid;
-        }
-        return Action::None;
-    }
-
-    static const std::string& getAssign(const Token* tok, Direction d)
-    {
-        if (d == Direction::Forward)
-            return tok->str();
-        return invertAssign(tok->str());
-    }
-
-    virtual Action isWritable(const Token* tok, Direction d) const {
-        const ValueFlow::Value* value = getValue(tok);
-        if (!value)
-            return Action::None;
-        if (!(value->isIntValue() || value->isFloatValue() || value->isSymbolicValue() || value->isLifetimeValue()))
-            return Action::None;
-        const Token* parent = tok->astParent();
-        // Only if its invertible
-        if (value->isImpossible() && !Token::Match(parent, "+=|-=|*=|++|--"))
-            return Action::None;
-        if (value->isLifetimeValue()) {
-            if (value->lifetimeKind != ValueFlow::Value::LifetimeKind::Iterator)
-                return Action::None;
-            if (!Token::Match(parent, "++|--|+="))
-                return Action::None;
-            return Action::Read | Action::Write;
-        }
-        if (parent && parent->isAssignmentOp() && astIsLHS(tok)) {
-            const Token* rhs = parent->astOperand2();
-            std::vector<MathLib::bigint> result = evaluateInt(rhs);
-            if (!result.empty()) {
-                ValueFlow::Value rhsValue{result.front()};
-                Action a;
-                if (!evalAssignment(*value, getAssign(parent, d), rhsValue))
-                    a = Action::Invalid;
-                else
-                    a = Action::Write;
-                if (parent->str() != "=") {
-                    a |= Action::Read | Action::Incremental;
-                } else {
-                    if (!value->isImpossible() && value->equalValue(rhsValue))
-                        a = Action::Idempotent;
-                    if (tok->exprId() != 0 &&
-                        findAstNode(rhs, [&](const Token* child) {
-                        return tok->exprId() == child->exprId();
-                    }))
-                        a |= Action::Incremental;
-                }
-                return a;
-            }
-        }
-
-        // increment/decrement
-        if (Token::Match(tok->astParent(), "++|--")) {
-            return Action::Read | Action::Write | Action::Incremental;
-        }
-        return Action::None;
-    }
-
-    virtual void writeValue(ValueFlow::Value* value, const Token* tok, Direction d) const {
-        if (!value)
-            return;
-        if (!tok->astParent())
-            return;
-        // Lifetime value doesn't change
-        if (value->isLifetimeValue())
-            return;
-        if (tok->astParent()->isAssignmentOp()) {
-            const Token* rhs = tok->astParent()->astOperand2();
-            std::vector<MathLib::bigint> result = evaluateInt(rhs);
-            assert(!result.empty());
-            ValueFlow::Value rhsValue{result.front()};
-            if (evalAssignment(*value, getAssign(tok->astParent(), d), rhsValue)) {
-                std::string info("Compound assignment '" + tok->astParent()->str() + "', assigned value is " +
-                                 value->infoString());
-                if (tok->astParent()->str() == "=")
-                    value->errorPath.clear();
-                value->errorPath.emplace_back(tok, std::move(info));
-            } else {
-                assert(false && "Writable value cannot be evaluated");
-                // TODO: Don't set to zero
-                value->intvalue = 0;
-            }
-        } else if (tok->astParent()->tokType() == Token::eIncDecOp) {
-            bool inc = tok->astParent()->str() == "++";
-            const std::string opName(inc ? "incremented" : "decremented");
-            if (d == Direction::Reverse)
-                inc = !inc;
-            value->intvalue += (inc ? 1 : -1);
-            value->errorPath.emplace_back(tok, tok->str() + " is " + opName + "', new value is " + value->infoString());
-        }
-    }
-
-    virtual bool useSymbolicValues() const {
-        return true;
-    }
-
-    const Token* findMatch(const Token* tok) const
-    {
-        return findAstNode(tok, [&](const Token* child) {
-            return match(child);
-        });
-    }
-
-    bool isSameSymbolicValue(const Token* tok, ValueFlow::Value* value = nullptr) const
-    {
-        if (!useSymbolicValues())
-            return false;
-        if (Token::Match(tok, "%assign%"))
-            return false;
-        const ValueFlow::Value* currValue = getValue(tok);
-        if (!currValue)
-            return false;
-        // If the same symbolic value is already there then skip
-        if (currValue->isSymbolicValue() &&
-            std::any_of(tok->values().cbegin(), tok->values().cend(), [&](const ValueFlow::Value& v) {
-            return v.isSymbolicValue() && currValue->equalValue(v);
-        }))
-            return false;
-        const bool isPoint = currValue->bound == ValueFlow::Value::Bound::Point && currValue->isIntValue();
-        const bool exact = !currValue->isIntValue() || currValue->isImpossible();
-        for (const ValueFlow::Value& v : tok->values()) {
-            if (!v.isSymbolicValue())
-                continue;
-            if (currValue->equalValue(v))
-                continue;
-            const bool toImpossible = v.isImpossible() && currValue->isKnown();
-            if (!v.isKnown() && !toImpossible)
-                continue;
-            if (exact && v.intvalue != 0 && !isPoint)
-                continue;
-            std::vector<MathLib::bigint> r;
-            ValueFlow::Value::Bound bound = currValue->bound;
-            if (match(v.tokvalue)) {
-                r = {currValue->intvalue};
-            } else if (!exact && findMatch(v.tokvalue)) {
-                r = evaluate(Evaluate::Integral, v.tokvalue, tok);
-                if (bound == ValueFlow::Value::Bound::Point)
-                    bound = v.bound;
-            }
-            if (!r.empty()) {
-                if (value) {
-                    value->errorPath.insert(value->errorPath.end(), v.errorPath.cbegin(), v.errorPath.cend());
-                    value->intvalue = r.front() + v.intvalue;
-                    if (toImpossible)
-                        value->setImpossible();
-                    value->bound = bound;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    Action analyzeMatch(const Token* tok, Direction d) const {
-        const Token* parent = tok->astParent();
-        if (d == Direction::Reverse && isGlobal() && !dependsOnThis() && Token::Match(parent, ". %name% (")) {
-            Action a = isGlobalModified(parent->next());
-            if (a != Action::None)
-                return a;
-        }
-        if ((astIsPointer(tok) || astIsSmartPointer(tok)) &&
-            (Token::Match(parent, "*|[") || (parent && parent->originalName() == "->")) && getIndirect(tok) <= 0)
-            return Action::Read;
-
-        Action w = isWritable(tok, d);
-        if (w != Action::None)
-            return w;
-
-        // Check for modifications by function calls
-        return isModified(tok);
-    }
-
-    Action analyzeToken(const Token* ref, const Token* tok, Direction d, bool inconclusiveRef) const {
-        if (!ref)
-            return Action::None;
-        // If its an inconclusiveRef then ref != tok
-        assert(!inconclusiveRef || ref != tok);
-        bool inconclusive = false;
-        if (match(ref)) {
-            if (inconclusiveRef) {
-                Action a = isModified(tok);
-                if (a.isModified() || a.isInconclusive())
-                    return Action::Inconclusive;
-            } else {
-                return analyzeMatch(tok, d) | Action::Match;
-            }
-        } else if (ref->isUnaryOp("*") && !match(ref->astOperand1())) {
-            const Token* lifeTok = nullptr;
-            for (const ValueFlow::Value& v:ref->astOperand1()->values()) {
-                if (!v.isLocalLifetimeValue())
-                    continue;
-                if (lifeTok)
-                    return Action::None;
-                lifeTok = v.tokvalue;
-            }
-            if (lifeTok && match(lifeTok)) {
-                Action a = Action::Read;
-                if (isModified(tok).isModified())
-                    a = Action::Invalid;
-                if (Token::Match(tok->astParent(), "%assign%") && astIsLHS(tok))
-                    a |= Action::Invalid;
-                if (inconclusiveRef && a.isModified())
-                    return Action::Inconclusive;
-                return a;
-            }
-            return Action::None;
-
-        } else if (isAlias(ref, inconclusive)) {
-            inconclusive |= inconclusiveRef;
-            Action a = isAliasModified(tok);
-            if (inconclusive && a.isModified())
-                return Action::Inconclusive;
-            return a;
-        }
-        if (isSameSymbolicValue(ref))
-            return Action::Read | Action::SymbolicMatch;
-
-        return Action::None;
-    }
-
-    Action analyze(const Token* tok, Direction d) const override {
-        if (invalid())
-            return Action::Invalid;
-        // Follow references
-        auto refs = followAllReferences(tok);
-        const bool inconclusiveRefs = refs.size() != 1;
-        if (std::none_of(refs.cbegin(), refs.cend(), [&](const ReferenceToken& ref) {
-            return tok == ref.token;
-        }))
-            refs.emplace_back(ReferenceToken{tok, {}});
-        for (const ReferenceToken& ref:refs) {
-            Action a = analyzeToken(ref.token, tok, d, inconclusiveRefs && ref.token != tok);
-            if (internalMatch(ref.token))
-                a |= Action::Internal;
-            if (a != Action::None)
-                return a;
-        }
-        if (dependsOnThis() && exprDependsOnThis(tok, !isVariable()))
-            return isThisModified(tok);
-
-        // bailout: global non-const variables
-        if (isGlobal() && !dependsOnThis() && Token::Match(tok, "%name% (") &&
-            !Token::simpleMatch(tok->linkAt(1), ") {")) {
-            return isGlobalModified(tok);
-        }
-        return Action::None;
-    }
-
-    template<class F>
-    std::vector<MathLib::bigint> evaluateInt(const Token* tok, F getProgramMemory) const
-    {
-        if (tok->hasKnownIntValue())
-            return {static_cast<int>(tok->values().front().intvalue)};
-        std::vector<MathLib::bigint> result;
-        ProgramMemory pm = getProgramMemory();
-        if (Token::Match(tok, "&&|%oror%")) {
-            if (conditionIsTrue(tok, pm, getSettings()))
-                result.push_back(1);
-            if (conditionIsFalse(tok, pm, getSettings()))
-                result.push_back(0);
-        } else {
-            MathLib::bigint out = 0;
-            bool error = false;
-            execute(tok, pm, &out, &error, getSettings());
-            if (!error)
-                result.push_back(out);
-        }
-        return result;
-    }
-    std::vector<MathLib::bigint> evaluateInt(const Token* tok) const
-    {
-        return evaluateInt(tok, [&] {
-            return ProgramMemory{getProgramState()};
-        });
-    }
-
-    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());
-            });
-        }
-        if (e == Evaluate::ContainerEmpty) {
-            const ValueFlow::Value* value = ValueFlow::findValue(tok->values(), nullptr, [](const ValueFlow::Value& v) {
-                return v.isKnown() && v.isContainerSizeValue();
-            });
-            if (value)
-                return {value->intvalue == 0};
-            ProgramMemory pm = pms.get(tok, ctx, getProgramState());
-            MathLib::bigint out = 0;
-            if (pm.getContainerEmptyValue(tok->exprId(), out))
-                return {static_cast<int>(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);
-
-        bool isCondBlock = false;
-        const Token* parent = tok->astParent();
-        if (parent) {
-            isCondBlock = Token::Match(parent->previous(), "if|while (");
-        }
-
-        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());
-            }
-        }
-
-        if (!(flags & Assume::Quiet)) {
-            if (flags & Assume::ContainerEmpty) {
-                std::string s = state ? "empty" : "not empty";
-                addErrorPath(tok, "Assuming container is " + s);
-            } else {
-                std::string s = state ? "true" : "false";
-                addErrorPath(tok, "Assuming condition is " + s);
-            }
-        }
-        if (!(flags & Assume::Absolute))
-            makeConditional();
-    }
-
-    virtual void internalUpdate(Token* /*tok*/, const ValueFlow::Value& /*v*/, Direction /*d*/)
-    {
-        assert(false && "Internal update unimplemented.");
-    }
-
-    void update(Token* tok, Action a, Direction d) override {
-        ValueFlow::Value* value = getValue(tok);
-        if (!value)
-            return;
-        ValueFlow::Value localValue;
-        if (a.isSymbolicMatch()) {
-            // Make a copy of the value to modify it
-            localValue = *value;
-            value = &localValue;
-            isSameSymbolicValue(tok, &localValue);
-        }
-        if (a.isInternal())
-            internalUpdate(tok, *value, d);
-        // Read first when moving forward
-        if (d == Direction::Forward && a.isRead())
-            setTokenValue(tok, *value, getSettings());
-        if (a.isInconclusive())
-            lowerToInconclusive();
-        if (a.isWrite() && tok->astParent()) {
-            writeValue(value, tok, d);
-        }
-        // Read last when moving in reverse
-        if (d == Direction::Reverse && a.isRead())
-            setTokenValue(tok, *value, getSettings());
-    }
-
-    ValuePtr<Analyzer> reanalyze(Token* /*tok*/, const std::string& /*msg*/) const override {
-        return {};
-    }
-};
-
-struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
-    std::unordered_map<nonneg int, const Variable*> varids;
-    std::unordered_map<nonneg int, const Variable*> aliases;
-    ValueFlow::Value value;
-
-    SingleValueFlowAnalyzer() : ValueFlowAnalyzer() {}
-
-    SingleValueFlowAnalyzer(ValueFlow::Value v, const TokenList* t, const Settings* s) : ValueFlowAnalyzer(t, s), value(std::move(v)) {}
-
-    const std::unordered_map<nonneg int, const Variable*>& getVars() const {
-        return varids;
-    }
-
-    const std::unordered_map<nonneg int, const Variable*>& getAliasedVars() const {
-        return aliases;
-    }
-
-    const ValueFlow::Value* getValue(const Token* /*tok*/) const override {
-        return &value;
-    }
-    ValueFlow::Value* getValue(const Token* /*tok*/) override {
-        return &value;
-    }
-
-    void makeConditional() override {
-        value.conditional = true;
-    }
-
-    bool useSymbolicValues() const override
-    {
-        if (value.isUninitValue())
-            return false;
-        if (value.isLifetimeValue())
-            return false;
-        return true;
-    }
-
-    void addErrorPath(const Token* tok, const std::string& s) override {
-        value.errorPath.emplace_back(tok, s);
-    }
-
-    bool isAlias(const Token* tok, bool& inconclusive) const override {
-        if (value.isLifetimeValue())
-            return false;
-        for (const auto& m: {
-            std::ref(getVars()), std::ref(getAliasedVars())
-        }) {
-            for (const auto& p:m.get()) {
-                nonneg int const varid = p.first;
-                const Variable* var = p.second;
-                if (tok->varId() == varid)
-                    return true;
-                if (isAliasOf(var, tok, varid, MakeSingleRange(value), &inconclusive))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    bool isGlobal() const override {
-        for (const auto&p:getVars()) {
-            const Variable* var = p.second;
-            if (!var->isLocal() && !var->isArgument() && !var->isConst())
-                return true;
-        }
-        return false;
-    }
-
-    bool lowerToPossible() override {
-        if (value.isImpossible())
-            return false;
-        value.changeKnownToPossible();
-        return true;
-    }
-    bool lowerToInconclusive() override {
-        if (value.isImpossible())
-            return false;
-        value.setInconclusive();
-        return true;
-    }
-
-    bool isConditional() const override {
-        if (value.conditional)
-            return true;
-        if (value.condition)
-            return !value.isKnown() && !value.isImpossible();
-        return false;
-    }
-
-    bool stopOnCondition(const Token* condTok) const override
-    {
-        if (value.isNonValue())
-            return false;
-        if (value.isImpossible())
-            return false;
-        if (isConditional() && !value.isKnown() && !value.isImpossible())
-            return true;
-        if (value.isSymbolicValue())
-            return false;
-        ConditionState cs = analyzeCondition(condTok);
-        return cs.isUnknownDependent();
-    }
-
-    bool updateScope(const Token* endBlock, bool /*modified*/) const override {
-        const Scope* scope = endBlock->scope();
-        if (!scope)
-            return false;
-        if (scope->type == Scope::eLambda)
-            return value.isLifetimeValue();
-        if (scope->type == Scope::eIf || scope->type == Scope::eElse || scope->type == Scope::eWhile ||
-            scope->type == Scope::eFor) {
-            if (value.isKnown() || value.isImpossible())
-                return true;
-            if (value.isLifetimeValue())
-                return true;
-            if (isConditional())
-                return false;
-            const Token* condTok = getCondTokFromEnd(endBlock);
-            std::set<nonneg int> varids2;
-            std::transform(getVars().cbegin(), getVars().cend(), std::inserter(varids2, varids2.begin()), SelectMapKeys{});
-            return bifurcate(condTok, varids2, getSettings());
-        }
-
-        return false;
-    }
-
-    ValuePtr<Analyzer> reanalyze(Token* tok, const std::string& msg) const override {
-        ValueFlow::Value newValue = value;
-        newValue.errorPath.emplace_back(tok, msg);
-        return makeAnalyzer(tok, std::move(newValue), tokenlist, settings);
-    }
-};
-
-struct ExpressionAnalyzer : SingleValueFlowAnalyzer {
-    const Token* expr;
-    bool local;
-    bool unknown;
-    bool dependOnThis;
-    bool uniqueExprId;
-
-    ExpressionAnalyzer()
-        : SingleValueFlowAnalyzer(), expr(nullptr), local(true), unknown(false), dependOnThis(false), uniqueExprId(false)
-    {}
-
-    ExpressionAnalyzer(const Token* e, ValueFlow::Value val, const TokenList* t, const Settings* s)
-        : SingleValueFlowAnalyzer(std::move(val), t, s),
-        expr(e),
-        local(true),
-        unknown(false),
-        dependOnThis(false),
-        uniqueExprId(false)
-    {
-
-        assert(e && e->exprId() != 0 && "Not a valid expression");
-        dependOnThis = exprDependsOnThis(expr);
-        setupExprVarIds(expr);
-        if (value.isSymbolicValue()) {
-            dependOnThis |= exprDependsOnThis(value.tokvalue);
-            setupExprVarIds(value.tokvalue);
-        }
-        uniqueExprId =
-            expr->isUniqueExprId() && (Token::Match(expr, "%cop%") || !isVariableChanged(expr, 0, s, t->isCPP()));
-    }
-
-    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();
-    }
-
-    void setupExprVarIds(const Token* start, int depth = 0) {
-        const int maxDepth = 4;
-        if (depth > maxDepth)
-            return;
-        visitAstNodes(start, [&](const Token* tok) {
-            const bool top = depth == 0 && tok == start;
-            const bool ispointer = astIsPointer(tok) || astIsSmartPointer(tok) || astIsIterator(tok);
-            if (!top || !ispointer || value.indirect != 0) {
-                for (const ValueFlow::Value& v : tok->values()) {
-                    if (!(v.isLocalLifetimeValue() || (ispointer && v.isSymbolicValue() && v.isKnown())))
-                        continue;
-                    if (!v.tokvalue)
-                        continue;
-                    if (v.tokvalue == tok)
-                        continue;
-                    setupExprVarIds(v.tokvalue, depth + 1);
-                }
-            }
-            if (depth == 0 && tok->isIncompleteVar()) {
-                // TODO: Treat incomplete var as global, but we need to update
-                // the alias variables to just expr ids instead of requiring
-                // Variable
-                unknown = true;
-                return ChildrenToVisit::none;
-            }
-            if (tok->varId() > 0) {
-                varids[tok->varId()] = tok->variable();
-                if (!Token::simpleMatch(tok->previous(), ".")) {
-                    const Variable* var = tok->variable();
-                    if (var && var->isReference() && var->isLocal() && Token::Match(var->nameToken(), "%var% [=(]") &&
-                        !isGlobalData(var->nameToken()->next()->astOperand2(), isCPP()))
-                        return ChildrenToVisit::none;
-                    const bool deref = tok->astParent() &&
-                                       (tok->astParent()->isUnaryOp("*") ||
-                                        (tok->astParent()->str() == "[" && tok == tok->astParent()->astOperand1()));
-                    local &= !nonLocal(tok->variable(), deref);
-                }
-            }
-            return ChildrenToVisit::op1_and_op2;
-        });
-    }
-
-    virtual bool skipUniqueExprIds() const {
-        return true;
-    }
-
-    bool invalid() const override {
-        if (skipUniqueExprIds() && uniqueExprId)
-            return true;
-        return unknown;
-    }
-
-    ProgramState getProgramState() const override {
-        ProgramState ps;
-        ps[expr] = value;
-        return ps;
-    }
-
-    bool match(const Token* tok) const override {
-        return tok->exprId() == expr->exprId();
-    }
-
-    bool dependsOnThis() const override {
-        return dependOnThis;
-    }
-
-    bool isGlobal() const override {
-        return !local;
-    }
-
-    bool isVariable() const override {
-        return expr->varId() > 0;
-    }
-};
-
-struct SameExpressionAnalyzer : ExpressionAnalyzer {
-
-    SameExpressionAnalyzer() : ExpressionAnalyzer() {}
-
-    SameExpressionAnalyzer(const Token* e, ValueFlow::Value val, const TokenList* t, const Settings* s)
-        : ExpressionAnalyzer(e, std::move(val), t, s)
-    {}
-
-    bool skipUniqueExprIds() const override {
-        return false;
-    }
-
-    bool match(const Token* tok) const override
-    {
-        return isSameExpression(isCPP(), true, expr, tok, getSettings()->library, true, true);
-    }
-};
-
-struct OppositeExpressionAnalyzer : ExpressionAnalyzer {
-    bool isNot;
-
-    OppositeExpressionAnalyzer() : ExpressionAnalyzer(), isNot(false) {}
-
-    OppositeExpressionAnalyzer(bool pIsNot, const Token* e, ValueFlow::Value val, const TokenList* t, const Settings* s)
-        : ExpressionAnalyzer(e, std::move(val), t, s), isNot(pIsNot)
-    {}
-
-    bool skipUniqueExprIds() const override {
-        return false;
-    }
-
-    bool match(const Token* tok) const override {
-        return isOppositeCond(isNot, isCPP(), expr, tok, getSettings()->library, true, true);
-    }
-};
-
-struct SubExpressionAnalyzer : ExpressionAnalyzer {
-    using PartialReadContainer = std::vector<std::pair<Token *, ValueFlow::Value>>;
-    // A shared_ptr is used so partial reads can be captured even after forking
-    std::shared_ptr<PartialReadContainer> partialReads;
-    SubExpressionAnalyzer() : ExpressionAnalyzer(), partialReads(nullptr) {}
-
-    SubExpressionAnalyzer(const Token* e, ValueFlow::Value val, const TokenList* t, const Settings* s)
-        : ExpressionAnalyzer(e, std::move(val), t, s), partialReads(std::make_shared<PartialReadContainer>())
-    {}
+    }
+}
 
-    virtual bool submatch(const Token* tok, bool exact = true) const = 0;
+static Analyzer::Result valueFlowForward(Token* startToken,
+                                         const Token* endToken,
+                                         const Token* exprTok,
+                                         ValueFlow::Value value,
+                                         const TokenList& tokenlist,
+                                         ErrorLogger& errorLogger,
+                                         const Settings& settings,
+                                         SourceLocation loc = SourceLocation::current())
+{
+    if (settings.debugnormal)
+        setSourceLocation(value, loc, startToken);
+    return valueFlowGenericForward(startToken,
+                                   endToken,
+                                   makeAnalyzer(exprTok, std::move(value), settings),
+                                   tokenlist,
+                                   errorLogger,
+                                   settings);
+}
 
-    bool isAlias(const Token* tok, bool& inconclusive) const override
-    {
-        if (tok->exprId() == expr->exprId() && tok->astParent() && submatch(tok->astParent(), false))
-            return false;
-        return ExpressionAnalyzer::isAlias(tok, inconclusive);
+static Analyzer::Result valueFlowForward(Token* startToken,
+                                         const Token* endToken,
+                                         const Token* exprTok,
+                                         std::list<ValueFlow::Value> values,
+                                         const TokenList& tokenlist,
+                                         ErrorLogger& errorLogger,
+                                         const Settings& settings,
+                                         SourceLocation loc = SourceLocation::current())
+{
+    Analyzer::Result result{};
+    for (ValueFlow::Value& v : values) {
+        result.update(valueFlowForward(startToken, endToken, exprTok, std::move(v), tokenlist, errorLogger, settings, loc));
     }
+    return result;
+}
 
-    bool match(const Token* tok) const override
-    {
-        return tok->astOperand1() && tok->astOperand1()->exprId() == expr->exprId() && submatch(tok);
-    }
-    bool internalMatch(const Token* tok) const override
-    {
-        return tok->exprId() == expr->exprId() && !(astIsLHS(tok) && submatch(tok->astParent(), false));
-    }
-    void internalUpdate(Token* tok, const ValueFlow::Value& v, Direction /*d*/) override
-    {
-        partialReads->emplace_back(tok, v);
-    }
+template<class ValueOrValues>
+static Analyzer::Result valueFlowForward(Token* startToken,
+                                         const Token* exprTok,
+                                         ValueOrValues v,
+                                         const TokenList& tokenlist,
+                                         ErrorLogger& errorLogger,
+                                         const Settings& settings,
+                                         SourceLocation loc = SourceLocation::current())
+{
+    const Token* endToken = nullptr;
+    const Function* f = Scope::nestedInFunction(startToken->scope());
+    if (f && f->functionScope)
+        endToken = f->functionScope->bodyEnd;
+    if (!endToken && exprTok && exprTok->variable() && !exprTok->variable()->isLocal())
+        endToken = startToken->scope()->bodyEnd;
+    return valueFlowForward(startToken, endToken, exprTok, std::move(v), tokenlist, errorLogger, settings, loc);
+}
 
-    // No reanalysis for subexression
-    ValuePtr<Analyzer> reanalyze(Token* /*tok*/, const std::string& /*msg*/) const override {
-        return {};
+static Analyzer::Result valueFlowForwardRecursive(Token* top,
+                                                  const Token* exprTok,
+                                                  std::list<ValueFlow::Value> values,
+                                                  const TokenList& tokenlist,
+                                                  ErrorLogger& errorLogger,
+                                                  const Settings& settings,
+                                                  SourceLocation loc = SourceLocation::current())
+{
+    Analyzer::Result result{};
+    for (ValueFlow::Value& v : values) {
+        if (settings.debugnormal)
+            setSourceLocation(v, loc, top);
+        result.update(
+            valueFlowGenericForward(top, makeAnalyzer(exprTok, std::move(v), settings), tokenlist, errorLogger, settings));
     }
-};
+    return result;
+}
 
-struct MemberExpressionAnalyzer : SubExpressionAnalyzer {
-    std::string varname;
-    MemberExpressionAnalyzer() : SubExpressionAnalyzer(), varname() {}
+static void valueFlowReverse(Token* tok,
+                             const Token* const endToken,
+                             const Token* const varToken,
+                             std::list<ValueFlow::Value> values,
+                             const TokenList& tokenlist,
+                             ErrorLogger& errorLogger,
+                             const Settings& settings,
+                             SourceLocation loc = SourceLocation::current())
+{
+    for (ValueFlow::Value& v : values) {
+        if (settings.debugnormal)
+            setSourceLocation(v, loc, tok);
+        valueFlowGenericReverse(tok,
+                                endToken,
+                                makeReverseAnalyzer(varToken, std::move(v), settings),
+                                tokenlist,
+                                errorLogger,
+                                settings);
+    }
+}
 
-    MemberExpressionAnalyzer(std::string varname, const Token* e, ValueFlow::Value val, const TokenList* t, const Settings* s)
-        : SubExpressionAnalyzer(e, std::move(val), t, s), varname(std::move(varname))
-    {}
+// Deprecated
+static void valueFlowReverse(const TokenList& tokenlist,
+                             Token* tok,
+                             const Token* const varToken,
+                             ValueFlow::Value val,
+                             ErrorLogger& errorLogger,
+                             const Settings& settings,
+                             SourceLocation loc = SourceLocation::current())
+{
+    valueFlowReverse(tok, nullptr, varToken, {std::move(val)}, tokenlist, errorLogger, settings, loc);
+}
 
-    bool submatch(const Token* tok, bool exact) const override
-    {
-        if (!Token::Match(tok, ". %var%"))
-            return false;
-        if (!exact)
-            return true;
-        return tok->next()->str() == varname;
-    }
-};
+static bool isConditionKnown(const Token* tok, bool then)
+{
+    const char* op = "||";
+    if (then)
+        op = "&&";
+    const Token* parent = tok->astParent();
+    while (parent && (parent->str() == op || parent->str() == "!" || parent->isCast()))
+        parent = parent->astParent();
+    const Token* top = tok->astTop();
+    if (Token::Match(top->previous(), "if|while|for ("))
+        return parent == top || Token::simpleMatch(parent, ";");
+    return parent && parent->str() != op;
+}
 
-enum class LifetimeCapture { Undefined, ByValue, ByReference };
+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
-            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)
@@ -3453,8 +1518,9 @@ ValueFlow::Value ValueFlow::getLifetimeObjValue(const Token *tok, bool inconclus
 template<class Predicate>
 static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
                                                                bool escape,
-                                                               ValueFlow::Value::ErrorPath errorPath,
+                                                               ErrorPath errorPath,
                                                                Predicate pred,
+                                                               const Settings& settings,
                                                                int depth = 20)
 {
     if (!tok)
@@ -3475,16 +1541,16 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
                 errorPath.emplace_back(varDeclEndToken, "Passed to reference.");
                 return {{tok, true, std::move(errorPath)}};
             }
-            if (Token::simpleMatch(varDeclEndToken, "=")) {
+            if (Token::Match(varDeclEndToken, "=|{")) {
                 errorPath.emplace_back(varDeclEndToken, "Assigned to reference.");
                 const Token *vartok = varDeclEndToken->astOperand2();
-                const bool temporary = isTemporary(true, vartok, nullptr, true);
+                const bool temporary = isTemporary(vartok, nullptr, true);
                 const bool nonlocal = var->isStatic() || var->isGlobal();
                 if (vartok == tok || (nonlocal && temporary) ||
                     (!escape && (var->isConst() || var->isRValueReference()) && temporary))
                     return {{tok, true, std::move(errorPath)}};
                 if (vartok)
-                    return getLifetimeTokens(vartok, escape, std::move(errorPath), pred, depth - 1);
+                    return getLifetimeTokens(vartok, escape, std::move(errorPath), pred, settings, depth - 1);
             } else if (Token::simpleMatch(var->nameToken()->astParent(), ":") &&
                        var->nameToken()->astParent()->astParent() &&
                        Token::simpleMatch(var->nameToken()->astParent()->astParent()->previous(), "for (")) {
@@ -3494,7 +1560,9 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
                     return {{tok, true, std::move(errorPath)}};
                 const Token* contok = var->nameToken()->astParent()->astOperand2();
                 if (astIsContainer(contok))
-                    return getLifetimeTokens(contok, escape, std::move(errorPath), pred, depth - 1);
+                    return ValueFlow::LifetimeToken::setAddressOf(
+                        getLifetimeTokens(contok, escape, std::move(errorPath), pred, settings, depth - 1),
+                        false);
                 return std::vector<ValueFlow::LifetimeToken>{};
             } else {
                 return std::vector<ValueFlow::LifetimeToken> {};
@@ -3510,13 +1578,11 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
             for (const Token* returnTok : returns) {
                 if (returnTok == tok)
                     continue;
-                for (ValueFlow::LifetimeToken& lt : getLifetimeTokens(returnTok, escape, errorPath, pred, depth - returns.size())) {
+                for (ValueFlow::LifetimeToken& lt : getLifetimeTokens(returnTok, escape, errorPath, pred, settings, depth - returns.size())) {
                     const Token* argvarTok = lt.token;
                     const Variable* argvar = argvarTok->variable();
-                    if (!argvar)
-                        continue;
                     const Token* argTok = nullptr;
-                    if (argvar->isArgument() && (argvar->isReference() || argvar->isRValueReference())) {
+                    if (argvar && argvar->isArgument() && (argvar->isReference() || argvar->isRValueReference())) {
                         const int n = getArgumentPos(argvar, f);
                         if (n < 0)
                             return std::vector<ValueFlow::LifetimeToken> {};
@@ -3536,7 +1602,7 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
                     }
                     if (argTok) {
                         std::vector<ValueFlow::LifetimeToken> arglts = ValueFlow::LifetimeToken::setInconclusive(
-                            getLifetimeTokens(argTok, escape, std::move(lt.errorPath), pred, depth - returns.size()),
+                            getLifetimeTokens(argTok, escape, std::move(lt.errorPath), pred, settings, depth - returns.size()),
                             returns.size() > 1);
                         result.insert(result.end(), arglts.cbegin(), arglts.cend());
                     }
@@ -3546,11 +1612,11 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
         }
         if (Token::Match(tok->tokAt(-2), ". %name% (") && tok->tokAt(-2)->originalName() != "->" && astIsContainer(tok->tokAt(-2)->astOperand1())) {
             const Library::Container* library = getLibraryContainer(tok->tokAt(-2)->astOperand1());
-            const Library::Container::Yield y = library->getYield(tok->previous()->str());
+            const Library::Container::Yield y = library->getYield(tok->strAt(-1));
             if (y == Library::Container::Yield::AT_INDEX || y == Library::Container::Yield::ITEM) {
                 errorPath.emplace_back(tok->previous(), "Accessing container.");
                 return ValueFlow::LifetimeToken::setAddressOf(
-                    getLifetimeTokens(tok->tokAt(-2)->astOperand1(), escape, std::move(errorPath), pred, depth - 1),
+                    getLifetimeTokens(tok->tokAt(-2)->astOperand1(), escape, std::move(errorPath), pred, settings, depth - 1),
                     false);
             }
         }
@@ -3558,9 +1624,16 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
 
         const Token *vartok = tok;
         while (vartok) {
-            if (vartok->str() == "[" || vartok->originalName() == "->" || vartok->isUnaryOp("*"))
+            if (vartok->str() == "[" || vartok->isUnaryOp("*"))
                 vartok = vartok->astOperand1();
-            else if (vartok->str() == "." || vartok->str() == "::")
+            else if (vartok->str() == ".") {
+                if (!Token::simpleMatch(vartok->astOperand1(), ".") &&
+                    !(vartok->astOperand2() && vartok->astOperand2()->valueType() && vartok->astOperand2()->valueType()->reference != Reference::None))
+                    vartok = vartok->astOperand1();
+                else
+                    break;
+            }
+            else if (vartok->str() == "::")
                 vartok = vartok->astOperand2();
             else
                 break;
@@ -3575,45 +1648,47 @@ static std::vector<ValueFlow::LifetimeToken> getLifetimeTokens(const Token* tok,
                 if (v.tokvalue == tok)
                     continue;
                 errorPath.insert(errorPath.end(), v.errorPath.cbegin(), v.errorPath.cend());
-                return getLifetimeTokens(v.tokvalue, escape, std::move(errorPath), pred, depth - 1);
+                return ValueFlow::LifetimeToken::setAddressOf(
+                    getLifetimeTokens(v.tokvalue, escape, std::move(errorPath), pred, settings, depth - 1),
+                    false);
             }
         } else {
-            return ValueFlow::LifetimeToken::setAddressOf(getLifetimeTokens(vartok, escape, std::move(errorPath), pred, depth - 1),
-                                                          !(astIsContainer(vartok) && Token::simpleMatch(vartok->astParent(), "[")));
+            return ValueFlow::LifetimeToken::setAddressOf(
+                getLifetimeTokens(vartok, escape, std::move(errorPath), pred, settings, depth - 1), false);
         }
     } else if (Token::simpleMatch(tok, "{") && getArgumentStart(tok) &&
                !Token::simpleMatch(getArgumentStart(tok), ",") && getArgumentStart(tok)->valueType()) {
         const Token* vartok = getArgumentStart(tok);
-        auto vts = getParentValueTypes(tok);
+        auto vts = getParentValueTypes(tok, settings);
         auto it = std::find_if(vts.cbegin(), vts.cend(), [&](const ValueType& vt) {
             return vt.isTypeEqual(vartok->valueType());
         });
         if (it != vts.end())
-            return getLifetimeTokens(vartok, escape, std::move(errorPath), pred, depth - 1);
+            return getLifetimeTokens(vartok, escape, std::move(errorPath), pred, settings, depth - 1);
     }
     return {{tok, std::move(errorPath)}};
 }
 
-std::vector<ValueFlow::LifetimeToken> ValueFlow::getLifetimeTokens(const Token* tok, bool escape, ValueFlow::Value::ErrorPath errorPath)
+std::vector<ValueFlow::LifetimeToken> ValueFlow::getLifetimeTokens(const Token* tok, const Settings& settings, bool escape, ErrorPath errorPath)
 {
     return getLifetimeTokens(tok, escape, std::move(errorPath), [](const Token*) {
         return false;
-    });
+    }, settings);
 }
 
-bool ValueFlow::hasLifetimeToken(const Token* tok, const Token* lifetime)
+bool ValueFlow::hasLifetimeToken(const Token* tok, const Token* lifetime, const Settings& settings)
 {
     bool result = false;
-    getLifetimeTokens(tok, false, ValueFlow::Value::ErrorPath{}, [&](const Token* tok2) {
+    getLifetimeTokens(tok, false, ErrorPath{}, [&](const Token* tok2) {
         result = tok2->exprId() == lifetime->exprId();
         return result;
-    });
+    }, settings);
     return result;
 }
 
-static const Token* getLifetimeToken(const Token* tok, ValueFlow::Value::ErrorPath& errorPath, bool* addressOf = nullptr)
+static const Token* getLifetimeToken(const Token* tok, ErrorPath& errorPath, const Settings& settings, bool* addressOf = nullptr)
 {
-    std::vector<ValueFlow::LifetimeToken> lts = ValueFlow::getLifetimeTokens(tok);
+    std::vector<ValueFlow::LifetimeToken> lts = ValueFlow::getLifetimeTokens(tok, settings);
     if (lts.size() != 1)
         return nullptr;
     if (lts.front().inconclusive)
@@ -3624,18 +1699,18 @@ static const Token* getLifetimeToken(const Token* tok, ValueFlow::Value::ErrorPa
     return lts.front().token;
 }
 
-const Variable* ValueFlow::getLifetimeVariable(const Token* tok, ValueFlow::Value::ErrorPath& errorPath, bool* addressOf)
+const Variable* ValueFlow::getLifetimeVariable(const Token* tok, ErrorPath& errorPath, const Settings& settings, bool* addressOf)
 {
-    const Token* tok2 = getLifetimeToken(tok, errorPath, addressOf);
+    const Token* tok2 = getLifetimeToken(tok, errorPath, settings, addressOf);
     if (tok2 && tok2->variable())
         return tok2->variable();
     return nullptr;
 }
 
-const Variable* ValueFlow::getLifetimeVariable(const Token* tok)
+const Variable* ValueFlow::getLifetimeVariable(const Token* tok, const Settings& settings)
 {
-    ValueFlow::Value::ErrorPath errorPath;
-    return getLifetimeVariable(tok, errorPath, nullptr);
+    ErrorPath errorPath;
+    return getLifetimeVariable(tok, errorPath, settings, nullptr);
 }
 
 static bool isNotLifetimeValue(const ValueFlow::Value& val)
@@ -3690,7 +1765,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;
     }
 
@@ -3730,23 +1810,22 @@ static bool isNotEqual(std::pair<const Token*, const Token*> x, std::pair<const
     start2 = skipCVRefs(start2, y.second);
     return !(start1 == x.second && start2 == y.second);
 }
-static bool isNotEqual(std::pair<const Token*, const Token*> x, const std::string& y)
+static bool isNotEqual(std::pair<const Token*, const Token*> x, const std::string& y, bool cpp, const Settings& settings)
 {
-    TokenList tokenList(nullptr);
-    std::istringstream istr(y);
-    tokenList.createTokens(istr);
+    TokenList tokenList(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
+    tokenList.createTokensFromBuffer(y.data(), y.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)
+static bool isNotEqual(std::pair<const Token*, const Token*> x, const ValueType* y, bool cpp, const Settings& settings)
 {
     if (y == nullptr)
         return false;
     if (y->originalTypeName.empty())
         return false;
-    return isNotEqual(x, y->originalTypeName);
+    return isNotEqual(x, y->originalTypeName, cpp, settings);
 }
 
-static bool isDifferentType(const Token* src, const Token* dst)
+static bool isDifferentType(const Token* src, const Token* dst, const Settings& settings)
 {
     const Type* t = Token::typeOf(src);
     const Type* parentT = Token::typeOf(dst);
@@ -3756,17 +1835,18 @@ static bool isDifferentType(const Token* src, const Token* dst)
     } else {
         std::pair<const Token*, const Token*> decl = Token::typeDecl(src);
         std::pair<const Token*, const Token*> parentdecl = Token::typeDecl(dst);
-        if (isNotEqual(decl, parentdecl))
+        const bool isCpp = (src && src->isCpp()) || (dst && dst->isCpp());
+        if (isNotEqual(decl, parentdecl) && !(isCpp && (Token::simpleMatch(decl.first, "auto") || Token::simpleMatch(parentdecl.first, "auto"))))
             return true;
-        if (isNotEqual(decl, dst->valueType()))
+        if (isNotEqual(decl, dst->valueType(), isCpp, settings))
             return true;
-        if (isNotEqual(parentdecl, src->valueType()))
+        if (isNotEqual(parentdecl, src->valueType(), isCpp, settings))
             return true;
     }
     return false;
 }
 
-bool ValueFlow::isLifetimeBorrowed(const Token *tok, const Settings *settings)
+bool ValueFlow::isLifetimeBorrowed(const Token *tok, const Settings &settings)
 {
     if (!tok)
         return true;
@@ -3784,24 +1864,24 @@ bool ValueFlow::isLifetimeBorrowed(const Token *tok, const Settings *settings)
             return false;
     }
     if (parent) {
-        if (isDifferentType(tok, parent))
+        if (isDifferentType(tok, parent, settings))
             return false;
     }
     return true;
 }
 
-static void valueFlowLifetimeFunction(Token *tok, TokenList *tokenlist, ErrorLogger *errorLogger, const Settings *settings);
+static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, ErrorLogger &errorLogger, const Settings &settings);
 
 static void valueFlowLifetimeConstructor(Token *tok,
-                                         TokenList *tokenlist,
-                                         ErrorLogger *errorLogger,
-                                         const Settings *settings);
+                                         const TokenList &tokenlist,
+                                         ErrorLogger &errorLogger,
+                                         const Settings &settings);
 
 static bool isRangeForScope(const Scope* scope)
 {
     if (!scope)
         return false;
-    if (scope->type != Scope::eFor)
+    if (scope->type != ScopeType::eFor)
         return false;
     if (!scope->bodyStart)
         return false;
@@ -3844,6 +1924,13 @@ const Token* ValueFlow::getEndOfExprScope(const Token* tok, const Scope* default
                 const Token* varEnd = getEndOfVarScope(var);
                 if (!end || (smallest ? precedes(varEnd, end) : succeeds(varEnd, end)))
                     end = varEnd;
+
+                const Token* top = var->nameToken()->astTop();
+                if (Token::simpleMatch(top->tokAt(-1), "if (")) { // variable declared in if (...)
+                    const Token* elseTok = top->link()->linkAt(1);
+                    if (Token::simpleMatch(elseTok, "} else {") && tok->scope()->isNestedIn(elseTok->tokAt(2)->scope()))
+                        end = tok->scope()->bodyEnd;
+                }
             }
         }
         return ChildrenToVisit::op1_and_op2;
@@ -3865,13 +1952,13 @@ const Token* ValueFlow::getEndOfExprScope(const Token* tok, const Scope* default
     return end;
 }
 
-static void valueFlowForwardLifetime(Token * tok, TokenList *tokenlist, ErrorLogger *errorLogger, const Settings *settings)
+static void valueFlowForwardLifetime(Token * tok, const TokenList &tokenlist, ErrorLogger &errorLogger, const Settings &settings)
 {
     // Forward lifetimes to constructed variable
     if (Token::Match(tok->previous(), "%var% {|(") && isVariableDecl(tok->previous())) {
         std::list<ValueFlow::Value> values = tok->values();
         values.remove_if(&isNotLifetimeValue);
-        valueFlowForward(nextAfterAstRightmostLeaf(tok), ValueFlow::getEndOfExprScope(tok), tok->previous(), values, tokenlist, settings);
+        valueFlowForward(nextAfterAstRightmostLeaf(tok), ValueFlow::getEndOfExprScope(tok), tok->previous(), std::move(values), tokenlist, errorLogger, settings);
         return;
     }
     Token *parent = tok->astParent();
@@ -3908,10 +1995,10 @@ static void valueFlowForwardLifetime(Token * tok, TokenList *tokenlist, ErrorLog
         });
 
         // Skip RHS
-        const Token *nextExpression = nextAfterAstRightmostLeaf(parent);
+        Token* nextExpression = nextAfterAstRightmostLeaf(parent);
 
         if (expr->exprId() > 0) {
-            valueFlowForward(const_cast<Token*>(nextExpression), endOfVarScope->next(), expr, values, tokenlist, settings);
+            valueFlowForward(nextExpression, endOfVarScope->next(), expr, values, tokenlist, errorLogger, settings);
 
             for (ValueFlow::Value& val : values) {
                 if (val.lifetimeKind == ValueFlow::Value::LifetimeKind::Address)
@@ -3920,9 +2007,9 @@ static void valueFlowForwardLifetime(Token * tok, TokenList *tokenlist, ErrorLog
             // TODO: handle `[`
             if (Token::simpleMatch(parent->astOperand1(), ".")) {
                 const Token* parentLifetime =
-                    getParentLifetime(tokenlist->isCPP(), parent->astOperand1()->astOperand2(), &settings->library);
+                    getParentLifetime(parent->astOperand1()->astOperand2(), settings.library);
                 if (parentLifetime && parentLifetime->exprId() > 0) {
-                    valueFlowForward(const_cast<Token*>(nextExpression), endOfVarScope, parentLifetime, values, tokenlist, settings);
+                    valueFlowForward(nextExpression, endOfVarScope, parentLifetime, std::move(values), tokenlist, errorLogger, settings);
                 }
             }
         }
@@ -3940,10 +2027,10 @@ static void valueFlowForwardLifetime(Token * tok, TokenList *tokenlist, ErrorLog
         const Token *endOfVarScope = var->scope()->bodyEnd;
 
         std::list<ValueFlow::Value> values = tok->values();
-        const Token *nextExpression = nextAfterAstRightmostLeaf(parent);
+        Token *nextExpression = nextAfterAstRightmostLeaf(parent);
         // Only forward lifetime values
         values.remove_if(&isNotLifetimeValue);
-        valueFlowForward(const_cast<Token*>(nextExpression), endOfVarScope, tok, values, tokenlist, settings);
+        valueFlowForward(nextExpression, endOfVarScope, tok, std::move(values), tokenlist, errorLogger, settings);
         // Cast
     } else if (parent->isCast()) {
         std::list<ValueFlow::Value> values = tok->values();
@@ -3956,23 +2043,14 @@ static void valueFlowForwardLifetime(Token * tok, TokenList *tokenlist, ErrorLog
 }
 
 struct LifetimeStore {
-    const Token *argtok;
+    const Token* argtok{};
     std::string message;
-    ValueFlow::Value::LifetimeKind type;
+    ValueFlow::Value::LifetimeKind type = ValueFlow::Value::LifetimeKind::Object;
     ErrorPath errorPath;
-    bool inconclusive;
-    bool forward;
-
-    struct Context {
-        Token* tok;
-        TokenList* tokenlist;
-        ErrorLogger* errorLogger;
-        const Settings* settings;
-    };
+    bool inconclusive{};
+    bool forward = true;
 
-    LifetimeStore()
-        : argtok(nullptr), message(), type(), errorPath(), inconclusive(false), forward(true), mContext(nullptr)
-    {}
+    LifetimeStore() = default;
 
     LifetimeStore(const Token* argtok,
                   std::string message,
@@ -3981,34 +2059,31 @@ struct LifetimeStore {
         : argtok(argtok),
         message(std::move(message)),
         type(type),
-        errorPath(),
-        inconclusive(inconclusive),
-        forward(true),
-        mContext(nullptr)
+        inconclusive(inconclusive)
     {}
 
     template<class F>
-    static void forEach(const std::vector<const Token*>& argtoks,
+    static void forEach(const TokenList& tokenlist,
+                        ErrorLogger& errorLogger,
+                        const Settings& settings,
+                        const std::vector<const Token*>& argtoks,
                         const std::string& message,
                         ValueFlow::Value::LifetimeKind type,
                         F f) {
-        std::map<const Token*, Context> forwardToks;
+        std::set<Token*> forwardToks;
         for (const Token* arg : argtoks) {
             LifetimeStore ls{arg, message, type};
-            Context c{};
-            ls.mContext = &c;
             ls.forward = false;
             f(ls);
-            if (c.tok)
-                forwardToks[c.tok] = c;
+            if (ls.forwardTok)
+                forwardToks.emplace(ls.forwardTok);
         }
-        for (const auto& p : forwardToks) {
-            const Context& c = p.second;
-            valueFlowForwardLifetime(c.tok, c.tokenlist, c.errorLogger, c.settings);
+        for (auto* tok : forwardToks) {
+            valueFlowForwardLifetime(tok, tokenlist, errorLogger, settings);
         }
     }
 
-    static LifetimeStore fromFunctionArg(const Function * f, const Token *tok, const Variable *var, TokenList *tokenlist, const Settings* settings, ErrorLogger *errorLogger) {
+    static LifetimeStore fromFunctionArg(const Function * f, const Token *tok, const Variable *var, const TokenList &tokenlist, const Settings& settings, ErrorLogger &errorLogger) {
         if (!var)
             return LifetimeStore{};
         if (!var->isArgument())
@@ -4018,7 +2093,7 @@ struct LifetimeStore {
             return LifetimeStore{};
         std::vector<const Token *> args = getArguments(tok);
         if (n >= args.size()) {
-            if (settings->debugwarnings)
+            if (settings.debugwarnings)
                 bailout(tokenlist,
                         errorLogger,
                         tok,
@@ -4033,24 +2108,24 @@ struct LifetimeStore {
 
     template<class Predicate>
     bool byRef(Token* tok,
-               TokenList* tokenlist,
-               ErrorLogger* errorLogger,
-               const Settings* settings,
-               Predicate pred,
-               SourceLocation loc = SourceLocation::current()) const
+               const TokenList& tokenlist,
+               ErrorLogger& errorLogger,
+               const Settings& settings,
+               const Predicate& pred,
+               SourceLocation loc = SourceLocation::current())
     {
         if (!argtok)
             return false;
         bool update = false;
-        for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(argtok)) {
-            if (!settings->certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
+        for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(argtok, settings)) {
+            if (!settings.certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
                 continue;
-            ErrorPath er = errorPath;
-            er.insert(er.end(), lt.errorPath.cbegin(), lt.errorPath.cend());
             if (!lt.token)
                 return false;
             if (!pred(lt.token))
                 return false;
+            ErrorPath er = errorPath;
+            er.insert(er.end(), lt.errorPath.cbegin(), lt.errorPath.cend());
             er.emplace_back(argtok, message);
 
             ValueFlow::Value value;
@@ -4063,7 +2138,7 @@ struct LifetimeStore {
             // Don't add the value a second time
             if (std::find(tok->values().cbegin(), tok->values().cend(), value) != tok->values().cend())
                 return false;
-            if (settings->debugnormal)
+            if (settings.debugnormal)
                 setSourceLocation(value, loc, tok);
             setTokenValue(tok, std::move(value), settings);
             update = true;
@@ -4074,10 +2149,10 @@ struct LifetimeStore {
     }
 
     bool byRef(Token* tok,
-               TokenList* tokenlist,
-               ErrorLogger* errorLogger,
-               const Settings* settings,
-               SourceLocation loc = SourceLocation::current()) const
+               const TokenList& tokenlist,
+               ErrorLogger& errorLogger,
+               const Settings& settings,
+               SourceLocation loc = SourceLocation::current())
     {
         return byRef(
             tok,
@@ -4092,11 +2167,11 @@ struct LifetimeStore {
 
     template<class Predicate>
     bool byVal(Token* tok,
-               TokenList* tokenlist,
-               ErrorLogger* errorLogger,
-               const Settings* settings,
-               Predicate pred,
-               SourceLocation loc = SourceLocation::current()) const
+               const TokenList& tokenlist,
+               ErrorLogger& errorLogger,
+               const Settings& settings,
+               const Predicate& pred,
+               SourceLocation loc = SourceLocation::current())
     {
         if (!argtok)
             return false;
@@ -4104,9 +2179,14 @@ struct LifetimeStore {
         if (argtok->values().empty()) {
             ErrorPath er;
             er.emplace_back(argtok, message);
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(argtok)) {
-                if (!settings->certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
+            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;
@@ -4114,16 +2194,12 @@ 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;
-                if (settings->debugnormal)
+                if (settings.debugnormal)
                     setSourceLocation(value, loc, tok);
                 setTokenValue(tok, std::move(value), settings);
                 update = true;
@@ -4133,15 +2209,15 @@ struct LifetimeStore {
             if (!v.isLifetimeValue())
                 continue;
             const Token *tok3 = v.tokvalue;
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok3)) {
-                if (!settings->certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
+            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());
 
@@ -4157,7 +2233,7 @@ struct LifetimeStore {
                 // Don't add the value a second time
                 if (std::find(tok->values().cbegin(), tok->values().cend(), value) != tok->values().cend())
                     continue;
-                if (settings->debugnormal)
+                if (settings.debugnormal)
                     setSourceLocation(value, loc, tok);
                 setTokenValue(tok, std::move(value), settings);
                 update = true;
@@ -4169,10 +2245,10 @@ struct LifetimeStore {
     }
 
     bool byVal(Token* tok,
-               TokenList* tokenlist,
-               ErrorLogger* errorLogger,
-               const Settings* settings,
-               SourceLocation loc = SourceLocation::current()) const
+               const TokenList& tokenlist,
+               ErrorLogger& errorLogger,
+               const Settings& settings,
+               SourceLocation loc = SourceLocation::current())
     {
         return byVal(
             tok,
@@ -4187,14 +2263,14 @@ struct LifetimeStore {
 
     template<class Predicate>
     bool byDerefCopy(Token* tok,
-                     TokenList* tokenlist,
-                     ErrorLogger* errorLogger,
-                     const Settings* settings,
+                     const TokenList& tokenlist,
+                     ErrorLogger& errorLogger,
+                     const Settings& settings,
                      Predicate pred,
                      SourceLocation loc = SourceLocation::current()) const
     {
         bool update = false;
-        if (!settings->certainty.isEnabled(Certainty::inconclusive) && inconclusive)
+        if (!settings.certainty.isEnabled(Certainty::inconclusive) && inconclusive)
             return update;
         if (!argtok)
             return update;
@@ -4205,12 +2281,14 @@ struct LifetimeStore {
                 continue;
             const Token *tok2 = v.tokvalue;
             ErrorPath er = v.errorPath;
-            const Variable *var = ValueFlow::getLifetimeVariable(tok2, er);
+            const Variable *var = ValueFlow::getLifetimeVariable(tok2, er, settings);
             // TODO: the inserted data is never used
             er.insert(er.end(), errorPath.cbegin(), errorPath.cend());
             if (!var)
                 continue;
             const Token * const varDeclEndToken = var->declEndToken();
+            if (!varDeclEndToken)
+                continue;
             for (const Token *tok3 = tok; tok3 && tok3 != varDeclEndToken; tok3 = tok3->previous()) {
                 if (tok3->varId() == var->declarationId()) {
                     update |= LifetimeStore{tok3, message, type, inconclusive}
@@ -4223,9 +2301,9 @@ struct LifetimeStore {
     }
 
     bool byDerefCopy(Token* tok,
-                     TokenList* tokenlist,
-                     ErrorLogger* errorLogger,
-                     const Settings* settings,
+                     const TokenList& tokenlist,
+                     ErrorLogger& errorLogger,
+                     const Settings& settings,
                      SourceLocation loc = SourceLocation::current()) const
     {
         return byDerefCopy(
@@ -4240,50 +2318,50 @@ struct LifetimeStore {
     }
 
 private:
-    Context* mContext;
-    void forwardLifetime(Token* tok, TokenList* tokenlist, ErrorLogger* errorLogger, const Settings* settings) const {
-        if (mContext) {
-            mContext->tok = tok;
-            mContext->tokenlist = tokenlist;
-            mContext->errorLogger = errorLogger;
-            mContext->settings = settings;
-        }
+    // cppcheck-suppress naming-privateMemberVariable
+    Token* forwardTok{};
+    void forwardLifetime(Token* tok, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings) {
+        forwardTok = tok;
         valueFlowForwardLifetime(tok, tokenlist, errorLogger, settings);
     }
 };
 
-static bool isOwningVariables(const std::list<Variable>& vars, int depth = 10)
+static bool hasBorrowingVariables(const std::list<Variable>& vars, const std::vector<const Token*>& args, int depth = 10)
 {
     if (depth < 0)
-        return false;
-    return vars.empty() || std::all_of(vars.cbegin(), vars.cend(), [&](const Variable& var) {
-        if (var.isReference() || var.isPointer())
-            return false;
-        const ValueType* vt = var.valueType();
-        if (vt) {
-            if (vt->pointer > 0)
+        return true;
+    return std::any_of(vars.cbegin(), vars.cend(), [&](const Variable& var) {
+        if (const ValueType* vt = var.valueType()) {
+            if (vt->pointer > 0 &&
+                std::none_of(args.begin(), args.end(), [vt](const Token* arg) {
+                return arg->valueType() && arg->valueType()->type == vt->type;
+            }))
                 return false;
-            if (vt->isPrimitive())
+            if (vt->pointer > 0)
                 return true;
-            if (vt->isEnum())
+            if (vt->reference != Reference::None)
                 return true;
+            if (vt->isPrimitive())
+                return false;
+            if (vt->isEnum())
+                return false;
             // TODO: Check container inner type
             if (vt->type == ValueType::CONTAINER && vt->container)
-                return !vt->container->view;
+                return vt->container->view;
             if (vt->typeScope)
-                return isOwningVariables(vt->typeScope->varlist, depth - 1);
+                return hasBorrowingVariables(vt->typeScope->varlist, args, depth - 1);
         }
-        return false;
+        return true;
     });
 }
 
 static void valueFlowLifetimeUserConstructor(Token* tok,
                                              const Function* constructor,
                                              const std::string& name,
-                                             std::vector<const Token*> args,
-                                             TokenList* tokenlist,
-                                             ErrorLogger* errorLogger,
-                                             const Settings* settings)
+                                             const std::vector<const Token*>& args,
+                                             const TokenList& tokenlist,
+                                             ErrorLogger& errorLogger,
+                                             const Settings& settings)
 {
     if (!constructor)
         return;
@@ -4305,7 +2383,7 @@ static void valueFlowLifetimeUserConstructor(Token* tok,
                 continue;
             if (!ValueFlow::isLifetimeBorrowed(expr, settings))
                 continue;
-            const Variable* argvar = ValueFlow::getLifetimeVariable(expr);
+            const Variable* argvar = ValueFlow::getLifetimeVariable(expr, settings);
             if (var->isReference() || var->isRValueReference()) {
                 if (argvar && argvar->isArgument() && (argvar->isReference() || argvar->isRValueReference())) {
                     paramCapture[argvar] = LifetimeCapture::ByReference;
@@ -4337,10 +2415,13 @@ static void valueFlowLifetimeUserConstructor(Token* tok,
             }
         }
         // TODO: Use SubExpressionAnalyzer for members
-        LifetimeStore::forEach(args,
+        LifetimeStore::forEach(tokenlist,
+                               errorLogger,
+                               settings,
+                               args,
                                "Passed to constructor of '" + name + "'.",
                                ValueFlow::Value::LifetimeKind::SubObject,
-                               [&](const LifetimeStore& ls) {
+                               [&](LifetimeStore& ls) {
             const Variable* paramVar = argToParam.at(ls.argtok);
             if (paramCapture.count(paramVar) == 0)
                 return;
@@ -4350,8 +2431,11 @@ static void valueFlowLifetimeUserConstructor(Token* tok,
             else
                 ls.byVal(tok, tokenlist, errorLogger, settings);
         });
-    } else if (!isOwningVariables(constructor->nestedIn->varlist)) {
-        LifetimeStore::forEach(args,
+    } else if (hasBorrowingVariables(constructor->nestedIn->varlist, args)) {
+        LifetimeStore::forEach(tokenlist,
+                               errorLogger,
+                               settings,
+                               args,
                                "Passed to constructor of '" + name + "'.",
                                ValueFlow::Value::LifetimeKind::SubObject,
                                [&](LifetimeStore& ls) {
@@ -4365,18 +2449,18 @@ static void valueFlowLifetimeUserConstructor(Token* tok,
     }
 }
 
-static void valueFlowLifetimeFunction(Token *tok, TokenList *tokenlist, ErrorLogger *errorLogger, const Settings *settings)
+static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, ErrorLogger &errorLogger, const Settings &settings)
 {
     if (!Token::Match(tok, "%name% ("))
         return;
     Token* memtok = nullptr;
     if (Token::Match(tok->astParent(), ". %name% (") && astIsRHS(tok))
         memtok = tok->astParent()->astOperand1();
-    const int returnContainer = settings->library.returnValueContainer(tok);
+    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) {
-            const Library::ArgumentChecks::IteratorInfo *i = settings->library.getArgIteratorInfo(tok, argnr);
+            const Library::ArgumentChecks::IteratorInfo *i = settings.library.getArgIteratorInfo(tok, argnr);
             if (!i)
                 continue;
             if (i->container != returnContainer)
@@ -4407,7 +2491,7 @@ static void valueFlowLifetimeFunction(Token *tok, TokenList *tokenlist, ErrorLog
                 tok->next(), tokenlist, errorLogger, settings);
         }
     } else if (memtok && Token::Match(tok->astParent(), ". push_back|push_front|insert|push|assign") &&
-               astIsContainer(memtok)) {
+               astIsNonStringContainer(memtok)) {
         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]) &&
@@ -4435,8 +2519,8 @@ static void valueFlowLifetimeFunction(Token *tok, TokenList *tokenlist, ErrorLog
         for (const Token* returnTok : returns) {
             if (returnTok == tok)
                 continue;
-            const Variable *returnVar = ValueFlow::getLifetimeVariable(returnTok);
-            if (returnVar && returnVar->isArgument() && (returnVar->isConst() || !isVariableChanged(returnVar, settings, tokenlist->isCPP()))) {
+            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);
                 ls.inconclusive = inconclusive;
                 ls.forward = false;
@@ -4488,14 +2572,16 @@ static void valueFlowLifetimeFunction(Token *tok, TokenList *tokenlist, ErrorLog
             valueFlowForwardLifetime(tok->next(), tokenlist, errorLogger, settings);
     } else if (tok->valueType()) {
         // TODO: Propagate lifetimes with library functions
-        if (settings->library.getFunction(tok->previous()))
+        if (settings.library.getFunction(tok->previous()))
+            return;
+        if (Token::simpleMatch(tok->astParent(), "."))
             return;
         // Assume constructing the valueType
         valueFlowLifetimeConstructor(tok->next(), tokenlist, errorLogger, settings);
         valueFlowForwardLifetime(tok->next(), tokenlist, errorLogger, settings);
     } else {
-        const std::string& retVal = settings->library.returnValue(tok);
-        if (retVal.compare(0, 3, "arg") == 0) {
+        const std::string& retVal = settings.library.returnValue(tok);
+        if (startsWith(retVal, "arg")) {
             std::size_t iArg{};
             try {
                 iArg = strToInt<std::size_t>(retVal.substr(3));
@@ -4507,7 +2593,7 @@ static void valueFlowLifetimeFunction(Token *tok, TokenList *tokenlist, ErrorLog
                 const Token* varTok = args[iArg - 1];
                 if (varTok->variable() && varTok->variable()->isLocal())
                     LifetimeStore{ varTok, "Passed to '" + tok->str() + "'.", ValueFlow::Value::LifetimeKind::Address }.byRef(
-                    tok->next(), tokenlist, errorLogger, settings);
+                        tok->next(), tokenlist, errorLogger, settings);
             }
         }
     }
@@ -4556,9 +2642,9 @@ static const Function* findConstructor(const Scope* scope, const Token* tok, con
 
 static void valueFlowLifetimeClassConstructor(Token* tok,
                                               const Type* t,
-                                              TokenList* tokenlist,
-                                              ErrorLogger* errorLogger,
-                                              const Settings* settings)
+                                              const TokenList& tokenlist,
+                                              ErrorLogger& errorLogger,
+                                              const Settings& settings)
 {
     if (!Token::Match(tok, "(|{"))
         return;
@@ -4572,7 +2658,10 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
         // If the type is unknown then assume it captures by value in the
         // constructor, but make each lifetime inconclusive
         std::vector<const Token*> args = getArguments(tok);
-        LifetimeStore::forEach(args,
+        LifetimeStore::forEach(tokenlist,
+                               errorLogger,
+                               settings,
+                               args,
                                "Passed to initializer list.",
                                ValueFlow::Value::LifetimeKind::SubObject,
                                [&](LifetimeStore& ls) {
@@ -4590,23 +2679,38 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
         if (scope->numConstructors == 0) {
             auto it = scope->varlist.cbegin();
             LifetimeStore::forEach(
+                tokenlist,
+                errorLogger,
+                settings,
                 args,
                 "Passed to constructor of '" + t->name() + "'.",
                 ValueFlow::Value::LifetimeKind::SubObject,
-                [&](const LifetimeStore& ls) {
+                [&](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 (isDesignatedInitializerArg)
+                    ls.argtok = ls.argtok->astOperand2();
+                const Variable &var = *it;
+                if (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 {
+                } 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);
@@ -4615,7 +2719,7 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
     }
 }
 
-static void valueFlowLifetimeConstructor(Token* tok, TokenList* tokenlist, ErrorLogger* errorLogger, const Settings* settings)
+static void valueFlowLifetimeConstructor(Token* tok, const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
 {
     if (!Token::Match(tok, "(|{"))
         return;
@@ -4634,10 +2738,13 @@ static void valueFlowLifetimeConstructor(Token* tok, TokenList* tokenlist, Error
     for (const ValueType& vt : vts) {
         if (vt.pointer > 0) {
             std::vector<const Token*> args = getArguments(tok);
-            LifetimeStore::forEach(args,
+            LifetimeStore::forEach(tokenlist,
+                                   errorLogger,
+                                   settings,
+                                   args,
                                    "Passed to initializer list.",
                                    ValueFlow::Value::LifetimeKind::SubObject,
-                                   [&](const LifetimeStore& ls) {
+                                   [&](LifetimeStore& ls) {
                 ls.byVal(tok, tokenlist, errorLogger, settings);
             });
         } else if (vt.container && vt.type == ValueType::CONTAINER) {
@@ -4645,8 +2752,11 @@ static void valueFlowLifetimeConstructor(Token* tok, TokenList* tokenlist, Error
             if (args.size() == 1 && vt.container->view && astIsContainerOwned(args.front())) {
                 LifetimeStore{args.front(), "Passed to container view.", ValueFlow::Value::LifetimeKind::SubObject}
                 .byRef(tok, tokenlist, errorLogger, settings);
-            } else if (args.size() == 2 && astIsIterator(args[0]) && astIsIterator(args[1])) {
+            } else if (args.size() == 2 && (astIsIterator(args[0]) || astIsIterator(args[1]))) {
                 LifetimeStore::forEach(
+                    tokenlist,
+                    errorLogger,
+                    settings,
                     args,
                     "Passed to initializer list.",
                     ValueFlow::Value::LifetimeKind::SubObject,
@@ -4654,10 +2764,13 @@ static void valueFlowLifetimeConstructor(Token* tok, TokenList* tokenlist, Error
                     ls.byDerefCopy(tok, tokenlist, errorLogger, settings);
                 });
             } else if (vt.container->hasInitializerListConstructor) {
-                LifetimeStore::forEach(args,
+                LifetimeStore::forEach(tokenlist,
+                                       errorLogger,
+                                       settings,
+                                       args,
                                        "Passed to initializer list.",
                                        ValueFlow::Value::LifetimeKind::SubObject,
-                                       [&](const LifetimeStore& ls) {
+                                       [&](LifetimeStore& ls) {
                     ls.byVal(tok, tokenlist, errorLogger, settings);
                 });
             }
@@ -4674,12 +2787,6 @@ static void valueFlowLifetimeConstructor(Token* tok, TokenList* tokenlist, Error
 
 struct Lambda {
     explicit Lambda(const Token* tok)
-        : capture(nullptr),
-        arguments(nullptr),
-        returnTok(nullptr),
-        bodyTok(nullptr),
-        explicitCaptures(),
-        implicitCapture(LifetimeCapture::Undefined)
     {
         if (!Token::simpleMatch(tok, "[") || !tok->link())
             return;
@@ -4715,12 +2822,12 @@ struct Lambda {
         }
     }
 
-    const Token * capture;
-    const Token * arguments;
-    const Token * returnTok;
-    const Token * bodyTok;
+    const Token* capture{};
+    const Token* arguments{};
+    const Token* returnTok{};
+    const Token* bodyTok{};
     std::unordered_map<const Variable*, std::pair<const Token*, LifetimeCapture>> explicitCaptures;
-    LifetimeCapture implicitCapture;
+    LifetimeCapture implicitCapture = LifetimeCapture::Undefined;
 
     std::vector<const Token*> getCaptures() const {
         return getArguments(capture);
@@ -4737,16 +2844,18 @@ static bool isDecayedPointer(const Token *tok)
         return false;
     if (!tok->astParent())
         return false;
+    if (Token::simpleMatch(tok->astParent(), "=") && astIsRHS(tok))
+        return true;
     if (astIsPointer(tok->astParent()) && !Token::simpleMatch(tok->astParent(), "return"))
         return true;
     if (tok->astParent()->isConstOp())
         return true;
     if (!Token::simpleMatch(tok->astParent(), "return"))
         return false;
-    return astIsPointer(tok->astParent());
+    return astIsPointer(tok->astParent()) || astIsContainerView(tok->astParent());
 }
 
-static bool isConvertedToView(const Token* tok, const Settings* settings)
+static bool isConvertedToView(const Token* tok, const Settings& settings)
 {
     std::vector<ValueType> vtParents = getParentValueTypes(tok, settings);
     return std::any_of(vtParents.cbegin(), vtParents.cend(), [&](const ValueType& vt) {
@@ -4756,23 +2865,23 @@ static bool isConvertedToView(const Token* tok, const Settings* settings)
     });
 }
 
-static bool isContainerOfPointers(const Token* tok, const Settings* settings)
+static bool isContainerOfPointers(const Token* tok, const Settings& settings)
 {
     if (!tok)
     {
         return true;
     }
 
-    ValueType vt = ValueType::parseDecl(tok, *settings, true); // TODO: set isCpp
+    ValueType vt = ValueType::parseDecl(tok, settings);
     return vt.pointer > 0;
 }
 
-static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* /*db*/, ErrorLogger *errorLogger, const Settings *settings)
+static void valueFlowLifetime(TokenList &tokenlist, ErrorLogger &errorLogger, const Settings &settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
         if (!tok->scope())
             continue;
-        if (tok->scope()->type == Scope::eGlobal)
+        if (tok->scope()->type == ScopeType::eGlobal)
             continue;
         Lambda lam(tok);
         // Lambdas
@@ -4887,8 +2996,18 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* /*db*/, Erro
         }
         // address of
         else if (tok->isUnaryOp("&")) {
-            for (const ValueFlow::LifetimeToken& lt : ValueFlow::getLifetimeTokens(tok->astOperand1())) {
-                if (!settings->certainty.isEnabled(Certainty::inconclusive) && lt.inconclusive)
+            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;
                 ErrorPath errorPath = lt.errorPath;
                 errorPath.emplace_back(tok, "Address of variable taken here.");
@@ -4948,7 +3067,7 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* /*db*/, Erro
                 continue;
             }
 
-            std::vector<const Token*> toks = {};
+            std::vector<const Token*> toks;
             if (tok->isUnaryOp("*") || parent->originalName() == "->") {
                 for (const ValueFlow::Value& v : tok->values()) {
                     if (!v.isLocalLifetimeValue())
@@ -4974,14 +3093,14 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* /*db*/, Erro
             }
 
             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());
                     if (Token::simpleMatch(parent, "("))
-                        setTokenValue(parent, value, settings);
+                        setTokenValue(parent, std::move(value), settings);
                     else
-                        setTokenValue(parent->tokAt(2), value, settings);
+                        setTokenValue(parent->tokAt(2), std::move(value), settings);
 
                     if (!rt.token->variable()) {
                         LifetimeStore ls = LifetimeStore{
@@ -4997,7 +3116,7 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* /*db*/, Erro
             valueFlowLifetimeConstructor(tok->next(), tokenlist, errorLogger, settings);
         }
         // Check function calls
-        else if (Token::Match(tok, "%name% (") && !Token::simpleMatch(tok->next()->link(), ") {")) {
+        else if (Token::Match(tok, "%name% (") && !Token::simpleMatch(tok->linkAt(1), ") {")) {
             valueFlowLifetimeFunction(tok, tokenlist, errorLogger, settings);
         }
         // Unique pointer lifetimes
@@ -5009,14 +3128,14 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* /*db*/, Erro
             value.lifetimeScope = ValueFlow::Value::LifetimeScope::Local;
             value.lifetimeKind = ValueFlow::Value::LifetimeKind::SubObject;
             value.tokvalue = tok;
-            value.errorPath = errorPath;
+            value.errorPath = std::move(errorPath);
             setTokenValue(ptok, std::move(value), settings);
             valueFlowForwardLifetime(ptok, tokenlist, errorLogger, settings);
         }
         // Check variables
         else if (tok->variable()) {
             ErrorPath errorPath;
-            const Variable * var = ValueFlow::getLifetimeVariable(tok, errorPath);
+            const Variable * var = ValueFlow::getLifetimeVariable(tok, errorPath, settings);
             if (!var)
                 continue;
             if (var->nameToken() == tok)
@@ -5028,7 +3147,7 @@ static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* /*db*/, Erro
                 value.valueType = ValueFlow::Value::ValueType::LIFETIME;
                 value.lifetimeScope = ValueFlow::Value::LifetimeScope::Local;
                 value.tokvalue = var->nameToken();
-                value.errorPath = errorPath;
+                value.errorPath = std::move(errorPath);
                 setTokenValue(tok, std::move(value), settings);
 
                 valueFlowForwardLifetime(tok, tokenlist, errorLogger, settings);
@@ -5078,31 +3197,31 @@ static bool isOpenParenthesisMemberFunctionCallOfVarId(const Token * openParenth
            varTok->next()->originalName().empty();
 }
 
-static const Token * findOpenParentesisOfMove(const Token * moveVarTok)
+static Token* findOpenParentesisOfMove(Token* moveVarTok)
 {
-    const Token * tok = moveVarTok;
+    Token* tok = moveVarTok;
     while (tok && tok->str() != "(")
         tok = tok->previous();
     return tok;
 }
 
-static const Token * findEndOfFunctionCallForParameter(const Token * parameterToken)
+static Token* findEndOfFunctionCallForParameter(Token* parameterToken)
 {
     if (!parameterToken)
         return nullptr;
-    const Token * parent = parameterToken->astParent();
-    while (parent && !parent->isOp() && parent->str() != "(")
+    Token* parent = parameterToken->astParent();
+    while (parent && !parent->isOp() && !Token::Match(parent, "[({]"))
         parent = parent->astParent();
     if (!parent)
         return nullptr;
     return nextAfterAstRightmostLeaf(parent);
 }
 
-static void valueFlowAfterMove(TokenList* tokenlist, const SymbolDatabase* symboldatabase, const Settings* settings)
+static void valueFlowAfterMove(const TokenList& tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger& errorLogger, const Settings& settings)
 {
-    if (!tokenlist->isCPP() || settings->standards.cpp < Standards::CPP11)
+    if (!tokenlist.isCPP() || settings.standards.cpp < Standards::CPP11)
         return;
-    for (const Scope * scope : symboldatabase->functionScopes) {
+    for (const Scope * scope : symboldatabase.functionScopes) {
         if (!scope)
             continue;
         const Token * start = scope->bodyStart;
@@ -5112,7 +3231,7 @@ static void valueFlowAfterMove(TokenList* tokenlist, const SymbolDatabase* symbo
                 start = memberInitializationTok;
         }
 
-        for (Token* tok = const_cast<Token*>(start); tok != scope->bodyEnd; tok = tok->next()) {
+        for (auto* tok = const_cast<Token*>(start); tok != scope->bodyEnd; tok = tok->next()) {
             Token * varTok;
             if (Token::Match(tok, "%var% . reset|clear (") && tok->next()->originalName().empty()) {
                 varTok = tok;
@@ -5130,7 +3249,7 @@ static void valueFlowAfterMove(TokenList* tokenlist, const SymbolDatabase* symbo
                 setTokenValue(tok, value, settings);
                 if (var->scope()) {
                     const Token* const endOfVarScope = var->scope()->bodyEnd;
-                    valueFlowForward(tok->next(), endOfVarScope, tok, std::move(value), tokenlist, settings);
+                    valueFlowForward(tok->next(), endOfVarScope, tok, std::move(value), tokenlist, errorLogger, settings);
                 }
                 continue;
             }
@@ -5151,9 +3270,19 @@ static void valueFlowAfterMove(TokenList* tokenlist, const SymbolDatabase* symbo
                 continue;
             const Token* const endOfVarScope = ValueFlow::getEndOfExprScope(varTok);
 
-            const Token * openParentesisOfMove = findOpenParentesisOfMove(varTok);
-            const Token * endOfFunctionCall = findEndOfFunctionCallForParameter(openParentesisOfMove);
+            Token* openParentesisOfMove = findOpenParentesisOfMove(varTok);
+            Token* endOfFunctionCall = findEndOfFunctionCallForParameter(openParentesisOfMove);
             if (endOfFunctionCall) {
+                if (endOfFunctionCall->str() == ")") {
+                    Token* ternaryColon = endOfFunctionCall->link()->astParent();
+                    while (Token::simpleMatch(ternaryColon, "("))
+                        ternaryColon = ternaryColon->astParent();
+                    if (Token::simpleMatch(ternaryColon, ":")) {
+                        endOfFunctionCall = ternaryColon->astOperand2();
+                        if (Token::simpleMatch(endOfFunctionCall, "("))
+                            endOfFunctionCall = endOfFunctionCall->link();
+                    }
+                }
                 ValueFlow::Value value;
                 value.valueType = ValueFlow::Value::ValueType::MOVED;
                 value.moveKind = moveKind;
@@ -5163,7 +3292,7 @@ static void valueFlowAfterMove(TokenList* tokenlist, const SymbolDatabase* symbo
                     value.errorPath.emplace_back(tok, "Calling std::forward(" + varTok->str() + ")");
                 value.setKnown();
 
-                valueFlowForward(const_cast<Token*>(endOfFunctionCall), endOfVarScope, varTok, std::move(value), tokenlist, settings);
+                valueFlowForward(endOfFunctionCall, endOfVarScope, varTok, std::move(value), tokenlist, errorLogger, settings);
             }
         }
     }
@@ -5181,8 +3310,8 @@ static const Token* findIncompleteVar(const Token* start, const Token* end)
 static ValueFlow::Value makeConditionValue(long long val,
                                            const Token* condTok,
                                            bool assume,
-                                           bool impossible = false,
-                                           const Settings* settings = nullptr,
+                                           bool impossible,
+                                           const Settings& settings,
                                            SourceLocation loc = SourceLocation::current())
 {
     ValueFlow::Value v(val);
@@ -5196,7 +3325,7 @@ static ValueFlow::Value makeConditionValue(long long val,
         v.errorPath.emplace_back(condTok, "Assuming condition '" + condTok->expressionString() + "' is true");
     else
         v.errorPath.emplace_back(condTok, "Assuming condition '" + condTok->expressionString() + "' is false");
-    if (settings && settings->debugnormal)
+    if (settings.debugnormal)
         setSourceLocation(v, loc, condTok);
     return v;
 }
@@ -5231,72 +3360,109 @@ static const Scope* getLoopScope(const Token* tok)
     if (!tok)
         return nullptr;
     const Scope* scope = tok->scope();
-    while (scope && scope->type != Scope::eWhile && scope->type != Scope::eFor && scope->type != Scope::eDo)
+    while (scope && scope->type != ScopeType::eWhile && scope->type != ScopeType::eFor && scope->type != ScopeType::eDo)
         scope = scope->nestedIn;
     return scope;
 }
 
 //
-static void valueFlowConditionExpressions(TokenList *tokenlist, const SymbolDatabase* symboldatabase, ErrorLogger *errorLogger, const Settings &settings)
-{
-    for (const Scope * scope : symboldatabase->functionScopes) {
+static void valueFlowConditionExpressions(const TokenList& tokenlist,
+                                          const SymbolDatabase& symboldatabase,
+                                          ErrorLogger& errorLogger,
+                                          const Settings& settings)
+{
+    if (!settings.daca && !settings.vfOptions.doConditionExpressionAnalysis) {
+        if (settings.debugwarnings) {
+            ErrorMessage::FileLocation loc(tokenlist.getSourceFilePath(), 0, 0);
+            const ErrorMessage errmsg(
+                {std::move(loc)},
+                tokenlist.getSourceFilePath(),
+                Severity::debug,
+                "Analysis of condition expressions is disabled. Use --check-level=exhaustive to enable it.",
+                "normalCheckLevelConditionExpressions",
+                Certainty::normal);
+            errorLogger.reportErr(errmsg);
+        }
+        return;
+    }
+
+    for (const Scope* scope : symboldatabase.functionScopes) {
         if (const Token* incompleteTok = findIncompleteVar(scope->bodyStart, scope->bodyEnd)) {
-            if (incompleteTok->isIncompleteVar()) {
-                if (settings.debugwarnings)
-                    bailoutIncompleteVar(tokenlist, errorLogger, incompleteTok, "Skipping function due to incomplete variable " + incompleteTok->str());
-                break;
-            }
+            if (settings.debugwarnings)
+                bailoutIncompleteVar(tokenlist,
+                                     errorLogger,
+                                     incompleteTok,
+                                     "Skipping function due to incomplete variable " + incompleteTok->str());
+            continue;
         }
 
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+        if (settings.daca && !settings.vfOptions.doConditionExpressionAnalysis)
+            continue;
+
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (!Token::simpleMatch(tok, "if ("))
                 continue;
             Token* parenTok = tok->next();
             if (!Token::simpleMatch(parenTok->link(), ") {"))
                 continue;
-            Token * blockTok = parenTok->link()->tokAt(1);
             const Token* condTok = parenTok->astOperand2();
             if (condTok->exprId() == 0)
                 continue;
             if (condTok->hasKnownIntValue())
                 continue;
-            if (!isConstExpression(condTok, settings.library, tokenlist->isCPP()))
+            if (!isConstExpression(condTok, settings.library))
                 continue;
-            const bool is1 = (condTok->isComparisonOp() || condTok->tokType() == Token::eLogicalOp || astIsBool(condTok));
+            const bool isOp = condTok->isComparisonOp() || condTok->tokType() == Token::eLogicalOp;
+            const bool is1 = isOp || astIsBool(condTok);
 
+            Token* blockTok = parenTok->link()->tokAt(1);
             Token* startTok = blockTok;
             // Inner condition
             {
                 for (const Token* condTok2 : getConditions(condTok, "&&")) {
                     if (is1) {
                         const bool isBool = astIsBool(condTok2) || Token::Match(condTok2, "%comp%|%oror%|&&");
-                        SameExpressionAnalyzer a1(condTok2, makeConditionValue(1, condTok2, /*assume*/ true, !isBool), tokenlist, &settings); // don't set '1' for non-boolean expressions
-                        valueFlowGenericForward(startTok, startTok->link(), a1, settings);
+                        auto a1 = makeSameExpressionAnalyzer(
+                            condTok2,
+                            makeConditionValue(1, condTok2, /*assume*/ true, !isBool, settings),
+                            settings); // don't set '1' for non-boolean expressions
+                        valueFlowGenericForward(startTok, startTok->link(), a1, tokenlist, errorLogger, settings);
                     }
 
-                    OppositeExpressionAnalyzer a2(true, condTok2, makeConditionValue(0, condTok2, true), tokenlist, &settings);
-                    valueFlowGenericForward(startTok, startTok->link(), a2, settings);
+                    auto a2 = makeOppositeExpressionAnalyzer(true,
+                                                             condTok2,
+                                                             makeConditionValue(0, condTok2, true, false, settings),
+                                                             settings);
+                    valueFlowGenericForward(startTok, startTok->link(), a2, tokenlist, errorLogger, settings);
                 }
             }
 
             std::vector<const Token*> conds = getConditions(condTok, "||");
+            if (conds.empty())
+                continue;
 
             // Check else block
             if (Token::simpleMatch(startTok->link(), "} else {")) {
                 startTok = startTok->link()->tokAt(2);
-                for (const Token* condTok2:conds) {
-                    SameExpressionAnalyzer a1(condTok2, makeConditionValue(0, condTok2, false), tokenlist, &settings);
-                    valueFlowGenericForward(startTok, startTok->link(), a1, settings);
+                for (const Token* condTok2 : conds) {
+                    auto a1 = makeSameExpressionAnalyzer(condTok2,
+                                                         makeConditionValue(0, condTok2, false, false, settings),
+                                                         settings);
+                    valueFlowGenericForward(startTok, startTok->link(), a1, tokenlist, errorLogger, settings);
 
                     if (is1) {
-                        OppositeExpressionAnalyzer a2(true, condTok2, makeConditionValue(1, condTok2, false), tokenlist, &settings);
-                        valueFlowGenericForward(startTok, startTok->link(), a2, settings);
+                        auto a2 =
+                            makeOppositeExpressionAnalyzer(true,
+                                                           condTok2,
+                                                           makeConditionValue(isOp, condTok2, false, false, settings),
+                                                           settings);
+                        valueFlowGenericForward(startTok, startTok->link(), a2, tokenlist, errorLogger, settings);
                     }
                 }
             }
 
             // Check if the block terminates early
-            if (isEscapeScope(blockTok, tokenlist, &settings)) {
+            if (isEscapeScope(blockTok, settings)) {
                 const Scope* scope2 = scope;
                 // If escaping a loop then only use the loop scope
                 if (isBreakOrContinueScope(blockTok->link())) {
@@ -5304,13 +3470,23 @@ static void valueFlowConditionExpressions(TokenList *tokenlist, const SymbolData
                     if (!scope2)
                         continue;
                 }
-                for (const Token* condTok2:conds) {
-                    SameExpressionAnalyzer a1(condTok2, makeConditionValue(0, condTok2, false), tokenlist, &settings);
-                    valueFlowGenericForward(startTok->link()->next(), scope2->bodyEnd, a1, settings);
+                for (const Token* condTok2 : conds) {
+                    auto a1 = makeSameExpressionAnalyzer(condTok2,
+                                                         makeConditionValue(0, condTok2, false, false, settings),
+                                                         settings);
+                    valueFlowGenericForward(startTok->link()->next(), scope2->bodyEnd, a1, tokenlist, errorLogger, settings);
 
                     if (is1) {
-                        OppositeExpressionAnalyzer a2(true, condTok2, makeConditionValue(1, condTok2, false), tokenlist, &settings);
-                        valueFlowGenericForward(startTok->link()->next(), scope2->bodyEnd, a2, settings);
+                        auto a2 = makeOppositeExpressionAnalyzer(true,
+                                                                 condTok2,
+                                                                 makeConditionValue(1, condTok2, false, false, settings),
+                                                                 settings);
+                        valueFlowGenericForward(startTok->link()->next(),
+                                                scope2->bodyEnd,
+                                                a2,
+                                                tokenlist,
+                                                errorLogger,
+                                                settings);
                     }
                 }
             }
@@ -5318,15 +3494,15 @@ static void valueFlowConditionExpressions(TokenList *tokenlist, const SymbolData
     }
 }
 
-static bool isTruncated(const ValueType* src, const ValueType* dst, const Settings* settings)
+static bool isTruncated(const ValueType* src, const ValueType* dst, const Settings& settings)
 {
     if (src->pointer > 0 || dst->pointer > 0)
         return src->pointer != dst->pointer;
     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)
@@ -5367,10 +3543,10 @@ static std::set<nonneg int> getVarIds(const Token* tok)
     return result;
 }
 
-static void valueFlowSymbolic(const TokenList* tokenlist, const SymbolDatabase* symboldatabase, const Settings* settings)
+static void valueFlowSymbolic(const TokenList& tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger& errorLogger, const Settings& settings)
 {
-    for (const Scope* scope : symboldatabase->functionScopes) {
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+    for (const Scope* scope : symboldatabase.functionScopes) {
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (!Token::simpleMatch(tok, "="))
                 continue;
             if (tok->astParent())
@@ -5387,13 +3563,13 @@ static void valueFlowSymbolic(const TokenList* tokenlist, const SymbolDatabase*
                 continue;
             if (tok->astOperand2()->exprId() == 0)
                 continue;
-            if (!isConstExpression(tok->astOperand2(), settings->library, tokenlist->isCPP()))
+            if (!isConstExpression(tok->astOperand2(), settings.library))
                 continue;
             if (tok->astOperand1()->valueType() && tok->astOperand2()->valueType()) {
                 if (isTruncated(
                         tok->astOperand2()->valueType(), tok->astOperand1()->valueType(), settings))
                     continue;
-            } else if (isDifferentType(tok->astOperand2(), tok->astOperand1())) {
+            } else if (isDifferentType(tok->astOperand2(), tok->astOperand1(), settings)) {
                 continue;
             }
             const std::set<nonneg int> rhsVarIds = getVarIds(tok->astOperand2());
@@ -5419,13 +3595,13 @@ static void valueFlowSymbolic(const TokenList* tokenlist, const SymbolDatabase*
             rhs.errorPath.emplace_back(tok,
                                        tok->astOperand1()->expressionString() + " is assigned '" +
                                        tok->astOperand2()->expressionString() + "' here.");
-            valueFlowForward(start, end, tok->astOperand1(), rhs, tokenlist, settings);
+            valueFlowForward(start, end, tok->astOperand1(), std::move(rhs), tokenlist, errorLogger, settings);
 
             ValueFlow::Value lhs = makeSymbolic(tok->astOperand1());
             lhs.errorPath.emplace_back(tok,
                                        tok->astOperand1()->expressionString() + " is assigned '" +
                                        tok->astOperand2()->expressionString() + "' here.");
-            valueFlowForward(start, end, tok->astOperand2(), lhs, tokenlist, settings);
+            valueFlowForward(start, end, tok->astOperand2(), std::move(lhs), tokenlist, errorLogger, settings);
         }
     }
 }
@@ -5458,12 +3634,10 @@ static const Token* isStrlenOf(const Token* tok, const Token* expr, int depth =
     return nullptr;
 }
 
-static ValueFlow::Value inferCondition(const std::string& op, const Token* varTok, MathLib::bigint val);
-
-static void valueFlowSymbolicOperators(const SymbolDatabase* symboldatabase, const Settings* settings)
+static void valueFlowSymbolicOperators(const SymbolDatabase& symboldatabase, const Settings& settings)
 {
-    for (const Scope* scope : symboldatabase->functionScopes) {
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+    for (const Scope* scope : symboldatabase.functionScopes) {
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (tok->hasKnownIntValue())
                 continue;
 
@@ -5471,6 +3645,8 @@ static void valueFlowSymbolicOperators(const SymbolDatabase* symboldatabase, con
                 const Token* arg = tok->next()->astOperand2();
                 if (!arg)
                     continue;
+                if (arg->exprId() == 0)
+                    continue;
                 ValueFlow::Value c = inferCondition(">=", arg, 0);
                 if (!c.isKnown())
                     continue;
@@ -5492,12 +3668,12 @@ static void valueFlowSymbolicOperators(const SymbolDatabase* symboldatabase, con
                     continue;
                 const ValueFlow::Value* constant = nullptr;
                 const Token* vartok = nullptr;
-                if (tok->astOperand1()->hasKnownIntValue()) {
-                    constant = &tok->astOperand1()->values().front();
+                if (const ValueFlow::Value* v = tok->astOperand1()->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+                    constant = v;
                     vartok = tok->astOperand2();
                 }
-                if (tok->astOperand2()->hasKnownIntValue()) {
-                    constant = &tok->astOperand2()->values().front();
+                if (const ValueFlow::Value* v = tok->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT)) {
+                    constant = v;
                     vartok = tok->astOperand1();
                 }
                 if (!constant)
@@ -5544,7 +3720,7 @@ static void valueFlowSymbolicOperators(const SymbolDatabase* symboldatabase, con
                     ValueFlow::Value v = value;
                     v.bound = ValueFlow::Value::Bound::Point;
                     v.valueType = ValueFlow::Value::ValueType::INT;
-                    v.errorPath.emplace_back(strlenTok, "Return index of string to the first element that is 0");
+                    v.errorPath.emplace_back(strlenTok, "Return index of first '\\0' character in string");
                     setTokenValue(tok, std::move(v), settings);
                 }
             }
@@ -5571,10 +3747,10 @@ struct SymbolicInferModel : InferModel {
     }
 };
 
-static void valueFlowSymbolicInfer(const SymbolDatabase* symboldatabase, const Settings* settings)
+static void valueFlowSymbolicInfer(const SymbolDatabase& symboldatabase, const Settings& settings)
 {
-    for (const Scope* scope : symboldatabase->functionScopes) {
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+    for (const Scope* scope : symboldatabase.functionScopes) {
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (!Token::Match(tok, "-|%comp%"))
                 continue;
             if (tok->hasKnownIntValue())
@@ -5596,8 +3772,11 @@ static void valueFlowSymbolicInfer(const SymbolDatabase* symboldatabase, const S
             if (astIsFloat(tok->astOperand2(), false))
                 continue;
 
-            SymbolicInferModel leftModel{tok->astOperand1()};
-            std::vector<ValueFlow::Value> values = infer(leftModel, tok->str(), 0, tok->astOperand2()->values());
+            std::vector<ValueFlow::Value> values;
+            {
+                SymbolicInferModel leftModel{tok->astOperand1()};
+                values = infer(leftModel, tok->str(), 0, tok->astOperand2()->values());
+            }
             if (values.empty()) {
                 SymbolicInferModel rightModel{tok->astOperand2()};
                 values = infer(rightModel, tok->str(), tok->astOperand1()->values(), 0);
@@ -5609,12 +3788,15 @@ 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,
                                   const Variable* var,
                                   const ContainerOfValue& values,
-                                  const Settings* const settings,
+                                  const Settings& settings,
                                   int /*unused*/ = 0)
 {
     if (!precedes(start, end))
@@ -5626,7 +3808,7 @@ static void valueFlowForwardConst(Token* start,
         } else {
             [&] {
                 // 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();
                 });
@@ -5648,12 +3830,15 @@ static void valueFlowForwardConst(Token* start,
                     if (v.tokvalue->varId() != var->declarationId())
                         continue;
                     for (ValueFlow::Value value : values) {
+                        if (!v.isKnown() && value.isImpossible())
+                            continue;
                         if (v.intvalue != 0) {
                             if (!value.isIntValue())
                                 continue;
                             value.intvalue += v.intvalue;
                         }
-                        value.valueKind = v.valueKind;
+                        if (!value.isImpossible())
+                            value.valueKind = v.valueKind;
                         value.bound = v.bound;
                         value.errorPath.insert(value.errorPath.end(), v.errorPath.cbegin(), v.errorPath.cend());
                         setTokenValue(tok, std::move(value), settings);
@@ -5668,19 +3853,59 @@ static void valueFlowForwardConst(Token* start,
                                   const Token* end,
                                   const Variable* var,
                                   const std::initializer_list<ValueFlow::Value>& values,
-                                  const Settings* const settings)
+                                  const Settings& settings)
 {
     valueFlowForwardConst(start, end, var, values, settings, 0);
 }
 
+static ValueFlow::Value::Bound findVarBound(const Variable* var,
+                                            const Token* start,
+                                            const Token* end,
+                                            const Settings& settings)
+{
+    ValueFlow::Value::Bound result = ValueFlow::Value::Bound::Point;
+    const Token* next = start;
+    while ((next = findExpressionChangedSkipDeadCode(
+                var->nameToken(), next->next(), end, settings, &evaluateKnownValues))) {
+        ValueFlow::Value::Bound b = ValueFlow::Value::Bound::Point;
+        if (next->varId() != var->declarationId())
+            return ValueFlow::Value::Bound::Point;
+        if (Token::simpleMatch(next->astParent(), "++"))
+            b = ValueFlow::Value::Bound::Lower;
+        else if (Token::simpleMatch(next->astParent(), "--"))
+            b = ValueFlow::Value::Bound::Upper;
+        else
+            return ValueFlow::Value::Bound::Point;
+        if (result == ValueFlow::Value::Bound::Point)
+            result = b;
+        else if (result != b)
+            return ValueFlow::Value::Bound::Point;
+    }
+    return result;
+}
+
+static bool isInitialVarAssign(const Token* tok)
+{
+    if (!tok)
+        return false;
+    if (!tok->variable())
+        return false;
+    if (tok->variable()->nameToken() == tok)
+        return true;
+    const Token* prev = tok->tokAt(2);
+    if (!Token::Match(prev, "%var% ; %var%"))
+        return false;
+    return tok->varId() == prev->varId() && tok->variable()->nameToken() == prev;
+}
+
 static void valueFlowForwardAssign(Token* const tok,
                                    const Token* expr,
                                    std::vector<const Variable*> vars,
                                    std::list<ValueFlow::Value> values,
                                    const bool init,
-                                   TokenList* const tokenlist,
-                                   ErrorLogger* const errorLogger,
-                                   const Settings* const settings)
+                                   const TokenList& tokenlist,
+                                   ErrorLogger& errorLogger,
+                                   const Settings& settings)
 {
     if (Token::simpleMatch(tok->astParent(), "return"))
         return;
@@ -5710,7 +3935,7 @@ static void valueFlowForwardAssign(Token* const tok,
         }
     }
 
-    if (tokenlist->isCPP() && vars.size() == 1 && Token::Match(vars.front()->typeStartToken(), "bool|_Bool")) {
+    if (tokenlist.isCPP() && vars.size() == 1 && Token::Match(vars.front()->typeStartToken(), "bool|_Bool")) {
         for (ValueFlow::Value& value : values) {
             if (value.isImpossible())
                 continue;
@@ -5722,7 +3947,7 @@ static void valueFlowForwardAssign(Token* const tok,
     }
 
     // Static variable initialisation?
-    if (vars.size() == 1 && vars.front()->isStatic() && init)
+    if (vars.size() == 1 && vars.front()->isStatic() && !vars.front()->isConst() && init)
         lowerToPossible(values);
 
     // is volatile
@@ -5732,7 +3957,7 @@ static void valueFlowForwardAssign(Token* const tok,
         lowerToPossible(values);
 
     // Skip RHS
-    const Token * nextExpression = tok->astParent() ? nextAfterAstRightmostLeaf(tok->astParent()) : tok->next();
+    Token* nextExpression = tok->astParent() ? nextAfterAstRightmostLeaf(tok->astParent()) : tok->next();
     if (!nextExpression)
         return;
 
@@ -5760,9 +3985,27 @@ static void valueFlowForwardAssign(Token* const tok,
         });
         std::list<ValueFlow::Value> constValues;
         constValues.splice(constValues.end(), values, it, values.end());
-        valueFlowForwardConst(const_cast<Token*>(nextExpression), endOfVarScope, expr->variable(), constValues, settings);
+        valueFlowForwardConst(nextExpression, endOfVarScope, expr->variable(), constValues, settings);
+    }
+    if (isInitialVarAssign(expr)) {
+        // Check if variable is only incremented or decremented
+        ValueFlow::Value::Bound b = findVarBound(expr->variable(), nextExpression, endOfVarScope, settings);
+        if (b != ValueFlow::Value::Bound::Point) {
+            auto knownValueIt = std::find_if(values.begin(), values.end(), [](const ValueFlow::Value& value) {
+                if (!value.isKnown())
+                    return false;
+                return value.isIntValue();
+            });
+            if (knownValueIt != values.end()) {
+                ValueFlow::Value value = *knownValueIt;
+                value.bound = b;
+                value.invertRange();
+                value.setImpossible();
+                valueFlowForwardConst(nextExpression, endOfVarScope, expr->variable(), {std::move(value)}, settings);
+            }
+        }
     }
-    valueFlowForward(const_cast<Token*>(nextExpression), endOfVarScope, expr, values, tokenlist, settings);
+    valueFlowForward(nextExpression, endOfVarScope, expr, std::move(values), tokenlist, errorLogger, settings);
 }
 
 static void valueFlowForwardAssign(Token* const tok,
@@ -5770,9 +4013,9 @@ static void valueFlowForwardAssign(Token* const tok,
                                    const std::list<ValueFlow::Value>& values,
                                    const bool /*unused*/,
                                    const bool init,
-                                   TokenList* const tokenlist,
-                                   ErrorLogger* const errorLogger,
-                                   const Settings* const settings)
+                                   const TokenList& tokenlist,
+                                   ErrorLogger& errorLogger,
+                                   const Settings& settings)
 {
     valueFlowForwardAssign(tok, var->nameToken(), {var}, values, init, tokenlist, errorLogger, settings);
 }
@@ -5780,15 +4023,15 @@ static void valueFlowForwardAssign(Token* const tok,
 static std::list<ValueFlow::Value> truncateValues(std::list<ValueFlow::Value> values,
                                                   const ValueType* dst,
                                                   const ValueType* src,
-                                                  const Settings* settings)
+                                                  const Settings& settings)
 {
     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())
@@ -5811,30 +4054,37 @@ static std::list<ValueFlow::Value> truncateValues(std::list<ValueFlow::Value> va
         if (value.isImpossible())
             continue;
         if (value.isFloatValue()) {
-            value.intvalue = value.floatValue;
+            value.intvalue = static_cast<MathLib::bigint>(value.floatValue);
             value.valueType = ValueFlow::Value::ValueType::INT;
         }
 
-        if (value.isIntValue() && sz > 0 && sz < 8) {
-            const MathLib::biguint unsignedMaxValue = (1ULL << (sz * 8)) - 1ULL;
-            const MathLib::biguint signBit = 1ULL << (sz * 8 - 1);
-            value.intvalue &= unsignedMaxValue;
-            if (dst->sign == ValueType::Sign::SIGNED && (value.intvalue & signBit))
-                value.intvalue |= ~unsignedMaxValue;
-        }
+        if (value.isIntValue() && sz > 0 && sz < sizeof(MathLib::biguint))
+            value.intvalue = ValueFlow::truncateIntValue(value.intvalue, sz, dst->sign);
     }
     return values;
 }
 
 static bool isVariableInit(const Token *tok)
 {
-    return (tok->str() == "(" || tok->str() == "{") &&
-           (tok->isBinaryOp() || (tok->astOperand1() && tok->link() == tok->next())) &&
-           tok->astOperand1()->variable() &&
-           tok->astOperand1()->variable()->nameToken() == tok->astOperand1() &&
-           tok->astOperand1()->variable()->valueType() &&
-           tok->astOperand1()->variable()->valueType()->type >= ValueType::Type::VOID &&
-           !Token::simpleMatch(tok->astOperand2(), ",");
+    if (!tok)
+        return false;
+    if (!Token::Match(tok->previous(), "%var% (|{"))
+        return false;
+    if (!tok->isBinaryOp() && !(tok->astOperand1() && tok->link() == tok->next()))
+        return false;
+    if (Token::simpleMatch(tok->astOperand2(), ","))
+        return false;
+    const Variable* var = tok->astOperand1()->variable();
+    if (!var)
+        return false;
+    if (var->nameToken() != tok->astOperand1())
+        return false;
+    const ValueType* vt = var->valueType();
+    if (!vt)
+        return false;
+    if (vt->type < ValueType::Type::VOID)
+        return false;
+    return true;
 }
 
 // Return true if two associative containers intersect
@@ -5843,6 +4093,7 @@ static bool intersects(const C1& c1, const C2& c2)
 {
     if (c1.size() > c2.size())
         return intersects(c2, c1);
+    // NOLINTNEXTLINE(readability-use-anyofallof) - TODO: fix if possible / also Cppcheck false negative
     for (auto&& x : c1) {
         if (c2.find(x) != c2.end())
             return true;
@@ -5850,17 +4101,22 @@ static bool intersects(const C1& c1, const C2& c2)
     return false;
 }
 
-static void valueFlowAfterAssign(TokenList *tokenlist,
-                                 const SymbolDatabase* symboldatabase,
-                                 ErrorLogger *errorLogger,
-                                 const Settings *settings,
+static void valueFlowAfterAssign(TokenList &tokenlist,
+                                 const SymbolDatabase& symboldatabase,
+                                 ErrorLogger &errorLogger,
+                                 const Settings &settings,
                                  const std::set<const Scope*>& skippedFunctions)
 {
-    for (const Scope * scope : symboldatabase->functionScopes) {
+    for (const Scope * scope : symboldatabase.functionScopes) {
         if (skippedFunctions.count(scope))
             continue;
         std::unordered_map<nonneg int, std::unordered_set<nonneg int>> backAssigns;
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+            if (!tok->scope()->isExecutable()) {
+                tok = const_cast<Token*>(tok->scope()->bodyEnd); // skip local type definition
+                continue;
+            }
+
             // Assignment
             bool isInit = false;
             if (tok->str() != "=" && !(isInit = isVariableInit(tok)))
@@ -5937,7 +4193,7 @@ static void valueFlowAfterAssign(TokenList *tokenlist,
                 continue;
             const bool init = vars.size() == 1 && (vars.front()->nameToken() == tok->astOperand1() || tok->isSplittedVarDeclEq());
             valueFlowForwardAssign(
-                rhs, tok->astOperand1(), vars, values, init, tokenlist, errorLogger, settings);
+                rhs, tok->astOperand1(), std::move(vars), values, init, tokenlist, errorLogger, settings);
             // Back propagate symbolic values
             if (tok->astOperand1()->exprId() > 0) {
                 Token* start = nextAfterAstRightmostLeaf(tok);
@@ -5969,7 +4225,7 @@ static void valueFlowAfterAssign(TokenList *tokenlist,
                     value.errorPath.emplace_back(tok,
                                                  tok->astOperand1()->expressionString() + " is assigned '" +
                                                  tok->astOperand2()->expressionString() + "' here.");
-                    valueFlowForward(start, end, expr, value, tokenlist, settings);
+                    valueFlowForward(start, end, expr, std::move(value), tokenlist, errorLogger, settings);
                 }
             }
         }
@@ -5987,13 +4243,13 @@ static std::vector<const Variable*> getVariables(const Token* tok)
     return result;
 }
 
-static void valueFlowAfterSwap(TokenList* tokenlist,
-                               const SymbolDatabase* symboldatabase,
-                               ErrorLogger* errorLogger,
-                               const Settings* settings)
+static void valueFlowAfterSwap(const TokenList& tokenlist,
+                               const SymbolDatabase& symboldatabase,
+                               ErrorLogger& errorLogger,
+                               const Settings& settings)
 {
-    for (const Scope* scope : symboldatabase->functionScopes) {
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+    for (const Scope* scope : symboldatabase.functionScopes) {
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (!Token::simpleMatch(tok, "swap ("))
                 continue;
             if (!Token::simpleMatch(tok->next()->astOperand2(), ","))
@@ -6008,7 +4264,7 @@ static void valueFlowAfterSwap(TokenList* tokenlist,
             for (int i = 0; i < 2; i++) {
                 std::vector<const Variable*> vars = getVariables(args[0]);
                 const std::list<ValueFlow::Value>& values = args[0]->values();
-                valueFlowForwardAssign(args[0], args[1], vars, values, false, tokenlist, errorLogger, settings);
+                valueFlowForwardAssign(args[0], args[1], std::move(vars), values, false, tokenlist, errorLogger, settings);
                 std::swap(args[0], args[1]);
             }
         }
@@ -6061,7 +4317,7 @@ static void insertNegateKnown(std::list<ValueFlow::Value>& values, const std::li
 
 struct ConditionHandler {
     struct Condition {
-        const Token *vartok;
+        const Token* vartok{};
         std::list<ValueFlow::Value> true_values;
         std::list<ValueFlow::Value> false_values;
         bool inverted = false;
@@ -6123,62 +4379,60 @@ struct ConditionHandler {
 
             return ctx;
         }
-
-        Condition() : vartok(nullptr), true_values(), false_values(), inverted(false), impossible(true) {}
     };
 
-    virtual std::vector<Condition> parse(const Token* tok, const Settings* settings) const = 0;
+    virtual std::vector<Condition> parse(const Token* tok, const Settings& settings) const = 0;
 
     virtual Analyzer::Result forward(Token* start,
                                      const Token* stop,
                                      const Token* exprTok,
                                      const std::list<ValueFlow::Value>& values,
-                                     TokenList* tokenlist,
-                                     const Settings* settings,
+                                     TokenList& tokenlist,
+                                     ErrorLogger& errorLogger,
+                                     const Settings& settings,
                                      SourceLocation loc = SourceLocation::current()) const
     {
-        return valueFlowForward(start->next(), stop, exprTok, values, tokenlist, settings, loc);
+        return valueFlowForward(start->next(), stop, exprTok, values, tokenlist, errorLogger, settings, loc);
     }
 
     virtual Analyzer::Result forward(Token* top,
                                      const Token* exprTok,
                                      const std::list<ValueFlow::Value>& values,
-                                     TokenList* tokenlist,
-                                     const Settings* settings,
+                                     TokenList& tokenlist,
+                                     ErrorLogger& errorLogger,
+                                     const Settings& settings,
                                      SourceLocation loc = SourceLocation::current()) const
     {
-        return valueFlowForwardRecursive(top, exprTok, values, tokenlist, settings, loc);
+        return valueFlowForwardRecursive(top, exprTok, values, tokenlist, errorLogger, settings, loc);
     }
 
     virtual void reverse(Token* start,
                          const Token* endToken,
                          const Token* exprTok,
                          const std::list<ValueFlow::Value>& values,
-                         TokenList* tokenlist,
-                         const Settings* settings,
+                         TokenList& tokenlist,
+                         ErrorLogger& errorLogger,
+                         const Settings& settings,
                          SourceLocation loc = SourceLocation::current()) const
     {
-        return valueFlowReverse(start, endToken, exprTok, values, tokenlist, settings, loc);
+        valueFlowReverse(start, endToken, exprTok, values, tokenlist, errorLogger, settings, loc);
     }
 
-    void traverseCondition(const TokenList* tokenlist,
-                           const SymbolDatabase* symboldatabase,
-                           const Settings* settings,
+    void traverseCondition(const SymbolDatabase& symboldatabase,
+                           const Settings& settings,
                            const std::set<const Scope*>& skippedFunctions,
                            const std::function<void(const Condition& cond, Token* tok, const Scope* scope)>& f) const
     {
-        for (const Scope *scope : symboldatabase->functionScopes) {
+        for (const Scope *scope : symboldatabase.functionScopes) {
             if (skippedFunctions.count(scope))
                 continue;
-            for (Token *tok = const_cast<Token *>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+            for (auto *tok = const_cast<Token *>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
                 if (Token::Match(tok, "if|while|for ("))
                     continue;
                 if (Token::Match(tok, ":|;|,"))
                     continue;
 
                 const Token* top = tok->astTop();
-                if (!top)
-                    continue;
 
                 if (!Token::Match(top->previous(), "if|while|for (") && !Token::Match(tok->astParent(), "&&|%oror%|?|!"))
                     continue;
@@ -6191,7 +4445,7 @@ struct ConditionHandler {
                         continue;
                     if (cond.true_values.empty() || cond.false_values.empty())
                         continue;
-                    if (!isConstExpression(cond.vartok, settings->library, tokenlist->isCPP()))
+                    if (!isConstExpression(cond.vartok, settings.library))
                         continue;
                     f(cond, tok, scope);
                 }
@@ -6199,12 +4453,12 @@ struct ConditionHandler {
         }
     }
 
-    void beforeCondition(TokenList* tokenlist,
-                         const SymbolDatabase* symboldatabase,
-                         ErrorLogger* errorLogger,
-                         const Settings* settings,
+    void beforeCondition(TokenList& tokenlist,
+                         const SymbolDatabase& symboldatabase,
+                         ErrorLogger& errorLogger,
+                         const Settings& settings,
                          const std::set<const Scope*>& skippedFunctions) const {
-        traverseCondition(tokenlist, symboldatabase, settings, skippedFunctions, [&](const Condition& cond, Token* tok, const Scope*) {
+        traverseCondition(symboldatabase, settings, skippedFunctions, [&](const Condition& cond, Token* tok, const Scope*) {
             if (cond.vartok->exprId() == 0)
                 return;
 
@@ -6220,7 +4474,7 @@ struct ConditionHandler {
                 return;
 
             if (Token::simpleMatch(tok->astParent(), "?") && tok->astParent()->isExpandedMacro()) {
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist,
                             errorLogger,
                             tok,
@@ -6230,7 +4484,7 @@ struct ConditionHandler {
 
             // if,macro => bailout
             if (Token::simpleMatch(top->previous(), "if (") && top->previous()->isExpandedMacro()) {
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist,
                             errorLogger,
                             tok,
@@ -6238,19 +4492,23 @@ struct ConditionHandler {
                 return;
             }
 
+            if (cond.true_values.empty() && cond.false_values.empty())
+                return;
+
             std::list<ValueFlow::Value> values = cond.true_values;
             if (cond.true_values != cond.false_values)
                 values.insert(values.end(), cond.false_values.cbegin(), cond.false_values.cend());
 
             // extra logic for unsigned variables 'i>=1' => possible value can also be 0
-            if (Token::Match(tok, "<|>")) {
+            if (Token::Match(tok, "<|>|<=|>=")) {
+                if (cond.vartok->valueType() && cond.vartok->valueType()->sign != ValueType::Sign::UNSIGNED)
+                    return;
+
                 values.remove_if([](const ValueFlow::Value& v) {
                     if (v.isIntValue())
                         return v.intvalue != 0;
                     return false;
                 });
-                if (cond.vartok->valueType() && cond.vartok->valueType()->sign != ValueType::Sign::UNSIGNED)
-                    return;
             }
             if (values.empty())
                 return;
@@ -6261,9 +4519,9 @@ struct ConditionHandler {
                 // Variable changed in 3rd for-expression
                 if (Token::simpleMatch(top->previous(), "for (")) {
                     if (top->astOperand2() && top->astOperand2()->astOperand2() &&
-                        isExpressionChanged(
-                            cond.vartok, top->astOperand2()->astOperand2(), top->link(), settings, tokenlist->isCPP())) {
-                        if (settings->debugwarnings)
+                        findExpressionChanged(
+                            cond.vartok, top->astOperand2()->astOperand2(), top->link(), settings)) {
+                        if (settings.debugwarnings)
                             bailout(tokenlist,
                                     errorLogger,
                                     tok,
@@ -6277,17 +4535,17 @@ struct ConditionHandler {
                 const Token* const block = top->link()->next();
                 const Token* const end = block->link();
 
-                if (isExpressionChanged(cond.vartok, start, end, settings, tokenlist->isCPP())) {
+                if (findExpressionChanged(cond.vartok, start, end, settings)) {
                     // If its reassigned in loop then analyze from the end
                     if (!Token::Match(tok, "%assign%|++|--") &&
                         findExpression(cond.vartok->exprId(), start, end, [&](const Token* tok2) {
                         return Token::Match(tok2->astParent(), "%assign%") && astIsLHS(tok2);
-                    })) {
+                    }) && !findEscapeStatement(block->scope(), settings.library)) {
                         // Start at the end of the loop body
                         Token* bodyTok = top->link()->next();
-                        reverse(bodyTok->link(), bodyTok, cond.vartok, values, tokenlist, settings);
+                        reverse(bodyTok->link(), bodyTok, cond.vartok, values, tokenlist, errorLogger, settings);
                     }
-                    if (settings->debugwarnings)
+                    if (settings.debugwarnings)
                         bailout(tokenlist,
                                 errorLogger,
                                 tok,
@@ -6304,7 +4562,7 @@ struct ConditionHandler {
             if (!startTok)
                 startTok = tok->previous();
 
-            reverse(startTok, nullptr, cond.vartok, values, tokenlist, settings);
+            reverse(startTok, nullptr, cond.vartok, values, tokenlist, errorLogger, settings);
         });
     }
 
@@ -6319,7 +4577,7 @@ struct ConditionHandler {
             if (Token::Match(tok->astParent(), "==|!=")) {
                 const Token* sibling = tok->astSibling();
                 if (sibling->hasKnownIntValue() && (astIsBool(tok) || astIsBool(sibling))) {
-                    const bool value = sibling->values().front().intvalue;
+                    const bool value = !!sibling->getKnownIntValue();
                     if (inverted)
                         *inverted ^= value == Token::simpleMatch(tok->astParent(), "!=");
                     continue;
@@ -6332,12 +4590,12 @@ struct ConditionHandler {
         return tok;
     }
 
-    static void fillFromPath(ProgramMemory& pm, const Token* top, MathLib::bigint path)
+    static void fillFromPath(ProgramMemory& pm, const Token* top, MathLib::bigint path, const Settings& settings)
     {
         if (path < 1)
             return;
         visitAstNodes(top, [&](const Token* tok) {
-            const ValueFlow::Value* v = ValueFlow::findValue(tok->values(), nullptr, [&](const ValueFlow::Value& v) {
+            const ValueFlow::Value* v = ValueFlow::findValue(tok->values(), settings, [&](const ValueFlow::Value& v) {
                 return v.path == path && isNonConditionalPossibleIntValue(v);
             });
             if (v == nullptr)
@@ -6347,14 +4605,12 @@ struct ConditionHandler {
         });
     }
 
-    void afterCondition(TokenList* tokenlist,
-                        const SymbolDatabase* symboldatabase,
-                        ErrorLogger* errorLogger,
-                        const Settings* settings,
+    void afterCondition(TokenList& tokenlist,
+                        const SymbolDatabase& symboldatabase,
+                        ErrorLogger& errorLogger,
+                        const Settings& settings,
                         const std::set<const Scope*>& skippedFunctions) const {
-        traverseCondition(tokenlist, symboldatabase, settings, skippedFunctions, [&](const Condition& cond, Token* condTok, const Scope* scope) {
-            Token* top = condTok->astTop();
-
+        traverseCondition(symboldatabase, settings, skippedFunctions, [&](const Condition& cond, Token* condTok, const Scope* scope) {
             const MathLib::bigint path = cond.getPath();
             const bool allowKnown = path == 0;
 
@@ -6383,9 +4639,9 @@ struct ConditionHandler {
                     const std::string& op(parent->str());
                     std::list<ValueFlow::Value> values;
                     if (op == "&&")
-                        values = andValues;
+                        values = std::move(andValues);
                     else if (op == "||")
-                        values = orValues;
+                        values = std::move(orValues);
                     if (allowKnown && (Token::Match(condTok, "==|!=") || cond.isBool()))
                         changePossibleToKnown(values);
                     if (astIsFloat(cond.vartok, false) ||
@@ -6397,7 +4653,7 @@ struct ConditionHandler {
                             return v.isImpossible();
                         });
                     for (Token* start:nextExprs) {
-                        Analyzer::Result r = forward(start, cond.vartok, values, tokenlist, settings);
+                        Analyzer::Result r = forward(start, cond.vartok, values, tokenlist, errorLogger, settings);
                         if (r.terminate != Analyzer::Terminate::None || r.action.isModified())
                             return;
                     }
@@ -6429,8 +4685,7 @@ struct ConditionHandler {
                 }
             }
 
-            if (!top)
-                return;
+            Token* top = condTok->astTop();
 
             if (top->previous()->isExpandedMacro()) {
                 for (std::list<ValueFlow::Value>* values : {&thenValues, &elseValues}) {
@@ -6457,8 +4712,8 @@ struct ConditionHandler {
 
             if (Token::simpleMatch(condTop, "?")) {
                 Token* colon = condTop->astOperand2();
-                forward(colon->astOperand1(), cond.vartok, thenValues, tokenlist, settings);
-                forward(colon->astOperand2(), cond.vartok, elseValues, tokenlist, settings);
+                forward(colon->astOperand1(), cond.vartok, thenValues, tokenlist, errorLogger, settings);
+                forward(colon->astOperand2(), cond.vartok, elseValues, tokenlist, errorLogger, settings);
                 // TODO: Handle after condition
                 return;
             }
@@ -6469,7 +4724,7 @@ struct ConditionHandler {
             if (!Token::Match(top->previous(), "if|while|for ("))
                 return;
 
-            if (top->previous()->str() == "for") {
+            if (top->strAt(-1) == "for") {
                 if (!Token::Match(condTok, "%comp%"))
                     return;
                 if (!Token::simpleMatch(condTok->astParent(), ";"))
@@ -6503,17 +4758,16 @@ struct ConditionHandler {
                                       startBlock->link(),
                                       cond.vartok->varId(),
                                       cond.vartok->variable()->isGlobal(),
-                                      settings,
-                                      tokenlist->isCPP()))
+                                      settings))
                     return;
                 // Check if condition in for loop is always false
                 const Token* initTok = getInitTok(top);
                 ProgramMemory pm;
-                fillFromPath(pm, initTok, path);
-                fillFromPath(pm, condTok, path);
-                execute(initTok, pm, nullptr, nullptr);
+                fillFromPath(pm, initTok, path, settings);
+                fillFromPath(pm, condTok, path, settings);
+                execute(initTok, pm, nullptr, nullptr, settings);
                 MathLib::bigint result = 1;
-                execute(condTok, pm, &result, nullptr);
+                execute(condTok, pm, &result, nullptr, settings);
                 if (result == 0)
                     return;
                 // Remove condition since for condition is not redundant
@@ -6545,7 +4799,7 @@ struct ConditionHandler {
                 if (allowKnown)
                     valueFlowSetConditionToKnown(condTok, values, i == 0);
 
-                Analyzer::Result r = forward(startTokens[i], startTokens[i]->link(), cond.vartok, values, tokenlist, settings);
+                Analyzer::Result r = forward(startTokens[i], startTokens[i]->link(), cond.vartok, values, tokenlist, errorLogger, settings);
                 deadBranch[i] = r.terminate == Analyzer::Terminate::Escape;
                 if (r.action.isModified() && !deadBranch[i])
                     changeBlock = i;
@@ -6555,7 +4809,7 @@ struct ConditionHandler {
                 changeKnownToPossible(values);
             }
             if (changeBlock >= 0 && !Token::simpleMatch(top->previous(), "while (")) {
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist,
                             errorLogger,
                             startTokens[changeBlock]->link(),
@@ -6564,7 +4818,7 @@ struct ConditionHandler {
                 return;
             }
             if (bailBlock >= 0) {
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist,
                             errorLogger,
                             startTokens[bailBlock]->link(),
@@ -6581,10 +4835,10 @@ struct ConditionHandler {
                 if (condTok->astParent() && Token::Match(top->previous(), "while|for ("))
                     dead_if = !isBreakScope(after);
                 else if (!dead_if)
-                    dead_if = isReturnScope(after, &settings->library, &unknownFunction);
+                    dead_if = isReturnScope(after, settings.library, &unknownFunction);
 
                 if (!dead_if && unknownFunction) {
-                    if (settings->debugwarnings)
+                    if (settings.debugwarnings)
                         bailout(tokenlist, errorLogger, unknownFunction, "possible noreturn scope");
                     return;
                 }
@@ -6593,9 +4847,9 @@ struct ConditionHandler {
                     after = after->linkAt(2);
                     unknownFunction = nullptr;
                     if (!dead_else)
-                        dead_else = isReturnScope(after, &settings->library, &unknownFunction);
+                        dead_else = isReturnScope(after, settings.library, &unknownFunction);
                     if (!dead_else && unknownFunction) {
-                        if (settings->debugwarnings)
+                        if (settings.debugwarnings)
                             bailout(tokenlist, errorLogger, unknownFunction, "possible noreturn scope");
                         return;
                     }
@@ -6606,9 +4860,9 @@ struct ConditionHandler {
 
                 std::list<ValueFlow::Value> values;
                 if (dead_if) {
-                    values = elseValues;
+                    values = std::move(elseValues);
                 } else if (dead_else) {
-                    values = thenValues;
+                    values = std::move(thenValues);
                 } else {
                     std::copy_if(thenValues.cbegin(),
                                  thenValues.cend(),
@@ -6654,36 +4908,36 @@ struct ConditionHandler {
                 if (isKnown && isBreakOrContinueScope(after)) {
                     const Scope* loopScope = getLoopScope(cond.vartok);
                     if (loopScope) {
-                        Analyzer::Result r = forward(after, loopScope->bodyEnd, cond.vartok, values, tokenlist, settings);
+                        Analyzer::Result r = forward(after, loopScope->bodyEnd, cond.vartok, values, tokenlist, errorLogger, settings);
                         if (r.terminate != Analyzer::Terminate::None)
                             return;
                         if (r.action.isModified())
                             return;
-                        Token* start = const_cast<Token*>(loopScope->bodyEnd);
+                        auto* start = const_cast<Token*>(loopScope->bodyEnd);
                         if (Token::simpleMatch(start, "} while (")) {
                             start = start->tokAt(2);
-                            forward(start, start->link(), cond.vartok, values, tokenlist, settings);
+                            forward(start, start->link(), cond.vartok, values, tokenlist, errorLogger, settings);
                             start = start->link();
                         }
                         values.remove_if(std::mem_fn(&ValueFlow::Value::isImpossible));
                         changeKnownToPossible(values);
                     }
                 }
-                forward(after, ValueFlow::getEndOfExprScope(cond.vartok, scope), cond.vartok, values, tokenlist, settings);
+                forward(after, ValueFlow::getEndOfExprScope(cond.vartok, scope), cond.vartok, values, tokenlist, errorLogger, settings);
             }
         });
     }
-    virtual ~ConditionHandler() {}
+    virtual ~ConditionHandler() = default;
     ConditionHandler(const ConditionHandler&) = default;
 protected:
     ConditionHandler() = default;
 };
 
 static void valueFlowCondition(const ValuePtr<ConditionHandler>& handler,
-                               TokenList* tokenlist,
-                               SymbolDatabase* symboldatabase,
-                               ErrorLogger* errorLogger,
-                               const Settings* settings,
+                               TokenList& tokenlist,
+                               SymbolDatabase& symboldatabase,
+                               ErrorLogger& errorLogger,
+                               const Settings& settings,
                                const std::set<const Scope*>& skippedFunctions)
 {
     handler->beforeCondition(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions);
@@ -6691,7 +4945,7 @@ static void valueFlowCondition(const ValuePtr<ConditionHandler>& handler,
 }
 
 struct SimpleConditionHandler : ConditionHandler {
-    std::vector<Condition> parse(const Token* tok, const Settings* /*settings*/) const override {
+    std::vector<Condition> parse(const Token* tok, const Settings& /*settings*/) const override {
 
         std::vector<Condition> conds;
         parseCompareEachInt(tok, [&](const Token* vartok, ValueFlow::Value true_value, ValueFlow::Value false_value) {
@@ -6732,35 +4986,6 @@ struct SimpleConditionHandler : ConditionHandler {
     }
 };
 
-struct IntegralInferModel : InferModel {
-    bool match(const ValueFlow::Value& value) const override {
-        return value.isIntValue();
-    }
-    ValueFlow::Value yield(MathLib::bigint value) const override
-    {
-        ValueFlow::Value result(value);
-        result.valueType = ValueFlow::Value::ValueType::INT;
-        result.setKnown();
-        return result;
-    }
-};
-
-ValuePtr<InferModel> ValueFlow::makeIntegralInferModel() {
-    return IntegralInferModel{};
-}
-
-ValueFlow::Value inferCondition(const std::string& op, const Token* varTok, MathLib::bigint val)
-{
-    if (!varTok)
-        return ValueFlow::Value{};
-    if (varTok->hasKnownIntValue())
-        return ValueFlow::Value{};
-    std::vector<ValueFlow::Value> r = infer(IntegralInferModel{}, op, varTok->values(), val);
-    if (r.size() == 1 && r.front().isKnown())
-        return r.front();
-    return ValueFlow::Value{};
-}
-
 struct IteratorInferModel : InferModel {
     virtual ValueFlow::Value::ValueType getType() const = 0;
     bool match(const ValueFlow::Value& value) const override {
@@ -6813,10 +5038,9 @@ static bool isIntegralOrPointer(const Token* tok)
     return false;
 }
 
-static void valueFlowInferCondition(TokenList* tokenlist,
-                                    const Settings* settings)
+static void valueFlowInferCondition(TokenList& tokenlist, const Settings& settings)
 {
-    for (Token* tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         if (!tok->astParent())
             continue;
         if (tok->hasKnownIntValue())
@@ -6835,14 +5059,15 @@ static void valueFlowInferCondition(TokenList* tokenlist,
                 }
             } else if (isIntegralOrPointer(tok->astOperand1()) && isIntegralOrPointer(tok->astOperand2())) {
                 std::vector<ValueFlow::Value> result =
-                    infer(IntegralInferModel{}, tok->str(), tok->astOperand1()->values(), tok->astOperand2()->values());
+                    infer(makeIntegralInferModel(), tok->str(), tok->astOperand1()->values(), tok->astOperand2()->values());
                 for (ValueFlow::Value& value : result) {
                     setTokenValue(tok, std::move(value), settings);
                 }
             }
         } else if (Token::Match(tok->astParent(), "?|&&|!|%oror%") ||
-                   Token::Match(tok->astParent()->previous(), "if|while (")) {
-            std::vector<ValueFlow::Value> result = infer(IntegralInferModel{}, "!=", tok->values(), 0);
+                   Token::Match(tok->astParent()->previous(), "if|while (") ||
+                   (astIsPointer(tok) && isUsedAsBool(tok, settings))) {
+            std::vector<ValueFlow::Value> result = infer(makeIntegralInferModel(), "!=", tok->values(), 0);
             if (result.size() != 1)
                 continue;
             ValueFlow::Value value = result.front();
@@ -6867,7 +5092,7 @@ struct SymbolicConditionHandler : SimpleConditionHandler {
         return tok->astOperand1();
     }
 
-    std::vector<Condition> parse(const Token* tok, const Settings* settings) const override
+    std::vector<Condition> parse(const Token* tok, const Settings& settings) const override
     {
         if (!Token::Match(tok, "%comp%"))
             return {};
@@ -6877,7 +5102,7 @@ struct SymbolicConditionHandler : SimpleConditionHandler {
             return {};
         if (!tok->astOperand2() || tok->astOperand2()->hasKnownIntValue() || tok->astOperand2()->isLiteral())
             return {};
-        if (!isConstExpression(tok, settings->library, true))
+        if (!isConstExpression(tok, settings.library))
             return {};
 
         std::vector<Condition> result;
@@ -6919,7 +5144,8 @@ struct SymbolicConditionHandler : SimpleConditionHandler {
 static bool valueFlowForLoop2(const Token *tok,
                               ProgramMemory *memory1,
                               ProgramMemory *memory2,
-                              ProgramMemory *memoryAfter)
+                              ProgramMemory *memoryAfter,
+                              const Settings& settings)
 {
     // for ( firstExpression ; secondExpression ; thirdExpression )
     const Token *firstExpression  = tok->next()->astOperand2()->astOperand1();
@@ -6929,10 +5155,10 @@ static bool valueFlowForLoop2(const Token *tok,
     ProgramMemory programMemory;
     MathLib::bigint result(0);
     bool error = false;
-    execute(firstExpression, programMemory, &result, &error);
+    execute(firstExpression, programMemory, &result, &error, settings);
     if (error)
         return false;
-    execute(secondExpression, programMemory, &result, &error);
+    execute(secondExpression, programMemory, &result, &error, settings);
     if (result == 0) // 2nd expression is false => no looping
         return false;
     if (error) {
@@ -6952,13 +5178,14 @@ static bool valueFlowForLoop2(const Token *tok,
     ProgramMemory startMemory(programMemory);
     ProgramMemory endMemory;
 
-    int maxcount = 10000;
+    int maxcount = settings.vfOptions.maxForLoopCount;
     while (result != 0 && !error && --maxcount > 0) {
         endMemory = programMemory;
-        execute(thirdExpression, programMemory, &result, &error);
+        execute(thirdExpression, programMemory, &result, &error, settings);
         if (!error)
-            execute(secondExpression, programMemory, &result, &error);
+            execute(secondExpression, programMemory, &result, &error, settings);
     }
+    // TODO: add bailout message
 
     if (memory1)
         memory1->swap(startMemory);
@@ -6976,17 +5203,23 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
                                      const Token* expr,
                                      bool globalvar,
                                      const MathLib::bigint value,
-                                     TokenList* tokenlist,
-                                     ErrorLogger* errorLogger,
-                                     const Settings* settings)
+                                     const TokenList& tokenlist,
+                                     ErrorLogger& errorLogger,
+                                     const Settings& settings)
 {
     // TODO: Refactor this to use arbitrary expressions
     assert(expr->varId() > 0);
     const Token * const bodyEnd = bodyStart->link();
 
     // Is variable modified inside for loop
-    if (isVariableChanged(bodyStart, bodyEnd, expr->varId(), globalvar, settings, tokenlist->isCPP()))
+    if (isVariableChanged(bodyStart, bodyEnd, expr->varId(), globalvar, settings))
+        return;
+
+    if (const Token* escape = findEscapeStatement(bodyStart->scope(), settings.library)) {
+        if (settings.debugwarnings)
+            bailout(tokenlist, errorLogger, escape, "For loop variable bailout on escape statement");
         return;
+    }
 
     for (Token *tok2 = bodyStart->next(); tok2 != bodyEnd; tok2 = tok2->next()) {
         if (tok2->varId() == expr->varId()) {
@@ -7003,7 +5236,7 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
                 }
             }
             if (parent) {
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist, errorLogger, tok2, "For loop variable " + tok2->str() + " stopping on ?");
                 continue;
             }
@@ -7015,8 +5248,8 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
 
         if (Token::Match(tok2, "%oror%|&&")) {
             const ProgramMemory programMemory(getProgramMemory(tok2->astTop(), expr, ValueFlow::Value(value), settings));
-            if ((tok2->str() == "&&" && !conditionIsTrue(tok2->astOperand1(), programMemory)) ||
-                (tok2->str() == "||" && !conditionIsFalse(tok2->astOperand1(), programMemory))) {
+            if ((tok2->str() == "&&" && !conditionIsTrue(tok2->astOperand1(), programMemory, settings)) ||
+                (tok2->str() == "||" && !conditionIsFalse(tok2->astOperand1(), programMemory, settings))) {
                 // Skip second expression..
                 Token *parent = tok2;
                 while (parent && parent->str() == tok2->str())
@@ -7029,7 +5262,6 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
                         tok2 = tok2->linkAt(1);
                 }
             }
-
         }
         const Token* vartok = expr;
         const Token* rml = nextAfterAstRightmostLeaf(vartok);
@@ -7040,33 +5272,25 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
 
         if ((tok2->str() == "&&" &&
              conditionIsFalse(tok2->astOperand1(),
-                              getProgramMemory(tok2->astTop(), expr, ValueFlow::Value(value), settings))) ||
+                              getProgramMemory(tok2->astTop(), expr, ValueFlow::Value(value), settings),
+                              settings)) ||
             (tok2->str() == "||" &&
              conditionIsTrue(tok2->astOperand1(),
-                             getProgramMemory(tok2->astTop(), expr, ValueFlow::Value(value), settings))))
+                             getProgramMemory(tok2->astTop(), expr, ValueFlow::Value(value), settings),
+                             settings)))
             break;
 
         if (Token::simpleMatch(tok2, ") {")) {
             if (vartok->varId() && Token::findmatch(tok2->link(), "%varid%", tok2, vartok->varId())) {
-                if (Token::findmatch(tok2, "continue|break|return", tok2->linkAt(1), vartok->varId())) {
-                    if (settings->debugwarnings)
-                        bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return");
-                    break;
-                }
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist, errorLogger, tok2, "For loop variable skipping conditional scope");
-                tok2 = tok2->next()->link();
+                tok2 = tok2->linkAt(1);
                 if (Token::simpleMatch(tok2, "} else {")) {
-                    if (Token::findmatch(tok2, "continue|break|return", tok2->linkAt(2), vartok->varId())) {
-                        if (settings->debugwarnings)
-                            bailout(tokenlist, errorLogger, tok2, "For loop variable bailout on conditional continue|break|return");
-                        break;
-                    }
                     tok2 = tok2->linkAt(2);
                 }
             }
             else {
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist, errorLogger, tok2, "For loop skipping {} code");
                 tok2 = tok2->linkAt(1);
                 if (Token::simpleMatch(tok2, "} else {"))
@@ -7076,7 +5300,7 @@ static void valueFlowForLoopSimplify(Token* const bodyStart,
     }
 }
 
-static void valueFlowForLoopSimplifyAfter(Token* fortok, nonneg int varid, const MathLib::bigint num, const TokenList* tokenlist, const Settings* settings)
+static void valueFlowForLoopSimplifyAfter(Token* fortok, nonneg int varid, const MathLib::bigint num, const TokenList& tokenlist, ErrorLogger & errorLogger, const Settings& settings)
 {
     const Token *vartok = nullptr;
     for (const Token *tok = fortok; tok; tok = tok->next()) {
@@ -7100,18 +5324,18 @@ static void valueFlowForLoopSimplifyAfter(Token* fortok, nonneg int varid, const
         ValueFlow::Value v{num};
         v.errorPath.emplace_back(fortok,"After for loop, " + var->name() + " has value " + v.infoString());
 
-        valueFlowForward(blockTok->next(), endToken, vartok, v, tokenlist, settings);
+        valueFlowForward(blockTok->next(), endToken, vartok, std::move(v), tokenlist, errorLogger, settings);
     }
 }
 
-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 != Scope::eFor)
+    for (const Scope &scope : symboldatabase.scopeList) {
+        if (scope.type != ScopeType::eFor)
             continue;
 
-        Token* tok = const_cast<Token*>(scope.classDef);
-        Token* const bodyStart = const_cast<Token*>(scope.bodyStart);
+        auto* tok = const_cast<Token*>(scope.classDef);
+        auto* const bodyStart = const_cast<Token*>(scope.bodyStart);
 
         if (!Token::simpleMatch(tok->next()->astOperand2(), ";") ||
             !Token::simpleMatch(tok->next()->astOperand2()->astOperand2(), ";"))
@@ -7128,7 +5352,7 @@ static void valueFlowForLoop(TokenList *tokenlist, const SymbolDatabase* symbold
                 std::list<ValueFlow::Value> initValues;
                 initValues.emplace_back(initValue, ValueFlow::Value::Bound::Lower);
                 initValues.push_back(ValueFlow::asImpossible(initValues.back()));
-                Analyzer::Result result = valueFlowForward(bodyStart, bodyStart->link(), vartok, initValues, tokenlist, settings);
+                Analyzer::Result result = valueFlowForward(bodyStart, bodyStart->link(), vartok, std::move(initValues), tokenlist, errorLogger, settings);
 
                 if (!result.action.isModified()) {
                     std::list<ValueFlow::Value> lastValues;
@@ -7137,14 +5361,14 @@ static void valueFlowForLoop(TokenList *tokenlist, const SymbolDatabase* symbold
                     lastValues.push_back(ValueFlow::asImpossible(lastValues.back()));
                     if (stepValue != 1)
                         lastValues.pop_front();
-                    valueFlowForward(bodyStart, bodyStart->link(), vartok, lastValues, tokenlist, settings);
+                    valueFlowForward(bodyStart, bodyStart->link(), vartok, std::move(lastValues), tokenlist, errorLogger, settings);
                 }
             }
             const MathLib::bigint afterValue = executeBody ? lastValue + stepValue : initValue;
-            valueFlowForLoopSimplifyAfter(tok, varid, afterValue, tokenlist, settings);
+            valueFlowForLoopSimplifyAfter(tok, varid, afterValue, tokenlist, errorLogger, settings);
         } else {
             ProgramMemory mem1, mem2, memAfter;
-            if (valueFlowForLoop2(tok, &mem1, &mem2, &memAfter)) {
+            if (valueFlowForLoop2(tok, &mem1, &mem2, &memAfter, settings)) {
                 for (const auto& p : mem1) {
                     if (!p.second.isIntValue())
                         continue;
@@ -7170,171 +5394,27 @@ static void valueFlowForLoop(TokenList *tokenlist, const SymbolDatabase* symbold
                         continue;
                     if (p.first.tok->varId() == 0)
                         continue;
-                    valueFlowForLoopSimplifyAfter(tok, p.first.getExpressionId(), p.second.intvalue, tokenlist, settings);
+                    valueFlowForLoopSimplifyAfter(tok, p.first.getExpressionId(), p.second.intvalue, tokenlist, errorLogger, settings);
                 }
             }
         }
     }
 }
 
-struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
-    std::unordered_map<nonneg int, ValueFlow::Value> values;
-    std::unordered_map<nonneg int, const Variable*> vars;
-    SymbolDatabase* symboldatabase;
-
-    MultiValueFlowAnalyzer() : ValueFlowAnalyzer(), values(), vars(), symboldatabase(nullptr) {}
-
-    MultiValueFlowAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const TokenList* t, const Settings* set, SymbolDatabase* s)
-        : ValueFlowAnalyzer(t, set), values(), vars(), symboldatabase(s) {
-        for (const auto& p:args) {
-            values[p.first->declarationId()] = p.second;
-            vars[p.first->declarationId()] = p.first;
-        }
-    }
-
-    virtual const std::unordered_map<nonneg int, const Variable*>& getVars() const {
-        return vars;
-    }
-
-    const ValueFlow::Value* getValue(const Token* tok) const override {
-        if (tok->varId() == 0)
-            return nullptr;
-        auto it = values.find(tok->varId());
-        if (it == values.end())
-            return nullptr;
-        return &it->second;
-    }
-    ValueFlow::Value* getValue(const Token* tok) override {
-        if (tok->varId() == 0)
-            return nullptr;
-        auto it = values.find(tok->varId());
-        if (it == values.end())
-            return nullptr;
-        return &it->second;
-    }
-
-    void makeConditional() override {
-        for (auto&& p:values) {
-            p.second.conditional = true;
-        }
-    }
-
-    void addErrorPath(const Token* tok, const std::string& s) override {
-        for (auto&& p:values) {
-            p.second.errorPath.emplace_back(tok, s);
-        }
-    }
-
-    bool isAlias(const Token* tok, bool& inconclusive) const override {
-        const auto range = SelectValueFromVarIdMapRange(&values);
-
-        for (const auto& p:getVars()) {
-            nonneg int const varid = p.first;
-            const Variable* var = p.second;
-            if (tok->varId() == varid)
-                return true;
-            if (isAliasOf(var, tok, varid, range, &inconclusive))
-                return true;
-        }
-        return false;
-    }
-
-    bool lowerToPossible() override {
-        for (auto&& p:values) {
-            if (p.second.isImpossible())
-                return false;
-            p.second.changeKnownToPossible();
-        }
-        return true;
-    }
-    bool lowerToInconclusive() override {
-        for (auto&& p:values) {
-            if (p.second.isImpossible())
-                return false;
-            p.second.setInconclusive();
-        }
-        return true;
-    }
-
-    bool isConditional() const override {
-        for (auto&& p:values) {
-            if (p.second.conditional)
-                return true;
-            if (p.second.condition)
-                return !p.second.isImpossible();
-        }
-        return false;
-    }
-
-    bool stopOnCondition(const Token* /*condTok*/) const override {
-        return isConditional();
-    }
-
-    bool updateScope(const Token* endBlock, bool /*modified*/) const override {
-        const Scope* scope = endBlock->scope();
-        if (!scope)
-            return false;
-        if (scope->type == Scope::eLambda) {
-            return std::all_of(values.cbegin(), values.cend(), [](const std::pair<nonneg int, ValueFlow::Value>& p) {
-                return p.second.isLifetimeValue();
-            });
-        }
-        if (scope->type == Scope::eIf || scope->type == Scope::eElse || scope->type == Scope::eWhile ||
-            scope->type == Scope::eFor) {
-            auto pred = [](const ValueFlow::Value& value) {
-                if (value.isKnown())
-                    return true;
-                if (value.isImpossible())
-                    return true;
-                if (value.isLifetimeValue())
-                    return true;
-                return false;
-            };
-            if (std::all_of(values.cbegin(), values.cend(), std::bind(pred, std::bind(SelectMapValues{}, std::placeholders::_1))))
-                return true;
-            if (isConditional())
-                return false;
-            const Token* condTok = getCondTokFromEnd(endBlock);
-            std::set<nonneg int> varids;
-            std::transform(getVars().cbegin(), getVars().cend(), std::inserter(varids, varids.begin()), SelectMapKeys{});
-            return bifurcate(condTok, varids, getSettings());
-        }
-
-        return false;
-    }
-
-    bool match(const Token* tok) const override {
-        return values.count(tok->varId()) > 0;
-    }
-
-    ProgramState getProgramState() const override {
-        ProgramState ps;
-        for (const auto& p : values) {
-            const Variable* var = vars.at(p.first);
-            if (!var)
-                continue;
-            ps[var->nameToken()] = p.second;
-        }
-        return ps;
-    }
-};
-
 template<class Key, class F>
-bool productParams(const Settings* settings, const std::unordered_map<Key, std::list<ValueFlow::Value>>& vars, F f)
+static bool productParams(const Settings& settings, const std::unordered_map<Key, std::list<ValueFlow::Value>>& vars, F f)
 {
     using Args = std::vector<std::unordered_map<Key, ValueFlow::Value>>;
     Args args(1);
     // Compute cartesian product of all arguments
-    for (const auto& p:vars) {
+    for (const auto& p : vars) {
         if (p.second.empty())
             continue;
         args.back()[p.first] = p.second.front();
     }
     bool bail = false;
-    int max = 8;
-    if (settings)
-        max = settings->performanceValueFlowMaxSubFunctionArgs;
-    for (const auto& p:vars) {
+    int max = settings.vfOptions.maxSubFunctionArgs;
+    for (const auto& p : vars) {
         if (args.size() > max) {
             bail = true;
             break;
@@ -7343,9 +5423,9 @@ bool productParams(const Settings* settings, const std::unordered_map<Key, std::
             continue;
         std::for_each(std::next(p.second.begin()), p.second.end(), [&](const ValueFlow::Value& value) {
             Args new_args;
-            for (auto arg:args) {
+            for (auto arg : args) {
                 if (value.path != 0) {
-                    for (const auto& q:arg) {
+                    for (const auto& q : arg) {
                         if (q.first == p.first)
                             continue;
                         if (q.second.path == 0)
@@ -7364,9 +5444,10 @@ bool productParams(const Settings* settings, const std::unordered_map<Key, std::
     if (args.size() > max) {
         bail = true;
         args.resize(max);
+        // TODO: add bailout message
     }
 
-    for (const auto& arg:args) {
+    for (const auto& arg : args) {
         if (arg.empty())
             continue;
         // Make sure all arguments are the same path
@@ -7380,16 +5461,20 @@ bool productParams(const Settings* settings, const std::unordered_map<Key, std::
     return !bail;
 }
 
-static void valueFlowInjectParameter(TokenList* tokenlist,
-                                     SymbolDatabase* symboldatabase,
-                                     ErrorLogger* errorLogger,
+static void valueFlowInjectParameter(const TokenList& tokenlist,
+                                     ErrorLogger& errorLogger,
                                      const Settings& settings,
                                      const Scope* functionScope,
                                      const std::unordered_map<const Variable*, std::list<ValueFlow::Value>>& vars)
 {
-    const bool r = productParams(&settings, vars, [&](const std::unordered_map<const Variable*, ValueFlow::Value>& arg) {
-        MultiValueFlowAnalyzer a(arg, tokenlist, &settings, symboldatabase);
-        valueFlowGenericForward(const_cast<Token*>(functionScope->bodyStart), functionScope->bodyEnd, a, settings);
+    const bool r = productParams(settings, vars, [&](const std::unordered_map<const Variable*, ValueFlow::Value>& arg) {
+        auto a = makeMultiValueFlowAnalyzer(arg, settings);
+        valueFlowGenericForward(const_cast<Token*>(functionScope->bodyStart),
+                                functionScope->bodyEnd,
+                                a,
+                                tokenlist,
+                                errorLogger,
+                                settings);
     });
     if (!r) {
         std::string fname = "<unknown>";
@@ -7400,8 +5485,9 @@ static void valueFlowInjectParameter(TokenList* tokenlist,
     }
 }
 
-static void valueFlowInjectParameter(const TokenList* tokenlist,
-                                     const Settings* settings,
+static void valueFlowInjectParameter(const TokenList& tokenlist,
+                                     ErrorLogger& errorLogger,
+                                     const Settings& settings,
                                      const Variable* arg,
                                      const Scope* functionScope,
                                      const std::list<ValueFlow::Value>& argvalues)
@@ -7420,58 +5506,61 @@ static void valueFlowInjectParameter(const TokenList* tokenlist,
                      arg->nameToken(),
                      argvalues,
                      tokenlist,
+                     errorLogger,
                      settings);
 }
 
-static void valueFlowSwitchVariable(TokenList *tokenlist, const SymbolDatabase* symboldatabase, ErrorLogger *errorLogger, const Settings *settings)
+static void valueFlowSwitchVariable(const TokenList& tokenlist,
+                                    const SymbolDatabase& symboldatabase,
+                                    ErrorLogger& errorLogger,
+                                    const Settings& settings)
 {
-    for (const Scope &scope : symboldatabase->scopeList) {
-        if (scope.type != Scope::ScopeType::eSwitch)
+    for (const Scope& scope : symboldatabase.scopeList) {
+        if (scope.type != ScopeType::eSwitch)
             continue;
         if (!Token::Match(scope.classDef, "switch ( %var% ) {"))
             continue;
-        const Token *vartok = scope.classDef->tokAt(2);
-        const Variable *var = vartok->variable();
+        const Token* vartok = scope.classDef->tokAt(2);
+        const Variable* var = vartok->variable();
         if (!var)
             continue;
 
         // bailout: global non-const variables
         if (!(var->isLocal() || var->isArgument()) && !var->isConst()) {
-            if (settings->debugwarnings)
+            if (settings.debugwarnings)
                 bailout(tokenlist, errorLogger, vartok, "switch variable " + var->name() + " is global");
             continue;
         }
 
-        for (const Token *tok = scope.bodyStart->next(); tok != scope.bodyEnd; tok = tok->next()) {
+        for (const Token* tok = scope.bodyStart->next(); tok != scope.bodyEnd; tok = tok->next()) {
             if (tok->str() == "{") {
                 tok = tok->link();
                 continue;
             }
             if (Token::Match(tok, "case %num% :")) {
                 std::list<ValueFlow::Value> values;
-                values.emplace_back(MathLib::toLongNumber(tok->next()->str()));
+                values.emplace_back(MathLib::toBigNumber(tok->tokAt(1)));
                 values.back().condition = tok;
-                values.back().errorPath.emplace_back(tok, "case " + tok->next()->str() + ": " + vartok->str() + " is " + tok->next()->str() + " here.");
+                values.back().errorPath.emplace_back(tok,
+                                                     "case " + tok->strAt(1) + ": " + vartok->str() + " is " +
+                                                     tok->strAt(1) + " here.");
                 bool known = false;
-                if ((Token::simpleMatch(tok->previous(), "{") || Token::simpleMatch(tok->tokAt(-2), "break ;")) && !Token::Match(tok->tokAt(3), ";| case"))
+                if ((Token::simpleMatch(tok->previous(), "{") || Token::simpleMatch(tok->tokAt(-2), "break ;")) &&
+                    !Token::Match(tok->tokAt(3), ";| case"))
                     known = true;
                 while (Token::Match(tok->tokAt(3), ";| case %num% :")) {
                     known = false;
                     tok = tok->tokAt(3);
                     if (!tok->isName())
                         tok = tok->next();
-                    values.emplace_back(MathLib::toLongNumber(tok->next()->str()));
+                    values.emplace_back(MathLib::toBigNumber(tok->tokAt(1)));
                     values.back().condition = tok;
-                    values.back().errorPath.emplace_back(tok, "case " + tok->next()->str() + ": " + vartok->str() + " is " + tok->next()->str() + " here.");
+                    values.back().errorPath.emplace_back(tok,
+                                                         "case " + tok->strAt(1) + ": " + vartok->str() + " is " +
+                                                         tok->strAt(1) + " here.");
                 }
-                for (std::list<ValueFlow::Value>::const_iterator val = values.cbegin(); val != values.cend(); ++val) {
-                    valueFlowReverse(tokenlist,
-                                     const_cast<Token*>(scope.classDef),
-                                     vartok,
-                                     *val,
-                                     ValueFlow::Value(),
-                                     errorLogger,
-                                     settings);
+                for (auto val = values.cbegin(); val != values.cend(); ++val) {
+                    valueFlowReverse(tokenlist, const_cast<Token*>(scope.classDef), vartok, *val, errorLogger, settings);
                 }
                 if (vartok->variable()->scope()) {
                     if (known)
@@ -7496,7 +5585,7 @@ static void valueFlowSwitchVariable(TokenList *tokenlist, const SymbolDatabase*
     }
 }
 
-static std::list<ValueFlow::Value> getFunctionArgumentValues(const Token *argtok)
+static std::list<ValueFlow::Value> getFunctionArgumentValues(const Token* argtok)
 {
     std::list<ValueFlow::Value> argvalues(argtok->values());
     removeImpossible(argvalues);
@@ -7507,18 +5596,18 @@ static std::list<ValueFlow::Value> getFunctionArgumentValues(const Token *argtok
     return argvalues;
 }
 
-static void valueFlowLibraryFunction(Token *tok, const std::string &returnValue, const Settings *settings)
+static void valueFlowLibraryFunction(Token* tok, const std::string& returnValue, const Settings& settings)
 {
     std::unordered_map<nonneg int, std::list<ValueFlow::Value>> argValues;
     int argn = 1;
-    for (const Token *argtok : getArguments(tok->previous())) {
+    for (const Token* argtok : getArguments(tok->previous())) {
         argValues[argn] = getFunctionArgumentValues(argtok);
         argn++;
     }
     if (returnValue.find("arg") != std::string::npos && argValues.empty())
         return;
     productParams(settings, argValues, [&](const std::unordered_map<nonneg int, ValueFlow::Value>& arg) {
-        ValueFlow::Value value = evaluateLibraryFunction(arg, returnValue, settings);
+        ValueFlow::Value value = evaluateLibraryFunction(arg, returnValue, settings, tok->isCpp());
         if (value.isUninitValue())
             return;
         ValueFlow::Value::ValueKind kind = ValueFlow::Value::ValueKind::Known;
@@ -7538,59 +5627,42 @@ static void valueFlowLibraryFunction(Token *tok, const std::string &returnValue,
     });
 }
 
-template<class Iterator>
-struct IteratorRange
-{
-    Iterator mBegin;
-    Iterator mEnd;
-
-    Iterator begin() const {
-        return mBegin;
-    }
-
-    Iterator end() const {
-        return mEnd;
-    }
-};
-
-template<class Iterator>
-IteratorRange<Iterator> MakeIteratorRange(Iterator start, Iterator last)
-{
-    return {start, last};
-}
-
-static void valueFlowSubFunction(TokenList* tokenlist, SymbolDatabase* symboldatabase,  ErrorLogger* errorLogger, const Settings& settings)
+static void valueFlowSubFunction(const TokenList& tokenlist,
+                                 const SymbolDatabase& symboldatabase,
+                                 ErrorLogger& errorLogger,
+                                 const Settings& settings)
 {
     int id = 0;
-    for (const Scope* scope : MakeIteratorRange(symboldatabase->functionScopes.crbegin(), symboldatabase->functionScopes.crend())) {
+    for (auto it = symboldatabase.functionScopes.crbegin(); it != symboldatabase.functionScopes.crend(); ++it) {
+        const Scope* scope = *it;
         const Function* function = scope->function;
         if (!function)
             continue;
-        for (Token* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
+        for (auto* tok = const_cast<Token*>(scope->bodyStart); tok != scope->bodyEnd; tok = tok->next()) {
             if (tok->isKeyword() || !Token::Match(tok, "%name% ("))
                 continue;
 
-            const Function * const calledFunction = tok->function();
+            const Function* const calledFunction = tok->function();
             if (!calledFunction) {
                 // library function?
                 const std::string& returnValue(settings.library.returnValue(tok));
                 if (!returnValue.empty())
-                    valueFlowLibraryFunction(tok->next(), returnValue, &settings);
+                    valueFlowLibraryFunction(tok->next(), returnValue, settings);
                 continue;
             }
 
-            const Scope * const calledFunctionScope = calledFunction->functionScope;
+            const Scope* const calledFunctionScope = calledFunction->functionScope;
             if (!calledFunctionScope)
                 continue;
 
             id++;
             std::unordered_map<const Variable*, std::list<ValueFlow::Value>> argvars;
             // TODO: Rewrite this. It does not work well to inject 1 argument at a time.
-            const std::vector<const Token *> &callArguments = getArguments(tok);
+            const std::vector<const Token*>& callArguments = getArguments(tok);
             for (int argnr = 0U; argnr < callArguments.size(); ++argnr) {
-                const Token *argtok = callArguments[argnr];
+                const Token* argtok = callArguments[argnr];
                 // Get function argument
-                const Variable * const argvar = calledFunction->getArgumentVar(argnr);
+                const Variable* const argvar = calledFunction->getArgumentVar(argnr);
                 if (!argvar)
                     break;
 
@@ -7604,8 +5676,9 @@ static void valueFlowSubFunction(TokenList* tokenlist, SymbolDatabase* symboldat
                     return false;
                 });
                 // Remove uninit values if argument is passed by value
-                if (argtok->variable() && !argtok->variable()->isPointer() && argvalues.size() == 1 && argvalues.front().isUninitValue()) {
-                    if (CheckUninitVar::isVariableUsage(tokenlist->isCPP(), argtok, settings.library, false, CheckUninitVar::Alloc::NO_ALLOC, 0))
+                if (argtok->variable() && !argtok->variable()->isPointer() && argvalues.size() == 1 &&
+                    argvalues.front().isUninitValue()) {
+                    if (CheckUninitVar::isVariableUsage(argtok, settings.library, false, CheckUninitVar::Alloc::NO_ALLOC, 0))
                         continue;
                 }
 
@@ -7613,19 +5686,13 @@ static void valueFlowSubFunction(TokenList* tokenlist, SymbolDatabase* symboldat
                     continue;
 
                 // Error path..
-                for (ValueFlow::Value &v : argvalues) {
-                    const std::string nr = MathLib::toString(argnr + 1) + getOrdinalText(argnr + 1);
+                for (ValueFlow::Value& v : argvalues) {
+                    const std::string nr = std::to_string(argnr + 1) + getOrdinalText(argnr + 1);
 
                     v.errorPath.emplace_back(argtok,
-                                             "Calling function '" +
-                                             calledFunction->name() +
-                                             "', " +
-                                             nr +
-                                             " argument '" +
-                                             argtok->expressionString() +
-                                             "' value is " +
-                                             v.infoString());
-                    v.path = 256 * v.path + id % 256;
+                                             "Calling function '" + calledFunction->name() + "', " + nr + " argument '" +
+                                             argtok->expressionString() + "' value is " + v.infoString());
+                    v.path = (256 * v.path) + (id % 256);
                     // Change scope of lifetime values
                     if (v.isLifetimeValue())
                         v.lifetimeScope = ValueFlow::Value::LifetimeScope::SubFunction;
@@ -7634,36 +5701,37 @@ static void valueFlowSubFunction(TokenList* tokenlist, SymbolDatabase* symboldat
                 // passed values are not "known"..
                 lowerToPossible(argvalues);
 
-                argvars[argvar] = argvalues;
+                argvars[argvar] = std::move(argvalues);
             }
-            valueFlowInjectParameter(tokenlist, symboldatabase, errorLogger, settings, calledFunctionScope, argvars);
+            valueFlowInjectParameter(tokenlist, errorLogger, settings, calledFunctionScope, argvars);
         }
     }
 }
 
-static void valueFlowFunctionDefaultParameter(const TokenList* tokenlist, const SymbolDatabase* symboldatabase, const Settings* settings)
+static void valueFlowFunctionDefaultParameter(const TokenList& tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger& errorLogger, const Settings& settings)
 {
-    if (!tokenlist->isCPP())
+    if (!tokenlist.isCPP())
         return;
 
-    for (const Scope* scope : symboldatabase->functionScopes) {
+    for (const Scope* scope : symboldatabase.functionScopes) {
         const Function* function = scope->function;
         if (!function)
             continue;
-        for (std::size_t arg = function->minArgCount(); arg < function->argCount(); arg++) {
+        for (nonneg int arg = function->minArgCount(); arg < function->argCount(); arg++) {
             const Variable* var = function->getArgumentVar(arg);
-            if (var && var->hasDefault() && Token::Match(var->nameToken(), "%var% = %num%|%str% [,)]")) {
+            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, settings, var, scope, argvalues);
+                    valueFlowInjectParameter(tokenlist, errorLogger, settings, var, scope, argvalues);
             }
         }
     }
@@ -7681,39 +5749,51 @@ static const ValueFlow::Value* getKnownValueFromToken(const Token* tok)
     return std::addressof(*it);
 }
 
-static const ValueFlow::Value* getKnownValueFromTokens(const std::vector<const Token*>& toks)
+static std::vector<ValueFlow::Value> getCommonValuesFromTokens(const std::vector<const Token*>& toks)
 {
     if (toks.empty())
-        return nullptr;
-    const ValueFlow::Value* result = getKnownValueFromToken(toks.front());
-    if (!result)
-        return nullptr;
-    if (!std::all_of(std::next(toks.begin()), toks.end(), [&](const Token* tok) {
-        return std::any_of(tok->values().begin(), tok->values().end(), [&](const ValueFlow::Value& v) {
-            return v.equalValue(*result) && v.valueKind == result->valueKind;
+        return {};
+    std::vector<ValueFlow::Value> result;
+    std::copy_if(toks.front()->values().begin(),
+                 toks.front()->values().end(),
+                 std::back_inserter(result),
+                 [&](const ValueFlow::Value& v) {
+        if (!v.isKnown() && !v.isImpossible())
+            return false;
+        return (v.isIntValue() || v.isContainerSizeValue() || v.isFloatValue());
+    });
+    std::for_each(toks.begin() + 1, toks.end(), [&](const Token* tok) {
+        auto it = std::remove_if(result.begin(), result.end(), [&](const ValueFlow::Value& v) {
+            return std::none_of(tok->values().begin(), tok->values().end(), [&](const ValueFlow::Value& v2) {
+                return v.equalValue(v2) && v.valueKind == v2.valueKind;
+            });
         });
-    }))
-        return nullptr;
+        result.erase(it, result.end());
+    });
     return result;
 }
 
-static void setFunctionReturnValue(const Function* f, Token* tok, ValueFlow::Value v, const Settings* settings)
+static void setFunctionReturnValue(const Function* f,
+                                   Token* tok,
+                                   ValueFlow::Value v,
+                                   const Settings& settings,
+                                   bool known = true)
 {
     if (f->hasVirtualSpecifier()) {
         if (v.isImpossible())
             return;
         v.setPossible();
-    } else if (!v.isImpossible()) {
+    } else if (!v.isImpossible() && known) {
         v.setKnown();
     }
     v.errorPath.emplace_back(tok, "Calling function '" + f->name() + "' returns " + v.toString());
     setTokenValue(tok, std::move(v), settings);
 }
 
-static void valueFlowFunctionReturn(TokenList *tokenlist, ErrorLogger *errorLogger, const Settings* settings)
+static void valueFlowFunctionReturn(TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
 {
-    for (Token *tok = tokenlist->back(); tok; tok = tok->previous()) {
-        if (tok->str() != "(" || !tok->astOperand1())
+    for (Token* tok = tokenlist.back(); tok; tok = tok->previous()) {
+        if (tok->str() != "(" || !tok->astOperand1() || tok->isCast())
             continue;
 
         const Function* function = nullptr;
@@ -7734,19 +5814,25 @@ static void valueFlowFunctionReturn(TokenList *tokenlist, ErrorLogger *errorLogg
         if (returns.empty())
             continue;
 
-        if (const ValueFlow::Value* v = getKnownValueFromTokens(returns)) {
-            setFunctionReturnValue(function, tok, *v, settings);
-            continue;
+        bool hasKnownValue = false;
+
+        for (const ValueFlow::Value& v : getCommonValuesFromTokens(returns)) {
+            setFunctionReturnValue(function, tok, v, settings, false);
+            if (v.isKnown())
+                hasKnownValue = true;
         }
 
+        if (hasKnownValue)
+            continue;
+
         // Arguments..
         std::vector<const Token*> arguments = getArguments(tok);
 
         ProgramMemory programMemory;
         for (std::size_t i = 0; i < arguments.size(); ++i) {
-            const Variable * const arg = function->getArgumentVar(i);
+            const Variable* const arg = function->getArgumentVar(i);
             if (!arg) {
-                if (settings->debugwarnings)
+                if (settings.debugwarnings)
                     bailout(tokenlist, errorLogger, tok, "function return; unhandled argument type");
                 programMemory.clear();
                 break;
@@ -7767,7 +5853,7 @@ static void valueFlowFunctionReturn(TokenList *tokenlist, ErrorLogger *errorLogg
     }
 }
 
-static bool needsInitialization(const Variable* var, bool cpp)
+static bool needsInitialization(const Variable* var)
 {
     if (!var)
         return false;
@@ -7777,7 +5863,7 @@ static bool needsInitialization(const Variable* var, bool cpp)
         return true;
     if (var->type() && var->type()->isUnionType())
         return false;
-    if (!cpp)
+    if (!var->nameToken()->isCpp())
         return true;
     if (var->type() && var->type()->needInitialization == Type::NeedInitialization::True)
         return true;
@@ -7788,6 +5874,15 @@ static bool needsInitialization(const Variable* var, bool cpp)
             return true;
         if (var->valueType()->type == ValueType::Type::ITERATOR)
             return true;
+        if (var->isStlType() && var->isArray()) {
+            if (const Token* ctt = var->valueType()->containerTypeToken) {
+                if (ctt->isStandardType())
+                    return true;
+                const Type* ct = ctt->type();
+                if (ct && ct->needInitialization == Type::NeedInitialization::True)
+                    return true;
+            }
+        }
     }
     return false;
 }
@@ -7811,102 +5906,9 @@ static void addToErrorPath(ValueFlow::Value& value, const ValueFlow::Value& from
     });
 }
 
-template<class Found, class Predicate>
-bool findTokenSkipDeadCodeImpl(const Library* library, Token* start, const Token* end, Predicate pred, Found found)
-{
-    for (Token* tok = start; precedes(tok, end); tok = tok->next()) {
-        if (pred(tok)) {
-            if (found(tok))
-                return true;
-        }
-        if (Token::simpleMatch(tok, "if (")) {
-            const Token* condTok = tok->next()->astOperand2();
-            if (!condTok)
-                continue;
-            if (!condTok->hasKnownIntValue())
-                continue;
-            if (!Token::simpleMatch(tok->linkAt(1), ") {"))
-                continue;
-            if (findTokenSkipDeadCodeImpl(library, tok->next(), tok->linkAt(1), pred, found))
-                return true;
-            Token* thenStart = tok->linkAt(1)->next();
-            Token* elseStart = nullptr;
-            if (Token::simpleMatch(thenStart->link(), "} else {"))
-                elseStart = thenStart->link()->tokAt(2);
-
-            int r = condTok->values().front().intvalue;
-            if (r == 0) {
-                if (elseStart) {
-                    if (findTokenSkipDeadCodeImpl(library, elseStart, elseStart->link(), pred, found))
-                        return true;
-                    if (isReturnScope(elseStart->link(), library))
-                        return true;
-                    tok = elseStart->link();
-                } else {
-                    tok = thenStart->link();
-                }
-            } else {
-                if (findTokenSkipDeadCodeImpl(library, thenStart, thenStart->link(), pred, found))
-                    return true;
-                if (isReturnScope(thenStart->link(), library))
-                    return true;
-                tok = thenStart->link();
-            }
-        } else if (Token::Match(tok->astParent(), "&&|?|%oror%") && astIsLHS(tok) && tok->hasKnownIntValue()) {
-            const bool cond = tok->values().front().intvalue != 0;
-            Token* next = nullptr;
-            if ((cond && Token::simpleMatch(tok->astParent(), "||")) ||
-                (!cond && Token::simpleMatch(tok->astParent(), "&&"))) {
-                next = nextAfterAstRightmostLeaf(tok->astParent());
-            } else if (Token::simpleMatch(tok->astParent(), "?")) {
-                Token* colon = tok->astParent()->astOperand2();
-                if (!cond) {
-                    next = colon;
-                } else {
-                    if (findTokenSkipDeadCodeImpl(library, tok->astParent()->next(), colon, pred, found))
-                        return true;
-                    next = nextAfterAstRightmostLeaf(colon);
-                }
-            }
-            if (next)
-                tok = next;
-        } else if (Token::simpleMatch(tok, "} else {")) {
-            const Token* condTok = getCondTokFromEnd(tok);
-            if (!condTok)
-                continue;
-            if (!condTok->hasKnownIntValue())
-                continue;
-            if (isReturnScope(tok->link(), library))
-                return true;
-            int r = condTok->values().front().intvalue;
-            if (r != 0) {
-                tok = tok->linkAt(1);
-            }
-        } else if (Token::simpleMatch(tok, "[") && Token::Match(tok->link(), "] (|{")) {
-            Token* afterCapture = tok->link()->next();
-            if (Token::simpleMatch(afterCapture, "(") && afterCapture->link())
-                tok = afterCapture->link()->next();
-            else
-                tok = afterCapture;
-        }
-    }
-    return false;
-}
-
-template<class Predicate>
-std::vector<Token*> findTokensSkipDeadCode(const Library* library, Token* start, const Token* end, Predicate pred)
-{
-    std::vector<Token*> result;
-    findTokenSkipDeadCodeImpl(library, start, end, pred, [&](Token* tok) {
-        result.push_back(tok);
-        return false;
-    });
-    return result;
-}
-
 static std::vector<Token*> findAllUsages(const Variable* var,
-                                         Token* start, // cppcheck-suppress constParameterPointer // FP
-                                         const Library* library)
+                                         Token* start,
+                                         const Library& library)
 {
     // std::vector<Token*> result;
     const Scope* scope = var->scope();
@@ -7917,7 +5919,7 @@ static std::vector<Token*> findAllUsages(const Variable* var,
     });
 }
 
-static Token* findStartToken(const Variable* var, Token* start, const Library* library)
+static Token* findStartToken(const Variable* var, Token* start, const Library& library)
 {
     std::vector<Token*> uses = findAllUsages(var, start, library);
     if (uses.empty())
@@ -7961,7 +5963,7 @@ static Token* findStartToken(const Variable* var, Token* start, const Library* l
         scope = scope->nestedIn;
     if (!scope)
         return start;
-    Token* tok = const_cast<Token*>(scope->bodyStart);
+    auto* tok = const_cast<Token*>(scope->bodyStart);
     if (!tok)
         return start;
     if (Token::simpleMatch(tok->tokAt(-2), "} else {"))
@@ -7971,9 +5973,9 @@ static Token* findStartToken(const Variable* var, Token* start, const Library* l
     return tok;
 }
 
-static void valueFlowUninit(TokenList* tokenlist, SymbolDatabase* /*symbolDatabase*/, const Settings* settings)
+static void valueFlowUninit(TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
         if (!tok->scope()->isExecutable())
             continue;
         if (!Token::Match(tok, "%var% ;|["))
@@ -7983,7 +5985,7 @@ static void valueFlowUninit(TokenList* tokenlist, SymbolDatabase* /*symbolDataba
             continue;
         if (var->nameToken() != tok || var->isInit())
             continue;
-        if (!needsInitialization(var, tokenlist->isCPP()))
+        if (!needsInitialization(var))
             continue;
         if (!var->isLocal() || var->isStatic() || var->isExtern() || var->isReference() || var->isThrow())
             continue;
@@ -7997,7 +5999,7 @@ static void valueFlowUninit(TokenList* tokenlist, SymbolDatabase* /*symbolDataba
 
         bool partial = false;
 
-        Token* start = findStartToken(var, tok->next(), &settings->library);
+        Token* start = findStartToken(var, tok->next(), settings.library);
 
         std::map<Token*, ValueFlow::Value> partialReads;
         if (const Scope* scope = var->typeScope()) {
@@ -8009,18 +6011,20 @@ static void valueFlowUninit(TokenList* tokenlist, SymbolDatabase* /*symbolDataba
                 // Skip array since we can't track partial initialization from nested subexpressions
                 if (memVar.isArray())
                     continue;
-                if (!needsInitialization(&memVar, tokenlist->isCPP())) {
-                    partial = true;
+                if (!needsInitialization(&memVar)) {
+                    if (!var->isPointer())
+                        partial = true;
                     continue;
                 }
-                MemberExpressionAnalyzer analyzer(memVar.nameToken()->str(), tok, uninitValue, tokenlist, settings);
-                valueFlowGenericForward(start, tok->scope()->bodyEnd, analyzer, *settings);
+                auto partialReadsAnalyzer = std::make_shared<PartialReadContainer>();
+                auto analyzer = makeMemberExpressionAnalyzer(memVar.nameToken()->str(), tok, uninitValue, partialReadsAnalyzer, settings);
+                valueFlowGenericForward(start, tok->scope()->bodyEnd, analyzer, tokenlist, errorLogger, settings);
 
-                for (auto&& p : *analyzer.partialReads) {
+                for (auto&& p : *partialReadsAnalyzer) {
                     Token* tok2 = p.first;
                     const ValueFlow::Value& v = p.second;
                     // Try to insert into map
-                    auto pp = partialReads.insert(std::make_pair(tok2, v));
+                    auto pp = partialReads.emplace(tok2, v);
                     ValueFlow::Value& v2 = pp.first->second;
                     const bool inserted = pp.second;
                     // Merge the two values if it is already in map
@@ -8044,20 +6048,20 @@ static void valueFlowUninit(TokenList* tokenlist, SymbolDatabase* /*symbolDataba
         if (partial)
             continue;
 
-        valueFlowForward(start, tok->scope()->bodyEnd, var->nameToken(), uninitValue, tokenlist, settings);
+        valueFlowForward(start, tok->scope()->bodyEnd, var->nameToken(), std::move(uninitValue), tokenlist, errorLogger, settings);
     }
 }
 
-static bool isContainerSizeChanged(nonneg int varId,
+static bool isContainerSizeChanged(const Token* expr,
                                    const Token* start,
                                    const Token* end,
                                    int indirect,
-                                   const Settings* settings = nullptr,
+                                   const Settings& settings,
                                    int depth = 20);
 
 static bool isContainerSizeChangedByFunction(const Token* tok,
                                              int indirect,
-                                             const Settings* settings = nullptr,
+                                             const Settings& settings,
                                              int depth = 20)
 {
     if (!tok->valueType())
@@ -8097,7 +6101,7 @@ static bool isContainerSizeChangedByFunction(const Token* tok,
                 if (!arg->nameToken())
                     return false;
                 if (depth > 0)
-                    return isContainerSizeChanged(arg->declarationId(),
+                    return isContainerSizeChanged(arg->nameToken(),
                                                   scope->bodyStart,
                                                   scope->bodyEnd,
                                                   addressOf ? indirect + 1 : indirect,
@@ -8114,113 +6118,6 @@ static bool isContainerSizeChangedByFunction(const Token* tok,
     return (isChanged || inconclusive);
 }
 
-struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
-    ContainerExpressionAnalyzer() : ExpressionAnalyzer() {}
-
-    ContainerExpressionAnalyzer(const Token* expr, ValueFlow::Value val, const TokenList* t, const Settings* s)
-        : ExpressionAnalyzer(expr, std::move(val), t, s)
-    {}
-
-    bool match(const Token* tok) const override {
-        return tok->exprId() == expr->exprId() || (astIsIterator(tok) && isAliasOf(tok, expr->exprId()));
-    }
-
-    Action isWritable(const Token* tok, Direction /*d*/) const override
-    {
-        if (astIsIterator(tok))
-            return Action::None;
-        if (!getValue(tok))
-            return Action::None;
-        if (!tok->valueType())
-            return Action::None;
-        if (!astIsContainer(tok))
-            return Action::None;
-        const Token* parent = tok->astParent();
-        const Library::Container* container = getLibraryContainer(tok);
-
-        if (container->stdStringLike && Token::simpleMatch(parent, "+=") && astIsLHS(tok) && parent->astOperand2()) {
-            const Token* rhs = parent->astOperand2();
-            if (rhs->tokType() == Token::eString)
-                return Action::Read | Action::Write | Action::Incremental;
-            const Library::Container* rhsContainer = getLibraryContainer(rhs);
-            if (rhsContainer && rhsContainer->stdStringLike) {
-                if (std::any_of(rhs->values().cbegin(), rhs->values().cend(), [&](const ValueFlow::Value &rhsval) {
-                    return rhsval.isKnown() && rhsval.isContainerSizeValue();
-                }))
-                    return Action::Read | Action::Write | Action::Incremental;
-            }
-        } else if (astIsLHS(tok) && Token::Match(tok->astParent(), ". %name% (")) {
-            const Library::Container::Action action = container->getAction(tok->astParent()->strAt(1));
-            if (action == Library::Container::Action::PUSH || action == Library::Container::Action::POP) {
-                std::vector<const Token*> args = getArguments(tok->tokAt(3));
-                if (args.size() < 2)
-                    return Action::Read | Action::Write | Action::Incremental;
-            }
-        }
-        return Action::None;
-    }
-
-    void writeValue(ValueFlow::Value* val, const Token* tok, Direction d) const override {
-        if (!val)
-            return;
-        if (!tok->astParent())
-            return;
-        if (!tok->valueType())
-            return;
-        if (!astIsContainer(tok))
-            return;
-        const Token* parent = tok->astParent();
-        const Library::Container* container = getLibraryContainer(tok);
-        int n = 0;
-
-        if (container->stdStringLike && Token::simpleMatch(parent, "+=") && parent->astOperand2()) {
-            const Token* rhs = parent->astOperand2();
-            const Library::Container* rhsContainer = getLibraryContainer(rhs);
-            if (rhs->tokType() == Token::eString)
-                n = Token::getStrLength(rhs);
-            else if (rhsContainer && rhsContainer->stdStringLike) {
-                auto it = std::find_if(rhs->values().begin(), rhs->values().end(), [&](const ValueFlow::Value& rhsval) {
-                    return rhsval.isKnown() && rhsval.isContainerSizeValue();
-                });
-                if (it != rhs->values().end())
-                    n = it->intvalue;
-            }
-        } else if (astIsLHS(tok) && Token::Match(tok->astParent(), ". %name% (")) {
-            const Library::Container::Action action = container->getAction(tok->astParent()->strAt(1));
-            if (action == Library::Container::Action::PUSH)
-                n = 1;
-            if (action == Library::Container::Action::POP)
-                n = -1;
-        }
-        if (d == Direction::Reverse)
-            val->intvalue -= n;
-        else
-            val->intvalue += n;
-    }
-
-    int getIndirect(const Token* tok) const override
-    {
-        if (tok->valueType()) {
-            return tok->valueType()->pointer;
-        }
-        return ValueFlowAnalyzer::getIndirect(tok);
-    }
-
-    Action isModified(const Token* tok) const override {
-        Action read = Action::Read;
-        // An iterator won't change the container size
-        if (astIsIterator(tok))
-            return read;
-        if (Token::Match(tok->astParent(), "%assign%") && astIsLHS(tok))
-            return Action::Invalid;
-        if (isLikelyStreamRead(isCPP(), tok->astParent()))
-            return Action::Invalid;
-        if (astIsContainer(tok) && ValueFlow::isContainerSizeChanged(tok, getIndirect(tok), getSettings()))
-            return read | Action::Invalid;
-        return read;
-    }
-};
-
 static const Token* parseBinaryIntOp(const Token* expr,
                                      const std::function<std::vector<MathLib::bigint>(const Token*)>& eval,
                                      MathLib::bigint& known)
@@ -8232,9 +6129,9 @@ static const Token* parseBinaryIntOp(const Token* expr,
     if (expr->astOperand1()->exprId() == 0 && expr->astOperand2()->exprId() == 0)
         return nullptr;
     std::vector<MathLib::bigint> x1 = eval(expr->astOperand1());
-    std::vector<MathLib::bigint> x2 = eval(expr->astOperand2());
     if (expr->astOperand1()->exprId() == 0 && x1.empty())
         return nullptr;
+    std::vector<MathLib::bigint> x2 = eval(expr->astOperand2());
     if (expr->astOperand2()->exprId() == 0 && x2.empty())
         return nullptr;
     const Token* varTok = nullptr;
@@ -8252,11 +6149,13 @@ 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, "+|-"))
         return expr;
-    MathLib::bigint intval;
+    MathLib::bigint intval = 0;
     const Token* binaryTok = parseBinaryIntOp(expr, eval, intval);
     const bool rhs = astIsRHS(binaryTok);
     // If its on the rhs, then -1 multiplication is needed, which is not possible with simple delta analysis used currently for symbolic values
@@ -8290,34 +6189,7 @@ const Token* ValueFlow::solveExprValue(const Token* expr,
     return expr;
 }
 
-static const Token* solveExprValue(const Token* expr, ValueFlow::Value& value)
-{
-    return ValueFlow::solveExprValue(
-        expr,
-        [](const Token* tok) -> std::vector<MathLib::bigint> {
-        if (tok->hasKnownIntValue())
-            return {tok->values().front().intvalue};
-        return {};
-    },
-        value);
-}
-
-ValuePtr<Analyzer> makeAnalyzer(const Token* exprTok, ValueFlow::Value value, const TokenList* tokenlist, const Settings* settings)
-{
-    if (value.isContainerSizeValue())
-        return ContainerExpressionAnalyzer(exprTok, std::move(value), tokenlist, settings);
-    const Token* expr = solveExprValue(exprTok, value);
-    return ExpressionAnalyzer(expr, std::move(value), tokenlist, settings);
-}
-
-ValuePtr<Analyzer> makeReverseAnalyzer(const Token* exprTok, ValueFlow::Value value, const TokenList* tokenlist, const Settings* settings)
-{
-    if (value.isContainerSizeValue())
-        return ContainerExpressionAnalyzer(exprTok, std::move(value), tokenlist, settings);
-    return ExpressionAnalyzer(exprTok, std::move(value), tokenlist, settings);
-}
-
-bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Settings* settings, int depth)
+bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Settings& settings, int depth)
 {
     if (!tok)
         return false;
@@ -8325,13 +6197,9 @@ bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Set
         return true;
     if (astIsLHS(tok) && Token::Match(tok->astParent(), "%assign%|<<"))
         return true;
-    const Library::Container* container = tok->valueType()->container;
-    // Views cannot change container size
-    if (container->view)
-        return false;
     if (astIsLHS(tok) && Token::simpleMatch(tok->astParent(), "["))
-        return container->stdAssociativeLike;
-    const Library::Container::Action action = astContainerAction(tok);
+        return tok->valueType()->container->stdAssociativeLike;
+    const Library::Container::Action action = astContainerAction(tok, settings.library);
     switch (action) {
     case Library::Container::Action::RESIZE:
     case Library::Container::Action::CLEAR:
@@ -8340,15 +6208,17 @@ bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Set
     case Library::Container::Action::CHANGE:
     case Library::Container::Action::INSERT:
     case Library::Container::Action::ERASE:
+    case Library::Container::Action::APPEND:
         return true;
     case Library::Container::Action::NO_ACTION:
         // Is this an unknown member function call?
         if (astIsLHS(tok) && Token::Match(tok->astParent(), ". %name% (")) {
-            const Library::Container::Yield yield = astContainerYield(tok);
+            const Library::Container::Yield yield = astContainerYield(tok, settings.library);
             return yield == Library::Container::Yield::NO_YIELD;
         }
         break;
     case Library::Container::Action::FIND:
+    case Library::Container::Action::FIND_CONST:
     case Library::Container::Action::CHANGE_CONTENT:
     case Library::Container::Action::CHANGE_INTERNAL:
         break;
@@ -8356,15 +6226,15 @@ bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Set
     return isContainerSizeChangedByFunction(tok, indirect, settings, depth);
 }
 
-static bool isContainerSizeChanged(nonneg int varId,
+static bool isContainerSizeChanged(const Token* expr,
                                    const Token* start,
                                    const Token* end,
                                    int indirect,
-                                   const Settings* settings,
+                                   const Settings& settings,
                                    int depth)
 {
     for (const Token *tok = start; tok != end; tok = tok->next()) {
-        if (tok->varId() != varId)
+        if (tok->exprId() != expr->exprId() && !isAliasOf(tok, expr))
             continue;
         if (ValueFlow::isContainerSizeChanged(tok, indirect, settings, depth))
             return true;
@@ -8372,9 +6242,9 @@ static bool isContainerSizeChanged(nonneg int varId,
     return false;
 }
 
-static void valueFlowSmartPointer(TokenList *tokenlist, ErrorLogger * errorLogger, const Settings *settings)
+static void valueFlowSmartPointer(TokenList &tokenlist, ErrorLogger & errorLogger, const Settings &settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
         if (!tok->scope())
             continue;
         if (!tok->scope()->isExecutable())
@@ -8407,14 +6277,14 @@ static void valueFlowSmartPointer(TokenList *tokenlist, ErrorLogger * errorLogge
                 if (Token::simpleMatch(ftok, "( )")) {
                     ValueFlow::Value v(0);
                     v.setKnown();
-                    valueFlowForwardAssign(ftok, tok, vars, {std::move(v)}, false, tokenlist, errorLogger, settings);
+                    valueFlowForwardAssign(ftok, tok, std::move(vars), {std::move(v)}, false, tokenlist, errorLogger, settings);
                 } else {
                     tok->removeValues(std::mem_fn(&ValueFlow::Value::isIntValue));
                     Token* inTok = ftok->astOperand2();
                     if (!inTok)
                         continue;
                     const std::list<ValueFlow::Value>& values = inTok->values();
-                    valueFlowForwardAssign(inTok, tok, vars, values, false, tokenlist, errorLogger, settings);
+                    valueFlowForwardAssign(inTok, tok, std::move(vars), values, false, tokenlist, errorLogger, settings);
                 }
             } else if (Token::simpleMatch(tok->astParent(), ". release ( )")) {
                 const Token* parent = ftok->astParent();
@@ -8431,7 +6301,7 @@ static void valueFlowSmartPointer(TokenList *tokenlist, ErrorLogger * errorLogge
                     continue;
                 ValueFlow::Value v(0);
                 v.setKnown();
-                valueFlowForwardAssign(ftok, tok, vars, {std::move(v)}, false, tokenlist, errorLogger, settings);
+                valueFlowForwardAssign(ftok, tok, std::move(vars), {std::move(v)}, false, tokenlist, errorLogger, settings);
             } else if (Token::simpleMatch(tok->astParent(), ". get ( )")) {
                 ValueFlow::Value v = makeSymbolic(tok);
                 setTokenValue(tok->astParent()->tokAt(2), std::move(v), settings);
@@ -8447,45 +6317,48 @@ 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 Settings& settings)
 {
-    auto yield = astContainerYield(tok, ftok);
-    if (*ftok)
+    auto yield = astContainerYield(tok, settings.library, &ftok);
+    if (ftok)
         return yield;
 
     if (!tok->astParent())
         return yield;
 
-    //begin/end free functions
-    return astFunctionYield(tok->astParent()->previous(), settings, ftok);
+    // begin/end free functions
+    return astFunctionYield(tok->astParent()->previous(), settings, &ftok);
 }
 
-static void valueFlowIterators(TokenList *tokenlist, const Settings *settings)
+static void valueFlowIterators(TokenList& tokenlist, const Settings& settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         if (!tok->scope())
             continue;
         if (!tok->scope()->isExecutable())
             continue;
         if (!astIsContainer(tok))
             continue;
-        Token* ftok = nullptr;
-        const Library::Container::Yield yield = findIteratorYield(tok, const_cast<const Token**>(&ftok), settings);
-        if (ftok) {
+        const Token* ftok = nullptr;
+        const Library::Container::Yield yield = findIteratorYield(tok, ftok, settings);
+        if (!ftok)
+            continue;
+        if (yield == Library::Container::Yield::START_ITERATOR) {
             ValueFlow::Value v(0);
             v.setKnown();
-            if (yield == Library::Container::Yield::START_ITERATOR) {
-                v.valueType = ValueFlow::Value::ValueType::ITERATOR_START;
-                setTokenValue(ftok->next(), std::move(v), settings);
-            } else if (yield == Library::Container::Yield::END_ITERATOR) {
-                v.valueType = ValueFlow::Value::ValueType::ITERATOR_END;
-                setTokenValue(ftok->next(), std::move(v), settings);
-            }
+            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);
         }
     }
 }
 
-static std::list<ValueFlow::Value> getIteratorValues(std::list<ValueFlow::Value> values, const ValueFlow::Value::ValueKind* kind = nullptr)
+static std::list<ValueFlow::Value> getIteratorValues(std::list<ValueFlow::Value> values,
+                                                     const ValueFlow::Value::ValueKind* kind = nullptr)
 {
     values.remove_if([&](const ValueFlow::Value& v) {
         if (kind && v.valueKind != *kind)
@@ -8496,14 +6369,14 @@ static std::list<ValueFlow::Value> getIteratorValues(std::list<ValueFlow::Value>
 }
 
 struct IteratorConditionHandler : SimpleConditionHandler {
-    std::vector<Condition> parse(const Token* tok, const Settings* /*settings*/) const override {
+    std::vector<Condition> parse(const Token* tok, const Settings& /*settings*/) const override {
         Condition cond;
 
         if (Token::Match(tok, "==|!=")) {
             if (!tok->astOperand1() || !tok->astOperand2())
                 return {};
 
-            const ValueFlow::Value::ValueKind kind = ValueFlow::Value::ValueKind::Known;
+            constexpr ValueFlow::Value::ValueKind kind = ValueFlow::Value::ValueKind::Known;
             std::list<ValueFlow::Value> values = getIteratorValues(tok->astOperand1()->values(), &kind);
             if (!values.empty()) {
                 cond.vartok = tok->astOperand2();
@@ -8517,16 +6390,16 @@ struct IteratorConditionHandler : SimpleConditionHandler {
                 v.assumeCondition(tok);
             }
             cond.true_values = values;
-            cond.false_values = values;
+            cond.false_values = std::move(values);
         }
 
         return {std::move(cond)};
     }
 };
 
-static void valueFlowIteratorInfer(TokenList *tokenlist, const Settings *settings)
+static void valueFlowIteratorInfer(TokenList& tokenlist, const Settings& settings)
 {
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         if (!tok->scope())
             continue;
         if (!tok->scope()->isExecutable())
@@ -8545,7 +6418,7 @@ static void valueFlowIteratorInfer(TokenList *tokenlist, const Settings *setting
                 return true;
             return false;
         });
-        for (ValueFlow::Value& v:values) {
+        for (ValueFlow::Value& v : values) {
             v.setPossible();
             if (v.isIteratorStartValue())
                 v.intvalue++;
@@ -8568,7 +6441,7 @@ static std::vector<ValueFlow::Value> getContainerValues(const Token* tok)
     return values;
 }
 
-static ValueFlow::Value makeContainerSizeValue(std::size_t s, bool known = true)
+static ValueFlow::Value makeContainerSizeValue(MathLib::bigint s, bool known = true)
 {
     ValueFlow::Value value(s);
     value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
@@ -8579,8 +6452,8 @@ static ValueFlow::Value makeContainerSizeValue(std::size_t s, bool known = true)
 
 static std::vector<ValueFlow::Value> makeContainerSizeValue(const Token* tok, bool known = true)
 {
-    if (tok->hasKnownIntValue())
-        return {makeContainerSizeValue(tok->values().front().intvalue, known)};
+    if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT))
+        return {makeContainerSizeValue(v->intvalue, known)};
     return {};
 }
 
@@ -8602,7 +6475,7 @@ static std::vector<ValueFlow::Value> getContainerSizeFromConstructorArgs(const s
             // (ptr, ptr) is empty
             // TODO: Use lifetime values to check if it points to the same address
             if (args[0]->exprId() == args[1]->exprId())
-                return {makeContainerSizeValue(std::size_t{0}, known)};
+                return {makeContainerSizeValue(MathLib::bigint{0}, known)};
             // TODO: Insert iterator positions for pointers
             if (Token::simpleMatch(args[1], "+")) {
                 nonneg int const eid = args[0]->exprId();
@@ -8616,7 +6489,8 @@ static std::vector<ValueFlow::Value> getContainerSizeFromConstructorArgs(const s
         }
     } else if (container->stdStringLike) {
         if (astIsPointer(args[0])) {
-            // TODO: Try to read size of string literal { "abc" }
+            if (args.size() == 1 && args[0]->tokType() == Token::Type::eString)
+                return {makeContainerSizeValue(Token::getStrLength(args[0]), known)};
             if (args.size() == 2 && astIsIntegral(args[1], false)) // { char*, count }
                 return {makeContainerSizeValue(args[1], known)};
         } else if (astIsContainer(args[0])) {
@@ -8630,32 +6504,32 @@ 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, const Settings& settings)
 {
     if (!tok || !tok->valueType() || !tok->valueType()->containerTypeToken)
-        return false;
+        return true;
 
-    const ValueType tokType = ValueType::parseDecl(tok->valueType()->containerTypeToken, *settings, true);
-    return contType.isTypeEqual(&tokType);
+    const ValueType tokType = ValueType::parseDecl(tok->valueType()->containerTypeToken, settings);
+    return contType.isTypeEqual(&tokType) || tokType.type == ValueType::Type::UNKNOWN_TYPE;
 }
 
 static std::vector<ValueFlow::Value> getInitListSize(const Token* tok,
                                                      const ValueType* valueType,
-                                                     const Settings* settings,
+                                                     const Settings& settings,
                                                      bool known = true)
 {
     std::vector<const Token*> args = getArguments(tok);
     if (args.empty())
-        return {makeContainerSizeValue(std::size_t{0}, known)};
-    bool initList = true;
+        return {makeContainerSizeValue(MathLib::bigint{0}, known)};
+    bool initList = tok->str() == "{";
     // Try to disambiguate init list from constructor
-    if (args.size() < 4) {
-        initList = !isIteratorPair(args) && !(args.size() < 3 && astIsIntegral(args[0], false));
+    if (initList && args.size() < 4) {
+        initList = !isIteratorPair(args);
         const Token* containerTypeToken = valueType->containerTypeToken;
         if (valueType->container->stdStringLike) {
             initList = astIsGenericChar(args[0]) && !astIsPointer(args[0]);
-        } else if (containerTypeToken && settings) {
-            ValueType vt = ValueType::parseDecl(containerTypeToken, *settings, true); // TODO: set isCpp
+        } else if (containerTypeToken) {
+            ValueType vt = ValueType::parseDecl(containerTypeToken, settings);
             if (vt.pointer > 0 && astIsPointer(args[0]))
                 initList = true;
             else if (vt.type == ValueType::ITERATOR && astIsIterator(args[0]))
@@ -8664,6 +6538,8 @@ static std::vector<ValueFlow::Value> getInitListSize(const Token* tok,
                 initList = true;
             else if (args.size() == 1 && valueFlowIsSameContainerType(vt, tok->astOperand2(), settings))
                 initList = false; // copy ctor
+            else if (args.size() == 2 && (!args[0]->valueType() || !args[1]->valueType())) // might be unknown iterators
+                initList = false;
         }
     }
     if (!initList)
@@ -8673,46 +6549,49 @@ static std::vector<ValueFlow::Value> getInitListSize(const Token* tok,
 
 static std::vector<ValueFlow::Value> getContainerSizeFromConstructor(const Token* tok,
                                                                      const ValueType* valueType,
-                                                                     const Settings* settings,
+                                                                     const Settings& settings,
                                                                      bool known = true)
 {
     std::vector<const Token*> args = getArguments(tok);
     if (args.empty())
-        return {makeContainerSizeValue(std::size_t{0}, known)};
+        return {makeContainerSizeValue(MathLib::bigint{0}, known)};
     // Init list in constructor
     if (args.size() == 1 && Token::simpleMatch(args[0], "{"))
         return getInitListSize(args[0], valueType, settings, known);
     return getContainerSizeFromConstructorArgs(args, valueType->container, known);
 }
 
-static void valueFlowContainerSetTokValue(TokenList* tokenlist, const Settings* settings, const Token* tok, Token* initList)
+static void valueFlowContainerSetTokValue(const TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings, const Token* tok, Token* initList)
 {
     ValueFlow::Value value;
     value.valueType = ValueFlow::Value::ValueType::TOK;
     value.tokvalue = initList;
+    if (astIsContainerString(tok) && Token::simpleMatch(initList, "{") && Token::Match(initList->astOperand2(), "%str%")) {
+        value.tokvalue = initList->astOperand2();
+    }
     value.setKnown();
     Token* start = initList->link() ? initList->link() : initList->next();
     if (tok->variable() && tok->variable()->isConst()) {
-        valueFlowForwardConst(start, tok->variable()->scope()->bodyEnd, tok->variable(), {value}, settings);
+        valueFlowForwardConst(start, tok->variable()->scope()->bodyEnd, tok->variable(), {std::move(value)}, settings);
     } else {
-        valueFlowForward(start, tok, value, tokenlist, settings);
+        valueFlowForward(start, tok, std::move(value), tokenlist, errorLogger, settings);
     }
 }
 
 static const Scope* getFunctionScope(const Scope* scope) {
-    while (scope && scope->type != Scope::ScopeType::eFunction)
+    while (scope && scope->type != ScopeType::eFunction)
         scope = scope->nestedIn;
     return scope;
 }
 
-static void valueFlowContainerSize(TokenList* tokenlist,
-                                   const SymbolDatabase* symboldatabase,
-                                   ErrorLogger* /*errorLogger*/,
-                                   const Settings* settings,
+static void valueFlowContainerSize(const TokenList& tokenlist,
+                                   const SymbolDatabase& symboldatabase,
+                                   ErrorLogger& errorLogger,
+                                   const Settings& settings,
                                    const std::set<const Scope*>& skippedFunctions)
 {
     // declaration
-    for (const Variable *var : symboldatabase->variableList()) {
+    for (const Variable *var : symboldatabase.variableList()) {
         if (!var)
             continue;
         if (!var->scope() || !var->scope()->bodyEnd || !var->scope()->bodyStart)
@@ -8725,7 +6604,7 @@ static void valueFlowContainerSize(TokenList* tokenlist,
             continue;
 
         bool known = true;
-        int size = 0;
+        MathLib::bigint size = 0;
         const bool nonLocal = !var->isLocal() || var->isPointer() || var->isReference() || var->isStatic();
         bool constSize = var->isConst() && !nonLocal;
         bool staticSize = false;
@@ -8737,8 +6616,8 @@ static void valueFlowContainerSize(TokenList* tokenlist,
                 const Dimension& dim = var->dimensions().front();
                 if (dim.known) {
                     size = dim.num;
-                } else if (dim.tok && dim.tok->hasKnownIntValue()) {
-                    size = dim.tok->values().front().intvalue;
+                } else if (dim.tok && dim.tok->hasKnownIntValue() && dim.tok->strAt(1) == ">") {
+                    size = dim.tok->getKnownIntValue();
                 }
             }
             if (size < 0)
@@ -8746,17 +6625,17 @@ static void valueFlowContainerSize(TokenList* tokenlist,
         }
         if (!staticSize && nonLocal)
             continue;
-        Token* nameToken = const_cast<Token*>(var->nameToken());
+        auto* nameToken = const_cast<Token*>(var->nameToken());
         if (nameToken->hasKnownValue(ValueFlow::Value::ValueType::CONTAINER_SIZE))
             continue;
         if (!staticSize) {
             if (!Token::Match(nameToken, "%name% ;") &&
-                !(Token::Match(nameToken, "%name% {") && Token::simpleMatch(nameToken->next()->link(), "} ;")) &&
+                !(Token::Match(nameToken, "%name% {") && Token::simpleMatch(nameToken->linkAt(1), "} ;")) &&
                 !Token::Match(nameToken, "%name% ("))
                 continue;
         }
-        if (nameToken->astTop() && Token::Match(nameToken->astTop()->previous(), "for|while"))
-            known = !isVariableChanged(var, settings, true);
+        if (Token::Match(nameToken->astTop()->previous(), "for|while"))
+            known = !isVariableChanged(var, settings);
         std::vector<ValueFlow::Value> values{ValueFlow::Value{size}};
         values.back().valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
         if (known)
@@ -8764,7 +6643,7 @@ static void valueFlowContainerSize(TokenList* tokenlist,
         if (!staticSize) {
             if (Token::simpleMatch(nameToken->next(), "{")) {
                 Token* initList = nameToken->next();
-                valueFlowContainerSetTokValue(tokenlist, settings, nameToken, initList);
+                valueFlowContainerSetTokValue(tokenlist, errorLogger, settings, nameToken, initList);
                 values = getInitListSize(initList, var->valueType(), settings, known);
             } else if (Token::simpleMatch(nameToken->next(), "(")) {
                 const Token* constructorArgs = nameToken->next();
@@ -8778,24 +6657,38 @@ static void valueFlowContainerSize(TokenList* tokenlist,
         }
 
         for (const ValueFlow::Value& value : values) {
-            valueFlowForward(nameToken->next(), var->nameToken(), value, tokenlist, settings);
+            valueFlowForward(nameToken->next(), var->nameToken(), value, tokenlist, errorLogger, settings);
         }
     }
 
+    auto forwardMinimumContainerSize = [&](MathLib::bigint size, Token* opTok, const Token* exprTok) -> void {
+        if (size == 0)
+            return;
+
+        ValueFlow::Value value(size - 1);
+        value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
+        value.bound = ValueFlow::Value::Bound::Upper;
+        value.setImpossible();
+        Token* next = nextAfterAstRightmostLeaf(opTok);
+        if (!next)
+            next = opTok->next();
+        valueFlowForward(next, exprTok, std::move(value), tokenlist, errorLogger, settings);
+    };
+
     // after assignment
-    for (const Scope *functionScope : symboldatabase->functionScopes) {
-        for (Token* tok = const_cast<Token*>(functionScope->bodyStart); tok != functionScope->bodyEnd; tok = tok->next()) {
+    for (const Scope *functionScope : symboldatabase.functionScopes) {
+        for (auto* tok = const_cast<Token*>(functionScope->bodyStart); tok != functionScope->bodyEnd; tok = tok->next()) {
             if (Token::Match(tok, "%name%|;|{|} %var% = %str% ;")) {
                 Token* containerTok = tok->next();
                 if (containerTok->exprId() == 0)
                     continue;
                 if (containerTok->valueType() && containerTok->valueType()->container &&
                     containerTok->valueType()->container->stdStringLike) {
-                    valueFlowContainerSetTokValue(tokenlist, settings, containerTok, containerTok->tokAt(2));
+                    valueFlowContainerSetTokValue(tokenlist, errorLogger, settings, containerTok, containerTok->tokAt(2));
                     ValueFlow::Value value(Token::getStrLength(containerTok->tokAt(2)));
                     value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
                     value.setKnown();
-                    valueFlowForward(containerTok->next(), containerTok, value, tokenlist, settings);
+                    valueFlowForward(containerTok->next(), containerTok, std::move(value), tokenlist, errorLogger, settings);
                 }
             } else if (Token::Match(tok->previous(), ">|return (|{") && astIsContainer(tok) && getLibraryContainer(tok)->size_templateArgNo < 0) {
                 std::vector<ValueFlow::Value> values;
@@ -8805,58 +6698,103 @@ static void valueFlowContainerSize(TokenList* tokenlist,
                     value.valueType = ValueFlow::Value::ValueType::TOK;
                     value.tokvalue = tok;
                     value.setKnown();
-                    values.push_back(value);
+                    values.push_back(std::move(value));
                 } else if (Token::simpleMatch(tok, "(")) {
                     const Token* constructorArgs = tok;
                     values = getContainerSizeFromConstructor(constructorArgs, tok->valueType(), settings, true);
                 }
                 for (const ValueFlow::Value& value : values)
                     setTokenValue(tok, value, settings);
-            } else if (Token::Match(tok, "%name%|;|{|}|> %var% = {") && Token::simpleMatch(tok->linkAt(3), "} ;")) {
+            }
+            else if (Token::Match(tok->previous(), ",|( {|%str%")) {
+                int nArg{};
+                if (const Token* funcTok = getTokenArgumentFunction(tok, 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 = tok->tokType() == Token::Type::eString
+                                   ? std::vector<ValueFlow::Value>{makeContainerSizeValue(Token::getStrLength(tok))}
+                                   : getInitListSize(tok, var->valueType(), settings, true);
+                                ValueFlow::Value tokValue;
+                                tokValue.valueType = ValueFlow::Value::ValueType::TOK;
+                                tokValue.tokvalue = tok;
+                                tokValue.setKnown();
+                                values.push_back(std::move(tokValue));
+
+                                for (const ValueFlow::Value &value : values)
+                                    setTokenValue(tok, 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() == "{") ||
+                        // constructor
+                        (!Token::simpleMatch(tok->tokAt(2)->astOperand2()->astOperand1(), ".") && settings.library.detectContainer(tok->tokAt(3))))) {
                 Token* containerTok = tok->next();
                 if (containerTok->exprId() == 0)
                     continue;
                 if (astIsContainer(containerTok) && containerTok->valueType()->container->size_templateArgNo < 0) {
-                    std::vector<ValueFlow::Value> values =
-                        getInitListSize(tok->tokAt(3), containerTok->valueType(), settings);
-                    valueFlowContainerSetTokValue(tokenlist, settings, containerTok, tok->tokAt(3));
+                    Token* rhs = tok->tokAt(2)->astOperand2();
+                    std::vector<ValueFlow::Value> values = getInitListSize(rhs, containerTok->valueType(), settings);
+                    valueFlowContainerSetTokValue(tokenlist, errorLogger, settings, containerTok, rhs);
                     for (const ValueFlow::Value& value : values)
-                        valueFlowForward(containerTok->next(), containerTok, value, tokenlist, settings);
+                        valueFlowForward(containerTok->next(), containerTok, value, tokenlist, errorLogger, settings);
                 }
             } else if (Token::Match(tok, ". %name% (") && tok->astOperand1() && tok->astOperand1()->valueType() &&
                        tok->astOperand1()->valueType()->container) {
                 const Token* containerTok = tok->astOperand1();
                 if (containerTok->exprId() == 0)
                     continue;
+                if (containerTok->variable() && containerTok->variable()->isArray())
+                    continue;
                 const Library::Container::Action action = containerTok->valueType()->container->getAction(tok->strAt(1));
                 if (action == Library::Container::Action::CLEAR) {
                     ValueFlow::Value value(0);
                     value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
                     value.setKnown();
-                    valueFlowForward(tok->next(), containerTok, value, tokenlist, settings);
+                    valueFlowForward(tok->next(), containerTok, std::move(value), tokenlist, errorLogger, settings);
                 } else if (action == Library::Container::Action::RESIZE && tok->tokAt(2)->astOperand2() &&
                            tok->tokAt(2)->astOperand2()->hasKnownIntValue()) {
-                    ValueFlow::Value value(tok->tokAt(2)->astOperand2()->values().front());
+                    ValueFlow::Value value(*tok->tokAt(2)->astOperand2()->getKnownValue(ValueFlow::Value::ValueType::INT));
                     value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
                     value.setKnown();
-                    valueFlowForward(tok->linkAt(2), containerTok, value, tokenlist, settings);
+                    valueFlowForward(tok->linkAt(2), containerTok, std::move(value), tokenlist, errorLogger, settings);
                 } else if (action == Library::Container::Action::PUSH && !isIteratorPair(getArguments(tok->tokAt(2)))) {
                     ValueFlow::Value value(0);
                     value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
                     value.setImpossible();
-                    valueFlowForward(tok->linkAt(2), containerTok, value, tokenlist, settings);
+                    valueFlowForward(tok->linkAt(2), containerTok, std::move(value), tokenlist, errorLogger, settings);
+                }
+                // TODO: handle more actions?
+
+            } else if (tok->str() == "+=" && astIsContainer(tok->astOperand1())) {
+                const Token* containerTok = tok->astOperand1();
+                const Token* valueTok = tok->astOperand2();
+                const MathLib::bigint size = ValueFlow::valueFlowGetStrLength(valueTok);
+                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());
+                    tok2 = tok2->astOperand1();
                 }
+                size += ValueFlow::valueFlowGetStrLength(tok2);
+                forwardMinimumContainerSize(size, tok, tok->astOperand1());
             }
         }
     }
 }
 
 struct ContainerConditionHandler : ConditionHandler {
-    std::vector<Condition> parse(const Token* tok, const Settings* settings) const override
+    std::vector<Condition> parse(const Token* tok, const Settings& settings) const override
     {
         std::vector<Condition> conds;
         parseCompareEachInt(tok, [&](const Token* vartok, ValueFlow::Value true_value, ValueFlow::Value false_value) {
-            vartok = settings->library.getContainerFromYield(vartok, Library::Container::Yield::SIZE);
+            vartok = settings.library.getContainerFromYield(vartok, Library::Container::Yield::SIZE);
             if (!vartok)
                 return;
             true_value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
@@ -8874,7 +6812,7 @@ struct ContainerConditionHandler : ConditionHandler {
 
         // Empty check
         if (tok->str() == "(") {
-            vartok = settings->library.getContainerFromYield(tok, Library::Container::Yield::EMPTY);
+            vartok = settings.library.getContainerFromYield(tok, Library::Container::Yield::EMPTY);
             // TODO: Handle .size()
             if (!vartok)
                 return {};
@@ -8920,13 +6858,13 @@ struct ContainerConditionHandler : ConditionHandler {
     }
 };
 
-static void valueFlowDynamicBufferSize(const TokenList* tokenlist, const SymbolDatabase* symboldatabase, const Settings* settings)
+static void valueFlowDynamicBufferSize(const TokenList& tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger& errorLogger, const Settings& settings)
 {
     auto getBufferSizeFromAllocFunc = [&](const Token* funcTok) -> MathLib::bigint {
         MathLib::bigint sizeValue = -1;
-        const Library::AllocFunc* allocFunc = settings->library.getAllocFuncInfo(funcTok);
+        const Library::AllocFunc* allocFunc = settings.library.getAllocFuncInfo(funcTok);
         if (!allocFunc)
-            allocFunc = settings->library.getReallocFuncInfo(funcTok);
+            allocFunc = settings.library.getReallocFuncInfo(funcTok);
         if (!allocFunc || allocFunc->bufferSize == Library::AllocFunc::BufferSize::none)
             return sizeValue;
 
@@ -8983,15 +6921,16 @@ 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;
             }
         }
         return sizeValue;
     };
 
-    for (const Scope *functionScope : symboldatabase->functionScopes) {
+    for (const Scope *functionScope : symboldatabase.functionScopes) {
         for (const Token *tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
             if (!Token::Match(tok, "[;{}] %var% ="))
                 continue;
@@ -9005,7 +6944,7 @@ static void valueFlowDynamicBufferSize(const TokenList* tokenlist, const SymbolD
             if (!rhs)
                 continue;
 
-            const bool isNew = symboldatabase->isCPP() && rhs->str() == "new";
+            const bool isNew = rhs->isCpp() && rhs->str() == "new";
             if (!isNew && !Token::Match(rhs->previous(), "%name% ("))
                 continue;
 
@@ -9017,81 +6956,30 @@ static void valueFlowDynamicBufferSize(const TokenList* tokenlist, const SymbolD
             value.errorPath.emplace_back(tok->tokAt(2), "Assign " + tok->strAt(1) + ", buffer with size " + MathLib::toString(sizeValue));
             value.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
             value.setKnown();
-            valueFlowForward(const_cast<Token*>(rhs), functionScope->bodyEnd, tok->next(), std::move(value), tokenlist, settings);
-        }
-    }
-}
-
-static bool getMinMaxValues(const ValueType *vt, const cppcheck::Platform &platform, MathLib::bigint &minValue, MathLib::bigint &maxValue)
-{
-    if (!vt || !vt->isIntegral() || vt->pointer)
-        return false;
-
-    int bits;
-    switch (vt->type) {
-    case ValueType::Type::BOOL:
-        bits = 1;
-        break;
-    case ValueType::Type::CHAR:
-        bits = platform.char_bit;
-        break;
-    case ValueType::Type::SHORT:
-        bits = platform.short_bit;
-        break;
-    case ValueType::Type::INT:
-        bits = platform.int_bit;
-        break;
-    case ValueType::Type::LONG:
-        bits = platform.long_bit;
-        break;
-    case ValueType::Type::LONGLONG:
-        bits = platform.long_long_bit;
-        break;
-    default:
-        return false;
-    }
-
-    if (bits == 1) {
-        minValue = 0;
-        maxValue = 1;
-    } else if (bits < 62) {
-        if (vt->sign == ValueType::Sign::UNSIGNED) {
-            minValue = 0;
-            maxValue = (1LL << bits) - 1;
-        } else {
-            minValue = -(1LL << (bits - 1));
-            maxValue = (1LL << (bits - 1)) - 1;
-        }
-    } else if (bits == 64) {
-        if (vt->sign == ValueType::Sign::UNSIGNED) {
-            minValue = 0;
-            maxValue = LLONG_MAX; // todo max unsigned value
-        } else {
-            minValue = LLONG_MIN;
-            maxValue = LLONG_MAX;
+            valueFlowForward(const_cast<Token*>(rhs), functionScope->bodyEnd, tok->next(), std::move(value), tokenlist, errorLogger, settings);
         }
-    } else {
-        return false;
     }
-
-    return true;
 }
 
-static bool getMinMaxValues(const std::string &typestr, const Settings *settings, MathLib::bigint &minvalue, MathLib::bigint &maxvalue)
+static bool getMinMaxValues(const std::string& typestr,
+                            const Settings& settings,
+                            bool cpp,
+                            MathLib::bigint& minvalue,
+                            MathLib::bigint& maxvalue)
 {
-    TokenList typeTokens(settings);
-    std::istringstream istr(typestr+";");
-    if (!typeTokens.createTokens(istr))
+    TokenList typeTokens(settings, cpp ? Standards::Language::CPP : Standards::Language::C);
+    const std::string str(typestr + ";");
+    if (!typeTokens.createTokensFromBuffer(str.data(), str.size()))
         return false;
     typeTokens.simplifyPlatformTypes();
     typeTokens.simplifyStdType();
-    const ValueType &vt = ValueType::parseDecl(typeTokens.front(), *settings, true); // TODO: set isCpp
-    return getMinMaxValues(&vt, settings->platform, minvalue, maxvalue);
+    const ValueType& vt = ValueType::parseDecl(typeTokens.front(), settings);
+    return ValueFlow::getMinMaxValues(&vt, settings.platform, minvalue, maxvalue);
 }
 
-static void valueFlowSafeFunctions(TokenList* tokenlist, const SymbolDatabase* symboldatabase, const Settings* settings)
+static void valueFlowSafeFunctions(const TokenList& tokenlist, const SymbolDatabase& symboldatabase, ErrorLogger& errorLogger, const Settings& settings)
 {
-    for (const Scope *functionScope : symboldatabase->functionScopes) {
+    for (const Scope *functionScope : symboldatabase.functionScopes) {
         if (!functionScope->bodyStart)
             continue;
         const Function *function = functionScope->function;
@@ -9099,7 +6987,7 @@ static void valueFlowSafeFunctions(TokenList* tokenlist, const SymbolDatabase* s
             continue;
 
         const bool safe = function->isSafe(settings);
-        const bool all = safe && settings->platform.type != cppcheck::Platform::Type::Unspecified;
+        const bool all = safe && settings.platform.type != Platform::Type::Unspecified;
 
         for (const Variable &arg : function->argumentList) {
             if (!arg.nameToken() || !arg.valueType())
@@ -9118,13 +7006,13 @@ static void valueFlowSafeFunctions(TokenList* tokenlist, const SymbolDatabase* s
                 argValues.back().errorPath.emplace_back(arg.nameToken(), "Assuming " + arg.name() + " size is 1000000");
                 argValues.back().safe = true;
                 for (const ValueFlow::Value &value : argValues)
-                    valueFlowForward(const_cast<Token*>(functionScope->bodyStart), arg.nameToken(), value, tokenlist, settings);
+                    valueFlowForward(const_cast<Token*>(functionScope->bodyStart), arg.nameToken(), value, tokenlist, errorLogger, settings);
                 continue;
             }
 
             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;
@@ -9134,7 +7022,7 @@ static void valueFlowSafeFunctions(TokenList* tokenlist, const SymbolDatabase* s
 
             if ((!isLow || !isHigh) && all) {
                 MathLib::bigint minValue, maxValue;
-                if (getMinMaxValues(arg.valueType(), settings->platform, minValue, maxValue)) {
+                if (ValueFlow::getMinMaxValues(arg.valueType(), settings.platform, minValue, maxValue)) {
                     if (!isLow)
                         low = minValue;
                     if (!isHigh)
@@ -9144,19 +7032,20 @@ static void valueFlowSafeFunctions(TokenList* tokenlist, const SymbolDatabase* s
                     std::list<ValueFlow::Value> argValues;
                     argValues.emplace_back(0);
                     argValues.back().valueType = ValueFlow::Value::ValueType::FLOAT;
-                    argValues.back().floatValue = isLow ? low : -1E25f;
+                    argValues.back().floatValue = isLow ? static_cast<double>(low) : -1E25;
                     argValues.back().errorPath.emplace_back(arg.nameToken(), "Safe checks: Assuming argument has value " + MathLib::toString(argValues.back().floatValue));
                     argValues.back().safe = true;
                     argValues.emplace_back(0);
                     argValues.back().valueType = ValueFlow::Value::ValueType::FLOAT;
-                    argValues.back().floatValue = isHigh ? high : 1E25f;
+                    argValues.back().floatValue = isHigh ? static_cast<double>(high) : 1E25;
                     argValues.back().errorPath.emplace_back(arg.nameToken(), "Safe checks: Assuming argument has value " + MathLib::toString(argValues.back().floatValue));
                     argValues.back().safe = true;
                     valueFlowForward(const_cast<Token*>(functionScope->bodyStart->next()),
                                      functionScope->bodyEnd,
                                      arg.nameToken(),
-                                     argValues,
+                                     std::move(argValues),
                                      tokenlist,
+                                     errorLogger,
                                      settings);
                     continue;
                 }
@@ -9178,30 +7067,49 @@ static void valueFlowSafeFunctions(TokenList* tokenlist, const SymbolDatabase* s
                 valueFlowForward(const_cast<Token*>(functionScope->bodyStart->next()),
                                  functionScope->bodyEnd,
                                  arg.nameToken(),
-                                 argValues,
+                                 std::move(argValues),
                                  tokenlist,
+                                 errorLogger,
                                  settings);
         }
     }
 }
 
-static void valueFlowUnknownFunctionReturn(TokenList *tokenlist, const Settings *settings)
+static void valueFlowUnknownFunctionReturn(TokenList& tokenlist, const Settings& settings)
 {
-    if (settings->checkUnknownFunctionReturn.empty())
+    if (!tokenlist.front())
         return;
-    for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front()->next(); tok; tok = tok->next()) {
         if (!tok->astParent() || tok->str() != "(" || !tok->previous()->isName())
             continue;
-        if (settings->checkUnknownFunctionReturn.find(tok->previous()->str()) == settings->checkUnknownFunctionReturn.end())
+
+        if (const auto* f = settings.library.getAllocFuncInfo(tok->astOperand1())) {
+            if (f->noFail) {
+                // Allocation function that cannot fail
+            } else if (settings.library.returnValueType(tok->astOperand1()).find('*') != std::string::npos) {
+                // Allocation function that returns a pointer
+                ValueFlow::Value value(0);
+                value.setPossible();
+                value.errorPath.emplace_back(tok, "Assuming allocation function fails");
+                if (Library::ismemory(f->groupId))
+                    value.unknownFunctionReturn = ValueFlow::Value::UnknownFunctionReturn::outOfMemory;
+                else
+                    value.unknownFunctionReturn = ValueFlow::Value::UnknownFunctionReturn::outOfResources;
+                setTokenValue(tok, std::move(value), settings);
+                continue;
+            }
+        }
+
+        if (settings.checkUnknownFunctionReturn.find(tok->strAt(-1)) == settings.checkUnknownFunctionReturn.end())
             continue;
-        std::vector<MathLib::bigint> unknownValues = settings->library.unknownReturnValues(tok->astOperand1());
+        std::vector<MathLib::bigint> unknownValues = settings.library.unknownReturnValues(tok->astOperand1());
         if (unknownValues.empty())
             continue;
 
         // Get min/max values for return type
-        const std::string &typestr = settings->library.returnValueType(tok->previous());
+        const std::string& typestr = settings.library.returnValueType(tok->previous());
         MathLib::bigint minvalue, maxvalue;
-        if (!getMinMaxValues(typestr, settings, minvalue, maxvalue))
+        if (!getMinMaxValues(typestr, settings, tok->isCpp(), minvalue, maxvalue))
             continue;
 
         for (MathLib::bigint value : unknownValues) {
@@ -9209,16 +7117,16 @@ static void valueFlowUnknownFunctionReturn(TokenList *tokenlist, const Settings
                 value = minvalue;
             else if (value > maxvalue)
                 value = maxvalue;
-            setTokenValue(const_cast<Token *>(tok), ValueFlow::Value(value), settings);
+            setTokenValue(tok, ValueFlow::Value(value), settings);
         }
     }
 }
 
-static void valueFlowDebug(TokenList* tokenlist, ErrorLogger* errorLogger, const Settings* settings)
+static void valueFlowDebug(TokenList& tokenlist, ErrorLogger& errorLogger, const Settings& settings)
 {
-    if (!settings->debugnormal && !settings->debugwarnings)
+    if (!settings.debugnormal && !settings.debugwarnings)
         return;
-    for (Token* tok = tokenlist->front(); tok; tok = tok->next()) {
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
         if (tok->getTokenDebug() != TokenDebug::ValueFlow)
             continue;
         if (tok->astParent() && tok->astParent()->getTokenDebug() == TokenDebug::ValueFlow)
@@ -9228,34 +7136,34 @@ 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});
         }
     }
 }
 
-const ValueFlow::Value *ValueFlow::valueFlowConstantFoldAST(Token *expr, const Settings *settings)
+const ValueFlow::Value *ValueFlow::valueFlowConstantFoldAST(Token *expr, const Settings &settings)
 {
     if (expr && expr->values().empty()) {
         valueFlowConstantFoldAST(expr->astOperand1(), settings);
         valueFlowConstantFoldAST(expr->astOperand2(), settings);
-        valueFlowSetConstantValue(expr, settings, true /* TODO: this is a guess */);
+        valueFlowSetConstantValue(expr, settings);
     }
     return expr && expr->hasKnownValue() ? &expr->values().front() : nullptr;
 }
 
 struct ValueFlowState {
-    explicit ValueFlowState(TokenList* tokenlist = nullptr,
-                            SymbolDatabase* symboldatabase = nullptr,
-                            ErrorLogger* errorLogger = nullptr,
-                            const Settings* settings = nullptr)
+    explicit ValueFlowState(TokenList& tokenlist,
+                            SymbolDatabase& symboldatabase,
+                            ErrorLogger& errorLogger,
+                            const Settings& settings)
         : tokenlist(tokenlist), symboldatabase(symboldatabase), errorLogger(errorLogger), settings(settings)
     {}
 
-    TokenList* tokenlist = nullptr;
-    SymbolDatabase* symboldatabase = nullptr;
-    ErrorLogger* errorLogger = nullptr;
-    const Settings* settings = nullptr;
-    std::set<const Scope*> skippedFunctions = {};
+    TokenList& tokenlist;
+    SymbolDatabase& symboldatabase;
+    ErrorLogger& errorLogger;
+    const Settings& settings;
+    std::set<const Scope*> skippedFunctions;
 };
 
 struct ValueFlowPass {
@@ -9267,7 +7175,7 @@ struct ValueFlowPass {
     virtual void run(const ValueFlowState& state) const = 0;
     // Returns true if pass needs C++
     virtual bool cpp() const = 0;
-    virtual ~ValueFlowPass() noexcept {}
+    virtual ~ValueFlowPass() noexcept = default;
 };
 
 struct ValueFlowPassRunner {
@@ -9290,7 +7198,7 @@ struct ValueFlowPassRunner {
     bool run(std::initializer_list<ValuePtr<ValueFlowPass>> passes) const
     {
         std::size_t values = 0;
-        std::size_t n = state.settings->valueFlowMaxIterations;
+        std::size_t n = state.settings.vfOptions.maxIterations;
         while (n > 0 && values != getTotalValues()) {
             values = getTotalValues();
             if (std::any_of(passes.begin(), passes.end(), [&](const ValuePtr<ValueFlowPass>& pass) {
@@ -9299,17 +7207,16 @@ struct ValueFlowPassRunner {
                 return true;
             --n;
         }
-        if (state.settings->debugwarnings) {
+        if (state.settings.debugwarnings) {
             if (n == 0 && values != getTotalValues()) {
-                ErrorMessage::FileLocation loc;
-                loc.setfile(state.tokenlist->getFiles()[0]);
+                ErrorMessage::FileLocation loc(state.tokenlist.getFiles()[0], 0, 0);
                 ErrorMessage errmsg({std::move(loc)},
-                                    emptyString,
+                                    "",
                                     Severity::debug,
                                     "ValueFlow maximum iterations exceeded",
                                     "valueFlowMaxIterations",
                                     Certainty::normal);
-                state.errorLogger->reportErr(errmsg);
+                state.errorLogger.reportErr(errmsg);
             }
         }
         return false;
@@ -9318,12 +7225,14 @@ struct ValueFlowPassRunner {
     bool run(const ValuePtr<ValueFlowPass>& pass) const
     {
         auto start = Clock::now();
-        if (start > stop)
+        if (start > stop) {
+            // TODO: add bailout message
             return true;
-        if (!state.tokenlist->isCPP() && pass->cpp())
+        }
+        if (!state.tokenlist.isCPP() && pass->cpp())
             return false;
         if (timerResults) {
-            Timer t(pass->name(), state.settings->showtime, timerResults);
+            Timer t(pass->name(), state.settings.showtime, timerResults);
             pass->run(state);
         } else {
             pass->run(state);
@@ -9334,15 +7243,15 @@ struct ValueFlowPassRunner {
     std::size_t getTotalValues() const
     {
         std::size_t n = 1;
-        for (Token* tok = state.tokenlist->front(); tok; tok = tok->next())
+        for (Token* tok = state.tokenlist.front(); tok; tok = tok->next())
             n += tok->values().size();
         return n;
     }
 
     void setSkippedFunctions()
     {
-        if (state.settings->performanceValueFlowMaxIfCount > 0) {
-            for (const Scope* functionScope : state.symboldatabase->functionScopes) {
+        if (state.settings.vfOptions.maxIfCount > 0) {
+            for (const Scope* functionScope : state.symboldatabase.functionScopes) {
                 int countIfScopes = 0;
                 std::vector<const Scope*> scopes{functionScope};
                 while (!scopes.empty()) {
@@ -9350,26 +7259,26 @@ struct ValueFlowPassRunner {
                     scopes.pop_back();
                     for (const Scope* s2 : s->nestedList) {
                         scopes.emplace_back(s2);
-                        if (s2->type == Scope::ScopeType::eIf)
+                        if (s2->type == ScopeType::eIf)
                             ++countIfScopes;
                     }
                 }
-                if (countIfScopes > state.settings->performanceValueFlowMaxIfCount) {
+                if (countIfScopes > state.settings.vfOptions.maxIfCount) {
                     state.skippedFunctions.emplace(functionScope);
 
-                    if (state.settings->severity.isEnabled(Severity::information)) {
+                    if (state.settings.severity.isEnabled(Severity::information)) {
                         const std::string& functionName = functionScope->className;
-                        const std::list<ErrorMessage::FileLocation> callstack(
+                        std::list<ErrorMessage::FileLocation> callstack(
                             1,
-                            ErrorMessage::FileLocation(functionScope->bodyStart, state.tokenlist));
-                        const ErrorMessage errmsg(callstack,
-                                                  state.tokenlist->getSourceFilePath(),
+                            ErrorMessage::FileLocation(functionScope->bodyStart, &state.tokenlist));
+                        const ErrorMessage errmsg(std::move(callstack),
+                                                  state.tokenlist.getSourceFilePath(),
                                                   Severity::information,
-                                                  "ValueFlow analysis is limited in " + functionName +
-                                                  ". Use --check-level=exhaustive if full analysis is wanted.",
-                                                  "checkLevelNormal",
+                                                  "Limiting ValueFlow analysis in function '" + functionName + "' since it is too complex. "
+                                                  "Please specify --check-level=exhaustive to perform full analysis.",
+                                                  "checkLevelNormal", // TODO: use more specific ID
                                                   Certainty::normal);
-                        state.errorLogger->reportErr(errmsg);
+                        state.errorLogger.reportErr(errmsg);
                     }
                 }
             }
@@ -9378,8 +7287,8 @@ struct ValueFlowPassRunner {
 
     void setStopTime()
     {
-        if (state.settings->performanceValueFlowMaxTime >= 0)
-            stop = Clock::now() + std::chrono::seconds{state.settings->performanceValueFlowMaxTime};
+        if (state.settings.vfOptions.maxTime >= 0)
+            stop = Clock::now() + std::chrono::seconds{state.settings.vfOptions.maxTime};
     }
 
     ValueFlowState state;
@@ -9392,7 +7301,7 @@ struct ValueFlowPassAdaptor : ValueFlowPass {
     const char* mName = nullptr;
     bool mCPP = false;
     F mRun;
-    ValueFlowPassAdaptor(const char* pname, bool pcpp, F prun) : mName(pname), mCPP(pcpp), mRun(prun) {}
+    ValueFlowPassAdaptor(const char* pname, bool pcpp, F prun) : ValueFlowPass(), mName(pname), mCPP(pcpp), mRun(prun) {}
     const char* name() const override {
         return mName;
     }
@@ -9406,18 +7315,18 @@ struct ValueFlowPassAdaptor : ValueFlowPass {
 };
 
 template<class F>
-ValueFlowPassAdaptor<F> makeValueFlowPassAdaptor(const char* name, bool cpp, F run)
+static ValueFlowPassAdaptor<F> makeValueFlowPassAdaptor(const char* name, bool cpp, F run)
 {
     return {name, cpp, run};
 }
 
 #define VALUEFLOW_ADAPTOR(cpp, ...)                                                                                    \
     makeValueFlowPassAdaptor(#__VA_ARGS__,                                                                             \
-                             cpp,                                                                                      \
-                             [](TokenList* tokenlist,                                                                  \
-                                SymbolDatabase* symboldatabase,                                                        \
-                                ErrorLogger* errorLogger,                                                              \
-                                const Settings* settings,                                                              \
+                             (cpp),                                                                                      \
+                             [](TokenList& tokenlist,                                                                  \
+                                SymbolDatabase& symboldatabase,                                                        \
+                                ErrorLogger& errorLogger,                                                              \
+                                const Settings& settings,                                                              \
                                 const std::set<const Scope*>& skippedFunctions) {                                      \
         (void)tokenlist;                                                                      \
         (void)symboldatabase;                                                                 \
@@ -9430,32 +7339,44 @@ ValueFlowPassAdaptor<F> makeValueFlowPassAdaptor(const char* name, bool cpp, F r
 #define VFA(...) VALUEFLOW_ADAPTOR(false, __VA_ARGS__)
 #define VFA_CPP(...) VALUEFLOW_ADAPTOR(true, __VA_ARGS__)
 
-void ValueFlow::setValues(TokenList* tokenlist,
-                          SymbolDatabase* symboldatabase,
-                          ErrorLogger* errorLogger,
-                          const Settings* settings,
+void ValueFlow::setValues(TokenList& tokenlist,
+                          SymbolDatabase& symboldatabase,
+                          ErrorLogger& errorLogger,
+                          const Settings& settings,
                           TimerResultsIntf* timerResults)
 {
-    for (Token* tok = tokenlist->front(); tok; tok = tok->next())
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next())
         tok->clearValueFlow();
 
+    // commas in init..
+    for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
+        if (tok->str() != "{" || !tok->astOperand1())
+            continue;
+        for (Token* tok2 = tok->next(); tok2 != tok->link(); tok2 = tok2->next()) {
+            if (tok2->link() && Token::Match(tok2, "[{[(<]"))
+                tok2 = tok2->link();
+            else if (tok2->str() == ",")
+                tok2->isInitComma(true);
+        }
+    }
+
     ValueFlowPassRunner runner{ValueFlowState{tokenlist, symboldatabase, errorLogger, settings}, timerResults};
     runner.run_once({
         VFA(valueFlowEnumValue(symboldatabase, settings)),
         VFA(valueFlowNumber(tokenlist, settings)),
         VFA(valueFlowString(tokenlist, settings)),
+        VFA(valueFlowTypeTraits(tokenlist, settings)),
         VFA(valueFlowArray(tokenlist, settings)),
         VFA(valueFlowUnknownFunctionReturn(tokenlist, settings)),
         VFA(valueFlowGlobalConstVar(tokenlist, settings)),
         VFA(valueFlowEnumValue(symboldatabase, settings)),
-        VFA(valueFlowNumber(tokenlist, settings)),
         VFA(valueFlowGlobalStaticVar(tokenlist, settings)),
         VFA(valueFlowPointerAlias(tokenlist, settings)),
-        VFA(valueFlowLifetime(tokenlist, symboldatabase, errorLogger, settings)),
-        VFA(valueFlowSymbolic(tokenlist, symboldatabase, settings)),
+        VFA(valueFlowLifetime(tokenlist, errorLogger, settings)),
+        VFA(valueFlowSymbolic(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowBitAnd(tokenlist, settings)),
         VFA(valueFlowSameExpressions(tokenlist, settings)),
-        VFA(valueFlowConditionExpressions(tokenlist, symboldatabase, errorLogger, *settings)),
+        VFA(valueFlowConditionExpressions(tokenlist, symboldatabase, errorLogger, settings)),
     });
 
     runner.run({
@@ -9466,32 +7387,32 @@ void ValueFlow::setValues(TokenList* tokenlist,
         VFA(valueFlowArrayBool(tokenlist, settings)),
         VFA(valueFlowArrayElement(tokenlist, settings)),
         VFA(valueFlowRightShift(tokenlist, settings)),
+        VFA_CPP(
+            valueFlowCondition(ContainerConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions)),
         VFA(valueFlowAfterAssign(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions)),
         VFA_CPP(valueFlowAfterSwap(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowCondition(SimpleConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions)),
         VFA(valueFlowInferCondition(tokenlist, settings)),
         VFA(valueFlowSwitchVariable(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowForLoop(tokenlist, symboldatabase, errorLogger, settings)),
-        VFA(valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, *settings)),
+        VFA(valueFlowSubFunction(tokenlist, symboldatabase, errorLogger, settings)),
         VFA(valueFlowFunctionReturn(tokenlist, errorLogger, settings)),
-        VFA(valueFlowLifetime(tokenlist, symboldatabase, errorLogger, settings)),
-        VFA(valueFlowFunctionDefaultParameter(tokenlist, symboldatabase, settings)),
-        VFA(valueFlowUninit(tokenlist, symboldatabase, settings)),
-        VFA_CPP(valueFlowAfterMove(tokenlist, symboldatabase, settings)),
+        VFA(valueFlowLifetime(tokenlist, errorLogger, settings)),
+        VFA(valueFlowFunctionDefaultParameter(tokenlist, symboldatabase, errorLogger, settings)),
+        VFA(valueFlowUninit(tokenlist, errorLogger, settings)),
+        VFA_CPP(valueFlowAfterMove(tokenlist, symboldatabase, errorLogger, settings)),
         VFA_CPP(valueFlowSmartPointer(tokenlist, errorLogger, settings)),
         VFA_CPP(valueFlowIterators(tokenlist, settings)),
         VFA_CPP(
             valueFlowCondition(IteratorConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions)),
         VFA_CPP(valueFlowIteratorInfer(tokenlist, settings)),
         VFA_CPP(valueFlowContainerSize(tokenlist, symboldatabase, errorLogger, settings, skippedFunctions)),
-        VFA_CPP(
-            valueFlowCondition(ContainerConditionHandler{}, tokenlist, symboldatabase, errorLogger, settings, skippedFunctions)),
-        VFA(valueFlowSafeFunctions(tokenlist, symboldatabase, settings)),
+        VFA(valueFlowSafeFunctions(tokenlist, symboldatabase, errorLogger, settings)),
     });
 
     runner.run_once({
-        VFA(valueFlowDynamicBufferSize(tokenlist, symboldatabase, settings)),
-        VFA(valueFlowDebug(tokenlist, errorLogger, settings)),
+        VFA(valueFlowDynamicBufferSize(tokenlist, symboldatabase, errorLogger, settings)),
+        VFA(valueFlowDebug(tokenlist, errorLogger, settings)), // TODO: add option to print it after each step/iteration
     });
 }
 
@@ -9512,7 +7433,7 @@ std::string ValueFlow::eitherTheConditionIsRedundant(const Token *condition)
 }
 
 const ValueFlow::Value* ValueFlow::findValue(const std::list<ValueFlow::Value>& values,
-                                             const Settings* settings,
+                                             const Settings& settings,
                                              const std::function<bool(const ValueFlow::Value&)> &pred)
 {
     const ValueFlow::Value* ret = nullptr;
@@ -9524,10 +7445,10 @@ const ValueFlow::Value* ValueFlow::findValue(const std::list<ValueFlow::Value>&
                 break;
         }
     }
-    if (settings && ret) {
-        if (ret->isInconclusive() && !settings->certainty.isEnabled(Certainty::inconclusive))
+    if (ret) {
+        if (ret->isInconclusive() && !settings.certainty.isEnabled(Certainty::inconclusive))
             return nullptr;
-        if (ret->condition && !settings->severity.isEnabled(Severity::warning))
+        if (ret->condition && !settings.severity.isEnabled(Severity::warning))
             return nullptr;
     }
     return ret;
diff --git a/lib/valueflow.h b/lib/valueflow.h
index c7298bb31c2..a813ff8d286 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-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
@@ -22,10 +22,9 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "errortypes.h"
 #include "mathlib.h"
-#include "vfvalue.h"
 
-#include <cstdlib>
 #include <functional>
 #include <list>
 #include <string>
@@ -33,58 +32,56 @@
 #include <vector>
 
 class ErrorLogger;
-struct InferModel;
 class Settings;
 class SymbolDatabase;
 class TimerResultsIntf;
 class Token;
 class TokenList;
-class ValueType;
 class Variable;
 class Scope;
 
-template<class T>
-class ValuePtr;
+namespace ValueFlow
+{
+    class Value;
+}
 
 namespace ValueFlow {
     /// Constant folding of expression. This can be used before the full ValueFlow has been executed (ValueFlow::setValues).
-    const Value * valueFlowConstantFoldAST(Token *expr, const Settings *settings);
+    const Value * valueFlowConstantFoldAST(Token *expr, const Settings &settings);
 
     /// Perform valueflow analysis.
-    void setValues(TokenList* tokenlist,
-                   SymbolDatabase* symboldatabase,
-                   ErrorLogger* errorLogger,
-                   const Settings* settings,
+    void setValues(TokenList& tokenlist,
+                   SymbolDatabase& symboldatabase,
+                   ErrorLogger& errorLogger,
+                   const Settings& settings,
                    TimerResultsIntf* timerResults);
 
     std::string eitherTheConditionIsRedundant(const Token *condition);
 
-    size_t getSizeOf(const ValueType &vt, const Settings *settings);
-
     const Value* findValue(const std::list<Value>& values,
-                           const Settings* settings,
+                           const Settings& settings,
                            const std::function<bool(const Value&)> &pred);
 
     std::vector<Value> isOutOfBounds(const Value& size, const Token* indexTok, bool possible = true);
 
     Value asImpossible(Value v);
 
-    bool isContainerSizeChanged(const Token* tok, int indirect, const Settings* settings = nullptr, int depth = 20);
+    bool isContainerSizeChanged(const Token* tok, int indirect, const Settings& settings, int depth = 20);
 
     struct LifetimeToken {
-        const Token* token;
-        Value::ErrorPath errorPath;
-        bool addressOf;
-        bool inconclusive;
+        const Token* token{};
+        ErrorPath errorPath;
+        bool addressOf{};
+        bool inconclusive{};
 
-        LifetimeToken() : token(nullptr), errorPath(), addressOf(false), inconclusive(false) {}
+        LifetimeToken() = default;
 
-        LifetimeToken(const Token* token, Value::ErrorPath errorPath)
-            : token(token), errorPath(std::move(errorPath)), addressOf(false), inconclusive(false)
+        LifetimeToken(const Token* token, ErrorPath errorPath)
+            : token(token), errorPath(std::move(errorPath))
         {}
 
-        LifetimeToken(const Token* token, bool addressOf, Value::ErrorPath errorPath)
-            : token(token), errorPath(std::move(errorPath)), addressOf(addressOf), inconclusive(false)
+        LifetimeToken(const Token* token, bool addressOf, ErrorPath errorPath)
+            : token(token), errorPath(std::move(errorPath)), addressOf(addressOf)
         {}
 
         static std::vector<LifetimeToken> setAddressOf(std::vector<LifetimeToken> v, bool b) {
@@ -103,25 +100,24 @@ namespace ValueFlow {
     const Token *parseCompareInt(const Token *tok, Value &true_value, Value &false_value, const std::function<std::vector<MathLib::bigint>(const Token*)>& evaluate);
     const Token *parseCompareInt(const Token *tok, Value &true_value, Value &false_value);
 
-    CPPCHECKLIB ValuePtr<InferModel> makeIntegralInferModel();
-
     const Token* solveExprValue(const Token* expr,
                                 const std::function<std::vector<MathLib::bigint>(const Token*)>& eval,
                                 Value& value);
 
     std::vector<LifetimeToken> getLifetimeTokens(const Token* tok,
+                                                 const Settings& settings,
                                                  bool escape = false,
-                                                 Value::ErrorPath errorPath = Value::ErrorPath{});
+                                                 ErrorPath errorPath = ErrorPath{});
 
-    bool hasLifetimeToken(const Token* tok, const Token* lifetime);
+    bool hasLifetimeToken(const Token* tok, const Token* lifetime, const Settings& settings);
 
-    const Variable* getLifetimeVariable(const Token* tok, Value::ErrorPath& errorPath, bool* addressOf = nullptr);
+    const Variable* getLifetimeVariable(const Token* tok, ErrorPath& errorPath, const Settings& settings, bool* addressOf = nullptr);
 
-    const Variable* getLifetimeVariable(const Token* tok);
+    const Variable* getLifetimeVariable(const Token* tok, const Settings& settings);
 
-    bool isLifetimeBorrowed(const Token *tok, const Settings *settings);
+    bool isLifetimeBorrowed(const Token *tok, const Settings &settings);
 
-    std::string lifetimeMessage(const Token *tok, const Value *val, Value::ErrorPath &errorPath);
+    std::string lifetimeMessage(const Token *tok, const Value *val, ErrorPath &errorPath);
 
     CPPCHECKLIB Value getLifetimeObjValue(const Token *tok, bool inconclusive = false);
 
diff --git a/lib/valueptr.h b/lib/valueptr.h
index 0740a72fc10..5e0bea0196b 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-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
@@ -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() {}
@@ -54,13 +55,6 @@ class CPPCHECKLIB ValuePtr {
     }
     ValuePtr(ValuePtr&& rhs) NOEXCEPT : mPtr(std::move(rhs.mPtr)), mClone(std::move(rhs.mClone)) {}
 
-    /**
-     * Releases the shared_ptr's ownership of the managed object using the .reset() function
-     */
-    void release() {
-        mPtr.reset();
-    }
-
     T* get() NOEXCEPT {
         return mPtr.get();
     }
@@ -82,13 +76,13 @@ class CPPCHECKLIB ValuePtr {
         return get();
     }
 
-    void swap(ValuePtr& rhs) {
+    void swap(ValuePtr& rhs) NOEXCEPT {
         using std::swap;
         swap(mPtr, rhs.mPtr);
         swap(mClone, rhs.mClone);
     }
 
-    ValuePtr<T>& operator=(ValuePtr rhs) {
+    ValuePtr<T>& operator=(ValuePtr rhs) & {
         swap(rhs);
         return *this;
     }
@@ -97,7 +91,6 @@ class CPPCHECKLIB ValuePtr {
     operator bool() const NOEXCEPT {
         return !!mPtr;
     }
-    ~ValuePtr() {}
 
 private:
     std::shared_ptr<T> mPtr;
diff --git a/lib/version.h b/lib/version.h
index f0d87079eba..3a7c5918b45 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -1,18 +1,28 @@
-// 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
+/* -*- 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/>.
+ */
 
-#define CPPCHECK_MAJOR_VERSION 2
-#define CPPCHECK_MINOR_VERSION 11
-#define CPPCHECK_DEVMINOR_VERSION 12
-#define CPPCHECK_FIX_VERSION 0
 
-#define STRINGIFY(x) STRING(x)
-#define STRING(VER) #VER
-#if CPPCHECK_MINOR_VERSION == CPPCHECK_DEVMINOR_VERSION
-#define CPPCHECK_VERSION_STRING STRINGIFY(CPPCHECK_MAJOR_VERSION) "." STRINGIFY(CPPCHECK_MINOR_VERSION) "." STRINGIFY(CPPCHECK_FIX_VERSION)
-#define CPPCHECK_VERSION CPPCHECK_MAJOR_VERSION,CPPCHECK_MINOR_VERSION,CPPCHECK_FIX_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
+#ifndef versionH
+#define versionH
+
+#define CPPCHECK_VERSION_STRING "2.19 dev"
+#define CPPCHECK_VERSION 2,18,99,0
+
+#define LEGALCOPYRIGHT L"Copyright (C) 2007-2025 Cppcheck team."
+
 #endif
-#define LEGALCOPYRIGHT L"Copyright (C) 2007-2023 Cppcheck team."
diff --git a/lib/vf_analyzers.cpp b/lib/vf_analyzers.cpp
new file mode 100644
index 00000000000..5f5568663e4
--- /dev/null
+++ b/lib/vf_analyzers.cpp
@@ -0,0 +1,1610 @@
+/*
+ * 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 "vf_analyzers.h"
+
+#include "analyzer.h"
+#include "astutils.h"
+#include "calculate.h"
+#include "config.h"
+#include "library.h"
+#include "mathlib.h"
+#include "programmemory.h"
+#include "smallvector.h"
+#include "settings.h"
+#include "symboldatabase.h"
+#include "token.h"
+#include "utils.h"
+#include "vfvalue.h"
+#include "valueptr.h"
+#include "valueflow.h"
+
+#include "vf_common.h"
+#include "vf_settokenvalue.h"
+
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <functional>
+#include <initializer_list>
+#include <iterator>
+#include <list>
+#include <set>
+#include <type_traits>
+
+static bool isDereferenceOp(const Token* tok)
+{
+    if (!tok)
+        return false;
+    if (!tok->astOperand1())
+        return false;
+    if (tok->str() == "*")
+        return true;
+    return tok->str() == "." && tok->originalName() == "->";
+}
+
+struct ValueFlowAnalyzer : Analyzer {
+    const Settings& settings;
+    ProgramMemoryState pms;
+
+    explicit ValueFlowAnalyzer(const Settings& s) : settings(s), pms(settings) {}
+
+    virtual const ValueFlow::Value* getValue(const Token* tok) const = 0;
+    virtual ValueFlow::Value* getValue(const Token* tok) = 0;
+
+    virtual void makeConditional() = 0;
+
+    virtual void addErrorPath(const Token* tok, const std::string& s) = 0;
+
+    virtual bool match(const Token* tok) const = 0;
+
+    virtual bool internalMatch(const Token* /*tok*/) const {
+        return false;
+    }
+
+    virtual bool isAlias(const Token* tok, bool& inconclusive) const = 0;
+
+    using ProgramState = ProgramMemory::Map;
+
+    virtual ProgramState getProgramState() const = 0;
+
+    virtual int getIndirect(const Token* tok) const {
+        const ValueFlow::Value* value = getValue(tok);
+        if (value)
+            return value->indirect;
+        return 0;
+    }
+
+    virtual bool isGlobal() const {
+        return false;
+    }
+    virtual bool dependsOnThis() const {
+        return false;
+    }
+    virtual bool isClassVariable() const {
+        return false;
+    }
+
+    const Settings& getSettings() const {
+        return settings;
+    }
+
+    struct ConditionState {
+        bool dependent = true;
+        bool unknown = true;
+
+        bool isUnknownDependent() const {
+            return unknown && dependent;
+        }
+    };
+
+    ConditionState analyzeCondition(const Token* tok, int depth = 20) const
+    {
+        if (!tok)
+            return {};
+        if (depth < 0)
+            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())
+                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
+                result.dependent = lhs.dependent || rhs.dependent;
+            result.unknown = lhs.unknown || rhs.unknown;
+            return result;
+        }
+        if (Token::Match(tok->previous(), "%name% (")) {
+            std::vector<const Token*> args = getArguments(tok->previous());
+            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;
+            });
+            if (result.dependent) {
+                // Check if we can evaluate the function
+                if (!evaluate(Evaluate::Integral, tok).empty())
+                    result.unknown = false;
+            }
+            return result;
+        }
+
+        std::unordered_map<nonneg int, const Token*> symbols = getSymbols(tok);
+        ConditionState result;
+        result.dependent = false;
+        for (auto&& p : symbols) {
+            const Token* arg = p.second;
+            ConditionState cs = analyzeCondition(arg, depth - 1);
+            result.dependent = cs.dependent;
+            if (result.dependent)
+                break;
+        }
+        if (result.dependent) {
+            // Check if we can evaluate the token
+            if (!evaluate(Evaluate::Integral, tok).empty())
+                result.unknown = false;
+        }
+        return result;
+    }
+
+    static ValueFlow::Value::MoveKind isMoveOrForward(const Token* tok)
+    {
+        if (!tok)
+            return ValueFlow::Value::MoveKind::NonMovedVariable;
+        const Token* parent = tok->astParent();
+        if (!Token::simpleMatch(parent, "("))
+            return ValueFlow::Value::MoveKind::NonMovedVariable;
+        const Token* ftok = parent->astOperand1();
+        if (!ftok)
+            return ValueFlow::Value::MoveKind::NonMovedVariable;
+        if (Token::simpleMatch(ftok->astOperand1(), "std :: move"))
+            return ValueFlow::Value::MoveKind::MovedVariable;
+        if (Token::simpleMatch(ftok->astOperand1(), "std :: forward"))
+            return ValueFlow::Value::MoveKind::ForwardedVariable;
+        // TODO: Check for cast
+        return ValueFlow::Value::MoveKind::NonMovedVariable;
+    }
+
+    virtual Action isModified(const Token* tok) const {
+        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 Action::Read;
+            // Inserting elements to container won't change the lifetime
+            if (astIsContainer(tok) && value->isLifetimeValue() &&
+                contains({Library::Container::Action::PUSH,
+                          Library::Container::Action::INSERT,
+                          Library::Container::Action::APPEND,
+                          Library::Container::Action::CHANGE_INTERNAL},
+                         astContainerAction(tok, getSettings().library)))
+                return Action::Read;
+        }
+        bool inconclusive = false;
+        if (isVariableChangedByFunctionCall(tok, getIndirect(tok), getSettings(), &inconclusive))
+            return Action::Read | Action::Invalid;
+        if (inconclusive)
+            return Action::Read | Action::Inconclusive;
+        if (isVariableChanged(tok, getIndirect(tok), getSettings())) {
+            if (Token::Match(tok->astParent(), "*|[|.|++|--"))
+                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)) {
+                std::vector<MathLib::bigint> result = evaluateInt(tok->astParent()->astOperand2());
+                if (!result.empty() && value->equalTo(result.front()))
+                    return Action::Idempotent;
+            }
+            return Action::Invalid;
+        }
+        return Action::Read;
+    }
+
+    virtual Action isAliasModified(const Token* tok, int indirect = -1) const {
+        // Lambda function call
+        if (Token::Match(tok, "%var% ("))
+            // TODO: Check if modified in the lambda function
+            return Action::Invalid;
+        if (indirect == -1) {
+            indirect = 0;
+            if (const ValueType* vt = tok->valueType()) {
+                indirect = vt->pointer;
+                if (vt->type == ValueType::ITERATOR)
+                    ++indirect;
+                const Token* tok2 = tok;
+                while (Token::simpleMatch(tok2->astParent(), "[")) {
+                    tok2 = tok2->astParent();
+                    --indirect;
+                }
+                indirect = std::max(indirect, 0);
+            }
+        }
+        for (int i = 0; i <= indirect; ++i)
+            if (isVariableChanged(tok, i, getSettings()))
+                return Action::Invalid;
+        return Action::None;
+    }
+
+    virtual Action isThisModified(const Token* tok) const {
+        if (isThisChanged(tok, 0, getSettings()))
+            return Action::Invalid;
+        return Action::None;
+    }
+
+    virtual Action isWritable(const Token* tok, Direction d) const {
+        const ValueFlow::Value* value = getValue(tok);
+        if (!value)
+            return Action::None;
+        if (!(value->isIntValue() || value->isFloatValue() || value->isSymbolicValue() || value->isLifetimeValue()))
+            return Action::None;
+        const Token* parent = tok->astParent();
+        // Only if its invertible
+        if (value->isImpossible() && !Token::Match(parent, "+=|-=|*=|++|--"))
+            return Action::None;
+        if (value->isLifetimeValue()) {
+            if (value->lifetimeKind != ValueFlow::Value::LifetimeKind::Iterator)
+                return Action::None;
+            if (!Token::Match(parent, "++|--|+="))
+                return Action::None;
+            return Action::Read | Action::Write;
+        }
+        if (parent && parent->isAssignmentOp() && astIsLHS(tok)) {
+            const Token* rhs = parent->astOperand2();
+            std::vector<MathLib::bigint> result = evaluateInt(rhs);
+            if (!result.empty()) {
+                ValueFlow::Value rhsValue{result.front()};
+                Action a;
+                if (!evalAssignment(*value, getAssign(parent, d), rhsValue))
+                    a = Action::Invalid;
+                else
+                    a = Action::Write;
+                if (parent->str() != "=") {
+                    a |= Action::Read | Action::Incremental;
+                } else {
+                    if (!value->isImpossible() && value->equalValue(rhsValue))
+                        a = Action::Idempotent;
+                    if (tok->exprId() != 0 &&
+                        findAstNode(rhs, [&](const Token* child) {
+                        return tok->exprId() == child->exprId();
+                    }))
+                        a |= Action::Incremental;
+                }
+                return a;
+            }
+        }
+
+        // increment/decrement
+        if (Token::Match(tok->astParent(), "++|--")) {
+            return Action::Read | Action::Write | Action::Incremental;
+        }
+        return Action::None;
+    }
+
+    virtual void writeValue(ValueFlow::Value* value, const Token* tok, Direction d) const {
+        if (!value)
+            return;
+        if (!tok->astParent())
+            return;
+        // Lifetime value doesn't change
+        if (value->isLifetimeValue())
+            return;
+        if (tok->astParent()->isAssignmentOp()) {
+            const Token* rhs = tok->astParent()->astOperand2();
+            std::vector<MathLib::bigint> result = evaluateInt(rhs);
+            assert(!result.empty());
+            ValueFlow::Value rhsValue{result.front()};
+            if (evalAssignment(*value, getAssign(tok->astParent(), d), rhsValue)) {
+                std::string info("Compound assignment '" + tok->astParent()->str() + "', assigned value is " +
+                                 value->infoString());
+                if (tok->astParent()->str() == "=")
+                    value->errorPath.clear();
+                value->errorPath.emplace_back(tok, std::move(info));
+            } else {
+                assert(false && "Writable value cannot be evaluated");
+                // TODO: Don't set to zero
+                value->intvalue = 0;
+            }
+        } else if (tok->astParent()->tokType() == Token::eIncDecOp) {
+            bool inc = tok->astParent()->str() == "++";
+            const std::string opName(inc ? "incremented" : "decremented");
+            if (d == Direction::Reverse)
+                inc = !inc;
+            value->intvalue += (inc ? 1 : -1);
+
+            /* Truncate value */
+            const ValueType *dst = tok->valueType();
+            if (dst) {
+                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);
+
+                    /* Handle overflow/underflow for value bounds */
+                    if (value->bound != ValueFlow::Value::Bound::Point) {
+                        if ((newvalue > value->intvalue && !inc) || (newvalue < value->intvalue && inc))
+                            value->invertBound();
+                    }
+
+                    value->intvalue = newvalue;
+                }
+
+                value->errorPath.emplace_back(tok, tok->str() + " is " + opName + "', new value is " + value->infoString());
+            }
+        }
+    }
+
+    virtual bool useSymbolicValues() const {
+        return true;
+    }
+
+    virtual void internalUpdate(Token* /*tok*/, const ValueFlow::Value& /*v*/, Direction /*d*/)
+    {
+        assert(false && "Internal update unimplemented.");
+    }
+
+private:
+    // Returns Action::Match if its an exact match, return Action::Read if it partially matches the lifetime
+    Action analyzeLifetime(const Token* tok) const
+    {
+        if (!tok)
+            return Action::None;
+        if (match(tok))
+            return Action::Match;
+        if (Token::simpleMatch(tok, ".") && analyzeLifetime(tok->astOperand1()) != Action::None)
+            return Action::Read;
+        if (astIsRHS(tok) && Token::simpleMatch(tok->astParent(), "."))
+            return analyzeLifetime(tok->astParent());
+        return Action::None;
+    }
+
+    std::unordered_map<nonneg int, const Token*> getSymbols(const Token* tok) const
+    {
+        std::unordered_map<nonneg int, const Token*> result;
+        if (!tok)
+            return result;
+        for (const ValueFlow::Value& v : tok->values()) {
+            if (!v.isSymbolicValue())
+                continue;
+            if (v.isImpossible())
+                continue;
+            if (!v.tokvalue)
+                continue;
+            if (v.tokvalue->exprId() == 0)
+                continue;
+            if (match(v.tokvalue))
+                continue;
+            result[v.tokvalue->exprId()] = v.tokvalue;
+        }
+        return result;
+    }
+
+    Action isGlobalModified(const Token* tok) const
+    {
+        if (tok->function()) {
+            if (!tok->function()->isConstexpr() && !isConstFunctionCall(tok, getSettings().library))
+                return Action::Invalid;
+        } else if (getSettings().library.getFunction(tok)) {
+            // Assume library function doesn't modify user-global variables
+            return Action::None;
+        } else if (Token::simpleMatch(tok->astParent(), ".") && astIsContainer(tok->astParent()->astOperand1())) {
+            // Assume container member function doesn't modify user-global variables
+            return Action::None;
+        } else if (tok->tokType() == Token::eType && astIsPrimitive(tok->next())) {
+            // Function cast does not modify global variables
+            return Action::None;
+        } else if (!tok->isKeyword() && Token::Match(tok, "%name% (")) {
+            return Action::Invalid;
+        }
+        return Action::None;
+    }
+
+    static const std::string& invertAssign(const std::string& assign)
+    {
+        static std::unordered_map<std::string, std::string> lookup = {{"=", "="},
+            {"+=", "-="},
+            {"-=", "+="},
+            {"*=", "/="},
+            {"/=", "*="},
+            {"<<=", ">>="},
+            {">>=", "<<="},
+            {"^=", "^="}};
+        auto it = lookup.find(assign);
+        if (it == lookup.end()) {
+            static const std::string s_empty_string;
+            return s_empty_string;
+        }
+        return it->second;
+    }
+
+    static const std::string& getAssign(const Token* tok, Direction d)
+    {
+        if (d == Direction::Forward)
+            return tok->str();
+        return invertAssign(tok->str());
+    }
+
+    template<class T, class U>
+    static void assignValueIfMutable(T& x, const U& y)
+    {
+        x = y;
+    }
+
+    template<class T, class U>
+    static void assignValueIfMutable(const T& /*unused*/, const U& /*unused*/)
+    {}
+
+    static std::string removeAssign(const std::string& assign) {
+        return std::string{assign.cbegin(), assign.cend() - 1};
+    }
+
+    template<class T, class U>
+    static T calculateAssign(const std::string& assign, const T& x, const U& y, bool* error = nullptr)
+    {
+        if (assign.empty() || assign.back() != '=') {
+            if (error)
+                *error = true;
+            return T{};
+        }
+        if (assign == "=")
+            return static_cast<T>(y);
+        return calculate<T, T>(removeAssign(assign), x, y, error);
+    }
+
+    template<class Value, REQUIRES("Value must ValueFlow::Value", std::is_convertible<Value&, const ValueFlow::Value&> )>
+    static bool evalAssignment(Value& lhsValue, const std::string& assign, const ValueFlow::Value& rhsValue)
+    {
+        bool error = false;
+        if (lhsValue.isSymbolicValue() && rhsValue.isIntValue()) {
+            if (assign != "+=" && assign != "-=")
+                return false;
+            assignValueIfMutable(lhsValue.intvalue, calculateAssign(assign, lhsValue.intvalue, rhsValue.intvalue, &error));
+        } else if (lhsValue.isIntValue() && rhsValue.isIntValue()) {
+            assignValueIfMutable(lhsValue.intvalue, calculateAssign(assign, lhsValue.intvalue, rhsValue.intvalue, &error));
+        } else if (lhsValue.isFloatValue() && rhsValue.isIntValue()) {
+            assignValueIfMutable(lhsValue.floatValue,
+                                 calculateAssign(assign, lhsValue.floatValue, rhsValue.intvalue, &error));
+        } else {
+            return false;
+        }
+        return !error;
+    }
+
+    const Token* findMatch(const Token* tok) const
+    {
+        return findAstNode(tok, [&](const Token* child) {
+            return match(child);
+        });
+    }
+
+    bool isSameSymbolicValue(const Token* tok, ValueFlow::Value* value = nullptr) const
+    {
+        if (!useSymbolicValues())
+            return false;
+        if (Token::Match(tok, "%assign%"))
+            return false;
+        const ValueFlow::Value* currValue = getValue(tok);
+        if (!currValue)
+            return false;
+        // If the same symbolic value is already there then skip
+        if (currValue->isSymbolicValue() &&
+            std::any_of(tok->values().cbegin(), tok->values().cend(), [&](const ValueFlow::Value& v) {
+            return v.isSymbolicValue() && currValue->equalValue(v);
+        }))
+            return false;
+        const bool isPoint = currValue->bound == ValueFlow::Value::Bound::Point && currValue->isIntValue();
+        const bool exact = !currValue->isIntValue() || currValue->isImpossible();
+        for (const ValueFlow::Value& v : tok->values()) {
+            if (!v.isSymbolicValue())
+                continue;
+            if (currValue->equalValue(v))
+                continue;
+            const bool toImpossible = v.isImpossible() && currValue->isKnown();
+            if (!v.isKnown() && !toImpossible)
+                continue;
+            if (exact && v.intvalue != 0 && !isPoint)
+                continue;
+            if (astIsUnsigned(tok) != astIsUnsigned(v.tokvalue))
+                continue;
+            std::vector<MathLib::bigint> r;
+            ValueFlow::Value::Bound bound = currValue->bound;
+            if (match(v.tokvalue)) {
+                r = {currValue->intvalue};
+            } else if (!exact && findMatch(v.tokvalue)) {
+                r = evaluate(Evaluate::Integral, v.tokvalue, tok);
+                if (bound == ValueFlow::Value::Bound::Point)
+                    bound = v.bound;
+            }
+            if (!r.empty()) {
+                if (value) {
+                    value->errorPath.insert(value->errorPath.end(), v.errorPath.cbegin(), v.errorPath.cend());
+                    value->intvalue = r.front() + v.intvalue;
+                    if (toImpossible)
+                        value->setImpossible();
+                    value->bound = bound;
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    Action analyzeMatch(const Token* tok, Direction d) const {
+        const Token* parent = tok->astParent();
+        if (d == Direction::Reverse && isGlobal() && !dependsOnThis() && Token::Match(parent, ". %name% (")) {
+            Action a = isGlobalModified(parent->next());
+            if (a != Action::None)
+                return a;
+        }
+        if ((astIsPointer(tok) || astIsSmartPointer(tok)) &&
+            (Token::Match(parent, "*|[") || (parent && parent->originalName() == "->")) && getIndirect(tok) <= 0)
+            return Action::Read;
+
+        Action w = isWritable(tok, d);
+        if (w != Action::None)
+            return w;
+
+        // Check for modifications by function calls
+        return isModified(tok);
+    }
+
+    Action analyzeToken(const Token* ref, const Token* tok, Direction d, bool inconclusiveRef) const {
+        if (!ref)
+            return Action::None;
+        // If its an inconclusiveRef then ref != tok
+        assert(!inconclusiveRef || ref != tok);
+        bool inconclusive = false;
+        if (match(ref)) {
+            if (inconclusiveRef) {
+                Action a = isModified(tok);
+                if (a.isModified() || a.isInconclusive())
+                    return Action::Inconclusive;
+            } else {
+                return analyzeMatch(tok, d) | Action::Match;
+            }
+        } else if (isDereferenceOp(ref) && !match(ref->astOperand1())) {
+            const Token* lifeTok = nullptr;
+            for (const ValueFlow::Value& v:ref->astOperand1()->values()) {
+                if (!v.isLocalLifetimeValue())
+                    continue;
+                if (v.conditional)
+                    continue;
+                if (lifeTok)
+                    return Action::None;
+                lifeTok = v.tokvalue;
+            }
+            if (!lifeTok)
+                return Action::None;
+            Action la = analyzeLifetime(lifeTok);
+            if (la.matches()) {
+                Action a = Action::Read;
+                if (isModified(tok).isModified())
+                    a = Action::Invalid;
+                if (Token::Match(tok->astParent(), "%assign%") && astIsLHS(tok))
+                    a |= Action::Invalid;
+                if (inconclusiveRef && a.isModified())
+                    return Action::Inconclusive;
+                return a;
+            }
+            if (la.isRead()) {
+                return isAliasModified(tok);
+            }
+            return Action::None;
+
+        } else if (isAlias(ref, inconclusive)) {
+            inconclusive |= inconclusiveRef;
+            Action a = isAliasModified(tok);
+            if (inconclusive && a.isModified())
+                return Action::Inconclusive;
+            return a;
+        }
+        if (isSameSymbolicValue(ref))
+            return Action::Read | Action::SymbolicMatch;
+
+        return Action::None;
+    }
+
+    Action analyze(const Token* tok, Direction d) const override {
+        if (invalid())
+            return Action::Invalid;
+        // Follow references
+        // 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;
+        }))
+            refs.emplace_back(ReferenceToken{tok, {}});
+        for (const ReferenceToken& ref:refs) {
+            Action a = analyzeToken(ref.token, tok, d, inconclusiveRefs && ref.token != tok);
+            if (internalMatch(ref.token))
+                a |= Action::Internal;
+            if (a != Action::None)
+                return a;
+        }
+        if (dependsOnThis() && exprDependsOnThis(tok, !isClassVariable()))
+            return isThisModified(tok);
+
+        // bailout: global non-const variables
+        if (isGlobal() && !dependsOnThis() && Token::Match(tok, "%name% (") && !tok->variable() &&
+            !Token::simpleMatch(tok->linkAt(1), ") {")) {
+            return isGlobalModified(tok);
+        }
+        return Action::None;
+    }
+
+    template<class F>
+    std::vector<MathLib::bigint> evaluateInt(const Token* tok, F getProgramMemory) const
+    {
+        if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT))
+            return {static_cast<int>(v->intvalue)};
+        std::vector<MathLib::bigint> result;
+        ProgramMemory pm = getProgramMemory();
+        if (Token::Match(tok, "&&|%oror%")) {
+            if (conditionIsTrue(tok, pm, getSettings()))
+                result.push_back(1);
+            if (conditionIsFalse(tok, std::move(pm), getSettings()))
+                result.push_back(0);
+        } else {
+            MathLib::bigint out = 0;
+            bool error = false;
+            execute(tok, pm, &out, &error, getSettings());
+            if (!error)
+                result.push_back(out);
+        }
+        return result;
+    }
+
+    std::vector<MathLib::bigint> evaluateInt(const Token* tok) const
+    {
+        return evaluateInt(tok, [&] {
+            return ProgramMemory{getProgramState()};
+        });
+    }
+
+    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());
+            });
+        }
+        if (e == Evaluate::ContainerEmpty) {
+            const ValueFlow::Value* value = ValueFlow::findValue(tok->values(), settings, [](const ValueFlow::Value& v) {
+                return v.isKnown() && v.isContainerSizeValue();
+            });
+            if (value)
+                return {value->intvalue == 0};
+            ProgramMemory pm = pms.get(tok, ctx, getProgramState());
+            MathLib::bigint out = 0;
+            if (pm.getContainerEmptyValue(tok->exprId(), out))
+                return {static_cast<int>(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);
+
+        bool isCondBlock = false;
+        const Token* parent = tok->astParent();
+        if (parent) {
+            isCondBlock = Token::Match(parent->previous(), "if|while (");
+        }
+
+        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());
+            }
+        }
+
+        if (!(flags & Assume::Quiet)) {
+            if (flags & Assume::ContainerEmpty) {
+                std::string s = state ? "empty" : "not empty";
+                addErrorPath(tok, "Assuming container is " + s);
+            } else {
+                std::string s = bool_to_string(state);
+                addErrorPath(tok, "Assuming condition is " + s);
+            }
+        }
+        if (!(flags & Assume::Absolute))
+            makeConditional();
+    }
+
+    void updateState(const Token* tok) override
+    {
+        // Update program state
+        pms.removeModifiedVars(tok);
+        pms.addState(tok, getProgramState());
+    }
+
+    void update(Token* tok, Action a, Direction d) override {
+        ValueFlow::Value* value = getValue(tok);
+        if (!value)
+            return;
+        ValueFlow::Value localValue;
+        if (a.isSymbolicMatch()) {
+            // Make a copy of the value to modify it
+            localValue = *value;
+            value = &localValue;
+            isSameSymbolicValue(tok, &localValue);
+        }
+        if (a.isInternal())
+            internalUpdate(tok, *value, d);
+        // Read first when moving forward
+        if (d == Direction::Forward && a.isRead())
+            setTokenValue(tok, *value, getSettings());
+        if (a.isInconclusive())
+            (void)lowerToInconclusive();
+        if (a.isWrite() && tok->astParent()) {
+            writeValue(value, tok, d);
+        }
+        // Read last when moving in reverse
+        if (d == Direction::Reverse && a.isRead())
+            setTokenValue(tok, *value, getSettings());
+    }
+
+    ValuePtr<Analyzer> reanalyze(Token* /*tok*/, const std::string& /*msg*/) const override {
+        return {};
+    }
+};
+
+static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, const Settings& settings, int depth = 20);
+
+static bool bifurcateVariableChanged(const Variable* var,
+                                     const std::set<nonneg int>& varids,
+                                     const Token* start,
+                                     const Token* end,
+                                     const Settings& settings,
+                                     int depth = 20)
+{
+    bool result = false;
+    const Token* tok = start;
+    while ((tok = findVariableChanged(
+                tok->next(), end, var->isPointer(), var->declarationId(), var->isGlobal(), settings))) {
+        if (Token::Match(tok->astParent(), "%assign%")) {
+            if (!bifurcate(tok->astParent()->astOperand2(), varids, settings, depth - 1))
+                return true;
+        } else {
+            result = true;
+        }
+    }
+    return result;
+}
+
+static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, const Settings& settings, int depth)
+{
+    if (depth < 0)
+        return false;
+    if (!tok)
+        return true;
+    if (tok->hasKnownIntValue())
+        return true;
+    if (tok->isConstOp())
+        return bifurcate(tok->astOperand1(), varids, settings, depth) && bifurcate(tok->astOperand2(), varids, settings, depth);
+    if (tok->varId() != 0) {
+        if (varids.count(tok->varId()) > 0)
+            return true;
+        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;
+        if (start->strAt(-1) == ")" || start->strAt(-1) == "}")
+            return false;
+        if (Token::Match(start, "; %varid% =", var->declarationId()))
+            start = start->tokAt(2);
+        if (var->isConst() || !bifurcateVariableChanged(var, varids, start, tok, settings, depth))
+            return var->isArgument() || bifurcate(start->astOperand2(), varids, settings, depth - 1);
+        return false;
+    }
+    return false;
+}
+
+// Check if its an alias of the variable or is being aliased to this variable
+template<typename V>
+static bool isAliasOf(const Variable * var, const Token *tok, nonneg int varid, const V& values, bool* inconclusive = nullptr)
+{
+    if (tok->varId() == varid)
+        return false;
+    if (tok->varId() == 0)
+        return false;
+    if (isAliasOf(tok, varid, inconclusive))
+        return true;
+    if (var && !var->isPointer())
+        return false;
+    // Search through non value aliases
+    return std::any_of(values.begin(), values.end(), [&](const ValueFlow::Value& val) {
+        if (!val.isNonValue())
+            return false;
+        if (val.isInconclusive())
+            return false;
+        if (val.isLifetimeValue() && !val.isLocalLifetimeValue())
+            return false;
+        if (val.isLifetimeValue() && val.lifetimeKind != ValueFlow::Value::LifetimeKind::Address)
+            return false;
+        if (!Token::Match(val.tokvalue, ".|&|*|%var%"))
+            return false;
+        return astHasVar(val.tokvalue, tok->varId());
+    });
+}
+
+struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
+    class SelectValueFromVarIdMapRange {
+        using M = std::unordered_map<nonneg int, ValueFlow::Value>;
+
+        struct Iterator {
+            using iterator_category = std::forward_iterator_tag;
+            using value_type = const ValueFlow::Value;
+            using pointer = value_type *;
+            using reference = value_type &;
+            using difference_type = std::ptrdiff_t;
+
+            explicit Iterator(const M::const_iterator & it)
+                : mIt(it) {}
+
+            reference operator*() const {
+                return mIt->second;
+            }
+
+            pointer operator->() const {
+                return &mIt->second;
+            }
+
+            Iterator &operator++() {
+                // cppcheck-suppress postfixOperator - forward iterator needs to perform post-increment
+                mIt++;
+                return *this;
+            }
+
+            friend bool operator==(const Iterator &a, const Iterator &b) {
+                return a.mIt == b.mIt;
+            }
+
+            friend bool operator!=(const Iterator &a, const Iterator &b) {
+                return a.mIt != b.mIt;
+            }
+
+        private:
+            M::const_iterator mIt;
+        };
+
+    public:
+        explicit SelectValueFromVarIdMapRange(const M *m)
+            : mMap(m) {}
+
+        Iterator begin() const {
+            return Iterator(mMap->begin());
+        }
+        Iterator end() const {
+            return Iterator(mMap->end());
+        }
+
+    private:
+        const M *mMap;
+    };
+
+    std::unordered_map<nonneg int, ValueFlow::Value> values;
+    std::unordered_map<nonneg int, const Variable*> vars;
+
+    MultiValueFlowAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const Settings& set)
+        : ValueFlowAnalyzer(set) {
+        for (const auto& p:args) {
+            const auto declId = p.first->declarationId();
+            if (declId == 0)
+                continue; // TODO: should never happen?
+            values[declId] = p.second;
+            vars[declId] = p.first;
+        }
+    }
+
+    virtual const std::unordered_map<nonneg int, const Variable*>& getVars() const {
+        return vars;
+    }
+
+    const ValueFlow::Value* getValue(const Token* tok) const override {
+        if (tok->varId() == 0)
+            return nullptr;
+        auto it = values.find(tok->varId());
+        if (it == values.end())
+            return nullptr;
+        return &it->second;
+    }
+    ValueFlow::Value* getValue(const Token* tok) override {
+        if (tok->varId() == 0)
+            return nullptr;
+        auto it = values.find(tok->varId());
+        if (it == values.end())
+            return nullptr;
+        return &it->second;
+    }
+
+    void makeConditional() override {
+        for (auto&& p:values) {
+            p.second.conditional = true;
+        }
+    }
+
+    void addErrorPath(const Token* tok, const std::string& s) override {
+        for (auto&& p:values) {
+            p.second.errorPath.emplace_back(tok, s);
+        }
+    }
+
+    bool isAlias(const Token* tok, bool& inconclusive) const override {
+        const auto range = SelectValueFromVarIdMapRange(&values);
+
+        for (const auto& p:getVars()) {
+            nonneg int const varid = p.first;
+            const Variable* var = p.second;
+            if (tok->varId() == varid)
+                return true;
+            if (isAliasOf(var, tok, varid, range, &inconclusive))
+                return true;
+        }
+        return false;
+    }
+
+    bool lowerToPossible() override {
+        for (auto&& p:values) {
+            if (p.second.isImpossible())
+                return false;
+            p.second.changeKnownToPossible();
+        }
+        return true;
+    }
+    bool lowerToInconclusive() override {
+        for (auto&& p:values) {
+            if (p.second.isImpossible())
+                return false;
+            p.second.setInconclusive();
+        }
+        return true;
+    }
+
+    bool isConditional() const override {
+        for (auto&& p:values) {
+            if (p.second.conditional)
+                return true;
+            if (p.second.condition)
+                return !p.second.isImpossible();
+        }
+        return false;
+    }
+
+    bool stopOnCondition(const Token* condTok) const override {
+        if (isConditional())
+            return true;
+        if (!condTok->hasKnownIntValue() && values.count(condTok->varId()) == 0) {
+            const auto& values_ = condTok->values();
+            return std::any_of(values_.cbegin(), values_.cend(), [](const ValueFlow::Value& v) {
+                return v.isSymbolicValue() && Token::Match(v.tokvalue, "%oror%|&&");
+            });
+        }
+        return false;
+    }
+
+    bool updateScope(const Token* endBlock, bool /*modified*/) const override {
+        const Scope* scope = endBlock->scope();
+        if (!scope)
+            return false;
+        if (scope->type == ScopeType::eLambda) {
+            return std::all_of(values.cbegin(), values.cend(), [](const std::pair<nonneg int, ValueFlow::Value>& p) {
+                return p.second.isLifetimeValue();
+            });
+        }
+        if (scope->type == ScopeType::eIf || scope->type == ScopeType::eElse || scope->type == ScopeType::eWhile ||
+            scope->type == ScopeType::eFor) {
+            auto pred = [](const ValueFlow::Value& value) {
+                if (value.isKnown())
+                    return true;
+                if (value.isImpossible())
+                    return true;
+                if (value.isLifetimeValue())
+                    return true;
+                return false;
+            };
+            if (std::all_of(values.cbegin(), values.cend(), std::bind(pred, std::bind(SelectMapValues{}, std::placeholders::_1))))
+                return true;
+            if (isConditional())
+                return false;
+            const Token* condTok = getCondTokFromEnd(endBlock);
+            std::set<nonneg int> varids;
+            std::transform(getVars().cbegin(), getVars().cend(), std::inserter(varids, varids.begin()), SelectMapKeys{});
+            return bifurcate(condTok, varids, getSettings());
+        }
+
+        return false;
+    }
+
+    bool match(const Token* tok) const override {
+        return values.count(tok->varId()) > 0;
+    }
+
+    ProgramState getProgramState() const override {
+        ProgramState ps;
+        for (const auto& p : values) {
+            const Variable* var = vars.at(p.first);
+            if (!var)
+                continue;
+            assert(var->nameToken());
+            ps[var->nameToken()] = p.second;
+        }
+        return ps;
+    }
+};
+
+ValuePtr<Analyzer> makeMultiValueFlowAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const Settings& settings)
+{
+    return MultiValueFlowAnalyzer{args, settings};
+}
+
+struct SingleValueFlowAnalyzer : ValueFlowAnalyzer {
+    std::unordered_map<nonneg int, const Variable*> varids;
+    std::unordered_map<nonneg int, const Variable*> aliases;
+    ValueFlow::Value value;
+
+    SingleValueFlowAnalyzer(ValueFlow::Value v, const Settings& s) : ValueFlowAnalyzer(s), value(std::move(v)) {}
+
+    const std::unordered_map<nonneg int, const Variable*>& getVars() const {
+        return varids;
+    }
+
+    const std::unordered_map<nonneg int, const Variable*>& getAliasedVars() const {
+        return aliases;
+    }
+
+    const ValueFlow::Value* getValue(const Token* /*tok*/) const override {
+        return &value;
+    }
+    ValueFlow::Value* getValue(const Token* /*tok*/) override {
+        return &value;
+    }
+
+    void makeConditional() override {
+        value.conditional = true;
+    }
+
+    bool useSymbolicValues() const override
+    {
+        if (value.isUninitValue())
+            return false;
+        if (value.isLifetimeValue())
+            return false;
+        return true;
+    }
+
+    void addErrorPath(const Token* tok, const std::string& s) override {
+        value.errorPath.emplace_back(tok, s);
+    }
+
+    template<class T>
+    struct SingleRange {
+        T* x;
+        T* begin() const {
+            return x;
+        }
+        T* end() const {
+            return x+1;
+        }
+    };
+
+    template<class T>
+    static SingleRange<T> MakeSingleRange(T& x)
+    {
+        return {&x};
+    }
+
+    bool isAlias(const Token* tok, bool& inconclusive) const override {
+        if (value.isLifetimeValue())
+            return false;
+        for (const auto& m: {
+            std::ref(getVars()), std::ref(getAliasedVars())
+        }) {
+            for (const auto& p:m.get()) {
+                nonneg int const varid = p.first;
+                const Variable* var = p.second;
+                if (tok->varId() == varid)
+                    return true;
+                if (isAliasOf(var, tok, varid, MakeSingleRange(value), &inconclusive))
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    bool isGlobal() const override {
+        const auto& vars = getVars();
+        return std::any_of(vars.cbegin(), vars.cend(), [] (const std::pair<nonneg int, const Variable*>& p) {
+            const Variable* var = p.second;
+            return !var->isLocal() && !var->isArgument() && !var->isConst();
+        });
+    }
+
+    bool lowerToPossible() override {
+        if (value.isImpossible())
+            return false;
+        value.changeKnownToPossible();
+        return true;
+    }
+    bool lowerToInconclusive() override {
+        if (value.isImpossible())
+            return false;
+        value.setInconclusive();
+        return true;
+    }
+
+    bool isConditional() const override {
+        if (value.conditional)
+            return true;
+        if (value.condition)
+            return !value.isKnown() && !value.isImpossible();
+        return false;
+    }
+
+    bool stopOnCondition(const Token* condTok) const override
+    {
+        if (value.isNonValue())
+            return false;
+        if (value.isImpossible())
+            return false;
+        if (isConditional() && !value.isKnown() && !value.isImpossible())
+            return true;
+        if (value.isSymbolicValue())
+            return false;
+        ConditionState cs = analyzeCondition(condTok);
+        return cs.isUnknownDependent();
+    }
+
+    bool updateScope(const Token* endBlock, bool /*modified*/) const override {
+        const Scope* scope = endBlock->scope();
+        if (!scope)
+            return false;
+        if (scope->type == ScopeType::eLambda)
+            return value.isLifetimeValue();
+        if (scope->type == ScopeType::eIf || scope->type == ScopeType::eElse || scope->type == ScopeType::eWhile ||
+            scope->type == ScopeType::eFor) {
+            if (value.isKnown() || value.isImpossible())
+                return true;
+            if (value.isLifetimeValue())
+                return true;
+            if (isConditional())
+                return false;
+            const Token* condTok = getCondTokFromEnd(endBlock);
+            std::set<nonneg int> varids2;
+            std::transform(getVars().cbegin(), getVars().cend(), std::inserter(varids2, varids2.begin()), SelectMapKeys{});
+            return bifurcate(condTok, varids2, getSettings());
+        }
+
+        return false;
+    }
+
+    ValuePtr<Analyzer> reanalyze(Token* tok, const std::string& msg) const override {
+        ValueFlow::Value newValue = value;
+        newValue.errorPath.emplace_back(tok, msg);
+        return makeAnalyzer(tok, std::move(newValue), settings);
+    }
+};
+
+struct ExpressionAnalyzer : SingleValueFlowAnalyzer {
+    const Token* expr;
+    bool local = true;
+    bool unknown{};
+    bool dependOnThis{};
+    bool uniqueExprId{};
+
+    ExpressionAnalyzer(const Token* e, ValueFlow::Value val, const Settings& s)
+        : SingleValueFlowAnalyzer(std::move(val), s),
+        expr(e)
+    {
+
+        assert(e && e->exprId() != 0 && "Not a valid expression");
+        dependOnThis = exprDependsOnThis(expr);
+        setupExprVarIds(expr);
+        if (value.isSymbolicValue()) {
+            dependOnThis |= exprDependsOnThis(value.tokvalue);
+            setupExprVarIds(value.tokvalue);
+        }
+        uniqueExprId =
+            expr->isUniqueExprId() && (Token::Match(expr, "%cop%") || !isVariableChanged(expr, 0, s));
+    }
+
+    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();
+    }
+
+    void setupExprVarIds(const Token* start, int depth = 0) {
+        if (depth > settings.vfOptions.maxExprVarIdDepth) {
+            // TODO: add bailout message
+            return;
+        }
+        visitAstNodes(start, [&](const Token* tok) {
+            const bool top = depth == 0 && tok == start;
+            const bool ispointer = astIsPointer(tok) || astIsSmartPointer(tok) || astIsIterator(tok);
+            if (!top || !ispointer || value.indirect != 0) {
+                for (const ValueFlow::Value& v : tok->values()) {
+                    if (!(v.isLocalLifetimeValue() || (ispointer && v.isSymbolicValue() && v.isKnown())))
+                        continue;
+                    if (!v.tokvalue)
+                        continue;
+                    if (v.tokvalue == tok)
+                        continue;
+                    setupExprVarIds(v.tokvalue, depth + 1);
+                }
+            }
+            if (depth == 0 && tok->isIncompleteVar()) {
+                // TODO: Treat incomplete var as global, but we need to update
+                // the alias variables to just expr ids instead of requiring
+                // Variable
+                unknown = true;
+                return ChildrenToVisit::none;
+            }
+            if (tok->varId() > 0) {
+                varids[tok->varId()] = tok->variable();
+                if (!Token::simpleMatch(tok->previous(), ".")) {
+                    const Variable* var = tok->variable();
+                    if (var && var->isReference() && var->isLocal() && Token::Match(var->nameToken(), "%var% [=(]") &&
+                        !isGlobalData(var->nameToken()->next()->astOperand2()))
+                        return ChildrenToVisit::none;
+                    const bool deref = tok->astParent() &&
+                                       (tok->astParent()->isUnaryOp("*") ||
+                                        (tok->astParent()->str() == "[" && tok == tok->astParent()->astOperand1()));
+                    local &= !nonLocal(tok->variable(), deref);
+                }
+            }
+            return ChildrenToVisit::op1_and_op2;
+        });
+    }
+
+    virtual bool skipUniqueExprIds() const {
+        return true;
+    }
+
+    bool invalid() const override {
+        if (skipUniqueExprIds() && uniqueExprId)
+            return true;
+        return unknown;
+    }
+
+    ProgramState getProgramState() const override {
+        ProgramState ps;
+        ps[expr] = value;
+        return ps;
+    }
+
+    bool match(const Token* tok) const override {
+        return tok->exprId() == expr->exprId();
+    }
+
+    bool dependsOnThis() const override {
+        return dependOnThis;
+    }
+
+    bool isGlobal() const override {
+        return !local;
+    }
+
+    bool isClassVariable() const override
+    {
+        if (expr->variable()) {
+            const Variable* var = expr->variable();
+            return !var->isLocal() && !var->isArgument() && !var->isStatic() && !var->isGlobal();
+        }
+        return expr->varId() > 0;
+    }
+
+    Action isAliasModified(const Token* tok, int indirect) const override {
+        if (value.isSymbolicValue() && tok->exprId() == value.tokvalue->exprId())
+            indirect = 0;
+        return SingleValueFlowAnalyzer::isAliasModified(tok, indirect);
+    }
+};
+
+struct SameExpressionAnalyzer : ExpressionAnalyzer {
+    SameExpressionAnalyzer(const Token* e, ValueFlow::Value val, const Settings& s)
+        : ExpressionAnalyzer(e, std::move(val), s)
+    {}
+
+    bool skipUniqueExprIds() const override {
+        return false;
+    }
+
+    bool match(const Token* tok) const override
+    {
+        return isSameExpression(true, expr, tok, getSettings(), true, true);
+    }
+};
+
+ValuePtr<Analyzer> makeSameExpressionAnalyzer(const Token* e, ValueFlow::Value val, const Settings& s)
+{
+    return SameExpressionAnalyzer{e, std::move(val), s};
+}
+
+struct OppositeExpressionAnalyzer : ExpressionAnalyzer {
+    bool isNot{};
+
+    OppositeExpressionAnalyzer(bool pIsNot, const Token* e, ValueFlow::Value val, const Settings& s)
+        : ExpressionAnalyzer(e, std::move(val), s), isNot(pIsNot)
+    {}
+
+    bool skipUniqueExprIds() const override {
+        return false;
+    }
+
+    bool match(const Token* tok) const override {
+        return isOppositeCond(isNot, expr, tok, getSettings(), true, true);
+    }
+};
+
+ValuePtr<Analyzer> makeOppositeExpressionAnalyzer(bool pIsNot, const Token* e, ValueFlow::Value val, const Settings& s)
+{
+    return OppositeExpressionAnalyzer{pIsNot, e, std::move(val), s};
+}
+
+struct SubExpressionAnalyzer : ExpressionAnalyzer {
+    using PartialReadContainer = std::vector<std::pair<Token *, ValueFlow::Value>>;
+    // A shared_ptr is used so partial reads can be captured even after forking
+    std::shared_ptr<PartialReadContainer> partialReads;
+
+    SubExpressionAnalyzer(const Token* e, ValueFlow::Value val, const Settings& s)
+        : ExpressionAnalyzer(e, std::move(val), s), partialReads(std::make_shared<PartialReadContainer>())
+    {}
+
+    SubExpressionAnalyzer(const Token* e, ValueFlow::Value val, const std::shared_ptr<PartialReadContainer>& p, const Settings& s)
+        : ExpressionAnalyzer(e, std::move(val), s), partialReads(p)
+    {}
+
+    virtual bool submatch(const Token* tok, bool exact = true) const = 0;
+
+    bool isAlias(const Token* tok, bool& inconclusive) const override
+    {
+        if (tok->exprId() == expr->exprId() && tok->astParent() && submatch(tok->astParent(), false))
+            return false;
+        return ExpressionAnalyzer::isAlias(tok, inconclusive);
+    }
+
+    bool match(const Token* tok) const override
+    {
+        return tok->astOperand1() && tok->astOperand1()->exprId() == expr->exprId() && submatch(tok);
+    }
+    bool internalMatch(const Token* tok) const override
+    {
+        return tok->exprId() == expr->exprId() && !(astIsLHS(tok) && submatch(tok->astParent(), false));
+    }
+    void internalUpdate(Token* tok, const ValueFlow::Value& v, Direction /*d*/) override
+    {
+        partialReads->emplace_back(tok, v);
+    }
+
+    // No reanalysis for subexpression
+    ValuePtr<Analyzer> reanalyze(Token* /*tok*/, const std::string& /*msg*/) const override {
+        return {};
+    }
+};
+
+struct MemberExpressionAnalyzer : SubExpressionAnalyzer {
+    std::string varname;
+
+    MemberExpressionAnalyzer(std::string varname, const Token* e, ValueFlow::Value val, const std::shared_ptr<PartialReadContainer>& p, const Settings& s)
+        : SubExpressionAnalyzer(e, std::move(val), p, s), varname(std::move(varname))
+    {}
+
+    bool submatch(const Token* tok, bool exact) const override
+    {
+        if (!Token::Match(tok, ". %var%"))
+            return false;
+        if (!exact)
+            return true;
+        return tok->strAt(1) == varname;
+    }
+};
+
+ValuePtr<Analyzer> makeMemberExpressionAnalyzer(std::string varname, const Token* e, ValueFlow::Value val, const std::shared_ptr<PartialReadContainer>& p, const Settings& s)
+{
+    return MemberExpressionAnalyzer{std::move(varname), e, std::move(val), p, s};
+}
+
+struct ContainerExpressionAnalyzer : ExpressionAnalyzer {
+    ContainerExpressionAnalyzer(const Token* expr, ValueFlow::Value val, const Settings& s)
+        : ExpressionAnalyzer(expr, std::move(val), s)
+    {}
+
+    bool match(const Token* tok) const override {
+        return tok->exprId() == expr->exprId() || (astIsIterator(tok) && isAliasOf(tok, expr->exprId()));
+    }
+
+    Action isWritable(const Token* tok, Direction /*d*/) const override
+    {
+        if (astIsIterator(tok))
+            return Action::None;
+        if (!getValue(tok))
+            return Action::None;
+        if (!tok->valueType())
+            return Action::None;
+        if (!astIsContainer(tok))
+            return Action::None;
+        const Token* parent = tok->astParent();
+        const Library::Container* container = getLibraryContainer(tok);
+
+        if (container->stdStringLike && Token::simpleMatch(parent, "+=") && astIsLHS(tok) && parent->astOperand2()) {
+            const Token* rhs = parent->astOperand2();
+            if (rhs->tokType() == Token::eString)
+                return Action::Read | Action::Write | Action::Incremental;
+            const Library::Container* rhsContainer = getLibraryContainer(rhs);
+            if (rhsContainer && rhsContainer->stdStringLike) {
+                if (std::any_of(rhs->values().cbegin(), rhs->values().cend(), [&](const ValueFlow::Value &rhsval) {
+                    return rhsval.isKnown() && rhsval.isContainerSizeValue();
+                }))
+                    return Action::Read | Action::Write | Action::Incremental;
+            }
+        } else if (astIsLHS(tok) && Token::Match(tok->astParent(), ". %name% (")) {
+            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));
+                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;
+            }
+        }
+        return Action::None;
+    }
+
+    void writeValue(ValueFlow::Value* val, const Token* tok, Direction d) const override {
+        if (!val)
+            return;
+        if (!tok->astParent())
+            return;
+        if (!tok->valueType())
+            return;
+        if (!astIsContainer(tok))
+            return;
+        const Token* parent = tok->astParent();
+        const Library::Container* container = getLibraryContainer(tok);
+        MathLib::bigint n = 0;
+
+        if (container->stdStringLike && Token::simpleMatch(parent, "+=") && parent->astOperand2()) {
+            const Token* rhs = parent->astOperand2();
+            const Library::Container* rhsContainer = getLibraryContainer(rhs);
+            if (rhs->tokType() == Token::eString)
+                n = Token::getStrLength(rhs);
+            else if (rhsContainer && rhsContainer->stdStringLike) {
+                auto it = std::find_if(rhs->values().begin(), rhs->values().end(), [&](const ValueFlow::Value& rhsval) {
+                    return rhsval.isKnown() && rhsval.isContainerSizeValue();
+                });
+                if (it != rhs->values().end())
+                    n = it->intvalue;
+            }
+        } else if (astIsLHS(tok) && Token::Match(tok->astParent(), ". %name% (")) {
+            const Library::Container::Action action = container->getAction(tok->astParent()->strAt(1));
+            switch (action) {
+            case Library::Container::Action::PUSH:
+                n = 1;
+                break;
+            case Library::Container::Action::POP:
+                n = -1;
+                break;
+            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));
+                if (n == 0) // TODO: handle known empty append
+                    val->setPossible();
+                break;
+            }
+            default:
+                break;
+            }
+        }
+        if (d == Direction::Reverse)
+            val->intvalue -= n;
+        else
+            val->intvalue += n;
+    }
+
+    int getIndirect(const Token* tok) const override
+    {
+        if (tok->valueType()) {
+            return tok->valueType()->pointer;
+        }
+        return ValueFlowAnalyzer::getIndirect(tok);
+    }
+
+    Action isModified(const Token* tok) const override {
+        // An iterator won't change the container size
+        if (astIsIterator(tok))
+            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 Action::Read | Action::Invalid;
+        return Action::Read;
+    }
+};
+
+static const Token* solveExprValue(const Token* expr, ValueFlow::Value& value)
+{
+    return ValueFlow::solveExprValue(
+        expr,
+        [](const Token* tok) -> std::vector<MathLib::bigint> {
+        if (const ValueFlow::Value* v = tok->getKnownValue(ValueFlow::Value::ValueType::INT))
+            return {v->intvalue};
+        return {};
+    },
+        value);
+}
+
+ValuePtr<Analyzer> makeAnalyzer(const Token* exprTok, ValueFlow::Value value, const Settings& settings)
+{
+    if (value.isContainerSizeValue())
+        return ContainerExpressionAnalyzer(exprTok, std::move(value), settings);
+    const Token* expr = solveExprValue(exprTok, value);
+    return ExpressionAnalyzer(expr, std::move(value), settings);
+}
+
+ValuePtr<Analyzer> makeReverseAnalyzer(const Token* exprTok, ValueFlow::Value value, const Settings& settings)
+{
+    if (value.isContainerSizeValue())
+        return ContainerExpressionAnalyzer(exprTok, std::move(value), settings);
+    return ExpressionAnalyzer(exprTok, std::move(value), settings);
+}
diff --git a/lib/vf_analyzers.h b/lib/vf_analyzers.h
new file mode 100644
index 00000000000..e9b4b92a753
--- /dev/null
+++ b/lib/vf_analyzers.h
@@ -0,0 +1,51 @@
+/* -*- 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 vfAnalyzers
+#define vfAnalyzers
+
+#include "analyzer.h"
+#include "valueptr.h"
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+class Token;
+class Variable;
+class Settings;
+namespace ValueFlow {
+    class Value;
+}
+
+ValuePtr<Analyzer> makeMultiValueFlowAnalyzer(const std::unordered_map<const Variable*, ValueFlow::Value>& args, const Settings& settings);
+
+ValuePtr<Analyzer> makeSameExpressionAnalyzer(const Token* e, ValueFlow::Value val, const Settings& s);
+
+ValuePtr<Analyzer> makeOppositeExpressionAnalyzer(bool pIsNot, const Token* e, ValueFlow::Value val, const Settings& s);
+
+using PartialReadContainer = std::vector<std::pair<Token *, ValueFlow::Value>>;
+ValuePtr<Analyzer> makeMemberExpressionAnalyzer(std::string varname, const Token* e, ValueFlow::Value val, const std::shared_ptr<PartialReadContainer>& p, const Settings& s);
+
+ValuePtr<Analyzer> makeAnalyzer(const Token* exprTok, ValueFlow::Value value, const Settings& settings);
+
+ValuePtr<Analyzer> makeReverseAnalyzer(const Token* exprTok, ValueFlow::Value value, const Settings& settings);
+
+#endif // vfAnalyzers
diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
new file mode 100644
index 00000000000..333f850d07d
--- /dev/null
+++ b/lib/vf_common.cpp
@@ -0,0 +1,403 @@
+/*
+ * 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 "vf_common.h"
+
+#include "astutils.h"
+#include "mathlib.h"
+#include "path.h"
+#include "platform.h"
+#include "settings.h"
+#include "standards.h"
+#include "symboldatabase.h"
+#include "token.h"
+#include "vfvalue.h"
+
+#include "vf_settokenvalue.h"
+
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
+#include <limits>
+#include <utility>
+#include <vector>
+
+namespace ValueFlow
+{
+    bool getMinMaxValues(const ValueType *vt, const Platform &platform, MathLib::bigint &minValue, MathLib::bigint &maxValue)
+    {
+        if (!vt || !vt->isIntegral() || vt->pointer)
+            return false;
+
+        std::uint8_t bits;
+        switch (vt->type) {
+        case ValueType::Type::BOOL:
+            bits = 1;
+            break;
+        case ValueType::Type::CHAR:
+            bits = platform.char_bit;
+            break;
+        case ValueType::Type::SHORT:
+            bits = platform.short_bit;
+            break;
+        case ValueType::Type::INT:
+            bits = platform.int_bit;
+            break;
+        case ValueType::Type::LONG:
+            bits = platform.long_bit;
+            break;
+        case ValueType::Type::LONGLONG:
+            bits = platform.long_long_bit;
+            break;
+        default:
+            return false;
+        }
+
+        if (bits == 1) {
+            minValue = 0;
+            maxValue = 1;
+        } else if (bits < 62) {
+            if (vt->sign == ValueType::Sign::UNSIGNED) {
+                minValue = 0;
+                maxValue = (1LL << bits) - 1;
+            } else {
+                minValue = -(1LL << (bits - 1));
+                maxValue = (1LL << (bits - 1)) - 1;
+            }
+        } else if (bits == 64) {
+            if (vt->sign == ValueType::Sign::UNSIGNED) {
+                minValue = 0;
+                maxValue = LLONG_MAX; // todo max unsigned value
+            } else {
+                minValue = LLONG_MIN;
+                maxValue = LLONG_MAX;
+            }
+        } else {
+            return false;
+        }
+
+        return true;
+    }
+
+    MathLib::bigint truncateIntValue(MathLib::bigint value, size_t value_size, const ValueType::Sign dst_sign)
+    {
+        if (value_size == 0)
+            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);
+        value &= unsignedMaxValue;
+        if (dst_sign == ValueType::Sign::SIGNED && (value & signBit))
+            value |= ~unsignedMaxValue;
+
+        return value;
+    }
+
+    static nonneg int getSizeOfType(const Token *typeTok, const Settings &settings)
+    {
+        const ValueType &valueType = ValueType::parseDecl(typeTok, settings);
+
+        return valueType.getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+    }
+
+    // Handle various constants..
+    Token * valueFlowSetConstantValue(Token *tok, const Settings &settings)
+    {
+        if ((tok->isNumber() && MathLib::isInt(tok->str())) || (tok->tokType() == Token::eChar)) {
+            try {
+                MathLib::bigint signedValue = MathLib::toBigNumber(tok);
+                const ValueType* vt = tok->valueType();
+                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;
+                }
+                Value value(signedValue);
+                if (!tok->isTemplateArg())
+                    value.setKnown();
+                setTokenValue(tok, std::move(value), settings);
+            } catch (const std::exception & /*e*/) {
+                // Bad character literal
+            }
+        } else if (tok->isNumber() && MathLib::isFloat(tok->str())) {
+            Value value;
+            value.valueType = Value::ValueType::FLOAT;
+            value.floatValue = MathLib::toDoubleNumber(tok);
+            if (!tok->isTemplateArg())
+                value.setKnown();
+            setTokenValue(tok, std::move(value), settings);
+        } else if (tok->enumerator() && tok->enumerator()->value_known) {
+            Value value(tok->enumerator()->value);
+            if (!tok->isTemplateArg())
+                value.setKnown();
+            setTokenValue(tok, std::move(value), settings);
+        } 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 (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 = tok->next()->astOperand2()->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                if (sz) {
+                    Value value(sz);
+                    value.setKnown();
+                    setTokenValue(tok->next(), std::move(value), settings);
+                    return tok->linkAt(1);
+                }
+            }
+
+            const Token *tok2 = tok->tokAt(2);
+            // skip over tokens to find variable or type
+            while (tok2 && !tok2->isStandardType() && Token::Match(tok2, "%name% ::|.|[")) {
+                if (tok2->strAt(1) == "[")
+                    tok2 = tok2->linkAt(1)->next();
+                else
+                    tok2 = tok2->tokAt(2);
+            }
+            if (Token::simpleMatch(tok, "sizeof ( *")) {
+                const ValueType *vt = tok->tokAt(2)->valueType();
+                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)
+                        value.setKnown();
+                    setTokenValue(tok->next(), std::move(value), settings);
+                }
+            } else if (tok2->enumerator() && tok2->enumerator()->scope) {
+                long long size = settings.platform.sizeof_int;
+                const Token * type = tok2->enumerator()->scope->enumType;
+                if (type) {
+                    size = getSizeOfType(type, settings);
+                    if (size == 0)
+                        tok->linkAt(1);
+                }
+                Value value(size);
+                if (!tok2->isTemplateArg() && settings.platform.type != Platform::Type::Unspecified)
+                    value.setKnown();
+                setTokenValue(tok, value, settings);
+                setTokenValue(tok->next(), std::move(value), settings);
+            } else if (tok2->type() && tok2->type()->isEnumType()) {
+                long long size = settings.platform.sizeof_int;
+                if (tok2->type()->classScope) {
+                    const Token * type = tok2->type()->classScope->enumType;
+                    if (type) {
+                        size = getSizeOfType(type, settings);
+                    }
+                }
+                Value value(size);
+                if (!tok2->isTemplateArg() && settings.platform.type != Platform::Type::Unspecified)
+                    value.setKnown();
+                setTokenValue(tok, value, settings);
+                setTokenValue(tok->next(), std::move(value), settings);
+            } else if (Token::Match(tok, "sizeof ( %var% ) /") && tok->next()->astParent() == tok->tokAt(4) &&
+                       tok->tokAt(4)->astOperand2() && Token::simpleMatch(tok->tokAt(4)->astOperand2()->previous(), "sizeof (")) {
+                // Get number of elements in array
+                const Token *sz1 = tok->tokAt(2);
+                const Token *sz2 = tok->tokAt(4)->astOperand2(); // left parenthesis of sizeof on rhs
+                const nonneg int varid1 = sz1->varId();
+                if (varid1 &&
+                    sz1->variable() &&
+                    sz1->variable()->isArray() &&
+                    !sz1->variable()->dimensions().empty() &&
+                    sz1->variable()->dimensionKnown(0) &&
+                    Token::Match(sz2->astOperand2(), "*|[") && Token::Match(sz2->astOperand2()->astOperand1(), "%varid%", varid1)) {
+                    Value value(sz1->variable()->dimension(0));
+                    if (!tok2->isTemplateArg() && settings.platform.type != Platform::Type::Unspecified)
+                        value.setKnown();
+                    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()) {
+                    // find the size of the type
+                    size_t size = 0;
+                    if (var->isEnumType()) {
+                        size = settings.platform.sizeof_int;
+                        if (var->type()->classScope && var->type()->classScope->enumType)
+                            size = getSizeOfType(var->type()->classScope->enumType, settings);
+                    } else if (var->valueType()) {
+                        size = var->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
+                    } else if (!var->type()) {
+                        size = getSizeOfType(var->typeStartToken(), settings);
+                    }
+                    // find the number of elements
+                    size_t count = 1;
+                    for (size_t i = 0; i < var->dimensions().size(); ++i) {
+                        if (var->dimensionKnown(i))
+                            count *= var->dimension(i);
+                        else
+                            count = 0;
+                    }
+                    if (size && count > 0) {
+                        Value value(count * size);
+                        if (settings.platform.type != Platform::Type::Unspecified)
+                            value.setKnown();
+                        setTokenValue(tok, value, settings);
+                        setTokenValue(tok->next(), std::move(value), settings);
+                    }
+                }
+            } else if (tok2->tokType() == Token::eString) {
+                const size_t sz = Token::getStrSize(tok2, settings);
+                if (sz > 0) {
+                    Value value(sz);
+                    value.setKnown();
+                    setTokenValue(tok->next(), std::move(value), settings);
+                }
+            } else if (tok2->tokType() == Token::eChar) {
+                nonneg int sz = 0;
+                if (tok2->isCpp() && settings.standards.cpp >= Standards::CPP20 && tok2->isUtf8())
+                    sz = 1;
+                else if (tok2->isUtf16())
+                    sz = 2;
+                else if (tok2->isUtf32())
+                    sz = 4;
+                else if (tok2->isLong())
+                    sz = settings.platform.sizeof_wchar_t;
+                else if ((!tok2->isCpp() && tok2->isCChar()) || (tok2->isCMultiChar()))
+                    sz = settings.platform.sizeof_int;
+                else
+                    sz = 1;
+
+                if (sz > 0) {
+                    Value value(sz);
+                    value.setKnown();
+                    setTokenValue(tok->next(), std::move(value), settings);
+                }
+            } else if (!tok2->type()) {
+                const ValueType& vt = ValueType::parseDecl(tok2, 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();
+                    if (num && ((num->isNumber() && MathLib::isInt(num->str())) || num->tokType() == Token::eChar)) {
+                        try {
+                            const MathLib::biguint dim = MathLib::toBigUNumber(num);
+                            sz *= dim;
+                            brac = brac->astParent();
+                            continue;
+                        }
+                        catch (const std::exception& /*e*/) {
+                            // Bad integer literal
+                        }
+                    }
+                    sz = 0;
+                    break;
+                }
+                if (sz > 0) {
+                    Value value(sz);
+                    if (!tok2->isTemplateArg() && settings.platform.type != Platform::Type::Unspecified)
+                        value.setKnown();
+                    setTokenValue(tok->next(), std::move(value), settings);
+                }
+            }
+            // skip over enum
+            tok = tok->linkAt(1);
+        } else if (Token::Match(tok, "%name% [{(] [)}]") && (tok->isStandardType() ||
+                                                             (tok->variable() && tok->variable()->nameToken() == tok &&
+                                                              (tok->variable()->isPointer() || (tok->variable()->valueType() && tok->variable()->valueType()->isIntegral()))))) {
+            Value value(0);
+            if (!tok->isTemplateArg())
+                value.setKnown();
+            setTokenValue(tok->next(), std::move(value), settings);
+        } else if (Token::simpleMatch(tok, "= { } ;")) {
+            const Token* lhs = tok->astOperand1();
+            if (lhs && lhs->valueType() && (lhs->valueType()->isIntegral() || lhs->valueType()->pointer > 0)) {
+                Value value(0);
+                value.setKnown();
+                setTokenValue(tok->next(), std::move(value), settings);
+            }
+        }
+        return tok->next();
+    }
+
+    Value castValue(Value value, const ValueType::Sign sign, nonneg int bit)
+    {
+        if (value.isFloatValue()) {
+            value.valueType = Value::ValueType::INT;
+            if (value.floatValue >= std::numeric_limits<int>::min() && value.floatValue <= std::numeric_limits<int>::max()) {
+                value.intvalue = static_cast<MathLib::bigint>(value.floatValue);
+            } else { // don't perform UB
+                value.intvalue = 0;
+            }
+        }
+        if (bit < MathLib::bigint_bits) {
+            constexpr MathLib::biguint one = 1;
+            value.intvalue &= (one << bit) - 1;
+            if (sign == ValueType::Sign::SIGNED && value.intvalue & (one << (bit - 1))) {
+                value.intvalue |= ~((one << bit) - 1ULL);
+            }
+        }
+        return value;
+    }
+
+    std::string debugString(const Value& v)
+    {
+        std::string kind;
+        switch (v.valueKind) {
+
+        case Value::ValueKind::Impossible:
+        case Value::ValueKind::Known:
+            kind = "always";
+            break;
+        case Value::ValueKind::Inconclusive:
+            kind = "inconclusive";
+            break;
+        case Value::ValueKind::Possible:
+            kind = "possible";
+            break;
+        }
+        return kind + " " + v.toString();
+    }
+
+    void setSourceLocation(Value& v,
+                           SourceLocation ctx,
+                           const Token* tok,
+                           SourceLocation local)
+    {
+        std::string file = ctx.file_name();
+        if (file.empty())
+            return;
+        std::string s = Path::stripDirectoryPart(file) + ":" + std::to_string(ctx.line()) + ": " + ctx.function_name() +
+                        " => " + local.function_name() + ": " + debugString(v);
+        v.debugPath.emplace_back(tok, std::move(s));
+    }
+
+    MathLib::bigint valueFlowGetStrLength(const Token* tok)
+    {
+        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::TOK)) {
+            if (v->tokvalue != tok)
+                return valueFlowGetStrLength(v->tokvalue);
+        }
+        return 0;
+    }
+}
diff --git a/lib/vf_common.h b/lib/vf_common.h
new file mode 100644
index 00000000000..3ed36e6c47f
--- /dev/null
+++ b/lib/vf_common.h
@@ -0,0 +1,59 @@
+/* -*- 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 vfCommonH
+#define vfCommonH
+
+#include "config.h"
+#include "mathlib.h"
+#include "sourcelocation.h"
+#include "symboldatabase.h"
+
+#include <cstddef>
+#include <string>
+
+class Token;
+class Settings;
+class Platform;
+
+namespace ValueFlow
+{
+    class Value;
+}
+
+namespace ValueFlow
+{
+    bool getMinMaxValues(const ValueType* vt, const Platform& platform, MathLib::bigint& minValue, MathLib::bigint& maxValue);
+
+    MathLib::bigint truncateIntValue(MathLib::bigint value, size_t value_size, ValueType::Sign dst_sign);
+
+    Token * valueFlowSetConstantValue(Token *tok, const Settings &settings);
+
+    Value castValue(Value value, ValueType::Sign sign, nonneg int bit);
+
+    std::string debugString(const Value& v);
+
+    void setSourceLocation(Value& v,
+                           SourceLocation ctx,
+                           const Token* tok,
+                           SourceLocation local = SourceLocation::current());
+
+    MathLib::bigint valueFlowGetStrLength(const Token* tok);
+}
+
+#endif // vfCommonH
diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
new file mode 100644
index 00000000000..4d39d35daae
--- /dev/null
+++ b/lib/vf_settokenvalue.cpp
@@ -0,0 +1,734 @@
+/*
+ * 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 "vf_settokenvalue.h"
+
+#include "astutils.h"
+#include "calculate.h"
+#include "config.h"
+#include "library.h"
+#include "mathlib.h"
+#include "platform.h"
+#include "settings.h"
+#include "symboldatabase.h"
+#include "token.h"
+#include "utils.h"
+#include "valueflow.h"
+#include "vfvalue.h"
+
+#include "vf_common.h"
+
+#include <algorithm>
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <list>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
+namespace ValueFlow
+{
+    static Library::Container::Yield getContainerYield(Token* tok, const Settings& settings, Token*& parent)
+    {
+        if (Token::Match(tok, ". %name% (") && tok->astParent() == tok->tokAt(2) && tok->astOperand1() &&
+            tok->astOperand1()->valueType()) {
+            const Library::Container* c = getLibraryContainer(tok->astOperand1());
+            parent = tok->astParent();
+            return c ? c->getYield(tok->strAt(1)) : Library::Container::Yield::NO_YIELD;
+        }
+        if (Token::Match(tok->previous(), "%name% (")) {
+            parent = tok;
+            if (const Library::Function* f = settings.library.getFunction(tok->previous())) {
+                return f->containerYield;
+            }
+        }
+        return Library::Container::Yield::NO_YIELD;
+    }
+
+    static Value truncateImplicitConversion(Token* parent, const Value& value, const Settings& settings)
+    {
+        if (!value.isIntValue() && !value.isFloatValue())
+            return value;
+        if (!parent)
+            return value;
+        if (!parent->isBinaryOp())
+            return value;
+        if (!parent->isConstOp())
+            return value;
+        if (!astIsIntegral(parent->astOperand1(), false))
+            return value;
+        if (!astIsIntegral(parent->astOperand2(), false))
+            return value;
+        const ValueType* vt1 = parent->astOperand1()->valueType();
+        const ValueType* vt2 = parent->astOperand2()->valueType();
+        // If the sign is the same there is no truncation
+        if (vt1->sign == vt2->sign)
+            return value;
+        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)
+            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)
+    {
+        // TODO: This might be a generic utility function?
+        if (!Token::Match(parent, "{|("))
+            return nullptr;
+        // Functional cast
+        if (parent->isBinaryOp() && Token::Match(parent->astOperand1(), "%type% (|{") &&
+            parent->astOperand1()->tokType() == Token::eType && astIsPrimitive(parent))
+            return parent->astOperand1();
+        if (parent->str() != "(")
+            return nullptr;
+        if (!parent->astOperand2() && Token::Match(parent, "( %name%|::")) {
+            const Token* ftok = parent->next();
+            if (ftok->isStandardType())
+                return ftok;
+            if (Token::simpleMatch(ftok, "::"))
+                ftok = ftok->next();
+            while (Token::Match(ftok, "%name% ::"))
+                ftok = ftok->tokAt(2);
+            if (settings.library.isNotLibraryFunction(ftok))
+                return parent->next();
+        }
+        if (parent->astOperand2() && Token::Match(parent->astOperand1(), "const_cast|dynamic_cast|reinterpret_cast|static_cast <"))
+            return parent->astOperand1()->tokAt(2);
+        return nullptr;
+    }
+
+    static bool isNumeric(const Value& value) {
+        return value.isIntValue() || value.isFloatValue();
+    }
+
+    static void setTokenValueCast(Token *parent, const ValueType &valueType, const Value &value, const Settings &settings)
+    {
+        if (valueType.pointer || value.isImpossible())
+            setTokenValue(parent,value,settings);
+        else if (valueType.type == ValueType::Type::CHAR)
+            setTokenValue(parent, castValue(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);
+        else if (valueType.type == ValueType::Type::INT)
+            setTokenValue(parent, castValue(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);
+        else if (valueType.type == ValueType::Type::LONGLONG)
+            setTokenValue(parent, castValue(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);
+        } 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);
+            }
+        }
+    }
+
+    // does the operation cause a loss of information?
+    static bool isNonInvertibleOperation(const Token* tok)
+    {
+        return !Token::Match(tok, "+|-");
+    }
+
+    static bool isComputableValue(const Token* parent, const Value& value)
+    {
+        const bool noninvertible = isNonInvertibleOperation(parent);
+        if (noninvertible && value.isImpossible())
+            return false;
+        if (!value.isIntValue() && !value.isFloatValue() && !value.isTokValue() && !value.isIteratorValue())
+            return false;
+        if (value.isIteratorValue() && !Token::Match(parent, "+|-"))
+            return false;
+        if (value.isTokValue() && (!parent->isComparisonOp() || !Token::Match(value.tokvalue, "{|%str%")))
+            return false;
+        return true;
+    }
+
+    /** Set token value for cast */
+    static bool isCompatibleValueTypes(Value::ValueType x, Value::ValueType y)
+    {
+        static const std::unordered_map<Value::ValueType,
+                                        std::unordered_set<Value::ValueType, EnumClassHash>,
+                                        EnumClassHash>
+        compatibleTypes = {
+            {Value::ValueType::INT,
+             {Value::ValueType::FLOAT,
+              Value::ValueType::SYMBOLIC,
+              Value::ValueType::TOK}},
+            {Value::ValueType::FLOAT, {Value::ValueType::INT}},
+            {Value::ValueType::TOK, {Value::ValueType::INT}},
+            {Value::ValueType::ITERATOR_START, {Value::ValueType::INT}},
+            {Value::ValueType::ITERATOR_END, {Value::ValueType::INT}},
+        };
+        if (x == y)
+            return true;
+        auto it = compatibleTypes.find(x);
+        if (it == compatibleTypes.end())
+            return false;
+        return it->second.count(y) > 0;
+    }
+
+    static bool isCompatibleValues(const Value& value1, const Value& value2)
+    {
+        if (value1.isSymbolicValue() && value2.isSymbolicValue() && value1.tokvalue->exprId() != value2.tokvalue->exprId())
+            return false;
+        if (!isCompatibleValueTypes(value1.valueType, value2.valueType))
+            return false;
+        if (value1.isKnown() || value2.isKnown())
+            return true;
+        if (value1.isImpossible() || value2.isImpossible())
+            return false;
+        if (value1.varId == 0 || value2.varId == 0)
+            return true;
+        if (value1.varId == value2.varId && value1.varvalue == value2.varvalue && value1.isIntValue() && value2.isIntValue())
+            return true;
+        return false;
+    }
+
+    /** set ValueFlow value and perform calculations if possible */
+    void setTokenValue(Token* tok,
+                       Value value,
+                       const Settings& settings,
+                       SourceLocation loc)
+    {
+        // Skip setting values that are too big since its ambiguous
+        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);
+
+        if (settings.debugnormal)
+            setSourceLocation(value, loc, tok);
+
+        if (!tok->addValue(value))
+            return;
+
+        if (value.path < 0)
+            return;
+
+        Token *parent = tok->astParent();
+        if (!parent)
+            return;
+
+        if (Token::simpleMatch(parent, ",") && !parent->isInitComma() && astIsRHS(tok)) {
+            const Token* callParent = findParent(parent, [](const Token* p) {
+                return !Token::simpleMatch(p, ",");
+            });
+            // Ensure that the comma isn't a function call
+            if (!callParent || (!Token::Match(callParent->previous(), "%name%|> (") && !Token::simpleMatch(callParent, "{") &&
+                                (!Token::Match(callParent, "( %name%") || settings.library.isNotLibraryFunction(callParent->next())) &&
+                                !(callParent->str() == "(" && (Token::simpleMatch(callParent->astOperand1(), "*") || Token::Match(callParent->astOperand1(), "%name%|("))))) {
+                setTokenValue(parent, std::move(value), settings);
+                return;
+            }
+        }
+
+        if (Token::simpleMatch(parent, "=") && astIsRHS(tok)) {
+            setTokenValue(parent, value, settings);
+            if (!value.isUninitValue())
+                return;
+        }
+
+        if (value.isContainerSizeValue() && astIsContainer(tok)) {
+            // .empty, .size, +"abc", +'a'
+            if (Token::Match(parent, "+|==|!=") && parent->astOperand1() && parent->astOperand2()) {
+                for (const Value &value1 : parent->astOperand1()->values()) {
+                    if (value1.isImpossible())
+                        continue;
+                    for (const Value &value2 : parent->astOperand2()->values()) {
+                        if (value2.isImpossible())
+                            continue;
+                        if (value1.path != value2.path)
+                            continue;
+                        Value result;
+                        if (Token::Match(parent, "%comp%"))
+                            result.valueType = Value::ValueType::INT;
+                        else
+                            result.valueType = Value::ValueType::CONTAINER_SIZE;
+
+                        if (value1.isContainerSizeValue() && value2.isContainerSizeValue())
+                            result.intvalue = calculate(parent->str(), value1.intvalue, value2.intvalue);
+                        else if (value1.isContainerSizeValue() && value2.isTokValue() && value2.tokvalue->tokType() == Token::eString)
+                            result.intvalue = calculate(parent->str(), value1.intvalue, MathLib::bigint(Token::getStrLength(value2.tokvalue)));
+                        else if (value2.isContainerSizeValue() && value1.isTokValue() && value1.tokvalue->tokType() == Token::eString)
+                            result.intvalue = calculate(parent->str(), MathLib::bigint(Token::getStrLength(value1.tokvalue)), value2.intvalue);
+                        else
+                            continue;
+
+                        combineValueProperties(value1, value2, result);
+
+                        if (Token::simpleMatch(parent, "==") && result.intvalue)
+                            continue;
+                        if (Token::simpleMatch(parent, "!=") && !result.intvalue)
+                            continue;
+
+                        setTokenValue(parent, std::move(result), settings);
+                    }
+                }
+            }
+            Token* next = nullptr;
+            const Library::Container::Yield yields = getContainerYield(parent, settings, next);
+            if (yields == Library::Container::Yield::SIZE) {
+                value.valueType = Value::ValueType::INT;
+                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;
+                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();
+                    } else
+                        v.setPossible();
+                } else {
+                    v.intvalue = !v.intvalue;
+                }
+                setTokenValue(next, std::move(v), settings);
+            }
+            return;
+        }
+
+        if (value.isLifetimeValue()) {
+            if (!isLifetimeBorrowed(parent, settings))
+                return;
+            if (value.lifetimeKind == Value::LifetimeKind::Iterator && astIsIterator(parent)) {
+                setTokenValue(parent,std::move(value),settings);
+            } else if (astIsPointer(tok) && astIsPointer(parent) && !parent->isUnaryOp("*") &&
+                       (parent->isArithmeticalOp() || parent->isCast())) {
+                setTokenValue(parent,std::move(value),settings);
+            }
+            return;
+        }
+
+        if (value.isUninitValue()) {
+            if (Token::Match(tok, ". %var%"))
+                setTokenValue(tok->next(), value, settings);
+            if (parent->isCast()) {
+                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();
+                else
+                    return;
+            }
+            if (parent->isUnaryOp("&")) {
+                pvalue.indirect++;
+                setTokenValue(parent, std::move(pvalue), 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);
+            } 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);
+            }
+            return;
+        }
+
+        // cast..
+        if (const Token *castType = getCastTypeStartToken(parent, settings)) {
+            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()
+                && 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);
+        }
+
+        else if (parent->str() == ":") {
+            setTokenValue(parent,std::move(value),settings);
+        }
+
+        else if (parent->str() == "?" && tok->str() == ":" && tok == parent->astOperand2() && parent->astOperand1()) {
+            // is condition always true/false?
+            if (parent->astOperand1()->hasKnownValue()) {
+                const Value &condvalue = parent->astOperand1()->values().front();
+                const bool cond(condvalue.isTokValue() || (condvalue.isIntValue() && condvalue.intvalue != 0));
+                if (cond && !tok->astOperand1()) { // true condition, no second operator
+                    setTokenValue(parent, condvalue, settings);
+                } else {
+                    const Token *op = cond ? tok->astOperand1() : tok->astOperand2();
+                    if (!op) // #7769 segmentation fault at setTokenValue()
+                        return;
+                    const std::list<Value> &values = op->values();
+                    if (std::find(values.cbegin(), values.cend(), value) != values.cend())
+                        setTokenValue(parent, std::move(value), settings);
+                }
+            } else if (!value.isImpossible()) {
+                // is condition only depending on 1 variable?
+                nonneg int varId = 0;
+                bool ret = false;
+                visitAstNodes(parent->astOperand1(),
+                              [&](const Token *t) {
+                    if (t->varId()) {
+                        if (varId > 0 || value.varId != 0)
+                            ret = true;
+                        varId = t->varId();
+                    } else if (t->str() == "(" && Token::Match(t->previous(), "%name%"))
+                        ret = true; // function call
+                    return ret ? ChildrenToVisit::done : ChildrenToVisit::op1_and_op2;
+                });
+                if (ret)
+                    return;
+
+                Value v(std::move(value));
+                v.conditional = true;
+                v.changeKnownToPossible();
+
+                setTokenValue(parent, std::move(v), settings);
+            }
+        }
+
+        else if (parent->str() == "?" && value.isIntValue() && tok == parent->astOperand1() && value.isKnown() &&
+                 parent->astOperand2() && parent->astOperand2()->astOperand1() && parent->astOperand2()->astOperand2()) {
+            const std::list<Value> &values = (value.intvalue == 0
+                ? parent->astOperand2()->astOperand2()->values()
+                : parent->astOperand2()->astOperand1()->values());
+
+            for (const Value &v : values)
+                setTokenValue(parent, v, settings);
+        }
+
+        // Offset of non null pointer is not null also
+        else if (astIsPointer(tok) && Token::Match(parent, "+|-") &&
+                 (parent->astOperand2() == nullptr || !astIsPointer(parent->astOperand2())) &&
+                 value.isIntValue() && value.isImpossible() && value.intvalue == 0) {
+            setTokenValue(parent, std::move(value), settings);
+        }
+
+        // Calculations..
+        else if ((parent->isArithmeticalOp() || parent->isComparisonOp() || (parent->tokType() == Token::eBitOp) ||
+                  (parent->tokType() == Token::eLogicalOp)) &&
+                 parent->astOperand1() && parent->astOperand2()) {
+
+            const bool noninvertible = isNonInvertibleOperation(parent);
+
+            // Skip operators with impossible values that are not invertible
+            if (noninvertible && value.isImpossible())
+                return;
+
+            if (!value.isImpossible() && value.isIntValue() &&
+                ((Token::Match(parent, "[&*]") && astIsIntegral(parent, true) && value.intvalue == 0) ||
+                 (Token::simpleMatch(parent, "&&") && value.intvalue == 0) ||
+                 (Token::simpleMatch(parent, "||") && value.intvalue != 0))) {
+                value.bound = Value::Bound::Point;
+                setTokenValue(parent, std::move(value), settings);
+                return;
+            }
+
+            for (const Value &value1 : parent->astOperand1()->values()) {
+                if (!isComputableValue(parent, value1))
+                    continue;
+                for (const Value &value2 : parent->astOperand2()->values()) {
+                    if (value1.path != value2.path && value1.path != 0 && value2.path != 0)
+                        continue;
+                    if (!isComputableValue(parent, value2))
+                        continue;
+                    if (value1.isIteratorValue() && value2.isIteratorValue())
+                        continue;
+                    if (!isCompatibleValues(value1, value2))
+                        continue;
+                    Value result(0);
+                    combineValueProperties(value1, value2, result);
+                    if (astIsFloat(parent, false)) {
+                        if (!result.isIntValue() && !result.isFloatValue())
+                            continue;
+                        result.valueType = Value::ValueType::FLOAT;
+                    }
+                    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 (Token::Match(parent, "==|!=")) {
+                        if ((value1.isIntValue() && value2.isTokValue()) || (value1.isTokValue() && value2.isIntValue())) {
+                            if (parent->str() == "==")
+                                result.intvalue = 0;
+                            else if (parent->str() == "!=")
+                                result.intvalue = 1;
+                        } else if (value1.isIntValue() && value2.isIntValue()) {
+                            bool error = false;
+                            result.intvalue = calculate(parent->str(), intValue1(), intValue2(), &error);
+                            if (error)
+                                continue;
+                        } else if (value1.isTokValue() && value2.isTokValue() &&
+                                   (astIsContainer(parent->astOperand1()) || astIsContainer(parent->astOperand2()))) {
+                            const Token* tok1 = value1.tokvalue;
+                            const Token* tok2 = value2.tokvalue;
+                            bool equal = false;
+                            if (Token::Match(tok1, "%str%") && Token::Match(tok2, "%str%")) {
+                                equal = tok1->str() == tok2->str();
+                            } else if (Token::simpleMatch(tok1, "{") && Token::simpleMatch(tok2, "{")) {
+                                std::vector<const Token*> args1 = getArguments(tok1);
+                                std::vector<const Token*> args2 = getArguments(tok2);
+                                if (args1.size() == args2.size()) {
+                                    if (!std::all_of(args1.begin(), args1.end(), std::mem_fn(&Token::hasKnownIntValue)))
+                                        continue;
+                                    if (!std::all_of(args2.begin(), args2.end(), std::mem_fn(&Token::hasKnownIntValue)))
+                                        continue;
+                                    equal = std::equal(args1.begin(),
+                                                       args1.end(),
+                                                       args2.begin(),
+                                                       [&](const Token* atok, const Token* btok) {
+                                        return atok->getKnownIntValue() ==
+                                               btok->getKnownIntValue();
+                                    });
+                                } else {
+                                    equal = false;
+                                }
+                            } else {
+                                continue;
+                            }
+                            result.intvalue = parent->str() == "==" ? equal : !equal;
+                        } else {
+                            continue;
+                        }
+                        setTokenValue(parent, std::move(result), settings);
+                    } else if (Token::Match(parent, "%op%")) {
+                        if (Token::Match(parent, "%comp%")) {
+                            if (!isFloat && !value1.isIntValue() && !value2.isIntValue())
+                                continue;
+                        } else {
+                            if (value1.isTokValue() || value2.isTokValue())
+                                break;
+                        }
+                        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;
+                            } else {
+                                result.intvalue = static_cast<MathLib::bigint>(val);
+                            }
+                        } else {
+                            auto val = calculate(parent->str(), intValue1(), intValue2(), &error);
+                            if (result.isFloatValue()) {
+                                result.floatValue = static_cast<double>(val);
+                            } else {
+                                result.intvalue = val;
+                            }
+                        }
+                        if (error)
+                            continue;
+                        // If the bound comes from the second value then invert the bound when subtracting
+                        if (Token::simpleMatch(parent, "-") && value2.bound == result.bound &&
+                            value2.bound != Value::Bound::Point)
+                            result.invertBound();
+                        setTokenValue(parent, std::move(result), settings);
+                    }
+                }
+            }
+        }
+
+        // !
+        else if (parent->str() == "!") {
+            for (const Value &val : tok->values()) {
+                if (!val.isIntValue())
+                    continue;
+                if (val.isImpossible() && val.intvalue != 0)
+                    continue;
+                Value v(val);
+                if (val.isImpossible())
+                    v.setKnown();
+                else
+                    v.intvalue = !v.intvalue;
+                setTokenValue(parent, std::move(v), settings);
+            }
+        }
+
+        // ~
+        else if (parent->str() == "~") {
+            for (const Value &val : tok->values()) {
+                if (!val.isIntValue())
+                    continue;
+                Value v(val);
+                v.intvalue = ~v.intvalue;
+                std::uint8_t bits = 0;
+                if (tok->valueType() &&
+                    tok->valueType()->sign == ValueType::Sign::UNSIGNED &&
+                    tok->valueType()->pointer == 0) {
+                    if (tok->valueType()->type == ValueType::Type::INT)
+                        bits = settings.platform.int_bit;
+                    else if (tok->valueType()->type == ValueType::Type::LONG)
+                        bits = settings.platform.long_bit;
+                }
+                if (bits > 0 && bits < MathLib::bigint_bits)
+                    v.intvalue &= (1ULL<<bits) - 1;
+                setTokenValue(parent, std::move(v), settings);
+            }
+        }
+
+        // unary minus
+        else if (parent->isUnaryOp("-")) {
+            for (const Value &val : tok->values()) {
+                if (!val.isIntValue() && !val.isFloatValue())
+                    continue;
+                Value v(val);
+                if (v.isIntValue()) {
+                    if (v.intvalue == LLONG_MIN)
+                        // Value can't be inverted
+                        continue;
+                    v.intvalue = -v.intvalue;
+                } else
+                    v.floatValue = -v.floatValue;
+                v.invertBound();
+                setTokenValue(parent, std::move(v), settings);
+            }
+        }
+
+        // increment
+        else if (parent->str() == "++") {
+            for (const Value &val : tok->values()) {
+                if (!val.isIntValue() && !val.isFloatValue() && !val.isSymbolicValue())
+                    continue;
+                Value v(val);
+                if (parent == tok->previous()) {
+                    if (v.isIntValue() || v.isSymbolicValue()) {
+                        const ValueType *dst = tok->valueType();
+                        if (dst) {
+                            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) {
+                                    v.invertBound();
+                                    newvalue -= 2;
+                                }
+                            }
+                            v.intvalue = newvalue;
+                        } else {
+                            v.intvalue = v.intvalue + 1;
+                        }
+                    }
+                    else
+                        v.floatValue = v.floatValue + 1.0;
+                }
+                setTokenValue(parent, std::move(v), settings);
+            }
+        }
+
+        // decrement
+        else if (parent->str() == "--") {
+            for (const Value &val : tok->values()) {
+                if (!val.isIntValue() && !val.isFloatValue() && !val.isSymbolicValue())
+                    continue;
+                Value v(val);
+                if (parent == tok->previous()) {
+                    if (v.isIntValue() || v.isSymbolicValue()) {
+                        const ValueType *dst = tok->valueType();
+                        if (dst) {
+                            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) {
+                                    v.invertBound();
+                                    newvalue += 2;
+                                }
+                            }
+                            v.intvalue = newvalue;
+                        } else {
+                            v.intvalue = v.intvalue - 1;
+                        }
+                    }
+                    else
+                        v.floatValue = v.floatValue - 1.0;
+                }
+                setTokenValue(parent, std::move(v), settings);
+            }
+        }
+
+        // C++ init
+        else if (parent->str() == "{" && Token::simpleMatch(parent->previous(), "= {") &&
+                 Token::simpleMatch(parent->link(), "} ;")) {
+            const Token* lhs = parent->previous()->astOperand1();
+            if (lhs && lhs->valueType()) {
+                if (lhs->valueType()->isIntegral() || lhs->valueType()->isFloat() || (lhs->valueType()->pointer > 0 && value.isIntValue())) {
+                    setTokenValue(parent, std::move(value), settings);
+                }
+            }
+        }
+
+        else if (Token::Match(parent, ":: %name%") && parent->astOperand2() == tok) {
+            setTokenValue(parent, std::move(value), settings);
+        }
+
+        // Calling std::size or std::empty on an array
+        else if (value.isTokValue() && Token::simpleMatch(value.tokvalue, "{") && tok->variable() &&
+                 tok->variable()->isArray() && Token::Match(parent->previous(), "%name% (") && astIsRHS(tok)) {
+            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);
+                } 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);
+                }
+            }
+        }
+
+        // C++ constructor
+        else if (value.isIntValue() && parent->str() == "{" && parent->valueType() && (parent->valueType()->isIntegral() || parent->valueType()->pointer > 0)) {
+            setTokenValue(parent, std::move(value), settings);
+        }
+    }
+}
diff --git a/lib/vf_settokenvalue.h b/lib/vf_settokenvalue.h
new file mode 100644
index 00000000000..65722d5a0ac
--- /dev/null
+++ b/lib/vf_settokenvalue.h
@@ -0,0 +1,36 @@
+/*
+ * 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 vfSetTokenValueH
+#define vfSetTokenValueH
+
+#include "sourcelocation.h"
+
+class Token;
+class Settings;
+namespace ValueFlow { class Value; }
+
+namespace ValueFlow
+{
+    void setTokenValue(Token* tok,
+                       Value value,
+                       const Settings& settings,
+                       SourceLocation loc = SourceLocation::current());
+}
+
+#endif // vfSetTokenValueH
diff --git a/lib/vfvalue.cpp b/lib/vfvalue.cpp
index 2c1da06cfbc..4ec1c742ab3 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-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
@@ -18,35 +18,23 @@
 
 #include "vfvalue.h"
 
-#include "errortypes.h"
+#include "mathlib.h"
 #include "token.h"
+#include "utils.h"
 
 #include <sstream>
 #include <string>
 
 namespace ValueFlow {
-    Value::Value(const Token *c, long long val, Bound b)
-        : valueType(ValueType::INT),
-        bound(b),
-        intvalue(val),
-        tokvalue(nullptr),
-        floatValue(0.0),
-        varvalue(val),
-        condition(c),
-        varId(0),
+    Value::Value(const Token *c, MathLib::bigint val, Bound b)
+        : bound(b),
         safe(false),
         conditional(false),
         macro(false),
         defaultArg(false),
-        indirect(0),
-        moveKind(MoveKind::NonMovedVariable),
-        path(0),
-        wideintvalue(0),
-        subexpressions(),
-        capturetok(nullptr),
-        lifetimeKind(LifetimeKind::Object),
-        lifetimeScope(LifetimeScope::Local),
-        valueKind(ValueKind::Possible) {
+        intvalue(val),
+        varvalue(val),
+        condition(c) {
         errorPath.emplace_back(c, "Assuming that condition '" + c->expressionString() + "' is not redundant");
     }
 
@@ -71,7 +59,7 @@ namespace ValueFlow {
             ss << this->tokvalue->str();
             break;
         case ValueType::FLOAT:
-            ss << this->floatValue;
+            ss << MathLib::toString(this->floatValue);
             break;
         case ValueType::MOVED:
             ss << toString(this->moveKind);
@@ -132,6 +120,7 @@ namespace ValueFlow {
         case ValueType::LIFETIME:
             return "lifetime=" + tokvalue->str();
         case ValueType::SYMBOLIC:
+        {
             std::string result = "symbolic=" + tokvalue->expressionString();
             if (intvalue > 0)
                 result += "+" + MathLib::toString(intvalue);
@@ -139,7 +128,8 @@ namespace ValueFlow {
                 result += "-" + MathLib::toString(-intvalue);
             return result;
         }
-        throw InternalError(nullptr, "Invalid ValueFlow Value type");
+        }
+        cppcheck::unreachable();
     }
 
     const char *Value::toString(MoveKind moveKind) {
@@ -207,10 +197,4 @@ namespace ValueFlow {
         }
         return "";
     }
-
-    Value Value::unknown() {
-        Value v;
-        v.valueType = ValueType::UNINIT;
-        return v;
-    }
 }
diff --git a/lib/vfvalue.h b/lib/vfvalue.h
index a32f86e990a..8a473143b68 100644
--- a/lib/vfvalue.h
+++ b/lib/vfvalue.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * 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
@@ -22,53 +22,45 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
+#include "errortypes.h"
 #include "mathlib.h"
 
 #include <cassert>
 #include <cmath>
+#include <cstdint>
 #include <functional>
-#include <list>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+FORCE_WARNING_CLANG_PUSH("-Wpadded")
+
 class Token;
 
 namespace ValueFlow
 {
     class CPPCHECKLIB Value {
     public:
-        using ErrorPathItem = std::pair<const Token *, std::string>;
-        using ErrorPath = std::list<ErrorPathItem>;
-        enum class Bound { Upper, Lower, Point };
+        enum class Bound : std::uint8_t { Upper, Lower, Point };
 
-        explicit Value(long long val = 0, Bound b = Bound::Point)
-            : valueType(ValueType::INT),
+        explicit Value(MathLib::bigint val = 0, Bound b = Bound::Point) :
             bound(b),
-            intvalue(val),
-            tokvalue(nullptr),
-            floatValue(0.0),
-            varvalue(val),
-            condition(nullptr),
-            varId(0U),
             safe(false),
             conditional(false),
             macro(false),
             defaultArg(false),
-            indirect(0),
-            moveKind(MoveKind::NonMovedVariable),
-            path(0),
-            wideintvalue(val),
-            subexpressions(),
-            capturetok(nullptr),
-            lifetimeKind(LifetimeKind::Object),
-            lifetimeScope(LifetimeScope::Local),
-            valueKind(ValueKind::Possible)
+            intvalue(val),
+            varvalue(val),
+            wideintvalue(val)
         {}
-        Value(const Token* c, long long val, Bound b = Bound::Point);
+        Value(const Token* c, MathLib::bigint val, Bound b = Bound::Point);
 
-        static Value unknown();
+        static Value unknown() {
+            Value v;
+            v.valueType = ValueType::UNINIT;
+            return v;
+        }
 
         bool equalValue(const ValueFlow::Value& rhs) const {
             if (valueType != rhs.valueType)
@@ -208,7 +200,7 @@ namespace ValueFlow
 
         std::string toString() const;
 
-        enum class ValueType {
+        enum class ValueType : std::uint8_t {
             INT,
             TOK,
             FLOAT,
@@ -220,7 +212,7 @@ namespace ValueFlow
             ITERATOR_START,
             ITERATOR_END,
             SYMBOLIC
-        } valueType;
+        } valueType = ValueType::INT;
         bool isIntValue() const {
             return valueType == ValueType::INT;
         }
@@ -275,59 +267,29 @@ namespace ValueFlow
         }
 
         /** The value bound  */
-        Bound bound;
-
-        /** int value (or sometimes bool value?) */
-        long long intvalue;
-
-        /** token value - the token that has the value. this is used for pointer aliases, strings, etc. */
-        const Token *tokvalue;
-
-        /** float value */
-        double floatValue;
-
-        /** For calculated values - variable value that calculated value depends on */
-        long long varvalue;
-
-        /** Condition that this value depends on */
-        const Token *condition;
-
-        ErrorPath errorPath;
-
-        ErrorPath debugPath;
-
-        /** For calculated values - varId that calculated value depends on */
-        nonneg int varId;
+        Bound bound = Bound::Point;
 
         /** value relies on safe checking */
-        bool safe;
+        // cppcheck-suppress premium-misra-cpp-2023-12.2.1
+        bool safe : 1;
 
         /** Conditional value */
-        bool conditional;
+        bool conditional : 1;
 
         /** Value is is from an expanded macro */
-        bool macro;
+        bool macro : 1;
 
         /** Is this value passed as default parameter to the function? */
-        bool defaultArg;
+        bool defaultArg : 1;
 
-        int indirect;
+        long long : 4; // padding
 
         /** kind of moved  */
-        enum class MoveKind {NonMovedVariable, MovedVariable, ForwardedVariable} moveKind;
+        enum class MoveKind : std::uint8_t { NonMovedVariable, MovedVariable, ForwardedVariable } moveKind = MoveKind::NonMovedVariable;
 
-        /** Path id */
-        MathLib::bigint path;
+        enum class LifetimeScope : std::uint8_t { Local, Argument, SubFunction, ThisPointer, ThisValue } lifetimeScope = LifetimeScope::Local;
 
-        /** int value before implicit truncation */
-        long long wideintvalue;
-
-        std::vector<std::string> subexpressions;
-
-        // Set to where a lifetime is captured by value
-        const Token* capturetok;
-
-        enum class LifetimeKind {
+        enum class LifetimeKind : std::uint8_t {
             // Pointer points to a member of lifetime
             Object,
             // A member of object points to the lifetime
@@ -338,17 +300,10 @@ namespace ValueFlow
             Iterator,
             // A pointer that holds the address of the lifetime
             Address
-        } lifetimeKind;
-
-        enum class LifetimeScope { Local, Argument, SubFunction, ThisPointer, ThisValue } lifetimeScope;
-
-        static const char* toString(MoveKind moveKind);
-        static const char* toString(LifetimeKind lifetimeKind);
-        static const char* toString(LifetimeScope lifetimeScope);
-        static const char* toString(Bound bound);
+        } lifetimeKind = LifetimeKind::Object;
 
         /** How known is this value */
-        enum class ValueKind {
+        enum class ValueKind : std::uint8_t {
             /** This value is possible, other unlisted values may also be possible */
             Possible,
             /** Only listed values are possible */
@@ -357,7 +312,57 @@ namespace ValueFlow
             Inconclusive,
             /** Listed values are impossible */
             Impossible
-        } valueKind;
+        } valueKind = ValueKind::Possible;
+
+        std::int8_t indirect{}; // TODO: can we reduce the size?
+
+        /** int value (or sometimes bool value?) */
+        MathLib::bigint intvalue{};
+
+        /** token value - the token that has the value. this is used for pointer aliases, strings, etc. */
+        const Token* tokvalue{};
+
+        /** float value */
+        double floatValue{};
+
+        /** For calculated values - variable value that calculated value depends on */
+        MathLib::bigint varvalue{};
+
+        /** Condition that this value depends on */
+        const Token* condition{};
+
+        ErrorPath errorPath;
+
+        ErrorPath debugPath; // TODO: make lighter by default
+
+        /** For calculated values - varId that calculated value depends on */
+        nonneg int varId{};
+
+        enum class UnknownFunctionReturn : std::uint8_t {
+            no,             // not unknown function return
+            outOfMemory,    // out of memory
+            outOfResources, // out of resource
+            other           // other
+        };
+        UnknownFunctionReturn unknownFunctionReturn{UnknownFunctionReturn::no};
+
+        long long : 24; // padding
+
+        /** Path id */
+        MathLib::bigint path{};
+
+        /** int value before implicit truncation */
+        MathLib::bigint wideintvalue{};
+
+        std::vector<std::string> subexpressions;
+
+        // Set to where a lifetime is captured by value
+        const Token* capturetok{};
+
+        RET_NONNULL static const char* toString(MoveKind moveKind);
+        RET_NONNULL static const char* toString(LifetimeKind lifetimeKind);
+        RET_NONNULL static const char* toString(LifetimeScope lifetimeScope);
+        RET_NONNULL static const char* toString(Bound bound);
 
         void setKnown() {
             valueKind = ValueKind::Known;
@@ -426,4 +431,6 @@ namespace ValueFlow
     };
 }
 
+FORCE_WARNING_CLANG_POP
+
 #endif // vfvalueH
diff --git a/lib/xml.h b/lib/xml.h
new file mode 100644
index 00000000000..e5591fafbfd
--- /dev/null
+++ b/lib/xml.h
@@ -0,0 +1,51 @@
+/* -*- 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 xmlH
+#define xmlH
+
+#include "config.h"
+#include "path.h"
+
+#if defined(__GNUC__) && (__GNUC__ >= 14)
+SUPPRESS_WARNING_GCC_PUSH("-Wsuggest-attribute=returns_nonnull")
+#endif
+SUPPRESS_WARNING_GCC_PUSH("-Wuseless-cast")
+SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant")
+SUPPRESS_WARNING_CLANG_PUSH("-Wsuggest-destructor-override")
+SUPPRESS_WARNING_CLANG_PUSH("-Winconsistent-missing-destructor-override")
+
+#include <tinyxml2.h> // IWYU pragma: export
+
+SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_GCC_POP
+#if defined(__GNUC__) && (__GNUC__ >= 14)
+SUPPRESS_WARNING_GCC_POP
+#endif
+
+inline static tinyxml2::XMLError xml_LoadFile(tinyxml2::XMLDocument& doc, const char* filename)
+{
+    // tinyxml2 will fail with a misleading XML_ERROR_FILE_READ_ERROR when you try to load a directory as a XML file
+    if (Path::isDirectory(filename))
+        return tinyxml2::XMLError::XML_ERROR_FILE_NOT_FOUND;
+    return doc.LoadFile(filename);
+}
+
+#endif // xmlH
diff --git a/lsan-suppr.txt b/lsan-suppr.txt
new file mode 100644
index 00000000000..bf8389f247e
--- /dev/null
+++ b/lsan-suppr.txt
@@ -0,0 +1 @@
+leak:libpcre.so
\ No newline at end of file
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
new file mode 100644
index 00000000000..be9720d23fb
--- /dev/null
+++ b/man/CMakeLists.txt
@@ -0,0 +1,7 @@
+if (BUILD_MANPAGE)
+    find_program(XSLTPROC NAMES xsltproc REQUIRED)
+    set(DB2MAN "/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl")
+    set(MAN_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/cppcheck.1.xml")
+    add_custom_target(man ${XSLTPROC} --nonet --param man.charmap.use.subset "0" ${DB2MAN} ${MAN_SOURCE}
+        DEPENDS ${MAN_SOURCE})
+endif()
\ No newline at end of file
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..52da49adad2
--- /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 rarelly 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/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/preprocessorErrorDirective.md b/man/checkers/preprocessorErrorDirective.md
new file mode 100644
index 00000000000..44fcb4c1a28
--- /dev/null
+++ b/man/checkers/preprocessorErrorDirective.md
@@ -0,0 +1,55 @@
+
+# preprocessorErrorDirective
+
+**Message**: #error message<br/>
+**Category**: Configuration<br/>
+**Severity**: Error<br/>
+**Language**: C and C++
+
+## Description
+
+The `#error` directive is a preprocessor instruction in C and C++ that explicitly generates a compilation error. It is typically used as a safeguard to prevent compilation under incorrect conditions—like unsupported configurations, platforms, or missing defines.
+
+These warnings from Cppcheck do not indicate a bug in your code. These warnings indicate that the Cppcheck configuration is not working.
+
+## How to fix
+
+The warning is typically reported for an `#error` directive that is located inside some conditional preprocessor block (`#if..`, `#else`, etc):
+```cpp
+#ifndef __BYTE_ORDER__
+#error Byte order is not defined
+#endif
+```
+
+The code here is correct and you should not try to change it.
+
+Somehow it will be necessary to define `__BYTE_ORDER__` in Cppcheck analysis.
+
+### gcc compiler macro
+If you compile your code with gcc and the macro is provided by gcc, then you can define all gcc-macros using these commands:
+```
+echo x > dummy.c
+gcc -dM -E dummy.c > gcc-macros.h
+```
+The gcc-macros.h that is generated can be included in cppcheck using the `--include` option:
+```
+cppcheck --include=gcc-macros.h  ....
+```
+
+### library macro
+If the macro that is needed is defined in some library header it might be possible to fix the issue by using an extra `--library` option:
+```
+cppcheck --library=foo .....
+```
+
+### manually defined macro
+To define extra macros manually you can use `-D`:
+```
+cppcheck -D__BYTE_ORDER__=123 .....
+```
+
+### use --force or --max-configs
+You can let Cppcheck try to resolve the required defines:
+```
+cppcheck --force .....
+```
diff --git a/man/checkers/truncLongCast.md b/man/checkers/truncLongCast.md
new file mode 100644
index 00000000000..7157a5b6627
--- /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 occured.
+
+## 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/cppcheck.1.xml b/man/cppcheck.1.xml
index dd968ed2694..db3a5a9baa6 100644
--- a/man/cppcheck.1.xml
+++ b/man/cppcheck.1.xml
@@ -123,9 +123,18 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <arg choice="opt">
         <option>--file-list=&lt;file&gt;</option>
       </arg>
+      <arg choice="opt">
+        <option>--filesdir</option>
+      </arg>
       <arg choice="opt">
         <option>--force</option>
       </arg>
+      <arg choice="opt">
+        <option>--fsigned-char</option>
+      </arg>
+      <arg choice="opt">
+        <option>--funsigned-char</option>
+      </arg>
       <arg choice="opt">
         <option>--help</option>
       </arg>
@@ -183,12 +192,18 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <arg choice="opt">
         <option>--report-progress</option>
       </arg>
+      <arg choice="opt">
+        <option>--report-type=&lt;type&gt;</option>
+      </arg>
       <arg choice="opt">
         <option>--rule=&lt;rule&gt;</option>
       </arg>
       <arg choice="opt">
         <option>--rule-file=&lt;file&gt;</option>
       </arg>
+      <arg choice="opt">
+        <option>--showtime=&lt;mode&gt;</option>
+      </arg>
       <arg choice="opt">
         <option>--std=&lt;id&gt;</option>
       </arg>
@@ -290,12 +305,21 @@ Example: '-UDEBUG'</para>
         </term>
         <listitem>
           <para>Enable additional checks. The available ids are:
-            <glosslist><glossentry><glossterm>all</glossterm><glossdef><para>Enable all checks. It is recommended to only use
+            <glosslist>
+              <glossentry><glossterm>all</glossterm><glossdef><para>Enable all checks. It is recommended to only use
                   --enable=all when the whole program is scanned, because this
-                  enables unusedFunction.</para></glossdef></glossentry><glossentry><glossterm>warning</glossterm><glossdef><para>Enable warning messages</para></glossdef></glossentry><glossentry><glossterm>style</glossterm><glossdef><para>Enable all coding style checks. All messages with the
+                  enables unusedFunction.</para></glossdef></glossentry>
+              <glossentry><glossterm>warning</glossterm><glossdef><para>Enable warning messages</para></glossdef></glossentry>
+              <glossentry><glossterm>style</glossterm><glossdef><para>Enable all coding style checks. All messages with the
                   severities 'style', 'performance' and 'portability' are
-                  enabled.</para></glossdef></glossentry><glossentry><glossterm>performance</glossterm><glossdef><para>Enable performance messages</para></glossdef></glossentry><glossentry><glossterm>portability</glossterm><glossdef><para>Enable portability messages</para></glossdef></glossentry><glossentry><glossterm>information</glossterm><glossdef><para>Enable information messages</para></glossdef></glossentry><glossentry><glossterm>unusedFunction</glossterm><glossdef><para>Check for unused functions. It is recommend to only
-                  enable this when the whole program is scanned</para></glossdef></glossentry><glossentry><glossterm>missingInclude</glossterm><glossdef><para>Warn if there are missing includes</para></glossdef></glossentry></glosslist>
+                  enabled.</para></glossdef></glossentry>
+              <glossentry><glossterm>performance</glossterm><glossdef><para>Enable performance messages</para></glossdef></glossentry>
+              <glossentry><glossterm>portability</glossterm><glossdef><para>Enable portability messages</para></glossdef></glossentry>
+              <glossentry><glossterm>information</glossterm><glossdef><para>Enable information messages</para></glossdef></glossentry>
+              <glossentry><glossterm>unusedFunction</glossterm><glossdef><para>Check for unused functions. It is recommend to only
+                  enable this when the whole program is scanned</para></glossdef></glossentry>
+              <glossentry><glossterm>missingInclude</glossterm><glossdef><para>Warn if there are missing includes</para></glossdef></glossentry>
+            </glosslist>
             By default none of the additional checks are enabled. Several ids can be given if you separate them with commas, e.g. --enable=style,unusedFunction. See also --std
           </para>
         </listitem>
@@ -335,6 +359,14 @@ Example: '-UDEBUG'</para>
           <para>Specify the files to check in a text file. One filename per line. When file is -, the file list will be read from standard input.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--filesdir</option>
+        </term>
+        <listitem>
+          <para>Print the built-in FILESDIR.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>-f</option>
@@ -347,6 +379,22 @@ Example: '-UDEBUG'</para>
 default. If used together with --max-configs=, the last option is the one that is effective.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+            <option>--fsigned-char</option>
+        </term>
+        <listitem>
+            <para>Treat char type as signed. This overrides previous --platform options and is overridden by following ones.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--funsigned-char</option>
+        </term>
+        <listitem>
+          <para>Treat char type as unsigned. This overrides previous --platform options and is overridden by following ones.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>-h</option>
@@ -486,7 +534,13 @@ There are false positives with this option. Each result must be carefully invest
         </term>
         <listitem>
           <para>Specifies platform specific types and sizes.The available platforms are:
-            <glosslist><glossentry><glossterm>unix32</glossterm><glossdef><para>32 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>unix64</glossterm><glossdef><para>64 bit unix variant</para></glossdef></glossentry><glossentry><glossterm>win32A</glossterm><glossdef><para>32 bit Windows ASCII character encoding</para></glossdef></glossentry><glossentry><glossterm>win32W</glossterm><glossdef><para>32 bit Windows UNICODE character encoding</para></glossdef></glossentry><glossentry><glossterm>win64</glossterm><glossdef><para>64 bit Windows</para></glossdef></glossentry></glosslist>
+            <glosslist>
+              <glossentry><glossterm>unix32</glossterm><glossdef><para>32 bit unix variant</para></glossdef></glossentry>
+              <glossentry><glossterm>unix64</glossterm><glossdef><para>64 bit unix variant</para></glossdef></glossentry>
+              <glossentry><glossterm>win32A</glossterm><glossdef><para>32 bit Windows ASCII character encoding</para></glossdef></glossentry>
+              <glossentry><glossterm>win32W</glossterm><glossdef><para>32 bit Windows UNICODE character encoding</para></glossdef></glossentry>
+              <glossentry><glossterm>win64</glossterm><glossdef><para>64 bit Windows</para></glossdef></glossentry>
+            </glosslist>
             By default the platform which was used to compile Cppcheck is used.
           </para>
         </listitem>
@@ -527,6 +581,26 @@ There are false positives with this option. Each result must be carefully invest
           <para>Report progress when checking a file.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--report-type=&lt;type&gt;</option>
+        </term>
+        <listitem>
+          <para>Add guideline and classification fields for specified coding standard. The available report types are:
+            <glosslist>
+              <glossentry><glossterm>normal</glossterm><glossdef><para>Default, only show cppcheck error ID and severity)</para></glossdef></glossentry>
+              <glossentry><glossterm>autosar</glossterm><glossdef><para>Autosar</para></glossdef></glossentry>
+              <glossentry><glossterm>cert-c-2016</glossterm><glossdef><para>Cert C 2016</para></glossdef></glossentry>
+              <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>
+          </para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>--rule=&lt;rule&gt;</option>
@@ -543,13 +617,39 @@ There are false positives with this option. Each result must be carefully invest
           <para>Use given rule XML file. See https://sourceforge.net/projects/cppcheck/files/Articles/ for more info about the syntax. This command is only available if cppcheck was compiled with HAVE_RULES=yes.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--showtime=&lt;mode&gt;</option>
+        </term>
+        <listitem>
+          <para>Show timing information. The available mode are:
+            <glosslist>
+              <glossentry><glossterm>none</glossterm><glossdef><para>Show nothing (default)</para></glossdef></glossentry>
+              <glossentry><glossterm>file</glossterm><glossdef><para>Show for each processed file</para></glossdef></glossentry>
+              <glossentry><glossterm>file-total</glossterm><glossdef><para>Show total time only for each processed file</para></glossdef></glossentry>
+              <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>
+            </glosslist>
+          </para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>--std=&lt;id&gt;</option>
         </term>
         <listitem>
           <para>Set standard. The available options are:
-            <glosslist><glossentry><glossterm>c89</glossterm><glossdef><para>C code is C89 compatible</para></glossdef></glossentry><glossentry><glossterm>c99</glossterm><glossdef><para>C code is C99 compatible</para></glossdef></glossentry><glossentry><glossterm>c11</glossterm><glossdef><para>C code is C11 compatible (default)</para></glossdef></glossentry><glossentry><glossterm>c++03</glossterm><glossdef><para>C++ code is C++03 compatible</para></glossdef></glossentry><glossentry><glossterm>c++11</glossterm><glossdef><para>C++ code is C++11 compatible (default)</para></glossdef></glossentry></glosslist>
+            <glosslist>
+              <glossentry><glossterm>c89</glossterm><glossdef><para>C code is C89 compatible</para></glossdef></glossentry>
+              <glossentry><glossterm>c99</glossterm><glossdef><para>C code is C99 compatible</para></glossdef></glossentry>
+              <glossentry><glossterm>c11</glossterm><glossdef><para>C code is C11 compatible (default)</para></glossdef></glossentry>
+              <glossentry><glossterm>c++03</glossterm><glossdef><para>C++ code is C++03 compatible</para></glossdef></glossentry>
+              <glossentry><glossterm>c++11</glossterm><glossdef><para>C++ code is C++11 compatible</para></glossdef></glossentry>
+              <glossentry><glossterm>c++14</glossterm><glossdef><para>C++ code is C++14 compatible</para></glossdef></glossentry>
+              <glossentry><glossterm>c++17</glossterm><glossdef><para>C++ code is C++17 compatible</para></glossdef></glossentry>
+              <glossentry><glossterm>c++20</glossterm><glossdef><para>C++ code is C++20 compatible (default)</para></glossdef></glossentry>
+            </glosslist>
           </para>
         </listitem>
       </varlistentry>
diff --git a/man/manual-premium.md b/man/manual-premium.md
new file mode 100644
index 00000000000..9f2e5992537
--- /dev/null
+++ b/man/manual-premium.md
@@ -0,0 +1,1421 @@
+---
+title: Cppcheck Premium manual
+author: Cppcheck team, Cppcheck Solutions AB
+lang: en
+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 
+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.
+
+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.
+
+The checks in Cppcheck are not perfect. There are bugs that should be found, that Cppcheck fails to detect.
+
+## About static analysis
+
+The kinds of bugs that you can find with static analysis are:
+
+- Undefined behavior
+- Using dangerous code patterns
+- 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"
+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;
+
+- Careful design
+- Testing
+- Dynamic analysis
+- Fuzzing
+
+# Getting started
+
+## GUI
+
+It is not required but creating a new project file is a good first step. There are a few options you can tweak to get
+good results.
+
+In the project settings dialog, the first option you see is "Import project". It is recommended that you use this
+feature if you can. Cppcheck can import:
+
+- Visual studio solution / project
+- Compile database, which can be generated from CMake/qbs/etc build files
+- Borland C++ Builder 6
+
+When you have filled out the project settings and clicked on OK, the Cppcheck analysis will start.
+
+## Command line
+
+### First test
+
+Here is some simple code:
+
+    int main()
+    {
+        char a[10];
+        a[10] = 0;
+        return 0;
+    }
+
+If you save that into file1.c and execute:
+
+    cppcheck file1.c
+
+The output from Cppcheck will then be:
+
+    Checking file1.c...
+    [file1.c:4]: (error) Array 'a[10]' index 10 out of bounds
+
+### Checking all files in a folder
+
+Normally a program has many source files. Cppcheck can check all source files in a directory:
+
+    cppcheck path
+
+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
+    Checking path/file2.cpp...
+    2/2 files checked 100% done
+
+### 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 
+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 
+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 configure file filter(s) and then only those files matching the filter will be checked.
+
+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 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
+
+With `-i <str>` you can configure filename/directory patterns that should be ignored.
+
+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.
+
+> *Note*: If you want to filter out warnings for a header file then `-i` will not work. Use suppressions instead.
+
+You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.  
+`**`: matches zero or more characters, including path separators  
+`*`: matches zero or more characters, excluding path separators  
+`?`: matches any single character except path separators
+
+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)
+
+By default Cppcheck uses an internal C/C++ parser. However there is an experimental option to use the Clang parser instead.
+
+Install `clang`. Then use Cppcheck option `--clang`.
+
+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 
+with a path. On Windows it will append the `.exe` extension unless you use a path.
+
+## Severities
+
+The possible severities for messages are:
+
+**error**
+
+when code is executed there is either undefined behavior or other error, such as a memory leak or resource leak
+
+**warning**
+
+when code is executed there might be undefined behavior
+
+**style**
+
+stylistic issues, such as unused functions, redundant code, constness, operator precedence, possible mistakes.
+
+**performance**
+
+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 
+"as you want", etc.
+
+**information**
+
+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 and high memory usage. Cppcheck will write information
+messages when there are potential problems.
+
+Example code:
+
+    template <int i>
+    void a()
+    {
+        a<i+1>();
+    }
+
+    void foo()
+    {
+        a<0>();
+    }
+
+Cppcheck output:
+
+    test.cpp:4:5: information: TemplateSimplifier: max template
+    recursion (100) reached for template 'a<101>'. You might
+    want to limit Cppcheck recursion. [templateRecursion]
+        a<i+1>();
+        ^
+
+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:
+
+- add template specialisation
+- configure Cppcheck, which can be done in the GUI project file dialog
+
+Example code with template specialisation:
+
+    template <int i>
+    void a()
+    {
+        a<i+1>();
+    }
+
+    void foo()
+    {
+        a<0>();
+    }
+
+    #ifdef __cppcheck__
+    template<> void a<3>() {}
+    #endif
+
+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:
+
+- 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.
+
+On the command line you configure that through `--cppcheck-build-dir=path`. Example:
+
+    mkdir b
+
+    # All files are analyzed
+    cppcheck --cppcheck-build-dir=b src
+
+    # Faster! Results of unchanged files are reused
+    cppcheck --cppcheck-build-dir=b src
+
+In the GUI it is configured in the project settings.
+
+# Importing a project
+
+You can import some project files and build configurations into Cppcheck.
+
+## Cppcheck GUI project
+
+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 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.
+
+    cppcheck --project=foobar.cppcheck -ifoo
+
+## CMake
+
+Generate a compile database (a JSON file containing compilation commands for each source file):
+
+    cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .
+
+The file `compile_commands.json` is created in the current folder. Now run Cppcheck like this:
+
+    cppcheck --project=compile_commands.json
+
+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)
+
+Running Cppcheck on an entire Visual Studio solution:
+
+    cppcheck --project=foobar.sln
+
+Running Cppcheck on a Visual Studio project:
+
+    cppcheck --project=foobar.vcxproj
+
+Both options will analyze all available configurations in the project(s).
+Limiting on a single configuration:
+
+    cppcheck --project=foobar.sln "--project-configuration=Release|Win32"
+
+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.
+
+    cppcheck --project=foobar.vcxproj -ifoo
+
+## C++ Builder 6
+
+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.
+
+    cppcheck --project=foobar.bpr -ifoo
+
+## Other
+
+If you can generate a compile 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:
+
+    bear -- make
+
+# 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
+automatic configuration of defines.
+
+## Automatic configuration of preprocessor 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).
+
+    #ifdef A
+        x=100/0;
+        #ifdef B
+            y=100/0;
+        #endif
+    #else
+        z=100/0;
+    #endif
+
+    #ifndef C
+    #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 `--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.
+
+Example:
+
+    # test all configurations
+    # all bugs are found
+    cppcheck test.c
+
+    # only test configuration "-DA"
+    # No bug is found (#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
+    # The last bug is found
+    cppcheck -UA test.c
+
+    # All configurations with "-DA" are tested
+    # The two first bugs are found
+    cppcheck --force -DA test.c
+
+
+## Include paths
+
+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 
+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 
+types to Cppcheck, see below for more information.
+
+# Platform
+
+You should use a platform configuration that matches your target environment.
+
+By default Cppcheck uses native platform configuration that works well if your code is compiled and executed locally.
+
+Cppcheck has builtin configurations for Unix and Windows targets. You can easily use these with the `--platform` command line flag.
+
+You can also create your own custom platform configuration in a XML file. Here is an example:
+
+    <?xml version="1"?>
+    <platform>
+      <char_bit>8</char_bit>
+      <default-sign>signed</default-sign>
+      <sizeof>
+        <short>2</short>
+        <int>4</int>
+        <long>4</long>
+        <long-long>8</long-long>
+        <float>4</float>
+        <double>8</double>
+        <long-double>12</long-double>
+        <pointer>4</pointer>
+        <size_t>4</size_t>
+        <wchar_t>2</wchar_t>
+      </sizeof>
+    </platform>
+
+# C/C++ Standard
+
+Use `--std` on the command line to specify a C/C++ standard.
+
+Cppcheck assumes that the code is compatible with the latest C/C++ standard, but it is possible to override this.
+
+The available options are:
+
+- c89: C code is C89 compatible
+- c99: C code is C99 compatible
+- c11: C code is C11 compatible
+- c17: C code is C17 compatible
+- c23: C code is C23 compatible (default)
+- c++03: C++ code is C++03 compatible
+- c++11: C++ code is C++11 compatible
+- c++14: C++ code is C++14 compatible
+- c++17: C++ code is C++17 compatible
+- c++20: C++ code is C++20 compatible
+- c++23: C++ code is C++23 compatible
+- c++26: C++ code is C++26 compatible (default)
+
+# Cppcheck build dir
+
+It's a good idea to use a Cppcheck build dir. On the command line use `--cppcheck-build-dir`. In
+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
+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, please report it to the Cppcheck team so that the issue can be
+fixed.
+
+## Plain text suppressions
+
+The format for an error suppression is one of:
+
+    [error id]:[filename]:[line]
+    [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 `error 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
+
+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
+
+You can create a suppressions file for example as follows:
+
+    // suppress memleak and exceptNew errors in the file src/file1.cpp
+    memleak:src/file1.cpp
+    exceptNew:src/file1.cpp
+
+    uninitvar // suppress all uninitvar errors in all files
+
+Note that you may add empty lines and comments in the suppressions file.
+Comments must start with `#` or `//` and be at the start of the line, or after the suppression line.
+
+The usage of the suppressions file is as follows:
+
+    cppcheck --suppressions-list=suppressions.txt src/
+
+## XML suppressions
+
+You can specify suppressions in a XML file, for example as follows:
+
+    <?xml version="1.0"?>
+    <suppressions>
+      <suppress>
+        <id>uninitvar</id>
+        <fileName>src/file1.c</fileName>
+        <lineNumber>10</lineNumber>
+        <symbolName>var</symbolName>
+      </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/
+
+## Inline suppressions
+
+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:
+
+    void f() {
+        char arr[5];
+        arr[10] = 0;
+    }
+
+The output is:
+
+    cppcheck test.c
+    [test.c:3]: (error) Array 'arr[5]' index 10 out of bounds
+
+To activate inline suppressions:
+
+    cppcheck --inline-suppr test.c
+
+### Format
+
+You can suppress a warning `aaaa` with:
+
+    // cppcheck-suppress aaaa
+
+Suppressing multiple ids in one comment by using []:
+
+    // cppcheck-suppress [aaaa, bbbb]
+
+Suppressing warnings `aaaa` on a block of code:
+
+    // cppcheck-suppress-begin aaaa
+    ...
+    // cppcheck-suppress-end aaaa
+
+Suppressing multiple ids on a block of code:
+
+    // cppcheck-suppress-begin [aaaa, bbbb]
+    ...
+    // cppcheck-suppress-end [aaaa, bbbb]
+
+Suppressing warnings `aaaa` for a whole file:
+
+    // cppcheck-suppress-file aaaa
+
+Suppressing multiple ids for a whole file:
+
+    // cppcheck-suppress-file [aaaa, bbbb]
+
+Suppressing warnings `aaaa` where macro is used:
+
+    // cppcheck-suppress-macro aaaa
+    #define MACRO ...
+    ...
+    x = MACRO; // <- aaaa warnings are suppressed here
+
+
+Suppressing multiple ids where macro is used:
+
+    // cppcheck-suppress-macro [aaaa, bbbb]
+    #define MACRO ...
+    ...
+    x = MACRO; // <- aaaa and bbbb warnings are suppressed here
+
+### Comment before code or on same line
+
+The comment can be put before the code or at the same line as the code.
+
+Before the code:
+
+    void f() {
+        char arr[5];
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+        arr[10] = 0;
+    }
+
+Or at the same line as the code:
+
+    void f() {
+        char arr[5];
+
+        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;`.
+
+    void f() {
+        a = b + c; // cppcheck-suppress abc
+        d = e + f;
+    }
+
+As a special case for backwards compatibility, if you have a `{` on its own line and a suppression comment after that, then that will suppress warnings for both the current and next line. This example will suppress `abc` warnings both for `{` and for `a = b + c;`:
+
+    void f()
+    { // cppcheck-suppress abc
+        a = b + c;
+    }
+
+### Multiple suppressions
+
+For a line of code there might be several warnings you want to suppress.
+
+There are several options;
+
+Using 2 suppression comments before code:
+
+    void f() {
+        char arr[5];
+
+        // cppcheck-suppress arrayIndexOutOfBounds
+        // cppcheck-suppress zerodiv
+        arr[10] = arr[10] / 0;
+    }
+
+Using 1 suppression comment before the code:
+
+    void f() {
+        char arr[5];
+
+        // cppcheck-suppress[arrayIndexOutOfBounds,zerodiv]
+        arr[10] = arr[10] / 0;
+    }
+
+Suppression comment on the same line as the code:
+
+    void f() {
+        char arr[5];
+
+        arr[10] = arr[10] / 0;  // cppcheck-suppress[arrayIndexOutOfBounds,zerodiv]
+    }
+
+
+### Symbol name
+
+You can specify that the inline suppression only applies to a specific symbol:
+
+    // cppcheck-suppress aaaa symbolName=arr
+
+Or:
+
+    // cppcheck-suppress[aaaa symbolName=arr, bbbb]
+
+### Comment about suppression
+
+You can write comments about a suppression as follows:
+
+    // cppcheck-suppress[warningid] some comment
+    // cppcheck-suppress warningid ; some comment
+    // cppcheck-suppress warningid // some comment
+
+# XML output
+
+Cppcheck can generate output in XML format. Use `--xml` to enable this format.
+
+A sample command to check a file and output errors in the XML format:
+
+    cppcheck --xml file1.cpp
+
+Here is a sample report:
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <results version="2">
+      <cppcheck version="1.66"/>
+      <errors>
+        <error id="someError" severity="error" msg="short error text"
+           verbose="long error text" inconclusive="true" cwe="312">
+          <location file0="file.c" file="file.h" line="1"/>
+       </error>
+      </errors>
+    </results>
+
+## The `<error>` element
+
+Each error is reported in a `<error>` element. Attributes:
+
+**id**
+
+id of error, and which are valid symbolnames
+
+**severity**
+
+error/warning/style/performance/portability/information
+
+**msg**
+
+the error message in short format
+
+**verbose**
+
+the error message in long format
+
+**inconclusive**
+
+this attribute is only used when the error message is inconclusive
+
+**cwe**
+
+CWE ID for the problem; note that this attribute is only used when the CWE ID for the message is known
+
+**remark**
+
+Optional attribute. The related remark/justification from a remark comment.
+
+## The `<location>` element
+
+All locations related to an error are listed with `<location>` elements. The primary location is listed first.
+
+Attributes:
+
+**file**
+
+filename, both relative and absolute paths are possible
+
+**file0**
+
+name of the source file (optional)
+
+**line**
+
+line number
+
+**info**
+
+short information for each location (optional)
+
+# Reformatting the text output
+
+If you want to reformat the output so that it looks different, then you can use templates.
+
+## Predefined output formats
+
+To get Visual Studio compatible output you can use --template=vs:
+
+    cppcheck --template=vs samples/arrayIndexOutOfBounds/bad.c
+
+This output will look like this:
+
+    Checking samples/arrayIndexOutOfBounds/bad.c ...
+    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:
+
+    cppcheck --template=gcc samples/arrayIndexOutOfBounds/bad.c
+
+The output will look like this:
+
+    Checking samples/arrayIndexOutOfBounds/bad.c ...
+    samples/arrayIndexOutOfBounds/bad.c:6:6: warning: Array
+    'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]
+    a[2] = 0;
+      ^
+
+## User defined output format (single line)
+
+You can write your own pattern. For instance:
+
+    cppcheck \
+    --template="{file}:{line}:{column}: {severity}:{message}" \
+    samples/arrayIndexOutOfBounds/bad.c
+
+The output will then look like this:
+
+    Checking samples/arrayIndexOutOfBounds/bad.c ...
+    samples/arrayIndexOutOfBounds/bad.c:6:6: error: Array
+    'a[2]' accessed at index 2, which is out of bounds.
+
+A comma separated format:
+
+    cppcheck \
+    --template="{file},{line},{severity},{id},{message}" \
+    samples/arrayIndexOutOfBounds/bad.c
+
+The output will look like this:
+
+    Checking samples/arrayIndexOutOfBounds/bad.c ...
+    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)
+
+Many warnings have multiple locations. Example code:
+
+    void f(int *p)
+    {
+        *p = 3;       // line 3
+    }
+
+    int main()
+    {
+        int *p = 0;   // line 8
+        f(p);         // line 9
+        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:
+
+    cppcheck \
+    --template="{file}:{line}: {severity}: {message}\n{code}" \
+    --template-location="{file}:{line}: note: {info}\n{code}" multiline.c
+
+The output from Cppcheck is:
+
+    Checking multiline.c ...
+    multiline.c:3: warning: Possible null pointer dereference: p
+        *p = 3;
+         ^
+    multiline.c:8: note: Assignment 'p=0', assigned value is 0
+        int *p = 0;
+                 ^
+    multiline.c:9: note: Calling function 'f', 1st argument 'p' value is 0
+        f(p);
+          ^
+    multiline.c:3: note: Null pointer dereference
+        *p = 3;
+         ^
+
+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.
+
+### Format specifiers for --template
+
+The available specifiers for --template are:
+
+**{file}**
+
+File name
+
+**{line}**
+
+Line number
+
+**{column}**
+
+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]
+
+**{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,}
+
+**{severity}**
+
+error/warning/style/performance/portability/information
+
+**{message}**
+
+The warning message
+
+**{id}**
+
+Warning id
+
+**{remark}**
+
+The remark text if a remark comment has been provided
+
+**{code}**
+
+The real code
+
+**\\t**
+
+Tab
+
+**\\n**
+
+Newline
+
+**\\r**
+
+Carriage return
+
+### Format specifiers for --template-location
+
+The available specifiers for `--template-location` are:
+
+**{file}**
+
+File name
+
+**{line}**
+
+Line number
+
+**{column}**
+
+Column number
+
+**{info}**
+
+Information message about the current location
+
+**{code}**
+
+The real code
+
+**\\t**
+
+Tab
+
+**\\n**
+
+Newline
+
+**\\r**
+
+Carriage return
+
+# Justifications for warnings in the report
+
+You can add remark comments in the source code that justify why there is a warning/violation.
+
+Such a remark comment shall:
+
+- start with REMARK.
+- can either be added above the source code that generates the warning, or after the code on the same line.
+
+Example code:
+
+    void foo(void) {
+        // REMARK Initialize x with 0
+        int x = 0;
+    }
+
+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
+
+    Checking test1.c ...
+    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:
+
+    $ ./cppcheck --enable=style --xml test1.c
+    ....
+    remark="Initialize x with 0"
+    ....
+
+# Addons
+
+Addons are scripts that analyse Cppcheck dump files to check compatibility with secure coding standards and to locate issues.
+
+Cppcheck is distributed with a few addons which are listed below.
+
+## Supported addons
+
+### namingng.py
+
+[namingng.py](https://github.com/danmar/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 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:
+
+    cppcheck --addon=mychecks.py somefile.c
+
+You can configure how you want to execute an addon in a json file. For example:
+
+    {
+        "script": "mychecks.py",
+        "args": [
+            "--some-option"
+        ],
+        "ctu": false
+    }
+
+To use that json file to execute your addon use the --addon option:
+
+    cppcheck --addon=mychecks.json somefile.c
+
+Cppcheck search for addons in the local folder first and then in the installation folder. A different path can be specified explicitly, for instance:
+
+    cppcheck --addon=path/to/my-addon.py somefile.c
+
+# 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.
+
+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.
+
+# 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.
+
+This command generates the help screen:
+
+    htmlreport/cppcheck-htmlreport -h
+
+The output screen says:
+
+    Usage: cppcheck-htmlreport [options]
+
+    Options:
+       -h, --help      show this help message and exit
+       --file=FILE     The cppcheck xml output file to read defects from.
+                       Default is reading from stdin.
+       --report-dir=REPORT_DIR
+                       The directory where the html report content is written.
+       --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=.
+
+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.
+
+## Normal
+
+The "normal" check level is chosen by default. Our aim is that this checking level will provide an effective checking in "reasonable" time.
+
+The "normal" check level should be useful during active development:
+
+- checking files while you edit them.
+- block changes to the repo
+- etc
+
+## Exhaustive
+
+When you can wait longer for the results you can enable the "exhaustive" checking, by using the option `--check-level=exhaustive`.
+
+Exhaustive checking level should be useful for scenarios where you can wait for results. For instance:
+
+- nightly builds
+- etc
+
+# Speeding up analysis
+
+## Limit preprocessor configurations
+
+For performance reasons it might be a good idea to limit preprocessor configurations to check.
+
+## 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.
+
+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.
+
+## GUI options
+
+In the GUI there are various options to limit analysis.
+
+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.
+
+# 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.
+
+It is not intended to be used in normal CI or regular static analysis by developers. The noise makes it useless for that.
+
+It is intended to be used when you are looking for bugs and you really can accept noise. For example:
+
+- 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
+
+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.
+
+The Cppcheck bug hunting analysis is "soundy".
+
+Command:
+
+    cppcheck --premium=bughunting ....
+
+## Coding standards
+
+Command to activate Autosar checkers:
+
+    cppcheck --premium=autosar ....
+
+Command to activate Cert C checkers:
+
+    cppcheck --premium=cert-c ....
+
+Command to activate Cert C++ checkers:
+
+    cppcheck --premium=cert-c++ ....
+
+Command to activate Misra C 2012 checkers:
+
+    cppcheck --premium=misra-c-2012 ....
+
+Command to activate Misra C 2023 checkers:
+
+    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 ....
+
+Command to activate Misra C++ 2023 checkers:
+
+    cppcheck --premium=misra-c++-2023 ....
+
+### 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:
+
+    # Misra C checkers are executed on C files, not on C++ files
+    cppcheck --premium=misra-c-2025 path
+
+    # Misra C checkers are executed on C and C++ files
+    cppcheck --premium=misra-c-2025:all path
+
+
+## Compliance report
+
+### Graphical user interface
+
+Run a analysis with some coding standards enabled. After that you can click on
+the `Compliance report...` in the `File` menu.
+
+### 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.
+
+Below is example usage to generate a Misra C 2012 compliance report.
+
+`cppcheck --premium=misra-c-2012 --xml-version=3 src 2> results.xml`
+
+`compliance-report --misra-c-2012 --project-name=Device --project-version=2.3 --output-file=report.html results.xml`
+
+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
+
+## 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
+
+### 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
+
+These commands can be executed from an arbitrary folder.
+
+#### Step 2: clean up cppcheck build dir
+
+Command line:
+If you use --cppcheck-build-dir then remove all files in the specified folder and recheck.
+
+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`.
+
+#### Step 3: remove cppcheck-premium-loc files
+
+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 ca5f4762387..d8da119f388 100644
--- a/man/manual.md
+++ b/man/manual.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck manual
-subtitle: Version 2.11.99
+subtitle: Version 2.19 dev
 author: Cppcheck team
 lang: en
 documentclass: report
@@ -103,34 +103,50 @@ 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.
 
-### Excluding a file or folder from checking
+### Ignore files matching a given pattern
 
-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:
+With `-i <str>` you can configure filename/directory patterns that should be ignored.
 
-    cppcheck src/a src/b
+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.
 
-All files under src/a and src/b are then checked.
+> *Note*: If you want to filter out warnings for a header file then `-i` will not work. Use suppressions instead.
 
-The second option is to use -i, which specifies the files/paths to ignore. With this command no files in src/c are 
-checked:
+You can use `**`, `*` and `?` in the pattern to specify excluded folders/files.  
+`**`: 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)
 
@@ -138,8 +154,8 @@ 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 
 with a path. On Windows it will append the `.exe` extension unless you use a path.
@@ -179,9 +195,8 @@ be improved.
 
 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:
 
@@ -198,7 +213,9 @@ Example code:
 
 Cppcheck output:
 
-    test.cpp:4:5: information: TemplateSimplifier: max template recursion (100) reached for template 'a<101>'. You might want to limit Cppcheck recursion. [templateRecursion]
+    test.cpp:4:5: information: TemplateSimplifier: max template
+    recursion (100) reached for template 'a<101>'. You might
+    want to limit Cppcheck recursion. [templateRecursion]
         a<i+1>();
         ^
 
@@ -236,7 +253,7 @@ 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.
@@ -244,8 +261,12 @@ The advantages are;
 On the command line you configure that through `--cppcheck-build-dir=path`. Example:
 
     mkdir b
-    cppcheck --cppcheck-build-dir=b src # <- All files are analyzed
-    cppcheck --cppcheck-build-dir=b src # <- Faster! Results of unchanged files are reused
+
+    # All files are analyzed
+    cppcheck --cppcheck-build-dir=b src
+
+    # Faster! Results of unchanged files are reused
+    cppcheck --cppcheck-build-dir=b src
 
 In the GUI it is configured in the project settings.
 
@@ -266,16 +287,21 @@ To ignore certain folders in the project you can use `-i`. This will skip the an
 
     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
@@ -317,11 +343,15 @@ To ignore certain folders in the project you can use `-i`. This will skip analys
 
 ## 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
+    bear -- make
+
+If you don't use Linux; there are python scripts that converts a Makefile into a compilation database.
 
 # Preprocessor Settings
 
@@ -351,20 +381,44 @@ 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.
 
 Example:
 
-    cppcheck test.c => test all configurations => all bugs are found
-    cppcheck -DA test.c => only test configuration "-DA" => No bug is found (#error)
-    cppcheck -DA -DC test.c => only test configuration "-DA -DC" => The first bug is found
-    cppcheck -UA test.c => The configuration "-DC" is tested => The last bug is found
-    cppcheck --force -DA test.c => All configurations with "-DA" are tested => The two first bugs are found
+    # test all configurations
+    # all bugs are found
+    cppcheck test.c
+
+    # only test configuration "-DA"
+    # 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
+
+    # Test all configurations that does not define "A"
+    # The last bug is found
+    cppcheck -UA test.c
+
+    # All configurations with "-DA" are tested
+    # 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
 
@@ -377,7 +431,7 @@ 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 wor fully and lead to a longer checking 
+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.
 
@@ -419,12 +473,16 @@ The available options are:
 
 - c89: C code is C89 compatible
 - c99: C code is C99 compatible
-- c11: C code is C11 compatible (default)
+- c11: C code is C11 compatible
+- c17: C code is C17 compatible
+- c23: C code is C23 compatible (default)
 - c++03: C++ code is C++03 compatible
 - c++11: C++ code is C++11 compatible
 - c++14: C++ code is C++14 compatible
 - c++17: C++ code is C++17 compatible
-- c++20: C++ code is C++20 compatible (default)
+- c++20: C++ code is C++20 compatible
+- c++23: C++ code is C++23 compatible
+- c++26: C++ code is C++26 compatible (default)
 
 # Cppcheck build dir
 
@@ -441,7 +499,8 @@ build dir. For instance, the unusedFunction warnings require whole program analy
 
 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
 
@@ -451,19 +510,22 @@ 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 easiest way to get it is to use the --template=gcc command line flag. The id is shown in brackets.
+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 `?`.  
+`**`: matches zero or more characters, including path separators  
+`*`: matches zero or more characters, excluding path separators  
+`?`: matches any single character except path separators
 
-The filename may include the wildcard characters \* or ?, which matches any sequence of characters or any single character respectively. 
-It is recommended to use "/" 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.
+It is recommended to use forward-slash `/` in the filename pattern as path separator on all operating systems.
 
-## Command line suppression
+### 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:
 
@@ -494,6 +556,11 @@ 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:
@@ -531,6 +598,41 @@ Suppressing multiple ids in one comment by using []:
 
     // cppcheck-suppress [aaaa, bbbb]
 
+Suppressing warnings `aaaa` on a block of code:
+
+    // cppcheck-suppress-begin aaaa
+    ...
+    // cppcheck-suppress-end aaaa
+
+Suppressing multiple ids on a block of code:
+
+    // cppcheck-suppress-begin [aaaa, bbbb]
+    ...
+    // cppcheck-suppress-end [aaaa, bbbb]
+
+Suppressing warnings `aaaa` for a whole file:
+
+    // cppcheck-suppress-file aaaa
+
+Suppressing multiple ids for a whole file:
+
+    // cppcheck-suppress-file [aaaa, bbbb]
+
+Suppressing warnings `aaaa` where macro is used:
+
+    // cppcheck-suppress-macro aaaa
+    #define MACRO ...
+    ...
+    x = MACRO; // <- aaaa warnings are suppressed here
+
+
+Suppressing multiple ids where macro is used:
+
+    // cppcheck-suppress-macro [aaaa, bbbb]
+    #define MACRO ...
+    ...
+    x = MACRO; // <- aaaa and bbbb warnings are suppressed here
+
 ### Comment before code or on same line
 
 The comment can be put before the code or at the same line as the code.
@@ -667,6 +769,10 @@ this attribute is only used when the error message is inconclusive
 
 CWE ID for the problem; note that this attribute is only used when the CWE ID for the message is known
 
+**remark**
+
+Optional attribute. The related remark/justification from a remark comment.
+
 ## The `<location>` element
 
 All locations related to an error are listed with `<location>` elements. The primary location is listed first.
@@ -702,7 +808,8 @@ To get Visual Studio compatible output you can use --template=vs:
 This output will look like this:
 
     Checking samples/arrayIndexOutOfBounds/bad.c ...
-    samples/arrayIndexOutOfBounds/bad.c(6): error: Array 'a[2]' accessed at index 2, which is out of bounds.
+    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:
 
@@ -711,29 +818,36 @@ To get gcc compatible output you can use --template=gcc:
 The output will look like this:
 
     Checking samples/arrayIndexOutOfBounds/bad.c ...
-    samples/arrayIndexOutOfBounds/bad.c:6:6: warning: Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]
+    samples/arrayIndexOutOfBounds/bad.c:6:6: warning: Array
+    'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]
     a[2] = 0;
       ^
 
 ## User defined output format (single line)
 
-You can write your own pattern. For instance, to get warning messages that are formatted like traditional gcc, then the following format can be used:
+You can write your own pattern. For instance:
 
-    cppcheck --template="{file}:{line}: {severity}: {message}" samples/arrayIndexOutOfBounds/bad.c
+    cppcheck \
+    --template="{file}:{line}:{column}: {severity}:{message}" \
+    samples/arrayIndexOutOfBounds/bad.c
 
 The output will then look like this:
 
     Checking samples/arrayIndexOutOfBounds/bad.c ...
-    samples/arrayIndexOutOfBounds/bad.c:6: error: Array 'a[2]' accessed at index 2, which is out of bounds.
+    samples/arrayIndexOutOfBounds/bad.c:6:6: error: Array
+    'a[2]' accessed at index 2, which is out of bounds.
 
 A comma separated format:
 
-    cppcheck --template="{file},{line},{severity},{id},{message}" samples/arrayIndexOutOfBounds/bad.c
+    cppcheck \
+    --template="{file},{line},{severity},{id},{message}" \
+    samples/arrayIndexOutOfBounds/bad.c
 
 The output will look like this:
 
     Checking samples/arrayIndexOutOfBounds/bad.c ...
-    samples/arrayIndexOutOfBounds/bad.c,6,error,arrayIndexOutOfBounds,Array 'a[2]' accessed at index 2, which is out of bounds.
+    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)
 
@@ -755,7 +869,9 @@ 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}" --template-location="{file}:{line}: note: {info}\n{code}" multiline.c
+    cppcheck \
+    --template="{file}:{line}: {severity}: {message}\n{code}" \
+    --template-location="{file}:{line}: note: {info}\n{code}" multiline.c
 
 The output from Cppcheck is:
 
@@ -813,6 +929,10 @@ The warning message
 
 Warning id
 
+**{remark}**
+
+The remark text if a remark comment has been provided
+
 **{code}**
 
 The real code
@@ -865,6 +985,38 @@ Newline
 
 Carriage return
 
+# Justifications for warnings in the report
+
+You can add remark comments in the source code that justify why there is a warning/violation.
+
+Such a remark comment shall:
+
+- start with REMARK.
+- can either be added above the source code that generates the warning, or after the code on the same line.
+
+Example code:
+
+    void foo(void) {
+        // REMARK Initialize x with 0
+        int x = 0;
+    }
+
+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
+
+    Checking test1.c ...
+    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:
+
+    $ ./cppcheck --enable=style --xml test1.c
+    ....
+    remark="Initialize x with 0"
+    ....
+
 # Addons
 
 Addons are scripts that analyse Cppcheck dump files to check compatibility with secure coding standards and to locate issues.
@@ -877,53 +1029,150 @@ Cppcheck is distributed with a few addons which are listed below.
 
 [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.
 
-This standard is proprietary, and open source tools are not allowed to distribute the Misra rule texts. Therefore Cppcheck is not allowed to write the rule texts directly. Cppcheck is allowed to distribute the rules and display the id of each violated rule (for example, [c2012-21.3]). The corresponding rule text can also be written however you need to provide that. To get the rule texts, please buy the PDF from MISRA (https://www.misra.org.uk). If you copy the rule texts from "Appendix A - Summary of guidelines" in the PDF and write those in a text file, then by using that text file Cppcheck can write the proper warning messages. To see how the text file can be formatted, take a look at the files listed here: https://github.com/danmar/cppcheck/blob/main/addons/test/misra/. You can use the option `--rule-texts` to specify your rules text file.
+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 full list of supported rules is available on [Cppcheck](https://cppcheck.sourceforge.io/misra.php) home page.
+To load the rule texts, create a configuration file. Example `misra.json`:
 
-### y2038.py
+    {
+        "script": "misra.py",
+        "args": [
+            "--rule-texts=misra_c_2012__headlines_for_cppcheck - AMD1+AMD2.txt"
+        ],
+        "ctu": true
+    }
+
+To use that `misra.json` in Cppcheck analysis, use option `--addon=misra.json`:
+
+    cppcheck --addon=misra.json --enable=style somefile.c
+
+Misra checkers in open source Cppcheck only cover MISRA rules partially and for full coverage use Cppcheck Premium.
+
+### namingng.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).
+[namingng.py](https://github.com/danmar/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 source code for [year 2038 problem](https://en.wikipedia.org/wiki/Year_2038_problem) safety.
+
 ## Running Addons
 
-Addons could be run through Cppcheck command line utility as follows:
+Addons can be executed with the `--addon` option:
+
+    cppcheck --addon=namingng.py somefile.c
 
-    cppcheck --addon=misra.py somefile.c
+Likewise, if you have created your own script you can execute that:
 
-This will launch all Cppcheck checks and additionally calls specific checks provided by selected addon.
+    cppcheck --addon=mychecks.py somefile.c
 
-Some addons need extra arguments. You can configure how you want to execute an addon in a json file. For example put this in misra.json:
+You can configure how you want to execute an addon in a json file. For example:
 
     {
-        "script": "misra.py",
+        "script": "mychecks.py",
         "args": [
-            "--rule-texts=misra.txt"
-        ]
+            "--some-option"
+        ],
+        "ctu": false
     }
 
-And then the configuration can be executed on the Cppcheck command line:
-
-    cppcheck --addon=misra.json somefile.c
+To use that json file to execute your addon use the --addon option:
 
-By default Cppcheck would search addon at the standard path which was specified 
-during the installation process. You also can set this path directly, for example:
+    cppcheck --addon=mychecks.json somefile.c
 
-    cppcheck --addon=/opt/cppcheck/configurations/my_misra.json somefile.c
+Cppcheck search for addons in the local folder first and then in the installation folder. A different path can be specified explicitly, for instance:
 
-This allows you to create and manage multiple configuration files for different projects.
+    cppcheck --addon=path/to/my-addon.py somefile.c
 
 # Library configuration
 
-When external libraries are used, such as WinAPI, POSIX, gtk, Qt, etc, Cppcheck doesn't know how the external functions behave. Cppcheck then fails to detect various problems such as memory leaks, buffer overflows, possible null pointer dereferences, etc. But this can be fixed with 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 upload it to us.
-
-## Using your own custom .cfg file
+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.
 
@@ -949,32 +1198,67 @@ 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
-    htmlreport/cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.
+    cppcheck gui/test.cpp --xml 2> err.xml
+    cppcheck-htmlreport --file=err.xml --report-dir=test1 --source-dir=.
+
+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.
+
 ## Normal
 
 The "normal" check level is chosen by default. Our aim is that this checking level will provide an effective checking in "reasonable" time.
 
 The "normal" check level should be useful during active development:
- * checking files while you edit them.
- * block changes to the repo
- * etc
+
+- checking files while you edit them.
+- block changes to the repo
+- etc
 
 ## Exhaustive
 
 When you can wait longer for the results you can enable the "exhaustive" checking, by using the option `--check-level=exhaustive`.
 
 Exhaustive checking level should be useful for scenarios where you can wait for results. For instance:
- * nightly builds
- * etc
+
+- nightly builds
+- etc
 
 # Speeding up analysis
 
@@ -987,9 +1271,10 @@ For performance reasons it might be a good idea to limit preprocessor configurat
 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:
- * 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.
+
+- 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.
@@ -999,68 +1284,8 @@ analysis time explodes.
 In the GUI there are various options to limit analysis.
 
 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.
-
-# 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.
+- Open the project dialog.
+- In the "Analysis" tab there are several options.
 
-It is not intended to be used in normal CI or regular static analysis by developers. The noise makes it useless for that.
-
-It is intended to be used when you are looking for bugs and you really can accept noise. For example:
- * 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
-
-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.
-
-The Cppcheck bug hunting analysis is "soundy".
-
-Command:
-
-    cppcheck --premium=bughunting ....
-
-## Coding standards
-
-Command to active Autosar checkers:
-
-    cppcheck --premium=autosar ....
-
-Command to active Cert C checkers:
-
-    cppcheck --premium=cert-c ....
-
-Command to active Cert C++ checkers:
-
-    cppcheck --premium=cert-c++ ....
-
-Command to active Misra C++ 2008 checkers:
-
-    cppcheck --premium=misra-c++-2008 ....
-
-## Licenses
-
-### Individual license
-
-A license that is connected to your computer. You can check any code you want.
-
-### LOC license
-
-A license that allows you to run cppcheck on a limited number of lines of code. It can only be used for certain licensed paths in a repository.
-
-#### Running analysis
-
-Commands:
-
-    cd check-path
-
-    # Calculate lines of code and validate the license
-    premiumaddon --check-loc-license some-path/license-file > cppcheck-premium-loc
-
-    # Run cppcheck analysis
-    cppcheck <usual cppcheck parameters>
+If you want to use these limitations on the command line also you can import the GUI project file with --project.
diff --git a/man/reference-cfg-format.md b/man/reference-cfg-format.md
index 23116de306a..7a9e3b6dee7 100644
--- a/man/reference-cfg-format.md
+++ b/man/reference-cfg-format.md
@@ -1,6 +1,6 @@
 ---
 title: Cppcheck .cfg format
-subtitle: Version 2.11.99
+subtitle: Version 2.19 dev
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/writing-addons.md b/man/writing-addons.md
index 1204f59a9ae..da21ea513ad 100644
--- a/man/writing-addons.md
+++ b/man/writing-addons.md
@@ -1,6 +1,6 @@
 ---
 title: Writing addons
-subtitle: Version 2.11.99
+subtitle: Version 2.19 dev
 author: Cppcheck team
 lang: en
 documentclass: report
diff --git a/man/writing-rules-3.docbook b/man/writing-rules-3.docbook
index cb5b56787f2..76792cd069b 100644
--- a/man/writing-rules-3.docbook
+++ b/man/writing-rules-3.docbook
@@ -185,7 +185,7 @@ void CheckOther::invalidFunctionUsage()
                     {
                         // convert next token into a number
                         MathLib::bigint radix;
-                        radix = MathLib::toLongNumber(tok2-&gt;strAt(1));
+                        radix = MathLib::toBigNumber(tok2-&gt;strAt(1));
 
                         // invalid radix?
                         if (!(radix == 0 || (radix &gt;= 2 &amp;&amp; radix &lt;= 36)))
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
index b3a9b6ce9a6..ad7fb641024 100644
--- a/oss-fuzz/Makefile
+++ b/oss-fuzz/Makefile
@@ -1,21 +1,376 @@
-#
-# fuzzer clients
-# ====================
-#
-# Local libfuzzer client:
-# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" LIB_FUZZING_ENGINE="-fsanitize=fuzzer" oss-fuzz-client
+# This file is generated by dmake, do not edit.
 
-CPPCHECK_DIR=..
-INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/picojson -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml2 -I ${CPPCHECK_DIR}/externals
-SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/externals/tinyxml2/tinyxml2.cpp ${CPPCHECK_DIR}/lib/*.cpp
+# 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
 
-all:	oss-fuzz-client	translate
+MATCHCOMPILER=yes
+ifndef MATCHCOMPILER
+    MATCHCOMPILER=
+endif
+# use match compiler
+ifeq ($(MATCHCOMPILER),yes)
+    # Find available Python interpreter
+    ifeq ($(PYTHON_INTERPRETER),)
+        PYTHON_INTERPRETER := $(shell which python3)
+    endif
+    ifeq ($(PYTHON_INTERPRETER),)
+        PYTHON_INTERPRETER := $(shell which python)
+    endif
+    ifeq ($(PYTHON_INTERPRETER),)
+        $(error Did not find a Python interpreter)
+    endif
+    ifdef VERIFY
+        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) ../tools/matchcompiler.py --read-dir ../lib --verify)
+    else
+        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) ../tools/matchcompiler.py --read-dir ../lib)
+    endif
+    libcppdir:=build
+else ifeq ($(MATCHCOMPILER),)
+    libcppdir:=lib
+else
+    $(error invalid MATCHCOMPILER value '$(MATCHCOMPILER)')
+endif
 
-oss-fuzz-client:	main.cpp	type2.cpp	type2.h
-	${CXX} -std=c++11 -g ${CXXFLAGS} -o oss-fuzz-client ${INCLUDE_DIR} ${SRC_FILES} ${LIB_FUZZING_ENGINE}
+INCS=-I../lib -isystem../externals/simplecpp -isystem../externals/tinyxml2 -isystem../externals/picojson
 
-translate:	translate.cpp	type2.cpp	type2.h
-	${CXX} -std=c++11 -g ${CXXFLAGS} -o translate type2.cpp translate.cpp
+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 \
+              $(libcppdir)/symboldatabase.o \
+              $(libcppdir)/addoninfo.o \
+              $(libcppdir)/analyzerinfo.o \
+              $(libcppdir)/astutils.o \
+              $(libcppdir)/check.o \
+              $(libcppdir)/check64bit.o \
+              $(libcppdir)/checkassert.o \
+              $(libcppdir)/checkautovariables.o \
+              $(libcppdir)/checkbool.o \
+              $(libcppdir)/checkbufferoverrun.o \
+              $(libcppdir)/checkclass.o \
+              $(libcppdir)/checkcondition.o \
+              $(libcppdir)/checkers.o \
+              $(libcppdir)/checkersidmapping.o \
+              $(libcppdir)/checkersreport.o \
+              $(libcppdir)/checkexceptionsafety.o \
+              $(libcppdir)/checkfunctions.o \
+              $(libcppdir)/checkinternal.o \
+              $(libcppdir)/checkio.o \
+              $(libcppdir)/checkleakautovar.o \
+              $(libcppdir)/checkmemoryleak.o \
+              $(libcppdir)/checknullpointer.o \
+              $(libcppdir)/checkother.o \
+              $(libcppdir)/checkpostfixoperator.o \
+              $(libcppdir)/checksizeof.o \
+              $(libcppdir)/checkstl.o \
+              $(libcppdir)/checkstring.o \
+              $(libcppdir)/checktype.o \
+              $(libcppdir)/checkuninitvar.o \
+              $(libcppdir)/checkunusedfunctions.o \
+              $(libcppdir)/checkunusedvar.o \
+              $(libcppdir)/checkvaarg.o \
+              $(libcppdir)/clangimport.o \
+              $(libcppdir)/color.o \
+              $(libcppdir)/cppcheck.o \
+              $(libcppdir)/ctu.o \
+              $(libcppdir)/errorlogger.o \
+              $(libcppdir)/errortypes.o \
+              $(libcppdir)/findtoken.o \
+              $(libcppdir)/forwardanalyzer.o \
+              $(libcppdir)/fwdanalysis.o \
+              $(libcppdir)/importproject.o \
+              $(libcppdir)/infer.o \
+              $(libcppdir)/keywords.o \
+              $(libcppdir)/library.o \
+              $(libcppdir)/mathlib.o \
+              $(libcppdir)/path.o \
+              $(libcppdir)/pathanalysis.o \
+              $(libcppdir)/pathmatch.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 \
+              $(libcppdir)/suppressions.o \
+              $(libcppdir)/templatesimplifier.o \
+              $(libcppdir)/timer.o \
+              $(libcppdir)/token.o \
+              $(libcppdir)/tokenlist.o \
+              $(libcppdir)/utils.o \
+              $(libcppdir)/vf_analyzers.o \
+              $(libcppdir)/vf_common.o \
+              $(libcppdir)/vf_settokenvalue.o \
+              $(libcppdir)/vfvalue.o
+
+EXTOBJ =      simplecpp.o \
+              tinyxml2.o
+
+oss-fuzz-client: $(EXTOBJ) $(LIBOBJ) main.o type2.o
+	${CXX} ${CXXFLAGS} -o $@ $^ ${LIB_FUZZING_ENGINE}
+
+no-fuzz: $(EXTOBJ) $(LIBOBJ) main_nofuzz.o type2.o
+	${CXX} ${CXXFLAGS} -o $@ $^
+
+translate: translate.o type2.o
+	${CXX} -std=c++11 -g ${CXXFLAGS} -o $@ type2.cpp translate.cpp
 
 clean:
-	rm -f oss-fuzz-client translate
+	rm -f *.o build/*.o oss-fuzz-client no-fuzz translate
+
+preprare-samples:
+	rm -rf samples
+	mkdir -p samples
+	cp -R ../samples .
+	find ./samples -type f -name '*.txt' -exec rm -vf {} \;
+
+do-fuzz: oss-fuzz-client preprare-samples
+	mkdir -p corpus
+	./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 corpus samples ../test/cli/fuzz-crash ../test/cli/fuzz-crash_c ../test/cli/fuzz-timeout
+
+dedup-corpus: oss-fuzz-client preprare-samples
+	mv corpus corpus_
+	mkdir -p corpus
+	./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 corpus corpus_ samples ../test/cli/fuzz-crash ../test/cli/fuzz-crash_c ../test/cli/fuzz-timeout -merge=1
+
+# jobs:
+# ./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 corpus samples ../test/cli/fuzz-crash ../test/cli/fuzz-crash_c ../test/cli/fuzz-timeout -workers=12 -jobs=9
+
+# minimize:
+# ./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 -minimize_crash=1 crash-0123456789abcdef
+
+simplecpp.o: ../externals/simplecpp/simplecpp.cpp ../externals/simplecpp/simplecpp.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ ../externals/simplecpp/simplecpp.cpp
+
+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
+	$(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
+	$(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
+	$(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
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/addoninfo.cpp
+
+$(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
+	$(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/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)/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/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
+	$(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
+	$(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
+	$(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
+	$(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/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
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkcondition.cpp
+
+$(libcppdir)/checkers.o: ../lib/checkers.cpp ../lib/checkers.h ../lib/config.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkers.cpp
+
+$(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
+	$(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
+	$(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
+	$(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
+	$(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
+	$(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
+	$(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
+	$(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
+	$(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
+	$(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/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/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
+	$(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
+	$(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
+	$(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
+	$(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/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
+	$(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
+	$(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/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 ../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/regex.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/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/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)/errorlogger.cpp
+
+$(libcppdir)/errortypes.o: ../lib/errortypes.cpp ../lib/config.h ../lib/errortypes.h ../lib/utils.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errortypes.cpp
+
+$(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
+	$(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
+	$(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/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/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/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/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
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/path.cpp
+
+$(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
+	$(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
+	$(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
+	$(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
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/programmemory.cpp
+
+$(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/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
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
+
+$(libcppdir)/sarifreport.o: ../lib/sarifreport.cpp ../externals/picojson/picojson.h ../lib/addoninfo.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/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/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/pathmatch.h ../lib/platform.h ../lib/smallvector.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
+	$(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/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
+	$(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
+	$(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
+	$(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
+	$(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/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
+	$(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/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
+
+
+type2.o: type2.cpp type2.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ type2.cpp
+
+translate.o: translate.cpp type2.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ translate.cpp
+
+main.o: main.cpp type2.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ main.cpp
+
+main_nofuzz.o: main.cpp type2.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -DNO_FUZZ -c -o $@ main.cpp
diff --git a/oss-fuzz/main.cpp b/oss-fuzz/main.cpp
index be33779d104..8500bb966cb 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-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
@@ -17,9 +17,24 @@
  */
 
 #include "cppcheck.h"
-#include "type2.h"
+#include "errorlogger.h"
+#include "errortypes.h"
+#include "filesettings.h"
+#include "settings.h"
+#include "suppressions.h"
+
+#include <string>
 
-enum class Color;
+#ifndef NO_FUZZ
+#include <cstddef>
+#include <cstdint>
+
+#include "type2.h"
+#else
+#include <cstdlib>
+#include <fstream>
+#include <sstream>
+#endif
 
 class DummyErrorLogger : public ErrorLogger {
 public:
@@ -27,23 +42,66 @@ class DummyErrorLogger : public ErrorLogger {
     void reportErr(const ErrorMessage& /*msg*/) override {}
     void reportProgress(const std::string& /*filename*/,
                         const char /*stage*/[],
-                        const std::size_t /*value*/) override {} // FN
+                        const std::size_t /*value*/) override {}
+    void reportMetric(const std::string & /*metric*/) override {}
 };
 
+static Settings create_settings()
+{
+    // TODO: load std.cfg
+    Settings s;
+    s.templateFormat = "{bold}{file}:{line}:{column}: {red}{inconclusive:{magenta}}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}";
+    s.templateLocation = "{bold}{file}:{line}:{column}: {dim}note:{reset} {info}\\n{code}";
+    s.addEnabled("all");
+    s.certainty.setEnabled(Certainty::inconclusive, true);
+    return s;
+}
+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 uint8_t *data, size_t dataSize)
+{
+    Suppressions supprs;
+    CppCheck cppcheck(s_settings, supprs, s_errorLogger, nullptr, false, nullptr);
+    cppcheck.checkBuffer(s_file, reinterpret_cast<const char*>(data), dataSize);
+}
+
+#ifndef NO_FUZZ
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize);
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize)
 {
     if (dataSize < 10000) {
         const std::string code = generateCode2(data, dataSize);
-
-        DummyErrorLogger errorLogger;
-        CppCheck cppcheck(errorLogger, false, nullptr);
-        cppcheck.settings().addEnabled("all");
-        cppcheck.settings().certainty.setEnabled(Certainty::inconclusive, true);
-        cppcheck.check("test.cpp", code);
+        doCheck(reinterpret_cast<const unsigned char*>(code.data()), code.size());
     }
     return 0;
 }
+#else
+int main(int argc, char * argv[])
+{
+    if (argc < 2 || argc > 3)
+        return EXIT_FAILURE;
+
+    std::ifstream f(argv[1]);
+    if (!f.is_open())
+        return EXIT_FAILURE;
+
+    std::ostringstream oss;
+    oss << f.rdbuf();
+
+    if (!f.good())
+        return EXIT_FAILURE;
+
+    const int cnt = (argc == 3) ? std::stoi(argv[2]) : 1;
+
+    const std::string code = oss.str();
+    for (int i = 0; i < cnt; ++i)
+        doCheck(reinterpret_cast<const unsigned char*>(code.data()), code.size());
+
+    return EXIT_SUCCESS;
+}
+#endif
 
 
diff --git a/oss-fuzz/type2.cpp b/oss-fuzz/type2.cpp
index 0fe4ce343c4..e337864ed6c 100644
--- a/oss-fuzz/type2.cpp
+++ b/oss-fuzz/type2.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
@@ -19,7 +19,6 @@
 #include "type2.h"
 
 #include <cstring>
-#include <sstream>
 
 static int getValue(const uint8_t *data, size_t dataSize, uint8_t maxValue, bool *done = nullptr)
 {
@@ -54,19 +53,20 @@ static std::string generateExpression2_lvalue(const uint8_t *data, size_t dataSi
 
 static std::string generateExpression2_Op(const uint8_t *data, size_t dataSize, uint8_t numberOfGlobalConstants)
 {
-    std::ostringstream code;
+    std::string code;
     switch (getValue(data, dataSize, 3)) {
     case 0:
-        code << generateExpression2_lvalue(data, dataSize);
+        code += generateExpression2_lvalue(data, dataSize);
         break;
     case 1:
-        code << "globalconstant" << (1 + getValue(data, dataSize, numberOfGlobalConstants));
+        code += "globalconstant";
+        code += (1 + getValue(data, dataSize, numberOfGlobalConstants));
         break;
     case 2:
-        code << (getValue(data, dataSize, 0x80) * 0x80 + getValue(data, dataSize, 0x80));
+        code += (getValue(data, dataSize, 0x80) * 0x80 + getValue(data, dataSize, 0x80));
         break;
     }
-    return code.str();
+    return code;
 }
 
 static std::string generateExpression2_Expr(const uint8_t *data, size_t dataSize, uint8_t numberOfGlobalConstants, int depth=0)
@@ -130,12 +130,14 @@ static std::string generateExpression2_conditionalCode(const std::string &indent
                                                        size_t dataSize,
                                                        uint8_t numberOfGlobalConstants)
 {
-    std::ostringstream code;
+    std::string code;
 
     if (indent.empty())
-        code << functionStart();
-    else
-        code << indent << "{\n";
+        code += functionStart();
+    else {
+        code += indent;
+        code += "{\n";
+    }
 
     for (int line = 0; line < 4 || indent.empty(); ++line) {
         bool done = false;
@@ -150,37 +152,60 @@ static std::string generateExpression2_conditionalCode(const std::string &indent
                           ((type1 >= 5) ? mostLikelyType : type1);
 
         if (type2 == 0) {
-            code << indent << "    var" << getValue(data, dataSize, 5) << "=" << generateExpression2_Expr(data, dataSize, numberOfGlobalConstants) << ";\n";
+            code += indent;
+            code += "    var";
+            code += getValue(data, dataSize, 5);
+            code += "=";
+            code += generateExpression2_Expr(data, dataSize, numberOfGlobalConstants);
+            code += ";\n";
         } else if (type2 == 1) {
-            code << indent << "    if (" << generateExpression2_Cond(data, dataSize, numberOfGlobalConstants) << ")\n";
-            code << generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
+            code += indent;
+            code += "    if (";
+            code += generateExpression2_Cond(data, dataSize, numberOfGlobalConstants);
+            code += ")\n";
+            code += generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
         } else if (type2 == 2) {
-            code << indent << "    if (" << generateExpression2_Cond(data, dataSize, numberOfGlobalConstants) << ")\n";
-            code << generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
-            code << indent << "    else\n";
-            code << generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
+            code += indent;
+            code += "    if (";
+            code += generateExpression2_Cond(data, dataSize, numberOfGlobalConstants);
+            code += ")\n";
+            code += generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
+            code += indent;
+            code += "    else\n";
+            code += generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
         } else if (type2 == 3) {
-            code << indent << "    while (" << generateExpression2_Cond(data, dataSize, numberOfGlobalConstants) << ")\n";
-            code << generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
+            code += indent;
+            code += "    while (";
+            code += generateExpression2_Cond(data, dataSize, numberOfGlobalConstants);
+            code += ")\n";
+            code += generateExpression2_conditionalCode(indent + "    ", data, dataSize, numberOfGlobalConstants);
         } else if (type2 == 4) {
-            code << indent << "    return " << generateExpression2_Expr(data, dataSize, numberOfGlobalConstants) << ";\n";
-            if (indent.empty())
-                code << "}\n\n" << functionStart();
+            code += indent;
+            code += "    return ";
+            code += generateExpression2_Expr(data, dataSize, numberOfGlobalConstants);
+            code += ";\n";
+            if (indent.empty()) {
+                code += "}\n\n";
+                code += functionStart();
+            }
             else
                 break;
         }
     }
 
-    if (!indent.empty())
-        code << indent << "}\n";
-    else
-        code << "    return 0;\n}\n";
-    return code.str();
+    if (!indent.empty()) {
+        code += indent;
+        code += "}\n";
+    }
+    else {
+        code += "    return 0;\n}\n";
+    }
+    return code;
 }
 
 std::string generateCode2(const uint8_t *data, size_t dataSize)
 {
-    std::ostringstream code;
+    std::string code;
 
     // create global constants
     constexpr uint8_t numberOfGlobalConstants = 0;
@@ -192,15 +217,15 @@ std::string generateCode2(const uint8_t *data, size_t dataSize)
        }
      */
 
-    code << "int var1 = 1;\n"
-        "int var2 = 0;\n"
-        "int var3 = 1;\n"
-        "int var4 = 0;\n"
-        "int var5 = -1;\n\n";
+    code += "int var1 = 1;\n"
+            "int var2 = 0;\n"
+            "int var3 = 1;\n"
+            "int var4 = 0;\n"
+            "int var5 = -1;\n\n";
 
-    code << generateExpression2_conditionalCode("", data, dataSize, numberOfGlobalConstants);
+    code += generateExpression2_conditionalCode("", data, dataSize, numberOfGlobalConstants);
 
-    return code.str();
+    return code;
 }
 
 
diff --git a/oss-fuzz/type2.h b/oss-fuzz/type2.h
index 8a7997b19ec..f382cbd9ef0 100644
--- a/oss-fuzz/type2.h
+++ b/oss-fuzz/type2.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2022 Cppcheck team.
+ * 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
diff --git a/philosophy.md b/philosophy.md
index 96cda35a357..af61a1cd38f 100644
--- a/philosophy.md
+++ b/philosophy.md
@@ -5,6 +5,12 @@ It is important that everybody in the Cppcheck team has a consistent idea about
 
 This is a static analyzer tool.
 
+## Usability
+
+Usability is very important. It's more important that Cppcheck is usable than finding all bugs.
+ - We don't want to have tons of configurations options.
+ - It's very important that warning messages are well written and with enough details.
+ - Speed is very important. --check-level=exhaustive can be used when user accept slow analysis.
 
 ## Normal analysis - No false positives
 
@@ -12,9 +18,9 @@ A fundamental goal is "no false positives".
 
 It is not possible to achieve "no false positives" completely. One case where false positives are OK is when the code is garbage.
 
-If the code is written as it is by design, then our goal is to not warn.
+If the code is written as it is by design, then our goal is to not show any false positives.
 
-If it is not known if there is a problem, then in general we need to bailout. We can only warn when we see that there is a problem.
+If it is not known if there is a problem, then in general we need to bailout to avoid false positives. We can only warn when we see that there is a problem.
 
 Stylistic checks are much more prone to false positives and therefore we should avoid writing stylistic checks mostly.
 
@@ -24,7 +30,10 @@ Reporting issues in Trac:
 
 ### Inconclusive messages
 
-Inconclusive messages will be created if cppcheck cannot be sure there is an issue to warn but 50-50 probability. User shall enable inconclusive messages if they are willing to spend substantially more time on message verification in order to find more issues within a high false positive rate.
+If cppcheck can't determine that there is a problem or not, then the analysis is inconclusive.
+
+If the user enables inconclusive warnings and we guess that the probability there is a real problem is at least 50-50 then it's OK to write a inconclusive warning.
+
 Inconclusive messages shall not be used for new checks which are just being developed. There `settings.experimental` can be used.
 
 
diff --git a/platforms/unix32-unsigned.xml b/platforms/unix32-unsigned.xml
deleted file mode 100644
index b2a56502ef7..00000000000
--- a/platforms/unix32-unsigned.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<platform>
-  <char_bit>8</char_bit>
-  <default-sign>unsigned</default-sign>
-  <sizeof>
-    <bool>1</bool>
-    <short>2</short>
-    <int>4</int>
-    <long>4</long>
-    <long-long>8</long-long>
-    <float>4</float>
-    <double>8</double>
-    <long-double>12</long-double>
-    <pointer>4</pointer>
-    <size_t>4</size_t>
-    <wchar_t>2</wchar_t>
-  </sizeof>
-</platform>
diff --git a/platforms/unix64-unsigned.xml b/platforms/unix64-unsigned.xml
deleted file mode 100644
index 818c2841580..00000000000
--- a/platforms/unix64-unsigned.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<platform>
-  <char_bit>8</char_bit>
-  <default-sign>unsigned</default-sign>
-  <sizeof>
-    <bool>1</bool>
-    <short>2</short>
-    <int>4</int>
-    <long>8</long>
-    <long-long>8</long-long>
-    <float>4</float>
-    <double>8</double>
-    <long-double>16</long-double>
-    <pointer>8</pointer>
-    <size_t>8</size_t>
-    <wchar_t>4</wchar_t>
-  </sizeof>
-</platform>
diff --git a/pylintrc_travis b/pylintrc_travis
deleted file mode 100644
index 547417375a0..00000000000
--- a/pylintrc_travis
+++ /dev/null
@@ -1,23 +0,0 @@
-[MESSAGES CONTROL]
-disable=C,R,W
-enable=mixed-indentation,
-       trailing-whitespace,
-       print-statement,
-       literal-comparison,
-       unnecessary-semicolon,
-       mixed-line-endings,
-       bad-open-mode,
-       redundant-unittest-assert,
-       boolean-datetime,
-       deprecated-method,
-       anomalous-unicode-escape-in-string,
-       anomalous-backslash-in-string,
-       bad-indentation
-[REPORTS]
-reports=no
-[TYPECHECK]
-# See https://stackoverflow.com/questions/10300082/how-to-prevent-python-pylint-complaining-about-socket-class-sendall-method
-ignored-classes=SQLObject,_socketobject
-[MASTER]
-init-hook='import sys; sys.path.append("./addons")'
-suggestion-mode=yes
diff --git a/readme.md b/readme.md
index ccb6ae17d10..72f368b3293 100644
--- a/readme.md
+++ b/readme.md
@@ -1,8 +1,9 @@
 # **Cppcheck** 
 
-OSS-Fuzz|Coverity Scan Build Status|License|
-|:--:|:--:|:--:|
-[![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)|[![License](https://img.shields.io/badge/license-GPL3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0) 
+|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)
+
 
 ## About the name
 
@@ -16,10 +17,18 @@ 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 script: `python cppcheck/tools/donate-cpu.py`.
+ 2. Run (Linux/MacOS example):
+    ```
+    cd cppcheck/
+    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.
 
@@ -27,30 +36,29 @@ You can stop the script whenever you like with Ctrl C.
 
 ## 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.
+Cppcheck requires a C++ compiler with (partial) C++11 support. Minimum required versions are GCC 5.1 / Clang 3.5 / Visual Studio 2015.
 
-To build the GUI, you need Qt.
+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:
-* qmake - cross platform build tool
-* cmake - cross platform build tool
-* Windows: Visual Studio (VS 2013 and above)
-* Windows: Qt Creator + mingw
-* gnu make
-* g++ 4.8 (or later)
-* clang++
+* CMake - cross platform build tool
+* (Windows) Visual Studio
+* (Windows) Qt Creator + MinGW
+* GNU compilers - via make or directly
+
+The minimum required Python version is 3.7.
+
+### CMake
 
-### cmake
+The minimum required version is CMake 3.13.
 
 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.
@@ -62,6 +70,9 @@ For rules support (requires pcre) use the flag.
 For release builds it is recommended that you use:
 -DUSE_MATCHCOMPILER=ON
 
+For building the tests use the flag.
+-DBUILD_TESTS=ON
+
 Using cmake you can generate project files for Visual Studio,XCode,etc.
 
 #### Building a specific configuration
@@ -69,29 +80,15 @@ Using cmake you can generate project files for Visual Studio,XCode,etc.
 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
-```
-
-### qmake
-
-You can use the gui/gui.pro file to build the GUI.
-
-```shell
-cd gui
-qmake
-make
+cmake -S . -B build
+cmake --build build --config RelWithDebInfo
 ```
 
 ### Visual Studio
@@ -179,7 +176,9 @@ For debugging create a launch.json file in the .vscode folder with the following
 The PCRE dll is needed to build the CLI. It can be downloaded here:
 http://software-download.name/pcre-library-windows/
 
-### GNU make
+### GNU compilers
+
+#### GNU make
 
 Simple, unoptimized build (no dependencies):
 
@@ -187,39 +186,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
 
@@ -255,13 +256,39 @@ 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/>
-*Note:* The non-Windows packages are not maintained by the Cppcheck team but by the respective packagers instead.
 
-- (Windows) An official Windows installer is available via the official Cppcheck SourceForge page: https://cppcheck.sourceforge.io/.
-- (Linux/Unix) Many major distros offer Cppcheck packages via their integrated package managers (`yum`, `apt`, `pacman`, etc.). See https://pkgs.org/search/?q=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 provide up-to-date packages. 
-- (Linux/Unix) The Canonical Snapcraft package is unmaintained and contains a very old version. Please refrain from using it! 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#default.
+### 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/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
+
+Third-party packages are ***not*** maintained by the Cppcheck team but their respective packagers.
+
+*Note:* The following 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/danmar/cppcheck/tags). Some packages might not carry the latest patch version though.
+
+*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.
+
+- (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
 
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index 06b24b7f0a5..00000000000
--- a/readme.txt
+++ /dev/null
@@ -1,123 +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:
-      * qmake - cross platform build tool
-      * 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
-
-    qmake
-    =====
-        You can use the gui/gui.pro file to build the GUI.
-            cd gui
-            qmake
-            make
-
-    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 27770202fbd..6d9dae60c95 100644
--- a/readmeja.md
+++ b/readmeja.md
@@ -23,7 +23,6 @@ GUIも利用する場合、Qtライブラリが必要です。
 コマンドラインツールをビルドする場合、[PCRE](http://www.pcre.org/)はオプションです。これはルールを作成するために利用します。
 
 コンパイル上の選択肢がいくつかあります。
-* qmake - クロスプラットフォームのビルドツール
 * cmake - クロスプラットフォームのビルドツール
 * Windows: Visual Studio (VS 2013 またはそれ以上)
 * Windows: Qt Creator + mingw
@@ -51,16 +50,6 @@ CppcheckのGUIが必要な場合次のフラグを指定します。
 pcreが必要になりますが、正規表現のルールサポートが必要な場合次のフラグを指定します。
 -DHAVE_RULES=ON
 
-### qmake
-
-GUIをビルドするには、gui/gui.proファイルが利用できます。
-
-```shell
-cd gui
-qmake
-make
-```
-
 ### Visual Studio
 
 cppcheck.slnファイルが利用できます。このファイルは、Visual Studio 2019向けです。しかし、このプラットフォームツールセットはこれより新しいバージョンまたは古いバージョン向けに変更できます。このソルーションには、プラットフォームターゲットとしてx86とx64があります。
@@ -83,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"
 ```
 
 フラグ:
@@ -97,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 225e5b67917..f130e957aec 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,11 +1,21 @@
-release notes for cppcheck-2.12
+
+Release Notes for Cppcheck 2.20
+
+Major bug fixes & crashes:
+-
 
 New checks:
+-
 
-Improved checking:
+C/C++ support:
+-
 
 GUI:
+-
 
 Changed interface:
+- removed CMake option "DISABLE_CRTDBG_MAP_ALLOC"
+-
 
-Other:
+Infrastructure & dependencies:
+-
diff --git a/rules/error-reporting.xml b/rules/error-reporting.xml
deleted file mode 100644
index 2813c9bba65..00000000000
--- a/rules/error-reporting.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<rule version="1">
-    <pattern>Severity :: fromString \( "\w+" \)</pattern>
-    <message>
-        <id>ConstantSeverityFromString</id>
-        <severity>style</severity>
-        <summary>Constant severity lookups should be done via
-Severity::constant.</summary>
-    </message>
-</rule>
diff --git a/rules/token-matching.xml b/rules/token-matching.xml
deleted file mode 100644
index 8b7823c05da..00000000000
--- a/rules/token-matching.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<rules>
-  <rule version="1">
-    <pattern>Token :: (?:findm|(?:simple|)M)atch \([^,]+,\s+"(?:\s+|[^"]+?\s+")</pattern>
-    <message>
-      <id>TokenMatchSpacing</id>
-      <severity>style</severity>
-      <summary>Useless extra spacing for Token::*Match.</summary>
-    </message>
-  </rule>
-  <rule version="1">
-    <pattern>(?U)Token :: Match \([^,]+,\s+"[^%|!\[\]]+" \)</pattern>
-    <message>
-      <id>UseTokensimpleMatch</id>
-      <severity>error</severity>
-      <summary>Token::simpleMatch should be used to match tokens without special pattern requirements.</summary>
-    </message>
-  </rule>
-  <rule version="1">
-    <pattern>\b[\w_]+ \. tokAt \( 0 \)</pattern>
-    <message>
-      <id>TokentokAt0</id>
-      <severity>error</severity>
-      <summary>tok-&gt;tokAt(0) is a slow way to say tok.</summary>
-    </message>
-  </rule>
-  <rule version="1">
-    <pattern>\b[\w_]+ \. strAt \( 0 \)</pattern>
-    <message>
-      <id>TokenstrAt0</id>
-      <severity>error</severity>
-      <summary>tok-&gt;strAt(0) is a slow way to say tok-&gt;str()</summary>
-    </message>
-  </rule>
-  <rule version="1">
-    <pattern><![CDATA[Token :: Match \( (\b\w+\b) , \"%var%\" \) && (\b\1\b) \. variable \( \)]]></pattern>
-    <message>
-      <id>TokenMatchVariable</id>
-      <severity>error</severity>
-      <summary>Simplify 'Token :: Match ( expr , %var% ) &amp;&amp; expr-&gt;variable()' to 'expr-&gt;variable()'</summary>
-    </message>
-  </rule>
-</rules>
diff --git a/runformat b/runformat
index bb8c457468b..f823229ecc7 100755
--- a/runformat
+++ b/runformat
@@ -1,11 +1,17 @@
 #!/bin/bash
 #
-# uncrustify-0.72 is used to format cppcheck source code.
-# source code: https://github.com/uncrustify/uncrustify/archive/refs/tags/uncrustify-0.72.0.zip
-# building in Linux: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make
-# building in Windows: mkdir build && cd build && cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release .. && nmake
+# 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.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
+#    - Windows: mkdir build && cd build && cmake -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=Release .. && nmake
+# 3. Ensure that the binary "uncrustify" is found by runformat. Either:
+#    - 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.]+')
@@ -38,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/AssignmentAddressToInteger/bad.c b/samples/AssignmentAddressToInteger/bad.c
index dcef286d6c2..0910cf0c902 100644
--- a/samples/AssignmentAddressToInteger/bad.c
+++ b/samples/AssignmentAddressToInteger/bad.c
@@ -1,4 +1,4 @@
-int foo(int *p)
+static int foo(int *p)
 {
     int a = p;
     return a + 4;
diff --git a/samples/AssignmentAddressToInteger/good.c b/samples/AssignmentAddressToInteger/good.c
index e52e11c16b5..ca2bdd961ff 100644
--- a/samples/AssignmentAddressToInteger/good.c
+++ b/samples/AssignmentAddressToInteger/good.c
@@ -1,4 +1,4 @@
-int* foo(int *p)
+static int* foo(int *p)
 {
     return p + 4;
 }
diff --git a/samples/accessMoved/bad.cpp b/samples/accessMoved/bad.cpp
new file mode 100644
index 00000000000..bab99668ea8
--- /dev/null
+++ b/samples/accessMoved/bad.cpp
@@ -0,0 +1,9 @@
+void foo(std::string);
+
+int main()
+{
+    std::string s = "test";
+    foo(std::move(s));
+
+    std::cout << s << std::endl;
+}
diff --git a/samples/accessMoved/good.cpp b/samples/accessMoved/good.cpp
new file mode 100644
index 00000000000..1dbc465db13
--- /dev/null
+++ b/samples/accessMoved/good.cpp
@@ -0,0 +1,9 @@
+void foo(std::string);
+
+int main()
+{
+    std::string s = "test";
+    foo(s);
+
+    std::cout << s << std::endl;
+}
diff --git a/samples/accessMoved/out.txt b/samples/accessMoved/out.txt
new file mode 100644
index 00000000000..1f04563d6da
--- /dev/null
+++ b/samples/accessMoved/out.txt
@@ -0,0 +1,9 @@
+samples\accessMoved\bad.cpp:8:18: warning: Access of moved variable 's'. [accessMoved]
+    std::cout << s << std::endl;
+                 ^
+samples\accessMoved\bad.cpp:6:9: note: Calling std::move(s)
+    foo(std::move(s));
+        ^
+samples\accessMoved\bad.cpp:8:18: note: Access of moved variable 's'.
+    std::cout << s << std::endl;
+                 ^
diff --git a/samples/arrayIndexOutOfBounds/out.txt b/samples/arrayIndexOutOfBounds/out.txt
deleted file mode 100644
index bb8c14037bf..00000000000
--- a/samples/arrayIndexOutOfBounds/out.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-samples\arrayIndexOutOfBounds\bad.c:7:6: error: Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]
-    a[2] = 0;
-     ^
diff --git a/samples/arrayIndexOutOfBounds/bad.c b/samples/arrayIndexOutOfBounds_1/bad.c
similarity index 100%
rename from samples/arrayIndexOutOfBounds/bad.c
rename to samples/arrayIndexOutOfBounds_1/bad.c
diff --git a/samples/arrayIndexOutOfBounds/good.c b/samples/arrayIndexOutOfBounds_1/good.c
similarity index 100%
rename from samples/arrayIndexOutOfBounds/good.c
rename to samples/arrayIndexOutOfBounds_1/good.c
diff --git a/samples/arrayIndexOutOfBounds_1/out.txt b/samples/arrayIndexOutOfBounds_1/out.txt
new file mode 100644
index 00000000000..c1ed04774d8
--- /dev/null
+++ b/samples/arrayIndexOutOfBounds_1/out.txt
@@ -0,0 +1,3 @@
+samples\arrayIndexOutOfBounds_1\bad.c:7:6: error: Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]
+    a[2] = 0;
+     ^
diff --git a/samples/arrayIndexOutOfBounds_2/bad.c b/samples/arrayIndexOutOfBounds_2/bad.c
new file mode 100644
index 00000000000..169a2d1dea3
--- /dev/null
+++ b/samples/arrayIndexOutOfBounds_2/bad.c
@@ -0,0 +1,8 @@
+int main()
+{
+    int a[2];
+    int i;
+    for (i = 0; i < 3; i++)
+        a[i] = 0;
+    return a[0];
+}
diff --git a/samples/arrayIndexOutOfBounds_2/good.c b/samples/arrayIndexOutOfBounds_2/good.c
new file mode 100644
index 00000000000..62fa9eb55d2
--- /dev/null
+++ b/samples/arrayIndexOutOfBounds_2/good.c
@@ -0,0 +1,8 @@
+int main()
+{
+    int a[3];
+    int i;
+    for (i = 0; i < 3; i++)
+        a[i] = 0;
+    return a[0];
+}
diff --git a/samples/arrayIndexOutOfBounds_2/out.txt b/samples/arrayIndexOutOfBounds_2/out.txt
new file mode 100644
index 00000000000..9fcc517dedd
--- /dev/null
+++ b/samples/arrayIndexOutOfBounds_2/out.txt
@@ -0,0 +1,9 @@
+samples\arrayIndexOutOfBounds_2\bad.c:6:10: error: Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]
+        a[i] = 0;
+         ^
+samples\arrayIndexOutOfBounds_2\bad.c:5:19: note: Assuming that condition 'i<3' is not redundant
+    for (i = 0; i < 3; i++)
+                  ^
+samples\arrayIndexOutOfBounds_2\bad.c:6:10: note: Array index out of bounds
+        a[i] = 0;
+         ^
diff --git a/samples/autoVariables/bad.c b/samples/autoVariables/bad.c
index 0b4287d288e..9f4d0641049 100644
--- a/samples/autoVariables/bad.c
+++ b/samples/autoVariables/bad.c
@@ -1,4 +1,4 @@
-void foo(int **a)
+static void foo(int **a)
 {
     int b = 1;
     *a = &b;
diff --git a/samples/autoVariables/good.c b/samples/autoVariables/good.c
index 6e74a8e6d56..d94869262f7 100644
--- a/samples/autoVariables/good.c
+++ b/samples/autoVariables/good.c
@@ -1,4 +1,4 @@
-void foo(int **a)
+static void foo(int **a)
 {
     int b = 1;
     **a = b;
diff --git a/samples/bufferAccessOutOfBounds/bad.c b/samples/bufferAccessOutOfBounds/bad.c
index 169a2d1dea3..e52bdb6a195 100644
--- a/samples/bufferAccessOutOfBounds/bad.c
+++ b/samples/bufferAccessOutOfBounds/bad.c
@@ -1,8 +1,7 @@
+#include <stdio.h>
 int main()
 {
-    int a[2];
-    int i;
-    for (i = 0; i < 3; i++)
-        a[i] = 0;
-    return a[0];
+    char str[5];
+    strcpy(str, "0123456789abcdef");
+    return 0;
 }
diff --git a/samples/bufferAccessOutOfBounds/good.c b/samples/bufferAccessOutOfBounds/good.c
index 62fa9eb55d2..21bcabab1af 100644
--- a/samples/bufferAccessOutOfBounds/good.c
+++ b/samples/bufferAccessOutOfBounds/good.c
@@ -1,8 +1,7 @@
+#include <stdio.h>
 int main()
 {
-    int a[3];
-    int i;
-    for (i = 0; i < 3; i++)
-        a[i] = 0;
-    return a[0];
+    char str[10];
+    snprintf(str, 10, "%s", "abc");
+    return 0;
 }
diff --git a/samples/bufferAccessOutOfBounds/out.txt b/samples/bufferAccessOutOfBounds/out.txt
index f166c371f0f..11c9d04a597 100644
--- a/samples/bufferAccessOutOfBounds/out.txt
+++ b/samples/bufferAccessOutOfBounds/out.txt
@@ -1,3 +1,3 @@
-samples\bufferAccessOutOfBounds\bad.c:6:10: error: Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]
-        a[i] = 0;
-         ^
+samples\bufferAccessOutOfBounds\bad.c:5:12: error: Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]
+    strcpy(str, "0123456789abcdef");
+           ^
diff --git a/samples/erase/out.txt b/samples/erase/out.txt
deleted file mode 100644
index d6f3852b657..00000000000
--- a/samples/erase/out.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-samples\erase\bad.cpp:9:32: error: Using iterator to local container 'items' that may be invalid. [invalidContainer]
-    for (iter = items.begin(); iter != items.end(); ++iter) {
-                               ^
-samples\erase\bad.cpp:9:17: note: Iterator to container is created here.
-    for (iter = items.begin(); iter != items.end(); ++iter) {
-                ^
-samples\erase\bad.cpp:10:19: note: Assuming condition is true.
-        if (*iter == 2) {
-                  ^
-samples\erase\bad.cpp:10:19: note: Assuming condition is true.
-        if (*iter == 2) {
-                  ^
-samples\erase\bad.cpp:9:37: note: Assuming condition is true.
-    for (iter = items.begin(); iter != items.end(); ++iter) {
-                                    ^
-samples\erase\bad.cpp:11:13: note: After calling 'erase', iterators or references to the container's data may be invalid .
-            items.erase(iter);
-            ^
-samples\erase\bad.cpp:4:22: note: Variable created here.
-    std::vector<int> items;
-                     ^
-samples\erase\bad.cpp:9:32: note: Using iterator to local container 'items' that may be invalid.
-    for (iter = items.begin(); iter != items.end(); ++iter) {
-                               ^
diff --git a/samples/incorrectLogicOperator/bad.c b/samples/incorrectLogicOperator/bad.c
new file mode 100644
index 00000000000..c3f80d8a71f
--- /dev/null
+++ b/samples/incorrectLogicOperator/bad.c
@@ -0,0 +1,6 @@
+
+static void foo(int x) {
+    if (x >= 0 || x <= 10) {}
+}
+
+dummy=foo();
diff --git a/samples/incorrectLogicOperator/good.c b/samples/incorrectLogicOperator/good.c
new file mode 100644
index 00000000000..0dc96bd8a28
--- /dev/null
+++ b/samples/incorrectLogicOperator/good.c
@@ -0,0 +1,6 @@
+
+static void foo(int x) {
+    if (x >= 0 && x <= 10) {}
+}
+
+dummy=foo();
diff --git a/samples/incorrectLogicOperator/out.txt b/samples/incorrectLogicOperator/out.txt
new file mode 100644
index 00000000000..e6cf2c5f76f
--- /dev/null
+++ b/samples/incorrectLogicOperator/out.txt
@@ -0,0 +1,3 @@
+samples\incorrectLogicOperator\bad.c:3:16: warning: Logical disjunction always evaluates to true: x >= 0 || x <= 10. [incorrectLogicOperator]
+    if (x >= 0 || x <= 10) {}
+               ^
diff --git a/samples/erase/bad.cpp b/samples/invalidContainer/bad.cpp
similarity index 100%
rename from samples/erase/bad.cpp
rename to samples/invalidContainer/bad.cpp
diff --git a/samples/erase/good.cpp b/samples/invalidContainer/good.cpp
similarity index 100%
rename from samples/erase/good.cpp
rename to samples/invalidContainer/good.cpp
diff --git a/samples/invalidContainer/out.txt b/samples/invalidContainer/out.txt
new file mode 100644
index 00000000000..767cf898643
--- /dev/null
+++ b/samples/invalidContainer/out.txt
@@ -0,0 +1,24 @@
+samples\invalidContainer\bad.cpp:9:32: error: inconclusive: Using iterator to local container 'items' that may be invalid. [invalidContainer]
+    for (iter = items.begin(); iter != items.end(); ++iter) {
+                               ^
+samples\invalidContainer\bad.cpp:9:28: note: Iterator to container is created here.
+    for (iter = items.begin(); iter != items.end(); ++iter) {
+                           ^
+samples\invalidContainer\bad.cpp:10:19: note: Assuming condition is true.
+        if (*iter == 2) {
+                  ^
+samples\invalidContainer\bad.cpp:10:19: note: Assuming condition is true.
+        if (*iter == 2) {
+                  ^
+samples\invalidContainer\bad.cpp:9:37: note: Assuming condition is true.
+    for (iter = items.begin(); iter != items.end(); ++iter) {
+                                    ^
+samples\invalidContainer\bad.cpp:11:19: note: After calling 'erase', iterators or references to the container's data may be invalid .
+            items.erase(iter);
+                  ^
+samples\invalidContainer\bad.cpp:4:22: note: Variable created here.
+    std::vector<int> items;
+                     ^
+samples\invalidContainer\bad.cpp:9:32: note: Using iterator to local container 'items' that may be invalid.
+    for (iter = items.begin(); iter != items.end(); ++iter) {
+                               ^
diff --git a/samples/memleak/bad.c b/samples/memleak/bad.c
index c61a8309cbf..47797f7b08e 100644
--- a/samples/memleak/bad.c
+++ b/samples/memleak/bad.c
@@ -1,9 +1,11 @@
 #include <stdlib.h>
 int main()
 {
-    int result;
+    int result = 0;
     char *a = malloc(10);
-    a[0] = 0;
-    result = a[0];
+    if (a) {
+        a[0] = 0;
+        result = a[0];
+    }
     return result;
 }
diff --git a/samples/memleak/good.c b/samples/memleak/good.c
index 862f35fc7f9..8bf183ab961 100644
--- a/samples/memleak/good.c
+++ b/samples/memleak/good.c
@@ -1,10 +1,12 @@
 #include <stdlib.h>
 int main()
 {
-    int result;
+    int result = 0;
     char *a = malloc(10);
-    a[0] = 0;
-    result = a[0];
-    free(a);
+    if (a) {
+        a[0] = 0;
+        result = a[0];
+        free(a);
+    }
     return result;
 }
diff --git a/samples/memleak/out.txt b/samples/memleak/out.txt
index 263ac1b1a08..1165e14d299 100644
--- a/samples/memleak/out.txt
+++ b/samples/memleak/out.txt
@@ -1,3 +1,3 @@
-samples/memleak/bad.c:8:5: error: Memory leak: a [memleak]
+samples\memleak\bad.c:10:5: error: Memory leak: a [memleak]
     return result;
     ^
diff --git a/samples/multiCondition/bad.c b/samples/multiCondition/bad.c
new file mode 100644
index 00000000000..dd352a189bf
--- /dev/null
+++ b/samples/multiCondition/bad.c
@@ -0,0 +1,11 @@
+static void f(bool b)
+{
+    if (b) {}
+    else if (!b) {}
+}
+
+int main()
+{
+    f(true);
+    return 0;
+}
diff --git a/samples/multiCondition/good.c b/samples/multiCondition/good.c
new file mode 100644
index 00000000000..715844f85ca
--- /dev/null
+++ b/samples/multiCondition/good.c
@@ -0,0 +1,11 @@
+static void f(bool b)
+{
+    if (b) {}
+    else {}
+}
+
+int main()
+{
+    f(true);
+    return 0;
+}
\ No newline at end of file
diff --git a/samples/multiCondition/out.txt b/samples/multiCondition/out.txt
new file mode 100644
index 00000000000..8753c103594
--- /dev/null
+++ b/samples/multiCondition/out.txt
@@ -0,0 +1,9 @@
+samples\multiCondition\bad.c:4:14: style: Expression is always true because 'else if' condition is opposite to previous condition at line 3. [multiCondition]
+    else if (!b) {}
+             ^
+samples\multiCondition\bad.c:3:9: note: first condition
+    if (b) {}
+        ^
+samples\multiCondition\bad.c:4:14: note: else if condition is opposite to first condition
+    else if (!b) {}
+             ^
diff --git a/samples/outOfBounds/bad.c b/samples/outOfBounds/bad.c
deleted file mode 100644
index e52bdb6a195..00000000000
--- a/samples/outOfBounds/bad.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-int main()
-{
-    char str[5];
-    strcpy(str, "0123456789abcdef");
-    return 0;
-}
diff --git a/samples/outOfBounds/good.c b/samples/outOfBounds/good.c
deleted file mode 100644
index 21bcabab1af..00000000000
--- a/samples/outOfBounds/good.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-int main()
-{
-    char str[10];
-    snprintf(str, 10, "%s", "abc");
-    return 0;
-}
diff --git a/samples/outOfBounds/out.txt b/samples/outOfBounds/out.txt
deleted file mode 100644
index 9ce3af4a5a8..00000000000
--- a/samples/outOfBounds/out.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-samples\outOfBounds\bad.c:5:12: error: Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]
-    strcpy(str, "0123456789abcdef");
-           ^
diff --git a/samples/passedByValue_1/bad.cpp b/samples/passedByValue_1/bad.cpp
new file mode 100644
index 00000000000..413b4327a74
--- /dev/null
+++ b/samples/passedByValue_1/bad.cpp
@@ -0,0 +1,11 @@
+class C
+{
+public:
+    explicit C(std::string s)
+    : _s(s)
+    {
+    }
+    void foo();
+private:
+    std::string _s;
+};
\ No newline at end of file
diff --git a/samples/passedByValue_1/good.cpp b/samples/passedByValue_1/good.cpp
new file mode 100644
index 00000000000..fd1f1450d17
--- /dev/null
+++ b/samples/passedByValue_1/good.cpp
@@ -0,0 +1,11 @@
+class C
+{
+public:
+    explicit C(std::string s)
+    : _s(std::move(s))
+    {
+    }
+    void foo();
+private:
+    std::string _s;
+};
\ No newline at end of file
diff --git a/samples/passedByValue_1/out.txt b/samples/passedByValue_1/out.txt
new file mode 100644
index 00000000000..07228031d62
--- /dev/null
+++ b/samples/passedByValue_1/out.txt
@@ -0,0 +1,3 @@
+samples\passedByValue_1\bad.cpp:4:28: performance: Function parameter 's' should be passed by const reference. [passedByValue]
+    explicit C(std::string s)
+                           ^
diff --git a/samples/passedByValue_2/bad.cpp b/samples/passedByValue_2/bad.cpp
new file mode 100644
index 00000000000..29da7fe9036
--- /dev/null
+++ b/samples/passedByValue_2/bad.cpp
@@ -0,0 +1,10 @@
+bool foo(std::string s)
+{
+    return s.empty();
+}
+
+int main()
+{
+    std::string s;
+    foo(s);
+}
diff --git a/samples/passedByValue_2/good.cpp b/samples/passedByValue_2/good.cpp
new file mode 100644
index 00000000000..bd3a941a45b
--- /dev/null
+++ b/samples/passedByValue_2/good.cpp
@@ -0,0 +1,10 @@
+bool foo(const std::string& s)
+{
+    return s.empty();
+}
+
+int main()
+{
+    std::string s;
+    foo(s);
+}
diff --git a/samples/passedByValue_2/out.txt b/samples/passedByValue_2/out.txt
new file mode 100644
index 00000000000..af76b252ad1
--- /dev/null
+++ b/samples/passedByValue_2/out.txt
@@ -0,0 +1,3 @@
+samples\passedByValue_2\bad.cpp:1:22: performance: Function parameter 's' should be passed by const reference. [passedByValue]
+bool foo(std::string s)
+                     ^
diff --git a/samples/resourceLeak/bad.c b/samples/resourceLeak/bad.c
index b517297a1b1..4595f10f4a4 100644
--- a/samples/resourceLeak/bad.c
+++ b/samples/resourceLeak/bad.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 int main()
 {
-    FILE *a = fopen("good.c", "r");
+    const FILE *a = fopen("good.c", "r");
     if (!a)
         return 0;
 
diff --git a/samples/unreadVariable/bad.cpp b/samples/unreadVariable/bad.cpp
new file mode 100644
index 00000000000..456304ad64a
--- /dev/null
+++ b/samples/unreadVariable/bad.cpp
@@ -0,0 +1,7 @@
+void foo(const std::string&, const std::string&);
+
+int main()
+{
+    std::string s1 = "test1", s2 = "test2";
+    foo(s1, s1);
+}
diff --git a/samples/unreadVariable/good.cpp b/samples/unreadVariable/good.cpp
new file mode 100644
index 00000000000..0b9871d8a33
--- /dev/null
+++ b/samples/unreadVariable/good.cpp
@@ -0,0 +1,7 @@
+void foo(const std::string&, const std::string&);
+
+int main()
+{
+    std::string s1 = "test1", s2 = "test2";
+    foo(s1, s2);
+}
diff --git a/samples/unreadVariable/out.txt b/samples/unreadVariable/out.txt
new file mode 100644
index 00000000000..2b1c295a8c6
--- /dev/null
+++ b/samples/unreadVariable/out.txt
@@ -0,0 +1,6 @@
+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/test/.clang-tidy b/test/.clang-tidy
new file mode 100644
index 00000000000..1f832f2d39e
--- /dev/null
+++ b/test/.clang-tidy
@@ -0,0 +1,7 @@
+---
+InheritParentConfig: true
+CheckOptions:
+  #- key:             bugprone-unused-return-value.CheckedFunctions
+  #  value:           '::.*'
+  - key:             bugprone-unused-return-value.AllowCastToVoid
+    value:           'true'
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 371654bb579..dca02d19194 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,25 +1,13 @@
 if (BUILD_TESTS)
+    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_include_directories(testrunner PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2)
-    else()
-        target_include_directories(testrunner SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
-    endif()
-    target_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)
@@ -27,13 +15,14 @@ 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)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        # (void) in ASSERT_THROW* macros might trigger this
+        target_compile_options_safe(testrunner -Wno-useless-cast)
+    endif()
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        # $ is used in dinit() designated initialization helper
+        target_compile_options_safe(testrunner -Wno-dollar-in-identifier-extension)
     endif()
 
     if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
@@ -56,17 +45,14 @@ if (BUILD_TESTS)
     endif()
 
     if (REGISTER_TESTS)
-        # CMP0064 requires 3.4
-        # CMAKE_MATCH_<n> usage for if (MATCHES) requires 3.9
-        cmake_minimum_required(VERSION 3.9)
-        cmake_policy(SET CMP0064 NEW)
-        cmake_policy(SET CMP0057 NEW)
+        # CMAKE_MATCH_<n> usage for if (MATCHES) requires CMake 3.9
 
         find_package(Threads REQUIRED)
         include(ProcessorCount)
         ProcessorCount(N)
         set(CTEST_PARALLEL_LEVEL ${N} CACHE STRING "CTest parallel level")
-        set(CTEST_TIMEOUT 90 CACHE STRING "CTest timeout")
+        # the macos-* runners are sporadically much slower than other runners so chose a high timeout
+        set(CTEST_TIMEOUT 130 CACHE STRING "CTest timeout")
         add_custom_target(check ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout ${CTEST_TIMEOUT}
                 DEPENDS testrunner cppcheck)
 
@@ -76,7 +62,7 @@ if (BUILD_TESTS)
             if (${NAME} IN_LIST SKIP_TESTS)
             elseif(TEST ${NAME})
             else()
-                add_test(NAME ${NAME} COMMAND testrunner ${NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+                add_test(NAME ${NAME} COMMAND $<TARGET_FILE:testrunner> ${NAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
             endif()
         endfunction()
 
@@ -111,19 +97,20 @@ if (BUILD_TESTS)
             endif()
             if ("cfg-${TEST_NAME}" IN_LIST SKIP_TESTS)
             else()
-                # TODO: remove missingInclude disabling when it no longer is implied by --enable=information
                 # TODO: add syntax check
                 add_test(NAME cfg-${TEST_NAME}
                         COMMAND $<TARGET_FILE:cppcheck>
+                        --library=${LIBRARY}
                         --check-library
+                        --check-level=exhaustive
                         --platform=${PLATFORM}
-                        --library=${LIBRARY}
                         --enable=style,information
                         --inconclusive
                         --force
                         --error-exitcode=1
-                        --disable=missingInclude
                         --inline-suppr
+                        --debug-warnings
+                        --suppress=checkersReport
                         ${CMAKE_CURRENT_SOURCE_DIR}/cfg/${CFG_TEST}
                 )
             endif()
@@ -133,21 +120,24 @@ if (BUILD_TESTS)
         add_cfg(bsd.c)
         add_cfg(cairo.c)
         add_cfg(cppunit.cpp)
+        add_cfg(emscripten.cpp)
         # TODO: posix needs to specified first or it has a different mmap() config
         # TODO: get rid of posix dependency
         add_cfg(gnu.c ADD_LIBRARY posix)
         add_cfg(googletest.cpp)
         add_cfg(gtk.c)
-        add_cfg(kde.cpp)
+        add_cfg(kde.cpp ADD_LIBRARY qt)
         add_cfg(libcurl.c)
         add_cfg(libsigc++.cpp)
         add_cfg(lua.c)
+        add_cfg(mfc.cpp)
         add_cfg(opencv2.cpp)
         add_cfg(openmp.c)
         add_cfg(openssl.c)
         add_cfg(posix.c)
         add_cfg(python.c)
         add_cfg(qt.cpp)
+        add_cfg(selinux.c)
         add_cfg(sqlite3.c)
         add_cfg(std.c)
         add_cfg(std.cpp)
@@ -164,10 +154,45 @@ if (BUILD_TESTS)
 
         # Set cost of the more expensive tests to help improve parallel scheduling
         # of tests
-        fixture_cost(TestIO 20)
-        fixture_cost(cfg-std_c 8)
-        fixture_cost(TestThreadExecutor 5)
-        fixture_cost(TestLeakAutoVarRecursiveCountLimit 4)
-        fixture_cost(TestTokenizer 4)
+        #
+        # To collect data to update this list remove "<cmake-build-folder>/Testing/Temporary/CTestCostData.txt",
+        # disable the fixture_cost() statements below and run a Debug build with "ctest -j1" several times.
+        # Afterwards run it with "ctest -j11" and immediately cancel the run and update the list accordingly to the
+        # first eleven tests chosen.
+        #
+        # NOTE: The TestProcessExecutor* tests are not the slowest but they invoke processes which max out the system
+        # and negatively impact the run-time of the other tests
+        if (TRUE)
+            fixture_cost(TestProcessExecutorFiles 2.00)
+            fixture_cost(TestProcessExecutorFS 2.00)
+            fixture_cost(TestCondition 1.30)
+            fixture_cost(TestStl 1.30)
+            fixture_cost(TestTokenizer 1.30)
+            fixture_cost(cfg-std_c 1.20)
+            fixture_cost(cfg-std_cpp 1.20)
+            fixture_cost(TestAutoVariables 1.20)
+            fixture_cost(TestUninitVar 1.20)
+            fixture_cost(TestSimplifyTemplate 1.15)
+            fixture_cost(TestIO 1.15)
+            fixture_cost(TestBufferOverrun 1.15)
+            fixture_cost(TestClass 1.15)
+            fixture_cost(TestNullPointer 1.15)
+            fixture_cost(TestSuppressions 1.15)
+            fixture_cost(TestLeakAutoVar 1.10)
+            fixture_cost(TestSingleExecutorFS 1.10)
+            fixture_cost(TestLeakAutoVarRecursiveCountLimit 1.05)
+            fixture_cost(TestThreadExecutorFS 1.05)
+            fixture_cost(TestThreadExecutorFiles 1.05)
+            fixture_cost(TestSymbolDatabase 1.05)
+            fixture_cost(TestSingleExecutorFiles 1.05)
+            fixture_cost(TestOther 1.05)
+            fixture_cost(TestValueFlow 1.05)
+            fixture_cost(cfg-wxwidgets_cpp 1.05)
+            fixture_cost(cfg-posix_c 1.05)
+            fixture_cost(cfg-windows32A 1.03)
+            fixture_cost(cfg-windows32W 1.03)
+            fixture_cost(cfg-windows64 1.03)
+            fixture_cost(TestUnusedVar 1.03)
+        endif()
     endif()
 endif()
diff --git a/test/cfg/boost.cpp b/test/cfg/boost.cpp
index ee6f77dd854..7e724a8b472 100644
--- a/test/cfg/boost.cpp
+++ b/test/cfg/boost.cpp
@@ -2,17 +2,32 @@
 // Test library configuration for boost.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=boost --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/boost.cpp
+// $ cppcheck --check-library --library=boost --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/boost.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-#include <boost/config.hpp>
+// cppcheck-suppress-file valueFlowBailout
+
+#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/bind.hpp>
-#include <boost/function.hpp>
+#include <boost/endian/conversion.hpp> // IWYU pragma: keep
+#include <boost/bind/bind.hpp>
+#include <boost/function.hpp> // IWYU pragma: keep
+#include <boost/smart_ptr/scoped_array.hpp>
+#include <boost/thread/mutex.hpp> // IWYU pragma: keep
+#include <boost/thread/lock_guard.hpp>
+#include <boost/test/unit_test.hpp> // IWYU pragma: keep
+#include <boost/core/scoped_enum.hpp>
+#include <boost/foreach.hpp>
 
+#include <cstdlib>
+#include <set>
+#include <vector>
 
 BOOST_FORCEINLINE void boost_forceinline_test()
 {}
@@ -83,7 +98,104 @@ void macros()
     BOOST_PP_REPEAT(5, DECL, int x)
 
     BOOST_SCOPED_ENUM_DECLARE_BEGIN(future_errc) {
+        // cppcheck-suppress valueFlowBailoutIncompleteVar
         no_state
     }
     BOOST_SCOPED_ENUM_DECLARE_END(future_errc)
 }
+
+void containerOutOfBounds_scoped_array(std::size_t n) // #12356
+{
+    boost::scoped_array<int> d(new int[n] {});
+    for (std::size_t i = 0; i < n; i++)
+        if (d[i]) {}
+}
+
+void lock_guard_finiteLifetime(boost::mutex& m)
+{
+    // cppcheck-suppress unusedScopedObject
+    boost::lock_guard<boost::mutex>{ m };
+}
+
+void test_BOOST_FOREACH_1(std::vector<int> data)
+{
+    BOOST_FOREACH(int i, data) {
+        // cppcheck-suppress invalidContainerLoop
+        data.push_back(123);
+    }
+}
+
+void test_BOOST_FOREACH_2(std::set<int> data)
+{
+    BOOST_FOREACH(int i, data) {
+        // don't warn for std::set
+        data.insert(123);
+    }
+}
+
+void test_BOOST_FOREACH_3(std::vector<int> data)
+{
+    BOOST_FOREACH(const int& i, data) {
+        // cppcheck-suppress invalidContainerLoop
+        data.erase(data.begin());
+    }
+}
+
+// Check single line usage
+void test_BOOST_FOREACH_4(std::vector<int> data)
+{
+    BOOST_FOREACH(const int& i, data)
+        // cppcheck-suppress invalidContainerLoop
+        data.clear();
+}
+
+// Container returned as result of a function -> Be quiet
+std::vector<int> get_data();
+void test_BOOST_FOREACH_5()
+{
+    std::set<int> data;
+    BOOST_FOREACH(const int& i, get_data())
+        data.insert(i);
+}
+
+// Break after modification (#4788)
+void test_BOOST_FOREACH_6(std::vector<int> data)
+{
+    BOOST_FOREACH(int i, data) {
+        data.push_back(123);
+        break;
+    }
+}
+
+void test_require()
+{
+    int *some_int = static_cast<int*>(std::malloc(sizeof(int)));
+    int *some_other_int = static_cast<int*>(malloc(sizeof(int)));
+    BOOST_REQUIRE(some_int);
+    BOOST_TEST_REQUIRE(some_other_int);
+    *some_int = 42;
+    *some_other_int = 42;
+    std::free(some_int);
+    free(some_other_int);
+}
+
+BOOST_AUTO_TEST_SUITE(my_auto_test_suite)
+
+BOOST_AUTO_TEST_CASE(test_message_macros)
+{
+    bool my_bool = false;
+    BOOST_WARN_MESSAGE(my_bool, "warn");
+    BOOST_CHECK_MESSAGE(my_bool, "check");
+    BOOST_REQUIRE_MESSAGE(my_bool, "require");
+
+    BOOST_WARN_MESSAGE(my_bool, "my_bool was: " << my_bool);
+}
+
+using test_types_w_tuples = std::tuple<int, long, unsigned char>;
+BOOST_AUTO_TEST_CASE_TEMPLATE(my_tuple_test, T, test_types_w_tuples)
+{
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    BOOST_TEST(sizeof(T) == 4U);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/cfg/bsd.c b/test/cfg/bsd.c
index 227e327c982..3cb39c14810 100644
--- a/test/cfg/bsd.c
+++ b/test/cfg/bsd.c
@@ -1,11 +1,13 @@
 // Test library configuration for bsd.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=bsd --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/bsd.c
+// $ cppcheck --check-library --library=bsd --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/bsd.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file valueFlowBailout
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -30,11 +32,15 @@ void nullPointer_setlinebuf(FILE *stream)
 // #9323, #9331
 void verify_timercmp(struct timeval t)
 {
+    // TODO cppcheck-suppress duplicateExpression
     (void)timercmp(&t, &t, <);
+    // TODO cppcheck-suppress duplicateExpression
     (void)timercmp(&t, &t, <=);
     (void)timercmp(&t, &t, ==);
     (void)timercmp(&t, &t, !=);
+    // TODO cppcheck-suppress duplicateExpression
     (void)timercmp(&t, &t, >=);
+    // TODO cppcheck-suppress duplicateExpression
     (void)timercmp(&t, &t, >);
 }
 
@@ -70,6 +76,7 @@ ssize_t nullPointer_pwritev(int fd, const struct iovec *iov, int iovcnt, off_t o
 void uninitvar_timercmp(struct timeval t)
 {
     struct timeval uninit;
+    // cppcheck-suppress uninitvar
     (void)timercmp(&t, &uninit, <);
     (void)timercmp(&uninit, &t, <=);
     (void)timercmp(&uninit, &uninit, ==);
@@ -144,3 +151,32 @@ void uninitvar(void)
     // cppcheck-suppress uninitvar
     (void) arc4random_uniform(uint32Uninit);
 }
+
+void arrayIndexOutOfBounds(void)
+{
+    char * pAlloc = calloc(2, 3);
+    // cppcheck-suppress nullPointerOutOfMemory
+    pAlloc[5] = 'a';
+    // cppcheck-suppress arrayIndexOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
+    pAlloc[6] = 1;
+    // cppcheck-suppress memleakOnRealloc
+    pAlloc = reallocarray(pAlloc, 3, 3);
+    pAlloc[8] = 'a';
+    // cppcheck-suppress arrayIndexOutOfBounds
+    pAlloc[9] = 1;
+    free(pAlloc);
+}
+
+void reallocarray_memleak(void) {
+    char *a = (char *)malloc(10);
+    // cppcheck-suppress [memleakOnRealloc, unreadVariable]
+    a = reallocarray(a, 100, 2);
+    // cppcheck-suppress memleak
+}
+
+void reallocarray_notused(void)
+{
+    // cppcheck-suppress [leakReturnValNotUsed, ignoredReturnValue]
+    reallocarray(NULL, 10, 10);
+}
diff --git a/test/cfg/cairo.c b/test/cfg/cairo.c
index c544a4548a5..a081a8fe52c 100644
--- a/test/cfg/cairo.c
+++ b/test/cfg/cairo.c
@@ -2,7 +2,7 @@
 // Test library configuration for cairo.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=cairo --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/cairo.c
+// $ cppcheck --check-library --library=cairo --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/cairo.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
diff --git a/test/cfg/cppunit.cpp b/test/cfg/cppunit.cpp
index 28b7fa7a858..b5e9826a25d 100644
--- a/test/cfg/cppunit.cpp
+++ b/test/cfg/cppunit.cpp
@@ -1,11 +1,17 @@
 // Test library configuration for cppunit.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=cppunit --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/cppunit.cpp
+// $ cppcheck --check-library --library=cppunit --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/cppunit.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// 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/emscripten.cpp b/test/cfg/emscripten.cpp
new file mode 100644
index 00000000000..7b19c01c79b
--- /dev/null
+++ b/test/cfg/emscripten.cpp
@@ -0,0 +1,92 @@
+
+// Test library configuration for emscripten.cfg
+//
+// Usage:
+// $ cppcheck --check-library --library=emscripten --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/emscripten.cpp
+// =>
+// No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
+//
+
+#include <stdio.h>
+#include <emscripten.h>
+
+void em_asm_test()
+{
+    // inline some JavaScript
+    EM_ASM(alert('hello'); );
+    MAIN_THREAD_EM_ASM(alert('hello main thread'); );
+
+    // pass parameters to JavaScript
+    EM_ASM(
+    {
+        console.log('I received: ' + [$0, $1]);
+    },
+        100, 35.5);
+
+    // pass a string to JavaScript
+    EM_ASM({console.log('hello ' + UTF8ToString($0))}, "world!");
+}
+
+void em_asm_int_test()
+{
+    // cppcheck-suppress unreadVariable
+    const int x = EM_ASM_INT({
+        return $0 + 42;
+    }, 100);
+
+    // cppcheck-suppress unreadVariable
+    const int y = MAIN_THREAD_EM_ASM_INT({return 2;});
+}
+
+void em_asm_double_test()
+{
+    // cppcheck-suppress unreadVariable
+    const double x = EM_ASM_DOUBLE({
+        return $0 + 1.0;
+    }, 2.0);
+
+    // cppcheck-suppress unreadVariable
+    const double y = MAIN_THREAD_EM_ASM_DOUBLE({return 1.0;});
+}
+
+void em_asm_ptr_test()
+{
+    void* ptr = EM_ASM_PTR({
+        return stringToNewUTF8("Hello");
+    });
+    printf("%s", static_cast<const char*>(ptr));
+    free(ptr);
+}
+
+void em_asm_ptr_memleak_test()
+{
+    const char *str = static_cast<char*>(EM_ASM_PTR({
+        return stringToNewUTF8("Hello");
+    }));
+    // cppcheck-suppress nullPointerOutOfMemory
+    printf("%s", str);
+
+    // cppcheck-suppress memleak
+}
+
+void main_thread_em_asm_ptr_test()
+{
+    // cppcheck-suppress leakReturnValNotUsed
+    MAIN_THREAD_EM_ASM_PTR(
+        return stringToNewUTF8("Hello");
+        );
+}
+
+EM_JS(void, two_alerts, (), {
+    alert('hai');
+    alert('bai');
+});
+EM_JS(void, take_args, (int x, float y), {
+    console.log('I received: ' + [x, y]);
+});
+
+void em_js_test()
+{
+    two_alerts();
+    take_args(100, 35.5);
+}
diff --git a/test/cfg/gnu.c b/test/cfg/gnu.c
index 66e74acf4e6..14dfcc7700f 100644
--- a/test/cfg/gnu.c
+++ b/test/cfg/gnu.c
@@ -2,32 +2,43 @@
 // Test library configuration for gnu.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=gnu --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/gnu.c
+// $ cppcheck --check-library --library=gnu --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/gnu.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file [valueFlowBailout,purgedConfiguration]
+
+#define _GNU_SOURCE
+
 #include <string.h>
 #include <stdlib.h>
 #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>
 #include <sys/sem.h>
 #include <wchar.h>
-#if !defined(__CYGWIN__) && !(defined(__APPLE__) && defined(__MACH__))
+#include <execinfo.h>
+#if !defined(__CYGWIN__) && !defined(__APPLE__)
 #include <sys/epoll.h>
 #endif
 #include <strings.h>
 #ifdef __gnu_linux__
 #include <error.h>
 #endif
+#include <unistd.h>
 #include <getopt.h>
 #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
@@ -39,7 +50,44 @@ void unreachableCode_error(void) // #11197
 }
 #endif
 
-int nullPointer_gethostbyname2_r(const char* name, int af, struct hostent* ret, char* buf, size_t buflen, struct hostent** result, int* h_errnop)
+
+int deallocuse_backtrace(int size) {
+    void **buffer = (void **)malloc(sizeof(void *) * size);
+    free(buffer);
+    // cppcheck-suppress deallocuse
+    // cppcheck-suppress nullPointerOutOfMemory
+    int numEntries = backtrace(buffer, size);
+    return numEntries;
+}
+
+#if !defined(__APPLE__)
+void leakReturnValNotUsed_get_current_dir_name(void)
+{
+    // cppcheck-suppress leakReturnValNotUsed
+    get_current_dir_name();
+}
+
+void memleak_get_current_dir_name0(void)
+{
+    const char *const name = get_current_dir_name();
+    if (name)
+    {
+        // cppcheck-suppress memleak
+        return;
+    }
+}
+
+void memleak_get_current_dir_name1(void)
+{
+    const char *const name = get_current_dir_name();
+    if (name)
+    {
+        free(name);
+        return;
+    }
+}
+
+int nullPointer_gethostbyname2_r(const char* name, int af, struct hostent* ret, const char* buf, size_t buflen, struct hostent** result, const int* h_errnop)
 {
     // cppcheck-suppress nullPointer
     (void) gethostbyname2_r(NULL, af, ret, buf, buflen, result, h_errnop);
@@ -54,7 +102,7 @@ int nullPointer_gethostbyname2_r(const char* name, int af, struct hostent* ret,
     return gethostbyname2_r(name, af, ret, buf, buflen, result, h_errnop);
 }
 
-int nullPointer_gethostbyname_r(const char* name, struct hostent* ret, char* buf, size_t buflen, struct hostent** result, int* h_errnop)
+int nullPointer_gethostbyname_r(const char* name, struct hostent* ret, const char* buf, size_t buflen, struct hostent** result, const int* h_errnop)
 {
     // cppcheck-suppress nullPointer
     (void) gethostbyname_r(NULL, ret, buf, buflen, result, h_errnop);
@@ -69,8 +117,7 @@ int nullPointer_gethostbyname_r(const char* name, struct hostent* ret, char* buf
     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, char* buf, size_t buflen, struct hostent** result, int* 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
     (void) gethostbyaddr_r(NULL, len, type, ret, buf, buflen, result, h_errnop);
@@ -84,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)
@@ -109,7 +157,8 @@ int nullPointer_getopt_long_only(int argc, char* const* argv, const char* optstr
     return getopt_long_only(argc, argv, optstring, longopts, longindex);
 }
 
-int nullPointer_getservent_r(struct servent *restrict result_buf, char *restrict buf, size_t buflen, struct servent **restrict result)
+#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
     (void) getservent_r(NULL, buf, buflen, result);
@@ -122,12 +171,13 @@ int nullPointer_getservent_r(struct servent *restrict result_buf, char *restrict
 
 void *bufferAccessOutOfBounds_memrchr(const void *s, int c, size_t n)
 {
-    char buf[42]={0};
+    const char buf[42]={0};
     (void)memrchr(buf,c,42);
     // cppcheck-suppress bufferAccessOutOfBounds
     (void)memrchr(buf,c,43);
     return memrchr(s,c,n);
 }
+#endif
 
 void knownConditionTrueFalse_ffsl(long i)
 {
@@ -147,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().
@@ -182,40 +233,10 @@ int uninitvar_getpw(uid_t uid, char *buf)
     // cppcheck-suppress uninitvar
     return getpw(someUid, buf);
 }
-
-// #9323, #9331
-void syntaxError_timercmp(struct timeval t)
-{
-    (void)timercmp(&t, &t, <);
-    (void)timercmp(&t, &t, <=);
-    (void)timercmp(&t, &t, ==);
-    (void)timercmp(&t, &t, !=);
-    (void)timercmp(&t, &t, >=);
-    (void)timercmp(&t, &t, >);
-}
-
-// False negative: #9346
-void uninitvar_timercmp(struct timeval t)
-{
-    struct timeval uninit;
-    (void)timercmp(&t, &uninit, <);
-    (void)timercmp(&uninit, &t, <=);
-    (void)timercmp(&uninit, &uninit, ==);
-}
-
-void nullPointer_timercmp(struct timeval t)
-{
-    // cppcheck-suppress constVariablePointer
-    struct timeval *p=0;
-    // cppcheck-suppress nullPointer
-    (void)timercmp(&t, p, <);
-    // cppcheck-suppress nullPointer
-    (void)timercmp(p, &t, <=);
-    // cppcheck-suppress nullPointer
-    (void)timercmp(p, p, ==);
-}
+#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);
@@ -275,17 +296,19 @@ int no_resourceLeak_mkostemp_02(char *template, int flags)
     return mkostemp(template, flags);
 }
 
-void valid_code(int argInt1, va_list valist_arg, int * parg)
+void valid_code(int argInt1, va_list valist_arg, const int * parg)
 {
     char *p;
 
     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)) {}
-    void *ax1 = __builtin_assume_aligned(parg, 16);
+#endif
+    const void *ax1 = __builtin_assume_aligned(parg, 16);
     printf("%p", ax1);
-    void *ax2 = __builtin_assume_aligned(parg, 32, 8);
+    const void *ax2 = __builtin_assume_aligned(parg, 32, 8);
     printf("%p", ax2);
 
     p = (char *)malloc(10);
@@ -316,8 +339,10 @@ void valid_code(int argInt1, va_list valist_arg, int * parg)
 
     if (__alignof__(int) == 4) {}
 
-    void * p_mmap = mmap(NULL, 1, PROT_NONE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    const void * p_mmap = mmap(NULL, 1, PROT_NONE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
     printf("%p", p_mmap);
+    // cppcheck-suppress nullPointerOutOfMemory
     munmap(p_mmap, 1);
 
     uint16_t i16_1 = 0, i16_2;
@@ -330,6 +355,7 @@ void valid_code(int argInt1, va_list valist_arg, int * parg)
     // cppcheck-suppress unreadVariable
     i64_2 = __builtin_bswap64(i64_1++);
 
+#if !defined(__APPLE__)
     // cppcheck-suppress zerodiv
     // cppcheck-suppress unreadVariable
     i16_1 /= bswap_16(0x1234) - 0x3412;
@@ -339,6 +365,7 @@ void valid_code(int argInt1, va_list valist_arg, int * parg)
     // cppcheck-suppress zerodiv
     // cppcheck-suppress unreadVariable
     i64_1 /= bswap_64(0x023456789abcde0f) - 0x0fdebc9a78563402;
+#endif
 }
 
 void ignoreleak(void)
@@ -354,21 +381,73 @@ void memleak_asprintf(char **ptr, const char *fmt, const int arg)
     if (-1 != asprintf(ptr,fmt,arg)) {
         free(ptr);
     }
-    if (-1 != asprintf(ptr,fmt,arg)) {
-        // TODO: Related to #8980 cppcheck-suppress memleak
+    if (-1 != asprintf(ptr,fmt,arg)) {}
+}
+
+void memleak_asprintf2() { // #12186
+    char* p = malloc(5);
+    // cppcheck-suppress memleak
+    (void)asprintf(&p, "%s", "test");
+    // cppcheck-suppress memleak
+}
+
+void memleak_asprintf3() {
+    char* p = malloc(5);
+    // cppcheck-suppress memleak
+    asprintf(&p, "%s", "test");
+    free(p);
+}
+
+void memleak_asprintf4(char** p) {
+    asprintf(p, "%s", "test");
+}
+
+void memleak_asprintf5(char* p) {
+    asprintf(&p, "%s", "test");
+    // cppcheck-suppress memleak
+}
+
+void memleak_asprintf6(const char* fmt, const int arg) {
+    char* ptr;
+    if (-1 == asprintf(&ptr, fmt, arg))
+        return;
+    printf("%s", ptr);
+    free(ptr);
+}
+
+void memleak_asprintf7(const char* fmt, const int arg) {
+    char* ptr;
+    if (asprintf(&ptr, fmt, arg) != -1) {
+        printf("%s", ptr);
+        free(ptr);
+    }
+    else
+        return;
+}
+
+void memleak_asprintf8(const char *fmt, const int arg) // #12204
+{
+    char* ptr;
+    int ret = asprintf(&ptr, fmt, arg);
+    if (-1 == ret) {
+        return;
     }
+    printf("%s", ptr);
+    free(ptr);
 }
 
 void memleak_xmalloc()
 {
     char *p = (char*)xmalloc(10);
+    // cppcheck-suppress nullPointerOutOfMemory
     p[9] = 0;
     // cppcheck-suppress memleak
 }
 
 void memleak_mmap()
 {
-    void * p_mmap = mmap(NULL, 1, PROT_NONE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    const void * p_mmap = mmap(NULL, 1, PROT_NONE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
     printf("%p", p_mmap);
     // cppcheck-suppress memleak
 }
@@ -391,21 +470,25 @@ void bufferAccessOutOfBounds__builtin_memset(void)
 
 void bufferAccessOutOfBounds()
 {
-    char buf[2] = "a";
+    const char buf[2] = "a";
     // This is valid
     sethostname(buf, 2);
     // cppcheck-suppress bufferAccessOutOfBounds
     sethostname(buf, 4);
 
     char * pAlloc1 = xcalloc(2, 4);
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc1, 0, 8);
     // cppcheck-suppress bufferAccessOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc1, 0, 9);
     free(pAlloc1);
 
     char * pAlloc2 = xmalloc(4);
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc2, 0, 4);
     // cppcheck-suppress bufferAccessOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc2, 0, 5);
 
     pAlloc2 = xrealloc(pAlloc2, 10);
@@ -416,6 +499,7 @@ void bufferAccessOutOfBounds()
     free(pAlloc2);
 }
 
+#if !defined(__APPLE__)
 void leakReturnValNotUsed()
 {
     // cppcheck-suppress [unreadVariable, constVariablePointer]
@@ -435,8 +519,9 @@ void leakReturnValNotUsed()
     if (42 == __builtin_expect(42, 0))
         return;
 }
+#endif
 
-#if !defined(__CYGWIN__) && !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__CYGWIN__) && !defined(__APPLE__)
 int nullPointer_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
 {
     // no warning is expected
@@ -447,6 +532,7 @@ int nullPointer_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
     //          Remove (deregister) the target file descriptor fd from the
     //          epoll instance referred to by epfd.  The event is ignored and
     //          can be NULL.
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     return epoll_ctl(epfd, EPOLL_CTL_DEL, fd, NULL);
 }
 #endif
diff --git a/test/cfg/googletest.cpp b/test/cfg/googletest.cpp
index 9ad2c43da57..eaec730136d 100644
--- a/test/cfg/googletest.cpp
+++ b/test/cfg/googletest.cpp
@@ -2,11 +2,13 @@
 // Test library configuration for googletest.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=googletest --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/googletest.cpp
+// $ cppcheck --check-library --library=googletest --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/googletest.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file valueFlowBailout
+
 #include <gmock/gmock-generated-matchers.h>
 #include <gtest/gtest.h>
 
@@ -15,16 +17,29 @@ namespace ExampleNamespace {
     constexpr long long TOLERANCE = 10;
 
     // #9397 syntaxError when MATCHER_P is not known
+    // cppcheck-suppress symbolDatabaseWarning
     MATCHER_P(ExampleMatcherPTest, expected, "")
     {
+        // cppcheck-suppress valueFlowBailoutIncompleteVar
         return ((arg <= (expected + TOLERANCE)) && (arg >= (expected - TOLERANCE)));
     }
 
     // syntaxError when MATCHER is not known
+    // cppcheck-suppress symbolDatabaseWarning
     MATCHER(ExampleMatcherTest, "")
     {
         return (arg == TOLERANCE);
     }
+
+    // syntaxError when TYPED_TEST is not known
+    TYPED_TEST (ExampleTypedTest, cppcheck_test)
+    {
+    }
+
+    // syntaxError when TYPED_TEST_P is not known
+    TYPED_TEST_P (ExampleTypedTestP, cppcheck)
+    {
+    }
 }
 
 TEST(ASSERT, ASSERT)
@@ -47,6 +62,7 @@ TEST(test_cppcheck, cppcheck)
 // #9964 - avoid compareBoolExpressionWithInt false positive
 TEST(Test, assert_false_fp)
 {
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     ASSERT_FALSE(errno < 0);
 }
 
@@ -70,6 +86,7 @@ TEST(Test, warning_in_assert_macros)
     // cppcheck-suppress duplicateExpression
     ASSERT_GE(i, i);
 
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     unsigned int u = errno;
     // cppcheck-suppress [unsignedPositive]
     ASSERT_GE(u, 0);
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
index 2286307a6be..8d5e9dd801d 100644
--- a/test/cfg/gtk.c
+++ b/test/cfg/gtk.c
@@ -2,14 +2,15 @@
 // Test library configuration for gtk.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=gtk --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr --library=gtk test/cfg/gtk.cpp
+// $ cppcheck --check-library --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr --library=gtk test/cfg/gtk.c
 // =>
 // 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>
 
 
 void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_table)
@@ -29,11 +30,13 @@ void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_t
     gpointer gpt = g_malloc(4);
     printf("%p", gpt);
     g_free(gpt);
+    // cppcheck-suppress deallocuse
     g_assert(gpt);
     if (!gpt) {
         // 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
@@ -68,6 +71,7 @@ void validCode(int argInt, GHashTableIter * hash_table_iter, GHashTable * hash_t
     // NULL is handled graciously
     char* str = g_strdup(NULL);
     if (g_strcmp0(str, NULL) || g_strcmp0(NULL, str))
+        // cppcheck-suppress valueFlowBailout // TODO: caused by <pure/>?
         printf("%s", str);
     g_free(str);
 }
@@ -77,7 +81,7 @@ void g_malloc_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_malloc(8);
 
-    gpointer gpt = g_malloc(1);
+    gconstpointer gpt = g_malloc(1);
 
     printf("%p", gpt);
 
@@ -89,7 +93,7 @@ void g_malloc0_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_malloc0(8);
 
-    gpointer gpt = g_malloc0(1);
+    gconstpointer gpt = g_malloc0(1);
 
     printf("%p", gpt);
 
@@ -101,7 +105,7 @@ void g_malloc_n_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_malloc_n(8, 1);
 
-    gpointer gpt = g_malloc_n(1, 2);
+    gconstpointer gpt = g_malloc_n(1, 2);
 
     printf("%p", gpt);
 
@@ -113,7 +117,7 @@ void g_malloc0_n_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_malloc0_n(8, 1);
 
-    gpointer gpt = g_malloc0_n(1, 2);
+    gconstpointer gpt = g_malloc0_n(1, 2);
 
     printf("%p", gpt);
 
@@ -125,7 +129,7 @@ void g_try_malloc_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_try_malloc(8);
 
-    gpointer gpt = g_try_malloc(1);
+    gconstpointer gpt = g_try_malloc(1);
 
     printf("%p", gpt);
 
@@ -137,7 +141,7 @@ void g_try_malloc0_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_try_malloc0(8);
 
-    gpointer gpt = g_try_malloc0(1);
+    gconstpointer gpt = g_try_malloc0(1);
 
     printf("%p", gpt);
 
@@ -149,7 +153,7 @@ void g_try_malloc_n_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_try_malloc_n(8, 1);
 
-    gpointer gpt = g_try_malloc_n(1, 2);
+    gconstpointer gpt = g_try_malloc_n(1, 2);
 
     printf("%p", gpt);
 
@@ -161,7 +165,7 @@ void g_try_malloc0_n_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_try_malloc0_n(8, 1);
 
-    gpointer gpt = g_try_malloc0_n(1, 2);
+    gconstpointer gpt = g_try_malloc0_n(1, 2);
 
     printf("%p", gpt);
 
@@ -230,6 +234,25 @@ void g_assert_test()
     g_assert(a = 5);
 }
 
+void g_assert_true_false_test()
+{
+    gboolean t = TRUE;
+    gboolean f = FALSE;
+    g_assert_true(t);
+    // cppcheck-suppress checkLibraryNoReturn
+    g_assert_false(f);
+}
+
+void g_assert_null_nonnull_test()
+{
+    char * gpt = g_malloc(1);
+    g_assert_nonnull(gpt);
+    gpt[0] = 0;
+    g_free(gpt);
+    // cppcheck-suppress checkLibraryNoReturn
+    g_assert_null(NULL);
+}
+
 void g_print_test()
 {
     // cppcheck-suppress invalidPrintfArgType_uint
@@ -258,7 +281,7 @@ void g_new_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_new(struct a, 1);
 
-    struct a * pNew2 = g_new(struct a, 2);
+    const struct a * pNew2 = g_new(struct a, 2);
     printf("%p", pNew2);
     // cppcheck-suppress memleak
 }
@@ -269,7 +292,7 @@ void g_new_if_test()
         int b;
     };
 
-    struct a * pNew3;
+    const struct a * pNew3;
     if (pNew3 = g_new(struct a, 6)) {
         printf("%p", pNew3);
     }
@@ -289,7 +312,7 @@ void g_new0_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_new0(struct a, 1);
 
-    struct a * pNew2 = g_new0(struct a, 2);
+    const struct a * pNew2 = g_new0(struct a, 2);
     printf("%p", pNew2);
     // cppcheck-suppress memleak
 }
@@ -307,7 +330,7 @@ void g_try_new_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_try_new(struct a, 1);
 
-    struct a * pNew2 = g_try_new(struct a, 2);
+    const struct a * pNew2 = g_try_new(struct a, 2);
     printf("%p", pNew2);
     // cppcheck-suppress memleak
 }
@@ -324,7 +347,7 @@ void g_try_new0_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_try_new0(struct a, 1);
 
-    struct a * pNew2 = g_try_new0(struct a, 2);
+    const struct a * pNew2 = g_try_new0(struct a, 2);
     printf("%p", pNew2);
     // cppcheck-suppress memleak
 }
@@ -370,7 +393,7 @@ void g_error_new_test()
     // cppcheck-suppress leakReturnValNotUsed
     g_error_new(1, -2, "a %d", 1);
 
-    GError * pNew2 = g_error_new(1, -2, "a %d", 1);
+    const GError * pNew2 = g_error_new(1, -2, "a %d", 1);
     printf("%p", pNew2);
     // cppcheck-suppress memleak
 }
@@ -425,3 +448,128 @@ void g_abort_test()
     //cppcheck-suppress unreachableCode
     printf("Never reached");
 }
+
+gchar* g_strchug_string_free_test(GString* t) // #12301
+{
+    gchar* p = g_strchug(g_string_free(t, FALSE));
+    return p;
+}
+
+void g_variant_test() {
+    // valid
+    GVariant *pGvariant = g_variant_new("i", 1);
+    printf("%p\n", pGvariant);
+    g_variant_unref(pGvariant);
+
+    // cppcheck-suppress leakReturnValNotUsed
+    g_variant_new("i", 1);
+
+    const GVariant *pGvariant1 = g_variant_new("i", 1);
+    printf("%p\n", pGvariant1);
+
+    GVariant *pGvariant2 = g_variant_parse(
+        NULL, "{'Test': <{'Test1': <uint32 1>}>}", NULL, NULL, NULL);
+    printf("%p\n", pGvariant2);
+    g_variant_unref(pGvariant2);
+
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add(&builder, "{sv}", "String",
+                          g_variant_new_string("String"));
+    g_variant_builder_add(&builder, "{sv}", "Byte", g_variant_new_byte(8));
+    g_variant_builder_add(&builder, "{sv}", "Int16", g_variant_new_int16(-16));
+    g_variant_builder_add(&builder, "{sv}", "Int32", g_variant_new_int32(-32));
+    g_variant_builder_add(&builder, "{sv}", "Int64", g_variant_new_int64(-64));
+    g_variant_builder_add(&builder, "{sv}", "Double", g_variant_new_double(1.0));
+    g_variant_builder_add(&builder, "{sv}", "UInt16", g_variant_new_uint16(16));
+    g_variant_builder_add(&builder, "{sv}", "UInt32", g_variant_new_uint32(32));
+    g_variant_builder_add(&builder, "{sv}", "UInt64", g_variant_new_uint64(64));
+    g_variant_builder_add(&builder, "{sv}", "Boolean",
+                            g_variant_new_boolean(TRUE));
+    g_variant_builder_add(&builder, "{sv}", "TakenString",
+                            g_variant_new_take_string(g_strdup("Owned string")));
+    g_variant_builder_add(&builder, "{sv}", "PrintfString",
+                            g_variant_new_printf("Formatted %d", 1));
+    g_variant_builder_add_value(
+        &builder, g_variant_new("{sv}", "String",
+                                g_variant_new_string("Owned string 2")));
+    g_variant_builder_add_parsed(&builder, "{'String', <'Owned string 3'>}");
+    GVariant *variant_dict = g_variant_builder_end(&builder);
+    printf("%p\n", variant_dict);
+    g_variant_unref(variant_dict);
+
+    GVariantBuilder builder_complex;
+    g_variant_builder_init(&builder_complex, G_VARIANT_TYPE("(sa(sa(sis)))"));
+    g_variant_builder_add(&builder_complex, "s", "OuterTest");
+    g_variant_builder_open(&builder_complex, G_VARIANT_TYPE("a(sa(sis))"));
+    g_variant_builder_open(&builder_complex, G_VARIANT_TYPE("(sa(sis))"));
+    g_variant_builder_add(&builder_complex, "s", "MiddelTest");
+    g_variant_builder_open(&builder_complex, G_VARIANT_TYPE("a(sis)"));
+    g_variant_builder_add(&builder_complex, "(sis)", "InnerTest", 1, "Value");
+    g_variant_builder_close(&builder_complex); // "a(sis)"
+    g_variant_builder_close(&builder_complex); // "(sa(sis))"
+    g_variant_builder_close(&builder_complex); // "a(sa(sis))"
+    GVariant *variant_complex =
+        g_variant_builder_end(&builder_complex); // "(sa(sa(sis)))"
+    printf("%p\n", variant_complex);
+    g_variant_unref(variant_complex);
+
+    // leak from pGvariant1
+    // cppcheck-suppress memleak
+}
+
+void g_queue_test() {
+    // cppcheck-suppress leakReturnValNotUsed
+    g_queue_new();
+
+    GQueue *queue = g_queue_new();
+    g_queue_push_head(queue, "test");
+    g_queue_push_tail(queue, "test");
+    // cppcheck-suppress ignoredReturnValue
+    g_queue_get_length(queue);
+    // cppcheck-suppress ignoredReturnValue
+    g_queue_is_empty(queue);
+    // cppcheck-suppress ignoredReturnValue
+    g_queue_peek_head(queue);
+    // cppcheck-suppress ignoredReturnValue
+    g_queue_peek_tail(queue);
+    // cppcheck-suppress ignoredReturnValue
+    g_queue_pop_head(queue);
+    // cppcheck-suppress ignoredReturnValue
+    g_queue_pop_tail(queue);
+
+    GQueue *copy_queue = g_queue_copy(queue);
+    g_queue_free(queue);
+    printf("%p\n", copy_queue);
+    g_queue_free(copy_queue);
+
+    GQueue *queue2 = g_queue_new();
+    g_queue_push_head(queue2, g_strdup("test"));
+    g_queue_push_tail(queue2, g_strdup("test"));
+    printf("%p\n", queue2);
+    g_queue_free_full(queue2, g_free);
+
+    const GQueue *queue3 = g_queue_new();
+    printf("%p\n", queue3);
+    // cppcheck-suppress memleak
+}
+
+void g_tree_test() {
+    // cppcheck-suppress leakReturnValNotUsed
+    g_tree_new((GCompareFunc)g_strcmp0);
+
+    GTree *tree = g_tree_new((GCompareFunc)g_strcmp0);
+    g_tree_insert(tree, "banana", "yellow");
+    g_tree_insert(tree, "apple", "red");
+    g_tree_insert(tree, "grape", "purple");
+    // cppcheck-suppress ignoredReturnValue
+    g_tree_nnodes(tree);
+    g_tree_remove(tree, "test");
+    // cppcheck-suppress ignoredReturnValue
+    g_tree_lookup(tree, "banana");
+    g_tree_destroy(tree);
+
+    const GTree *tree2 = g_tree_new((GCompareFunc)g_strcmp0);
+    printf("%p\n", tree2);
+    // cppcheck-suppress memleak
+}
diff --git a/test/cfg/kde.cpp b/test/cfg/kde.cpp
index 0a8546fb18d..71533ca781f 100644
--- a/test/cfg/kde.cpp
+++ b/test/cfg/kde.cpp
@@ -2,7 +2,7 @@
 // Test library configuration for kde.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=kde --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/kde.cpp
+// $ cppcheck --check-library --library=kde --library=qt --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/kde.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
@@ -10,13 +10,15 @@
 #include <cstdio>
 #include <KDE/KGlobal>
 #include <KDE/KConfigGroup>
+#include <klocalizedstring.h>
+#include <kpluginfactory.h>
 
 class k_global_static_testclass1 {};
 K_GLOBAL_STATIC(k_global_static_testclass1, k_global_static_testinstance1);
 
 void valid_code(const KConfigGroup& cfgGroup)
 {
-    k_global_static_testclass1 * pk_global_static_testclass1 = k_global_static_testinstance1;
+    const k_global_static_testclass1 * pk_global_static_testclass1 = k_global_static_testinstance1;
     printf("%p", pk_global_static_testclass1);
 
     bool entryTest = cfgGroup.readEntry("test", false);
@@ -30,3 +32,55 @@ void ignoredReturnValue(const KConfigGroup& cfgGroup)
     // cppcheck-suppress ignoredReturnValue
     cfgGroup.readEntry("test");
 }
+
+void i18n_test()
+{
+    (void)i18n("Text");
+    (void)xi18n("Text");
+    (void)ki18n("Text");
+    (void)i18nc("Text", "Context");
+    (void)xi18nc("Text", "Context");
+    (void)ki18nc("Text", "Context");
+}
+
+class PluginWithoutMetaData : public QObject
+{
+    Q_OBJECT
+public:
+    // Add a default arg to make sure we do not get an ambiguity compiler error
+    explicit PluginWithoutMetaData(const QObject *, const QVariantList &args = {})
+    : QObject()
+    {
+        Q_UNUSED(args)
+    };
+};
+
+K_PLUGIN_CLASS(PluginWithoutMetaData)
+
+class StaticSimplePluginClass : public QObject
+{
+    Q_OBJECT
+
+public:
+    // Next to the assertion below, ensure that we have no ambiguity!
+    explicit StaticSimplePluginClass(QObject *parent, const QString &data = {})
+    : QObject(parent)
+    {
+        // We have added a default arg, but KPluginFactory should still provide the valid metadata instead of the default one
+        data = QString("foo");
+    }
+};
+K_PLUGIN_CLASS_WITH_JSON(StaticSimplePluginClass, "data/jsonplugin.json")
+
+class ClipboardPlugin : public Purpose::PluginBase
+{
+    Q_OBJECT
+public:
+    using PluginBase::PluginBase;
+    Purpose::Job *createJob() const override
+    {
+        return new ClipboardJob(nullptr);
+    }
+};
+
+K_PLUGIN_FACTORY_WITH_JSON(Clipboard, "clipboardplugin.json", foo)
diff --git a/test/cfg/libcurl.c b/test/cfg/libcurl.c
index cb6b5775b75..07fd26b031f 100644
--- a/test/cfg/libcurl.c
+++ b/test/cfg/libcurl.c
@@ -2,11 +2,13 @@
 // Test library configuration for libcurl.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=libcurl --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/libcurl.c
+// $ cppcheck --check-library --library=libcurl --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/libcurl.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file valueFlowBailout
+
 #include <curl/curl.h>
 #include <stdio.h>
 
@@ -15,6 +17,7 @@ void validCode()
     CURL *curl = curl_easy_init();
     if (curl) {
         CURLcode res;
+        // cppcheck-suppress valueFlowBailoutIncompleteVar
         curl_easy_setopt(curl, CURLOPT_URL, "http://example.com");
         res = curl_easy_perform(curl);
         if (res != CURLE_OK) {
@@ -33,6 +36,7 @@ void validCode()
     }
 }
 
+// cppcheck-suppress constParameterPointer
 void ignoredReturnValue(CURL * handle)
 {
     // cppcheck-suppress ignoredReturnValue
@@ -41,21 +45,21 @@ void ignoredReturnValue(CURL * handle)
 
 void resourceLeak_curl_easy_init()
 {
-    CURL *curl = curl_easy_init();
+    const CURL *curl = curl_easy_init();
     printf("%p", curl);
     // cppcheck-suppress resourceLeak
 }
 
 void resourceLeak_curl_easy_duphandle(CURL * handle)
 {
-    CURL *curl = curl_easy_duphandle(handle);
+    const CURL *curl = curl_easy_duphandle(handle);
     printf("%p", curl);
     // cppcheck-suppress resourceLeak
 }
 
 void memleak_curl_easy_escape(CURL * handle)
 {
-    char * pStr = curl_easy_escape(handle, "a", 1);
+    const char * pStr = curl_easy_escape(handle, "a", 1);
     if (pStr)
         printf("%s", pStr);
     // cppcheck-suppress memleak
@@ -76,8 +80,8 @@ void nullPointer(CURL * handle)
 
 void uninitvar(CURL * handle)
 {
-    char * bufInit[10] = {0};
-    char * bufUninit;
+    const char * bufInit[10] = {0};
+    const char * bufUninit;
     size_t len;
 
     curl_easy_send(handle, bufInit, 10, &len);
diff --git a/test/cfg/libsigc++.cpp b/test/cfg/libsigc++.cpp
index 031f2dfa0bb..499e36d839a 100644
--- a/test/cfg/libsigc++.cpp
+++ b/test/cfg/libsigc++.cpp
@@ -2,12 +2,15 @@
 // Test library configuration for libsigc++.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=libsigc++ --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/libsigc++.cpp
+// $ cppcheck --check-library --library=libsigc++ --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/libsigc++.cpp
 // =>
 // 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/lua.c b/test/cfg/lua.c
index de222d55cf0..8555bc1d876 100644
--- a/test/cfg/lua.c
+++ b/test/cfg/lua.c
@@ -2,7 +2,7 @@
 // Test library configuration for lua.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=lua --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/lua.c
+// $ cppcheck --check-library --library=lua --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/lua.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
diff --git a/test/cfg/mfc.cpp b/test/cfg/mfc.cpp
new file mode 100644
index 00000000000..84a7d868971
--- /dev/null
+++ b/test/cfg/mfc.cpp
@@ -0,0 +1,26 @@
+
+// Test library configuration for mfc.cfg
+
+#include <afxwin.h>
+
+
+class MyClass1 : public CObject {
+    DECLARE_DYNAMIC(MyClass1)
+public:
+    MyClass1() {}
+};
+IMPLEMENT_DYNAMIC(MyClass1, CObject)
+
+class MyClass2 : public CObject {
+    DECLARE_DYNCREATE(MyClass2)
+public:
+    MyClass2() {}
+};
+IMPLEMENT_DYNCREATE(MyClass2, CObject)
+
+class MyClass3 : public CObject {
+    DECLARE_SERIAL(MyClass3)
+public:
+    MyClass3() {}
+};
+IMPLEMENT_SERIAL(MyClass3, CObject, 42)
diff --git a/test/cfg/opencv2.cpp b/test/cfg/opencv2.cpp
index 3dbbeebee12..6e79caab8d0 100644
--- a/test/cfg/opencv2.cpp
+++ b/test/cfg/opencv2.cpp
@@ -2,18 +2,21 @@
 // Test library configuration for opencv2.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=opencv2 --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/opencv2.cpp
+// $ cppcheck --check-library --library=opencv2 --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/opencv2.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file valueFlowBailout
+
 #include <iostream>
 #include <opencv2/opencv.hpp>
 
 
-void validCode(char* argStr)
+void validCode(const char* argStr)
 {
     cv::Mat image;
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     image = cv::imread(argStr, cv::IMREAD_COLOR);
     if (!image.data) {
         printf("No image data \n");
@@ -27,7 +30,8 @@ void validCode(char* argStr)
     cvStr += " World";
     std::cout << cvStr;
 
-    char * pBuf = (char *)cv::fastMalloc(20); // cppcheck-suppress cstyleCast
+    // cppcheck-suppress [cstyleCast, unusedAllocatedMemory]
+    char * pBuf = (char *)cv::fastMalloc(20);
     cv::fastFree(pBuf);
 }
 
@@ -39,7 +43,9 @@ void ignoredReturnValue()
 
 void memleak()
 {
-    char * pBuf = (char *)cv::fastMalloc(1000); // cppcheck-suppress cstyleCast
+    // cppcheck-suppress cstyleCast
+    const char * pBuf = (char *)cv::fastMalloc(1000);
+    // cppcheck-suppress [uninitdata, valueFlowBailoutIncompleteVar, nullPointerOutOfMemory]
     std::cout << pBuf;
     // cppcheck-suppress memleak
 }
diff --git a/test/cfg/openmp.c b/test/cfg/openmp.c
index 3f747fc28c8..709e4dad18a 100644
--- a/test/cfg/openmp.c
+++ b/test/cfg/openmp.c
@@ -2,7 +2,7 @@
 // Test library configuration for openmp.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=openmp --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/openmp.c
+// $ cppcheck --check-library --library=openmp --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/openmp.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
@@ -26,7 +26,7 @@ void validCode()
 
 void memleak_omp_target_alloc()
 {
-    char * pChars = (char *) omp_target_alloc(2, 0);
+    const char * pChars = (char *) omp_target_alloc(2, 0);
     printf("pChars: %p", pChars);
     // cppcheck-suppress memleak
 }
diff --git a/test/cfg/openssl.c b/test/cfg/openssl.c
index 99b467cd1ca..edfc4dd04a8 100644
--- a/test/cfg/openssl.c
+++ b/test/cfg/openssl.c
@@ -2,13 +2,15 @@
 // Test library configuration for openssl.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=openssl --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/openssl.c
+// $ cppcheck --check-library --library=openssl --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/openssl.c
 // =>
 // 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)
@@ -17,13 +19,13 @@ void valid_code(BIO * bio)
 }
 
 // Example for encrypting a string using IDEA (from https://www.openssl.org/docs/man1.1.1/man3/EVP_CIPHER_CTX_new.html)
-int valid_code_do_crypt(char *outfile)
+int valid_code_do_crypt(const char *outfile)
 {
     unsigned char outbuf[1024];
     int outlen, tmplen;
-    unsigned char key[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
-    unsigned char iv[] = {1,2,3,4,5,6,7,8};
-    char intext[] = "Some Crypto Text";
+    const unsigned char key[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
+    const unsigned char iv[] = {1,2,3,4,5,6,7,8};
+    const char intext[] = "Some Crypto Text";
     EVP_CIPHER_CTX *ctx;
     FILE *out;
 
@@ -62,7 +64,7 @@ void invalidPrintfArgType_test(BIO * bio)
 
 void EVP_CIPHER_CTX_new_test()
 {
-    EVP_CIPHER_CTX * ctx = EVP_CIPHER_CTX_new();
+    const EVP_CIPHER_CTX * ctx = EVP_CIPHER_CTX_new();
     printf("%p", ctx);
     // cppcheck-suppress resourceLeak
 }
diff --git a/test/cfg/posix.c b/test/cfg/posix.c
index 3da4959536a..2e53d171dec 100644
--- a/test/cfg/posix.c
+++ b/test/cfg/posix.c
@@ -2,12 +2,15 @@
 // Test library configuration for posix.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=posix --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/posix.c
+// $ cppcheck --check-library --library=posix --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/posix.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file [valueFlowBailout]
+
 #define _BSD_SOURCE
+#define _XOPEN_SOURCE // wcwidth
 
 #include <aio.h>
 #include <stdio.h> // <- FILE
@@ -30,16 +33,23 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <stdbool.h>
-#if !(defined(__APPLE__) && defined(__MACH__))
+#include <string.h>
+#include <strings.h>
+#if defined(__APPLE__)
+#include <xlocale.h>
+#endif
+#if !defined(__APPLE__)
 #include <mqueue.h>
 #endif
 #include <stdlib.h>
 #include <unistd.h>
 #include <wchar.h>
-#include <string.h>
-#include <strings.h>
+#include <sys/stat.h>
+#include <utime.h>
+#include <stddef.h>
+
 
-#if !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__APPLE__)
 void nullPointer_mq_timedsend(mqd_t mqdes, const char* msg_ptr, size_t msg_len, unsigned msg_prio, const struct timespec* abs_timeout) {
     // cppcheck-suppress nullPointer
     (void) mq_timedsend(mqdes, NULL, msg_len, msg_prio, abs_timeout);
@@ -87,7 +97,7 @@ int nullPointer_posix_trace_timedgetnext_event(trace_id_t trid, struct posix_tra
     return posix_trace_timedgetnext_event(trid, event, data, num_bytes, data_len, unavailable, abstime);
 }
 
-int nullPointer_posix_trace_getnext_event(trace_id_t trid, struct posix_trace_event_info *restrict event, void *restrict data, size_t num_bytes, size_t *restrict data_len, int *restrict unavailable)
+int nullPointer_posix_trace_getnext_event(trace_id_t trid, struct posix_trace_event_info *restrict event, const void *restrict data, size_t num_bytes, size_t *restrict data_len, int *restrict unavailable)
 {
     // cppcheck-suppress nullPointer
     (void) posix_trace_getnext_event(trid, NULL, data, num_bytes, data_len, unavailable);
@@ -101,6 +111,17 @@ int nullPointer_posix_trace_getnext_event(trace_id_t trid, struct posix_trace_ev
 }
 #endif // __TRACE_H__
 
+size_t nullPointer_strxfrm_l(char *restrict dest, const char *restrict src, size_t count, locale_t locale)
+{
+    (void)strxfrm_l(dest, src, count, locale);
+    // In case the 3rd argument is 0, the 1st argument is permitted to be a null pointer. (#6306)
+    (void)strxfrm_l(NULL, src, 0, locale);
+    (void)strxfrm_l(NULL, src, 1, locale);
+    (void)strxfrm_l(NULL, src, count, locale);
+    // cppcheck-suppress nullPointer
+    return strxfrm_l(dest, NULL, count, locale);
+}
+
 void nullPointer_pthread_attr_getstack(const pthread_attr_t *attr, void *stackaddr, size_t stacksize) {
     // cppcheck-suppress nullPointer
     (void) pthread_attr_getstack(NULL, &stackaddr, &stacksize);
@@ -118,26 +139,29 @@ void nullPointer_pthread_attr_getstack(const pthread_attr_t *attr, void *stackad
     (void) pthread_attr_getstack(NULL, NULL, NULL);
 }
 
-void nullPointer_pthread_attr_setstack(pthread_attr_t *attr) {
+void nullPointer_pthread_attr_setstack(const pthread_attr_t *attr) {
     // cppcheck-suppress nullPointer
     (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);
 }
 
+#ifndef __linux__
 void nullPointer_setkey(const char *key)
 {
     // cppcheck-suppress nullPointer
     setkey(NULL);
 }
 
-void nullPointer_encrypt(char block[64], int edflag)
+void nullPointer_encrypt(const char block[64], int edflag)
 {
     // cppcheck-suppress nullPointer
     encrypt(NULL, edflag);
     encrypt(block, edflag);
 }
+#endif
 
 int nullPointer_getopt(int argc, char* const argv[], const char* optstring)
 {
@@ -148,7 +172,7 @@ int nullPointer_getopt(int argc, char* const argv[], const char* optstring)
     return getopt(argc, argv, optstring);
 }
 
-#if !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__APPLE__)
 int invalidFunctionArgStr_mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio)
 {
     // No warning is expected for:
@@ -169,6 +193,14 @@ void invalidFunctionArgStr_mbsnrtowcs(void)
     if (mbsnrtowcs (wenough, &cp, 1, 10, &s) != 1 || wcscmp (wenough, L"AEF") != 0) {}
 }
 
+struct tm * ignoredReturnValue_localtime(const time_t *tp)
+{
+    // cppcheck-suppress [ignoredReturnValue,localtimeCalled]
+    localtime(tp);
+    // cppcheck-suppress localtimeCalled
+    return localtime(tp);
+}
+
 int nullPointer_getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result)
 {
     // cppcheck-suppress nullPointer
@@ -193,7 +225,8 @@ int nullPointer_getpwnam_r(const char *name, struct passwd *pwd, char *buffer, s
     return getpwnam_r(name, pwd, buffer, bufsize, result);
 }
 
-int nullPointer_fgetpwent_r(FILE *restrict stream, struct passwd *restrict pwbuf, char *restrict buf, size_t buflen, struct passwd **restrict pwbufp)
+#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
     (void) fgetpwent_r(NULL, pwbuf, buf, buflen, pwbufp);
@@ -206,7 +239,7 @@ int nullPointer_fgetpwent_r(FILE *restrict stream, struct passwd *restrict pwbuf
     return fgetpwent_r(stream, pwbuf, buf, buflen, pwbufp);
 }
 
-int nullPointer_getpwent_r(struct passwd *restrict pwbuf, char *restrict buf, size_t buflen, struct passwd **restrict pwbufp)
+int nullPointer_getpwent_r(const struct passwd *restrict pwbuf, char *restrict buf, size_t buflen, struct passwd **restrict pwbufp)
 {
     // cppcheck-suppress nullPointer
     (void) getpwent_r(NULL, buf, buflen, pwbufp);
@@ -216,6 +249,7 @@ int nullPointer_getpwent_r(struct passwd *restrict pwbuf, char *restrict buf, si
     (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)
 {
@@ -302,7 +336,7 @@ int nullPointer_socketpair(int domain, int t, int protocol, int sv[2])
     return socketpair(domain, t, protocol, sv);
 }
 
-void nullPointer_lcong48(unsigned short param[7])
+void nullPointer_lcong48(const unsigned short param[7])
 {
     // cppcheck-suppress nullPointer
     (void) lcong48(NULL);
@@ -330,7 +364,14 @@ double nullPointer_erand48(unsigned short xsubi[3])
     return erand48(xsubi);
 }
 
-unsigned short *nullPointer_seed48(unsigned short seed16v[3])
+struct non_const_parameter_erand48_struct { unsigned short xsubi[3]; };
+// No warning is expected that dat can be const
+double non_const_parameter_erand48(struct non_const_parameter_erand48_struct *dat)
+{
+    return erand48(dat->xsubi);
+}
+
+unsigned short *nullPointer_seed48(const unsigned short seed16v[3])
 {
     // cppcheck-suppress nullPointer
     (void) seed48(NULL);
@@ -420,7 +461,7 @@ int nullPointer_wcsnlen(const wchar_t *s, size_t n)
 
 size_t bufferAccessOutOfBounds_wcsnlen(void) // #10997
 {
-    wchar_t buf[2]={L'4',L'2'};
+    const wchar_t buf[2]={L'4',L'2'};
     size_t len = wcsnlen(buf,2);
     // TODO cppcheck-suppress bufferAccessOutOfBounds
     len+=wcsnlen(buf,3);
@@ -499,7 +540,7 @@ int nullPointer_aio_suspend(const struct aiocb *const aiocb_list[], int nitems,
     return aio_suspend(aiocb_list, nitems, timeout);
 }
 
-#ifdef __linux__
+#if !defined(__linux__) && !defined(__APPLE__)
 // Note: Since glibc 2.28, this function symbol is no longer available to newly linked applications.
 void invalidFunctionArg_llseek(int fd, loff_t offset, int origin)
 {
@@ -530,7 +571,6 @@ void invalidFunctionArg_llseek(int fd, loff_t offset, int origin)
     // cppcheck-suppress llseekCalled
     (void)llseek(fd, offset, SEEK_END);
 }
-#endif
 
 void invalidFunctionArg_lseek64(int fd, off_t offset, int origin)
 {
@@ -551,6 +591,7 @@ void invalidFunctionArg_lseek64(int fd, off_t offset, int origin)
     (void)lseek64(fd, offset, SEEK_CUR);
     (void)lseek64(fd, offset, SEEK_END);
 }
+#endif
 
 void invalidFunctionArg_lseek(int fd, off_t offset, int origin)
 {
@@ -615,7 +656,7 @@ char * overlappingWriteFunction_stpcpy(char *src, char *dest)
     return stpcpy(src, src);
 }
 
-int nullPointer_strcasecmp(char *a, char *b)
+int nullPointer_strcasecmp(const char *a, const char *b)
 {
     // No warning shall be shown:
     (void) strcasecmp(a, b);
@@ -625,7 +666,7 @@ int nullPointer_strcasecmp(char *a, char *b)
     return strcasecmp(NULL, b);
 }
 
-int nullPointer_strncasecmp(char *a, char *b, size_t n)
+int nullPointer_strncasecmp(const char *a, const char *b, size_t n)
 {
     // No warning shall be shown:
     (void) strncasecmp(a, b, n);
@@ -696,7 +737,7 @@ size_t nullPointer_strnlen(const char *s, size_t maxlen)
     return strnlen(NULL, maxlen);
 }
 
-char * nullPointer_stpcpy(char *src, char *dest)
+char * nullPointer_stpcpy(const char *src, char *dest)
 {
     // No warning shall be shown:
     (void) stpcpy(dest, src);
@@ -740,7 +781,7 @@ void nullPointer_bcopy(const void *src, void *dest, size_t n)
     bcopy(src, NULL, n);
 }
 
-void overlappingWriteFunction_memccpy(unsigned char *src, unsigned char *dest, int c, size_t count)
+void overlappingWriteFunction_memccpy(const unsigned char *src, unsigned char *dest, int c, size_t count)
 {
     // No warning shall be shown:
     (void)memccpy(dest, src, c, count);
@@ -770,7 +811,7 @@ wchar_t* overlappingWriteFunction_wcpncpy(wchar_t *src, wchar_t *dest, ssize_t n
 void overlappingWriteFunction_swab(char *src, char *dest, ssize_t n)
 {
     // No warning shall be shown:
-    swab(dest, src, n);
+    swab(src, dest, n);
     // cppcheck-suppress overlappingWriteFunction
     swab(src, src+3, 4);
 }
@@ -779,7 +820,7 @@ void bufferAccessOutOfBounds_swab(char *src, char *dest, ssize_t n)
 {
     // No warning shall be shown:
     swab(dest, src, n);
-    char srcBuf[42] = {0};
+    const char srcBuf[42] = {0};
     char destBuf[42] = {0};
     swab(srcBuf, dest, 42);
     // cppcheck-suppress bufferAccessOutOfBounds
@@ -843,7 +884,7 @@ void memleak_scandir(void)
        which is allocated via malloc(3).  If filter is NULL, all entries are
        selected.*/
 
-    // TODO: cppcheck-suppress memleak
+    // cppcheck-suppress memleak
 }
 
 void no_memleak_scandir(void)
@@ -864,6 +905,7 @@ void validCode(va_list valist_arg1, va_list valist_arg2)
     void *ptr;
     if (posix_memalign(&ptr, sizeof(void *), sizeof(void *)) == 0)
         free(ptr);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     syslog(LOG_ERR, "err %u", 0U);
     syslog(LOG_WARNING, "warn %d %d", 5, 1);
     vsyslog(LOG_EMERG, "emerg %d", valist_arg1);
@@ -875,6 +917,24 @@ void validCode(va_list valist_arg1, va_list valist_arg2)
     }
 }
 
+typedef struct {
+    size_t N;
+    int* data;
+} S_memalign;
+
+S_memalign* posix_memalign_memleak(size_t n) { // #12248
+    S_memalign* s = malloc(sizeof(*s));
+    // cppcheck-suppress nullPointerOutOfMemory
+    s->N = n;
+    if (0 != posix_memalign((void**)&s->data, 16, n * sizeof(int))) {
+        free(s);
+        return NULL;
+    }
+    // cppcheck-suppress nullPointerOutOfMemory
+    memset(s->data, 0, n * sizeof(int));
+    return s;
+}
+
 ssize_t nullPointer_send(int socket, const void *buf, size_t len, int flags)
 {
     // cppcheck-suppress nullPointer
@@ -934,7 +994,6 @@ void nullPointer(char *p, int fd, pthread_mutex_t mutex)
     mkdir(p, 0);
     getcwd(0, 0);
     // cppcheck-suppress nullPointer
-    // cppcheck-suppress readdirCalled
     readdir(0);
     // cppcheck-suppress nullPointer
     // cppcheck-suppress utimeCalled
@@ -975,12 +1034,45 @@ void nullPointer(char *p, int fd, pthread_mutex_t mutex)
     pthread_mutex_unlock(NULL);
 }
 
-void memleak_getaddrinfo()
+// cppcheck-suppress constParameterCallback
+void* f_returns_NULL(void* arg)
+{
+    return NULL;
+}
+
+void nullPointer_pthread_create() // #12396
+{
+    pthread_t thread;
+    pthread_create(&thread, NULL, (void* (*)(void*))f_returns_NULL, NULL);
+}
+
+void memleak_getaddrinfo() // #6994
 {
-    //TODO: nothing to report yet, see http://sourceforge.net/p/cppcheck/discussion/general/thread/d9737d5d/
     struct addrinfo * res=NULL;
     getaddrinfo("node", NULL, NULL, &res);
     freeaddrinfo(res);
+    getaddrinfo("node", NULL, NULL, &res);
+    // cppcheck-suppress memleak
+}
+
+void memleak_getaddrinfo_if() // #12506
+{
+    struct addrinfo hints = {};
+    struct addrinfo* addrs;
+    int err = getaddrinfo("example.com", "https", &hints, &addrs);
+    if (err != 0) {}
+    else {
+        freeaddrinfo(addrs);
+    }
+}
+
+void memleak_getaddrinfo_if2() // #12996
+{
+    struct addrinfo *addrs = NULL;
+    if (getaddrinfo("a", "b", NULL, &addrs)) {
+        return;
+    }
+    freeaddrinfo(addrs);
 }
 
 void memleak_mmap(int fd)
@@ -998,8 +1090,51 @@ void * memleak_mmap2() // #8327
     return NULL;
 }
 
+void memleak_getline() { // #11043
+    char *line = NULL;
+    size_t size = 0;
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    getline(&line, &size, stdin);
+    // cppcheck-suppress memleak
+    line = NULL;
+    getline(&line, &size, stdin);
+    // cppcheck-suppress memleak
+    line = NULL;
+}
+
+void memleak_getline_array(FILE* stream) { // #12498
+    char* a[2] = { 0 };
+    size_t n;
+    getline(&a[0], &n, stream);
+    getline(&a[1], &n, stream);
+    free(a[0]);
+    free(a[1]);
+}
+
+void memleak_getdelim(int delim) {
+    char *line = NULL;
+    size_t size = 0;
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    getdelim(&line, &size, delim, stdin);
+    // cppcheck-suppress memleak
+    line = NULL;
+    getdelim(&line, &size, delim, stdin);
+    // cppcheck-suppress memleak
+    line = NULL;
+}
+
+void memleak_getdelim_array(FILE* stream, int delim) {
+    char* a[2] = { 0 };
+    size_t n;
+    getdelim(&a[0], &n, delim, stream);
+    getdelim(&a[1], &n, delim, stream);
+    free(a[0]);
+    free(a[1]);
+}
+
 void * identicalCondition_mmap(int fd, size_t size) // #9940
 {
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     void* buffer = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
     if (buffer == MAP_FAILED) {
         return NULL;
@@ -1012,7 +1147,8 @@ int munmap_no_double_free(int tofd, // #11396
                           size_t len)
 {
     int rc;
-    void* fptr = mmap(NULL,len,PROT_READ|PROT_WRITE,MAP_SHARED,fromfd,(off_t)0);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    const void* fptr = mmap(NULL,len,PROT_READ|PROT_WRITE,MAP_SHARED,fromfd,(off_t)0);
     if (fptr == MAP_FAILED) {
         return -1;
     }
@@ -1023,13 +1159,16 @@ int munmap_no_double_free(int tofd, // #11396
         return -1;
     }
 
+    // cppcheck-suppress nullPointerOutOfMemory
     memcpy(tptr,fptr,len);
 
+    // cppcheck-suppress nullPointerOutOfMemory
     if ((rc = munmap(fptr,len)) != 0) {
         // cppcheck-suppress memleak
         return -1;
     }
 
+    // cppcheck-suppress nullPointerOutOfMemory
     if ((rc = munmap(tptr,len)) != 0) {
         return -1;
     }
@@ -1044,6 +1183,15 @@ void resourceLeak_fdopen(int fd)
     // cppcheck-suppress resourceLeak
 }
 
+void resourceLeak_fdopen2(const char* fn) // #2767
+{
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
+    int fi = open(fn, O_RDONLY);
+    FILE* fd = fdopen(fi, "r");
+    // cppcheck-suppress nullPointerOutOfResources
+    fclose(fd);
+}
+
 void resourceLeak_mkstemp(char *template)
 {
     // cppcheck-suppress unreadVariable
@@ -1085,14 +1233,14 @@ void resourceLeak_socket(void)
 
 void resourceLeak_open1(void)
 {
-    // cppcheck-suppress unreadVariable
+    // cppcheck-suppress [unreadVariable,valueFlowBailoutIncompleteVar]
     int fd = open("file", O_RDWR | O_CREAT);
     // cppcheck-suppress resourceLeak
 }
 
 void resourceLeak_open2(void)
 {
-    // cppcheck-suppress unreadVariable
+    // cppcheck-suppress [unreadVariable,valueFlowBailoutIncompleteVar]
     int fd = open("file", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
     // cppcheck-suppress resourceLeak
 }
@@ -1100,27 +1248,24 @@ void resourceLeak_open2(void)
 void noleak(int x, int y, int z)
 {
     DIR *p1 = fdopendir(x);
+    // cppcheck-suppress nullPointerOutOfResources
     closedir(p1);
     DIR *p2 = opendir("abc");
+    // cppcheck-suppress nullPointerOutOfResources
     closedir(p2);
     int s = socket(AF_INET,SOCK_STREAM,0);
     close(s);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     int fd1 = open("a", O_RDWR | O_CREAT);
     close(fd1);
     int fd2 = open("a", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
     close(fd2);
-    /* TODO: add configuration for open/fdopen
-        // #2830
-        int fd = open("path", O_RDONLY);
-        FILE *f = fdopen(fd, "rt");
-        fclose(f);
-     */
 }
 
 
 // unused return value
 
-void ignoredReturnValue(void *addr, int fd)
+void ignoredReturnValue(const void *addr, int fd)
 {
     // cppcheck-suppress leakReturnValNotUsed
     mmap(addr, 255, PROT_NONE, MAP_PRIVATE, fd, 0);
@@ -1163,7 +1308,7 @@ void uninitvar(int fd)
     char buf[2];
     int decimal, sign;
     double d;
-    void *p;
+    const void *p;
     pthread_mutex_t mutex, mutex1, mutex2, mutex3;
     // cppcheck-suppress uninitvar
     write(x1,"ab",2);
@@ -1192,12 +1337,13 @@ void uninitvar(int fd)
     // cppcheck-suppress gcvtCalled
     gcvt(3.141, 2, buf);
 
-    char *filename1, *filename2;
-    struct utimbuf *times;
+    const char *filename1, *filename2;
+    const struct utimbuf *times;
     // cppcheck-suppress uninitvar
     // cppcheck-suppress utimeCalled
     utime(filename1, times);
-    struct timeval times1[2];
+    // cppcheck-suppress constVariable
+    struct utimbuf times1[2];
     // cppcheck-suppress uninitvar
     // cppcheck-suppress utimeCalled
     utime(filename2, times1);
@@ -1245,15 +1391,16 @@ void uninitvar_types(void)
     b + 1;
 
     struct dirent d;
-    // cppcheck-suppress constStatement - TODO: uninitvar
+    // cppcheck-suppress [uninitvar,constStatement]
     d.d_ino + 1;
 }
 
-void timet_h(struct timespec* ptp1)
+void timet_h(const struct timespec* ptp1)
 {
     clockid_t clk_id1, clk_id2, clk_id3;
+    // cppcheck-suppress constVariablePointer
     struct timespec* ptp;
-    // cppcheck-suppress uninitvar
+    // cppcheck-suppress [uninitvar,valueFlowBailoutIncompleteVar]
     clock_settime(CLOCK_REALTIME, ptp);
     // cppcheck-suppress uninitvar
     clock_settime(clk_id1, ptp);
@@ -1290,10 +1437,10 @@ void dl(const char* libname, const char* func)
     // cppcheck-suppress resourceLeak
 }
 
-void asctime_r_test(struct tm * tm, char * bufSizeUnknown)
+void asctime_r_test(const struct tm * tm, char * bufSizeUnknown)
 {
     struct tm tm_uninit_data;
-    struct tm * tm_uninit_pointer;
+    const struct tm * tm_uninit_pointer;
     char bufSize5[5];
     char bufSize25[25];
     char bufSize26[26];
@@ -1321,10 +1468,10 @@ void asctime_r_test(struct tm * tm, char * bufSizeUnknown)
     asctime_r(tm, bufSizeUnknown);
 }
 
-void ctime_r_test(time_t * timep, char * bufSizeUnknown)
+void ctime_r_test(const time_t * timep, char * bufSizeUnknown)
 {
     time_t time_t_uninit_data;
-    time_t * time_t_uninit_pointer;
+    const time_t * time_t_uninit_pointer;
     char bufSize5[5];
     char bufSize25[25];
     char bufSize26[26];
@@ -1351,3 +1498,13 @@ void ctime_r_test(time_t * timep, char * bufSizeUnknown)
     // cppcheck-suppress ctime_rCalled
     ctime_r(timep, bufSizeUnknown);
 }
+
+void invalidFunctionArg_nice(int inc)
+{
+    // cppcheck-suppress invalidFunctionArg
+    nice(-21);
+    nice(-20);
+    nice(19);
+    // cppcheck-suppress invalidFunctionArg
+    nice(+20);
+}
diff --git a/test/cfg/python.c b/test/cfg/python.c
index f664bc4b75d..165afd4744f 100644
--- a/test/cfg/python.c
+++ b/test/cfg/python.c
@@ -2,7 +2,7 @@
 // Test library configuration for python.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=python --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/python.c
+// $ cppcheck --check-library --library=python --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/python.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
@@ -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)
 {
@@ -43,7 +44,7 @@ void nullPointer()
 
 void PyMem_Malloc_memleak()
 {
-    char * pBuf1 = PyMem_Malloc(1);
+    const char * pBuf1 = PyMem_Malloc(1);
     printf("%p", pBuf1);
     // cppcheck-suppress memleak
 }
@@ -58,7 +59,7 @@ void PyMem_Malloc_mismatchAllocDealloc()
 
 void PyMem_New_memleak()
 {
-    char * pBuf1 = PyMem_New(char, 5);
+    const char * pBuf1 = PyMem_New(char, 5);
     printf("%p", pBuf1);
     // cppcheck-suppress memleak
 }
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
index 584d1015a38..d508eeef487 100644
--- a/test/cfg/qt.cpp
+++ b/test/cfg/qt.cpp
@@ -2,25 +2,169 @@
 // Test library configuration for qt.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=qt --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/qt.cpp
+// $ cppcheck --check-library --library=qt --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/qt.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file valueFlowBailout
+
 #include <QObject>
 #include <QString>
 #include <QVector>
 #include <QStack>
 #include <QByteArray>
 #include <QList>
-#include <QLinkedList>
+#include <QMap>
+#include <QMultiMap>
+#include <QQueue>
+#include <QSet>
 #include <QtPlugin>
 #include <QFile>
-#include <cstdio>
 #include <QCoreApplication>
 #include <QLoggingCategory>
 #include <QTest>
+#include <QRect>
+#include <QRectF>
+#include <QSize>
+#include <QSizeF>
+#include <QPoint>
+#include <QPointF>
+#include <QRegion>
+#include <QTransform>
+
+// TODO: this is actually avilable 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>
+
+int ignoredReturnValue_QSize_height(const QSize &s)
+{
+    // cppcheck-suppress ignoredReturnValue
+    s.height();
+    return s.height();
+}
+
+int ignoredReturnValue_QSize_width(const QSize &s)
+{
+    // cppcheck-suppress ignoredReturnValue
+    s.width();
+    return s.width();
+}
+
+void unusedVariable_QTransform()
+{
+    // cppcheck-suppress unusedVariable
+    QTransform a;
+}
+
+void unreadVariable_QRegion(const int x, const QRegion::RegionType type, const QPolygon &polygon, const QBitmap &bm, const QRegion &region, const Qt::FillRule fillRule)
+{
+    // cppcheck-suppress unusedVariable
+    QRegion a;
+    // cppcheck-suppress unreadVariable
+    QRegion b{};
+    // cppcheck-suppress unreadVariable
+    QRegion c{x,x,x,x};
+    // cppcheck-suppress unreadVariable
+    QRegion d{x,x,x,x, type};
+    // cppcheck-suppress unreadVariable
+    QRegion e{polygon, fillRule};
+    // cppcheck-suppress unreadVariable
+    QRegion f{bm};
+    // cppcheck-suppress unreadVariable
+    QRegion g{region};
+}
+
+void unreadVariable_QPoint(const QPoint &s)
+{
+    // cppcheck-suppress unusedVariable
+    QPoint a;
+    // cppcheck-suppress unreadVariable
+    QPoint b{};
+    // cppcheck-suppress unreadVariable
+    QPoint c{4, 2};
+    // cppcheck-suppress unreadVariable
+    QPoint d(4, 2);
+    // cppcheck-suppress unreadVariable
+    QPoint e(s);
+}
 
+void unreadVariable_QPointF(const QPointF &s)
+{
+    // cppcheck-suppress unusedVariable
+    QPointF a;
+    // cppcheck-suppress unreadVariable
+    QPointF b{};
+    // cppcheck-suppress unreadVariable
+    QPointF c{4.2, 4.2};
+    // cppcheck-suppress unreadVariable
+    QPointF d(4.2, 4.2);
+    // cppcheck-suppress unreadVariable
+    QPointF e(s);
+}
+
+void unreadVariable_QSizeF(const QSize &s)
+{
+    // cppcheck-suppress unusedVariable
+    QSizeF a;
+    // cppcheck-suppress unreadVariable
+    QSizeF b{};
+    // cppcheck-suppress unreadVariable
+    QSizeF c{4.2, 4.2};
+    // cppcheck-suppress unreadVariable
+    QSizeF d(4.2, 4.2);
+    // cppcheck-suppress unreadVariable
+    QSizeF e(s);
+}
+
+void unreadVariable_QSize(const QSize &s)
+{
+    // cppcheck-suppress unusedVariable
+    QSize a;
+    // cppcheck-suppress unreadVariable
+    QSize b{};
+    // cppcheck-suppress unreadVariable
+    QSize c{4, 2};
+    // cppcheck-suppress unreadVariable
+    QSize d(4, 2);
+    // cppcheck-suppress unreadVariable
+    QSize e(s);
+}
+
+void unreadVariable_QRect(const QPoint &topLeft, const QSize &size, const QPoint &bottomRight, const int x) {
+    // cppcheck-suppress unusedVariable
+    QRect a;
+    // cppcheck-suppress unreadVariable
+    QRect b{};
+    // cppcheck-suppress unreadVariable
+    QRect c(0, 0, 100, 50);
+    // cppcheck-suppress unreadVariable
+    QRect d(x, x, x, x);
+    // cppcheck-suppress unreadVariable
+    QRect e(topLeft, size);
+    // cppcheck-suppress unreadVariable
+    QRect f(topLeft, bottomRight);
+}
+
+void unreadVariable_QRectF(const QPointF &topLeft, const QSizeF &size, const QPointF &bottomRight, const QRectF &rect, const qreal x) {
+    // cppcheck-suppress unusedVariable
+    QRectF a;
+    // cppcheck-suppress unreadVariable
+    QRectF b{};
+    // cppcheck-suppress unreadVariable
+    QRectF c(0.0, 0.0, 100.0, 50.0);
+    // cppcheck-suppress unreadVariable
+    QRectF d(x, x, x, x);
+    // cppcheck-suppress unreadVariable
+    QRectF e(topLeft, size);
+    // cppcheck-suppress unreadVariable
+    QRectF f(topLeft, bottomRight);
+    // cppcheck-suppress unreadVariable
+    QRectF g(rect);
+}
 
 void QString1(QString s)
 {
@@ -71,6 +215,22 @@ bool QString7(QString s, const QString& l) {
     return l.startsWith(s);
 }
 
+void QString_split(const char* name) { // #12998
+    // cppcheck-suppress valueFlowBailoutIncompleteVar // FIXME
+    QStringList qsl = QString(name).split(';', Qt::SkipEmptyParts);
+    if (qsl.isEmpty()) {}
+}
+
+namespace NTestStd // #12355
+{
+    using namespace std;
+    QString QString_std(QString s)
+    {
+        s.replace("abc", "def");
+        return s;
+    }
+}
+
 void QByteArray1(QByteArray byteArrayArg)
 {
     for (int i = 0; i <= byteArrayArg.size(); ++i) {
@@ -167,6 +327,7 @@ QList<int>::iterator QList3()
     return it;
 }
 
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 void QLinkedList1()
 {
     // cppcheck-suppress unreadVariable
@@ -203,6 +364,7 @@ QLinkedList<int>::iterator QLinkedList3()
     // cppcheck-suppress returnDanglingLifetime
     return it;
 }
+#endif
 
 void QStringList1(QStringList stringlistArg)
 {
@@ -316,11 +478,18 @@ QVector<int>::iterator QVector2()
 // cppcheck-suppress passedByValue
 void duplicateExpression_QString_Compare(QString style) //#8723
 {
-    // cppcheck-suppress duplicateExpression
+    // cppcheck-suppress [duplicateExpression,valueFlowBailoutIncompleteVar]
     if (style.compare( "x", Qt::CaseInsensitive ) == 0 || style.compare( "x", Qt::CaseInsensitive ) == 0)
     {}
 }
 
+void QVector_uninit()
+{
+    int i;
+    // cppcheck-suppress [uninitvar, unreadVariable]
+    QVector<int> v(i);
+}
+
 void QStack1(QStack<int> intStackArg)
 {
     for (int i = 0; i <= intStackArg.size(); ++i) {
@@ -406,11 +575,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()
@@ -420,6 +591,7 @@ void MacroTest3()
     QVERIFY2(2 >= 0, message.constData());
 }
 
+// cppcheck-suppress constParameterReference
 void validCode(int * pIntPtr, QString & qstrArg, double d)
 {
     Q_UNUSED(d)
@@ -441,7 +613,7 @@ void validCode(int * pIntPtr, QString & qstrArg, double d)
 
     printf(QT_TR_NOOP("Hi"));
 
-    // cppcheck-suppress checkLibraryFunction
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     Q_DECLARE_LOGGING_CATEGORY(logging_category_test);
     QT_FORWARD_DECLARE_CLASS(forwardDeclaredClass);
     QT_FORWARD_DECLARE_STRUCT(forwardDeclaredStruct);
@@ -453,7 +625,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) {}
     }
 }
@@ -503,6 +675,7 @@ namespace {
     private slots:
         void foo();
     };
+    // cppcheck-suppress functionStatic
     void Fred::foo() {}
 
     // bitfields14
@@ -562,6 +735,7 @@ namespace {
         ~MyObject1() {}
     public slots:
     signals:
+        // cppcheck-suppress functionStatic
         void test() {}
     };
 
@@ -573,4 +747,118 @@ namespace {
     // simplifyQtSignalsSlots2
     namespace Foo { class Bar; }
     class Foo::Bar : public QObject { private slots: };
+
+    // Q_PROPERTY with templates inducing a ',' should not produce a preprocessorErrorDirective
+    class AssocProperty : public QObject {
+    public:
+        Q_PROPERTY(QHash<QString, int> hash READ hash WRITE setHash)
+    };
+}
+
+struct SEstimateSize {
+    inline const QString& get() const {
+        return m;
+    }
+    QString m;
+};
+
+class QString;
+
+void dontCrashEstimateSize(const SEstimateSize& s) {
+    // cppcheck-suppress redundantCopyLocalConst
+    QString q = s.get();
+    if (!q.isNull()) {}
+}
+
+bool knownConditionTrueFalse_QString_count(const QString& s) // #11036
+{
+    if (!s.isEmpty() && s.count("abc") == 0)
+        return false;
+    return true;
+}
+
+void unusedVariable_qtContainers() // #10689
+{
+    // cppcheck-suppress unusedVariable
+    QMap<int, int> qm;
+    // cppcheck-suppress unusedVariable
+    QSet<int> qs;
+    // cppcheck-suppress unusedVariable
+    QMultiMap<int, int> qmm;
+    // cppcheck-suppress unusedVariable
+    QQueue<int> qq;
+    // cppcheck-suppress unusedVariable
+    QLatin1String ql1s;
+}
+
+void unreadVariable_QMapIterator(QMap<QString, QObject*>& m)
+{
+    auto it = m.find("abc"); // #12662
+    if (it != m.end()) {
+        // cppcheck-suppress checkLibraryFunction // TODO
+        delete it.value();
+        // cppcheck-suppress checkLibraryFunction
+        it.value() = new QObject();
+    }
+}
+
+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;
+    return qs;
+}
+
+struct BQObject_missingOverride { // #13406
+    Q_OBJECT
+};
+
+struct DQObject_missingOverride : BQObject_missingOverride {
+    Q_OBJECT
+};
+
+namespace {
+    class TestUnusedFunction : public QObject { // #13236
+        TestUnusedFunction();
+        void doStuff();
+    };
+
+    TestUnusedFunction::TestUnusedFunction() {
+        QObject::connect(this, SIGNAL(doStuff()), SLOT(doStuff()));
+    }
+
+    // cppcheck-suppress functionStatic
+    void TestUnusedFunction::doStuff() {} // Should not warn here with unusedFunction
+}
+
+int qdateIsValid()
+{
+    QDate qd(1,1,2025);
+    Q_ASSERT(qd.isValid()); // Should not warn here with assertWithSideEffect
+    return qd.month(); 
 }
diff --git a/test/cfg/runtests.sh b/test/cfg/runtests.sh
index 30563dc9934..c8c1515e66c 100755
--- a/test/cfg/runtests.sh
+++ b/test/cfg/runtests.sh
@@ -2,6 +2,8 @@
 set -e # abort on error
 #set -x # be verbose
 
+# TODO: do not bail out on first error - always run all tests and return error instead
+
 function exit_if_strict {
     if [ -n "${STRICT}" ] && [ "${STRICT}" -eq 1 ]; then
       exit 1
@@ -24,15 +26,30 @@ CFG="$DIR"../../cfg/
 
 # TODO: remove missingInclude disabling when it no longer is implied by --enable=information
 # Cppcheck options
-CPPCHECK_OPT='--check-library --platform=unix64 --enable=style,information --inconclusive --force --error-exitcode=-1 --disable=missingInclude --inline-suppr --template="{file}:{line}:{severity}:{id}:{message}"'
+# need to suppress unmatchedSuppression in case valueFlowBailout is not reported
+CPPCHECK_OPT=(
+    "--check-library"
+    "--platform=unix64"
+    "--enable=style,information"
+    "--inconclusive"
+    "--force"
+    "--check-level=exhaustive"
+    "--error-exitcode=-1"
+    "--inline-suppr"
+    "--template=\"{file}:{line}:{severity}:{id}:{message}\""
+    "--debug-warnings"
+    "--suppress=checkersReport")
 
 # Compiler settings
 CXX=g++
-CXX_OPT='-fsyntax-only -w -std=c++2a'
+CXX_OPT=("-fsyntax-only" "-w" "-std=c++2a")
 CC=gcc
-CC_OPT='-fsyntax-only -w -std=c11'
+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?
     set +e
     PKGCONFIG=$(pkg-config --cflags "$@")
     PKGCONFIG_RETURNCODE=$?
@@ -48,25 +65,64 @@ 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 {
-    ${CC} ${CC_OPT} ${DIR}posix.c
+    echo "POSIX assumed to be present, checking syntax with ${CC} now."
+    cc_syntax ${DIR}posix.c
 }
 
 # gnu.c
 function gnu_fn {
-    ${CC} ${CC_OPT} -D_GNU_SOURCE ${DIR}gnu.c
+    echo "GNU assumed to be present, checking syntax with ${CC} now."
+    cc_syntax ${DIR}gnu.c
 }
 
 # qt.cpp
 function qt_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
-        QTCONFIG=$(get_pkg_config_cflags Qt5Core Qt5Test)
-        if [ -n "$QTCONFIG" ]; then
-            QTBUILDCONFIG=$(pkg-config --variable=qt_config Qt5Core Qt5Test)
+        # 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++ -
+            echo -e "#include <QString>" | ${CXX} "${CXX_OPT[@]}" ${QTCONFIG} -x c++ -
             QTCHECK_RETURNCODE=$?
             set -e
             if [ $QTCHECK_RETURNCODE -ne 0 ]; then
@@ -74,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}."
@@ -85,28 +141,38 @@ function qt_fn {
 
 # bsd.c
 function bsd_fn {
-  true
+    # TODO: add syntax check
+    true
 }
 
 # std.c
 function std_c_fn {
-    ${CC} ${CC_OPT} ${DIR}std.c
+    echo "C standard library assumed to be present, checking syntax with ${CC} now."
+    cc_syntax "${DIR}"std.c
 }
 
 # std.cpp
 function std_cpp_fn {
-    ${CXX} ${CXX_OPT} ${DIR}std.cpp
+    echo "C++ standard library assumed to be present, checking syntax with ${CXX} now."
+    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
+}
+
+# mfc.cpp
+function mfc_fn {
+    # TODO: Add syntax check
     true
 }
 
 # wxwidgets.cpp
 function wxwidgets_fn {
+    # TODO: get rid of the error enabling/disabling?
     set +e
     WXCONFIG=$(wx-config --cxxflags)
     WXCONFIG_RETURNCODE=$?
@@ -115,8 +181,9 @@ function wxwidgets_fn {
         echo "wx-config does not work, skipping syntax check for wxWidgets tests."
         exit_if_strict
     else
+        # TODO: get rid of the error enabling/disabling?
         set +e
-        echo -e "#include <wx/filefn.h>\n#include <wx/app.h>\n#include <wx/artprov.h>\n#include <wx/version.h>\n#if wxVERSION_NUMBER<2950\n#error \"Old version\"\n#endif" | ${CXX} ${CXX_OPT} ${WXCONFIG} -x c++ -
+        echo -e "#include <wx/filefn.h>\n#include <wx/app.h>\n#include <wx/artprov.h>\n#include <wx/version.h>\n#if wxVERSION_NUMBER<2950\n#error \"Old version\"\n#endif" | ${CXX} "${CXX_OPT[@]}"  ${WXCONFIG} -x c++ -
         WXCHECK_RETURNCODE=$?
         set -e
         if [ $WXCHECK_RETURNCODE -ne 0 ]; then
@@ -124,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
 }
@@ -137,19 +204,20 @@ function gtk_fn {
             GTKCONFIG=$(get_pkg_config_cflags gtk+-2.0)
         fi
         if [ -n "$GTKCONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <gtk/gtk.h>" | ${CC} ${CC_OPT} ${GTKCONFIG} -x c -
+            echo -e "#include <gtk/gtk.h>" | ${CC} "${CC_OPT[@]}" ${GTKCONFIG} -x c -
             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
@@ -157,8 +225,9 @@ function gtk_fn {
 
 # boost.cpp
 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
@@ -166,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
 }
 
@@ -175,8 +244,9 @@ function sqlite3_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
         SQLITE3CONFIG=$(get_pkg_config_cflags sqlite3)
         if [ -n "$SQLITE3CONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <sqlite3.h>" | ${CC} ${CC_OPT} ${SQLITE3CONFIG} -x c -
+            echo -e "#include <sqlite3.h>" | ${CC} "${CC_OPT[@]}" ${SQLITE3CONFIG} -x c -
             SQLITE3CHECK_RETURNCODE=$?
             set -e
             if [ $SQLITE3CHECK_RETURNCODE -ne 0 ]; then
@@ -184,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}."
@@ -195,9 +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
-      ${CC} ${CC_OPT} -fopenmp ${DIR}openmp.c
+      echo "OpenMP assumed to be present, checking syntax with ${CC} now."
+      cc_syntax -fopenmp ${DIR}openmp.c
     fi
 }
 
@@ -206,8 +278,9 @@ function python_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
         PYTHON3CONFIG=$(get_pkg_config_cflags python3)
         if [ -n "$PYTHON3CONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <Python.h>" | ${CC} ${CC_OPT} ${PYTHON3CONFIG} -x c -
+            echo -e "#include <Python.h>" | ${CC} "${CC_OPT[@]}" ${PYTHON3CONFIG} -x c -
             PYTHON3CONFIG_RETURNCODE=$?
             set -e
             if [ $PYTHON3CONFIG_RETURNCODE -ne 0 ]; then
@@ -215,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}."
@@ -227,10 +300,14 @@ 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
-            echo -e "#include <lua.h>" | ${CC} ${CC_OPT} ${LUACONFIG} -x c -
+            echo -e "#include <lua.h>" | ${CC} "${CC_OPT[@]}" ${LUACONFIG} -x c -
             LUACONFIG_RETURNCODE=$?
             set -e
             if [ $LUACONFIG_RETURNCODE -ne 0 ]; then
@@ -238,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}."
@@ -252,8 +329,9 @@ function libcurl_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
         LIBCURLCONFIG=$(get_pkg_config_cflags libcurl)
         if [ -n "$LIBCURLCONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <curl/curl.h>" | ${CC} ${CC_OPT} ${LIBCURLCONFIG} -x c -
+            echo -e "#include <curl/curl.h>" | ${CC} "${CC_OPT[@]}" ${LIBCURLCONFIG} -x c -
             LIBCURLCONFIG_RETURNCODE=$?
             set -e
             if [ $LIBCURLCONFIG_RETURNCODE -ne 0 ]; then
@@ -261,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}."
@@ -275,8 +353,9 @@ function cairo_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
         CAIROCONFIG=$(get_pkg_config_cflags cairo)
         if [ -n "$CAIROCONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <cairo.h>" | ${CC} ${CC_OPT} ${CAIROCONFIG} -x c -
+            echo -e "#include <cairo.h>" | ${CC} "${CC_OPT[@]}" ${CAIROCONFIG} -x c -
             CAIROCONFIG_RETURNCODE=$?
             set -e
             if [ $CAIROCONFIG_RETURNCODE -ne 0 ]; then
@@ -284,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}."
@@ -295,11 +374,13 @@ function cairo_fn {
 
 # googletest.cpp
 function googletest_fn {
+    # TODO: add syntax check
     true
 }
 
 # kde.cpp
 function kde_fn {
+    # TODO: get rid of the error enabling/disabling?
     set +e
     KDECONFIG=$(kde4-config --path include)
     KDECONFIG_RETURNCODE=$?
@@ -313,8 +394,9 @@ function kde_fn {
             echo "Suitable Qt not present, Qt is necessary for KDE. Skipping syntax check."
             exit_if_strict
         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
@@ -322,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
@@ -333,8 +415,9 @@ function libsigcpp_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
         LIBSIGCPPCONFIG=$(get_pkg_config_cflags sigc++-2.0)
         if [ -n "$LIBSIGCPPCONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <sigc++/sigc++.h>\n" | ${CXX} ${CXX_OPT} ${LIBSIGCPPCONFIG} -x c++ -
+            echo -e "#include <sigc++/sigc++.h>\n" | ${CXX} "${CXX_OPT[@]}" ${LIBSIGCPPCONFIG} -x c++ -
             LIBSIGCPPCONFIG_RETURNCODE=$?
             set -e
             if [ $LIBSIGCPPCONFIG_RETURNCODE -ne 0 ]; then
@@ -342,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}."
@@ -356,8 +439,9 @@ function openssl_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
         OPENSSLCONFIG=$(get_pkg_config_cflags libssl)
         if [ -n "$OPENSSLCONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <openssl/ssl.h>" | ${CC} ${CC_OPT} ${OPENSSLCONFIG} -x c -
+            echo -e "#include <openssl/ssl.h>" | ${CC} "${CC_OPT[@]}" ${OPENSSLCONFIG} -x c -
             OPENSSLCONFIG_RETURNCODE=$?
             set -e
             if [ $OPENSSLCONFIG_RETURNCODE -ne 0 ]; then
@@ -365,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}."
@@ -379,8 +463,9 @@ function opencv2_fn {
     if [ $HAS_PKG_CONFIG -eq 1 ]; then
         OPENCVCONFIG=$(get_pkg_config_cflags opencv)
         if [ -n "$OPENCVCONFIG" ]; then
+            # TODO: get rid of the error enabling/disabling?
             set +e
-            echo -e "#include <opencv2/opencv.hpp>\n" | ${CXX} ${CXX_OPT} ${OPENCVCONFIG} -x c++ -
+            echo -e "#include <opencv2/opencv.hpp>\n" | ${CXX} "${CXX_OPT[@]}"  ${OPENCVCONFIG} -x c++ -
             OPENCVCONFIG_RETURNCODE=$?
             set -e
             if [ $OPENCVCONFIG_RETURNCODE -ne 0 ]; then
@@ -388,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}."
@@ -405,108 +490,133 @@ 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
 }
 
+# emscripten.cpp
+function emscripten_fn {
+    # TODO: Syntax check via g++ does not work because it can not find a valid emscripten.h
+    # cxx_syntax ${DIR}emscripten.cpp
+    true
+}
+
+# selinux.c
+function selinux_fn {
+    # TODO: add syntax check
+    true
+}
+
 function check_file {
-    f=$(basename $1)
+    f=$(basename "$1")
     lib="${f%%.*}"
     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_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 ${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"
+            ;;
+        mfc.cpp)
+            mfc_fn
+            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_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"
@@ -518,7 +628,7 @@ function check_files
 {
 for f in "$@"
 do
-    check_file $f
+    check_file "$f"
 done
 }
 
@@ -529,12 +639,12 @@ function check_defines_syntax
         echo "xmlstarlet needed to extract defines, skipping defines check."
         exit_if_strict
     else
-        for configfile in ${CFG}*.cfg; do
+        for configfile in "${CFG}"*.cfg; do
             echo "Checking defines in $configfile"
             # Disable debugging output temporarily since there could be many defines
             set +x
             # XMLStarlet returns 1 if no elements were found which is no problem here
-            EXTRACTED_DEFINES=$(xmlstarlet sel -t -m '//define' -c . -n <$configfile || true)
+            EXTRACTED_DEFINES=$(xmlstarlet sel -t -m '//define' -c . -n <"$configfile" || true)
             EXTRACTED_DEFINES=$(echo "$EXTRACTED_DEFINES" | sed 's/<define name="/#define /g' | sed 's/" value="/ /g' | sed 's/"\/>//g')
             echo "$EXTRACTED_DEFINES" | gcc -fsyntax-only -xc -Werror -
         done
diff --git a/test/cfg/selinux.c b/test/cfg/selinux.c
new file mode 100644
index 00000000000..361af4d9c08
--- /dev/null
+++ b/test/cfg/selinux.c
@@ -0,0 +1,306 @@
+
+// Test library configuration for selinux.cfg
+//
+// Usage:
+// $ cppcheck --check-library --library=selinux --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/selinux.c
+// =>
+// No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
+//
+
+#include <stdio.h>
+
+#include <selinux/restorecon.h>
+#include <selinux/get_default_type.h>
+#include <selinux/label.h>
+#include <selinux/context.h>
+#include <selinux/get_context_list.h>
+#include <selinux/avc.h>
+
+void restorecon(void)
+{
+    // cppcheck-suppress [ignoredReturnValue, nullPointer, invalidFunctionArgBool]
+    selinux_restorecon(NULL, true);
+
+    selinux_restorecon_set_sehandle(NULL);
+
+    // cppcheck-suppress ignoredReturnValue
+    selinux_restorecon_default_handle();
+
+    // cppcheck-suppress [ignoredReturnValue, nullPointer]
+    selinux_restorecon_set_alt_rootpath(NULL);
+
+    // cppcheck-suppress nullPointer
+    selinux_restorecon_set_exclude_list(NULL);
+
+    // cppcheck-suppress ignoredReturnValue
+    selinux_restorecon_get_skipped_errors();
+
+    struct dir_xattr **arg3;
+    // cppcheck-suppress [ignoredReturnValue, nullPointer, invalidFunctionArgBool, uninitvar]
+    selinux_restorecon_xattr(NULL, true, &arg3);
+}
+
+void get_default_type_fail(void)
+{
+    // cppcheck-suppress ignoredReturnValue
+    selinux_default_type_path();
+
+    char *type1;
+    // FIXME: report ignoredReturnValue
+    // cppcheck-suppress [nullPointer]
+    get_default_type(NULL, &type1);
+
+    char **type2;
+    // FIXME: report ignoredReturnValue
+    // cppcheck-suppress [uninitvar]
+    get_default_type("object_r", type2);
+
+    // cppcheck-suppress memleak
+}
+
+void get_default_type_success(void)
+{
+    char *type = NULL;
+    int err = get_default_type("object_r", &type);
+    if (err != 0)
+        return;
+    free(type);
+}
+
+void selabel_fail1(void)
+{
+    // cppcheck-suppress [unreadVariable, constVariablePointer]
+    struct selabel_handle *hnd = selabel_open(SELABEL_CTX_FILE, NULL, 1);
+
+    // cppcheck-suppress resourceLeak
+}
+
+void selabel_fail2(void)
+{
+    struct selabel_handle *hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
+
+    char *ctx;
+    // cppcheck-suppress nullPointerOutOfResources
+    selabel_lookup(hnd, &ctx, "/", 0);
+
+    // cppcheck-suppress nullPointerOutOfResources
+    selabel_close(hnd);
+
+    // cppcheck-suppress memleak
+}
+
+void selabel_success(void)
+{
+    struct selabel_handle *hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
+
+    char *ctx;
+    // cppcheck-suppress nullPointerOutOfResources
+    selabel_lookup(hnd, &ctx, "/", 0);
+
+    freecon(ctx);
+
+    // cppcheck-suppress nullPointerOutOfResources
+    (void)selabel_cmp(hnd, hnd);
+
+    // cppcheck-suppress nullPointerOutOfResources
+    selabel_stats(hnd);
+
+    // cppcheck-suppress nullPointerOutOfResources
+    selabel_close(hnd);
+}
+
+void context_fail1(void)
+{
+    // cppcheck-suppress [unreadVariable, nullPointer]
+    context_t con = context_new(NULL);
+
+    // cppcheck-suppress memleak
+}
+
+void context_fail2(void)
+{
+    // cppcheck-suppress unreadVariable
+    context_t con = context_new("kernel");
+
+    // cppcheck-suppress memleak
+}
+
+void context_success(void)
+{
+    context_t con = context_new("system_u:system_r:kernel_t:s0");
+
+    printf("%s: %s %s %s %s\n", context_str(con),
+           context_type_get(con), context_range_get(con),
+           context_role_get(con), context_user_get(con));
+
+    (void)context_type_set(con, "init_t");
+
+    context_free(con);
+}
+
+void get_ordered_context_list_fail1(void)
+{
+    char **ret;
+    // cppcheck-suppress nullPointer
+    get_ordered_context_list(NULL, NULL, &ret);
+
+    // cppcheck-suppress memleak
+}
+
+void get_ordered_context_list_fail2(void)
+{
+    char **ret;
+    get_ordered_context_list("root", NULL, &ret);
+
+    // cppcheck-suppress mismatchAllocDealloc
+    freecon((void*)ret);
+}
+
+void get_ordered_context_list_success1(void)
+{
+    char **ret;
+    get_ordered_context_list("root", NULL, &ret);
+    freeconary(ret);
+}
+
+void get_default_context_with_rolelevel_fail1(void)
+{
+    char *ctx;
+    // cppcheck-suppress nullPointer
+    get_default_context_with_rolelevel("root", NULL, "s0", "system_u:system_r:init_t:s0", &ctx);
+
+    // cppcheck-suppress memleak
+}
+
+void get_default_context_with_rolelevel_fail2(void)
+{
+    char *ctx;
+    get_default_context_with_rolelevel("root", "sysadm_r", NULL, NULL, &ctx);
+
+    // cppcheck-suppress mismatchAllocDealloc
+    freeconary((void*)ctx);
+}
+
+void get_default_context_with_rolelevel_success1(void)
+{
+    char *ctx;
+    get_default_context_with_rolelevel("root", "sysadm_r", NULL, NULL, &ctx);
+    freecon(ctx);
+}
+
+void selinux_status_fail1(void)
+{
+    // cppcheck-suppress [invalidFunctionArg, ignoredReturnValue]
+    selinux_status_open(-1);
+    // TODO: report leak
+}
+
+void selinux_status_success1(void)
+{
+    (void)selinux_status_open(0);
+    (void)selinux_status_updated();
+    selinux_status_close();
+}
+
+void realpath_not_final_fail1(void)
+{
+    char buf[64];
+    // cppcheck-suppress bufferAccessOutOfBounds
+    (void)realpath_not_final("/root", buf);
+}
+
+void realpath_not_final_success1(void)
+{
+#define PATH_MAX 4096
+    char buf[PATH_MAX + 1];
+    // cppcheck-suppress ignoredReturnValue
+    realpath_not_final("/root", buf);
+}
+
+void selinux_getpolicytype_fail1(void)
+{
+    // cppcheck-suppress nullPointer
+    selinux_getpolicytype(NULL);
+}
+
+void selinux_getpolicytype_fail2(void)
+{
+    char *type;
+    (void)selinux_getpolicytype(&type);
+
+    // cppcheck-suppress memleak
+}
+
+void selinux_check_access_fail1(void)
+{
+    const char *msg = "Hello World!";
+    // cppcheck-suppress [ignoredReturnValue, nullPointer]
+    selinux_check_access("foo", "bar", NULL, "baz", msg);
+}
+
+void selinux_check_access_success1(void)
+{
+    (void)selinux_check_access("kernel", "init", "file", "write", NULL);
+}
+
+void selinux_trans_to_raw_context_fail1(void)
+{
+    // FIXME: report ignoredReturnValue
+    // cppcheck-suppress nullPointer
+    selinux_trans_to_raw_context("kernel", NULL);
+}
+
+void selinux_trans_to_raw_context_fail2(void)
+{
+    char *ctx;
+    // FIXME: report ignoredReturnValue
+    selinux_trans_to_raw_context("kernel", &ctx);
+
+    // cppcheck-suppress memleak
+}
+
+void selinux_trans_to_raw_context_success1(void)
+{
+    char *ctx;
+    (void)selinux_trans_to_raw_context("kernel", &ctx);
+    free(ctx);
+}
+
+void getseuserbyname_fail1(void)
+{
+    char *seuser, *level;
+    // cppcheck-suppress nullPointer
+    getseuserbyname(NULL, &seuser, &level);
+    free(seuser);
+
+    // cppcheck-suppress memleak
+}
+
+void getseuserbyname_fail2(void)
+{
+    char *seuser, *level;
+    getseuserbyname("root", &seuser, &level);
+    free(level);
+
+    // FIXME: report memleak
+}
+
+void getseuserbyname_success1(void)
+{
+    char *seuser, *level;
+    getseuserbyname("root", &seuser, &level);
+    free(seuser);
+    free(level);
+}
+
+void danger1(void)
+{
+    // cppcheck-suppress selinux_reset_configCalled
+    selinux_reset_config();
+}
+
+void danger2(void)
+{
+    // cppcheck-suppress [security_disableCalled, ignoredReturnValue]
+    security_disable();
+}
diff --git a/test/cfg/sqlite3.c b/test/cfg/sqlite3.c
index ac4ed1d6957..093a1378b4e 100644
--- a/test/cfg/sqlite3.c
+++ b/test/cfg/sqlite3.c
@@ -2,7 +2,7 @@
 // Test library configuration for sqlite3.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=sqlite3 --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/sqlite3.c
+// $ cppcheck --check-library --library=sqlite3 --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/sqlite3.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
@@ -16,7 +16,7 @@ void validCode()
 
     int rc = sqlite3_open("/db", &db);
     if (rc != SQLITE_OK) {
-        fprintf(stderr, "Error opening sqlite3 db: %s\n", sqlite3_errmsg(db));
+        printf("Error opening sqlite3 db: %s\n", sqlite3_errmsg(db));
         sqlite3_close(db);
     } else {
         sqlite3_close(db);
@@ -43,10 +43,24 @@ void resourceLeak_sqlite3_open()
     sqlite3 * db;
 
     sqlite3_open("/db", &db);
-    // TODO: cppcheck-suppress resourceLeak
+    // cppcheck-suppress resourceLeak
 }
 
-void ignoredReturnValue(char * buf)
+void resourceLeak_sqlite3_open_v2(const char* Filename, int Flags, int Timeout, const char* Vfs) { // #12951, don't crash
+    sqlite3* handle;
+    const int ret = sqlite3_open_v2(Filename, &handle, Flags, Vfs);
+    if (SQLITE_OK != ret) {}
+    if (Timeout > 0) {}
+    // cppcheck-suppress resourceLeak
+}
+
+void nullPointer_sqlite3_open_v2(const char* filename, int flags) { // #13078
+    sqlite3* handle;
+    sqlite3_open_v2(filename, &handle, flags, NULL);
+    sqlite3_close_v2(handle);
+}
+
+void ignoredReturnValue(const char * buf)
 {
     // cppcheck-suppress leakReturnValNotUsed
     sqlite3_malloc(10);
diff --git a/test/cfg/std.c b/test/cfg/std.c
index 5c35cba1215..b96f1bf8317 100644
--- a/test/cfg/std.c
+++ b/test/cfg/std.c
@@ -2,11 +2,13 @@
 // Test library configuration for std.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=std --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/std.c
+// $ cppcheck --check-library --library=std --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/std.c
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file valueFlowBailout
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,14 +24,19 @@
 #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>
 
 size_t invalidFunctionArgStr_wcslen(void)
 {
@@ -185,6 +192,7 @@ size_t bufferAccessOutOfBounds_wcsrtombs(char * dest, const wchar_t ** src, size
 void bufferAccessOutOfBounds(void)
 {
     char a[5];
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     fgets(a,5,stdin);
     // cppcheck-suppress bufferAccessOutOfBounds
     fgets(a,6,stdin);
@@ -202,8 +210,10 @@ void bufferAccessOutOfBounds(void)
     // cppcheck-suppress bufferAccessOutOfBounds
     // TODO cppcheck-suppress redundantCopy
     strcpy(a, "abcde");
+#ifdef __STDC_LIB_EXT1__
     // cppcheck-suppress bufferAccessOutOfBounds
     strcpy_s(a, 10, "abcdefghij");
+#endif
     // TODO cppcheck-suppress redundantCopy
     // cppcheck-suppress terminateStrncpy
     strncpy(a,"abcde",5);
@@ -215,17 +225,21 @@ void bufferAccessOutOfBounds(void)
     strncpy(a,"a",6);
     // TODO cppcheck-suppress redundantCopy
     strncpy(a,"abcdefgh",4);
+#ifdef __STDC_LIB_EXT1__
     // valid call
     strncpy_s(a,5,"abcd",5);
     // string will be truncated, error is returned, but no buffer overflow
     strncpy_s(a,5,"abcde",6);
+    // TODO cppcheck-suppress bufferAccessOutOfBounds
     strncpy_s(a,5,"a",6);
     strncpy_s(a,5,"abcdefgh",4);
     // valid call
     strncat_s(a,5,"1",2);
     // cppcheck-suppress bufferAccessOutOfBounds
     strncat_s(a,10,"1",2);
+    // TODO cppcheck-suppress bufferAccessOutOfBounds
     strncat_s(a,5,"1",5);
+#endif
     fread(a,1,5,stdin);
     // cppcheck-suppress bufferAccessOutOfBounds
     fread(a,1,6,stdin);
@@ -234,8 +248,10 @@ void bufferAccessOutOfBounds(void)
     fread(a,1,6,stdout);
 
     char * pAlloc1 = aligned_alloc(8, 16);
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc1, 0, 16);
     // cppcheck-suppress bufferAccessOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc1, 0, 17);
     free(pAlloc1);
 }
@@ -315,17 +331,30 @@ void bufferAccessOutOfBounds_libraryDirectionConfiguration(void)
     arr[c] = 'x';
 }
 
+void internalError_libraryDirectionConfiguration(char* str) { // #12824
+    const char* s = str;
+    char* end = str;
+    if (1) {
+        // cppcheck-suppress unreadVariable
+        unsigned long val = strtoul(&s[1], &end, 10);
+    }
+}
+
 void arrayIndexOutOfBounds()
 {
     char * pAlloc1 = aligned_alloc(8, 16);
+    // cppcheck-suppress nullPointerOutOfMemory
     pAlloc1[15] = '\0';
     // cppcheck-suppress arrayIndexOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
     pAlloc1[16] = '1';
     free(pAlloc1);
 
     char * pAlloc2 = malloc(9);
+    // cppcheck-suppress nullPointerOutOfMemory
     pAlloc2[8] = 'a';
     // cppcheck-suppress arrayIndexOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
     pAlloc2[9] = 'a';
 
     // #1379
@@ -342,14 +371,11 @@ void arrayIndexOutOfBounds()
     free(pAlloc2);
 
     char * pAlloc3 = calloc(2,3);
+    // cppcheck-suppress nullPointerOutOfMemory
     pAlloc3[5] = 'a';
     // cppcheck-suppress arrayIndexOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
     pAlloc3[6] = 1;
-    // cppcheck-suppress memleakOnRealloc
-    pAlloc3 = reallocarray(pAlloc3, 3,3);
-    pAlloc3[8] = 'a';
-    // cppcheck-suppress arrayIndexOutOfBounds
-    pAlloc3[9] = 1;
     free(pAlloc3);
 }
 
@@ -399,10 +425,12 @@ void nullpointer(int value)
     puts(0);
     // cppcheck-suppress nullPointer
     fp=fopen(0,0);
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
     fp = 0;
     // No FP
     fflush(0); // If stream is a null pointer, all streams are flushed.
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     fp = freopen(0,"abc",stdin);
     fclose(fp);
     fp = NULL;
@@ -416,8 +444,10 @@ void nullpointer(int value)
     frexp(1.0,0);
     // cppcheck-suppress nullPointer
     fsetpos(0,0);
+#ifdef _WIN32 // not available on non-Windows compilers
     // cppcheck-suppress nullPointer
     itoa(123,0,10);
+#endif
     putchar(0);
     // cppcheck-suppress ignoredReturnValue
     // cppcheck-suppress nullPointer
@@ -463,24 +493,30 @@ void nullpointer(int value)
     // cppcheck-suppress ignoredReturnValue
     // cppcheck-suppress nullPointer
     wcscmp(0,0);
+#ifdef __STDC_LIB_EXT1__
     // cppcheck-suppress nullPointer
     strcpy_s(0,1,1);
     // cppcheck-suppress nullPointer
     strcpy_s(1,1,0);
+#endif
     // cppcheck-suppress nullPointer
     strncpy(0,0,1);
+#ifdef __STDC_LIB_EXT1__
     // cppcheck-suppress nullPointer
     strncpy_s(0,1,1,1);
     // cppcheck-suppress nullPointer
     strncpy_s(1,1,0,1);
+#endif
     // cppcheck-suppress nullPointer
     wcsncpy(0,0,1);
     // cppcheck-suppress nullPointer
     strncat(0,0,1);
+#ifdef __STDC_LIB_EXT1__
     // cppcheck-suppress nullPointer
     strncat_s(0,1,1,1);
     // cppcheck-suppress nullPointer
     strncat_s(1,1,0,1);
+#endif
     // cppcheck-suppress nullPointer
     wcsncat(0,0,1);
     // cppcheck-suppress ignoredReturnValue
@@ -516,6 +552,7 @@ void nullpointer(int value)
     wcstok(NULL,L"xyz",&pWcsUninit);
 
     strxfrm(0,"foo",0);
+    // TODO: error message (#6306 and http://trac.cppcheck.net/changeset/d11eb4931aea51cf2cb74faccdcd2a3289b818d6/)
     strxfrm(0,"foo",42);
     wcsxfrm(0,L"foo",0);
     // TODO: error message when arg1==NULL and arg3!=0 #6306: https://trac.cppcheck.net/ticket/6306#comment:2
@@ -586,13 +623,13 @@ size_t nullPointer_strlen(const char *s)
     return strlen(s);
 }
 
-void nullpointerMemchr1(char *p, char *s)
+void nullpointerMemchr1(char *p, const char *s)
 {
     p = memchr(s, 'p', strlen(s));
     (void)p;
 }
 
-void nullpointerMemchr2(char *p, char *s)
+void nullpointerMemchr2(char *p, const char *s)
 {
     p = memchr(s, 0, strlen(s));
     (void)p;
@@ -600,7 +637,7 @@ void nullpointerMemchr2(char *p, char *s)
 
 void nullPointer_memchr(char *p)
 {
-    char *s = 0;
+    const char *s = 0;
     // cppcheck-suppress nullPointer
     p = memchr(s, 0, strlen(s));
     (void)p;
@@ -656,9 +693,11 @@ void uninitvar_fopen(void)
     FILE *fp;
     // cppcheck-suppress uninitvar
     fp = fopen(filename, "rt");
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
     // cppcheck-suppress uninitvar
     fp = fopen("filename.txt", mode);
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
 }
 
@@ -708,7 +747,9 @@ void uninitvar_fgetpos(void)
 
     fp = fopen("filename","rt");
     // cppcheck-suppress uninitvar
+    // cppcheck-suppress nullPointerOutOfResources
     fgetpos(fp,ppos);
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
 }
 
@@ -716,13 +757,15 @@ void uninitvar_fsetpos(void)
 {
     FILE *fp;
     fpos_t pos;
-    fpos_t *ppos;
+    const fpos_t *ppos;
     // cppcheck-suppress uninitvar
     fsetpos(fp,&pos);
 
     fp = fopen("filename","rt");
     // cppcheck-suppress uninitvar
+    // cppcheck-suppress nullPointerOutOfResources
     fsetpos(fp,ppos);
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
 }
 
@@ -733,6 +776,7 @@ void uninitvar_fgets(void)
     char *str;
     int n;
 
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     fgets(buf,10,stdin);
 
     // cppcheck-suppress uninitvar
@@ -750,6 +794,7 @@ void uninitvar_fputc(void)
     int i;
     FILE *fp;
 
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     fputc('a', stdout);
 
     // cppcheck-suppress uninitvar
@@ -764,6 +809,7 @@ void uninitvar_fputs(void)
     const char *s;
     FILE *fp;
 
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     fputs("a", stdout);
 
     // cppcheck-suppress uninitvar
@@ -919,6 +965,7 @@ void uninitvar_asctime(void)
     (void)asctime(tm);
 }
 
+#ifdef __STDC_LIB_EXT1__
 void uninitvar_asctime_s(void)
 {
     const struct tm *tm;
@@ -927,6 +974,7 @@ void uninitvar_asctime_s(void)
     // cppcheck-suppress asctime_sCalled
     asctime_s(buf, sizeof(buf), tm);
 }
+#endif
 
 void uninitvar_assert(void)
 {
@@ -1089,8 +1137,8 @@ void uninitvar_casinh(void)
 void uninitvar_wcsftime(wchar_t* ptr)
 {
     size_t maxsize;
-    wchar_t* format;
-    struct tm* timeptr;
+    const wchar_t* format;
+    const struct tm* timeptr;
     // cppcheck-suppress uninitvar
     (void)wcsftime(ptr, maxsize, format, timeptr);
 }
@@ -1178,7 +1226,7 @@ void uninitvar_feraiseexcept(void)
 
 void uninitvar_fesetenv(void)
 {
-    fenv_t* envp;
+    const fenv_t* envp;
     // cppcheck-suppress uninitvar
     (void)fesetenv(envp);
 }
@@ -1199,7 +1247,7 @@ void uninitvar_fetestexcept(void)
 
 void uninitvar_feupdateenv(void)
 {
-    fenv_t* envp;
+    const fenv_t* envp;
     // cppcheck-suppress uninitvar
     (void)feupdateenv(envp);
 }
@@ -1311,14 +1359,14 @@ void uninitvar_atan2(void)
 
 void uninitvar_atof(void)
 {
-    char * c;
+    const char * c;
     // cppcheck-suppress uninitvar
     (void)atof(c);
 }
 
 void uninitvar_atol(void)
 {
-    char * c1, *c2, *c3;
+    const char * c1, *c2, *c3;
     // cppcheck-suppress uninitvar
     (void)atoi(c1);
 
@@ -1446,7 +1494,7 @@ void uninitvar_ccosh(void)
 
 void uninitvar_ctime(void)
 {
-    time_t *tp;
+    const time_t *tp;
     // cppcheck-suppress uninitvar
     (void)ctime(tp);
 }
@@ -1705,7 +1753,7 @@ void uninitvar_fmod(void)
     (void)fmodl(ld1,ld2);
 }
 
-void nullPointer_fprintf(FILE *Stream, char *Format, int Argument)
+void nullPointer_fprintf(FILE *Stream, const char *Format, int Argument)
 {
     // cppcheck-suppress nullPointer
     (void)fprintf(Stream, NULL, Argument);
@@ -1713,10 +1761,10 @@ void nullPointer_fprintf(FILE *Stream, char *Format, int Argument)
     (void)fprintf(Stream, Format, Argument);
 }
 
-void uninitvar_fprintf(FILE *Stream, char *Format, int Argument)
+void uninitvar_fprintf(FILE *Stream, const char *Format, int Argument)
 {
     FILE *stream1, *stream2;
-    char *format1, *format2;
+    const char *format1, *format2;
     int argument1, argument2;
     // cppcheck-suppress uninitvar
     (void)fprintf(stream1, format1, argument1);
@@ -1741,7 +1789,7 @@ void nullPointer_vfprintf(FILE *Stream, const char *Format, va_list Arg)
 void uninitvar_vfprintf(FILE *Stream, const char *Format, va_list Arg)
 {
     FILE *stream1, *stream2;
-    char *format1, *format2;
+    const char *format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1757,17 +1805,17 @@ void uninitvar_vfprintf(FILE *Stream, const char *Format, va_list Arg)
     (void)vfprintf(Stream, Format, arg);
 }
 
-void nullPointer_vfwprintf(FILE *Stream, wchar_t *Format, va_list Arg)
+void nullPointer_vfwprintf(FILE *Stream, const wchar_t *Format, va_list Arg)
 {
     // cppcheck-suppress nullPointer
     (void)vfwprintf(Stream, NULL, Arg);
     (void)vfwprintf(Stream, Format, Arg);
 }
 
-void uninitvar_vfwprintf(FILE *Stream, wchar_t *Format, va_list Arg)
+void uninitvar_vfwprintf(FILE *Stream, const wchar_t *Format, va_list Arg)
 {
     FILE *stream1, *stream2;
-    wchar_t *format1, *format2;
+    const wchar_t *format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1793,7 +1841,7 @@ void uninitvar_fputwc(void)
 
 void uninitvar_fputws(void)
 {
-    wchar_t *string;
+    const wchar_t *string;
     FILE *stream;
     // cppcheck-suppress uninitvar
     (void)fputws(string,stream);
@@ -1812,15 +1860,15 @@ void uninitvar_fread(void)
 void uninitvar_free(void)
 {
     // cppcheck-suppress unassignedVariable
-    void *block;
+    const void *block;
     // cppcheck-suppress uninitvar
     free(block);
 }
 
 void uninitvar_freopen(void)
 {
-    char *filename;
-    char *mode;
+    const char *filename;
+    const char *mode;
     FILE *stream;
     // cppcheck-suppress uninitvar
     FILE * p = freopen(filename,mode,stream);
@@ -1863,7 +1911,7 @@ void uninitvar_hypot(void)
 void uninitvar_fscanf(void)
 {
     FILE *stream;
-    char *format;
+    const char *format;
     int i;
     // cppcheck-suppress uninitvar
     (void)fscanf(stream,format,i);
@@ -1872,7 +1920,7 @@ void uninitvar_fscanf(void)
 void uninitvar_vfscanf(void)
 {
     FILE *stream;
-    char * format;
+    const char * format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1882,7 +1930,7 @@ void uninitvar_vfscanf(void)
 void uninitvar_vfwscanf(void)
 {
     FILE *stream;
-    wchar_t *format;
+    const wchar_t *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1917,7 +1965,7 @@ void uninitvar_fwide(void)
 
 void uninitvar_fwrite(void)
 {
-    void *ptr;
+    const void *ptr;
     size_t size;
     size_t nobj;
     FILE *stream;
@@ -1927,7 +1975,7 @@ void uninitvar_fwrite(void)
 
 void uninitvar_mblen(void)
 {
-    char *string;
+    const char *string;
     size_t size;
     // cppcheck-suppress uninitvar
     (void)mblen(string,size);
@@ -1936,7 +1984,7 @@ void uninitvar_mblen(void)
 void uninitvar_mbtowc(void)
 {
     wchar_t* pwc;
-    char* pmb;
+    const char* pmb;
     size_t max;
     // cppcheck-suppress uninitvar
     (void)mbtowc(pwc,pmb,max);
@@ -1944,7 +1992,7 @@ void uninitvar_mbtowc(void)
 
 void uninitvar_mbrlen(const char* p, size_t m, mbstate_t* s)
 {
-    char* pmb1, *pmb2;
+    const char* pmb1, *pmb2;
     size_t max1, max2;
     mbstate_t* ps1, *ps2;
     // cppcheck-suppress uninitvar
@@ -1977,7 +2025,7 @@ void uninitvar_btowc(void)
 
 void uninitvar_mbsinit(void)
 {
-    mbstate_t* ps;
+    const mbstate_t* ps;
     // cppcheck-suppress uninitvar
     (void)mbsinit(ps);
 }
@@ -1985,7 +2033,7 @@ void uninitvar_mbsinit(void)
 void uninitvar_mbstowcs(wchar_t* d, const char* s, size_t m)
 {
     wchar_t *dest;
-    char *src;
+    const char *src;
     size_t max;
 
     // cppcheck-suppress uninitvar
@@ -2040,7 +2088,7 @@ void uninitvar_wctomb(void)
 void uninitvar_wcstombs(void)
 {
     char *mbstr;
-    wchar_t *wcstr;
+    const wchar_t *wcstr;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)wcstombs(mbstr,wcstr,n);
@@ -2078,11 +2126,13 @@ void uninitvar_ungetwc(void)
 
 void uninitvar_getenv(void)
 {
-    char *name;
+    const char *name;
     // cppcheck-suppress uninitvar
     (void)getenv(name);
 }
 
+#if defined(_WIN32) || (__STDC_VERSION__ < 201112L)
+// since glibc 2.16 gets() is no longer available starting when >= C11
 void uninitvar_gets(void)
 {
     char *buffer;
@@ -2090,10 +2140,11 @@ void uninitvar_gets(void)
     // cppcheck-suppress uninitvar
     (void)gets(buffer);
 }
+#endif
 
 void uninitvar_gmtime(void)
 {
-    time_t *tp;
+    const time_t *tp;
     // cppcheck-suppress uninitvar
     (void)gmtime(tp);
 }
@@ -2298,21 +2349,21 @@ void uninitvar_towupper(void)
 
 void uninitvar_wctrans(void)
 {
-    char* property;
+    const char* property;
     // cppcheck-suppress uninitvar
     (void)wctrans(property);
 }
 
 void uninitvar_wctype(void)
 {
-    char* property;
+    const char* property;
     // cppcheck-suppress uninitvar
     (void)wctype(property);
 }
 
 void ignorereturn(void)
 {
-    char szNumbers[] = "2001 60c0c0 -1101110100110100100000 0x6fffff";
+    const char szNumbers[] = "2001 60c0c0 -1101110100110100100000 0x6fffff";
     char * pEnd;
     strtol(szNumbers,&pEnd,10);
 }
@@ -2503,7 +2554,7 @@ void uninitvar_ldiv(void)
 
 void uninitvar_localtime(void)
 {
-    time_t *tp;
+    const time_t *tp;
     // cppcheck-suppress uninitvar
     (void)localtime(tp);
 }
@@ -2690,7 +2741,7 @@ void uninitvar_islessgreater(void)
 
 void uninitvar_nan(void)
 {
-    char *tagp1, *tagp2, *tagp3;
+    const char *tagp1, *tagp2, *tagp3;
     // cppcheck-suppress uninitvar
     (void)nanf(tagp1);
     // cppcheck-suppress uninitvar
@@ -2852,7 +2903,7 @@ void uninitvar_alloca(void)
 
 void uninitvar_memchr(void)
 {
-    void *cs;
+    const void *cs;
     int c;
     size_t n;
     // cppcheck-suppress uninitvar
@@ -2861,7 +2912,7 @@ void uninitvar_memchr(void)
 
 void *bufferAccessOutOfBounds_memchr(const void *s, int c, size_t n)
 {
-    char buf[42]={0};
+    const char buf[42]={0};
     (void)memchr(buf,c,42);
     // cppcheck-suppress bufferAccessOutOfBounds
     (void)memchr(buf,c,43);
@@ -2870,7 +2921,7 @@ void *bufferAccessOutOfBounds_memchr(const void *s, int c, size_t n)
 
 void uninitvar_wmemchr(void)
 {
-    wchar_t *cs;
+    const wchar_t *cs;
     wchar_t c;
     size_t n;
     // cppcheck-suppress uninitvar
@@ -2879,8 +2930,8 @@ void uninitvar_wmemchr(void)
 
 void uninitvar_memcmp(void)
 {
-    void *s1;
-    void *s2;
+    const void *s1;
+    const void *s2;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)memcmp(s1,s2,n);
@@ -2888,8 +2939,8 @@ void uninitvar_memcmp(void)
 
 void uninitvar_wmemcmp(void)
 {
-    wchar_t *s1;
-    wchar_t *s2;
+    const wchar_t *s1;
+    const wchar_t *s2;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)wmemcmp(s1,s2,n);
@@ -2898,7 +2949,7 @@ void uninitvar_wmemcmp(void)
 void uninitvar_memcpy(void)
 {
     void *ct;
-    void *cs;
+    const void *cs;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)memcpy(ct,cs,n);
@@ -2907,7 +2958,7 @@ void uninitvar_memcpy(void)
 void uninitvar_wmemcpy(void)
 {
     wchar_t *cs;
-    wchar_t *c;
+    const wchar_t *c;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)wmemcpy(cs,c,n);
@@ -2954,10 +3005,6 @@ void uninitvar_mktime(void)
     struct tm *tp;
     // cppcheck-suppress uninitvar
     (void)mktime(tp);
-
-    struct tmx *tpx;
-    // cppcheck-suppress uninitvar
-    (void)mkxtime(tpx);
 }
 
 void uninitvar_modf(void)
@@ -2980,7 +3027,7 @@ void uninitvar_modf(void)
 
 void uninitvar_perror(void)
 {
-    char *string;
+    const char *string;
     // cppcheck-suppress uninitvar
     (void)perror(string);
 }
@@ -3048,9 +3095,9 @@ void uninitvar_remquo(void)
     (void)remquol(ld1,ld2,i3);
 }
 
-void uninitvar_printf(char *Format, int Argument)
+void uninitvar_printf(const char *Format, int Argument)
 {
-    char * format_1, * format_2, * format_3;
+    const char * format_1, * format_2, * format_3;
     int argument1, argument2;
     // no warning is expected
     (void)printf("x");
@@ -3067,9 +3114,9 @@ void uninitvar_printf(char *Format, int Argument)
     (void)printf(Format,Argument);
 }
 
-void uninitvar_vprintf(char *Format, va_list Arg)
+void uninitvar_vprintf(const char *Format, va_list Arg)
 {
-    char * format1, *format2;
+    const char * format1, *format2;
     va_list arg1, arg2;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3083,17 +3130,21 @@ void uninitvar_vprintf(char *Format, va_list Arg)
     (void)vprintf(Format,arg2);
 }
 
-void memleak_strdup (char *s) // #9328
+#if defined(_WIN32) || (__STDC_VERSION__ < 199901L)
+// strdup() is POSIX since glibc 2.10 - it is also not available on Linux compiler starting with C99
+void memleak_strdup (const char *s) // #9328
 {
-    char *s1 = strdup(s);
+    const char *s1 = strdup(s);
+    // cppcheck-suppress nullPointerOutOfMemory
     printf("%s",s1);
     free(s);     // s1 is not freed
     // cppcheck-suppress memleak
 }
+#endif
 
-void uninitvar_vwprintf(wchar_t *Format, va_list Arg)
+void uninitvar_vwprintf(const wchar_t *Format, va_list Arg)
 {
-    wchar_t * format1, * format2;
+    const wchar_t * format1, * format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3107,7 +3158,7 @@ void uninitvar_vwprintf(wchar_t *Format, va_list Arg)
     (void)vwprintf(Format,arg);
 }
 
-void nullPointer_bsearch(void* key, void* base, size_t num, size_t size)
+void nullPointer_bsearch(const void* key, const void* base, size_t num, size_t size)
 {
     // cppcheck-suppress nullPointer
     (void)bsearch(NULL,base,num,size,(int (*)(const void*,const void*))strcmp);
@@ -3119,8 +3170,8 @@ void nullPointer_bsearch(void* key, void* base, size_t num, size_t size)
 
 void uninitvar_bsearch(void)
 {
-    void* key;
-    void* base;
+    const void* key;
+    const void* base;
     size_t num;
     size_t size;
     // cppcheck-suppress uninitvar
@@ -3170,15 +3221,15 @@ void uninitvar_realloc(void)
 
 void uninitvar_remove(void)
 {
-    char *s;
+    const char *s;
     // cppcheck-suppress uninitvar
     (void)remove(s);
 }
 
 void uninitvar_rename(void)
 {
-    char *s1;
-    char *s2;
+    const char *s1;
+    const char *s2;
     // cppcheck-suppress uninitvar
     (void)rename(s1,s2);
 }
@@ -3264,7 +3315,7 @@ void uninitvar_raise(void)
 
 void uninitvar_scanf(void)
 {
-    char *format;
+    const char *format;
     char str[42];
     // cppcheck-suppress uninitvar
     (void)scanf(format, str);
@@ -3276,8 +3327,8 @@ void uninitvar_scanf(void)
 
 void uninitvar_vsscanf(void)
 {
-    char *s;
-    char *format;
+    const char *s;
+    const char *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3286,8 +3337,8 @@ void uninitvar_vsscanf(void)
 
 void uninitvar_vswscanf(void)
 {
-    wchar_t *s;
-    wchar_t *format;
+    const wchar_t *s;
+    const wchar_t *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3296,7 +3347,7 @@ void uninitvar_vswscanf(void)
 
 void uninitvar_vscanf(void)
 {
-    char *format;
+    const char *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3305,7 +3356,7 @@ void uninitvar_vscanf(void)
 
 void uninitvar_vwscanf(void)
 {
-    wchar_t *format;
+    const wchar_t *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3357,7 +3408,7 @@ void uninitvar_setvbuf(void)
 void uninitvar_strcat(char *dest, const char * const source)
 {
     char *deststr1, *deststr2;
-    char *srcstr1, *srcstr2;
+    const char *srcstr1, *srcstr2;
     // cppcheck-suppress uninitvar
     (void)strcat(deststr1,srcstr1);
     // cppcheck-suppress uninitvar
@@ -3396,7 +3447,7 @@ void bufferAccessOutOfBounds_strcat(char *dest, const char * const source)
     char buf4[4] = {0};
     const char * const srcstr3 = "123";
     const char * const srcstr4 = "1234";
-    // @todo #8599 cppcheck-suppress bufferAccessOutOfBounds
+    // cppcheck-suppress bufferAccessOutOfBounds
     (void)strcat(buf4,srcstr4); // off by one issue: strcat is appends \0' at the end
 
     // no warning shall be shown for
@@ -3408,7 +3459,7 @@ void bufferAccessOutOfBounds_strcat(char *dest, const char * const source)
 void uninitvar_wcscat(wchar_t *dest, const wchar_t * const source)
 {
     wchar_t *deststr_1, *deststr_2;
-    wchar_t *srcstr_1, *srcstr_2;
+    const wchar_t *srcstr_1, *srcstr_2;
     // cppcheck-suppress uninitvar
     (void)wcscat(deststr_1,srcstr_1);
     // cppcheck-suppress uninitvar
@@ -3431,13 +3482,13 @@ void uninitvar_wcrtomb(void)
 
 void uninitvar_strchr(void)
 {
-    char *cs;
+    const char *cs;
     int c;
     // cppcheck-suppress uninitvar
     (void)strchr(cs,c);
 }
 
-void invalidFunctionArg_strchr(char *cs, int c)
+void invalidFunctionArg_strchr(const char *cs, int c)
 {
     // cppcheck-suppress invalidFunctionArg
     (void)strchr(cs,-1);
@@ -3457,6 +3508,7 @@ void invalidFunctionArg_log10(float f, double d, const long double ld)
     (void)log10f(0.0f);
     (void)log10f(1.4013e-45f); // note: calculated by nextafterf(0.0f, 1.0f);
     (void)log10f(f);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     (void)log10f(FLT_MAX);
 
     // cppcheck-suppress invalidFunctionArg
@@ -3481,6 +3533,7 @@ void invalidFunctionArg_log(float f, double d, const long double ld)
     (void)logf(0.0f);
     (void)logf(1.4013e-45f); // note: calculated by nextafterf(0.0f, 1.0f);
     (void)logf(f);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     (void)logf(FLT_MAX);
 
     // cppcheck-suppress invalidFunctionArg
@@ -3505,6 +3558,7 @@ void invalidFunctionArg_log2(float f, double d, const long double ld)
     (void)log2f(0.0f);
     (void)log2f(1.4013e-45f); // note: calculated by nextafterf(0.0f, 1.0f);
     (void)log2f(f);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     (void)log2f(FLT_MAX);
 
     // cppcheck-suppress invalidFunctionArg
@@ -3524,13 +3578,13 @@ void invalidFunctionArg_log2(float f, double d, const long double ld)
 
 void uninitvar_wcschr(void)
 {
-    wchar_t *cs;
+    const wchar_t *cs;
     wchar_t c;
     // cppcheck-suppress uninitvar
     (void)wcschr(cs,c);
 }
 
-void nullPointer_strcmp(char *s1, char *s2)
+void nullPointer_strcmp(const char *s1, const char *s2)
 {
     // cppcheck-suppress nullPointer
     (void)strcmp(NULL,s2);
@@ -3539,12 +3593,12 @@ void nullPointer_strcmp(char *s1, char *s2)
     (void)strcmp(s1,s2);
 }
 
-void uninitvar_strcmp(char *s1, char *s2)
+void uninitvar_strcmp(const char *s1, const char *s2)
 {
-    char *str1;
-    char *str2;
-    char *str3;
-    char *str4;
+    const char *str1;
+    const char *str2;
+    const char *str3;
+    const char *str4;
 
     // cppcheck-suppress uninitvar
     (void)strcmp(str1,s2);
@@ -3557,12 +3611,12 @@ void uninitvar_strcmp(char *s1, char *s2)
     (void)strcmp(s1,s2);
 }
 
-void uninitvar_wcscmp(wchar_t *s1, wchar_t *s2)
+void uninitvar_wcscmp(const wchar_t *s1, const wchar_t *s2)
 {
-    wchar_t *str1;
-    wchar_t *str2;
-    wchar_t *str3;
-    wchar_t *str4;
+    const wchar_t *str1;
+    const wchar_t *str2;
+    const wchar_t *str3;
+    const wchar_t *str4;
 
     // cppcheck-suppress uninitvar
     (void)wcscmp(str1,s2);
@@ -3575,10 +3629,10 @@ void uninitvar_wcscmp(wchar_t *s1, wchar_t *s2)
     (void)wcscmp(s1,s2);
 }
 
-void uninitvar_strcpy(char *d, char *s)
+void uninitvar_strcpy(char *d, const char *s)
 {
     char *dest1, *dest2;
-    char *src1, *src2;
+    const char *src1, *src2;
 
     // cppcheck-suppress uninitvar
     (void)strcpy(dest1,s);
@@ -3591,10 +3645,11 @@ void uninitvar_strcpy(char *d, char *s)
     (void)strcpy(d,s);
 }
 
-void uninitvar_strcpy_s(char * strDest, ssize_t s, char *source)
+#ifdef __STDC_LIB_EXT1__
+void uninitvar_strcpy_s(char * strDest, ssize_t s, const char *source)
 {
     char *strUninit1;
-    char *strUninit2;
+    const char *strUninit2;
     ssize_t size;
 
     // cppcheck-suppress uninitvar
@@ -3607,11 +3662,12 @@ void uninitvar_strcpy_s(char * strDest, ssize_t s, char *source)
     // No warning is expected
     (void)strcpy_s(strDest, s, source);
 }
+#endif
 
-void uninitvar_wcscpy(wchar_t *d, wchar_t*s)
+void uninitvar_wcscpy(wchar_t *d, const wchar_t*s)
 {
     wchar_t *dest1, *dest2;
-    wchar_t *src1, *src2;
+    const wchar_t *src1, *src2;
 
     // cppcheck-suppress uninitvar
     (void)wcscpy(dest1,s);
@@ -3648,19 +3704,15 @@ void uninitvar_strftime(void)
 {
     char *s;
     size_t max;
-    char *fmt;
-    struct tm *p;
+    const char *fmt;
+    const struct tm *p;
     // cppcheck-suppress uninitvar
     (void)strftime(s,max,fmt,p);
-
-    struct tmx *px;
-    // cppcheck-suppress uninitvar
-    (void)strfxtime(s,max,fmt,px);
 }
 
 void uninitvar_strlen(const char *str)
 {
-    char *s;
+    const char *s;
     // cppcheck-suppress uninitvar
     (void)strlen(s);
 
@@ -3675,7 +3727,7 @@ void uninitvar_strlen(const char *str)
 
 void uninitvar_wcslen(void)
 {
-    wchar_t *s;
+    const wchar_t *s;
     // cppcheck-suppress uninitvar
     (void)wcslen(s);
 }
@@ -3684,7 +3736,7 @@ void uninitvar_wcslen(void)
 void uninitvar_strncpy(char * dest, const char * src, size_t num)
 {
     char *d;
-    char *s;
+    const char *s;
     size_t n;
 
     // cppcheck-suppress uninitvar
@@ -3698,10 +3750,11 @@ void uninitvar_strncpy(char * dest, const char * src, size_t num)
     (void)strncpy(dest,src,num);
 }
 
-void uninitvar_strncpy_s(char *Ct, size_t N1, char *S, size_t N2)
+#ifdef __STDC_LIB_EXT1__
+void uninitvar_strncpy_s(char *Ct, size_t N1, const char *S, size_t N2)
 {
     char dest[42];
-    char *s1, *s2;
+    const char *s1, *s2;
     size_t n1;
     size_t n2;
     size_t n3;
@@ -3720,20 +3773,21 @@ void uninitvar_strncpy_s(char *Ct, size_t N1, char *S, size_t N2)
     (void)strncpy_s(Ct,N1,S,N2);
     (void)strncpy_s(dest,N1,S,N2);
 }
+#endif
 
 void uninitvar_strpbrk(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)strpbrk(cs,ct);
 }
 
 // char * strncat ( char * destination, const char * source, size_t num );
-void uninitvar_strncat(char *d, char *s, size_t n)
+void uninitvar_strncat(char *d, const char *s, size_t n)
 {
     char *dest;
-    char *src;
+    const char *src;
     size_t num;
 
     // cppcheck-suppress uninitvar
@@ -3747,7 +3801,7 @@ void uninitvar_strncat(char *d, char *s, size_t n)
     (void)strncat(d,s,n);
 }
 
-void nullPointer_strncat(char *d, char *s, size_t n)
+void nullPointer_strncat(char *d, const char *s, size_t n)
 {
     // cppcheck-suppress nullPointer
     (void)strncat(NULL,s,n);
@@ -3767,11 +3821,12 @@ void nullPointer_strncpy(char *d, const char *s, size_t n)
     (void)strncpy(d,s,n);
 }
 
+#ifdef __STDC_LIB_EXT1__
 // errno_t strcat_s(char *restrict dest, rsize_t destsz, const char *restrict src); // since C11
-void uninitvar_strcat_s(char *Ct, size_t N, char *S)
+void uninitvar_strcat_s(char *Ct, size_t N, const char *S)
 {
     char *ct_1, *ct_2;
-    char *s1, *s2;
+    const char *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)strcat_s(ct_1,n1,s1);
@@ -3787,10 +3842,10 @@ void uninitvar_strcat_s(char *Ct, size_t N, char *S)
 }
 
 // errno_t wcscat_s(wchar_t *restrict dest, rsize_t destsz, const wchar_t *restrict src); // since C11
-void uninitvar_wcscat_s(wchar_t *Ct, size_t N, wchar_t *S)
+void uninitvar_wcscat_s(wchar_t *Ct, size_t N, const wchar_t *S)
 {
     wchar_t *ct_1, *ct_2;
-    wchar_t *s1, *s2;
+    const wchar_t *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)wcscat_s(ct_1,n1,s1);
@@ -3805,10 +3860,10 @@ void uninitvar_wcscat_s(wchar_t *Ct, size_t N, wchar_t *S)
     (void) wcscat_s(Ct,N,S);
 }
 
-void uninitvar_strncat_s(char *Ct, size_t N1, char *S, size_t N2)
+void uninitvar_strncat_s(char *Ct, size_t N1, const char *S, size_t N2)
 {
     char *ct_1, *ct_2;
-    char *s1, *s2;
+    const char *s1, *s2;
     size_t n1;
     size_t n2;
     size_t n3;
@@ -3828,11 +3883,12 @@ void uninitvar_strncat_s(char *Ct, size_t N1, char *S, size_t N2)
     // no warning is expected for
     (void)strncat_s(Ct,N1,S,N2);
 }
+#endif
 
-void uninitvar_wcsncat(wchar_t *Ct, wchar_t *S, size_t N)
+void uninitvar_wcsncat(wchar_t *Ct, const wchar_t *S, size_t N)
 {
     wchar_t *ct_1, *ct_2;
-    wchar_t *s1, *s2;
+    const wchar_t *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)wcsncat(ct_1,s1,n1);
@@ -3847,10 +3903,10 @@ void uninitvar_wcsncat(wchar_t *Ct, wchar_t *S, size_t N)
     (void)wcsncat(Ct,S,N);
 }
 
-void uninitvar_strncmp(char *Ct, char *S, size_t N)
+void uninitvar_strncmp(const char *Ct, const char *S, size_t N)
 {
-    char *ct;
-    char *s;
+    const char *ct;
+    const char *s;
     size_t n1;
 
     // cppcheck-suppress uninitvar
@@ -3864,10 +3920,10 @@ void uninitvar_strncmp(char *Ct, char *S, size_t N)
     (void)strncmp(Ct,S,N);
 }
 
-void uninitvar_wcsncmp(wchar_t *Ct, wchar_t *S, size_t N)
+void uninitvar_wcsncmp(const wchar_t *Ct, const wchar_t *S, size_t N)
 {
-    wchar_t *ct1, *ct2;
-    wchar_t *s1, *s2;
+    const wchar_t *ct1, *ct2;
+    const wchar_t *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)wcsncmp(ct1,s1,n1);
@@ -3884,24 +3940,24 @@ void uninitvar_wcsncmp(wchar_t *Ct, wchar_t *S, size_t N)
 
 void uninitvar_strstr(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)strstr(cs,ct);
 }
 
 void uninitvar_wcsstr(void)
 {
-    wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *cs;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)wcsstr(cs,ct);
 }
 
 void uninitvar_strspn(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)strspn(cs,ct);
 }
@@ -3909,7 +3965,7 @@ void uninitvar_strspn(void)
 void uninitvar_strxfrm(void)
 {
     char *ds;
-    char *ss;
+    const char *ss;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)strxfrm(ds,ss,n);
@@ -3930,7 +3986,7 @@ void bufferAccessOutOfBounds_strxfrm(void)
 void bufferAccessOutOfBounds_strncmp(void)
 {
     const char src[3] = "abc";
-    char dest[1] = "a";
+    const char dest[1] = "a";
     (void)strncmp(dest,src,1);
     (void)strncmp(dest,src,2);
     (void)strncmp(dest,src,3);
@@ -4000,7 +4056,7 @@ void nullPointer_strncmp(const char *s1, const char *s2, size_t n)
 void uninitvar_wcsxfrm(void)
 {
     wchar_t *ds;
-    wchar_t *ss;
+    const wchar_t *ss;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)wcsxfrm(ds,ss,n);
@@ -4008,8 +4064,8 @@ void uninitvar_wcsxfrm(void)
 
 void uninitvar_wcsspn(void)
 {
-    wchar_t *ds;
-    wchar_t *ss;
+    const wchar_t *ds;
+    const wchar_t *ss;
     // cppcheck-suppress uninitvar
     (void)wcsspn(ds,ss);
 }
@@ -4017,7 +4073,7 @@ void uninitvar_wcsspn(void)
 void uninitvar_setlocale(void)
 {
     int category;
-    char* locale;
+    const char* locale;
     // cppcheck-suppress uninitvar
     (void)setlocale(category,locale);
 }
@@ -4031,24 +4087,24 @@ void uninitvar_strerror(void)
 
 void uninitvar_strcspn(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)strcspn(cs,ct);
 }
 
 void uninitvar_wcscspn(void)
 {
-    wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *cs;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)wcscspn(cs,ct);
 }
 
 void uninitvar_wcspbrk(void)
 {
-    wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *cs;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)wcspbrk(cs,ct);
 }
@@ -4056,7 +4112,7 @@ void uninitvar_wcspbrk(void)
 void uninitvar_wcsncpy(void)
 {
     wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *ct;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)wcsncpy(cs,ct,n);
@@ -4064,16 +4120,16 @@ void uninitvar_wcsncpy(void)
 
 void uninitvar_strcoll(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)strcoll(cs,ct);
 }
 
 void uninitvar_wcscoll(void)
 {
-    wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *cs;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)wcscoll(cs,ct);
 }
@@ -4082,7 +4138,7 @@ void uninitvar_wcscoll(void)
 //      char * strrchr (       char * str, int character );
 void uninitvar_strrchr(const char * s, int c)
 {
-    char * str;
+    const char * str;
     int character;
 
     // cppcheck-suppress uninitvar
@@ -4096,7 +4152,7 @@ void uninitvar_strrchr(const char * s, int c)
 
 void uninitvar_wcsrchr(void)
 {
-    wchar_t* ws;
+    const wchar_t* ws;
     wchar_t wc;
     // cppcheck-suppress uninitvar
     (void)wcsrchr(ws,wc);
@@ -4115,7 +4171,7 @@ void uninitvar_wcsrtombs(void)
 void uninitvar_strtok(void)
 {
     char *s;
-    char *ct;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)strtok(s,ct);
 }
@@ -4178,7 +4234,6 @@ void uninitvar_tolower(int character)
     // cppcheck-suppress uninitvar
     (void)tolower(c1);
 
-    // cppcheck-suppress unassignedVariable
     int c2;
     // cppcheck-suppress constVariablePointer
     int *pc=&c2;
@@ -4200,7 +4255,6 @@ void uninitvar_toupper(int character)
     // cppcheck-suppress uninitvar
     (void)toupper(c1);
 
-    // cppcheck-suppress unassignedVariable
     int c2;
     // cppcheck-suppress constVariablePointer
     int *pc=&c2;
@@ -4273,7 +4327,7 @@ void uninitvar_wcstol(void)
     (void)wcstoull(s4,endp,base4);
 }
 
-void uninitvar_wprintf(wchar_t *Format, int Argument)
+void uninitvar_wprintf(const wchar_t *Format, int Argument)
 {
     const wchar_t *format1, *format2, *format3;
     int argument1, argument2;
@@ -4290,7 +4344,7 @@ void uninitvar_wprintf(wchar_t *Format, int Argument)
     (void)wprintf(Format);
 }
 
-void uninitvar_sprintf(char *S, char *Format, int Argument)
+void uninitvar_sprintf(char *S, const char *Format, int Argument)
 {
     char *s1, *s2;
     const char *format1, *format2;
@@ -4372,10 +4426,10 @@ void uninitvar_fwprintf(void)
     (void)fwprintf(stream,format,i);
 }
 
-void uninitvar_snprintf(char *S, size_t N, char *Format, int Int)
+void uninitvar_snprintf(char *S, size_t N, const char *Format, int Int)
 {
     size_t n1,n2;
-    char *format1, *format2;
+    const char *format1, *format2;
     int i1, i2;
     char *s1, *s2;
     // cppcheck-suppress uninitvar
@@ -4393,11 +4447,11 @@ void uninitvar_snprintf(char *S, size_t N, char *Format, int Int)
     (void)snprintf(S,N,Format,Int);
 }
 
-void uninitvar_vsnprintf(char *S, size_t N, char *Format, va_list Arg)
+void uninitvar_vsnprintf(char *S, size_t N, const char *Format, va_list Arg)
 {
     char *s1, *s2;
     size_t n1, n2;
-    char *format1, *format2;
+    const char *format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -4417,7 +4471,7 @@ void uninitvar_vsnprintf(char *S, size_t N, char *Format, va_list Arg)
 
 void uninitvar_wscanf(void)
 {
-    wchar_t *format1, *format2;
+    const wchar_t *format1, *format2;
     int i;
     // cppcheck-suppress uninitvar
     (void)wscanf(format1);
@@ -4425,9 +4479,9 @@ void uninitvar_wscanf(void)
     (void)wscanf(format2,&i);
 }
 
-void uninitvar_sscanf(char *s, const char *f, int i, int *ip)
+void uninitvar_sscanf(const char *s, const char *f, int i, int *ip)
 {
-    char *string1, *string2, *string3;
+    const char *string1, *string2, *string3;
     const char * format;
     int *pInteger;
 
@@ -4450,7 +4504,7 @@ void uninitvar_sscanf(char *s, const char *f, int i, int *ip)
 void uninitvar_fwscanf(void)
 {
     FILE* stream;
-    wchar_t* format1, *format2;
+    const wchar_t* format1, *format2;
     int i;
     // cppcheck-suppress uninitvar
     (void)fwscanf(stream,format1);
@@ -4460,8 +4514,8 @@ void uninitvar_fwscanf(void)
 
 void uninitvar_swscanf(void)
 {
-    wchar_t* s;
-    wchar_t* format1, *format2;
+    const wchar_t* s;
+    const wchar_t* format1, *format2;
     int i;
     // cppcheck-suppress uninitvar
     (void)swscanf(s,format1);
@@ -4471,12 +4525,12 @@ void uninitvar_swscanf(void)
 
 void uninitvar_system(void)
 {
-    char *c;
+    const char *c;
     // cppcheck-suppress uninitvar
     (void)system(c);
 }
 
-void nullPointer_system(char *c)
+void nullPointer_system(const char *c)
 {
     // If a null pointer is given, command processor is checked for existence
     (void)system(NULL);
@@ -4494,14 +4548,8 @@ int nullPointer_mtx_timedlock( mtx_t *restrict mutex, const struct timespec *res
 }
 #endif
 
-void uninitvar_zonetime(void)
-{
-    time_t *tp;
-    int zone;
-    // cppcheck-suppress uninitvar
-    (void)zonetime(tp,zone);
-}
-
+#ifdef _WIN32
+/* itoa() is not ANSI-C and not implemented by all compilers */
 void uninitvar_itoa(void)
 {
     int value;
@@ -4510,6 +4558,7 @@ void uninitvar_itoa(void)
     // cppcheck-suppress uninitvar
     (void)itoa(value,str,base);
 }
+#endif
 
 #ifdef __STD_UTF_16__
 void uninitvar_c16rtomb(void)
@@ -4524,7 +4573,7 @@ void uninitvar_c16rtomb(void)
 void uninitvar_mbrtoc16(void)
 {
     char16_t * pc16;
-    char * pmb;
+    const char * pmb;
     size_t max;
     mbstate_t * ps;
     // cppcheck-suppress uninitvar
@@ -4545,7 +4594,7 @@ void uninitvar_c32rtomb(void)
 void uninitvar_mbrtoc32(void)
 {
     char32_t * pc32;
-    char * pmb;
+    const char * pmb;
     size_t max;
     mbstate_t * ps;
     // cppcheck-suppress uninitvar
@@ -4685,9 +4734,11 @@ bool invalidFunctionArgBool_isxdigit(bool b, int c)
 
 void invalidFunctionArg(char c)
 {
+#ifdef __STDC_LIB_EXT1__
     // cppcheck-suppress asctime_sCalled
     // cppcheck-suppress invalidFunctionArg
     asctime_s(1, 24, 1);
+#endif
 
     /* cppcheck-suppress invalidFunctionArg */
     (void)isalnum(256);
@@ -4815,8 +4866,10 @@ void invalidFunctionArg(char c)
     (void)toupper(0);
     (void)toupper(255);
 
+#ifdef __STDC_LIB_EXT1__
     /* cppcheck-suppress invalidFunctionArg */
     (void)strcpy_s(1,0,"a");
+#endif
 }
 
 void invalidFunctionArgString(char c)
@@ -4845,9 +4898,14 @@ void ignoredReturnValue_abs(int i)
     abs(-100);
 }
 
+int clamp(int, int, int, int); // #13599
+void ignoredReturnValue_clamp(int a, int b, int c, int d) {
+    clamp(a, b, c, d); // not a library function
+}
+
 void nullPointer_asctime(void)
 {
-    struct tm *tm = 0;
+    const struct tm *tm = 0;
     // cppcheck-suppress asctimeCalled
     // cppcheck-suppress nullPointer
     (void)asctime(tm);
@@ -4856,9 +4914,10 @@ void nullPointer_asctime(void)
     (void)asctime(0);
 }
 
+#ifdef __STDC_LIB_EXT1__
 void nullPointer_asctime_s(void)
 {
-    struct tm *tm = 0;
+    const struct tm *tm = 0;
     char * buf = NULL;
     // cppcheck-suppress asctime_sCalled
     // cppcheck-suppress nullPointer
@@ -4867,6 +4926,7 @@ void nullPointer_asctime_s(void)
     // cppcheck-suppress nullPointer
     asctime_s(1, 26, tm);
 }
+#endif
 
 void nullPointer_fegetenv(void)
 {
@@ -4897,7 +4957,7 @@ void nullPointer_feholdexcept(void)
 
 void nullPointer_fesetenv(void)
 {
-    fenv_t* envp = 0;
+    const fenv_t* envp = 0;
     // cppcheck-suppress nullPointer
     (void)fesetenv(envp);
     // cppcheck-suppress nullPointer
@@ -4906,14 +4966,14 @@ void nullPointer_fesetenv(void)
 
 void nullPointer_fesetexceptflag(int excepts)
 {
-    fexcept_t* flagp = 0;
+    const fexcept_t* flagp = 0;
     // cppcheck-suppress nullPointer
     (void)fesetexceptflag(flagp,excepts);
     // cppcheck-suppress nullPointer
     (void)fesetexceptflag(0,excepts);
 }
 
-void invalidFunctionArg_fesetexceptflag(fexcept_t* flagp, int excepts)
+void invalidFunctionArg_fesetexceptflag(const fexcept_t* flagp, int excepts)
 {
     (void)fesetexceptflag(flagp, excepts);
     // cppcheck-suppress invalidFunctionArg
@@ -4945,7 +5005,7 @@ void invalidFunctionArg_fetestexcept(int excepts)
 
 void nullPointer_feupdateenv(void)
 {
-    fenv_t* envp = 0;
+    const fenv_t* envp = 0;
     // cppcheck-suppress nullPointer
     (void)feupdateenv(envp);
     // cppcheck-suppress nullPointer
@@ -4960,7 +5020,7 @@ void nullPointer_atexit(void)
 
 void nullPointer_atof(void)
 {
-    char * c = 0;
+    const char * c = 0;
     // cppcheck-suppress nullPointer
     (void)atof(c);
     // cppcheck-suppress nullPointer
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 8d6ec92d416..8a9976a94ae 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -2,12 +2,15 @@
 // Test library configuration for std.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=std --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/std.cpp
+// $ cppcheck --check-library --library=std --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/std.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-#include <algorithm>
+// cppcheck-suppress-file valueFlowBailout
+
+#include <algorithm> // IWYU pragma: keep
+#include <array>
 #include <bitset>
 #include <cassert>
 #include <cctype>
@@ -25,28 +28,107 @@
 #define __STDC_WANT_LIB_EXT1__ 1
 #include <ctime>
 #include <cwchar>
+#include <cwctype>
+#include <deque>
+#include <exception>
+#include <filesystem>
 #include <fstream>
 #include <functional>
 #ifndef __STDC_NO_THREADS__
     #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> // IWYU pragma: keep
+#include <locale>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <numeric>
+#include <queue>
+#include <set>
+#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
+#ifdef __cpp_lib_format
+#include <format>
+#endif
+
+#if __cplusplus <= 201402L
+void unreachableCode_std_unexpected(int &x)
+{
+    // cppcheck-suppress unexpectedCalled
+    std::unexpected();
+    // cppcheck-suppress unreachableCode
+    x=42;
+}
+#endif
+
+#ifdef __cpp_lib_clamp
+int ignoredReturnValue_std_clamp(const int x)
+{
+    // cppcheck-suppress ignoredReturnValue
+    std::clamp(x, 1, -1);
+    return std::clamp(x, 1, -1);
+}
+void knownConditionTrueFalse_std_clamp(const int x)
+{
+    // cppcheck-suppress knownConditionTrueFalse
+    if(std::clamp(-2, -1, 1) == -1){}
+    // cppcheck-suppress knownConditionTrueFalse
+    if(std::clamp(2, -1, 1) == 1){}
+    // cppcheck-suppress knownConditionTrueFalse
+    if(std::clamp(0, -1, 1) == 0){}
+    if(std::clamp(x, 0, 2)){}
+}
+#endif // __cpp_lib_clamp
+
+void unreachableCode_std_terminate(int &x)
+{
+    std::terminate();
+    // cppcheck-suppress unreachableCode
+    x=42;
+}
+
+bool ignoredReturnValue_std_filesystem_exists(const std::filesystem::path &path, std::error_code& ec)
+{
+    // cppcheck-suppress ignoredReturnValue
+    std::filesystem::exists(path);
+    // cppcheck-suppress ignoredReturnValue
+    std::filesystem::exists(path, ec);
+    const bool b {std::filesystem::exists(path)};
+    return b && std::filesystem::exists(path, ec);
+}
+
+// https://en.cppreference.com/w/cpp/io/manip/quoted
+void uninitvar_std_quoted(std::stringstream &ss, const std::string &input, const char delim, const char escape)
+{
+    ss << std::quoted(input);
+    ss << std::quoted(input, delim);
+    ss << std::quoted(input, delim, escape);
+    char delimChar;
+    // cppcheck-suppress uninitvar
+    ss << std::quoted(input, delimChar);
+    char escapeChar;
+    // cppcheck-suppress uninitvar
+    ss << std::quoted(input, delim, escapeChar);
+}
 
 int zerodiv_ldexp()
 {
@@ -297,9 +379,11 @@ void invalidFunctionArgStr_fopen(const char * const fileName, const char * const
     const char modeBuf[] = {'r'};
     // cppcheck-suppress invalidFunctionArgStr
     FILE *fp = fopen(fileName, modeBuf);
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
     // cppcheck-suppress invalidFunctionArgStr
     fp = fopen(fileNameBuf, mode);
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
 }
 
@@ -464,7 +548,7 @@ void nullPointer_std_ifstream_open(std::ifstream &is, const std::string &strFile
 
 void bufferAccessOutOfBounds_std_fstream_write(std::fstream &fs, const char* s, std::streamsize n)
 {
-    char buf[42] = {0};
+    const char buf[42] = {0};
     (void)fs.write(buf,42);
     // cppcheck-suppress bufferAccessOutOfBounds
     (void)fs.write(buf,43);
@@ -474,7 +558,7 @@ void bufferAccessOutOfBounds_std_fstream_write(std::fstream &fs, const char* s,
 
 void bufferAccessOutOfBounds_std_ostream_write(std::ostream &os, const char* s, std::streamsize n)
 {
-    char buf[42] = {0};
+    const char buf[42] = {0};
     (void)os.write(buf,42);
     // cppcheck-suppress bufferAccessOutOfBounds
     (void)os.write(buf,43);
@@ -484,7 +568,7 @@ void bufferAccessOutOfBounds_std_ostream_write(std::ostream &os, const char* s,
 
 void bufferAccessOutOfBounds_std_ostringstream_write(std::ostringstream &oss, const char* s, std::streamsize n)
 {
-    char buf[42] = {0};
+    const char buf[42] = {0};
     (void)oss.write(buf,42);
     // cppcheck-suppress bufferAccessOutOfBounds
     (void)oss.write(buf,43);
@@ -494,7 +578,7 @@ void bufferAccessOutOfBounds_std_ostringstream_write(std::ostringstream &oss, co
 
 void bufferAccessOutOfBounds_std_ofstream_write(std::ofstream &os, const char* s, std::streamsize n)
 {
-    char buf[42] = {0};
+    const char buf[42] = {0};
     (void)os.write(buf,42);
     // cppcheck-suppress bufferAccessOutOfBounds
     (void)os.write(buf,43);
@@ -502,7 +586,29 @@ void bufferAccessOutOfBounds_std_ofstream_write(std::ofstream &os, const char* s
     (void)os.write(s,n);
 }
 
-void invalidFunctionArg_fesetexceptflag(fexcept_t* flagp, int excepts)
+// cppcheck-suppress constParameterReference // TODO: FP
+void bufferAccessOutOfBounds_std_ifstream_get(std::ifstream& in, std::streambuf& sb)
+{
+    char cBuf[10];
+    // cppcheck-suppress bufferAccessOutOfBounds
+    in.getline(cBuf, 100);
+    // cppcheck-suppress bufferAccessOutOfBounds
+    in.read(cBuf, 100);
+    // cppcheck-suppress bufferAccessOutOfBounds
+    in.readsome(cBuf, 100);
+    // cppcheck-suppress bufferAccessOutOfBounds
+    in.get(cBuf, 100);
+    // cppcheck-suppress bufferAccessOutOfBounds
+    in.get(cBuf, 100, 'a');
+    // cppcheck-suppress bufferAccessOutOfBounds
+    in.getline(cBuf, 100, 'a');
+
+    in.get(sb, 'a');
+
+    in.close();
+}
+
+void invalidFunctionArg_fesetexceptflag(const fexcept_t* flagp, int excepts)
 {
     (void)std::fesetexceptflag(flagp, excepts);
     // cppcheck-suppress invalidFunctionArg
@@ -532,7 +638,7 @@ void invalidFunctionArg_fetestexcept(int excepts)
     (void)std::fetestexcept(FE_ALL_EXCEPT+1);
 }
 
-void nullPointer_fprintf(FILE *Stream, char *Format, int Argument)
+void nullPointer_fprintf(FILE *Stream, const char *Format, int Argument)
 {
     // cppcheck-suppress nullPointer
     (void)std::fprintf(Stream, nullptr, Argument);
@@ -568,7 +674,7 @@ void nullPointer_vfprintf(FILE *Stream, const char *Format, va_list Arg)
     (void)std::vfprintf(Stream, Format, Arg);
 }
 
-void nullPointer_vfwprintf(FILE *Stream, wchar_t *Format, va_list Arg)
+void nullPointer_vfwprintf(FILE *Stream, const wchar_t *Format, va_list Arg)
 {
     // cppcheck-suppress nullPointer
     (void)std::vfwprintf(Stream, nullptr, Arg);
@@ -588,6 +694,7 @@ void *bufferAccessOutOfBounds_memchr(void *s, int c, size_t n)
 #ifdef __STDC_LIB_EXT1__
 void uninitvar_localtime_s(const std::time_t *restrict time, struct tm *restrict result)
 {
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     const std::time_t *restrict Time;
     // TODO cppcheck-suppress uninitvar
     (void)std::localtime_s(Time, result);
@@ -602,6 +709,17 @@ void nullPointer_localtime_s(const std::time_t *restrict time, struct tm *restri
     (void)std::localtime_s(time, NULL);
     (void)std::localtime_s(time, result);
 }
+
+void memleak_localtime_s(const std::time_t *restrict time, struct tm *restrict result) // #9258
+{
+    const time_t t = time(0);
+    const struct tm* const now = new tm();
+    if (localtime_s(now, &t) == 0) {
+        // cppcheck-suppress valueFlowBailoutIncompleteVar
+        std::cout << now->tm_mday << std::endl;
+    }
+    // cppcheck-suppress memleak
+}
 #endif // __STDC_LIB_EXT1__
 
 size_t nullPointer_strftime(char *s, size_t max, const char *fmt, const struct tm *p)
@@ -624,6 +742,12 @@ size_t bufferAccessOutOfBounds_wcsrtombs(char * dest, const wchar_t ** src, size
     return std::wcsrtombs(dest,src,len,ps);
 }
 
+void deallocuse_wcrtomb(char *buff) { // #13119
+    free(buff);
+    // cppcheck-suppress deallocuse
+    wcrtomb(buff, L'x', nullptr);
+}
+
 void invalidFunctionArg_std_string_substr(const std::string &str, std::size_t pos, std::size_t len) {
     // cppcheck-suppress invalidFunctionArg
     (void)str.substr(-1,len);
@@ -631,6 +755,7 @@ void invalidFunctionArg_std_string_substr(const std::string &str, std::size_t po
     (void)str.substr(pos,-1);
     // no warning is expected for
     (void)str.substr(pos,len);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     (void)str.substr(pos, std::string::npos);
 }
 
@@ -641,6 +766,7 @@ void invalidFunctionArg_std_wstring_substr(const std::wstring &str, std::size_t
     (void)str.substr(pos,-1);
     // no warning is expected for
     (void)str.substr(pos,len);
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     (void)str.substr(pos, std::wstring::npos);
 }
 
@@ -703,7 +829,7 @@ void overlappingWriteFunction_wcscat(wchar_t *src, wchar_t *dest)
     (void)wcscat(src, src);
 }
 
-void overlappingWriteFunction_wcsxfrm(wchar_t *s1, wchar_t *s2, size_t n)
+void overlappingWriteFunction_wcsxfrm(wchar_t *s1, const wchar_t *s2, size_t n)
 {
     // No warning shall be shown:
     (void)wcsxfrm(s1, s2, n);
@@ -735,7 +861,7 @@ wchar_t* nullPointer_wcsncpy(wchar_t *s, const wchar_t *cs, size_t n)
     return std::wcsncpy(s,cs,n);
 }
 
-char * overlappingWriteFunction_strncat(char *src, char *dest, const std::size_t count)
+char * overlappingWriteFunction_strncat(const char *src, char *dest, const std::size_t count)
 {
     // No warning shall be shown:
     (void)strncat(dest, src, 42);
@@ -748,7 +874,7 @@ char * overlappingWriteFunction_strncat(char *src, char *dest, const std::size_t
     return strncat(buffer, buffer + 1, 3);
 }
 
-wchar_t * overlappingWriteFunction_wcsncat(wchar_t *src, wchar_t *dest, const std::size_t count)
+wchar_t * overlappingWriteFunction_wcsncat(const wchar_t *src, wchar_t *dest, const std::size_t count)
 {
     // No warning shall be shown:
     (void)wcsncat(dest, src, 42);
@@ -880,6 +1006,47 @@ void std_unordered_map_emplace_unnitvar(std::unordered_set<int>& u)
     u.emplace(i);
 }
 
+int std_map_find_constref(std::map<int, int>& m) // #11857
+{
+    std::map<int, int>& r = m;
+    std::map<int, int>::iterator it = r.find(42);
+    int* p = &it->second;
+    return ++*p;
+}
+
+void std_rotate_constref(std::vector<int>& v) // #13657
+{
+    std::rotate(v.begin(), v.begin() + 1, v.begin() + 2);
+}
+
+void std_queue_front_ignoredReturnValue(const std::queue<int>& q) {
+    // cppcheck-suppress ignoredReturnValue
+    q.front();
+}
+
+void std_priority_queue_top_ignoredReturnValue(const std::priority_queue<int>& pq) {
+    // cppcheck-suppress ignoredReturnValue
+    pq.top();
+}
+
+void std_tie_ignoredReturnValue(int a, int b)
+{
+    std::set<int> s;
+    std::set<int>::iterator it;
+    bool success;
+    std::tie(it, success) = s.insert(1);
+    // cppcheck-suppress ignoredReturnValue
+    std::tie();
+    // cppcheck-suppress ignoredReturnValue
+    std::tie(a, b);
+}
+
+void std_exception_ignoredReturnValue(const std::exception& e)
+{
+    // cppcheck-suppress ignoredReturnValue
+    e.what();
+}
+
 void valid_code()
 {
     std::vector<int> vecInt{0, 1, 2};
@@ -1035,8 +1202,8 @@ void uninitvar_isxdigit(void)
 void uninitvar_proj(void)
 {
     double d;
+    // cppcheck-suppress uninitvar
     const std::complex<double> dc(d,d);
-    // TODO cppcheck-suppress uninitvar
     (void)std::proj(dc);
 }
 
@@ -1156,8 +1323,8 @@ void uninitvar_asinh(void)
 void uninitvar_wcsftime(wchar_t* ptr)
 {
     size_t maxsize;
-    wchar_t* format;
-    struct tm* timeptr;
+    const wchar_t* format;
+    const struct tm* timeptr;
     // cppcheck-suppress uninitvar
     (void)std::wcsftime(ptr, maxsize, format, timeptr);
 }
@@ -1269,14 +1436,14 @@ void uninitvar_atan2(void)
 
 void uninitvar_atof(void)
 {
-    char * c;
+    const char * c;
     // cppcheck-suppress uninitvar
     (void)std::atof(c);
 }
 
 void uninitvar_atol(void)
 {
-    char * c1, *c2, *c3;
+    const char * c1, *c2, *c3;
     // cppcheck-suppress uninitvar
     (void)std::atoi(c1);
 
@@ -1376,7 +1543,7 @@ void uninitvar_feraiseexcept(void)
     (void)std::feraiseexcept(expects);
 }
 
-void uninitvar_fesetexceptflag(fexcept_t* flagp)
+void uninitvar_fesetexceptflag(const fexcept_t* flagp)
 {
     int expects;
     // cppcheck-suppress uninitvar
@@ -1392,7 +1559,7 @@ void uninitvar_feclearexcept(void)
 
 void uninitvar_fesetenv(void)
 {
-    fenv_t* envp;
+    const fenv_t* envp;
     // cppcheck-suppress uninitvar
     (void)std::fesetenv(envp);
 }
@@ -1413,14 +1580,14 @@ void uninitvar_fetestexcept(void)
 
 void uninitvar_feupdateenv(void)
 {
-    fenv_t* envp;
+    const fenv_t* envp;
     // cppcheck-suppress uninitvar
     (void)std::feupdateenv(envp);
 }
 
 void uninitvar_ctime(void)
 {
-    time_t *tp;
+    const time_t *tp;
     // cppcheck-suppress uninitvar
     (void)std::ctime(tp);
 }
@@ -1564,6 +1731,7 @@ void uninitvar_fdim(void)
 
 void uninitvar_fclose(void)
 {
+    // cppcheck-suppress unassignedVariable
     FILE *stream;
     // cppcheck-suppress uninitvar
     (void)std::fclose(stream);
@@ -1689,17 +1857,18 @@ void uninitvar_fmod(void)
 
 void uninitar_fopen(void)
 {
-    char *filename;
-    char *mode;
+    const char *filename;
+    const char *mode;
     // cppcheck-suppress uninitvar
     FILE * fp = std::fopen(filename, mode);
+    // cppcheck-suppress nullPointerOutOfResources
     fclose(fp);
 }
 
-void uninitar_fprintf(FILE *Stream, char *Format, int Argument)
+void uninitar_fprintf(FILE *Stream, const char *Format, int Argument)
 {
     FILE *stream1, *stream2;
-    char *format1, *format2;
+    const char *format1, *format2;
     int argument1, argument2;
     // cppcheck-suppress uninitvar
     (void)std::fprintf(stream1, format1, argument1);
@@ -1717,7 +1886,7 @@ void uninitar_fprintf(FILE *Stream, char *Format, int Argument)
 void uninitar_vfprintf(FILE *Stream, const char *Format, va_list Arg)
 {
     FILE *stream1, *stream2;
-    char *format1, *format2;
+    const char *format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1733,10 +1902,10 @@ void uninitar_vfprintf(FILE *Stream, const char *Format, va_list Arg)
     (void)std::vfprintf(Stream, Format, arg);
 }
 
-void uninitar_vfwprintf(FILE *Stream, wchar_t *Format, va_list Arg)
+void uninitar_vfwprintf(FILE *Stream, const wchar_t *Format, va_list Arg)
 {
     FILE *stream1, *stream2;
-    wchar_t *format1, *format2;
+    const wchar_t *format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1770,7 +1939,7 @@ void uninitvar_fputwc(void)
 
 void uninitvar_fputs(void)
 {
-    char *string;
+    const char *string;
     FILE *stream;
     // cppcheck-suppress uninitvar
     (void)std::fputs(string,stream);
@@ -1778,7 +1947,7 @@ void uninitvar_fputs(void)
 
 void uninitvar_fputws(void)
 {
-    wchar_t *string;
+    const wchar_t *string;
     FILE *stream;
     // cppcheck-suppress uninitvar
     (void)std::fputws(string,stream);
@@ -1796,6 +1965,7 @@ void uninitvar_fread(void)
 
 void uninitvar_free(void)
 {
+    // cppcheck-suppress unassignedVariable
     void *block;
     // cppcheck-suppress uninitvar
     std::free(block);
@@ -1803,12 +1973,12 @@ void uninitvar_free(void)
 
 void uninitvar_freopen(void)
 {
-    char *filename;
-    char *mode;
+    const char *filename;
+    const char *mode;
     FILE *stream;
     // cppcheck-suppress uninitvar
     FILE * p = std::freopen(filename,mode,stream);
-    free(p);
+    std::fclose(p);
 }
 
 void uninitvar_frexp(void)
@@ -1847,7 +2017,7 @@ void uninitvar_hypot(void)
 void uninitvar_fscanf(void)
 {
     FILE *stream;
-    char *format;
+    const char *format;
     int i;
     // cppcheck-suppress uninitvar
     (void)std::fscanf(stream,format,i);
@@ -1856,7 +2026,7 @@ void uninitvar_fscanf(void)
 void uninitvar_vfscanf(void)
 {
     FILE *stream;
-    char *format;
+    const char *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1866,7 +2036,7 @@ void uninitvar_vfscanf(void)
 void uninitvar_vfwscanf(void)
 {
     FILE *stream;
-    wchar_t *format;
+    const wchar_t *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -1910,7 +2080,7 @@ void invalidFunctionArgBool_fseek(FILE* stream, long int offset, int origin)
 void uninitvar_fsetpos(void)
 {
     FILE* stream;
-    fpos_t *ptr;
+    const fpos_t *ptr;
     // cppcheck-suppress uninitvar
     (void)std::fsetpos(stream,ptr);
 }
@@ -1944,7 +2114,7 @@ void nullPointer_memcmp(const void *s1, const void *s2, size_t n)
     (void)std::memcmp(s1,s2,n);
 }
 
-void nullPointer_strncat(char *d, char *s, size_t n)
+void nullPointer_strncat(char *d, const char *s, size_t n)
 {
     // cppcheck-suppress nullPointer
     (void)std::strncat(NULL,s,n);
@@ -2040,7 +2210,7 @@ void uninitvar_fwide(void)
 
 void uninitvar_fwrite(void)
 {
-    void *ptr;
+    const void *ptr;
     size_t size;
     size_t nobj;
     FILE *stream;
@@ -2050,7 +2220,7 @@ void uninitvar_fwrite(void)
 
 void uninitvar_mblen(void)
 {
-    char *string;
+    const char *string;
     size_t size;
     // cppcheck-suppress uninitvar
     (void)std::mblen(string,size);
@@ -2059,7 +2229,7 @@ void uninitvar_mblen(void)
 void uninitvar_mbtowc(void)
 {
     wchar_t* pwc;
-    char* pmb;
+    const char* pmb;
     size_t max;
     // cppcheck-suppress uninitvar
     (void)std::mbtowc(pwc,pmb,max);
@@ -2067,7 +2237,7 @@ void uninitvar_mbtowc(void)
 
 void uninitvar_mbrlen(const char* p, size_t m, mbstate_t* s)
 {
-    char* pmb1, *pmb2;
+    const char* pmb1, *pmb2;
     size_t max1, max2;
     mbstate_t* ps1, *ps2;
     // cppcheck-suppress uninitvar
@@ -2100,7 +2270,7 @@ void uninitvar_btowc(void)
 
 void uninitvar_mbsinit(void)
 {
-    mbstate_t* ps;
+    const mbstate_t* ps;
     // cppcheck-suppress uninitvar
     (void)std::mbsinit(ps);
 }
@@ -2108,7 +2278,7 @@ void uninitvar_mbsinit(void)
 void uninitvar_mbstowcs(void)
 {
     wchar_t *ws;
-    char *s;
+    const char *s;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::mbstowcs(ws,s,n);
@@ -2142,7 +2312,7 @@ void uninitvar_wctomb(void)
 void uninitvar_wcstombs(void)
 {
     char *mbstr;
-    wchar_t *wcstr;
+    const wchar_t *wcstr;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::wcstombs(mbstr,wcstr,n);
@@ -2180,14 +2350,14 @@ void uninitvar_ungetwc(void)
 
 void uninitvar_getenv(void)
 {
-    char *name;
+    const char *name;
     // cppcheck-suppress uninitvar
     (void)std::getenv(name);
 }
 
 void uninitvar_gmtime(void)
 {
-    time_t *tp;
+    const time_t *tp;
     // cppcheck-suppress uninitvar
     (void)std::gmtime(tp);
 }
@@ -2322,14 +2492,14 @@ void uninitvar_towupper(void)
 
 void uninitvar_wctrans(void)
 {
-    char* property;
+    const char* property;
     // cppcheck-suppress uninitvar
     (void)std::wctrans(property);
 }
 
 void uninitvar_wctype(void)
 {
-    char* property;
+    const char* property;
     // cppcheck-suppress uninitvar
     (void)std::wctype(property);
 }
@@ -2363,6 +2533,54 @@ void uninitvar_ldexp(void)
     (void)std::ldexp(ldc,e3);
 }
 
+void invalidFunctionArg_lgamma(float f, double d, long double ld)
+{
+    (void)lgamma(d);
+    // TODO cppcheck-suppress invalidFunctionArg
+    (void)lgamma(-0.1);
+    // cppcheck-suppress invalidFunctionArg
+    (void)lgamma(0.0);
+    (void)lgamma(0.1);
+
+    (void)lgammaf(f);
+    // TODO cppcheck-suppress invalidFunctionArg
+    (void)lgammaf(-0.1f);
+    // cppcheck-suppress invalidFunctionArg
+    (void)lgammaf(0.0f);
+    (void)lgammaf(0.1f);
+
+    (void)lgammal(ld);
+    // TODO cppcheck-suppress invalidFunctionArg
+    (void)lgammal(-0.1L);
+    // cppcheck-suppress invalidFunctionArg
+    (void)lgammal(0.0L);
+    (void)lgammal(0.1L);
+}
+
+void invalidFunctionArg_tgamma(float f, double d, long double ld)
+{
+    (void)tgamma(d);
+    // TODO cppcheck-suppress invalidFunctionArg
+    (void)tgamma(-0.1);
+    // cppcheck-suppress invalidFunctionArg
+    (void)tgamma(0.0);
+    (void)tgamma(0.1);
+
+    (void)tgammaf(f);
+    // TODO cppcheck-suppress invalidFunctionArg
+    (void)tgammaf(-0.1f);
+    // cppcheck-suppress invalidFunctionArg
+    (void)tgammaf(0.0f);
+    (void)tgammaf(0.1f);
+
+    (void)tgammal(ld);
+    // TODO cppcheck-suppress invalidFunctionArg
+    (void)tgammal(-0.1L);
+    // cppcheck-suppress invalidFunctionArg
+    (void)tgammal(0.0L);
+    (void)tgammal(0.1L);
+}
+
 void uninitvar_lgamma(void)
 {
     float f;
@@ -2453,11 +2671,25 @@ void uninitvar_llround(void)
     (void)std::llroundl(ld);
 }
 
+void unusedScopedObject_std_monostate(void)
+{
+    // cppcheck-suppress unusedScopedObject
+    std::monostate{};
+}
+
+void unusedScopedObject_std_logic_error()
+{
+    // cppcheck-suppress unusedScopedObject
+    std::logic_error("abc");
+}
+
 void uninitvar_srand(void)
 {
     unsigned int seed;
     // cppcheck-suppress uninitvar
     (void)std::srand(seed);
+    // cppcheck-suppress ignoredReturnValue
+    std::rand();
 }
 
 void uninitvar_ldiv(void)
@@ -2475,7 +2707,7 @@ void uninitvar_ldiv(void)
 
 void uninitvar_localtime(void)
 {
-    time_t *tp;
+    const time_t *tp;
     // cppcheck-suppress uninitvar
     (void)std::localtime(tp);
 }
@@ -2510,6 +2742,13 @@ void uninitvar_fpclassify(void)
     (void)std::fpclassify(ld);
 }
 
+void bool_isfinite(float f)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isfinite(f)==123) {}
+}
+
 void uninitvar_isfinite(void)
 {
     float f;
@@ -2525,6 +2764,13 @@ void uninitvar_isfinite(void)
     (void)std::isfinite(ld);
 }
 
+void bool_isgreater(float f1, float f2)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isgreater(f1,f2)==123) {}
+}
+
 void uninitvar_isgreater(void)
 {
     float f1,f2;
@@ -2540,6 +2786,13 @@ void uninitvar_isgreater(void)
     (void)std::isgreater(ld1,ld2);
 }
 
+void bool_isgreaterequal(float f1, float f2)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isgreaterequal(f1, f2)==123) {}
+}
+
 void uninitvar_isgreaterequal(void)
 {
     float f1,f2;
@@ -2555,6 +2808,13 @@ void uninitvar_isgreaterequal(void)
     (void)std::isgreaterequal(ld1,ld2);
 }
 
+void bool_isinf(float f)
+{
+    // cppcheck-suppress compareBoolExpressionWithInt
+    // cppcheck-suppress compareValueOutOfTypeRangeError
+    if (std::isinf(f)==123) {}
+}
+
 void uninitvar_isinf(void)
 {
     double d;
@@ -2624,7 +2884,7 @@ void uninitvar_islessgreater(void)
 
 void uninitvar_nan(void)
 {
-    char *tagp1, *tagp2, *tagp3;
+    const char *tagp1, *tagp2, *tagp3;
     // cppcheck-suppress uninitvar
     (void)std::nanf(tagp1);
     // cppcheck-suppress uninitvar
@@ -2770,7 +3030,7 @@ void uninitvar_longjmp(void)
 void uninitvar_malloc(void)
 {
     size_t size;
-    // cppcheck-suppress [uninitvar, cstyleCast]
+    // cppcheck-suppress [uninitvar, cstyleCast, unusedAllocatedMemory]
     int *p = (int*)std::malloc(size);
     free(p);
 }
@@ -2795,8 +3055,8 @@ void uninitvar_wmemchr(void)
 
 void uninitvar_memcmp(void)
 {
-    void *s1;
-    void *s2;
+    const void *s1;
+    const void *s2;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::memcmp(s1,s2,n);
@@ -2804,8 +3064,8 @@ void uninitvar_memcmp(void)
 
 void uninitvar_wmemcmp(void)
 {
-    wchar_t *s1;
-    wchar_t *s2;
+    const wchar_t *s1;
+    const wchar_t *s2;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::wmemcmp(s1,s2,n);
@@ -2814,7 +3074,7 @@ void uninitvar_wmemcmp(void)
 void uninitvar_memcpy(void)
 {
     void *ct;
-    void *cs;
+    const void *cs;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::memcpy(ct,cs,n);
@@ -2823,7 +3083,7 @@ void uninitvar_memcpy(void)
 void uninitvar_wmemcpy(void)
 {
     wchar_t *cs;
-    wchar_t *c;
+    const wchar_t *c;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::wmemcpy(cs,c,n);
@@ -2832,7 +3092,7 @@ void uninitvar_wmemcpy(void)
 void uninitvar_memmove(void)
 {
     void *ct;
-    void *cs;
+    const void *cs;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::memmove(ct,cs,n);
@@ -2892,7 +3152,7 @@ void uninivar_modf(void)
 
 void uninivar_perror(void)
 {
-    char *string;
+    const char *string;
     // cppcheck-suppress uninitvar
     (void)std::perror(string);
 }
@@ -2945,9 +3205,9 @@ void uninitvar_remquo(void)
     (void)std::remquol(ld1,ld2,i3);
 }
 
-void uninivar_printf(char *Format, int Argument)
+void uninivar_printf(const char *Format, int Argument)
 {
-    char * format_1, * format_2, * format_3;
+    const char * format_1, * format_2, * format_3;
     int argument1, argument2;
     // no warning is expected
     (void)std::printf("x");
@@ -2964,9 +3224,9 @@ void uninivar_printf(char *Format, int Argument)
     (void)std::printf(Format,Argument);
 }
 
-void uninivar_vprintf(char *Format, va_list Arg)
+void uninivar_vprintf(const char *Format, va_list Arg)
 {
-    char * format1, *format2;
+    const char * format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -2980,9 +3240,9 @@ void uninivar_vprintf(char *Format, va_list Arg)
     (void)std::vprintf(Format,arg);
 }
 
-void uninivar_vwprintf(wchar_t *Format, va_list Arg)
+void uninivar_vwprintf(const wchar_t *Format, va_list Arg)
 {
-    wchar_t * format1, *format2;
+    const wchar_t * format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -2998,8 +3258,8 @@ void uninivar_vwprintf(wchar_t *Format, va_list Arg)
 
 void uninivar_bsearch(void)
 {
-    void* key;
-    void* base;
+    const void* key;
+    const void* base;
     size_t num;
     size_t size;
     // cppcheck-suppress [uninitvar, cstyleCast]
@@ -3010,7 +3270,7 @@ void minsize_bsearch(const void* key, const void* base,
                      size_t num, size_t size,
                      int (*compar)(const void*,const void*))
 {
-    int Base[3] = {42, 43, 44};
+    const int Base[3] = {42, 43, 44};
 
     (void)std::bsearch(key,Base,2,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
     (void)std::bsearch(key,Base,3,size,(int (*)(const void*,const void*))strcmp); // cppcheck-suppress cstyleCast
@@ -3095,7 +3355,7 @@ void uninitvar_putwchar(void)
 
 void uninitvar_puts(void)
 {
-    char *s;
+    const char *s;
     // cppcheck-suppress uninitvar
     (void)std::puts(s);
 }
@@ -3111,15 +3371,15 @@ void uninitvar_realloc(void)
 
 void uninitvar_remove(void)
 {
-    char *s;
+    const char *s;
     // cppcheck-suppress uninitvar
     (void)std::remove(s);
 }
 
 void uninitvar_rename(void)
 {
-    char *s1;
-    char *s2;
+    const char *s1;
+    const char *s2;
     // cppcheck-suppress uninitvar
     (void)std::rename(s1,s2);
 }
@@ -3205,7 +3465,7 @@ void uninivar_raise(void)
 
 void uninivar_scanf(void)
 {
-    char *format;
+    const char *format;
     char str[42];
     // cppcheck-suppress uninitvar
     (void)std::scanf(format, str);
@@ -3213,8 +3473,8 @@ void uninivar_scanf(void)
 
 void uninivar_vsscanf(void)
 {
-    char *s;
-    char *format;
+    const char *s;
+    const char *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3223,8 +3483,8 @@ void uninivar_vsscanf(void)
 
 void uninivar_vswscanf(void)
 {
-    wchar_t *s;
-    wchar_t *format;
+    const wchar_t *s;
+    const wchar_t *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3233,7 +3493,7 @@ void uninivar_vswscanf(void)
 
 void uninivar_vscanf(void)
 {
-    char *format;
+    const char *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3242,7 +3502,7 @@ void uninivar_vscanf(void)
 
 void uninivar_vwscanf(void)
 {
-    wchar_t *format;
+    const wchar_t *format;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -3294,7 +3554,7 @@ void uninivar_setvbuf(void)
 void uninitvar_strcat(char *dest, const char * const source)
 {
     char *deststr1, *deststr2;
-    char *srcstr1, *srcstr2;
+    const char *srcstr1, *srcstr2;
     // cppcheck-suppress uninitvar
     (void)std::strcat(deststr1,srcstr1);
     // cppcheck-suppress uninitvar
@@ -3309,7 +3569,7 @@ void uninitvar_strcat(char *dest, const char * const source)
 void uninitvar_wcscat(wchar_t *dest, const wchar_t * const source)
 {
     wchar_t *deststr_1, *deststr_2;
-    wchar_t *srcstr1, *srcstr2;
+    const wchar_t *srcstr1, *srcstr2;
     // cppcheck-suppress uninitvar
     (void)std::wcscat(deststr_1,srcstr1);
     // cppcheck-suppress uninitvar
@@ -3332,7 +3592,7 @@ void uninivar_wcrtomb(void)
 
 void uninivar_strchr(void)
 {
-    char *cs;
+    const char *cs;
     int c;
     // cppcheck-suppress uninitvar
     (void)std::strchr(cs,c);
@@ -3340,7 +3600,7 @@ void uninivar_strchr(void)
 
 void uninivar_wcschr(void)
 {
-    wchar_t *cs;
+    const wchar_t *cs;
     wchar_t c;
     // cppcheck-suppress uninitvar
     (void)std::wcschr(cs,c);
@@ -3348,16 +3608,16 @@ void uninivar_wcschr(void)
 
 void uninivar_strcmp(void)
 {
-    char *str1;
-    char *str2;
+    const char *str1;
+    const char *str2;
     // cppcheck-suppress uninitvar
     (void)std::strcmp(str1,str2);
 }
 
 void uninivar_wcscmp(void)
 {
-    wchar_t *str1;
-    wchar_t *str2;
+    const wchar_t *str1;
+    const wchar_t *str2;
     // cppcheck-suppress uninitvar
     (void)std::wcscmp(str1,str2);
 }
@@ -3365,7 +3625,7 @@ void uninivar_wcscmp(void)
 void uninivar_strcpy(void)
 {
     char *str1;
-    char *str2;
+    const char *str2;
     // cppcheck-suppress uninitvar
     (void)std::strcpy(str1,str2);
 }
@@ -3373,7 +3633,7 @@ void uninivar_strcpy(void)
 void uninivar_wcscpy(void)
 {
     wchar_t *str1;
-    wchar_t *str2;
+    const wchar_t *str2;
     // cppcheck-suppress uninitvar
     (void)std::wcscpy(str1,str2);
 }
@@ -3382,22 +3642,22 @@ void uninivar_strftime(void)
 {
     char *s;
     size_t max;
-    char *fmt;
-    struct tm *p;
+    const char *fmt;
+    const struct tm *p;
     // cppcheck-suppress uninitvar
     (void)std::strftime(s,max,fmt,p);
 }
 
 void uninivar_strlen(void)
 {
-    char *s;
+    const char *s;
     // cppcheck-suppress uninitvar
     (void)std::strlen(s);
 }
 
 void uninivar_wcslen(void)
 {
-    wchar_t *s;
+    const wchar_t *s;
     // cppcheck-suppress uninitvar
     (void)std::wcslen(s);
 }
@@ -3405,7 +3665,7 @@ void uninivar_wcslen(void)
 void uninivar_strncpy(void)
 {
     char *s;
-    char *ct;
+    const char *ct;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::strncpy(s,ct,n);
@@ -3413,16 +3673,16 @@ void uninivar_strncpy(void)
 
 void uninivar_strpbrk(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)std::strpbrk(cs,ct);
 }
 
-void uninivar_strncat(char *Ct, char *S, size_t N)
+void uninivar_strncat(char *Ct, const char *S, size_t N)
 {
     char *ct_1, *ct_2;
-    char *s1, *s2;
+    const char *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)std::strncat(ct_1,s1,n1);
@@ -3437,10 +3697,10 @@ void uninivar_strncat(char *Ct, char *S, size_t N)
     (void)std::strncat(Ct,S,N);
 }
 
-void uninivar_wcsncat(wchar_t *Ct, wchar_t *S, size_t N)
+void uninivar_wcsncat(wchar_t *Ct, const wchar_t *S, size_t N)
 {
     wchar_t *ct_1, *ct_2;
-    wchar_t *s1, *s2;
+    const wchar_t *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)std::wcsncat(ct_1,s1,n1);
@@ -3455,10 +3715,10 @@ void uninivar_wcsncat(wchar_t *Ct, wchar_t *S, size_t N)
     (void)std::wcsncat(Ct,S,N);
 }
 
-void uninivar_strncmp(char *Ct, char *S, size_t N)
+void uninivar_strncmp(const char *Ct, const char *S, size_t N)
 {
-    char *ct1, *ct2;
-    char *s1, *s2;
+    const char *ct1, *ct2;
+    const char *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)std::strncmp(ct1,s1,n1);
@@ -3473,10 +3733,10 @@ void uninivar_strncmp(char *Ct, char *S, size_t N)
     (void)std::strncmp(Ct,S,N);
 }
 
-void uninivar_wcsncmp(wchar_t *Ct, wchar_t *S, size_t N)
+void uninivar_wcsncmp(const wchar_t *Ct, const wchar_t *S, size_t N)
 {
-    wchar_t *ct1, *ct2;
-    wchar_t *s1, *s2;
+    const wchar_t *ct1, *ct2;
+    const wchar_t *s1, *s2;
     size_t n1, n2;
     // cppcheck-suppress uninitvar
     (void)std::wcsncmp(ct1,s1,n1);
@@ -3494,7 +3754,7 @@ void uninivar_wcsncmp(wchar_t *Ct, wchar_t *S, size_t N)
 void uninivar_strstr(void)
 {
     char *cs;
-    char *ct;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)std::strstr(cs,ct);
 }
@@ -3502,15 +3762,15 @@ void uninivar_strstr(void)
 void uninivar_wcsstr(void)
 {
     wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)std::wcsstr(cs,ct);
 }
 
 void uninivar_strspn(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)std::strspn(cs,ct);
 }
@@ -3518,7 +3778,7 @@ void uninivar_strspn(void)
 void uninivar_strxfrm(void)
 {
     char *ds;
-    char *ss;
+    const char *ss;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::strxfrm(ds,ss,n);
@@ -3527,7 +3787,7 @@ void uninivar_strxfrm(void)
 void uninivar_wcsxfrm(void)
 {
     wchar_t *ds;
-    wchar_t *ss;
+    const wchar_t *ss;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::wcsxfrm(ds,ss,n);
@@ -3535,8 +3795,8 @@ void uninivar_wcsxfrm(void)
 
 void uninivar_wcsspn(void)
 {
-    wchar_t *ds;
-    wchar_t *ss;
+    const wchar_t *ds;
+    const wchar_t *ss;
     // cppcheck-suppress uninitvar
     (void)std::wcsspn(ds,ss);
 }
@@ -3544,7 +3804,7 @@ void uninivar_wcsspn(void)
 void uninivar_setlocale(void)
 {
     int category;
-    char* locale;
+    const char* locale;
     // cppcheck-suppress uninitvar
     (void)std::setlocale(category,locale);
 }
@@ -3557,24 +3817,24 @@ void uninivar_strerror(void)
 
 void uninivar_strcspn(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)std::strcspn(cs,ct);
 }
 
 void uninivar_wcscspn(void)
 {
-    wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *cs;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)std::wcscspn(cs,ct);
 }
 
 void uninivar_wcspbrk(void)
 {
-    wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *cs;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)std::wcspbrk(cs,ct);
 }
@@ -3582,7 +3842,7 @@ void uninivar_wcspbrk(void)
 void uninivar_wcsncpy(void)
 {
     wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *ct;
     size_t n;
     // cppcheck-suppress uninitvar
     (void)std::wcsncpy(cs,ct,n);
@@ -3590,23 +3850,23 @@ void uninivar_wcsncpy(void)
 
 void uninivar_strcoll(void)
 {
-    char *cs;
-    char *ct;
+    const char *cs;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)std::strcoll(cs,ct);
 }
 
 void uninivar_wcscoll(void)
 {
-    wchar_t *cs;
-    wchar_t *ct;
+    const wchar_t *cs;
+    const wchar_t *ct;
     // cppcheck-suppress uninitvar
     (void)std::wcscoll(cs,ct);
 }
 
 void uninivar_strrchr(void)
 {
-    char * str;
+    const char * str;
     int c;
     // cppcheck-suppress uninitvar
     (void)std::strrchr(str,c);
@@ -3633,7 +3893,7 @@ void uninivar_wcsrtombs(void)
 void uninivar_strtok(void)
 {
     char *s;
-    char *ct;
+    const char *ct;
     // cppcheck-suppress uninitvar
     (void)std::strtok(s,ct);
 }
@@ -3894,7 +4154,7 @@ void uninivar_wcstol(void)
     (void)wcstoumax(s8,endp8,base8);
 }
 
-void uninitvar_wprintf(wchar_t *Format, int Argument)
+void uninitvar_wprintf(const wchar_t *Format, int Argument)
 {
     const wchar_t *format1, *format2, *format3;
     int argument1, argument2;
@@ -3967,10 +4227,10 @@ void uninivar_fwprintf(void)
     (void)std::fwprintf(stream,format,i);
 }
 
-void uninivar_snprintf(char *S, size_t N, char *Format, int Int)
+void uninivar_snprintf(char *S, size_t N, const char *Format, int Int)
 {
     size_t n1, n2;
-    char *format1, *format2;
+    const char *format1, *format2;
     int i1, i2;
     char *s1, *s2;
     // cppcheck-suppress uninitvar
@@ -3988,11 +4248,11 @@ void uninivar_snprintf(char *S, size_t N, char *Format, int Int)
     (void)std::snprintf(S,N,Format,Int);
 }
 
-void uninivar_vsnprintf(char *S, size_t N, char *Format, va_list Arg)
+void uninivar_vsnprintf(char *S, size_t N, const char *Format, va_list Arg)
 {
     char *s1, *s2;
     size_t n1, n2;
-    char *format1, *format2;
+    const char *format1, *format2;
     va_list arg;
     // cppcheck-suppress va_list_usedBeforeStarted
     // cppcheck-suppress uninitvar
@@ -4012,7 +4272,7 @@ void uninivar_vsnprintf(char *S, size_t N, char *Format, va_list Arg)
 
 void uninivar_wscanf(void)
 {
-    wchar_t *format1, *format2;
+    const wchar_t *format1, *format2;
     int i;
     // cppcheck-suppress uninitvar
     (void)std::wscanf(format1);
@@ -4022,7 +4282,7 @@ void uninivar_wscanf(void)
 
 void uninivar_sscanf(void)
 {
-    char *string1, *string2;
+    const char *string1, *string2;
     const char * format;
     int i;
     // cppcheck-suppress uninitvar
@@ -4034,7 +4294,7 @@ void uninivar_sscanf(void)
 void uninivar_fwscanf(void)
 {
     FILE* stream;
-    wchar_t* format1, *format2;
+    const wchar_t* format1, *format2;
     int i;
     // cppcheck-suppress uninitvar
     (void)std::fwscanf(stream,format1);
@@ -4044,8 +4304,8 @@ void uninivar_fwscanf(void)
 
 void uninivar_swscanf(void)
 {
-    wchar_t* s;
-    wchar_t* format1, *format2;
+    const wchar_t* s;
+    const wchar_t* format1, *format2;
     int i;
     // cppcheck-suppress uninitvar
     (void)std::swscanf(s,format1);
@@ -4055,14 +4315,14 @@ void uninivar_swscanf(void)
 
 void uninitvar_system(void)
 {
-    char *c;
+    const char *c;
     // cppcheck-suppress uninitvar
     (void)std::system(c);
 }
 
 #ifndef __STDC_NO_THREADS__
 
-void nullPointer_mtx_destroy( mtx_t *mutex )
+void nullPointer_mtx_destroy(mtx_t *mutex )
 {
     // cppcheck-suppress nullPointer
     mtx_destroy(nullptr);
@@ -4093,7 +4353,7 @@ int nullPointer_mtx_timedlock( mtx_t *mutex, const struct timespec *time_point )
 }
 #endif
 
-void nullPointer_system(char *c)
+void nullPointer_system(const char *c)
 {
     // If a null pointer is given, command processor is checked for existence
     (void)std::system(NULL);
@@ -4103,7 +4363,7 @@ void nullPointer_system(char *c)
 void uninitvar_setw(void)
 {
     int i;
-    // cppcheck-suppress uninitvar
+    // cppcheck-suppress [uninitvar,valueFlowBailoutIncompleteVar]
     std::cout << std::setw(i);
 }
 
@@ -4111,6 +4371,7 @@ void uninitvar_setiosflags(void)
 {
     std::ios_base::fmtflags mask;
     // TODO cppcheck-suppress uninitvar
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     std::cout << std::setiosflags(mask); // #6987 - false negative
 }
 
@@ -4118,13 +4379,14 @@ void uninitvar_resetiosflags(void)
 {
     std::ios_base::fmtflags mask;
     // TODO cppcheck-suppress uninitvar
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     std::cout << std::resetiosflags(mask); // #6987 - false negative
 }
 
 void uninitvar_setfill(void)
 {
     char c;
-    // cppcheck-suppress uninitvar
+    // cppcheck-suppress [uninitvar,valueFlowBailoutIncompleteVar]
     std::cout << std::setfill(c);
 
     wchar_t wc;
@@ -4135,14 +4397,14 @@ void uninitvar_setfill(void)
 void uninitvar_setprecision(void)
 {
     int p;
-    // cppcheck-suppress uninitvar
+    // cppcheck-suppress [uninitvar,valueFlowBailoutIncompleteVar]
     std::cout << std::setprecision(p);
 }
 
 void uninitvar_setbase(void)
 {
     int p;
-    // cppcheck-suppress uninitvar
+    // cppcheck-suppress [uninitvar,valueFlowBailoutIncompleteVar]
     std::cout << std::setbase(p);
 }
 
@@ -4198,13 +4460,13 @@ void uninivar_istream_read(std::istream &f)
     f.read(buffer, size);
 }
 
-void uninitvar_string_compare(std::string &teststr, std::wstring &testwstr)
+void uninitvar_string_compare(const std::string &teststr, const std::wstring &testwstr)
 {
-    char *pStrUninit;
+    const char *pStrUninit;
     // cppcheck-suppress uninitvar
     (void)teststr.compare(pStrUninit);
 
-    wchar_t *pWStrUninit;
+    const wchar_t *pWStrUninit;
     // cppcheck-suppress uninitvar
     (void)testwstr.compare(pWStrUninit);
 }
@@ -4273,9 +4535,31 @@ void nullPointer_istream_read(std::istream &f)
     f.read(NULL, 10);
 }
 
+std::size_t nullPointer_strxfrm(char *dest, const char *src, std::size_t count)
+{
+    (void)strxfrm(dest, src, count);
+    // In case the 3rd argument is 0, the 1st argument is permitted to be a null pointer. (#6306)
+    (void)strxfrm(nullptr, src, 0);
+    (void)strxfrm(nullptr, src, 1);
+    (void)strxfrm(nullptr, src, count);
+    // cppcheck-suppress nullPointer
+    return strxfrm(dest, nullptr, count);
+}
+
+std::size_t nullPointer_wcsxfrm(wchar_t *dest, const wchar_t *src, std::size_t count)
+{
+    (void)wcsxfrm(dest, src, count);
+    // In case the 3rd argument is 0, the 1st argument is permitted to be a null pointer. (#6306)
+    (void)wcsxfrm(nullptr, src, 0);
+    (void)wcsxfrm(nullptr, src, 1);
+    (void)wcsxfrm(nullptr, src, count);
+    // cppcheck-suppress nullPointer
+    return wcsxfrm(dest, nullptr, count);
+}
+
 void nullPointer_asctime(void)
 {
-    struct tm *tm = 0;
+    const struct tm *tm = 0;
     // cppcheck-suppress asctimeCalled
     // cppcheck-suppress nullPointer
     (void)std::asctime(tm);
@@ -4324,7 +4608,7 @@ void nullPointer_feholdexcept(void)
 
 void nullPointer_fesetenv(void)
 {
-    fenv_t* envp = 0;
+    const fenv_t* envp = 0;
     // cppcheck-suppress nullPointer
     (void)std::fesetenv(envp);
     // cppcheck-suppress nullPointer
@@ -4333,7 +4617,7 @@ void nullPointer_fesetenv(void)
 
 void nullPointer_fesetexceptflag(int expects)
 {
-    fexcept_t* flagp = 0;
+    const fexcept_t* flagp = 0;
     // cppcheck-suppress nullPointer
     (void)std::fesetexceptflag(flagp,expects);
     // cppcheck-suppress nullPointer
@@ -4342,7 +4626,7 @@ void nullPointer_fesetexceptflag(int expects)
 
 void nullPointer_feupdateenv(void)
 {
-    fenv_t* envp = 0;
+    const fenv_t* envp = 0;
     // cppcheck-suppress nullPointer
     (void)std::feupdateenv(envp);
     // cppcheck-suppress nullPointer
@@ -4357,7 +4641,7 @@ void nullPointer_atexit(void)
 
 void nullPointer_atof(void)
 {
-    char * c = 0;
+    const char * c = 0;
     // cppcheck-suppress nullPointer
     (void)std::atof(c);
     // cppcheck-suppress nullPointer
@@ -4489,7 +4773,7 @@ void getline()
     in.close();
 }
 
-// TODO cppcheck-suppress passedByValue
+// cppcheck-suppress passedByValue
 void stream_write(std::ofstream& s, std::vector<char> v) {
     if (v.empty()) {}
     s.write(v.data(), v.size());
@@ -4503,6 +4787,11 @@ void stdstring()
 
     // valid
     s.assign("a");
+
+#ifdef __cpp_lib_starts_ends_with
+    // cppcheck-suppress ignoredReturnValue
+    s.starts_with("abc");
+#endif
 }
 
 void stdvector()
@@ -4558,8 +4847,10 @@ void stdbind()
     std::bind(stdbind_helper, 1);
 
     // TODO cppcheck-suppress unreadVariable
+    // cppcheck-suppress autoNoType
     auto f1 = std::bind(stdbind_helper, _1);
     // TODO cppcheck-suppress unreadVariable
+    // cppcheck-suppress autoNoType
     auto f2 = std::bind(stdbind_helper, 10);
 }
 
@@ -4625,11 +4916,19 @@ void string_view_unused(std::string_view v)
     v.substr(1, 3);
 }
 
-void stdspan()
+// cppcheck-suppress passedByValue
+void string_substr(std::string s)
 {
+    // cppcheck-suppress ignoredReturnValue
+    s.substr(1, 3);
+}
+
 #ifndef __cpp_lib_span
 #warning "This compiler does not support std::span"
 #else
+void stdspan()
+{
+
     std::vector<int> vec{1,2,3,4};
     std::span spn{vec};
     // cppcheck-suppress unreadVariable
@@ -4669,9 +4968,19 @@ void stdspan()
     spn3.first<1>();
     spn3.last<1>();
     spn3.subspan<1, 1>();
-    #endif
 }
 
+std::span<const int> returnDanglingLifetime_std_span0() {
+    static int a[10]{};
+    return a;
+}
+
+std::span<const int> returnDanglingLifetime_std_span1() {
+    static std::vector<int> v;
+    return v;
+}
+#endif
+
 void beginEnd()
 {
     std::vector<int> v;
@@ -4694,6 +5003,7 @@ void beginEnd()
     //cppcheck-suppress ignoredReturnValue
     std::crend(v);
 
+    // cppcheck-suppress constVariable
     int arr[4];
 
     //cppcheck-suppress ignoredReturnValue
@@ -4726,12 +5036,19 @@ void smartPtr_get()
 
 void smartPtr_get2(std::vector<std::unique_ptr<int>>& v)
 {
+    // cppcheck-suppress autoNoType
     for (auto& u : v) {
         int* p = u.get();
         *p = 0;
     }
 }
 
+bool smartPtr_get3(size_t n, size_t i) { // #12748
+    std::unique_ptr<int[]> buf = std::make_unique<int[]>(n);
+    const int* p = buf.get() + i;
+    return p != nullptr;
+}
+
 void smartPtr_reset()
 {
     std::unique_ptr<int> p(new int());
@@ -4755,3 +5072,250 @@ void std_vector_data_arithmetic()
     buf.resize(1);
     memcpy(buf.data() + 0, "", 1);
 }
+
+void memleak_std_malloc() // #12332
+{
+    //cppcheck-suppress [unreadVariable, constVariablePointer, unusedAllocatedMemory]
+    void* p = std::malloc(1);
+    //cppcheck-suppress memleak
+}
+
+void memleak_std_realloc(void* block, size_t newsize)
+{
+    //cppcheck-suppress [unreadVariable, constVariablePointer]
+    void* p = std::realloc(block, newsize);
+    //cppcheck-suppress memleak
+}
+
+void unusedAllocatedMemory_std_free()
+{
+    // cppcheck-suppress unusedAllocatedMemory
+    void* p = std::malloc(1);
+    std::free(p);
+}
+
+std::string global_scope_std() // #12355
+{
+    ::std::stringstream ss;
+    return ss.str();
+}
+
+::std::size_t global_scope_std2() // #12378
+{
+    std::vector<::std::size_t> v;
+    // cppcheck-suppress containerOutOfBounds
+    return v.front();
+}
+
+void unique_lock_const_ref(std::mutex& m)
+{
+    std::unique_lock lock(m);
+}
+
+void eraseIteratorOutOfBounds_std_deque(std::deque<int>& x) // #8690
+{
+    // cppcheck-suppress eraseIteratorOutOfBounds
+    x.erase(x.end());
+}
+
+void assertWithSideEffect_system()
+{
+    // cppcheck-suppress [assertWithSideEffect,checkLibraryNoReturn] // TODO: #8329
+    assert(std::system("abc"));
+}
+
+void assertWithSideEffect_std_map_at(const std::map<int, int>& m) // #12695
+{
+    // cppcheck-suppress checkLibraryNoReturn
+    assert(m.at(0));
+}
+
+void assertWithSideEffect_std_unique_ptr_get(std::unique_ptr<int>& p)
+{
+    // cppcheck-suppress checkLibraryNoReturn
+    assert(p.get());
+}
+
+void assertWithSideEffect_std_begin(const std::vector<std::string>& v) {
+    // cppcheck-suppress checkLibraryFunction // TODO
+    assert(std::is_sorted(std::begin(v), std::end(v), [](const std::string& a, const std::string& b) {
+        return a.size() < b.size();
+    })); // cppcheck-suppress checkLibraryNoReturn
+}
+
+void assertWithSideEffect_std_prev_next(const std::vector<int>& v, std::vector<int>::const_iterator it) {
+    assert(std::prev(it, 1) == v.begin());
+    // cppcheck-suppress checkLibraryNoReturn
+    assert(std::next(it, 1) == v.end());
+}
+
+std::vector<int> containerOutOfBounds_push_back() { // #12775
+    std::vector<int> v;
+    for (int i = 0; i < 4; ++i) {
+        v.push_back(i);
+        (void)v[i];
+    }
+    return v;
+}
+
+template<typename T>
+void constVariablePointer_push_back(std::vector<T*>& d, const std::vector<T*>& s) {
+    for (const auto& e : s) {
+        T* newE = new T(*e);
+        d.push_back(newE);
+    }
+}
+
+std::streampos constParameterPointer_istream_tellg(std::istream* p) { // #13801
+    return p->tellg();
+}
+
+void constParameterPointer_unique_ptr_reset(std::unique_ptr<int>& u, int* p) {
+    u.reset(p);
+}
+
+bool constParameterPointer_map_contains(const std::map<int*, int>& m, int* p) {
+#if __cplusplus >= 202002L
+    return m.contains(p);
+#else
+    return m.count(p) > 0;
+#endif
+}
+
+// cppcheck-suppress constParameterReference
+void constParameterReference_push_back(std::vector<std::string>& v, std::string& s) { // #12661
+    v.push_back(s);
+}
+
+// cppcheck-suppress constParameterReference
+void constParameterReference_assign(std::vector<int>& v, int& r) {
+    v.assign(5, r);
+}
+
+// cppcheck-suppress constParameterReference
+void constParameterReference_insert(std::list<int>& l, int& r) {
+    l.insert(l.end(), r);
+    l.insert(l.end(), 5, r);
+}
+
+const char* variableScope_cstr_dummy(const char* q); // #12812
+std::size_t variableScope_cstr(const char* p) {
+    std::string s;
+    if (!p) {
+        s = "abc";
+        p = variableScope_cstr_dummy(s.c_str());
+    }
+    return std::strlen(p);
+}
+
+void unusedvar_stringstream(const char* p)
+{
+    // cppcheck-suppress unreadVariable
+    std::istringstream istr(p);
+    // cppcheck-suppress unreadVariable
+    std::ostringstream ostr(p);
+    // cppcheck-suppress unreadVariable
+    std::stringstream sstr(p);
+}
+
+void unusedvar_stdcomplex()
+{
+    // cppcheck-suppress unusedVariable
+    std::complex<double> z1;
+    // cppcheck-suppress unreadVariable
+    std::complex<double> z2(0.0, 0.0);
+}
+
+int passedByValue_std_array1(std::array<int, 2> a)
+{
+    return a[0] + a[1];
+}
+
+// cppcheck-suppress passedByValue
+int passedByValue_std_array2(std::array<int, 200> a)
+{
+    return a[0] + a[1];
+}
+
+int passedByValue_std_bitset1(std::bitset<4> bs) // #12961
+{
+    return bs.size();
+}
+
+// cppcheck-suppress passedByValue
+int passedByValue_std_bitset2(std::bitset<256> bs)
+{
+    return bs.size();
+}
+
+struct S_std_as_const { // #12974
+    // cppcheck-suppress functionConst
+    void f() {
+        for (const int i : std::as_const(l)) {}
+    }
+    std::list<int> l;
+};
+
+#if __cpp_lib_format
+void unreadVariable_std_format_error(char * c)
+{
+    // cppcheck-suppress unreadVariable
+    std::format_error x(c);
+}
+#endif
+
+void eraseIteratorOutOfBounds_std_list1()
+{
+    std::list<int> a;
+    std::list<int>::iterator p = a.begin();
+    // cppcheck-suppress eraseIteratorOutOfBounds
+    a.erase(p);
+}
+int eraseIteratorOutOfBounds_std_list2()
+{
+    std::list<int> a;
+    std::list<int>::iterator p = a.begin();
+    std::list<int>::iterator q = p;
+    // cppcheck-suppress eraseIteratorOutOfBounds
+    a.erase(q);
+    return *q;
+}
+
+void containerOutOfBounds_std_string(std::string &var) { // #11403
+    std::string s0{"x"};
+    // cppcheck-suppress containerOutOfBounds
+    var+= s0[2];
+
+    std::string s1{ R"(x)" };
+    // cppcheck-suppress containerOutOfBounds
+    var+= s1[2];
+
+    std::string s2 = R"--(XYZ)--";
+    // cppcheck-suppress containerOutOfBounds
+    var+= s2[3];
+
+    std::string s3 = {R"--(XYZ)--"};
+    // cppcheck-suppress containerOutOfBounds
+    var+= s3[3];
+
+    const char *x = R"--(XYZ)--";
+    std::string s4(x);
+    // TODO cppcheck-suppress containerOutOfBounds
+    var+= s4[3];
+
+    std::string s5{x};
+    // 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);
+}
\ No newline at end of file
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
index a9ceedc4e52..5951cb74c07 100644
--- a/test/cfg/windows.cpp
+++ b/test/cfg/windows.cpp
@@ -2,27 +2,96 @@
 // Test library configuration for windows.cfg
 //
 // Usage:
-// $ cppcheck --check-library --library=windows --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/windows.cpp
+// $ cppcheck --check-library --library=windows --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/windows.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-#include <windows.h>
-#include <stdio.h>
+// cppcheck-suppress-file [valueFlowBailout,purgedConfiguration]
+
+#include <Windows.h>
+#include <WinCon.h>
+#include <cstdio>
 #include <direct.h>
-#include <stdlib.h>
-#include <time.h>
+#include <evntrace.h>
+#include <cstdlib>
+#include <ctime>
 #include <memory.h>
 #include <mbstring.h>
+#include <tchar.h>
 #include <wchar.h>
 #include <atlstr.h>
+#include <string>
+
+bool UpdateTraceACalled(TRACEHANDLE traceHandle, LPCSTR loggerName, EVENT_TRACE_PROPERTIES* pProperties)
+{
+    // cppcheck-suppress UpdateTraceACalled
+    return UpdateTraceA(traceHandle, loggerName, pProperties) != ERROR_SUCCESS;
+}
+bool UpdateTraceWCalled(TRACEHANDLE traceHandle, LPCWSTR loggerName, EVENT_TRACE_PROPERTIES* pProperties)
+{
+    // cppcheck-suppress UpdateTraceWCalled
+    return UpdateTraceW(traceHandle, loggerName, pProperties) != ERROR_SUCCESS;
+}
+
+void invalidHandle_CreateFile(LPCWSTR lpFileName)
+{
+    HANDLE file = CreateFile(lpFileName, GENERIC_READ, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
+
+    // INVALID_HANDLE_VALUE is not the same as 0
+    if (file != INVALID_HANDLE_VALUE && file) {}
+
+    // cppcheck-suppress resourceLeak
+}
+
+void invalid_socket()
+{
+    SOCKET sock = socket(AF_INET, SOCK_RAW, IPPROTO_TCP);
+
+    // INVALID_SOCKET is not the same as 0
+    if (sock != INVALID_SOCKET && sock) {}
+
+    // cppcheck-suppress resourceLeak
+}
+
+void resourceLeak_OpenThread(const DWORD dwDesiredAccess, const BOOL bInheritHandle, const DWORD dwThreadId)
+{
+    HANDLE proc = OpenThread(dwDesiredAccess, bInheritHandle, dwThreadId);
+    if (proc != INVALID_HANDLE_VALUE) {}
+    // cppcheck-suppress resourceLeak
+}
+
+void resourceLeak_OpenProcess(const DWORD dwDesiredAccess, const BOOL bInheritHandle, const DWORD dwProcessId)
+{
+    HANDLE proc = OpenProcess(dwDesiredAccess, bInheritHandle, dwProcessId);
+    if (proc != INVALID_HANDLE_VALUE) {}
+    // cppcheck-suppress resourceLeak
+}
+
+/// https://learn.microsoft.com/en-us/windows/console/flushconsoleinputbuffer
+BOOL unreachableCode_FlushConsoleInputBuffer(int &val)
+{
+    const BOOL retVal = FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE));
+    // still reachable after call FlushConsoleInputBuffer()
+    val = 42;
+    return retVal;
+}
+
+/// https://learn.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulefilenamew
+std::string constVariable_GetModuleFileName(void) {
+    char path[42];
+    if (GetModuleFileNameA(NULL, path, sizeof(path))==0)
+        return std::string();
+    return std::string{path};
+}
 
 int stringCompare_mbscmp(const unsigned char *string1, const unsigned char *string2)
 {
     // cppcheck-suppress stringCompare
     (void) _mbscmp(string1, string1);
-    // cppcheck-suppress staticStringCompare
-    (void) _mbscmp("x", "x");
+    const unsigned char x[] = "x";
+    // cppcheck-suppress stringCompare
+    (void) _mbscmp(x, x);
     return _mbscmp(string1, string2);
 }
 
@@ -30,8 +99,9 @@ int stringCompare_mbscmp_l(const unsigned char *string1, const unsigned char *st
 {
     // cppcheck-suppress stringCompare
     (void) _mbscmp_l(string1, string1, locale);
-    // cppcheck-suppress staticStringCompare
-    (void) _mbscmp_l("x", "x", locale);
+    const unsigned char x[] = "x";
+    // cppcheck-suppress stringCompare
+    (void) _mbscmp_l(x, x, locale);
     return _mbscmp_l(string1, string2, locale);
 }
 
@@ -66,7 +136,7 @@ void invalidFunctionArg__fseeki64(FILE* stream, __int64 offset, int origin)
     (void)_fseeki64(stream, offset, SEEK_END);
 }
 
-void invalidFunctionArgBool__fseeki64(FILE* stream, __int64 offset, int origin)
+void invalidFunctionArgBool__fseeki64(FILE* stream, __int64 offset)
 {
     // cppcheck-suppress invalidFunctionArgBool
     (void)_fseeki64(stream, offset, true);
@@ -82,7 +152,7 @@ unsigned char * overlappingWriteFunction__mbscat(unsigned char *src, unsigned ch
     return _mbscat(src, src);
 }
 
-unsigned char * overlappingWriteFunction__memccpy(unsigned char *src, unsigned char *dest, int c, size_t count)
+void* overlappingWriteFunction__memccpy(const unsigned char *src, unsigned char *dest, int c, size_t count)
 {
     // No warning shall be shown:
     (void)_memccpy(dest, src, c, count);
@@ -109,7 +179,7 @@ void overlappingWriteFunction__swab(char *src, char *dest, int n)
     _swab(src, src+3, 4);
 }
 
-SYSTEM_INFO uninitvar_GetSystemInfo(char * envstr)
+SYSTEM_INFO uninitvar_GetSystemInfo()
 {
     // No warning is expected
     SYSTEM_INFO SystemInfo;
@@ -117,22 +187,22 @@ SYSTEM_INFO uninitvar_GetSystemInfo(char * envstr)
     return SystemInfo;
 }
 
-void uninitvar__putenv(char * envstr)
+void uninitvar__putenv(const char * envstr)
 {
     // No warning is expected
     (void)_putenv(envstr);
 
-    char * p;
+    const char * p;
     // cppcheck-suppress uninitvar
     (void)_putenv(p);
 }
 
-void nullPointer__putenv(char * envstr)
+void nullPointer__putenv(const char * envstr)
 {
     // No warning is expected
     (void)_putenv(envstr);
 
-    char * p=NULL;
+    const char * p=NULL;
     // cppcheck-suppress nullPointer
     (void)_putenv(p);
 }
@@ -201,16 +271,17 @@ void validCode()
     hSemaphore1 = CreateSemaphore(NULL, 0, 1, NULL);
     CloseHandle(hSemaphore1);
     HANDLE hSemaphore2;
+    // cppcheck-suppress valueFlowBailoutIncompleteVar
     hSemaphore2 = CreateSemaphoreEx(NULL, 0, 1, NULL, 0, SEMAPHORE_ALL_ACCESS);
     CloseHandle(hSemaphore2);
     HANDLE hSemaphore3;
-    hSemaphore3 = OpenSemaphore(SEMAPHORE_ALL_ACCESS, TRUE, "sem");
+    hSemaphore3 = OpenSemaphore(SEMAPHORE_ALL_ACCESS, TRUE, L"sem");
     CloseHandle(hSemaphore3);
 
     // Valid lstrcat usage, but with warning because it is deprecated
     char buf[30] = "hello world";
-    // cppcheck-suppress lstrcatCalled
-    lstrcat(buf, "test");
+    // cppcheck-suppress lstrcatACalled
+    lstrcatA(buf, "test");
 
     // cppcheck-suppress strlwrCalled
     strlwr(buf);
@@ -221,14 +292,14 @@ void validCode()
     HANDLE hMutex1;
     hMutex1 = CreateMutex(NULL, TRUE, NULL);
     if (hMutex1) {
-        ReleaseMutex(hMutex);
+        ReleaseMutex(hMutex1);
     }
     CloseHandle(hMutex1);
     HANDLE hMutex2;
     hMutex2 = CreateMutexEx(NULL, NULL, 0, MUTEX_ALL_ACCESS);
     CloseHandle(hMutex2);
     HANDLE hMutex3;
-    hMutex3 = OpenMutex(MUTEX_ALL_ACCESS, FALSE, "sem");
+    hMutex3 = OpenMutex(MUTEX_ALL_ACCESS, FALSE, _T("sem"));
     CloseHandle(hMutex3);
 
     // Valid Module usage, no leaks, valid arguments
@@ -300,12 +371,12 @@ void validCode()
     _tprintf(TEXT("%s"), bufTC);
     _stprintf(bufTC, TEXT("%d"), 1);
     _tprintf(TEXT("%s"), bufTC);
-    _stprintf(bufTC, _countof(bufTC), TEXT("%d"), 2);
+    _stprintf(bufTC, TEXT("%d"), 2);
     _tprintf(TEXT("%s"), bufTC);
 
     GetUserName(NULL, &dwordInit);
     dwordInit = 10;
-    GetUserName(bufTC, _countof(bufTC));
+    GetUserName(bufTC, &dwordInit);
 
     WSADATA wsaData = {0};
     WSAStartup(2, &wsaData);
@@ -318,7 +389,7 @@ void validCode()
     WSACleanup();
 
     wordInit = MAKEWORD(1, 2);
-    // cppcheck-suppress redundantAssignment
+    // TODO cppcheck-suppress redundantAssignment
     dwordInit = MAKELONG(1, 2);
     // cppcheck-suppress redundantAssignment
     wordInit = LOWORD(dwordInit);
@@ -426,21 +497,23 @@ void bufferAccessOutOfBounds()
     // cppcheck-suppress bufferAccessOutOfBounds
     FillMemory(byteBuf, sizeof(byteBuf)+1, 0x01);
 
-    char * pAlloc1 = _malloca(32);
+    char * pAlloc1 = static_cast<char*>(_malloca(32));
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc1, 0, 32);
     // cppcheck-suppress bufferAccessOutOfBounds
+    // cppcheck-suppress nullPointerOutOfMemory
     memset(pAlloc1, 0, 33);
     _freea(pAlloc1);
 }
 
 void mismatchAllocDealloc()
 {
-    char * pChar = _aligned_malloc(100, 2);
+    char * pChar = static_cast<char*>(_aligned_malloc(100, 2));
     // cppcheck-suppress mismatchAllocDealloc
     free(pChar);
 
     // cppcheck-suppress unusedAllocatedMemory
-    pChar = _malloca(32);
+    pChar = static_cast<char*>(_malloca(32));
     // cppcheck-suppress mismatchAllocDealloc
     _aligned_free(pChar);
 }
@@ -448,14 +521,14 @@ void mismatchAllocDealloc()
 void nullPointer()
 {
     HANDLE hSemaphore;
-    // cppcheck-suppress nullPointer
+    // cppcheck-suppress [nullPointer,valueFlowBailoutIncompleteVar]
     hSemaphore = OpenSemaphore(SEMAPHORE_ALL_ACCESS, FALSE, NULL);
     CloseHandle(hSemaphore);
 
     // cppcheck-suppress lstrcatCalled
     // cppcheck-suppress nullPointer
-    lstrcat(NULL, "test");
-    char buf[10] = "\0";
+    lstrcat(NULL, _T("test"));
+    TCHAR buf[10] = _T("\0");
     // cppcheck-suppress lstrcatCalled
     // cppcheck-suppress nullPointer
     lstrcat(buf, NULL);
@@ -518,9 +591,9 @@ void nullPointer()
     // cppcheck-suppress nullPointer
     getpeername(socketInit, &sockaddrUninit, pIntNull);
     // cppcheck-suppress nullPointer
-    getsockopt(sockInit, 1, 2, NULL, &intInit);
+    getsockopt(socketInit, 1, 2, NULL, &intInit);
     // cppcheck-suppress nullPointer
-    getsockopt(sockInit, 1, 2, charArray, pIntNull);
+    getsockopt(socketInit, 1, 2, charArray, pIntNull);
 }
 
 void memleak_malloca()
@@ -534,8 +607,8 @@ void memleak_AllocateAndInitializeSid()
 {
     PSID pEveryoneSID = NULL;
     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = SECURITY_WORLD_SID_AUTHORITY;
-    AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &pEveryoneSID)
-    // TODO: enable when #6994 is implemented cppcheck-suppress memleak
+    AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &pEveryoneSID);
+    // cppcheck-suppress memleak
 }
 
 void memleak_HeapAlloc()
@@ -551,7 +624,7 @@ void memleak_HeapAlloc()
 void memleak_LocalAlloc()
 {
     LPTSTR pszBuf;
-    // cppcheck-suppress [LocalAllocCalled, cstyleCast]
+    // cppcheck-suppress [LocalAllocCalled, cstyleCast, valueFlowBailoutIncompleteVar]
     pszBuf = (LPTSTR)LocalAlloc(LPTR, MAX_PATH*sizeof(TCHAR));
     (void)LocalSize(pszBuf);
     (void)LocalFlags(pszBuf);
@@ -560,6 +633,20 @@ void memleak_LocalAlloc()
     // cppcheck-suppress memleak
 }
 
+void memleak_dupenv_s() // #10646
+{
+    char* pValue;
+    size_t len;
+    errno_t err = _dupenv_s(&pValue, &len, "pathext");
+    if (err) return;
+    printf("pathext = %s\n", pValue);
+    free(pValue);
+    err = _dupenv_s(&pValue, &len, "nonexistentvariable");
+    if (err) return;
+    printf("nonexistentvariable = %s\n", pValue);
+    // cppcheck-suppress memleak
+}
+
 void resourceLeak_CreateSemaphoreA()
 {
     HANDLE hSemaphore;
@@ -571,7 +658,7 @@ void resourceLeak_CreateSemaphoreA()
 void resourceLeak_CreateSemaphoreEx()
 {
     HANDLE hSemaphore;
-    // cppcheck-suppress unreadVariable
+    // cppcheck-suppress [unreadVariable,valueFlowBailoutIncompleteVar]
     hSemaphore = CreateSemaphoreEx(NULL, 0, 1, NULL, 0, SEMAPHORE_ALL_ACCESS);
     // cppcheck-suppress resourceLeak
 }
@@ -579,8 +666,8 @@ void resourceLeak_CreateSemaphoreEx()
 void resourceLeak_OpenSemaphore()
 {
     HANDLE hSemaphore;
-    // cppcheck-suppress unreadVariable
-    hSemaphore = OpenSemaphore(SEMAPHORE_ALL_ACCESS, TRUE, "sem");
+    // cppcheck-suppress [unreadVariable,valueFlowBailoutIncompleteVar]
+    hSemaphore = OpenSemaphore(SEMAPHORE_ALL_ACCESS, TRUE, _T("sem"));
     // cppcheck-suppress resourceLeak
 }
 
@@ -595,8 +682,8 @@ void resourceLeak_CreateMutexA()
 void resourceLeak_CreateMutexEx()
 {
     HANDLE hMutex;
-    // cppcheck-suppress unreadVariable
-    hMutex = CreateMutexEx(NULL, "sem", 0, MUTEX_ALL_ACCESS);
+    // cppcheck-suppress [unreadVariable,valueFlowBailoutIncompleteVar]
+    hMutex = CreateMutexEx(NULL, _T("sem"), 0, MUTEX_ALL_ACCESS);
     // cppcheck-suppress resourceLeak
 }
 
@@ -604,7 +691,7 @@ void resourceLeak_OpenMutex()
 {
     HANDLE hMutex;
     // cppcheck-suppress unreadVariable
-    hMutex = OpenMutex(MUTEX_ALL_ACCESS, TRUE, "sem");
+    hMutex = OpenMutex(MUTEX_ALL_ACCESS, TRUE, _T("sem"));
     // cppcheck-suppress resourceLeak
 }
 
@@ -613,8 +700,8 @@ void resourceLeak_LoadLibrary()
     HINSTANCE hInstLib;
     hInstLib = ::LoadLibrary(L"My.dll");
     typedef BOOL (WINAPI *fpFunc)();
-    // cppcheck-suppress unreadVariable
-    fpFunc pFunc = GetProcAddress(hInstLib, "name");
+    // cppcheck-suppress [unreadVariable, cstyleCast]
+    fpFunc pFunc = (fpFunc)GetProcAddress(hInstLib, "name");
     // cppcheck-suppress resourceLeak
 }
 
@@ -637,7 +724,7 @@ void resourceLeak_CreateEventExA()
 void resourceLeak_OpenEventW()
 {
     HANDLE hEvent;
-    // cppcheck-suppress unreadVariable
+    // cppcheck-suppress [unreadVariable,valueFlowBailoutIncompleteVar]
     hEvent = OpenEventW(EVENT_ALL_ACCESS, TRUE, L"testevent");
     // cppcheck-suppress resourceLeak
 }
@@ -650,11 +737,11 @@ void resourceLeak_socket()
     // cppcheck-suppress resourceLeak
 }
 
-void ignoredReturnValue()
+void ignoredReturnValue(FILE* fp)
 {
     // cppcheck-suppress leakReturnValNotUsed
     CreateSemaphoreW(NULL, 0, 1, NULL);
-    // cppcheck-suppress leakReturnValNotUsed
+    // cppcheck-suppress [leakReturnValNotUsed,valueFlowBailoutIncompleteVar]
     CreateSemaphoreExA(NULL, 0, 1, NULL, 0, SEMAPHORE_ALL_ACCESS);
     // cppcheck-suppress leakReturnValNotUsed
     OpenSemaphoreA(SEMAPHORE_ALL_ACCESS, TRUE, "sem");
@@ -696,14 +783,14 @@ void ignoredReturnValue()
     GetProcessHeap();
     // cppcheck-suppress leakReturnValNotUsed
     HeapAlloc(GetProcessHeap(), 0, 10);
-    // cppcheck-suppress leakReturnValNotUsed
-    HeapReAlloc(GetProcessHeap(), 0, 1, 0);
+    // cppcheck-suppress [leakReturnValNotUsed, nullPointer]
+    HeapReAlloc(GetProcessHeap(), 0, nullptr, 0);
 
     // cppcheck-suppress leakReturnValNotUsed
     socket(1, 2, 3);
 
     // cppcheck-suppress ignoredReturnValue
-    _fileno(stdio);
+    _fileno(fp);
 
     // cppcheck-suppress lstrlenCalled
     // cppcheck-suppress ignoredReturnValue
@@ -717,9 +804,9 @@ void invalidFunctionArg()
     hSemaphore = CreateSemaphore(NULL, 0, 0, NULL);
     CloseHandle(hSemaphore);
     // cppcheck-suppress invalidFunctionArgBool
-    hSemaphore = CreateSemaphore(NULL, 0, 1, true);
+    hSemaphore = CreateSemaphore(NULL, 0, 1, false);
     CloseHandle(hSemaphore);
-    // cppcheck-suppress invalidFunctionArg
+    // cppcheck-suppress [invalidFunctionArg,valueFlowBailoutIncompleteVar]
     hSemaphore = CreateSemaphoreEx(NULL, 0, 0, NULL, 0, SEMAPHORE_ALL_ACCESS);
     CloseHandle(hSemaphore);
     // cppcheck-suppress invalidFunctionArg
@@ -731,15 +818,15 @@ void invalidFunctionArg()
     hMutex = CreateMutex(NULL, TRUE, false);
     CloseHandle(hMutex);
     // cppcheck-suppress invalidFunctionArgBool
-    hMutex = CreateMutex(NULL, FALSE, true);
+    hMutex = CreateMutex(NULL, FALSE, false);
     CloseHandle(hMutex);
     // cppcheck-suppress invalidFunctionArg
     hMutex = CreateMutexEx(NULL, NULL, 3, MUTEX_ALL_ACCESS);
     CloseHandle(hMutex);
 
     //Incorrect: 2. parameter to LoadLibraryEx() must be NULL
-    // cppcheck-suppress invalidFunctionArg
-    HINSTANCE hInstLib = LoadLibraryEx(L"My.dll", 1, 0);
+    // cppcheck-suppress [invalidFunctionArg, intToPointerCast]
+    HINSTANCE hInstLib = LoadLibraryEx(L"My.dll", HANDLE(1), 0);
     FreeLibrary(hInstLib);
 
     // cppcheck-suppress invalidFunctionArg
@@ -758,12 +845,13 @@ void uninitvar()
     // cppcheck-suppress uninitvar
     CloseHandle(hSemaphore);
 
-    char buf[10];
+    TCHAR buf[10];
     // cppcheck-suppress lstrcatCalled
     // cppcheck-suppress uninitvar
-    lstrcat(buf, "test");
-    buf[0] = '\0';
-    char buf2[2];
+    lstrcat(buf, _T("test"));
+    buf[0] = _T('\0');
+    // TODO cppcheck-suppress constVariable
+    TCHAR buf2[2];
     // cppcheck-suppress lstrcatCalled
     // cppcheck-suppress uninitvar
     lstrcat(buf, buf2);
@@ -799,9 +887,9 @@ void uninitvar()
     // cppcheck-suppress uninitvar
     SetLastError(dwordUninit);
 
-    DWORD dwordUninit;
+    DWORD dwordUninit2;
     // cppcheck-suppress uninitvar
-    GetUserName(NULL, &dwordUninit);
+    GetUserName(NULL, &dwordUninit2);
 
     FILE *pFileUninit;
     // cppcheck-suppress uninitvar
@@ -992,7 +1080,7 @@ HANDLE test_CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes,
 unsigned char * uninitvar_mbscat(unsigned char *strDestination, const unsigned char *strSource)
 {
     unsigned char *uninit_deststr;
-    unsigned char *uninit_srcstr1, *uninit_srcstr2;
+    const unsigned char *uninit_srcstr1, *uninit_srcstr2;
     // cppcheck-suppress uninitvar
     (void)_mbscat(uninit_deststr,uninit_srcstr1);
     // cppcheck-suppress uninitvar
@@ -1015,11 +1103,11 @@ unsigned char * nullPointer_mbscat(unsigned char *strDestination, const unsigned
 }
 
 // errno_t _mbscat_s(unsigned char *strDestination, size_t numberOfElements, const unsigned char *strSource );
-error_t uninitvar_mbscat_s(unsigned char *strDestination, size_t numberOfElements, const unsigned char *strSource)
+errno_t uninitvar_mbscat_s(unsigned char *strDestination, size_t numberOfElements, const unsigned char *strSource)
 {
     unsigned char *uninit_strDestination;
     size_t uninit_numberOfElements;
-    unsigned char *uninit_strSource;
+    const unsigned char *uninit_strSource;
 
     // cppcheck-suppress uninitvar
     (void)_mbscat_s(uninit_strDestination, numberOfElements, strSource);
@@ -1033,7 +1121,7 @@ error_t uninitvar_mbscat_s(unsigned char *strDestination, size_t numberOfElement
 }
 
 // errno_t _mbscat_s(unsigned char *strDestination, size_t numberOfElements, const unsigned char *strSource );
-error_t nullPointer_mbscat_s(unsigned char *strDestination, size_t numberOfElements, const unsigned char *strSource)
+errno_t nullPointer_mbscat_s(unsigned char *strDestination, size_t numberOfElements, const unsigned char *strSource)
 {
     // cppcheck-suppress nullPointer
     (void)_mbscat_s(0, numberOfElements, strSource);
@@ -1044,8 +1132,9 @@ error_t nullPointer_mbscat_s(unsigned char *strDestination, size_t numberOfEleme
     return _mbscat_s(strDestination, numberOfElements, strSource);
 }
 
+#if !UNICODE
 // errno_t _strncpy_s_l(char *strDest, size_t numberOfElements, const char *strSource, size_t count, _locale_t locale);
-error_t uninitvar__strncpy_s_l(char *strDest, size_t numberOfElements, const char *strSource, size_t count, _locale_t locale)
+errno_t uninitvar__strncpy_s_l(char *strDest, size_t numberOfElements, const char *strSource, size_t count, _locale_t locale)
 {
     size_t uninit_numberOfElements;
     const char *uninit_strSource;
@@ -1065,8 +1154,7 @@ error_t uninitvar__strncpy_s_l(char *strDest, size_t numberOfElements, const cha
     return _strncpy_s_l(strDest, numberOfElements, strSource, count, locale);
 }
 
-// errno_t _strncpy_s_l(char *strDest, size_t numberOfElements, const char *strSource, size_t count, _locale_t locale);
-error_t nullPointer__strncpy_s_l(char *strDest, size_t numberOfElements, const char *strSource, size_t count, _locale_t locale)
+errno_t nullPointer__strncpy_s_l(char *strDest, size_t numberOfElements, const char *strSource, size_t count, _locale_t locale)
 {
     // cppcheck-suppress nullPointer
     (void)_strncpy_s_l(0, numberOfElements, strSource, count, locale);
@@ -1076,8 +1164,9 @@ error_t nullPointer__strncpy_s_l(char *strDest, size_t numberOfElements, const c
     // no warning shall be shown for
     return _strncpy_s_l(strDest, numberOfElements, strSource, count, locale);
 }
+#endif
 
-void GetShortPathName_validCode(TCHAR* lpszPath)
+void GetShortPathName_validCode(const TCHAR* lpszPath)
 {
     long length = GetShortPathName(lpszPath, NULL, 0);
     if (length == 0) {
@@ -1095,21 +1184,35 @@ void GetShortPathName_validCode(TCHAR* lpszPath)
     delete[] buffer;
 }
 
-class MyClass : public CObject {
-    DECLARE_DYNAMIC(MyClass)
-    DECLARE_DYNCREATE(MyClass)
-    DECLARE_SERIAL(MyClass)
-public:
-    MyClass() {}
-};
-IMPLEMENT_DYNAMIC(MyClass, CObject)
-IMPLEMENT_DYNCREATE(MyClass, CObject)
-IMPLEMENT_SERIAL(MyClass,CObject, 42)
-
 void invalidPrintfArgType_StructMember(double d) { // #9672
     typedef struct { CString st; } my_struct_t;
 
     my_struct_t my_struct;
     // cppcheck-suppress invalidPrintfArgType_sint
-    my_struct.st.Format("%d", d);
-}
\ No newline at end of file
+    my_struct.st.Format(_T("%d"), d);
+}
+
+BOOL MyEnableWindow(HWND hWnd, BOOL bEnable) {
+    return EnableWindow(hWnd, bEnable);
+}
+
+int SEH_filter(unsigned int code, struct _EXCEPTION_POINTERS* ep);
+int SEH_throwing_func();
+
+void SEH_knownConditionTrueFalse() { // #8434
+    int r = 0;
+    __try {
+        r = SEH_throwing_func();
+    }
+    __except (SEH_filter(GetExceptionCode(), GetExceptionInformation())) {
+        r = 1;
+    }
+    if (r == 0) {}
+}
+
+void SEH_unusedLabel() { // #13233
+    __try {
+    }
+    __finally {
+    }
+}
diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp
index 1808377a427..983f3e1bbc3 100644
--- a/test/cfg/wxwidgets.cpp
+++ b/test/cfg/wxwidgets.cpp
@@ -2,34 +2,867 @@
 // Test library configuration for wxwidgets.cfg
 //
 // Usage:
-// $ ./cppcheck --check-library --library=wxwidgets --enable=style,information --inconclusive --error-exitcode=1 --disable=missingInclude --inline-suppr test/cfg/wxwidgets.cpp
+// $ ./cppcheck --check-library --library=wxwidgets --enable=style,information --inconclusive --error-exitcode=1 --inline-suppr test/cfg/wxwidgets.cpp
 // =>
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
+// cppcheck-suppress-file valueFlowBailout
+// cppcheck-suppress-file purgedConfiguration
+
 #include <wx/wx.h>
+#include <wx/accel.h>
+#include <wx/any.h>
 #include <wx/app.h>
-#include <wx/dc.h>
-#include <wx/log.h>
-#include <wx/filefn.h>
-#include <wx/spinctrl.h>
+#include <wx/archive.h>
 #include <wx/artprov.h>
+#include <wx/bitmap.h>
+#if wxCHECK_VERSION(3, 1, 6)  // wxWidets-3.1.6 or higher
+#include <wx/bmpbndl.h>
+#endif
+#include <wx/brush.h>
 #include <wx/calctrl.h>
+#include <wx/colour.h>
 #include <wx/combo.h>
-#include <wx/icon.h>
-#include <wx/bitmap.h>
+#include <wx/cursor.h>
+#include <wx/dc.h>
 #include <wx/dataview.h>
-#include <wx/memory.h>
+#include <wx/datetime.h>
+#include <wx/dc.h>
+#include <wx/dynarray.h>
+#include <wx/filefn.h>
+#include <wx/font.h>
+#include <wx/fontenum.h>
+#include <wx/fontutil.h>
 #include <wx/frame.h>
+#include <wx/gbsizer.h>
+#include <wx/gdicmn.h>
+#include <wx/geometry.h>
+#include <wx/graphics.h>
+#include <wx/grid.h>
+#include <wx/icon.h>
+#include <wx/iconbndl.h>
+#include <wx/iconloc.h>
+#include <wx/image.h>
+#include <wx/imaggif.h>
+#include <wx/imagiff.h>
+#include <wx/imagjpeg.h>
+#include <wx/imagpcx.h>
+#include <wx/log.h>
 #include <wx/menu.h>
+#include <wx/memory.h>
+#include <wx/mimetype.h>
+#if defined(__WXMSW__)
+#include <wx/msw/ole/automtn.h>
+#include <wx/metafile.h>
+#include <wx/msw/ole/oleutils.h>
+#endif
+#include <wx/palette.h>
+#include <wx/pen.h>
+#include <wx/position.h>
+#include <wx/propgrid/property.h>
 #include <wx/regex.h>
-#include <wx/stattext.h>
+#include <wx/region.h>
+#include <wx/renderer.h>
+#include <wx/settings.h>
+#include <wx/spinctrl.h>
 #include <wx/sizer.h>
 #include <wx/string.h>
+#include <wx/sysopt.h>
+#include <wx/tarstrm.h>
 #include <wx/textctrl.h>
-#include <wx/propgrid/property.h>
+#include <wx/unichar.h>
+#include <wx/ustring.h>
+#include <wx/variant.h>
+#include <wx/vector.h>
+#include <wx/versioninfo.h>
+#include <wx/wrapsizer.h>
+#include <wx/zipstrm.h>
+
+#if wxCHECK_VERSION(3, 1, 6)  // wxWidets-3.1.6 or higher
+void unreadVariable_wxBitmapBundle(const wxBitmap &bmp, const wxIcon &icon, const wxImage &image, const char *const * xpm, const wxBitmapBundle &bundle)
+{
+    // cppcheck-suppress unusedVariable
+    wxBitmapBundle a;
+    // cppcheck-suppress unreadVariable
+    wxBitmapBundle b(bmp);
+    // cppcheck-suppress unreadVariable
+    wxBitmapBundle c(icon);
+    // cppcheck-suppress unreadVariable
+    wxBitmapBundle d(image);
+    // cppcheck-suppress unreadVariable
+    wxBitmapBundle e(xpm);
+    // cppcheck-suppress unreadVariable
+    wxBitmapBundle f(bundle);
+}
+#endif
+
+#if wxCHECK_VERSION(3, 1, 3)  // wxWidets-3.1.3 or higher
+void unreadVariable_wxDCTextBgModeChanger(wxDC &dc)
+{
+    // cppcheck-suppress unreadVariable
+    wxDCTextBgModeChanger a(dc);
+}
+
+void unreadVariable_wxDCTextBgColourChanger(wxDC &dc, const wxColour &colour)
+{
+    // cppcheck-suppress unreadVariable
+    wxDCTextBgColourChanger a(dc);
+    // cppcheck-suppress unreadVariable
+    wxDCTextBgColourChanger b(dc, colour);
+}
+#endif
+
+void unreadVariable_wxZipEntry(const wxZipEntry &entry)
+{
+    // cppcheck-suppress unreadVariable
+    wxZipEntry a(entry);
+}
+
+void unreadVariable_wxTarEntry(const wxTarEntry &entry)
+{
+    // cppcheck-suppress unreadVariable
+    wxTarEntry a(entry);
+}
+
+void unreadVariable_wxDCTextColourChanger(wxDC &dc, const wxColour &colour)
+{
+    // cppcheck-suppress unreadVariable
+    wxDCTextColourChanger a(dc);
+    // cppcheck-suppress unreadVariable
+    wxDCTextColourChanger b(dc, colour);
+}
+
+void unreadVariable_wxDCPenChanger(wxDC &dc, const wxPen &pen)
+{
+    // cppcheck-suppress unreadVariable
+    wxDCPenChanger a(dc, pen);
+}
+
+void unreadVariable_wxDCFontChanger(wxDC &dc, const wxFont &font)
+{
+    // cppcheck-suppress unreadVariable
+    wxDCFontChanger a(dc);
+    // cppcheck-suppress unreadVariable
+    wxDCFontChanger b(dc, font);
+}
+
+void unreadVariable_wxDCBrushChanger(wxDC &dc, const wxBrush &brush)
+{
+    // cppcheck-suppress unreadVariable
+    wxDCBrushChanger a(dc, brush);
+}
+
+void unreadVariable_wxGBSpan(const int x)
+{
+    // cppcheck-suppress unusedVariable
+    wxGBSpan a;
+    // cppcheck-suppress unreadVariable
+    wxGBSpan b(x, x);
+}
+
+void unreadVariable_wxGBPosition(const int x)
+{
+    // cppcheck-suppress unusedVariable
+    wxGBPosition a;
+    // cppcheck-suppress unreadVariable
+    wxGBPosition b(x, x);
+}
+
+void unreadVariable_wxWrapSizer(const int x)
+{
+    // cppcheck-suppress unreadVariable
+    wxWrapSizer a(x, x);
+}
+
+void unreadVariable_wxGridBagSizer(const int x)
+{
+    // cppcheck-suppress unreadVariable
+    wxGridBagSizer a(x, x);
+}
+
+void unreadVariable_wxGBSizerItem(const int x, const wxGBPosition &pos)
+{
+    // cppcheck-suppress unreadVariable
+    wxGBSizerItem a(x, x, pos);
+}
+
+void unreadVariable_wxSizerItem(const int x)
+{
+    // cppcheck-suppress unreadVariable
+    wxSizerItem a(x, x);
+}
+
+void unreadVariable_wxFlexGridSizer(const int x)
+{
+    // cppcheck-suppress unreadVariable
+    wxFlexGridSizer a(x, x, x);
+}
+
+void unreadVariable_wxBoxSizer(const int orient)
+{
+    // cppcheck-suppress unreadVariable
+    wxBoxSizer a(orient);
+}
+
+void unreadVariable_wxGridSizer(int x)
+{
+    // cppcheck-suppress unreadVariable
+    wxGridSizer a(x, x, x);
+}
+
+void unreadVariable_wxStaticBoxSizer(wxStaticBox *box, const int orient, wxWindow *parent, const wxString &label)
+{
+    // cppcheck-suppress unreadVariable
+    wxStaticBoxSizer a(box, orient);
+    // cppcheck-suppress unreadVariable
+    wxStaticBoxSizer b(orient, parent);
+    // cppcheck-suppress unreadVariable
+    wxStaticBoxSizer c(orient, parent, label);
+}
+
+void unusedVariable_wxDelegateRendererNative()
+{
+    // cppcheck-suppress unusedVariable
+    wxDelegateRendererNative a;
+}
+
+void unusedVariable_wxHeaderButtonParams()
+{
+    // cppcheck-suppress unusedVariable
+    wxHeaderButtonParams a;
+}
+
+void unusedVariable_wxRegionIterator()
+{
+    // cppcheck-suppress unusedVariable
+    wxRegionIterator a;
+}
+
+void unusedVariable_wxRegionContain()
+{
+    // cppcheck-suppress unusedVariable
+    wxRegionContain a;
+}
+
+void unusedVariable_wxPalette()
+{
+    // cppcheck-suppress unusedVariable
+    wxPalette a;
+}
+
+void unusedVariable_wxJPEGHandler()
+{
+    // cppcheck-suppress unusedVariable
+    wxJPEGHandler a;
+}
+
+void unusedVariable_wxGIFHandler()
+{
+    // cppcheck-suppress unusedVariable
+    wxGIFHandler a;
+}
+
+void unusedVariable_wxPCXHandler()
+{
+    // cppcheck-suppress unusedVariable
+    wxPCXHandler a;
+}
+
+void unusedVariable_wxIFFHandler()
+{
+    // cppcheck-suppress unusedVariable
+    wxIFFHandler a;
+}
+
+void unusedVariable_wxGraphicsBrush()
+{
+    // cppcheck-suppress unusedVariable
+    wxGraphicsBrush a;
+}
+
+void unusedVariable_wxGraphicsMatrix()
+{
+    // cppcheck-suppress unusedVariable
+    wxGraphicsMatrix a;
+}
+
+void unusedVariable_wxGraphicsFont()
+{
+    // cppcheck-suppress unusedVariable
+    wxGraphicsFont a;
+}
+
+void unusedVariable_wxIconBundle()
+{
+    // cppcheck-suppress unusedVariable
+    wxIconBundle a;
+}
+
+void unusedVariable_wxStdDialogButtonSizer()
+{
+    // cppcheck-suppress unusedVariable
+    wxStdDialogButtonSizer a;
+}
+
+void unusedVariable_wxColourDatabase()
+{
+    // cppcheck-suppress unusedVariable
+    wxColourDatabase a;
+}
+
+void unusedVariable_wxFontEnumerator()
+{
+    // cppcheck-suppress unusedVariable
+    wxFontEnumerator a;
+}
+
+void unusedVariable_wxCursor()
+{
+    // cppcheck-suppress unusedVariable
+    wxCursor a;
+}
+
+void unusedVariable_wxBitmapHandler()
+{
+    // cppcheck-suppress unusedVariable
+    wxBitmapHandler a;
+}
+
+void unusedVariable_wxNativeFontInfo()
+{
+    // cppcheck-suppress unusedVariable
+    wxNativeFontInfo a;
+}
+
+void unreadVariable_wxDCClipper(wxDC &dc, const wxRegion &region)
+{
+    // cppcheck-suppress unreadVariable
+    wxDCClipper a(dc, region);
+}
+
+void unreadVariable_wxMask(const wxBitmap &bmp, int x, const wxColour & colour)
+{
+    // cppcheck-suppress unusedVariable
+    wxMask a;
+    // cppcheck-suppress unreadVariable
+    wxMask b(bmp);
+    // cppcheck-suppress unreadVariable
+    wxMask c(bmp, x);
+    // cppcheck-suppress unreadVariable
+    wxMask d(bmp, colour);
+}
+
+void unreadVariable_wxGraphicsGradientStops()
+{
+    // cppcheck-suppress unusedVariable
+    wxGraphicsGradientStops a;
+    // cppcheck-suppress unreadVariable
+    wxGraphicsGradientStops b(wxTransparentColour);
+    // cppcheck-suppress unreadVariable
+    wxGraphicsGradientStops c(wxTransparentColour, wxTransparentColour);
+}
+
+void unreadVariable_wxGraphicsGradientStop()
+{
+    // cppcheck-suppress unusedVariable
+    wxGraphicsGradientStop a;
+    // cppcheck-suppress unreadVariable
+    wxGraphicsGradientStop b(wxTransparentColour);
+    // cppcheck-suppress unreadVariable
+    wxGraphicsGradientStop c(wxTransparentColour, 0.42);
+}
+
+void unusedVariable_wxFontMetrics()
+{
+    // cppcheck-suppress unusedVariable
+    wxFontMetrics a;
+}
+
+void unusedVariable_wxIconLocation()
+{
+    // cppcheck-suppress unusedVariable
+    wxIconLocation a;
+}
+
+void unreadVariable_wxIcon(const wxIcon &icon, const wxIconLocation &loc, const char *const *ptr)
+{
+    // cppcheck-suppress unusedVariable
+    wxIcon a;
+    // cppcheck-suppress unreadVariable
+    wxIcon b(icon);
+    // cppcheck-suppress unreadVariable
+    wxIcon c(loc);
+    // cppcheck-suppress unreadVariable
+    wxIcon d(ptr);
+}
+
+void unreadVariable_wxImage(const wxImage &image, const int x)
+{
+    // cppcheck-suppress unusedVariable
+    wxImage a;
+    // cppcheck-suppress unreadVariable
+    wxImage b(image);
+    // cppcheck-suppress unreadVariable
+    wxImage c(x, x);
+    // cppcheck-suppress unreadVariable
+    wxImage d(x, x, true);
+}
+
+void unreadVariable_wxUString(const wxUString &str, const wxChar32 *strPtr)
+{
+    // cppcheck-suppress unusedVariable
+    wxUString a;
+    // cppcheck-suppress unreadVariable
+    wxUString b(str);
+    // cppcheck-suppress unreadVariable
+    wxUString c(strPtr);
+}
+
+void unreadVariable_wxAny(const wxVariant &variant, const wxAny &any)
+{
+    // cppcheck-suppress unusedVariable
+    wxAny a;
+    // cppcheck-suppress unreadVariable
+    wxAny b(42);
+    // cppcheck-suppress unreadVariable
+    wxAny c(variant);
+    // cppcheck-suppress unreadVariable
+    wxAny d(any);
+}
+
+void unreadVariable_wxVariant(wxVariantData *data,
+                              const wxString &name,
+                              const wxVariant &variant,
+                              const wxAny &any,
+                              const wxChar *valuePtr,
+                              const wxString &valueStr,
+                              const wxChar charValue,
+                              long lValue,
+                              bool bvalue)
+{
+    // cppcheck-suppress unusedVariable
+    wxVariant a;
+    // cppcheck-suppress unreadVariable
+    wxVariant b(data);
+    // cppcheck-suppress unreadVariable
+    wxVariant c(data, name);
+    // cppcheck-suppress unreadVariable
+    wxVariant d(variant);
+    // cppcheck-suppress unreadVariable
+    wxVariant e(any);
+    // cppcheck-suppress unreadVariable
+    wxVariant f(valuePtr);
+    // cppcheck-suppress unreadVariable
+    wxVariant g(valuePtr, name);
+    // cppcheck-suppress unreadVariable
+    wxVariant h(valueStr);
+    // cppcheck-suppress unreadVariable
+    wxVariant i(valueStr, name);
+    // cppcheck-suppress unreadVariable
+    wxVariant j(charValue);
+    // cppcheck-suppress unreadVariable
+    wxVariant k(charValue, name);
+    // cppcheck-suppress unreadVariable
+    wxVariant l(lValue);
+    // cppcheck-suppress unreadVariable
+    wxVariant m(lValue, name);
+    // cppcheck-suppress unreadVariable
+    wxVariant n(bvalue);
+    // cppcheck-suppress unreadVariable
+    wxVariant o(bvalue, name);
+}
+
+#if defined(__WXMSW__)
+
+void unusedVariable_wxMetafile()
+{
+    // cppcheck-suppress unusedVariable
+    wxMetafile a;
+}
 
-void uninitvar_wxRegEx_GetMatch(wxRegEx &obj, size_t *start, size_t *len, size_t index)
+void unusedVariable_wxVariantDataErrorCode()
+{
+    // cppcheck-suppress unusedVariable
+    wxVariantDataErrorCode a;
+}
+void unusedVariable_wxVariantDataCurrency()
+{
+    // cppcheck-suppress unusedVariable
+    wxVariantDataCurrency a;
+}
+void unusedVariable_wxVariantDataSafeArray()
+{
+    // cppcheck-suppress unusedVariable
+    wxVariantDataSafeArray a;
+}
+#endif
+
+void unreadVariable_wxBitmap(const wxBitmap &bmp, const char bits[], const int x, const wxSize &sz)
+{
+    // cppcheck-suppress unusedVariable
+    wxBitmap a;
+    // cppcheck-suppress unreadVariable
+    wxBitmap b(bmp);
+    // cppcheck-suppress unreadVariable
+    wxBitmap c(bits, x, x);
+    // cppcheck-suppress unreadVariable
+    wxBitmap d(bits, x, x, x);
+    // cppcheck-suppress unreadVariable
+    wxBitmap e(x, x);
+    // cppcheck-suppress unreadVariable
+    wxBitmap f(x, x, x);
+    // cppcheck-suppress unreadVariable
+    wxBitmap g(sz);
+    // cppcheck-suppress unreadVariable
+    wxBitmap h(sz, x);
+}
+
+void unusedVariable_wxChar()
+{
+    // cppcheck-suppress unusedVariable
+    wxChar a;
+}
+
+void unusedVariable_wxUniChar(const int c)
+{
+    // cppcheck-suppress unusedVariable
+    wxUniChar a;
+    // cppcheck-suppress unreadVariable
+    wxUniChar b(c);
+}
+
+void unusedVariable_wxSystemOptions()
+{
+    // cppcheck-suppress unusedVariable
+    wxSystemOptions a;
+}
+
+void unusedVariable_wxSystemSettings()
+{
+    // cppcheck-suppress unusedVariable
+    wxSystemSettings a;
+}
+
+void unusedVariable_wxPenList()
+{
+    // cppcheck-suppress unusedVariable
+    wxPenList a;
+}
+
+void unusedVariable_wxPen(const wxColour &colour, int width, const wxPenStyle style, const wxPen &pen)
+{
+    // cppcheck-suppress unusedVariable
+    wxPen a;
+    // cppcheck-suppress unreadVariable
+    wxPen b(colour, width);
+    // cppcheck-suppress unreadVariable
+    wxPen c(colour, width, style);
+    // cppcheck-suppress unreadVariable
+    wxPen d(pen);
+}
+
+void unusedVariable_wxBrush(const wxColour &color, const wxBrushStyle style, const wxBitmap &bmp, const wxBrush &brush)
+{
+    // cppcheck-suppress unusedVariable
+    wxBrush a;
+    // cppcheck-suppress unreadVariable
+    wxBrush b(color, style);
+    // cppcheck-suppress unreadVariable
+    wxBrush c(bmp);
+    // cppcheck-suppress unreadVariable
+    wxBrush d(brush);
+}
+
+void unusedVariable_wxFontList()
+{
+    // cppcheck-suppress unusedVariable
+    wxFontList a;
+}
+
+void unusedVariable_wxFontInfo(const double pointSize, const wxSize &sz)
+{
+    // cppcheck-suppress unusedVariable
+    wxFontInfo a;
+    // cppcheck-suppress unreadVariable
+    wxFontInfo b(pointSize);
+    // cppcheck-suppress unreadVariable
+    wxFontInfo c(sz);
+}
+
+void unusedVariable_wxFont(const wxFont &font,
+                           const wxFontInfo &fontInfo,
+                           const int pointSize,
+                           const wxFontFamily family,
+                           const wxFontStyle style,
+                           const wxFontWeight weight,
+                           const bool underline,
+                           const wxString &faceName,
+                           const wxFontEncoding encoding)
+{
+    // cppcheck-suppress unusedVariable
+    wxFont a;
+    // cppcheck-suppress unreadVariable
+    wxFont b(font);
+    // cppcheck-suppress unreadVariable
+    wxFont c(fontInfo);
+    // cppcheck-suppress unreadVariable
+    wxFont d(pointSize, family, style, weight);
+    // cppcheck-suppress unreadVariable
+    wxFont e(pointSize, family, style, weight, underline);
+    // cppcheck-suppress unreadVariable
+    wxFont f(pointSize, family, style, weight, underline, faceName);
+    // cppcheck-suppress unreadVariable
+    wxFont g(pointSize, family, style, weight, underline, faceName, encoding);
+}
+
+void unusedVariable_wxVector()
+{
+    // cppcheck-suppress unusedVariable
+    wxVector<int> a;
+}
+
+void unusedVariable_wxArrayInt()
+{
+    // cppcheck-suppress unusedVariable
+    wxArrayInt a;
+}
+
+void unusedVariable_wxArrayDouble()
+{
+    // cppcheck-suppress unusedVariable
+    wxArrayDouble a;
+}
+
+void unusedVariable_wxArrayShort()
+{
+    // cppcheck-suppress unusedVariable
+    wxArrayShort a;
+}
+
+void unusedVariable_wxArrayString()
+{
+    // cppcheck-suppress unusedVariable
+    wxArrayString a;
+}
+
+void unusedVariable_wxArrayPtrVoid()
+{
+    // cppcheck-suppress unusedVariable
+    wxArrayPtrVoid a;
+}
+
+void unreadVariable_wxColour(const unsigned char uc, const wxString &name, const unsigned long colRGB, const wxColour &colour)
+{
+    // cppcheck-suppress unusedVariable
+    wxColour a;
+    // cppcheck-suppress unreadVariable
+    wxColour b(uc, uc, uc);
+    // cppcheck-suppress unreadVariable
+    wxColour c(uc, uc, uc, uc);
+    // cppcheck-suppress unreadVariable
+    wxColour d(name);
+    // cppcheck-suppress unreadVariable
+    wxColour e(colRGB);
+    // cppcheck-suppress unreadVariable
+    wxColour f(colour);
+}
+
+void unreadVariable_wxPoint2DInt(const wxInt32 x, const wxPoint2DInt& pti, const wxPoint &pt)
+{
+    // cppcheck-suppress unusedVariable
+    wxPoint2DInt a;
+    // cppcheck-suppress unreadVariable
+    wxPoint2DInt b(x, x);
+    // cppcheck-suppress unreadVariable
+    wxPoint2DInt c(pti);
+    // cppcheck-suppress unreadVariable
+    wxPoint2DInt d(pt);
+}
+
+void unreadVariable_wxPoint2DDouble(const wxDouble x, const wxPoint2DDouble& ptd, const wxPoint2DInt& pti, const wxPoint &pt)
+{
+    // cppcheck-suppress unusedVariable
+    wxPoint2DDouble a;
+    // cppcheck-suppress unreadVariable
+    wxPoint2DDouble b(x, x);
+    // cppcheck-suppress unreadVariable
+    wxPoint2DDouble c(ptd);
+    // cppcheck-suppress unreadVariable
+    wxPoint2DDouble d(pti);
+    // cppcheck-suppress unreadVariable
+    wxPoint2DDouble e(pt);
+}
+
+void unusedVariable_wxAcceleratorEntry()
+{
+    // cppcheck-suppress unusedVariable
+    wxAcceleratorEntry a;
+}
+
+void unreadVariable_wxDateSpan(const int x)
+{
+    // cppcheck-suppress unusedVariable
+    wxDateSpan a;
+    // cppcheck-suppress unreadVariable
+    wxDateSpan b{x};
+    // cppcheck-suppress unreadVariable
+    wxDateSpan c{x, x};
+    // cppcheck-suppress unreadVariable
+    wxDateSpan d{x, x, x};
+    // cppcheck-suppress unreadVariable
+    wxDateSpan e{x, x, x, x};
+}
+
+void unreadVariable_wxTimeSpan(const long x, const wxLongLong y)
+{
+    // cppcheck-suppress unusedVariable
+    wxTimeSpan a;
+    // cppcheck-suppress unreadVariable
+    wxTimeSpan b{};
+    // cppcheck-suppress unreadVariable
+    wxTimeSpan c{x};
+    // cppcheck-suppress unreadVariable
+    wxTimeSpan d{x, x};
+    // cppcheck-suppress unreadVariable
+    wxTimeSpan e{x, x, y};
+    // cppcheck-suppress unreadVariable
+    wxTimeSpan f{x, x, y, y};
+}
+
+void unreadVariable_wxFileType(const wxFileTypeInfo &info)
+{
+    // cppcheck-suppress unreadVariable
+    wxFileType a(info);
+}
+
+void unreadVariable_wxPosition(const int x)
+{
+    // cppcheck-suppress unusedVariable
+    wxPosition a;
+    // cppcheck-suppress unreadVariable
+    wxPosition b{};
+    // cppcheck-suppress unreadVariable
+    wxPosition c{x,x};
+}
+
+void unreadVariable_wxRegEx(const wxString &expr, const int flags)
+{
+    // cppcheck-suppress unusedVariable
+    wxRegEx a;
+    // cppcheck-suppress unreadVariable
+    wxRegEx b{expr};
+    // cppcheck-suppress unreadVariable
+    wxRegEx c{expr, flags};
+}
+
+void unreadVariable_wxRegion(const wxCoord x, const wxPoint &pt, const wxRect &rect, const wxRegion &region, const wxBitmap &bmp)
+{
+    // cppcheck-suppress unusedVariable
+    wxRegion a;
+    // cppcheck-suppress unreadVariable
+    wxRegion b{};
+    // cppcheck-suppress unreadVariable
+    wxRegion c{x,x,x,x};
+    // cppcheck-suppress unreadVariable
+    wxRegion d{pt,pt};
+    // cppcheck-suppress unreadVariable
+    wxRegion e{rect};
+    // cppcheck-suppress unreadVariable
+    wxRegion f{region};
+    // cppcheck-suppress unreadVariable
+    wxRegion g{bmp};
+}
+
+void unreadVariable_wxVersionInfo(const wxString &name, const int major, const int minor, const int micro, const wxString &description, const wxString &copyright)
+{
+    // cppcheck-suppress unusedVariable
+    wxVersionInfo a;
+    // cppcheck-suppress unreadVariable
+    wxVersionInfo b(name);
+    // cppcheck-suppress unreadVariable
+    wxVersionInfo c(name, major);
+    // cppcheck-suppress unreadVariable
+    wxVersionInfo d(name, major, minor);
+    // cppcheck-suppress unreadVariable
+    wxVersionInfo e(name, major, minor, micro);
+    // cppcheck-suppress unreadVariable
+    wxVersionInfo f(name, major, minor, micro, description);
+    // cppcheck-suppress unreadVariable
+    wxVersionInfo g(name, major, minor, micro, description, copyright);
+}
+
+void unreadVariable_wxSize(const wxSize &s)
+{
+    // cppcheck-suppress unusedVariable
+    wxSize a;
+    // cppcheck-suppress unreadVariable
+    wxSize b{};
+    // cppcheck-suppress unreadVariable
+    wxSize c{4, 2};
+    // cppcheck-suppress unreadVariable
+    wxSize d(4, 2);
+    // cppcheck-suppress unreadVariable
+    wxSize e(s);
+}
+
+void unreadVariable_wxPoint(const wxRealPoint &rp, const int x, const int y)
+{
+    // cppcheck-suppress unusedVariable
+    wxPoint a;
+    // cppcheck-suppress unreadVariable
+    wxPoint b{};
+    // cppcheck-suppress unreadVariable
+    wxPoint c{4, 2};
+    // cppcheck-suppress unreadVariable
+    wxPoint d(4, 2);
+    // cppcheck-suppress unreadVariable
+    wxPoint e{x, 2};
+    // cppcheck-suppress unreadVariable
+    wxPoint f(4, y);
+    // cppcheck-suppress unreadVariable
+    wxPoint g(rp);
+}
+
+void unreadVariable_wxRealPoint(const wxPoint &pt, const double x, const double y)
+{
+    // cppcheck-suppress unusedVariable
+    wxRealPoint a;
+    // cppcheck-suppress unreadVariable
+    wxRealPoint b{};
+    // cppcheck-suppress unreadVariable
+    wxRealPoint c{4.0, 2.0};
+    // cppcheck-suppress unreadVariable
+    wxRealPoint d(4.0, 2.0);
+    // cppcheck-suppress unreadVariable
+    wxRealPoint e{x, 2.0};
+    // cppcheck-suppress unreadVariable
+    wxRealPoint f(4.0, y);
+    // cppcheck-suppress unreadVariable
+    wxRealPoint g(pt);
+}
+
+void unreadVariable_wxRect(const int x, const wxPoint &pt, const wxSize &sz)
+{
+    // cppcheck-suppress unusedVariable
+    wxRect a;
+    // cppcheck-suppress unreadVariable
+    wxRect b{};
+    // cppcheck-suppress unreadVariable
+    wxRect c{x,x,x,x};
+    // cppcheck-suppress unreadVariable
+    wxRect d{pt,sz};
+    // cppcheck-suppress unreadVariable
+    wxRect e{sz};
+    // cppcheck-suppress unreadVariable
+    wxRect f(x,x,x,x);
+    // cppcheck-suppress unreadVariable
+    wxRect g(pt,sz);
+    // cppcheck-suppress unreadVariable
+    wxRect h(sz);
+}
+
+void uninitvar_wxRegEx_GetMatch(const wxRegEx &obj, size_t *start, size_t *len, size_t index)
 {
     size_t s,l;
     size_t *sPtr,*lPtr;
@@ -277,8 +1110,9 @@ void invalidFunctionArg(const wxString &str)
 void uninitvar(wxWindow &w)
 {
     wxLogLevel logLevelUninit;
+    // cppcheck-suppress constVariable
     char cBufUninit[10];
-    char *pcUninit;
+    const char *pcUninit;
     bool uninitBool;
     // cppcheck-suppress uninitvar
     wxLogGeneric(logLevelUninit, "test");
@@ -351,10 +1185,10 @@ void deprecatedFunctions_wxDataViewCustomRenderer(wxDataViewCustomRenderer &data
     dataViewCustomRenderer.LeftClick(cursor, cell, model, item, col);
 }
 
-void deprecatedFunctions(wxApp &a,
+void deprecatedFunctions([[maybe_unused]] wxApp &a,
                          const wxString &s,
-                         wxArtProvider *artProvider,
-                         wxCalendarCtrl &calenderCtrl,
+                         [[maybe_unused]] wxArtProvider *artProvider,
+                         [[maybe_unused]] wxCalendarCtrl &calenderCtrl,
                          wxComboCtrl &comboCtrl,
                          wxChar * path)
 {
@@ -366,7 +1200,7 @@ void deprecatedFunctions(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
@@ -447,3 +1281,9 @@ wxString::iterator wxString_test3()
     // cppcheck-suppress returnDanglingLifetime
     return it;
 }
+
+wxGrid::wxGridSelectionModes get_wxGridSelectionModes()
+{
+    // cppcheck-suppress valueFlowBailoutIncompleteVar // TODO: configure enum #8183
+    return wxGrid::wxGridSelectCells;
+}
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
new file mode 100644
index 00000000000..e4ec19a5ada
--- /dev/null
+++ b/test/cli/clang-import_test.py
@@ -0,0 +1,305 @@
+
+# python -m pytest test-clang-import.py
+
+import os
+import re
+import subprocess
+import sys
+import pytest
+from testutils import cppcheck, assert_cppcheck
+
+try:
+    # TODO: handle exitcode?
+    subprocess.call(['clang', '--version'])
+except OSError:
+    pytest.skip("'clang' does not exist", allow_module_level=True)
+
+
+# the IDs differ with Visual Studio
+if sys.platform == 'win32':
+    pytest.skip(allow_module_level=True)
+
+
+def __get_debug_section(title, stdout):
+    s = re.sub(r'0x[0-9a-fA-F]+', '0x12345678', stdout)
+    s = re.sub(r'nestedIn: Struct', 'nestedIn: Class', s)
+    s = re.sub(r'classDef: struct', 'classDef: class', s)
+    s = re.sub(r'isInline: [a-z]+', 'isInline: ---', s)
+    s = re.sub(r'needInitialization: .*', 'needInitialization: ---', s)
+    s = re.sub(r'functionOf: .*', 'functionOf: ---', s)
+    s = re.sub(r'0x12345678 Struct', '0x12345678 Class', s)
+
+    if title == '##AST':
+        # TODO set types
+        s = re.sub(r"return '[a-zA-Z0-9: *]+'", "return", s)
+
+    pos1 = s.find(title)
+    assert pos1 > 0, 'title not found'
+    pos1 = s.find('\n', pos1) + 1
+    assert pos1 > 0
+    pos2 = s.find("\n##", pos1)
+    if pos2 < 0:
+        return s[pos1:]
+    return s[pos1:pos2-1]
+
+
+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(['-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)
+
+
+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(['-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)
+
+
+
+def test_symbol_database_1(tmpdir):
+    __check_symbol_database(tmpdir, 'int main(){return 0;}')
+
+def test_symbol_database_2(tmpdir):
+    __check_symbol_database(tmpdir, 'struct Foo { void f(); }; void Foo::f() {}')
+
+def test_symbol_database_3(tmpdir):
+    __check_symbol_database(tmpdir, 'struct Fred { int a; }; int b; void f(int c, int d) { int e; }')
+
+def test_symbol_database_4(tmpdir):
+    __check_symbol_database(tmpdir, 'void f(const int x) {}')
+
+def test_symbol_database_5(tmpdir):
+    __check_symbol_database(tmpdir, 'void f(int);')
+
+def test_symbol_database_6(tmpdir):
+    __check_symbol_database(tmpdir, 'inline static int foo(int x) { return x; }')
+
+def test_symbol_database_7(tmpdir):
+    __check_symbol_database(tmpdir, 'struct S {int x;}; void f(struct S *s) {}')
+
+def test_symbol_database_class_access_1(tmpdir):
+    __check_symbol_database(tmpdir, 'class Fred { void foo ( ) {} } ;')
+
+def test_symbol_database_class_access_2(tmpdir):
+    __check_symbol_database(tmpdir, 'class Fred { protected: void foo ( ) {} } ;')
+
+def test_symbol_database_class_access_3(tmpdir):
+    __check_symbol_database(tmpdir, 'class Fred { public: void foo ( ) {} } ;')
+
+def test_symbol_database_operator(tmpdir):
+    __check_symbol_database(tmpdir, 'struct Fred { void operator=(int x); };')
+
+def test_symbol_database_struct_1(tmpdir):
+    __check_symbol_database(tmpdir, 'struct S {};')
+
+def test_ast_calculations(tmpdir):
+    __check_ast(tmpdir, 'int x = 5; int y = (x + 4) * 2;')
+    __check_ast(tmpdir, 'long long dostuff(int x) { return x ? 3 : 5; }')
+
+def test_ast_control_flow(tmpdir):
+    __check_ast(tmpdir, 'void foo(int x) { if (x > 5){} }')
+    __check_ast(tmpdir, 'int dostuff() { for (int x = 0; x < 10; x++); }')
+    __check_ast(tmpdir, 'void foo(int x) { switch (x) {case 1: break; } }')
+    __check_ast(tmpdir, 'void foo(int a, int b, int c) { foo(a,b,c); }')
+
+def test_ast(tmpdir):
+    __check_ast(tmpdir, 'struct S { int x; }; S* foo() { return new S(); }')
+
+def test_log(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt'):
+        pass
+
+    args = ['--clang', test_file]
+    out_lines = [
+        'Checking {} ...'.format(test_file).replace('\\', '/'),
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+def test_warning(tmpdir):  # #12424
+    test_file = os.path.join(tmpdir, 'test_2')
+    with open(test_file, 'wt') as f:
+        f.write('''void f() {}''')
+
+    exitcode, stdout, stderr = cppcheck(['-q', '--enable=warning', '--clang', test_file])
+    assert exitcode == 0, stderr # do not assert
+    assert stdout == ''
+    assert stderr == ''
+
+
+def __test_cmd(tmp_path, file_name, extra_args, stdout_exp_1, content=''):
+    test_file = tmp_path / file_name
+    with open(test_file, 'wt') as f:
+        f.write(content)
+
+    args = [
+        '--enable=information',
+        '--verbose',
+        '--clang',
+        file_name
+    ]
+
+    args += extra_args
+
+    if stdout_exp_1:
+        stdout_exp_1 += ' '
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 0, stderr if not stdout else stdout
+    assert stderr == ''
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(file_name),
+        'clang -fsyntax-only -Xclang -ast-dump -fno-color-diagnostics {}{}'.format(stdout_exp_1, file_name)
+    ]
+
+
+def test_cmd_c(tmp_path):
+    __test_cmd(tmp_path, 'test.c', [], '-x c')
+
+
+def test_cmd_cpp(tmp_path):
+    __test_cmd(tmp_path, 'test.cpp', [], '-x c++')
+
+
+# files with unknown extensions are treated as C++
+def test_cmd_unk(tmp_path):
+    __test_cmd(tmp_path, 'test.cplusplus', [], '-x c++')
+
+
+# headers are treated as C by default
+def test_cmd_hdr(tmp_path):
+    __test_cmd(tmp_path, 'test.h', [], '-x c')
+
+
+def test_cmd_hdr_probe(tmp_path):
+    __test_cmd(tmp_path, 'test.h', ['--cpp-header-probe'], '-x c++', '// -*- C++ -*-')
+
+
+def test_cmd_inc(tmp_path):
+    inc_path = tmp_path / 'inc'
+    os.makedirs(inc_path)
+    __test_cmd(tmp_path, 'test.cpp',['-Iinc'], '-x c++ -Iinc/')
+
+
+def test_cmd_def(tmp_path):
+    __test_cmd(tmp_path, 'test.cpp',['-DDEF'], '-x c++ -DDEF=1')
+
+
+def test_cmd_include(tmp_path):
+    inc_file = tmp_path / 'inc.h'
+    with open(inc_file, 'wt'):
+        pass
+    __test_cmd(tmp_path, 'test.cpp',['--include=inc.h'], '-x c++ --include inc.h')
+
+
+def test_cmd_enforce_c(tmp_path):  # #13128
+    __test_cmd(tmp_path, 'test.cpp',['-x', 'c'], '-x c')
+
+
+def test_cmd_enforce_cpp(tmp_path):  # #13128
+    __test_cmd(tmp_path, 'test.c',['-x', 'c++'], '-x c++')
+
+
+def test_cmd_std_c(tmp_path):  # #13129
+    __test_cmd(tmp_path, 'test.cpp',['--std=c89', '--std=c++14'], '-x c++ -std=c++14')
+
+
+# TODO: remove when we inject the build-dir into all tests
+def test_cmd_std_c_builddir(tmp_path):  # #13129
+    build_dir = tmp_path / 'b1'
+    os.makedirs(build_dir)
+    __test_cmd(tmp_path, 'test.cpp',['--std=c89', '--std=c++14', '--cppcheck-build-dir={}'.format(build_dir)], '-x c++ -std=c++14')
+
+
+def test_cmd_std_cpp(tmp_path):  # #13129
+    __test_cmd(tmp_path, 'test.c',['--std=c89', '--std=c++14'], '-x c -std=c89')
+
+
+def test_cmd_std_c_enforce(tmp_path):  # #13128/#13129
+    __test_cmd(tmp_path, 'test.cpp',['--language=c', '--std=c89', '--std=c++14'], '-x c -std=c89')
+
+
+def test_cmd_std_cpp_enforce(tmp_path):  # #13128/#13129
+    __test_cmd(tmp_path, 'test.c',['--language=c++', '--std=c89', '--std=c++14'], '-x c++ -std=c++14')
+
+
+def test_cmd_std_c_enforce_alias(tmp_path):  # #13128/#13129/#13130
+    __test_cmd(tmp_path, 'test.c',['--language=c', '--std=gnu99', '--std=gnu++11'], '-x c -std=gnu99')
+
+
+def test_cmd_std_c_enforce_alias_2(tmp_path):  # #13128/#13129/#13130
+    __test_cmd(tmp_path, 'test.c',['--language=c', '--std=iso9899:1999', '--std=gnu++11'], '-x c -std=iso9899:1999')
+
+
+def test_cmd_std_cpp_enforce_alias(tmp_path):  # #13128/#13129/#13130
+    __test_cmd(tmp_path, 'test.c',['--language=c++', '--std=gnu99', '--std=gnu++11'], '-x c++ -std=gnu++11')
+
+
+def test_debug_clang_output(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+void f() {}
+""")
+
+    args = [
+        '-q',
+        '--clang',
+        '--debug-clang-output',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stderr if not stdout else stdout
+    assert stderr == ''
+    assert stdout.startswith('TranslationUnitDecl'), stdout
+    assert stdout.find(str(test_file)) != -1, stdout
+
+
+def test_debug_clang_output_failure_exitcode(tmp_path):
+    # the given code will cause clang to fail with an exitcode
+    #
+    # Failed to execute 'clang -fsyntax-only -Xclang -ast-dump -fno-color-diagnostics -x c++ a.cpp 2>&1' - (exitcode: 1 / output: a.cpp:3:12: error: indirection requires pointer operand ('int' invalid)
+    # 3 |     (void)(*0);
+    # |            ^~
+    # 1 error generated.
+    # TranslationUnitDecl 0x6127d5d9d4e8 <<invalid sloc>> <invalid sloc>
+    # ...
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""void f()
+{
+    (void)(*0);
+}
+""")
+
+    args = [
+        '-q',
+        '--clang',
+        '--debug-clang-output',
+        '--no-cppcheck-build-dir',  # TODO: test without this?
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stderr if not stdout else stdout
+    stderr_lines = stderr.splitlines()
+    assert len(stderr_lines) > 5, stderr_lines
+    assert (stderr_lines[0] ==
+            "Failed to execute 'clang -fsyntax-only -Xclang -ast-dump -fno-color-diagnostics -x c {} 2>&1' - (exitcode: 1 / output: {}:3:12: error: indirection requires pointer operand ('int' invalid)".format(test_file, test_file))
+    assert stdout.find('TranslationUnitDecl') != -1, stdout
+    assert stdout.find(str(test_file)) != -1, stdout
\ No newline at end of file
diff --git a/test/cli/dumpfile_test.py b/test/cli/dumpfile_test.py
new file mode 100644
index 00000000000..932c4363a30
--- /dev/null
+++ b/test/cli/dumpfile_test.py
@@ -0,0 +1,134 @@
+# python -m pytest dumpfile_test.py
+
+import json
+import os
+import pathlib
+
+from testutils import cppcheck
+import xml.etree.ElementTree as ET
+
+
+def test_libraries(tmpdir):  #13701
+    test_file = str(tmpdir / 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('x=1;\n')
+
+    args = ['--library=posix', '--dump', test_file]
+    _, _, _ = cppcheck(args)
+
+    dumpfile = test_file + '.dump'
+    assert os.path.isfile(dumpfile)
+    with open(dumpfile, 'rt') as f:
+        dump = f.read()
+    assert '<library lib="posix"/>' in dump
+    assert dump.find('<library lib="posix"/>') < dump.find('<dump cfg=')
+
+
+def __test_language(tmp_path, file_ext, exp_lang, force_lang=None):
+    test_file = tmp_path / ('test.' + file_ext)
+    with open(test_file, 'wt'):
+        pass
+
+    args = [
+        '--dump',
+        str(test_file)
+    ]
+    if force_lang:
+        args += ['--language=' + force_lang]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+
+    dump_s = pathlib.Path(str(test_file) + '.dump').read_text()
+
+    dump_xml = ET.fromstring(dump_s)
+    assert 'language' in dump_xml.attrib
+    assert dump_xml.attrib['language'] == exp_lang
+
+
+def test_language_c(tmp_path):
+    __test_language(tmp_path, 'c', exp_lang='c')
+
+
+def test_language_c_force_c(tmp_path):
+    __test_language(tmp_path, 'c', force_lang='c', exp_lang='c')
+
+
+def test_language_c_force_cpp(tmp_path):
+    __test_language(tmp_path, 'c', force_lang='c++', exp_lang='cpp')
+
+
+def test_language_cpp(tmp_path):
+    __test_language(tmp_path, 'cpp', exp_lang='cpp')
+
+
+def test_language_cpp_force_cpp(tmp_path):
+    __test_language(tmp_path, 'cpp', force_lang='c++', exp_lang='cpp')
+
+
+def test_language_cpp_force_c(tmp_path):
+    __test_language(tmp_path, 'cpp', force_lang='c', exp_lang='c')
+
+
+# headers default to C
+def test_language_h(tmp_path):
+    __test_language(tmp_path, 'h', exp_lang='c')
+
+
+def test_language_h_force_c(tmp_path):
+    __test_language(tmp_path, 'h', force_lang='c', exp_lang='c')
+
+
+def test_language_h_force_cpp(tmp_path):
+    __test_language(tmp_path, 'h', force_lang='c++', exp_lang='cpp')
+
+
+# files with unknown extensions default to C++
+def test_language_unk(tmp_path):
+    __test_language(tmp_path, 'src', exp_lang='cpp')
+
+
+def test_language_unk_force_c(tmp_path):
+    __test_language(tmp_path, 'src', force_lang='c', exp_lang='c')
+
+
+def test_language_unk_force_cpp(tmp_path):
+    __test_language(tmp_path, 'src', force_lang='c++', exp_lang='cpp')
+
+
+def test_duplicate_file_entries(tmpdir):  #13333
+    test_file = str(tmpdir / 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('x=1;\n')
+
+    project_file = str(tmpdir / 'compile_commands.json')
+    with open(project_file, 'wt') as f:
+        f.write(json.dumps([{
+               "file": test_file,
+               "directory": str(tmpdir),
+               "command": "cc -c test.c"
+            },{
+               "file": test_file,
+               "directory": str(tmpdir),
+               "command": "cc -c test.c"
+            }]))
+
+    args = ['--project=compile_commands.json', '--dump']
+    _, _, _ = cppcheck(args, cwd=str(tmpdir))
+
+    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/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-0f0efd6e66bd115fc0aabbfe6503230b31de5f24 b/test/cli/fuzz-crash/crash-0f0efd6e66bd115fc0aabbfe6503230b31de5f24
new file mode 100644
index 00000000000..a011f109bd7
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-0f0efd6e66bd115fc0aabbfe6503230b31de5f24
@@ -0,0 +1 @@
+d f(t*a){a[a[3]]}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-0fc87af032255dddcea3248798a6e19ab49b231a b/test/cli/fuzz-crash/crash-0fc87af032255dddcea3248798a6e19ab49b231a
new file mode 100644
index 00000000000..46f648c018c
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-0fc87af032255dddcea3248798a6e19ab49b231a
@@ -0,0 +1 @@
+{template<~>tu<0>}tu=c<F
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-15d71125ba17344f02417a9d46443cdaa30aa17f b/test/cli/fuzz-crash/crash-15d71125ba17344f02417a9d46443cdaa30aa17f
new file mode 100644
index 00000000000..5d268fdf158
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-15d71125ba17344f02417a9d46443cdaa30aa17f
@@ -0,0 +1 @@
+t m(){int a[]i for(;;)}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-19219d7e7dfe8202248cd22229cdd9a2fd87a78a b/test/cli/fuzz-crash/crash-19219d7e7dfe8202248cd22229cdd9a2fd87a78a
new file mode 100644
index 00000000000..b0042052db2
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-19219d7e7dfe8202248cd22229cdd9a2fd87a78a
@@ -0,0 +1 @@
+n::template u
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-19269c327fd82c6db8f9f2b0c47c645a721ff55a b/test/cli/fuzz-crash/crash-19269c327fd82c6db8f9f2b0c47c645a721ff55a
new file mode 100644
index 00000000000..ac4c5f2b1de
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-19269c327fd82c6db8f9f2b0c47c645a721ff55a
@@ -0,0 +1 @@
+n eu<#F A<>;template<#m<>eu=i
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-1b9524a7fa25529c34c06b04372efd44e72ccfdc b/test/cli/fuzz-crash/crash-1b9524a7fa25529c34c06b04372efd44e72ccfdc
new file mode 100644
index 00000000000..802e88e43fc
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-1b9524a7fa25529c34c06b04372efd44e72ccfdc
@@ -0,0 +1 @@
+(h l).h
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-1bcbece2593792b0d34fb8f5dbacbae22decd082 b/test/cli/fuzz-crash/crash-1bcbece2593792b0d34fb8f5dbacbae22decd082
new file mode 100644
index 00000000000..c95fb490043
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-1bcbece2593792b0d34fb8f5dbacbae22decd082
@@ -0,0 +1 @@
+enum{A=0()7=F};
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-20efd8856e04ca1fced9daa93837ae3384bb5e62 b/test/cli/fuzz-crash/crash-20efd8856e04ca1fced9daa93837ae3384bb5e62
new file mode 100644
index 00000000000..bc4d567d733
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-20efd8856e04ca1fced9daa93837ae3384bb5e62
@@ -0,0 +1 @@
+assert({:=;})
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-2490dbc1880f2d7883c1b634deee8da3805186f8 b/test/cli/fuzz-crash/crash-2490dbc1880f2d7883c1b634deee8da3805186f8
new file mode 100644
index 00000000000..60a55bed0b9
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-2490dbc1880f2d7883c1b634deee8da3805186f8
@@ -0,0 +1 @@
+i a;m t(=a[]);m e(){a[]=0}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-26edfe9761d3b681c841dfe80398847dee332f83 b/test/cli/fuzz-crash/crash-26edfe9761d3b681c841dfe80398847dee332f83
new file mode 100644
index 00000000000..ca4faea1d2e
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-26edfe9761d3b681c841dfe80398847dee332f83
@@ -0,0 +1 @@
+[]<i
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-28733cc31fd7f5d636beeaa3fa2bc30779fc6487 b/test/cli/fuzz-crash/crash-28733cc31fd7f5d636beeaa3fa2bc30779fc6487
new file mode 100644
index 00000000000..adf0f71ff8f
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-28733cc31fd7f5d636beeaa3fa2bc30779fc6487
@@ -0,0 +1 @@
+assert({:=4;})
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-2adde1da09b2db453c18898785b78024adb02c78 b/test/cli/fuzz-crash/crash-2adde1da09b2db453c18898785b78024adb02c78
new file mode 100644
index 00000000000..ee90f9ea13d
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-2adde1da09b2db453c18898785b78024adb02c78
@@ -0,0 +1 @@
+S namespace d=S;e namespace d=a
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-2cf8ffd04628a7c025bb07074462a51c1284dff0 b/test/cli/fuzz-crash/crash-2cf8ffd04628a7c025bb07074462a51c1284dff0
new file mode 100644
index 00000000000..ffa34fb944d
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-2cf8ffd04628a7c025bb07074462a51c1284dff0
@@ -0,0 +1 @@
+//REMARK /
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-3275671bf6888060270f902458ff36c711718e22 b/test/cli/fuzz-crash/crash-3275671bf6888060270f902458ff36c711718e22
new file mode 100644
index 00000000000..c4057bba583
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-3275671bf6888060270f902458ff36c711718e22
@@ -0,0 +1 @@
+v o(ia){$ i;for(i:)a=[]0;}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-34c8d34fd4607de810d8d5bec881b40d37533181 b/test/cli/fuzz-crash/crash-34c8d34fd4607de810d8d5bec881b40d37533181
new file mode 100644
index 00000000000..9c0ebaea86e
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-34c8d34fd4607de810d8d5bec881b40d37533181
@@ -0,0 +1 @@
+t<e<:template<>e=c>n
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-3997cb1cad0af26035d36ca1a01ece07ca3fd114 b/test/cli/fuzz-crash/crash-3997cb1cad0af26035d36ca1a01ece07ca3fd114
new file mode 100644
index 00000000000..fe21ddcbfa4
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-3997cb1cad0af26035d36ca1a01ece07ca3fd114
@@ -0,0 +1 @@
+b=1;t o(){& &&&}
\ 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-3ea64296c8518edb538e0047c3eba0792d5deeba b/test/cli/fuzz-crash/crash-3ea64296c8518edb538e0047c3eba0792d5deeba
new file mode 100644
index 00000000000..a12e6966bd5
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-3ea64296c8518edb538e0047c3eba0792d5deeba
@@ -0,0 +1 @@
+n i(){t i;for(i=0;i<3;++);}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-43fe82a87d6a7f34f000cbbc90b63ad1a58e3dcd b/test/cli/fuzz-crash/crash-43fe82a87d6a7f34f000cbbc90b63ad1a58e3dcd
new file mode 100644
index 00000000000..ac43489b2c0
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-43fe82a87d6a7f34f000cbbc90b63ad1a58e3dcd
@@ -0,0 +1 @@
+d o(){t&a=*&a}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-44b5d1f53328660cbcb6e90793eae2ff8ffc4893 b/test/cli/fuzz-crash/crash-44b5d1f53328660cbcb6e90793eae2ff8ffc4893
new file mode 100644
index 00000000000..c45497a8601
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-44b5d1f53328660cbcb6e90793eae2ff8ffc4893
@@ -0,0 +1 @@
+typedef q r[];r A
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-49338578888313fd087eb219d248c9aaf4ea9d0b b/test/cli/fuzz-crash/crash-49338578888313fd087eb219d248c9aaf4ea9d0b
new file mode 100644
index 00000000000..484bdfe4ca3
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-49338578888313fd087eb219d248c9aaf4ea9d0b
@@ -0,0 +1 @@
+;namespace d=S;r namespace d=X
\ No newline at end of file
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-4d4e80f09d4733a9f724282d60ee4e3c3a143b61 b/test/cli/fuzz-crash/crash-4d4e80f09d4733a9f724282d60ee4e3c3a143b61
new file mode 100644
index 00000000000..de445fa92bf
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-4d4e80f09d4733a9f724282d60ee4e3c3a143b61
@@ -0,0 +1 @@
+d o(i*a){n b;*a=&b;if(a)r{}}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-522f048722bf5f33fa10a32a4c5253d1dc8b01d5 b/test/cli/fuzz-crash/crash-522f048722bf5f33fa10a32a4c5253d1dc8b01d5
new file mode 100644
index 00000000000..4f6def81102
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-522f048722bf5f33fa10a32a4c5253d1dc8b01d5
@@ -0,0 +1 @@
+C(){o y=>::*}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-58e1517a74e314553e8eef249268cec29493235b b/test/cli/fuzz-crash/crash-58e1517a74e314553e8eef249268cec29493235b
new file mode 100644
index 00000000000..935f807a15f
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-58e1517a74e314553e8eef249268cec29493235b
@@ -0,0 +1 @@
+n a(){!!=!!?:b}
\ 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-5db88ae1610f5a9782ea78af206f9cd87b6708dd b/test/cli/fuzz-crash/crash-5db88ae1610f5a9782ea78af206f9cd87b6708dd
new file mode 100644
index 00000000000..8026606c85c
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-5db88ae1610f5a9782ea78af206f9cd87b6708dd
@@ -0,0 +1 @@
+{for(typedef;);}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-66bd8440a699d270b323367978dab020dd1da3ff b/test/cli/fuzz-crash/crash-66bd8440a699d270b323367978dab020dd1da3ff
new file mode 100644
index 00000000000..bdae8e1eded
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-66bd8440a699d270b323367978dab020dd1da3ff
@@ -0,0 +1 @@
+enum{C={;}=e};
\ No newline at end of file
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-69570c88fc79e9a66ce2f2c729b455eaa237f3d2 b/test/cli/fuzz-crash/crash-69570c88fc79e9a66ce2f2c729b455eaa237f3d2
new file mode 100644
index 00000000000..a901d0c5c07
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-69570c88fc79e9a66ce2f2c729b455eaa237f3d2
@@ -0,0 +1 @@
+o oo(){extern oo();}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-6eadb507c9ee93d9500028a9be2d183d1518f26b b/test/cli/fuzz-crash/crash-6eadb507c9ee93d9500028a9be2d183d1518f26b
new file mode 100644
index 00000000000..2c7ce45bc97
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-6eadb507c9ee93d9500028a9be2d183d1518f26b
@@ -0,0 +1 @@
+i a;u n(;a[]),n(){a[]=0}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-772965250be2580c7c52f024c15fd5c8a9bb13c7 b/test/cli/fuzz-crash/crash-772965250be2580c7c52f024c15fd5c8a9bb13c7
new file mode 100644
index 00000000000..a010a5fcfcc
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-772965250be2580c7c52f024c15fd5c8a9bb13c7
@@ -0,0 +1 @@
+enum{C=e;=U};
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-77a4e4ffd476997f06f67e4a18b5d4eedfa71900 b/test/cli/fuzz-crash/crash-77a4e4ffd476997f06f67e4a18b5d4eedfa71900
new file mode 100644
index 00000000000..f0766577f5c
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-77a4e4ffd476997f06f67e4a18b5d4eedfa71900
@@ -0,0 +1 @@
+n i(){t i=0-::-t}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-78bcf47420424bf607f6697cf84ddd84b4dfbeb9 b/test/cli/fuzz-crash/crash-78bcf47420424bf607f6697cf84ddd84b4dfbeb9
new file mode 100644
index 00000000000..89b2cab671d
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-78bcf47420424bf607f6697cf84ddd84b4dfbeb9
@@ -0,0 +1 @@
+assert(a~--)
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-7bac85061edab7fdce2889f02ea3a044242a3920 b/test/cli/fuzz-crash/crash-7bac85061edab7fdce2889f02ea3a044242a3920
new file mode 100644
index 00000000000..d9de20d6e55
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-7bac85061edab7fdce2889f02ea3a044242a3920
@@ -0,0 +1 @@
+a,typedef U typedef,U,i
\ No newline at end of file
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-7ead2ccf9be8b03b2d9c8c82891f58081390a560 b/test/cli/fuzz-crash/crash-7ead2ccf9be8b03b2d9c8c82891f58081390a560
new file mode 100644
index 00000000000..0de3f6a49b3
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-7ead2ccf9be8b03b2d9c8c82891f58081390a560
@@ -0,0 +1 @@
+n m(){int a[];a=[]}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-81a29a4459dee76d10e452690f3e52fa0172852f b/test/cli/fuzz-crash/crash-81a29a4459dee76d10e452690f3e52fa0172852f
new file mode 100644
index 00000000000..5579544ce3e
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-81a29a4459dee76d10e452690f3e52fa0172852f
@@ -0,0 +1 @@
+{s for(typedef:;){}}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-82986578453ec2056069c70846571775b10dfbcb b/test/cli/fuzz-crash/crash-82986578453ec2056069c70846571775b10dfbcb
new file mode 100644
index 00000000000..d658e27570f
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-82986578453ec2056069c70846571775b10dfbcb
@@ -0,0 +1 @@
+namespace d=S
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-889549c7af3edaaf3e6e6f0783a42f4bcab7167e b/test/cli/fuzz-crash/crash-889549c7af3edaaf3e6e6f0783a42f4bcab7167e
new file mode 100644
index 00000000000..69d0b174b03
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-889549c7af3edaaf3e6e6f0783a42f4bcab7167e
@@ -0,0 +1 @@
+{enum{A=s()0=s};}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-8a24e81ac1d7627233a227e6cc156dd20d57b058 b/test/cli/fuzz-crash/crash-8a24e81ac1d7627233a227e6cc156dd20d57b058
new file mode 100644
index 00000000000..8810b86ac93
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-8a24e81ac1d7627233a227e6cc156dd20d57b058
@@ -0,0 +1 @@
+r*register
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-8b9b108955146efbdae71f7167251da89d1e18c4 b/test/cli/fuzz-crash/crash-8b9b108955146efbdae71f7167251da89d1e18c4
new file mode 100644
index 00000000000..dcf55359979
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-8b9b108955146efbdae71f7167251da89d1e18c4
@@ -0,0 +1 @@
+{enum{A=s(u)0=s};}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-8e34edab2458422d12e1b796686205a80760dbcb b/test/cli/fuzz-crash/crash-8e34edab2458422d12e1b796686205a80760dbcb
new file mode 100644
index 00000000000..581bcb4dae7
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-8e34edab2458422d12e1b796686205a80760dbcb
@@ -0,0 +1 @@
+typedef e*(C)()const C;
\ No newline at end of file
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-9a91d3da4e19336af500b94b2405831ed0fc1585 b/test/cli/fuzz-crash/crash-9a91d3da4e19336af500b94b2405831ed0fc1585
new file mode 100644
index 00000000000..fac1475e560
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-9a91d3da4e19336af500b94b2405831ed0fc1585
@@ -0,0 +1 @@
+template<>>a{}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-9e4f80a23bc966f25e874df655f600478dca3b87 b/test/cli/fuzz-crash/crash-9e4f80a23bc966f25e874df655f600478dca3b87
new file mode 100644
index 00000000000..dc5e7b97e16
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-9e4f80a23bc966f25e874df655f600478dca3b87
@@ -0,0 +1 @@
+__thread<>e
\ 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-9ef938bba7d752386e24f2438c73cec66f6b972b b/test/cli/fuzz-crash/crash-9ef938bba7d752386e24f2438c73cec66f6b972b
new file mode 100644
index 00000000000..57d23881507
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-9ef938bba7d752386e24f2438c73cec66f6b972b
@@ -0,0 +1 @@
+o n(){r<>items;t iter;for(&&){iter=items.g}}
\ 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-a3cfaec435c6df0f6c3cfc83f052abd42c75ba4d b/test/cli/fuzz-crash/crash-a3cfaec435c6df0f6c3cfc83f052abd42c75ba4d
new file mode 100644
index 00000000000..e3569504de1
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-a3cfaec435c6df0f6c3cfc83f052abd42c75ba4d
@@ -0,0 +1 @@
+typedef C();typedef const C*(*func2)();d(func2())
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-a431ec7f7379fc460eaa6284627091ded6c0d696 b/test/cli/fuzz-crash/crash-a431ec7f7379fc460eaa6284627091ded6c0d696
new file mode 100644
index 00000000000..ee0a7d32082
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-a431ec7f7379fc460eaa6284627091ded6c0d696
@@ -0,0 +1 @@
+{for(typedef,typedef;);}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-a76710eb5c80761456679c5be64482f1ef332556 b/test/cli/fuzz-crash/crash-a76710eb5c80761456679c5be64482f1ef332556
new file mode 100644
index 00000000000..c819faeb807
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-a76710eb5c80761456679c5be64482f1ef332556
@@ -0,0 +1 @@
+i n(){$ i;f a;for(i:++)a=[]i;}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-adb20a108c3686d79bc9bd0e4025445e3a35fa49 b/test/cli/fuzz-crash/crash-adb20a108c3686d79bc9bd0e4025445e3a35fa49
new file mode 100644
index 00000000000..98e8746abd0
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-adb20a108c3686d79bc9bd0e4025445e3a35fa49
@@ -0,0 +1 @@
+template<#p<>tu< <>tu=e
\ No newline at end of file
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-c021b973c9f8692ff1ea73710209a4129dc7a834 b/test/cli/fuzz-crash/crash-c021b973c9f8692ff1ea73710209a4129dc7a834
new file mode 100644
index 00000000000..411936bf04e
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-c021b973c9f8692ff1ea73710209a4129dc7a834
@@ -0,0 +1 @@
+typedef const C;C(public C<i)
\ No newline at end of file
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-cb1d71440b24712fdf0bdcee43b9b3f1bc35c0d0 b/test/cli/fuzz-crash/crash-cb1d71440b24712fdf0bdcee43b9b3f1bc35c0d0
new file mode 100644
index 00000000000..37d2ba6564c
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-cb1d71440b24712fdf0bdcee43b9b3f1bc35c0d0
@@ -0,0 +1 @@
+(n@()###);
\ No newline at end of file
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-d6609399a4398aed92f5ac9e53aa0554d9f8bbd6 b/test/cli/fuzz-crash/crash-d6609399a4398aed92f5ac9e53aa0554d9f8bbd6
new file mode 100644
index 00000000000..1563d4c95bd
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-d6609399a4398aed92f5ac9e53aa0554d9f8bbd6
@@ -0,0 +1 @@
+_(){w((char)=e)}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-e000709d155e9c993795748ba31fddacbd5a86ac b/test/cli/fuzz-crash/crash-e000709d155e9c993795748ba31fddacbd5a86ac
new file mode 100644
index 00000000000..6f94840a159
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-e000709d155e9c993795748ba31fddacbd5a86ac
@@ -0,0 +1 @@
+{for(()s)}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-e4a26f2d7d0a73836bf086f54e48204d8914b95a b/test/cli/fuzz-crash/crash-e4a26f2d7d0a73836bf086f54e48204d8914b95a
new file mode 100644
index 00000000000..ba39dbb8588
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-e4a26f2d7d0a73836bf086f54e48204d8914b95a
@@ -0,0 +1 @@
+t i(){for(;;f&++)}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-e6c12e56d9711d24fc9a4355e7d35fc23fbf0ff4 b/test/cli/fuzz-crash/crash-e6c12e56d9711d24fc9a4355e7d35fc23fbf0ff4
new file mode 100644
index 00000000000..7249082ff90
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-e6c12e56d9711d24fc9a4355e7d35fc23fbf0ff4
@@ -0,0 +1 @@
+struct B{o a;B<>{0,{}}}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-ee5250480d7bc4bed7520d96a50d8501632a8997 b/test/cli/fuzz-crash/crash-ee5250480d7bc4bed7520d96a50d8501632a8997
new file mode 100644
index 00000000000..55f38493a42
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-ee5250480d7bc4bed7520d96a50d8501632a8997
@@ -0,0 +1 @@
+$(){using}
\ No newline at end of file
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-f158d32510f6eba5e1aa06ed8ef689b88da33a95 b/test/cli/fuzz-crash/crash-f158d32510f6eba5e1aa06ed8ef689b88da33a95
new file mode 100644
index 00000000000..52272b364ea
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-f158d32510f6eba5e1aa06ed8ef689b88da33a95
@@ -0,0 +1 @@
+enum{a=1{}=d};
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-f4ec019b9a1f357d036a9bc3c2cb6fb10a0c3ded b/test/cli/fuzz-crash/crash-f4ec019b9a1f357d036a9bc3c2cb6fb10a0c3ded
new file mode 100644
index 00000000000..7f948841a94
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-f4ec019b9a1f357d036a9bc3c2cb6fb10a0c3ded
@@ -0,0 +1 @@
+o k(){t*data;{memcpy(data,,sizeof\)}}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash/crash-faa56134676fb5d021ad69c8ac526d65debcfdb1 b/test/cli/fuzz-crash/crash-faa56134676fb5d021ad69c8ac526d65debcfdb1
new file mode 100644
index 00000000000..26613dccc82
--- /dev/null
+++ b/test/cli/fuzz-crash/crash-faa56134676fb5d021ad69c8ac526d65debcfdb1
@@ -0,0 +1 @@
+{for(typedef U typedef{};);}
\ 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/leak-9543188fae87abc4409106e1918d6424efe0d68a b/test/cli/fuzz-crash/leak-9543188fae87abc4409106e1918d6424efe0d68a
new file mode 100644
index 00000000000..58448756115
--- /dev/null
+++ b/test/cli/fuzz-crash/leak-9543188fae87abc4409106e1918d6424efe0d68a
@@ -0,0 +1 @@
+v f(*){e=t&&}
\ 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-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-77c74a5f04704110ab5f71b753a623f2d28440bc b/test/cli/fuzz-crash_c/crash-77c74a5f04704110ab5f71b753a623f2d28440bc
new file mode 100644
index 00000000000..b00cf975b74
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-77c74a5f04704110ab5f71b753a623f2d28440bc
@@ -0,0 +1 @@
+class r::_
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-7af21bec1d9be105742fdcb336514aae26ab4425 b/test/cli/fuzz-crash_c/crash-7af21bec1d9be105742fdcb336514aae26ab4425
new file mode 100644
index 00000000000..6620c0d315f
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-7af21bec1d9be105742fdcb336514aae26ab4425
@@ -0,0 +1,2 @@
+i
+class q::_
\ 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-85219ec46607233cec457b54a209ded59c333f46 b/test/cli/fuzz-crash_c/crash-85219ec46607233cec457b54a209ded59c333f46
new file mode 100644
index 00000000000..54d804c62d4
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-85219ec46607233cec457b54a209ded59c333f46
@@ -0,0 +1 @@
+n(){o?5:t++m}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-bbf4e88b43fa24873e63d39ab04ef8d3fd00e344 b/test/cli/fuzz-crash_c/crash-bbf4e88b43fa24873e63d39ab04ef8d3fd00e344
new file mode 100644
index 00000000000..e9da81bd248
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-bbf4e88b43fa24873e63d39ab04ef8d3fd00e344
@@ -0,0 +1 @@
+f(){int a[5];memset(a,5)}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-c43160a021f72643e229bb61306240d0dbf2c9bd b/test/cli/fuzz-crash_c/crash-c43160a021f72643e229bb61306240d0dbf2c9bd
new file mode 100644
index 00000000000..92c19cc05b5
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-c43160a021f72643e229bb61306240d0dbf2c9bd
@@ -0,0 +1 @@
+f(a b){do{if(b){}}while(e)x}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-dbd2b8fcc4fecd0b7bdde1f5938711075a35d242 b/test/cli/fuzz-crash_c/crash-dbd2b8fcc4fecd0b7bdde1f5938711075a35d242
new file mode 100644
index 00000000000..3cabdd2f6fc
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-dbd2b8fcc4fecd0b7bdde1f5938711075a35d242
@@ -0,0 +1 @@
+{assert({f=a})}
\ No newline at end of file
diff --git a/test/cli/fuzz-crash_c/crash-dd1289f81f5aaf90167595c5402e6cda2be505be b/test/cli/fuzz-crash_c/crash-dd1289f81f5aaf90167595c5402e6cda2be505be
new file mode 100644
index 00000000000..056f4456bfd
--- /dev/null
+++ b/test/cli/fuzz-crash_c/crash-dd1289f81f5aaf90167595c5402e6cda2be505be
@@ -0,0 +1 @@
+d(){A a;n=do{}while(N)t}
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/minimized-from-179e5b42a7b0ba41a088e7972bdb13dde18ef4d1 b/test/cli/fuzz-timeout/minimized-from-179e5b42a7b0ba41a088e7972bdb13dde18ef4d1
new file mode 100644
index 00000000000..9118d58da24
--- /dev/null
+++ b/test/cli/fuzz-timeout/minimized-from-179e5b42a7b0ba41a088e7972bdb13dde18ef4d1
@@ -0,0 +1 @@
+d f(*){*:b&&}
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/oom-0c8e70d5adb08986635b786737dbb5e6ac098f22 b/test/cli/fuzz-timeout/oom-0c8e70d5adb08986635b786737dbb5e6ac098f22
new file mode 100644
index 00000000000..54d37965b04
--- /dev/null
+++ b/test/cli/fuzz-timeout/oom-0c8e70d5adb08986635b786737dbb5e6ac098f22
@@ -0,0 +1 @@
+template<8<>e=e<>>f
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/oom-756ab636471bffa2430290f58776f1f6d8754ab1 b/test/cli/fuzz-timeout/oom-756ab636471bffa2430290f58776f1f6d8754ab1
new file mode 100644
index 00000000000..a945de7b7c4
--- /dev/null
+++ b/test/cli/fuzz-timeout/oom-756ab636471bffa2430290f58776f1f6d8754ab1
@@ -0,0 +1 @@
+template< <>t=t<>>d
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/oom-e19261c78d73cf172308f6c33df68642dfd7b679 b/test/cli/fuzz-timeout/oom-e19261c78d73cf172308f6c33df68642dfd7b679
new file mode 100644
index 00000000000..f0d2b9c00b2
--- /dev/null
+++ b/test/cli/fuzz-timeout/oom-e19261c78d73cf172308f6c33df68642dfd7b679
@@ -0,0 +1 @@
+template<~>tu<2>tu=<tu<0&tu<0&n
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-0ee5eed9abd34e9d23640a5b82dd724affd05b79 b/test/cli/fuzz-timeout/timeout-0ee5eed9abd34e9d23640a5b82dd724affd05b79
new file mode 100644
index 00000000000..5f9465da55e
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-0ee5eed9abd34e9d23640a5b82dd724affd05b79
@@ -0,0 +1 @@
+;new t()
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-7795aa299fc0c2bafe3a152785d55b039d4f339c b/test/cli/fuzz-timeout/timeout-7795aa299fc0c2bafe3a152785d55b039d4f339c
new file mode 100644
index 00000000000..579dddd02b3
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-7795aa299fc0c2bafe3a152785d55b039d4f339c
@@ -0,0 +1 @@
+ e<>(){F+0+0+++++++++++++++++++++++++++++++++++++++++5;}
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-8229bbbfcf6f3ab98a6c23bfb1421ffd611c3657 b/test/cli/fuzz-timeout/timeout-8229bbbfcf6f3ab98a6c23bfb1421ffd611c3657
new file mode 100644
index 00000000000..685ac840459
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-8229bbbfcf6f3ab98a6c23bfb1421ffd611c3657
@@ -0,0 +1,8 @@
+int bhar()
+{
+    int a[2];
+    ift i;  
+    for (i = 0; i < 3; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^~^^^^^^^^^^^^^^^^^^&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&size_t^^^^^^^^^^^^^^^^^^i++)
+        a[i] = 1;
+    rewurn a[0];
+}
diff --git a/test/cli/fuzz-timeout/timeout-90ec15c5629f957bf2d497bc9f60c57f252bd2ae b/test/cli/fuzz-timeout/timeout-90ec15c5629f957bf2d497bc9f60c57f252bd2ae
new file mode 100644
index 00000000000..23ac243e4ab
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-90ec15c5629f957bf2d497bc9f60c57f252bd2ae
@@ -0,0 +1 @@
+ ama typedef f  m ef ef dz e dz e e ef   ef  m ef dz e,,,,m  ef dz e,,,,,K 
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-9598595ae3c480b58773e85cd4e4d52b1dc37038 b/test/cli/fuzz-timeout/timeout-9598595ae3c480b58773e85cd4e4d52b1dc37038
new file mode 100644
index 00000000000..1fb47f839a8
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-9598595ae3c480b58773e85cd4e4d52b1dc37038
@@ -0,0 +1 @@
+i f(n*a){n b=0;*a=b;%*a=b;--------------------b}
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-98121de84d1c09fdfd3697cdedcdd69bf6abc15d b/test/cli/fuzz-timeout/timeout-98121de84d1c09fdfd3697cdedcdd69bf6abc15d
new file mode 100644
index 00000000000..aad51f01fe5
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-98121de84d1c09fdfd3697cdedcdd69bf6abc15d
@@ -0,0 +1 @@
+typedef static i i,n.i
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-a0b9848dd6e98677a0a96c5fc50ad571ed5a7092 b/test/cli/fuzz-timeout/timeout-a0b9848dd6e98677a0a96c5fc50ad571ed5a7092
new file mode 100644
index 00000000000..2f29da2e360
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-a0b9848dd6e98677a0a96c5fc50ad571ed5a7092
@@ -0,0 +1,2 @@
+t i(){int
+t,?:0::::}
\ No newline at end of file
diff --git a/test/cli/fuzz-timeout/timeout-faa72062ab3f26df7305d72eed55a69f7f0dfbf0 b/test/cli/fuzz-timeout/timeout-faa72062ab3f26df7305d72eed55a69f7f0dfbf0
new file mode 100644
index 00000000000..f2a7a35935a
--- /dev/null
+++ b/test/cli/fuzz-timeout/timeout-faa72062ab3f26df7305d72eed55a69f7f0dfbf0
@@ -0,0 +1 @@
+typedef q k k k q,q k,q,k,q,k,q k,q,k,q,k,;
\ No newline at end of file
diff --git a/test/cli/fuzz_test.py b/test/cli/fuzz_test.py
new file mode 100644
index 00000000000..f1dbcd2983e
--- /dev/null
+++ b/test/cli/fuzz_test.py
@@ -0,0 +1,46 @@
+import os
+import subprocess
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+
+def test_fuzz_crash():
+    failures = {}
+
+    fuzz_crash_dir = os.path.join(__script_dir, 'fuzz-crash')
+    for f in os.listdir(fuzz_crash_dir):
+        ret, stdout, stderr = cppcheck(['-q', '--language=c++', '--enable=all', '--inconclusive', f], cwd=fuzz_crash_dir)
+        if ret != 0:
+            failures[f] = stdout + stderr
+
+    assert failures == {}
+
+
+def test_fuzz_crash_c():
+    failures = {}
+
+    fuzz_crash_dir = os.path.join(__script_dir, 'fuzz-crash_c')
+    # TODO: remove check if we have test data
+    if not os.path.exists(fuzz_crash_dir):
+        return
+    for f in os.listdir(fuzz_crash_dir):
+        ret, stdout, stderr = cppcheck(['-q', '--language=c', '--enable=all', '--inconclusive', f], cwd=fuzz_crash_dir)
+        if ret != 0:
+            failures[f] = stdout + stderr
+
+    assert failures == {}
+
+
+def test_fuzz_timeout():
+    failures = []
+
+    fuzz_timeout_dir = os.path.join(__script_dir, 'fuzz-timeout')
+    for f in os.listdir(fuzz_timeout_dir):
+        try:
+            cppcheck(['-q', '--language=c++', '--enable=all', '--inconclusive', f], cwd=fuzz_timeout_dir, timeout=5)
+        except subprocess.TimeoutExpired:
+            failures.append(f)
+
+    assert failures == []
diff --git a/test/cli/helloworld/main.c b/test/cli/helloworld/main.c
index cfcce06fdfa..c5b94db7aa0 100644
--- a/test/cli/helloworld/main.c
+++ b/test/cli/helloworld/main.c
@@ -2,7 +2,7 @@
 
 int main(void) {
     (void)printf("Hello world!\n");
-    x = 3 / 0; // ERROR
+    int x = 3 / 0; (void)x; // ERROR
     return 0;
 }
 
diff --git a/test/cli/helloworld_test.py b/test/cli/helloworld_test.py
new file mode 100644
index 00000000000..c4ffec69c9c
--- /dev/null
+++ b/test/cli/helloworld_test.py
@@ -0,0 +1,394 @@
+
+# python -m pytest test-helloworld.py
+
+import os
+import re
+import glob
+import json
+import shutil
+import xml.etree.ElementTree as ET
+
+import pytest
+
+from testutils import create_gui_project_file, cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'helloworld')
+
+
+# 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',
+        'helloworld'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename = os.path.join('helloworld', 'main.c')
+    assert ret == 0, stdout
+    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
+
+
+def test_local_path():
+    args = [
+        '--template=cppcheck1',
+        '.'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__proj_dir)
+    assert ret == 0, stdout
+    assert stderr == '[main.c:5]: (error) Division by zero.\n'
+
+def test_absolute_path():
+    args = [
+        '--template=cppcheck1',
+        __proj_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    filename = os.path.join(__proj_dir, 'main.c')
+    assert ret == 0, stdout
+    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
+
+def test_addon_local_path():
+    args = [
+        '--addon=misra',
+        '--enable=style',
+        '--template=cppcheck1',
+        '.'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__proj_dir)
+    assert ret == 0, stdout
+    assert stderr == ('[main.c:5]: (error) Division by zero.\n'
+                      '[main.c:4]: (style) misra violation (use --rule-texts=<file> to get proper output)\n')
+
+def test_addon_local_path_not_enable():
+    args = [
+        '--addon=misra',
+        '--template=cppcheck1',
+        '.'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__proj_dir)
+    assert ret == 0, stdout
+    assert stderr == '[main.c:5]: (error) Division by zero.\n'
+
+def test_addon_absolute_path():
+    args = [
+        '--addon=misra',
+        '--enable=style',
+        '--template=cppcheck1',
+        __proj_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    filename = os.path.join(__proj_dir, 'main.c')
+    assert ret == 0, stdout
+    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))
+
+def test_addon_relative_path():
+    args = [
+        '--addon=misra',
+        '--enable=style',
+        '--template=cppcheck1',
+        'helloworld'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename = os.path.join('helloworld', 'main.c')
+    assert ret == 0, stdout
+    assert stdout == ('Checking %s ...\n'
+                      'Checking %s: 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))
+
+def test_addon_with_gui_project(tmp_path):
+    shutil.copytree(os.path.join(__script_dir, 'helloworld'), tmp_path / 'helloworld')
+    project_file = os.path.join('helloworld', 'test.cppcheck')
+    create_gui_project_file(tmp_path / project_file, paths=['.'], addon='misra')
+    args = [
+        '--template=cppcheck1',
+        '--enable=style',
+        '--project={}'.format(project_file)
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    filename = os.path.join('helloworld', 'main.c')
+    assert ret == 0, stdout
+    assert stdout.strip().split('\n') == [
+        'Checking %s ...' % filename,
+        'Checking %s: 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))
+
+def test_basepath_relative_path():
+    args = [
+        'helloworld',
+        '--template=cppcheck1',
+        '-rp=helloworld'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    assert stderr == '[main.c:5]: (error) Division by zero.\n'
+
+def test_basepath_absolute_path():
+    args = [
+        '--template=cppcheck1',
+        __proj_dir,
+        '-rp=' + __proj_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0, stdout
+    assert stderr == '[main.c:5]: (error) Division by zero.\n'
+
+def __test_vs_project_local_path(extra_args=None, exp_vs_cfg='Debug|Win32 Debug|x64 Release|Win32 Release|x64'):
+    args = [
+        '--template=cppcheck1',
+        '--project=helloworld.vcxproj'
+    ]
+    if extra_args:
+        args += extra_args
+    ret, stdout, stderr = cppcheck(args, cwd=__proj_dir)
+    assert ret == 0, stdout
+    assert __getVsConfigs(stdout, 'main.c') == exp_vs_cfg
+    assert stderr == '[main.c:5]: (error) Division by zero.\n'
+
+def test_vs_project_local_path():
+    __test_vs_project_local_path()
+
+def test_vs_project_local_path_select_one():
+    __test_vs_project_local_path(['--project-configuration=Release|Win32'], 'Release|Win32')
+
+def test_vs_project_local_path_select_one_multiple():
+    __test_vs_project_local_path(['--project-configuration=Debug|Win32', '--project-configuration=Release|Win32'], 'Release|Win32')
+
+def test_vs_project_local_path_no_analyze_all():
+    __test_vs_project_local_path(['--no-analyze-all-vs-configs'], 'Debug|Win32')
+
+def test_vs_project_relative_path():
+    args = [
+        '--template=cppcheck1',
+        '--project=' + os.path.join(__proj_dir, 'helloworld.vcxproj')
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename = os.path.join(__proj_dir, 'main.c')
+    assert ret == 0, stdout
+    assert __getVsConfigs(stdout, filename) == 'Debug|Win32 Debug|x64 Release|Win32 Release|x64'
+    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
+
+def test_vs_project_absolute_path():
+    args = [
+        '--template=cppcheck1',
+        '--project=' + os.path.join(__proj_dir, 'helloworld.vcxproj')
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    filename = os.path.join(__proj_dir, 'main.c')
+    assert ret == 0, stdout
+    assert __getVsConfigs(stdout, filename) == 'Debug|Win32 Debug|x64 Release|Win32 Release|x64'
+    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
+
+def __test_cppcheck_project_local_path(extra_args=None, exp_vs_cfg='Debug|x64'):
+    args = [
+        '--template=cppcheck1',
+        '--platform=win64',
+        '--project=helloworld.cppcheck'
+    ]
+    if extra_args:
+        args += extra_args
+    ret, stdout, stderr = cppcheck(args, cwd=__proj_dir)
+    assert ret == 0, stdout
+    assert __getVsConfigs(stdout, 'main.c') == exp_vs_cfg
+    assert stderr == '[main.c:5]: (error) Division by zero.\n'
+
+def test_cppcheck_project_local_path():
+    __test_cppcheck_project_local_path()
+
+@pytest.mark.xfail  # TODO: no source files found
+def test_cppcheck_project_local_path_select_one():
+    __test_cppcheck_project_local_path(['--project-configuration=Release|Win32'], 'Release|Win32')
+
+@pytest.mark.xfail  # TODO: no source files found
+def test_cppcheck_project_local_path_select_one_multiple():
+    __test_cppcheck_project_local_path(['--project-configuration=Debug|Win32', '--project-configuration=Release|Win32'], 'Release|Win32')
+
+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():
+    args = [
+        '--template=cppcheck1',
+        '--platform=win64',
+        '--project=' + os.path.join('helloworld', 'helloworld.cppcheck')
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    filename = os.path.join('helloworld', 'main.c')
+    assert ret == 0, stdout
+    assert __getVsConfigs(stdout, filename) == 'Debug|x64'
+    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
+
+def test_cppcheck_project_absolute_path():
+    args = [
+        '--template=cppcheck1',
+        '--platform=win64',
+        '--project=' + os.path.join(__proj_dir, 'helloworld.cppcheck')
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    filename = os.path.join(__proj_dir, 'main.c')
+    assert ret == 0, stdout
+    assert __getVsConfigs(stdout, filename) == 'Debug|x64'
+    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
+
+def test_suppress_command_line_related():
+    args = [
+        '--suppress=zerodiv:' + os.path.join('helloworld', 'main.c'),
+        'helloworld'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    assert stderr == ''
+
+def test_suppress_command_line_absolute():
+    args = [
+        '--suppress=zerodiv:' + os.path.join(__proj_dir, 'main.c'),
+        __proj_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0, stdout
+    assert stderr == ''
+
+def test_suppress_project_relative(tmp_path):
+    shutil.copytree(os.path.join(__script_dir, 'helloworld'), tmp_path / 'helloworld')
+    project_file = os.path.join('helloworld', 'test.cppcheck')
+    create_gui_project_file(tmp_path / project_file,
+                            paths=['.'],
+                            suppressions=[{'fileName':'main.c', 'id':'zerodiv'}])
+
+    args = [
+        '--project={}'.format(project_file)
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert ret == 0, stdout
+    assert stderr == ''
+
+
+def test_suppress_project_absolute(tmp_path):
+    shutil.copytree(os.path.join(__script_dir, 'helloworld'), tmp_path / 'helloworld')
+    project_file = tmp_path / 'helloworld' / 'test.cppcheck'
+    create_gui_project_file(project_file,
+                            paths=['.'],
+                            suppressions=[{'fileName':'main.c', 'id':'zerodiv'}])
+
+    args = [
+        '--project={}'.format(project_file)
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0, stdout
+    assert stderr == ''
+
+def test_exclude():
+    args = [
+        '-i' + 'helloworld',
+        '--platform=win64',
+        '--project=' + os.path.join('helloworld', 'helloworld.cppcheck')
+    ]
+    ret, stdout, _ = cppcheck(args, cwd=__script_dir)
+    assert ret == 1
+    lines = stdout.splitlines()
+    assert lines == [
+        'cppcheck: error: no C or C++ source files found.',
+        'cppcheck: all paths were ignored'
+    ]
+
+
+def test_build_dir_dump_output(tmpdir):
+    args = [
+        f'--cppcheck-build-dir={tmpdir}',
+        '--addon=misra',
+        'helloworld'
+    ]
+
+    cppcheck(args)
+    cppcheck(args)
+
+    filename = f'{tmpdir}/main.a1.*.dump'
+    filelist = glob.glob(filename)
+    assert(len(filelist) == 0)
+
+
+def test_checkers_report(tmpdir):
+    filename = os.path.join(tmpdir, '1.txt')
+    args = [
+        f'--checkers-report={filename}',
+        '--no-cppcheck-build-dir',  # TODO: remove this
+        'helloworld'
+    ]
+
+    cppcheck(args, cwd=__script_dir)
+
+    with open(filename, 'rt') as f:
+        data = f.read().splitlines()
+        assert 'No   CheckAutoVariables::assignFunctionArg                     require:style,warning' in data, json.dumps(data, indent=4)
+        assert 'Yes  CheckAutoVariables::autoVariables' in data, json.dumps(data, indent=4)
+
+    args += [
+        '--enable=style'
+    ]
+    cppcheck(args, cwd=__script_dir)
+    with open(filename, 'rt') as f:
+        data = f.read().splitlines()
+        # checker has been activated by --enable=style
+        assert 'Yes  CheckAutoVariables::assignFunctionArg' in data, json.dumps(data, indent=4)
+
+
+def test_missing_include_system():  # #11283
+    args = [
+        '--enable=missingInclude',
+        '--suppress=zerodiv',
+        '--template=simple',
+        'helloworld'
+    ]
+
+    _, _, stderr = cppcheck(args, cwd=__script_dir)
+    assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n'
+
+
+def test_sarif():
+    args = [
+        '--output-format=sarif',
+        'helloworld'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert ret == 0, stdout
+    res = json.loads(stderr)
+    assert res['version'] == '2.1.0'
+    assert res['runs'][0]['results'][0]['locations'][0]['physicalLocation']['artifactLocation']['uri'] == 'helloworld/main.c'
+    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.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():
+    test_file = os.path.join(__proj_dir, 'main.c')
+    args = ['--xml-version=3', '--enable=all', test_file]
+
+    exitcode, _, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert ET.fromstring(stderr) is not None
diff --git a/test/cli/inline-suppress_test.py b/test/cli/inline-suppress_test.py
new file mode 100644
index 00000000000..7b8be839df4
--- /dev/null
+++ b/test/cli/inline-suppress_test.py
@@ -0,0 +1,560 @@
+
+# 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__))
+__proj_inline_suppres_path = 'proj-inline-suppress' + os.path.sep
+
+
+def __create_unused_function_compile_commands(tmpdir):
+    prjpath = os.path.realpath(os.path.join(__script_dir, 'proj-inline-suppress-unusedFunction'))
+    j = [{'directory': prjpath,
+          'command': '/usr/bin/c++ -I"' + prjpath + '" -o "' + os.path.join(prjpath, 'B.cpp.o') + '" -c "' + os.path.join(prjpath, 'B.cpp') + '"',
+          'file': os.path.join(prjpath, 'B.cpp')},
+         {'directory': prjpath,
+          'command': '/usr/bin/c++ -I"' + prjpath + '" -o "' + os.path.join(prjpath, 'A.cpp.o') + '" -c "' + os.path.join(prjpath, 'A.cpp') + '"',
+          'file': os.path.join(prjpath, 'A.cpp')}]
+    compdb_path = os.path.join(tmpdir, 'proj-inline-suppress-unusedFunction')
+    os.makedirs(compdb_path)
+    compile_commands = os.path.join(compdb_path, 'compile_commands.json')
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(j, indent=4))
+    return compile_commands
+
+
+def test_1():
+    args = [
+        '-q',
+        '--template=simple',
+        '--inline-suppr',
+        'proj-inline-suppress'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert stderr == ''
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_2():
+    args = [
+        '-q',
+        '--template=simple',
+        'proj-inline-suppress'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == [
+        '{}3.cpp:4:19: error: Division by zero. [zerodiv]'.format(__proj_inline_suppres_path)
+    ]
+    assert stdout == ''
+    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',
+        '--template=simple',
+        '--inline-suppr',
+        '--enable=information',
+        '--error-exitcode=1',
+        '{}2.c'.format(__proj_inline_suppres_path)
+    ]
+    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)
+    ]
+    assert stdout == ''
+    assert ret == 1, stdout
+
+
+def test_unmatched_suppression_path_with_extra_stuff():
+    args = [
+        '-q',
+        '--template=simple',
+        '--inline-suppr',
+        '--enable=information',
+        '--error-exitcode=1',
+        '{}2.c'.format(__proj_inline_suppres_path)
+    ]
+    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)
+    ]
+    assert stdout == ''
+    assert ret == 1, stdout
+
+
+def test_backwards_compatibility():
+    args = [
+        '-q',
+        '--template=simple',
+        '{}3.cpp'.format(__proj_inline_suppres_path)
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == [
+        '{}3.cpp:4:19: error: Division by zero. [zerodiv]'.format(__proj_inline_suppres_path)
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--inline-suppr',
+        '{}3.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
+
+
+def __test_compile_commands_unused_function(tmpdir, use_j):
+    compdb_file = __create_unused_function_compile_commands(tmpdir)
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=all',
+        '--error-exitcode=1',
+        '--project={}'.format(compdb_file)
+    ]
+    if use_j:
+        args.append('-j2')
+    else:
+        args.append('-j1')
+    ret, stdout, stderr = cppcheck(args)
+    proj_path_sep = os.path.join(__script_dir, 'proj-inline-suppress-unusedFunction') + os.path.sep
+    lines = stderr.splitlines()
+    assert lines == [
+        "{}B.cpp:6:9: style: The function 'unusedFunctionTest' is never used. [unusedFunction]".format(proj_path_sep)
+    ]
+    assert stdout == ''
+    assert ret == 1, stdout
+
+
+def test_compile_commands_unused_function(tmpdir):
+    __test_compile_commands_unused_function(tmpdir, False)
+
+
+@pytest.mark.skip  # unusedFunction does not work with -j
+def test_compile_commands_unused_function_j(tmpdir):
+    __test_compile_commands_unused_function(tmpdir, True)
+
+
+def __test_compile_commands_unused_function_suppression(tmpdir, use_j):
+    compdb_file = __create_unused_function_compile_commands(tmpdir)
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=all',
+        '--inline-suppr',
+        '--error-exitcode=1',
+        '--project={}'.format(compdb_file)
+    ]
+    if use_j:
+        args.append('-j2')
+    else:
+        args.append('-j1')
+    ret, stdout, stderr = cppcheck(args)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_compile_commands_unused_function_suppression(tmpdir):
+    __test_compile_commands_unused_function_suppression(tmpdir, False)
+
+
+@pytest.mark.skip  # unusedFunction does not work with -j
+def test_compile_commands_unused_function_suppression_j(tmpdir):
+    __test_compile_commands_unused_function_suppression(tmpdir, True)
+
+
+def test_unmatched_suppression_ifdef():
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--inline-suppr',
+        '-DNO_ZERO_DIV',
+        'trac5704/trac5704a.c'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_unmatched_suppression_ifdef_0():
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--inline-suppr',
+        'trac5704/trac5704b.c'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_build_dir(tmpdir):
+    args = [
+        '-q',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(tmpdir),
+        '--enable=all',
+        '--inline-suppr',
+        '{}4.c'.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',
+        '--template=simple',
+        '--cppcheck-build-dir={}'.format(tmpdir),
+        '--enable=all',
+        '--inline-suppr',
+        '{}template.cpp'.format(__proj_inline_suppres_path)
+    ]
+
+    args = args + extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_build_dir_unused_template(tmpdir):
+    __test_build_dir_unused_template(tmpdir, ['-j1', '--no-cppcheck-build-dir'])
+
+
+def test_build_dir_unused_template_j_thread(tmpdir):
+    __test_build_dir_unused_template(tmpdir, ['-j2', '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_build_dir_unused_template_j_process(tmpdir):
+    __test_build_dir_unused_template(tmpdir, ['-j2', '--executor=process'])
+
+
+def test_suppress_unmatched_inline_suppression():  # 11172
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--suppress=unmatchedSuppression',
+        '--inline-suppr',
+        '{}2.c'.format(__proj_inline_suppres_path)
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+@pytest.mark.skip  # TODO: this test makes no sense
+@pytest.mark.xfail(strict=True)  # no error as inline suppressions are currently not being propagated back
+def test_duplicate(tmpdir):
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=all',
+        '--inline-suppr',
+        'proj-inline-suppress/duplicate.cpp'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert stderr.splitlines() == []
+    assert stdout.splitlines() == [
+        "cppcheck: error: suppression 'unreadVariable' already exists"
+    ]
+    assert ret == 0, stdout
+
+
+# no error as inline suppressions are handled separately
+def __test_duplicate_cmd(tmpdir, extra_args):
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=all',
+        '--inline-suppr',
+        '--suppress=unreadVariable',
+        'proj-inline-suppress/4.c'
+    ]
+
+    args = args + extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    # this is the suppression provided via the command-line which is unused because only the inline suppression is being matched
+    assert lines == [
+        'nofile:0:0: information: Unmatched suppression: unreadVariable [unmatchedSuppression]'
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+@pytest.mark.skip  # TODO: behavior of duplicate suppressions across inline and non-inline is currently undefined
+def test_duplicate_cmd(tmp_path):
+    __test_duplicate_cmd(tmp_path, ['-j1'])
+
+
+@pytest.mark.skip  # TODO: behavior of duplicate suppressions across inline and non-inline is currently undefined
+def test_duplicate_cmd_j(tmp_path):
+    __test_duplicate_cmd(tmp_path, ['-j2'])
+
+
+# no error as inline suppressions are handled separately
+def __test_duplicate_file(tmp_path, extra_args):
+    suppr_file =  tmp_path / 'suppressions'
+    with open(suppr_file, 'wt') as f:
+        f.write('unreadVariable')
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=all',
+        '--inline-suppr',
+        '--suppressions-list={}'.format(suppr_file),
+        'proj-inline-suppress/4.c'
+    ]
+
+    args = args + extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    # this is the suppression provided via the suppression file which is unused because only the inline suppression is being matched
+    assert lines == [
+        'nofile:0:0: information: Unmatched suppression: unreadVariable [unmatchedSuppression]'
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+@pytest.mark.skip  # TODO: behavior of duplicate suppressions across inline and non-inline is currently undefined
+def test_duplicate_file(tmpdir):
+    __test_duplicate_file(tmpdir, ['-j1'])
+
+
+@pytest.mark.skip  # TODO: behavior of duplicate suppressions across inline and non-inline is currently undefined
+def test_duplicate_file_j(tmpdir):
+    __test_duplicate_file(tmpdir, ['-j2'])
+
+
+# reporting of inline unusedFunction is deferred
+def __test_unused_function_unmatched(tmpdir, extra_args):
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=all',
+        '--inline-suppr',
+        'proj-inline-suppress/unusedFunctionUnmatched.cpp'
+    ]
+
+    args += extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    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)
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_unused_function_unmatched(tmpdir):
+    __test_unused_function_unmatched(tmpdir, ['-j1', '--no-cppcheck-build-dir'])
+
+
+@pytest.mark.xfail(strict=True)  # TODO: check error - do not work with -j2
+def test_unused_function_unmatched_j(tmpdir):
+    __test_unused_function_unmatched(tmpdir, ['-j2', '--no-cppcheck-build-dir'])
+
+
+def test_unused_function_unmatched_builddir(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_function_unmatched(tmpdir, ['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
+
+
+def test_unused_function_unmatched_builddir_j_thread(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_function_unmatched(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_unused_function_unmatched_builddir_j_process(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_function_unmatched(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=process'])
+
+
+# do not report unmatched unusedFunction inline suppressions when unusedFunction check is disabled
+def test_unused_function_disabled_unmatched():
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=warning,information',
+        '--inline-suppr',
+        'proj-inline-suppress/unusedFunctionUnmatched.cpp'
+    ]
+
+    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)
+    ]
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_unmatched_cfg():
+    # make sure we do not report unmatched inline suppressions from inactive code blocks
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=warning,information',
+        '--inline-suppr',
+        'proj-inline-suppress/cfg.c'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert stderr.splitlines() == [
+        '{}cfg.c:5:0: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
+        '{}cfg.c:9:0: 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:0: 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:0: 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:0: 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..cab96a7f6bb
--- /dev/null
+++ b/test/cli/lookup_test.py
@@ -0,0 +1,1002 @@
+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.cfg'",
+        "looking for library '{}/config/gnu.cfg'".format(exepath),
+        "looking for library '{}/cfg/config/gnu.cfg'".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_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.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'."
+    ]
+
+
+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)
+    ]
+
+
+@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
+    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)
+    ]
+
+
+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)
+    ]
+
+
+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'
+    ]
+
+
+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
+    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),  # TODO: mixed separators
+        '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
+    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'
+    ]
+
+
+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'
+    ]
+
+
+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
+    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),  # TODO: mixed separators
+        'Did not find addon addon/misra.py'
+    ]
+
+
+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
+    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),  # TODO: mixed separators
+        '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)
+    ]
+
+
+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
+    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)
+    ]
+
+
+# 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
new file mode 100644
index 00000000000..03dc00ed0f3
--- /dev/null
+++ b/test/cli/more-projects_test.py
@@ -0,0 +1,1099 @@
+# python -m pytest test-more-projects.py
+import json
+import os
+import pytest
+import sys
+from testutils import cppcheck, assert_cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+def test_project_force_U(tmpdir):
+    # 10018
+    # -U does not work with compile_commands.json
+    with open(os.path.join(tmpdir, 'bug1.cpp'), 'wt') as f:
+        f.write("""
+                int x = 123 / 0;
+                #ifdef MACRO1
+                int y = 1000 / 0;
+                #endif
+                """)
+
+    compile_commands = os.path.join(tmpdir, 'compile_commands.json')
+
+    compilation_db = [
+        {"directory": str(tmpdir),
+         "command": "c++ -o bug1.o -c bug1.cpp",
+         "file": "bug1.cpp",
+         "output": "bug1.o"}
+    ]
+
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    # Without -U => both bugs are found
+    ret, stdout, stderr = cppcheck(['--project=' + compile_commands, '--force', '-rp=' + str(tmpdir), '--template=cppcheck1'])
+    assert ret == 0, stdout
+    assert (stderr == '[bug1.cpp:2]: (error) Division by zero.\n'
+                      '[bug1.cpp:4]: (error) Division by zero.\n')
+
+    # With -U => only first bug is found
+    ret, stdout, stderr = cppcheck(['--project=' + compile_commands, '--force', '-UMACRO1', '-rp=' + str(tmpdir), '--template=cppcheck1'])
+    assert ret == 0, stdout
+    assert stderr == '[bug1.cpp:2]: (error) Division by zero.\n'
+
+
+def __write_cppcheck_project_file(tmpdir, platform=None, importproject=None):
+    project_file = os.path.join(tmpdir, 'Project.cppcheck')
+
+    if platform is not None:
+        platform = '<platform>{}</platform>'.format(platform)
+    if importproject is not None:
+        platform = '<importproject>{}</importproject>'.format(importproject)
+
+    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(platform, importproject)
+        )
+
+    return project_file
+
+
+def test_project_custom_platform(tmpdir):
+    """
+    import cppcheck project that contains a custom platform file
+    """
+    project_file = __write_cppcheck_project_file(tmpdir, platform='p1.xml')
+
+    with open(os.path.join(tmpdir, 'p1.xml'), 'wt') as f:
+        f.write('<?xml version="1.0"?>\n<platform/>')
+
+    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
+        f.write("int x;")
+
+    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1', '-q'])
+    assert ret == 0, stdout
+    assert stdout == ''
+    assert stderr == ''
+
+
+def test_project_empty_platform(tmpdir):
+    """
+    import cppcheck project that contains an empty platform type
+    """
+    project_file = __write_cppcheck_project_file(tmpdir, platform='')
+
+    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
+        f.write("int x;")
+
+    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1', '-q'])
+    assert ret == 0, stdout
+    assert stdout == ''
+    assert stderr == ''
+
+
+def test_project_unspecified_platform(tmpdir):
+    """
+    import cppcheck project that contains the deprecated platform type "Unspecified"
+    """
+    project_file = __write_cppcheck_project_file(tmpdir, platform='Unspecified')
+
+    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
+        f.write("int x;")
+
+    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1', '-q'])
+    assert ret == 1, stdout
+    assert stdout == "cppcheck: error: unrecognized platform: 'Unspecified'.\n"
+    assert stderr == ''
+
+
+def test_project_unknown_platform(tmpdir):
+    """
+    import cppcheck project that contains an unknown platform type
+    """
+    project_file = __write_cppcheck_project_file(tmpdir, platform='dummy')
+
+    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
+        f.write("int x;")
+
+    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1'])
+    assert ret == 1, stdout
+    assert stdout == "cppcheck: error: unrecognized platform: 'dummy'.\n"
+    assert stderr == ''
+
+
+def test_project_empty_fields(tmpdir):
+    """
+    import cppcheck project that contains all empty fields - make sure there are no crashes
+    """
+    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">
+  <root/>
+  <builddir/>
+  <includedir/>
+  <includedir>
+    <dir/>
+  </includedir>
+  <defines/>
+  <defines>
+    <define/>
+  </defines>
+  <undefines/>
+  <undefines>
+    <undefine/>
+  </undefines>
+  <importproject/>
+  <paths/>
+  <paths>
+    <dir/>
+  </paths>
+  <exclude/>
+  <exclude>
+    <path/>
+  </exclude>
+  <function-contracts/>
+  <variable-contracts/>
+  <ignore/>
+  <ignore>
+    <path/>
+  </ignore>
+  <libraries/>
+  <libraries>
+    <library/>
+  </libraries>
+  <suppressions/>
+  <suppressions>
+    <suppression/>
+  </suppressions>
+  <vs-configurations/>
+  <vs-configurations>
+    <config/>
+  </vs-configurations>
+  <platform/>
+  <analyze-all-vs-configs/>
+  <parser/>
+  <addons/>
+  <addons>
+    <addon/>
+  </addons>
+  <tags/>
+  <tools/>
+  <tools>
+    <tool/>
+  </tools>
+  <check-headers/>
+  <check-unused-templates/>
+  <max-ctu-depth/>
+  <max-template-recursion/>
+  <check-unknown-function-return-values/>
+  <safe-checks/>
+  <safe-checks>
+    <class-public/>
+    <external-functions/>
+    <internal-functions/>
+    <external-variables/>
+  </safe-checks>
+  <tag-warnings/>
+  <bug-hunting/>
+  <cert-c-int-precision/>
+  <coding-standards/>
+  <coding-standards>
+    <coding-standard/>
+  </coding-standards>
+</project>""")
+
+    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1'])
+    assert ret == 1, stdout # do not crash
+    assert stdout == 'cppcheck: error: no C or C++ source files found.\n'
+    assert stderr == ''
+
+
+def test_project_missing_subproject(tmpdir):
+    """
+    import cppcheck project that contains an unknown platform type
+    """
+    project_file = __write_cppcheck_project_file(tmpdir, importproject='dummy.json')
+
+    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1'])
+    assert ret == 1, stdout
+    assert stdout == "cppcheck: error: failed to open project '{}/dummy.json'. The file does not exist.\n".format(str(tmpdir).replace('\\', '/'))
+    assert stderr == ''
+
+
+def test_project_std(tmpdir):
+    with open(os.path.join(tmpdir, 'bug1.cpp'), 'wt') as f:
+        f.write("""
+                #if __cplusplus == 201402L
+                int x = 123 / 0;
+                #endif
+                """)
+
+    compile_commands = os.path.join(tmpdir, 'compile_commands.json')
+
+    compilation_db = [
+        {
+            "directory": str(tmpdir),
+            "command": "c++ -o bug1.o -c bug1.cpp -std=c++14",
+            "file": "bug1.cpp",
+            "output": "bug1.o"
+        }
+    ]
+
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    ret, stdout, stderr = cppcheck(['--project=' + compile_commands, '--enable=all', '-rp=' + str(tmpdir), '--template=cppcheck1'])
+    assert ret == 0, stdout
+    assert (stderr == '[bug1.cpp:3]: (error) Division by zero.\n')
+
+
+
+@pytest.mark.skip() # clang-tidy is not available in all cases
+def test_clang_tidy(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                int main(int argc)
+                {
+                  (void)argc;
+                }
+                """)
+
+    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 version="1">
+  <paths>
+   <dir name="{}"/>
+  </paths>>
+  <tools>
+    <tool>clang-tidy</tool>
+  </tools>
+</project>""".format(test_file))
+
+    args = ['--project={}'.format(project_file)]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    lines = stdout.splitlines()
+    # TODO: should detect clang-tidy issue
+    assert len(lines) == 1
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == ''
+
+
+@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
+
+    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="{}"/>
+    </paths>
+</project>""".format(test_file))
+
+    args = file_filter + ['--project={}'.format(project_file)]
+    out_lines = [
+        'Checking {} ...'.format(test_file)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+@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
+    test_file_2 = os.path.join(tmpdir, 'test.c')
+    with open(test_file_2, '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_1, test_file_2))
+
+    args = file_filter + ['--project={}'.format(project_file)]
+    out_lines = [
+        'Checking {} ...'.format(test_file_1)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+@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
+    test_file_2 = os.path.join(tmpdir, 'test.c')
+    with open(test_file_2, '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_1, test_file_2))
+
+    args = file_filter + ['--project={}'.format(project_file)]
+    out_lines = [
+        'Checking {} ...'.format(test_file_2)
+    ]
+
+    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:
+        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="{}"/>
+    </paths>
+</project>""".format(test_file))
+
+    args = ['--file-filter=*.c', '--project={}'.format(project_file)]
+    out_lines = [
+        'cppcheck: error: could not find any files matching the filter:*.c'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_project_file_order(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+    test_file_b = os.path.join(tmpdir, 'b.c')
+    with open(test_file_b, 'wt'):
+        pass
+    test_file_c = os.path.join(tmpdir, 'c.c')
+    with open(test_file_c, 'wt'):
+        pass
+    test_file_d = os.path.join(tmpdir, 'd.c')
+    with open(test_file_d, 'wt'):
+        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="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+    </paths>
+</project>""".format(test_file_c, test_file_d, test_file_b, test_file_a))
+
+    args = ['--project={}'.format(project_file), '-j1']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file_c),
+        '1/4 files checked 25% done',
+        'Checking {} ...'.format(test_file_d),
+        '2/4 files checked 50% done',
+        'Checking {} ...'.format(test_file_b),
+        '3/4 files checked 75% done',
+        'Checking {} ...'.format(test_file_a),
+        '4/4 files checked 100% done'
+    ]
+    assert stderr == ''
+
+
+def test_project_file_duplicate(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        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="{}"/>
+        <dir name="{}"/>
+    </paths>
+</project>""".format(test_file_a, test_file_a, tmpdir))
+
+    args = ['--project={}'.format(project_file)]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file_a)
+    ]
+    assert stderr == ''
+
+
+def test_project_file_duplicate_2(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+    test_file_b = os.path.join(tmpdir, 'b.c')
+    with open(test_file_b, 'wt'):
+        pass
+    test_file_c = os.path.join(tmpdir, 'c.c')
+    with open(test_file_c, 'wt'):
+        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="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+    </paths>
+</project>""".format(test_file_c, test_file_a, test_file_b, tmpdir, test_file_b, test_file_c, test_file_a, tmpdir))
+
+    args = ['--project={}'.format(project_file), '-j1']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file_c),
+        '1/3 files checked 33% done',
+        'Checking {} ...'.format(test_file_a),
+        '2/3 files checked 66% done',
+        'Checking {} ...'.format(test_file_b),
+        '3/3 files checked 100% done'
+    ]
+    assert stderr == ''
+
+
+def test_project_file_duplicate_3(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+
+    # multiple ways to specify the same file
+    in_file_a = 'a.c'
+    in_file_b = os.path.join('.', 'a.c')
+    in_file_c = os.path.join('dummy', '..', 'a.c')
+    in_file_d = os.path.join(tmpdir, 'a.c')
+    in_file_e = os.path.join(tmpdir, '.', 'a.c')
+    in_file_f = os.path.join(tmpdir, 'dummy', '..', 'a.c')
+
+    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="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+    </paths>
+</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 33% done',
+            'Checking {} ...'.format(test_file_a),
+            '2/3 files checked 66% done',
+            'Checking {} ...'.format(test_file_a),
+            '3/3 files checked 100% done'
+        ]
+    else:
+        assert lines == [
+            'Checking {} ...'.format(test_file_a),
+            '1/2 files checked 50% done',
+            'Checking {} ...'.format(test_file_a),
+            '2/2 files checked 100% done'
+        ]
+    assert stderr == ''
+
+
+@pytest.mark.skipif(sys.platform != 'win32', reason="requires Windows")
+def test_project_file_duplicate_4(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+
+    # multiple ways to specify the same file
+    in_file_a = 'a.c'
+    in_file_b = os.path.join('.', 'a.c')
+    in_file_c = os.path.join('dummy', '..', 'a.c')
+    in_file_d = os.path.join(tmpdir, 'a.c')
+    in_file_e = os.path.join(tmpdir, '.', 'a.c')
+    in_file_f = os.path.join(tmpdir, 'dummy', '..', 'a.c')
+
+    args1 = [in_file_a, in_file_b, in_file_c, in_file_d, in_file_e, in_file_f, str(tmpdir)]
+    args2 = []
+    for a in args1:
+        args2.append(a.replace('\\', '/'))
+
+    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="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+        <dir name="{}"/>
+    </paths>
+</project>""".format(in_file_a, in_file_b, in_file_c, in_file_d, in_file_e, in_file_f, 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 33% done',
+        'Checking {} ...'.format(test_file_a),
+        '2/3 files checked 66% done',
+        'Checking {} ...'.format(test_file_a),
+        '3/3 files checked 100% done'
+    ]
+    assert stderr == ''
+
+def test_project_file_ignore(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, '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="{}"/>
+    </paths>
+</project>""".format(test_file))
+
+    args = ['-itest.cpp', '--project={}'.format(project_file)]
+    out_lines = [
+        'cppcheck: error: could not find or open any of the paths given.',
+        'cppcheck: Maybe all paths were ignored?'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_project_file_ignore_2(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, '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="{}"/>
+    </paths>
+    <exclude>
+        <path name="test.cpp"/>
+    </exclude>
+</project>""".format(test_file))
+
+    args = ['--project={}'.format(project_file)]
+    out_lines = [
+        'cppcheck: error: could not find or open any of the paths given.',
+        'cppcheck: Maybe all paths were ignored?'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_project_file_ignore_3(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, '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="{}"/>
+    </paths>
+    <ignore>
+        <path name="test.cpp"/>
+    </ignore>
+</project>""".format(test_file))
+
+    args = ['--project={}'.format(project_file)]
+    out_lines = [
+        'cppcheck: error: could not find or open any of the paths given.',
+        'cppcheck: Maybe all paths were ignored?'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_json_file_ignore(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        pass
+
+    compilation_db = [
+        {"directory": str(tmpdir),
+         "command": "c++ -o bug1.o -c bug1.cpp",
+         "file": "test.cpp",
+         "output": "test.o"}
+    ]
+
+    project_file = os.path.join(tmpdir, 'test.json')
+    with open(project_file, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    args = ['-itest.cpp', '--project={}'.format(project_file)]
+    out_lines = [
+        'cppcheck: error: no C or C++ source files found.',
+        'cppcheck: all paths were ignored'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_json_file_ignore_2(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        pass
+
+    compilation_db = [
+        {"directory": str(tmpdir),
+         "command": "c++ -o bug1.o -c bug1.cpp",
+         "file": "test.cpp",
+         "output": "test.o"}
+    ]
+
+    project_file = os.path.join(tmpdir, 'test.json')
+    with open(project_file, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    args = ['-i{}'.format(test_file), '--project={}'.format(project_file)]
+    out_lines = [
+        'cppcheck: error: no C or C++ source files found.',
+        'cppcheck: all paths were ignored'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+@pytest.mark.xfail(strict=True)
+def test_project_D(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+#ifndef __GNUC__
+#error "requirement not met"
+#endif
+                """)
+
+    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 version="1">
+  <paths>
+   <dir name="{}"/>
+  </paths>
+</project>
+            """.format(test_file))
+
+    args = [
+        '--project=' + project_file,
+        '--template=simple',
+    ]
+    arg_D = ['-D__GNUC__']
+
+    out_expected = [
+        'Checking {} ...'.format(test_file),
+        'Checking {}: __GNUC__=1...'.format(test_file)
+    ]
+
+    args1 = args + arg_D
+    ret, stdout, stderr = cppcheck(args1)
+    assert stdout.splitlines() == out_expected
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+    # TODO: -D__GNUC__ is lost
+    args2 = arg_D + args
+    ret, stdout, stderr = cppcheck(args2)
+    assert stdout.splitlines() == out_expected
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_compdb_D(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+#ifndef __GNUC__
+#error "requirement not met"
+#endif
+                """)
+
+    compile_commands = os.path.join(tmpdir, 'compile_commands.json')
+    compilation_db = [
+        {"directory": str(tmpdir),
+         "command": "c++ -o test.o -c test.cpp",
+         "file": "test.cpp",
+         "output": "test.o"}
+    ]
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(compilation_db))
+
+    args = [
+        '--project=' + compile_commands,
+        '--template=simple',
+        ]
+    arg_D = ['-D__GNUC__']
+
+    out_expected = [
+        'Checking {} ...'.format(test_file),
+        'Checking {}: __GNUC__=1;...'.format(test_file)  # TODO: get rid of extra ;
+    ]
+
+    args1 = args + arg_D
+    ret, stdout, stderr = cppcheck(args1)
+    assert stdout.splitlines() == out_expected
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+    args2 = arg_D + args
+    ret, stdout, stderr = cppcheck(args2)
+    assert stdout.splitlines() == out_expected
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_shared_items_project():
+    solution_file = os.path.join('shared-items-project', 'Solution.sln')
+
+    args = [
+        '--platform=win64',
+        '--project={}'.format(solution_file),
+        '--project-configuration=Release|x64'
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert exitcode == 0
+
+    # Assume no errors, and that shared items code files have been checked as well
+    assert '2/2 files checked ' in stdout  # only perform partial check since -j2 does not report a percentage right now
+    assert stderr == ''
+
+
+def test_project_file_nested(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt'):
+        pass
+
+    level3_file = tmp_path / 'level3.cppcheck'
+    with open(level3_file, 'wt') as f:
+        f.write(
+"""<project>
+    <paths>
+        <dir name="{}"/>
+    </paths>
+</project>""".format(test_file))
+
+    level2_file = tmp_path / 'level2.cppcheck'
+    with open(level2_file, 'wt') as f:
+        f.write(
+"""<project>
+    <importproject>level3.cppcheck</importproject>
+</project>""")
+
+    level1_file = tmp_path / 'level1.cppcheck'
+    with open(level1_file, 'wt') as f:
+        f.write(
+"""<project>
+    <importproject>level2.cppcheck</importproject>
+</project>""")
+
+    args = ['--project={}'.format(level1_file)]
+    out_lines = [
+        'cppcheck: error: nested Cppcheck GUI projects are not supported.'
+    ]
+
+    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
new file mode 100644
index 00000000000..c4ae2fab5cf
--- /dev/null
+++ b/test/cli/other_test.py
@@ -0,0 +1,4121 @@
+
+# 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, __lookup_cppcheck_exe
+from xml.etree import ElementTree
+
+
+def __remove_verbose_log(l : list):
+    l.remove('Defines:')
+    l.remove('Undefines:')
+    l.remove('Includes:')
+    l.remove('Platform:native')
+    return l
+
+
+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"
+""")
+
+    args = ['--enable=missingInclude', '--template=simple', test_file]
+
+    _, _, stderr = cppcheck(args)
+    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):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                #include "test.h"
+                """)
+
+    # TODO: -rp is not working requiring the full path in the assert
+    args = '--check-config -rp={} {}'.format(tmpdir, test_file)
+    if use_j:
+        args = '-j2 ' + args
+
+    _, _, stderr = cppcheck(args.split())
+    assert stderr == '' # --check-config no longer reports the missing includes
+
+
+def test_missing_include_check_config(tmpdir):
+    __test_missing_include_check_config(tmpdir, False)
+
+
+def test_missing_include_check_config_j(tmpdir):
+    __test_missing_include_check_config(tmpdir, True)
+
+
+def test_missing_include_inline_suppr(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                // cppcheck-suppress missingInclude
+                #include "missing.h"
+                // cppcheck-suppress missingIncludeSystem
+                #include <missing2.h>
+                """)
+
+    args = ['--enable=missingInclude', '--inline-suppr', test_file]
+
+    _, _, stderr = cppcheck(args)
+    assert stderr == ''
+
+
+def test_preprocessor_error(tmpdir):
+    test_file = os.path.join(tmpdir, '10866.c')
+    with open(test_file, 'wt') as f:
+        f.write('#error test\nx=1;\n')
+    exitcode, _, stderr = cppcheck(['--error-exitcode=1', test_file])
+    assert 'preprocessorErrorDirective' in stderr
+    assert exitcode != 0
+
+
+__ANSI_BOLD = "\x1b[1m"
+__ANSI_FG_RED = "\x1b[31m"
+__ANSI_FG_DEFAULT = "\x1b[39m"
+__ANSI_FG_RESET = "\x1b[0m"
+
+
+@pytest.mark.parametrize("env,color_expected", [({"CLICOLOR_FORCE":"1"}, True), ({"NO_COLOR": "1", "CLICOLOR_FORCE":"1"}, False)])
+def test_color_non_tty(tmpdir, env, color_expected):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('#error test\nx=1;\n')
+    exitcode, stdout, stderr = cppcheck([test_file], env=env)
+
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stderr
+    assert (__ANSI_BOLD in stderr) == color_expected
+    assert (__ANSI_FG_RED in stderr) == color_expected
+    assert (__ANSI_FG_DEFAULT in stderr) == color_expected
+    assert (__ANSI_FG_RESET in stderr) == color_expected
+
+
+@pytest.mark.skipif(sys.platform == "win32", reason="TTY not supported in Windows")
+@pytest.mark.parametrize("env,color_expected", [({}, True), ({"NO_COLOR": "1"}, False)])
+def test_color_tty(tmpdir, env, color_expected):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('#error test\nx=1;\n')
+    exitcode, stdout, stderr = cppcheck([test_file], env=env, tty=True)
+
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stderr
+    assert (__ANSI_BOLD in stderr) == color_expected
+    assert (__ANSI_FG_RED in stderr) == color_expected
+    assert (__ANSI_FG_DEFAULT in stderr) == color_expected
+    assert (__ANSI_FG_RESET in stderr) == color_expected
+
+
+def test_invalid_library(tmpdir):
+    args = ['--library=none', '--library=posix', '--library=none2', 'file.c']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1
+    assert (stdout == "cppcheck: Failed to load library configuration file 'none'. File not found\n"
+                      "cppcheck: Failed to load library configuration file 'none2'. File not found\n")
+    assert stderr == ""
+
+
+def test_message_j(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write("")
+
+    args = ['-j2', test_file]
+
+    _, stdout, _ = cppcheck(args)
+    assert stdout == "Checking {} ...\n".format(test_file) # we were adding stray \0 characters at the end
+
+# TODO: test missing std.cfg
+
+
+def test_progress(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                int main(int argc)
+                {
+                }
+                """)
+
+    args = ['--report-progress=0', '--enable=all', '--inconclusive', '-j1', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    pos = stdout.find('\n')
+    assert(pos != -1)
+    pos += 1
+    assert stdout[:pos] == "Checking {} ...\n".format(test_file)
+    assert (stdout[pos:] ==
+            "progress: Tokenize (typedef) 0%\n"
+            "progress: Tokenize (typedef) 12%\n"
+            "progress: Tokenize (typedef) 25%\n"
+            "progress: Tokenize (typedef) 37%\n"
+            "progress: Tokenize (typedef) 50%\n"
+            "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"
+            )
+    assert stderr == ""
+
+
+def test_progress_j(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                int main(int argc)
+                {
+                }
+                """)
+
+    args = ['--report-progress=0', '--enable=all', '--inconclusive', '-j2', '--disable=unusedFunction', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stdout == "Checking {} ...\n".format(test_file)
+    assert stderr == ""
+
+
+def test_execute_addon_failure_py_auto(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                void f();
+                """)
+
+    args = ['--addon=naming', test_file]
+
+    # provide empty PATH environment variable so python is not found and execution of addon fails
+    env = {'PATH': ''}
+    _, _, stderr = cppcheck(args, env)
+    assert stderr == '{}:0:0: error: Bailing out from analysis: Checking file failed: Failed to auto detect python [internalError]\n\n^\n'.format(test_file)
+
+
+def test_execute_addon_failure_py_notexist(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                void f();
+                """)
+
+    # specify non-existent python executable so execution of addon fails
+    args = ['--addon=naming', '--addon-python=python5.x', test_file]
+
+    _, _, stderr = cppcheck(args)
+    ec = 1 if os.name == 'nt' else 127
+    assert stderr == "{}:0:0: error: Bailing out from analysis: Checking file failed: Failed to execute addon 'naming' - exitcode is {} [internalError]\n\n^\n".format(test_file, ec)
+
+
+def test_execute_addon_failure_json_notexist(tmpdir):
+    # specify non-existent python executable so execution of addon fails
+    addon_json = os.path.join(tmpdir, 'addon.json')
+    with open(addon_json, 'wt') as f:
+        f.write(json.dumps({'executable': 'notexist'}))
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                void f();
+                """)
+
+    args = [
+        '--addon={}'.format(addon_json),
+        test_file
+    ]
+
+    _, _, stderr = cppcheck(args)
+    ec = 1 if os.name == 'nt' else 127
+    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')
+    with open(addon_json, 'wt') as f:
+        f.write(json.dumps({
+            'executable': 'notexist',
+            'ctu': True
+        }))
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                void f(); """)
+
+    args = [
+        '--template=simple',
+        '--addon={}'.format(addon_json),
+        test_file
+    ]
+
+    _, _, stderr = cppcheck(args)
+    ec = 1 if os.name == 'nt' else 127
+    assert stderr.splitlines() == [
+        "{}:0:0: error: Bailing out from analysis: Checking file failed: Failed to execute addon 'addon.json' - exitcode is {} [internalError]".format(test_file, ec),
+        ":0:0: error: Bailing out from analysis: Whole program analysis failed: Failed to execute addon 'addon.json' - exitcode is {} [internalError]".format(ec)
+    ]
+
+
+def test_execute_addon_file0(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('void foo() {}\n')
+
+    args = ['--xml', '--addon=misra', '--enable=style', test_file]
+
+    _, _, stderr = cppcheck(args)
+    assert 'misra-c2012-8.2' in stderr
+    assert '.dump' not in stderr
+
+
+# TODO: find a test case which always fails
+@pytest.mark.skip
+def test_internal_error(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+#include <cstdio>
+
+void f() {
+    double gc = 3333.3333;
+    char stat[80];
+    sprintf(stat,"'%2.1f'",gc);
+}
+                """)
+
+    args = [test_file]
+
+    _, _, stderr = cppcheck(args)
+    assert stderr == '{}:0:0: error: Bailing from out analysis: Checking file failed: converting \'1f\' to integer failed - not an integer [internalError]\n\n^\n'.format(test_file)
+
+
+def test_addon_ctu_exitcode(tmpdir):
+    """ #12440 - Misra ctu violations found => exit code should be non-zero """
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write("""typedef enum { BLOCK =  0x80U, } E;""")
+    args = ['--addon=misra', '--enable=style', '--error-exitcode=1', test_file]
+    exitcode, _, stderr = cppcheck(args)
+    assert '2.3' in stderr, stderr
+    assert exitcode == 1
+
+
+# TODO: test with -j2
+def test_addon_misra(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+typedef int MISRA_5_6_VIOLATION;
+        """)
+
+    args = ['--addon=misra', '--enable=all', '--disable=unusedFunction', '-j1', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    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)
+
+
+def test_addon_y2038(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    # TODO: trigger warning
+    with open(test_file, 'wt') as f:
+        f.write("""
+extern void f()
+{
+    time_t t = std::time(nullptr);
+    (void)t;
+}
+        """)
+
+    args = ['--addon=y2038', '--enable=all', '--disable=unusedFunction', '--template=simple', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == '{}:4:21: warning: time is Y2038-unsafe [y2038-unsafe-call]\n'.format(test_file)
+
+
+def test_addon_threadsafety(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+extern const char* f()
+{
+    return strerror(1);
+}
+        """)
+
+    args = ['--addon=threadsafety', '--enable=all', '--disable=unusedFunction', '--template=simple', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == '{}:4:12: warning: strerror is MT-unsafe [threadsafety-unsafe-call]\n'.format(test_file)
+
+
+def test_addon_naming(tmpdir):
+    # the addon does nothing without a config
+    addon_file = os.path.join(tmpdir, 'naming1.json')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+{
+    "script": "addons/naming.py",
+    "args": [
+        "--var=[_a-z].*"
+    ]
+}
+                """)
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+int Var;
+        """)
+
+    args = ['--addon={}'.format(addon_file), '--enable=all', '--disable=unusedFunction', '--template=simple', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == '{}:2:1: style: Variable Var violates naming convention [naming-varname]\n'.format(test_file)
+
+
+def test_addon_namingng(tmpdir):
+    addon_file = os.path.join(tmpdir, 'namingng.json')
+    addon_config_file = os.path.join(tmpdir, 'namingng.config.json')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+{
+    "script": "addons/namingng.py",
+    "args": [
+        "--configfile=%s"
+    ]
+}
+                """%(addon_config_file).replace('\\','\\\\'))
+
+    with open(addon_config_file, 'wt') as f:
+        f.write("""
+{
+    "RE_FILE": [
+        "[^/]*[a-z][a-z0-9_]*[a-z0-9]\\.c\\Z"
+    ],
+    "RE_CLASS_NAME": ["[a-z][a-z0-9_]*[a-z0-9]\\Z"],
+    "RE_NAMESPACE": ["[a-z][a-z0-9_]*[a-z0-9]\\Z"],
+    "RE_VARNAME": ["[a-z][a-z0-9_]*[a-z0-9]\\Z"],
+    "RE_PUBLIC_MEMBER_VARIABLE": ["[a-z][a-z0-9_]*[a-z0-9]\\Z"],
+    "RE_PRIVATE_MEMBER_VARIABLE": {
+        ".*_tmp\\Z":[true,"illegal suffix _tmp"],
+        "priv_.*\\Z":[false,"required prefix priv_ missing"]
+    },
+    "RE_GLOBAL_VARNAME": ["[a-z][a-z0-9_]*[a-z0-9]\\Z"],
+    "RE_FUNCTIONNAME": ["[a-z][a-z0-9_]*[a-z0-9]\\Z"],
+    "include_guard": {
+        "input": "basename",
+        "prefix": "_",
+        "suffix": "",
+        "case": "upper",
+        "max_linenr": 5,
+        "RE_HEADERFILE": ".*\\.h\\Z",
+        "required": true
+    },
+    "var_prefixes": {"uint32_t": "ui32"},
+    "function_prefixes": {"uint16_t": "ui16",
+                          "uint32_t": "ui32"},
+    "skip_one_char_variables": false
+}
+                """.replace('\\','\\\\'))
+
+    test_unguarded_include_file_basename = 'test_unguarded.h'
+    test_unguarded_include_file = os.path.join(tmpdir, test_unguarded_include_file_basename)
+    with open(test_unguarded_include_file, 'wt') as f:
+        f.write("""
+void InvalidFunctionUnguarded();
+""")
+
+    test_include_file_basename = '_test.h'
+    test_include_file = os.path.join(tmpdir, test_include_file_basename)
+    with open(test_include_file, 'wt') as f:
+        f.write("""
+#ifndef TEST_H
+#define TEST_H
+
+void InvalidFunction();
+extern int _invalid_extern_global;
+
+#include "{}"
+
+#endif
+""".format(test_unguarded_include_file))
+
+    test_file_basename = 'test_.cpp'
+    test_file = os.path.join(tmpdir, test_file_basename)
+    with open(test_file, 'wt') as f:
+        f.write("""
+#include "%s"
+
+void invalid_function_();
+void _invalid_function();
+void valid_function1();
+void valid_function2(int _invalid_arg);
+void valid_function3(int invalid_arg_);
+void valid_function4(int valid_arg32);
+void valid_function5(uint32_t invalid_arg32);
+void valid_function6(uint32_t ui32_valid_arg);
+uint16_t invalid_function7(int valid_arg);
+uint16_t ui16_valid_function8(int valid_arg);
+
+int _invalid_global;
+static int _invalid_static_global;
+
+class _clz {
+public:
+    _clz() : _invalid_public(0), _invalid_private(0), priv_good(0), priv_bad_tmp(0) { }
+    int _invalid_public;
+private:
+    char _invalid_private;
+    int priv_good;
+    int priv_bad_tmp;
+};
+
+namespace _invalid_namespace { }
+        """%(test_include_file_basename))
+
+    args = ['--addon='+addon_file, '--verbose', '--enable=all', '--disable=unusedFunction', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = __remove_verbose_log(stdout.splitlines())
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    lines = [line for line in stderr.splitlines() if line != '']
+    expect = [
+        '{}:0:0: style: File name {} violates naming convention [namingng-namingConvention]'.format(test_include_file,test_include_file_basename),
+        '^',
+        '{}:2:9: style: include guard naming violation; TEST_H != _TEST_H [namingng-includeGuardName]'.format(test_include_file),
+        '#ifndef TEST_H',
+        '        ^',
+        '{}:5:6: style: Function InvalidFunction violates naming convention [namingng-namingConvention]'.format(test_include_file),
+        'void InvalidFunction();',
+        '     ^',
+        '{}:6:12: style: Global variable _invalid_extern_global violates naming convention [namingng-namingConvention]'.format(test_include_file),
+        'extern int _invalid_extern_global;',
+        '           ^',
+
+        '{}:0:0: style: File name {} violates naming convention [namingng-namingConvention]'.format(test_unguarded_include_file,test_unguarded_include_file_basename),
+        '^',
+        '{}:0:0: style: Missing include guard [namingng-includeGuardMissing]'.format(test_unguarded_include_file),
+        '^',
+        '{}:2:6: style: Function InvalidFunctionUnguarded violates naming convention [namingng-namingConvention]'.format(test_unguarded_include_file),
+        'void InvalidFunctionUnguarded();',
+        '     ^',
+
+        '{}:0:0: style: File name {} violates naming convention [namingng-namingConvention]'.format(test_file,test_file_basename),
+        '^',
+        '{}:7:26: style: Variable _invalid_arg violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void valid_function2(int _invalid_arg);',
+        '                         ^',
+        '{}:8:26: style: Variable invalid_arg_ violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void valid_function3(int invalid_arg_);',
+        '                         ^',
+        '{}:10:31: style: Variable invalid_arg32 violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void valid_function5(uint32_t invalid_arg32);',
+        '                              ^',
+        '{}:4:6: style: Function invalid_function_ violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void invalid_function_();',
+        '     ^',
+        '{}:5:6: style: Function _invalid_function violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void _invalid_function();',
+        '     ^',
+        '{}:12:10: style: Function invalid_function7 violates naming convention [namingng-namingConvention]'.format(test_file),
+        'uint16_t invalid_function7(int valid_arg);',
+        '         ^',
+        '{}:15:5: style: Global variable _invalid_global violates naming convention [namingng-namingConvention]'.format(test_file),
+        'int _invalid_global;',
+        '    ^',
+        '{}:16:12: style: Global variable _invalid_static_global violates naming convention [namingng-namingConvention]'.format(test_file),
+        'static int _invalid_static_global;',
+        '           ^',
+        '{}:20:5: style: Class Constructor _clz violates naming convention [namingng-namingConvention]'.format(test_file),
+        '    _clz() : _invalid_public(0), _invalid_private(0), priv_good(0), priv_bad_tmp(0) { }',
+        '    ^',
+        '{}:21:9: style: Public member variable _invalid_public violates naming convention [namingng-namingConvention]'.format(test_file),
+        '    int _invalid_public;',
+        '        ^',
+        '{}:23:10: style: Private member variable _invalid_private violates naming convention: required prefix priv_ missing [namingng-namingConvention]'.format(test_file),
+        '    char _invalid_private;',
+        '         ^',
+        '{}:25:9: style: Private member variable priv_bad_tmp violates naming convention: illegal suffix _tmp [namingng-namingConvention]'.format(test_file),
+        '    int priv_bad_tmp;',
+        '        ^',
+        '{}:28:11: style: Namespace _invalid_namespace violates naming convention [namingng-namingConvention]'.format(test_file),
+        'namespace _invalid_namespace { }',
+        '          ^',
+    ]
+    # test sorted lines; the order of messages may vary and is not of importance
+    lines.sort()
+    expect.sort()
+    assert lines == expect
+
+
+# TODO: test with -j2
+def test_addon_namingng_config(tmpdir):
+    addon_file = os.path.join(tmpdir, 'namingng.json')
+    addon_config_file = os.path.join(tmpdir, 'namingng.config.json')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+{
+    "script": "addons/namingng.py",
+    "args": [
+        "--configfile=%s"
+    ]
+}
+                """%(addon_config_file).replace('\\','\\\\'))
+
+    with open(addon_config_file, 'wt') as f:
+        f.write("""
+{
+    "RE_FILE": "[^/]*[a-z][a-z0-9_]*[a-z0-9]\\.c\\Z",
+    "RE_NAMESPACE": false,
+    "RE_VARNAME": ["+bad pattern","[a-z]_good_pattern\\Z","(parentheses?"],
+    "RE_PRIVATE_MEMBER_VARIABLE": "[a-z][a-z0-9_]*[a-z0-9]\\Z",
+    "RE_PUBLIC_MEMBER_VARIABLE": {
+        "tmp_.*\\Z":[true,"illegal prefix tmp_"],
+        "bad_.*\\Z":true,
+        "public_.*\\Z":[false],
+        "pub_.*\\Z":[0,"required prefix pub_ missing"]
+    },
+    "RE_GLOBAL_VARNAME": "[a-z][a-z0-9_]*[a-z0-9]\\Z",
+    "RE_FUNCTIONNAME": "[a-z][a-z0-9_]*[a-z0-9]\\Z",
+    "RE_CLASS_NAME": "[a-z][a-z0-9_]*[a-z0-9]\\Z",
+    "_comment1": "these should all be arrays, or null, or not set",
+
+    "include_guard": true,
+    "var_prefixes": ["bad"],
+    "function_prefixes": false,
+    "_comment2": "these should all be dict",
+
+    "skip_one_char_variables": "false",
+    "_comment3": "this should be bool",
+
+    "RE_VAR_NAME": "typo"
+}
+                """.replace('\\','\\\\'))
+
+    test_file_basename = 'test.c'
+    test_file = os.path.join(tmpdir, test_file_basename)
+    with open(test_file, 'a'):
+        # only create the file
+        pass
+
+    args = ['--addon='+addon_file, '--verbose', '--enable=all', '-j1', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+
+    lines = __remove_verbose_log(stdout.splitlines())
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    lines = stderr.splitlines()
+    # ignore the first line, stating that the addon failed to run properly
+    lines.pop(0)
+    assert lines == [
+        "Output:",
+        "config error: RE_FILE must be list (not str), or not set",
+        "config error: RE_NAMESPACE must be list or dict (not bool), or not set",
+        "config error: include_guard must be dict (not bool), or not set",
+        "config error: item '+bad pattern' of 'RE_VARNAME' is not a valid regular expression: nothing to repeat at position 0",
+        "config error: item '(parentheses?' of 'RE_VARNAME' is not a valid regular expression: missing ), unterminated subpattern at position 0",
+        "config error: var_prefixes must be dict (not list), or not set",
+        "config error: RE_PRIVATE_MEMBER_VARIABLE must be list or dict (not str), or not set",
+        "config error: item 'bad_.*\\Z' of 'RE_PUBLIC_MEMBER_VARIABLE' must be an array [bool,string]",
+        "config error: item 'public_.*\\Z' of 'RE_PUBLIC_MEMBER_VARIABLE' must be an array [bool,string]",
+        "config error: item 'pub_.*\\Z' of 'RE_PUBLIC_MEMBER_VARIABLE' must be an array [bool,string]",
+        "config error: RE_GLOBAL_VARNAME must be list or dict (not str), or not set",
+        "config error: RE_FUNCTIONNAME must be list or dict (not str), or not set",
+        "config error: function_prefixes must be dict (not bool), or not set",
+        "config error: RE_CLASS_NAME must be list or dict (not str), or not set",
+        "config error: skip_one_char_variables must be bool (not str), or not set",
+        "config error: unknown config key 'RE_VAR_NAME' [internalError]",
+        "",
+        "^",
+    ]
+
+
+def test_addon_findcasts(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+        extern void f(char c)
+        {
+            int i = (int)c;
+            (void)i;
+        }
+        """)
+
+    args = ['--addon=findcasts', '--enable=all', '--disable=unusedFunction', '--template=simple', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == '{}:4:21: information: found a cast [findcasts-cast]\n'.format(test_file)
+
+
+def test_addon_misc(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+extern void f()
+{
+    char char* [] = {"a" "b"}
+}
+        """)
+
+    args = ['--addon=misc', '--enable=all', '--disable=unusedFunction', '--template=simple', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == '{}:4:26: style: String concatenation in array initialization, missing comma? [misc-stringConcatInArrayInit]\n'.format(test_file)
+
+
+def test_invalid_addon_json(tmpdir):
+    addon_file = os.path.join(tmpdir, 'addon1.json')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+                """)
+
+    test_file = os.path.join(tmpdir, 'file.cpp')
+    with open(test_file, 'wt'):
+        pass
+
+    args = ['--addon={}'.format(addon_file), test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1
+    lines = stdout.splitlines()
+    assert lines == [
+        'Loading {} failed. syntax error at line 2 near: '.format(addon_file)
+    ]
+    assert stderr == ''
+
+
+def test_invalid_addon_py(tmpdir):
+    addon_file = os.path.join(tmpdir, 'addon1.py')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+raise Exception()
+                """)
+
+    test_file = os.path.join(tmpdir, 'file.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+typedef int MISRA_5_6_VIOLATION;
+                """)
+
+    args = ['--addon={}'.format(addon_file), '--enable=all', '--disable=unusedFunction', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0  # TODO: needs to be 1
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == "{}:0:0: error: Bailing out from analysis: Checking file failed: Failed to execute addon 'addon1' - exitcode is 1 [internalError]\n\n^\n".format(test_file)
+
+
+# TODO: test with -j2
+def test_invalid_addon_py_verbose(tmpdir):
+    addon_file = os.path.join(tmpdir, 'addon1.py')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+raise Exception()
+                """)
+
+    test_file = os.path.join(tmpdir, 'file.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+typedef int MISRA_5_6_VIOLATION;
+                """)
+
+    args = ['--addon={}'.format(addon_file), '--enable=all', '--disable=unusedFunction', '--verbose', '-j1', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0  # TODO: needs to be 1
+    lines = __remove_verbose_log(stdout.splitlines())
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    """
+/tmp/pytest-of-user/pytest-11/test_invalid_addon_py_20/file.cpp:0:0: error: Bailing out from analysis: Checking file failed: Failed to execute addon 'addon1' - exitcode is 1: python3 /home/user/CLionProjects/cppcheck/addons/runaddon.py /tmp/pytest-of-user/pytest-11/test_invalid_addon_py_20/addon1.py --cli /tmp/pytest-of-user/pytest-11/test_invalid_addon_py_20/file.cpp.24762.dump
+Output:
+Traceback (most recent call last):
+  File "/home/user/CLionProjects/cppcheck/addons/runaddon.py", line 8, in <module>
+    runpy.run_path(addon, run_name='__main__')
+  File "<frozen runpy>", line 291, in run_path
+  File "<frozen runpy>", line 98, in _run_module_code
+  File "<frozen runpy>", line 88, in _run_code
+  File "/tmp/pytest-of-user/pytest-11/test_invalid_addon_py_20/addon1.py", line 2, in <module>
+    raise Exception()
+Exceptio [internalError]
+    """
+    # /tmp/pytest-of-user/pytest-10/test_invalid_addon_py_20/file.cpp:0:0: error: Bailing out from analysis: Checking file failed: Failed to execute addon 'addon1' - exitcode is 256.: python3 /home/user/CLionProjects/cppcheck/addons/runaddon.py /tmp/pytest-of-user/pytest-10/test_invalid_addon_py_20/addon1.py --cli /tmp/pytest-of-user/pytest-10/test_invalid_addon_py_20/file.cpp.24637.dump
+    assert stderr.startswith("{}:0:0: error: Bailing out from analysis: Checking file failed: Failed to execute addon 'addon1' - exitcode is 1: ".format(test_file))
+    assert stderr.count('Output:\nTraceback')
+    assert stderr.endswith('raise Exception()\nException [internalError]\n\n^\n')
+
+
+def test_addon_result(tmpdir):
+    addon_file = os.path.join(tmpdir, 'addon1.py')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+print("Checking ...")
+print("")
+print('{"file": "test.cpp", "linenr": 1, "column": 1, "severity": "style", "message": "msg", "addon": "addon1", "errorId": "id", "extra": ""}')
+print('{"loc": [{"file": "test.cpp", "linenr": 1, "column": 1, "info": ""}], "severity": "style", "message": "msg", "addon": "addon1", "errorId": "id", "extra": ""}')
+                """)
+
+    test_file = os.path.join(tmpdir, 'file.cpp')
+    with open(test_file, 'wt') as f:
+        f.write("""
+typedef int MISRA_5_6_VIOLATION;
+                """)
+
+    args = ['--addon={}'.format(addon_file), '--enable=all', '--disable=unusedFunction', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0  # TODO: needs to be 1
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr == 'test.cpp:1:1: style: msg [addon1-id]\n\n^\n'
+
+
+# TODO: test with -j2
+# #11483
+def __test_unused_function_include(tmpdir, extra_args):
+    test_cpp_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_cpp_file, 'wt') as f:
+        f.write("""
+                #include "test.h"
+                """)
+
+    test_h_file = os.path.join(tmpdir, 'test.h')
+    with open(test_h_file, 'wt') as f:
+        f.write("""
+                class A {
+                public:
+                    void f() {}
+                    // cppcheck-suppress unusedFunction
+                    void f2() {}
+                };
+                """)
+
+    args = [
+        '--enable=unusedFunction',
+        '--inline-suppr',
+        '--template=simple',
+        '-j1',
+        test_cpp_file
+    ]
+
+    args += extra_args
+
+    _, _, stderr = cppcheck(args)
+    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')
+    with open(test_file, 'wt') as f:
+        f.write("""
+                int main(int argc)
+                {
+                }
+                """)
+
+    args = ['--showtime=top5_file', '--quiet', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0  # TODO: needs to be 1
+    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 stderr == ''
+
+
+def test_missing_addon(tmpdir):
+    args = ['--addon=misra3', '--addon=misra', '--addon=misra2', 'file.c']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1
+    lines = stdout.splitlines()
+    lines.sort()
+    assert lines == [
+        'Did not find addon misra2.py',
+        'Did not find addon misra3.py'
+    ]
+    assert stderr == ""
+
+
+def test_file_filter(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt'):
+        pass
+
+    args = ['--file-filter=*.cpp', test_file]
+    out_lines = [
+        'Checking {} ...'.format(test_file)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+def test_file_filter_2(tmpdir):
+    test_file_1 = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file_1, 'wt'):
+        pass
+    test_file_2 = os.path.join(tmpdir, 'test.c')
+    with open(test_file_2, 'wt'):
+        pass
+
+    args = ['--file-filter=*.cpp', test_file_1, test_file_2]
+    out_lines = [
+        'Checking {} ...'.format(test_file_1)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+def test_file_filter_3(tmpdir):
+    test_file_1 = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file_1, 'wt'):
+        pass
+    test_file_2 = os.path.join(tmpdir, 'test.c')
+    with open(test_file_2, 'wt'):
+        pass
+
+    args = ['--file-filter=*.c', test_file_1, test_file_2]
+    out_lines = [
+        'Checking {} ...'.format(test_file_2)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+def test_file_filter_no_match(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt'):
+        pass
+
+    args = ['--file-filter=*.c', test_file]
+    out_lines = [
+        'cppcheck: error: could not find any files matching the filter:*.c'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_file_order(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+    test_file_b = os.path.join(tmpdir, 'b.c')
+    with open(test_file_b, 'wt'):
+        pass
+    test_file_c = os.path.join(tmpdir, 'c.c')
+    with open(test_file_c, 'wt'):
+        pass
+    test_file_d = os.path.join(tmpdir, 'd.c')
+    with open(test_file_d, 'wt'):
+        pass
+
+    args = [test_file_c, test_file_d, test_file_b, test_file_a, '-j1']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file_c),
+        '1/4 files checked 25% done',
+        'Checking {} ...'.format(test_file_d),
+        '2/4 files checked 50% done',
+        'Checking {} ...'.format(test_file_b),
+        '3/4 files checked 75% done',
+        'Checking {} ...'.format(test_file_a),
+        '4/4 files checked 100% done'
+    ]
+    assert stderr == ''
+
+
+def test_markup(tmpdir):
+    test_file_1 = os.path.join(tmpdir, 'test_1.qml')
+    with open(test_file_1, 'wt'):
+        pass
+    test_file_2 = os.path.join(tmpdir, 'test_2.cpp')
+    with open(test_file_2, 'wt'):
+        pass
+    test_file_3 = os.path.join(tmpdir, 'test_3.qml')
+    with open(test_file_3, 'wt'):
+        pass
+    test_file_4 = os.path.join(tmpdir, 'test_4.cpp')
+    with open(test_file_4, 'wt'):
+        pass
+
+    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 25% done',
+        'Checking {} ...'.format(test_file_4),
+        '2/4 files checked 50% done',
+        'Checking {} ...'.format(test_file_1),
+        '3/4 files checked 75% done',
+        'Checking {} ...'.format(test_file_3),
+        '4/4 files checked 100% done'
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+def test_markup_j(tmpdir):
+    test_file_1 = os.path.join(tmpdir, 'test_1.qml')
+    with open(test_file_1, 'wt'):
+        pass
+    test_file_2 = os.path.join(tmpdir, 'test_2.cpp')
+    with open(test_file_2, 'wt'):
+        pass
+    test_file_3 = os.path.join(tmpdir, 'test_3.qml')
+    with open(test_file_3, 'wt'):
+        pass
+    test_file_4 = os.path.join(tmpdir, 'test_4.cpp')
+    with open(test_file_4, 'wt'):
+        pass
+
+    args = ['--library=qt', '-j2', test_file_1, test_file_2, test_file_3, test_file_4]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+
+    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 == ''
+
+
+def test_valueflow_debug(tmpdir):
+    test_file_cpp = os.path.join(tmpdir, 'test_1.cpp')
+    with open(test_file_cpp, 'wt') as f:
+        f.write("""
+#include "test.h"
+
+void f()
+{
+    int i = 0;
+}
+"""
+                )
+    test_file_h = os.path.join(tmpdir, 'test.h')
+    with open(test_file_h, 'wt') as f:
+        f.write("""
+#include "test2.h"
+inline void f1()
+{
+    int i = 0;
+}
+"""
+                )
+    test_file_h_2 = os.path.join(tmpdir, 'test2.h')
+    with open(test_file_h_2, 'wt') as f:
+        f.write("""
+inline void f2()
+{
+    int i = 0;
+}
+"""
+                )
+
+    args = ['--debug', test_file_cpp]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    if sys.platform == "win32":
+        stdout = stdout.replace('/', '\\')
+    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 ;
+5: }}
+
+##file {}
+
+1:
+2:
+3: void f1 ( )
+4: {{
+5: int i@var2 ; i@var2 = 0 ;
+6: }}
+
+##file {}
+
+1:
+2:
+3:
+4: void f ( )
+5: {{
+6: int i@var3 ; i@var3 = 0 ;
+7: }}
+
+
+
+##Value flow
+File {}
+Line 4
+  = always 0
+  0 always 0
+File {}
+Line 5
+  = always 0
+  0 always 0
+File {}
+Line 6
+  = always 0
+  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 == ''
+
+
+def test_file_duplicate(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+
+    args = [test_file_a, test_file_a, str(tmpdir)]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file_a)
+    ]
+    assert stderr == ''
+
+
+def test_file_duplicate_2(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+    test_file_b = os.path.join(tmpdir, 'b.c')
+    with open(test_file_b, 'wt'):
+        pass
+    test_file_c = os.path.join(tmpdir, 'c.c')
+    with open(test_file_c, 'wt'):
+        pass
+
+    args = [test_file_c, test_file_a, test_file_b, str(tmpdir), test_file_b, test_file_c, test_file_a, str(tmpdir), '-j1']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file_c),
+        '1/3 files checked 33% done',
+        'Checking {} ...'.format(test_file_a),
+        '2/3 files checked 66% done',
+        'Checking {} ...'.format(test_file_b),
+        '3/3 files checked 100% done'
+    ]
+    assert stderr == ''
+
+
+def test_file_duplicate_3(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+
+    # multiple ways to specify the same file
+    in_file_a = 'a.c'
+    in_file_b = os.path.join('.', 'a.c')
+    in_file_c = os.path.join('dummy', '..', 'a.c')
+    in_file_d = os.path.join(tmpdir, 'a.c')
+    in_file_e = os.path.join(tmpdir, '.', 'a.c')
+    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 16% done',
+            'Checking {} ...'.format('a.c'),
+            '2/6 files checked 33% done',
+            'Checking {} ...'.format('a.c'),
+            '3/6 files checked 50% done',
+            'Checking {} ...'.format(test_file_a),
+            '4/6 files checked 66% done',
+            'Checking {} ...'.format(test_file_a),
+            '5/6 files checked 83% done',
+            'Checking {} ...'.format(test_file_a),
+            '6/6 files checked 100% done'
+        ]
+    else:
+        assert lines == [
+            'Checking {} ...'.format('a.c'),
+            '1/4 files checked 25% done',
+            'Checking {} ...'.format('a.c'),
+            '2/4 files checked 50% done',
+            'Checking {} ...'.format(test_file_a),
+            '3/4 files checked 75% done',
+            'Checking {} ...'.format(test_file_a),
+            '4/4 files checked 100% done'
+        ]
+    assert stderr == ''
+
+
+@pytest.mark.skipif(sys.platform != 'win32', reason="requires Windows")
+def test_file_duplicate_4(tmpdir):
+    test_file_a = os.path.join(tmpdir, 'a.c')
+    with open(test_file_a, 'wt'):
+        pass
+
+    # multiple ways to specify the same file
+    in_file_a = 'a.c'
+    in_file_b = os.path.join('.', 'a.c')
+    in_file_c = os.path.join('dummy', '..', 'a.c')
+    in_file_d = os.path.join(tmpdir, 'a.c')
+    in_file_e = os.path.join(tmpdir, '.', 'a.c')
+    in_file_f = os.path.join(tmpdir, 'dummy', '..', 'a.c')
+
+    args1 = [in_file_a, in_file_b, in_file_c, in_file_d, in_file_e, in_file_f, str(tmpdir)]
+    args2 = []
+    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 16% done',
+        'Checking {} ...'.format('a.c'),
+        '2/6 files checked 33% done',
+        'Checking {} ...'.format('a.c'),
+        '3/6 files checked 50% done',
+        'Checking {} ...'.format(test_file_a),
+        '4/6 files checked 66% done',
+        'Checking {} ...'.format(test_file_a),
+        '5/6 files checked 83% done',
+        'Checking {} ...'.format(test_file_a),
+        '6/6 files checked 100% done'
+    ]
+    assert stderr == ''
+
+
+def test_file_ignore(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt'):
+        pass
+
+    args = ['-itest.cpp', test_file]
+    out_lines = [
+        'cppcheck: error: could not find or open any of the paths given.',
+        'cppcheck: Maybe all paths were ignored?'
+    ]
+
+    assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_build_dir_j_memleak(tmpdir): #12111
+    build_dir = os.path.join(tmpdir, 'build-dir')
+    os.mkdir(build_dir)
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('int main() {}')
+
+    args = ['--cppcheck-build-dir={}'.format(build_dir), '-j2', test_file]
+    out_lines = [
+        'Checking {} ...'.format(test_file)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
+
+
+def __test_addon_json_invalid(tmpdir, addon_json, expected):
+    addon_file = os.path.join(tmpdir, 'invalid.json')
+    with open(addon_file, 'wt') as f:
+        f.write(addon_json)
+
+    test_file = os.path.join(tmpdir, 'file.cpp')
+    with open(test_file, 'wt'):
+        pass
+
+    args = ['--addon={}'.format(addon_file), test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1
+    lines = stdout.splitlines()
+    assert len(lines) == 1
+    assert lines == [
+        'Loading {} failed. {}'.format(addon_file, expected)
+    ]
+    assert stderr == ''
+
+
+def test_addon_json_invalid_no_obj(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps([]), "JSON is not an object.")
+
+
+def test_addon_json_invalid_args_1(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps({'args':0}), "'args' must be an array.")
+
+
+def test_addon_json_invalid_args_2(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps({'args':[0]}), "'args' entry is not a string.")
+
+
+def test_addon_json_invalid_ctu(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps({'ctu':0}), "'ctu' must be a boolean.")
+
+
+def test_addon_json_invalid_python(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps({'python':0}), "'python' must be a string.")
+
+
+def test_addon_json_invalid_executable(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps({'executable':0}), "'executable' must be a string.")
+
+
+def test_addon_json_invalid_script_1(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps({'Script':''}), "'script' is missing.")
+
+
+def test_addon_json_invalid_script_2(tmpdir):
+    __test_addon_json_invalid(tmpdir, json.dumps({'script':0}), "'script' must be a string.")
+
+
+def test_unknown_extension(tmpdir):
+    test_file = os.path.join(tmpdir, 'test_2')
+    with open(test_file, 'wt') as f:
+        f.write('''
+void f() { }
+''')
+
+    exitcode, stdout, stderr = cppcheck(['-q', test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stdout == ''
+    assert stderr == ''
+
+
+def test_rule_file_define_multiple(tmpdir):
+    rule_file = os.path.join(tmpdir, 'rule_file.xml')
+    with open(rule_file, 'wt') as f:
+        f.write("""
+<rules>
+    <rule>
+        <tokenlist>define</tokenlist>
+        <pattern>DEF_1</pattern>
+        <message>
+            <severity>error</severity>
+            <id>ruleId1</id>
+        </message>
+    </rule>
+    <rule>
+        <tokenlist>define</tokenlist>
+        <pattern>DEF_2</pattern>
+        <message>
+            <severity>error</severity>
+            <id>ruleId2</id>
+            <summary>define2</summary>
+        </message>
+    </rule>
+</rules>""")
+
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('''
+#define DEF_1
+#define DEF_2
+void f() { }
+''')
+
+    exitcode, stdout, stderr = cppcheck(['--template=simple', '--rule-file={}'.format(rule_file), '-DDEF_3', test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: DEF_1',
+        'Processing rule: DEF_2',
+        'Checking {}: DEF_3=1...'.format(test_file)
+    ]
+    lines = stderr.splitlines()
+    assert lines == [
+        "{}:2:0: error: found 'DEF_1' [ruleId1]".format(test_file),
+        "{}:3:0: error: define2 [ruleId2]".format(test_file)
+    ]
+
+
+def test_rule_file_define(tmpdir):
+    rule_file = os.path.join(tmpdir, 'rule_file.xml')
+    with open(rule_file, 'wt') as f:
+        f.write("""
+<rule>
+    <tokenlist>define</tokenlist>
+    <pattern>DEF_.</pattern>
+</rule>
+""")
+
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('''
+#define DEF_1
+#define DEF_2
+void f() { }
+''')
+
+    exitcode, stdout, stderr = cppcheck(['--template=simple', '--rule-file={}'.format(rule_file), '-DDEF_3', test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: DEF_.',
+        'Checking {}: DEF_3=1...'.format(test_file)
+    ]
+    lines = stderr.splitlines()
+    assert lines == [
+        "{}:2:0: style: found 'DEF_1' [rule]".format(test_file),
+        "{}:3:0: style: found 'DEF_2' [rule]".format(test_file)
+    ]
+
+
+def test_rule_file_normal(tmpdir):
+    rule_file = os.path.join(tmpdir, 'rule_file.xml')
+    with open(rule_file, 'wt') as f:
+        f.write("""
+<rule>
+    <pattern>int</pattern>
+</rule>
+""")
+
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('''
+#define DEF_1
+#define DEF_2
+typedef int i32;
+void f(i32) { }
+''')
+
+    exitcode, stdout, stderr = cppcheck(['--template=simple', '--rule-file={}'.format(rule_file), test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: int',
+    ]
+    lines = stderr.splitlines()
+    assert lines == [
+        "{}:5:0: style: found 'int' [rule]".format(test_file)
+    ]
+
+
+def test_rule_file_raw(tmpdir):
+    rule_file = os.path.join(tmpdir, 'rule_file.xml')
+    with open(rule_file, 'wt') as f:
+        f.write("""
+<rule>
+    <tokenlist>raw</tokenlist>
+    <pattern>i32</pattern>
+</rule>
+""")
+
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('''
+#define DEF_1
+#define DEF_2
+typedef int i32;
+void f(i32) { }
+''')
+
+    exitcode, stdout, stderr = cppcheck(['--template=simple', '--rule-file={}'.format(rule_file), test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: i32',
+    ]
+    lines = stderr.splitlines()
+    assert lines == [
+        "{}:4:0: style: found 'i32' [rule]".format(test_file),
+        "{}:5:0: style: found 'i32' [rule]".format(test_file)
+    ]
+
+
+def test_rule(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('''
+#define DEF_1
+#define DEF_2
+void f() { }
+''')
+
+    exitcode, stdout, stderr = cppcheck(['--template=simple', '--rule=f', test_file])
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: f',
+    ]
+    lines = stderr.splitlines()
+    assert lines == [
+        "{}:4:0: style: found 'f' [rule]".format(test_file)
+    ]
+
+
+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)
+
+    with open(os.path.join(list_dir, 'aaa.c'), 'wt'):
+        pass
+    with open(os.path.join(list_dir, 'zzz.c'), 'wt'):
+        pass
+    with open(os.path.join(list_dir, 'valueflow.cpp'), 'wt'):
+        pass
+    with open(os.path.join(list_dir, 'vfvalue.cpp'), 'wt'):
+        pass
+    with open(os.path.join(list_dir, 'vf_enumvalue.cpp'), 'wt'):
+        pass
+    with open(os.path.join(list_dir, 'vf_analyze.h'), 'wt'):
+        pass
+
+    sub_dir_1 = os.path.join(list_dir, 'valueflow')
+    os.mkdir(sub_dir_1)
+    with open(os.path.join(sub_dir_1, 'file.cpp'), 'wt'):
+        pass
+    with open(os.path.join(sub_dir_1, 'file.c'), 'wt'):
+        pass
+    with open(os.path.join(sub_dir_1, 'file.h'), 'wt'):
+        pass
+
+    sub_dir_2 = os.path.join(list_dir, 'vfvalue')
+    os.mkdir(sub_dir_2)
+    with open(os.path.join(sub_dir_2, 'file.cpp'), 'wt'):
+        pass
+    with open(os.path.join(sub_dir_2, 'file.c'), 'wt'):
+        pass
+    with open(os.path.join(sub_dir_2, 'file.h'), 'wt'):
+        pass
+
+    sub_dir_3 = os.path.join(list_dir, 'vf_enumvalue')
+    os.mkdir(sub_dir_3)
+    with open(os.path.join(sub_dir_3, 'file.cpp'), 'wt'):
+        pass
+    with open(os.path.join(sub_dir_3, 'file.c'), 'wt'):
+        pass
+    with open(os.path.join(sub_dir_3, 'file.h'), 'wt'):
+        pass
+
+    # TODO: -rp is not applied to "Checking" messages
+    #exitcode, stdout, stderr = cppcheck(['-j1', '-rp', list_dir])
+    exitcode, stdout, stderr = cppcheck(['-j1', '.'], cwd=list_dir)
+    assert exitcode == 0, stdout if stdout else stderr
+    if sys.platform == "win32":
+        stdout = stdout.replace('\\', '/')
+    lines = stdout.splitlines()
+    expected = [
+        'Checking aaa.c ...',
+        'Checking valueflow.cpp ...',
+        'Checking valueflow/file.c ...',
+        'Checking valueflow/file.cpp ...',
+        'Checking vf_enumvalue.cpp ...',
+        'Checking vf_enumvalue/file.c ...',
+        'Checking vf_enumvalue/file.cpp ...',
+        'Checking vfvalue.cpp ...',
+        'Checking vfvalue/file.c ...',
+        'Checking vfvalue/file.cpp ...',
+        'Checking zzz.c ...'
+    ]
+    assert len(expected), len(lines)
+    for i in range(1, len(expected)+1):
+        lines.remove('{}/{} files checked {}% done'.format(i, len(expected), int(100 * i // len(expected))))
+    assert lines == expected
+
+
+def test_markup_lang(tmpdir):
+    test_file_1 = os.path.join(tmpdir, 'test_1.qml')
+    with open(test_file_1, 'wt'):
+        pass
+    test_file_2 = os.path.join(tmpdir, 'test_2.cpp')
+    with open(test_file_2, 'wt'):
+        pass
+
+    # do not assert processing markup file with enforced language
+    args = [
+        '--library=qt',
+        '--enable=unusedFunction',
+        '--language=c++',
+        '-j1',
+        test_file_1,
+        test_file_2
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+
+
+def test_cpp_probe(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.h')
+    with open(test_file, 'wt') as f:
+        f.writelines([
+            'class A {};'
+        ])
+
+    args = ['-q', '--template=simple', '--cpp-header-probe', '--verbose', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    lines = stdout.splitlines()
+    assert lines == []
+    lines = stderr.splitlines()
+    assert lines == [
+        # TODO: fix that awkward format
+        "{}:1:1: error: Code 'classA{{' is invalid C code.: Use --std, -x or --language to enforce C++. Or --cpp-header-probe to identify C++ headers via the Emacs marker. [syntaxError]".format(test_file)
+    ]
+
+
+def test_cpp_probe_2(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.h')
+    with open(test_file, 'wt') as f:
+        f.writelines([
+            '// -*- C++ -*-',
+            'class A {};'
+        ])
+
+    args = ['-q', '--template=simple', '--cpp-header-probe', test_file]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=[])
+
+
+def test_config_invalid(tmpdir):
+    # cppcheck.cfg needs to be next to executable
+    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)
+    shutil.copytree(os.path.join(os.path.dirname(__lookup_cppcheck_exe()), '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([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_config_override(tmpdir):
+    # cppcheck.cfg needs to be next to executable
+    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)
+    shutil.copytree(os.path.join(os.path.dirname(__lookup_cppcheck_exe()), '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(json.dumps({
+            'safety': False
+        }))
+
+    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
+    assert stdout.splitlines() == []
+    assert 'checkersReport' in stderr
+
+
+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
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
+    assert exitcode == 1, stdout if stdout else stderr
+    assert stdout.splitlines() == lines_exp
+
+
+def test_ignore_file(tmpdir):
+    __test_ignore_file(tmpdir, 'test.cpp')
+
+
+def test_ignore_file_append(tmpdir):
+    __test_ignore_file(tmpdir, 'test.cpp', append=True)
+
+
+def test_ignore_file_wildcard_back(tmpdir):
+    __test_ignore_file(tmpdir, 'test.c*')
+
+
+def test_ignore_file_wildcard_front(tmpdir):
+    __test_ignore_file(tmpdir, '*test.cpp')
+
+
+def test_ignore_file_placeholder(tmpdir):
+    __test_ignore_file(tmpdir, 't?st.cpp')
+
+
+def test_ignore_file_relative(tmpdir):
+    __test_ignore_file(tmpdir, 'src/test.cpp')
+
+
+def test_ignore_file_relative_backslash(tmpdir):
+    __test_ignore_file(tmpdir, 'src\\test.cpp')
+
+
+def test_ignore_file_relative_wildcard(tmpdir):
+    __test_ignore_file(tmpdir, 'src/test.c*')
+
+
+def test_ignore_file_relative_wildcard_backslash(tmpdir):
+    __test_ignore_file(tmpdir, 'src\\test.c*')
+
+
+def test_ignore_path_relative(tmpdir):
+    __test_ignore_file(tmpdir, 'src/')
+
+
+def test_ignore_path_relative_backslash(tmpdir):
+    __test_ignore_file(tmpdir, 'src\\')
+
+
+def test_ignore_path_relative_wildcard(tmpdir):
+    __test_ignore_file(tmpdir, 'src*/')
+
+
+def test_ignore_path_relative_wildcard_backslash(tmpdir):
+    __test_ignore_file(tmpdir, 'src*\\')
+
+
+def test_ignore_abspath(tmpdir):
+    __test_ignore_file(tmpdir, '$path', inject_path=True)
+
+
+def __write_gui_project(tmpdir, test_file, ignore):
+    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="{}"/>
+</paths>
+<ignore>
+<path name="{}"/>
+</ignore>
+</project>""".format(test_file, ignore))
+
+    return project_file
+
+
+def __test_ignore_project(tmpdir, ign_proj, ign_cli=None, append_cli=False, inject_path_proj=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 were 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?'
+    ]
+
+    if inject_path_proj:
+        ign_proj = ign_proj.replace('$path', str(test_file))
+
+    project_file = __write_gui_project(tmpdir, test_file, ign_proj)
+    args = [
+        '--debug-ignore',
+        '--project={}'.format(project_file)
+    ]
+
+    if append_cli:
+        args += ['-i{}'.format(ign_cli)]
+    else:
+        args = ['-i{}'.format(ign_cli)] + args
+
+    exitcode, stdout, _ = cppcheck(args, cwd=tmpdir)
+    assert exitcode == 1, stdout
+    assert stdout.splitlines() == lines_exp
+
+
+def test_ignore_project_file(tmpdir):
+    __test_ignore_project(tmpdir, 'test.cpp')
+
+
+def test_ignore_project_file_cli_prepend(tmpdir):
+    __test_ignore_project(tmpdir, ign_proj='test2.cpp', ign_cli='test.cpp')
+
+
+def test_ignore_project_file_cli_append(tmpdir):
+    __test_ignore_project(tmpdir, ign_proj='test2.cpp', ign_cli='test.cpp', append_cli=True)
+
+
+def test_ignore_project_file_wildcard_back(tmpdir):
+    __test_ignore_project(tmpdir, 'test.c*')
+
+
+def test_ignore_project_file_wildcard_front(tmpdir):
+    __test_ignore_project(tmpdir, '*test.cpp')
+
+
+def test_ignore_project_file_placeholder(tmpdir):
+    __test_ignore_project(tmpdir, 't?st.cpp')
+
+
+def test_ignore_project_file_relative(tmpdir):
+    __test_ignore_project(tmpdir, 'src/test.cpp')
+
+
+def test_ignore_project_file_relative_backslash(tmpdir):
+    __test_ignore_project(tmpdir, 'src\\test.cpp')
+
+
+def test_ignore_project_path_relative(tmpdir):
+    __test_ignore_project(tmpdir, 'src/')
+
+
+def test_ignore_project_path_relative_backslash(tmpdir):
+    __test_ignore_project(tmpdir, 'src\\')
+
+
+def test_ignore_project_abspath(tmpdir):
+    __test_ignore_project(tmpdir, '$path', inject_path_proj=True)
+
+
+def __write_compdb(tmpdir, test_file):
+    compile_commands = os.path.join(tmpdir, 'compile_commands.json')
+    j = [
+        {
+            'directory': os.path.dirname(test_file),
+            'file': test_file,
+            'command': 'gcc -c {}'.format(test_file)
+        }
+    ]
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(j))
+    return compile_commands
+
+
+def __test_ignore_project_2(tmpdir, extra_args, 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
+
+    lines_exp = [
+        'ignored path: {}'.format(str(test_file).replace('\\', '/')),
+        'cppcheck: error: no C or C++ source files found.',
+        'cppcheck: all paths were ignored'
+    ]
+    project_file = __write_compdb(tmpdir, test_file)
+    args = [
+        '--debug-ignore',
+        '--project={}'.format(project_file)
+    ]
+
+    if inject_path:
+        extra_args = [ extra_args[0].replace('$path', str(test_file)) ]
+    if append:
+        args += extra_args
+    else:
+        args = extra_args + args
+    print(args)
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmpdir)
+    assert exitcode == 1, stdout if stdout else stderr
+    assert stdout.splitlines() == lines_exp
+
+
+def test_ignore_project_2_file(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-itest.cpp'])
+
+
+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)
+
+
+def test_ignore_project_2_file_wildcard_back(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-itest.c*'])
+
+
+def test_ignore_project_2_file_wildcard_front(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-i*test.cpp'])
+
+
+def test_ignore_project_2_file_placeholder(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-it?st.cpp'])
+
+
+def test_ignore_project_2_file_relative(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc/test.cpp'])
+
+
+def test_ignore_project_2_file_relative_backslash(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc\\test.cpp'])
+
+
+def test_ignore_project_2_file_relative_wildcard(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc/test.c*'])
+
+
+def test_ignore_project_2_file_relative_wildcard_backslash(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc\\test.c*'])
+
+
+def test_ignore_project_2_path_relative(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc/'])
+
+
+def test_ignore_project_2_path_relative_backslash(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc\\'])
+
+
+def test_ignore_project_2_path_relative_wildcard(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc*/'])
+
+
+def test_ignore_project_2_path_relative_wildcard_backslash(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-isrc*\\'])
+
+
+def test_ignore_project_2_abspath(tmpdir):
+    __test_ignore_project_2(tmpdir, ['-i$path'], inject_path=True)
+
+
+def test_dumpfile_platform(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('x=1;\n')
+    cppcheck('--dump --platform=unix64 test.c'.split(), cwd=tmpdir)
+    platform = ''
+    with open(test_file + '.dump', 'rt') as f:
+        for line in f:
+            if line.find('<platform name="') > 0:
+                platform = line.strip()
+                break
+    assert ' wchar_t_bit="' in platform
+    assert ' size_t_bit="' in platform
+
+
+def test_builddir_hash_check_level(tmp_path):  # #13376
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f(bool b)
+{
+    for (int i = 0; i < 2; ++i)
+    {
+        if (i == 0) {}
+        if (b) continue;
+    }
+}
+""")
+
+    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
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '--template=simple',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stderr == '{}:0:0: information: Limiting analysis of branches. Use --check-level=exhaustive to analyze all branches. [normalCheckLevelMaxBranches]\n'.format(test_file)
+
+    cache_file = (build_dir / 'test.a1')
+
+    root = ElementTree.fromstring(cache_file.read_text())
+    hash_1 = root.get('hash')
+
+    args += ['--check-level=exhaustive']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stderr == ''
+
+    root = ElementTree.fromstring(cache_file.read_text())
+    hash_2 = root.get('hash')
+
+    assert hash_1 != hash_2
+
+
+def test_def_undef(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f()
+{
+#ifndef DEF_1
+    (void)(*((int*)0));
+#endif
+}
+""")
+
+    args = [
+        '--template=simple',
+        '-DDEF_1',
+        '-UDEF_1',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Checking {}: DEF_1=1...'.format(test_file)  # TODO: should not print DEF_1 - see #13335
+    ]
+    assert stderr.splitlines() == [
+        '{}:5:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+
+
+@pytest.mark.xfail(strict=True)
+def test_def_def(tmp_path):  # #13334
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f()
+{
+#if DEF_1 == 3
+    (void)(*((int*)0));
+#endif
+#if DEF_1 == 7
+    (void)(*((int*)0));
+#endif
+}
+""")
+
+    args = [
+        '--template=simple',
+        '-DDEF_1=3',
+        '-DDEF_1=7',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Checking {}: DEF_1=3;DEF_1=7...'.format(test_file)  # TODO: should not print DEF_1 twice - see #13335
+    ]
+    assert stderr.splitlines() == [
+        '{}:8:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+
+
+@pytest.mark.xfail(strict=True)
+def test_def_undef_def(tmp_path):  # #13334
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f()
+{
+#ifdef DEF_1
+    (void)(*((int*)0));
+#endif
+}
+""")
+
+    args = [
+        '--template=simple',
+        '-DDEF_1',
+        '-UDEF_1',
+        '-DDEF_1',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Checking {}: DEF_1=1;DEF_1=1...'.format(test_file)  # TODO: should not print DEF_1 twice - see #13335
+    ]
+    assert stderr.splitlines() == [
+        '{}:5:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+
+
+def test_undef(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f()
+{
+#ifndef DEF_1
+    (void)(*((int*)0));
+#endif
+}
+""")
+
+    args = [
+        '--template=simple',
+        '-UDEF_1',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr.splitlines() == [
+        '{}:5:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+
+
+@pytest.mark.xfail(strict=True)
+def test_undef_src(tmp_path):  # #13340
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+#define DEF_1
+
+void f()
+{
+#ifdef DEF_1
+    (void)(*((int*)0));
+#endif
+}
+""")
+
+    args = [
+        '--template=simple',
+        '-UDEF_1',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file)
+    ]
+    assert stderr.splitlines() == [
+        '{}:7:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+
+
+def test_dump_check_config(tmp_path):  # #13432
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f() {}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--dump',
+        '--check-config',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout == ''
+    assert stderr == ''
+
+    # no dump file should have been generated
+    assert not os.path.exists(str(test_file) + '.dump')
+
+
+# TODO: remove all overrides when fully fixed
+def __test_inline_suppr(tmp_path, extra_args):  # #13087
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f() {
+  // cppcheck-suppress memleak
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--inline-suppr',
+        str(test_file)
+    ]
+
+    args += extra_args
+
+    exitcode, stdout, stderr, = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        '{}:4:0: information: Unmatched suppression: memleak [unmatchedSuppression]'.format(test_file)
+    ]
+
+
+def test_inline_suppr(tmp_path):
+    __test_inline_suppr(tmp_path, ['-j1'])
+
+
+def test_inline_suppr_j(tmp_path):
+    __test_inline_suppr(tmp_path, ['-j2'])
+
+
+def test_inline_suppr_builddir(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __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)
+    __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+    __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+
+
+def test_inline_suppr_builddir_j(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __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)
+    __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+    __test_inline_suppr(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+
+
+def test_duplicate_suppression(tmp_path):
+    test_file = tmp_path / 'file.cpp'
+    with open(test_file, 'wt'):
+        pass
+
+    args = [
+        '-q',
+        '--suppress=uninitvar',
+        '--suppress=uninitvar',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1, stdout
+    assert stdout.splitlines() == [
+        "cppcheck: error: suppression 'uninitvar' already exists"
+    ]
+    assert stderr == ''
+
+
+def test_duplicate_suppressions_list(tmp_path):
+    suppr_file = tmp_path / 'suppressions'
+    with open(suppr_file, 'wt') as f:
+        f.write('''
+uninitvar
+uninitvar
+''')
+
+    test_file = tmp_path / 'file.cpp'
+    with open(test_file, 'wt'):
+        pass
+
+    args = [
+        '-q',
+        '--suppressions-list={}'.format(suppr_file),
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1, stdout
+    assert stdout.splitlines() == [
+        "cppcheck: error: suppression 'uninitvar' already exists"
+    ]
+    assert stderr == ''
+
+
+def test_duplicate_suppressions_mixed(tmp_path):
+    suppr_file = tmp_path / 'suppressions'
+    with open(suppr_file, 'wt') as f:
+        f.write('uninitvar')
+
+    test_file = tmp_path / 'file.cpp'
+    with open(test_file, 'wt'):
+        pass
+
+    args = [
+        '-q',
+        '--suppress=uninitvar',
+        '--suppressions-list={}'.format(suppr_file),
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 1, stdout
+    assert stdout.splitlines() == [
+        "cppcheck: error: suppression 'uninitvar' already exists"
+    ]
+    assert stderr == ''
+
+
+def test_xml_output(tmp_path):  # #13391 / #13485
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f(const void* p)
+{
+    if(p) {}
+    (void)*p; // REMARK: boom
+}
+""")
+
+    _, version_str, _ = cppcheck(['--version'])
+    version_str = version_str.replace('Cppcheck ', '').strip()
+
+    args = [
+        '-q',
+        '--enable=style',
+        '--xml',
+        str(test_file)
+    ]
+    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">
+            <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, 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):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+void f() {
+    int i = 0x10000000000000000;
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        '{}:3:13: error: Internal Error. MathLib::toBigUNumber: out_of_range: 0x10000000000000000 [internalError]'.format(test_file)
+    ]
+
+
+def __test_addon_suppr(tmp_path, extra_args):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+// cppcheck-suppress misra-c2012-2.3
+typedef int MISRA_5_6_VIOLATION;
+typedef int MISRA_5_6_VIOLATION_1;
+        """)
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=style',
+        '--addon=misra',
+        str(test_file)
+    ]
+
+    args += extra_args
+
+    exitcode, stdout, stderr = cppcheck(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),
+    ]
+
+
+# TODO: remove override when all issues are fixed
+def test_addon_suppr_inline(tmp_path):
+    __test_addon_suppr(tmp_path, ['--inline-suppr', '-j1'])
+
+# TODO: remove override when all issues are fixed
+def test_addon_suppr_inline_j(tmp_path):
+    __test_addon_suppr(tmp_path, ['--inline-suppr', '-j2'])
+
+
+def test_addon_suppr_cli_line(tmp_path):
+    __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:*:3'])
+
+
+def test_addon_suppr_cli_file_line(tmp_path):
+    __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:test.c:3'])
+
+
+def test_addon_suppr_cli_absfile_line(tmp_path):
+    test_file = tmp_path / 'test.c'
+    __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:{}:3'.format(test_file)])
+
+
+def test_ctu_path_builddir(tmp_path):  # #11883
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f(int *p) { *p = 3; }
+int main() {
+    int *p = 0;
+f(p);
+}
+        """)
+
+    args = [
+        '-q',
+        '--enable=style',
+        '--suppress=nullPointer',  # we only care about the CTU findings
+        '--cppcheck-build-dir={}'.format(build_dir),
+        str(test_file)
+    ]
+
+    # the CTU path was not properly read leading to missing location information
+    stderr_exp = [
+        '{}:2:19: error: Null pointer dereference: p [ctunullpointer]'.format(test_file),
+        'void f(int *p) { *p = 3; }',
+        '                  ^',
+        "{}:4:14: note: Assignment 'p=0', assigned value is 0".format(test_file),
+        '    int *p = 0;',
+        '             ^',
+        '{}:5:2: note: Calling function f, 1st argument is null'.format(test_file),
+        'f(p);',
+        ' ^',
+        '{}:2:19: note: Dereferencing argument p that is null'.format(test_file),
+        'void f(int *p) { *p = 3; }',
+        '                  ^'
+    ]
+
+    exitcode_1, stdout_1, stderr_1 = cppcheck(args)
+    assert exitcode_1 == 0, stdout_1
+    assert stdout_1 == ''
+    assert stderr_1.splitlines() == stderr_exp
+
+    exitcode_2, stdout_2, stderr_2 = cppcheck(args)
+    assert exitcode_2 == 0, stdout_2
+    assert stdout_2 == ''
+    assert stderr_2.splitlines() == stderr_exp
+
+
+@pytest.mark.xfail(strict=True)
+def test_ctu_builddir(tmp_path):  # #11883
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f(int *p) { *p = 3; }
+int main() {
+    int *p = 0;
+f(p);
+}
+        """)
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=style',
+        '--suppress=nullPointer',  # we only care about the CTU findings
+        '--cppcheck-build-dir={}'.format(build_dir),
+        '-j1',
+        '--emit-duplicates',
+        str(test_file)
+    ]
+
+    # the CTU was run and then evaluated again from the builddir leading to duplicated findings
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout == ''
+    assert stderr.splitlines() == [
+        '{}:2:19: error: Null pointer dereference: p [ctunullpointer]'.format(test_file)
+    ]
+
+
+def test_debug(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--debug',
+        str(test_file)
+    ]
+
+    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
+    assert stderr.splitlines() == []
+
+
+def test_debug_xml(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--debug',
+        '--xml',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+
+    assert stderr
+    assert ElementTree.fromstring(stderr) is not None
+
+    assert stdout.find('##file ') != -1  # also exists in CDATA
+    assert stdout.find('##Value flow') == -1
+    assert stdout.find('### Symbol database ###') == -1
+    assert stdout.find('##AST') == -1
+    assert stdout.find('### Template Simplifier pass ') == -1
+
+    debug_xml = ElementTree.fromstring(stdout)
+    assert debug_xml is not None
+    assert debug_xml.tag == 'debug'
+    file_elem = debug_xml.findall('file')
+    assert len(file_elem) == 1
+    valueflow_elem = debug_xml.findall('valueflow')
+    assert len(valueflow_elem) == 1
+    scopes_elem = debug_xml.findall('scopes')
+    assert len(scopes_elem) == 1
+    ast_elem = debug_xml.findall('ast')
+    assert len(ast_elem) == 0
+
+
+def test_debug_verbose(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--debug',
+        '--verbose',
+        str(test_file)
+    ]
+
+    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
+    assert stderr.splitlines() == []
+
+
+def test_debug_verbose_xml(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--debug',
+        '--verbose',
+        '--xml',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+
+    assert stderr
+    assert ElementTree.fromstring(stderr) is not None
+
+    assert stdout.find('##file ') != -1  # also exists in CDATA
+    assert stdout.find('##Value flow') == -1
+    assert stdout.find('### Symbol database ###') == -1
+    assert stdout.find('##AST') == -1
+    assert stdout.find('### Template Simplifier pass ') == -1
+
+    debug_xml = ElementTree.fromstring(stdout)
+    assert debug_xml is not None
+    assert debug_xml.tag == 'debug'
+    file_elem = debug_xml.findall('file')
+    assert len(file_elem) == 1
+    valueflow_elem = debug_xml.findall('valueflow')
+    assert len(valueflow_elem) == 1
+    scopes_elem = debug_xml.findall('scopes')
+    assert len(scopes_elem) == 1
+    ast_elem = debug_xml.findall('ast')
+    assert len(ast_elem) == 1
+
+
+# TODO: remove interaction with --debug?
+# TODO: test with --xml
+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));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--debug-template',
+        str(test_file)
+    ]
+
+    if verbose:
+        args += ['--verbose']
+    if debug:
+        args += ['--debug']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    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:14: error: Null pointer dereference: (int*)nullptr [nullPointer]'.format(test_file)
+    ]
+    return stdout
+
+
+def test_debug_template(tmp_path):
+    __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, 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
+    tests_path = tmp_path / 'tests'
+    os.mkdir(tests_path)
+
+    lib_path = tmp_path / 'lib'
+    os.mkdir(lib_path)
+
+    test_file_1 = lib_path / 'test_1.c'
+    with open(test_file_1, 'wt'):
+        pass
+
+    args = [
+        '-itests',
+        '-itest_1.c',
+        '.'
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args, cwd=tmp_path)
+    assert exitcode == 1, stdout
+    assert stdout.splitlines() == [
+        'cppcheck: error: could not find or open any of the paths given.',
+        'cppcheck: Maybe all paths were ignored?'
+    ]
+    assert stderr.splitlines() == []
+
+
+def test_debug_valueflow_data(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""int f()
+{
+    double d = 1.0 / 0.5;
+    return d;
+}
+""")
+
+    args = [
+        '-q',
+        '--debug-valueflow',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+
+    # check sections in output
+    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
+    assert stderr.splitlines() == []
+
+    # check precision in output - #13607
+    valueflow = stdout[stdout.find('##Value flow'):]
+    assert valueflow.splitlines() == [
+        '##Value flow',
+        'File {}'.format(str(test_file).replace('\\', '/')),
+        'Line 3',
+        '  = always 2.0',
+        '  1.0 always 1.0',
+        '  / always 2.0',
+        '  0.5 always 0.5',
+        'Line 4',
+        '  d always {symbolic=(1.0/0.5),2.0}'
+    ]
+
+
+def test_debug_valueflow_data_xml(tmp_path):  # #13606
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""double f()
+{
+    double d = 0.0000001;
+    return d;
+}
+""")
+
+    args = [
+        '-q',
+        '--debug-valueflow',
+        '--xml',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+
+    assert stderr
+    assert ElementTree.fromstring(stderr) is not None
+
+    # check sections in output
+    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
+
+    # check XML nodes in output
+    debug_xml = ElementTree.fromstring(stdout)
+    assert debug_xml is not None
+    assert debug_xml.tag == 'debug'
+    valueflow_elem = debug_xml.findall('valueflow')
+    assert len(valueflow_elem) == 1
+    scopes_elem = debug_xml.findall('scopes')
+    assert len(scopes_elem) == 1
+    ast_elem = debug_xml.findall('ast')
+    assert len(ast_elem) == 0
+
+    # check precision in output - #13606
+    value_elem = valueflow_elem[0].findall('values/value')
+    assert len(value_elem) == 3
+    assert 'floatvalue' in value_elem[0].attrib
+    assert value_elem[0].attrib['floatvalue'] == '1e-07'
+    assert 'floatvalue' in value_elem[1].attrib
+    assert value_elem[1].attrib['floatvalue'] == '1e-07'
+    assert 'floatvalue' in value_elem[2].attrib
+    assert value_elem[2].attrib['floatvalue'] == '1e-07'
+
+
+def test_dir_ignore(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt'):
+        pass
+
+    lib_dir = tmp_path / 'lib'
+    os.mkdir(lib_dir)
+    lib_test_file = lib_dir / 'test.cpp'
+    with open(lib_test_file, 'wt'):
+        pass
+
+    args = [
+        '-ilib',
+        '--debug-ignore',
+        str(tmp_path)
+    ]
+    # make sure the whole directory is being ignored instead of each of its contents individually
+    out_lines = [
+        'ignored path: {}'.format(lib_dir),
+        'Checking {} ...'.format(test_file)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines, cwd=str(tmp_path))
+
+
+def test_check_headers(tmp_path):
+    test_file_h = tmp_path / 'test.h'
+    with open(test_file_h, 'wt') as f:
+        f.write(
+"""
+inline void hdr()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    test_file_c = tmp_path / 'test.c'
+    with open(test_file_c, 'wt') as f:
+        f.write(
+"""
+#include "test.h"
+
+void f() {}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--no-check-headers',
+        str(test_file_c)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == []  # no error since the header is not checked
+
+
+def test_unique_error(tmp_path):  # #6366
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""void f()
+{
+    const long m[9] = {};
+    long a=m[9], b=m[9];
+    (void)a;
+    (void)b;
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        "{}:4:13: error: Array 'm[9]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]".format(test_file),
+        "{}:4:21: error: Array 'm[9]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]".format(test_file)
+    ]
+
+
+def test_check_unused_templates_class(tmp_path):
+    test_file_h = tmp_path / 'test.h'
+    with open(test_file_h, 'wt') as f:
+        f.write(
+"""template<class T>
+class HdrCl1
+{
+    HdrCl1()
+    {
+        (void)(*((int*)0));
+    }
+};
+
+template<typename T>
+class HdrCl2
+{
+    HdrCl2()
+    {
+        (void)(*((int*)0));
+    }
+};
+
+template<class T>
+struct HdrSt1
+{
+    HdrSt1()
+    {
+        (void)(*((int*)0));
+    }
+};
+
+template<typename T>
+struct HdrSt2
+{
+    HdrSt2()
+    {
+        (void)(*((int*)0));
+    }
+};
+""")
+
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""#include "test.h"
+
+template<class T>
+class Cl1
+{
+    CL1()
+    {
+        (void)(*((int*)0));
+    }
+};
+
+template<typename T>
+class Cl2
+{
+    Cl2()
+    {
+        (void)(*((int*)0));
+    }
+};
+
+template<class T>
+struct St1
+{
+    St1()
+    {
+        (void)(*((int*)0));
+    }
+};
+
+template<typename T>
+struct St2
+{
+    St2()
+    {
+        (void)(*((int*)0));
+    }
+};
+
+void f() {}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--no-check-unused-templates',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == []  # no error since the unused templates are 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:
+        f.write(
+"""template<class T>
+void f_t_hdr_1()
+{
+    (void)(*((int*)0));
+}
+
+template<typename T>
+void f_t_hdr_2()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""#include "test.h"
+
+template<class T>
+void f_t_1()
+{
+    (void)(*((int*)0));
+}
+
+template<typename T>
+void f_t_2()
+{
+    (void)(*((int*)0));
+}
+
+void f() {}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--no-check-unused-templates',
+        str(test_file)
+    ]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    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:
+        f.write(
+"""static void foo() // NOLINT(misc-use-anonymous-namespace)
+{
+    (void)(*((int*)nullptr));
+}""")
+
+    project_file = __write_compdb(tmpdir, test_file) if use_compdb else None
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--clang-tidy'
+    ]
+    if project_file:
+        args += ['--project={}'.format(project_file)]
+    else:
+        args += [str(test_file)]
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.splitlines() == [
+    ]
+    assert stderr.splitlines() == [
+        '{}:3:14: error: Null pointer dereference: (int*)nullptr [nullPointer]'.format(test_file),
+        '{}:3:14: style: C-style casts are discouraged; use static_cast/const_cast/reinterpret_cast [clang-tidy-google-readability-casting]'.format(test_file)
+    ]
+
+
+@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')
+def test_clang_tidy_project(tmpdir):
+    __test_clang_tidy(tmpdir, True)
+
+
+@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:
+        f.write(
+"""#include <string>
+#include <utility>
+
+// cppcheck-suppress clang-tidy-modernize-use-trailing-return-type
+static bool f() // NOLINT(misc-use-anonymous-namespace)
+{
+    std::string str;
+    const std::string str1 = std::move(str);
+    (void)str1;
+    return str.empty();
+}""")
+
+    # TODO: remove project file usage when --clang-tidy works with non-project files
+    project_file = __write_compdb(tmp_path, str(test_file))
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--inline-suppr',
+        '--std=c++11',
+        '--clang-tidy',
+        '--project={}'.format(project_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        "{}:10:12: warning: 'str' used after it was moved [clang-tidy-bugprone-use-after-move]".format(test_file),
+        "{}:10:12: style: 'str' used after it was moved [clang-tidy-hicpp-invalid-access-moved]".format(test_file)
+    ]
+    assert exitcode == 0, stdout
+
+
+def test_suppress_unmatched_wildcard(tmp_path):  # #13660
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    # need to run in the temporary folder because the path of the suppression has to match
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--suppress=nullPointer:test*.c',  # checked and matched
+        '--suppress=id:test*.c',  # checked and unmatched
+        '--suppress=id2:test*.c',  # checked and unmatched
+        '--suppress=id2:tes?.c',  # checked and unmatched
+        '--suppress=*:test*.c',  # checked and unmatched
+        '--suppress=id:test*.cpp',  # unchecked
+        '--suppress=id2:test?.cpp',  # unchecked
+        'test.c'
+    ]
+    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]'
+    ]
+
+
+def test_suppress_unmatched_wildcard_unchecked(tmp_path):
+    # make sure that unmatched wildcards suppressions are reported if files matching the expressions were processesd
+    # but isSuppressed() has never been called (i.e. no findings in file at all)
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write("""void f() {}""")
+
+    # need to run in the temporary folder because the path of the suppression has to match
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information',
+        '--suppress=id:test*.c',
+        '--suppress=id:tes?.c',
+        '--suppress=id2:*',
+        '--suppress=*:test*.c',
+        'test.c'
+    ]
+    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]'
+    ]
+
+
+def test_preprocess_enforced_c(tmp_path):  # #10989
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""#ifdef __cplusplus
+#error "err"
+#endif""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--language=c',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == []
+
+
+def test_preprocess_enforced_cpp(tmp_path):  # #10989
+    test_file = tmp_path / 'test.c'
+    with open(test_file, 'wt') as f:
+        f.write(
+"""#ifdef __cplusplus
+#error "err"
+#endif""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--language=c++',
+        str(test_file)
+    ]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout if stdout else stderr
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        '{}:2:2: error: #error "err" [preprocessorErrorDirective]'.format(test_file)
+    ]
+
+
+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'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--debug-normal',
+        str(test_file)
+    ]
+
+    if verbose:
+        args += ['--verbose']
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert exitcode == 0, stdout
+    assert stdout.find('##file ') != -1
+    assert stdout.find('##Value flow') != -1
+    if verbose:
+        assert stdout.find('### Symbol database ###') != -1
+    else:
+        assert stdout.find('### Symbol database ###') == -1
+    if verbose:
+        assert stdout.find('##AST') != -1
+    else:
+        assert stdout.find('##AST') == -1
+    assert stdout.find('### Template Simplifier pass ') == -1
+    assert stderr.splitlines() == [
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+    return stdout
+
+
+def test_debug_normal(tmp_path):
+    __test_debug_normal(tmp_path, False)
+
+
+@pytest.mark.xfail(strict=True)  # TODO: remove dependency on --verbose
+def test_debug_normal_verbose_nodiff(tmp_path):
+    # make sure --verbose does not change the output
+    assert __test_debug_normal(tmp_path, False) == __test_debug_normal(tmp_path, True)
+
+
+# TODO: test with --xml
+def __test_debug_simplified(tmp_path, verbose):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--debug-simplified',
+        str(test_file)
+    ]
+
+    if verbose:
+        args += ['--verbose']
+
+    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
+    assert stderr.splitlines() == [
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+    return stdout
+
+
+def test_debug_simplified(tmp_path):
+    __test_debug_simplified(tmp_path, False)
+
+
+def test_debug_simplified_verbose_nodiff(tmp_path):
+    # make sure --verbose does not change the output
+    assert __test_debug_simplified(tmp_path, False) == __test_debug_simplified(tmp_path, True)
+
+
+# TODO: test with --xml
+def __test_debug_symdb(tmp_path, verbose):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--debug-symdb',
+        str(test_file)
+    ]
+
+    if verbose:
+        args += ['--verbose']
+
+    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
+    assert stderr.splitlines() == [
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+    return stdout
+
+
+def test_debug_symdb(tmp_path):
+    __test_debug_symdb(tmp_path, False)
+
+
+@pytest.mark.skip  # TODO: this contains memory addresses the output will always differ - would require stable identifier
+def test_debug_symdb_verbose_nodiff(tmp_path):
+    # make sure --verbose does not change the output
+    assert __test_debug_symdb(tmp_path, False) == __test_debug_symdb(tmp_path, True)
+
+
+# TODO: test with --xml
+def __test_debug_ast(tmp_path, verbose):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--debug-ast',
+        str(test_file)
+    ]
+
+    if verbose:
+        args += ['--verbose']
+
+    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
+    assert stderr.splitlines() == [
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+    return stdout
+
+
+def test_debug_ast(tmp_path):
+    __test_debug_ast(tmp_path, False)
+
+
+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)
+
+
+# TODO: test with --xml
+def __test_debug_valueflow(tmp_path, verbose):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--debug-valueflow',
+        str(test_file)
+    ]
+
+    if verbose:
+        args += ['--verbose']
+
+    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
+    assert stderr.splitlines() == [
+        '{}:3:14: error: Null pointer dereference: (int*)0 [nullPointer]'.format(test_file)
+    ]
+    return stdout
+
+
+def test_debug_valueflow(tmp_path):
+    __test_debug_valueflow(tmp_path, False)
+
+
+def test_debug_valueflow_verbose_nodiff(tmp_path):
+    # make sure --verbose does not change the output
+    assert __test_debug_valueflow(tmp_path, False) == __test_debug_valueflow(tmp_path, True)
+
+
+def test_debug_syntaxerror_c(tmp_path):
+    test_file = tmp_path / 'test.c'
+    with open(test_file, "w") as f:
+        f.write(
+"""
+template<class T> class TemplCl;
+void f()
+{
+    (void)(*((int*)0));
+}
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--debug-normal',
+        str(test_file)
+    ]
+
+    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
+    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}:-1:0: information: Unmatched suppression: error [unmatchedSuppression]',
+        f'{lib_file}:-1:0: information: Unmatched suppression: error2 [unmatchedSuppression]',
+        f'{lib_file}:-1:0: information: Unmatched suppression: error3 [unmatchedSuppression]',
+        f'{lib_file}:-1:0: information: Unmatched suppression: error4 [unmatchedSuppression]',
+        f'{lib_file}:-1:0: information: Unmatched suppression: error5 [unmatchedSuppression]',
+        f'{lib_file}:-1: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. Cppcheck failed to extract a valid configuration. Use -v for more details. [noValidConfiguration]'.format(test_file)
+    ]
+
+
+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, 975, use_unusedfunction_only=True)
+
+
+def test_active_unusedfunction_only_builddir(tmp_path):
+    checkers_exp = [
+        'CheckUnusedFunctions::check'
+    ]
+    __test_active_checkers(tmp_path, 1, 975, use_unusedfunction_only=True, checkers_exp=checkers_exp)
+
+
+def test_active_unusedfunction_only_misra(tmp_path):
+    __test_active_checkers(tmp_path, 1, 1175, 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, 1175, use_unusedfunction_only=True, use_misra=True, checkers_exp=checkers_exp)
diff --git a/test/cli/performance_test.py b/test/cli/performance_test.py
new file mode 100644
index 00000000000..90daf9b58cc
--- /dev/null
+++ b/test/cli/performance_test.py
@@ -0,0 +1,392 @@
+
+# python -m pytest performance_test.py
+
+import os
+import sys
+
+import pytest
+
+from testutils import cppcheck
+
+
+
+@pytest.mark.timeout(10)
+def test_slow_array_many_floats(tmpdir):
+    # 11649
+    # cppcheck valueflow takes a long time when an array has many floats
+    filename = os.path.join(tmpdir, 'hang.c')
+    with open(filename, 'wt') as f:
+        f.write("const float f[] = {\n")
+        for _ in range(20000):
+            f.write('    13.6f,\n')
+        f.write("};\n")
+    cppcheck([filename]) # should not take more than ~1 second
+
+
+@pytest.mark.timeout(10)
+def test_slow_array_many_strings(tmpdir):
+    # 11901
+    # cppcheck valueflow takes a long time when analyzing a file with many strings
+    filename = os.path.join(tmpdir, 'hang.c')
+    with open(filename, 'wt') as f:
+        f.write("const char *strings[] = {\n")
+        for _ in range(20000):
+            f.write('    "abc",\n')
+        f.write("};\n")
+    cppcheck([filename]) # should not take more than ~1 second
+
+
+@pytest.mark.timeout(10)
+def test_slow_long_line(tmpdir):
+    # simplecpp #314
+    filename = os.path.join(tmpdir, 'hang.c')
+    with open(filename, 'wt') as f:
+        f.write("#define A() static const int a[] = {\\\n")
+        for _ in range(5000):
+            f.write(" -123, 456, -789,\\\n")
+        f.write("};\n")
+    cppcheck([filename]) # should not take more than ~1 second
+
+
+@pytest.mark.timeout(60)
+def test_slow_large_constant_expression(tmpdir):
+    # 12182
+    filename = os.path.join(tmpdir, 'hang.c')
+    with open(filename, 'wt') as f:
+        f.write("""
+#define FLAG1 0
+#define FLAG2 0
+#define FLAG3 0
+#define FLAG4 0
+#define FLAG5 0
+#define FLAG6 0
+#define FLAG7 0
+#define FLAG8 0
+#define FLAG9 0
+#define FLAG10 0
+#define FLAG11 0
+#define FLAG12 0
+#define FLAG13 0
+#define FLAG14 0
+#define FLAG15 0
+#define FLAG16 0
+#define FLAG17 0
+#define FLAG18 0
+#define FLAG19 0
+#define FLAG20 0
+#define FLAG21 0
+#define FLAG22 0
+#define FLAG23 0
+#define FLAG24 0
+
+#define maxval(x, y) ((x) > (y) ? (x) : (y))
+
+#define E_SAMPLE_SIZE   maxval( FLAG1,                \
+                                  maxval( FLAG2,      \
+                                  maxval( FLAG3,      \
+                                  maxval( FLAG4,      \
+                                  maxval( FLAG5,      \
+                                  maxval( FLAG6,      \
+                                  maxval( FLAG7,      \
+                                  maxval( FLAG8,      \
+                                  maxval( FLAG9,      \
+                                  maxval( FLAG10,     \
+                                  maxval( FLAG11,     \
+                                  maxval( FLAG12,     \
+                                  maxval( FLAG13,     \
+                                  maxval( FLAG14,     \
+                                  FLAG15 ))))))))))))))
+
+#define SAMPLE_SIZE       maxval( E_SAMPLE_SIZE,      \
+                                  maxval( sizeof(st), \
+                                  maxval( FLAG16,     \
+                                  maxval( FLAG17,     \
+                                  maxval( FLAG18,     \
+                                  maxval( FLAG19,     \
+                                  maxval( FLAG20,     \
+                                  maxval( FLAG21,     \
+                                  maxval( FLAG22,     \
+                                  maxval( FLAG23,     \
+                                          FLAG24 ))))))))))
+
+typedef struct {
+    int n;
+} st;
+
+x = SAMPLE_SIZE;
+        """)
+
+    cppcheck([filename])
+
+@pytest.mark.timeout(10)
+def test_slow_exprid(tmpdir):
+    # 11885
+    filename = os.path.join(tmpdir, 'hang.c')
+    with open(filename, 'wt') as f:
+        f.write("""
+int foo(int a, int b)
+{
+#define A0(a, b)  ((a) + (b))
+#define A1(a, b)  ((a) > (b)) ? A0((a) - (b), (b)) : A0((b) - (a), (a))
+#define A2(a, b)  ((a) > (b)) ? A1((a) - (b), (b)) : A1((b) - (a), (a))
+#define A3(a, b)  ((a) > (b)) ? A2((a) - (b), (b)) : A2((b) - (a), (a))
+#define A4(a, b)  ((a) > (b)) ? A3((a) - (b), (b)) : A3((b) - (a), (a))
+#define A5(a, b)  ((a) > (b)) ? A4((a) - (b), (b)) : A4((b) - (a), (a))
+#define A6(a, b)  ((a) > (b)) ? A5((a) - (b), (b)) : A5((b) - (a), (a))
+#define A7(a, b)  ((a) > (b)) ? A6((a) - (b), (b)) : A6((b) - (a), (a))
+#define A8(a, b)  ((a) > (b)) ? A7((a) - (b), (b)) : A7((b) - (a), (a))
+#define A9(a, b)  ((a) > (b)) ? A8((a) - (b), (b)) : A8((b) - (a), (a))
+#define A10(a, b) ((a) > (b)) ? A9((a) - (b), (b)) : A9((b) - (a), (a))
+#define A11(a, b) ((a) > (b)) ? A10((a) - (b), (b)) : A10((b) - (a), (a))
+	return A8(a, b);
+}
+        """)
+
+    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):
+    # #12235
+    filename = os.path.join(tmpdir, 'hang.cpp')
+    with open(filename, 'wt') as f:
+        f.write(r"""
+                struct T {
+                    int* q;
+                    int nx, ny;
+                };
+                struct S {
+                    void f();
+                    int n;
+                    T* p;
+                };
+                #define ROW 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 ,
+                #define ROW4 ROW ROW ROW ROW
+                #define ROW16 ROW4 ROW4 ROW4 ROW4
+                #define ROW64 ROW16 ROW16 ROW16 ROW16
+                #define ROW256 ROW64 ROW64 ROW64 ROW64
+                #define ROW1K ROW256 ROW256 ROW256 ROW256
+                #define ROW4K ROW1K ROW1K ROW1K ROW1K
+                const int A[] = {
+                    ROW4K
+                };
+                void S::f() {
+                    for (int i = 0; i < n; ++i) {
+                        T& t = p[i];
+                        for (int y = 0; y < t.ny; y += 4) {
+                            int* row0 = t.q + y * t.nx;
+                            for (int x = 0; x < t.nx; x += 4) {
+                                int s[16] = {};
+                                memcpy(row0, &s[0], 4);
+                                row0 += 4;
+                            }
+                        }
+                    }
+                }""")
+    cppcheck([filename]) # should not take more than ~1 second
+
+
+@pytest.mark.timeout(10)
+def test_slow_many_scopes(tmpdir):
+    # #12038
+    filename = os.path.join(tmpdir, 'hang.cpp')
+    with open(filename, 'wt') as f:
+        f.write(r"""
+                #define BLOCK {\
+                    char buf[sizeof("x") + 5 * 3 + 16];\
+                    int rc;\
+                    memset(buf, cmp[0], sizeof buf);\
+                    rc = sprintf(buf + 5, "x");\
+                    assert(rc == sizeof("x") - 1);\
+                    assert(memcmp(buf, cmp, 5) == 0);\
+                    if ((rc) >= 0) {\
+                        assert(memcmp(buf + 5, ("x"), (rc)) == 0);\
+                        assert(buf[5 + (rc)] == '\0');\
+                    }\
+                    assert(memcmp(buf + 5 + (rc) + 1, cmp, 5) == 0);\
+                }
+                #define BLOCK2 BLOCK BLOCK
+                #define BLOCK4 BLOCK2 BLOCK2
+                #define BLOCK8 BLOCK4 BLOCK4
+                #define BLOCK16 BLOCK8 BLOCK8
+                #define BLOCK32 BLOCK16 BLOCK16
+                #define BLOCK64 BLOCK32 BLOCK32
+                int main() {
+                    char cmp[5];
+                    memset(cmp, '\376', sizeof cmp);
+                    BLOCK64
+                    return EXIT_SUCCESS;
+                }""")
+    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):
+    # 12847
+    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
+                namespace N {
+                    static const char A = 'a';
+                    const char a[] = {
+                        ROW4096 ROW4096 ROW4096 ROW4096
+                    };
+                }""")
+    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(20)
+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
diff --git a/test/cli/premium_test.py b/test/cli/premium_test.py
new file mode 100644
index 00000000000..ddf7b1e2fbe
--- /dev/null
+++ b/test/cli/premium_test.py
@@ -0,0 +1,201 @@
+
+# python -m pytest premium_test.py
+
+import os
+import re
+import shutil
+import sys
+import time
+
+from testutils import cppcheck, __lookup_cppcheck_exe
+
+__PRODUCT_NAME = 'Cppcheck Premium ' + str(time.time())
+
+
+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')
+    with open(test_cfg_folder.join('std.cfg'), 'wt') as f:
+        f.write('<?xml version="1.0"?>\n<def format="2"/>')
+
+    # add simple cppcheck.cfg
+    with open(tmpdir.join('cppcheck.cfg'), 'wt') as f:
+        f.write("""
+                {
+                    "addons": [],
+                    "productName": "NAME",
+                    "about": "NAME",
+                    "manualUrl" : "https://files.cppchecksolutions.com/manual.pdf",
+                    "safety": true
+                }
+                """.replace('NAME', __PRODUCT_NAME))
+
+    return exe
+
+
+def test_misra_c_builtin_style_checks(tmpdir):
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('void foo() { int x; y = 0; }')
+
+    exe = __copy_cppcheck_premium(tmpdir)
+
+    exitcode, _, stderr = cppcheck(['--premium=autosar', '--xml', test_file], cppcheck_exe=exe)
+    assert exitcode == 0
+    assert 'id="unusedVariable"' in stderr
+    assert 'id="checkersReport"' in stderr
+
+    exitcode, _, stderr = cppcheck(['--premium=autosar', '--premium=safety-off', '--xml', test_file], cppcheck_exe=exe)
+    assert exitcode == 0
+    assert 'id="unusedVariable"' in stderr
+    assert 'id="checkersReport"' not in stderr
+
+    exitcode, _, stderr = cppcheck(['--xml-version=3', test_file], cppcheck_exe=exe)
+    assert exitcode == 0
+    assert '<safety/>' in stderr
+
+    exitcode, _, stderr = cppcheck(['--xml-version=3', '--premium=safety-off', test_file], cppcheck_exe=exe)
+    assert exitcode == 0
+    assert '<safety/>' not in stderr
+
+    exitcode, _, stderr = cppcheck(['--xml-version=3', '--inline-suppr', test_file], cppcheck_exe=exe)
+    assert exitcode == 0
+    assert '<inline-suppr/>' in stderr
+
+    exitcode, _, stderr = cppcheck(['--xml-version=3', '--suppress=foo', test_file], cppcheck_exe=exe)
+    assert exitcode == 0
+    assert '<suppression errorId="foo" inline="false" />' in stderr
+
+
+def test_build_dir_hash_cppcheck_product(tmpdir):
+    # 13644 - cppcheck build dir hashes should depend on the cppcheck version
+    # so that files are rescanned when cppcheck is switched
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(';')
+
+    build_dir = tmpdir.mkdir('b')
+    args = [f'--cppcheck-build-dir={build_dir}', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args)
+    assert 'error' not in stdout
+    assert stderr == ''
+    assert exitcode == 0
+
+    def _get_hash(s:str):
+        i = s.find(' hash="')
+        if i <= -1:
+            return ''
+        i += 7
+        return s[i:s.find('"', i)]
+
+    with open(build_dir.join('test.a1'), 'rt') as f:
+        f1 = f.read()
+        hash1 = _get_hash(f1)
+    assert re.match(r'^[0-9a-f]{6,}$', hash1), f1
+
+    premium_exe = __copy_cppcheck_premium(tmpdir)
+    exitcode, stdout, stderr = cppcheck(args, cppcheck_exe=premium_exe)
+    assert 'error' not in stdout
+    assert stderr == ''
+    assert exitcode == 0
+
+    with open(build_dir.join('test.a1'), 'rt') as f:
+        f2 = f.read()
+        hash2 = _get_hash(f2)
+    assert re.match(r'^[0-9a-f]{6,}$', hash2), f2
+
+    assert hash1 != hash2
+
+
+def test_misra_py(tmpdir):
+    # 13831 - do not execute misra.py when --premium=misra-c-2012 is used
+    test_file = os.path.join(tmpdir, 'test.c')
+    with open(test_file, 'wt') as f:
+        f.write('void foo();\n')
+
+    exe = __copy_cppcheck_premium(tmpdir)
+
+    # ensure that misra.py is not available:
+    _, stdout, _ = cppcheck(['--enable=style', '--addon=misra', test_file], cppcheck_exe=exe)
+    assert 'Did not find addon misra.py' in stdout
+
+    # Execute misra
+    _, 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/cfg.c b/test/cli/proj-inline-suppress/cfg.c
new file mode 100644
index 00000000000..b597217fa32
--- /dev/null
+++ b/test/cli/proj-inline-suppress/cfg.c
@@ -0,0 +1,10 @@
+void f()
+{
+#if DEF_1
+    // cppcheck-suppress id
+    (void)0;
+#endif
+
+    // cppcheck-suppress id
+    (void)0;
+}
diff --git a/test/cli/proj-inline-suppress/duplicate.cpp b/test/cli/proj-inline-suppress/duplicate.cpp
new file mode 100644
index 00000000000..eae28cf8a46
--- /dev/null
+++ b/test/cli/proj-inline-suppress/duplicate.cpp
@@ -0,0 +1,5 @@
+int main() {
+    // cppcheck-suppress [unreadVariable,unreadVariable]
+    int i = 0;
+    return 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/proj-inline-suppress/unusedFunctionUnmatched.cpp b/test/cli/proj-inline-suppress/unusedFunctionUnmatched.cpp
new file mode 100644
index 00000000000..8bd895e99bb
--- /dev/null
+++ b/test/cli/proj-inline-suppress/unusedFunctionUnmatched.cpp
@@ -0,0 +1,5 @@
+// cppcheck-suppress unusedFunction
+void f() {
+    // cppcheck-suppress unusedFunction
+    // cppcheck-suppress uninitvar
+}
diff --git a/test/cli/proj2_test.py b/test/cli/proj2_test.py
new file mode 100644
index 00000000000..c9516d9ddbf
--- /dev/null
+++ b/test/cli/proj2_test.py
@@ -0,0 +1,173 @@
+
+# python -m pytest test-proj2.py
+
+import json
+import os
+import shutil
+from testutils import create_gui_project_file, cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__proj_dir = os.path.join(__script_dir, 'proj2')
+
+__COMPILE_COMMANDS_JSON = 'compile_commands.json'
+
+__ERR_A = ('%s:1:7: error: Division by zero. [zerodiv]\n' +
+           'x = 3 / 0;\n' +
+           '      ^\n') % os.path.join('a', 'a.c')
+__ERR_B = ('%s:1:7: error: Division by zero. [zerodiv]\n' +
+           'x = 3 / 0;\n' +
+           '      ^\n') % os.path.join('b', 'b.c')
+
+def __create_compile_commands(proj_dir):
+    proj_dir = str(proj_dir)
+    j = [{'directory': os.path.join(proj_dir, 'a'), 'command': 'gcc -c a.c', 'file': 'a.c'},
+         {'directory': proj_dir, 'command': 'gcc -c b/b.c', 'file': 'b/b.c'}]
+    with open(os.path.join(proj_dir, __COMPILE_COMMANDS_JSON), 'wt') as f:
+        f.write(json.dumps(j))
+
+
+def test_file_filter():
+    ret, stdout, _ = cppcheck(['proj2/','--file-filter=proj2/a/*'], cwd=__script_dir)
+    file1 = os.path.join('proj2', 'a', 'a.c')
+    file2 = os.path.join('proj2', 'b', 'b.c')
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s ...' % file1) >= 0
+    ret, stdout, _ = cppcheck(['proj2/','--file-filter=proj2/b*'], cwd=__script_dir)
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s ...' % file2) >= 0
+
+def test_local_path(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    __create_compile_commands(proj_dir)
+    ret, stdout, _ = cppcheck(['--project=compile_commands.json'], cwd=proj_dir)
+    file1 = os.path.join('a', 'a.c')
+    file2 = os.path.join('b', 'b.c')
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s ...' % file1) >= 0
+    assert stdout.find('Checking %s ...' % file2) >= 0
+
+def test_local_path_force(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    __create_compile_commands(proj_dir)
+    ret, stdout, _ = cppcheck(['--project=compile_commands.json', '--force'], cwd=proj_dir)
+    assert ret == 0, stdout
+    assert stdout.find('AAA') >= 0
+
+def test_local_path_maxconfigs(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    __create_compile_commands(proj_dir)
+    ret, stdout, _ = cppcheck(['--project=compile_commands.json', '--max-configs=2'], cwd=proj_dir)
+    assert ret == 0, stdout
+    assert stdout.find('AAA') >= 0
+
+def test_relative_path(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    __create_compile_commands(proj_dir)
+    ret, stdout, _ = cppcheck(['--project=proj2/' + __COMPILE_COMMANDS_JSON], cwd=tmp_path)
+    file1 = os.path.join('proj2', 'a', 'a.c')
+    file2 = os.path.join('proj2', 'b', 'b.c')
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s ...' % file1) >= 0
+    assert stdout.find('Checking %s ...' % file2) >= 0
+
+def test_absolute_path(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    __create_compile_commands(proj_dir)
+    ret, stdout, _ = cppcheck(['--project=' + os.path.join(proj_dir, __COMPILE_COMMANDS_JSON)], cwd=tmp_path)
+    file1 = os.path.join(proj_dir, 'a', 'a.c')
+    file2 = os.path.join(proj_dir, 'b', 'b.c')
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s ...' % file1) >= 0
+    assert stdout.find('Checking %s ...' % file2) >= 0
+
+def test_gui_project_loads_compile_commands_1(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    __create_compile_commands(proj_dir)
+    ret, stdout, _ = cppcheck(['--project=proj2/proj2.cppcheck'], cwd=tmp_path)
+    file1 = os.path.join('proj2', 'a', 'a.c')
+    file2 = os.path.join('proj2', 'b', 'b.c')
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s ...' % file1) >= 0
+    assert stdout.find('Checking %s ...' % file2) >= 0
+
+def test_gui_project_loads_compile_commands_2(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    __create_compile_commands(proj_dir)
+    exclude_path_1 = 'proj2/b'
+    create_gui_project_file(os.path.join(proj_dir, 'test.cppcheck'),
+                            import_project='compile_commands.json',
+                            exclude_paths=[exclude_path_1])
+    ret, stdout, _ = cppcheck(['--project=' + os.path.join('proj2','test.cppcheck')], cwd=tmp_path)
+    file1 = os.path.join('proj2', 'a', 'a.c')
+    file2 = os.path.join('proj2', 'b', 'b.c') # Excluded by test.cppcheck
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s ...' % file1) >= 0
+    assert stdout.find('Checking %s ...' % file2) < 0
+
+
+def test_gui_project_loads_relative_vs_solution(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    create_gui_project_file(os.path.join(tmp_path, 'test.cppcheck'), import_project='proj2/proj2.sln')
+    ret, stdout, _ = cppcheck(['--project=test.cppcheck'], cwd=tmp_path)
+    file1 = os.path.join('proj2', 'a', 'a.c')
+    file2 = os.path.join('proj2', 'b', 'b.c')
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s Debug|Win32...' % file1) >= 0
+    assert stdout.find('Checking %s Debug|x64...' % file1) >= 0
+    assert stdout.find('Checking %s Release|Win32...' % file1) >= 0
+    assert stdout.find('Checking %s Release|x64...' % file1) >= 0
+    assert stdout.find('Checking %s Debug|Win32...' % file2) >= 0
+    assert stdout.find('Checking %s Debug|x64...' % file2) >= 0
+    assert stdout.find('Checking %s Release|Win32...' % file2) >= 0
+    assert stdout.find('Checking %s Release|x64...' % file2) >= 0
+
+def test_gui_project_loads_absolute_vs_solution(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    create_gui_project_file(os.path.join(tmp_path, 'test.cppcheck'), import_project=os.path.join(proj_dir, 'proj2.sln'))
+    ret, stdout, _ = cppcheck(['--project=test.cppcheck'], cwd=tmp_path)
+    file1 = os.path.join(proj_dir, 'a', 'a.c')
+    file2 = os.path.join(proj_dir, 'b', 'b.c')
+    assert ret == 0, stdout
+    assert stdout.find('Checking %s Debug|Win32...' % file1) >= 0
+    assert stdout.find('Checking %s Debug|x64...' % file1) >= 0
+    assert stdout.find('Checking %s Release|Win32...' % file1) >= 0
+    assert stdout.find('Checking %s Release|x64...' % file1) >= 0
+    assert stdout.find('Checking %s Debug|Win32...' % file2) >= 0
+    assert stdout.find('Checking %s Debug|x64...' % file2) >= 0
+    assert stdout.find('Checking %s Release|Win32...' % file2) >= 0
+    assert stdout.find('Checking %s Release|x64...' % file2) >= 0
+
+def test_gui_project_loads_relative_vs_solution_2(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    create_gui_project_file(os.path.join(tmp_path, 'test.cppcheck'), root_path='proj2', import_project='proj2/proj2.sln')
+    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'], cwd=tmp_path)
+    assert ret == 0, stdout
+    assert stderr == __ERR_A + __ERR_B
+
+def test_gui_project_loads_relative_vs_solution_with_exclude(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    create_gui_project_file(os.path.join(tmp_path, 'test.cppcheck'), root_path='proj2', import_project='proj2/proj2.sln', exclude_paths=['b'])
+    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'], cwd=tmp_path)
+    assert ret == 0, stdout
+    assert stderr == __ERR_A
+
+def test_gui_project_loads_absolute_vs_solution_2(tmp_path):
+    proj_dir = tmp_path / 'proj2'
+    shutil.copytree(__proj_dir, proj_dir)
+    create_gui_project_file(os.path.join(tmp_path, 'test.cppcheck'),
+                            root_path=str(proj_dir),
+                            import_project=os.path.join(proj_dir, 'proj2.sln'))
+    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'], cwd=tmp_path)
+    assert ret == 0, stdout
+    assert stderr == __ERR_A + __ERR_B
diff --git a/test/cli/test-project.py b/test/cli/project_test.py
similarity index 74%
rename from test/cli/test-project.py
rename to test/cli/project_test.py
index 8f6e221f765..ec1ef56d7d1 100644
--- a/test/cli/test-project.py
+++ b/test/cli/project_test.py
@@ -3,6 +3,7 @@
 import pytest
 import os
 import json
+import sys
 from testutils import cppcheck
 
 
@@ -16,7 +17,7 @@ def test_missing_project(project_ext):
     assert "" == stderr
 
 
-def _test_project_error(tmpdir, ext, content, expected):
+def __test_project_error(tmpdir, ext, content, expected):
     project_file = os.path.join(tmpdir, "file.{}".format(ext))
 
     with open(project_file, 'w') as f:
@@ -37,7 +38,7 @@ def _test_project_error(tmpdir, ext, content, expected):
     ("cppcheck", "Cppcheck GUI project file is not a valid XML - XML_ERROR_EMPTY_DOCUMENT")
 ])
 def test_empty_project(tmpdir, project_ext, expected):
-    _test_project_error(tmpdir, project_ext, None, expected)
+    __test_project_error(tmpdir, project_ext, None, expected)
 
 
 def test_json_entry_file_not_found(tmpdir):
@@ -48,9 +49,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
 
-    _test_project_error(tmpdir, "json", json.dumps(compilation_db), expected)
+    if sys.platform == "win32":
+        missing_file_posix = missing_file_posix.replace('\\', '/')
+
+    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"nofile:0:0: error: File is missing: {missing_file_posix} [missingFile]\n"
 
 
 def test_json_no_arguments(tmpdir):
@@ -62,7 +76,7 @@ def test_json_no_arguments(tmpdir):
 
     expected = "no 'arguments' or 'command' field found in compilation database entry"
 
-    _test_project_error(tmpdir, "json", json.dumps(compilation_db), expected)
+    __test_project_error(tmpdir, "json", json.dumps(compilation_db), expected)
 
 
 def test_json_invalid_arguments(tmpdir):
@@ -75,7 +89,7 @@ def test_json_invalid_arguments(tmpdir):
 
     expected = "'arguments' field in compilation database entry is not a JSON array"
 
-    _test_project_error(tmpdir, "json", json.dumps(compilation_db), expected)
+    __test_project_error(tmpdir, "json", json.dumps(compilation_db), expected)
 
 
 def test_sln_invalid_file(tmpdir):
@@ -83,7 +97,7 @@ def test_sln_invalid_file(tmpdir):
 
     expected = "Visual Studio solution file header not found"
 
-    _test_project_error(tmpdir, "sln", content, expected)
+    __test_project_error(tmpdir, "sln", content, expected)
 
 
 def test_sln_no_header(tmpdir):
@@ -92,7 +106,7 @@ def test_sln_no_header(tmpdir):
 
     expected = "Visual Studio solution file header not found"
 
-    _test_project_error(tmpdir, "sln", content, expected)
+    __test_project_error(tmpdir, "sln", content, expected)
 
 
 def test_sln_no_projects(tmpdir):
@@ -101,7 +115,7 @@ def test_sln_no_projects(tmpdir):
 
     expected = "no projects found in Visual Studio solution file"
 
-    _test_project_error(tmpdir, "sln", content, expected)
+    __test_project_error(tmpdir, "sln", content, expected)
 
 
 def test_sln_project_file_not_found(tmpdir):
@@ -117,9 +131,11 @@ def test_sln_project_file_not_found(tmpdir):
               "EndProject\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, "cli\\cli.vcxproj"))
+               "cppcheck: error: failed to load '{}' from Visual Studio solution".format(os.path.join(tmpdir, "cli/cli.vcxproj"))
+    if sys.platform == "win32":
+        expected = expected.replace('\\', '/')
 
-    _test_project_error(tmpdir, "sln", content, expected)
+    __test_project_error(tmpdir, "sln", content, expected)
 
 
 def test_vcxproj_no_xml_root(tmpdir):
@@ -127,7 +143,7 @@ def test_vcxproj_no_xml_root(tmpdir):
 
     expected = "Visual Studio project file has no XML root node"
 
-    _test_project_error(tmpdir, "vcxproj", content, expected)
+    __test_project_error(tmpdir, "vcxproj", content, expected)
 
 
 def test_bpr_no_xml_root(tmpdir):
@@ -135,7 +151,7 @@ def test_bpr_no_xml_root(tmpdir):
 
     expected = "Borland project file has no XML root node"
 
-    _test_project_error(tmpdir, "bpr", content, expected)
+    __test_project_error(tmpdir, "bpr", content, expected)
 
 
 def test_cppcheck_no_xml_root(tmpdir):
@@ -143,4 +159,4 @@ def test_cppcheck_no_xml_root(tmpdir):
 
     expected = "Cppcheck GUI project file has no XML root node"
 
-    _test_project_error(tmpdir, "cppcheck", content, expected)
+    __test_project_error(tmpdir, "cppcheck", content, expected)
diff --git a/test/cli/qml_test.py b/test/cli/qml_test.py
new file mode 100644
index 00000000000..5ce7428b0ae
--- /dev/null
+++ b/test/cli/qml_test.py
@@ -0,0 +1,63 @@
+
+# python3 -m pytest test-qml.py
+
+import os
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+# there are unused functions. But fillSampleData is not unused because that is referenced from main.qml
+__project_dir = os.path.join(__script_dir, 'QML-Samples-TableView')
+__project_dir_sep = __project_dir + os.path.sep
+
+
+def __test_unused_functions(extra_args):
+    args = [
+        '-q',
+        '--template=simple',
+        '--library=qt',
+        '--enable=unusedFunction',
+        __project_dir
+    ]
+    args += extra_args
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == []
+    lines = stderr.splitlines()
+    lines.sort()
+    # there are unused functions. But fillSampleData is not unused because that is referenced from main.qml
+    assert lines == [
+        "{}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
+
+
+def test_unused_functions():
+    __test_unused_functions(['-j1', '--no-cppcheck-build-dir'])
+
+
+def test_unused_functions_j():
+    args = [
+        '-q',
+        '--template=simple',
+        '--library=qt',
+        '--enable=unusedFunction',
+        '-j2',
+        '--no-cppcheck-build-dir',
+        __project_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == ["cppcheck: unusedFunction check requires --cppcheck-build-dir to be active with -j."]
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_unused_functions_builddir(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions(['--cppcheck-build-dir={}'.format(build_dir)])
+
+
+# TODO: test with project file
+# TODO: test with FileSettings
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/rules_test.py b/test/cli/rules_test.py
new file mode 100644
index 00000000000..241cdf34c51
--- /dev/null
+++ b/test/cli/rules_test.py
@@ -0,0 +1,186 @@
+import os
+import sys
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__root_dir = os.path.abspath(os.path.join(__script_dir, '..', '..'))
+__rules_dir = os.path.join(__root_dir, 'rules')
+
+
+def test_empty_catch_block(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f()
+{
+    try
+    {
+    }
+    catch (...)
+    {
+    }
+}
+""")
+
+    rule_file = os.path.join(__rules_dir, 'empty-catch-block.xml')
+    args = [
+        '--template=simple',
+        '--rule-file={}'.format(rule_file),
+        str(test_file)
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: \\}\\s*catch\\s*\\(.*\\)\\s*\\{\\s*\\}'
+    ]
+    assert stderr.splitlines() == [
+        '{}:6:0: style: Empty catch block found. [rule]'.format(test_file)
+    ]
+
+
+def test_show_all_defines(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write("""
+#define DEF_1
+
+void f()
+{
+}
+""")
+
+    rule_file = os.path.join(__rules_dir, 'show-all-defines.rule')
+    args = [
+        '--template=simple',
+        '-DDEF_2',
+        '--rule-file={}'.format(rule_file),
+        str(test_file)
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: .*',
+        'Checking {}: DEF_2=1...'.format(test_file)
+    ]
+    if sys.platform == 'win32':
+        test_file = str(test_file).replace('\\', '/')
+    assert stderr.splitlines() == [
+        # TODO: this message looks strange
+        ":1:0: information: found ' # line 2 \"{}\" # define DEF_1' [showalldefines]".format(test_file)
+    ]
+
+
+def test_stl(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f()
+{
+    std::string s;
+    if (s.find("t") == 17)
+    {
+    }
+}
+""")
+
+    rule_file = os.path.join(__rules_dir, 'stl.xml')
+    args = [
+        '--template=simple',
+        '--rule-file={}'.format(rule_file),
+        str(test_file)
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule:  \\. find \\( "[^"]+?" \\) == \\d+ '
+    ]
+    assert stderr.splitlines() == [
+        '{}:5:0: performance: When looking for a string at a fixed position compare [UselessSTDStringFind]'.format(test_file)
+    ]
+
+
+def test_strlen_empty_str(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f(const char* s)
+{
+    if (strlen(s) > 0)
+    {
+    }
+}
+""")
+
+    rule_file = os.path.join(__rules_dir, 'strlen-empty-str.xml')
+    args = [
+        '--template=simple',
+        '--rule-file={}'.format(rule_file),
+        str(test_file)
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule:  if \\( ([!] )*?(strlen) \\( \\w+? \\) ([>] [0] )*?\\) { '
+    ]
+    assert stderr.splitlines() == [
+        '{}:4:0: performance: Using strlen() to check if a string is empty is not efficient. [StrlenEmptyString]'.format(test_file)
+    ]
+
+
+def test_suggest_nullptr(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f()
+{
+    const char* p = 0;
+}
+""")
+
+    rule_file = os.path.join(__rules_dir, 'suggest_nullptr.xml')
+    args = [
+        '--template=simple',
+        '--rule-file={}'.format(rule_file),
+        str(test_file)
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule: (\\b\\w+\\b) \\* (\\b\\w+\\b) = 0 ;'
+    ]
+    assert stderr.splitlines() == [
+        "{}:4:0: style: Prefer to use a 'nullptr' instead of initializing a pointer with 0. [modernizeUseNullPtr]".format(test_file)
+    ]
+
+
+def test_unused_deref(tmp_path):
+    test_file = tmp_path / 'test.cpp'
+    with open(test_file, 'wt') as f:
+        f.write("""
+void f(const char* p)
+{
+    *p++;
+}
+""")
+
+    rule_file = os.path.join(__rules_dir, 'unused-deref.xml')
+    args = [
+        '--template=simple',
+        '--rule-file={}'.format(rule_file),
+        str(test_file)
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert ret == 0
+    assert stdout.splitlines() == [
+        'Checking {} ...'.format(test_file),
+        'Processing rule:  [;{}] [*] \\w+? (\\+\\+|\\-\\-) ; '
+    ]
+    assert stderr.splitlines() == [
+        '{}:3:0: style: Redundant * found, "*p++" is the same as "*(p++)". [UnusedDeref]'.format(test_file)
+    ]
diff --git a/test/cli/samples_test.py b/test/cli/samples_test.py
new file mode 100644
index 00000000000..d8459509d3a
--- /dev/null
+++ b/test/cli/samples_test.py
@@ -0,0 +1,45 @@
+import os
+import sys
+
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+__root_dir = os.path.abspath(os.path.join(__script_dir, '..', '..'))
+
+
+def test_samples():
+    failures = {}
+
+    samples_dir = os.path.join(__root_dir, 'samples')
+    for entry in os.listdir(samples_dir):
+        sample_dir = os.path.join(samples_dir, entry)
+        if not os.path.isdir(sample_dir):
+            continue
+
+        with open(os.path.join(sample_dir, 'out.txt')) as out_in:
+            out_txt = out_in.read()
+        if sys.platform != 'win32':
+            out_txt = out_txt.replace('\\', '/')
+
+        if not os.path.exists(os.path.join(sample_dir, 'good.c')):
+            good_src = os.path.join('samples', entry, 'good.cpp')
+            bad_src = os.path.join('samples', entry, 'bad.cpp')
+        else:
+            good_src = os.path.join('samples', entry, 'good.c')
+            bad_src = os.path.join('samples', entry, 'bad.c')
+
+        # check that good input does not produce any warnings
+        ret, _, stderr = cppcheck(['-q', '--enable=all', '--disable=missingInclude', '--inconclusive', '--check-level=exhaustive', '--error-exitcode=1', good_src], cwd=__root_dir)
+        if ret != 0:
+            failures[good_src] = stderr
+
+        # check that the bad inout produces a warning
+        ret, _, stderr = cppcheck(['-q', '--enable=all', '--disable=missingInclude', '--inconclusive', '--check-level=exhaustive', '--error-exitcode=1', bad_src], cwd=__root_dir)
+        if ret != 1:
+            failures[bad_src] = stderr
+
+        # check that the bad input procudes the expected output
+        if not stderr == out_txt:
+            failures[bad_src] = stderr
+
+    assert failures == {}
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/shared-items-project/Main/Main.vcxproj b/test/cli/shared-items-project/Main/Main.vcxproj
new file mode 100644
index 00000000000..17c6fc98aa3
--- /dev/null
+++ b/test/cli/shared-items-project/Main/Main.vcxproj
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{074143a3-6080-409a-a181-24e4e468bfd8}</ProjectGuid>
+    <RootNamespace>Blub</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="$(SolutionDir)\Shared\Shared.vcxitems" Label="Shared" />
+  </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)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="MainFile.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/test/cli/shared-items-project/Main/MainFile.cpp b/test/cli/shared-items-project/Main/MainFile.cpp
new file mode 100644
index 00000000000..bbfcb9626b7
--- /dev/null
+++ b/test/cli/shared-items-project/Main/MainFile.cpp
@@ -0,0 +1,7 @@
+#include <TestClass.h>
+
+int main(void)
+{
+    Shared::TestClass test{};
+    return 0;
+}
\ No newline at end of file
diff --git a/test/cli/shared-items-project/Shared/Shared.vcxitems b/test/cli/shared-items-project/Shared/Shared.vcxitems
new file mode 100644
index 00000000000..6f904c81453
--- /dev/null
+++ b/test/cli/shared-items-project/Shared/Shared.vcxitems
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{3633ee6f-e5e8-46fc-87c9-f13a18db966a}</ItemsProjectGuid>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)TestClass.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)TestClass.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/test/cli/shared-items-project/Shared/TestClass.cpp b/test/cli/shared-items-project/Shared/TestClass.cpp
new file mode 100644
index 00000000000..4fa992fce1b
--- /dev/null
+++ b/test/cli/shared-items-project/Shared/TestClass.cpp
@@ -0,0 +1,9 @@
+#include "TestClass.h"
+
+using namespace Shared;
+
+TestClass::TestClass()
+{}
+
+TestClass::~TestClass()
+{}
diff --git a/test/cli/shared-items-project/Shared/TestClass.h b/test/cli/shared-items-project/Shared/TestClass.h
new file mode 100644
index 00000000000..7fbdb22dcde
--- /dev/null
+++ b/test/cli/shared-items-project/Shared/TestClass.h
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace Shared
+{
+    class TestClass
+    {
+    public:
+        explicit TestClass();
+        virtual ~TestClass();
+    };
+} // namespace Shared
diff --git a/test/cli/shared-items-project/Solution.sln b/test/cli/shared-items-project/Solution.sln
new file mode 100644
index 00000000000..6a4aac0fd2f
--- /dev/null
+++ b/test/cli/shared-items-project/Solution.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34607.119
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "Shared\Shared.vcxitems", "{3633EE6F-E5E8-46FC-87C9-F13A18DB966A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "Main\Main.vcxproj", "{074143A3-6080-409A-A181-24E4E468BFD8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{074143A3-6080-409A-A181-24E4E468BFD8}.Release|x64.ActiveCfg = Release|x64
+		{074143A3-6080-409A-A181-24E4E468BFD8}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {510D1526-E6EE-452F-A697-173A3D4C4E93}
+	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		Shared\Shared.vcxitems*{074143a3-6080-409a-a181-24e4e468bfd8}*SharedItemsImports = 4
+		Shared\Shared.vcxitems*{3633ee6f-e5e8-46fc-87c9-f13a18db966a}*SharedItemsImports = 9
+	EndGlobalSection
+EndGlobal
diff --git a/test/cli/suppress-syntaxError_test.py b/test/cli/suppress-syntaxError_test.py
new file mode 100644
index 00000000000..9b58bf4e7c3
--- /dev/null
+++ b/test/cli/suppress-syntaxError_test.py
@@ -0,0 +1,31 @@
+
+# python -m pytest test-suppress-syntaxError.py
+
+import os
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+def test_j():
+    ret, stdout, stderr = cppcheck(['-q', '--error-exitcode=1', '-j2', '-q', 'proj-suppress-syntaxError'], cwd=__script_dir)
+    assert ret == 1, stdout
+    assert len(stderr) > 0
+
+def test_suppress_j():
+    ret, stdout, stderr = cppcheck(['-q', '--error-exitcode=1', '--suppress=*:proj-suppress-syntaxError/*', '-j2', '-q', 'proj-suppress-syntaxError'], cwd=__script_dir)
+    assert ret == 0, stdout
+    assert len(stderr) == 0
+
+# TODO: test with -j2
+def test_safety_suppress_syntax_error_implicitly(tmpdir):
+    ret, stdout, stderr = cppcheck(['-q', '--safety', '--suppress=*', 'proj-suppress-syntaxError', '-j1'], remove_checkers_report=False, cwd=__script_dir)
+    assert ret == 1, stdout
+    assert '[syntaxError]' in stderr
+    assert 'Active checkers: There was critical errors' in stderr
+
+# TODO: test with -j2
+def test_safety_suppress_syntax_error_explicitly():
+    ret, stdout, stderr = cppcheck(['-q', '--safety', '--suppress=syntaxError', 'proj-suppress-syntaxError', '-j1'], remove_checkers_report=False, cwd=__script_dir)
+    assert ret == 1, stdout
+    assert '[syntaxError]' not in stderr
+    assert 'Active checkers: There was critical errors' in stderr
diff --git a/test/cli/test-clang-import.py b/test/cli/test-clang-import.py
deleted file mode 100644
index c4af2ce0980..00000000000
--- a/test/cli/test-clang-import.py
+++ /dev/null
@@ -1,124 +0,0 @@
-
-# python -m pytest test-clang-import.py
-
-import os
-import re
-import subprocess
-import pytest
-from testutils import cppcheck
-
-try:
-    subprocess.call(['clang', '--version'])
-except OSError:
-    pytest.skip("'clang' does not exist", allow_module_level=True)
-
-
-def get_debug_section(title, stdout):
-    s = re.sub(r'0x[0-9a-fA-F]+', '0x12345678', stdout)
-    s = re.sub(r'nestedIn: Struct', 'nestedIn: Class', s)
-    s = re.sub(r'classDef: struct', 'classDef: class', s)
-    s = re.sub(r'isInline: [a-z]+', 'isInline: ---', s)
-    s = re.sub(r'needInitialization: .*', 'needInitialization: ---', s)
-    s = re.sub(r'functionOf: .*', 'functionOf: ---', s)
-    s = re.sub(r'0x12345678 Struct', '0x12345678 Class', s)
-
-    if title == '##AST':
-        # TODO set types
-        s = re.sub(r"return '[a-zA-Z0-9: *]+'", "return", s)
-
-    pos1 = s.find(title)
-    assert pos1 > 0, 'title not found'
-    pos1 = s.find('\n', pos1) + 1
-    assert pos1 > 0
-    pos2 = s.find("\n##", pos1)
-    if pos2 < 0:
-        return s[pos1:]
-    return s[pos1:pos2-1]
-
-
-def check_symbol_database(code):
-    testfile = 'test.cpp'
-    with open(testfile, 'w+t') as f:
-        f.write(code)
-    ret1, stdout1, _ = cppcheck(['--clang', '--debug', '-v', testfile])
-    ret2, stdout2, _ = cppcheck(['--debug', '-v', testfile])
-    os.remove(testfile)
-    assert 0 == ret1, stdout1
-    assert 0 == ret2, stdout2
-    assert get_debug_section('### Symbol database', stdout1) == get_debug_section('### Symbol database', stdout2)
-
-
-def check_ast(code):
-    testfile = 'test.cpp'
-    with open(testfile, 'w+t') as f:
-        f.write(code)
-    ret1, stdout1, _ = cppcheck(['--clang', '--debug', '-v', testfile])
-    ret2, stdout2, _ = cppcheck(['--debug', '-v', testfile])
-    os.remove(testfile)
-    assert 0 == ret1, stdout1
-    assert 0 == ret2, stdout1
-    assert get_debug_section('##AST', stdout1) == get_debug_section('##AST', stdout2)
-
-
-def todo_check_ast(code):
-    testfile = 'test.cpp'
-    with open(testfile, 'w+t') as f:
-        f.write(code)
-    ret1, stdout1, _ = cppcheck(['--clang', '--debug', '-v', testfile])
-    ret2, stdout2, _ = cppcheck(['--debug', '-v', testfile])
-    os.remove(testfile)
-    assert 0 == ret1, stdout1
-    assert 0 == ret2, stdout2
-    assert get_debug_section('##AST', stdout1) != get_debug_section('##AST', stdout2)
-
-
-
-def test_symbol_database_1():
-    check_symbol_database('int main(){return 0;}')
-
-def test_symbol_database_2():
-    check_symbol_database('struct Foo { void f(); }; void Foo::f() {}')
-
-def test_symbol_database_3():
-    check_symbol_database('struct Fred { int a; }; int b; void f(int c, int d) { int e; }')
-
-def test_symbol_database_4():
-    check_symbol_database('void f(const int x) {}')
-
-def test_symbol_database_5():
-    check_symbol_database('void f(int);')
-
-def test_symbol_database_6():
-    check_symbol_database('inline static int foo(int x) { return x; }')
-
-def test_symbol_database_7():
-    check_symbol_database('struct S {int x;}; void f(struct S *s) {}')
-
-def test_symbol_database_class_access_1():
-    check_symbol_database('class Fred { void foo ( ) {} } ;')
-
-def test_symbol_database_class_access_2():
-    check_symbol_database('class Fred { protected: void foo ( ) {} } ;')
-
-def test_symbol_database_class_access_3():
-    check_symbol_database('class Fred { public: void foo ( ) {} } ;')
-
-def test_symbol_database_operator():
-    check_symbol_database('struct Fred { void operator=(int x); };')
-
-def test_symbol_database_struct_1():
-    check_symbol_database('struct S {};')
-
-def test_ast_calculations():
-    check_ast('int x = 5; int y = (x + 4) * 2;')
-    check_ast('long long dostuff(int x) { return x ? 3 : 5; }')
-
-def test_ast_control_flow():
-    check_ast('void foo(int x) { if (x > 5){} }')
-    check_ast('int dostuff() { for (int x = 0; x < 10; x++); }')
-    check_ast('void foo(int x) { switch (x) {case 1: break; } }')
-    check_ast('void foo(int a, int b, int c) { foo(a,b,c); }')
-
-def test_ast():
-    check_ast('struct S { int x; }; S* foo() { return new S(); }')
-
diff --git a/test/cli/test-helloworld.py b/test/cli/test-helloworld.py
deleted file mode 100644
index 5bdf6294574..00000000000
--- a/test/cli/test-helloworld.py
+++ /dev/null
@@ -1,214 +0,0 @@
-
-# python -m pytest test-helloworld.py
-
-import os
-import re
-import tempfile
-import pytest
-import glob
-
-from testutils import create_gui_project_file, cppcheck
-
-# Run Cppcheck from project path
-def cppcheck_local(args):
-    cwd = os.getcwd()
-    os.chdir('helloworld')
-    ret, stdout, stderr = cppcheck(args)
-    os.chdir(cwd)
-    return ret, stdout, stderr
-
-def getRelativeProjectPath():
-    return 'helloworld'
-
-def getAbsoluteProjectPath():
-    return os.path.join(os.getcwd(), 'helloworld')
-
-# 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():
-    ret, stdout, stderr = cppcheck(['--template=cppcheck1', 'helloworld'])
-    filename = os.path.join('helloworld', 'main.c')
-    assert ret == 0, stdout
-    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
-
-
-def test_local_path():
-    ret, stdout, stderr = cppcheck_local(['--template=cppcheck1', '.'])
-    assert ret == 0, stdout
-    assert stderr == '[main.c:5]: (error) Division by zero.\n'
-
-def test_absolute_path():
-    prjpath = getAbsoluteProjectPath()
-    ret, stdout, stderr = cppcheck(['--template=cppcheck1', prjpath])
-    filename = os.path.join(prjpath, 'main.c')
-    assert ret == 0, stdout
-    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
-
-def test_addon_local_path():
-    ret, stdout, stderr = cppcheck_local(['--addon=misra', '--enable=style', '--template=cppcheck1', '.'])
-    assert ret == 0, stdout
-    assert stderr == ('[main.c:5]: (error) Division by zero.\n'
-                      '[main.c:1]: (style) misra violation (use --rule-texts=<file> to get proper output)\n')
-
-def test_addon_local_path_not_enable():
-    ret, stdout, stderr = cppcheck_local(['--addon=misra', '--template=cppcheck1', '.'])
-    assert ret == 0, stdout
-    assert stderr == '[main.c:5]: (error) Division by zero.\n'
-
-def test_addon_absolute_path():
-    prjpath = getAbsoluteProjectPath()
-    ret, stdout, stderr = cppcheck(['--addon=misra', '--enable=style', '--template=cppcheck1', prjpath])
-    filename = os.path.join(prjpath, 'main.c')
-    assert ret == 0, stdout
-    assert stderr == ('[%s:5]: (error) Division by zero.\n'
-                      '[%s:1]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
-
-def test_addon_relative_path():
-    prjpath = getRelativeProjectPath()
-    ret, stdout, stderr = cppcheck(['--platform=native', '--addon=misra', '--enable=style', '--template=cppcheck1', prjpath])
-    filename = os.path.join(prjpath, 'main.c')
-    assert ret == 0, stdout
-    assert stdout == ('Checking %s ...\n'
-                      'Checking %s: SOME_CONFIG...\n' % (filename, filename))
-    assert stderr == ('[%s:5]: (error) Division by zero.\n'
-                      '[%s:1]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
-
-def test_addon_with_gui_project():
-    project_file = 'helloworld/test.cppcheck'
-    create_gui_project_file(project_file, paths=['.'], addon='misra')
-    ret, stdout, stderr = cppcheck(['--platform=native', '--template=cppcheck1', '--enable=style', '--project=' + project_file])
-    filename = os.path.join('helloworld', 'main.c')
-    assert ret == 0, stdout
-    assert stdout == 'Checking %s ...\n' % filename
-    assert stderr == ('[%s:5]: (error) Division by zero.\n'
-                      '[%s:1]: (style) misra violation (use --rule-texts=<file> to get proper output)\n' % (filename, filename))
-
-def test_basepath_relative_path():
-    prjpath = getRelativeProjectPath()
-    ret, stdout, stderr = cppcheck([prjpath, '--template=cppcheck1', '-rp=' + prjpath])
-    assert ret == 0, stdout
-    assert stderr == '[main.c:5]: (error) Division by zero.\n'
-
-def test_basepath_absolute_path():
-    prjpath = getAbsoluteProjectPath()
-    ret, stdout, stderr = cppcheck(['--template=cppcheck1', prjpath, '-rp=' + prjpath])
-    assert ret == 0, stdout
-    assert stderr == '[main.c:5]: (error) Division by zero.\n'
-
-def test_vs_project_local_path():
-    ret, stdout, stderr = cppcheck_local(['--template=cppcheck1', '--project=helloworld.vcxproj'])
-    assert ret == 0, stdout
-    assert getVsConfigs(stdout, 'main.c') == 'Debug|Win32 Debug|x64 Release|Win32 Release|x64'
-    assert stderr == '[main.c:5]: (error) Division by zero.\n'
-
-def test_vs_project_relative_path():
-    prjpath = getRelativeProjectPath()
-    ret, stdout, stderr = cppcheck(['--template=cppcheck1', '--project=' + os.path.join(prjpath, 'helloworld.vcxproj')])
-    filename = os.path.join(prjpath, 'main.c')
-    assert ret == 0, stdout
-    assert getVsConfigs(stdout, filename) == 'Debug|Win32 Debug|x64 Release|Win32 Release|x64'
-    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
-
-def test_vs_project_absolute_path():
-    prjpath = getAbsoluteProjectPath()
-    ret, stdout, stderr = cppcheck(['--template=cppcheck1', '--project=' + os.path.join(prjpath, 'helloworld.vcxproj')])
-    filename = os.path.join(prjpath, 'main.c')
-    assert ret == 0, stdout
-    assert getVsConfigs(stdout, filename) == 'Debug|Win32 Debug|x64 Release|Win32 Release|x64'
-    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
-
-def test_cppcheck_project_local_path():
-    ret, stdout, stderr = cppcheck_local(['--template=cppcheck1', '--platform=win64', '--project=helloworld.cppcheck'])
-    assert ret == 0, stdout
-    assert getVsConfigs(stdout, 'main.c') == 'Debug|x64'
-    assert stderr == '[main.c:5]: (error) Division by zero.\n'
-
-def test_cppcheck_project_relative_path():
-    prjpath = getRelativeProjectPath()
-    ret, stdout, stderr = cppcheck(['--template=cppcheck1', '--platform=win64', '--project=' + os.path.join(prjpath, 'helloworld.cppcheck')])
-    filename = os.path.join(prjpath, 'main.c')
-    assert ret == 0, stdout
-    assert getVsConfigs(stdout, filename) == 'Debug|x64'
-    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
-
-def test_cppcheck_project_absolute_path():
-    prjpath = getAbsoluteProjectPath()
-    ret, stdout, stderr = cppcheck(['--template=cppcheck1', '--platform=win64', '--project=' + os.path.join(prjpath, 'helloworld.cppcheck')])
-    filename = os.path.join(prjpath, 'main.c')
-    assert ret == 0, stdout
-    assert getVsConfigs(stdout, filename) == 'Debug|x64'
-    assert stderr == '[%s:5]: (error) Division by zero.\n' % filename
-
-def test_suppress_command_line():
-    prjpath = getRelativeProjectPath()
-    ret, stdout, stderr = cppcheck(['--suppress=zerodiv:' + os.path.join(prjpath, 'main.c'), prjpath])
-    assert ret == 0, stdout
-    assert stderr == ''
-
-    prjpath = getAbsoluteProjectPath()
-    ret, stdout, stderr = cppcheck(['--suppress=zerodiv:' + os.path.join(prjpath, 'main.c'), prjpath])
-    assert ret == 0, stdout
-    assert stderr == ''
-
-def test_suppress_project():
-    project_file = os.path.join('helloworld', 'test.cppcheck')
-    create_gui_project_file(project_file,
-                            paths=['.'],
-                            suppressions=[{'fileName':'main.c', 'id':'zerodiv'}])
-
-    # Relative path
-    ret, stdout, stderr = cppcheck(['--project=' + project_file])
-    assert ret == 0, stdout
-    assert stderr == ''
-
-    # Absolute path
-    ret, stdout, stderr = cppcheck(['--project=' + os.path.join(os.getcwd(), 'helloworld', 'test.cppcheck')])
-    assert ret == 0, stdout
-    assert stderr == ''
-
-
-def test_exclude():
-    prjpath = getRelativeProjectPath()
-    ret, stdout, _ = cppcheck(['-i' + prjpath, '--platform=win64', '--project=' + os.path.join(prjpath, 'helloworld.cppcheck')])
-    assert ret == 1
-    assert stdout == 'cppcheck: error: no C or C++ source files found.\n'
-
-
-def test_build_dir_dump_output():
-    with tempfile.TemporaryDirectory() as tempdir:
-        args = f'--cppcheck-build-dir={tempdir} --addon=misra helloworld'
-
-        cppcheck(args.split())
-        cppcheck(args.split())
-
-        filename = f'{tempdir}/main.a1.*.dump'
-        filelist = glob.glob(filename)
-        assert(len(filelist) == 0)
-
-
-def __test_missing_include_system(use_j):
-    args = ['--enable=missingInclude', '--suppress=zerodiv', '--template={file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]', 'helloworld']
-    if use_j:
-        args.insert(0, '-j2')
-
-    _, _, stderr = cppcheck(args)
-    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'
-
-def test_missing_include_system():
-    __test_missing_include_system(False)
-
-def test_missing_include_system_j(): #11283
-    __test_missing_include_system(True)
diff --git a/test/cli/test-inline-suppress.py b/test/cli/test-inline-suppress.py
deleted file mode 100644
index f443896321c..00000000000
--- a/test/cli/test-inline-suppress.py
+++ /dev/null
@@ -1,100 +0,0 @@
-
-# python -m pytest test-inline-suppress.py
-
-import json
-import os
-import tempfile
-from testutils import cppcheck
-
-def create_unused_function_compile_commands():
-    prjpath = os.path.realpath('proj-inline-suppress-unusedFunction')
-    compile_commands = os.path.join(prjpath, 'compile_commands.json')
-    j = [{'directory': prjpath,
-          'command': '/usr/bin/c++ -I"' + prjpath + '" -o "' + os.path.join(prjpath, 'B.cpp.o') + '" -c "' + os.path.join(prjpath, 'B.cpp') + '"',
-          'file': os.path.join(prjpath, 'B.cpp')},
-         {'directory': prjpath,
-          'command': '/usr/bin/c++ -I"' + prjpath + '" -o "' + os.path.join(prjpath, 'A.cpp.o') + '" -c "' + os.path.join(prjpath, 'A.cpp') + '"',
-          'file': os.path.join(prjpath, 'A.cpp')}]
-    with open(compile_commands, 'wt') as f:
-        f.write(json.dumps(j, indent=4))
-
-def test1():
-    ret, stdout, stderr = cppcheck(['--inline-suppr', 'proj-inline-suppress'])
-    assert ret == 0, stdout
-    assert stderr == ''
-
-def test2():
-    ret, stdout, stderr = cppcheck(['proj-inline-suppress'])
-    assert ret == 0, stdout
-    assert len(stderr) > 0
-
-def test_unmatched_suppression():
-    ret, stdout, stderr = cppcheck(['--inline-suppr', '--enable=information', '--error-exitcode=1', 'proj-inline-suppress/2.c'])
-    assert ret == 1
-    assert 'Unmatched suppression: some_warning_id' in stderr
-
-def test_unmatched_suppression_path_with_extra_stuf():
-    ret, stdout, stderr = cppcheck(['--inline-suppr', '--enable=information', '--error-exitcode=1', './proj-inline-suppress/2.c'])
-    assert ret == 1
-    assert 'Unmatched suppression: some_warning_id' in stderr
-
-def test_backwards_compatibility():
-    ret, stdout, stderr = cppcheck(['proj-inline-suppress/3.cpp'])
-    assert '[zerodiv]' in stderr
-
-    ret, stdout, stderr = cppcheck(['--inline-suppr', 'proj-inline-suppress/3.cpp'])
-    assert ret == 0, stdout
-    assert stderr == ''
-
-def test_compile_commands_unused_function():
-    create_unused_function_compile_commands()
-    ret, stdout, stderr = cppcheck(['--enable=all', '--error-exitcode=1', '--project=./proj-inline-suppress-unusedFunction/compile_commands.json'])
-    assert ret == 1
-    assert 'unusedFunction' in stderr
-
-def test_compile_commands_unused_function_suppression():
-    create_unused_function_compile_commands()
-    ret, stdout, stderr = cppcheck(['--enable=all', '--inline-suppr', '--error-exitcode=1', '--project=./proj-inline-suppress-unusedFunction/compile_commands.json'])
-    assert ret == 0, stdout
-    assert 'unusedFunction' not in stderr
-
-
-def test_unmatched_suppression_ifdef():
-    ret, stdout, stderr = cppcheck(['--enable=all', '--suppress=missingIncludeSystem', '--inline-suppr', '-DNO_ZERO_DIV', 'trac5704/trac5704a.c'])
-    assert ret == 0, stdout
-    assert 'unmatchedSuppression' not in stderr
-
-
-def test_unmatched_suppression_ifdef_0():
-    ret, stdout, stderr = cppcheck(['--enable=all', '--suppress=missingIncludeSystem', '--inline-suppr', 'trac5704/trac5704b.c'])
-    assert ret == 0, stdout
-    assert 'unmatchedSuppression' not in stderr
-
-
-def test_build_dir():
-    with tempfile.TemporaryDirectory() as tempdir:
-        args = f'--cppcheck-build-dir={tempdir} --enable=all --inline-suppr proj-inline-suppress/4.c'.split()
-
-        ret, stdout, stderr = cppcheck(args)
-        assert ret == 0, stdout
-        assert len(stderr) == 0
-
-        ret, stdout, stderr = cppcheck(args)
-        assert ret == 0, stdout
-        assert len(stderr) == 0
-
-def test_build_dir_unused_template():
-    with tempfile.TemporaryDirectory() as tempdir:
-        args = f'--cppcheck-build-dir={tempdir} --enable=all --inline-suppr proj-inline-suppress/template.cpp'.split()
-
-        ret, stdout, stderr = cppcheck(args)
-        assert ret == 0, stdout
-        assert len(stderr) == 0
-
-
-def test_suppress_unmatched_inline_suppression(): # 11172
-    ret, stdout, stderr = cppcheck(['--enable=all', '--suppress=unmatchedSuppression', '--inline-suppr', 'proj-inline-suppress/2.c'])
-    assert ret == 0, stdout
-    assert 'unmatchedSuppression' not in stderr
-
-
diff --git a/test/cli/test-more-projects.py b/test/cli/test-more-projects.py
deleted file mode 100644
index 6269d64a5f2..00000000000
--- a/test/cli/test-more-projects.py
+++ /dev/null
@@ -1,227 +0,0 @@
-# python -m pytest test-more-projects.py
-import json
-import os
-from testutils import cppcheck
-
-
-def test_project_force_U(tmpdir):
-    # 10018
-    # -U does not work with compile_commands.json
-    with open(os.path.join(tmpdir, 'bug1.cpp'), 'wt') as f:
-        f.write("""
-                int x = 123 / 0;
-                #ifdef MACRO1
-                int y = 1000 / 0;
-                #endif
-                """)
-
-    compile_commands = os.path.join(tmpdir, 'compile_commands.json')
-
-    compilation_db = [
-        {"directory": str(tmpdir),
-         "command": "c++ -o bug1.o -c bug1.cpp",
-         "file": "bug1.cpp",
-         "output": "bug1.o"}
-    ]
-
-    with open(compile_commands, 'wt') as f:
-        f.write(json.dumps(compilation_db))
-
-    # Without -U => both bugs are found
-    ret, stdout, stderr = cppcheck(['--project=' + compile_commands, '--force', '-rp=' + str(tmpdir), '--template=cppcheck1'])
-    assert ret == 0, stdout
-    assert (stderr == '[bug1.cpp:2]: (error) Division by zero.\n'
-                      '[bug1.cpp:4]: (error) Division by zero.\n')
-
-    # With -U => only first bug is found
-    ret, stdout, stderr = cppcheck(['--project=' + compile_commands, '--force', '-UMACRO1', '-rp=' + str(tmpdir), '--template=cppcheck1'])
-    assert ret == 0, stdout
-    assert stderr == '[bug1.cpp:2]: (error) Division by zero.\n'
-
-
-def __write_cppcheck_project_file(tmpdir, platform=None, importproject=None):
-    project_file = os.path.join(tmpdir, 'Project.cppcheck')
-
-    if platform is not None:
-        platform = '<platform>{}</platform>'.format(platform)
-    if importproject is not None:
-        platform = '<importproject>{}</importproject>'.format(importproject)
-
-    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(platform, importproject)
-        )
-
-    return project_file
-
-
-def test_project_custom_platform(tmpdir):
-    """
-    import cppcheck project that contains a custom platform file
-    """
-    project_file = __write_cppcheck_project_file(tmpdir, platform='p1.xml')
-
-    with open(os.path.join(tmpdir, 'p1.xml'), 'wt') as f:
-        f.write('<?xml version="1.0"?>\n<platform/>')
-
-    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
-        f.write("int x;")
-
-    ret, stdout, stderr = cppcheck(['--platform=native', '--project=' + project_file, '--template=cppcheck1', '-q'])
-    assert ret == 0, stdout
-    assert stdout == ''
-    assert stderr == ''
-
-
-def test_project_empty_platform(tmpdir):
-    """
-    import cppcheck project that contains an empty platform type
-    """
-    project_file = __write_cppcheck_project_file(tmpdir, platform='')
-
-    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
-        f.write("int x;")
-
-    ret, stdout, stderr = cppcheck(['--platform=native', '--project=' + project_file, '--template=cppcheck1', '-q'])
-    assert ret == 0, stdout
-    assert stdout == ''
-    assert stderr == ''
-
-
-def test_project_unspecified_platform(tmpdir):
-    """
-    import cppcheck project that contains the deprecated platform type "Unspecified"
-    """
-    project_file = __write_cppcheck_project_file(tmpdir, platform='Unspecified')
-
-    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
-        f.write("int x;")
-
-    ret, stdout, stderr = cppcheck(['--platform=native', '--project=' + project_file, '--template=cppcheck1', '-q'])
-    assert ret == 0, stdout
-    assert stdout == "cppcheck: 'Unspecified' is a deprecated platform type and will be removed in Cppcheck 2.14. Please use 'unspecified' instead.\n"
-    assert stderr == ''
-
-
-def test_project_unknown_platform(tmpdir):
-    """
-    import cppcheck project that contains an unknown platform type
-    """
-    project_file = __write_cppcheck_project_file(tmpdir, platform='dummy')
-
-    with open(os.path.join(tmpdir, '1.c'), 'wt') as f:
-        f.write("int x;")
-
-    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1'])
-    assert ret == 1, stdout
-    assert stdout == "cppcheck: error: unrecognized platform: 'dummy'.\n"
-    assert stderr == ''
-
-
-def test_project_empty_fields(tmpdir):
-    """
-    import cppcheck project that contains all empty fields - make sure there are no crashes
-    """
-    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">
-  <root/>
-  <builddir/>
-  <includedir/>
-  <includedir>
-    <dir/>
-  </includedir>
-  <defines/>
-  <defines>
-    <define/>
-  </defines>
-  <undefines/>
-  <undefines>
-    <undefine/>
-  </undefines>
-  <importproject/>
-  <paths/>
-  <paths>
-    <dir/>
-  </paths>
-  <exclude/>
-  <exclude>
-    <paths/>
-  </exclude>
-  <function-contracts/>
-  <variable-contracts/>
-  <ignore/>
-  <ignore>
-    <path/>
-  </ignore>
-  <libraries/>
-  <libraries>
-    <library/>
-  </libraries>
-  <suppressions/>
-  <suppressions>
-    <suppression/>
-  </suppressions>
-  <vs-configurations/>
-  <vs-configurations>
-    <config/>
-  </vs-configurations>
-  <platform/>
-  <analyze-all-vs-configs/>
-  <parser/>
-  <addons/>
-  <addons>
-    <addon/>
-  </addons>
-  <tags/>
-  <tools/>
-  <tools>
-    <tool/>
-  </tools>
-  <check-headers/>
-  <check-unused-templates/>
-  <max-ctu-depth/>
-  <max-template-recursion/>
-  <check-unknown-function-return-values/>
-  <safe-checks/>
-  <safe-checks>
-    <class-public/>
-    <external-functions/>
-    <internal-functions/>
-    <external-variables/>
-  </safe-checks>
-  <tag-warnings/>
-  <bug-hunting/>
-  <cert-c-int-precision/>
-  <coding-standards/>
-  <coding-standards>
-    <coding-standard/>
-  </coding-standards>
-</project>""")
-
-    ret, stdout, stderr = cppcheck(['--platform=native', '--project=' + project_file, '--template=cppcheck1'])
-    assert ret == 1, stdout # do not crash
-    assert stdout == 'cppcheck: error: no C or C++ source files found.\n'
-    assert stderr == ''
-
-
-def test_project_missing_subproject(tmpdir):
-    """
-    import cppcheck project that contains an unknown platform type
-    """
-    project_file = __write_cppcheck_project_file(tmpdir, importproject='dummy.json')
-
-    ret, stdout, stderr = cppcheck(['--project=' + project_file, '--template=cppcheck1'])
-    assert ret == 1, stdout
-    assert stdout == "cppcheck: error: failed to open project '{}/dummy.json'. The file does not exist.\n".format(str(tmpdir).replace('\\', '/'))
-    assert stderr == ''
\ No newline at end of file
diff --git a/test/cli/test-other.py b/test/cli/test-other.py
deleted file mode 100644
index 29db8ea0c9f..00000000000
--- a/test/cli/test-other.py
+++ /dev/null
@@ -1,63 +0,0 @@
-
-# python -m pytest test-other.py
-
-import os
-import pytest
-
-from testutils import cppcheck
-
-def __test_missing_include(tmpdir, use_j):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt') as f:
-        f.write("""
-                #include "test.h"
-                """)
-
-    args = ['--enable=missingInclude', '--template={file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]', test_file]
-    if use_j:
-        args.insert(0, '-j2')
-
-    _, _, stderr = cppcheck(args)
-    assert stderr == '{}:2:0: information: Include file: "test.h" not found. [missingInclude]\n'.format(test_file)
-
-def test_missing_include(tmpdir):
-    __test_missing_include(tmpdir, False)
-
-def test_missing_include_j(tmpdir): #11283
-    __test_missing_include(tmpdir, True)
-
-def __test_missing_include_check_config(tmpdir, use_j):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt') as f:
-        f.write("""
-                #include "test.h"
-                """)
-
-    # TODO: -rp is not working requiring the full path in the assert
-    args = '--check-config -rp={} {}'.format(tmpdir, test_file)
-    if use_j:
-        args = '-j2 ' + args
-
-    _, _, stderr = cppcheck(args.split())
-    assert stderr == '' # --check-config no longer reports the missing includes
-
-def test_missing_include_check_config(tmpdir):
-    __test_missing_include_check_config(tmpdir, False)
-
-def test_missing_include_check_config_j(tmpdir):
-    __test_missing_include_check_config(tmpdir, True)
-
-def test_missing_include_inline_suppr(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.c')
-    with open(test_file, 'wt') as f:
-        f.write("""
-                // cppcheck-suppress missingInclude
-                #include "missing.h"
-                // cppcheck-suppress missingIncludeSystem
-                #include <missing2.h>
-                """)
-
-    args = ['--enable=missingInclude', '--inline-suppr', test_file]
-
-    _, _, stderr = cppcheck(args)
-    assert stderr == ''
\ No newline at end of file
diff --git a/test/cli/test-proj2.py b/test/cli/test-proj2.py
deleted file mode 100644
index 868d832ddf0..00000000000
--- a/test/cli/test-proj2.py
+++ /dev/null
@@ -1,155 +0,0 @@
-
-# python -m pytest test-proj2.py
-
-import json
-import os
-from testutils import create_gui_project_file, cppcheck
-
-COMPILE_COMMANDS_JSON = 'compile_commands.json'
-
-ERR_A = ('%s:1:7: error: Division by zero. [zerodiv]\n' +
-         'x = 3 / 0;\n' +
-         '      ^\n') % os.path.join('a', 'a.c')
-ERR_B = ('%s:1:7: error: Division by zero. [zerodiv]\n' +
-         'x = 3 / 0;\n' +
-         '      ^\n') % os.path.join('b', 'b.c')
-
-def realpath(s):
-    return os.path.realpath(s).replace('\\', '/')
-
-def create_compile_commands():
-    j = [{'directory': realpath('proj2/a'), 'command': 'gcc -c a.c', 'file': 'a.c'},
-         {'directory': realpath('proj2'), 'command': 'gcc -c b/b.c', 'file': 'b/b.c'}]
-    with open('proj2/' + COMPILE_COMMANDS_JSON, 'wt') as f:
-        f.write(json.dumps(j))
-
-# Run Cppcheck from project path
-def cppcheck_local(args):
-    cwd = os.getcwd()
-    os.chdir('proj2')
-    ret, stdout, stderr = cppcheck(args)
-    os.chdir(cwd)
-    return ret, stdout, stderr
-
-def test_file_filter():
-    ret, stdout, stderr = cppcheck(['proj2/','--file-filter=proj2/a/*'])
-    file1 = os.path.join('proj2', 'a', 'a.c')
-    file2 = os.path.join('proj2', 'b', 'b.c')
-    assert ret == 0
-    assert stdout.find('Checking %s ...' % file1) >= 0
-    ret, stdout, stderr = cppcheck(['proj2/','--file-filter=proj2/b*'])
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s ...' % file2) >= 0
-
-def test_local_path():
-    create_compile_commands()
-    ret, stdout, stderr = cppcheck_local(['--project=compile_commands.json'])
-    file1 = os.path.join('a', 'a.c')
-    file2 = os.path.join('b', 'b.c')
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s ...' % file1) >= 0
-    assert stdout.find('Checking %s ...' % file2) >= 0
-
-def test_local_path_force():
-    create_compile_commands()
-    ret, stdout, stderr = cppcheck_local(['--project=compile_commands.json', '--force'])
-    assert ret == 0, stdout
-    assert stdout.find('AAA') >= 0
-
-def test_local_path_maxconfigs():
-    create_compile_commands()
-    ret, stdout, stderr = cppcheck_local(['--project=compile_commands.json', '--max-configs=2'])
-    assert ret == 0, stdout
-    assert stdout.find('AAA') >= 0
-
-def test_relative_path():
-    create_compile_commands()
-    ret, stdout, stderr = cppcheck(['--project=proj2/' + COMPILE_COMMANDS_JSON])
-    file1 = os.path.join('proj2', 'a', 'a.c')
-    file2 = os.path.join('proj2', 'b', 'b.c')
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s ...' % file1) >= 0
-    assert stdout.find('Checking %s ...' % file2) >= 0
-
-def test_absolute_path():
-    create_compile_commands()
-    ret, stdout, stderr = cppcheck(['--project=' + os.path.realpath('proj2/' + COMPILE_COMMANDS_JSON)])
-    file1 = os.path.realpath('proj2/a/a.c')
-    file2 = os.path.realpath('proj2/b/b.c')
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s ...' % file1) >= 0
-    assert stdout.find('Checking %s ...' % file2) >= 0
-
-def test_gui_project_loads_compile_commands_1():
-    create_compile_commands()
-    ret, stdout, stderr = cppcheck(['--project=proj2/proj2.cppcheck'])
-    file1 = os.path.join('proj2', 'a', 'a.c')
-    file2 = os.path.join('proj2', 'b', 'b.c')
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s ...' % file1) >= 0
-    assert stdout.find('Checking %s ...' % file2) >= 0
-
-def test_gui_project_loads_compile_commands_2():
-    create_compile_commands()
-    exclude_path_1 = 'proj2/b'
-    create_gui_project_file('proj2/test.cppcheck',
-                            import_project='compile_commands.json',
-                            exclude_paths=[exclude_path_1])
-    ret, stdout, stderr = cppcheck(['--project=proj2/test.cppcheck'])
-    file1 = os.path.join('proj2', 'a', 'a.c')
-    file2 = os.path.join('proj2', 'b', 'b.c') # Excluded by test.cppcheck
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s ...' % file1) >= 0
-    assert stdout.find('Checking %s ...' % file2) < 0
-
-
-def test_gui_project_loads_relative_vs_solution():
-    create_gui_project_file('test.cppcheck', import_project='proj2/proj2.sln')
-    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'])
-    file1 = os.path.join('proj2', 'a', 'a.c')
-    file2 = os.path.join('proj2', 'b', 'b.c')
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s Debug|Win32...' % file1) >= 0
-    assert stdout.find('Checking %s Debug|x64...' % file1) >= 0
-    assert stdout.find('Checking %s Release|Win32...' % file1) >= 0
-    assert stdout.find('Checking %s Release|x64...' % file1) >= 0
-    assert stdout.find('Checking %s Debug|Win32...' % file2) >= 0
-    assert stdout.find('Checking %s Debug|x64...' % file2) >= 0
-    assert stdout.find('Checking %s Release|Win32...' % file2) >= 0
-    assert stdout.find('Checking %s Release|x64...' % file2) >= 0
-
-def test_gui_project_loads_absolute_vs_solution():
-    create_gui_project_file('test.cppcheck', import_project=realpath('proj2/proj2.sln'))
-    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'])
-    file1 = os.path.realpath('proj2/a/a.c')
-    file2 = os.path.realpath('proj2/b/b.c')
-    print(stdout)
-    assert ret == 0, stdout
-    assert stdout.find('Checking %s Debug|Win32...' % file1) >= 0
-    assert stdout.find('Checking %s Debug|x64...' % file1) >= 0
-    assert stdout.find('Checking %s Release|Win32...' % file1) >= 0
-    assert stdout.find('Checking %s Release|x64...' % file1) >= 0
-    assert stdout.find('Checking %s Debug|Win32...' % file2) >= 0
-    assert stdout.find('Checking %s Debug|x64...' % file2) >= 0
-    assert stdout.find('Checking %s Release|Win32...' % file2) >= 0
-    assert stdout.find('Checking %s Release|x64...' % file2) >= 0
-
-def test_gui_project_loads_relative_vs_solution_2():
-    create_gui_project_file('test.cppcheck', root_path='proj2', import_project='proj2/proj2.sln')
-    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'])
-    assert ret == 0, stdout
-    assert stderr == ERR_A + ERR_B
-
-def test_gui_project_loads_relative_vs_solution_with_exclude():
-    create_gui_project_file('test.cppcheck', root_path='proj2', import_project='proj2/proj2.sln', exclude_paths=['b'])
-    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'])
-    assert ret == 0, stdout
-    assert stderr == ERR_A
-
-def test_gui_project_loads_absolute_vs_solution_2():
-    create_gui_project_file('test.cppcheck',
-                            root_path=realpath('proj2'),
-                            import_project=realpath('proj2/proj2.sln'))
-    ret, stdout, stderr = cppcheck(['--project=test.cppcheck'])
-    assert ret == 0, stdout
-    assert stderr == ERR_A + ERR_B
diff --git a/test/cli/test-qml.py b/test/cli/test-qml.py
deleted file mode 100644
index d16017bcfb0..00000000000
--- a/test/cli/test-qml.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# python3 -m pytest test-qml.py
-
-import os
-from testutils import cppcheck
-
-PROJECT_DIR = 'QML-Samples-TableView'
-
-def test_unused_functions():
-    ret, stdout, stderr = cppcheck(['--library=qt', '--enable=unusedFunction', PROJECT_DIR])
-    # there are unused functions. But fillSampleData is not unused because that is referenced from main.qml
-    assert '[unusedFunction]' in stderr
-    assert 'fillSampleData' not in stderr
-
diff --git a/test/cli/test-suppress-syntaxError.py b/test/cli/test-suppress-syntaxError.py
deleted file mode 100644
index 00d383eab35..00000000000
--- a/test/cli/test-suppress-syntaxError.py
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# python -m pytest test-suppress-syntaxError.py
-
-from testutils import cppcheck
-
-def test_j2():
-    ret, stdout, stderr = cppcheck(['--error-exitcode=1', '-j2', '-q', 'proj-suppress-syntaxError'])
-    assert ret == 1
-    assert len(stderr) > 0
-
-def test_j2_suppress():
-    ret, stdout, stderr = cppcheck(['--error-exitcode=1', '--suppress=*:proj-suppress-syntaxError/*', '-j2', '-q', 'proj-suppress-syntaxError'])
-    assert ret == 0
-    assert len(stderr) == 0
-
diff --git a/test/cli/testutils.py b/test/cli/testutils.py
index 5b94b15a4da..f352af49f15 100644
--- a/test/cli/testutils.py
+++ b/test/cli/testutils.py
@@ -1,7 +1,10 @@
-
+import errno
 import logging
 import os
+import select
 import subprocess
+import time
+import tempfile
 
 # Create Cppcheck project file
 import sys
@@ -38,12 +41,11 @@ def create_gui_project_file(project_file, root_path=None, import_project=None, p
         cppcheck_xml += '  </addons>\n'
     cppcheck_xml += '</project>\n'
 
-    f = open(project_file, 'wt')
-    f.write(cppcheck_xml)
-    f.close()
+    with open(project_file, 'wt') as f:
+        f.write(cppcheck_xml)
 
 
-def lookup_cppcheck_exe():
+def __lookup_cppcheck_exe():
     # path the script is located in
     script_path = os.path.dirname(os.path.realpath(__file__))
 
@@ -52,24 +54,195 @@ def lookup_cppcheck_exe():
     if sys.platform == "win32":
         exe_name += ".exe"
 
-    for base in (script_path + '/../../', './'):
-        for path in ('', 'bin/', 'bin/debug/'):
-            exe_path = base + path + exe_name
-            if os.path.isfile(exe_path):
-                print("using '{}'".format(exe_path))
-                return exe_path
+    exe_path = None
+
+    if 'TEST_CPPCHECK_EXE_LOOKUP_PATH' in os.environ:
+        lookup_paths = [os.environ['TEST_CPPCHECK_EXE_LOOKUP_PATH']]
+    else:
+        lookup_paths = [os.path.join(script_path, '..', '..'), '.']
+
+    for base in lookup_paths:
+        for path in ('', 'bin', os.path.join('bin', 'debug')):
+            tmp_exe_path = os.path.join(base, path, exe_name)
+            if os.path.isfile(tmp_exe_path):
+                exe_path = tmp_exe_path
+                break
+
+    if exe_path:
+        exe_path = os.path.abspath(exe_path)
+        print("using '{}'".format(exe_path))
+    return exe_path
+
+
+def __run_subprocess_tty(args, env=None, cwd=None, timeout=None):
+    import pty
+    mo, so = pty.openpty()
+    me, se = pty.openpty()
+    p = subprocess.Popen(args, stdout=so, stderr=se, env=env, cwd=cwd)
+    for fd in [so, se]:
+        os.close(fd)
+
+    select_timeout = 0.04  # seconds
+    readable = [mo, me]
+    result = {mo: b'', me: b''}
+    try:
+        start_time = time.monotonic()
+        while readable:
+            ready, _, _ = select.select(readable, [], [], select_timeout)
+            for fd in ready:
+                try:
+                    data = os.read(fd, 512)
+                except OSError as e:
+                    if e.errno != errno.EIO:
+                        raise
+                    # EIO means EOF on some systems
+                    readable.remove(fd)
+                else:
+                    if not data: # EOF
+                        readable.remove(fd)
+                    result[fd] += data
+            if timeout is not None and (time.monotonic() - start_time):
+                break
+    finally:
+        for fd in [mo, me]:
+            os.close(fd)
+        if p.poll() is None:
+            p.kill()
+        return_code = p.wait()
 
-    return None
+    stdout = result[mo]
+    stderr = result[me]
+    return return_code, stdout, stderr
+
+
+def __run_subprocess(args, env=None, cwd=None, timeout=None):
+    p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, cwd=cwd)
+
+    try:
+        stdout, stderr = p.communicate(timeout=timeout)
+        return_code = p.returncode
+        p = None
+    except subprocess.TimeoutExpired:
+        import psutil
+        # terminate all the child processes
+        child_procs = psutil.Process(p.pid).children(recursive=True)
+        if len(child_procs) > 0:
+            for child in child_procs:
+                child.terminate()
+            try:
+                # call with timeout since it might be stuck
+                p.communicate(timeout=5)
+                p = None
+            except subprocess.TimeoutExpired:
+                pass
+        raise
+    finally:
+        if p:
+            # sending the signal to the process groups causes the parent Python process to terminate as well
+            #os.killpg(os.getpgid(p.pid), signal.SIGTERM)  # Send the signal to all the process groups
+            p.terminate()
+            stdout, stderr = p.communicate()
+            p = None
+
+    return return_code, stdout, stderr
 
 
 # Run Cppcheck with args
-def cppcheck(args):
-    exe = lookup_cppcheck_exe()
+def cppcheck_ex(args, env=None, remove_checkers_report=True, cwd=None, cppcheck_exe=None, timeout=None, tty=False):
+    exe = cppcheck_exe if cppcheck_exe else __lookup_cppcheck_exe()
     assert exe is not None, 'no cppcheck binary found'
 
+    # do not inject arguments for calls with exclusive options
+    has_exclusive = bool({'--doc', '--errorlist', '-h', '--help', '--version'} & set(args))
+
+    if not has_exclusive and ('TEST_CPPCHECK_INJECT_J' in os.environ):
+        found_j = False
+        for arg in args:
+            if arg.startswith('-j'):
+                found_j = True
+                break
+        if not found_j:
+            arg_j = '-j' + str(os.environ['TEST_CPPCHECK_INJECT_J'])
+            args.append(arg_j)
+
+    if not has_exclusive and ('TEST_CPPCHECK_INJECT_CLANG' in os.environ):
+        found_clang = False
+        for arg in args:
+            if arg.startswith('--clang'):
+                found_clang = True
+                break
+        if not found_clang:
+            arg_clang = '--clang=' + str(os.environ['TEST_CPPCHECK_INJECT_CLANG'])
+            args.append(arg_clang)
+
+    if not has_exclusive and ('TEST_CPPCHECK_INJECT_EXECUTOR' in os.environ):
+        found_jn = False
+        found_executor = False
+        for arg in args:
+            if arg.startswith('-j') and arg != '-j1':
+                found_jn = True
+                continue
+            if arg.startswith('--executor'):
+                found_executor = True
+                continue
+        # only add '--executor' if we are actually using multiple jobs
+        if found_jn and not found_executor:
+            arg_executor = '--executor=' + str(os.environ['TEST_CPPCHECK_INJECT_EXECUTOR'])
+            args.append(arg_executor)
+
+    builddir_tmp = None
+
+    if not has_exclusive and ('TEST_CPPCHECK_INJECT_BUILDDIR' in os.environ):
+        found_builddir = False
+        for arg in args:
+            if arg.startswith('--cppcheck-build-dir=') or arg == '--no-cppcheck-build-dir':
+                found_builddir = True
+                break
+        if not found_builddir:
+            builddir_tmp = tempfile.TemporaryDirectory(prefix=str(os.environ['TEST_CPPCHECK_INJECT_BUILDDIR']))
+            arg_clang = '--cppcheck-build-dir=' + builddir_tmp.name
+            args.append(arg_clang)
+
     logging.info(exe + ' ' + ' '.join(args))
-    p = subprocess.Popen([exe] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    comm = p.communicate()
-    stdout = comm[0].decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
-    stderr = comm[1].decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
-    return p.returncode, stdout, stderr
+
+    run_subprocess = __run_subprocess_tty if tty else __run_subprocess
+    return_code, stdout, stderr = run_subprocess([exe] + args, env=env, cwd=cwd, timeout=timeout)
+
+    stdout = stdout.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+    stderr = stderr.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+
+    if builddir_tmp:
+        builddir_tmp.cleanup()
+
+    if remove_checkers_report:
+        if stderr.find('[checkersReport]\n') > 0:
+            start_id = stderr.find('[checkersReport]\n')
+            start_line = stderr.rfind('\n', 0, start_id)
+            if start_line <= 0:
+                stderr = ''
+            else:
+                stderr = stderr[:start_line + 1]
+        elif stderr.find(': (information) Active checkers: ') >= 0:
+            pos = stderr.find(': (information) Active checkers: ')
+            if pos == 0:
+                stderr = ''
+            elif stderr[pos - 1] == '\n':
+                stderr = stderr[:pos]
+    return return_code, stdout, stderr, exe
+
+
+def cppcheck(*args, **kwargs):
+    return_code, stdout, stderr, _ = cppcheck_ex(*args, **kwargs)
+    return return_code, stdout, stderr
+
+
+def assert_cppcheck(args, ec_exp=None, out_exp=None, err_exp=None, env=None, cwd=None):
+    exitcode, stdout, stderr = cppcheck(args, env=env, cwd=cwd)
+    if ec_exp is not None:
+        assert exitcode == ec_exp, stdout
+    if out_exp is not None:
+        out_lines = stdout.splitlines()
+        assert out_lines == out_exp, out_lines
+    if err_exp is not None:
+        err_lines = stderr.splitlines()
+        assert err_lines == err_exp, err_lines
diff --git a/test/cli/unusedFunction/1.c b/test/cli/unusedFunction/1.c
new file mode 100644
index 00000000000..6e725814d2b
--- /dev/null
+++ b/test/cli/unusedFunction/1.c
@@ -0,0 +1,7 @@
+#include "3.h"
+
+// cppcheck-suppress unusedFunction
+void f1()
+{
+    f3_1();
+}
\ No newline at end of file
diff --git a/test/cli/unusedFunction/2.c b/test/cli/unusedFunction/2.c
new file mode 100644
index 00000000000..c6bf77cea8b
--- /dev/null
+++ b/test/cli/unusedFunction/2.c
@@ -0,0 +1,7 @@
+#include "3.h"
+
+// cppcheck-suppress unusedFunction
+void f2()
+{
+    f3_2();
+}
\ No newline at end of file
diff --git a/test/cli/unusedFunction/3.c b/test/cli/unusedFunction/3.c
new file mode 100644
index 00000000000..3b517fe3c36
--- /dev/null
+++ b/test/cli/unusedFunction/3.c
@@ -0,0 +1,3 @@
+void f3_1() {}
+void f3_2() {}
+void f3_3() {}
\ No newline at end of file
diff --git a/test/cli/unusedFunction/3.h b/test/cli/unusedFunction/3.h
new file mode 100644
index 00000000000..3b643b42c26
--- /dev/null
+++ b/test/cli/unusedFunction/3.h
@@ -0,0 +1,3 @@
+void f3_1();
+void f3_2();
+void f3_3();
\ No newline at end of file
diff --git a/test/cli/unusedFunction/4.c b/test/cli/unusedFunction/4.c
new file mode 100644
index 00000000000..ae17ea51075
--- /dev/null
+++ b/test/cli/unusedFunction/4.c
@@ -0,0 +1,7 @@
+static void f4_0() {}
+
+// cppcheck-suppress unusedFunction
+void f4_1()
+{
+    f4_0();
+}
\ No newline at end of file
diff --git a/test/cli/unusedFunction/unusedFunction.cppcheck b/test/cli/unusedFunction/unusedFunction.cppcheck
new file mode 100644
index 00000000000..fd28f7074a9
--- /dev/null
+++ b/test/cli/unusedFunction/unusedFunction.cppcheck
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <paths>
+        <dir name="1.c"/>
+        <dir name="2.c"/>
+        <dir name="3.c"/>
+        <dir name="4.c"/>
+    </paths>
+</project>
\ No newline at end of file
diff --git a/test/cli/unused_function_test.py b/test/cli/unused_function_test.py
new file mode 100644
index 00000000000..591986f1dde
--- /dev/null
+++ b/test/cli/unused_function_test.py
@@ -0,0 +1,204 @@
+
+# python3 -m pytest test-unused_function_test.py
+
+import os
+import json
+import sys
+import pytest
+from testutils import cppcheck
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+__project_dir = os.path.join(__script_dir, 'unusedFunction')
+__project_dir_sep = __project_dir + os.path.sep
+
+
+# TODO: make this a generic helper function
+def __create_compdb(tmpdir, projpath):
+    compile_commands = os.path.join(tmpdir, 'compile_commands.json')
+    files = []
+    for f in os.listdir(projpath):
+        files.append(f)
+    files.sort()
+    j = []
+    for f in files:
+        j.append({
+            'directory': projpath,
+            'file': os.path.join(projpath, f),
+            'command': 'gcc -c {}'.format(f)
+        })
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(j, indent=4))
+    return compile_commands
+
+
+def __test_unused_functions(extra_args):
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=unusedFunction',
+        '--inline-suppr',
+        __project_dir
+    ]
+    args += extra_args
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        "{}3.c:3:6: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
+    ]
+    assert ret == 0, stdout
+
+
+def test_unused_functions():
+    __test_unused_functions(['-j1', '--no-cppcheck-build-dir'])
+
+
+def test_unused_functions_j():
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=unusedFunction',
+        '--inline-suppr',
+        '-j2',
+        '--no-cppcheck-build-dir',
+        __project_dir
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == [
+        "cppcheck: unusedFunction check requires --cppcheck-build-dir to be active with -j."
+    ]
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_unused_functions_builddir(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions(['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
+
+
+def test_unused_functions_builddir_j_thread(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_unused_functions_builddir_j_process(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=process'])
+
+
+def __test_unused_functions_project(extra_args):
+    project_file = os.path.join(__project_dir, 'unusedFunction.cppcheck')
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=unusedFunction',
+        '--inline-suppr',
+        '--project={}'.format(project_file),
+    ]
+    args += extra_args
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == []
+    assert [
+        "{}3.c:3:6: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
+    ] == stderr.splitlines()
+    assert ret == 0, stdout
+
+
+def test_unused_functions_project():
+    __test_unused_functions_project(['-j1', '--no-cppcheck-build-dir'])
+
+
+def test_unused_functions_project_j():
+    project_file = os.path.join(__project_dir, 'unusedFunction.cppcheck')
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=unusedFunction',
+        '--inline-suppr',
+        '--project={}'.format(project_file),
+        '-j2',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == [
+        "cppcheck: unusedFunction check requires --cppcheck-build-dir to be active with -j."
+    ]
+    assert [] == stderr.splitlines()
+    assert ret == 0, stdout
+
+
+def test_unused_functions_project_builddir(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions_project(['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
+
+
+def test_unused_functions_project_builddir_j_thread(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions_project(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_unused_functions_project_builddir_j_process(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions_project(['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=process'])
+
+
+def __test_unused_functions_compdb(tmpdir, extra_args):
+    compdb_file = __create_compdb(tmpdir, __project_dir)
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=unusedFunction',
+        '--inline-suppr',
+        '--project={}'.format(compdb_file)
+    ]
+    args += extra_args
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == []
+    assert stderr.splitlines() == [
+        "{}3.c:3:6: style: The function 'f3_3' is never used. [unusedFunction]".format(__project_dir_sep)
+    ]
+    assert ret == 0, stdout
+
+
+def test_unused_functions_compdb(tmpdir):
+    __test_unused_functions_compdb(tmpdir, ['-j1', '--no-cppcheck-build-dir'])
+
+
+def test_unused_functions_compdb_j(tmpdir):
+    compdb_file = __create_compdb(tmpdir, __project_dir)
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=unusedFunction',
+        '--inline-suppr',
+        '--project={}'.format(compdb_file),
+        '-j2',
+        '--no-cppcheck-build-dir'
+    ]
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout.splitlines() == [
+        "cppcheck: unusedFunction check requires --cppcheck-build-dir to be active with -j."
+    ]
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
+
+
+def test_unused_functions_compdb_buildir_j_thread(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions_compdb(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=thread'])
+
+
+@pytest.mark.skipif(sys.platform == 'win32', reason='ProcessExecutor not available on Windows')
+def test_unused_functions_compdb_builddir_j_process(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_unused_functions_compdb(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir), '--executor=process'])
\ No newline at end of file
diff --git a/test/cli/whole-program/nullpointer1.cpp b/test/cli/whole-program/nullpointer1.cpp
new file mode 100644
index 00000000000..d323e3ad1d3
--- /dev/null
+++ b/test/cli/whole-program/nullpointer1.cpp
@@ -0,0 +1 @@
+#include "nullpointer1.h"
diff --git a/test/cli/whole-program/nullpointer1.h b/test/cli/whole-program/nullpointer1.h
new file mode 100644
index 00000000000..56fa6c49d84
--- /dev/null
+++ b/test/cli/whole-program/nullpointer1.h
@@ -0,0 +1,8 @@
+#include "nullpointer1_1.h"
+
+template<typename T>
+void f(T* p) {
+    if (sizeof(T) == 4)
+        p = nullptr;
+    g(p);
+}
diff --git a/test/cli/whole-program/nullpointer1_1.h b/test/cli/whole-program/nullpointer1_1.h
new file mode 100644
index 00000000000..cbbc478cf2c
--- /dev/null
+++ b/test/cli/whole-program/nullpointer1_1.h
@@ -0,0 +1,4 @@
+template<typename T>
+void g(T* p) {
+    *p = 0;
+};
diff --git a/test/cli/whole-program/odr.h b/test/cli/whole-program/odr.h
new file mode 100644
index 00000000000..29965892446
--- /dev/null
+++ b/test/cli/whole-program/odr.h
@@ -0,0 +1,7 @@
+class Base {
+public:
+    virtual void f() = 0;
+};
+
+extern Base *c1_create();
+extern Base *c2_create();
\ No newline at end of file
diff --git a/test/cli/whole-program/odr1.cpp b/test/cli/whole-program/odr1.cpp
new file mode 100644
index 00000000000..11f3f53b8d8
--- /dev/null
+++ b/test/cli/whole-program/odr1.cpp
@@ -0,0 +1,17 @@
+#include "odr.h"
+
+#include <iostream>
+
+// cppcheck-suppress ctuOneDefinitionRuleViolation
+class C : public Base
+{
+public:
+    void f() override {
+        std::cout << "1";
+    }
+};
+
+Base *c1_create()
+{
+    return new C();
+}
diff --git a/test/cli/whole-program/odr2.cpp b/test/cli/whole-program/odr2.cpp
new file mode 100644
index 00000000000..849418af508
--- /dev/null
+++ b/test/cli/whole-program/odr2.cpp
@@ -0,0 +1,16 @@
+#include "odr.h"
+
+#include <iostream>
+
+class C : public Base
+{
+public:
+    void f() override {
+        std::cout << "2";
+    }
+};
+
+Base *c2_create()
+{
+    return new C();
+}
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/whole1.c b/test/cli/whole-program/whole1.c
new file mode 100644
index 00000000000..0917e545c06
--- /dev/null
+++ b/test/cli/whole-program/whole1.c
@@ -0,0 +1,3 @@
+// cppcheck-suppress misra-c2012-8.4
+// cppcheck-suppress misra-c2012-5.8
+int misra_5_8_var1;
diff --git a/test/cli/whole-program/whole2.c b/test/cli/whole-program/whole2.c
new file mode 100644
index 00000000000..62546753586
--- /dev/null
+++ b/test/cli/whole-program/whole2.c
@@ -0,0 +1,2 @@
+// cppcheck-suppress misra-c2012-5.8
+static int misra_5_8_var1;
diff --git a/test/cli/whole-program_test.py b/test/cli/whole-program_test.py
new file mode 100644
index 00000000000..dfb4e8112d1
--- /dev/null
+++ b/test/cli/whole-program_test.py
@@ -0,0 +1,432 @@
+import glob
+import os
+import pytest
+import json
+import shutil
+from testutils import cppcheck
+import xml.etree.ElementTree as ET
+
+__script_dir = os.path.dirname(os.path.abspath(__file__))
+
+# TODO: use dedicated addon
+# TODO: test CheckNullPointer
+# TODO: test CheckUninitVar
+# TODO: test CheckBufferOverrun
+
+
+def __create_compile_commands(dir, entries):
+    j = []
+    for e in entries:
+        f = os.path.basename(e)
+        obj = {
+            'directory': os.path.dirname(os.path.abspath(e)),
+            'command': 'gcc -c {}'.format(f),
+            'file': f
+        }
+        j.append(obj)
+    compile_commands = os.path.join(dir, 'compile_commmands.json')
+    with open(compile_commands, 'wt') as f:
+        f.write(json.dumps(j))
+    return compile_commands
+
+
+def test_addon_suppress_inline():
+    args = [
+        '-q',
+        '--addon=misra',
+        '--template=simple',
+        '--enable=information,style',
+        '--inline-suppr',
+        '--error-exitcode=1',
+        'whole-program/whole1.c',
+        'whole-program/whole2.c'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_addon_suppress_inline_project(tmpdir):
+    compile_db = __create_compile_commands(tmpdir, [
+        os.path.join(__script_dir, 'whole-program', 'whole1.c'),
+        os.path.join(__script_dir, 'whole-program', 'whole2.c')
+    ])
+
+    args = [
+        '-q',
+        '--addon=misra',
+        '--template=simple',
+        '--enable=information,style',
+        '--inline-suppr',
+        '--error-exitcode=1',
+        '--project={}'.format(compile_db)
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+# TODO: remove overrides when this is fully working
+def __test_suppress_inline(extra_args):
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information,style',
+        '--inline-suppr',
+        '--error-exitcode=1',
+        'whole-program/odr1.cpp',
+        'whole-program/odr2.cpp'
+    ]
+
+    args += extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+def test_suppress_inline():
+    __test_suppress_inline(['-j1', '--no-cppcheck-build-dir'])
+
+
+@pytest.mark.xfail(strict=True)
+def test_suppress_inline_j():
+    __test_suppress_inline(['-j2', '--no-cppcheck-build-dir'])
+
+
+def test_suppress_inline_builddir(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline(['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+
+
+def test_suppress_inline_builddir_cached(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline(['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+    __test_suppress_inline(['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+
+
+def test_suppress_inline_builddir_j(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline(['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+
+
+def test_inline_suppr_builddir_j_cached(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline(['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+    __test_suppress_inline(['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+
+
+# TODO: remove overrides when it is fully working
+def __test_suppress_inline_project(tmp_path, extra_args):
+    compile_db = __create_compile_commands(str(tmp_path), [
+        os.path.join(__script_dir, 'whole-program', 'odr1.cpp'),
+        os.path.join(__script_dir, 'whole-program', 'odr2.cpp')
+    ])
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information,style',
+        '--inline-suppr',
+        '--error-exitcode=1',
+        '--project={}'.format(compile_db)
+    ]
+
+    args += extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == []
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
+
+def test_suppress_inline_project(tmp_path):
+    __test_suppress_inline_project(tmp_path, ['-j1', '--no-cppcheck-build-dir'])
+
+
+@pytest.mark.xfail(strict=True)
+def test_suppress_inline_project_j(tmp_path):
+    __test_suppress_inline_project(tmp_path, ['-j2', '--no-cppcheck-build-dir'])
+
+
+def test_suppress_inline_project_builddir(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline_project(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+
+
+def test_suppress_inline_project_builddir_cached(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline_project(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+    __test_suppress_inline_project(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j1'])
+
+
+def test_suppress_inline_project_builddir_j(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline_project(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+
+
+def test_suppress_inline_project_builddir_j_cached(tmp_path):
+    build_dir = tmp_path / 'b1'
+    os.mkdir(build_dir)
+    __test_suppress_inline_project(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+    __test_suppress_inline_project(tmp_path, ['--cppcheck-build-dir={}'.format(build_dir), '-j2'])
+
+
+@pytest.mark.parametrize("builddir", (False,True))
+def test_addon_rerun(tmp_path, builddir):
+    """Rerun analysis and ensure that misra CTU works; with and without build dir"""
+    args = [
+        '--addon=misra',
+        '--enable=style',
+        '--template={id}',
+        'whole-program']
+    # do not use the injection because the directory needs to survive runs
+    if builddir:
+        args.append('--cppcheck-build-dir=' + str(tmp_path))
+    else:
+        args.append('--no-cppcheck-build-dir')
+    _, _, stderr = cppcheck(args, cwd=__script_dir)
+    assert 'misra-c2012-5.8' in stderr
+    _, _, stderr = cppcheck(args, cwd=__script_dir)
+    assert 'misra-c2012-5.8' in stderr
+
+def test_addon_builddir_use_ctuinfo(tmp_path):
+    """Test that ctu-info files are used when builddir is used"""
+    args = [
+        '--cppcheck-build-dir=' + str(tmp_path),
+        '--addon=misra',
+        '--enable=style',
+        '--template={id}',
+        'whole-program']
+    _, _, stderr = cppcheck(args, cwd=__script_dir)
+    assert 'misra-c2012-5.8' in stderr
+    with open(tmp_path / 'whole1.a1.ctu-info', 'wt'):
+        pass
+    with open(tmp_path / 'whole2.a1.ctu-info', 'wt'):
+        pass
+    _, _, stderr = cppcheck(args, cwd=__script_dir)
+    assert 'misra-c2012-5.8' not in stderr
+
+
+@pytest.mark.parametrize("builddir", (False,True))
+def test_addon_no_artifacts(tmp_path, builddir):
+    """Test that there are no artifacts left after analysis"""
+    shutil.copyfile(os.path.join(__script_dir, 'whole-program', 'whole1.c'), tmp_path / 'whole1.c')
+    shutil.copyfile(os.path.join(__script_dir, 'whole-program', 'whole2.c'), tmp_path / 'whole2.c')
+    build_dir = str(tmp_path / 'b1')
+    os.mkdir(build_dir)
+    args = [
+        '--addon=misra',
+        '--enable=style',
+        '--template={id}',
+        str(tmp_path)]
+    if builddir:
+        args.append('--cppcheck-build-dir=' + build_dir)
+    _, _, stderr = cppcheck(args, cwd=__script_dir)
+    assert 'misra-c2012-5.8' in stderr
+    files = []
+    for f in glob.glob(str(tmp_path / '*')):
+        if os.path.isfile(f):
+            files.append(os.path.basename(f))
+    files.sort()
+    assert ' '.join(files) == 'whole1.c whole2.c'
+
+
+def __test_checkclass(extra_args):
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information,style',
+        '--error-exitcode=1',
+        'whole-program/odr1.cpp',
+        'whole-program/odr2.cpp',
+        'whole-program/odr3.cpp'
+    ]
+
+    args += extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == [
+        "whole-program{}odr1.cpp:6:1: error: The one definition rule is violated, different classes/structs have the same name 'C' [ctuOneDefinitionRuleViolation]".format(os.path.sep)
+    ]
+    assert stdout == ''
+    assert ret == 1, stdout
+
+
+def test_checkclass():
+    __test_checkclass(['-j1'])
+
+
+@pytest.mark.xfail(strict=True) # TODO: check error
+def test_checkclass_j():
+    __test_checkclass(['-j2', '--no-cppcheck-build-dir'])
+
+
+def test_checkclass_builddir(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_checkclass(['--cppcheck-build-dir={}'.format(build_dir)])
+
+
+def test_checkclass_builddir_j(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_checkclass(['-j2', '--cppcheck-build-dir={}'.format(build_dir)])
+
+
+def __test_checkclass_project(tmpdir, extra_args):
+    odr_file_1 = os.path.join(__script_dir, 'whole-program', 'odr1.cpp')
+
+    compile_db = __create_compile_commands(tmpdir, [
+        odr_file_1,
+        os.path.join(__script_dir, 'whole-program', 'odr2.cpp')
+    ])
+
+    args = [
+        '-q',
+        '--template=simple',
+        '--enable=information,style',
+        '--error-exitcode=1',
+        '--project={}'.format(compile_db)
+    ]
+
+    args += extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+    assert lines == [
+        "{}:6:1: error: The one definition rule is violated, different classes/structs have the same name 'C' [ctuOneDefinitionRuleViolation]".format(odr_file_1)
+    ]
+    assert stdout == ''
+    assert ret == 1, stdout
+
+
+def test_checkclass_project(tmpdir):
+    __test_checkclass_project(tmpdir, ['-j1'])
+
+
+@pytest.mark.xfail(strict=True) # TODO: check error
+def test_checkclass_project_j(tmpdir):
+    __test_checkclass_project(tmpdir, ['-j2', '--no-cppcheck-build-dir'])
+
+
+def test_checkclass_project_builddir(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_checkclass_project(tmpdir, ['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
+
+
+def test_checkclass_project_builddir_j(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    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 = [
+        '-q',
+        '--xml',
+        '--error-exitcode=1',
+        'whole-program/nullpointer1.cpp'
+    ]
+
+    args += extra_args
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    results = ET.fromstring(stderr)
+    file0 = ''
+    for e in results.findall('errors/error[@id="ctunullpointer"]'):
+        file0 = e.attrib['file0']
+
+    assert ret == 1, stdout if stdout else stderr
+    assert stdout == ''
+    assert file0 == 'whole-program/nullpointer1.cpp', stderr
+
+
+def test_nullpointer_file0():
+    __test_nullpointer_file0(['-j1'])
+
+
+@pytest.mark.xfail(strict=True) # no CTU without builddir
+def test_nullpointer_file0_j():
+    __test_nullpointer_file0(['-j2', '--no-cppcheck-build-dir'])
+
+
+def test_nullpointer_file0_builddir_j(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_nullpointer_file0(['-j2', '--cppcheck-build-dir={}'.format(build_dir)])
+
+# TODO: this only succeeded because it depedent on the bugged unqiue message handling
+@pytest.mark.parametrize("single_file", [
+    False,
+    pytest.param(True, marks=pytest.mark.xfail(strict=True)),
+])
+def test_nullpointer_out_of_memory(tmpdir, single_file):
+    """Ensure that there are not duplicate warnings related to memory/resource allocation failures
+       https://trac.cppcheck.net/ticket/13521
+    """
+    code1 = 'void f(int* p) { *p = 0; }\n'
+    code2 = 'int main() { int* p = malloc(10); f(p); return 0; }\n'
+    if single_file:
+        with open(tmpdir / 'test.c', 'wt') as f:
+            f.write(code1 + code2)
+    else:
+        with open(tmpdir / 'header.h', 'wt') as f:
+            f.write('void f(int* p);\n')
+        with open(tmpdir / 'test1.c', 'wt') as f:
+            f.write('#include "header.h"\n' + code1)
+        with open(tmpdir / 'test2.c', 'wt') as f:
+            f.write('#include "header.h"\n' + code2)
+    args = [
+        '--cppcheck-build-dir=.',
+        '--enable=style',
+        '.']
+    _, _, stderr = cppcheck(args, cwd=tmpdir)
+    results = []
+    for line in stderr.splitlines():
+        if line.endswith(']'):
+            results.append(line[line.find('['):])
+
+    if single_file:
+        # the bug is found and reported using normal valueflow analysis
+        # ctu finding is not reported
+        assert results == ['[nullPointerOutOfMemory]']
+    else:
+        # the bug is found using ctu analysis
+        assert results == ['[ctunullpointerOutOfMemory]']
diff --git a/test/fixture.cpp b/test/fixture.cpp
index 81db5b4d7e9..b59b47855f7 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-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
@@ -19,52 +19,58 @@
 #include "fixture.h"
 
 #include "errortypes.h"
+#include "helpers.h"
+#include "library.h"
 #include "options.h"
-#include "path.h"
 #include "redirect.h"
 
+#include <algorithm>
 #include <cstdio>
 #include <cctype>
 #include <exception>
 #include <iostream>
+#include <set>
 #include <sstream>
 #include <string>
 
-#include <tinyxml2.h>
-
-std::ostringstream errout;
-std::ostringstream output;
+#include "xml.h"
 
 /**
  * TestRegistry
  **/
 namespace {
     struct CompareFixtures {
-        bool operator()(const TestFixture* lhs, const TestFixture* rhs) const {
+        bool operator()(const TestInstance* lhs, const TestInstance* rhs) const {
             return lhs->classname < rhs->classname;
         }
     };
 }
-using TestSet = std::set<TestFixture*, CompareFixtures>;
-class TestRegistry {
-    TestSet _tests;
-public:
-
-    static TestRegistry &theInstance() {
-        static TestRegistry testreg;
-        return testreg;
-    }
+using TestSet = std::set<TestInstance*, CompareFixtures>;
+namespace {
+    class TestRegistry {
+        TestSet _tests;
+    public:
 
-    void addTest(TestFixture *t) {
-        _tests.insert(t);
-    }
+        static TestRegistry &theInstance() {
+            static TestRegistry testreg;
+            return testreg;
+        }
 
-    const TestSet &tests() const {
-        return _tests;
-    }
-};
+        void addTest(TestInstance *t) {
+            _tests.insert(t);
+        }
 
+        const TestSet &tests() const {
+            return _tests;
+        }
+    };
+}
 
+TestInstance::TestInstance(const char * _name)
+    : classname(_name)
+{
+    TestRegistry::theInstance().addTest(this);
+}
 
 
 /**
@@ -79,21 +85,17 @@ std::size_t TestFixture::todos_counter = 0;
 std::size_t TestFixture::succeeded_todos_counter = 0;
 
 TestFixture::TestFixture(const char * const _name)
-    : mVerbose(false),
-    exename(),
-    quiet_tests(false),
-    classname(_name)
-{
-    TestRegistry::theInstance().addTest(this);
-}
+    : classname(_name)
+{}
 
 
 bool TestFixture::prepareTest(const char testname[])
 {
-    mVerbose = false;
     mTemplateFormat.clear();
     mTemplateLocation.clear();
 
+    prepareTestInternal();
+
     // Check if tests should be executed
     if (testToRun.empty() || testToRun == testname) {
         // Tests will be executed - prepare them
@@ -105,11 +107,27 @@ bool TestFixture::prepareTest(const char testname[])
         } else {
             std::cout << classname << "::" << mTestname << std::endl;
         }
-        return true;
+        return !dry_run;
     }
     return false;
 }
 
+void TestFixture::teardownTest()
+{
+    teardownTestInternal();
+
+    {
+        const std::string s = errout_str();
+        if (!s.empty())
+            throw std::runtime_error("unconsumed ErrorLogger err: " + s);
+    }
+    {
+        const std::string s = output_str();
+        if (!s.empty())
+            throw std::runtime_error("unconsumed ErrorLogger out: " + s);
+    }
+}
+
 std::string TestFixture::getLocationStr(const char * const filename, const unsigned int linenr) const
 {
     return std::string(filename) + ':' + std::to_string(linenr) + '(' + classname + "::" + mTestname + ')';
@@ -120,7 +138,7 @@ static std::string writestr(const std::string &str, bool gccStyle = false)
     std::ostringstream ostr;
     if (gccStyle)
         ostr << '\"';
-    for (std::string::const_iterator i = str.cbegin(); i != str.cend(); ++i) {
+    for (auto i = str.cbegin(); i != str.cend(); ++i) {
         if (*i == '\n') {
             ostr << "\\n";
             if ((i+1) != str.end() && !gccStyle)
@@ -141,16 +159,18 @@ static std::string writestr(const std::string &str, bool gccStyle = false)
     return ostr.str();
 }
 
-bool TestFixture::assert_(const char * const filename, const unsigned int linenr, const bool condition) const
+void TestFixture::assert_(const char * const filename, const unsigned int linenr, const bool condition, const std::string& msg) const
 {
     if (!condition) {
         ++fails_counter;
         errmsg << getLocationStr(filename, linenr) << ": Assertion failed." << std::endl << "_____" << std::endl;
+        if (!msg.empty())
+            errmsg << "Hint:" << std::endl << msg << std::endl;
+        throw AssertFailedError();
     }
-    return condition;
 }
 
-void TestFixture::assertEqualsFailed(const char* const filename, const unsigned int linenr, const std::string& expected, const std::string& actual, const std::string& msg) const
+void TestFixture::assertFailure(const char* const filename, const unsigned int linenr, const std::string& expected, const std::string& actual, const std::string& msg) const
 {
     ++fails_counter;
     errmsg << getLocationStr(filename, linenr) << ": Assertion failed. " << std::endl
@@ -161,14 +181,14 @@ void TestFixture::assertEqualsFailed(const char* const filename, const unsigned
     if (!msg.empty())
         errmsg << "Hint:" << std::endl << msg << std::endl;
     errmsg << "_____" << std::endl;
+    throw AssertFailedError();
 }
 
-bool TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg) const
+void TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg) const
 {
     if (expected != actual) {
-        assertEqualsFailed(filename, linenr, expected, actual, msg);
+        assertFailure(filename, linenr, expected, actual, msg);
     }
-    return expected == actual;
 }
 
 std::string TestFixture::deleteLineNumber(const std::string &message)
@@ -200,25 +220,26 @@ void TestFixture::assertEqualsWithoutLineNumbers(const char * const filename, co
     assertEquals(filename, linenr, deleteLineNumber(expected), deleteLineNumber(actual), msg);
 }
 
-bool TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg) const
+void TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg) const
 {
-    return assertEquals(filename, linenr, std::string(expected), actual, msg);
+    assertEquals(filename, linenr, std::string(expected), actual, msg);
 }
-bool TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const char expected[], const char actual[], const std::string &msg) const
+
+void TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const char expected[], const char actual[], const std::string &msg) const
 {
-    return assertEquals(filename, linenr, std::string(expected), std::string(actual), msg);
+    assertEquals(filename, linenr, std::string(expected), std::string(actual), msg);
 }
-bool TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const std::string& expected, const char actual[], const std::string &msg) const
+
+void TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const std::string& expected, const char actual[], const std::string &msg) const
 {
-    return assertEquals(filename, linenr, expected, std::string(actual), msg);
+    assertEquals(filename, linenr, expected, std::string(actual), msg);
 }
 
-bool TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const long long expected, const long long actual, const std::string &msg) const
+void TestFixture::assertEquals(const char * const filename, const unsigned int linenr, const long long expected, const long long actual, const std::string &msg) const
 {
     if (expected != actual) {
         assertEquals(filename, linenr, std::to_string(expected), std::to_string(actual), msg);
     }
-    return expected == actual;
 }
 
 void TestFixture::assertEqualsDouble(const char * const filename, const unsigned int linenr, const double expected, const double actual, const double tolerance, const std::string &msg) const
@@ -267,7 +288,7 @@ void TestFixture::assertThrow(const char * const filename, const unsigned int li
     ++fails_counter;
     errmsg << getLocationStr(filename, linenr) << ": Assertion succeeded. "
            << "The expected exception was thrown" << std::endl << "_____" << std::endl;
-
+    throw AssertFailedError();
 }
 
 void TestFixture::assertThrowFail(const char * const filename, const unsigned int linenr) const
@@ -275,15 +296,35 @@ void TestFixture::assertThrowFail(const char * const filename, const unsigned in
     ++fails_counter;
     errmsg << getLocationStr(filename, linenr) << ": Assertion failed. "
            << "The expected exception was not thrown"  << std::endl << "_____" << std::endl;
-
+    throw AssertFailedError();
 }
 
-void TestFixture::assertNoThrowFail(const char * const filename, const unsigned int linenr) const
+void TestFixture::assertNoThrowFail(const char * const filename, const unsigned int linenr, bool bailout) const
 {
+    std::string ex_msg;
+
+    try {
+        // cppcheck-suppress rethrowNoCurrentException
+        throw;
+    }
+    catch (const AssertFailedError&) {
+        return;
+    }
+    catch (const InternalError& e) {
+        ex_msg = e.errorMessage;
+    }
+    catch (const std::exception& e) {
+        ex_msg = e.what();
+    }
+    catch (...) {
+        ex_msg = "unknown exception";
+    }
+
     ++fails_counter;
     errmsg << getLocationStr(filename, linenr) << ": Assertion failed. "
-           << "Unexpected exception was thrown"  << std::endl << "_____" << std::endl;
-
+           << "Unexpected exception was thrown: " << ex_msg << std::endl << "_____" << std::endl;
+    if (bailout)
+        throw AssertFailedError();
 }
 
 void TestFixture::printHelp()
@@ -303,7 +344,9 @@ void TestFixture::printHelp()
         "\n"
         "Options:\n"
         "    -q                   Do not print the test cases that have run.\n"
-        "    -h, --help           Print this help.\n";
+        "    -h, --help           Print this help.\n"
+        "    -n                   Print no summaries.\n"
+        "    -d                   Do not execute the tests.\n";
 }
 
 void TestFixture::run(const std::string &str)
@@ -335,6 +378,7 @@ void TestFixture::run(const std::string &str)
 void TestFixture::processOptions(const options& args)
 {
     quiet_tests = args.quiet();
+    dry_run = args.dry_run();
     exename = args.exe();
 }
 
@@ -343,6 +387,7 @@ std::size_t TestFixture::runTests(const options& args)
     countTests = 0;
     errmsg.str("");
 
+    // 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) {
@@ -350,23 +395,28 @@ std::size_t TestFixture::runTests(const options& args)
             classname.erase(classname.find("::"));
         }
 
-        for (TestFixture * test : TestRegistry::theInstance().tests()) {
+        for (TestInstance * test : TestRegistry::theInstance().tests()) {
             if (classname.empty() || test->classname == classname) {
-                test->processOptions(args);
-                test->run(testname);
+                TestFixture* fixture = test->create();
+                fixture->processOptions(args);
+                fixture->run(testname);
             }
         }
     }
 
-    std::cout << "\n\nTesting Complete\nNumber of tests: " << countTests << std::endl;
-    std::cout << "Number of todos: " << todos_counter;
-    if (succeeded_todos_counter > 0)
-        std::cout << " (" << succeeded_todos_counter << " succeeded)";
-    std::cout << std::endl;
+    if (args.summary() && !args.dry_run()) {
+        std::cout << "\n\nTesting Complete\nNumber of tests: " << countTests << std::endl;
+        std::cout << "Number of todos: " << todos_counter;
+        if (succeeded_todos_counter > 0)
+            std::cout << " (" << succeeded_todos_counter << " succeeded)";
+        std::cout << std::endl;
+    }
     // calling flush here, to do all output before the error messages (in case the output is buffered)
     std::cout.flush();
 
-    std::cerr << "Tests failed: " << fails_counter << std::endl << std::endl;
+    if (args.summary() && !args.dry_run()) {
+        std::cerr << "Tests failed: " << fails_counter << std::endl << std::endl;
+    }
     std::cerr << errmsg.str();
 
     std::cerr.flush();
@@ -375,23 +425,48 @@ std::size_t TestFixture::runTests(const options& args)
 
 void TestFixture::reportOut(const std::string & outmsg, Color /*c*/)
 {
-    output << outmsg << std::endl;
+    mOutput << outmsg << std::endl;
 }
 
 void TestFixture::reportErr(const ErrorMessage &msg)
 {
-    const std::string errormessage(msg.toString(mVerbose, mTemplateFormat, mTemplateLocation));
-    if (errout.str().find(errormessage) == std::string::npos)
-        errout << errormessage << std::endl;
+    if (msg.severity == Severity::internal)
+        return;
+    if (msg.severity == Severity::information && msg.id == "normalCheckLevelMaxBranches")
+        return;
+    std::string errormessage;
+    if (!mTemplateFormat.empty()) {
+        errormessage = msg.toString(false, mTemplateFormat, mTemplateLocation);
+    }
+    else {
+        if (!msg.callStack.empty()) {
+            errormessage += ErrorLogger::callStackToString(msg.callStack, mNewTemplate);
+            errormessage += ": ";
+        }
+        if (msg.severity != Severity::none) {
+            errormessage += '(';
+            errormessage += severityToString(msg.severity);
+            if (msg.certainty == Certainty::inconclusive)
+                errormessage += ", inconclusive";
+            errormessage += ") ";
+        }
+        errormessage += msg.shortMessage();
+        if (mNewTemplate) {
+            errormessage += " [";
+            errormessage += msg.id;
+            errormessage += "]";
+        }
+    }
+    mErrout << errormessage << std::endl;
 }
 
 void TestFixture::setTemplateFormat(const std::string &templateFormat)
 {
     if (templateFormat == "multiline") {
-        mTemplateFormat = "{file}:{line}:{severity}:{message}";
-        mTemplateLocation = "{file}:{line}:note:{info}";
+        mTemplateFormat = "[{file}:{line}:{column}]: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
+        mTemplateLocation = "[{file}:{line}:{column}]: note: {info}";
     }
-    else if (templateFormat == "simple") {
+    else if (templateFormat == "simple") { // TODO: use the existing one in CmdLineParser
         mTemplateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]";
         mTemplateLocation = "";
     }
@@ -401,9 +476,18 @@ void TestFixture::setTemplateFormat(const std::string &templateFormat)
     }
 }
 
+TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::checkLevel(Settings::CheckLevel level) {
+    settings.setCheckLevel(level);
+    return *this;
+}
+
 TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::library(const char lib[]) {
+    if (REDUNDANT_CHECK && std::find(settings.libraries.cbegin(), settings.libraries.cend(), lib) != settings.libraries.cend())
+        throw std::runtime_error("redundant setting: libraries (" + std::string(lib) + ")");
     // TODO: exename is not yet set
-    LOAD_LIB_2_EXE(settings.library, lib, fixture.exename.c_str());
+    const Library::ErrorCode lib_error = settings.library.load(fixture.exename.c_str(), lib).errorcode;
+    if (lib_error != Library::ErrorCode::OK)
+        throw std::runtime_error("loading library '" + std::string(lib) + "' failed - " + std::to_string(static_cast<int>(lib_error)));
     // strip extension
     std::string lib_s(lib);
     const std::string ext(".cfg");
@@ -414,9 +498,13 @@ TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::library(const char l
     return *this;
 }
 
-TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::platform(cppcheck::Platform::Type type)
+TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::platform(Platform::Type type)
 {
-    const std::string platformStr = cppcheck::Platform::toString(type);
+    const std::string platformStr = Platform::toString(type);
+
+    if (REDUNDANT_CHECK && settings.platform.type == type)
+        throw std::runtime_error("redundant setting: platform (" + platformStr + ")");
+
     std::string errstr;
     // TODO: exename is not yet set
     if (!settings.platform.set(platformStr, errstr, {fixture.exename}))
@@ -427,9 +515,11 @@ TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::platform(cppcheck::P
 TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::libraryxml(const char xmldata[], std::size_t len)
 {
     tinyxml2::XMLDocument doc;
-    if (tinyxml2::XML_SUCCESS != doc.Parse(xmldata, len))
-        throw std::runtime_error("loading XML data failed");
-    if (settings.library.load(doc).errorcode != Library::ErrorCode::OK)
-        throw std::runtime_error("loading library XML failed");
+    const tinyxml2::XMLError xml_error = doc.Parse(xmldata, len);
+    if (tinyxml2::XML_SUCCESS != xml_error)
+        throw std::runtime_error(std::string("loading library XML data failed - ") + tinyxml2::XMLDocument::ErrorIDToName(xml_error));
+    const Library::ErrorCode lib_error = LibraryHelper::loadxmldoc(settings.library, doc).errorcode;
+    if (lib_error != Library::ErrorCode::OK)
+        throw std::runtime_error("loading library XML failed - " + std::to_string(static_cast<int>(lib_error)));
     return *this;
 }
diff --git a/test/fixture.h b/test/fixture.h
index 5004f1608f3..5983ae66a3a 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-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
@@ -24,17 +24,23 @@
 #include "color.h"
 #include "config.h"
 #include "errorlogger.h"
+#include "errortypes.h"
+#include "platform.h"
 #include "settings.h"
+#include "standards.h"
 
 #include <cstddef>
+#include <cstdint>
+#include <exception>
 #include <list>
-#include <set>
+#include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <string>
+#include <type_traits>
+#include <utility>
 
 class options;
-class Settings;
 class Tokenizer;
 
 class TestFixture : public ErrorLogger {
@@ -44,7 +50,6 @@ 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;
@@ -52,55 +57,71 @@ class TestFixture : public ErrorLogger {
 protected:
     std::string exename;
     std::string testToRun;
-    bool quiet_tests;
+    bool quiet_tests{};
+    bool dry_run{};
+    bool mNewTemplate{};
 
     virtual void run() = 0;
 
     bool prepareTest(const char testname[]);
-    std::string getLocationStr(const char * const filename, const unsigned int linenr) const;
+    virtual void prepareTestInternal() {}
+    void teardownTest();
+    virtual void teardownTestInternal() {}
+    std::string getLocationStr(const char * filename, unsigned int linenr) const;
 
-    bool assert_(const char * const filename, const unsigned int linenr, const bool condition) const;
+    class AssertFailedError : public std::exception {};
 
-    template<typename T, typename U>
-    bool assertEquals(const char* const filename, const unsigned int linenr, const T& expected, const U& actual, const std::string& msg = emptyString) const {
+    void assert_(const char * filename, unsigned int linenr, bool condition, const std::string& msg = "") const;
+
+    template<typename T>
+    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;
 
-            assertEqualsFailed(filename, linenr, expectedStr.str(), actualStr.str(), msg);
+            assertFailure(filename, linenr, expectedStr.str(), actualStr.str(), msg);
         }
-        return expected == actual;
     }
 
-    //Helper function to be called when an assertEquals assertion fails.
-    //Writes the appropriate failure message to errmsg and increments fails_counter
-    void assertEqualsFailed(const char* const filename, const unsigned int linenr, const std::string& expected, const std::string& actual, const std::string& msg) const;
+    template<typename T>
+    void assertEqualsEnum(const char* const filename, const unsigned int linenr, const T& expected, const T& actual, const std::string& msg = "") const {
+        if (std::is_unsigned<T>())
+            assertEquals(filename, linenr, static_cast<std::uint64_t>(expected), static_cast<std::uint64_t>(actual), msg);
+        else
+            assertEquals(filename, linenr, static_cast<std::int64_t>(expected), static_cast<std::int64_t>(actual), msg);
+    }
 
-    bool assertEquals(const char * const filename, const unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = emptyString) const;
-    void assertEqualsWithoutLineNumbers(const char * const filename, const unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = emptyString) const;
-    bool assertEquals(const char * const filename, const unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg = emptyString) const;
-    bool assertEquals(const char * const filename, const unsigned int linenr, const char expected[], const char actual[], const std::string &msg = emptyString) const;
-    bool assertEquals(const char * const filename, const unsigned int linenr, const std::string& expected, const char actual[], const std::string &msg = emptyString) const;
-    bool assertEquals(const char * const filename, const unsigned int linenr, const long long expected, const long long actual, const std::string &msg = emptyString) const;
-    void assertEqualsDouble(const char * const filename, const unsigned int linenr, const double expected, const double actual, const double tolerance, const std::string &msg = emptyString) const;
+    template<typename T>
+    void todoAssertEqualsEnum(const char* const filename, const unsigned int linenr, const T& wanted, const T& current, const T& actual) const {
+        if (std::is_unsigned<T>())
+            todoAssertEquals(filename, linenr, static_cast<std::uint64_t>(wanted), static_cast<std::uint64_t>(current), static_cast<std::uint64_t>(actual));
+        else
+            todoAssertEquals(filename, linenr, static_cast<std::int64_t>(wanted), static_cast<std::int64_t>(current), static_cast<std::int64_t>(actual));
+    }
+
+    void assertEquals(const char * filename, unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = "") const;
+    void assertEqualsWithoutLineNumbers(const char * filename, unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = "") const;
+    void assertEquals(const char * filename, unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg = "") const;
+    void assertEquals(const char * filename, unsigned int linenr, const char expected[], const char actual[], const std::string &msg = "") const;
+    void assertEquals(const char * filename, unsigned int linenr, const std::string& expected, const char actual[], const std::string &msg = "") const;
+    void assertEquals(const char * filename, unsigned int linenr, long long expected, long long actual, const std::string &msg = "") const;
+    void assertEqualsDouble(const char * filename, unsigned int linenr, double expected, double actual, double tolerance, const std::string &msg = "") const;
 
-    void todoAssertEquals(const char * const filename, const unsigned int linenr, const std::string &wanted,
+    void todoAssertEquals(const char * filename, unsigned int linenr, const std::string &wanted,
                           const std::string &current, const std::string &actual) const;
-    void todoAssertEquals(const char * const filename, const unsigned int linenr, const char wanted[],
+    void todoAssertEquals(const char * filename, unsigned int linenr, const char wanted[],
                           const char current[], const std::string &actual) const;
-    void todoAssertEquals(const char * const filename, const unsigned int linenr, const long long wanted,
-                          const long long current, const long long actual) const;
-    void assertThrow(const char * const filename, const unsigned int linenr) const;
-    void assertThrowFail(const char * const filename, const unsigned int linenr) const;
-    void assertNoThrowFail(const char * const filename, const unsigned int linenr) const;
+    void todoAssertEquals(const char * filename, unsigned int linenr, long long wanted,
+                          long long current, long long actual) const;
+    NORETURN void assertThrow(const char * filename, unsigned int linenr) const;
+    NORETURN void assertThrowFail(const char * filename, unsigned int linenr) const;
+    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() {
@@ -113,7 +134,7 @@ class TestFixture : public ErrorLogger {
     static T& getCheck()
     {
         for (Check *check : Check::instances()) {
-            //cppcheck-suppress [constVariablePointer, useStlAlgorithm] - TODO: fix constVariable FP
+            //cppcheck-suppress useStlAlgorithm
             if (T* c = dynamic_cast<T*>(check))
                 return *c;
         }
@@ -121,71 +142,97 @@ class TestFixture : public ErrorLogger {
     }
 
     template<typename T>
-    static void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
+    static void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     {
-        T& check = getCheck<T>();
-        check.runChecks(tokenizer, settings, errorLogger);
+        Check& check = getCheck<T>();
+        check.runChecks(tokenizer, errorLogger);
     }
 
-    // TODO: bail out on redundant settings
     class SettingsBuilder
     {
     public:
         explicit SettingsBuilder(const TestFixture &fixture) : fixture(fixture) {}
         SettingsBuilder(const TestFixture &fixture, Settings settings) : fixture(fixture), settings(std::move(settings)) {}
 
-        SettingsBuilder& severity(Severity::SeverityType sev, bool b = true) {
+        SettingsBuilder& severity(Severity sev, bool b = true) {
+            if (REDUNDANT_CHECK && settings.severity.isEnabled(sev) == b)
+                throw std::runtime_error("redundant setting: severity - " + severityToString(sev));
             settings.severity.setEnabled(sev, b);
             return *this;
         }
 
         SettingsBuilder& certainty(Certainty cert, bool b = true) {
+            if (REDUNDANT_CHECK && settings.certainty.isEnabled(cert) == b)
+                throw std::runtime_error("redundant setting: certainty");
             settings.certainty.setEnabled(cert, b);
             return *this;
         }
 
         SettingsBuilder& clang() {
+            if (REDUNDANT_CHECK && settings.clang)
+                throw std::runtime_error("redundant setting: clang");
             settings.clang = true;
             return *this;
         }
 
         SettingsBuilder& checkLibrary() {
+            if (REDUNDANT_CHECK && settings.checkLibrary)
+                throw std::runtime_error("redundant setting: checkLibrary");
             settings.checkLibrary = true;
             return *this;
         }
 
         SettingsBuilder& checkUnusedTemplates(bool b = true) {
+            if (REDUNDANT_CHECK && settings.checkUnusedTemplates == b)
+                throw std::runtime_error("redundant setting: checkUnusedTemplates");
             settings.checkUnusedTemplates = b;
             return *this;
         }
 
         SettingsBuilder& debugwarnings(bool b = true) {
+            if (REDUNDANT_CHECK && settings.debugwarnings == b)
+                throw std::runtime_error("redundant setting: debugwarnings");
             settings.debugwarnings = b;
             return *this;
         }
 
         SettingsBuilder& c(Standards::cstd_t std) {
+            // TODO: CLatest and C23 are the same - handle differently?
+            //if (REDUNDANT_CHECK && settings.standards.c == std)
+            //    throw std::runtime_error("redundant setting: standards.c");
             settings.standards.c = std;
             return *this;
         }
 
         SettingsBuilder& cpp(Standards::cppstd_t std) {
+            // TODO: CPPLatest and CPP26 are the same - handle differently?
+            //if (REDUNDANT_CHECK && settings.standards.cpp == std)
+            //    throw std::runtime_error("redundant setting: standards.cpp");
             settings.standards.cpp = std;
             return *this;
         }
 
+        SettingsBuilder& checkLevel(Settings::CheckLevel level);
+
         SettingsBuilder& library(const char lib[]);
 
-        SettingsBuilder& libraryxml(const char xmldata[], std::size_t len);
+        template<size_t size>
+        SettingsBuilder& libraryxml(const char (&xmldata)[size]) {
+            return libraryxml(xmldata, size-1);
+        }
 
-        SettingsBuilder& platform(cppcheck::Platform::Type type);
+        SettingsBuilder& platform(Platform::Type type);
 
         SettingsBuilder& checkConfiguration() {
+            if (REDUNDANT_CHECK && settings.checkConfiguration)
+                throw std::runtime_error("redundant setting: checkConfiguration");
             settings.checkConfiguration = true;
             return *this;
         }
 
         SettingsBuilder& checkHeaders(bool b = true) {
+            if (REDUNDANT_CHECK && settings.checkHeaders == b)
+                throw std::runtime_error("redundant setting: checkHeaders");
             settings.checkHeaders = b;
             return *this;
         }
@@ -194,8 +241,12 @@ class TestFixture : public ErrorLogger {
             return std::move(settings);
         }
     private:
+        SettingsBuilder& libraryxml(const char xmldata[], std::size_t len);
+
         const TestFixture &fixture;
         Settings settings;
+
+        static constexpr bool REDUNDANT_CHECK = false;
     };
 
     SettingsBuilder settingsBuilder() const {
@@ -206,47 +257,93 @@ class TestFixture : public ErrorLogger {
         return SettingsBuilder(*this, std::move(settings));
     }
 
-public:
+    std::string output_str() {
+        std::string s = mOutput.str();
+        mOutput.str("");
+        return s;
+    }
+
+    std::string errout_str() {
+        std::string s = mErrout.str();
+        mErrout.str("");
+        return s;
+    }
+
+    void ignore_errout() {
+        if (errout_str().empty())
+            throw std::runtime_error("no errout to ignore");
+    }
+
+    const Settings settingsDefault;
+
+private:
+    //Helper function to be called when an assertEquals assertion fails.
+    //Writes the appropriate failure message to errmsg and increments fails_counter
+    NORETURN void assertFailure(const char* filename, unsigned int linenr, const std::string& expected, const std::string& actual, const std::string& msg) const;
+
+    std::ostringstream mOutput;
+    std::ostringstream mErrout;
+
     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;
+    }
     void run(const std::string &str);
+
+public:
     static void printHelp();
     const std::string classname;
 
-    explicit TestFixture(const char * const _name);
-    ~TestFixture() override {}
+    explicit TestFixture(const char * _name);
 
     static std::size_t runTests(const options& args);
 };
 
-// TODO: fix these
-// NOLINTNEXTLINE(readability-redundant-declaration)
-extern std::ostringstream errout;
-// NOLINTNEXTLINE(readability-redundant-declaration)
-extern std::ostringstream output;
-
-// TODO: most asserts do not actually assert i.e. do not return
-#define TEST_CASE( NAME )  do { if (prepareTest(#NAME)) { setVerbose(false); NAME(); } } while (false)
-#define ASSERT( CONDITION )  if (!assert_(__FILE__, __LINE__, (CONDITION))) return
-#define ASSERT_LOC( CONDITION, FILE_, LINE_ )  assert_(FILE_, LINE_, (CONDITION))
-#define CHECK_EQUALS( EXPECTED, ACTUAL )  assertEquals(__FILE__, __LINE__, (EXPECTED), (ACTUAL))
-#define ASSERT_EQUALS( EXPECTED, ACTUAL )  if (!assertEquals(__FILE__, __LINE__, (EXPECTED), (ACTUAL))) return
-#define ASSERT_EQUALS_WITHOUT_LINENUMBERS( EXPECTED, ACTUAL )  assertEqualsWithoutLineNumbers(__FILE__, __LINE__, EXPECTED, ACTUAL)
-#define ASSERT_EQUALS_DOUBLE( EXPECTED, ACTUAL, TOLERANCE )  assertEqualsDouble(__FILE__, __LINE__, EXPECTED, ACTUAL, TOLERANCE)
-#define ASSERT_EQUALS_MSG( EXPECTED, ACTUAL, MSG )  assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL, MSG)
-#define ASSERT_THROW( CMD, EXCEPTION ) do { try { CMD; assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&) {} catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
-#define ASSERT_THROW_EQUALS( CMD, EXCEPTION, EXPECTED ) do { try { 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 { CMD; assertThrowFail(__FILE__, __LINE__); } catch (const EXCEPTION&e) { assertEquals(__FILE__, __LINE__, EXPECTED, e.what()); } catch (...) { assertThrowFail(__FILE__, __LINE__); } } while (false)
-#define ASSERT_NO_THROW( CMD ) do { try { CMD; } catch (...) { assertNoThrowFail(__FILE__, __LINE__); } } while (false)
-#define TODO_ASSERT_THROW( CMD, EXCEPTION ) do { try { CMD; } catch (const EXCEPTION&) {} catch (...) { assertThrow(__FILE__, __LINE__); } } while (false)
+class TestInstance {
+public:
+    explicit TestInstance(const char * _name);
+    virtual ~TestInstance() = default;
+
+    virtual TestFixture* create() = 0;
+
+    const std::string classname;
+protected:
+    std::unique_ptr<TestFixture> impl;
+};
+
+#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*
+#define ASSERT_EQUALS( EXPECTED, ACTUAL ) do { try { assertEquals(__FILE__, __LINE__, (EXPECTED), (ACTUAL)); } catch(const AssertFailedError&) { throw; } catch (...) { assertNoThrowFail(__FILE__, __LINE__, true); } } while (false)
+// *INDENT-ON*
+#define ASSERT_EQUALS_WITHOUT_LINENUMBERS( EXPECTED, ACTUAL ) assertEqualsWithoutLineNumbers(__FILE__, __LINE__, EXPECTED, ACTUAL)
+#define ASSERT_EQUALS_DOUBLE( EXPECTED, ACTUAL, TOLERANCE ) assertEqualsDouble(__FILE__, __LINE__, EXPECTED, ACTUAL, TOLERANCE)
+#define ASSERT_EQUALS_LOC( EXPECTED, ACTUAL, FILE_, LINE_ ) assertEquals(FILE_, LINE_, EXPECTED, ACTUAL)
+#define ASSERT_EQUALS_LOC_MSG( EXPECTED, ACTUAL, MSG, FILE_, LINE_ ) assertEquals(FILE_, LINE_, EXPECTED, ACTUAL, MSG)
+#define ASSERT_EQUALS_MSG( EXPECTED, ACTUAL, MSG ) assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL, MSG)
+#define ASSERT_EQUALS_ENUM( EXPECTED, ACTUAL ) assertEqualsEnum(__FILE__, __LINE__, (EXPECTED), (ACTUAL))
+#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_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)
+#define TODO_ASSERT_THROW( CMD, EXCEPTION ) do { try { (void)(CMD); } catch (const AssertFailedError&) { throw; } catch (const EXCEPTION&) {} catch (...) { assertThrow(__FILE__, __LINE__); } } while (false)
 #define TODO_ASSERT( CONDITION ) do { const bool condition=(CONDITION); todoAssertEquals(__FILE__, __LINE__, true, false, condition); } while (false)
 #define TODO_ASSERT_EQUALS( WANTED, CURRENT, ACTUAL ) todoAssertEquals(__FILE__, __LINE__, WANTED, CURRENT, ACTUAL)
-#define EXPECT_EQ( EXPECTED, ACTUAL ) assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL)
-#define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance_ ## CLASSNAME; }
 
-#define LOAD_LIB_2_EXE( LIB, NAME, EXE ) do { if (((LIB).load((EXE), NAME).errorcode != Library::ErrorCode::OK)) throw std::runtime_error("library '" + std::string(NAME) + "' not found"); } while (false)
-#define LOAD_LIB_2( LIB, NAME ) LOAD_LIB_2_EXE(LIB, NAME, exename.c_str())
+// *INDENT-OFF*
+#define REGISTER_TEST( CLASSNAME ) namespace { class CLASSNAME ## Instance : public TestInstance { public: CLASSNAME ## Instance() : TestInstance(#CLASSNAME) {} TestFixture* create() override { impl.reset(new CLASSNAME); return impl.get(); } }; CLASSNAME ## Instance instance_ ## CLASSNAME; }
+// *INDENT-ON*
 
-#define PLATFORM( P, T ) do { std::string errstr; assertEquals(__FILE__, __LINE__, true, P.set(cppcheck::Platform::toString(T), errstr, {exename}), errstr); } while (false)
+#define PLATFORM( P, T ) do { std::string errstr; assertEquals(__FILE__, __LINE__, true, P.set(Platform::toString(T), errstr, {exename}), errstr); } while (false)
 
 #endif // fixtureH
diff --git a/test/helpers.cpp b/test/helpers.cpp
index 9c86d7320b6..25b4564ed38 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-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
@@ -18,12 +18,18 @@
 
 #include "helpers.h"
 
+#include "filelister.h"
+#include "filesettings.h"
+#include "library.h"
 #include "path.h"
+#include "pathmatch.h"
 #include "preprocessor.h"
 
+#include <cerrno>
 #include <cstdio>
 #include <iostream>
 #include <fstream>
+#include <list>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -37,14 +43,19 @@
 
 #include <simplecpp.h>
 
-class Suppressions;
+#include "xml.h"
 
+const Settings SimpleTokenizer::s_settings;
+
+// TODO: better path-only usage
 ScopedFile::ScopedFile(std::string name, const std::string &content, std::string path)
     : mName(std::move(name))
     , mPath(Path::toNativeSeparators(std::move(path)))
     , mFullPath(Path::join(mPath, mName))
 {
     if (!mPath.empty() && mPath != Path::getCurrentPath()) {
+        if (Path::isDirectory(mPath))
+            throw std::runtime_error("ScopedFile(" + mFullPath + ") - directory already exists");
 #ifdef _WIN32
         if (!CreateDirectoryA(mPath.c_str(), nullptr))
             throw std::runtime_error("ScopedFile(" + mFullPath + ") - could not create directory");
@@ -54,6 +65,9 @@ ScopedFile::ScopedFile(std::string name, const std::string &content, std::string
 #endif
     }
 
+    if (Path::isFile(mFullPath))
+        throw std::runtime_error("ScopedFile(" + mFullPath + ") - file already exists");
+
     std::ofstream of(mFullPath);
     if (!of.is_open())
         throw std::runtime_error("ScopedFile(" + mFullPath + ") - could not open file");
@@ -63,53 +77,73 @@ ScopedFile::ScopedFile(std::string name, const std::string &content, std::string
 ScopedFile::~ScopedFile() {
     const int remove_res = std::remove(mFullPath.c_str());
     if (remove_res != 0) {
-        std::cout << "ScopedFile(" << mFullPath + ") - could not delete file (" << remove_res << ")";
+        std::cout << "ScopedFile(" << mFullPath + ") - could not delete file (" << remove_res << ")" << std::endl;
     }
     if (!mPath.empty() && mPath != Path::getCurrentPath()) {
+        // TODO: remove all files
+        // 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());
+        if (!res.empty()) {
+            std::cout << "ScopedFile(" << mPath + ") - generating file list failed (" << res << ")" << std::endl;
+        }
+        for (const auto &f : files)
+        {
+            const std::string &file = f.path();
+            const int rm_f_res = std::remove(file.c_str());
+            if (rm_f_res != 0) {
+                std::cout << "ScopedFile(" << mPath + ") - could not delete '" << file << "' (" << rm_f_res << ")" << std::endl;
+            }
+        }
+
 #ifdef _WIN32
         if (!RemoveDirectoryA(mPath.c_str())) {
-            std::cout << "ScopedFile(" << mFullPath + ") - could not delete folder (" << GetLastError() << ")";
+            std::cout << "ScopedFile(" << mFullPath + ") - could not delete folder (" << GetLastError() << ")" << std::endl;
         }
 #else
         const int rmdir_res = rmdir(mPath.c_str());
         if (rmdir_res == -1) {
             const int err = errno;
-            std::cout << "ScopedFile(" << mFullPath + ") - could not delete folder (" << err << ")";
+            std::cout << "ScopedFile(" << mFullPath + ") - could not delete folder (" << err << ")" << std::endl;
         }
 #endif
     }
 }
 
-// TODO: we should be using the actual Preprocessor implementation
-std::string PreprocessorHelper::getcode(Preprocessor &preprocessor, const std::string &filedata, const std::string &cfg, const std::string &filename, Suppressions *inlineSuppression)
+void SimpleTokenizer2::preprocess(const char* code, std::size_t size, std::vector<std::string> &files, const std::string& file0, Tokenizer& tokenizer, ErrorLogger& errorlogger)
 {
     simplecpp::OutputList outputList;
-    std::vector<std::string> files;
-
-    std::istringstream istr(filedata);
-    simplecpp::TokenList tokens1(istr, files, Path::simplifyPath(filename), &outputList);
-    if (inlineSuppression)
-        preprocessor.inlineSuppressions(tokens1, *inlineSuppression);
-    tokens1.removeComments();
-    preprocessor.simplifyPragmaAsm(&tokens1);
-    preprocessor.removeComments();
-    preprocessor.setDirectives(tokens1);
-
-    preprocessor.reportOutput(outputList, true);
-
-    if (Preprocessor::hasErrors(outputList))
-        return "";
-
-    std::string ret;
-    try {
-        ret = preprocessor.getcode(tokens1, cfg, files, filedata.find("#file") != std::string::npos);
-    } catch (const simplecpp::Output &) {
-        ret.clear();
-    }
+    simplecpp::TokenList tokens1({code, size}, files, file0, &outputList);
+
+    Preprocessor preprocessor(tokens1, tokenizer.getSettings(), errorlogger, Path::identify(tokens1.getFiles()[0], false));
+    (void)preprocessor.loadFiles(files); // TODO: check result
+    simplecpp::TokenList tokens2 = preprocessor.preprocess("", files, outputList);
+    (void)preprocessor.reportOutput(outputList, true);
+
+    // Tokenizer..
+    tokenizer.list.createTokens(std::move(tokens2));
 
-    // Since "files" is a local variable the tracking info must be cleared..
-    preprocessor.mMacroUsage.clear();
-    preprocessor.mIfCond.clear();
+    std::list<Directive> directives = preprocessor.createDirectives();
+    tokenizer.setDirectives(std::move(directives));
+}
+
+bool LibraryHelper::loadxmldata(Library &lib, const char xmldata[], std::size_t len)
+{
+    tinyxml2::XMLDocument doc;
+    return (tinyxml2::XML_SUCCESS == doc.Parse(xmldata, len)) && (lib.load(doc).errorcode == Library::ErrorCode::OK);
+}
 
-    return ret;
+bool LibraryHelper::loadxmldata(Library &lib, Library::Error& liberr, const char xmldata[], std::size_t len)
+{
+    tinyxml2::XMLDocument doc;
+    if (tinyxml2::XML_SUCCESS != doc.Parse(xmldata, len))
+        return false;
+    liberr = lib.load(doc);
+    return true;
+}
+
+Library::Error LibraryHelper::loadxmldoc(Library &lib, const tinyxml2::XMLDocument& doc)
+{
+    return lib.load(doc);
 }
diff --git a/test/helpers.h b/test/helpers.h
index 621544cf28e..5a0bd106812 100644
--- a/test/helpers.h
+++ b/test/helpers.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * 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
@@ -19,39 +19,124 @@
 #ifndef helpersH
 #define helpersH
 
+#include "library.h"
+#include "path.h"
 #include "settings.h"
+#include "standards.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
+#include <stdexcept>
+#include <sstream>
 #include <string>
+#include <vector>
 
 class Token;
-class Preprocessor;
-class Suppressions;
+class ErrorLogger;
+namespace tinyxml2 {
+    class XMLDocument;
+}
+
+// TODO: make Tokenizer private
+class SimpleTokenizer : public Tokenizer {
+public:
+    explicit SimpleTokenizer(ErrorLogger& errorlogger, bool cpp = true)
+        : Tokenizer{TokenList{s_settings, cpp ? Standards::Language::CPP : Standards::Language::C}, errorlogger}
+    {}
+
+    SimpleTokenizer(const Settings& settings, ErrorLogger& errorlogger, bool cpp = true)
+        : Tokenizer{TokenList{settings, cpp ? Standards::Language::CPP : Standards::Language::C}, errorlogger}
+    {}
+
+    SimpleTokenizer(const Settings& settings, ErrorLogger& errorlogger, const std::string& filename)
+        : Tokenizer{TokenList{settings, Path::identify(filename, false)}, errorlogger}
+    {
+        list.appendFileIfNew(filename);
+    }
+
+    template<size_t size>
+    bool tokenize(const char (&code)[size])
+    {
+        return tokenize(code, size-1);
+    }
+
+    bool tokenize(const std::string& code)
+    {
+        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"));
+    }
 
-class givenACodeSampleToTokenize {
 private:
-    Tokenizer tokenizer;
-    const Settings settings;
+    /**
+     * Tokenize code
+     * @param code The code
+     * @param filename Indicates if the code is C++
+     * @return false if source code contains syntax errors
+     */
+    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.createTokensFromBuffer(code, size))
+            return false;
+
+        return simplifyTokens1("");
+    }
+
+    // TODO: find a better solution
+    static const Settings s_settings;
+};
 
+class SimpleTokenList
+{
 public:
-    explicit givenACodeSampleToTokenize(const char sample[], bool createOnly = false, bool cpp = true)
-        : tokenizer(&settings, nullptr) {
-        std::istringstream iss(sample);
-        if (createOnly)
-            tokenizer.list.createTokens(iss, cpp ? "test.cpp" : "test.c");
-        else
-            tokenizer.tokenize(iss, cpp ? "test.cpp" : "test.c");
+    template<size_t size>
+    explicit SimpleTokenList(const char (&code)[size], Standards::Language lang = Standards::Language::CPP)
+        : list{settings, lang}
+    {
+        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");
+    }
+
+    Token* front() {
+        return list.front();
     }
 
-    Token* tokens() {
-        return tokenizer.tokens();
+    const Token* front() const {
+        return list.front();
     }
 
-    const Token* tokens() const {
-        return tokenizer.tokens();
+    const TokenList& get() const {
+        return list;
     }
+
+private:
+    const Settings settings;
+    TokenList list;
 };
 
 
@@ -65,6 +150,10 @@ class ScopedFile {
         return mFullPath;
     }
 
+    const std::string& name() const {
+        return mName;
+    }
+
     ScopedFile(const ScopedFile&) = delete;
     ScopedFile(ScopedFile&&) = delete;
     ScopedFile& operator=(const ScopedFile&) = delete;
@@ -76,20 +165,97 @@ class ScopedFile {
     const std::string mFullPath;
 };
 
-class PreprocessorHelper
+namespace cppcheck {
+    template<typename T>
+    std::size_t count_all_of(const std::string& str, T sub) {
+        std::size_t n = 0;
+        std::string::size_type pos = 0;
+        while ((pos = str.find(sub, pos)) != std::string::npos) {
+            ++pos;
+            ++n;
+        }
+        return n;
+    }
+}
+
+/* designated initialization helper
+    Usage:
+    struct S
+    {
+        int i;
+    };
+
+    const auto s = dinit(S,
+        $.i = 1
+    );
+ */
+#define dinit(T, ...) \
+    ([&] { T ${}; __VA_ARGS__; return $; }())
+
+// Default construct object to avoid bug in clang
+// error: default member initializer for 'y' needed within definition of enclosing class 'X' outside of member functions
+// see https://stackoverflow.com/questions/53408962
+struct make_default_obj
+{
+    template<class T>
+    operator T() const // NOLINT
+    {
+        return T{};
+    }
+};
+
+inline std::string filter_valueflow(const std::string& s) {
+    bool filtered = false;
+    std::istringstream istr(s);
+    std::string ostr;
+    std::string errline;
+    while (std::getline(istr, errline)) {
+        if (errline.find("valueflow.cpp") != std::string::npos)
+        {
+            filtered = true;
+            continue;
+        }
+        ostr += errline;
+        ostr += '\n'; // TODO: last line might not contain a newline
+    }
+    if (!filtered)
+        throw std::runtime_error("no valueflow.cpp messages were filtered");
+    return ostr;
+}
+
+struct LibraryHelper
 {
+    static bool loadxmldata(Library &lib, const char xmldata[], std::size_t len);
+    static bool loadxmldata(Library &lib, Library::Error& liberr, const char xmldata[], std::size_t len);
+    static Library::Error loadxmldoc(Library &lib, const tinyxml2::XMLDocument& doc);
+};
+
+class SimpleTokenizer2 : public Tokenizer {
+    friend class TestSimplifyTypedef; // TODO: get rid of this
 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(Preprocessor &preprocessor, const std::string &filedata, const std::string &cfg, const std::string &filename, Suppressions *inlineSuppression = nullptr);
+    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, size-1, mFiles, file0, *this, errorlogger);
+    }
+
+private:
+    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
+{
+    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.createTokensFromString(code);
+    }
 };
 
 #endif // helpersH
diff --git a/test/main.cpp b/test/main.cpp
index 571b126922d..afe3e3b4171 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -25,11 +25,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
-
     Preprocessor::macroChar = '$';     // While macroChar is char(1) per default outside test suite, we require it to be a human-readable character here.
     gDisableColors = true;
 
diff --git a/test/options.cpp b/test/options.cpp
index 4a6378daf40..e8b3be139ae 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-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
@@ -20,10 +20,12 @@ 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])
 {
-    for (std::set<std::string>::const_iterator it = mWhichTests.cbegin(); it != mWhichTests.cend();) {
-        if (!(*it).empty() && (((*it)[0] == '-') || ((*it).find("::") != std::string::npos && mWhichTests.count((*it).substr(0, (*it).find("::"))))))
+    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;
@@ -44,6 +46,16 @@ bool options::help() const
     return mHelp;
 }
 
+bool options::summary() const
+{
+    return mSummary;
+}
+
+bool options::dry_run() const
+{
+    return mDryRun;
+}
+
 const std::set<std::string>& options::which_test() const
 {
     return mWhichTests;
diff --git a/test/options.h b/test/options.h
index bdde6a1d4bc..18df1dd79b2 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-2022 Cppcheck team.
+// 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
@@ -33,6 +33,10 @@ class options {
     bool quiet() const;
     /** Print help. */
     bool help() const;
+    /** Print summary. */
+    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;
 
@@ -46,6 +50,8 @@ class options {
     std::set<std::string> mWhichTests;
     const bool mQuiet;
     const bool mHelp;
+    const bool mSummary;
+    const bool mDryRun;
     std::string mExe;
 };
 
diff --git a/test/precompiled.h b/test/precompiled.h
index 9fba4c2a659..bb6ba567123 100644
--- a/test/precompiled.h
+++ b/test/precompiled.h
@@ -1,6 +1,6 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
diff --git a/test/redirect.h b/test/redirect.h
index 092e2c9bdd9..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-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
@@ -19,12 +19,9 @@
 
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 
-// NOLINTNEXTLINE(readability-redundant-declaration) - TODO: fix this
-extern std::ostringstream errout;
-// NOLINTNEXTLINE(readability-redundant-declaration) - TODO: fix this
-extern std::ostringstream output;
 /**
  * @brief Utility class for capturing cout and cerr to ostringstream buffers
  * for later use. Uses RAII to stop redirection when the object goes out of
@@ -46,35 +43,37 @@ 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() {
+    ~RedirectOutputError() noexcept(false) {
         std::cout.rdbuf(_oldCout); // restore cout's original streambuf
         std::cerr.rdbuf(_oldCerr); // restore cerrs's original streambuf
 
-        errout << _err.str();
-        output << _out.str();
+        {
+            const std::string s = _out.str();
+            if (!s.empty())
+                throw std::runtime_error("unconsumed stdout: " + s);
+        }
+
+        {
+            const std::string s = _err.str();
+            if (!s.empty())
+                throw std::runtime_error("consumed stderr: " + s);
+        }
     }
 
-    /** Return what would be printed to cout. See also clearOutput() */
-    std::string getOutput() const {
-        return _out.str();
-    }
-
-    /** Normally called after getOutput() to prevent same text to be returned
-       twice. */
-    void clearOutput() {
+    /** Return what would be printed to cout. */
+    std::string getOutput() {
+        std::string s = _out.str();
         _out.str("");
+        return s;
     }
 
-    /** Return what would be printed to cerr. See also clearErrout() */
-    std::string getErrout() const {
-        return _err.str();
-    }
-
-    /** Normally called after getErrout() to prevent same text to be returned
-       twice. */
-    void clearErrout() {
+    /** Return what would be printed to cerr. */
+    std::string getErrout() {
+        std::string s = _err.str();
         _err.str("");
+        return s;
     }
 
 private:
@@ -112,10 +111,23 @@ class SuppressOutput {
 
 #define REDIRECT RedirectOutputError redir
 #define GET_REDIRECT_OUTPUT redir.getOutput()
-#define CLEAR_REDIRECT_OUTPUT redir.clearOutput()
 #define GET_REDIRECT_ERROUT redir.getErrout()
-#define CLEAR_REDIRECT_ERROUT redir.clearErrout()
 
 #define SUPPRESS SuppressOutput supprout
 
+
+class RedirectInput {
+public:
+    explicit RedirectInput(const std::string &input) : _in(input) {
+        _oldCin = std::cin.rdbuf(); // back up cin's streambuf
+        std::cin.rdbuf(_in.rdbuf()); // assign streambuf to cin
+    }
+    ~RedirectInput() noexcept {
+        std::cin.rdbuf(_oldCin); // restore cin's original streambuf
+    }
+private:
+    std::istringstream _in;
+    std::streambuf* _oldCin;
+};
+
 #endif
diff --git a/tools/extract_and_run_more_tests.sh b/test/scripts/extract_and_run_more_tests.sh
similarity index 77%
rename from tools/extract_and_run_more_tests.sh
rename to test/scripts/extract_and_run_more_tests.sh
index f47d4132a48..0ecb64504eb 100755
--- a/tools/extract_and_run_more_tests.sh
+++ b/test/scripts/extract_and_run_more_tests.sh
@@ -4,5 +4,5 @@ cd ~/cppcheck || exit 1
 rm -rf test1
 python tools/extracttests.py --code=test1 test/testleakautovar.cpp
 cd ~/cppcheck/test1 || exit 1
-~/cppcheck/tools/run_more_tests.sh
+~/cppcheck/test/scripts/run_more_tests.sh
 
diff --git a/tools/extracttests.py b/test/scripts/extracttests.py
similarity index 98%
rename from tools/extracttests.py
rename to test/scripts/extracttests.py
index 42a80d6c051..a45c8261d64 100755
--- a/tools/extracttests.py
+++ b/test/scripts/extracttests.py
@@ -94,8 +94,7 @@ def parseFile(self, filename):
         start_code = None
         disable = False
 
-        fin = open(filename, 'r')
-        for line in fin:
+        for line in open(filename, 'r'):
             # testclass starts
             res = re.match('class (' + name + ')', line)
             if res is not None:
@@ -137,6 +136,10 @@ def parseFile(self, filename):
             if code is not None:
                 res = re.match('\\s+' + string, line)
                 if res is not None:
+                    if line.find('",') > line.find('"'):
+                        code = None
+                        continue
+
                     code = code + res.group(1)
                     if res.group(1).find('"') > 0:
                         code = None
@@ -159,10 +162,8 @@ def parseFile(self, filename):
                         'expected': expected}
                 self.nodes.append(node)
                 code = None
-
-        # close test file
-        fin.close()
-
+            elif re.match('\\s+[TOD_]*ASSERT', line) is not None:
+                code = None
 
 def strtoxml(s):
     """Convert string to xml/html format"""
diff --git a/tools/generate_and_run_more_tests.sh b/test/scripts/generate_and_run_more_tests.sh
similarity index 51%
rename from tools/generate_and_run_more_tests.sh
rename to test/scripts/generate_and_run_more_tests.sh
index 9034aa4ec56..3558f425b66 100755
--- a/tools/generate_and_run_more_tests.sh
+++ b/test/scripts/generate_and_run_more_tests.sh
@@ -8,14 +8,14 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 set -e
 
 echo testleakautovar
-$DIR/run_more_tests.sh $DIR/../test/testleakautovar.cpp
+$DIR/run_more_tests.sh $DIR/../testleakautovar.cpp
 
 echo testmemleak
-$DIR/run_more_tests.sh $DIR/../test/testmemleak.cpp
+$DIR/run_more_tests.sh $DIR/../testmemleak.cpp
 
 echo testnullpointer
-$DIR/run_more_tests.sh $DIR/../test/testnullpointer.cpp
+$DIR/run_more_tests.sh $DIR/../testnullpointer.cpp
 
 echo testuninitvar
-$DIR/run_more_tests.sh $DIR/../test/testuninitvar.cpp
+$DIR/run_more_tests.sh $DIR/../testuninitvar.cpp
 
diff --git a/tools/run_more_tests.sh b/test/scripts/run_more_tests.sh
similarity index 97%
rename from tools/run_more_tests.sh
rename to test/scripts/run_more_tests.sh
index 12633c41fb6..413ff8892f9 100755
--- a/tools/run_more_tests.sh
+++ b/test/scripts/run_more_tests.sh
@@ -18,6 +18,9 @@ python3 $DIR/extracttests.py --code=$(pwd)/test1 $1
 
 cd test1
 
+# ensure there are not critical errors in extracted tests
+$CPPCHECK -q --safety --suppress="*" .
+
 $CPPCHECK -q --template=cppcheck1 . 2> 1.txt
 
 echo "(!x) => (x==0)"
diff --git a/test/scripts/testrunner-single.sh b/test/scripts/testrunner-single.sh
new file mode 100755
index 00000000000..3bb63a3c660
--- /dev/null
+++ b/test/scripts/testrunner-single.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [ -n "$1" ]; then
+  testrunner_bin=$1
+else
+  make -s -C "$SCRIPT_DIR/../.." -j"$(nproc)" testrunner # CXXOPTS="-g -O2 -w" CPPOPTS="-DHAVE_BOOST"
+  testrunner_bin=$SCRIPT_DIR/../../testrunner
+fi
+
+ec=0
+
+tests=$($testrunner_bin -d | cut -d'(' -f2 | cut -d')' -f1)
+for test in $tests; do
+  $testrunner_bin -n "$test" || ec=1
+done
+
+exit $ec
diff --git a/tools/testrunnerify_code.sh b/test/scripts/testrunnerify_code.sh
similarity index 100%
rename from tools/testrunnerify_code.sh
rename to test/scripts/testrunnerify_code.sh
diff --git a/test/seh/CMakeLists.txt b/test/seh/CMakeLists.txt
new file mode 100644
index 00000000000..aa946a85c4e
--- /dev/null
+++ b/test/seh/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_executable(test-sehwrapper
+    test-sehwrapper.cpp
+    ${PROJECT_SOURCE_DIR}/cli/sehwrapper.cpp)
+target_include_directories(test-sehwrapper PRIVATE ${PROJECT_SOURCE_DIR}/cli ${PROJECT_SOURCE_DIR}/lib)
\ No newline at end of file
diff --git a/test/seh/test-sehwrapper.cpp b/test/seh/test-sehwrapper.cpp
new file mode 100644
index 00000000000..a92753b8423
--- /dev/null
+++ b/test/seh/test-sehwrapper.cpp
@@ -0,0 +1,86 @@
+/*
+ * 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 "config.h" // IWYU pragma: keep
+
+#if defined(USE_WINDOWS_SEH)
+#include "sehwrapper.h"
+
+#include <cassert>
+#include <cfenv>
+#include <cstdlib>
+#include <cstring>
+
+#include <windows.h>
+
+static int my_assert()
+{
+    assert(false);
+    return 0;
+}
+
+static int my_abort()
+{
+    abort();
+}
+
+static int my_segv()
+{
+    // cppcheck-suppress nullPointer
+    ++*(int*)nullptr;
+    return 0;
+}
+
+// TODO: how to catch these?
+static int my_fpe()
+{
+    const int fpe_res = std::feraiseexcept(FE_ALL_EXCEPT);
+    if (fpe_res != 0)
+        return 11;
+    return sqrt(-1.0); // invalid operation
+}
+#endif
+
+int main(int argc, const char * const argv[])
+{
+#if defined(USE_WINDOWS_SEH)
+    if (argc != 2)
+        return 1;
+
+    if (strcmp(argv[1], "assert") == 0) {
+        _set_abort_behavior(0, _WRITE_ABORT_MSG); // suppress the "Debug Error!" MessageBox
+        CALL_WITH_SEH_WRAPPER(my_assert());
+    }
+    if (strcmp(argv[1], "abort") == 0) {
+        _set_abort_behavior(0, _WRITE_ABORT_MSG); // suppress the "Debug Error!" MessageBox
+        CALL_WITH_SEH_WRAPPER(my_abort());
+    }
+    if (strcmp(argv[1], "fpe") == 0) {
+        CALL_WITH_SEH_WRAPPER(my_fpe());
+    }
+    if (strcmp(argv[1], "segv") == 0) {
+        CALL_WITH_SEH_WRAPPER(my_segv());
+    }
+
+    return 0;
+#else
+    (void)argc;
+    (void)argv;
+    return 111;
+#endif
+}
diff --git a/test/seh/test-sehwrapper.py b/test/seh/test-sehwrapper.py
new file mode 100644
index 00000000000..199d96bc0d3
--- /dev/null
+++ b/test/seh/test-sehwrapper.py
@@ -0,0 +1,78 @@
+import subprocess
+import os
+import sys
+import pytest
+
+# TODO: only run on Windows
+
+def _lookup_cppcheck_exe(exe_name):
+    # path the script is located in
+    script_path = os.path.dirname(os.path.realpath(__file__))
+
+    if sys.platform == "win32":
+        exe_name += ".exe"
+
+    for base in (script_path + '/../../', './'):
+        for path in ('', 'bin/', 'bin/debug/'):
+            exe_path = base + path + exe_name
+            if os.path.isfile(exe_path):
+                print("using '{}'".format(exe_path))
+                return exe_path
+
+    return None
+
+def _call_process(arg):
+    exe = _lookup_cppcheck_exe('test-sehwrapper')
+    if exe is None:
+        raise Exception('executable not found')
+    p = subprocess.Popen([exe, arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    comm = p.communicate()
+    stdout = comm[0].decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+    stderr = comm[1].decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+    return p.returncode, stdout, stderr
+
+
+def test_assert():
+    exitcode, stdout, stderr = _call_process('assert')
+    assert stdout == ''
+    # Assertion failed: false, file S:\GitHub\cppcheck-fw\test\seh\test-sehwrapper.cpp, line 33
+    assert stderr.startswith("Assertion failed: false, file "), stderr
+    assert stderr.endswith("test-sehwrapper.cpp, line 33\n"), stderr
+    assert exitcode == 3
+
+
+def test_abort():
+    exitcode, stdout, stderr = _call_process('abort')
+    # nothing is written in case of abort()
+    # it will show the "Debug Error!" MessageBox though which we suppress in the test
+    assert stdout == ''
+    assert stderr == ''
+    assert exitcode == 3
+
+
+def test_segv():
+    exitcode, stdout, stderr = _call_process('segv')
+    assert stderr == ''
+    lines = stdout.splitlines()
+    assert lines[0].startswith('Internal error: Access violation (instruction: 0x'), lines[0]
+    assert lines[0].endswith(') reading from 0x0000000000000000'), lines[0]
+    assert lines[1].startswith('0. 0x'), lines[1]
+    assert lines[1].endswith(' in my_segv'), lines[1]
+    assert lines[2].startswith('1. 0x'), lines[2]
+    assert lines[2].endswith(' in main'), lines[2]
+    assert lines[len(lines)-1] == 'Please report this to the cppcheck developers!'
+    assert exitcode == 4294967295  # returns -1
+
+
+# TODO: make this work
+@pytest.mark.skip
+def test_fpe():
+    exitcode, stdout, stderr = _call_process('fpe')
+    assert stderr == ''
+    lines = stdout.splitlines()
+    assert lines[0].startswith('Internal error: cppcheck received signal SIGFPE - FPE_FLTDIV (at 0x7f'), lines[0]
+    assert lines[0].endswith(').'), lines[0]
+    assert lines[1] == 'Callstack:'
+    assert lines[2].endswith('my_fpe()'), lines[2]
+    assert lines[len(lines)-1] == 'Please report this to the cppcheck developers!'
+    assert exitcode == 4294967295  # returns -1
diff --git a/test/signal/CMakeLists.txt b/test/signal/CMakeLists.txt
new file mode 100644
index 00000000000..0bd186fff20
--- /dev/null
+++ b/test/signal/CMakeLists.txt
@@ -0,0 +1,28 @@
+add_executable(test-signalhandler
+        test-signalhandler.cpp
+        ${PROJECT_SOURCE_DIR}/cli/signalhandler.cpp
+        ${PROJECT_SOURCE_DIR}/cli/stacktrace.cpp)
+target_include_directories(test-signalhandler PRIVATE ${PROJECT_SOURCE_DIR}/cli ${PROJECT_SOURCE_DIR}/lib)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # names for static functions are omitted from trace
+    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
+    if(NOT CMAKE_SYSTEM_NAME MATCHES AIX)
+        target_link_options(test-signalhandler PRIVATE -rdynamic)
+    endif()
+endif()
+
+add_executable(test-stacktrace
+        test-stacktrace.cpp
+        ${PROJECT_SOURCE_DIR}/cli/stacktrace.cpp)
+target_include_directories(test-stacktrace PRIVATE ${PROJECT_SOURCE_DIR}/cli ${PROJECT_SOURCE_DIR}/lib)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # names for static functions are omitted from trace
+    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
+    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
new file mode 100644
index 00000000000..153ec95f245
--- /dev/null
+++ b/test/signal/test-signalhandler.cpp
@@ -0,0 +1,94 @@
+/*
+ * 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/>.
+ */
+
+#if !defined(__APPLE__)
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE // required to have feenableexcept()
+#endif
+#endif
+
+#include "config.h"
+
+#if defined(USE_UNIX_SIGNAL_HANDLING)
+#include "signalhandler.h"
+
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#if !defined(__APPLE__)
+#include <cfenv>
+#endif
+
+// static functions are omitted from trace
+
+/*static*/ NORETURN void my_assert() // NOLINT(misc-use-internal-linkage)
+{
+    assert(false);
+}
+
+/*static*/ NORETURN void my_abort() // NOLINT(misc-use-internal-linkage)
+{
+    abort();
+}
+
+/*static*/ void my_segv() // NOLINT(misc-use-internal-linkage)
+{
+    // cppcheck-suppress nullPointer
+    ++*static_cast<int*>(nullptr); // NOLINT(clang-analyzer-core.NullDereference)
+}
+
+#if !defined(__APPLE__) && !defined(_AIX)
+/*static*/ int my_fpe() // NOLINT(misc-use-internal-linkage)
+{
+    if (feenableexcept(FE_ALL_EXCEPT) == -1)
+        return 2;
+    if (std::feraiseexcept(FE_ALL_EXCEPT) != 0)
+        return 3;
+    return 1 % -1;
+}
+#endif
+#endif
+
+int main(int argc, const char * const argv[])
+{
+#if defined(USE_UNIX_SIGNAL_HANDLING)
+    if (argc != 2)
+        return 1;
+
+    register_signal_handler(stdout);
+
+    if (strcmp(argv[1], "assert") == 0)
+        my_assert();
+    else if (strcmp(argv[1], "abort") == 0)
+        my_abort();
+    else if (strcmp(argv[1], "segv") == 0)
+        my_segv();
+#if !defined(__APPLE__) && !defined(_AIX)
+    else if (strcmp(argv[1], "fpe") == 0)
+        return my_fpe();
+#endif
+
+    return 0;
+#else
+    (void)argc;
+    (void)argv;
+    return 1;
+#endif
+}
diff --git a/test/signal/test-signalhandler.py b/test/signal/test-signalhandler.py
new file mode 100644
index 00000000000..1ed700d7ec8
--- /dev/null
+++ b/test/signal/test-signalhandler.py
@@ -0,0 +1,94 @@
+import subprocess
+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
+    script_path = os.path.dirname(os.path.realpath(__file__))
+
+    if sys.platform == "win32":
+        exe_name += ".exe"
+
+    for base in (script_path + '/../../', './'):
+        for path in ('', 'bin/', 'bin/debug/'):
+            exe_path = base + path + exe_name
+            if os.path.isfile(exe_path):
+                print("using '{}'".format(exe_path))
+                return exe_path
+
+    return None
+
+def __call_process(arg):
+    exe = __lookup_cppcheck_exe('test-signalhandler')
+    if exe is None:
+        raise Exception('executable not found')
+    with subprocess.Popen([exe, arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE) as p:
+        stdout, stderr = p.communicate()
+        rc = p.returncode
+    stdout = stdout.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+    stderr = stderr.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+    return rc, stdout, stderr
+
+
+def test_assert():
+    exitcode, stdout, stderr = __call_process('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: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
+    if sys.platform != "darwin":
+        assert lines[1] == 'Callstack:'
+        assert lines[2].endswith('my_abort()'), lines[2]  # TODO: wrong function
+        assert lines[len(lines)-1] == 'Please report this to the cppcheck developers!'
+    assert exitcode == -6
+
+
+def test_abort():
+    exitcode, stdout, _ = __call_process('abort')
+    lines = stdout.splitlines()
+    assert lines[0] == 'Internal error: cppcheck received signal SIGABRT - abort or assertion'
+    # no stacktrace on macOS
+    if sys.platform != "darwin":
+        assert lines[1] == 'Callstack:'
+        assert lines[2].endswith('my_segv()'), lines[2]  # TODO: wrong function
+        assert lines[len(lines)-1] == 'Please report this to the cppcheck developers!'
+    assert exitcode == -6
+
+
+def test_segv():
+    exitcode, stdout, stderr = __call_process('segv')
+    assert stderr == ''
+    lines = stdout.splitlines()
+    if sys.platform == "darwin":
+        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
+    if sys.platform != "darwin":
+        assert lines[1] == 'Callstack:'
+        assert lines[2].endswith('my_segv()'), lines[2]  # TODO: wrong function
+        assert lines[len(lines)-1] == 'Please report this to the cppcheck developers!'
+    assert exitcode == -11
+
+
+@pytest.mark.skipif(sys.platform == 'darwin', reason='Cannot raise FPE on macOS')
+def test_fpe():
+    exitcode, stdout, stderr = __call_process('fpe')
+    assert stderr == ''
+    lines = stdout.splitlines()
+    assert lines[0].startswith('Internal error: cppcheck received signal SIGFPE - FPE_FLTINV (at 0x'), lines[0]
+    assert lines[0].endswith(').'), lines[0]
+    assert lines[1] == 'Callstack:'
+    assert lines[3].endswith('my_fpe()'), lines[2]
+    assert lines[len(lines)-1] == 'Please report this to the cppcheck developers!'
+    assert exitcode == -8
diff --git a/test/signal/test-stacktrace.cpp b/test/signal/test-stacktrace.cpp
new file mode 100644
index 00000000000..8b4a2698433
--- /dev/null
+++ b/test/signal/test-stacktrace.cpp
@@ -0,0 +1,48 @@
+/*
+ * 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 "config.h"
+
+#ifdef USE_UNIX_BACKTRACE_SUPPORT
+#include "stacktrace.h"
+
+#include <cstdio>
+
+// static functions are omitted from trace
+
+/*static*/ void my_func_2() // NOLINT(misc-use-internal-linkage)
+{
+    print_stacktrace(stdout, 0, true, -1, true);
+}
+
+/*static*/ void my_func() // NOLINT(misc-use-internal-linkage)
+{
+    my_func_2();
+}
+#endif
+
+int main()
+{
+#ifdef USE_UNIX_BACKTRACE_SUPPORT
+    my_func();
+
+    return 0;
+#else
+    return 1;
+#endif
+}
diff --git a/test/signal/test-stacktrace.py b/test/signal/test-stacktrace.py
new file mode 100644
index 00000000000..47e7b2d72a2
--- /dev/null
+++ b/test/signal/test-stacktrace.py
@@ -0,0 +1,39 @@
+import subprocess
+import os
+import sys
+
+def __lookup_cppcheck_exe(exe_name):
+    # path the script is located in
+    script_path = os.path.dirname(os.path.realpath(__file__))
+
+    if sys.platform == "win32":
+        exe_name += ".exe"
+
+    for base in (script_path + '/../../', './'):
+        for path in ('', 'bin/', 'bin/debug/'):
+            exe_path = base + path + exe_name
+            if os.path.isfile(exe_path):
+                print("using '{}'".format(exe_path))
+                return exe_path
+
+    return None
+
+def __call_process():
+    exe = __lookup_cppcheck_exe('test-stacktrace')
+    if exe is None:
+        raise Exception('executable not found')
+    with subprocess.Popen([exe], stdout=subprocess.PIPE, stderr=subprocess.PIPE) as p:
+        stdout, stderr = p.communicate()
+        rc = p.returncode
+    stdout = stdout.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+    stderr = stderr.decode(encoding='utf-8', errors='ignore').replace('\r\n', '\n')
+    return rc, stdout, stderr
+
+
+def test_stack():
+    _, stdout, stderr = __call_process()
+    assert stderr == ''
+    lines = stdout.splitlines()
+    assert lines[0] == 'Callstack:'
+    assert lines[1].endswith('my_func_2()')
+    assert lines[2].endswith('my_func()')
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
index 4a2a5461342..6f9a5fbda2f 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-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
@@ -16,14 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "check64bit.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 
 class Test64BitPortability : public TestFixture {
 public:
@@ -33,6 +32,7 @@ class Test64BitPortability : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::portability).library("std.cfg").build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(novardecl);
         TEST_CASE(functionpar);
         TEST_CASE(structmember);
@@ -42,15 +42,12 @@ class Test64BitPortability : public TestFixture {
         TEST_CASE(assignment);
     }
 
-#define check(code) check_(code, __FILE__, __LINE__)
-    void check_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#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) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
         Check64BitPortability check64BitPortability(&tokenizer, &settings, this);
@@ -63,13 +60,19 @@ class Test64BitPortability : public TestFixture {
               "void f() {\n"
               "    CharArray foo = \"\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T { std::vector<int>*a[2][2]; };\n" // #11560
               "void f(T& t, int i, int j) {\n"
               "    t.a[i][j] = new std::vector<int>;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f();\n" // #11522
+              "void g() {\n"
+              "    int (*fp)() = *(int(*)())f;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void novardecl() {
@@ -78,7 +81,7 @@ class Test64BitPortability : public TestFixture {
               "{\n"
               "    a = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void functionpar() {
@@ -87,65 +90,65 @@ class Test64BitPortability : public TestFixture {
               "    int a = p;\n"
               "    return a + 4;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Assigning a pointer to an integer is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Assigning a pointer to an integer is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (portability) Returning an address value in a function with integer return type is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Assigning an integer to a pointer is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int *p) {\n" // #6096
               "    bool a = p;\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,2> f();\n"
               "void g() {\n"
               "    std::array<int, 2> a = f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typedef std::array<int, 2> Array;\n"
               "Array f();\n"
               "void g(int i) {\n"
               "    Array a = f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #9951
               "    enum E { E0 };\n"
@@ -154,12 +157,18 @@ class Test64BitPortability : public TestFixture {
               "void f() {\n"
               "    std::array<double, 1> a = S::g(S::E::E0);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char* f(char* p) {\n"
               "    return p ? p : 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int* p) {\n"
+              "    int n = (int)(size_t)*p;\n"
+              "    return n;\n"
+              "}\n", false);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember() {
@@ -167,7 +176,7 @@ class Test64BitPortability : public TestFixture {
               "void f(struct Foo *foo) {\n"
               "    int i = foo->p;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Assigning a pointer to an integer is not portable.\n", errout.str());
+        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
               "    enum class E { e1, e2 };\n"
@@ -177,7 +186,7 @@ class Test64BitPortability : public TestFixture {
               "void f(S& s) {\n"
               "    s.e = S::E::e1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ptrcompare() {
@@ -185,7 +194,7 @@ class Test64BitPortability : public TestFixture {
         check("void foo(int *p) {\n"
               "    int a = (p != NULL);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ptrarithmetic() {
@@ -194,74 +203,74 @@ class Test64BitPortability : public TestFixture {
               "    int x = 10;\n"
               "    int *a = p + x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = x + p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    int x = 10;\n"
               "    int *a = x * x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Assigning an integer to a pointer is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnIssues() {
         check("void* foo(int i) {\n"
               "    return i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Returning an integer in a function with pointer return type is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int i) {\n"
               "    return i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "\n"
               "int* dostuff(Foo foo) {\n"
               "  return foo;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(char* c) {\n"
               "    return c;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Returning an address value in a function with integer return type is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Returning an address value in a function with integer return type is not portable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(char *a, char *b) {\n" // #4486
               "    return a + 1 - b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct s {\n" // 4642
               "   int i;\n"
@@ -269,13 +278,13 @@ class Test64BitPortability : public TestFixture {
               "int func(struct s *p) {\n"
               " return 1 + p->i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7247: don't check return statements in nested functions..
         check("int foo() {\n"
@@ -283,7 +292,7 @@ class Test64BitPortability : public TestFixture {
               "    const char * name() { return \"abc\"; }\n"
               "  } table;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7451: Lambdas
         check("const int* test(std::vector<int> outputs, const std::string& text) {\n"
@@ -291,7 +300,36 @@ class Test64BitPortability : public TestFixture {
               "     [&](int ele) { return \"test\" == text; });\n"
               "  return nullptr;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12159
+              "    std::future<int> f() const {\n"
+              "        return {};\n"
+              "    }\n"
+              "};\n"
+              "int g() {\n"
+              "    std::shared_ptr<S> s = std::make_shared<S>();\n"
+              "    auto x = s->f();\n"
+              "    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 0c0c0bde741..35e86e0dbb8 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-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
@@ -18,28 +18,221 @@
 
 
 #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 : public AnalyzerInformation
+    {
+        friend class TestAnalyzerInformation;
+    };
 
     void run() override {
         TEST_CASE(getAnalyzerInfoFile);
+        TEST_CASE(duplicateFile);
+        TEST_CASE(filesTextDuplicateFile);
+        TEST_CASE(parse);
+        TEST_CASE(skipAnalysis);
     }
 
     void getAnalyzerInfoFile() const {
-        const char filesTxt[] = "file1.a4::file1.c\n";
+        constexpr char filesTxt[] = "file1.a4:::file1.c\n";
+        std::istringstream f1(filesTxt);
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 0));
+        std::istringstream f2(filesTxt);
+        ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", "", 0));
+        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));
+    }
+
+    void filesTextDuplicateFile() const {
+        std::list<FileSettings> fileSettings;
+        fileSettings.emplace_back("a.c", Standards::Language::C, 10);
+        fileSettings.back().fileIndex = 0;
+        fileSettings.emplace_back("a.c", Standards::Language::C, 10);
+        fileSettings.back().fileIndex = 1;
+
+        const char expected[] = "a.a1:::a.c\n"
+                                "a.a2::1:a.c\n";
+
+        ASSERT_EQUALS(expected, AnalyzerInformationTest::getFilesTxt({}, "", fileSettings));
+    }
+
+    void duplicateFile() const {
+        // same file duplicated
+        constexpr char filesTxt[] = "file1.a1::1:file1.c\n"
+                                    "file1.a2::2:file1.c\n";
         std::istringstream f1(filesTxt);
-        ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", ""));
+        ASSERT_EQUALS("file1.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "file1.c", "", 1));
         std::istringstream f2(filesTxt);
-        ASSERT_EQUALS("file1.a4", getAnalyzerInfoFileFromFilesTxt(f2, "./file1.c", ""));
-        ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "file1.c", ""));
-        ASSERT_EQUALS("builddir/file1.c.analyzerinfo", AnalyzerInformation::getAnalyzerInfoFile("builddir", "some/path/file1.c", ""));
+        ASSERT_EQUALS("file1.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "file1.c", "", 2));
+    }
+
+    void parse() const {
+        AnalyzerInformation::Info info;
+
+        ASSERT_EQUALS(false, info.parse("a"));
+        ASSERT_EQUALS(false, info.parse("a:b"));
+        ASSERT_EQUALS(false, info.parse("a:b:c"));
+        ASSERT_EQUALS(false, info.parse("a:b:c:d"));
+
+        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("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("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("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\">"
+                "<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(false, 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\">"
+                "<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(false, 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\">"
+                "<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(false, 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\">"
+                "<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(true, 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\">"
+                "</analyzerinfo>"
+                );
+            ASSERT_EQUALS(tinyxml2::XML_SUCCESS, xmlError);
+
+            ASSERT_EQUALS(true, 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\">"
+                "<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(false, 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(false, AnalyzerInformationTest::skipAnalysis(doc, 100, errorList));
+            ASSERT_EQUALS(0, errorList.size());
+        }
     }
 };
 
diff --git a/test/testassert.cpp b/test/testassert.cpp
index 8c18720ed04..412a7cb750b 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-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
@@ -19,13 +19,11 @@
 
 #include "checkassert.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <list>
-#include <sstream> // IWYU pragma: keep
+#include "helpers.h"
+#include "settings.h"
 
+#include <cstddef>
 
 class TestAssert : public TestFixture {
 public:
@@ -35,20 +33,18 @@ class TestAssert : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::warning).build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char *filename = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        runChecks<CheckAssert>(&tokenizer, &settings, this);
+        runChecks<CheckAssert>(tokenizer, this);
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(assignmentInAssert);
         TEST_CASE(functionCallInAssert);
         TEST_CASE(memberFunctionCallInAssert);
@@ -66,7 +62,7 @@ class TestAssert : public TestFixture {
             "   return a;\n"
             "}\n"
             "assert(foo() == 3);");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "int foo(int a) {\n"
@@ -74,7 +70,7 @@ class TestAssert : public TestFixture {
             "    return b;\n"
             "}\n"
             "assert(foo(1) == 2);");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void functionCallInAssert() {
@@ -85,7 +81,7 @@ class TestAssert : public TestFixture {
             "    return a;\n"
             "}\n"
             "assert(foo() == 3);");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Assert statement calls a function which may have desired side effects: 'foo'.\n", errout.str());
+        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"
         check("struct SquarePack {\n"
@@ -97,7 +93,7 @@ class TestAssert : public TestFixture {
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
               "   static bool isRank1Or8( Square &sq ) {\n"
@@ -108,7 +104,7 @@ class TestAssert : public TestFixture {
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Assert statement calls a function which may have desired side effects: 'isRank1Or8'.\n", errout.str());
+        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"
               "   static bool isRank1Or8( Square *sq ) {\n"
@@ -119,7 +115,7 @@ class TestAssert : public TestFixture {
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Assert statement calls a function which may have desired side effects: 'isRank1Or8'.\n", errout.str());
+        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"
               "   static bool isRank1Or8( Square *sq ) {\n"
@@ -130,7 +126,7 @@ class TestAssert : public TestFixture {
               "void foo() {\n"
               "   assert( !SquarePack::isRank1Or8(push2) );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Geometry {\n"
               "    int nbv;\n"
@@ -141,7 +137,16 @@ class TestAssert : public TestFixture {
               "void Geometry::ReadGeometry() {\n"
               "    assert(empty());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #4811
+              "    void f() const;\n"
+              "    bool g(std::ostream& os = std::cerr) const;\n"
+              "};\n"
+              "void S::f() const {\n"
+              "    assert(g());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void memberFunctionCallInAssert() {
@@ -151,7 +156,7 @@ class TestAssert : public TestFixture {
               "void foo(SquarePack s) {\n"
               "   assert( s.Foo() );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
               "   int Foo() const;\n"
@@ -159,7 +164,7 @@ class TestAssert : public TestFixture {
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
               "   static int Foo();\n"
@@ -167,14 +172,14 @@ class TestAssert : public TestFixture {
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct SquarePack {\n"
               "};\n"
               "void foo(SquarePack* s) {\n"
               "   assert( s->Foo() );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assignmentInAssert() {
@@ -183,54 +188,54 @@ class TestAssert : public TestFixture {
               "    assert(a = 2);\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Assert statement modifies 'a'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "    assert(a == 2 && (b = 1));\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Assert statement modifies 'b'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Assert statement modifies 'a'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Assert statement modifies 'a'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Assert statement modifies 'a'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Assert statement modifies 'a'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Assert statement modifies 'a'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (warning) Assert statement modifies 'a'. [assignmentInAssert]\n", errout_str());
 
         check("void f() {\n"
               "  assert(std::all_of(first, last, []() {\n"
@@ -239,19 +244,19 @@ class TestAssert : public TestFixture {
               "                  return tmp == expected;\n"
               "                }));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void crash() {
         check("void foo() {\n"
               "  assert(sizeof(struct { int a[x++]; })==sizeof(int));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #9790
               "  assert(kad_bucket_hash(&(kad_guid) { .bytes = { 0 } }, & (kad_guid){.bytes = { 0 }}) == -1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
index d14d3564079..8ca2412a095 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-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
@@ -16,18 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "astutils.h"
-#include "library.h"
-#include "settings.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "settings.h"
 #include "symboldatabase.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
 
+#include <cstdint>
 #include <cstring>
-#include <sstream> // IWYU pragma: keep
 
 class TestAstUtils : public TestFixture {
 public:
@@ -35,12 +33,15 @@ class TestAstUtils : public TestFixture {
 
 private:
 
+    // TODO: test with C code
+
     void run() override {
         TEST_CASE(findLambdaEndTokenTest);
         TEST_CASE(findLambdaStartTokenTest);
         TEST_CASE(isNullOperandTest);
         TEST_CASE(isReturnScopeTest);
-        TEST_CASE(isSameExpressionTest);
+        TEST_CASE(isSameExpressionCpp);
+        TEST_CASE(isSameExpressionC);
         TEST_CASE(isVariableChangedTest);
         TEST_CASE(isVariableChangedByFunctionCallTest);
         TEST_CASE(isExpressionChangedTest);
@@ -49,11 +50,10 @@ class TestAstUtils : public TestFixture {
     }
 
 #define findLambdaEndToken(...) findLambdaEndToken_(__FILE__, __LINE__, __VA_ARGS__)
-    bool findLambdaEndToken_(const char* file, int line, const char code[], const char pattern[] = nullptr, bool checkNext = true) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+    template<size_t size>
+    bool findLambdaEndToken_(const char* file, int line, const char (&code)[size], const char pattern[] = nullptr, bool checkNext = true) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token* const tokStart = pattern ? Token::findsimplematch(tokenizer.tokens(), pattern, strlen(pattern)) : tokenizer.tokens();
         const Token * const tokEnd = (::findLambdaEndToken)(tokStart);
         return tokEnd && (!checkNext || tokEnd->next() == nullptr);
@@ -87,12 +87,11 @@ class TestAstUtils : public TestFixture {
         ASSERT_EQUALS(true, findLambdaEndToken("int i = 5 * []{ return 7; }();", "[", /*checkNext*/ false));
     }
 
-#define findLambdaStartToken(code) findLambdaStartToken_(code, __FILE__, __LINE__)
-    bool findLambdaStartToken_(const char code[], const char* file, int line) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#define findLambdaStartToken(...) findLambdaStartToken_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool findLambdaStartToken_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const tokStart = (::findLambdaStartToken)(tokenizer.list.back());
         return tokStart && tokStart == tokenizer.list.front();
     }
@@ -120,12 +119,11 @@ class TestAstUtils : public TestFixture {
         ASSERT_EQUALS(true, findLambdaStartToken("[](void) constexpr -> const * const* int { return x; }"));
     }
 
-#define isNullOperand(code) isNullOperand_(code, __FILE__, __LINE__)
-    bool isNullOperand_(const char code[], const char* file, int line) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#define isNullOperand(...) isNullOperand_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool isNullOperand_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         return (::isNullOperand)(tokenizer.tokens());
     }
 
@@ -142,16 +140,15 @@ class TestAstUtils : public TestFixture {
         ASSERT_EQUALS(false, isNullOperand("(void*)1;"));
     }
 
-#define isReturnScope(code, offset) isReturnScope_(code, offset, __FILE__, __LINE__)
-    bool isReturnScope_(const char code[], int offset, const char* file, int line) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#define isReturnScope(...) isReturnScope_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool isReturnScope_(const char* file, int line, const char (&code)[size], int offset) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const tok = (offset < 0)
                                   ? tokenizer.list.back()->tokAt(1+offset)
                                   : tokenizer.tokens()->tokAt(offset);
-        return (isReturnScope)(tok);
+        return (isReturnScope)(tok, settingsDefault.library);
     }
 
     void isReturnScopeTest() {
@@ -173,67 +170,77 @@ class TestAstUtils : public TestFixture {
         ASSERT_EQUALS(true, isReturnScope("void positiveTokenOffset() { return; }", 7));
     }
 
-#define isSameExpression(code, tokStr1, tokStr2) isSameExpression_(code, tokStr1, tokStr2, __FILE__, __LINE__)
-    bool isSameExpression_(const char code[], const char tokStr1[], const char tokStr2[], const char* file, int line) {
-        const Settings settings;
-        Library library;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
-        tokenizer.simplifyTokens1("");
+#define isSameExpression(...) isSameExpression_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool isSameExpression_(const char* file, int line, const char (&code)[size], const char tokStr1[], const char tokStr2[], bool cpp) {
+        SimpleTokenizer tokenizer(settingsDefault, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const tok1 = Token::findsimplematch(tokenizer.tokens(), tokStr1, strlen(tokStr1));
         const Token * const tok2 = Token::findsimplematch(tok1->next(), tokStr2, strlen(tokStr2));
-        return (isSameExpression)(false, false, tok1, tok2, library, false, true, nullptr);
+        return (isSameExpression)(false, tok1, tok2, settingsDefault, false, true);
     }
 
-    void isSameExpressionTest() {
-        ASSERT_EQUALS(true,  isSameExpression("x = 1 + 1;", "1", "1"));
-        ASSERT_EQUALS(false, isSameExpression("x = 1 + 1u;", "1", "1u"));
-        ASSERT_EQUALS(true,  isSameExpression("x = 1.0 + 1.0;", "1.0", "1.0"));
-        ASSERT_EQUALS(false, isSameExpression("x = 1.0f + 1.0;", "1.0f", "1.0"));
-        ASSERT_EQUALS(false, isSameExpression("x = 1L + 1;", "1L", "1"));
-        ASSERT_EQUALS(true,  isSameExpression("x = 0.0f + 0x0p+0f;", "0.0f", "0x0p+0f"));
-        ASSERT_EQUALS(true,  isSameExpression("x < x;", "x", "x"));
-        ASSERT_EQUALS(false, isSameExpression("x < y;", "x", "y"));
-        ASSERT_EQUALS(true,  isSameExpression("(x + 1) < (x + 1);", "+", "+"));
-        ASSERT_EQUALS(false, isSameExpression("(x + 1) < (x + 1L);", "+", "+"));
-        ASSERT_EQUALS(true,  isSameExpression("(1 + x) < (x + 1);", "+", "+"));
-        ASSERT_EQUALS(false, isSameExpression("(1.0l + x) < (1.0 + x);", "+", "+"));
-        ASSERT_EQUALS(true,  isSameExpression("(0.0 + x) < (x + 0x0p+0);", "+", "+"));
-        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; (x + y) < (x + 10.0); } ", "+", "+"));
-        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; (x + 10.0) < (y + x); } ", "+", "+"));
-        ASSERT_EQUALS(true,  isSameExpression("void f() {double y = 1e1; double z = 10.0; (x + y) < (x + z); } ", "+", "+"));
-        ASSERT_EQUALS(true,  isSameExpression("A + A", "A", "A"));
+    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));
+
+        // 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;", "::", "::"));
-        ASSERT_EQUALS(false, isSameExpression("A::B + A::C;", "::", "::"));
-        ASSERT_EQUALS(true, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::B(true); }", "new", "new"));
-        ASSERT_EQUALS(false, isSameExpression("A::B* get() { if(x) return new A::B(true); else return new A::C(true); }", "new", "new"));
-        ASSERT_EQUALS(true, true);
+        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));
+    }
+
+    void isSameExpressionCpp() {
+        isSameExpressionTestInternal(true);
+    }
+
+    void isSameExpressionC() {
+        isSameExpressionTestInternal(false);
     }
 
-#define isVariableChanged(code, startPattern, endPattern) isVariableChanged_(code, startPattern, endPattern, __FILE__, __LINE__)
-    bool isVariableChanged_(const char code[], const char startPattern[], const char endPattern[], const char* file, int line) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#define isVariableChanged(...) isVariableChanged_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool isVariableChanged_(const char* file, int line, const char (&code)[size], const char startPattern[], const char endPattern[]) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * const tok1 = Token::findsimplematch(tokenizer.tokens(), startPattern, strlen(startPattern));
         const Token * const tok2 = Token::findsimplematch(tokenizer.tokens(), endPattern, strlen(endPattern));
-        return (isVariableChanged)(tok1, tok2, 1, false, &settings, true);
+        return (isVariableChanged)(tok1, tok2, 1, false, settingsDefault);
     }
 
     void isVariableChangedTest() {
         // #8211 - no lhs for >> , do not crash
-        isVariableChanged("void f() {\n"
-                          "  int b;\n"
-                          "  if (b) { (int)((INTOF(8))result >> b); }\n"
-                          "}", "if", "}");
+        (void)isVariableChanged("void f() {\n"
+                                "  int b;\n"
+                                "  if (b) { (int)((INTOF(8))result >> b); }\n"
+                                "}", "if", "}");
         // #9235
-        ASSERT_EQUALS(true, isVariableChanged("void f() {\n"
-                                              "    int &a = a;\n"
-                                              "}\n", "= a", "}"));
+        ASSERT_EQUALS(false,
+                      isVariableChanged("void f() {\n"
+                                        "    int &a = a;\n"
+                                        "}\n",
+                                        "= a",
+                                        "}"));
 
         ASSERT_EQUALS(false, isVariableChanged("void f(const A& a) { a.f(); }", "{", "}"));
         ASSERT_EQUALS(true,
@@ -241,161 +248,185 @@ class TestAstUtils : public TestFixture {
                                         "void f(int x) { g(&x); }\n",
                                         "{",
                                         "}"));
+        ASSERT_EQUALS(false, isVariableChanged("const int A[] = { 1, 2, 3 };", "[", "]"));
     }
 
-#define isVariableChangedByFunctionCall(code, pattern, inconclusive) isVariableChangedByFunctionCall_(code, pattern, inconclusive, __FILE__, __LINE__)
-    bool isVariableChangedByFunctionCall_(const char code[], const char pattern[], bool *inconclusive, const char* file, int line) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#define isVariableChangedByFunctionCall(...) isVariableChangedByFunctionCall_( __FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool isVariableChangedByFunctionCall_(const char* file, int line, const char (&code)[size], const char pattern[], bool *inconclusive) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         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, &settings, inconclusive);
+        return (isVariableChangedByFunctionCall)(argtok, indirect, settingsDefault, inconclusive);
     }
 
     void isVariableChangedByFunctionCallTest() {
-        const char *code;
-        bool inconclusive;
-
-        // #8271 - template method
-        code = "void f(int x) {\n"
-               "  a<int>(x);\n"
-               "}";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
-        ASSERT_EQUALS(true, inconclusive);
-
-        code = "int f(int x) {\n"
-               "return int(x);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(int* p);\n"
-               "void f(int x) {\n"
-               "    return g(&x);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(const int* p);\n"
-               "void f(int x) {\n"
-               "    return g(&x);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(int** pp);\n"
-               "void f(int* p) {\n"
-               "    return g(&p);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "p ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(int* const* pp);\n"
-               "void f(int* p) {\n"
-               "    return g(&p);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "p ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(int a[2]);\n"
-               "void f() {\n"
-               "    int b[2] = {};\n"
-               "    return g(b);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(const int a[2]);\n"
-               "void f() {\n"
-               "    int b[2] = {};\n"
-               "    return g(b);\n"
-               "}\n";
-        inconclusive = false;
-        TODO_ASSERT_EQUALS(false, true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(std::array<int, 2> a);\n"
-               "void f() {\n"
-               "    std::array<int, 2> b = {};\n"
-               "    return g(b);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(std::array<int, 2>& a);\n"
-               "void f() {\n"
-               "    std::array<int, 2> b = {};\n"
-               "    return g(b);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(const std::array<int, 2>& a);\n"
-               "void f() {\n"
-               "    std::array<int, 2> b = {};\n"
-               "    return g(b);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "void g(std::array<int, 2>* p);\n"
-               "void f() {\n"
-               "    std::array<int, 2> b = {};\n"
-               "    return g(&b);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "struct S {};\n"
-               "void g(S);\n"
-               "void f(S* s) {\n"
-               "    g(*s);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "s ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
-
-        code = "struct S {};\n"
-               "void g(const S&);\n"
-               "void f(S* s) {\n"
-               "    g(*s);\n"
-               "}\n";
-        inconclusive = false;
-        ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "s ) ;", &inconclusive));
-        ASSERT_EQUALS(false, inconclusive);
+
+        { // #8271 - template method
+            const char code[] = "void f(int x) {\n"
+                                "  a<int>(x);\n"
+                                "}";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
+            ASSERT_EQUALS(true, inconclusive);
+        }
+
+        {
+            const char code[] = "int f(int x) {\n"
+                                "return int(x);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(int* p);\n"
+                                "void f(int x) {\n"
+                                "    return g(&x);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(const int* p);\n"
+                                "void f(int x) {\n"
+                                "    return g(&x);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "x ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(int** pp);\n"
+                                "void f(int* p) {\n"
+                                "    return g(&p);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "p ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(int* const* pp);\n"
+                                "void f(int* p) {\n"
+                                "    return g(&p);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "p ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(int a[2]);\n"
+                                "void f() {\n"
+                                "    int b[2] = {};\n"
+                                "    return g(b);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(const int a[2]);\n"
+                                "void f() {\n"
+                                "    int b[2] = {};\n"
+                                "    return g(b);\n"
+                                "}\n";
+            bool inconclusive = false;
+            TODO_ASSERT_EQUALS(false, true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(std::array<int, 2> a);\n"
+                                "void f() {\n"
+                                "    std::array<int, 2> b = {};\n"
+                                "    return g(b);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(std::array<int, 2>& a);\n"
+                                "void f() {\n"
+                                "    std::array<int, 2> b = {};\n"
+                                "    return g(b);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(const std::array<int, 2>& a);\n"
+                                "void f() {\n"
+                                "    std::array<int, 2> b = {};\n"
+                                "    return g(b);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "void g(std::array<int, 2>* p);\n"
+                                "void f() {\n"
+                                "    std::array<int, 2> b = {};\n"
+                                "    return g(&b);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(true, isVariableChangedByFunctionCall(code, "b ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "struct S {};\n"
+                                "void g(S);\n"
+                                "void f(S* s) {\n"
+                                "    g(*s);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "s ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
+
+        {
+            const char code[] = "struct S {};\n"
+                                "void g(const S&);\n"
+                                "void f(S* s) {\n"
+                                "    g(*s);\n"
+                                "}\n";
+            bool inconclusive = false;
+            ASSERT_EQUALS(false, isVariableChangedByFunctionCall(code, "s ) ;", &inconclusive));
+            ASSERT_EQUALS(false, inconclusive);
+        }
     }
 
-#define isExpressionChanged(code, var, startPattern, endPattern)                                                       \
-    isExpressionChanged_(code, var, startPattern, endPattern, __FILE__, __LINE__)
-    bool isExpressionChanged_(const char code[],
+#define isExpressionChanged(...) isExpressionChanged_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool isExpressionChanged_(const char* file,
+                              int line,
+                              const char (&code)[size],
                               const char var[],
                               const char startPattern[],
-                              const char endPattern[],
-                              const char* file,
-                              int line)
+                              const char endPattern[])
     {
         const Settings settings = settingsBuilder().library("std.cfg").build();
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token* const start = Token::findsimplematch(tokenizer.tokens(), startPattern, strlen(startPattern));
         const Token* const end = Token::findsimplematch(start, endPattern, strlen(endPattern));
         const Token* const expr = Token::findsimplematch(tokenizer.tokens(), var, strlen(var));
-        return (isExpressionChanged)(expr, start, end, &settings, true);
+        return (findExpressionChanged)(expr, start, end, settings);
     }
 
     void isExpressionChangedTest()
@@ -418,12 +449,11 @@ class TestAstUtils : public TestFixture {
                                           "}"));
     }
 
-#define nextAfterAstRightmostLeaf(code, parentPattern, rightPattern) nextAfterAstRightmostLeaf_(code, parentPattern, rightPattern, __FILE__, __LINE__)
-    bool nextAfterAstRightmostLeaf_(const char code[], const char parentPattern[], const char rightPattern[], const char* file, int line) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#define nextAfterAstRightmostLeaf(...) nextAfterAstRightmostLeaf_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool nextAfterAstRightmostLeaf_(const char* file, int line, const char (&code)[size], const char parentPattern[], const char rightPattern[]) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token * tok = Token::findsimplematch(tokenizer.tokens(), parentPattern, strlen(parentPattern));
         return Token::simpleMatch((::nextAfterAstRightmostLeaf)(tok), rightPattern, strlen(rightPattern));
     }
@@ -442,18 +472,17 @@ class TestAstUtils : public TestFixture {
         ASSERT_EQUALS(true, nextAfterAstRightmostLeaf("int * g(int); void f(int a, int b) { int x = g(a + 1)[b]; }", "+", ") ["));
     }
 
-    enum class Result {False, True, Fail};
+    enum class Result : std::uint8_t {False, True, Fail};
 
-    Result isUsedAsBool(const char code[], const char pattern[]) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        if (!tokenizer.tokenize(istr, "test.cpp"))
+    template<size_t size>
+    Result isUsedAsBool(const char (&code)[size], const char pattern[]) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        if (!tokenizer.tokenize(code))
             return Result::Fail;
         const Token * const argtok = Token::findmatch(tokenizer.tokens(), pattern);
         if (!argtok)
             return Result::Fail;
-        return ::isUsedAsBool(argtok) ? Result::True : Result::False;
+        return ::isUsedAsBool(argtok, settingsDefault) ? Result::True : Result::False;
     }
 
     void isUsedAsBool() {
@@ -484,7 +513,7 @@ class TestAstUtils : public TestFixture {
         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::True == isUsedAsBool("void f() { int *i; if (*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 ) )"));
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index 5fbe371f6a3..2117fe7ba8d 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-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
@@ -16,16 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkautovariables.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <list>
-#include <sstream> // IWYU pragma: keep
-#include <string>
+#include <cstddef>
 
 class TestAutoVariables : public TestFixture {
 public:
@@ -33,23 +30,28 @@ 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();
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool inconclusive = true, const char* filename = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        bool inconclusive = true;
+        bool cpp = true;
+    };
 
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
+#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 = options.inconclusive ? settings_i : settings;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckAutoVariables>(&tokenizer, &settings1, this);
+        runChecks<CheckAutoVariables>(tokenizer, this);
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(testautovar1);
         TEST_CASE(testautovar2);
         TEST_CASE(testautovar3); // ticket #2925
@@ -66,6 +68,7 @@ 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(testautovar_array1);
         TEST_CASE(testautovar_array2);
         TEST_CASE(testautovar_array3);
@@ -76,6 +79,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);
@@ -123,6 +127,9 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(returnReference23);
         TEST_CASE(returnReference24); // #10098
         TEST_CASE(returnReference25); // #10983
+        TEST_CASE(returnReference26);
+        TEST_CASE(returnReference27);
+        TEST_CASE(returnReference28);
         TEST_CASE(returnReferenceFunction);
         TEST_CASE(returnReferenceContainer);
         TEST_CASE(returnReferenceLiteral);
@@ -151,7 +158,7 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(danglingLifetime);
         TEST_CASE(danglingLifetimeFunction);
         TEST_CASE(danglingLifetimeUserConstructor);
-        TEST_CASE(danglingLifetimeAggegrateConstructor);
+        TEST_CASE(danglingLifetimeAggregateConstructor);
         TEST_CASE(danglingLifetimeInitList);
         TEST_CASE(danglingLifetimeImplicitConversion);
         TEST_CASE(danglingTemporaryLifetime);
@@ -160,6 +167,7 @@ class TestAutoVariables : public TestFixture {
         TEST_CASE(invalidLifetime);
         TEST_CASE(deadPointer);
         TEST_CASE(splitNamespaceAuto); // crash #10473
+        TEST_CASE(incompleteTypeArray);
     }
 
 
@@ -170,21 +178,21 @@ class TestAutoVariables : public TestFixture {
               "    int num = 2;\n"
               "    *res = &num;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar2() {
@@ -196,7 +204,7 @@ class TestAutoVariables : public TestFixture {
               "    int num = 2;\n"
               "    *res = &num;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        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"
               "    void func1(int **res);\n"
@@ -206,7 +214,7 @@ class TestAutoVariables : public TestFixture {
               "    int num = 2;\n"
               "    res = &num;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?\n", errout.str());
+        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"
               "    void func1(int **res);\n"
@@ -216,7 +224,7 @@ class TestAutoVariables : public TestFixture {
               "    int num = 2;\n"
               "    foo.res = &num;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar3() { // ticket #2925
@@ -225,7 +233,7 @@ class TestAutoVariables : public TestFixture {
               "    int x[100];\n"
               "    *p = x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar4() { // ticket #2928
@@ -234,7 +242,7 @@ class TestAutoVariables : public TestFixture {
               "    static int x[100];\n"
               "    *p = x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar5() { // ticket #2926
@@ -243,7 +251,7 @@ class TestAutoVariables : public TestFixture {
               "    char a;\n"
               "    ab->a = &a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error, inconclusive) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar6() { // ticket #2931
@@ -251,15 +259,15 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    char a[10];\n"
               "    x->str = a;\n"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct X *x)\n"
               "{\n"
               "    char a[10];\n"
               "    x->str = a;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4]: (error, inconclusive) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+              "}");
+        ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar7() { // ticket #3066
@@ -268,21 +276,21 @@ class TestAutoVariables : public TestFixture {
               "    struct txt_scrollpane_s * scrollpane;\n"
               "    target->parent = &scrollpane->widget;\n"
               "    return scrollpane;\n"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar8() {
         check("void foo(int*& p) {\n"
               "    int i = 0;\n"
               "    p = &i;\n"
-              "}", false);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+              "}", 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"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar9() {
@@ -292,8 +300,8 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &fn.i;\n"
-              "}", false);
-        ASSERT_EQUALS("[test.cpp:6]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+              "}", 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"
               "struct FP {FN* f};\n"
@@ -301,8 +309,8 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &p_fp->i;\n"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct FN {int i;};\n"
               "struct FP {FN* f};\n"
@@ -310,101 +318,101 @@ class TestAutoVariables : public TestFixture {
               "    FN fn;\n"
               "    FP fp;\n"
               "    p = &fp.f->i;\n"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar10() { // #2930 - assignment of function parameter
         check("void foo(char* p) {\n"
               "    p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Assignment of function parameter has no effect outside the function.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Assignment of function parameter has no effect outside the function.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Assignment of function parameter has no effect outside the function.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    if (!p) p = buf;\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    if (!p) p = buf;\n"
               "    do_something(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    while (!p) p = buf;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* p) {\n"
               "    p = 0;\n"
               "    asm(\"somecmd\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(Foo* p) {\n"
               "    p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Assignment of function parameter has no effect outside the function.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& p) {\n"
               "    p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("double foo(double d) {\n" // #5005
               "    int i = d;\n"
               "    d = i;\n"
               "    return d;"
-              "}",false);
-        ASSERT_EQUALS("", errout.str());
+              "}",dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int* ptr) {\n" // #4793
               "    ptr++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar11() { // #4641 - fp, assign local struct member address to function parameter
@@ -415,7 +423,7 @@ class TestAutoVariables : public TestFixture {
               "    struct A a = bar();\n"
               "    *p = &(*a.data)[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    char data[10];\n"
@@ -424,30 +432,30 @@ class TestAutoVariables : public TestFixture {
               "    struct A a = bar();\n"
               "    *p = &a.data[0];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4998
         check("void f(s8**out) {\n"
               "  s8 *p;\n"  // <- p is pointer => no error
               "  *out = &p[1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(s8**out) {\n"
               "  s8 p[10];\n"  // <- p is array => error
               "  *out = &p[1];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        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(check("void f(int* a) { a = }"), InternalError);
+        ASSERT_THROW_INTERNAL(check("void f(int* a) { a = }"), SYNTAX);
         check("struct custom_type { custom_type(int) {} };\n"
               "void func(int) {}\n"
               "int var;\n"
@@ -473,7 +481,7 @@ class TestAutoVariables : public TestFixture {
               "    goto label;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar15() { // Ticket #6538
@@ -485,8 +493,8 @@ class TestAutoVariables : public TestFixture {
               "    if (lumdiff > 5.0f)\n"
               "        return &darkOutline;\n"
               "    return 0;\n"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar16() { // Ticket #8114
@@ -494,7 +502,18 @@ class TestAutoVariables : public TestFixture {
               "  int dummy;\n"
               "  *result = (&dummy < ptr);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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 testautovar_array1() {
@@ -503,7 +522,7 @@ class TestAutoVariables : public TestFixture {
               "    int num=2;"
               "    arr[0]=&num;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar_array2() {
@@ -515,7 +534,7 @@ class TestAutoVariables : public TestFixture {
               "    int num=2;"
               "    arr[0]=&num;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:19]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar_array3() {
@@ -523,7 +542,7 @@ class TestAutoVariables : public TestFixture {
               "    std::string a = \"abc\";\n"
               "    argv[0] = &a[0];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char* c[]) {\n"
               "    char a[] = \"abc\";\n"
@@ -533,9 +552,9 @@ class TestAutoVariables : public TestFixture {
               "    std::string a = \"abc\";\n"
               "    c[0] = a.data();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Address of local auto-variable assigned to a function parameter.\n"
-                      "[test.cpp:7]: (error) Address of local auto-variable assigned to a function parameter.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n"
+                      "[test.cpp:7:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
+                      errout_str());
 
         check("struct String {\n"
               "    String& operator=(const char* c) { m = c; return *this; }\n"
@@ -550,7 +569,14 @@ class TestAutoVariables : public TestFixture {
               "    char a[] = \"abc\";\n"
               "    *s = &a[0];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        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() {
@@ -559,7 +585,7 @@ class TestAutoVariables : public TestFixture {
               "    XPoint DropPoint;\n"
               "    ds->location_data = (XtPointer *)&DropPoint;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error, inconclusive) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error, inconclusive) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar_ptrptr() { // #6596
@@ -567,7 +593,7 @@ class TestAutoVariables : public TestFixture {
               "  char dead_slot;\n"
               "  matches[0] = (char *)&dead_slot;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:3]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
     }
 
     void testautovar_return1() {
@@ -576,7 +602,7 @@ class TestAutoVariables : public TestFixture {
               "    int num=2;"
               "    return &num;"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3] -> [test.cpp:3]: (error) Returning pointer to local variable 'num' that will be invalid when returning.\n", errout.str());
+        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());
     }
 
     void testautovar_return2() {
@@ -588,7 +614,7 @@ class TestAutoVariables : public TestFixture {
               "    int num=2;"
               "    return &num;"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:6] -> [test.cpp:6]: (error) Returning pointer to local variable 'num' that will be invalid when returning.\n", errout.str());
+        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());
     }
 
     void testautovar_return3() {
@@ -598,7 +624,7 @@ class TestAutoVariables : public TestFixture {
               "    void *&value = tls[id];"
               "    return &value;"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar_return4() {
@@ -607,7 +633,7 @@ class TestAutoVariables : public TestFixture {
               "  int cond2;\n"
               "  dostuff([&cond2]() { return &cond2; });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar_return5() { // #11465
@@ -615,7 +641,27 @@ class TestAutoVariables : public TestFixture {
               "const std::type_info* f() {\n"
               "    return &typeid(S);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        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() {
@@ -624,7 +670,7 @@ class TestAutoVariables : public TestFixture {
               "    extern struct foo f;\n"
               "    return &f;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testautovar_reassigned() {
@@ -634,7 +680,7 @@ class TestAutoVariables : public TestFixture {
               "  dostuff(pcb);\n"
               "  pcb->root0 = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(cb* pcb) {\n"
               "  int root0;\n"
@@ -643,7 +689,7 @@ class TestAutoVariables : public TestFixture {
               "  if (condition) return;\n" // <- not reassigned => error
               "  pcb->root0 = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error, inconclusive) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        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"
               "  int root0;\n"
@@ -652,7 +698,7 @@ class TestAutoVariables : public TestFixture {
               "  if (condition)\n"
               "    pcb->root0 = 0;\n"  // <- conditional reassign => error
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error, inconclusive) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        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"
               "void g(struct S* s) {\n"
@@ -664,7 +710,10 @@ class TestAutoVariables : public TestFixture {
               "    struct S s;\n"
               "    g(&s);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        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
+            errout_str());
     }
 
     void testinvaliddealloc() {
@@ -680,37 +729,37 @@ class TestAutoVariables : public TestFixture {
               "    char tmp5[256];\n"
               "    delete[] tmp5;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Deallocation of an auto-variable results in undefined behaviour.\n"
-                      "[test.cpp:5]: (error) Deallocation of an auto-variable results in undefined behaviour.\n"
-                      "[test.cpp:7]: (error) Deallocation of an auto-variable results in undefined behaviour.\n"
-                      "[test.cpp:9]: (error) Deallocation of an auto-variable results in undefined behaviour.\n"
-                      "[test.cpp:11]: (error) Deallocation of an auto-variable results in undefined behaviour.\n", errout.str());
+        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"
+                      "[test.cpp:9:15]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n"
+                      "[test.cpp:11:14]: (error) Deallocation of an auto-variable results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("void func1(char * ptr) {\n"
               "    free(ptr);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void func1() {\n"
               "    char* tmp1[256];\n"
               "    init(tmp1);\n"
               "    delete tmp1[34];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void func1() {\n"
               "    static char tmp1[256];\n"
               "    char *p = tmp1;\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Deallocation of a static variable (tmp1) results in undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Deallocation of a global variable (tmp1) results in undefined behaviour.\n", errout.str());
+        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"
               "{\n"
@@ -721,7 +770,7 @@ class TestAutoVariables : public TestFixture {
               "        free(psz_title);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2298 new check: passing stack-address to free()
         check("int main() {\n"
@@ -729,44 +778,44 @@ class TestAutoVariables : public TestFixture {
               "   free(&p);\n"
               "   return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Deallocation of an auto-variable results in undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Deallocation of an auto-variable results in undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main() {\n"
               "   long *pKoeff[256];\n"
               "   delete[] pKoeff;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Deallocation of an auto-variable results in undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Deallocation of an auto-variable results in undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "   MyObj& obj = *new MyObj;\n"
               "   delete &obj;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6506
         check("struct F {\n"
@@ -778,7 +827,7 @@ class TestAutoVariables : public TestFixture {
               "  char *c2 = 0;\n"
               "  F().free(&c2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class foo {\n"
               "  void free(void* );\n"
@@ -787,14 +836,14 @@ class TestAutoVariables : public TestFixture {
               "    free(&dst_copy);\n"
               "  }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6551
         check("bool foo( ) {\n"
               "  SwTxtFld * pTxtFld = GetFldTxtAttrAt();\n"
               "  delete static_cast<SwFmtFld*>(&pTxtFld->GetAttr());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8910
         check("void f() {\n"
@@ -804,14 +853,14 @@ class TestAutoVariables : public TestFixture {
               "    else data = (RGNDATA *)stack;\n"
               "    if ((char *)data != stack) free (data);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8923
         check("void f(char **args1, char *args2[]) {\n"
               "    free((char **)args1);\n"
               "    free((char **)args2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10097
         check("struct Array {\n"
@@ -819,7 +868,7 @@ class TestAutoVariables : public TestFixture {
               "    std::array<long, 256>* m_Arr{};\n"
               "};\n"
               "Array arr;\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8174
         check("struct S {};\n"
@@ -828,7 +877,7 @@ class TestAutoVariables : public TestFixture {
               "    S* p = &s;\n"
               "    free(p);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Deallocation of an auto-variable (s) results in undefined behaviour.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Deallocation of an auto-variable (s) results in undefined behaviour. [autovarInvalidDeallocation]\n", errout_str());
 
         check("void f(bool b, int* q) {\n"
               "    int i;\n"
@@ -836,7 +885,7 @@ class TestAutoVariables : public TestFixture {
               "    if (!b)\n"
               "        free(p);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct E { int* i; };\n" // #11768
               "struct C { E e; };\n"
@@ -846,13 +895,13 @@ class TestAutoVariables : public TestFixture {
               "    delete[] e->i;\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    S* p = &g();\n"
               "    delete p;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testinvaliddealloc_input() {
@@ -860,12 +909,12 @@ class TestAutoVariables : public TestFixture {
         check("void f(int* a[]) {\n"
               "    free(a);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a[]) {\n"
               "    free(a);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int* a[]) {\n"
               "    int * p = *a;\n"
@@ -873,13 +922,13 @@ class TestAutoVariables : public TestFixture {
               "    int ** q = a;\n"
               "    free(q);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a[]) {\n"
               "    int * p = a;\n"
               "    free(p);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testinvaliddealloc_string() {
@@ -894,12 +943,12 @@ class TestAutoVariables : public TestFixture {
               "    p = \"abc\";\n"
               "    free(p);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Deallocation of a string literal results in undefined behaviour.\n"
-                      "[test.cpp:4]: (error) Deallocation of a string literal results in undefined behaviour.\n"
-                      "[test.cpp:5]: (error) Deallocation of a pointer pointing to a string literal (\"a\") results in undefined behaviour.\n"
-                      "[test.cpp:6]: (error) Deallocation of a pointer pointing to a string literal (\"a\") results in undefined behaviour.\n"
-                      "[test.cpp:9]: (error) Deallocation of a pointer pointing to a string literal (\"abc\") results in undefined behaviour.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Deallocation of a string literal results in undefined behaviour. [autovarInvalidDeallocation]\n"
+                      "[test.cpp:4:12]: (error) Deallocation of a string literal results in undefined behaviour. [autovarInvalidDeallocation]\n"
+                      "[test.cpp:5:10]: (error) Deallocation of a pointer pointing to a string literal (\"a\") results in undefined behaviour. [autovarInvalidDeallocation]\n"
+                      "[test.cpp:6:12]: (error) Deallocation of a pointer pointing to a string literal (\"a\") results in undefined behaviour. [autovarInvalidDeallocation]\n"
+                      "[test.cpp:9:10]: (error) Deallocation of a pointer pointing to a string literal (\"abc\") results in undefined behaviour. [autovarInvalidDeallocation]\n",
+                      errout_str());
 
         check("void f() {\n"
               "   char *ptr = malloc(10);\n"
@@ -909,7 +958,7 @@ class TestAutoVariables : public TestFixture {
               "   if (ptr != empty_str)\n"
               "      free(ptr);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testinvaliddealloc_C() {
@@ -917,8 +966,8 @@ class TestAutoVariables : public TestFixture {
         check("void svn_repos_dir_delta2() {\n"
               "  struct context c;\n"
               "      SVN_ERR(delete(&c, root_baton, src_entry, pool));\n"
-              "}\n", false, "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = false, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testassign1() { // Ticket #1819
@@ -926,7 +975,7 @@ class TestAutoVariables : public TestFixture {
               "    EventPtr event = *eventP;\n"
               "    *actionsP = &event->actions;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testassign2() { // Ticket #2765
@@ -934,7 +983,7 @@ class TestAutoVariables : public TestFixture {
               "    struct my_s *mr = global_structure_pointer;\n"
               "    *datap = &mr->value;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assignAddressOfLocalArrayToGlobalPointer() {
@@ -943,7 +992,7 @@ class TestAutoVariables : public TestFixture {
               "  int x[10];\n"
               "  p = x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Non-local variable 'p' will use pointer to local variable 'x'.\n", errout.str());
+        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"
               "void f() {\n"
@@ -951,7 +1000,7 @@ class TestAutoVariables : public TestFixture {
               "  p = x;\n"
               "  p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assignAddressOfLocalVariableToGlobalPointer() {
@@ -960,7 +1009,7 @@ class TestAutoVariables : public TestFixture {
               "  int x;\n"
               "  p = &x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Non-local variable 'p' will use pointer to local variable 'x'.\n", errout.str());
+        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"
               "void f() {\n"
@@ -968,7 +1017,7 @@ class TestAutoVariables : public TestFixture {
               "  p = &x;\n"
               "  p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assignAddressOfLocalVariableToMemberVariable() {
@@ -979,7 +1028,7 @@ class TestAutoVariables : public TestFixture {
               "  }\n"
               "  int *ptr;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Non-local variable 'ptr' will use pointer to local variable 'x'.\n", errout.str());
+        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"
               "  void f() {\n"
@@ -989,7 +1038,22 @@ class TestAutoVariables : public TestFixture {
               "  }\n"
               "  int *ptr;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct R {\n" // #11393
+              "    void pop() { p = nullptr; };\n"
+              "    int* p;\n"
+              "};\n"
+              "struct T {\n"
+              "    void f();\n"
+              "    R* r;\n"
+              "};\n"
+              "void T::f() {\n"
+              "    int i = 0;\n"
+              "    r->p = &i;\n"
+              "    r->pop();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnLocalVariable1() {
@@ -999,8 +1063,8 @@ class TestAutoVariables : public TestFixture {
               "    return str;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Returning pointer to local variable 'str' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("char *foo()\n" // use ValueFlow
               "{\n"
@@ -1009,8 +1073,8 @@ class TestAutoVariables : public TestFixture {
               "    return p;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3] -> [test.cpp:5]: (error) Returning pointer to local variable 'str' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("class Fred {\n"
               "    char *foo();\n"
@@ -1021,8 +1085,8 @@ class TestAutoVariables : public TestFixture {
               "    return str;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:6] -> [test.cpp:7]: (error) Returning pointer to local variable 'str' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("char * format_reg(char *outbuffer_start) {\n"
               "    return outbuffer_start;\n"
@@ -1032,7 +1096,7 @@ class TestAutoVariables : public TestFixture {
               "    char *tp = temp;\n"
               "    tp = format_reg(tp);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnLocalVariable2() {
@@ -1041,7 +1105,7 @@ class TestAutoVariables : public TestFixture {
               "    char str[100] = {0};\n"
               "    return str;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
               "    std::string foo();\n"
@@ -1051,7 +1115,7 @@ class TestAutoVariables : public TestFixture {
               "    char str[100] = {0};\n"
               "    return str;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1061,14 +1125,14 @@ class TestAutoVariables : public TestFixture {
               "    char q[] = \"AAAAAAAAAAAA\";\n"
               "    return &q[1];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning pointer to local variable 'q' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char *foo()\n"
               "{\n"
@@ -1077,7 +1141,7 @@ class TestAutoVariables : public TestFixture {
               "p = &q[1];\n"
               "return p;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3] -> [test.cpp:6]: (error) Returning pointer to local variable 'q' that will be invalid when returning.\n", errout.str());
+        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());
     }
 
     void returnLocalVariable4() { // x+y
@@ -1086,16 +1150,16 @@ class TestAutoVariables : public TestFixture {
               "    return x+5;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("char *foo(int y) {\n"
               "    char x[10] = {0};\n"
               "    return (x+8)-y;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
     }
 
     void returnLocalVariable5() { // cast
@@ -1104,8 +1168,8 @@ class TestAutoVariables : public TestFixture {
               "    return (char *)x;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
     }
 
     void returnLocalVariable6() { // valueflow
@@ -1114,7 +1178,7 @@ class TestAutoVariables : public TestFixture {
               "    int p = &x;\n"
               "    return p;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 'x' that will be invalid when returning.\n", errout.str());
+        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());
     }
 
     void returnReference1() {
@@ -1124,35 +1188,35 @@ class TestAutoVariables : public TestFixture {
               "    int& x = s;\n"
               "    return x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5]: (error) Reference to local variable returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Reference to local variable returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Reference to local variable returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> &foo()\n"
               "{\n"
               "    thread_local std::vector<int> v;\n"
               "    return v;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string hello()\n"
               "{\n"
@@ -1163,7 +1227,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    return hello();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         // make sure scope is used in function lookup
         check("class Fred {\n"
@@ -1174,7 +1238,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &f() {\n"
               "    return hello();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string hello() {\n"
               "     return std::string();\n"
@@ -1183,7 +1247,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &f() {\n"
               "    return hello();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::string hello() {\n"
               "     return \"foo\";\n"
@@ -1192,7 +1256,7 @@ class TestAutoVariables : public TestFixture {
               "std::string &f() {\n"
               "    return hello().substr(1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:26]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Foo;\n"
               "Foo hello() {\n"
@@ -1202,7 +1266,7 @@ class TestAutoVariables : public TestFixture {
               "Foo& f() {\n"
               "    return hello();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         // make sure function overloads are handled properly
         check("class Foo;\n"
@@ -1217,7 +1281,7 @@ class TestAutoVariables : public TestFixture {
               "Foo& f() {\n"
               "    return hello(true);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("Foo hello() {\n"
               "     return Foo();\n"
@@ -1226,7 +1290,7 @@ class TestAutoVariables : public TestFixture {
               "Foo& f() {\n" // Unknown type - might be a reference
               "    return hello();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference2() {
@@ -1238,7 +1302,7 @@ class TestAutoVariables : public TestFixture {
               "    std::string s;\n"
               "    return s;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Reference to local variable returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("class Fred {\n"
               "    std::vector<int> &foo();\n"
@@ -1248,7 +1312,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> v;\n"
               "    return v;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Reference to local variable returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("class Fred {\n"
               "    std::vector<int> &foo();\n"
@@ -1258,7 +1322,7 @@ class TestAutoVariables : public TestFixture {
               "    static std::vector<int> v;\n"
               "    return v;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
               "    std::string &f();\n"
@@ -1271,7 +1335,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    return hello();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Fred {\n"
               "    std::string hello();\n"
@@ -1285,7 +1349,7 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    return hello();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:11]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:17]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("class Bar;\n"
               "Bar foo() {\n"
@@ -1294,7 +1358,7 @@ class TestAutoVariables : public TestFixture {
               "Bar& bar() {\n"
               "    return foo();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::map<int, string> foo() {\n"
               "     return something;\n"
@@ -1302,7 +1366,7 @@ class TestAutoVariables : public TestFixture {
               "std::map<int, string>& bar() {\n"
               "    return foo();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:15]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("Bar foo() {\n"
               "     return something;\n"
@@ -1310,7 +1374,7 @@ class TestAutoVariables : public TestFixture {
               "Bar& bar() {\n" // Unknown type - might be a typedef to a reference type
               "    return foo();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // Don't crash with function in unknown scope (#4076)
         check("X& a::Bar() {}"
               "X& foo() {"
@@ -1323,8 +1387,8 @@ class TestAutoVariables : public TestFixture {
               "    double ret = getValue();\n"
               "    rd = ret;\n"
               "    return rd;\n"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Returning reference to global variable
@@ -1333,7 +1397,7 @@ class TestAutoVariables : public TestFixture {
               "double & f() {\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference5() {
@@ -1353,7 +1417,7 @@ class TestAutoVariables : public TestFixture {
               "        return ra;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference6() {
@@ -1361,7 +1425,7 @@ class TestAutoVariables : public TestFixture {
               "    Fred &fred(*new Fred);\n"
               "    return fred;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference7() {  // 3791 - false positive for overloaded function
@@ -1370,14 +1434,14 @@ class TestAutoVariables : public TestFixture {
               "std::string &b() {\n"
               "    return a(12);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string &a(int);\n"
               "std::string a();\n"
               "std::string &b() {\n"
               "    return a(12);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference8() {
@@ -1386,14 +1450,14 @@ class TestAutoVariables : public TestFixture {
               "    int& value = *it;\n"
               "    return value;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference9() {
         check("int& f(bool b, int& x, int& y) {\n"
               "    return b ? x : y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference10() {
@@ -1402,14 +1466,14 @@ class TestAutoVariables : public TestFixture {
               "    A a;\n"
               "    return a.f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference11() {
@@ -1417,19 +1481,19 @@ class TestAutoVariables : public TestFixture {
               "int& g() {\n"
               "    return A::f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace A { int& f(); }\n"
               "int& g() {\n"
               "    return A::f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference12() {
@@ -1437,14 +1501,14 @@ class TestAutoVariables : public TestFixture {
               "auto g() {\n"
               "    return &A::f;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A { static int& f(); };\n"
               "auto g() {\n"
               "    auto x = &A::f;\n"
               "    return x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference13() {
@@ -1453,14 +1517,14 @@ class TestAutoVariables : public TestFixture {
               "int& foo(size_t i) {\n"
               "    return ((std::vector<int>*)vp)->at(i);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference14() {
@@ -1473,7 +1537,7 @@ class TestAutoVariables : public TestFixture {
               "void* &A::f() {\n"
               "    return g()->m;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference15() {
@@ -1486,7 +1550,7 @@ class TestAutoVariables : public TestFixture {
               "const int& f(const T&) {\n"
               "    return f<T>();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <class T>\n"
               "int g();\n"
@@ -1494,19 +1558,19 @@ class TestAutoVariables : public TestFixture {
               "const int& f(const T&) {\n"
               "    return g<T>();\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void returnReference16() {
         check("int& f(std::tuple<int>& x) {\n"
               "    return std::get<0>(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& f(int x) {\n"
               "    return std::get<0>(std::make_tuple(x));\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void returnReference17() {
@@ -1514,7 +1578,7 @@ class TestAutoVariables : public TestFixture {
               "int& f() {\n"
               "    return g();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference18() {
@@ -1523,7 +1587,7 @@ class TestAutoVariables : public TestFixture {
               "int& g(int* x) {\n"
               "    return f(*x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #9597
@@ -1531,7 +1595,7 @@ class TestAutoVariables : public TestFixture {
         check("struct C : B {\n"
               "    const B &f() const { return (const B &)*this; }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #9536
@@ -1542,7 +1606,7 @@ class TestAutoVariables : public TestFixture {
               "int& b() {\n"
               "    return a()();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto a() {\n"
               "    return []() -> int& {\n"
@@ -1553,20 +1617,20 @@ class TestAutoVariables : public TestFixture {
               "const int& c() {\n"
               "    return a()();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::function<int&()> a();\n"
               "int& b() {\n"
               "    return a()();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9889
         check("int f(std::vector<std::function<int&()>>& v, int i) {\n"
               "    auto& j = v[i]();\n"
               "    return j;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #9530
@@ -1574,7 +1638,7 @@ class TestAutoVariables : public TestFixture {
         check("int& f(int& x) {\n"
               "    return {x};\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference22() {
@@ -1582,7 +1646,7 @@ class TestAutoVariables : public TestFixture {
               "    std::unique_ptr<int> p = std::make_unique<int>(1);\n"
               "    return *p;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Reference to local variable returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("void g(const std::unique_ptr<int>&);\n"
               "int& f() {\n"
@@ -1590,7 +1654,7 @@ class TestAutoVariables : public TestFixture {
               "    g(p);\n"
               "    return *p;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Reference to local variable returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("void g(std::shared_ptr<int>);\n"
               "int& f() {\n"
@@ -1598,26 +1662,26 @@ class TestAutoVariables : public TestFixture {
               "    g(p);\n"
               "    return *p;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::shared_ptr<int> g();\n"
               "int& f() {\n"
               "    return *g();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::unique_ptr<int> g();\n"
               "int& f() {\n"
               "    return *g();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("struct A { int x; };\n"
               "int& f() {\n"
               "    std::unique_ptr<A> p = std::make_unique<A>();\n"
               "    return p->x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Reference to local variable returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
     }
 
     void returnReference23() {
@@ -1625,7 +1689,7 @@ class TestAutoVariables : public TestFixture {
               "const std::vector<int>& f() {\n"
               "    return *g();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReference24()
@@ -1636,7 +1700,7 @@ class TestAutoVariables : public TestFixture {
               "const A& a() {\n"
               "    return A();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
     }
 
     void returnReference25()
@@ -1648,7 +1712,40 @@ class TestAutoVariables : public TestFixture {
               "int& h() {\n"
               "    return g();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void returnReference26()
+    {
+        check("const int& f() {\n" // #12153
+              "    int x = 234;\n"
+              "    int& s{ x };\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:4:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
+    }
+
+    void returnReference27()
+    {
+        check("struct S {\n" // #12607
+              "    const std::string & f(const std::string& a, const std::string& b) {\n"
+              "        auto status = m.emplace(a, b);\n"
+              "        return status.first->second;\n"
+              "    }\n"
+              "    std::map<std::string, std::string> m;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void returnReference28()
+    {
+        check("struct S {\n" // #13373
+              "    int& r;\n"
+              "};\n"
+              "int& f(S s) {\n"
+              "    return s.r;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceFunction() {
@@ -1660,8 +1757,8 @@ class TestAutoVariables : public TestFixture {
               "    return f(x);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:1] -> [test.cpp:2] -> [test.cpp:6] -> [test.cpp:6]: (error) Reference to local variable returned.\n",
-            errout.str());
+            "[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());
 
         check("int& f(int& a) {\n"
               "    return a;\n"
@@ -1671,8 +1768,8 @@ class TestAutoVariables : public TestFixture {
               "    return &f(x);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:1] -> [test.cpp:2] -> [test.cpp:6] -> [test.cpp:6] -> [test.cpp:5] -> [test.cpp:6]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("int* f(int * x) {\n"
               "    return x;\n"
@@ -1680,7 +1777,7 @@ class TestAutoVariables : public TestFixture {
               "int * g(int x) {\n"
               "    return f(&x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:5] -> [test.cpp:4] -> [test.cpp:5]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n", errout.str());
+        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"
               "    x = nullptr;\n"
@@ -1689,7 +1786,7 @@ class TestAutoVariables : public TestFixture {
               "int * g(int x) {\n"
               "    return f(&x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int& a) {\n"
               "    return a;\n"
@@ -1698,7 +1795,7 @@ class TestAutoVariables : public TestFixture {
               "    int x = 0;\n"
               "    return f(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:13]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("int& f(int a) {\n"
               "    return a;\n"
@@ -1707,7 +1804,7 @@ class TestAutoVariables : public TestFixture {
               "    int x = 0;\n"
               "    return f(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Reference to local variable returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12]: (error) Reference to local variable returned. [returnReference]\n", errout_str());
 
         check("int f(int a) {\n"
               "    return a;\n"
@@ -1716,14 +1813,14 @@ class TestAutoVariables : public TestFixture {
               "    int x = 0;\n"
               "    return f(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceContainer() {
@@ -1731,31 +1828,31 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int> x;\n"
               "    return x[0];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Reference to local variable returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (error) Reference to local variable returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Reference to local variable returned.\n", errout.str());
+        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"
               "const V& get_default(const T& t, const K& k, const V& v) {\n"
@@ -1766,11 +1863,10 @@ class TestAutoVariables : public TestFixture {
               "const int& bar(const std::unordered_map<int, int>& m, int k) {\n"
               "    auto x = 0;\n"
               "    return get_default(m, k, x);\n"
-              "}\n",
-              true);
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:4] -> [test.cpp:9] -> [test.cpp:9]: (error, inconclusive) Reference to local variable returned.\n",
-            errout.str());
+            "[test.cpp:2:56] -> [test.cpp:4:31] -> [test.cpp:9:12] -> [test.cpp:9:23]: (error, inconclusive) Reference to local variable returned. [returnReference]\n",
+            errout_str());
 
         check("template <class T, class K, class V>\n"
               "const V& get_default(const T& t, const K& k, const V& v) {\n"
@@ -1780,103 +1876,102 @@ class TestAutoVariables : public TestFixture {
               "}\n"
               "const int& bar(const std::unordered_map<int, int>& m, int k) {\n"
               "    return get_default(m, k, 0);\n"
-              "}\n",
-              true);
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:4] -> [test.cpp:8] -> [test.cpp:8]: (error, inconclusive) Reference to temporary returned.\n",
-            errout.str());
+            "[test.cpp:2:56] -> [test.cpp:4:31] -> [test.cpp:8:12] -> [test.cpp:8:23]: (error, inconclusive) 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("static std::vector<int> A[2];\n"
               "static std::vector<int> B;\n"
               "std::vector<int>& g(int i) {\n"
               "    return i ? A[i] : B;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceLiteral() {
         check("const std::string &a() {\n"
               "    return \"foo\";\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("const std::string a() {\n"
               "    return \"foo\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:1] -> [test.cpp:1] -> [test.cpp:3] -> [test.cpp:3]: (error) Reference to temporary returned.\n",
-            errout.str());
+            "[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());
 
         check("const char * f(const char * x) { return x; }\n"
               "const std::string &a() {\n"
               "    return f(\"foo\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::ostream& operator<<(std::ostream* out, const std::string& path) {\n"
               "    return *out << path;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("Unknown1& operator<<(Unknown1 out, Unknown2 path) {\n"
               "    return out << path;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& a(int b) {\n"
               "    return 2*(b+1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Reference to temporary returned.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const std::string &a(int bar) {\n"
               "    return foo(bar + 1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const std::string a(const std::string& str) {\n"
               "    return \"foo\" + str;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& incValue(int& value) {\n"
               "    return ++value;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceLambda() {
@@ -1887,7 +1982,7 @@ class TestAutoVariables : public TestFixture {
               "        return false;\n"
               "    });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5844
         check("map<string,string> const &getVariableTable() {\n"
@@ -1897,13 +1992,13 @@ class TestAutoVariables : public TestFixture {
               "  }();\n"
               "return s_var;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7583
         check("Command& foo() {\n"
               "  return f([]() -> int { return 1; });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceInnerScope() {
@@ -1916,16 +2011,16 @@ class TestAutoVariables : public TestFixture {
               "    };\n"
               "    return _make(_Wrapper::call, pmf);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnReferenceRecursive() {
         check("int& f() { return f(); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& g(int& i) { return i; }\n"
               "int& f() { return g(f()); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void extendedLifetime() {
@@ -1935,7 +2030,7 @@ class TestAutoVariables : public TestFixture {
               "    const int& x = h();\n"
               "    return [&] { return x; };\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5] -> [test.cpp:4] -> [test.cpp:5]: (error) Returning lambda that captures local variable 'x' that will be invalid when returning.\n", errout.str());
+        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"
               "int h();\n"
@@ -1943,7 +2038,7 @@ class TestAutoVariables : public TestFixture {
               "    const int& x = h();\n"
               "    return &x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5] -> [test.cpp:4] -> [test.cpp:5]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n", errout.str());
+        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"
               "int h();\n"
@@ -1952,9 +2047,9 @@ class TestAutoVariables : public TestFixture {
               "    g(&x);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:5] -> [test.cpp:4] -> [test.cpp:5]: (error) Using pointer that is a temporary.\n"
-            "[test.cpp:4] -> [test.cpp:5]: (error) Using reference to dangling temporary.\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("void g(int*);\n"
               "int h();\n"
@@ -1962,7 +2057,7 @@ class TestAutoVariables : public TestFixture {
               "    const int& x = h();\n"
               "    g(&x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Data {\n"
               "    std::string path;\n"
@@ -1971,7 +2066,7 @@ class TestAutoVariables : public TestFixture {
               "    const Data& data = getData();\n"
               "    return data.path.c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingReference() {
@@ -1980,15 +2075,15 @@ class TestAutoVariables : public TestFixture {
               "    static int &r = k;\n"
               "    return r;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (error) Non-local reference variable 'r' to local variable 'k'\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:3:17]: (error) Non-local reference variable 'r' to local variable 'k' [danglingReference]\n",
+                      errout_str());
 
         check("int &f( int & k )\n"
               "{\n"
               "    static int &r = k;\n"
               "    return r;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingTempReference() {
@@ -1999,7 +2094,7 @@ class TestAutoVariables : public TestFixture {
               "    const auto& str_cref2 = g(std::string(\"hello\"));\n"
               "    std::cout << str_cref2 << std::endl;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:1] -> [test.cpp:2] -> [test.cpp:5] -> [test.cpp:6]: (error) Using reference to dangling temporary.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:27] -> [test.cpp:1:49] -> [test.cpp:2:12] -> [test.cpp:5:29] -> [test.cpp:6:18]: (error) Using reference to dangling temporary. [danglingTempReference]\n", errout_str());
 
         // Lifetime extended
         check("std::string g(const std::string& str_cref) {\n"
@@ -2009,14 +2104,14 @@ class TestAutoVariables : public TestFixture {
               "    const auto& str_cref2 = g(std::string(\"hello\"));\n"
               "    std::cout << str_cref2 << std::endl;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char f() {\n"
               "    char c = 0;\n"
               "    char&& cr = std::move(c);\n"
               "    return cr;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9987
         check("void g(std::vector<int>);\n"
@@ -2024,7 +2119,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int>&& v = {};\n"
               "    g(std::move(v));\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(std::vector<int>);\n"
               "std::vector<int> h();\n"
@@ -2032,7 +2127,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<int>&& v = h();\n"
               "    g(std::move(v));\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11087
         check("struct S1 {\n"
@@ -2044,8 +2139,8 @@ class TestAutoVariables : public TestFixture {
               "    v += 1;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:6] -> [test.cpp:2] -> [test.cpp:6] -> [test.cpp:7]: (error) Using reference to dangling temporary.\n",
-            errout.str());
+            "[test.cpp:6:12] -> [test.cpp:2:25] -> [test.cpp:6:19] -> [test.cpp:7:5]: (error) Using reference to dangling temporary. [danglingTempReference]\n",
+            errout_str());
 
         check("struct A {\n"
               "    const int& g() const { return i; }\n"
@@ -2056,7 +2151,7 @@ class TestAutoVariables : public TestFixture {
               "    const int& i = a()->g();\n"
               "    return i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    const int& g() const { return i; }\n"
@@ -2068,8 +2163,8 @@ class TestAutoVariables : public TestFixture {
               "    return i;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:2] -> [test.cpp:7] -> [test.cpp:8]: (error) Using reference to dangling temporary.\n",
-            errout.str());
+            "[test.cpp:7:18] -> [test.cpp:2:35] -> [test.cpp:7:25] -> [test.cpp:8:12]: (error) Using reference to dangling temporary. [danglingTempReference]\n",
+            errout_str());
 
         check("struct S1 {\n"
               "    auto get() -> auto& { return val; }\n"
@@ -2086,8 +2181,8 @@ class TestAutoVariables : public TestFixture {
               "    return c.s.val;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:11] -> [test.cpp:2] -> [test.cpp:11] -> [test.cpp:12]: (error) Using reference to dangling temporary.\n",
-            errout.str());
+            "[test.cpp:11:13] -> [test.cpp:2:34] -> [test.cpp:11:23] -> [test.cpp:12:5]: (error) Using reference to dangling temporary. [danglingTempReference]\n",
+            errout_str());
 
         check("struct C {\n"
               "  std::vector<std::vector<int>> v;\n"
@@ -2105,14 +2200,14 @@ class TestAutoVariables : public TestFixture {
               "  auto e = (*it)->v.begin();\n"
               "  const int& x = (*e)[1];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int* g();\n" // #11188
               "void f() {\n"
               "    const auto& p = g();\n"
               "    if (p != nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<typename S, typename T>\n"
               "void f(const std::vector<S>& v) {\n"
@@ -2122,7 +2217,7 @@ class TestAutoVariables : public TestFixture {
               "        a = b;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("using namespace std;\n" // #10971
               "struct S { int i = 3; };\n"
@@ -2134,7 +2229,16 @@ class TestAutoVariables : public TestFixture {
               "    const S& s = *g();\n"
               "    (void)s.i;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:9]: (error) Using reference to dangling temporary.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:16] -> [test.cpp:9:11]: (error) Using reference to dangling temporary. [danglingTempReference]\n", errout_str());
+
+        check("std::string f() {\n" // #12173
+              "    std::string s;\n"
+              "    for (auto& c : { \"a\", \"b\", \"c\" }) {\n"
+              "        s += c;\n"
+              "    }\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testglobalnamespace() {
@@ -2148,7 +2252,7 @@ class TestAutoVariables : public TestFixture {
               "   }\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnParameterAddress() {
@@ -2157,28 +2261,28 @@ class TestAutoVariables : public TestFixture {
               "  return &y;\n"
               "}");
 
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning pointer to local variable 'y' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
 
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning pointer to local variable 'y' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int * foo(int * y)\n"
               "{\n"
               "  return y;\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct s { void *p; };\n"
               "extern struct s* f(void);\n"
@@ -2188,7 +2292,7 @@ class TestAutoVariables : public TestFixture {
               "    *q = &r->p;\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testconstructor() { // Ticket #5478 - crash while checking a constructor
@@ -2198,6 +2302,7 @@ class TestAutoVariables : public TestFixture {
               "    return const_tree_iterator(foo);\n"
               "  }\n"
               "};");
+        ASSERT_EQUALS("[test.cpp:4:31]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
     }
 
     void variableIsUsedInScope() {
@@ -2216,30 +2321,30 @@ class TestAutoVariables : public TestFixture {
               "    auto l = [&](){ return a; };\n"
               "    return l;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1] -> [test.cpp:2]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning lambda that captures local variable 'p' that will be invalid when returning.\n", errout.str());
+        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"
               "    return [=](){\n"
@@ -2247,7 +2352,7 @@ class TestAutoVariables : public TestFixture {
               "        return [&](){ return a; };\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "    return [=](int a){\n"
@@ -2255,30 +2360,30 @@ class TestAutoVariables : public TestFixture {
               "        return [&](){ return a; };\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto g(int a) {\n"
               "    auto p = a;\n"
               "    return [=](){ return p; };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto g(int& a) {\n"
               "    auto p = a;\n"
               "    return [=](){ return p; };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto g(int& a) {\n"
               "    int& p = a;\n"
               "    return [&](){ return p; };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<class F>\n"
               "void g(F);\n"
@@ -2286,51 +2391,51 @@ class TestAutoVariables : public TestFixture {
               "    int x;\n"
               "    return g([&]() { return x; });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
               "    int i = 0;\n"
               "    return [&i] {};\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning lambda that captures local variable 'i' that will be invalid when returning.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    int i = 0;\n"
               "    return [i] {};\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
               "    int i = 0;\n"
               "    return [=, &i] {};\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning lambda that captures local variable 'i' that will be invalid when returning.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:17] -> [test.cpp:2:9] -> [test.cpp:3:12]: (error) Returning lambda that captures local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    int i = 0;\n"
               "    int j = 0;\n"
               "    return [=, &i] { return j; };\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning lambda that captures local variable 'i' that will be invalid when returning.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:17] -> [test.cpp:2:9] -> [test.cpp:4:12]: (error) Returning lambda that captures local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f() {\n"
               "    int i = 0;\n"
               "    return [&, i] {};\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
               "    int i = 0;\n"
               "    int j = 0;\n"
               "    return [&, i] { return j; };\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Returning lambda that captures local variable 'j' that will be invalid when returning.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:28] -> [test.cpp:3:9] -> [test.cpp:4:12]: (error) Returning lambda that captures local variable 'j' that will be invalid when returning. [returnDanglingLifetime]\n", errout_str());
 
         check("auto f(int& i) {\n"
               "    int j = 0;\n"
               "    return [=, &i] { return j; };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int*);\n"
               "auto g(int y) {\n"
@@ -2339,7 +2444,7 @@ class TestAutoVariables : public TestFixture {
               "        g(&x);\n"
               "    };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int x;\n"
@@ -2351,7 +2456,7 @@ class TestAutoVariables : public TestFixture {
               "        ap->x;\n"
               "    };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingLifetimeContainer() {
@@ -2359,21 +2464,21 @@ class TestAutoVariables : public TestFixture {
               "    auto it = x.begin();\n"
               "    return it;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f() {\n"
               "    std::vector<int> x;\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning iterator to local container 'x' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning iterator to local container 'x' that will be invalid when returning.\n", errout.str());
+        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"
@@ -2381,8 +2486,8 @@ class TestAutoVariables : public TestFixture {
               "    return p;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("auto f() {\n"
               "    std::vector<int> x;\n"
@@ -2390,8 +2495,8 @@ class TestAutoVariables : public TestFixture {
               "    return p;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning pointer to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("struct A { int foo; };\n"
               "int* f(std::vector<A> v) {\n"
@@ -2399,14 +2504,14 @@ class TestAutoVariables : public TestFixture {
               "    return &it->foo;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning pointer to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("std::vector<int>::iterator f(std::vector<int> x) {\n"
               "    auto it = x.begin();\n"
               "    return it;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning iterator to local container 'x' that will be invalid when returning.\n", errout.str());
+        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"
@@ -2414,8 +2519,8 @@ class TestAutoVariables : public TestFixture {
               "    return std::next(it);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("auto f() {\n"
               "    std::vector<int> x;\n"
@@ -2423,8 +2528,8 @@ class TestAutoVariables : public TestFixture {
               "    return it + 1;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning iterator to local container 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("auto f() {\n"
               "    std::vector<int> x;\n"
@@ -2432,8 +2537,8 @@ class TestAutoVariables : public TestFixture {
               "    return std::next(it + 1);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("std::vector<int*> f() {\n"
               "    int i = 0;\n"
@@ -2442,8 +2547,8 @@ class TestAutoVariables : public TestFixture {
               "    return v;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:2] -> [test.cpp:5]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("std::vector<int*> f() {\n"
               "    std::vector<int*> r;\n"
@@ -2454,8 +2559,8 @@ class TestAutoVariables : public TestFixture {
               "    return r;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:5] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:7]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    std::vector<int*> v;\n"
@@ -2465,8 +2570,8 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "};");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:5] -> [test.cpp:4] -> [test.cpp:5]: (error) Non-local variable 'v' will use object that points to local variable 'i'.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    std::vector<int*> v;\n"
@@ -2477,8 +2582,8 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "};");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:6] -> [test.cpp:4] -> [test.cpp:6]: (error) Non-local variable 'v' will use object that points to local variable 'i'.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    std::vector<int*> m;\n"
@@ -2490,8 +2595,9 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "};");
         ASSERT_EQUALS(
-            "[test.cpp:6] -> [test.cpp:6] -> [test.cpp:6] -> [test.cpp:4] -> [test.cpp:7]: (error) Non-local variable 'm' will use object that points to local variable 'x'.\n",
-            errout.str());
+            "[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
+            errout_str());
 
         check("std::vector<int>::iterator f(std::vector<int> v) {\n"
               "    for(auto it = v.begin();it != v.end();it++) {\n"
@@ -2500,16 +2606,16 @@ class TestAutoVariables : public TestFixture {
               "    return {};\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning iterator to local container 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("const char * f() {\n"
               "   std::string ba(\"hello\");\n"
               "   return ba.c_str();\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning pointer to local variable 'ba' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("template <class T, class K, class V>\n"
               "const V* get_default(const T& t, const K& k, const V* v) {\n"
@@ -2520,33 +2626,32 @@ class TestAutoVariables : public TestFixture {
               "const int* bar(const std::unordered_map<int, int>& m, int k) {\n"
               "    auto x = 0;\n"
               "    return get_default(m, k, &x);\n"
-              "}\n",
-              true);
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:9] -> [test.cpp:8] -> [test.cpp:9]: (error, inconclusive) Returning pointer to local variable 'x' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:30] -> [test.cpp:9:30] -> [test.cpp:8:10] -> [test.cpp:9:23]: (error, inconclusive) Returning pointer to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("std::vector<int> g();\n"
               "auto f() {\n"
               "    return g().begin();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (error) Returning iterator that will be invalid when returning.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:21] -> [test.cpp:3:21]: (error) Returning iterator that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
 
         check("std::vector<int> g();\n"
               "std::vector<int>::iterator f() {\n"
               "    auto it = g().begin();\n"
               "    return it;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3] -> [test.cpp:4]: (error) Using iterator that is a temporary.\n"
-                      "[test.cpp:3] -> [test.cpp:4]: (error) Returning iterator that will be invalid when returning.\n",
-                      errout.str());
+        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",
+                      errout_str());
 
         check("std::vector<int> g();\n"
               "int& f() {\n"
               "    return *g().begin();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:22] -> [test.cpp:3:12]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("struct A {\n"
               "    std::vector<std::string> v;\n"
@@ -2555,7 +2660,7 @@ class TestAutoVariables : public TestFixture {
               "        v.push_back(s);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::string> f() {\n"
               "    const char * s = \"hello\";\n"
@@ -2563,46 +2668,46 @@ class TestAutoVariables : public TestFixture {
               "    v.push_back(s);\n"
               "    return v;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto f() {\n"
               "  static std::vector<int> x;\n"
               "  return x.begin();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string g() {\n"
               "    std::vector<char> v;\n"
               "    return v.data();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>::iterator f(std::vector<int>* v) {\n"
               "    return v->begin();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> v) {\n"
               "    return *v.begin();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> v) {\n"
               "    return v.end() - v.begin();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto g() {\n"
               "    std::vector<char> v;\n"
               "    return {v, [v]() { return v.data(); }};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<class F>\n"
               "void g(F);\n"
@@ -2610,7 +2715,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<char> v;\n"
               "    return g([&]() { return v.data(); });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> g();\n"
               "struct A {\n"
@@ -2620,7 +2725,7 @@ class TestAutoVariables : public TestFixture {
               "        m.insert(m.end(), v.begin(), v.end());\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    std::vector<int> v = {1};\n"
@@ -2630,7 +2735,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    return v.back() == 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "    int f( P p ) {\n"
@@ -2641,7 +2746,7 @@ class TestAutoVariables : public TestFixture {
               "    std::map< S, B > m1;\n"
               "    std::map< S, B > m2;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::vector<int*> v;\n"
@@ -2650,47 +2755,47 @@ class TestAutoVariables : public TestFixture {
               "        v.push_back(&x);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f(const std::string& x) {\n"
               "    std::string y = \"x\";\n"
               "    return y.find(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string* f();\n"
               "const char* g() {\n"
               "    std::string* var = f();\n"
               "    return var->c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<char*> f() {\n"
               "    char a = 0;\n"
               "    return std::vector<char*>{&a};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "int& f() {\n"
               "    auto* p = g();\n"
               "    return p->front();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::vector<int>> g();\n"
               "void f() {\n"
               "    for(auto& x:g())\n"
               "        std::sort(x.begin(), x.end());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::vector<int*> v;\n"
@@ -2703,8 +2808,8 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "};\n");
         ASSERT_EQUALS(
-            "[test.cpp:8] -> [test.cpp:8] -> [test.cpp:4] -> [test.cpp:7] -> [test.cpp:4]: (error) Non-local variable 'v' will use object that points to local variable 'i'.\n",
-            errout.str());
+            "[test.cpp:8:13] -> [test.cpp:8:13] -> [test.cpp:4:21] -> [test.cpp:7:13] -> [test.cpp:4:9]: (error) Non-local variable 'v' will use object that points to local variable 'i'. [danglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    std::vector<int*> v;\n"
@@ -2717,7 +2822,7 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    a.add(&i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::vector<int*> v;\n"
@@ -2730,7 +2835,7 @@ class TestAutoVariables : public TestFixture {
               "        a.add(&i);\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int i;\n"
@@ -2741,7 +2846,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    return i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int* get(std::vector<int>& container) {\n"
               "    Sequence seq(container);\n"
@@ -2750,20 +2855,18 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    return &*seq.begin();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(std::string Str, int first, int last) {\n"
               "    return { Str.begin() + first, Str.begin() + last + 1 };\n"
-              "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(std::string s) {\n"
               "    std::string r = { s.begin(), s.end() };\n"
               "    return r;\n"
-              "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::vector<std::unique_ptr<int>> mA;\n"
@@ -2772,7 +2875,7 @@ class TestAutoVariables : public TestFixture {
               "        mA.push_back(std::move(a));\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::map<std::string, int> m;\n"
@@ -2781,20 +2884,37 @@ class TestAutoVariables : public TestFixture {
               "        return &(r.first->second);\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "	std::queue<int> q;\n"
               "	auto& h = q.emplace();\n"
               "    h = 1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(std::string s) {\n"
               "    std::string ss = (\":\" + s).c_str();\n"
               "    return ss;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #12568
+              "    std::string str;\n"
+              "    {\n"
+              "        std::unique_ptr<char[]> b(new char[1]{});\n"
+              "        str.assign(b.get());\n"
+              "    }\n"
+              "    std::cerr << str;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("auto f() {\n" // #11420
+              "    std::vector<int> x;\n"
+              "    std::vector<int>::iterator it = x.begin();\n"
+              "    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());
     }
 
     void danglingLifetimeContainerView()
@@ -2804,8 +2924,8 @@ class TestAutoVariables : public TestFixture {
               "    return s;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:12] -> [test.cpp:2:17] -> [test.cpp:3:12]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("std::string_view f() {\n"
               "    std::string s = \"\";\n"
@@ -2813,16 +2933,16 @@ class TestAutoVariables : public TestFixture {
               "    return sv;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:27] -> [test.cpp:2:17] -> [test.cpp:4:12]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("std::string_view f() {\n"
               "    std::string s = \"\";\n"
               "    return std::string_view{s};\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:29] -> [test.cpp:2:17] -> [test.cpp:3:28]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("std::string_view f(std::string_view s) {\n"
               "    return s;\n"
@@ -2832,8 +2952,8 @@ class TestAutoVariables : public TestFixture {
               "    return f(s);\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:6] -> [test.cpp:6] -> [test.cpp:5] -> [test.cpp:6]: (error) Returning object that points to local variable 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:6:14] -> [test.cpp:6:14] -> [test.cpp:5:17] -> [test.cpp:6:13]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("const char * f() {\n"
               "    std::string s;\n"
@@ -2841,62 +2961,62 @@ class TestAutoVariables : public TestFixture {
               "    return sv.begin();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning iterator to local container 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:4:20] -> [test.cpp:2:17] -> [test.cpp:4:20]: (error) Returning iterator to local container 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("const char * f() {\n"
               "    std::string s;\n"
               "    return std::string_view{s}.begin();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning iterator to local container 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:37] -> [test.cpp:2:17] -> [test.cpp:3:37]: (error) Returning iterator to local container 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("const char * f() {\n"
               "    std::string s;\n"
               "    return std::string_view(s).begin();\n"
               "}\n");
         TODO_ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning iterator to local container 's' that will be invalid when returning.\n",
+            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning iterator to local container 's' that will be invalid when returning. [returnDanglingLifetime]\n",
             "",
-            errout.str());
+            errout_str());
 
         check("const char * f(std::string_view sv) {\n"
               "    return sv.begin();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const char * f(std::string s) {\n"
               "    std::string_view sv = s;\n"
               "    return sv.begin();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning iterator to local container 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:20] -> [test.cpp:1:28] -> [test.cpp:3:20]: (error) Returning iterator to local container 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("std::string_view f(std::string s) {\n"
               "    return s;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:1] -> [test.cpp:2]: (error) Returning object that points to local variable 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:2:12] -> [test.cpp:1:32] -> [test.cpp:2:12]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("const char * f(const std::string& s) {\n"
               "    std::string_view sv = s;\n"
               "    return sv.begin();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string_view f(const std::string_view& sv) {\n"
               "    return sv;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #10993
               "    std::string_view v = std::string();\n"
               "    v.data();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2] -> [test.cpp:3]: (error) Using object that is a temporary.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:37] -> [test.cpp:2:37] -> [test.cpp:3:5]: (error) Using object that is a temporary. [danglingTemporaryLifetime]\n", errout_str());
 
         check("std::string convert(std::string_view sv) { return std::string{ sv }; }\n" // #11374
               "auto f() {\n"
@@ -2904,7 +3024,7 @@ class TestAutoVariables : public TestFixture {
               "    v.push_back(convert(\"foo\"));\n"
               "    return v[0];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10532
         check("std::string f(std::string ss) {\n"
@@ -2912,16 +3032,23 @@ class TestAutoVariables : public TestFixture {
               "  std::string s = sv;\n"
               "  return s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2] -> [test.cpp:3]: (error) Using object that is a temporary.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:30] -> [test.cpp:2:30] -> [test.cpp:3:17]: (error) Using object that is a temporary. [danglingTemporaryLifetime]\n",
+                      errout_str());
+
+        // #10833
+        check("struct A { std::string s; };\n"
+              "const std::string& f(A* a) {\n"
+              "    return a ? a->s : \"\";\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("std::span<int> f() {\n"
               "    std::vector<int> v{};\n"
               "    return v;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:12] -> [test.cpp:2:22] -> [test.cpp:3:12]: (error) Returning object that points to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("std::span<int> f() {\n"
               "    std::vector<int> v;\n"
@@ -2929,16 +3056,16 @@ class TestAutoVariables : public TestFixture {
               "    return sp;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:20] -> [test.cpp:2:22] -> [test.cpp:4:12]: (error) Returning object that points to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("std::span<int> f() {\n"
               "    std::vector<int> v;\n"
               "    return std::span{v};\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:3:22] -> [test.cpp:2:22] -> [test.cpp:3:21]: (error) Returning object that points to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("int f() {\n"
               "    std::span<int> s;\n"
@@ -2949,8 +3076,8 @@ class TestAutoVariables : public TestFixture {
               "return s.back()\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:6]: (error) Using object that points to local variable 'v' that is out of scope.\n",
-            errout.str());
+            "[test.cpp:4:43] -> [test.cpp:4:26] -> [test.cpp:6:8]: (error) Using object that points to local variable 'v' that is out of scope. [invalidLifetime]\n",
+            errout_str());
 
         check("int f() {\n"
               "    std::span<int> s;\n"
@@ -2961,8 +3088,8 @@ class TestAutoVariables : public TestFixture {
               "return s.back()\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:6]: (error) Using object that points to local variable 'v' that is out of scope.\n",
-            errout.str());
+            "[test.cpp:4:43] -> [test.cpp:4:26] -> [test.cpp:6:8]: (error) Using object that points to local variable 'v' that is out of scope. [invalidLifetime]\n",
+            errout_str());
 
         check("int f() {\n"
               "    std::span<int> s;\n"
@@ -2973,8 +3100,8 @@ class TestAutoVariables : public TestFixture {
               "return s.front()\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:6]: (error) Using object that points to local variable 'v' that is out of scope.\n",
-            errout.str());
+            "[test.cpp:4:43] -> [test.cpp:4:26] -> [test.cpp:6:8]: (error) Using object that points to local variable 'v' that is out of scope. [invalidLifetime]\n",
+            errout_str());
 
         check("int f() {\n"
               "    std::span<int> s;\n"
@@ -2985,8 +3112,8 @@ class TestAutoVariables : public TestFixture {
               "return s.last(1)\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:6]: (error) Using object that points to local variable 'v' that is out of scope.\n",
-            errout.str());
+            "[test.cpp:4:43] -> [test.cpp:4:26] -> [test.cpp:6:8]: (error) Using object that points to local variable 'v' that is out of scope. [invalidLifetime]\n",
+            errout_str());
 
         check("int f() {\n"
               "    std::span<int> s;\n"
@@ -2997,8 +3124,24 @@ class TestAutoVariables : public TestFixture {
               "return s.first(1)\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:6]: (error) Using object that points to local variable 'v' that is out of scope.\n",
-            errout.str());
+            "[test.cpp:4:43] -> [test.cpp:4:26] -> [test.cpp:6:8]: (error) Using object that points to local variable 'v' that is out of scope. [invalidLifetime]\n",
+            errout_str());
+
+        check("std::span<const int> f() {\n" // #12966
+              "    int a[10]{};\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:12] -> [test.cpp:2:9] -> [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" // #10995
+              "    char a[10]{};\n"
+              "    return a;\n"
+              "}\n");
+        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());
     }
 
     void danglingLifetimeUniquePtr()
@@ -3008,15 +3151,15 @@ class TestAutoVariables : public TestFixture {
               "    return rp;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning pointer to local variable 'p' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:2:21] -> [test.cpp:1:29] -> [test.cpp:3:12]: (error) Returning pointer to local variable 'p' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("int* f();\n" // #11406
               "bool g() {\n"
               "    std::unique_ptr<int> ptr(f());\n"
               "    return ptr.get();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int* f();\n"
               "int* g() {\n"
@@ -3024,8 +3167,15 @@ class TestAutoVariables : public TestFixture {
               "    return ptr.get();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Returning pointer to local variable 'ptr' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:4:19] -> [test.cpp:3:26] -> [test.cpp:4:19]: (error) Returning object that points to local variable 'ptr' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
+
+        // #12600
+        check("struct S { std::unique_ptr<int> p; };\n"
+              "int* f(const S* s) {\n"
+              "    return s[0].p.get();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
     void danglingLifetime() {
         check("auto f() {\n"
@@ -3033,13 +3183,13 @@ class TestAutoVariables : public TestFixture {
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:3]: (error) Returning lambda that captures local variable 'a' that will be invalid when returning.\n", errout.str());
+        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"
@@ -3047,19 +3197,19 @@ class TestAutoVariables : public TestFixture {
               "    return c;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3] -> [test.cpp:4]: (error) Returning pointer to local variable 'c' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("auto f(std::vector<int>& a) {\n"
               "    auto it = a.begin();\n"
               "    return [=](){ return it; };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int * f(int a[]) {\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    struct b {\n"
@@ -3067,14 +3217,14 @@ class TestAutoVariables : public TestFixture {
               "    } d;\n"
               "    uint32_t *a = d.f;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
         check("struct A;\n"
@@ -3082,7 +3232,7 @@ class TestAutoVariables : public TestFixture {
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
         check("struct A;\n"
@@ -3090,7 +3240,7 @@ class TestAutoVariables : public TestFixture {
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1]();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
         check("struct A;\n"
@@ -3098,7 +3248,7 @@ class TestAutoVariables : public TestFixture {
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Make sure we don't hang
         check("struct A;\n"
@@ -3106,7 +3256,7 @@ class TestAutoVariables : public TestFixture {
               "    using T = A[3];\n"
               "    A &&a = T{1, 2, 3}[1]();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Crash #8872
         check("struct a {\n"
@@ -3114,14 +3264,14 @@ class TestAutoVariables : public TestFixture {
               "    d(c, [&] { c->e });\n"
               "  }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "  void operator()(b c) override {\n"
               "    d(c, [=] { c->e });\n"
               "  }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "    a(char* b) {}\n"
@@ -3130,7 +3280,7 @@ class TestAutoVariables : public TestFixture {
               "    char c[20];\n"
               "    return c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "    a(char* b) {}\n"
@@ -3140,7 +3290,7 @@ class TestAutoVariables : public TestFixture {
               "    a d = c;\n"
               "    return d;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    struct a {\n"
@@ -3148,14 +3298,14 @@ class TestAutoVariables : public TestFixture {
               "        auto g() { return v.end(); }\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int * f(std::vector<int>& v) {\n"
               "    for(int & x : v)\n"
               "        return &x;\n"
               "    return nullptr;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9275
         check("struct S {\n"
@@ -3167,7 +3317,7 @@ class TestAutoVariables : public TestFixture {
               "    const char* msg = buf;\n"
               "    m = msg;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9201
         check("int* f() {\n"
@@ -3175,14 +3325,14 @@ class TestAutoVariables : public TestFixture {
               "    static a b{0};\n"
               "    return &b.m;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9453
         check("int *ptr;\n"
               "void foo(int arr[]) {\n"
               "    ptr = &arr[2];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9639
         check("struct Fred {\n"
@@ -3193,7 +3343,7 @@ class TestAutoVariables : public TestFixture {
               "  const Fred &fred = getFred();\n"
               "  return fred.s.c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9534
         check("struct A {\n"
@@ -3203,14 +3353,14 @@ class TestAutoVariables : public TestFixture {
               "    A& y = v[i];\n"
               "    return &y.x[i];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9712
         check("std::string f(const char *str) {\n"
               "    char value[256];\n"
               "    return value;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9770
         check("class C {\n"
@@ -3220,7 +3370,7 @@ class TestAutoVariables : public TestFixture {
               "  const char data[] = \"x\";\n"
               "  return data;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9899
         check("struct A {\n"
@@ -3232,14 +3382,14 @@ class TestAutoVariables : public TestFixture {
               "        f(std::move(w));\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         //Make sure we can still take the address of a reference without warning
         check("int* foo() {\n"
               "  int& x = getX();\n"
               "  return &x;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("struct C {\n"
               "  int* m_x;\n"
               "  void foo() {\n"
@@ -3247,7 +3397,7 @@ class TestAutoVariables : public TestFixture {
               "    m_x = &x;\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10090
         check("struct a {\n"
@@ -3265,7 +3415,7 @@ class TestAutoVariables : public TestFixture {
               "        e.c = &e.d->b;\n"
               "    return e;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10214
         check("struct A {\n"
@@ -3278,7 +3428,7 @@ class TestAutoVariables : public TestFixture {
               "                   [key](const auto &v) { return v.key == key; });\n"
               "  return (entry == lookup.end()) ? \"\" : entry->value;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9811
         check("struct Base {\n"
@@ -3289,7 +3439,7 @@ class TestAutoVariables : public TestFixture {
               "    auto get() -> int & override { return z; }\n"
               "    auto getMore() -> int & { return get(); }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10575
         check("struct Data {\n"
@@ -3307,22 +3457,22 @@ class TestAutoVariables : public TestFixture {
               "    MoreData mMoreData;\n"
               "};\n");
         ASSERT_EQUALS(
-            "[test.cpp:11] -> [test.cpp:10] -> [test.cpp:11]: (error) Non-local variable 'mMoreData.data1' will use pointer to local variable 'data'.\n",
-            errout.str());
+            "[test.cpp:11:27] -> [test.cpp:10:14] -> [test.cpp:11:18]: (error) Non-local variable 'mMoreData.data1' will use pointer to local variable 'data'. [danglingLifetime]\n",
+            errout_str());
 
         // #10784
         check("template <class... Ts>\n"
               "auto f(int i, Ts&... xs) {\n"
               "    return std::tie(xs[i]...);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11362
         check("int* f() {\n"
               "    static struct { int x; } a[] = { { 1 } };\n"
               "    return &a[0].x;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11666
         check("template <class T, int M, int N>\n"
@@ -3344,7 +3494,7 @@ class TestAutoVariables : public TestFixture {
               "Matrix<T, 2, 2> O() {\n"
               "    return { {}, {} };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11729
         check("struct T {\n"
@@ -3357,7 +3507,26 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    std::vector<int*> v;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #13560
+        check("void f() {\n"
+              "    int a[] = { 1 };\n"
+              "    static int* p = nullptr;\n"
+              "    if (!p) {\n"
+              "        p = &a[0];\n"
+              "    }\n"
+              "    *p = 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:13] -> [test.cpp:2:9] -> [test.cpp:7:6]: (error) Static variable 'p' will use pointer to local variable 'a'. [danglingLifetime]\n", errout_str());
+
+        // #10902
+        check("void f() {\n"
+              "    static int* x;\n"
+              "    int y;\n"
+              "    x = &y;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:9] -> [test.cpp:3:9] -> [test.cpp:4:5]: (error) Static variable 'x' will use pointer to local variable 'y'. [danglingLifetime]\n", errout_str());
     }
 
     void danglingLifetimeFunction() {
@@ -3366,16 +3535,16 @@ class TestAutoVariables : public TestFixture {
               "    return std::ref(a);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 'a' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("auto f() {\n"
               "    int a;\n"
               "    return std::make_tuple(std::ref(a));\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 'a' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("template<class T>\n"
               "auto by_value(T x) {\n"
@@ -3386,8 +3555,8 @@ class TestAutoVariables : public TestFixture {
               "    return by_value(v.begin());\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:7] -> [test.cpp:3] -> [test.cpp:3] -> [test.cpp:6] -> [test.cpp:7]: (error) Returning object that points to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("template<class T>\n"
               "auto by_value(const T& x) {\n"
@@ -3398,8 +3567,8 @@ class TestAutoVariables : public TestFixture {
               "    return by_value(v.begin());\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:7] -> [test.cpp:3] -> [test.cpp:3] -> [test.cpp:6] -> [test.cpp:7]: (error) Returning object that points to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("auto by_ref(int& x) {\n"
               "    return [&] { return x; };\n"
@@ -3409,8 +3578,8 @@ class TestAutoVariables : public TestFixture {
               "    return by_ref(i);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:1] -> [test.cpp:2] -> [test.cpp:6] -> [test.cpp:5] -> [test.cpp:6]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("auto by_ref(const int& x) {\n"
               "    return [=] { return x; };\n"
@@ -3419,14 +3588,14 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    return by_ref(i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto f(int x) {\n"
               "    int a;\n"
               "    std::tie(a) = x;\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::pair<std::string, std::string>\n"
               "str_pair(std::string const & a, std::string const & b) {\n"
@@ -3439,7 +3608,14 @@ class TestAutoVariables : public TestFixture {
               "    par.push_back(str_pair(\"param3\", \"prop_c\"));\n"
               "    return par;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int* (*ptr)(const int*); };\n" // #13057
+              "int* f(S* s) {\n"
+              "    int x = 0;\n"
+              "    return s->ptr(&x);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingLifetimeUserConstructor()
@@ -3456,8 +3632,8 @@ class TestAutoVariables : public TestFixture {
               "    return a;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:8] -> [test.cpp:10]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:9] -> [test.cpp:8:9] -> [test.cpp:10:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int* i;\n"
@@ -3467,11 +3643,10 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    A a{i};\n"
               "    return a;\n"
-              "}\n",
-              true);
+              "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:6] -> [test.cpp:8]: (error, inconclusive) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:7:9] -> [test.cpp:6:9] -> [test.cpp:8:12]: (error, inconclusive) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int* i;\n"
@@ -3481,9 +3656,8 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    A a{i};\n"
               "    return a;\n"
-              "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int& i;\n"
@@ -3497,8 +3671,8 @@ class TestAutoVariables : public TestFixture {
               "    return a;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:8] -> [test.cpp:10]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:9] -> [test.cpp:8:9] -> [test.cpp:10:12]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int& i;\n"
@@ -3512,8 +3686,8 @@ class TestAutoVariables : public TestFixture {
               "    return a;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:8] -> [test.cpp:10]: (error) Returning object that points to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:9] -> [test.cpp:8:22] -> [test.cpp:10:12]: (error) Returning object that points to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int* i;\n"
@@ -3527,8 +3701,8 @@ class TestAutoVariables : public TestFixture {
               "    return a;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:8] -> [test.cpp:10]: (error) Returning object that points to local variable 'v' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:9] -> [test.cpp:8:22] -> [test.cpp:10:12]: (error) Returning object that points to local variable 'v' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    const int* i;\n"
@@ -3540,8 +3714,8 @@ class TestAutoVariables : public TestFixture {
               "    A a{0};\n"
               "    return a;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:9]: (error) Returning object that will be invalid when returning.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:9:12]: (error) Returning object that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
 
         check("struct A {\n"
               "    const int* i;\n"
@@ -3554,8 +3728,8 @@ class TestAutoVariables : public TestFixture {
               "    return A{i};\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:8] -> [test.cpp:9]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:14] -> [test.cpp:8:9] -> [test.cpp:9:13]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    std::string v;\n"
@@ -3567,7 +3741,7 @@ class TestAutoVariables : public TestFixture {
               "    std::string s;\n"
               "    return A{s};\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::string_view v;\n"
@@ -3580,8 +3754,8 @@ class TestAutoVariables : public TestFixture {
               "    return A{s};\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:8] -> [test.cpp:9]: (error) Returning object that points to local variable 's' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:14] -> [test.cpp:8:17] -> [test.cpp:9:13]: (error) Returning object that points to local variable 's' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    const int* i;\n"
@@ -3592,8 +3766,8 @@ class TestAutoVariables : public TestFixture {
               "A f() {\n"
               "    return A{0};\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:8]: (error) Returning object that will be invalid when returning.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:8:13]: (error) Returning object that will be invalid when returning. [returnDanglingLifetime]\n",
+                      errout_str());
 
         check("struct A {\n"
               "    int n;\n"
@@ -3603,7 +3777,7 @@ class TestAutoVariables : public TestFixture {
               "    A m(4);\n"
               "    return m;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct B {};\n"
               "struct A {\n"
@@ -3614,7 +3788,7 @@ class TestAutoVariables : public TestFixture {
               "    A m(B{});\n"
               "    return m;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    A(std::vector<std::string> &filenames)\n"
@@ -3626,8 +3800,8 @@ class TestAutoVariables : public TestFixture {
               "    return A(files);\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:8] -> [test.cpp:7] -> [test.cpp:8]: (error) Returning object that points to local variable 'files' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:8:14] -> [test.cpp:7:30] -> [test.cpp:8:13]: (error) Returning object that points to local variable 'files' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct S {\n"
               "    explicit S(std::string& s);\n"
@@ -3635,9 +3809,8 @@ class TestAutoVariables : public TestFixture {
               "S f() {\n"
               "    std::string m(\"abc\");\n"
               "    return S(m);\n"
-              "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    std::string msg;\n"
@@ -3646,12 +3819,23 @@ class TestAutoVariables : public TestFixture {
               "S f() {\n"
               "    std::string s(\"abc\");\n"
               "    return S(s.c_str());\n"
-              "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    explicit S(const char* p) { m = p; }\n"
+              "    void g();\n"
+              "    std::string m;\n"
+              "    int* t{};\n"
+              "};\n"
+              "void f(const std::stringstream& buffer) {\n"
+              "    S s(buffer.str().c_str());\n"
+              "    s.g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
-    void danglingLifetimeAggegrateConstructor() {
+    void danglingLifetimeAggregateConstructor() {
         check("struct A {\n"
               "    const int& x;\n"
               "    int y;\n"
@@ -3661,8 +3845,8 @@ class TestAutoVariables : public TestFixture {
               "    return A{i, i};\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:6] -> [test.cpp:7]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    const int& x;\n"
@@ -3673,8 +3857,8 @@ class TestAutoVariables : public TestFixture {
               "    return {i, i};\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:6] -> [test.cpp:7]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    const int& x;\n"
@@ -3686,8 +3870,8 @@ class TestAutoVariables : public TestFixture {
               "    return r;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:6] -> [test.cpp:8]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    const int& x;\n"
@@ -3699,8 +3883,8 @@ class TestAutoVariables : public TestFixture {
               "    return r;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:6] -> [test.cpp:8]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    const int& x;\n"
@@ -3711,8 +3895,8 @@ class TestAutoVariables : public TestFixture {
               "    return A{i, x};\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:6] -> [test.cpp:7]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    const int& x;\n"
@@ -3722,7 +3906,7 @@ class TestAutoVariables : public TestFixture {
               "    int i = 0;\n"
               "    return A{x, i};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    const int& x;\n"
@@ -3731,14 +3915,89 @@ class TestAutoVariables : public TestFixture {
               "A f(int& x) {\n"
               "    return A{x, x};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct a {\n"
+              "    std::string m;\n"
+              "};\n"
+              "a f() {\n"
+              "    std::array<char, 1024> m {};\n"
+              "    return { m.data() };\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { std::string s; };\n" // #13167
+              "std::vector<S> f() {\n"
+              "    std::vector<S> v;\n"
+              "    {\n"
+              "        std::string a{ \"abc\" };\n"
+              "        v.push_back({ a.c_str() });\n"
+              "    }\n"
+              "    return v;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { std::string_view sv; };\n"
+              "std::vector<S> f() {\n"
+              "    std::vector<S> v;\n"
+              "    {\n"
+              "        std::string a{ \"abc\" };\n"
+              "        v.push_back({ a.c_str() });\n"
+              "    }\n"
+              "    return v;\n"
+              "}\n");
+        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 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());
     }
 
     void danglingLifetimeInitList() {
@@ -3748,8 +4007,9 @@ class TestAutoVariables : public TestFixture {
               "    return v;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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
+            errout_str());
 
         check("std::vector<int*> f() {\n"
               "    int i = 0;\n"
@@ -3757,21 +4017,23 @@ class TestAutoVariables : public TestFixture {
               "    return v;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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
+            errout_str());
 
         check("std::vector<int*> f() {\n"
               "    int i = 0;\n"
               "    return {&i, &i};\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3] -> [test.cpp:2] -> [test.cpp:3]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[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
+            errout_str());
 
         check("std::vector<int*> f(int& x) {\n"
               "    return {&x, &x};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::string> f() {\n"
               "    std::set<std::string> x;\n"
@@ -3779,7 +4041,7 @@ class TestAutoVariables : public TestFixture {
               "    x.insert(\"2\");\n"
               "    return { x.begin(), x.end() };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingLifetimeImplicitConversion() {
@@ -3788,7 +4050,7 @@ class TestAutoVariables : public TestFixture {
               "   std::string ba(\"hello\");\n"
               "   return ba.c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(const char *a); };\n"
               "A f() {\n"
@@ -3796,7 +4058,7 @@ class TestAutoVariables : public TestFixture {
               "   A bp = ba.c_str();\n"
               "   return bp;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(const char *a); };\n"
               "std::vector<A> f() {\n"
@@ -3805,7 +4067,7 @@ class TestAutoVariables : public TestFixture {
               "   v.push_back(ba.c_str());\n"
               "   return v;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& x) {\n"
               "  const char c[] = \"\";\n"
@@ -3813,7 +4075,7 @@ class TestAutoVariables : public TestFixture {
               "    return x + c;\n"
               "  return \"\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& x) {\n"
               "  const char c[] = \"123\";\n"
@@ -3821,7 +4083,7 @@ class TestAutoVariables : public TestFixture {
               "    return c + 1;\n"
               "  return \"\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void danglingTemporaryLifetime() {
@@ -3835,7 +4097,7 @@ class TestAutoVariables : public TestFixture {
               "    C c(\"\");\n"
               "    while (c.f()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const int& g(const int& x) {\n"
               "    return x;\n"
@@ -3845,8 +4107,8 @@ class TestAutoVariables : public TestFixture {
               "    i += *x;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:1] -> [test.cpp:2] -> [test.cpp:5] -> [test.cpp:5] -> [test.cpp:5] -> [test.cpp:6]: (error) Using pointer that is a temporary.\n",
-            errout.str());
+            "[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());
 
         check("QString f() {\n"
               "    QString a(\"dummyValue\");\n"
@@ -3854,30 +4116,30 @@ class TestAutoVariables : public TestFixture {
               "    QString c = b;\n"
               "    return c;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3] -> [test.cpp:4]: (error) Using pointer that is a temporary.\n",
-                      errout.str());
+        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());
 
         check("auto f(std::string s) {\n"
               "    const char *x = s.substr(1,2).c_str();\n"
               "    auto i = s.substr(4,5).begin();\n"
               "    return *i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3] -> [test.cpp:4]: (error) Using iterator that is a temporary.\n",
-                      errout.str());
+        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());
 
         check("std::string f() {\n"
               "    std::stringstream tmp;\n"
               "    const std::string &str = tmp.str();\n"
               "    return std::string(str.c_str(), 1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int get_value();\n"
               "const int &get_reference1() {\n"
               "  const int &x = get_value();\n"
               "  return x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Reference to temporary returned.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:4:10]: (error) Reference to temporary returned. [returnTempReference]\n", errout_str());
 
         check("int get_value();\n"
               "const int &get_reference2() {\n"
@@ -3885,14 +4147,14 @@ class TestAutoVariables : public TestFixture {
               "  const int &x2 = x1;\n"
               "  return x2;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3] -> [test.cpp:5]: (error) Reference to temporary returned.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:17] -> [test.cpp:3:17] -> [test.cpp:5:10]: (error) Reference to temporary returned. [returnTempReference]\n",
+                      errout_str());
 
         check("const std::string& getState() {\n"
               "    static const std::string& state = \"\";\n"
               "    return state;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct var {\n"
               "    void fun();\n"
@@ -3905,7 +4167,7 @@ class TestAutoVariables : public TestFixture {
               "    auto a = T(GetTemp().c_str());\n"
               "    a->fun();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::map<int, int> m_;\n"
@@ -3918,8 +4180,22 @@ class TestAutoVariables : public TestFixture {
               "    const std::map<int, int>::iterator& m = func().a_.m_.begin();\n"
               "    (void)m->first;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:9] -> [test.cpp:10]: (error) Using iterator that is a temporary.\n",
-                      errout.str());
+        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"
@@ -3929,7 +4205,7 @@ class TestAutoVariables : public TestFixture {
               "  for (auto it = ptr->begin(); it != ptr->end(); ++it)\n"
               "  {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct String {\n" // #10469
               "    void Append(uint8_t Val);\n"
@@ -3941,7 +4217,7 @@ class TestAutoVariables : public TestFixture {
               "        Append(Val);\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11057
         check("struct S {\n"
@@ -3951,7 +4227,7 @@ class TestAutoVariables : public TestFixture {
               "    const S a[] = { { i } };\n"
               "    for (const auto& s : a) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<char*> f(const std::vector<std::string>& args) {\n" // #9773
               "    std::vector<char*> cargs;\n"
@@ -3964,7 +4240,7 @@ class TestAutoVariables : public TestFixture {
               "    std::vector<char*> cargs = f({ \"0\", \"0\" });\n"
               "    (void)cargs;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:4] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4] -> [test.cpp:9] -> [test.cpp:9] -> [test.cpp:10]: (error) Using object that is a temporary.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:4:47] -> [test.cpp:3:22] -> [test.cpp:1:58] -> [test.cpp:4:40] -> [test.cpp:9:34] -> [test.cpp:9:34] -> [test.cpp:10:11]: (error) Using object that is a temporary. [danglingTemporaryLifetime]\n", errout_str());
 
         check("struct C {\n" // #9194
               "    const int& m;\n"
@@ -3975,7 +4251,7 @@ class TestAutoVariables : public TestFixture {
               "    C c(42);\n"
               "    return c.get();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:7] -> [test.cpp:8]: (error) Using object that is a temporary.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:7:9] -> [test.cpp:8:12]: (error) Using object that is a temporary. [danglingTemporaryLifetime]\n", errout_str());
 
         // #11298
         check("struct S {\n"
@@ -3993,17 +4269,15 @@ class TestAutoVariables : public TestFixture {
               "void T::f() {\n"
               "    U u(p->g().c_str());\n"
               "    if (u.h()) {}\n"
-              "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         // #11442
         check("const std::string& f(const P< std::string >& value) {\n"
               "   static const std::string empty;\n"
               "   return value.get() == nullptr ? empty : *value;\n"
-              "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         // #11472
         check("namespace N {\n"
@@ -4013,7 +4287,7 @@ class TestAutoVariables : public TestFixture {
               "        return p != nullptr ? *p : *reinterpret_cast<const ::N::T*>(&i);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11609
         check("struct S {\n"
@@ -4023,7 +4297,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    std::map<std::string, int> m;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11628
         check("std::vector<int>* g();\n"
@@ -4031,7 +4305,22 @@ class TestAutoVariables : public TestFixture {
               "	std::unique_ptr<std::vector<int>> p(g());\n"
               "	if (!p) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #13760
+        check("template<class T>\n"
+              "auto f(T&& x) {\n"
+              "    return [&] {\n"
+              "        return x();\n"
+              "    };\n"
+              "}\n"
+              "auto g() {\n"
+              "    auto y = f([](auto x) { return 1; });\n"
+              "    return y();\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:12] -> [test.cpp:2:13] -> [test.cpp:4:16] -> [test.cpp:8:16] -> [test.cpp:8:16] -> [test.cpp:9:12]: (error) Using object that is a temporary. [danglingTemporaryLifetime]\n",
+            errout_str());
     }
 
     void danglingLifetimeBorrowedMembers()
@@ -4054,7 +4343,7 @@ class TestAutoVariables : public TestFixture {
               "    func1(&rech.dat);\n"
               "    func2(rech.k);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int x; };\n"
               "A* g();\n"
@@ -4062,8 +4351,8 @@ class TestAutoVariables : public TestFixture {
               "    A** ap = &g();\n"
               "    (*ap)->x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:4] -> [test.cpp:5]: (error) Using pointer that is a temporary.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14] -> [test.cpp:4:16] -> [test.cpp:5:7]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
+                      errout_str());
 
         check("struct A { int* x; };\n"
               "A g();\n"
@@ -4071,7 +4360,7 @@ class TestAutoVariables : public TestFixture {
               "    int* x = g().x;\n"
               "    (void)*x + 1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int x; };\n"
               "struct B { A* a; }\n"
@@ -4080,7 +4369,7 @@ class TestAutoVariables : public TestFixture {
               "    int* x = &g()->a.x;\n"
               "    (void)*x + 1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int x; };\n"
               "struct B { A* g(); };\n"
@@ -4089,8 +4378,8 @@ class TestAutoVariables : public TestFixture {
               "    A** ap = &b.g();\n"
               "    (*ap)->x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:5] -> [test.cpp:6]: (error) Using pointer that is a temporary.\n",
-                      errout.str());
+        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());
     }
 
     void danglingLifetimeClassMemberFunctions()
@@ -4104,8 +4393,8 @@ class TestAutoVariables : public TestFixture {
               "    return S(i).ptr();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:7] -> [test.cpp:7]: (error) Returning pointer that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:4:25] -> [test.cpp:4:25] -> [test.cpp:7:13] -> [test.cpp:7:20]: (error) Returning pointer that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct Fred\n"
               "{\n"
@@ -4123,8 +4412,8 @@ class TestAutoVariables : public TestFixture {
               "    return fred.get_x();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:9] -> [test.cpp:14] -> [test.cpp:13] -> [test.cpp:14]: (error) Returning pointer to local variable 'fred' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:16] -> [test.cpp:9:16] -> [test.cpp:14:12] -> [test.cpp:13:10] -> [test.cpp:14:22]: (error) Returning pointer to local variable 'fred' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int i;\n"
@@ -4136,8 +4425,8 @@ class TestAutoVariables : public TestFixture {
               "    return A().f();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:8] -> [test.cpp:8]: (error) Returning object that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:4:16] -> [test.cpp:4:28] -> [test.cpp:8:13] -> [test.cpp:8:17]: (error) Returning object that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int i;\n"
@@ -4148,7 +4437,7 @@ class TestAutoVariables : public TestFixture {
               "auto g() {\n"
               "    return A().f();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int* i;\n"
@@ -4161,8 +4450,8 @@ class TestAutoVariables : public TestFixture {
               "    return A{&i}.f();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:9] -> [test.cpp:9] -> [test.cpp:4] -> [test.cpp:4] -> [test.cpp:8] -> [test.cpp:9]: (error) Returning object that points to local variable 'i' that will be invalid when returning.\n",
-            errout.str());
+            "[test.cpp:9:14] -> [test.cpp:9:14] -> [test.cpp:9:13] -> [test.cpp:4:16] -> [test.cpp:4:18] -> [test.cpp:8:9] -> [test.cpp:9:19]: (error) Returning object that points to local variable 'i' that will be invalid when returning. [returnDanglingLifetime]\n",
+            errout_str());
 
         check("struct S {\n"
               "    int i{};\n"
@@ -4179,7 +4468,36 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    *p = ret;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct A {\n"
+              "    int val=42;\n"
+              "    const A& Get() const & {\n"
+              "        return *this;\n"
+              "    }\n"
+              "};\n"
+              "const A *ptr;\n"
+              "int main() {\n"
+              "    ptr = &A().Get();\n"
+              "    return ptr->val;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:4:16] -> [test.cpp:9:16] -> [test.cpp:9:11] -> [test.cpp:9:13] -> [test.cpp:10:12]: (error) Using pointer that is a temporary. [danglingTemporaryLifetime]\n",
+            errout_str());
+
+        check("struct A {\n"
+              "    int val = 42;\n"
+              "    const A& Get() const {\n"
+              "        return *this;\n"
+              "    }\n"
+              "};\n"
+              "int main() {\n"
+              "    const A& r = A().Get();\n"
+              "    return r.val;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:8:16] -> [test.cpp:4:16] -> [test.cpp:8:22] -> [test.cpp:9:12]: (error) Using reference to dangling temporary. [danglingTempReference]\n",
+            errout_str());
     }
 
     void invalidLifetime() {
@@ -4191,7 +4509,7 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4] -> [test.cpp:7]: (error) Using lambda that captures local variable 'b' that is out of scope.\n", errout.str());
+        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"
               "  int* x;\n"
@@ -4202,8 +4520,8 @@ class TestAutoVariables : public TestFixture {
               "  x[3];\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:4] -> [test.cpp:7]: (error) Using pointer to local variable 'y' that is out of scope.\n",
-            errout.str());
+            "[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());
 
         check("void foo(int a) {\n"
               "    std::function<void()> f;\n"
@@ -4213,7 +4531,7 @@ class TestAutoVariables : public TestFixture {
               "        f();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "  b();\n"
@@ -4222,7 +4540,7 @@ class TestAutoVariables : public TestFixture {
               "void a::b() {\n"
               "  c.end()\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void b(char f[], char c[]) {\n"
               "  std::string d(c); {\n"
@@ -4230,7 +4548,7 @@ class TestAutoVariables : public TestFixture {
               "    b(f, e.c_str())\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    std::string s;\n"
@@ -4240,11 +4558,11 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    std::cout << s;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int &a[];\n"
               "void b(){int *c = a};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int x;\n"
@@ -4258,7 +4576,7 @@ class TestAutoVariables : public TestFixture {
               "        };\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace test {\n"
               "class Foo {};\n"
@@ -4277,7 +4595,7 @@ class TestAutoVariables : public TestFixture {
               "  f(bar);\n"
               "}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo {};\n"
               "struct Bar {\n"
@@ -4294,7 +4612,7 @@ class TestAutoVariables : public TestFixture {
               "  }\n"
               "  f(bar);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace test {\n"
               "class Foo {};\n"
@@ -4312,7 +4630,7 @@ class TestAutoVariables : public TestFixture {
               "  f(bar);\n"
               "}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:12]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("class Foo {};\n"
               "struct Bar {\n"
@@ -4328,7 +4646,7 @@ class TestAutoVariables : public TestFixture {
               "  }\n"
               "  f(bar);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:11]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("class Foo {};\n" // #10750
               "struct Bar {\n"
@@ -4344,7 +4662,7 @@ class TestAutoVariables : public TestFixture {
               "  }\n"
               "  f(bar);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Address of local auto-variable assigned to a function parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:7]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
 
         check("void f(std::string_view text);\n" // #11508
               "void g() {\n"
@@ -4354,7 +4672,7 @@ class TestAutoVariables : public TestFixture {
               "void f(std::string_view text) {"
               "  g(text.data());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::span<int> data);\n" // #11508
               "void g() {\n"
@@ -4364,7 +4682,7 @@ class TestAutoVariables : public TestFixture {
               "void f(std::span<int> data) {"
               "  g(data.begin());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -4377,7 +4695,7 @@ class TestAutoVariables : public TestFixture {
               "  }\n"
               "  *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4] -> [test.cpp:7]: (error) Using pointer to local variable 'x' that is out of scope.\n", errout.str());
+        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
         check("void f(struct KEY *key) {\n"
@@ -4394,7 +4712,7 @@ class TestAutoVariables : public TestFixture {
               "  }\n"
               "  f(tmp);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Don't warn about references (#6399)
         check("void f() {\n"
@@ -4406,7 +4724,7 @@ class TestAutoVariables : public TestFixture {
               "    if (former_hover != pitem)\n"
               "        dosth();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    wxAuiToolBarItem* former_hover = NULL;\n"
@@ -4418,8 +4736,8 @@ class TestAutoVariables : public TestFixture {
               "        dosth();\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:7]: (error) Using pointer to local variable 'item' that is out of scope.\n",
-            errout.str());
+            "[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());
 
         // #6575
         check("void trp_deliver_signal()  {\n"
@@ -4430,7 +4748,7 @@ class TestAutoVariables : public TestFixture {
               "    EventReport * rep = &repData;\n"
               "    rep->setEventType(NDB_LE_Connected);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8785
         check("int f(bool a, bool b) {\n"
@@ -4443,7 +4761,7 @@ class TestAutoVariables : public TestFixture {
               "        return *iPtr;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4] -> [test.cpp:8]: (error) Using pointer to local variable 'x' that is out of scope.\n", errout.str());
+        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());
 
         // #11753
         check("int main(int argc, const char *argv[]) {\n"
@@ -4454,13 +4772,13 @@ class TestAutoVariables : public TestFixture {
               "    }\n"
               "    std::cout << s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4] -> [test.cpp:7]: (error) Using pointer to local variable 'buff' that is out of scope.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:26] -> [test.cpp:4:14] -> [test.cpp:7:18]: (error) Using pointer to local variable 'buff' that is out of scope. [invalidLifetime]\n", errout_str());
 
         check("char* f(char* dst) {\n"
               "    const char* src = \"abc\";\n"
               "    return strcpy(dst, src);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void splitNamespaceAuto() { // #10473
@@ -4472,7 +4790,15 @@ class TestAutoVariables : public TestFixture {
               "{\n"
               "    int i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void incompleteTypeArray() { // #13787
+        check("struct S (*a[10]);\n"
+              "void f(int i, struct S* p) {\n"
+              "    a[i] = &p[i];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
     }
 
 };
diff --git a/test/testbool.cpp b/test/testbool.cpp
index 2e3b2106754..70860a8c169 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-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
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkbool.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <list>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 
 class TestBool : public TestFixture {
 public:
@@ -34,6 +32,7 @@ class TestBool : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::style).severity(Severity::warning).certainty(Certainty::inconclusive).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(bitwiseOnBoolean);      // if (bool & bool)
         TEST_CASE(incrementBoolean);
         TEST_CASE(assignBoolToPointer);
@@ -77,18 +76,20 @@ class TestBool : public TestFixture {
         TEST_CASE(returnNonBoolClass);
     }
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        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()) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this, options.cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check...
-        runChecks<CheckBool>(&tokenizer, &settings, this);
+        runChecks<CheckBool>(tokenizer, this);
     }
 
 
@@ -96,28 +97,28 @@ class TestBool : public TestFixture {
         check("void foo(bool *p) {\n"
               "    p = false;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Boolean value assigned to pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Boolean value assigned to pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Boolean value assigned to pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Boolean value assigned to pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #5046 - false positive: Boolean value assigned to pointer
         check("struct S {\n"
@@ -127,7 +128,7 @@ class TestBool : public TestFixture {
               "    S s = {0};\n"
               "    *s.p = true;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    bool *p;\n"
@@ -136,13 +137,13 @@ class TestBool : public TestFixture {
               "    S s = {0};\n"
               "    s.p = true;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Boolean value assigned to pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #6588 (c mode)
         check("struct MpegEncContext { int *q_intra_matrix, *q_chroma_intra_matrix; };\n"
@@ -151,8 +152,8 @@ class TestBool : public TestFixture {
               "  const int *rmat = n < 4 ? " /* OK */
               "                       ctx->q_intra_matrix :"
               "                       ctx->q_chroma_intra_matrix;\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Boolean value assigned to pointer.\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:3:19]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #6588 (c++ mode)
         check("struct MpegEncContext { int *q_intra_matrix, *q_chroma_intra_matrix; };\n"
@@ -162,7 +163,7 @@ class TestBool : public TestFixture {
               "                       ctx->q_intra_matrix :"
               "                       ctx->q_chroma_intra_matrix;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Boolean value assigned to pointer.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Boolean value assigned to pointer. [assignBoolToPointer]\n", errout_str());
 
         // ticket #6665
         check("void pivot_big(char *first, int compare(const void *, const void *)) {\n"
@@ -170,38 +171,38 @@ 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"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #7381
         check("void foo(bool *p, bool b) {\n"
               "    p = b;\n"
               "    p = &b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Boolean value assigned to pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Boolean value assigned to floating point variable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Boolean value assigned to floating point variable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Boolean value assigned to floating point variable.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    float p;\n"
@@ -210,7 +211,7 @@ class TestBool : public TestFixture {
               "    S s = {0};\n"
               "    s.p = true;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Boolean value assigned to floating point variable.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
 
         check("struct S {\n"
               "    float* p[1];\n"
@@ -219,7 +220,7 @@ class TestBool : public TestFixture {
               "    S s = {0};\n"
               "    *s.p[0] = true;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Boolean value assigned to floating point variable.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:13]: (style) Boolean value assigned to floating point variable. [assignBoolToFloat]\n", errout_str());
     }
 
     void comparisonOfBoolExpressionWithInt1() {
@@ -227,180 +228,183 @@ class TestBool : public TestFixture {
               "    if ((x && 0x0f)==6)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x || 0x0f)==6)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x & 0x0f)==6)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x | 0x0f)==6)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((5 && x)==3)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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
+            errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x)!=3)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) < 0)\n"
               "        a++;\n"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((5 && x) > 1)\n"
               "        a++;\n"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer.\n", errout.str());
+        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 (0 < (5 && x))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (0 > (5 && x))\n"
               "        a++;\n"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (1 < (5 && x))\n"
               "        a++;\n"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() { return !a+b<c; }"); // #5072
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         check("int f() { return (!a+b<c); }");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         check("int f() { return (a+(b<5)<=c); }");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
     }
 
     void comparisonOfBoolExpressionWithInt2() {
@@ -409,85 +413,85 @@ class TestBool : public TestFixture {
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 == !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool y) {\n"
               "    if (y != !x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (10 != x) {\n"
               "        printf(\"x not equal to 10\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    return (!y == !x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  return (x()+1 == !a);\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("void f() { if (!!a+!!b+!!c>1){} }");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         check("void f(int a, int b, int c) { if (a != !b || c) {} }");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         check("void f(int a, int b, int c) { if (1 < !!a + !!b + !!c) {} }");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         check("void f(int a, int b, int c) { if (1 < !(a+b)) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Comparison of a boolean expression with an integer.\n",errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolExpressionWithInt4() {
@@ -495,48 +499,48 @@ class TestBool : public TestFixture {
         check("void f() {\n"
               "  for(int i = 4; i > -1 < 5 ; --i) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return x(a > b) < c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b, int c) {\n"
               "  return a > b == c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // templates
         check("struct Tokenizer { TokenList list; };\n"
               "void Tokenizer::f() {\n"
               "  std::list<Token*> locationList;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5063 - or
         check("void f() {\n"
               "  return a > b or c < d;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "  return (a < b) != 0U;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("int f() {\n"
               "  return (a < b) != 0x0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("int f() {\n"
               "  return (a < b) != 42U;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18]: (warning) Comparison of a boolean expression with an integer other than 0 or 1. [compareBoolExpressionWithInt]\n", errout_str());
     }
 
     void checkComparisonOfFuncReturningBool1() {
@@ -560,7 +564,7 @@ class TestBool : public TestFixture {
               "     else\n"
               "         return true;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n", errout_str());
     }
 
     void checkComparisonOfFuncReturningBool2() {
@@ -585,8 +589,8 @@ class TestBool : public TestFixture {
               "    else\n"
               "     return false;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.\n"
-                      "[test.cpp:11]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        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());
     }
 
     void checkComparisonOfFuncReturningBool3() {
@@ -597,8 +601,8 @@ class TestBool : public TestFixture {
               "   }\n"
               "}\n"
               "bool compare(int temp);");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n"
-                      "[test.cpp:3]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        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());
     }
 
     void checkComparisonOfFuncReturningBool4() {
@@ -623,7 +627,7 @@ class TestBool : public TestFixture {
               " else\n"
               "     return false;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfFuncReturningBoolError]\n", errout_str());
     }
 
     void checkComparisonOfFuncReturningBool5() {
@@ -647,7 +651,7 @@ class TestBool : public TestFixture {
               "     else\n"
               "         return true;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n", errout_str());
     }
 
     void checkComparisonOfFuncReturningBool6() {
@@ -661,7 +665,7 @@ class TestBool : public TestFixture {
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace Foo {\n"
               "    bool compare1(int temp);\n"
@@ -673,7 +677,7 @@ class TestBool : public TestFixture {
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int compare1(int temp);\n"
               "namespace Foo {\n"
@@ -685,7 +689,7 @@ class TestBool : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Comparison of a function returning boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        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"
               "namespace Foo {\n"
@@ -697,7 +701,7 @@ class TestBool : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool compare1(int temp);\n"
               "void f(){\n"
@@ -706,7 +710,7 @@ class TestBool : public TestFixture {
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkComparisonOfFuncReturningBool7() { // #7197
@@ -720,11 +724,11 @@ class TestBool : public TestFixture {
               "    if ((int)c1.isEmpty() < (int)c2.isEmpty()) {}\n"
               "    if (static_cast<int>(c1.isEmpty()) < static_cast<int>(c2.isEmpty())) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n"
-                      "[test.cpp:7]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n"
-                      "[test.cpp:8]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n"
-                      "[test.cpp:9]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:20]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n"
+                      "[test.cpp:7:20]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n"
+                      "[test.cpp:8:24]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n"
+                      "[test.cpp:9:36]: (style) Comparison of two functions returning boolean value using relational (<, >, <= or >=) operator. [comparisonOfTwoFuncsReturningBoolError]\n",
+                      errout_str());
     }
 
     void checkComparisonOfFuncReturningBool8() { // #4103
@@ -736,7 +740,7 @@ class TestBool : public TestFixture {
               "        ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        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"
               "    bool a = true;\n"
@@ -745,7 +749,7 @@ class TestBool : public TestFixture {
               "        ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        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"
               "    bool a = true;\n"
@@ -754,7 +758,7 @@ class TestBool : public TestFixture {
               "        ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        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"
               "    bool a = true;\n"
@@ -763,7 +767,7 @@ class TestBool : public TestFixture {
               "        ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
     }
 
     void checkComparisonOfFuncReturningBoolIntegrationTest1() { // #7798
@@ -775,7 +779,7 @@ class TestBool : public TestFixture {
               "    return 1;\n"
               "  return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkComparisonOfBoolWithBool() {
@@ -802,133 +806,133 @@ class TestBool : public TestFixture {
                             "        return false;\n"
                             "}\n";
         check(code);
-        ASSERT_EQUALS("[test.cpp:5]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Comparison of a variable having boolean value using relational (<, >, <= or >=) operator. [comparisonOfBoolWithBoolError]\n", errout_str());
     }
 
     void bitwiseOnBoolean() { // 3062
         check("void f(_Bool a, _Bool b) {\n"
               "    if(a & b) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '&&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '&&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a>0' is used in bitwise operation. Did you mean '&&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool a, int b) {\n"
               "    return a | b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Boolean expression 'a' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    foo(bar, &b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n" // #9405
               "    class C { void foo(bool &b) {} };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
               "bool g() {\n"
               "  return f() | f();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("uint8 outcode(float p) {\n"
               "    float d = 0.;\n"
               "    return ((p - xm >= d) << 1) | (x - p > d);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int g();\n" // #10655
               "void f(bool b) {\n"
               "    if (g() | b) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("int g();\n"
               "void f(bool b) {\n"
               "    if (b | g()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int g();\n"
               "bool f(bool b, bool c) {\n"
               "    return b | g() | c;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Boolean expression 'c' is used in bitwise operation. Did you mean '||'?\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:20]: (style, inconclusive) Boolean expression 'c' is used in bitwise operation. Did you mean '||'? [bitwiseOnBoolean]\n", errout_str());
 
         check("void f(int i) {\n" // #4233
               "    bool b = true, c = false;\n"
@@ -936,48 +940,58 @@ class TestBool : public TestFixture {
               "    c |= i;\n"
               "    if (b || c) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation.\n"
-                      "[test.cpp:4]: (style, inconclusive) Boolean expression 'c' is used in bitwise operation.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:7]: (style, inconclusive) Boolean expression 'b' is used in bitwise operation. [bitwiseOnBoolean]\n"
+                      "[test.cpp:4:7]: (style, inconclusive) Boolean expression 'c' is used in bitwise operation. [bitwiseOnBoolean]\n",
+                      errout_str());
 
         check("void f(int i, int j, bool b) {\n"
               "    i &= b;\n"
               "    j |= b;\n"
               "    if (b || c) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool b, int i) {\n"
               "    b &= (i == 5);\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { bool b{}; };\n" // #12455
+              "void f(const std::unordered_map<int, S> m) {\n"
+              "    for (const auto& e : m) {\n"
+              "        S s;\n"
+              "        s.b |= e.second.b;\n"
+              "        (void)s.b;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incrementBoolean() {
         check("bool bValue = true;\n"
               "void f() { bValue++; }");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Incrementing a variable of type 'bool' with postfix operator++ is deprecated by the C++ Standard. You should assign it the value 'true' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt1() {
@@ -986,51 +1000,51 @@ class TestBool : public TestFixture {
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"  // #3356
               "    if (x == 1) {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"
               "    if (x != 10) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("DensePropertyMap<int, true> visited;"); // #4075
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt2() {
@@ -1039,28 +1053,28 @@ class TestBool : public TestFixture {
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x, bool y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x, fooClass y) {\n"
               "    if (x == y) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt3() {
@@ -1069,35 +1083,35 @@ class TestBool : public TestFixture {
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool y) {\n"
               "    if (y == true) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool y) {\n"
               "    if (false < 5) {\n"
               "        printf(\"foo\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of a boolean expression with an integer other than 0 or 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt5() {
@@ -1105,21 +1119,21 @@ class TestBool : public TestFixture {
               "    bool (SciTEBase::*ischarforsel)(char ch);\n"
               "    if (visible != GetVisible(index)) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt7() { // #4846 - (!x==true)
         check("void f(int x) {\n"
               "    if (!x == true) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt8() { // #9165
@@ -1129,7 +1143,7 @@ class TestBool : public TestFixture {
               "    if (expectedResult == res)\n"
               "        throw 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
               "void Test(bool expectedResult) {\n"
@@ -1137,7 +1151,7 @@ class TestBool : public TestFixture {
               "    if (expectedResult == res)\n"
               "        throw 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool Fun();\n"
               "void Test(bool expectedResult) {\n"
@@ -1145,7 +1159,7 @@ class TestBool : public TestFixture {
               "    if (5 + expectedResult == res)\n"
               "        throw 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
               "void Test(bool expectedResult) {\n"
@@ -1153,7 +1167,7 @@ class TestBool : public TestFixture {
               "    if (5 + expectedResult == res)\n"
               "        throw 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int Fun();\n"
               "void Test(bool expectedResult) {\n"
@@ -1161,7 +1175,7 @@ class TestBool : public TestFixture {
               "    if (expectedResult == res + 5)\n"
               "        throw 2;\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void comparisonOfBoolWithInt9() { // #9304
@@ -1172,7 +1186,7 @@ class TestBool : public TestFixture {
               "    }\n"
               "    return b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparisonOfBoolWithInt10() { // #10935
@@ -1181,7 +1195,7 @@ class TestBool : public TestFixture {
               "void f(bool v) {\n"
               "    if (v == H) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace N {\n"
               "    enum class E { H = 2 };\n"
@@ -1189,7 +1203,7 @@ class TestBool : public TestFixture {
               "void f(bool v) {\n"
               "    if (v == N::H) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1197,76 +1211,76 @@ class TestBool : public TestFixture {
         check("void f(char *p) {\n"
               "    if (p+1){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Converting pointer arithmetic result to bool. The bool is always true unless there is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    return 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    return 2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    int x = 10;\n"
               "    return x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    int ret = 0;\n"
@@ -1274,7 +1288,7 @@ class TestBool : public TestFixture {
               "        ret = 1;\n"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    int ret = 0;\n"
@@ -1282,20 +1296,20 @@ class TestBool : public TestFixture {
               "        ret = 3;\n"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Non-boolean value returned from function returning bool\n"
-                      "[test.cpp:4]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnNonBoolLambda() {
@@ -1303,42 +1317,42 @@ class TestBool : public TestFixture {
               "    auto x = [](void) { return -1; };\n"
               "    return false;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) { return -1; };\n"
               "    return 2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(void) {\n"
               "    auto x = [](void) -> int { return -1; };\n"
               "    return 2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x, int y) {\n"
               "    return x | y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    return (x & 0x2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnNonBoolClass() {
@@ -1346,7 +1360,7 @@ class TestBool : public TestFixture {
               "    public:\n"
               "        bool f() { return -1;}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:20]: (style) Non-boolean value returned from function returning bool [returnNonBoolInBooleanFunction]\n", errout_str());
 
         check("bool f() {\n"
               "    struct X {\n"
@@ -1355,7 +1369,7 @@ class TestBool : public TestFixture {
               "    };\n"
               "    return false;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    class X {\n"
@@ -1364,7 +1378,7 @@ class TestBool : public TestFixture {
               "    };\n"
               "    return false;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    class X {\n"
@@ -1373,8 +1387,8 @@ class TestBool : public TestFixture {
               "    };\n"
               "    return -1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Non-boolean value returned from function returning bool\n"
-                      "[test.cpp:4]: (style) Non-boolean value returned from function returning bool\n", errout.str());
+        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/testboost.cpp b/test/testboost.cpp
deleted file mode 100644
index e82feb4f638..00000000000
--- a/test/testboost.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "checkboost.h"
-#include "errortypes.h"
-#include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
-
-#include <list>
-#include <sstream> // IWYU pragma: keep
-
-class TestBoost : public TestFixture {
-public:
-    TestBoost() : TestFixture("TestBoost") {}
-
-private:
-    const Settings settings = settingsBuilder().severity(Severity::style).severity(Severity::performance).build();
-
-    void run() override {
-        TEST_CASE(BoostForeachContainerModification);
-    }
-
-#define check(code) check_(code, __FILE__, __LINE__)
-    void check_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
-
-        // Check..
-        runChecks<CheckBoost>(&tokenizer, &settings, this);
-    }
-
-    void BoostForeachContainerModification() {
-        check("void f() {\n"
-              "    vector<int> data;\n"
-              "    BOOST_FOREACH(int i, data) {\n"
-              "        data.push_back(123);\n"
-              "    }\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) BOOST_FOREACH caches the end() iterator. It's undefined behavior if you modify the container inside.\n", errout.str());
-
-        check("void f() {\n"
-              "    set<int> data;\n"
-              "    BOOST_FOREACH(int i, data) {\n"
-              "        data.insert(123);\n"
-              "    }\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) BOOST_FOREACH caches the end() iterator. It's undefined behavior if you modify the container inside.\n", errout.str());
-
-        check("void f() {\n"
-              "    set<int> data;\n"
-              "    BOOST_FOREACH(const int &i, data) {\n"
-              "        data.erase(123);\n"
-              "    }\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) BOOST_FOREACH caches the end() iterator. It's undefined behavior if you modify the container inside.\n", errout.str());
-
-        // Check single line usage
-        check("void f() {\n"
-              "    set<int> data;\n"
-              "    BOOST_FOREACH(const int &i, data)\n"
-              "        data.clear();\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) BOOST_FOREACH caches the end() iterator. It's undefined behavior if you modify the container inside.\n", errout.str());
-
-        // Container returned as result of a function -> Be quiet
-        check("void f() {\n"
-              "    BOOST_FOREACH(const int &i, get_data())\n"
-              "        data.insert(i);\n"
-              "}");
-        ASSERT_EQUALS("", errout.str());
-
-        // Break after modification (#4788)
-        check("void f() {\n"
-              "    vector<int> data;\n"
-              "    BOOST_FOREACH(int i, data) {\n"
-              "        data.push_back(123);\n"
-              "        break;\n"
-              "    }\n"
-              "}");
-        ASSERT_EQUALS("", errout.str());
-    }
-};
-
-REGISTER_TEST(TestBoost)
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index 0eb59bf5af3..ec02406dcc8 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-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
@@ -21,85 +21,69 @@
 #include "checkbufferoverrun.h"
 #include "ctu.h"
 #include "errortypes.h"
-#include "standards.h"
-#include "library.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
 
-#include <map>
+#include <cstddef>
 #include <list>
-#include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
 class TestBufferOverrun : public TestFixture {
 public:
     TestBufferOverrun() : TestFixture("TestBufferOverrun") {}
 
 private:
-    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).severity(Severity::portability).build();
+    const Settings settings0_i = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
+    const Settings settings1 = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        bool cpp = true;
+    };
 
-        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
+#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()) {
+        check_(file, line, code, settings0_i, options.cpp);
+    }
 
-        // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+    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, &settings, this);
+        runChecks<CheckBufferOverrun>(tokenizer, this);
     }
 
-    void check_(const char* file, int line, const char code[], const Settings &settings, const char filename[] = "test.cpp") {
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
-
-        // Clear the error buffer..
-        errout.str("");
+    // TODO: get rid of this
+    void check_(const char* file, int line, const std::string& code) {
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings0_i, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(&tokenizer, &settings, this);
+        runChecks<CheckBufferOverrun>(tokenizer, this);
     }
 
-    void checkP(const char code[], const char* filename = "test.cpp")
+#define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size])
     {
-        // Clear the error buffer..
-        errout.str("");
-
-        const Settings settings = settingsBuilder(settings0).severity(Severity::style).severity(Severity::warning).severity(Severity::portability).severity(Severity::performance)
-                                  .c(Standards::CLatest).cpp(Standards::CPPLatest).certainty(Certainty::inconclusive).build();
-
-        // Raw tokens..
-        std::vector<std::string> files(1, filename);
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+        SimpleTokenizer2 tokenizer(settings1, *this, code, "test.cpp");
 
         // Tokenizer..
-        Tokenizer tokenizer(&settings, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(&tokenizer, &settings, this);
+        runChecks<CheckBufferOverrun>(tokenizer, this);
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(noerr1);
         TEST_CASE(noerr2);
         TEST_CASE(noerr3);
@@ -177,6 +161,8 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(array_index_72); // #11784
         TEST_CASE(array_index_73); // #11530
         TEST_CASE(array_index_74); // #11088
+        TEST_CASE(array_index_75);
+        TEST_CASE(array_index_76);
         TEST_CASE(array_index_multidim);
         TEST_CASE(array_index_switch_in_for);
         TEST_CASE(array_index_for_in_for);   // FP: #2634
@@ -191,6 +177,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(array_index_negative7);    // #5685
         TEST_CASE(array_index_negative8);    // #11651
         TEST_CASE(array_index_negative9);
+        TEST_CASE(array_index_negative10);
         TEST_CASE(array_index_for_decr);
         TEST_CASE(array_index_varnames);     // FP: struct member #1576, FN: #1586
         TEST_CASE(array_index_for_continue); // for,continue
@@ -238,12 +225,12 @@ 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_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
 
@@ -256,6 +243,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(pointer_out_of_bounds_2);
         TEST_CASE(pointer_out_of_bounds_3);
         TEST_CASE(pointer_out_of_bounds_4);
+        TEST_CASE(pointer_out_of_bounds_5); // #10227
         TEST_CASE(pointer_out_of_bounds_sub);
 
         TEST_CASE(strcat1);
@@ -282,6 +270,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
@@ -335,7 +324,7 @@ class TestBufferOverrun : public TestFixture {
               "        char str[50];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -357,7 +346,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    strcpy(buf, str);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -368,7 +357,7 @@ class TestBufferOverrun : public TestFixture {
               "    char data[1];\n"
               "    return abc.data[1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -378,7 +367,7 @@ class TestBufferOverrun : public TestFixture {
               "    char data[100];\n"
               "    const char *p = data + 100;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void sizeof3() {
@@ -390,7 +379,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct group *gr;\n"
               "    snprintf(group, 32, \"%u\", gr->gr_gid);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_1() {
@@ -400,14 +389,14 @@ class TestBufferOverrun : public TestFixture {
               "    str[15] = 0;\n"
               "    str[16] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'str[16]' accessed at index 16, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'str[16]' accessed at index 16, which is out of bounds.\n", errout.str());
+        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
         check("int f()\n"
@@ -417,7 +406,7 @@ class TestBufferOverrun : public TestFixture {
               "   y = x[ 4 ];\n"
               "   return y;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'x[3]' accessed at index 4, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -426,15 +415,15 @@ class TestBufferOverrun : public TestFixture {
               "   y = x[ 2 ];\n"
               "   return y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int x[5] = {0};\n"
               "int a = x[10];");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Array 'x[5]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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];");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Array 'x[5]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12]: (error) Array 'x[5]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
 
@@ -445,21 +434,21 @@ class TestBufferOverrun : public TestFixture {
               "    str[i] = 0;\n"
               "}\n"
               "void b() { a(16); }");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'str[16]' accessed at index 16, which is out of bounds.\n", errout.str());
+        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];");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Array '\"abc\"[4]' accessed at index 4, which is out of bounds.\n", errout.str());
+        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];");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char c = \"\\0abc\"[2];");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char c = L\"abc\"[4];");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Array 'L\"abc\"[4]' accessed at index 4, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:16]: (error) Array 'L\"abc\"[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_3() {
@@ -470,7 +459,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (i = 0; i < 100; i++)\n"
               "        sum += val[i];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'val[50]' accessed at index 99, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -479,7 +468,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (i = 1; i < 100; i++)\n"
               "        sum += val[i];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'val[50]' accessed at index 99, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -488,7 +477,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (i = a; i < 100; i++)\n"
               "        sum += val[i];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'val[50]' accessed at index 99, which is out of bounds.\n", errout.str());
+        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"
               "void foo(char *a)\n"
@@ -498,21 +487,21 @@ class TestBufferOverrun : public TestFixture {
               "    a[i]=0;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int argc)\n"
               "{\n"
               "  char a[2];\n"
               "  for (int i = 4; i < argc; i++){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a[10]) {\n"
               "    for (int i=0;i<50;++i) {\n"
               "        a[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[10]' accessed at index 49, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Array 'a[10]' accessed at index 49, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_6() {
@@ -526,7 +515,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC abc;\n"
               "    abc.str[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Array 'abc.str[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -538,7 +527,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC abc;\n"
               "    return abc.str[10];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Array 'abc.str[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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
         check("struct ABC\n"
@@ -551,7 +540,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[1] = 0;"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // This is not out of bounds because it is not a variable length array
         check("struct ABC\n"
@@ -565,7 +554,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[1] = 0;"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is not out of bounds because it is a variable length array
         // and the index is within the memory allocated.
@@ -580,7 +569,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[10] = 0;"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // This is out of bounds because it is outside the memory allocated.
         /** @todo this doesn't work because of a bug in sizeof(struct)  */
@@ -594,7 +583,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC* x = malloc(sizeof(struct ABC) + 10);\n"
               "    x->str[11] = 0;"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:9]: (error) Array 'str[1]' accessed at index 11, which is out of bounds.\n", "", errout.str());
+        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)
         check("struct ABC\n"
@@ -607,7 +596,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC* x = malloc(sizeof(ABC) + 10);\n"
               "    x->str[11] = 0;"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is out of bounds because it is outside the memory allocated
         /** @todo this doesn't work because of a bug in sizeof(struct) */
@@ -621,7 +610,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC* x = malloc(sizeof(struct ABC));\n"
               "    x->str[1] = 0;"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:9]: (error) Array 'str[1]' accessed at index 1, which is out of bounds.\n", "", errout.str());
+        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
         // But only if 'sizeof(ABC)' is 1 (No padding)
@@ -635,7 +624,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC* x = malloc(sizeof(ABC));\n"
               "    x->str[1] = 0;"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // This is out of bounds because it is not a variable array
         check("struct ABC\n"
@@ -648,7 +637,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC x;\n"
               "    x.str[1] = 0;"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Array 'x.str[1]' accessed at index 1, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -661,19 +650,19 @@ class TestBufferOverrun : public TestFixture {
               "    for ( unsigned int i = 0; i < 64; ++i )\n"
               "        f.str[i] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Array 'f.str[10]' accessed at index 63, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("union { char a[1]; int b; } ab;\n"
               "void f() {\n"
               "    ab.a[2] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'ab.a[1]' accessed at index 2, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (error) Array 'ab.a[1]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
 
@@ -687,7 +676,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    abc->str[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:13]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_11() {
@@ -706,7 +695,7 @@ class TestBufferOverrun : public TestFixture {
               "        abc->str[10] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:13]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:13:17]: (error) Array 'abc->str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_12() {
@@ -721,7 +710,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    str[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Array 'str[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -734,7 +723,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    return str[10];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Array 'str[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:15]: (error) Array 'str[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_13() {
@@ -747,7 +736,7 @@ class TestBufferOverrun : public TestFixture {
               "            int x = buf[i];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_14() {
@@ -757,7 +746,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i+10] = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[10]' accessed at index 19, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_15() {
@@ -767,7 +756,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 10; i++)\n"
               "        a[10+i] = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[10]' accessed at index 19, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_16() {
@@ -777,7 +766,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i+1] = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_17() {
@@ -787,7 +776,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i*2] = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[10]' accessed at index 18, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -795,7 +784,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 12; i+=6)\n"
               "        a[i+5] = i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -803,21 +792,21 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 12; i+=6)\n"
               "        a[i+6] = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[12]' accessed at index 12, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2]' accessed at index 2, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_18() {
@@ -830,7 +819,7 @@ class TestBufferOverrun : public TestFixture {
               "        i+=1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -841,7 +830,7 @@ class TestBufferOverrun : public TestFixture {
               "        i++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -852,7 +841,7 @@ class TestBufferOverrun : public TestFixture {
               "        ++i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -863,7 +852,7 @@ class TestBufferOverrun : public TestFixture {
               "        i=4;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'a[5]' accessed at index 5, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -874,7 +863,7 @@ class TestBufferOverrun : public TestFixture {
               "        i+=1;\n"
               "    }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Buffer overrun\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Buffer overrun\n", "", errout_str());
     }
 
     void array_index_19() {
@@ -884,7 +873,7 @@ class TestBufferOverrun : public TestFixture {
               "  char a[2];\n"
               "  char *end = &(a[2]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Getting more than one past the end is not legal
         check("void f()\n"
@@ -892,7 +881,7 @@ class TestBufferOverrun : public TestFixture {
               "  char a[2];\n"
               "  char *end = &(a[3]);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2]' accessed at index 3, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Array 'a[2]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_20() {
@@ -903,7 +892,7 @@ class TestBufferOverrun : public TestFixture {
               " for ( int i = 0; i < 9; i++ )\n"
               "  b[i] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_21() {
@@ -917,7 +906,7 @@ class TestBufferOverrun : public TestFixture {
               "  int b = indices[j];\n"
               " }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_22() {
@@ -925,7 +914,7 @@ class TestBufferOverrun : public TestFixture {
               "  size_t indices[2];\n"
               "  int b = indices[2];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'indices[2]' accessed at index 2, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:18]: (error) Array 'indices[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_23() {
@@ -934,77 +923,77 @@ class TestBufferOverrun : public TestFixture {
               "    char c[10];\n"
               "    c[1<<23]='a';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'c[10]' accessed at index 8388608, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'c[10]' accessed at index 8388608, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_24() {
         // ticket #1492 and #1539
         const std::string charMaxPlusOne(settings0.platform.defaultSign == 'u' ? "256" : "128");
-        check(("void f(char n) {\n"
-               "    int a[n];\n"     // n <= CHAR_MAX
-               "    a[-1] = 0;\n"    // negative index
-               "    a[" + charMaxPlusOne + "] = 0;\n"   // 128/256 > CHAR_MAX
-               "}\n").c_str());
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[" + charMaxPlusOne + "]' accessed at index -1, which is out of bounds.\n"
-                      "[test.cpp:4]: (error) Array 'a[" + charMaxPlusOne + "]' accessed at index " + charMaxPlusOne + ", which is out of bounds.\n", errout.str());
+        check("void f(char n) {\n"
+              "    int a[n];\n"     // n <= CHAR_MAX
+              "    a[-1] = 0;\n"    // negative index
+              "    a[" + charMaxPlusOne + "] = 0;\n"   // 128/256 > CHAR_MAX
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[" + charMaxPlusOne + "]' accessed at index -1, which is out of bounds. [negativeIndex]\n"
+                      "[test.cpp:4:6]: (error) Array 'a[" + charMaxPlusOne + "]' accessed at index " + charMaxPlusOne + ", which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f(signed char n) {\n"
               "    int a[n];\n"     // n <= SCHAR_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[128] = 0;\n"   // 128 > SCHAR_MAX
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[128]' accessed at index -1, which is out of bounds.\n"
-                      "[test.cpp:4]: (error) Array 'a[128]' accessed at index 128, which is out of bounds.\n", errout.str());
+        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());
 
         check("void f(unsigned char n) {\n"
               "    int a[n];\n"     // n <= UCHAR_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[256] = 0;\n"   // 256 > UCHAR_MAX
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[256]' accessed at index -1, which is out of bounds.\n"
-                      "[test.cpp:4]: (error) Array 'a[256]' accessed at index 256, which is out of bounds.\n", errout.str());
+        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());
 
         check("void f(short n) {\n"
               "    int a[n];\n"     // n <= SHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[32768] = 0;\n" // 32768 > SHRT_MAX
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[32768]' accessed at index -1, which is out of bounds.\n"
-                      "[test.cpp:4]: (error) Array 'a[32768]' accessed at index 32768, which is out of bounds.\n", errout.str());
+        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(unsigned short n) {\n"
               "    int a[n];\n"     // n <= USHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[65536] = 0;\n" // 65536 > USHRT_MAX
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[65536]' accessed at index -1, which is out of bounds.\n"
-                      "[test.cpp:4]: (error) Array 'a[65536]' accessed at index 65536, which is out of bounds.\n", errout.str());
+        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());
 
         check("void f(signed short n) {\n"
               "    int a[n];\n"     // n <= SHRT_MAX
               "    a[-1] = 0;\n"    // negative index
               "    a[32768] = 0;\n" // 32768 > SHRT_MAX
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[32768]' accessed at index -1, which is out of bounds.\n"
-                      "[test.cpp:4]: (error) Array 'a[32768]' accessed at index 32768, which is out of bounds.\n", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[2147483648]' accessed at index -1, which is out of bounds.\n", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[4294967296]' accessed at index -1, which is out of bounds.\n", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[2147483648]' accessed at index -1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'a[2147483648]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
     void array_index_25() { // #1536
@@ -1012,7 +1001,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "   long l[SOME_SIZE];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_26() {
@@ -1022,7 +1011,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 3; 0 <= i; i--)\n"
               "        a[i] = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[3]' accessed at index 3, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -1030,7 +1019,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 3; 0 <= i; i--)\n"
               "        a[i] = i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_27() {
@@ -1040,7 +1029,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 10; i++)\n"
               "        a[i-1] = a[i];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[10]' accessed at index -1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
     void array_index_28() {
@@ -1051,7 +1040,7 @@ class TestBufferOverrun : public TestFixture {
               "    int *ip = i + 1;\n"
               "    ip[-10] = 1;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Array ip[-10] out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Array ip[-10] out of bounds.\n", "", errout_str());
     }
 
     void array_index_29() {
@@ -1063,7 +1052,7 @@ class TestBufferOverrun : public TestFixture {
               "    int *ii = i + -5;"
               "    ii[10] = 0;"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Array ii[10] out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Array ii[10] out of bounds.\n", "", errout_str());
     }
 
     void array_index_30() {
@@ -1073,7 +1062,7 @@ class TestBufferOverrun : public TestFixture {
               "    UINT8 x[2];\n"
               "    x[5] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'x[2]' accessed at index 5, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:6]: (error) Array 'x[2]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_31() {
@@ -1090,7 +1079,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct s1 obj;\n"
               "    x(obj.delay, 123);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct s1 {\n"
               "    unknown_type_t delay[3];\n"
@@ -1106,7 +1095,7 @@ class TestBufferOverrun : public TestFixture {
               "}");
         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());
+                           errout_str());
 
         check("struct s1 {\n"
               "    float a[0];\n"
@@ -1115,7 +1104,7 @@ class TestBufferOverrun : public TestFixture {
               "void f() {\n"
               "    struct s1 *obj;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_32() {
@@ -1129,14 +1118,14 @@ class TestBufferOverrun : public TestFixture {
               "    }\n"
               "    int m_x[1];\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Array 'm_x[1]' accessed at index 1, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_34() { // ticket #3063
@@ -1145,8 +1134,8 @@ class TestBufferOverrun : public TestFixture {
               "    y[0][2][0] = 0;\n"
               "    y[0][0][2] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'y[2][2][2]' accessed at index y[0][2][0], which is out of bounds.\n"
-                      "[test.cpp:4]: (error) Array 'y[2][2][2]' accessed at index y[0][0][2], which is out of bounds.\n", errout.str());
+        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());
 
         check("struct TEST\n"
               "{\n"
@@ -1165,12 +1154,12 @@ class TestBufferOverrun : public TestFixture {
               "    ptest->b[10][2] = 4;\n"
               "    ptest->b[0][19] = 4;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Array 'test.a[10]' accessed at index 10, which is out of bounds.\n"
-                      "[test.cpp:10]: (error) Array 'test.b[10][5]' accessed at index test.b[10][2], which is out of bounds.\n"
-                      "[test.cpp:11]: (error) Array 'test.b[10][5]' accessed at index test.b[0][19], which is out of bounds.\n"
-                      "[test.cpp:14]: (error) Array 'ptest->a[10]' accessed at index 10, which is out of bounds.\n"
-                      "[test.cpp:15]: (error) Array 'ptest->b[10][5]' accessed at index ptest->b[10][2], which is out of bounds.\n"
-                      "[test.cpp:16]: (error) Array 'ptest->b[10][5]' accessed at index ptest->b[0][19], which is out of bounds.\n", errout.str());
+        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"
+                      "[test.cpp:14:13]: (error) Array 'ptest->a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n"
+                      "[test.cpp:15:13]: (error) Array 'ptest->b[10][5]' accessed at index ptest->b[10][2], which is out of bounds. [arrayIndexOutOfBounds]\n"
+                      "[test.cpp:16:13]: (error) Array 'ptest->b[10][5]' accessed at index ptest->b[0][19], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("struct TEST\n"
               "{\n"
@@ -1186,10 +1175,10 @@ class TestBufferOverrun : public TestFixture {
               "    ptest->a[9][5] = 4;\n"
               "    ptest->a[0][50] = 4;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Array 'test.a[10][5]' accessed at index test.a[9][5], which is out of bounds.\n"
-                      "[test.cpp:9]: (error) Array 'test.a[10][5]' accessed at index test.a[0][50], which is out of bounds.\n"
-                      "[test.cpp:12]: (error) Array 'ptest->a[10][5]' accessed at index ptest->a[9][5], which is out of bounds.\n"
-                      "[test.cpp:13]: (error) Array 'ptest->a[10][5]' accessed at index ptest->a[0][50], which is out of bounds.\n", errout.str());
+        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"
+                      "[test.cpp:13:13]: (error) Array 'ptest->a[10][5]' accessed at index ptest->a[0][50], which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_35() { // ticket #2889
@@ -1197,21 +1186,21 @@ class TestBufferOverrun : public TestFixture {
               "    struct Struct { unsigned m_Var[1]; } s;\n"
               "    s.m_Var[1] = 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 's.m_Var[1]' accessed at index 1, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 's.m_Var[1]' accessed at index 1, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_36() { // ticket #2960
@@ -1223,8 +1212,8 @@ class TestBufferOverrun : public TestFixture {
               "Fred::Fred(const Fred & rhs) {\n"
               "    m_b[2] = rhs.m_b[2];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Array 'm_b[2]' accessed at index 2, which is out of bounds.\n"
-                      "[test.cpp:7]: (error) Array 'rhs.m_b[2]' accessed at index 2, which is out of bounds.\n", errout.str());
+        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());
     }
 
     void array_index_37() {
@@ -1235,7 +1224,7 @@ class TestBufferOverrun : public TestFixture {
               "            i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_38() { //ticket #3273
@@ -1254,7 +1243,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_39() { // ticket 3387
@@ -1263,7 +1252,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    a[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_40() {
@@ -1272,7 +1261,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 10; ++i)\n"
               "        f2(&a[i + 1]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_41() {
@@ -1285,7 +1274,7 @@ class TestBufferOverrun : public TestFixture {
               "void b() {\n"
               "    struct Fred { char data[3]; } fred;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void a() {\n"
               "    struct Fred { char data[6]; } fred;\n"
@@ -1296,7 +1285,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct Fred { char data[3]; } fred;\n"
               "    fred.data[4] = 0;\n"  // <- error
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Array 'fred.data[3]' accessed at index 4, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:14]: (error) Array 'fred.data[3]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_42() { // ticket #3569
@@ -1307,7 +1296,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[10] = 7;\n"
               "  free(p);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'p[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -1315,7 +1304,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[10] = 7;\n"
               "  free(p);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'p[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -1324,7 +1313,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[9] = 9;\n"
               "  free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -1333,7 +1322,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[9] = 9;\n"
               "  delete [] p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -1342,7 +1331,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[9] = 9;\n"
               "  delete [] p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -1357,7 +1346,7 @@ class TestBufferOverrun : public TestFixture {
               "  p[9] = 9;\n"
               "  delete [] p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_43() { // #3838
@@ -1374,7 +1363,7 @@ class TestBufferOverrun : public TestFixture {
               "   y = var[ 0 ].arr[ 3 ];\n" // <-- array access out of bounds
               "   return y;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Array 'var[0].arr[3]' accessed at index 3, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -1388,7 +1377,7 @@ class TestBufferOverrun : public TestFixture {
               "   y = var[ 0 ].arr[ 2 ];\n"
               "   return y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("int f( ){\n"
@@ -1404,8 +1393,8 @@ class TestBufferOverrun : public TestFixture {
               "y=var.arr[ 3 ];\n"   // <-- array access out of bounds
               "return y;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Array 'var.arr[3]' accessed at index 3, which is out of bounds.\n"
-                      "[test.cpp:11]: (error) Array 'var.arr[3]' accessed at index 3, which is out of bounds.\n", errout.str());
+        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());
 
 
         check("void f( ) {\n"
@@ -1418,7 +1407,7 @@ class TestBufferOverrun : public TestFixture {
               "var[0].var[ 2 ] = 2;\n"
               "var[0].var[ 4 ] = 4;\n" // <-- array access out of bounds
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Array 'var[0].var[3]' accessed at index 4, which is out of bounds.\n", errout.str());
+        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"
               "struct S{\n"
@@ -1429,7 +1418,7 @@ class TestBufferOverrun : public TestFixture {
               "var[0].var[ 1 ] = 1;\n"
               "var[0].var[ 2 ] = 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // avoid FPs (modified examples taken from #3838)
         check("struct AB { int a[10]; int b[10]; };\n"
@@ -1438,7 +1427,7 @@ class TestBufferOverrun : public TestFixture {
               "    int * p = &ab.a[10];\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a[10]; int b[10]; };\n"
               "int main() {\n"
@@ -1446,7 +1435,7 @@ class TestBufferOverrun : public TestFixture {
               "    int * p = &ab[0].a[10];\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a[10]; int b[10]; };\n"
               "int main() {\n"
@@ -1454,7 +1443,7 @@ class TestBufferOverrun : public TestFixture {
               "    int * p = &ab[10].a[0];\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'ab[1]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Array 'ab[1]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_44() { // #3979 (false positive)
@@ -1468,7 +1457,7 @@ class TestBufferOverrun : public TestFixture {
               "        buf[i] = 1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -1478,7 +1467,7 @@ class TestBufferOverrun : public TestFixture {
               "        buf[i] = 2.;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_45() { // #4207 - handling of function with variable number of parameters / unnamed arguments
@@ -1491,7 +1480,7 @@ class TestBufferOverrun : public TestFixture {
               "    CHAR buffer[1024];\n"
               "    f(\"%s\", buffer);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unnamed argument
         check("void f(char *) {\n"
@@ -1501,7 +1490,7 @@ class TestBufferOverrun : public TestFixture {
               "    char buffer[1024];\n"
               "    f(buffer);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Two statement for-loop
@@ -1513,7 +1502,7 @@ class TestBufferOverrun : public TestFixture {
               "        printf(\"files(%i): %s\", 3-i, buffer[3-i]);\n"
               "    }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Array 'buffer[3]' accessed at index 3, which is out of bounds.\n", "", errout.str());
+        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"
               "    int buffer[9];\n"
@@ -1522,7 +1511,7 @@ class TestBufferOverrun : public TestFixture {
               "        buffer[i] = i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'buffer[9]' accessed at index 9, which is out of bounds.\n", errout.str());
+        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
         check("void f() {\n"
@@ -1531,7 +1520,7 @@ class TestBufferOverrun : public TestFixture {
               "        buffer[i] = i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_47() {
@@ -1541,7 +1530,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 2; i < 0; i++)\n"
               "        s[i] = 5;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_48() {
@@ -1554,7 +1543,7 @@ class TestBufferOverrun : public TestFixture {
               "        array[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'array[4]' accessed at index 4, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -1564,7 +1553,7 @@ class TestBufferOverrun : public TestFixture {
               "        array[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_49() {
@@ -1578,7 +1567,7 @@ class TestBufferOverrun : public TestFixture {
               "    }\n"
               "    arr[k];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_50() {
@@ -1590,7 +1579,7 @@ class TestBufferOverrun : public TestFixture {
               "    f(\"12345678\");\n"
               "    f(\"12345\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_51() {
@@ -1598,7 +1587,7 @@ class TestBufferOverrun : public TestFixture {
               "    int k=0, dd, d[1U] = {1};\n"
               "    for (dd=d[k]; k<10; dd=d[++k]){;}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'd[1]' accessed at index 1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:29]: (error) Array 'd[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_52() {
@@ -1609,7 +1598,7 @@ class TestBufferOverrun : public TestFixture {
               "       buf[i] = 0;\n"
               "    return buf[0];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:11]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_53() {
@@ -1621,7 +1610,7 @@ class TestBufferOverrun : public TestFixture {
               "        for (int j = 0; j < 3; j++)\n"
               "             M[i][j]=0.0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Array 'M[3][1]' accessed at index M[*][2], which is out of bounds.\n", errout.str());
+        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());
     }
 
     void array_index_54() {
@@ -1635,7 +1624,7 @@ class TestBufferOverrun : public TestFixture {
               "        b[i+1] = 0;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_55() {
@@ -1652,7 +1641,7 @@ class TestBufferOverrun : public TestFixture {
               "void f2() {\n"
               "    make(\"false\");\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_56() {
@@ -1664,7 +1653,7 @@ class TestBufferOverrun : public TestFixture {
               "    foo.array[foo.index++] = 1;\n"
               "    if (foo.index == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_57() {
@@ -1678,7 +1667,7 @@ class TestBufferOverrun : public TestFixture {
               "        x = c;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    int a[3] = { 1, 2, 3 };\n"
@@ -1691,8 +1680,8 @@ class TestBufferOverrun : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:6] -> [test.cpp:5]: (warning) Either the condition 'i==4' is redundant or the array 'a[3]' is accessed at index 3, which is out of bounds.\n",
-            errout.str());
+            "[test.cpp:6:15] -> [test.cpp:5:18]: (warning) Either the condition 'i==4' is redundant or the array 'a[3]' is accessed at index 3, which is out of bounds. [arrayIndexOutOfBoundsCond]\n",
+            errout_str());
     }
 
     void array_index_58()
@@ -1706,8 +1695,26 @@ class TestBufferOverrun : public TestFixture {
               "    return y;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:6]: (warning) Either the condition 'x<2' is redundant or the array 'a[3]' is accessed at index 3, which is out of bounds.\n",
-            errout.str());
+            "[test.cpp:3:9] -> [test.cpp:6:14]: (warning) Either the condition 'x<2' is redundant or the array 'a[3]' is accessed at index 3, which is out of bounds. [arrayIndexOutOfBoundsCond]\n",
+            errout_str());
+
+        check("void f() {\n" // #2199
+              "    char a[5];\n"
+              "    for (int i = 0; i < 5; i++) {\n"
+              "        i += 8;\n"
+              "        a[i] = 0;\n"
+              "    }\n"
+              "}\n"
+              "void g() {\n"
+              "    char a[5];\n"
+              "    for (int i = 0; i < 5; i++) {\n"
+              "        a[i + 7] = 0;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:5:10]: (error) Array 'a[5]' accessed at index 8, which is out of bounds. [arrayIndexOutOfBounds]\n"
+            "[test.cpp:11:10]: (error) Array 'a[5]' accessed at index 11, which is out of bounds. [arrayIndexOutOfBounds]\n",
+            errout_str());
     }
 
     void array_index_59() // #10413
@@ -1719,7 +1726,7 @@ class TestBufferOverrun : public TestFixture {
               "    return 0;\n"
               "  return a[b];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "    const int S[2] = {};\n"
@@ -1729,13 +1736,13 @@ class TestBufferOverrun : public TestFixture {
               "        else if (S[b] > S[a]) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int a[2] = {};\n"
               "void f(int i) {\n"
               "    g(i < 0 ? 0 : a[i]);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_60()
@@ -1748,7 +1755,7 @@ class TestBufferOverrun : public TestFixture {
                "      i = A[i];\n"
                "  return i;\n"
                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkP("#define ASSERT(expression, action) if (expression) {action;}\n"
                "int array[5];\n"
@@ -1757,8 +1764,8 @@ class TestBufferOverrun : public TestFixture {
                "    array[index]++;\n"
                "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:5]: (warning) Either the condition 'index>5' is redundant or the array 'array[5]' is accessed at index 5, which is out of bounds.\n",
-            errout.str());
+            "[test.cpp:4:5] -> [test.cpp:5:10]: (warning) Either the condition 'index>5' is redundant or the array 'array[5]' is accessed at index 5, which is out of bounds. [arrayIndexOutOfBoundsCond]\n",
+            errout_str());
     }
 
     void array_index_61()
@@ -1771,7 +1778,7 @@ class TestBufferOverrun : public TestFixture {
               "    return 0; \n"
               "  return M[i];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { enum E { e0 }; };\n"
               "const S::E M[4] = { S::E:e0, S::E:e0, S::E:e0, S::E:e0 };\n"
@@ -1782,7 +1789,7 @@ class TestBufferOverrun : public TestFixture {
               "	  return 0;\n"
               "  return M[i]; \n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_62()
@@ -1796,8 +1803,8 @@ class TestBufferOverrun : public TestFixture {
               "       buf[i] = 0;\n"
               "    return buf[0];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:7:11]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n",
+                      errout_str());
     }
 
     void array_index_63()
@@ -1809,7 +1816,7 @@ class TestBufferOverrun : public TestFixture {
               "    if (i >= 0 && i < sizeof(b) / sizeof((b)[0]))\n"
               "        b[i] = 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_64() // #10878
@@ -1822,7 +1829,7 @@ class TestBufferOverrun : public TestFixture {
               "    Array array = {};\n"
               "    array.accessArrayRef(10);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'x[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:42]: (error) Array 'x[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("int i = 10;\n"
               "struct Array {\n"
@@ -1833,7 +1840,7 @@ class TestBufferOverrun : public TestFixture {
               "    Array array = {};\n"
               "    array.accessArrayRef(i);\n"
               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Array 'x[10]' accessed at index 10, which is out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3:42]: (error) Array 'x[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", "", errout_str());
     }
 
     void array_index_65() // #11066
@@ -1845,7 +1852,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (j = 0; j < 2; j++)\n"
               "        c[j] = f[P[j] - 1];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_66()
@@ -1858,8 +1865,8 @@ class TestBufferOverrun : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:5]: (warning) Either the condition 'j>=256' is redundant or the array 'offsets[256]' is accessed at index 256, which is out of bounds.\n",
-            errout.str());
+            "[test.cpp:4:15] -> [test.cpp:5:16]: (warning) Either the condition 'j>=256' is redundant or the array 'offsets[256]' is accessed at index 256, which is out of bounds. [arrayIndexOutOfBoundsCond]\n",
+            errout_str());
     }
 
     void array_index_67() {
@@ -1878,7 +1885,7 @@ class TestBufferOverrun : public TestFixture {
               "        type_cnt++;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_68() { // #6655
@@ -1891,7 +1898,7 @@ class TestBufferOverrun : public TestFixture {
               "    f(20);\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'ia[10]' accessed at index 19, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (error) Array 'ia[10]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     // #6370
@@ -1903,7 +1910,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(int i = 0; i < 4; ++i)\n"
               "      a[e[i]] = 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[4]' accessed at index 30, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:8]: (error) Array 'a[4]' accessed at index 30, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     // #11355
@@ -1912,7 +1919,7 @@ class TestBufferOverrun : public TestFixture {
               "    static const char a[] = ((\"test\"));\n"
               "    printf(\"%c\", a[5]);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[5]' accessed at index 5, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Array 'a[5]' accessed at index 5, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     // #11461
@@ -1925,7 +1932,7 @@ class TestBufferOverrun : public TestFixture {
               "  int arr[64] = { 0 };\n"
               "  return arr[Idx];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #11784
@@ -1940,7 +1947,7 @@ class TestBufferOverrun : public TestFixture {
               "  }\n"
               "  return d[3];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #11530
@@ -1951,7 +1958,7 @@ class TestBufferOverrun : public TestFixture {
               "  std::function<void(int)> a[1] = {};\n"
               "  a[k++](0);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #11088
@@ -1966,7 +1973,39 @@ class TestBufferOverrun : public TestFixture {
               "void bar() {\n"
               "  foo(\"q\");\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    // #1644
+    void array_index_75()
+    {
+        check("void f() {\n"
+              "    char buf[10];\n"
+              "    int i = 10;\n"
+              "    while (i >= 3)\n"
+              "        buf[i--] = 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
+    }
+
+    // #12592
+    void array_index_76()
+    {
+        check("void cb0(void*, int i) {\n"
+              "    const char s[] = \"\";\n"
+              "    (void)s[i];\n"
+              "}\n"
+              "void cb1(int i, void*) {\n"
+              "    const char s[] = \"\";\n"
+              "    (void)s[i];\n"
+              "}\n"
+              "void f() {\n"
+              "    cb0(nullptr, 1);\n"
+              "    cb1(1, nullptr);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Array 's[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n"
+                      "[test.cpp:7:12]: (error) Array 's[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n",
+                      errout_str());
     }
 
     void array_index_multidim() {
@@ -1975,87 +2014,87 @@ class TestBufferOverrun : public TestFixture {
               "  char a[2][2];\n"
               "  a[1][1] = 'a';\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2][2];\n"
               "  a[1][1][1] = 'a';\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "  char a[2][2];\n"
               "  a[2][1] = 'a';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2][2]' accessed at index a[2][1], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2][2]' accessed at index a[1][2], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2][2][2]' accessed at index a[2][1][1], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2][2][2]' accessed at index a[1][2][1], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2][2][2][2]' accessed at index a[1][2][1][1], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[2][2][2]' accessed at index a[1][1][2], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[10][10][10]' accessed at index a[6][12][2], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[10][10][10]' accessed at index a[6][40][10], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[1][1][1]' accessed at index a[2][2][2], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[6][6][6]' accessed at index a[6][6][2], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unknown dim..
         check("void f()\n"
@@ -2063,7 +2102,7 @@ class TestBufferOverrun : public TestFixture {
               "  int a[2][countof(x)] = {{1,2},{3,4}};\n"
               "  a[0][0] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void draw_quad(float z)  {\n"
               "    int i;\n"
@@ -2085,7 +2124,7 @@ class TestBufferOverrun : public TestFixture {
               "        vertices[i][1][3] = 5.0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             check("int foo() {\n"
@@ -2094,7 +2133,7 @@ class TestBufferOverrun : public TestFixture {
                   "  extern int stuff[A][B];\n"
                   "  return stuff[0][1];\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             // TODO: better handling of VLAs in symboldatabase. should be
             //       possible to use ValueFlow values.
@@ -2104,7 +2143,7 @@ class TestBufferOverrun : public TestFixture {
                   "  extern int stuff[A][B];\n"
                   "  return stuff[0][1];\n"
                   "}");
-            TODO_ASSERT_EQUALS("error", "", errout.str());
+            TODO_ASSERT_EQUALS("error", "", errout_str());
         }
     }
 
@@ -2125,7 +2164,7 @@ class TestBufferOverrun : public TestFixture {
               "  };\n"
               " }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -2143,7 +2182,7 @@ class TestBufferOverrun : public TestFixture {
               "  };\n"
               " }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:12]: (error) Array index out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:12]: (error) Array index out of bounds.\n", "", errout_str());
     }
 
     void array_index_for_in_for() {
@@ -2155,7 +2194,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_bounds() {
@@ -2165,9 +2204,9 @@ class TestBufferOverrun : public TestFixture {
               "  if (i >= 0 && i < 10) {}\n"
               "  a[i] = 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'i<10' is redundant or the array 'a[10]' is accessed at index 10, which is out of bounds.\n"
-                      "[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'i>=0' is redundant or the array 'a[10]' is accessed at index -1, which is out of bounds.\n",
-                      errout.str());
+        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());
     }
 
     void array_index_calculation() {
@@ -2179,7 +2218,7 @@ class TestBufferOverrun : public TestFixture {
               "        data[i/2] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'data[8]' accessed at index 17, which is out of bounds.\n", errout.str());
+        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
         check("void f()\n"
@@ -2189,7 +2228,7 @@ class TestBufferOverrun : public TestFixture {
               "        arr[i + 7] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'arr[5]' accessed at index 11, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'arr[5]' accessed at index 11, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_negative1() {
@@ -2199,21 +2238,21 @@ class TestBufferOverrun : public TestFixture {
               "    char data[8];\n"
               "    data[-1] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'data[8]' accessed at index -1, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'data[8][4]' accessed at index data[*][-1], which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -2221,14 +2260,14 @@ class TestBufferOverrun : public TestFixture {
               "    char *p = s + strlen(s);\n"
               "    if (p[-1]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_negative2() { // ticket #3063
@@ -2237,7 +2276,7 @@ class TestBufferOverrun : public TestFixture {
               "    TEST test;\n"
               "    test.a[-1] = 3;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'test.a[10]' accessed at index -1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (error) Array 'test.a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
     void array_index_negative3() {
@@ -2253,7 +2292,7 @@ class TestBufferOverrun : public TestFixture {
               "    if( i == 0 )\n"
               "        return f(i);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_negative4()
@@ -2264,7 +2303,7 @@ class TestBufferOverrun : public TestFixture {
               "    for(i=0; i <16; ++i){}\n"
               "    for(; i < 24; ++i){ buf[i] = buf[i-16];}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_negative5() // #10526
@@ -2282,7 +2321,7 @@ class TestBufferOverrun : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #11349
@@ -2295,7 +2334,7 @@ class TestBufferOverrun : public TestFixture {
               "  (void)a[k];\n"
               "  if (i == -3) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #5685
@@ -2307,7 +2346,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (; i < 5; i++)\n"
               "        a[i] = 1;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[5]' accessed at index -9, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[5]' accessed at index -9, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
     // #11651
@@ -2320,7 +2359,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = u, j = sizeof(i); --i >= 0;)\n"
               "        char c = buf[i];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #8075
@@ -2335,7 +2374,21 @@ class TestBufferOverrun : public TestFixture {
               "    int a[] = { 1, 2, 3 };\n"
               "    printf(\"%d\\n\", a[g(4)]);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Array 'a[3]' accessed at index -1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:21]: (error) Array 'a[3]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
+    }
+
+    // #11844
+    void array_index_negative10()
+    {
+        check("struct S { int a[4]; };\n"
+              "void f(S* p, int k) {\n"
+              "  int m = 3;\n"
+              "  if (k)\n"
+              "    m = 2;\n"
+              "  for (int j = m + 1; j <= 4; j++)\n"
+              "    p->a[j-1];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_for_decr() {
@@ -2346,7 +2399,7 @@ class TestBufferOverrun : public TestFixture {
               "        data[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'data[8]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -2355,7 +2408,7 @@ class TestBufferOverrun : public TestFixture {
               "        val[i+1] = val[i];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -2364,8 +2417,8 @@ class TestBufferOverrun : public TestFixture {
               "        val[i+1] = val[i];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'val[5]' accessed at index -9994, which is out of bounds.\n"
-                      "[test.cpp:5]: (error) Array 'val[5]' accessed at index -9995, which is out of bounds.\n", errout.str());
+        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());
     }
 
 
@@ -2382,7 +2435,7 @@ class TestBufferOverrun : public TestFixture {
               "    a.data[3] = 0;\n"
               "    a.b.data[2] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #1586
         check("struct A {\n"
@@ -2397,8 +2450,8 @@ class TestBufferOverrun : public TestFixture {
               "    a.data[4] = 0;\n"
               "    a.b.data[3] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Array 'a.data[4]' accessed at index 4, which is out of bounds.\n"
-                      "[test.cpp:11]: (error) Array 'a.b.data[3]' accessed at index 3, which is out of bounds.\n", errout.str());
+        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());
     }
 
     void array_index_for_andand_oror() {  // #3907 - using && or ||
@@ -2411,7 +2464,7 @@ class TestBufferOverrun : public TestFixture {
               "        data[x] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'data[2]' accessed at index 9, which is out of bounds.\n", errout.str());
+        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"
               "    char data[2];\n"
@@ -2420,7 +2473,7 @@ class TestBufferOverrun : public TestFixture {
               "        data[x] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'data[2]' accessed at index 9, which is out of bounds.\n", errout.str());
+        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"
               "    char data[2];\n"
@@ -2429,7 +2482,7 @@ class TestBufferOverrun : public TestFixture {
               "        data[x] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'data[2]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "    char data[2];\n"
@@ -2438,7 +2491,7 @@ class TestBufferOverrun : public TestFixture {
               "        data[x] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'data[2]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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
               "    int i, c;\n"
@@ -2449,8 +2502,8 @@ class TestBufferOverrun : public TestFixture {
               "            c++;\n"
               "     }\n"
               "    return c;\n"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_for_continue() {
@@ -2464,7 +2517,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i - 1] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int maybe();
         check("void f() {\n"
@@ -2476,7 +2529,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i - 1] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Array 'a[2]' accessed at index -1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:10]: (error) Array 'a[2]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
     void array_index_for() {
@@ -2489,7 +2542,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'a[10]' accessed at index 19, which is out of bounds.\n", errout.str());
+        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
         check("void f() {\n"
@@ -2501,7 +2554,7 @@ class TestBufferOverrun : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #3893 - start value out of bounds
         // extracttests.start: int maybe(); int dostuff();
@@ -2511,7 +2564,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         // #7686
         check("char f() {\n"
@@ -2521,7 +2574,20 @@ class TestBufferOverrun : public TestFixture {
               "        buf[i] = 0;\n"
               "    return buf[0];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'buf[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    const int a[10] = {};\n"
+              "    for (int n = 0; 1; ++n) {\n"
+              "        if (a[n] < 1) {\n"
+              "            switch (a[n]) {\n"
+              "            case 0:\n"
+              "                break;\n"
+              "            }\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:14]: (error) Array 'a[10]' accessed at index 9998, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_for_neq() {
@@ -2532,8 +2598,8 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[5]' accessed at index 9, which is out of bounds.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'a[5]' accessed at index 9, which is out of bounds. [arrayIndexOutOfBounds]\n",
+                      errout_str());
     }
 
     void array_index_for_question() {
@@ -2544,7 +2610,7 @@ class TestBufferOverrun : public TestFixture {
               "        i == 0 ? 0 : a[i-1];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[10];\n"
@@ -2552,8 +2618,8 @@ class TestBufferOverrun : public TestFixture {
               "        some_condition ? 0 : a[i-1];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'a[10]' accessed at index -1, which is out of bounds.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:31]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    int a[10];\n"
@@ -2562,7 +2628,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i-1] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'a[10]' accessed at index -1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
     void array_index_for_varid0() { // #4228: No varid for counter variable
@@ -2570,7 +2636,7 @@ class TestBufferOverrun : public TestFixture {
               "   char a[10];\n"
               "   for (i=0; i<10; i++);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_vla_for() {
@@ -2581,14 +2647,14 @@ class TestBufferOverrun : public TestFixture {
               "        a[0] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_extern() {
         // Ticket #1684. FP when using 'extern'.
         check("extern char arr[15];\n"
               "char arr[15] = \"abc\";");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_cast() {
@@ -2602,7 +2668,7 @@ class TestBufferOverrun : public TestFixture {
               "    int x[2];\n"
               "    f1(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Same type => error
         check("void f1(const char buf[]) {\n"
@@ -2614,7 +2680,7 @@ class TestBufferOverrun : public TestFixture {
               "}");
         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());
+                           errout_str());
     }
 
     void array_index_string_literal() {
@@ -2622,41 +2688,41 @@ class TestBufferOverrun : public TestFixture {
               "    const char *str = \"abc\";\n"
               "    bar(str[10]);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'str[4]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'str[4]' accessed at index 4, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char *str = \"a\tc\";\n"
               "    bar(str[4]);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'str[4]' accessed at index 4, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
-              "}", settings0, "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n" // #11020
               "    const char* p = (x == 0 ? \"12345\" : \"ABC\");\n"
@@ -2665,7 +2731,7 @@ class TestBufferOverrun : public TestFixture {
               "        s += p[i];\n"
               "    return s;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_same_struct_and_var_name() {
@@ -2678,7 +2744,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct tt *tt=x;\n"
               "    tt->name;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // detect error
         check("struct tt {\n"
@@ -2689,7 +2755,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct tt *tt=x;\n"
               "    tt->name[22] = 123;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Array 'tt->name[21]' accessed at index 22, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:13]: (error) Array 'tt->name[21]' accessed at index 22, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_valueflow() {
@@ -2698,7 +2764,7 @@ class TestBufferOverrun : public TestFixture {
               "    str[i] = 0;\n"
               "    if (i==10) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition 'i==10' is redundant or the array 'str[3]' is accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "    char str[3];\n"
@@ -2707,31 +2773,31 @@ class TestBufferOverrun : public TestFixture {
               "    case 10: break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (warning) Either the switch case 'case 10' is redundant or the array 'str[3]' is accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
-              "}", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"  // #5416 FP
               "    char *str[3];\n"
               "    do_something(&str[0][5]);\n"
-              "}", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("class X { static const int x[100]; };\n" // #6070
               "const int X::x[100] = {0};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace { class X { static const int x[100]; };\n" // #6232
               "const int X::x[100] = {0}; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class ActorSprite { static ImageSet * targetCursorImages[2][10]; };\n"
               "ImageSet *ActorSprite::targetCursorImages[2][10];");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::size_t s) {\n" // #10130
               "    const char a[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };\n"
@@ -2740,8 +2806,20 @@ class TestBufferOverrun : public TestFixture {
               "int g() {\n"
               "    return f(16);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 's>sizeof(a)' is redundant or the array 'a[16]' is accessed at index 16, which is out of bounds.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:15] -> [test.cpp:3:41]: (warning) Either the condition 's>sizeof(a)' is redundant or the array 'a[16]' is accessed at index 16, which is out of bounds. [arrayIndexOutOfBoundsCond]\n",
+                      errout_str());
+
+        check("void f(int fd) {\n" // #12318
+              "    char buf[10];\n"
+              "    int size = 0;\n"
+              "    int pos = -1;\n"
+              "    do {\n"
+              "        pos++;\n"
+              "        size = read(fd, &buf[pos], 1);\n"
+              "    } while (size > 0);\n"
+              "    buf[pos] = '\\0';\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -2751,7 +2829,7 @@ class TestBufferOverrun : public TestFixture {
               "  int *p = a;\n"
               "  p[20] = 0;\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());
+        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());
 
         {
             // address of
@@ -2760,14 +2838,14 @@ class TestBufferOverrun : public TestFixture {
                   "  int *p = a;\n"
                   "  p[10] = 0;\n"
                   "}");
-            TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Array 'a[10]' accessed at index 10, which is out of bounds.\n", "", errout.str());
+            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"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         check("void f() {\n"
@@ -2775,33 +2853,33 @@ class TestBufferOverrun : public TestFixture {
               "  int *p = a;\n"
               "  p[20] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int a[2];\n"
               "  char *p = (char *)a;\n" // cast
               "  p[4] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Array 'a[10]' accessed at index 20, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char a[10]) {\n"
               "  a[0] = 0;\n"
               "  a[-1] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'a[10]' accessed at index -1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:4]: (error) Array 'a[10]' accessed at index -1, which is out of bounds. [negativeIndex]\n", errout_str());
     }
 
     void array_index_enum_array() { // #8439
@@ -2810,7 +2888,7 @@ class TestBufferOverrun : public TestFixture {
               "    E arrE[] = { e1, e2 };\n"
               "    arrE[sizeof(arrE)] = e1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'arrE[2]' accessed at index 8, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (error) Array 'arrE[2]' accessed at index 8, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void array_index_container() { // #9386
@@ -2818,7 +2896,7 @@ class TestBufferOverrun : public TestFixture {
               "void foo(std::array<uint8_t, blockLen * 2>& a) {\n"
               "    a[2] = 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_two_for_loops() {
@@ -2832,7 +2910,7 @@ class TestBufferOverrun : public TestFixture {
               "    if (i < 50)\n"
               "        sum -= val[i];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool b();\n"
               "void f()\n"
@@ -2846,7 +2924,7 @@ class TestBufferOverrun : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool b();\n"
               "void f()\n"
@@ -2858,7 +2936,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (; i < 50; i++)\n"
               "        sum -= val[i];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_new() { // #7690
@@ -2868,7 +2946,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = 0;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[1]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[1]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    int* z = new int(1);\n"
@@ -2876,7 +2954,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = 0;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[1]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[1]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    int* z = new int{};\n"
@@ -2884,7 +2962,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = 0;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[1]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[1]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    int* z = new int[5];\n"
@@ -2892,7 +2970,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = 0;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[5]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[5]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void g() {\n"
               "    int* z = new int[5]();\n"
@@ -2900,7 +2978,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = 1;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[5]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[5]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void h() {\n"
               "    int** z = new int* [5];\n"
@@ -2908,7 +2986,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = nullptr;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[5]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[5]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void h() {\n"
               "    int** z = new int* [5]();\n"
@@ -2916,7 +2994,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = nullptr;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[5]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[5]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void h() {\n"
               "    int** z = new int* [5]{};\n"
@@ -2924,7 +3002,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = nullptr;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[5]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[5]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
 
         check("void h() {\n"
               "    int** z = new int* [5]{ 0 };\n"
@@ -2932,7 +3010,7 @@ class TestBufferOverrun : public TestFixture {
               "        z[n] = nullptr;\n"
               "    delete[] z;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'z[5]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Array 'z[5]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_2_struct() {
@@ -2945,7 +3023,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    strcpy( abc->str, \"abcdef\" );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Buffer is accessed out of bounds: abc->str\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc->str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
               "{\n"
@@ -2957,7 +3035,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct ABC abc;\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Buffer is accessed out of bounds: abc.str\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct ABC\n"
               "{\n"
@@ -2968,7 +3046,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Buffer is accessed out of bounds: abc.str\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("static void f()\n"
               "{\n"
@@ -2978,7 +3056,7 @@ class TestBufferOverrun : public TestFixture {
               "    } abc;\n"
               "    strcpy( abc.str, \"abcdef\" );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Buffer is accessed out of bounds: abc.str\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:16]: (error) Buffer is accessed out of bounds: abc.str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("static void f()\n"
               "{\n"
@@ -2990,7 +3068,7 @@ class TestBufferOverrun : public TestFixture {
               "    strcpy( abc->str, \"abcdef\" );\n"
               "    free(abc);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Buffer is accessed out of bounds: abc->str\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:16]: (error) Buffer is accessed out of bounds: abc->str [bufferAccessOutOfBounds]\n", errout_str());
     }
 
 
@@ -3003,11 +3081,11 @@ class TestBufferOverrun : public TestFixture {
               "    for (i = 0; i <= 10; ++i)\n"
               "        a[i] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Array 'a[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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
               "int f() { return e[1].b; }\n");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Array 'e[1]' accessed at index 1, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (error) Array 'e[1]' accessed at index 1, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
 
@@ -3018,7 +3096,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; i < 8; ++i)\n"
               "        p[i] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'p[2]' accessed at index 7, which is out of bounds.\n", errout.str());
+        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
         check("void foo(int x, int y)\n"
@@ -3027,7 +3105,7 @@ class TestBufferOverrun : public TestFixture {
               "    const char *s = y + p[1];\n"
               "    p[1] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // There is no error here
         check("void f1(char *s,int size)\n"
@@ -3039,7 +3117,7 @@ class TestBufferOverrun : public TestFixture {
               "  char s[3];\n"
               "  f1(s,20);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout.str());
+        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"
               "{\n"
@@ -3050,7 +3128,7 @@ class TestBufferOverrun : public TestFixture {
               "  char s[3];\n"
               "  f1(s,3);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_5() {
@@ -3060,7 +3138,7 @@ class TestBufferOverrun : public TestFixture {
               "    sprintf(n, \"d\");\n"
               "    printf(\"hello!\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_6() {
@@ -3070,7 +3148,21 @@ class TestBufferOverrun : public TestFixture {
               "   strcat(n, \"abc\");\n"
               "   strcat(n, \"def\");\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: n\n", "", errout.str());
+        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"
+              "}");
+        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"
+              "}");
+        TODO_ASSERT_EQUALS("[test.cpp:4:11]: (error) Buffer is accessed out of bounds: d [bufferAccessOutOfBounds]\n", "", errout_str());
     }
 
     void buffer_overrun_7() {
@@ -3080,7 +3172,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[2];\n"
               "    strcpy(a, \"a\\0\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_8() {
@@ -3093,7 +3185,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -3103,7 +3195,7 @@ class TestBufferOverrun : public TestFixture {
               "        a[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_9() {
@@ -3117,7 +3209,7 @@ class TestBufferOverrun : public TestFixture {
               "        i += 100;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_10() {
@@ -3130,7 +3222,7 @@ class TestBufferOverrun : public TestFixture {
               "        char b = a[i];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_11() {
@@ -3141,7 +3233,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -3150,7 +3242,7 @@ class TestBufferOverrun : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_15() { // ticket #1787
@@ -3162,7 +3254,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    strcpy(val, \"ab\") ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Buffer is accessed out of bounds: val\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:12]: (error) Buffer is accessed out of bounds: val [bufferAccessOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_16() {
@@ -3171,20 +3263,20 @@ class TestBufferOverrun : public TestFixture {
               "    struct Foo foo[5];\n"
               "    memset(foo, 0, sizeof(foo));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"  // ticket #2093
               "    gchar x[3];\n"
               "    strcpy(x, \"12\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("extern char a[10];\n"
               "void f() {\n"
               "    char b[25] = {0};\n"
               "    std::memcpy(b, a, 10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_18() { // ticket #2576
@@ -3198,7 +3290,7 @@ class TestBufferOverrun : public TestFixture {
               "        b[i] = b[i+1];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "    void foo();\n"
@@ -3210,7 +3302,7 @@ class TestBufferOverrun : public TestFixture {
               "        b[i] = b[i+1];\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Array 'b[7]' accessed at index 7, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:17]: (error) Array 'b[7]' accessed at index 7, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_19() { // #2597 - class member with unknown type
@@ -3223,7 +3315,7 @@ class TestBufferOverrun : public TestFixture {
               "A::A() {\n"
               "    memset(buf, 0, 10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_21() {
@@ -3234,7 +3326,7 @@ class TestBufferOverrun : public TestFixture {
               "    for (size_t i = 0; i <= 4; i++)\n"
               "        dst[i] = src[i];\n"
               "} } }");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'dst[4]' accessed at index 4, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12]: (error) Array 'dst[4]' accessed at index 4, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_24() { // index variable is changed in for-loop
@@ -3246,7 +3338,7 @@ class TestBufferOverrun : public TestFixture {
               "      x += array[i];\n"
               "       i++;  }\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         // ticket #4096
         check("void main() {\n"
@@ -3256,7 +3348,7 @@ class TestBufferOverrun : public TestFixture {
               "      x += array[i++];\n"
               "   }\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void buffer_overrun_26() { // ticket #4432 (segmentation fault)
@@ -3267,7 +3359,7 @@ class TestBufferOverrun : public TestFixture {
               "    split(inbuf, f, 10, \"\t\t\");\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_27() { // ticket #4444 (segmentation fault)
@@ -3277,7 +3369,7 @@ class TestBufferOverrun : public TestFixture {
               "abc(x);\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #7083: false positive: typedef and initialization with strings
@@ -3287,7 +3379,7 @@ class TestBufferOverrun : public TestFixture {
               "  testChar tc1 = \"\";\n"
               "  tc1[5]='a';\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -3297,14 +3389,14 @@ class TestBufferOverrun : public TestFixture {
               "int f(S * s) {\n"
               "    return s->m[sizeof(s->m)];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 's->m[9]' accessed at index 36, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_32() {
@@ -3315,7 +3407,7 @@ class TestBufferOverrun : public TestFixture {
               "    (void)strxfrm(dest,src,1);\n"
               "    (void)strxfrm(dest,src,2);\n"// <<
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: dest\n", errout.str());
+        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"
               "    const char src[3] = \"abc\";\n"
@@ -3324,7 +3416,24 @@ class TestBufferOverrun : public TestFixture {
               "    (void)strxfrm(dest,src,2);\n"
               "    (void)strxfrm(dest,src,3);\n" // <<
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Buffer is accessed out of bounds: dest\n", errout.str());
+        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"
+              "    const char src[2] = \"ab\";\n"
+              "    char dest[3] = \"abc\";\n"
+              "    (void)strxfrm(dest,src,1);\n"
+              "    (void)strxfrm(dest,src,2);\n"
+              "    (void)strxfrm(dest,src,3);\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"
+              "    const char src[1] = \"a\";\n"
+              "    char dest[3] = \"abc\";\n"
+              "    (void)strxfrm(dest,src,1);\n"
+              "    (void)strxfrm(dest,src,2);\n" // <<
+              "}");
+        ASSERT_EQUALS("[test.cpp:5:24]: (error) Buffer is accessed out of bounds: src [bufferAccessOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_33() { // #2019
@@ -3335,7 +3444,7 @@ class TestBufferOverrun : public TestFixture {
               "          z[i] = 0;\n"
               "   return z[0];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'z[16]' accessed at index 19, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Array 'z[16]' accessed at index 19, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void buffer_overrun_34() { // #11035
@@ -3349,7 +3458,7 @@ class TestBufferOverrun : public TestFixture {
               "        return a[i];\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_35() { // #2304
@@ -3359,7 +3468,7 @@ class TestBufferOverrun : public TestFixture {
               "    strcpy(p, q);\n"
               "    free(p);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Buffer is accessed out of bounds: p [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f() {\n"
               "    char* q = \"0123456789\";\n"
@@ -3367,7 +3476,7 @@ class TestBufferOverrun : public TestFixture {
               "    strcpy(p, q);\n"
               "    free(p);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Buffer is accessed out of bounds: p [bufferAccessOutOfBounds]\n", errout_str());
 
         check("typedef struct { char buf[1]; } S;\n"
               "S* f() {\n"
@@ -3376,7 +3485,7 @@ class TestBufferOverrun : public TestFixture {
               "    sprintf((char*)s->buf, \"abc\");\n"
               "    return s;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_36() { // #11708
@@ -3384,51 +3493,21 @@ class TestBufferOverrun : public TestFixture {
               "    char a[80];\n"
               "    sprintf(a, \"%2.1f\", d);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
-    }
-
-    void buffer_overrun_37() { // #11765
-        check("void f() {\n"
-              "    char buf[128];\n"
-              "    memcpy(buf, \"Error\", 6);\n"
-              "}\n");
-        ASSERT_EQUALS("", errout.str());
-
-        check("void f() {\n"
-              "    char buf[128];\n"
-              "    memcpy(buf, \"Error\", 16);\n"
-              "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: \"Error\"\n", errout.str());
-
-        check("void f() {\n"
-              "    char buf[128];\n"
-              "    memcpy(buf, L\"Error\", 10);\n" // at least 12 bytes on any platform
-              "}\n");
-        ASSERT_EQUALS("", errout.str());
-
-        check("void f() {\n"
-              "    char buf[128];\n"
-              "    memcpy(buf, L\"Error\", 26);\n" // at most 24 bytes
-              "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: L\"Error\"\n", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_errorpath() {
         setMultiline();
-        const Settings settingsOld = settings0;
-        settings0.templateLocation = "{file}:{line}:note:{info}";
+        Settings s = settings0;
+        s.templateLocation = "{file}:{line}:note:{info}";
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    memset(p, 0, 20);\n"
-              "}");
-        ASSERT_EQUALS("test.cpp:3:error:Buffer is accessed out of bounds: p\n"
-                      "test.cpp:2:note:Assign p, buffer with size 10\n"
-                      "test.cpp:3:note:Buffer overrun\n", errout.str());
-
-        // TODO: need to reset this but it breaks other tests
-        (void)settingsOld;
-        //settings0 = settingsOld;
+              "}", 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());
     }
 
     void buffer_overrun_bailoutIfSwitch() {
@@ -3441,7 +3520,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    f1(a);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // No false positive
         check("void f1(char *s) {\n"
@@ -3453,7 +3532,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    f1(a);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // No false negative
         check("void f1(char *s) {\n"
@@ -3465,7 +3544,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    f1(a);"
               "}");
-        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());
+        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());
     }
 
     void buffer_overrun_function_array_argument() {
@@ -3476,33 +3555,33 @@ class TestBufferOverrun : public TestFixture {
               "    char a[2];\n"
               "    f(a);\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:warning:Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n"
-                      "test.cpp:4:note:Function 'f' is called\n"
-                      "test.cpp:1:note:Declaration of 1st function argument.\n"
-                      "test.cpp:3:note:Passing buffer 'a' to function that is declared here\n"
-                      "test.cpp:4:note:Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n", errout.str());
+        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"
+                      "[test.cpp:3:10]: note: Passing buffer 'a' to function that is declared here\n"
+                      "[test.cpp:4:5]: note: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n", errout_str());
 
         check("void f(float a[10][3]);\n"
               "void g() {\n"
               "    float a[2][3];\n"
               "    f(a);\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:warning:Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n"
-                      "test.cpp:4:note:Function 'f' is called\n"
-                      "test.cpp:1:note:Declaration of 1st function argument.\n"
-                      "test.cpp:3:note:Passing buffer 'a' to function that is declared here\n"
-                      "test.cpp:4:note:Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n", errout.str());
+        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"
+                      "[test.cpp:3:11]: note: Passing buffer 'a' to function that is declared here\n"
+                      "[test.cpp:4:5]: note: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n", errout_str());
 
         check("void f(int a[20]);\n"
               "void g() {\n"
               "    int a[2];\n"
               "    f(a);\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:warning:Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n"
-                      "test.cpp:4:note:Function 'f' is called\n"
-                      "test.cpp:1:note:Declaration of 1st function argument.\n"
-                      "test.cpp:3:note:Passing buffer 'a' to function that is declared here\n"
-                      "test.cpp:4:note:Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n", errout.str());
+        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"
+                      "[test.cpp:3:9]: note: Passing buffer 'a' to function that is declared here\n"
+                      "[test.cpp:4:5]: note: Buffer 'a' is too small, the function 'f' expects a bigger buffer in 1st argument\n", errout_str());
 
         check("void f(int a[]) {\n"
               "  switch (2) {\n"
@@ -3513,14 +3592,14 @@ class TestBufferOverrun : public TestFixture {
               "int a[1];\n"
               "f(a);\n"
               "");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void CreateLeafTex(unsigned char buf[256][2048][4]);\n"
               "void foo() {\n"
               "  unsigned char(* tree)[2048][4] = new unsigned char[256][2048][4];\n"
               "  CreateLeafTex(tree);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a[10]) {\n" // #10069
               "    int i = 0;\n"
@@ -3532,12 +3611,12 @@ class TestBufferOverrun : public TestFixture {
               "    f(b);\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:8:warning:Buffer 'b' is too small, the function 'f' expects a bigger buffer in 1st argument\n"
-                      "test.cpp:8:note:Function 'f' is called\n"
-                      "test.cpp:1:note:Declaration of 1st function argument.\n"
-                      "test.cpp:7:note:Passing buffer 'b' to function that is declared here\n"
-                      "test.cpp:8:note:Buffer 'b' is too small, the function 'f' expects a bigger buffer in 1st argument\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: warning: Buffer 'b' is too small, the function 'f' expects a bigger buffer in 1st argument [argumentSize]\n"
+                      "[test.cpp:8:5]: note: Function 'f' is called\n"
+                      "[test.cpp:1:12]: note: Declaration of 1st function argument.\n"
+                      "[test.cpp:7:9]: note: Passing buffer 'b' to function that is declared here\n"
+                      "[test.cpp:8:5]: note: Buffer 'b' is too small, the function 'f' expects a bigger buffer in 1st argument\n",
+                      errout_str());
     }
 
     void possible_buffer_overrun_1() { // #3035
@@ -3548,7 +3627,7 @@ class TestBufferOverrun : public TestFixture {
               "    src[99] = '\\0';\n"
               "    strcat(data, src);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (warning) Possible buffer overflow if strlen(src) is larger than sizeof(data)-strlen(data).\n", "", errout.str());
+        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"
               "    char * data = (char *)alloca(100);\n"
@@ -3557,19 +3636,19 @@ class TestBufferOverrun : public TestFixture {
               "    src[99] = '\\0';\n"
               "    strcat(data, src);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(50);\n"
               "    strcat(data, src);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) Possible buffer overflow if strlen(src) is larger than sizeof(data)-strlen(data).\n", "", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    char * data = (char *)alloca(50);\n"
@@ -3578,7 +3657,7 @@ class TestBufferOverrun : public TestFixture {
               "    src[99] = '\\0';\n"
               "    strcpy(data, src);\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());
+        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"
               "    char * data = (char *)alloca(100);\n"
@@ -3587,60 +3666,112 @@ class TestBufferOverrun : public TestFixture {
               "    src[99] = '\\0';\n"
               "    strcpy(data, src);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char src[100]) {\n"
               "    char * data = (char *)alloca(50);\n"
               "    strcpy(data, src);\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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void buffer_overrun_readSizeFromCfg() {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <podtype name=\"u8\" sign=\"u\" size=\"1\"/>\n"
-                               "  <function name=\"mystrcpy\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "    <arg nr=\"1\">\n"
-                               "      <minsize type=\"strlen\" arg=\"2\"/>\n"
-                               "    </arg>\n"
-                               "    <arg nr=\"2\"/>\n"
-                               "  </function>\n"
-                               "</def>";
-        const Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <podtype name=\"u8\" sign=\"u\" size=\"1\"/>\n"
+                                   "  <function name=\"mystrcpy\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "    <arg nr=\"1\">\n"
+                                   "      <minsize type=\"strlen\" arg=\"2\"/>\n"
+                                   "    </arg>\n"
+                                   "    <arg nr=\"2\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        const Settings settings = settingsBuilder().libraryxml(xmldata).build();
 
         // Attempt to get size from Cfg files, no false positives if size is not specified
         check("void f() {\n"
               "  u8 str[256];\n"
               "  mystrcpy(str, \"abcd\");\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  u8 str[2];\n"
               "  mystrcpy(str, \"abcd\");\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: str\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    struct { u8 str[2]; } ms;\n"
               "    mystrcpy(ms.str, \"abcd\");\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: ms.str\n", errout.str());
+        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"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "  int i;\n"
+              "  memset(&i, 0, 1000);\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"
+              "}");
+        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"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "  int i[10];\n"
+              "  memset(&i[1], 0, 1000);\n"
+              "}");
+        TODO_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
@@ -3649,7 +3780,7 @@ class TestBufferOverrun : public TestFixture {
               "  if (cond) x = \"abcde\";\n"
               "  return x[20];\n" // <- array index out of bounds when x is "abcde"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'x[6]' accessed at index 20, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (error) Array 'x[6]' accessed at index 20, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void pointer_out_of_bounds_1() {
@@ -3659,40 +3790,40 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    char *p = a + 100;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'a+100' is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'a+100' is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (portability) Undefined behaviour, when 'i' is 123 the pointer arithmetic 'x+i' is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (portability) Undefined behaviour, when 'i' is -1 the pointer arithmetic 'x+i' is out of bounds.\n", errout.str());
+        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"
-              "}", "6350.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    const char   d[] = \"0123456789\";\n"
               "    char *cp = d + 3;\n"
               "    return cp - d;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pointer_out_of_bounds_2() {
@@ -3701,7 +3832,7 @@ class TestBufferOverrun : public TestFixture {
               "    p += 100;\n"
               "    free(p);"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'p+100' is out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'p+100' is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
@@ -3709,7 +3840,7 @@ class TestBufferOverrun : public TestFixture {
               "    *p = 0;\n"
               "    free(p);"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) p is out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) p is out of bounds.\n", "", errout_str());
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
@@ -3718,7 +3849,7 @@ class TestBufferOverrun : public TestFixture {
               "    *p = 0;\n"
               "    free(p);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
@@ -3727,7 +3858,7 @@ class TestBufferOverrun : public TestFixture {
               "    *p = 0;\n"
               "    free(p);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pointer_out_of_bounds_3() {
@@ -3735,7 +3866,7 @@ class TestBufferOverrun : public TestFixture {
               "void f(struct S *s) {\n"
               "    int *p = s->a + 100;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 's->a+100' is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -3751,36 +3882,36 @@ class TestBufferOverrun : public TestFixture {
               "    const T* P1 = P2 - 1;\n"
               "}\n"
               "Vector<std::array<long, 2>> Foo;\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pointer_out_of_bounds_4() {
         check("const char* f() {\n"
               "    g(\"Hello\" + 6);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const char* f() {\n"
               "    g(\"Hello\" + 7);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Undefined behaviour, pointer arithmetic '\"Hello\"+7' is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const char16_t* f() {\n"
               "    g(u\"Hello\" + 7);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Undefined behaviour, pointer arithmetic 'u\"Hello\"+7' is out of bounds.\n", errout.str());
+        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");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic '\"hi\"+val' is out of bounds.\n", errout.str());
+        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
               "    const char* end = s + len;\n"
@@ -3790,7 +3921,7 @@ class TestBufferOverrun : public TestFixture {
               "    f(\"a\", 1);\n"
               "    f(\"bbb\", 3);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, const char* a) {\n" // #11140
               "    (void)a[i];\n"
@@ -3803,9 +3934,15 @@ class TestBufferOverrun : public TestFixture {
               "    for (int i = 0; \"012\"[i]; ++i)\n"
               "        f(i, \"345\");\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        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");
+        ASSERT_EQUALS("", errout_str());
+    }
 
     void pointer_out_of_bounds_sub() {
         // extracttests.start: void dostuff(char *);
@@ -3814,26 +3951,26 @@ class TestBufferOverrun : public TestFixture {
               "    char x[10];\n"
               "    return x-1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'x-1' is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (portability) Undefined behaviour, when 'i' is 123 the pointer arithmetic 'x-i' is out of bounds.\n", errout.str());
+        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"
               "}");
-        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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void strcat1() {
@@ -3843,7 +3980,7 @@ class TestBufferOverrun : public TestFixture {
               "  strcat(x.a, \"aa\");\n"
               "  strcat(x.a, \"aa\");\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
     }
 
     void varid1() {
@@ -3856,7 +3993,7 @@ class TestBufferOverrun : public TestFixture {
               "        str[30] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varid2() { // #4764
@@ -3864,7 +4001,7 @@ class TestBufferOverrun : public TestFixture {
               "  void bar() { return; }\n"
               "  type<> member[1];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign1() {
@@ -3874,7 +4011,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               "    str[3] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'str[3]' accessed at index 3, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:8]: (error) Array 'str[3]' accessed at index 3, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     void alloc_new() {
@@ -3883,7 +4020,7 @@ class TestBufferOverrun : public TestFixture {
               "    char *s; s = new char[10];\n"
               "    s[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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
         check("char f()\n"
@@ -3891,7 +4028,7 @@ class TestBufferOverrun : public TestFixture {
               "    int *s; s = new int[10];\n"
               "    return s[10];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "char f()\n"
@@ -3899,12 +4036,12 @@ class TestBufferOverrun : public TestFixture {
               "    Fred *f; f = new Fred;\n"
               "    return f->c[10];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'f->c[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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]; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  char * buf; buf = new char[8];\n"
@@ -3914,7 +4051,7 @@ class TestBufferOverrun : public TestFixture {
               "  buf[8] = 0;\n"
               "  delete [] buf;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  char * buf; buf = new char[8];\n"
@@ -3924,7 +4061,7 @@ class TestBufferOverrun : public TestFixture {
               "  buf[9] = 0;\n"
               "  delete [] buf;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Array 'buf[9]' accessed at index 9, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -3932,7 +4069,7 @@ class TestBufferOverrun : public TestFixture {
               "    char *s; s = new char[Size];\n"
               "    s[Size] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 's[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -3940,7 +4077,7 @@ class TestBufferOverrun : public TestFixture {
               "    E *e; e = new E[10];\n"
               "    e[10] = ZERO;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'e[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:6]: (error) Array 'e[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     // data is allocated with malloc
@@ -3950,14 +4087,14 @@ class TestBufferOverrun : public TestFixture {
               "    char *s; s = (char *)malloc(10);\n"
               "    s[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds.\n", errout.str());
+        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
         check("void foo() {\n"
@@ -3966,7 +4103,7 @@ class TestBufferOverrun : public TestFixture {
               "    p = (char *)malloc(10);\n"
               "    p[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Array 'p[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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
         check("void f() {\n"
@@ -3974,7 +4111,7 @@ class TestBufferOverrun : public TestFixture {
               "    x = (int *)malloc(10 * sizeof(int));\n"
               "    x[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'x[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "  int *tab4; tab4 = malloc(20 * sizeof(int));\n"
@@ -3984,7 +4121,7 @@ class TestBufferOverrun : public TestFixture {
               "  tab4[20] = 0;\n"
               "  free(tab4);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int *tab4 = malloc(20 * sizeof(int));\n"
@@ -3993,49 +4130,49 @@ class TestBufferOverrun : public TestFixture {
               "  tab4[20] = 0;\n"
               "  free(tab4);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum E { Size = 20 };\n"
               "    E *tab4 = (E *)malloc(Size * 4);\n"
               "    tab4[Size] = Size;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 'tab4[20]' accessed at index 20, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Array 'a[2]' accessed at index 2, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Array 'a[2]' accessed at index 2, which is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 'a[2]' accessed at index 2, which is out of bounds. [arrayIndexOutOfBounds]\n", errout_str());
     }
 
     // statically allocated buffer
@@ -4045,21 +4182,21 @@ class TestBufferOverrun : public TestFixture {
               "    const char *s = \"123\";\n"
               "    s[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[4]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[1]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n" // #7718
               "{\n"
@@ -4067,7 +4204,7 @@ class TestBufferOverrun : public TestFixture {
               "    s.resize(100);\n"
               "    s[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // data is allocated with alloca
@@ -4077,7 +4214,7 @@ class TestBufferOverrun : public TestFixture {
               "    char *s = (char *)alloca(10);\n"
               "    s[10] = 0;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Array 's[10]' accessed at index 10, which is out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4:6]: (error) Array 's[10]' accessed at index 10, which is out of bounds. [arrayIndexOutOfBounds]\n", "", errout_str());
     }
     /*
         void countSprintfLength() const {
@@ -4155,31 +4292,32 @@ class TestBufferOverrun : public TestFixture {
     // extracttests.disable
 
     void minsize_argvalue() {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"mymemset\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "    <arg nr=\"1\">\n"
-                               "      <minsize type=\"argvalue\" arg=\"3\"/>\n"
-                               "    </arg>\n"
-                               "    <arg nr=\"2\"/>\n"
-                               "    <arg nr=\"3\"/>\n"
-                               "  </function>\n"
-                               "</def>";
-        Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).severity(Severity::warning).build();
-        settings.platform.sizeof_wchar_t = 4;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"mymemset\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "    <arg nr=\"1\">\n"
+                                   "      <minsize type=\"argvalue\" arg=\"3\"/>\n"
+                                   "    </arg>\n"
+                                   "    <arg nr=\"2\"/>\n"
+                                   "    <arg nr=\"3\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        // 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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char c[10];\n"
               "    mymemset(c, 0, 11);\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
 
         check("struct S {\n"
               "    char a[5];\n"
@@ -4188,79 +4326,79 @@ class TestBufferOverrun : public TestFixture {
               "    S s;\n"
               "    mymemset(s.a, 0, 10);\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:6]: (error) Buffer is accessed out of bounds: s.a\n", errout.str());
+        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"
               "}", settings);
         TODO_ASSERT_EQUALS("[test.cpp:3]: (warning) The size argument is given as a char constant.\n"
-                           "[test.cpp:3]: (error) Buffer is accessed out of bounds: s\n", "[test.cpp:3]: (error) Buffer is accessed out of bounds: s\n", errout.str());
+                           "[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());
 
         // ticket #836
         check("void f(void) {\n"
               "  char a[10];\n"
               "  mymemset(a+5, 0, 10);\n"
               "}", settings);
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: a\n", "", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: str\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "    wchar_t str[] = L\"abcd\";\n"
               "    mymemset(str, 0, 21);\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: str\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #1659 - overflowing variable when using memcpy
         check("void f(void) {\n"
               "  char c;\n"
               "  mymemset(&c, 0, 4);\n"
               "}", settings);
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: c\n", "", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3124 - multidimensional array
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 5 * 6);\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main() {\n"
               "    char b[5][6];\n"
               "    mymemset(b, 0, 6 * 6);\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: b\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Buffer is accessed out of bounds: b [bufferAccessOutOfBounds]\n", errout_str());
 
         // #4968 - not standard function
         check("void f() {\n"
@@ -4269,75 +4407,77 @@ class TestBufferOverrun : public TestFixture {
               "    foo::mymemset(str, 0, 100);\n"
               "    std::mymemset(str, 0, 100);\n"
               "}", settings);
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: str\n", "", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Buffer is accessed out of bounds: \"abc\"\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void minsize_sizeof() {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"mystrncpy\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "    <arg nr=\"1\">\n"
-                               "      <minsize type=\"strlen\" arg=\"2\"/>\n"
-                               "      <minsize type=\"argvalue\" arg=\"3\"/>\n"
-                               "    </arg>\n"
-                               "    <arg nr=\"2\"/>\n"
-                               "    <arg nr=\"3\"/>\n"
-                               "  </function>\n"
-                               "</def>";
-        const Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"mystrncpy\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "    <arg nr=\"1\">\n"
+                                   "      <minsize type=\"strlen\" arg=\"2\"/>\n"
+                                   "      <minsize type=\"argvalue\" arg=\"3\"/>\n"
+                                   "    </arg>\n"
+                                   "    <arg nr=\"2\"/>\n"
+                                   "    <arg nr=\"3\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        const Settings settings = settingsBuilder().libraryxml(xmldata).build();
 
         check("void f() {\n"
               "    char c[7];\n"
               "    mystrncpy(c, \"hello\", 7);\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               " char c[6];\n"
               " mystrncpy(c,\"hello\",6);\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               " char c[5];\n"
               " mystrncpy(c,\"hello\",6);\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: c\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: c\n", errout.str());
+        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"
-              "}", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void a(char *p) { mystrncpy(p,\"hello world!\",10); }\n" // #3168
               "void b() {\n"
@@ -4346,37 +4486,37 @@ class TestBufferOverrun : public TestFixture {
               "}", settings);
         TODO_ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Buffer is accessed out of bounds: buf\n",
                            "",
-                           errout.str());
+                           errout_str());
     }
 
     void minsize_strlen() {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"mysprintf\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "    <formatstr/>\n"
-                               "    <arg nr=\"1\">\n"
-                               "      <minsize type=\"strlen\" arg=\"2\"/>\n"
-                               "    </arg>\n"
-                               "    <arg nr=\"2\">\n"
-                               "      <formatstr/>\n"
-                               "    </arg>\n"
-                               "  </function>\n"
-                               "</def>";
-        const Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"mysprintf\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "    <formatstr/>\n"
+                                   "    <arg nr=\"1\">\n"
+                                   "      <minsize type=\"strlen\" arg=\"2\"/>\n"
+                                   "    </arg>\n"
+                                   "    <arg nr=\"2\">\n"
+                                   "      <formatstr/>\n"
+                                   "    </arg>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        const Settings settings = settingsBuilder().libraryxml(xmldata).build();
 
         // formatstr..
         check("void f() {\n"
               "    char str[3];\n"
               "    mysprintf(str, \"test\");\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: str\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: str\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:15]: (error) Buffer is accessed out of bounds: str [bufferAccessOutOfBounds]\n", errout_str());
 
         check("int getnumber();\n"
               "void f()\n"
@@ -4384,51 +4524,51 @@ class TestBufferOverrun : public TestFixture {
               "    char str[5];\n"
               "    mysprintf(str, \"%d: %s\", getnumber(), \"abcde\");\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Buffer is accessed out of bounds: str\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char *str = new char[5];\n"
               "    mysprintf(str, \"abcde\");\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: str\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int condition) {\n"
               "    char str[5];\n"
               "    mysprintf(str, \"test%s\", condition ? \"12\" : \"345\");\n"
               "}", settings);
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds: x.a\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: a\n", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: a\n", errout.str());
+        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)
         check("struct Foo { char a[1]; };\n"
@@ -4436,21 +4576,21 @@ class TestBufferOverrun : public TestFixture {
               "  struct Foo *x = malloc(sizeof(Foo));\n"
               "  mysprintf(x->a, \"aa\");\n"
               "}", settings);
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error, inconclusive) Buffer is accessed out of bounds: x.a\n", "", errout.str());
+        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"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { char a[1]; };\n"
               "void f() {\n"
               "  struct Foo x;\n"
               "  mysprintf(x.a, \"aa\");\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds: x.a\n", errout.str());
+        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
               "  char a[LEN];\n"
@@ -4459,34 +4599,34 @@ class TestBufferOverrun : public TestFixture {
               "void Foo::f() {\n"
               "  mysprintf(a, \"abcd\");\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void minsize_mul() {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"myfread\">\n"
-                               "    <arg nr=\"1\">\n"
-                               "      <minsize type=\"mul\" arg=\"2\" arg2=\"3\"/>\n"
-                               "    </arg>\n"
-                               "    <arg nr=\"2\"/>\n"
-                               "    <arg nr=\"3\"/>\n"
-                               "    <arg nr=\"4\"/>\n"
-                               "  </function>\n"
-                               "</def>";
-        const Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"myfread\">\n"
+                                   "    <arg nr=\"1\">\n"
+                                   "      <minsize type=\"mul\" arg=\"2\" arg2=\"3\"/>\n"
+                                   "    </arg>\n"
+                                   "    <arg nr=\"2\"/>\n"
+                                   "    <arg nr=\"3\"/>\n"
+                                   "    <arg nr=\"4\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        const Settings settings = settingsBuilder().libraryxml(xmldata).build();
 
         check("void f() {\n"
               "    char c[5];\n"
               "    myfread(c, 1, 5, stdin);\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char c[5];\n"
               "    myfread(c, 1, 6, stdin);\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (error) Buffer is accessed out of bounds: c [bufferAccessOutOfBounds]\n", errout_str());
     }
 
     // extracttests.enable
@@ -4496,7 +4636,7 @@ class TestBufferOverrun : public TestFixture {
               "{\n"
               " UnknownType *a = malloc(4);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
     // extracttests.disable
     void terminateStrncpy1() {
@@ -4508,26 +4648,26 @@ class TestBufferOverrun : public TestFixture {
               "    strncpy(baz, bar, 100);\n"
               "    baz[99] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo ( char *bar ) {\n"
               "    char baz[100];\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[99] = '\\0';\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo ( char *bar ) {\n"
               "    char baz[100];\n"
               "    strncpy(baz, bar, 100);\n"
               "    baz[x+1] = '\\0';\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test with invalid code that there is no segfault
         check("char baz[100];\n"
               "strncpy(baz, \"var\", 100)");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test that there are no duplicate error messages
         check("void foo ( char *bar ) {\n"
@@ -4536,7 +4676,7 @@ class TestBufferOverrun : public TestFixture {
               "    foo(baz);\n"
               "    foo(baz);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'baz' may not be null-terminated after the call to strncpy().\n", errout.str());
+        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());
     }
 
     void terminateStrncpy2() {
@@ -4546,7 +4686,7 @@ class TestBufferOverrun : public TestFixture {
               "    bar[99] = 0;\n"
               "    return strdup(baz);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'baz' may not be null-terminated after the call to strncpy().\n", errout.str());
+        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());
     }
 
     void terminateStrncpy3() {
@@ -4561,7 +4701,7 @@ class TestBufferOverrun : public TestFixture {
               "void bar(char *p) {\n"
               "    strncpy(p, str, 100);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) The buffer 'str' may not be null-terminated after the call to strncpy().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) The buffer 'str' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
 
     void terminateStrncpy4() {
@@ -4569,13 +4709,13 @@ class TestBufferOverrun : public TestFixture {
               "    char buf[4];\n"
               "    strncpy(buf, \"ab\", 4);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void bar() {\n"
               "    char buf[4];\n"
               "    strncpy(buf, \"abcde\", 4);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'buf' may not be null-terminated after the call to strncpy().\n", errout.str());
+        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());
     }
 
     void terminateStrncpy5() { // #9944
@@ -4585,17 +4725,31 @@ class TestBufferOverrun : public TestFixture {
               "        return;\n"
               "    strncpy(v, buf.c_str(), sizeof(v));\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string& buf) {\n"
               "    char v[255];\n"
               "    if (buf.size() >= sizeof(v))\n"
               "        strncpy(v, buf.c_str(), sizeof(v));\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) The buffer 'v' may not be null-terminated after the call to strncpy().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (warning, inconclusive) The buffer 'v' may not be null-terminated after the call to strncpy(). [terminateStrncpy]\n", errout_str());
     }
     // extracttests.enable
 
+    void terminateStrncpy_handle_addr_of_var() { // #7570
+        check("void foo() {\n"
+              "  char c[6];\n"
+              "  strncpy(&c, \"hello!\", 6);\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"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+    }
+
     void recursive_long_time() {
         // Just test that recursive check doesn't take long time
         check("char *f2 ( char *b )\n"
@@ -4621,7 +4775,7 @@ class TestBufferOverrun : public TestFixture {
               "    char a[10];\n"
               "    f2(a);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -4637,7 +4791,7 @@ class TestBufferOverrun : public TestFixture {
               "    struct A *str;\n"
               "    str = malloc(4);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void crash2() {
@@ -4702,7 +4856,7 @@ class TestBufferOverrun : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "{\n"
@@ -4715,112 +4869,112 @@ class TestBufferOverrun : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long command line arguments.\n", "", errout.str());
+        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"
@@ -4828,7 +4982,7 @@ class TestBufferOverrun : public TestFixture {
               "    if (strlen(argv[0]) < 10)\n"
               "        strcpy(prog, argv[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
               "{\n"
@@ -4836,7 +4990,7 @@ class TestBufferOverrun : public TestFixture {
               "    if (10 > strlen(argv[0]))\n"
               "        strcat(prog, argv[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char **argv, char **envp)\n"
               "{\n"
@@ -4844,7 +4998,7 @@ class TestBufferOverrun : public TestFixture {
               "    argv[0][0] = '\\0';\n"
               "    strcpy(prog, argv[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5835
         check("int main(int argc, char* argv[]) {\n"
@@ -4853,17 +5007,17 @@ class TestBufferOverrun : public TestFixture {
               "    strcpy(prog, argv[0]);\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());
+                           "[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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("int main(int argc, char *argv[]) {\n"
               "  char *strcat();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkBufferAllocatedWithStrlen() {
@@ -4871,33 +5025,33 @@ class TestBufferOverrun : public TestFixture {
               "  char *b = new char[strlen(a)];\n"
               "  strcpy(b, a);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  strcpy(b, a);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
@@ -4905,31 +5059,31 @@ class TestBufferOverrun : public TestFixture {
               "    strcpy(b, a);\n"
               "  }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Buffer is accessed out of bounds.\n", "", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a, char *c) {\n"
               "  char *b = (char *)realloc(c, strlen(a));\n"
               "  strcpy(b, a);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *a) {\n"
               "  char *b = (char *)malloc(strlen(a));\n"
               "  strcpy(b, a);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds.\n", "", errout_str());
     }
 
     void scope() {
@@ -4943,7 +5097,7 @@ class TestBufferOverrun : public TestFixture {
               "    X x;\n"
               "    x.buf[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "public:\n"
@@ -4955,12 +5109,15 @@ class TestBufferOverrun : public TestFixture {
               "    A::X x;\n"
               "    x.buf[10] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Array 'x.buf[10]' accessed at index 10, which is out of bounds.\n", errout.str());
+        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
-        getCheck<CheckBufferOverrun>().getErrorMessages(this, nullptr);
+        const Check& c = getCheck<CheckBufferOverrun>();
+        c.getErrorMessages(this, nullptr);
+        // we are not interested in the output - just consume it
+        ignore_errout();
     }
 
     void arrayIndexThenCheck() {
@@ -4970,68 +5127,68 @@ class TestBufferOverrun : public TestFixture {
               "    if (s[i] == 'x' && i < y) {\n"
               "    }"
               "}");
-        ASSERT_EQUALS("", errout.str()); // No message because i is unknown and thus gets no varid. Avoid an internalError here.
+        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"
               "    }"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Array index 'i' is used before limits check.\n", errout.str());
+        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"
               "    }"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Array index 'i' is used before limits check.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Array index 'i' is used before limits check.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Array index 'i' is used before limits check.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Array index 'i' is used before limits check.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const int a[], unsigned i) {\n"
               "    if (foo(a[i] + 3) < func(i) && i <= 42) {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Array index 'i' is used before limits check.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void arrayIndexEarlyReturn() { // #6884
@@ -5046,7 +5203,7 @@ class TestBufferOverrun : public TestFixture {
               "  }\n"
               "  return name;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void bufferNotZeroTerminated() {
@@ -5054,19 +5211,19 @@ class TestBufferOverrun : public TestFixture {
               "    char c[6];\n"
               "    strncpy(c,\"hello!\",6);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to strncpy().\n", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to memcpy().\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to memmove().\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) The buffer 'c' may not be null-terminated after the call to memmove().\n", "", errout_str());
     }
 
     void negativeMemoryAllocationSizeError() { // #389
@@ -5076,7 +5233,7 @@ class TestBufferOverrun : public TestFixture {
               "   a = new int[-1];\n"
               "   delete [] a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory allocation size is negative.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -5084,7 +5241,7 @@ class TestBufferOverrun : public TestFixture {
               "   a = (int *)malloc( -10 );\n"
               "   free(a);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory allocation size is negative.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -5092,14 +5249,14 @@ class TestBufferOverrun : public TestFixture {
               "   a = (int *)malloc( -10);\n"
               "   free(a);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory allocation size is negative.\n", "", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory allocation size is negative.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4:8]: (error) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", "", errout_str());
 
         check("int* f(int n) {\n" // #11145
               "    int d = -1;\n"
@@ -5108,7 +5265,7 @@ class TestBufferOverrun : public TestFixture {
               "    int* p = new int[d];\n"
               "    return p;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3] -> [test.cpp:5]: (warning, inconclusive) Memory allocation size is negative.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (warning, inconclusive) Memory allocation size is negative. [negativeMemoryAllocationSize]\n", errout_str());
     }
 
     void negativeArraySize() {
@@ -5116,14 +5273,14 @@ class TestBufferOverrun : public TestFixture {
               "   int a[sz];\n"
               "}\n"
               "void x() { f(-100); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Declaration of array 'a' with negative size is undefined behaviour\n", errout.str());
+        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];");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pointerAddition1() {
@@ -5131,33 +5288,30 @@ class TestBufferOverrun : public TestFixture {
               "    char arr[10];\n"
               "    char *p = arr + 20;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Undefined behaviour, pointer arithmetic 'arr+20' is out of bounds.\n", errout.str());
+        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");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
-#define ctu(code) ctu_(code, __FILE__, __LINE__)
-    void ctu_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define ctu(...) ctu_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void ctu_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CTU::FileInfo *ctu = CTU::getFileInfo(&tokenizer);
+        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
         // Check code..
         std::list<Check::FileInfo*> fileInfo;
-        CheckBufferOverrun checkBO(&tokenizer, &settings0, this);
-        fileInfo.push_back(checkBO.getFileInfo(&tokenizer, &settings0));
-        checkBO.analyseWholeProgram(ctu, fileInfo, settings0, *this);
+        Check& c = getCheck<CheckBufferOverrun>();
+        fileInfo.push_back(c.getFileInfo(tokenizer, settings0, ""));
+        c.analyseWholeProgram(*ctu, fileInfo, settings0, *this); // TODO: check result
         while (!fileInfo.empty()) {
             delete fileInfo.back();
             fileInfo.pop_back();
@@ -5174,7 +5328,7 @@ class TestBufferOverrun : public TestFixture {
             "  char *s = malloc(4);\n"
             "  dostuff(s);\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:7] -> [test.cpp:2]: (error) Array index out of bounds; buffer 'p' is accessed at offset -3.\n", errout.str());
+        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"
             "  p[4] = 0;\n"
@@ -5184,7 +5338,7 @@ class TestBufferOverrun : public TestFixture {
             "  char *s = malloc(4);\n"
             "  dostuff(s);\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:7] -> [test.cpp:2]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 4.\n", errout.str());
+        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
             "    int b[1];\n"
@@ -5196,7 +5350,7 @@ class TestBufferOverrun : public TestFixture {
             "    a[0] = 5;\n"
             "    f(a);\n"
             "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9] -> [test.cpp:3]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 20.\n", errout.str());
+        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());
     }
 
     void ctu_array() {
@@ -5207,7 +5361,7 @@ class TestBufferOverrun : public TestFixture {
             "  char str[4];\n"
             "  dostuff(str);\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:2]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 10.\n", errout.str());
+        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"
             "{\n"
@@ -5219,7 +5373,7 @@ class TestBufferOverrun : public TestFixture {
             "    char str[5];\n"
             "    memclr( str );\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:3]: (error) Array index out of bounds; 'data' buffer size is 5 and it is accessed at offset 10.\n", errout.str());
+        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"
             "{\n"
@@ -5231,7 +5385,7 @@ class TestBufferOverrun : public TestFixture {
             "    char str[5];\n"
             "    memclr( 0, str );\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:3]: (error) Array index out of bounds; 'data' buffer size is 5 and it is accessed at offset 10.\n", errout.str());
+        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"
             "{\n"
@@ -5244,7 +5398,7 @@ class TestBufferOverrun : public TestFixture {
             "    memclr( 10, str );\n"
             "}");
         TODO_ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:3]: (possible error) Array index out of bounds.\n",
-                           "", errout.str());
+                           "", errout_str());
 
         // This is not an error
         ctu("static void memclr( char *data, int size )\n"
@@ -5258,7 +5412,7 @@ class TestBufferOverrun : public TestFixture {
             "    char str[5];\n"
             "    memclr( str, 5 );\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2097
         ctu("void foo(int *p)\n"
@@ -5272,7 +5426,7 @@ class TestBufferOverrun : public TestFixture {
             "    int p[3];\n"
             "    foo(p+1);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9112
         ctu("static void get_mac_address(const u8 *strbuf)\n"
@@ -5285,7 +5439,7 @@ class TestBufferOverrun : public TestFixture {
             "    u8 macstrbuf[17] = { 0 };\n"
             "    get_mac_address(macstrbuf);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9788
         ctu("void f1(char *s) { s[2] = 'B'; }\n"
@@ -5295,9 +5449,9 @@ class TestBufferOverrun : public TestFixture {
             "    f1(str);\n"
             "    f2(str);\n"
             "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:1]: (error) Array index out of bounds; 's' buffer size is 2 and it is accessed at offset 2.\n"
-                      "[test.cpp:6] -> [test.cpp:2]: (error) Array index out of bounds; 's' buffer size is 2 and it is accessed at offset 2.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:7] -> [test.cpp:1:20]: (error) Array index out of bounds; 's' buffer size is 2 and it is accessed at offset 2. [ctuArrayIndex]\n"
+                      "[test.cpp:6:7] -> [test.cpp:2:21]: (error) Array index out of bounds; 's' buffer size is 2 and it is accessed at offset 2. [ctuArrayIndex]\n",
+                      errout_str());
 
         // #5140
         ctu("void g(const char* argv[]) { std::cout << \"argv: \" << argv[4] << std::endl; }\n"
@@ -5305,23 +5459,23 @@ class TestBufferOverrun : public TestFixture {
             "    const char* argv[] = { \"test\" };\n"
             "    g(argv);\n"
             "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Array index out of bounds; 'argv' buffer size is 1 and it is accessed at offset 4.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6] -> [test.cpp:1:55]: (error) Array index out of bounds; 'argv' buffer size is 1 and it is accessed at offset 4. [ctuArrayIndex]\n",
+                      errout_str());
 
         ctu("void g(const char* argv[]) { std::cout << \"argv: \" << argv[5] << std::endl; }\n"
             "void f() {\n"
             "    const char* argv[1] = { \"test\" };\n"
             "    g(argv);\n"
             "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Array index out of bounds; 'argv' buffer size is 1 and it is accessed at offset 5.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6] -> [test.cpp:1:55]: (error) Array index out of bounds; 'argv' buffer size is 1 and it is accessed at offset 5. [ctuArrayIndex]\n",
+                      errout_str());
 
         ctu("void g(int *b) { b[0] = 0; }\n"
             "void f() {\n"
             "    GLint a[1];\n"
             "    g(a);\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("const int a[1] = { 1 };\n" // #11042
             "void g(const int* d) {\n"
@@ -5330,8 +5484,8 @@ class TestBufferOverrun : public TestFixture {
             "void f() {\n"
             "    g(a);\n"
             "}\n");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:3]: (error) Array index out of bounds; 'd' buffer size is 4 and it is accessed at offset 8.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:6] -> [test.cpp:3:11]: (error) Array index out of bounds; 'd' buffer size is 4 and it is accessed at offset 8. [ctuArrayIndex]\n",
+                      errout_str());
     }
 
     void ctu_variable() {
@@ -5342,7 +5496,7 @@ class TestBufferOverrun : public TestFixture {
             "  int x = 4;\n"
             "  dostuff(&x);\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:2]: (error) Array index out of bounds; 'p' buffer size is 4 and it is accessed at offset 40.\n", errout.str());
+        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());
     }
 
     void ctu_arithmetic() {
@@ -5351,7 +5505,7 @@ class TestBufferOverrun : public TestFixture {
             "  int x[3];\n"
             "  dostuff(x);\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Pointer arithmetic overflow; 'p' buffer size is 12\n", errout.str());
+        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
             "    const char* c = p + 1;\n"
@@ -5360,7 +5514,7 @@ class TestBufferOverrun : public TestFixture {
             "    const char s[N] = \"ab\";\n"
             "    f(s);\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void objectIndex() {
@@ -5369,49 +5523,49 @@ class TestBufferOverrun : public TestFixture {
               "    return (&i)[1];\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3]: (error) The address of local variable 'i' is accessed at non-zero index.\n",
-            errout.str());
+            "[test.cpp:3:13] -> [test.cpp:3:16]: (error) The address of variable 'i' is accessed at non-zero index. [objectIndex]\n",
+            errout_str());
 
         check("int f(int j) {\n"
               "    int i;\n"
               "    return (&i)[j];\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3]: (warning) The address of local variable 'i' might be accessed at non-zero index.\n",
-            errout.str());
+            "[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());
 
         check("int f() {\n"
               "    int i;\n"
               "    return (&i)[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int * i) {\n"
               "    return i[1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> i) {\n"
               "    return i[1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> i) {\n"
               "    return i.data()[1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::vector<int>& i) {\n"
               "    return &(i[1]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; int j; };\n"
               "int f() {\n"
               "    A x;\n"
               "    return (&x.i)[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int i; int j; };\n"
               "int f() {\n"
@@ -5419,7 +5573,7 @@ class TestBufferOverrun : public TestFixture {
               "    int * i = &x.i;\n"
               "    return i[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x = 0;\n"
@@ -5427,7 +5581,7 @@ class TestBufferOverrun : public TestFixture {
               "  m[0] = &x;\n"
               "  m[1] = &x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "  int x = 0;\n"
@@ -5436,8 +5590,18 @@ class TestBufferOverrun : public TestFixture {
               "  return m[0][1];\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:5]: (error) The address of local variable 'x' is accessed at non-zero index.\n",
-            errout.str());
+            "[test.cpp:4:10] -> [test.cpp:5:14]: (error) The address of variable 'x' is accessed at non-zero index. [objectIndex]\n",
+            errout_str());
+
+        check("int x = 0;\n"
+              "int f() {\n"
+              "  std::map<int, int*> m;\n"
+              "  m[0] = &x;\n"
+              "  return m[0][1];\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());
 
         check("int f(int * y) {\n"
               "  int x = 0;\n"
@@ -5446,7 +5610,7 @@ class TestBufferOverrun : public TestFixture {
               "  m[1] = y;\n"
               "  return m[1][1];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void print(char** test);\n"
               "int main(){\n"
@@ -5461,7 +5625,7 @@ class TestBufferOverrun : public TestFixture {
         TODO_ASSERT_EQUALS(
             "[test.cpp:4] -> [test.cpp:4] -> [test.cpp:9]: (warning) The address of local variable 'test' might be accessed at non-zero index.\n",
             "",
-            errout.str());
+            errout_str());
 
         check("void Bar(uint8_t data);\n"
               "void Foo(const uint8_t * const data, const uint8_t length) {\n"
@@ -5472,7 +5636,7 @@ class TestBufferOverrun : public TestFixture {
               "    const uint8_t data = 0U;\n"
               "    Foo(&data,1U);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int n, int* p) {\n"
               "    int res = 0;\n"
@@ -5484,7 +5648,7 @@ class TestBufferOverrun : public TestFixture {
               "    int single_value = 0;\n"
               "    return foo(1, &single_value);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const char* app, size_t applen) {\n" // #10137
               "    char* tmp_de = NULL;\n"
@@ -5496,8 +5660,8 @@ class TestBufferOverrun : public TestFixture {
               "        (*str)[applen] = '\\0';\n"
               "    }\n"
               "    free(*str);\n"
-              "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("template <typename T, unsigned N>\n"
               "using vector = Eigen::Matrix<T, N, 1>;\n"
@@ -5506,7 +5670,7 @@ class TestBufferOverrun : public TestFixture {
               "    vector<V, 2>* out_row = &out(r, 0);\n"
               "    out_row[c] = vector<V, 2>(1,2);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const uint8_t* d, const uint8_t L) {\n" // #10092
               "    for (uint8_t i = 0U; i < L; ++i)\n"
@@ -5516,45 +5680,45 @@ class TestBufferOverrun : public TestFixture {
               "    const uint8_t u = 4;\n"
               "    f(&u, N);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("uint32_t f(uint32_t u) {\n" // #10154
               "    return ((uint8_t*)&u)[3];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("uint32_t f(uint32_t u) {\n"
               "    return ((uint8_t*)&u)[4];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (error) The address of local variable 'u' is accessed at non-zero index.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:23] -> [test.cpp:2:26]: (error) The address of variable 'u' is accessed at non-zero index. [objectIndex]\n", errout_str());
 
         check("uint32_t f(uint32_t u) {\n"
               "    return reinterpret_cast<unsigned char*>(&u)[3];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("uint32_t f(uint32_t u) {\n"
               "    return reinterpret_cast<unsigned char*>(&u)[4];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (error) The address of local variable 'u' is accessed at non-zero index.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:45] -> [test.cpp:2:48]: (error) The address of variable 'u' is accessed at non-zero index. [objectIndex]\n", errout_str());
 
         check("uint32_t f(uint32_t u) {\n"
               "    uint8_t* p = (uint8_t*)&u;\n"
               "    return p[3];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("uint32_t f(uint32_t u) {\n"
               "    uint8_t* p = (uint8_t*)&u;\n"
               "    return p[4];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) The address of local variable 'u' is accessed at non-zero index.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:28] -> [test.cpp:3:13]: (error) The address of variable 'u' is accessed at non-zero index. [objectIndex]\n", errout_str());
 
         check("uint32_t f(uint32_t* pu) {\n"
               "    uint8_t* p = (uint8_t*)pu;\n"
               "    return p[4];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { uint8_t padding[500]; };\n" // #10133
               "S s = { 0 };\n"
@@ -5562,22 +5726,20 @@ class TestBufferOverrun : public TestFixture {
               "    uint8_t* p = (uint8_t*)&s;\n"
               "    return p[10];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct X {\n" // #2654
               "    int  a;\n"
               "    char b;\n"
               "};\n"
               "void f() {\n"
-              "    X s;\n"
-              "    int* y = &s.a;\n"
+              "    const X s;\n"
+              "    const int* y = &s.a;\n"
               "    (void)y[0];\n"
               "    (void)y[1];\n"
               "    (void)y[2];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9]: (error) The address of local variable 'a' is accessed at non-zero index.\n"
-                      "[test.cpp:7] -> [test.cpp:10]: (error) The address of local variable 'a' is accessed at non-zero index.\n",
-                      errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void checkPipeParameterSize() { // #3521
@@ -5590,7 +5752,7 @@ class TestBufferOverrun : public TestFixture {
               "    return;\n"
               "  }\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: pipefd\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: pipefd [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(){\n"
               "int pipefd[2];\n"
@@ -5598,7 +5760,7 @@ class TestBufferOverrun : public TestFixture {
               "    return;\n"
               "  }\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(){\n"
               "char pipefd[2];\n"
@@ -5606,7 +5768,7 @@ class TestBufferOverrun : public TestFixture {
               "    return;\n"
               "  }\n"
               "}", settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Buffer is accessed out of bounds: (int*)pipefd\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Buffer is accessed out of bounds: (int*)pipefd [bufferAccessOutOfBounds]\n", errout_str());
 
         check("void f(){\n"
               "char pipefd[20];\n" // Strange, but large enough
@@ -5614,7 +5776,7 @@ class TestBufferOverrun : public TestFixture {
               "    return;\n"
               "  }\n"
               "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
index 5dc35ce55f4..624efcff539 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-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
@@ -16,38 +16,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkother.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 
 class TestCharVar : public TestFixture {
 public:
     TestCharVar() : TestFixture("TestCharVar") {}
 
 private:
-    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).platform(cppcheck::Platform::Type::Unspecified).build();
+    const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).platform(Platform::Type::Unspecified).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(array_index_1);
         TEST_CASE(array_index_2);
         TEST_CASE(bitop);
     }
 
-#define check(code) check_(code, __FILE__, __LINE__)
-    void check_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
         CheckOther checkOther(&tokenizer, &settings, this);
@@ -61,7 +58,7 @@ class TestCharVar : public TestFixture {
               "    unsigned char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
               "void foo()\n"
@@ -69,7 +66,7 @@ class TestCharVar : public TestFixture {
               "    char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (portability) 'char' type used as array index.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (portability) 'char' type used as array index. [unknownSignCharArrayIndex]\n", errout_str());
 
         check("int buf[256];\n"
               "void foo()\n"
@@ -77,7 +74,7 @@ class TestCharVar : public TestFixture {
               "    char ch = 0;\n"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
               "void foo()\n"
@@ -85,7 +82,7 @@ class TestCharVar : public TestFixture {
               "    signed char ch = 0;\n"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
               "void foo()\n"
@@ -93,67 +90,67 @@ class TestCharVar : public TestFixture {
               "    char ch = 0x80;\n"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (portability) 'char' type used as array index.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int buf[256];\n"
               "void foo(char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    char ch = 0x80;"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) 'char' type used as array index.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf)\n"
               "{\n"
               "    buf['A'] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* buf, char ch)\n"
               "{\n"
               "    buf[ch] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int flags[256];\n"
               "void foo(const char* str)\n"
               "{\n"
               "    flags[*str] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int flags[256];\n"
               "void foo(const char* str)\n"
               "{\n"
               "    flags[(unsigned char)*str] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const char str[])\n"
               "{\n"
               "    map[str] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void array_index_2() {
@@ -163,7 +160,7 @@ class TestCharVar : public TestFixture {
               "    const char *s = \"abcde\";\n"
               "    foo(s[i]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void bitop() {
@@ -171,32 +168,32 @@ class TestCharVar : public TestFixture {
               "    signed char ch = -1;\n"
               "    *result = a | ch;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) When using 'char' variables in bit operations, sign extension can generate unexpected results.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = a | ch;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // 0x03 & ..
         check("void foo(int *result) {\n"
               "    signed char ch = -1;\n"
               "    *result = 0x03 | ch;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) When using 'char' variables in bit operations, sign extension can generate unexpected results.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testcheck.cpp b/test/testcheck.cpp
new file mode 100644
index 00000000000..8ea4cef38d8
--- /dev/null
+++ b/test/testcheck.cpp
@@ -0,0 +1,58 @@
+/*
+ * 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 "fixture.h"
+
+#include <list>
+#include <string>
+
+class TestCheck : public TestFixture {
+public:
+    TestCheck() : TestFixture("TestCheck") {}
+
+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();
+            if (!info.empty()) {
+                ASSERT('\n' != info[0]);         // No \n in the beginning
+                ASSERT('\n' == info.back());     // \n at end
+                if (info.size() > 1)
+                    ASSERT('\n' != info[info.length()-2]); // Only one \n at end
+            }
+        }
+    }
+};
+
+REGISTER_TEST(TestCheck)
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
index 175a37a047e..c67767db0ba 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-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
@@ -15,17 +15,21 @@
 // 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>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 
@@ -101,9 +105,7 @@ class TestClangImport : public TestFixture {
         TEST_CASE(recordDecl1);
         TEST_CASE(recordDecl2);
         TEST_CASE(switchStmt);
-        TEST_CASE(typedefDecl1);
-        TEST_CASE(typedefDecl2);
-        TEST_CASE(typedefDecl3);
+        TEST_CASE(typedefDeclPrologue);
         TEST_CASE(unaryExprOrTypeTraitExpr1);
         TEST_CASE(unaryExprOrTypeTraitExpr2);
         TEST_CASE(unaryOperator);
@@ -128,19 +130,23 @@ class TestClangImport : public TestFixture {
         TEST_CASE(symbolDatabaseVariablePointerRef);
         TEST_CASE(symbolDatabaseNodeType1);
         TEST_CASE(symbolDatabaseForVariable);
+        TEST_CASE(stdinLoc);
 
         TEST_CASE(valueFlow1);
         TEST_CASE(valueFlow2);
 
         TEST_CASE(valueType1);
         TEST_CASE(valueType2);
+
+        TEST_CASE(crash);
     }
 
     std::string parse(const char clang[]) {
         const Settings settings = settingsBuilder().clang().build();
-        Tokenizer tokenizer(&settings, this);
+        TokenList tokenlist{settings, Standards::Language::CPP};
+        Tokenizer tokenizer(std::move(tokenlist), *this);
         std::istringstream istr(clang);
-        clangimport::parseClangAstDump(&tokenizer, istr);
+        clangimport::parseClangAstDump(tokenizer, istr);
         if (!tokenizer.tokens()) {
             return std::string();
         }
@@ -279,7 +285,7 @@ class TestClangImport : public TestFixture {
     }
 
     void conditionalExpr() {
-        const char clang[] = "`-VarDecl 0x257cc88 <line:4:1, col:13> col:5 x 'int' cinit\n"
+        const char clang[] = "`-VarDecl 0x257cc88 <a.cpp:4:1, col:13> col:5 x 'int' cinit\n"
                              "  `-ConditionalOperator 0x257cda8 <col:9, col:13> 'int'\n"
                              "    |-ImplicitCastExpr 0x257cd60 <col:9> 'int' <LValueToRValue>\n"
                              "    | `-DeclRefExpr 0x257cce8 <col:9> 'int' lvalue Var 0x257cae0 'a' 'int'\n"
@@ -323,7 +329,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxConstructorDecl1() {
-        const char clang[] = "|-CXXConstructorDecl 0x428e890 <col:11, col:24> col:11 C 'void ()'\n"
+        const char clang[] = "|-CXXConstructorDecl 0x428e890 <a.cpp:11:1, col:24> col:11 C 'void ()'\n"
                              "| `-CompoundStmt 0x428ea58 <col:15, col:24>\n"
                              "|   `-BinaryOperator 0x428ea30 <col:17, col:21> 'int' lvalue '='\n"
                              "|     |-MemberExpr 0x428e9d8 <col:17> 'int' lvalue ->x 0x428e958\n"
@@ -334,13 +340,13 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxConstructorDecl2() {
-        const char clang[] = "`-CXXConstructorDecl 0x1c208c0 <col:11> col:11 implicit constexpr basic_string 'void (std::basic_string<char> &&)' inline default trivial noexcept-unevaluated 0x1c208c0\n"
+        const char clang[] = "`-CXXConstructorDecl 0x1c208c0 <a.cpp:1:11> col:11 implicit constexpr basic_string 'void (std::basic_string<char> &&)' inline default trivial noexcept-unevaluated 0x1c208c0\n"
                              "  `-ParmVarDecl 0x1c209f0 <col:11> col:11 'std::basic_string<char> &&'";
         ASSERT_EQUALS("basic_string ( std::basic_string<char> && ) = default ;", parse(clang));
     }
 
     void cxxConstructExpr1() {
-        const char clang[] = "`-FunctionDecl 0x2dd7940 <line:2:1, col:30> col:5 f 'Foo (Foo)'\n"
+        const char clang[] = "`-FunctionDecl 0x2dd7940 <a.cpp:2:1, col:30> col:5 f 'Foo (Foo)'\n"
                              "  |-ParmVarDecl 0x2dd7880 <col:7, col:11> col:11 used foo 'Foo'\n"
                              "  `-CompoundStmt 0x2dd80c0 <col:16, col:30>\n"
                              "    `-ReturnStmt 0x2dd80a8 <col:18, col:25>\n"
@@ -392,7 +398,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxForRangeStmt1() {
-        const char clang[] = "`-FunctionDecl 0x4280820 <line:4:1, line:8:1> line:4:6 foo 'void ()'\n"
+        const char clang[] = "`-FunctionDecl 0x4280820 <a.cpp:4:1, line:8:1> line:4:6 foo 'void ()'\n"
                              "  `-CompoundStmt 0x42810f0 <col:12, line:8:1>\n"
                              "    `-CXXForRangeStmt 0x4281090 <line:5:3, line:7:3>\n"
                              "      |-DeclStmt 0x4280c30 <line:5:17>\n"
@@ -428,7 +434,7 @@ class TestClangImport : public TestFixture {
 
     void cxxForRangeStmt2() {
         // clang 9
-        const char clang[] = "`-FunctionDecl 0xc15d98 <line:3:1, col:36> col:6 foo 'void ()'\n"
+        const char clang[] = "`-FunctionDecl 0xc15d98 <a.cpp:3:1, col:36> col:6 foo 'void ()'\n"
                              "  `-CompoundStmt 0xc16668 <col:12, col:36>\n"
                              "    `-CXXForRangeStmt 0xc165f8 <col:14, col:34>\n"
                              "      |-<<<NULL>>>\n"
@@ -464,7 +470,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxFunctionalCastExpr() {
-        const char clang[] = "`-FunctionDecl 0x156fe98 <line:1:1, line:3:1> line:1:5 main 'int (int, char **)'\n"
+        const char clang[] = "`-FunctionDecl 0x156fe98 <a.cpp:1:1, line:3:1> line:1:5 main 'int (int, char **)'\n"
                              "  |-ParmVarDecl 0x156fd00 <col:10, col:14> col:14 argc 'int'\n"
                              "  |-ParmVarDecl 0x156fdb8 <col:20, col:27> col:27 argv 'char **'\n"
                              "  `-CompoundStmt 0x1596410 <line:2:1, line:2:1>\n"
@@ -481,7 +487,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxMemberCall() {
-        const char clang[] = "`-FunctionDecl 0x320dc80 <line:2:1, col:33> col:6 bar 'void ()'\n"
+        const char clang[] = "`-FunctionDecl 0x320dc80 <a.cpp:2:1, col:33> col:6 bar 'void ()'\n"
                              "  `-CompoundStmt 0x323bb08 <col:12, col:33>\n"
                              "    |-DeclStmt 0x323ba40 <col:14, col:22>\n"
                              "    | `-VarDecl 0x320df28 <col:14, col:21> col:21 used c 'C<int>':'C<int>' callinit\n"
@@ -493,7 +499,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxMethodDecl1() {
-        const char clang[] = "|-CXXMethodDecl 0x55c786f5ad60 <line:56:5, col:179> col:10 analyzeFile '_Bool (const std::string &, const std::string &, const std::string &, unsigned long long, std::list<ErrorLogger::ErrorMessage> *)'\n"
+        const char clang[] = "|-CXXMethodDecl 0x55c786f5ad60 <a.cpp:56:5, col:179> col:10 analyzeFile '_Bool (const std::string &, const std::string &, const std::string &, unsigned long long, std::list<ErrorLogger::ErrorMessage> *)'\n"
                              "| |-ParmVarDecl 0x55c786f5a4c8 <col:22, col:41> col:41 buildDir 'const std::string &'\n"
                              "| |-ParmVarDecl 0x55c786f5a580 <col:51, col:70> col:70 sourcefile 'const std::string &'\n"
                              "| |-ParmVarDecl 0x55c786f5a638 <col:82, col:101> col:101 cfg 'const std::string &'\n"
@@ -504,7 +510,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxMethodDecl2() { // "unexpanded" template method
-        const char clang[] = "`-CXXMethodDecl 0x220ecb0 parent 0x21e4c28 prev 0x21e5338 <line:11:1, line:18:1> line:14:1 find 'const typename char_traits<_CharT>::char_type *(const char_traits::char_type *, int, const char_traits::char_type &)'\n"
+        const char clang[] = "`-CXXMethodDecl 0x220ecb0 parent 0x21e4c28 prev 0x21e5338 <a.cpp:11:1, line:18:1> line:14:1 find 'const typename char_traits<_CharT>::char_type *(const char_traits::char_type *, int, const char_traits::char_type &)'\n"
                              "  `-CompoundStmt 0x220ede0 <line:15:1, line:18:1>\n"
                              "    `-ReturnStmt 0x220edd0 <line:17:5, col:12>\n"
                              "      `-IntegerLiteral 0x220edb0 <col:12> 'int' 0";
@@ -528,7 +534,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxMethodDecl4() {
-        const char clang[] = "|-ClassTemplateSpecializationDecl 0x15d82f8 <line:7:3, line:18:3> line:8:12 struct char_traits definition\n"
+        const char clang[] = "|-ClassTemplateSpecializationDecl 0x15d82f8 <a.cpp:7:3, line:18:3> line:8:12 struct char_traits definition\n"
                              "| |-TemplateArgument type 'char'\n"
                              "| | `-BuiltinType 0x15984c0 'char'\n"
                              "| |-CXXRecordDecl 0x15d8520 <col:5, col:12> col:12 implicit struct char_traits\n"
@@ -551,7 +557,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxNewExpr2() {
-        const char clang[] = "|-FunctionDecl 0x59a188 <line:7:1, line:9:1> line:7:11 f 'struct S *()'\n"
+        const char clang[] = "|-FunctionDecl 0x59a188 <a.cpp:7:1, line:9:1> line:7:11 f 'struct S *()'\n"
                              "| `-CompoundStmt 0x5c4318 <col:15, line:9:1>\n"
                              "|   `-ReturnStmt 0x5c4308 <line:8:3, col:14>\n"
                              "|     `-CXXNewExpr 0x5c42c8 <col:10, col:14> 'S *' Function 0x59a378 'operator new' 'void *(unsigned long)'\n"
@@ -568,7 +574,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxOperatorCallExpr() {
-        const char clang[] = "`-FunctionDecl 0x3c099f0 <line:2:1, col:24> col:6 foo 'void ()'\n"
+        const char clang[] = "`-FunctionDecl 0x3c099f0 <a.cpp:2:1, col:24> col:6 foo 'void ()'\n"
                              "  `-CompoundStmt 0x3c37308 <col:12, col:24>\n"
                              "    |-DeclStmt 0x3c0a060 <col:14, col:17>\n"
                              "    | `-VarDecl 0x3c09ae0 <col:14, col:16> col:16 used c 'C' callinit\n"
@@ -587,6 +593,9 @@ class TestClangImport : public TestFixture {
 
         clang = "`-CXXRecordDecl 0x34cc5f8 <C:\\Foo\\Bar Baz\\1.cpp:2:1, col:7> col:7 class Foo";
         ASSERT_EQUALS("class Foo ;", parse(clang));
+
+        clang = "`-CXXRecordDecl 0x34cc5f8 <C:/Foo/Bar Baz/1.cpp:2:1, col:7> col:7 class Foo";
+        ASSERT_EQUALS("class Foo ;", parse(clang));
     }
 
     void cxxRecordDecl2() {
@@ -621,7 +630,7 @@ class TestClangImport : public TestFixture {
     }
 
     void cxxStaticCastExpr3() {
-        const char clang[] = "`-ClassTemplateSpecializationDecl 0xd842d8 <line:4:3, line:7:3> line:4:21 struct char_traits definition\n"
+        const char clang[] = "`-ClassTemplateSpecializationDecl 0xd842d8 <a.cpp:4:3, line:7:3> line:4:21 struct char_traits definition\n"
                              "  |-TemplateArgument type 'char'\n"
                              "  | `-BuiltinType 0xd444c0 'char'\n"
                              "  |-CXXRecordDecl 0xd84500 <col:14, col:21> col:21 implicit struct char_traits\n"
@@ -675,7 +684,7 @@ class TestClangImport : public TestFixture {
     }
 
     void doStmt() {
-        const char clang[] = "`-FunctionDecl 0x27fbbc8 <line:2:1, col:34> col:6 foo 'void ()'\n"
+        const char clang[] = "`-FunctionDecl 0x27fbbc8 <a.cpp:2:1, col:34> col:6 foo 'void ()'\n"
                              "  `-CompoundStmt 0x27fbd08 <col:12, col:34>\n"
                              "    `-DoStmt 0x27fbce8 <col:14, col:31>\n"
                              "      |-CompoundStmt 0x27fbcb0 <col:17, col:22>\n"
@@ -686,7 +695,7 @@ class TestClangImport : public TestFixture {
     }
 
     void enumDecl1() {
-        const char clang[] = "`-EnumDecl 0x2660660 <line:3:1, col:16> col:6 referenced abc\n"
+        const char clang[] = "`-EnumDecl 0x2660660 <a.cpp:3:1, col:16> col:6 referenced abc\n"
                              "  |-EnumConstantDecl 0x2660720 <col:11> col:11 referenced a 'abc'\n"
                              "  |-EnumConstantDecl 0x2660768 <col:13> col:13 b 'abc'\n"
                              "  `-EnumConstantDecl 0x26607b0 <col:15> col:15 c 'abc'";
@@ -757,14 +766,14 @@ class TestClangImport : public TestFixture {
     }
 
     void funcdecl3() {
-        const char clang[] = "|-FunctionDecl 0x27cb6b8 <line:865:1, col:35> col:12 __overflow 'int (FILE *, int)' extern\n"
+        const char clang[] = "|-FunctionDecl 0x27cb6b8 <a.cpp:865:1, col:35> col:12 __overflow 'int (FILE *, int)' extern\n"
                              "| |-ParmVarDecl 0x27cb528 <col:24, col:29> col:30 'FILE *'\n"
                              "| `-ParmVarDecl 0x27cb5a0 <col:32> col:35 'int'";
         ASSERT_EQUALS("int __overflow ( FILE * , int ) ;", parse(clang));
     }
 
     void funcdecl4() {
-        const char clang[] = "|-FunctionDecl 0x272bb60 <line:658:15> col:15 implicit fwrite 'unsigned long (const void *, unsigned long, unsigned long, FILE *)' extern\n"
+        const char clang[] = "|-FunctionDecl 0x272bb60 <a.cpp:658:15> col:15 implicit fwrite 'unsigned long (const void *, unsigned long, unsigned long, FILE *)' extern\n"
                              "| |-ParmVarDecl 0x272cc40 <<invalid sloc>> <invalid sloc> 'const void *'\n"
                              "| |-ParmVarDecl 0x272cca0 <<invalid sloc>> <invalid sloc> 'unsigned long'\n"
                              "| |-ParmVarDecl 0x272cd00 <<invalid sloc>> <invalid sloc> 'unsigned long'\n"
@@ -922,24 +931,30 @@ class TestClangImport : public TestFixture {
                       parse(clang));
     }
 
-    void typedefDecl1() {
-        const char clang[] = "|-TypedefDecl 0x2d60180 <<invalid sloc>> <invalid sloc> implicit __int128_t '__int128'\n"
-                             "| `-BuiltinType 0x2d5fe80 '__int128'";
-        ASSERT_EQUALS("typedef __int128 __int128_t ;", parse(clang));
-    }
-
-    void typedefDecl2() {
-        const char clang[] = "|-TypedefDecl 0x2d604a8 <<invalid sloc>> <invalid sloc> implicit __NSConstantString 'struct __NSConstantString_tag'\n"
-                             "| `-RecordType 0x2d602c0 'struct __NSConstantString_tag'\n"
-                             "|   `-Record 0x2d60238 '__NSConstantString_tag'";
-        ASSERT_EQUALS("typedef struct __NSConstantString_tag __NSConstantString ;", parse(clang));
-    }
-
-    void typedefDecl3() {
-        const char clang[] = "|-TypedefDecl 0x2d60540 <<invalid sloc>> <invalid sloc> implicit __builtin_ms_va_list 'char *'\n"
-                             "| `-PointerType 0x2d60500 'char *'\n"
-                             "|   `-BuiltinType 0x2d5f980 'char'";
-        ASSERT_EQUALS("typedef char * __builtin_ms_va_list ;", parse(clang));
+    void typedefDeclPrologue()
+    {
+        // these TypedefDecl are included in *any* AST dump and we should ignore them as they should not be of interest to us
+        // see https://github.com/llvm/llvm-project/issues/120228#issuecomment-2549212109 for an explanation
+        const char clang[] =
+            "TranslationUnitDecl 0x60efd80ef9f8 <<invalid sloc>> <invalid sloc>\n"
+            "|-TypedefDecl 0x60efd80f0228 <<invalid sloc>> <invalid sloc> implicit __int128_t '__int128'\n"
+            "| `-BuiltinType 0x60efd80effc0 '__int128'\n"
+            "|-TypedefDecl 0x60efd80f0298 <<invalid sloc>> <invalid sloc> implicit __uint128_t 'unsigned __int128'\n"
+            "| `-BuiltinType 0x60efd80effe0 'unsigned __int128'\n"
+            "|-TypedefDecl 0x60efd80f05a0 <<invalid sloc>> <invalid sloc> implicit __NSConstantString 'struct __NSConstantString_tag'\n"
+            "| `-RecordType 0x60efd80f0370 'struct __NSConstantString_tag'\n"
+            "|   `-Record 0x60efd80f02f0 '__NSConstantString_tag'\n"
+            "|-TypedefDecl 0x60efd80f0648 <<invalid sloc>> <invalid sloc> implicit __builtin_ms_va_list 'char *'\n"
+            "| `-PointerType 0x60efd80f0600 'char *'\n"
+            "|   `-BuiltinType 0x60efd80efaa0 'char'\n"
+            "|-TypedefDecl 0x60efd80f0940 <<invalid sloc>> <invalid sloc> implicit __builtin_va_list 'struct __va_list_tag[1]'\n"
+            "| `-ConstantArrayType 0x60efd80f08e0 'struct __va_list_tag[1]' 1\n"
+            "|   `-RecordType 0x60efd80f0720 'struct __va_list_tag'\n"
+            "|     `-Record 0x60efd80f06a0 '__va_list_tag'\n"
+            "`-FunctionDecl 0x60efd8151470 <a.cpp:1:1, line:3:1> line:1:6 f 'void ()'\n"
+            "`-CompoundStmt 0x60efd8151560 <line:2:1, line:3:1>\n";
+
+        ASSERT_EQUALS("void f ( ) ;", parse(clang));
     }
 
     void unaryExprOrTypeTraitExpr1() {
@@ -950,7 +965,7 @@ class TestClangImport : public TestFixture {
     }
 
     void unaryExprOrTypeTraitExpr2() {
-        const char clang[] = "`-VarDecl 0x27c6c00 <line:3:5, col:23> col:9 x 'int' cinit\n"
+        const char clang[] = "`-VarDecl 0x27c6c00 <a.cpp:3:5, col:23> col:9 x 'int' cinit\n"
                              "  `-ImplicitCastExpr 0x27c6cc8 <col:13, col:23> 'int' <IntegralCast>\n"
                              "    `-UnaryExprOrTypeTraitExpr 0x27c6ca8 <col:13, col:23> 'unsigned long' sizeof\n"
                              "      `-ParenExpr 0x27c6c88 <col:19, col:23> 'char [10]' lvalue\n"
@@ -1004,12 +1019,12 @@ class TestClangImport : public TestFixture {
     }
 
     void vardecl4() {
-        const char clang[] = "|-VarDecl 0x23d6c78 <line:137:1, col:14> col:14 stdin 'FILE *' extern";
+        const char clang[] = "|-VarDecl 0x23d6c78 <a.cpp:137:1, col:14> col:14 stdin 'FILE *' extern";
         ASSERT_EQUALS("FILE * stdin@1 ;", parse(clang));
     }
 
     void vardecl5() {
-        const char clang[] = "|-VarDecl 0x2e31fc0 <line:27:1, col:38> col:26 sys_errlist 'const char *const []' extern";
+        const char clang[] = "|-VarDecl 0x2e31fc0 <a.cpp:27:1, col:38> col:26 sys_errlist 'const char *const []' extern";
         ASSERT_EQUALS("const char * const [] sys_errlist@1 ;", parse(clang));
     }
 
@@ -1048,11 +1063,12 @@ class TestClangImport : public TestFixture {
 
 
 #define GET_SYMBOL_DB(AST) \
-    const Settings settings = settingsBuilder().clang().platform(cppcheck::Platform::Type::Unix64).build(); \
-    Tokenizer tokenizer(&settings, this); \
+    const Settings settings = settingsBuilder().clang().platform(Platform::Type::Unix64).build(); \
+    TokenList tokenlist{settings, Standards::Language::CPP}; \
+    Tokenizer tokenizer(std::move(tokenlist), *this); \
     { \
         std::istringstream istr(AST); \
-        clangimport::parseClangAstDump(&tokenizer, istr); \
+        clangimport::parseClangAstDump(tokenizer, istr); \
     } \
     const SymbolDatabase *db = tokenizer.getSymbolDatabase(); \
     ASSERT(db)
@@ -1083,7 +1099,7 @@ class TestClangImport : public TestFixture {
         // Enum scope and type
         ASSERT_EQUALS(3, db->scopeList.size());
         const Scope &enumScope = db->scopeList.back();
-        ASSERT_EQUALS(Scope::ScopeType::eEnum, enumScope.type);
+        ASSERT_EQUALS_ENUM(ScopeType::eEnum, enumScope.type);
         ASSERT_EQUALS("abc", enumScope.className);
         const Type *enumType = enumScope.definedType;
         ASSERT_EQUALS("abc", enumType->name());
@@ -1128,8 +1144,8 @@ class TestClangImport : public TestFixture {
         const Scope *scope = db->functionScopes[0];
         const Function *func = scope->function;
         ASSERT_EQUALS(2, func->argCount());
-        ASSERT_EQUALS(0, (long long)func->getArgumentVar(0)->nameToken());
-        ASSERT_EQUALS(0, (long long)func->getArgumentVar(1)->nameToken());
+        ASSERT(!func->getArgumentVar(0)->nameToken());
+        ASSERT(!func->getArgumentVar(1)->nameToken());
     }
 
     void symbolDatabaseFunction3() { // #9640
@@ -1210,7 +1226,7 @@ class TestClangImport : public TestFixture {
     }
 
     void symbolDatabaseNodeType1() {
-        const char clang[] = "`-FunctionDecl 0x32438c0 <line:5:1, line:7:1> line:5:6 foo 'a::b (a::b)'\n"
+        const char clang[] = "`-FunctionDecl 0x32438c0 <a.cpp:5:1, line:7:1> line:5:6 foo 'a::b (a::b)'\n"
                              "  |-ParmVarDecl 0x32437b0 <col:10, col:15> col:15 used i 'a::b':'long'\n"
                              "  `-CompoundStmt 0x3243a60 <col:18, line:7:1>\n"
                              "    `-ReturnStmt 0x3243a48 <line:6:3, col:12>\n"
@@ -1247,7 +1263,7 @@ class TestClangImport : public TestFixture {
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "i");
         ASSERT(!!tok);
         ASSERT(!!tok->variable());
-        ASSERT_EQUALS(Scope::ScopeType::eFor, tok->variable()->scope()->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFor, tok->variable()->scope()->type);
     }
 
     void valueFlow1() {
@@ -1264,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() {
@@ -1286,7 +1302,7 @@ class TestClangImport : public TestFixture {
     }
 
     void valueType1() {
-        const char clang[] = "`-FunctionDecl 0x32438c0 <line:5:1, line:7:1> line:5:6 foo 'a::b (a::b)'\n"
+        const char clang[] = "`-FunctionDecl 0x32438c0 <a.cpp:5:1, line:7:1> line:5:6 foo 'a::b (a::b)'\n"
                              "  |-ParmVarDecl 0x32437b0 <col:10, col:15> col:15 used i 'a::b':'long'\n"
                              "  `-CompoundStmt 0x3243a60 <col:18, line:7:1>\n"
                              "    `-ReturnStmt 0x3243a48 <line:6:3, col:12>\n"
@@ -1314,6 +1330,48 @@ class TestClangImport : public TestFixture {
         ASSERT(!!tok->valueType());
         ASSERT_EQUALS("const signed char *", tok->valueType()->str());
     }
+
+    void stdinLoc() {
+        // we should never encounter this
+        /*
+           int i;
+         */
+        const char clang[] = "`-VarDecl 0x5776bb240470 <<stdin>:1:1, col:5> col:5 i 'int'\n";
+
+        ASSERT_THROW_INTERNAL_EQUALS(parse(clang), AST, "invalid AST location: <<stdin>");
+    }
+
+    void crash() {
+        const char* clang = "TranslationUnitDecl 0x56037914f998 <<invalid sloc>> <invalid sloc>\n"
+                            "|-ClassTemplateDecl 0x560379196b58 <test1.cpp:1:1, col:50> col:37 A\n"
+                            "| |-TemplateTypeParmDecl 0x560379196950 <col:11> col:19 typename depth 0 index 0\n"
+                            "| |-TemplateTypeParmDecl 0x5603791969f8 <col:21> col:29 typename depth 0 index 1\n"
+                            "| `-CXXRecordDecl 0x560379196ac8 <col:31, col:50> col:37 class A definition\n"
+                            "|   |-DefinitionData empty aggregate standard_layout trivially_copyable pod trivial literal has_constexpr_non_copy_move_ctor can_const_default_init\n"
+                            "|   | |-DefaultConstructor exists trivial constexpr needs_implicit defaulted_is_constexpr\n"
+                            "|   | |-CopyConstructor simple trivial has_const_param needs_implicit implicit_has_const_param\n"
+                            "|   | |-MoveConstructor exists simple trivial needs_implicit\n"
+                            "|   | |-CopyAssignment simple trivial has_const_param needs_implicit implicit_has_const_param\n"
+                            "|   | |-MoveAssignment exists simple trivial needs_implicit\n"
+                            "|   | `-Destructor simple irrelevant trivial needs_implicit\n"
+                            "|   |-CXXRecordDecl 0x560379196de0 <col:31, col:37> col:37 implicit referenced class A\n"
+                            "|   `-CXXRecordDecl 0x560379196e70 <col:41, col:47> col:47 class b\n"
+                            "|-CXXRecordDecl 0x560379197110 parent 0x560379196ac8 prev 0x560379196e70 <line:2:1, col:63> col:50 class b definition\n"
+                            "| |-DefinitionData empty standard_layout trivially_copyable has_user_declared_ctor can_const_default_init\n"
+                            "| | |-DefaultConstructor defaulted_is_constexpr\n"
+                            "| | |-CopyConstructor simple trivial has_const_param needs_implicit implicit_has_const_param\n"
+                            "| | |-MoveConstructor exists simple trivial needs_implicit\n"
+                            "| | |-CopyAssignment simple trivial has_const_param needs_implicit implicit_has_const_param\n"
+                            "| | |-MoveAssignment exists simple trivial needs_implicit\n"
+                            "| | `-Destructor simple irrelevant trivial needs_implicit\n"
+                            "| |-CXXRecordDecl 0x560379197250 <col:35, col:50> col:50 implicit referenced class b\n"
+                            "| `-CXXConstructorDecl 0x5603791974b8 <col:54, col:60> col:54 b 'void (A<type-parameter-0-0, type-parameter-0-1> &)'\n"
+                            "|   `-ParmVarDecl 0x560379197380 <col:56, col:59> col:59 a 'A<type-parameter-0-0, type-parameter-0-1> &'\n"
+                            "`-CXXConstructorDecl 0x5603791b5600 parent 0x560379197110 prev 0x5603791974b8 <line:3:1, col:55> col:47 b 'void (A<type-parameter-0-0, type-parameter-0-1> &)'\n"
+                            "  |-ParmVarDecl 0x5603791b5570 <col:49, col:51> col:52 'A<type-parameter-0-0, type-parameter-0-1> &'\n"
+                            "  `-CompoundStmt 0x5603791b5700 <col:54, col:55>\n";
+        (void)parse(clang); // don't crash
+    }
 };
 
 REGISTER_TEST(TestClangImport)
diff --git a/test/testclass.cpp b/test/testclass.cpp
index c7470314d5d..ffcf5b0f868 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-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
@@ -18,28 +18,32 @@
 
 #include "check.h"
 #include "checkclass.h"
+#include "ctu.h"
 #include "errortypes.h"
-#include "library.h"
-#include "preprocessor.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
+#include <cstddef>
 #include <list>
-#include <sstream> // IWYU pragma: keep
 #include <string>
 #include <vector>
 
-
 class TestClass : public TestFixture {
 public:
     TestClass() : TestFixture("TestClass") {}
 
 private:
-    Settings settings0 = settingsBuilder().severity(Severity::style).library("std.cfg").build();
-    Settings settings1 = settingsBuilder().severity(Severity::warning).library("std.cfg").build();
+    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_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;
         TEST_CASE(virtualDestructor1);      // Base class not found => no error
         TEST_CASE(virtualDestructor2);      // Base class doesn't have a destructor
         TEST_CASE(virtualDestructor3);      // Base class has a destructor, but it's not virtual
@@ -58,6 +62,7 @@ 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(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
 
@@ -181,6 +186,15 @@ class TestClass : public TestFixture {
         TEST_CASE(const89);
         TEST_CASE(const90);
         TEST_CASE(const91);
+        TEST_CASE(const92);
+        TEST_CASE(const93);
+        TEST_CASE(const94);
+        TEST_CASE(const95); // #13320 - do not warn about r-value ref method
+        TEST_CASE(const96);
+        TEST_CASE(const97);
+        TEST_CASE(const98);
+        TEST_CASE(const99);
+        TEST_CASE(const100);
 
         TEST_CASE(const_handleDefaultParameters);
         TEST_CASE(const_passThisToMemberOfOtherClass);
@@ -210,10 +224,12 @@ class TestClass : public TestFixture {
         TEST_CASE(const_shared_ptr);
         TEST_CASE(constPtrToConstPtr);
         TEST_CASE(constTrailingReturnType);
+        TEST_CASE(constRefQualified);
         TEST_CASE(staticArrayPtrOverload);
         TEST_CASE(qualifiedNameMember); // #10872
 
         TEST_CASE(initializerListOrder);
+        TEST_CASE(initializerListArgument);
         TEST_CASE(initializerListUsage);
         TEST_CASE(selfInitialization);
 
@@ -239,20 +255,18 @@ class TestClass : public TestFixture {
         TEST_CASE(ctuOneDefinitionRule);
 
         TEST_CASE(testGetFileInfo);
+
+        TEST_CASE(returnByReference);
     }
 
-#define checkCopyCtorAndEqOperator(code) checkCopyCtorAndEqOperator_(code, __FILE__, __LINE__)
-    void checkCopyCtorAndEqOperator_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
+#define checkCopyCtorAndEqOperator(...) checkCopyCtorAndEqOperator_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkCopyCtorAndEqOperator_(const char* file, int line, const char (&code)[size]) {
         const Settings settings = settingsBuilder().severity(Severity::warning).build();
 
-        Preprocessor preprocessor(settings);
-
         // Tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -265,25 +279,25 @@ class TestClass : public TestFixture {
                                    "    A(const A& other) { }\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
                                    "    A(const A& other) { }\n"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A\n"
                                    "{\n"
                                    "    A& operator=(const A& other) { return *this; }\n"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkCopyCtorAndEqOperator("class A\n"
@@ -291,7 +305,7 @@ class TestClass : public TestFixture {
                                    "    A(const A& other) { }\n"
                                    "    int x;\n"
                                    "};");
-        TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' has 'copy constructor' but lack of 'operator='.\n", "", errout.str());
+        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'
 
         checkCopyCtorAndEqOperator("class A\n"
@@ -299,7 +313,7 @@ class TestClass : public TestFixture {
                                    "    A& operator=(const A& other) { return *this; }\n"
                                    "    int x;\n"
                                    "};");
-        TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) The class 'A' has 'operator=' but lack of 'copy constructor'.\n", "", errout.str());
+        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'
 
         checkCopyCtorAndEqOperator("class A\n"
@@ -307,7 +321,7 @@ class TestClass : public TestFixture {
                                    "    A& operator=(const int &x) { this->x = x; return *this; }\n"
                                    "    int x;\n"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyCtorAndEqOperator("class A {\n"
                                    "public:\n"
@@ -327,7 +341,7 @@ class TestClass : public TestFixture {
                                    "private:\n"
                                    "    static int i;\n"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7987 - Don't show warning when there is a move constructor
         checkCopyCtorAndEqOperator("struct S {\n"
@@ -338,27 +352,22 @@ class TestClass : public TestFixture {
                                    "    return *this;\n"
                                    "  }\n"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
-#define checkExplicitConstructors(code) checkExplicitConstructors_(code, __FILE__, __LINE__)
-    void checkExplicitConstructors_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings0);
-
+#define checkExplicitConstructors(...) checkExplicitConstructors_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkExplicitConstructors_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings0, this);
@@ -374,7 +383,7 @@ class TestClass : public TestFixture {
                                   "    explicit Class(const std::string&) { }\n"
                                   "    Class(int a, int b) { }\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class() = delete;\n"
@@ -382,7 +391,7 @@ class TestClass : public TestFixture {
                                   "    explicit Class(Class&& other) { }\n"
                                   "    virtual int i() = 0;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class() = delete;\n"
@@ -390,37 +399,37 @@ class TestClass : public TestFixture {
                                   "    Class(Class&& other) = delete;\n"
                                   "    virtual int i() = 0;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(int i) { }\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Class 'Class' has a constructor with 1 argument that is not explicit.\n", errout.str());
+        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"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    Class(Class&& other) { }\n"
                                   "    virtual int i() = 0;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6585
         checkExplicitConstructors("class Class {\n"
                                   "    private: Class(const Class&);\n"
                                   "    virtual int i() = 0;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Class {\n"
                                   "    public: Class(const Class&);\n"
                                   "    virtual int i() = 0;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7465: Error properly reported in templates
         checkExplicitConstructors("template <class T> struct Test {\n"
@@ -431,7 +440,7 @@ class TestClass : public TestFixture {
                                   "  Test <int> test;\n"
                                   "  return 0;\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Struct 'Test < int >' has a constructor with 1 argument that is not explicit.\n", errout.str());
+        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
         checkExplicitConstructors("template <class T> struct Test {\n"
@@ -444,7 +453,7 @@ class TestClass : public TestFixture {
                                   "  Test <int> test;\n"
                                   "  return 0;\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8600
         checkExplicitConstructors("struct A { struct B; };\n"
@@ -452,12 +461,12 @@ class TestClass : public TestFixture {
                                   "    B() = default;\n"
                                   "    B(const B&) {}\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("struct A{"
                                   "    A(int, int y=2) {}"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Struct 'A' has a constructor with 1 argument that is not explicit.\n", errout.str());
+        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
                                   "    template <typename T>\n"
@@ -470,49 +479,52 @@ class TestClass : public TestFixture {
                                   "struct Baz {\n"
                                   "    explicit constexpr Baz(int) {}\n"
                                   "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Token;\n" // #11126
                                   "struct Branch {\n"
                                   "    Branch(Token* tok = nullptr) : endBlock(tok) {}\n"
                                   "    Token* endBlock = nullptr;\n"
                                   "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Struct 'Branch' has a constructor with 1 argument that is not explicit.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) Struct 'Branch' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]\n", errout_str());
 
         checkExplicitConstructors("struct S {\n"
                                   "    S(std::initializer_list<int> il) : v(il) {}\n"
                                   "    std::vector<int> v;\n"
                                   "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("template<class T>\n" // #10977
                                   "struct A {\n"
                                   "    template<class... Ts>\n"
                                   "    A(Ts&&... ts) {}\n"
                                   "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkExplicitConstructors("class Color {\n" // #7176
                                   "public:\n"
                                   "    Color(unsigned int rgba);\n"
                                   "    Color(std::uint8_t r = 0, std::uint8_t g = 0, std::uint8_t b = 0, std::uint8_t a = 255);\n"
                                   "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Class 'Color' has a constructor with 1 argument that is not explicit.\n"
-                      "[test.cpp:4]: (style) Class 'Color' has a constructor with 1 argument that is not explicit.\n",
-                      errout.str());
+        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(code) checkDuplInheritedMembers_(code, __FILE__, __LINE__)
-    void checkDuplInheritedMembers_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings1);
-
+#define checkDuplInheritedMembers(...) checkDuplInheritedMembers_( __FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkDuplInheritedMembers_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -526,7 +538,7 @@ class TestClass : public TestFixture {
                                   "struct Derived : Base {\n"
                                   "   int x;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
                                   "   protected:\n"
@@ -535,7 +547,7 @@ class TestClass : public TestFixture {
                                   "struct Derived : Base {\n"
                                   "   int x;\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'.\n", errout.str());
+        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"
                                   "   protected:\n"
@@ -544,7 +556,7 @@ class TestClass : public TestFixture {
                                   "struct Derived : public Base {\n"
                                   "   int x;\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base'.\n", errout.str());
+        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"
                                   "   int x;\n"
@@ -555,7 +567,7 @@ class TestClass : public TestFixture {
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base0 {\n"
                                   "   protected:\n"
@@ -567,7 +579,7 @@ class TestClass : public TestFixture {
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:9]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'.\n", errout.str());
+        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"
                                   "   protected:\n"
@@ -580,8 +592,8 @@ class TestClass : public TestFixture {
                                   "struct Derived : Base0, Base1 {\n"
                                   "   int x;\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:10]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base0'.\n"
-                      "[test.cpp:7] -> [test.cpp:10]: (warning) The struct 'Derived' defines member variable with name 'x' also defined in its parent class 'Base1'.\n", errout.str());
+        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());
 
         checkDuplInheritedMembers("class Base {\n"
                                   "   int x;\n"
@@ -589,7 +601,7 @@ class TestClass : public TestFixture {
                                   "struct Derived : Base {\n"
                                   "   int y;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class A {\n"
                                   "   int x;\n"
@@ -597,20 +609,20 @@ class TestClass : public TestFixture {
                                   "struct B {\n"
                                   "   int x;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown 'Base' class
         checkDuplInheritedMembers("class Derived : public UnknownBase {\n"
                                   "  int x;\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("class Base {\n"
                                   "   int x;\n"
                                   "};\n"
                                   "class Derived : public Base {\n"
                                   "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6692
         checkDuplInheritedMembers("namespace test1 {\n"
@@ -622,7 +634,7 @@ class TestClass : public TestFixture {
                                   "   int Value;\n"
                                   "   };\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9957
         checkDuplInheritedMembers("class Base {\n"
@@ -636,12 +648,12 @@ class TestClass : public TestFixture {
                                   "class Derived2 : public Derived1 {\n"
                                   "    int i;\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:10]: (warning) The class 'Derived2' defines member variable with name 'i' also defined in its parent class 'Base'.\n", errout.str());
+        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> { };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // don't crash on recursive template
         checkDuplInheritedMembers("namespace _impl {\n"
@@ -656,13 +668,13 @@ class TestClass : public TestFixture {
                                   "    struct fn_traits<decltype(void(&T::operator())), T>\n"
                                   "        : public fn_traits<void, decltype(&T::operator())> {};\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10594
         checkDuplInheritedMembers("template<int i> struct A { bool a = true; };\n"
                                   "struct B { bool a; };\n"
                                   "template<> struct A<1> : B {};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("struct B {\n"
                                   "    int g() const;\n"
@@ -672,8 +684,8 @@ class TestClass : public TestFixture {
                                   "    int g() const;\n"
                                   "    int f() const override { return g(); }\n"
                                   "};\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:6]: (warning) The struct 'D' defines member function with name 'g' also defined in its parent struct 'B'.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:6:9]: (warning) The struct 'D' defines member function with name 'g' also defined in its parent struct 'B'. [duplInheritedMember]\n",
+                      errout_str());
 
         checkDuplInheritedMembers("struct B {\n"
                                   "    int g() const;\n"
@@ -681,7 +693,7 @@ class TestClass : public TestFixture {
                                   "struct D : B {\n"
                                   "    int g(int) const;\n"
                                   "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkDuplInheritedMembers("struct S {\n"
                                   "    struct T {\n"
@@ -691,23 +703,48 @@ class TestClass : public TestFixture {
                                   "struct T : S::T {\n"
                                   "    T() : S::T() {}\n"
                                   "};\n");
-        ASSERT_EQUALS("", errout.str());
-    }
+        ASSERT_EQUALS("", errout_str());
 
-#define checkCopyConstructor(code) checkCopyConstructor_(code, __FILE__, __LINE__)
-    void checkCopyConstructor_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
+        checkDuplInheritedMembers("struct S {};\n" // #11827
+                                  "struct SPtr {\n"
+                                  "    virtual S* operator->() const { return p; }\n"
+                                  "    S* p = nullptr;\n"
+                                  "};\n"
+                                  "struct T : public S {};\n"
+                                  "struct TPtr : public SPtr {\n"
+                                  "    T* operator->() const { return (T*)p; }\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
 
-        Preprocessor preprocessor(settings0);
+        checkDuplInheritedMembers("struct B { virtual int& get() = 0; };\n" // #12311
+                                  "struct D : B {\n"
+                                  "    int i{};\n"
+                                  "    int& get() override { return i; }\n"
+                                  "    const int& get() const { return i; }\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
 
+        checkDuplInheritedMembers("class Base {\n" // #12353
+                                  "    public:\n"
+                                  "        void One();\n"
+                                  "        void Two();\n"
+                                  "};\n"
+                                  "class Derived : public Base {\n"
+                                  "public:\n"
+                                  "    void Two() = delete;\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+#define checkCopyConstructor(...) checkCopyConstructor_( __FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkCopyConstructor_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings3, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClass checkClass(&tokenizer, &settings3, this);
         checkClass.copyconstructors();
     }
 
@@ -729,7 +766,7 @@ class TestClass : public TestFixture {
                              "   F&operator=(const F&);\n"
                              "   ~F();\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());
+        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"
                              "   char *p;\n"
@@ -742,10 +779,10 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory.\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]: (warning) Value of pointer 'p', which points to allocated memory, is copied in copy constructor instead of allocating new memory.\n"
-                           , errout.str());
+                           "[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"
+                           , errout_str());
 
         checkCopyConstructor("class F\n"
                              "{\n"
@@ -765,7 +802,7 @@ class TestClass : public TestFixture {
         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",
                            ""
-                           , errout.str());
+                           , errout_str());
 
         checkCopyConstructor("class kalci\n"
                              "{\n"
@@ -792,7 +829,7 @@ class TestClass : public TestFixture {
                              "   ~kalci();\n"
                              "   kalci& operator=(const kalci&kalci);\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F\n"
                              "{\n"
@@ -817,7 +854,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\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());
+        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"
                              "   char *c;\n"
@@ -831,7 +868,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F {\n"
                              "   char *c;\n"
@@ -845,7 +882,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\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());
+        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"
                              "{\n"
@@ -860,7 +897,7 @@ class TestClass : public TestFixture {
                              "   ~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());
+        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"
@@ -884,7 +921,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F : E\n"
                              "{\n"
@@ -895,7 +932,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class E { E(E&); };\n" // non-copyable
                              "class F : E\n"
@@ -907,7 +944,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class E {};\n"
                              "class F : E {\n"
@@ -918,7 +955,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).\n", errout.str());
+        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"
@@ -929,7 +966,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class F {\n"
                              "   char *p;\n"
@@ -937,7 +974,7 @@ class TestClass : public TestFixture {
                              "   ~F();\n"
                              "   F& operator=(const F&f);\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Class 'F' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).\n", errout.str());
+        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"
@@ -946,7 +983,7 @@ class TestClass : public TestFixture {
                              "      p = malloc(100);\n"
                              "   }\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void copyConstructor2() { // ticket #4458
@@ -963,7 +1000,7 @@ class TestClass : public TestFixture {
                              "     Vector& operator=(const Vector&v);\n"
                              "    _Tp* _M_finish;\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void copyConstructor3() {
@@ -974,7 +1011,7 @@ class TestClass : public TestFixture {
                              "   F&operator=(const F &f);\n"
                              "   ~F();\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("struct F {\n"
                              "   char* c;\n"
@@ -983,7 +1020,7 @@ class TestClass : public TestFixture {
                              "   F&operator=(const F &f);\n"
                              "   ~F();\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3]: (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.\n", errout.str());
+        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());
     }
 
     void copyConstructor4() {
@@ -1006,7 +1043,7 @@ class TestClass : public TestFixture {
                              "private:\n"
                              "    int* m_ptr;\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void copyConstructor5() {
@@ -1019,7 +1056,7 @@ class TestClass : public TestFixture {
                              "private:\n"
                              "    int* m_ptr;\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("class Copyable {};\n"
                              "\n"
@@ -1030,7 +1067,7 @@ class TestClass : public TestFixture {
                              "private:\n"
                              "    int* m_ptr;\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void copyConstructor6() {
@@ -1041,11 +1078,38 @@ 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());
+                           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() {
@@ -1055,7 +1119,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   ~F();\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Struct 'F' does not have a operator= which is recommended since it has dynamic memory/resource allocation(s).\n", errout.str());
+        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"
@@ -1065,7 +1129,7 @@ class TestClass : public TestFixture {
                              "   F &operator=(const F &f) = default;\n"
                              "   ~F();\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3]: (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=.\n", errout.str());
+        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=
         checkCopyConstructor("struct F {\n"
@@ -1075,7 +1139,7 @@ class TestClass : public TestFixture {
                              "   F &operator=(const F &f) = delete;\n"
                              "   ~F();\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // base class deletes operator=
         checkCopyConstructor("struct F : NonCopyable {\n"
@@ -1084,7 +1148,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   ~F();\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noDestructor() {
@@ -1094,7 +1158,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s).\n", errout.str());
+        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"
@@ -1102,7 +1166,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkCopyConstructor("struct F {\n"
                              "   int* i;\n"
@@ -1110,7 +1174,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F& operator=(const F&);"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s).\n", errout.str());
+        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"
@@ -1119,7 +1183,7 @@ class TestClass : public TestFixture {
                              "   F(const F &f);\n"
                              "   F&operator=(const F&);"
                              "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Struct 'F' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s).\n", errout.str());
+        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"
@@ -1129,7 +1193,7 @@ class TestClass : public TestFixture {
                              "   F &operator=(const F &f);\n"
                              "   ~F() = default;\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3]: (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.\n", errout.str());
+        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
         checkCopyConstructor("struct F {\n"
@@ -1139,21 +1203,16 @@ class TestClass : public TestFixture {
                              "   F &operator=(const F &f);\n"
                              "   ~F() = delete;\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Check that operator Equal returns reference to this
-#define checkOpertorEqRetRefThis(code) checkOpertorEqRetRefThis_(code, __FILE__, __LINE__)
-    void checkOpertorEqRetRefThis_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings0);
-
+#define checkOpertorEqRetRefThis(...) checkOpertorEqRetRefThis_( __FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkOpertorEqRetRefThis_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings0, this);
@@ -1167,7 +1226,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1175,7 +1234,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a) { return a; }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1184,7 +1243,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &);\n"
             "};\n"
             "A & A::operator=(const A &a) { return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1193,7 +1252,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &a);\n"
             "};\n"
             "A & A::operator=(const A &a) { return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1202,7 +1261,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &);\n"
             "};\n"
             "A & A::operator=(const A &a) { return a; }");
-        ASSERT_EQUALS("[test.cpp:6]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:8]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1211,7 +1270,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &a);\n"
             "};\n"
             "A & A::operator=(const A &a) { return a; }");
-        ASSERT_EQUALS("[test.cpp:6]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:8]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1223,7 +1282,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1235,7 +1294,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &b) { return b; }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:7]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:13]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1248,7 +1307,7 @@ class TestClass : public TestFixture {
             "    };\n"
             "};\n"
             "A::B & A::B::operator=(const A::B &b) { return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A\n"
@@ -1261,7 +1320,7 @@ class TestClass : public TestFixture {
             "    };\n"
             "};\n"
             "A::B & A::B::operator=(const A::B &b) { return b; }");
-        ASSERT_EQUALS("[test.cpp:10]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1271,7 +1330,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  B & operator=(const B & b) { return b; }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:7]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1282,7 +1341,7 @@ class TestClass : public TestFixture {
             "  B & operator=(const B &);\n"
             "};\n"
             "A::B & A::B::operator=(const A::B & b) { return b; }");
-        ASSERT_EQUALS("[test.cpp:8]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1292,7 +1351,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::B & operator=(const A::B & b) { return b; }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:10]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1303,7 +1362,7 @@ class TestClass : public TestFixture {
             "  A::B & operator=(const A::B &);\n"
             "};\n"
             "A::B & A::B::operator=(const A::B & b) { return b; }");
-        ASSERT_EQUALS("[test.cpp:8]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace A {\n"
@@ -1313,7 +1372,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  B & operator=(const B & b) { return b; }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:7]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace A {\n"
@@ -1324,7 +1383,7 @@ class TestClass : public TestFixture {
             "  B & operator=(const B &);\n"
             "};\n"
             "A::B & A::B::operator=(const A::B & b) { return b; }");
-        ASSERT_EQUALS("[test.cpp:8]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace A {\n"
@@ -1334,7 +1393,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::B & operator=(const A::B & b) { return b; }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:10]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace A {\n"
@@ -1345,7 +1404,7 @@ class TestClass : public TestFixture {
             "  A::B & operator=(const A::B &);\n"
             "};\n"
             "A::B & A::B::operator=(const A::B & b) { return b; }");
-        ASSERT_EQUALS("[test.cpp:8]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:14]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis( // #11380
             "struct S {\n"
@@ -1355,7 +1414,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    int i;\n"
             "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqRetRefThis2() {
@@ -1365,7 +1424,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other) {}\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class szp\n"
@@ -1373,7 +1432,7 @@ class TestClass : public TestFixture {
             "  szp &operator =(int *other);\n"
             "};\n"
             "szp &szp::operator =(int *other) {}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:11]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace NS {\n"
@@ -1383,7 +1442,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other) {}\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace NS {\n"
@@ -1394,7 +1453,7 @@ class TestClass : public TestFixture {
             "  szp &operator =(int *other);\n"
             "};\n"
             "NS::szp &NS::szp::operator =(int *other) {}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:19]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace NS {\n"
@@ -1404,7 +1463,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  NS::szp &operator =(int *other) {}\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "namespace NS {\n"
@@ -1415,7 +1474,7 @@ class TestClass : public TestFixture {
             "  NS::szp &operator =(int *other);\n"
             "};\n"
             "NS::szp &NS::szp::operator =(int *other) {}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:19]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1425,7 +1484,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  szp &operator =(int *other) {}\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:8]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1436,7 +1495,7 @@ class TestClass : public TestFixture {
             "  szp &operator =(int *other);\n"
             "};\n"
             "A::szp &A::szp::operator =(int *other) {}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:17]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1446,7 +1505,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  A::szp &operator =(int *other) {}\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:6]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:11]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1457,7 +1516,7 @@ class TestClass : public TestFixture {
             "  A::szp &operator =(int *other);\n"
             "};\n"
             "A::szp &A::szp::operator =(int *other) {}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:17]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
     }
 
     void operatorEqRetRefThis3() {
@@ -1468,7 +1527,7 @@ class TestClass : public TestFixture {
             "  inline A &operator =(int *other) { return (*this); };\n"
             "  inline A &operator =(long *other) { return (*this = 0); };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1478,7 +1537,7 @@ class TestClass : public TestFixture {
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
             "A &A::operator =(long *other) { return (*this = 0); };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1486,7 +1545,7 @@ class TestClass : public TestFixture {
             "  inline A &operator =(int *other) { return (*this); };\n"
             "  inline A &operator =(long *other) { return operator = (*(int *)other); };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1496,7 +1555,7 @@ class TestClass : public TestFixture {
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
             "A &A::operator =(long *other) { return operator = (*(int *)other); };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1506,7 +1565,7 @@ class TestClass : public TestFixture {
             "};\n"
             "A &A::operator =(int *other) { return (*this); };\n"
             "A &A::operator =(long *other) { return this->operator = (*(int *)other); };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqRetRefThis( // #9045
             "class V {\n"
@@ -1518,7 +1577,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqRetRefThis4() {
@@ -1528,7 +1587,7 @@ class TestClass : public TestFixture {
             "{\n"
             "  return (P&)(*this += pc);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqRetRefThis5() {
@@ -1538,21 +1597,21 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a) { }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        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"
             "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        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"
             "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) 'operator=' should return reference to 'this' instance.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) 'operator=' should return reference to 'this' instance. [operatorEqRetRefThis]\n", errout_str());
 
         checkOpertorEqRetRefThis(
             "class A {\n"
@@ -1562,7 +1621,7 @@ class TestClass : public TestFixture {
             "        throw std::exception();\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) 'operator=' should either return reference to 'this' instance or be declared private and left unimplemented.\n", errout.str());
+        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(
             "class A {\n"
@@ -1572,7 +1631,7 @@ class TestClass : public TestFixture {
             "        abort();\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) 'operator=' should either return reference to 'this' instance or be declared private and left unimplemented.\n", errout.str());
+        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(
             "class A {\n"
@@ -1580,7 +1639,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &a);\n"
             "};\n"
             "A & A :: operator=(const A &a) { }");
-        ASSERT_EQUALS("[test.cpp:5]: (error) No 'return' statement in non-void function causes undefined behavior.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) No 'return' statement in non-void function causes undefined behavior. [operatorEqMissingReturnStatement]\n", errout_str());
     }
 
     void operatorEqRetRefThis6() { // ticket #2478 (segmentation fault)
@@ -1615,21 +1674,16 @@ class TestClass : public TestFixture {
             "    return replaceImplDiscr();\n"
             "  }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Check that operator Equal checks for assignment to self
-#define checkOpertorEqToSelf(code) checkOpertorEqToSelf_(code, __FILE__, __LINE__)
-    void checkOpertorEqToSelf_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings1);
-
+#define checkOpertorEqToSelf(...) checkOpertorEqToSelf_( __FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkOpertorEqToSelf_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -1644,7 +1698,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a) { if (&a != this) { } return *this; }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but it is not needed
         checkOpertorEqToSelf(
@@ -1653,7 +1707,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
         checkOpertorEqToSelf(
@@ -1671,7 +1725,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this class needs an assignment test but doesn't have it
         checkOpertorEqToSelf(
@@ -1686,7 +1740,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1696,7 +1750,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &);\n"
             "};\n"
             "A & A::operator=(const A &a) { if (&a != this) { } return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
         checkOpertorEqToSelf(
@@ -1706,7 +1760,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &);\n"
             "};\n"
             "A & A::operator=(const A &a) { return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
         checkOpertorEqToSelf(
@@ -1725,7 +1779,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has the inverse test
         checkOpertorEqToSelf(
@@ -1744,7 +1798,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1763,7 +1817,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1782,7 +1836,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1801,7 +1855,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1820,7 +1874,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1842,7 +1896,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1863,7 +1917,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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 but doesn’t have it
@@ -1880,7 +1934,7 @@ class TestClass : public TestFixture {
             "    s = strdup(a.s);\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1898,7 +1952,7 @@ class TestClass : public TestFixture {
             "    delete oldtree;\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -1914,7 +1968,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &b) { if (&b != this) { } return *this; }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
         checkOpertorEqToSelf(
@@ -1927,7 +1981,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but has it
         checkOpertorEqToSelf(
@@ -1947,7 +2001,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but doesn't have it
         checkOpertorEqToSelf(
@@ -1966,7 +2020,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -1980,7 +2034,7 @@ class TestClass : public TestFixture {
             "    };\n"
             "};\n"
             "A::B & A::B::operator=(const A::B &b) { if (&b != this) { } return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test doesn't have an assignment test but doesn't need it
         checkOpertorEqToSelf(
@@ -1994,7 +2048,7 @@ class TestClass : public TestFixture {
             "    };\n"
             "};\n"
             "A::B & A::B::operator=(const A::B &b) { return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test and has it
         checkOpertorEqToSelf(
@@ -2017,7 +2071,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             " }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test needs an assignment test but doesn't have it
         checkOpertorEqToSelf(
@@ -2037,7 +2091,7 @@ class TestClass : public TestFixture {
             "    s = strdup(b.s);\n"
             "    return *this;\n"
             " }");
-        ASSERT_EQUALS("[test.cpp:11]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:14]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
     }
 
     void operatorEqToSelf3() {
@@ -2048,7 +2102,7 @@ class TestClass : public TestFixture {
             "public:\n"
             "    A & operator=(const A &a) { return *this; }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
         checkOpertorEqToSelf(
@@ -2063,7 +2117,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -2073,7 +2127,7 @@ class TestClass : public TestFixture {
             "    A & operator=(const A &);\n"
             "};\n"
             "A & A::operator=(const A &a) { return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
         checkOpertorEqToSelf(
@@ -2089,7 +2143,7 @@ class TestClass : public TestFixture {
             "    s = strdup(a.s);\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqToSelf4() {
@@ -2104,7 +2158,7 @@ class TestClass : public TestFixture {
             "        B & operator=(const B &b) { return *this; }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
         checkOpertorEqToSelf(
@@ -2123,7 +2177,7 @@ class TestClass : public TestFixture {
             "        }\n"
             "    };\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        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
         checkOpertorEqToSelf(
@@ -2137,7 +2191,7 @@ class TestClass : public TestFixture {
             "    };\n"
             "};\n"
             "A::B & A::B::operator=(const A::B &b) { return *this; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // this test has multiple inheritance and needs an assignment test but there is no trivial way to test for it
         checkOpertorEqToSelf(
@@ -2157,7 +2211,7 @@ class TestClass : public TestFixture {
             "    s = strdup(b.s);\n"
             "    return *this;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqToSelf5() {
@@ -2177,7 +2231,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2194,7 +2248,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2211,7 +2265,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2228,7 +2282,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2245,7 +2299,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2262,7 +2316,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2279,7 +2333,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2296,7 +2350,7 @@ class TestClass : public TestFixture {
             "        return *this;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2314,7 +2368,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2332,7 +2386,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2350,7 +2404,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2368,7 +2422,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2386,7 +2440,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2404,7 +2458,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2422,7 +2476,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "class A\n"
@@ -2440,7 +2494,7 @@ class TestClass : public TestFixture {
             "    }\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOpertorEqToSelf(
             "struct A {\n"
@@ -2452,7 +2506,7 @@ class TestClass : public TestFixture {
             "    s = strdup(a.s);\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqToSelf6() {
@@ -2471,7 +2525,7 @@ class TestClass : public TestFixture {
             "private:\n"
             "    char * data;\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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(
             "class A\n"
@@ -2488,7 +2542,7 @@ class TestClass : public TestFixture {
             "    strcpy(data, a.data);\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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(
             "class A\n"
@@ -2504,7 +2558,7 @@ class TestClass : public TestFixture {
             "private:\n"
             "    char * data;\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        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(
             "class A\n"
@@ -2521,7 +2575,7 @@ class TestClass : public TestFixture {
             "    *data = *a.data;\n"
             "    return *this;\n"
             "};");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:8]: (warning) 'operator=' should check for assignment to self to avoid problems with dynamic memory. [operatorEqToSelf]\n", errout_str());
     }
 
     void operatorEqToSelf7() {
@@ -2538,7 +2592,7 @@ class TestClass : public TestFixture {
             "        return assign(a);\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqToSelf8() {
@@ -2557,7 +2611,7 @@ class TestClass : public TestFixture {
             "{\n"
             "    return copy(in);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqToSelf9() {
@@ -2576,28 +2630,26 @@ class TestClass : public TestFixture {
             "{\n"
             "    return Foo::operator=(&other);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
+    struct CheckVirtualDestructorOptions
+    {
+        bool inconclusive = false;
+    };
+
     // Check that base classes have virtual destructors
 #define checkVirtualDestructor(...) checkVirtualDestructor_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkVirtualDestructor_(const char* file, int line, const char code[], bool inconclusive = false) {
-        // Clear the error log
-        errout.str("");
-
-        // TODO: subsequent tests depend on these changes - should use SettingsBuilder
-        settings0.certainty.setEnabled(Certainty::inconclusive, inconclusive);
-        settings0.severity.enable(Severity::warning);
-
-        Preprocessor preprocessor(settings0);
+    template<size_t size>
+    void checkVirtualDestructor_(const char* file, int line, const char (&code)[size], const CheckVirtualDestructorOptions& options = make_default_obj()) {
+        const Settings& s = options.inconclusive ? settings3_i : settings3;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(s, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClass checkClass(&tokenizer, &s, this);
         checkClass.virtualDestructor();
     }
 
@@ -2607,12 +2659,12 @@ class TestClass : public TestFixture {
         checkVirtualDestructor("class Derived : public Base { };\n"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualDestructor("class Derived : Base { };\n"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void virtualDestructor2() {
@@ -2622,25 +2674,25 @@ class TestClass : public TestFixture {
                                "class Derived : public Base { public: ~Derived() { (void)11; } };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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; } };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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; } };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualDestructor("class Base { };\n"
                                "class Derived : Base { public: ~Derived() { (void)11; } };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9104
         checkVirtualDestructor("struct A\n"
@@ -2661,7 +2713,7 @@ class TestClass : public TestFixture {
                                "    Base* p = new Derived();\n"
                                "    delete p;\n"
                                "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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"
                                "struct A\n"
@@ -2682,7 +2734,7 @@ class TestClass : public TestFixture {
                                "    Base* p = new Derived();\n"
                                "    delete p;\n"
                                "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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());
     }
 
     void virtualDestructor3() {
@@ -2692,19 +2744,19 @@ class TestClass : public TestFixture {
                                "class Derived : public Base { public: ~Derived() { (void)11; } };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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; } };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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; } };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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());
     }
 
     void virtualDestructor4() {
@@ -2714,13 +2766,13 @@ class TestClass : public TestFixture {
                                "class Derived : public Base { };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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 { };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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());
     }
 
     void virtualDestructor5() {
@@ -2730,13 +2782,13 @@ class TestClass : public TestFixture {
                                "class Derived : public Base { public: ~Derived() {} };"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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() {}"
                                "Base *base = new Derived;\n"
                                "delete base;");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+        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());
     }
 
     void virtualDestructor6() {
@@ -2745,7 +2797,7 @@ class TestClass : public TestFixture {
 
         checkVirtualDestructor("class Base { public: ~Base(); };\n"
                                "class Derived : public Base { public: ~Derived() { (void)11; } };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void virtualDestructorProtected() {
@@ -2762,7 +2814,7 @@ class TestClass : public TestFixture {
                                "public:\n"
                                "    ~B() { int a; }\n"
                                "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void virtualDestructorInherited() {
@@ -2783,7 +2835,7 @@ class TestClass : public TestFixture {
                                "public:\n"
                                "    ~B() { int a; }\n"
                                "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // class A inherits virtual destructor from struct Base -> no error
         // also notice that public is not given, but destructor is public, because
@@ -2801,7 +2853,7 @@ class TestClass : public TestFixture {
                                "public:\n"
                                "    ~B() { int a; }\n"
                                "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown Base class -> it could have virtual destructor, so ignore
         checkVirtualDestructor("class A : private Base\n"
@@ -2815,7 +2867,7 @@ class TestClass : public TestFixture {
                                "public:\n"
                                "    ~B() { int a; }\n"
                                "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Virtual destructor is inherited -> no error
         checkVirtualDestructor("class Base2\n"
@@ -2836,7 +2888,7 @@ class TestClass : public TestFixture {
                                "public:\n"
                                "    ~B() { int a; }\n"
                                "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // class A doesn't inherit virtual destructor from class Base -> error
         checkVirtualDestructor("class Base\n"
@@ -2856,7 +2908,7 @@ class TestClass : public TestFixture {
                                "    ~B() { int a; }\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());
+                           "", errout_str());
     }
 
     void virtualDestructorTemplate() {
@@ -2877,7 +2929,7 @@ class TestClass : public TestFixture {
                                "};\n"
                                "\n"
                                "AA<double> *p = new B; delete p;");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Class 'AA < double >' which is inherited by class 'B' does not have a virtual destructor.\n", errout.str());
+        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());
     }
 
     void virtualDestructorInconclusive() {
@@ -2885,8 +2937,8 @@ class TestClass : public TestFixture {
                                "public:\n"
                                "    ~Base(){}\n"
                                "    virtual void foo(){}\n"
-                               "};\n", true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Class 'Base' which has virtual members does not have a virtual destructor.\n", errout.str());
+                               "};\n", dinit(CheckVirtualDestructorOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:6]: (warning, inconclusive) Class 'Base' which has virtual members does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         checkVirtualDestructor("class Base {\n"
                                "public:\n"
@@ -2900,8 +2952,8 @@ class TestClass : public TestFixture {
                                "void foo() {\n"
                                "    Base * base = new Derived();\n"
                                "    delete base;\n"
-                               "}\n", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor.\n", errout.str());
+                               "}\n", dinit(CheckVirtualDestructorOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:6]: (error) Class 'Base' which is inherited by class 'Derived' does not have a virtual destructor. [virtualDestructor]\n", errout_str());
 
         // class Base destructor is not virtual but protected -> no error
         checkVirtualDestructor("class Base {\n"
@@ -2909,34 +2961,29 @@ class TestClass : public TestFixture {
                                "    virtual void foo(){}\n"
                                "protected:\n"
                                "    ~Base(){}\n"
-                               "};\n", true);
-        ASSERT_EQUALS("", errout.str());
+                               "};\n", dinit(CheckVirtualDestructorOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualDestructor("class C {\n"
                                "private:\n"
                                "    C();\n"
                                "    virtual ~C();\n"
-                               "};\n", true);
-        ASSERT_EQUALS("", errout.str());
+                               "};\n", dinit(CheckVirtualDestructorOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
 
 #define checkNoMemset(...) checkNoMemset_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkNoMemset_(const char* file, int line, const char code[]) {
-        const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).library("std.cfg").build();
-        checkNoMemset_(file, line, code, settings);
+    template<size_t size>
+    void checkNoMemset_(const char* file, int line, const char (&code)[size]) {
+        checkNoMemset_(file, line, code, settings4);
     }
 
-    void checkNoMemset_(const char* file, int line, const char code[], const Settings &settings) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings);
-
+    template<size_t size>
+    void checkNoMemset_(const char* file, int line, const char (&code)[size], const Settings &settings) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -2952,7 +2999,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -2963,7 +3010,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -2974,7 +3021,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -2985,7 +3032,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Using 'memset' on class that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -2996,7 +3043,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Using 'memset' on class that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred {\n"
                       "    std::string b;\n"
@@ -3005,7 +3052,7 @@ class TestClass : public TestFixture {
                       "void Fred::f() {\n"
                       "    memset(this, 0, sizeof(*this));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Using 'memset' on class that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -3015,7 +3062,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -3026,7 +3073,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Using 'memset' on class that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -3038,7 +3085,7 @@ class TestClass : public TestFixture {
                       "    Pebbles pebbles;\n"
                       "    memset(&pebbles, 0, sizeof(pebbles));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Using 'memset' on class that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -3049,7 +3096,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Using 'memset' on class that contains a virtual function.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -3060,7 +3107,7 @@ class TestClass : public TestFixture {
                       "    static Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Using 'memset' on class that contains a virtual function.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on class that contains a virtual function. [memsetClass]\n", errout_str());
 
         checkNoMemset("class Fred\n"
                       "{\n"
@@ -3075,7 +3122,7 @@ class TestClass : public TestFixture {
                       "    Pebbles pebbles;\n"
                       "    memset(&pebbles, 0, sizeof(pebbles));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:12]: (error) Using 'memset' on class that contains a virtual function.\n", errout.str());
+        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
         checkNoMemset("namespace n1 {\n"
@@ -3089,7 +3136,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(Fred));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Fred with namespace qualifier
         checkNoMemset("namespace n1 {\n"
@@ -3103,7 +3150,7 @@ class TestClass : public TestFixture {
                       "    n1::Fred fred;\n"
                       "    memset(&fred, 0, sizeof(n1::Fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Using 'memset' on class that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         // Fred with namespace qualifier
         checkNoMemset("namespace n1 {\n"
@@ -3117,7 +3164,7 @@ class TestClass : public TestFixture {
                       "    n1::Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Using 'memset' on class that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:5]: (error) Using 'memset' on class that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class A {\n"
                       "  virtual ~A() { }\n"
@@ -3128,7 +3175,7 @@ class TestClass : public TestFixture {
                       "  A** arr = new A*[N];\n"
                       "  memset(arr, 0, N * sizeof(A*));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class A {\n" // #5116 - nested class data is mixed in the SymbolDatabase
                       "  std::string s;\n"
@@ -3137,7 +3184,7 @@ class TestClass : public TestFixture {
                       "void f(A::B *b) {\n"
                       "  memset(b,0,4);\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4461 Warn about memset/memcpy on class with references as members
         checkNoMemset("class A {\n"
@@ -3147,7 +3194,7 @@ class TestClass : public TestFixture {
                       "  A a;\n"
                       "  memset(&a, 0, sizeof(a));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Using 'memset' on class that contains a reference.\n", errout.str());
+        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"
                       "};\n"
@@ -3155,7 +3202,7 @@ class TestClass : public TestFixture {
                       "  A a;\n"
                       "  memset(&a, 0, sizeof(a));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Using 'memset' on class that contains a reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:3]: (error) Using 'memset' on class that contains a reference. [memsetClassReference]\n", errout_str());
 
         // #7456
         checkNoMemset("struct A {\n"
@@ -3169,7 +3216,7 @@ class TestClass : public TestFixture {
                       "  B b[4];\n"
                       "  memset(b, 0, sizeof(b));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8619
         checkNoMemset("struct S { std::vector<int> m; };\n"
@@ -3180,11 +3227,11 @@ class TestClass : public TestFixture {
                       "    memset(&v[0], 0, 5 * sizeof(S));\n"
                       "    memset(&v[0], 0, sizeof(S) * 5);\n"
                       "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Using 'memset' on struct that contains a 'std::vector'.\n"
-                      "[test.cpp:5]: (error) Using 'memset' on struct that contains a 'std::vector'.\n"
-                      "[test.cpp:6]: (error) Using 'memset' on struct that contains a 'std::vector'.\n"
-                      "[test.cpp:7]: (error) Using 'memset' on struct that contains a 'std::vector'.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n"
+                      "[test.cpp:5:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n"
+                      "[test.cpp:6:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n"
+                      "[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n",
+                      errout_str());
 
         // #1655
         const Settings s = settingsBuilder().library("std.cfg").build();
@@ -3193,7 +3240,7 @@ class TestClass : public TestFixture {
                       "    std::string s;\n"
                       "    memcpy(&s, c, strlen(c) + 1);\n"
                       "}\n", s);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Using 'memcpy' on std::string.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Using 'memcpy' on std::string. [memsetClass]\n", errout_str());
 
         checkNoMemset("template <typename T>\n"
                       "    void f(T* dst, const T* src, int N) {\n"
@@ -3205,13 +3252,13 @@ class TestClass : public TestFixture {
                       "    P Dst[2];\n"
                       "    f<P>(Dst, Src, 2);\n"
                       "}\n", s);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("void f() {\n"
                       "    std::array<char, 4> a;\n"
                       "    std::memset(&a, 0, 4);\n"
                       "}\n", s);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void memsetOnInvalid() { // Ticket #5425
@@ -3239,7 +3286,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
                       "{\n"
@@ -3249,7 +3296,7 @@ class TestClass : public TestFixture {
                       "    struct A a;\n"
                       "    memset(&a, 0, sizeof(struct A));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
                       "{\n"
@@ -3259,14 +3306,14 @@ class TestClass : public TestFixture {
                       "    struct A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("void f()\n"
                       "{\n"
                       "    struct sockaddr_in6 fail;\n"
                       "    memset(&fail, 0, sizeof(struct sockaddr_in6));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A\n"
                       "{\n"
@@ -3279,7 +3326,7 @@ class TestClass : public TestFixture {
                       " struct A fail;\n"
                       " memset(&fail, 0, sizeof(struct A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Using 'memset' on struct that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:2]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct Fred\n"
                       "{\n"
@@ -3290,7 +3337,7 @@ class TestClass : public TestFixture {
                       "    Fred fred;\n"
                       "    memset(&fred, 0, sizeof(fred));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Using 'memset' on struct that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct Stringy {\n"
                       "    std::string inner;\n"
@@ -3303,7 +3350,7 @@ class TestClass : public TestFixture {
                       "    memset(&foo, 0, sizeof(Foo));\n"
                       "}");
 
-        ASSERT_EQUALS("[test.cpp:9]: (error) Using 'memset' on struct that contains a 'std::string'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
     }
 
     void memsetVector() {
@@ -3315,7 +3362,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on class that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on class that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
                       "{ std::vector<int> ints; };\n"
@@ -3325,7 +3372,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on struct that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
                       "{ std::vector<int> ints; };\n"
@@ -3335,7 +3382,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(struct A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on struct that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
                       "{ std::vector<int> ints; };\n"
@@ -3345,7 +3392,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(a));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on struct that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("class A\n"
                       "{ std::vector< std::vector<int> > ints; };\n"
@@ -3355,7 +3402,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on class that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on class that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
                       "{ std::vector< std::vector<int> > ints; };\n"
@@ -3365,7 +3412,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on struct that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
                       "{ std::vector< std::vector<int> > ints; };\n"
@@ -3375,7 +3422,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(a));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on struct that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A\n"
                       "{ std::vector<int *> ints; };\n"
@@ -3385,7 +3432,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Using 'memset' on struct that contains a 'std::vector'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Using 'memset' on struct that contains a 'std::vector'. [memsetClass]\n", errout_str());
 
         checkNoMemset("struct A {\n"
                       "     std::vector<int *> buf;\n"
@@ -3395,7 +3442,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(a, 0, 100);\n"
                       "}");
-        ASSERT_EQUALS("", errout.str()); // #4460
+        ASSERT_EQUALS("", errout_str()); // #4460
 
         checkNoMemset("struct C {\n"
                       "    std::string s;\n"
@@ -3413,10 +3460,10 @@ class TestClass : public TestFixture {
                       "    memset(c2, 0, 10);\n"
                       "    memset(c3, 0, 10);\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Using 'memset' on struct that contains a 'std::string'.\n"
-                      "[test.cpp:11]: (error) Using 'memset' on struct that contains a 'std::string'.\n"
-                      "[test.cpp:12]: (error) Using 'memset' on struct that contains a 'std::string'.\n"
-                      "[test.cpp:13]: (error) Using 'memset' on struct that contains a 'std::string'.\n", errout.str());
+        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"
+                      "[test.cpp:13:5]: (error) Using 'memset' on struct that contains a 'std::string'. [memsetClass]\n", errout_str());
 
         // Ticket #6953
         checkNoMemset("typedef float realnum;\n"
@@ -3429,16 +3476,16 @@ class TestClass : public TestFixture {
                       "  memset(d, 0, sizeof(multilevel_data));\n"
                       "  return (void*) d;\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:8]: (portability) Using memset() on struct which contains a floating point number.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:3]: (portability) Using memset() on struct which contains a floating point number. [memsetClassFloat]\n", errout_str());
     }
 
     void memsetOnStdPodType() { // Ticket #5901
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <podtype name=\"std::uint8_t\" sign=\"u\" size=\"1\"/>\n"
-                               "  <podtype name=\"std::atomic_bool\"/>\n"
-                               "</def>";
-        const Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <podtype name=\"std::uint8_t\" sign=\"u\" size=\"1\"/>\n"
+                                   "  <podtype name=\"std::atomic_bool\"/>\n"
+                                   "</def>";
+        const Settings settings = settingsBuilder().libraryxml(xmldata).build();
 
         checkNoMemset("class A {\n"
                       "    std::array<int, 10> ints;\n"
@@ -3447,7 +3494,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str()); // std::array is POD (#5481)
+        ASSERT_EQUALS("", errout_str()); // std::array is POD (#5481)
 
         checkNoMemset("struct st {\n"
                       "  std::uint8_t a;\n"
@@ -3458,7 +3505,7 @@ class TestClass : public TestFixture {
                       "  st s;\n"
                       "  std::memset(&s, 0, sizeof(st));\n"
                       "}", settings);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void memsetOnFloat() {
@@ -3469,7 +3516,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:6]: (portability) Using memset() on struct which contains a floating point number.\n", errout.str());
+        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"
                       "    float f[4];\n"
@@ -3478,7 +3525,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:6]: (portability) Using memset() on struct which contains a floating point number.\n", errout.str());
+        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"
                       "    float f[4];\n"
@@ -3487,7 +3534,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memcpy(&a, &b, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct A {\n"
                       "    float* f;\n"
@@ -3496,7 +3543,7 @@ class TestClass : public TestFixture {
                       "    A a;\n"
                       "    memset(&a, 0, sizeof(A));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void memsetOnUnknown() {
@@ -3504,7 +3551,7 @@ class TestClass : public TestFixture {
                       "  *Tokens = (CXToken *)malloc(sizeof(CXToken) * CXTokens.size());\n"
                       "  memmove(*Tokens, CXTokens.data(), sizeof(CXToken) * CXTokens.size());\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mallocOnClass() {
@@ -3512,62 +3559,77 @@ class TestClass : public TestFixture {
                       "void foo(C*& p) {\n"
                       "    p = malloc(sizeof(C));\n"
                       "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1]: (warning) Memory for class instance allocated with malloc(), but class provides constructors.\n", errout.str());
+        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"
                       "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1]: (warning) Memory for class instance allocated with malloc(), but class provides constructors.\n", errout.str());
+        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"
                       "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1]: (warning) Memory for class instance allocated with realloc(), but class provides constructors.\n", errout.str());
+        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"
                       "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1]: (error) Memory for class instance allocated with malloc(), but class contains a virtual function.\n", errout.str());
+        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"
                       "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1]: (error) Memory for class instance allocated with malloc(), but class contains a 'std::string'.\n", errout.str());
+        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"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("struct C { C() {} };\n"
                       "void foo(C*& p) {\n"
                       "    p = new C();\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNoMemset("class C { C() {} };\n"
                       "void foo(D*& p) {\n" // Unknown type
                       "    p = malloc(sizeof(C));\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
-    }
+        ASSERT_EQUALS("", errout_str());
 
-#define checkThisSubtraction(code) checkThisSubtraction_(code, __FILE__, __LINE__)
-    void checkThisSubtraction_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
+        checkNoMemset("class AutoCloseFD {\n"
+                      "    int fd;\n"
+                      "public:\n"
+                      "    AutoCloseFD(int fd);\n"
+                      "    ~AutoCloseFD();\n"
+                      "};\n"
+                      "void f() {\n"
+                      "    AutoCloseFD fd = open(\"abc\", O_RDONLY | O_CLOEXEC);\n"
+                      "}");
+        ASSERT_EQUALS("", errout_str());
 
-        Preprocessor preprocessor(settings1);
+        checkNoMemset("struct C {\n" // #12313
+                      "    char* p;\n"
+                      "    C(char* ptr) : p(ptr) {}\n"
+                      "};\n"
+                      "void f() {\n"
+                      "    C c = strdup(\"abc\");\n"
+                      "}");
+        ASSERT_EQUALS("", errout_str());
+    }
 
+#define checkThisSubtraction(...) checkThisSubtraction_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkThisSubtraction_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -3576,35 +3638,39 @@ class TestClass : public TestFixture {
 
     void this_subtraction() {
         checkThisSubtraction("; this-x ;");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Suspicious pointer subtraction. Did you intend to write '->'?\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:3]: (warning) Suspicious pointer subtraction. Did you intend to write '->'? [thisSubtraction]\n", errout_str());
 
         checkThisSubtraction("; *this = *this-x ;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkThisSubtraction("; *this = *this-x ;\n"
                              "this-x ;");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious pointer subtraction. Did you intend to write '->'?\n", errout.str());
+        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 ;");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious pointer subtraction. Did you intend to write '->'?\n"
-                      "[test.cpp:3]: (warning) Suspicious pointer subtraction. Did you intend to write '->'?\n", errout.str());
+        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());
     }
 
-#define checkConst(...) checkConst_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkConst_(const char* file, int line, const char code[], const Settings *s = nullptr, bool inconclusive = true) {
-        // Clear the error log
-        errout.str("");
+    struct CheckConstOptions
+    {
+        bool inconclusive = true;
+    };
 
-        const Settings settings = settingsBuilder(s ? *s : settings0).certainty(Certainty::inconclusive, inconclusive).build();
+#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 = options.inconclusive ? settings0_i : settings0;
 
-        Preprocessor preprocessor(settings);
+        checkConst_(file, line, code, settings);
+    }
 
-        // Tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+    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);
         (checkClass.checkConst)();
@@ -3615,18 +3681,18 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    int getA() { return a; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::getA' can be const.\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -3634,14 +3700,14 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    Fred() { }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment through |=..
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    int setA() { a |= true; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // functions with a call to a member function can only be const, if that member function is const, too.. (#1305)
         checkConst("class foo {\n"
@@ -3650,7 +3716,7 @@ class TestClass : public TestFixture {
                    "    void a() { x = 1; }\n"
                    "    void b() { a(); }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "public:\n"
@@ -3658,14 +3724,14 @@ class TestClass : public TestFixture {
                    "    int a() const { return x; }\n"
                    "    void b() { a(); }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Technically the member function 'Fred::b' can be const.\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::b' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -3674,12 +3740,12 @@ class TestClass : public TestFixture {
                    "    static unsigned get()\n"
                    "    { return 0; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    const std::string foo() const throw() { return \"\"; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) The member function 'Fred::foo' can be static. [functionStatic]\n", errout_str());
     }
 
     void const2() {
@@ -3689,49 +3755,49 @@ class TestClass : public TestFixture {
                    "    std::string s;\n"
                    "    void foo() { s = \"\"; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const3() {
@@ -3740,42 +3806,42 @@ class TestClass : public TestFixture {
                    "    int s;\n"
                    "    void foo(int * a) { *a = s; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const4() {
@@ -3784,14 +3850,14 @@ class TestClass : public TestFixture {
                    "    int getA();\n"
                    "};\n"
                    "int Fred::getA() { return a; }");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::getA' can be const.\n", errout.str());
+        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:5] -> [test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -3802,7 +3868,7 @@ class TestClass : public TestFixture {
                    "    void b();\n"
                    "};\n"
                    "void Fred::b() { a(); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // static functions can't be const..
         checkConst("class Fred\n"
@@ -3811,7 +3877,7 @@ class TestClass : public TestFixture {
                    "    static unsigned get();\n"
                    "};\n"
                    "static unsigned Fred::get() { return 0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to variable can't be const
         checkConst("class Fred {\n"
@@ -3819,7 +3885,7 @@ class TestClass : public TestFixture {
                    "    void foo();\n"
                    "};\n"
                    "void Fred::foo() { s = \"\"; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument reference can be const
         checkConst("class Fred {\n"
@@ -3827,7 +3893,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a);\n"
                    "};\n"
                    "void Fred::foo(std::string & a) { a = s; }");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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
         checkConst("class Fred {\n"
@@ -3835,7 +3901,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a);\n"
                    "};\n"
                    "void Fred::foo(std::string & a) { s = a; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument references can be const
         checkConst("class Fred {\n"
@@ -3843,7 +3909,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
                    "void Fred::foo(std::string & a, std::string & b) { a = s; b = s; }");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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
         checkConst("class Fred {\n"
@@ -3851,7 +3917,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
                    "void Fred::foo(std::string & a, std::string & b) { s = a; s = b; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
@@ -3859,7 +3925,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
                    "void Fred::foo(std::string & a, std::string & b) { s = a; b = a; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
@@ -3867,7 +3933,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string & a, std::string & b);\n"
                    "};\n"
                    "void Fred::foo(std::string & a, std::string & b) { a = s; s = b; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointer can be const
         checkConst("class Fred {\n"
@@ -3875,7 +3941,7 @@ class TestClass : public TestFixture {
                    "    void foo(int * a);\n"
                    "};\n"
                    "void Fred::foo(int * a) { *a = s; }");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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
         checkConst("class Fred {\n"
@@ -3883,7 +3949,7 @@ class TestClass : public TestFixture {
                    "    void foo(int * a);\n"
                    "};\n"
                    "void Fred::foo(int * a) { s = *a; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to function argument pointers can be const
         checkConst("class Fred {\n"
@@ -3891,7 +3957,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
                    "void Fred::foo(std::string * a, std::string * b) { *a = s; *b = s; }");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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
         checkConst("class Fred {\n"
@@ -3899,7 +3965,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
                    "void Fred::foo(std::string * a, std::string * b) { s = *a; s = *b; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
@@ -3907,7 +3973,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
                    "void Fred::foo(std::string * a, std::string * b) { s = *a; *b = s; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment to variable, can't be const
         checkConst("class Fred {\n"
@@ -3915,7 +3981,7 @@ class TestClass : public TestFixture {
                    "    void foo(std::string * a, std::string * b);\n"
                    "};\n"
                    "void Fred::foo(std::string * a, std::string * b) { *a = s; s = b; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // check functions with same name
         checkConst("class Fred {\n"
@@ -3927,8 +3993,8 @@ class TestClass : public TestFixture {
                    "void Fred::foo() { }"
                    "void Fred::foo(std::string & a) { a = s; }"
                    "void Fred::foo(const std::string & a) { s = a; }");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:7] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::foo' can be const.\n", errout.str());
+        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:7:32]: (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"
@@ -3944,11 +4010,11 @@ class TestClass : public TestFixture {
                    "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:9] -> [test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::foo1' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:10] -> [test.cpp:4]: (performance, inconclusive) Technically the member function 'Fred::foo2' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:11] -> [test.cpp:5]: (performance, inconclusive) Technically the member function 'Fred::foo3' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:12] -> [test.cpp:6]: (performance, inconclusive) Technically the member function 'Fred::foo4' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:13] -> [test.cpp:7]: (performance, inconclusive) Technically the member function 'Fred::foo5' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -3957,7 +4023,7 @@ class TestClass : public TestFixture {
                    "        int getA() { return a; }\n"
                    "    };\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const.\n", errout.str());
+        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"
                    "    class A {\n"
@@ -3966,7 +4032,7 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "    int A::getA() { return a; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const.\n", errout.str());
+        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"
                    "    class A {\n"
@@ -3975,7 +4041,7 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "};\n"
                    "int Fred::A::getA() { return a; }");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::A::getA' can be const.\n", errout.str());
+        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
         checkConst("class Fred {\n"
@@ -3988,9 +4054,9 @@ class TestClass : public TestFixture {
                    "        };\n"
                    "    };\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const.\n"
-                      "[test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n"
-                      , errout.str());
+        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());
 
         checkConst("class Fred {\n"
                    "    class B {\n"
@@ -4004,8 +4070,8 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "    int B::getB() { return b; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const.\n"
-                      "[test.cpp:9] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n", errout.str());
+        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());
 
         checkConst("class Fred {\n"
                    "    class B {\n"
@@ -4019,8 +4085,8 @@ class TestClass : public TestFixture {
                    "    int B::A::getA() { return a; }\n"
                    "    int B::getB() { return b; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const.\n"
-                      "[test.cpp:10] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n", errout.str());
+        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());
 
         checkConst("class Fred {\n"
                    "    class B {\n"
@@ -4034,8 +4100,8 @@ class TestClass : public TestFixture {
                    "};\n"
                    "int Fred::B::A::getA() { return a; }\n"
                    "int Fred::B::getB() { return b; }");
-        ASSERT_EQUALS("[test.cpp:12] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const.\n"
-                      "[test.cpp:11] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n", errout.str());
+        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());
     }
 
     // operator< can often be const
@@ -4044,7 +4110,7 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    bool operator<(const Fred &f) { return a < f.a; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::operator<' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'Fred::operator<' can be const. [functionConst]\n", errout_str());
     }
 
     // operator<<
@@ -4059,7 +4125,7 @@ class TestClass : public TestFixture {
                    "        foo << 123;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Foo {\n"
                    "    void operator<<(int);\n"
@@ -4071,7 +4137,7 @@ class TestClass : public TestFixture {
                    "        std::cout << foo << 123;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style, inconclusive) Technically the member function 'Fred::x' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:10]: (style, inconclusive) Technically the member function 'Fred::x' can be const. [functionConst]\n", errout_str());
     }
 
     void constoperator3() {
@@ -4080,13 +4146,13 @@ class TestClass : public TestFixture {
                    "    int const & operator [] (unsigned int index) const { return array[index]; }\n"
                    "    int & operator [] (unsigned int index) { return array[index]; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Fred {\n"
                    "    int array[10];\n"
                    "    int const & operator [] (unsigned int index) { return array[index]; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::operator[]' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:17]: (style, inconclusive) Technically the member function 'Fred::operator[]' can be const. [functionConst]\n", errout_str());
     }
 
     void constoperator4() {
@@ -4096,14 +4162,14 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    operator int*() { return &c; };\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator const int*() { return &c; };\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::operatorconstint*' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorconstint*' can be const. [functionConst]\n", errout_str());
 
         // #2375
         checkConst("struct Fred {\n"
@@ -4111,14 +4177,14 @@ class TestClass : public TestFixture {
                    "    typedef int* (Fred::*UnspecifiedBoolType);\n"
                    "    operator UnspecifiedBoolType() { };\n"
                    "};");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::operatorint**' can be const.\n", "", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void constoperator5() { // ticket #3252
@@ -4127,21 +4193,21 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    operator int& () {return c}\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "    int c;\n"
                    "public:\n"
                    "    operator const int& () {return c}\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::operatorconstint&' can be const.\n", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::operatorint' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (style, inconclusive) Technically the member function 'A::operatorint' can be const. [functionConst]\n", errout_str());
     }
 
     void constoperator6() { // ticket #8669
@@ -4149,7 +4215,7 @@ class TestClass : public TestFixture {
                    "    int c;\n"
                    "    void f() { os >> *this; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const5() {
@@ -4163,7 +4229,7 @@ class TestClass : public TestFixture {
                    "        return same;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'A::foo' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
     void const6() {
@@ -4172,14 +4238,14 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "};\n"
                    "void bar() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred\n"
                    "{\n"
                    "public:\n"
                    "    void foo() { }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (performance, inconclusive) Technically the member function 'Fred::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -4193,7 +4259,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "    buff[10] = t;\n"
                    "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const7() {
@@ -4204,7 +4270,7 @@ class TestClass : public TestFixture {
                    "    void set(const foo & f) { *this = f; }\n"
                    "};\n"
                    "void bar() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const8() {
@@ -4216,7 +4282,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::string m_strValue;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::strGetString' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:17]: (style, inconclusive) Technically the member function 'A::strGetString' can be const. [functionConst]\n", errout_str());
     }
 
     void const9() {
@@ -4227,7 +4293,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    wxThread::ExitCode m_exitcode;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const10() {
@@ -4238,7 +4304,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    int x;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "public:\n"
@@ -4246,7 +4312,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    int x;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "public:\n"
@@ -4254,7 +4320,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    int x;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const11() {
@@ -4265,7 +4331,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    struct tm m_time;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const12() {
@@ -4276,7 +4342,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    mutable int x;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'A::foo' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
     void const13() {
@@ -4290,8 +4356,8 @@ class TestClass : public TestFixture {
                    "    std::vector<int> m_vec;\n"
                    "    std::pair<int,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetVec' can be const.\n"
-                      "[test.cpp:5]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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());
 
         checkConst("class A {\n"
                    "public:\n"
@@ -4302,8 +4368,8 @@ class TestClass : public TestFixture {
                    "    std::vector<int> m_vec;\n"
                    "    std::pair<int,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetVec' can be const.\n"
-                      "[test.cpp:5]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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());
     }
 
     void const14() {
@@ -4315,7 +4381,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4324,7 +4390,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4333,7 +4399,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair<std::vector<int>,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkConst("using namespace std;"
@@ -4344,7 +4410,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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;"
                    "class A {\n"
@@ -4354,7 +4420,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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;"
                    "class A {\n"
@@ -4364,7 +4430,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    pair<int ,double> m_pair;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkConst("class A {\n"
@@ -4374,7 +4440,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4383,7 +4449,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4392,7 +4458,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< int,std::vector<int> >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkConst("using namespace std;"
@@ -4403,7 +4469,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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;"
                    "class A {\n"
@@ -4413,7 +4479,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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;"
                    "class A {\n"
@@ -4423,7 +4489,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    pair< vector<int>, int >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "public:\n"
@@ -4432,7 +4498,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4441,7 +4507,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4450,7 +4516,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< std::vector<int>,std::vector<int> >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
 
@@ -4461,7 +4527,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4470,7 +4536,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4479,7 +4545,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< std::pair < int, char > , int >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkConst("class A {\n"
@@ -4489,7 +4555,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4498,7 +4564,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetPair' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4507,7 +4573,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::pair< int , std::pair < int, char > >  m_pair;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkConst("using namespace std;"
@@ -4518,7 +4584,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetVec' can be const.\n", errout.str());
+        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;"
                    "class A {\n"
@@ -4528,7 +4594,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::GetVec' can be const.\n", errout.str());
+        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;"
                    "class A {\n"
@@ -4538,7 +4604,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    vector<int>  m_Vec;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         checkConst("class A {\n"
@@ -4547,7 +4613,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    const int * x;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "public:\n"
@@ -4555,7 +4621,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    const int * x;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'A::foo' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:18]: (style, inconclusive) Technically the member function 'A::foo' can be const. [functionConst]\n", errout_str());
     }
 
     void const15() {
@@ -4563,7 +4629,7 @@ class TestClass : public TestFixture {
                    "    unsigned long long int a;\n"
                    "    unsigned long long int getA() { return a; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::getA' can be const.\n", errout.str());
+        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..
         checkConst("class Fred {\n"
@@ -4571,14 +4637,14 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    Fred() { }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment through |=..
         checkConst("class Fred {\n"
                    "    unsigned long long int a;\n"
                    "    unsigned long long int setA() { a |= true; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // static functions can't be const..
         checkConst("class foo\n"
@@ -4587,7 +4653,7 @@ class TestClass : public TestFixture {
                    "    static unsigned long long int get()\n"
                    "    { return 0; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const16() {
@@ -4596,7 +4662,7 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    void set(int i) { Fred::a = i; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const17() {
@@ -4607,7 +4673,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    struct { int k; } a[4];\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const18() {
@@ -4616,7 +4682,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void set(int i) { x = i; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (performance, inconclusive) Technically the member function 'Fred::set' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The member function 'Fred::set' can be static. [functionStatic]\n", errout_str());
     }
 
     void const19() {
@@ -4628,7 +4694,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void set(std::string ss) { s = ss; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const20() {
@@ -4638,35 +4704,35 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void set(int i) { x = i; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    list<int *> x;\n"
                    "public:\n"
                    "    list<int *> get() { return x; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    list<const int *> x;\n"
                    "public:\n"
                    "    list<const int *> get() { return x; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::get' can be const.\n", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::get' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:36]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
     }
 
     void const21() {
@@ -4682,7 +4748,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "    void f1() { l1[0] = \"Hello\"; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const22() {
@@ -4693,7 +4759,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void f1() { v1 = 0; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A\n"
                    "{\n"
@@ -4702,7 +4768,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void f1() { v1[0] = 0; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const23() {
@@ -4714,7 +4780,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    Type2 _m;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const24() {
@@ -4727,7 +4793,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::map<QString, QString> *m_pSettings;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -4742,7 +4808,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "std::string m_strVal;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A{\n"
                    "public:\n"
@@ -4752,7 +4818,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "std::string m_strVal;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::strGetString' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4762,7 +4828,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "std::string m_strVal;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::strGetString1' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4772,7 +4838,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "std::vector<std::string> m_strVec;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::strGetSize' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4782,7 +4848,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "std::vector<std::string> m_strVec;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'A::strGetEmpty' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (style, inconclusive) Technically the member function 'A::strGetEmpty' can be const. [functionConst]\n", errout_str());
     }
 
     void const26() { // ticket #1847
@@ -4793,7 +4859,7 @@ class TestClass : public TestFixture {
                    "}\n"
                    "float delays_[4];\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct DelayBase {\n"
                    "    float swapSpecificDelays(int index1) {\n"
@@ -4801,7 +4867,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "    float delays_[4];\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Technically the member function 'DelayBase::swapSpecificDelays' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style, inconclusive) Technically the member function 'DelayBase::swapSpecificDelays' can be const. [functionConst]\n", errout_str());
     }
 
     void const27() { // ticket #1882
@@ -4818,8 +4884,8 @@ class TestClass : public TestFixture {
                    "    if( m_d != 0 )\n"
                    "        return m_iRealVal / m_d;\n"
                    "    return dRet;\n"
-                   "};", nullptr, true);
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'A::dGetValue' can be const.\n", errout.str());
+                   "};");
+        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());
     }
 
     void const28() { // ticket #1883
@@ -4836,7 +4902,7 @@ class TestClass : public TestFixture {
                    "        y=yPos;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class AA : public P {\n"
                    "public:\n"
@@ -4846,7 +4912,7 @@ class TestClass : public TestFixture {
                    "        UnknownScope::x = x_;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class AA {\n"
                    "public:\n"
@@ -4856,7 +4922,7 @@ class TestClass : public TestFixture {
                    "        UnknownScope::x = x_;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:4]: (performance, inconclusive) Technically the member function 'AA::vSetXPos' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:17]: (style) The member function 'AA::vSetXPos' can be static. [functionStatic]\n", errout_str());
 
     }
 
@@ -4881,7 +4947,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "  return value_;\n"
                    "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const30() {
@@ -4896,7 +4962,7 @@ class TestClass : public TestFixture {
                    "        return a;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:7]: (style, inconclusive) Technically the member function 'Derived::get' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4915,8 +4981,8 @@ class TestClass : public TestFixture {
                    "        return b;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:11]: (style, inconclusive) Technically the member function 'Derived::getA' can be const.\n"
-                      "[test.cpp:14]: (style, inconclusive) Technically the member function 'Derived::getB' can be const.\n", errout.str());
+        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());
 
         checkConst("class Base {\n"
                    "public:\n"
@@ -4929,7 +4995,7 @@ class TestClass : public TestFixture {
                    "        return a;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:8]: (style, inconclusive) Technically the member function 'Derived2::get' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -4944,7 +5010,7 @@ class TestClass : public TestFixture {
                    "        return a;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:10]: (style, inconclusive) Technically the member function 'Derived4::get' can be const.\n", errout.str());
+        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
         checkConst("class Base {\n"
@@ -4957,7 +5023,7 @@ class TestClass : public TestFixture {
                    "        return a;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base1 {\n"
                    "public:\n"
@@ -4976,7 +5042,7 @@ class TestClass : public TestFixture {
                    "        return b;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base {\n"
                    "public:\n"
@@ -4989,7 +5055,7 @@ class TestClass : public TestFixture {
                    "        return a;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Base {\n"
                    "public:\n"
@@ -5004,7 +5070,7 @@ class TestClass : public TestFixture {
                    "        return a;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const31() {
@@ -5014,7 +5080,7 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    int get() { return a; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Technically the member function 'Fred::get' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (style, inconclusive) Technically the member function 'Fred::get' can be const. [functionConst]\n", errout_str());
     }
 
     void const32() {
@@ -5023,7 +5089,7 @@ class TestClass : public TestFixture {
                    "    std::string a[10];\n"
                    "    void seta() { a[0] = \"\"; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const33() {
@@ -5031,7 +5097,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void f(){}\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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
@@ -5040,7 +5106,7 @@ class TestClass : public TestFixture {
                    "        foo.bar = this;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const35() { // ticket #2001
@@ -5059,7 +5125,7 @@ class TestClass : public TestFixture {
                    "                int var;\n"
                    "        };\n"
                    "}");
-        ASSERT_EQUALS("[test.cpp:12]: (style, inconclusive) Technically the member function 'N::Derived::getResourceName' can be const.\n", errout.str());
+        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"
                    "{\n"
@@ -5071,7 +5137,7 @@ class TestClass : public TestFixture {
                    "        };\n"
                    "}\n"
                    "int N::Base::getResourceName() { return var; }");
-        ASSERT_EQUALS("[test.cpp:10] -> [test.cpp:6]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const.\n", errout.str());
+        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"
                    "{\n"
@@ -5086,7 +5152,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "        int Base::getResourceName() { return var; }\n"
                    "}");
-        ASSERT_EQUALS("[test.cpp:12] -> [test.cpp:6]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const.\n", errout.str());
+        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"
                    "{\n"
@@ -5099,7 +5165,7 @@ class TestClass : public TestFixture {
                    "}\n"
                    "using namespace N;\n"
                    "int Base::getResourceName() { return var; }");
-        ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:6]: (style, inconclusive) Technically the member function 'N::Base::getResourceName' can be const.\n", errout.str());
+        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());
     }
 
     void const36() { // ticket #2003
@@ -5111,7 +5177,7 @@ class TestClass : public TestFixture {
                    "        m_MaxQueueSize = a_MaxQueueSize;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const37() { // ticket #2081 and #2085
@@ -5126,7 +5192,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    std::string m_str;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Technically the member function 'A::operator+' can be const.\n", errout.str());
+        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"
                    "{\n"
@@ -5140,7 +5206,7 @@ class TestClass : public TestFixture {
                    "        return (x == 0x11224488);\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:9]: (style, inconclusive) Technically the member function 'Fred::isValid' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:10]: (style, inconclusive) Technically the member function 'Fred::isValid' can be const. [functionConst]\n", errout_str());
     }
 
     void const38() { // ticket #2135
@@ -5156,7 +5222,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "    (*oArq) << \"</table>\";\n"
                    "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const39() {
@@ -5177,7 +5243,7 @@ class TestClass : public TestFixture {
                    "    return p;\n"
                    "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const40() { // ticket #2228
@@ -5194,7 +5260,7 @@ class TestClass : public TestFixture {
                    "   }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const41() { // ticket #2255
@@ -5208,7 +5274,7 @@ class TestClass : public TestFixture {
                    "   }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class SharedPtrHolder\n"
                    "{\n"
@@ -5220,7 +5286,7 @@ class TestClass : public TestFixture {
                    "   }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class SharedPtrHolder2\n"
                    "{\n"
@@ -5235,7 +5301,7 @@ class TestClass : public TestFixture {
                    "   }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct IntPtrTypes\n"
                    "{\n"
@@ -5252,7 +5318,7 @@ class TestClass : public TestFixture {
                    "   }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("template <typename T>\n"
                    "struct PtrTypes\n"
@@ -5270,7 +5336,7 @@ class TestClass : public TestFixture {
                    "   }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const42() { // ticket #2282
@@ -5284,7 +5350,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "}");
 
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:5]: (performance, inconclusive) Technically the member function 'Fred::f' can be static (but you may consider moving to unnamed namespace).\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"
@@ -5298,7 +5364,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "}");
 
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:7]: (performance, inconclusive) Technically the member function 'Fred::f' can be static (but you may consider moving to unnamed namespace).\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"
@@ -5314,7 +5380,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "}");
 
-        ASSERT_EQUALS("[test.cpp:10] -> [test.cpp:8]: (performance, inconclusive) Technically the member function 'NS::Fred::f' can be static (but you may consider moving to unnamed namespace).\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"
@@ -5330,7 +5396,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "}");
 
-        ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:8]: (performance, inconclusive) Technically the member function 'NS::Fred::f' can be static (but you may consider moving to unnamed namespace).\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"
@@ -5346,7 +5412,7 @@ class TestClass : public TestFixture {
                    "{\n"
                    "}");
 
-        ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:8]: (performance, inconclusive) Technically the member function 'Foo::Fred::f' can be static (but you may consider moving to unnamed namespace).\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
@@ -5361,7 +5427,7 @@ class TestClass : public TestFixture {
                    "    a = b;\n"
                    "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("namespace AA\n"
                    "{\n"
@@ -5385,7 +5451,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("namespace ZZ\n"
                    "{\n"
@@ -5404,7 +5470,7 @@ class TestClass : public TestFixture {
                    "        a = b;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const44() { // ticket 2595
@@ -5418,7 +5484,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const45() { // ticket 2664
@@ -5435,7 +5501,7 @@ class TestClass : public TestFixture {
                    "    };\n"
                    "}");
 
-        ASSERT_EQUALS("[test.cpp:8]: (performance, inconclusive) Technically the member function 'tools::WorkspaceControl::toGrid' can be static (but you may consider moving to unnamed namespace).\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
@@ -5450,8 +5516,8 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "};");
 
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'Altren::fun1' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:7]: (performance, inconclusive) Technically the member function 'Altren::fun2' can be static (but you may consider moving to unnamed namespace).\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
@@ -5462,7 +5528,7 @@ class TestClass : public TestFixture {
                    "  void bar() { foo(); }\n"
                    "};");
 
-        ASSERT_EQUALS("[test.cpp:4]: (performance, inconclusive) Technically the member function 'Altren::foo' can be static (but you may consider moving to unnamed namespace).\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"
@@ -5471,8 +5537,8 @@ class TestClass : public TestFixture {
                    "  void bar() { foo(1); }\n"
                    "};");
 
-        ASSERT_EQUALS("[test.cpp:4]: (performance, inconclusive) Technically the member function 'Altren::foo' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:5]: (style, inconclusive) Technically the member function 'Altren::bar' can be const.\n", errout.str());
+        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());
     }
 
     void const48() { // ticket 2672
@@ -5494,7 +5560,7 @@ class TestClass : public TestFixture {
                    "    mSave = mCurrent;\n"
                    "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const49() { // ticket 2795
@@ -5508,7 +5574,7 @@ class TestClass : public TestFixture {
                    "             return _hash[key];\n"
                    "         }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const50() { // ticket 2943
@@ -5524,7 +5590,7 @@ class TestClass : public TestFixture {
                    "        if (mEmptyView) return;\n"
                    "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const51() { // ticket 3040
@@ -5537,7 +5603,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    unsigned char *_pesdata;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class PESPacket {\n"
                    "public:\n"
@@ -5552,7 +5618,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void SetSection(uint num) { pesdata()[6] = num; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const52() { // ticket 3048
@@ -5562,7 +5628,7 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "    int bar;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'foo::DoSomething' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The member function 'foo::DoSomething' can be static. [functionStatic]\n", errout_str());
     }
 
     void const53() { // ticket 3049
@@ -5578,7 +5644,7 @@ class TestClass : public TestFixture {
                    "    B() {};\n"
                    "    bool One(bool b = false) { return false; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const54() { // ticket 3052
@@ -5586,7 +5652,7 @@ class TestClass : public TestFixture {
                    "  public:\n"
                    "    void Clear(void) { Example tmp; (*this) = tmp; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const55() {
@@ -5596,7 +5662,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    void set(std::stringstream &in) { in >> tmp; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const56() { // ticket #3149
@@ -5606,7 +5672,7 @@ class TestClass : public TestFixture {
                    "    switch (x) { }\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'MyObject::foo' can be static. [functionStatic]\n", errout_str());
 
         checkConst("class A\n"
                    "{\n"
@@ -5646,7 +5712,7 @@ class TestClass : public TestFixture {
                    "\n"
                    "    return RET_NOK;\n"
                    "}");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:4]: (performance, inconclusive) Technically the member function 'A::f' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -5654,7 +5720,7 @@ class TestClass : public TestFixture {
                    "    for (int i = 0; i < 5; i++) { }\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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
@@ -5679,9 +5745,9 @@ class TestClass : public TestFixture {
                    "private:\n"
                    "  MyGUI::IntCoord mCoordValue;\n"
                    "};");
-        TODO_ASSERT_EQUALS("[test.cpp:7]: (performance, inconclusive) Technically the member function 'MyGUI::types::TCoord::size' can be static (but you may consider moving to unnamed namespace).\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]: (performance, inconclusive) Technically the member function 'MyGUI::types::TCoord::size' can be static (but you may consider moving to unnamed namespace).\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"
@@ -5689,7 +5755,7 @@ class TestClass : public TestFixture {
                    "        b.run();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Bar {\n"
                    "    int i = 0;\n"
@@ -5701,7 +5767,7 @@ class TestClass : public TestFixture {
                    "        b.run();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Bar {\n"
                    "    void run() const { }\n"
@@ -5712,8 +5778,8 @@ class TestClass : public TestFixture {
                    "        b.run();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Bar::run' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:6]: (style, inconclusive) Technically the member function 'Foo::foo' can be const.\n", errout.str());
+        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());
     }
 
     void const58() {
@@ -5722,14 +5788,14 @@ class TestClass : public TestFixture {
                    "        f.clear();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'MyObject::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -5737,7 +5803,7 @@ class TestClass : public TestFixture {
                    "        return f.length();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct MyObject {\n"
                    "    std::string f;\n"
@@ -5745,7 +5811,7 @@ class TestClass : public TestFixture {
                    "        return f.length();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'MyObject::foo' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'MyObject::foo' can be const. [functionConst]\n", errout_str());
     }
 
     void const59() { // ticket #4646
@@ -5757,7 +5823,7 @@ class TestClass : public TestFixture {
                    "    int   re;\n"
                    "    int   im;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const60() { // ticket #3322
@@ -5772,7 +5838,7 @@ class TestClass : public TestFixture {
                    "    {       return operator+=( str ); }\n"
                    "    char *m_ptr;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         checkConst("class MyString {\n"
                    "public:\n"
                    "    MyString() : m_ptr(0){}\n"
@@ -5781,7 +5847,7 @@ class TestClass : public TestFixture {
                    "    {       return operator+=( str ); }\n"
                    "    char *m_ptr;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const61() { // ticket #5606 - don't crash
@@ -5816,8 +5882,9 @@ class TestClass : public TestFixture {
                    "  void set(const Key& key) {\n"
                    "      inherited::set(inherited::Key(key));\n"
                    "  }\n"
-                   "};\n", nullptr, false);
-        ASSERT_EQUALS("", errout.str());
+                   "};\n", dinit(CheckConstOptions, $.inconclusive = false));
+        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());
     }
 
     void const62() {
@@ -5831,7 +5898,7 @@ class TestClass : public TestFixture {
                    "             return _hash[key];\n"
                    "         }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const63() {
@@ -5842,7 +5909,7 @@ class TestClass : public TestFixture {
                    "         p->clear();\n"
                    "     }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
                    "    std::string s;\n"
@@ -5851,7 +5918,7 @@ class TestClass : public TestFixture {
                    "         r.clear();\n"
                    "     }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
                    "    std::string s;\n"
@@ -5860,7 +5927,7 @@ class TestClass : public TestFixture {
                    "         r.clear();\n"
                    "     }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'A::clear' can be const.\n", errout.str());
+        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"
                    "    std::string s;\n"
@@ -5869,7 +5936,7 @@ class TestClass : public TestFixture {
                    "         p->somefunction();\n"
                    "     }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'A::clear' can be const.\n", errout.str());
+        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"
                    "    std::string s;\n"
@@ -5878,7 +5945,7 @@ class TestClass : public TestFixture {
                    "         r.somefunction();\n"
                    "     }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'A::clear' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style, inconclusive) Technically the member function 'A::clear' can be const. [functionConst]\n", errout_str());
     }
 
     void const64() {
@@ -5893,7 +5960,7 @@ class TestClass : public TestFixture {
                    "        ::B::D::DKIPtr membervariable;\n"
                    "    };\n"
                    "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const65() {
@@ -5912,7 +5979,7 @@ class TestClass : public TestFixture {
                    "    TemplateClass<float> b;\n"
                    "    return 0;\n"
                    "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const66() {
@@ -5922,7 +5989,7 @@ class TestClass : public TestFixture {
                    "    void g(char *) { n++; }\n"
                    "    int n;\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const67() { // #9193
@@ -5936,7 +6003,7 @@ class TestClass : public TestFixture {
                    "    const std::list<std::shared_ptr<int>>& get() { return m_test.m_list; }\n"
                    "    TestList<std::shared_ptr<int>> m_test;\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:8]: (style, inconclusive) Technically the member function 'Test::get' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:44]: (style, inconclusive) Technically the member function 'Test::get' can be const. [functionConst]\n", errout_str());
     }
 
     void const68() { // #6471
@@ -5947,7 +6014,7 @@ class TestClass : public TestFixture {
                    "    }\n"
                    "    void* m_data;\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const69() { // #9806
@@ -5966,7 +6033,7 @@ class TestClass : public TestFixture {
                    "        call<int>(1, 2, 3);\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const70() {
@@ -5979,7 +6046,7 @@ class TestClass : public TestFixture {
                    "        call(1, 2);\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const71() { // #10146
@@ -5992,7 +6059,7 @@ class TestClass : public TestFixture {
                    "    int k{};\n"
                    "    void g() { bar.f(k); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    A a;\n"
@@ -6000,7 +6067,7 @@ class TestClass : public TestFixture {
                    "        p = &(((a[j])));\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const72() { // #10520
@@ -6012,7 +6079,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return S{ &i }; }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    explicit S(int* p) : mp(p) {}\n"
@@ -6022,7 +6089,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return S(&i); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    int* mp{};\n"
@@ -6031,7 +6098,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return S{ &i }; }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    int* mp{};\n"
@@ -6040,7 +6107,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return { &i }; }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    explicit S(const int* p) : mp(p) {}\n"
@@ -6050,7 +6117,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return S{ &i }; }\n"
                    "};\n");
-        TODO_ASSERT_EQUALS("[test.cpp:7]: (style, inconclusive) Technically the member function 'C::f' can be const.\n", "", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:7]: (style, inconclusive) Technically the member function 'C::f' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct S {\n"
                    "    explicit S(const int* p) : mp(p) {}\n"
@@ -6060,7 +6127,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return S(&i); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:7]: (style, inconclusive) Technically the member function 'C::f' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:7]: (style, inconclusive) Technically the member function 'C::f' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct S {\n"
                    "    const int* mp{};\n"
@@ -6069,7 +6136,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return S{ &i }; }\n"
                    "};\n");
-        TODO_ASSERT_EQUALS("[test.cpp:7]: (style, inconclusive) Technically the member function 'C::f' can be const.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:7:7]: (style, inconclusive) Technically the member function 'C::f' can be const. [functionConst]\n", "", errout_str());
 
         checkConst("struct S {\n"
                    "    const int* mp{};\n"
@@ -6078,7 +6145,7 @@ class TestClass : public TestFixture {
                    "    int i{};\n"
                    "    S f() { return { &i }; }\n"
                    "};\n");
-        TODO_ASSERT_EQUALS("[test.cpp:7]: (style, inconclusive) Technically the member function 'C::f' can be const.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:7:7]: (style, inconclusive) Technically the member function 'C::f' can be const. [functionConst]\n", "", errout_str());
     }
 
     void const73() {
@@ -6093,7 +6160,7 @@ class TestClass : public TestFixture {
                    "        *p = 0;\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n" // #10758
                    "    T* h;\n"
@@ -6102,7 +6169,7 @@ class TestClass : public TestFixture {
                    "void S::f() {\n"
                    "    char* c = h->x[y];\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Technically the member function 'S::f' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:9]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n", errout_str());
     }
 
     void const74() { // #10671
@@ -6114,7 +6181,7 @@ class TestClass : public TestFixture {
                    "        for(std::vector<std::string>::const_iterator it = m_str.begin(); it != m_str.end(); ++it) {;}\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Technically the member function 'A::bar' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (style, inconclusive) Technically the member function 'A::bar' can be const. [functionConst]\n", errout_str());
 
         // Don't crash
         checkConst("struct S {\n"
@@ -6124,7 +6191,7 @@ class TestClass : public TestFixture {
                    "void S::f() const {\n"
                    "    for (std::vector<T*>::const_iterator it = v.begin(), end = v.end(); it != end; ++it) {}\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const75() { // #10065
@@ -6135,7 +6202,7 @@ class TestClass : public TestFixture {
                    "        if (N::i) {}\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (performance, inconclusive) Technically the member function 'S::f' can be static (but you may consider moving to unnamed namespace).\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"
@@ -6144,7 +6211,7 @@ class TestClass : public TestFixture {
                    "        if (::i) {}\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (performance, inconclusive) Technically the member function 'S::f' can be static (but you may consider moving to unnamed namespace).\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"
@@ -6154,7 +6221,7 @@ class TestClass : public TestFixture {
                    "        }\n"
                    "    };\n"
                    "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'N::S::f' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14]: (style, inconclusive) Technically the member function 'N::S::f' can be const. [functionConst]\n", errout_str());
     }
 
     void const76() { // #10825
@@ -6167,8 +6234,8 @@ class TestClass : public TestFixture {
                    "void S::f(const T* t) {\n"
                    "    const_cast<T*>(t)->e();\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:3]: (performance, inconclusive) Technically the member function 'S::f' can be static (but you may consider moving to unnamed namespace).\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:7:9]: (style) The member function 'S::f' can be static. [functionStatic]\n",
+                      errout_str());
     }
 
     void const77() {
@@ -6177,13 +6244,13 @@ class TestClass : public TestFixture {
                    "    std::vector<T> const* f() const { return p; }\n"
                    "    std::vector<T> const* p;\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n" // #10311
                    "    std::vector<const int*> v;\n"
                    "    std::vector<const int*>& f() { return v; }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const78() { // #10315
@@ -6194,7 +6261,7 @@ class TestClass : public TestFixture {
                    "void S::g(F f) {\n"
                    "    (this->*f)();\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    using F = void(S::*)();\n"
@@ -6203,7 +6270,7 @@ class TestClass : public TestFixture {
                    "void S::g(F f) {\n"
                    "    (this->*f)();\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const79() { // #9861
@@ -6213,8 +6280,8 @@ class TestClass : public TestFixture {
                    "        return nullptr;\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'A::f' can be static (but you may consider moving to unnamed namespace).\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) The member function 'A::f' can be static. [functionStatic]\n",
+                      errout_str());
     }
 
     void const80() { // #11328
@@ -6244,11 +6311,11 @@ class TestClass : public TestFixture {
                    "void S::n() {\n"
                    "        this->h();\n"
                    "}\n");
-        ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:4]: (performance, inconclusive) Technically the member function 'S::g' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:14] -> [test.cpp:5]: (performance, inconclusive) Technically the member function 'S::h' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:17] -> [test.cpp:6]: (style, inconclusive) Technically the member function 'S::k' can be const.\n"
-                      "[test.cpp:21] -> [test.cpp:7]: (performance, inconclusive) Technically the member function 'S::m' can be static (but you may consider moving to unnamed namespace).\n",
-                      errout.str());
+        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]: (style) The member function 'S::m' can be static. [functionStatic]\n",
+                      errout_str());
     }
 
     void const81() {
@@ -6261,8 +6328,8 @@ class TestClass : public TestFixture {
                    "        if (a->f()) {}\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:6]: (style, inconclusive) Technically the member function 'S::g' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:10]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n",
+                      errout_str());
 
         checkConst("struct A {\n" // #11499
                    "    void f() const;\n"
@@ -6276,8 +6343,8 @@ class TestClass : public TestFixture {
                    "    P<A> p;\n"
                    "    void g() { p->f(); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:11]: (style, inconclusive) Technically the member function 'S::g' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:11:10]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n",
+                      errout_str());
 
         checkConst("struct A {\n"
                    "    void f(int) const;\n"
@@ -6291,7 +6358,7 @@ class TestClass : public TestFixture {
                    "  P<A> p;\n"
                    "  void g() { p->f(1); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:11]: (style, inconclusive) Technically the member function 'S::g' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:8]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct A {\n"
                    "    void f(void*) const;\n"
@@ -6308,7 +6375,7 @@ class TestClass : public TestFixture {
                    "    P<A> p;\n"
                    "    std::vector<S> g() { p->f(nullptr); return {}; }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:14]: (style, inconclusive) Technically the member function 'S::g' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:14:20]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct A {\n"
                    "    void f();\n"
@@ -6322,7 +6389,7 @@ class TestClass : public TestFixture {
                    "    P<A> p;\n"
                    "    void g() { p->f(); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
                    "    void f() const;\n"
@@ -6335,7 +6402,7 @@ class TestClass : public TestFixture {
                    "    P<A> p;\n"
                    "    void g() { p->f(); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n"
                    "    void f(int&) const;\n"
@@ -6350,7 +6417,7 @@ class TestClass : public TestFixture {
                    "    int i;\n"
                    "    void g() { p->f(i); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A {\n" // #11501
                    "    enum E { E1 };\n"
@@ -6360,7 +6427,7 @@ class TestClass : public TestFixture {
                    "    A* a;\n"
                    "    void g() { a->f(A::E1); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:7]: (style, inconclusive) Technically the member function 'F::g' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:10]: (style, inconclusive) Technically the member function 'F::g' can be const. [functionConst]\n", errout_str());
     }
 
     void const82() { // #11513
@@ -6369,16 +6436,16 @@ class TestClass : public TestFixture {
                    "    void h(bool) const;\n"
                    "    void g() { h(i == 1); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'S::g' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n",
+                      errout_str());
 
         checkConst("struct S {\n"
                    "    int i;\n"
                    "    void h(int, int*) const;\n"
                    "    void g() { int a; h(i, &a); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'S::g' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n",
+                      errout_str());
     }
 
     void const83() {
@@ -6395,7 +6462,7 @@ class TestClass : public TestFixture {
                    "    int& r = b ? j : i2;\n"
                    "    r = 5;\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const84() {
@@ -6413,9 +6480,9 @@ class TestClass : public TestFixture {
                    "        T t(s);\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:8]: (style, inconclusive) Technically the member function 'C::f1' can be const.\n"
-                      "[test.cpp:11]: (style, inconclusive) Technically the member function 'C::f2' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:8:10]: (style, inconclusive) Technically the member function 'C::f1' can be const. [functionConst]\n"
+                      "[test.cpp:11:10]: (style, inconclusive) Technically the member function 'C::f2' can be const. [functionConst]\n",
+                      errout_str());
     }
 
     void const85() { // #11618
@@ -6428,7 +6495,7 @@ class TestClass : public TestFixture {
                    "    q[0] = p[0];\n"
                    "    q[1] = p[1];\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const86() { // #11621
@@ -6440,7 +6507,7 @@ class TestClass : public TestFixture {
                    "    void g() { int* a[] = { &i }; }\n"
                    "    void h() { T t = { 1, &i }; }\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const87() {
@@ -6466,14 +6533,14 @@ class TestClass : public TestFixture {
                    "bool CheckB::f(const std::string& s) {\n"
                    "    return CheckA::test(s, mSettings, mTokenizer->isCPP());\n"
                    "}\n");
-        ASSERT_EQUALS("[test.cpp:20] -> [test.cpp:15]: (style, inconclusive) Technically the member function 'CheckB::f' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:15:10] -> [test.cpp:20:14]: (style, inconclusive) Technically the member function 'CheckB::f' can be const. [functionConst]\n", errout_str());
 
         checkConst("void g(int&);\n"
                    "struct S {\n"
                    "    struct { int i; } a[1];\n"
                    "    void f() { g(a[0].i); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    const int& g() const { return i; }\n"
@@ -6485,7 +6552,7 @@ class TestClass : public TestFixture {
                    "    int j;\n"
                    "    void f() { h(j, s.g()); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:9]: (style, inconclusive) Technically the member function 'T::f' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:10]: (style, inconclusive) Technically the member function 'T::f' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct S {\n"
                    "    int& g() { return i; }\n"
@@ -6497,7 +6564,7 @@ class TestClass : public TestFixture {
                    "    int j;\n"
                    "    void f() { h(j, s.g()); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n"
                    "    const int& g() const { return i; }\n"
@@ -6509,7 +6576,7 @@ class TestClass : public TestFixture {
                    "    int j;\n"
                    "    void f() { h(j, &s.g()); }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:9]: (style, inconclusive) Technically the member function 'T::f' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:10]: (style, inconclusive) Technically the member function 'T::f' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct S {\n"
                    "    int& g() { return i; }\n"
@@ -6521,7 +6588,7 @@ class TestClass : public TestFixture {
                    "    int j;\n"
                    "    void f() { h(j, &s.g()); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("void j(int** x);\n"
                    "void k(int* const* y);\n"
@@ -6535,7 +6602,7 @@ class TestClass : public TestFixture {
                    "    void g2() { k(q); }\n"
                    "    void g3() { k(r); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("void m(int*& r);\n"
                    "void n(int* const& s);\n"
@@ -6546,7 +6613,7 @@ class TestClass : public TestFixture {
                    "    void f2() { n(&i); }\n"
                    "    void f3() { n(p); }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void const88() { // #11626
@@ -6558,17 +6625,17 @@ class TestClass : public TestFixture {
                    "    char* k() { return (char*)p; }\n"
                    "    int* p;\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Technically the member function 'S::f' can be const.\n"
-                      "[test.cpp:3]: (style, inconclusive) Technically the member function 'S::g' can be const.\n"
-                      "[test.cpp:4]: (style, inconclusive) Technically the member function 'S::h' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n"
+                      "[test.cpp:3:16]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n"
+                      "[test.cpp:4:16]: (style, inconclusive) Technically the member function 'S::h' can be const. [functionConst]\n",
+                      errout_str());
 
         checkConst("struct S {\n"
                    "    bool f() { return p != nullptr; }\n"
                    "    std::shared_ptr<int> p;\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style, inconclusive) Technically the member function 'S::f' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n",
+                      errout_str());
     }
 
     void const89() {
@@ -6580,7 +6647,7 @@ class TestClass : public TestFixture {
                    "    if (i && b)\n"
                    "        f(false);\n"
                    "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:2]: (style, inconclusive) Technically the member function 'S::f' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:5:9]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n", errout_str());
 
         checkConst("struct S {\n"
                    "    void f(int& r);\n"
@@ -6591,7 +6658,7 @@ class TestClass : public TestFixture {
                    "    if (i)\n"
                    "        f(i);\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct S {\n" // #11744
                    "    S* p;\n"
@@ -6606,9 +6673,20 @@ class TestClass : public TestFixture {
                    "        return 0;\n"
                    "    }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style, inconclusive) Technically the member function 'S::f' can be const.\n"
-                      "[test.cpp:8]: (performance, inconclusive) Technically the member function 'S::g' can be static (but you may consider moving to unnamed namespace).\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n"
+                      "[test.cpp:8:9]: (style) The member function 'S::g' can be static. [functionStatic]\n",
+                      errout_str());
+
+        checkConst("class C {\n" // #11653
+                   "public:\n"
+                   "    void f(bool b) const;\n"
+                   "};\n"
+                   "void C::f(bool b) const {\n"
+                   "    if (b)\n"
+                   "        f(false);\n"
+                   "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:5:9]: (style) The member function 'C::f' can be static. [functionStatic]\n",
+                      errout_str());
     }
 
     void const90() { // #11637
@@ -6622,9 +6700,9 @@ class TestClass : public TestFixture {
                    "    void f1() { C c = C{ &s }; }\n"
                    "    void f2() { C c = C{ s }; }\n"
                    "};\n");
-        ASSERT_EQUALS("[test.cpp:8]: (style, inconclusive) Technically the member function 'T::f1' can be const.\n"
-                      "[test.cpp:9]: (style, inconclusive) Technically the member function 'T::f2' can be const.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:8:10]: (style, inconclusive) Technically the member function 'T::f1' can be const. [functionConst]\n"
+                      "[test.cpp:9:10]: (style, inconclusive) Technically the member function 'T::f2' can be const. [functionConst]\n",
+                      errout_str());
     }
 
     void const91() { // #11790
@@ -6638,7 +6716,248 @@ class TestClass : public TestFixture {
                    "const int* f(S& s) {\n"
                    "    return s.get<const int>();\n"
                    "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void const92() { // #11886
+        checkConst("void g(int);\n"
+                   "template<int n>\n"
+                   "struct S : public S<n - 1> {\n"
+                   "    void f() {\n"
+                   "        g(n - 1);\n"
+                   "    }\n"
+                   "};\n"
+                   "template<>\n"
+                   "struct S<0> {};\n"
+                   "struct D : S<150> {};\n");
+        // don't hang
+        ignore_errout();
+    }
+
+    void const93() { // #12162
+        checkConst("struct S {\n"
+                   "    bool f() {\n"
+                   "        return m.cbegin()->first == 0;\n"
+                   "    }\n"
+                   "    bool g() {\n"
+                   "        return m.count(0);\n"
+                   "    }\n"
+                   "    std::map<int, int> m;\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n"
+                      "[test.cpp:5:10]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n",
+                      errout_str());
+    }
+
+    void const94() { // #7459
+        checkConst("class A {\n"
+                   "public:\n"
+                   "    A() : tickFunction(&A::nop) {}\n"
+                   "    void tick() { (this->*tickFunction)(); }\n"
+                   "private:\n"
+                   "    typedef void (A::* Fn)();\n"
+                   "    Fn tickFunction;\n"
+                   "    void nop() {}\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void const95() { // #13320
+        checkConst("class C {\n"
+                   "    std::string x;\n"
+                   "    std::string get() && { return x; }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void const96() {
+        checkConst("struct S : B {\n" // #13282
+                   "    bool f() { return b; }\n"
+                   "    bool g() override { return b; }\n"
+                   "    bool b;\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style, inconclusive) Either there is a missing 'override', or the member function 'S::f' can be const. [functionConst]\n", errout_str());
+
+        checkConst("struct B;\n" // #13382
+                   "struct S : B {\n"
+                   "    void f();\n"
+                   "};\n"
+                   "void S::f() {\n"
+                   "    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());
+    }
+
+    void const97() { // #13301
+        checkConst("struct S {\n"
+                   "    std::vector<int> v;\n"
+                   "    int f() {\n"
+                   "        const int& r = v.front();\n"
+                   "        return r;\n"
+                   "    }\n"
+                   "    int g() {\n"
+                   "        const int& r = v.at(0);\n"
+                   "        return r;\n"
+                   "    }\n"
+                   "    void h() {\n"
+                   "        if (v.front() == 0) {}\n"
+                   "        if (1 == v.front()) {}\n"
+                   "    }\n"
+                   "    void i() {\n"
+                   "        v.at(0) = 0;\n"
+                   "    }\n"
+                   "    void j() {\n"
+                   "        dostuff(1, v.at(0));\n"
+                   "    }\n"
+                   "    void k() {\n"
+                   "        int& r = v.front();\n"
+                   "        r = 0;\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("[test.cpp:3:9]: (style, inconclusive) Technically the member function 'S::f' can be const. [functionConst]\n"
+                      "[test.cpp:7:9]: (style, inconclusive) Technically the member function 'S::g' can be const. [functionConst]\n"
+                      "[test.cpp:11:10]: (style, inconclusive) Technically the member function 'S::h' can be const. [functionConst]\n",
+                      errout_str());
+
+        checkConst("struct B { std::string s; };\n"
+                   "struct D : B {\n"
+                   "    bool f(std::string::iterator it) { return it == B::s.begin(); }\n"
+                   "};\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
+        checkConst("enum E {\n"
+                   "    E0,\n"
+                   "    E1\n"
+                   "};\n"
+                   "void set(int* p) {\n"
+                   "    *p = 1;\n"
+                   "}\n"
+                   "struct S {\n"
+                   "    E e;\n"
+                   "    void f() {\n"
+                   "        set(reinterpret_cast<int*>(&e));\n"
+                   "    }\n"
+                   "    void g() {\n"
+                   "        set(reinterpret_cast<int*>(reinterpret_cast<void*>(&e)));\n"
+                   "    }\n"
+                   "    void h() {\n"
+                   "        set((int*)(&e));\n"
+                   "    }\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkConst("enum E {\n"
+                   "    E0,\n"
+                   "    E1\n"
+                   "};\n"
+                   "void set1(int i, int* p) {\n"
+                   "    *p = i;\n"
+                   "}\n"
+                   "void set2(int* p, int i) {\n"
+                   "    *p = i;\n"
+                   "}\n"
+                   "struct S {\n"
+                   "    E e;\n"
+                   "    void f1() {\n"
+                   "        set1(1, reinterpret_cast<int*>(&e));\n"
+                   "    }\n"
+                   "    void f2() {\n"
+                   "        set2(reinterpret_cast<int*>(&e), 1);\n"
+                   "    }\n"
+                   "    void g1() {\n"
+                   "        set1(1, reinterpret_cast<int*>(reinterpret_cast<void*>(&e)));\n"
+                   "    }\n"
+                   "    void g2() {\n"
+                   "        set2(reinterpret_cast<int*>(reinterpret_cast<void*>(&e)), 1);\n"
+                   "    }\n"
+                   "};\n");
+        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 const_handleDefaultParameters() {
@@ -6671,8 +6990,8 @@ class TestClass : public TestFixture {
                    "        return foo3();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:11]: (performance, inconclusive) Technically the member function 'Foo::bar3' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:14]: (performance, inconclusive) Technically the member function 'Foo::bar4' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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() {
@@ -6682,7 +7001,7 @@ class TestClass : public TestFixture {
                    "        b.takeFoo(this);\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct Foo {\n"
                    "    void foo() {\n"
@@ -6690,7 +7009,7 @@ class TestClass : public TestFixture {
                    "        f.foo();\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Foo::foo' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -6701,7 +7020,7 @@ class TestClass : public TestFixture {
                    "        B()(this);\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assigningPointerToPointerIsNotAConstOperation() {
@@ -6713,7 +7032,7 @@ class TestClass : public TestFixture {
                    "        v = 0;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assigningArrayElementIsNotAConstOperation() {
@@ -6725,7 +7044,7 @@ class TestClass : public TestFixture {
                    "        v[0] = \"Happy new year!\";\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // increment/decrement => not const
@@ -6734,49 +7053,49 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    void nextA() { return ++a; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return --a; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a++; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a--; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return ++a; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
@@ -6784,7 +7103,7 @@ class TestClass : public TestFixture {
                    "    S operator ++(int) { S s = *this; ++(*this); return s; }\n"
                    "    void f() { (*this)--; }\n"
                    "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void constassign1() {
@@ -6792,61 +7111,61 @@ class TestClass : public TestFixture {
                    "    int a;\n"
                    "    void nextA() { return a=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a-=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a+=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a*=-1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a;\n"
                    "    void nextA() { return a/=-2; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("int a;\n"
                    "class Fred {\n"
                    "    void nextA() { return a=1; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
     void constassign2() {
@@ -6854,90 +7173,90 @@ class TestClass : public TestFixture {
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a-=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a+=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    struct A { int a; } s;\n"
                    "    void nextA() { return s.a*=-1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a-=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a+=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a*=-1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("struct A { int a; };\n"
                    "class Fred {\n"
                    "    A s;\n"
                    "    void nextA() { return s.a/=-2; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // increment/decrement array element => not const
@@ -6946,49 +7265,49 @@ class TestClass : public TestFixture {
                    "    int a[2];\n"
                    "    void nextA() { return ++a[0]; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return --a[0]; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]++; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]--; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return ++a[0]; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
     void constassignarray() {
@@ -6996,61 +7315,61 @@ class TestClass : public TestFixture {
                    "    int a[2];\n"
                    "    void nextA() { return a[0]=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]-=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]+=1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]*=-1; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class Fred {\n"
                    "    int a[2];\n"
                    "    void nextA() { return a[0]/=-2; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("int a[2];\n"
                    "class Fred {\n"
                    "    void nextA() { return a[0]=1; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        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]: (performance, inconclusive) Technically the member function 'Fred::nextA' can be static (but you may consider moving to unnamed namespace).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The member function 'Fred::nextA' can be static. [functionStatic]\n", errout_str());
     }
 
     // return pointer/reference => not const
@@ -7060,7 +7379,7 @@ class TestClass : public TestFixture {
                    "    int &getR() { return a; }\n"
                    "    int *getP() { return &a; }"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // delete member variable => not const (but technically it can, it compiles without errors)
@@ -7069,7 +7388,7 @@ class TestClass : public TestFixture {
                    "    int *a;\n"
                    "    void clean() { delete a; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // A function that returns unknown types can't be const (#1579)
@@ -7077,14 +7396,14 @@ class TestClass : public TestFixture {
         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());
+        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"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // a function that calls const functions can be const
@@ -7093,8 +7412,8 @@ class TestClass : public TestFixture {
                    "    void f() const { };\n"
                    "    void a() { f(); };\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Technically the member function 'Fred::f' can be static (but you may consider moving to unnamed namespace).\n"
-                      "[test.cpp:3]: (style, inconclusive) Technically the member function 'Fred::a' can be const.\n", errout.str());
+        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
         checkConst("class A\n"
@@ -7104,7 +7423,7 @@ class TestClass : public TestFixture {
                    "   A(){}\n"
                    "   unsigned int GetVecSize()  {return m_v.size();}\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style, inconclusive) Technically the member function 'A::GetVecSize' can be const.\n", errout.str());
+        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"
                    "{\n"
@@ -7113,7 +7432,7 @@ class TestClass : public TestFixture {
                    "   A(){}\n"
                    "   bool GetVecEmpty()  {return m_v.empty();}\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style, inconclusive) Technically the member function 'A::GetVecEmpty' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (style, inconclusive) Technically the member function 'A::GetVecEmpty' can be const. [functionConst]\n", errout_str());
     }
 
     void constVirtualFunc() {
@@ -7125,7 +7444,7 @@ class TestClass : public TestFixture {
                    "   B() : b(0) { }\n"
                    "   int func() { return b; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style, inconclusive) Technically the member function 'B::func' can be const.\n", errout.str());
+        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"
                    "class B : public A {\n"
@@ -7135,7 +7454,7 @@ class TestClass : public TestFixture {
                    "   int func();\n"
                    "};\n"
                    "int B::func() { return b; }");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:6]: (style, inconclusive) Technically the member function 'B::func' can be const.\n", errout.str());
+        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
         checkConst("class A {\n"
@@ -7148,7 +7467,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func() { return b; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:9]: (style, inconclusive) Technically the member function 'B::func' can be const.\n", errout.str());
+        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"
                    "public:\n"
@@ -7161,7 +7480,7 @@ class TestClass : public TestFixture {
                    "    int func();\n"
                    "};\n"
                    "int B::func() { return b; }");
-        ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:9]: (style, inconclusive) Technically the member function 'B::func' can be const.\n", errout.str());
+        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
         checkConst("class A {\n"
@@ -7174,7 +7493,7 @@ class TestClass : public TestFixture {
                    "    B() : b(0) { }\n"
                    "    int func() { return b; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "public:\n"
@@ -7187,7 +7506,7 @@ class TestClass : public TestFixture {
                    "    int func();\n"
                    "};\n"
                    "int B::func() { return b; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "public:\n"
@@ -7200,7 +7519,7 @@ class TestClass : public TestFixture {
                    "    int func();\n"
                    "};\n"
                    "int B::func() { return b; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // base class has no virtual function
         checkConst("class A {\n"
@@ -7221,9 +7540,9 @@ class TestClass : public TestFixture {
                    "    C() : c(0) { }\n"
                    "    int func() { return c; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Technically the member function 'A::func' can be const.\n"
-                      "[test.cpp:11]: (style, inconclusive) Technically the member function 'B::func' can be const.\n"
-                      "[test.cpp:17]: (style, inconclusive) Technically the member function 'C::func' can be const.\n", errout.str());
+        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());
 
         checkConst("class A {\n"
                    "    int a;\n"
@@ -7246,9 +7565,9 @@ class TestClass : public TestFixture {
                    "    int func();\n"
                    "};\n"
                    "int C::func() { return c; }");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:5]: (style, inconclusive) Technically the member function 'A::func' can be const.\n"
-                      "[test.cpp:14] -> [test.cpp:12]: (style, inconclusive) Technically the member function 'B::func' can be const.\n"
-                      "[test.cpp:21] -> [test.cpp:19]: (style, inconclusive) Technically the member function 'C::func' can be const.\n", errout.str());
+        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());
 
         // base class has virtual function
         checkConst("class A {\n"
@@ -7269,7 +7588,7 @@ class TestClass : public TestFixture {
                    "    C() : c(0) { }\n"
                    "    int func() { return c; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkConst("class A {\n"
                    "    int a;\n"
@@ -7292,7 +7611,7 @@ class TestClass : public TestFixture {
                    "    int func();\n"
                    "};\n"
                    "int C::func() { return c; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #1311
         checkConst("class X {\n"
@@ -7313,9 +7632,9 @@ class TestClass : public TestFixture {
                    "    Z(int x, int y, int z) : Y(x, y), z(z) { }\n"
                    "    int getZ() { return z; }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Technically the member function 'X::getX' can be const.\n"
-                      "[test.cpp:11]: (style, inconclusive) Technically the member function 'Y::getY' can be const.\n"
-                      "[test.cpp:17]: (style, inconclusive) Technically the member function 'Z::getZ' can be const.\n", errout.str());
+        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());
 
         checkConst("class X {\n"
                    "    int x;\n"
@@ -7338,9 +7657,9 @@ class TestClass : public TestFixture {
                    "    int getZ();\n"
                    "};\n"
                    "int Z::getZ() { return z; }");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:5]: (style, inconclusive) Technically the member function 'X::getX' can be const.\n"
-                      "[test.cpp:14] -> [test.cpp:12]: (style, inconclusive) Technically the member function 'Y::getY' can be const.\n"
-                      "[test.cpp:21] -> [test.cpp:19]: (style, inconclusive) Technically the member function 'Z::getZ' can be const.\n", errout.str());
+        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());
     }
 
     void constIfCfg() {
@@ -7353,11 +7672,11 @@ class TestClass : public TestFixture {
                             "    }\n"
                             "};";
 
-        checkConst(code, &settings0, true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Technically the member function 'foo::f' can be static (but you may consider moving to unnamed namespace).\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, &settings0, 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
@@ -7365,7 +7684,7 @@ class TestClass : public TestFixture {
                             "    friend void f() { }\n"
                             "};";
         checkConst(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void constUnion() { // ticket #2111
@@ -7379,7 +7698,7 @@ class TestClass : public TestFixture {
                    "        d.f = x;\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void constArrayOperator() {
@@ -7396,7 +7715,7 @@ class TestClass : public TestFixture {
                    "        return y[1][6];\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:10]: (style, inconclusive) Technically the member function 'foo::c' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:7]: (style, inconclusive) Technically the member function 'foo::c' can be const. [functionConst]\n", errout_str());
     }
 
     void constRangeBasedFor() { // #5514
@@ -7416,7 +7735,7 @@ class TestClass : public TestFixture {
                    "            foo(e);\n"
                    "    }\n"
                    "};");
-        ASSERT_EQUALS("[test.cpp:8]: (style, inconclusive) Technically the member function 'Fred::f2' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:10]: (style, inconclusive) Technically the member function 'Fred::f2' can be const. [functionConst]\n", errout_str());
     }
 
     void const_shared_ptr() { // #8674
@@ -7428,7 +7747,7 @@ class TestClass : public TestFixture {
                    "};\n"
                    "\n"
                    "std::shared_ptr<Data> Fred::getData() { return data; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void constPtrToConstPtr() {
@@ -7436,7 +7755,7 @@ class TestClass : public TestFixture {
                    "public:\n"
                    "    const char *const *data;\n"
                    "    const char *const *getData() { return data; }\n}");
-        ASSERT_EQUALS("[test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::getData' can be const.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:24]: (style, inconclusive) Technically the member function 'Fred::getData' can be const. [functionConst]\n", errout_str());
     }
 
     void constTrailingReturnType() { // #9814
@@ -7444,7 +7763,17 @@ class TestClass : public TestFixture {
                    "    int x = 1;\n"
                    "    auto get() -> int & { return x; }\n"
                    "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void constRefQualified() { // #12920
+        checkConst("class Fred {\n"
+                   "public:\n"
+                   "    const Data& get() & { return data; }\n"
+                   "private:\n"
+                   "    Data data;\n"
+                   "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void staticArrayPtrOverload() {
@@ -7460,11 +7789,11 @@ class TestClass : public TestFixture {
                    "    return f(ptrs);\n"
                    "}\n"
                    "template void S::f(const std::array<std::string_view, 3>& sv);\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     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"
@@ -7472,26 +7801,18 @@ class TestClass : public TestFixture {
                    "};\n"
                    "void S::f() {\n"
                    "    std::vector<data>::const_iterator end = std.end();\n"
-                   "}\n", &s);
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'S::f' can be const.\n", errout.str());
+                   "}\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());
     }
 
-#define checkInitializerListOrder(code) checkInitializerListOrder_(code, __FILE__, __LINE__)
-    void checkInitializerListOrder_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        // Check..
-        settings0.certainty.setEnabled(Certainty::inconclusive, true);
-
-        Preprocessor preprocessor(settings0);
-
+#define checkInitializerListOrder(...) checkInitializerListOrder_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkInitializerListOrder_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings2, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClass checkClass(&tokenizer, &settings2, this);
         checkClass.initializerListOrder();
     }
 
@@ -7501,32 +7822,149 @@ class TestClass : public TestFixture {
                                   "public:\n"
                                   "    Fred() : c(0), b(0), a(0) { }\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2]: (style, inconclusive) Member variable 'Fred::b' is in the wrong place in the initializer list.\n"
-                      "[test.cpp:4] -> [test.cpp:2]: (style, inconclusive) Member variable 'Fred::a' is in the wrong place in the initializer list.\n", errout.str());
+        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("class Fred {\n"
                                   "    int a, b, c;\n"
                                   "public:\n"
                                   "    Fred() : c{0}, b{0}, a{0} { }\n"
                                   "};");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2]: (style, inconclusive) Member variable 'Fred::b' is in the wrong place in the initializer list.\n"
-                      "[test.cpp:4] -> [test.cpp:2]: (style, inconclusive) Member variable 'Fred::a' is in the wrong place in the initializer list.\n", errout.str());
+        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"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    int nCols() const;\n"
+                                  "    int nRows() const;\n"
+                                  "};\n"
+                                  "struct B {\n"
+                                  "    const char* m_name;\n"
+                                  "    int nCols;\n"
+                                  "    int nRows;\n"
+                                  "    B(const char* p_name, int nR, int nC)\n"
+                                  "        : m_name(p_name)\n"
+                                  "        , nCols(nC)\n"
+                                  "        , nRows(nR)\n"
+                                  "    {}\n"
+                                  "};\n"
+                                  "struct D : public B {\n"
+                                  "    const int  m_i;\n"
+                                  "    D(const S& s, int _i)\n"
+                                  "        : B(\"abc\", s.nRows(), s.nCols())\n"
+                                  "        , m_i(_i)\n"
+                                  "    {}\n"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
     }
 
-#define checkInitializationListUsage(code) checkInitializationListUsage_(code, __FILE__, __LINE__)
-    void checkInitializationListUsage_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
+    void initializerListArgument() {
+        checkInitializerListOrder("struct A { A(); };\n" // #12322
+                                  "struct B { explicit B(const A* a); };\n"
+                                  "struct C {\n"
+                                  "    C() : b(&a) {}\n"
+                                  "    B b;\n"
+                                  "    const A a;\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"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S() : p(a) {}\n"
+                                  "    int* p;\n"
+                                  "    int a[1];\n"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
 
+        checkInitializerListOrder("struct S {\n"
+                                  "    S() : p(&i) {}\n"
+                                  "    int* p;\n"
+                                  "    int i;\n"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S() : a(b = 1) {}\n"
+                                  "    int a, b;\n"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S() : r(i) {}\n"
+                                  "    int& r;\n"
+                                  "    int i{};\n"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct B {\n"
+                                  "    int a{}, b{};\n"
+                                  "};\n"
+                                  "struct D : B {\n"
+                                  "    D() : B(), j(b) {}\n"
+                                  "    int j;\n"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S() : a(i) {}\n"
+                                  "    int a;\n"
+                                  "    static int i;\n"
+                                  "};\n"
+                                  "int S::i = 0;");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S(int b) : a(b) {}\n"
+                                  "    int a, b{};\n"
+                                  "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("class Foo {\n" // #3524
+                                  "public:\n"
+                                  "    Foo(int arg) : a(b), b(arg) {}\n"
+                                  "    int a;\n"
+                                  "    int b;\n"
+                                  "};\n");
+        ASSERT_EQUALS("[test.cpp:3:20] -> [test.cpp:4:9]: (style, inconclusive) Member variable 'Foo::a' uses an uninitialized argument 'b' due to the order of declarations. [initializerList]\n",
+                      errout_str());
+
+        checkInitializerListOrder("struct S { double d = 0; };\n" // #12730
+                                  "struct T {\n"
+                                  "    T() : s(), a(s.d), d(0) {}\n"
+                                  "    S s;\n"
+                                  "    double a, d;\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S { static const int d = 1; };\n"
+                                  "struct T {\n"
+                                  "    T() : s(), a(S::d), d(0) {}\n"
+                                  "    S s;\n"
+                                  "    int a, d;\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+#define checkInitializationListUsage(...) checkInitializationListUsage_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkInitializationListUsage_(const char* file, int line, const char (&code)[size]) {
         // Check..
         const Settings settings = settingsBuilder().severity(Severity::performance).build();
 
-        Preprocessor preprocessor(settings);
-
         // Tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings, this);
         checkClass.initializationListUsage();
@@ -7540,113 +7978,113 @@ class TestClass : public TestFixture {
                                      "    Enum c;\n" // No message for enums: No performance gain
                                      "    Fred() { a = 0; b = 0; c = C; }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string s;\n"
                                      "    Fred() { a = 0; s = \"foo\"; }\n"
                                      "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 's' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::vector<int> v;\n"
                                      "    Fred() { v = unknown; }\n"
                                      "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'v' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Variable 'c' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() : a(0) { if(b) a = 0; }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        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.
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class C;\n"
                                      "class Fred {\n"
                                      "    C a;\n"
                                      "    Fred() { try { a = new int; } catch(...) {} }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string s;\n"
                                      "    Fred() { s = toString((size_t)this); }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string a;\n"
                                      "    std::string foo();\n"
                                      "    Fred() { a = foo(); }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n"
                                      "    std::string a;\n"
                                      "    Fred() { a = foo(); }\n"
                                      "};");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Variable 'a' is assigned in constructor body. Consider performing initialization in initialization list.\n", errout.str());
+        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"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #5640
                                      "    std::string s;\n"
@@ -7657,7 +8095,7 @@ class TestClass : public TestFixture {
                                      "        s = str;\n"
                                      "    }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class B {\n" // #5640
                                      "    std::shared_ptr<A> _d;\n"
@@ -7665,7 +8103,7 @@ class TestClass : public TestFixture {
                                      "        *_d = *other._d;\n"
                                      "    }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Bar {\n" // #8466
                                      "public:\n"
@@ -7674,7 +8112,7 @@ class TestClass : public TestFixture {
                                      "private:\n"
                                      "    char s;\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("unsigned bar(std::string);\n" // #8291
                                      "class Foo {\n"
@@ -7683,7 +8121,7 @@ class TestClass : public TestFixture {
                                      "    Foo(int a, int b) : a_(a), b_(b) {}\n"
                                      "    Foo(int a, const std::string& b) : Foo(a, bar(b)) {}\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class Fred {\n" // #8111
                                      "    std::string a;\n"
@@ -7693,7 +8131,7 @@ class TestClass : public TestFixture {
                                      "        a = ostr.str();\n"
                                      "    }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // bailout: multi line lambda in rhs => do not warn
         checkInitializationListUsage("class Fred {\n"
@@ -7704,7 +8142,7 @@ class TestClass : public TestFixture {
                                      "        };\n"
                                      "    }\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // don't warn if some other instance's members are assigned to
         checkInitializationListUsage("class C {\n"
@@ -7713,7 +8151,7 @@ class TestClass : public TestFixture {
                                      "private:\n"
                                      "    Foo m_i;\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInitializationListUsage("class A {\n" // #9821 - delegate constructor
                                      "public:\n"
@@ -7726,21 +8164,31 @@ class TestClass : public TestFixture {
                                      "private:\n"
                                      "    std::string st;\n"
                                      "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
+                                     "};");
+        ASSERT_EQUALS("", errout_str());
     }
 
 
-#define checkSelfInitialization(code) checkSelfInitialization_(code, __FILE__, __LINE__)
-    void checkSelfInitialization_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings0);
-
+#define checkSelfInitialization(...) checkSelfInitialization_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkSelfInitialization_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings0, this);
         (checkClass.checkSelfInitialization)();
@@ -7752,14 +8200,14 @@ class TestClass : public TestFixture {
                                 "    Fred() : i(i) {\n"
                                 "    }\n"
                                 "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Member variable 'i' is initialized by itself.\n", errout.str());
+        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"
                                 "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Member variable 'i' is initialized by itself.\n", errout.str());
+        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"
@@ -7767,7 +8215,7 @@ class TestClass : public TestFixture {
                                 "};\n"
                                 "Fred::Fred() : i(i) {\n"
                                 "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Member variable 'i' is initialized by itself.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (error) Member variable 'i' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class A {\n" // #10427
                                 "public:\n"
@@ -7775,7 +8223,7 @@ class TestClass : public TestFixture {
                                 "private:\n"
                                 "    int _x;\n"
                                 "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Member variable '_x' is initialized by itself.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:23]: (error) Member variable '_x' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class A {\n"
                                 "public:\n"
@@ -7783,80 +8231,74 @@ class TestClass : public TestFixture {
                                 "private:\n"
                                 "    int _x;\n"
                                 "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Member variable '_x' is initialized by itself.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:23]: (error) Member variable '_x' is initialized by itself. [selfInitialization]\n", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    std::string s;\n"
                                 "    Fred() : s(s) {\n"
                                 "    }\n"
                                 "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Member variable 's' is initialized by itself.\n", errout.str());
+        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) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    int x;\n"
                                 "    Fred(int x);\n"
                                 "};\n"
                                 "Fred::Fred(int x) : x{x} { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    std::string s;\n"
                                 "    Fred(const std::string& s) : s(s) {\n"
                                 "    }\n"
                                 "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("class Fred {\n"
                                 "    std::string s;\n"
                                 "    Fred(const std::string& s) : s{s} {\n"
                                 "    }\n"
                                 "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : Bar {\n"
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : Bar(\"\"), i(i) {}\n"
                                 "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : std::Bar {\n" // #6073
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : std::Bar(\"\"), i(i) {}\n"
                                 "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkSelfInitialization("struct Foo : std::Bar {\n" // #6073
                                 "    int i;\n"
                                 "    Foo(int i)\n"
                                 "        : std::Bar(\"\"), i{i} {}\n"
                                 "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
-
 #define checkVirtualFunctionCall(...) checkVirtualFunctionCall_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkVirtualFunctionCall_(const char* file, int line, const char code[], bool inconclusive = true) {
-        // Clear the error log
-        errout.str("");
-
+    template<size_t size>
+    void checkVirtualFunctionCall_(const char* file, int line, const char (&code)[size]) {
         // Check..
-        const Settings settings = settingsBuilder().severity(Severity::warning).certainty(Certainty::inconclusive, inconclusive).build();
-
-        Preprocessor preprocessor(settings);
+        const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).certainty(Certainty::inconclusive).build();
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckClass checkClass(&tokenizer, &settings, this);
         checkClass.checkVirtualFunctionCallInConstructor();
@@ -7870,21 +8312,21 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A()\n"
                                  "{f();}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:3]: (style) Virtual function 'f' is called from constructor 'A()' at line 7. Dynamic binding is not used.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (style) Virtual function 'f' is called from constructor 'A()' at line 3. Dynamic binding is not used.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (style) Virtual function 'f' is called from constructor 'A()' at line 3. Dynamic binding is not used.\n", errout.str());
+        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"
                                  "    virtual int f() = 0;\n"
@@ -7894,20 +8336,20 @@ class TestClass : public TestFixture {
                                  "    A() {f();}\n"
                                  "};\n"
                                  "int A::f() { return 1; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  "{\n"
                                  "    A() { A::f(); }\n"
                                  "    virtual void f() {}\n"
                                  "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A : B {\n"
                                  "    int f() final { return 1; }\n"
                                  "    A() { f(); }\n"
                                  "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class B {\n"
                                  "public:"
@@ -7918,7 +8360,7 @@ class TestClass : public TestFixture {
                                  "    void f() override final {}\n"
                                  "    A() { f(); }\n"
                                  "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class Base {\n"
                                  "public:\n"
@@ -7938,26 +8380,26 @@ class TestClass : public TestFixture {
                                  "    auto d = dynamic_cast<const Derived&>(Src);\n"
                                  "    i = d.i;\n"
                                  "}\n");
-        ASSERT_EQUALS("[test.cpp:13] -> [test.cpp:9]: (style) Virtual function 'Copy' is called from copy constructor 'Derived(const Derived&Src)' at line 13. Dynamic binding is not used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:13:5] -> [test.cpp:9:10]: (style) Virtual function 'Copy' is called from copy constructor 'Derived(const Derived&Src)' at line 13. Dynamic binding is not used. [virtualCallInConstructor]\n",
+                      errout_str());
 
         checkVirtualFunctionCall("struct B {\n"
                                  "    B() { auto pf = &f; }\n"
                                  "    virtual void f() {}\n"
                                  "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("struct B {\n"
                                  "    B() { auto pf = &B::f; }\n"
                                  "    virtual void f() {}\n"
                                  "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("struct B {\n"
                                  "    B() { (f)(); }\n"
                                  "    virtual void f() {}\n"
                                  "};\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Virtual function 'f' is called from constructor 'B()' at line 2. Dynamic binding is not used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:18]: (style) Virtual function 'f' is called from constructor 'B()' at line 2. Dynamic binding is not used. [virtualCallInConstructor]\n", errout_str());
 
         checkVirtualFunctionCall("class S {\n" // don't crash
                                  "    ~S();\n"
@@ -7968,7 +8410,7 @@ class TestClass : public TestFixture {
                                  "    typeid(S);\n"
                                  "}\n"
                                  "S::~S() = default;\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("struct Base: { virtual void wibble() = 0; virtual ~Base() {} };\n" // #11167
                                  "struct D final : public Base {\n"
@@ -7976,7 +8418,7 @@ class TestClass : public TestFixture {
                                  "    D() {}\n"
                                  "    virtual ~D() { wibble(); }\n"
                                  "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pureVirtualFunctionCall() {
@@ -7987,7 +8429,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A()\n"
                                  "{pure();}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in constructor.\n", errout.str());
+        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"
                                  "{\n"
@@ -7997,7 +8439,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A():m(A::pure())\n"
                                  "{}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in constructor.\n", errout.str());
+        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"
                                  "  class A\n"
@@ -8008,7 +8450,7 @@ class TestClass : public TestFixture {
                                  "  };\n"
                                  "}\n"
                                  "N::A::A() : m(N::A::pure()) {}\n");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:4]: (warning) Call of pure virtual function 'pure' in constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:21] -> [test.cpp:4:19]: (warning) Call of pure virtual function 'pure' in constructor. [pureVirtualCall]\n", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  " {\n"
@@ -8018,7 +8460,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::~A()\n"
                                  "{pure();}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in destructor.\n", errout.str());
+        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"
                                  " {\n"
@@ -8029,7 +8471,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A()\n"
                                  "{nonpure();}");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:5] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in constructor.\n", errout.str());
+        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"
                                  " {\n"
@@ -8041,7 +8483,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A():m(nonpure())\n"
                                  "{}");
-        TODO_ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:5] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in constructor.\n", "", errout.str());
+        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"
                                  " {\n"
@@ -8053,7 +8495,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::~A()\n"
                                  "{nonpure();}");
-        ASSERT_EQUALS("[test.cpp:10] -> [test.cpp:5] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in destructor.\n", errout.str());
+        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"
                                  "{\n"
@@ -8062,7 +8504,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A(bool b)\n"
                                  "{if (b) pure();}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in constructor.\n", errout.str());
+        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"
                                  "{\n"
@@ -8072,7 +8514,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::~A()\n"
                                  "{if (b) pure();}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (warning) Call of pure virtual function 'pure' in destructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:9] -> [test.cpp:3:18]: (warning) Call of pure virtual function 'pure' in destructor. [pureVirtualCall]\n", errout_str());
 
         // #5831
         checkVirtualFunctionCall("class abc {\n"
@@ -8080,7 +8522,7 @@ class TestClass : public TestFixture {
                                  "  virtual ~abc() throw() {}\n"
                                  "  virtual void def(void* g) throw () = 0;\n"
                                  "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4992
         checkVirtualFunctionCall("class CMyClass {\n"
@@ -8091,7 +8533,7 @@ class TestClass : public TestFixture {
                                  "    }\n"
                                  "    virtual void VirtualMethod() = 0;\n"
                                  "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10559
         checkVirtualFunctionCall("struct S {\n"
@@ -8099,7 +8541,7 @@ class TestClass : public TestFixture {
                                  "    virtual int f(const int x, const int y) = 0;\n"
                                  "    std::function<int()> m;\n"
                                  "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pureVirtualFunctionCallOtherClass() {
@@ -8110,7 +8552,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A(const A & a)\n"
                                  "{a.pure();}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  "{\n"
@@ -8123,7 +8565,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A()\n"
                                  "{B b; b.pure();}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pureVirtualFunctionCallWithBody() {
@@ -8136,7 +8578,7 @@ class TestClass : public TestFixture {
                                  "{pureWithBody();}\n"
                                  "void A::pureWithBody()\n"
                                  "{}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  " {\n"
@@ -8149,7 +8591,7 @@ class TestClass : public TestFixture {
                                  "{nonpure();}\n"
                                  "void A::pureWithBody()\n"
                                  "{}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -8163,7 +8605,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A()\n"
                                  "{nonpure(false);}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  " {\n"
@@ -8174,7 +8616,7 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A()\n"
                                  "{nonpure(false);}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkVirtualFunctionCall("class A\n"
                                  " {\n"
@@ -8189,23 +8631,18 @@ class TestClass : public TestFixture {
                                  "};\n"
                                  "A::A()\n"
                                  "{nonpure(false);}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
-#define checkOverride(code) checkOverride_(code, __FILE__, __LINE__)
-    void checkOverride_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
+#define checkOverride(...) checkOverride_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkOverride_(const char* file, int line, const char (&code)[size]) {
         const Settings settings = settingsBuilder().severity(Severity::style).build();
 
-        Preprocessor preprocessor(settings);
-
         // Tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -8215,15 +8652,15 @@ class TestClass : public TestFixture {
     void override1() {
         checkOverride("class Base { virtual void f(); };\n"
                       "class Derived : Base { virtual void f(); };");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
+        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; };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
                       "class Derived : Base { virtual void f() final; };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base {\n"
                       "public:\n"
@@ -8235,7 +8672,7 @@ class TestClass : public TestFixture {
                       "    auto foo( ) const -> size_t { return 0; }\n"
                       "    auto bar( ) const -> size_t override { return 0; }\n"
                       "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:8]: (style) The function 'foo' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
+        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"
                       "    class C {\n"
@@ -8247,7 +8684,7 @@ class TestClass : public TestFixture {
                       "public:\n"
                       "    ~C();\n"
                       "};");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:9]: (style) The destructor '~C' overrides a destructor in a base class but is not marked with a 'override' specifier.\n", errout.str());
+        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"
                       "    virtual void foo();\n"
@@ -8257,7 +8694,7 @@ class TestClass : public TestFixture {
                       "   void foo() override;\n"
                       "   void foo(int);\n"
                       "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct B {\n" // #9092
                       "    virtual int f(int i) const = 0;\n"
@@ -8267,7 +8704,7 @@ class TestClass : public TestFixture {
                       "        virtual int f(int i) const;\n"
                       "    };\n"
                       "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:6]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:6:21]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(int);\n"
@@ -8275,7 +8712,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(double);\n"
                       "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(int);\n"
@@ -8283,7 +8720,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(int);\n"
                       "};\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:5:8]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(char, int);\n"
@@ -8291,7 +8728,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(char, int);\n"
                       "};\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:5:8]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(char, int);\n"
@@ -8299,7 +8736,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(char, double);\n"
                       "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(char, int);\n"
@@ -8307,7 +8744,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(char c = '\\0', double);\n"
                       "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(char, int);\n"
@@ -8315,7 +8752,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(char c = '\\0', int);\n"
                       "};\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:5:8]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(char c, std::vector<int>);\n"
@@ -8323,7 +8760,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(char c, std::vector<double>);\n"
                       "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(char c, std::vector<int>);\n"
@@ -8331,7 +8768,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(char c, std::set<int>);\n"
                       "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("struct A {\n"
                       "    virtual void f(char c, std::vector<int> v);\n"
@@ -8339,7 +8776,7 @@ class TestClass : public TestFixture {
                       "struct D : A {\n"
                       "  void f(char c, std::vector<int> w = {});\n"
                       "};\n");
-        TODO_ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:2:18] -> [test.cpp:5:8]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", "", errout_str());
 
         checkOverride("struct T {};\n" // #10920
                       "struct B {\n"
@@ -8348,47 +8785,65 @@ class TestClass : public TestFixture {
                       "struct D : B {\n"
                       "    friend T f();\n"
                       "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkOverride("struct S {};\n" // #11827
+                      "struct SPtr {\n"
+                      "    virtual S* operator->() const { return p; }\n"
+                      "    S* p = nullptr;\n"
+                      "};\n"
+                      "struct T : public S {};\n"
+                      "struct TPtr : public SPtr {\n"
+                      "    T* operator->() const { return (T*)p; }\n"
+                      "};\n");
+        ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:8:8]: (style) The function 'operator->' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n",
+                      errout_str());
+
+        checkOverride("class Base {\n" // #12131
+                      "    virtual int Calculate(int arg) = 0;\n"
+                      "};\n"
+                      "class Derived : public Base {\n"
+                      "    int Calculate(int arg = 0) {\n"
+                      "        return arg * 2;\n"
+                      "    }\n"
+                      "};\n");
+        ASSERT_EQUALS("[test.cpp:2:17] -> [test.cpp:5:9]: (style) The function 'Calculate' overrides a function in a base class but is not marked with a 'override' specifier. [missingOverride]\n", errout_str());
+
+        checkOverride("struct S {\n" // #12439
+                      "    virtual ~S() = default;\n"
+                      "};\n"
+                      "struct D : S {\n"
+                      "    ~D() {}\n"
+                      "};\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());
     }
 
     void overrideCVRefQualifiers() {
         checkOverride("class Base { virtual void f(); };\n"
                       "class Derived : Base { void f() const; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
                       "class Derived : Base { void f() volatile; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
                       "class Derived : Base { void f() &; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOverride("class Base { virtual void f(); };\n"
                       "class Derived : Base { void f() &&; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
-    #define checkUselessOverride(code) checkUselessOverride_(code, __FILE__, __LINE__)
-    void checkUselessOverride_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
+    #define checkUselessOverride(...) checkUselessOverride_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkUselessOverride_(const char* file, int line, const char (&code)[size]) {
         const Settings settings = settingsBuilder().severity(Severity::style).build();
 
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
-        // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        tokenizer.createTokens(std::move(tokens2));
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check..
@@ -8401,51 +8856,51 @@ class TestClass : public TestFixture {
                              "struct D : B {\n"
                              "    int f() override { return B::f(); }\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class.\n", errout.str());
+        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"
                              "};");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class.\n", errout.str());
+        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"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                              "};");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3]: (style) The function 'f' overrides a function in a base class but just delegates back to the base class.\n", errout.str());
+        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"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct S { virtual void f(); };\n"
                              "struct D : S {\n"
                              "    void f() final { S::f(); }\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct S {\n"
                              "protected:\n"
@@ -8455,7 +8910,7 @@ class TestClass : public TestFixture {
                              "public:\n"
                              "    void f() override { S::f(); }\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual void f(int, int, int) const; };\n" // #11799
                              "struct D : B {\n"
@@ -8465,7 +8920,7 @@ class TestClass : public TestFixture {
                              "void D::f(int a, int b, int c) const {\n"
                              "    B::f(a, b, m);\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n" // #11803
                              "    virtual void f();\n"
@@ -8476,7 +8931,7 @@ class TestClass : public TestFixture {
                              "    void f(int i) override;\n"
                              "    void g() { f(); }\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B { virtual void f(); };\n" // #11808
                              "struct D : B { void f() override {} };\n"
@@ -8485,7 +8940,7 @@ class TestClass : public TestFixture {
                              "        B::f();\n"
                              "    }\n"
                              "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n"
                              "    virtual int f() { return 1; }\n"
@@ -8499,9 +8954,9 @@ class TestClass : public TestFixture {
                              "    int h(int j, int i) override { return i + j; }\n"
                              "    int j(int i, int j) override { return i + j; }\n"
                              "};");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:9]: (style) The function 'g' overrides a function in a base class but is identical to the overridden function\n"
-                      "[test.cpp:5] -> [test.cpp:11]: (style) The function 'j' overrides a function in a base class but is identical to the overridden function\n",
-                      errout.str());
+        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());
 
         checkUselessOverride("struct B : std::exception {\n"
                              "    virtual void f() { throw *this; }\n"
@@ -8509,7 +8964,7 @@ class TestClass : public TestFixture {
                              "struct D : B {\n"
                              "    void f() override { throw *this; }\n"
                              "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("#define MACRO virtual void f() {}\n"
                              "struct B {\n"
@@ -8518,7 +8973,7 @@ class TestClass : public TestFixture {
                              "struct D : B {\n"
                              "    MACRO\n"
                              "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n"
                              "    B() = default;\n"
@@ -8531,7 +8986,7 @@ class TestClass : public TestFixture {
                              "    int m{};\n"
                              "    int f() const override { return m; }\n"
                              "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUselessOverride("struct B {\n"
                              "    int g() const;\n"
@@ -8541,23 +8996,45 @@ class TestClass : public TestFixture {
                              "    int g() const;\n"
                              "    int f() const override { return g(); }\n"
                              "};\n");
-        ASSERT_EQUALS("", errout.str());
-    }
+        ASSERT_EQUALS("", errout_str());
 
-#define checkUnsafeClassRefMember(code) checkUnsafeClassRefMember_(code, __FILE__, __LINE__)
-    void checkUnsafeClassRefMember_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
+        checkUselessOverride("#define MACRO 1\n"
+                             "struct B { virtual int f() { return 1; } };\n"
+                             "struct D : B {\n"
+                             "    int f() override { return MACRO; }\n"
+                             "};\n");
+        ASSERT_EQUALS("", errout_str());
 
-        Settings settings = settingsBuilder().severity(Severity::warning).build();
-        settings.safeChecks.classes = true;
+        checkUselessOverride("struct B {\n" // #12706
+                             "    virtual void f() { g(); }\n"
+                             "    void g() { std::cout << \"Base\\n\"; }\n"
+                             "};\n"
+                             "struct D : B {\n"
+                             "    void f() override { g(); }\n"
+                             "    virtual void g() { std::cout << \"Derived\\n\"; }\n"
+                             "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUselessOverride("struct B {\n" // #12946
+                             "    virtual int f() { return i; }\n"
+                             "    int i;\n"
+                             "};\n"
+                             "struct D : B {\n"
+                             "    int f() override { return b.f(); }\n"
+                             "    B b;\n"
+                             "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
 
-        Preprocessor preprocessor(settings);
+#define checkUnsafeClassRefMember(...) checkUnsafeClassRefMember_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkUnsafeClassRefMember_(const char* file, int line, const char (&code)[size]) {
+        /*const*/ Settings settings = settingsBuilder().severity(Severity::warning).build();
+        settings.safeChecks.classes = true;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings, this);
@@ -8566,21 +9043,16 @@ class TestClass : public TestFixture {
 
     void unsafeClassRefMember() {
         checkUnsafeClassRefMember("class C { C(const std::string &s) : s(s) {} const std::string &s; };");
-        ASSERT_EQUALS("[test.cpp:1]: (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.\n", errout.str());
+        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());
     }
 
 
-#define checkThisUseAfterFree(code) checkThisUseAfterFree_(code, __FILE__, __LINE__)
-    void checkThisUseAfterFree_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings1);
-
+#define checkThisUseAfterFree(...) checkThisUseAfterFree_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkThisUseAfterFree_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
         CheckClass checkClass(&tokenizer, &settings1, this);
@@ -8598,11 +9070,11 @@ class TestClass : public TestFixture {
                               "  static C *mInstance;\n"
                               "  void hello() {}\n"
                               "};");
-        ASSERT_EQUALS("test.cpp:3:warning:Calling method 'hello()' when 'this' might be invalid\n"
-                      "test.cpp:5:note:Assuming 'mInstance' is used as 'this'\n"
-                      "test.cpp:3:note:Delete 'mInstance', invalidating 'this'\n"
-                      "test.cpp:3:note:Call method when 'this' is invalid\n",
-                      errout.str());
+        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"
+                      "[test.cpp:3:38]: note: Call method when 'this' is invalid\n",
+                      errout_str());
 
         checkThisUseAfterFree("class C {\n"
                               "public:\n"
@@ -8611,11 +9083,11 @@ class TestClass : public TestFixture {
                               "  static std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
                               "};");
-        ASSERT_EQUALS("test.cpp:3:warning:Calling method 'hello()' when 'this' might be invalid\n"
-                      "test.cpp:5:note:Assuming 'mInstance' is used as 'this'\n"
-                      "test.cpp:3:note:Delete 'mInstance', invalidating 'this'\n"
-                      "test.cpp:3:note:Call method when 'this' is invalid\n",
-                      errout.str());
+        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"
+                      "[test.cpp:3:39]: note: Call method when 'this' is invalid\n",
+                      errout_str());
 
         checkThisUseAfterFree("class C {\n"
                               "public:\n"
@@ -8625,11 +9097,11 @@ class TestClass : public TestFixture {
                               "  void hello();\n"
                               "  void reset() { mInstance.reset(); }\n"
                               "};");
-        ASSERT_EQUALS("test.cpp:3:warning:Calling method 'hello()' when 'this' might be invalid\n"
-                      "test.cpp:5:note:Assuming 'mInstance' is used as 'this'\n"
-                      "test.cpp:7:note:Delete 'mInstance', invalidating 'this'\n"
-                      "test.cpp:3:note:Call method when 'this' is invalid\n",
-                      errout.str());
+        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"
+                      "[test.cpp:3:29]: note: Call method when 'this' is invalid\n",
+                      errout_str());
 
         // Use member..
         checkThisUseAfterFree("class C {\n"
@@ -8639,11 +9111,11 @@ class TestClass : public TestFixture {
                               "  static C *self;\n"
                               "  int x;\n"
                               "};");
-        ASSERT_EQUALS("test.cpp:3:warning:Using member 'x' when 'this' might be invalid\n"
-                      "test.cpp:5:note:Assuming 'self' is used as 'this'\n"
-                      "test.cpp:3:note:Delete 'self', invalidating 'this'\n"
-                      "test.cpp:3:note:Call method when 'this' is invalid\n",
-                      errout.str());
+        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"
+                      "[test.cpp:3:33]: note: Call method when 'this' is invalid\n",
+                      errout_str());
 
         checkThisUseAfterFree("class C {\n"
                               "public:\n"
@@ -8652,11 +9124,11 @@ class TestClass : public TestFixture {
                               "  static C *self;\n"
                               "  std::map<int,int> x;\n"
                               "};");
-        ASSERT_EQUALS("test.cpp:3:warning:Using member 'x' when 'this' might be invalid\n"
-                      "test.cpp:5:note:Assuming 'self' is used as 'this'\n"
-                      "test.cpp:3:note:Delete 'self', invalidating 'this'\n"
-                      "test.cpp:3:note:Call method when 'this' is invalid\n",
-                      errout.str());
+        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"
+                      "[test.cpp:3:33]: note: Call method when 'this' is invalid\n",
+                      errout_str());
 
         // Assign 'shared_from_this()' to non-static smart pointer
         checkThisUseAfterFree("class C {\n"
@@ -8667,11 +9139,11 @@ class TestClass : public TestFixture {
                               "  std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
                               "};");
-        ASSERT_EQUALS("test.cpp:4:warning:Calling method 'hello()' when 'this' might be invalid\n"
-                      "test.cpp:6:note:Assuming 'mInstance' is used as 'this'\n"
-                      "test.cpp:4:note:Delete 'mInstance', invalidating 'this'\n"
-                      "test.cpp:4:note:Call method when 'this' is invalid\n",
-                      errout.str());
+        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"
+                      "[test.cpp:4:39]: note: Call method when 'this' is invalid\n",
+                      errout_str());
 
         // Avoid FP..
         checkThisUseAfterFree("class C {\n"
@@ -8681,7 +9153,7 @@ class TestClass : public TestFixture {
                               "  C *self;\n"
                               "  int x;\n"
                               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C {\n"
                               "public:\n"
@@ -8691,7 +9163,7 @@ class TestClass : public TestFixture {
                               "  std::shared_ptr<C> mInstance;\n"
                               "  void hello() {}\n"
                               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkThisUseAfterFree("class C\n"
                               "{\n"
@@ -8708,7 +9180,7 @@ class TestClass : public TestFixture {
                               "};\n"
                               "\n"
                               "C* C::instanceSingleton;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Avoid false positive when pointer is deleted in lambda
         checkThisUseAfterFree("class C {\n"
@@ -8724,26 +9196,41 @@ class TestClass : public TestFixture {
                               "    dostuff();\n"
                               "    done();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkThisUseAfterFree("class C {\n" // #13311
+                              "public:\n"
+                              "    static void init();\n"
+                              "private:\n"
+                              "    C();\n"
+                              "    static C* self;\n"
+                              "    bool use;\n"
+                              "};\n"
+                              "C::C() { use = true; }\n"
+                              "void C::init() {\n"
+                              "    if (self)\n"
+                              "        delete self;\n"
+                              "    self = new C();\n"
+                              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
 
     void ctu(const std::vector<std::string> &code) {
-        const Settings settings;
-        auto &check = getCheck<CheckClass>();
+        Check &check = getCheck<CheckClass>();
 
         // getFileInfo
         std::list<Check::FileInfo*> fileInfo;
         for (const std::string& c: code) {
-            Tokenizer tokenizer(&settings, this);
-            std::istringstream istr(c);
-            ASSERT(tokenizer.tokenize(istr, (std::to_string(fileInfo.size()) + ".cpp").c_str()));
-            fileInfo.push_back(check.getFileInfo(&tokenizer, &settings));
+            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, ""));
         }
 
         // Check code..
-        errout.str("");
-        check.analyseWholeProgram(nullptr, fileInfo, settings, *this);
+        const CTU::FileInfo ctu;
+        check.analyseWholeProgram(ctu, fileInfo, settingsDefault, *this); // TODO: check result
 
         while (!fileInfo.empty()) {
             delete fileInfo.back();
@@ -8753,44 +9240,38 @@ class TestClass : public TestFixture {
 
     void ctuOneDefinitionRule() {
         ctu({"class C { C() { std::cout << 0; } };", "class C { C() { std::cout << 1; } };"});
-        ASSERT_EQUALS("[1.cpp:1] -> [0.cpp:1]: (error) The one definition rule is violated, different classes/structs have the same name 'C'\n", errout.str());
+        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; }"});
-        ASSERT_EQUALS("[1.cpp:1] -> [0.cpp:1]: (error) The one definition rule is violated, different classes/structs have the same name 'C'\n", errout.str());
+        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());
+        ASSERT_EQUALS("", errout_str());
 
         ctu({"class C { C(); }; C::C(){}", "class C { C(); }; C::C(){}"});
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu({"class A::C { C() { std::cout << 0; } };", "class B::C { C() { std::cout << 1; } };"});
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // 11435 - template specialisations
         const std::string header = "template<typename T1, typename T2> struct Test {};\n";
         ctu({header + "template<typename T1> struct Test<T1, int> {};\n",
              header + "template<typename T1> struct Test<T1, double> {};\n"});
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
-#define getFileInfo(code) getFileInfo_(code, __FILE__, __LINE__)
-    void getFileInfo_(const char code[], const char* file, int line) {
-        // Clear the error log
-        errout.str("");
-
-        Preprocessor preprocessor(settings1);
-
+#define getFileInfo(...) getFileInfo_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void getFileInfo_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings1, this);
-
-        Check::FileInfo * fileInfo = (checkClass.getFileInfo)(&tokenizer, &settings1);
+        const Check& c = getCheck<CheckClass>();
+        Check::FileInfo * fileInfo = (c.getFileInfo)(tokenizer, settings1, "");
 
         delete fileInfo;
     }
@@ -8800,6 +9281,116 @@ class TestClass : public TestFixture {
         getFileInfo("struct sometype { sometype(); }; sometype::sometype() = delete;"); // don't crash
     }
 
+#define checkReturnByReference(...) checkReturnByReference_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkReturnByReference_(const char* file, int line, const char (&code)[size]) {
+        const Settings settings = settingsBuilder().severity(Severity::performance).library("std.cfg").build();
+
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
+
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
+
+        // Check..
+        CheckClass checkClass(&tokenizer, &settings, this);
+        (checkClass.checkReturnByReference)();
+    }
+
+    void returnByReference() {
+        checkReturnByReference("struct T { int a[10]; };\n" // #12546
+                               "struct S {\n"
+                               "    T t;\n"
+                               "    int i;\n"
+                               "    std::string s;\n"
+                               "    T getT() const { return t; }\n"
+                               "    int getI() const { return i; }\n"
+                               "    std::string getS() const { return s; }\n"
+                               "    unknown_t f() { return; }\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:6:7]: (performance) Function 'getT()' should return member 't' by const reference. [returnByReference]\n"
+                      "[test.cpp:8:17]: (performance) Function 'getS()' should return member 's' by const reference. [returnByReference]\n",
+                      errout_str());
+
+        checkReturnByReference("struct B {\n" // #12608
+                               "    virtual std::string f() { return \"abc\"; }\n"
+                               "};\n"
+                               "struct D : B {\n"
+                               "    std::string f() override { return s; }\n"
+                               "    std::string s;\n"
+                               "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkReturnByReference("struct S {\n"
+                               "    std::string f(std::string s) { return s; }\n"
+                               "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkReturnByReference("struct S { S(); };\n" // #12620
+                               "S::S() = delete;\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
+        checkReturnByReference("struct S {\n" // #12626
+                               "    std::string s;\n"
+                               "    operator std::string_view() const { return s; }\n"
+                               "    std::string_view get() const { return s; }\n"
+                               "};\n"
+                               "template<typename T>\n"
+                               "struct U {\n"
+                               "    T t;\n"
+                               "    operator const T& () const { return t; }\n"
+                               "};\n"
+                               "U<std::string> u;\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkReturnByReference("struct S {\n" // #13011
+                               "    std::string s;\n"
+                               "    const std::string& foo() const & { return s; }\n"
+                               "    std::string foo() && { return s; }\n" // <- used for temporary objects
+                               "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkReturnByReference("struct S1 {\n" // #13056
+                               "    std::string str;\n"
+                               "    struct T { std::string strT; } mT;\n"
+                               "};\n"
+                               "struct S2 {\n"
+                               "    std::string get1() const {\n"
+                               "        return mS1->str;\n"
+                               "    }\n"
+                               "    std::string get2() const {\n"
+                               "        return mS1->mT.strT;\n"
+                               "    }\n"
+                               "    S1* mS1;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:6:17]: (performance) Function 'get1()' should return member 'str' by const reference. [returnByReference]\n"
+                      "[test.cpp:9:17]: (performance) Function 'get2()' should return member 'strT' by const reference. [returnByReference]\n",
+                      errout_str());
+
+        checkReturnByReference("struct S { std::string str; };\n" // #13059
+                               "struct T {\n"
+                               "    S temp() const;\n"
+                               "    S s[1];\n"
+                               "};\n"
+                               "struct U {\n"
+                               "    std::string get1() const {\n"
+                               "        return t.temp().str;\n"
+                               "    }\n"
+                               "    std::string get2() const {\n"
+                               "        return t.s[0].str;\n"
+                               "    }\n"
+                               "    T t;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:10:17]: (performance) Function 'get2()' should return member 'str' by const reference. [returnByReference]\n",
+                      errout_str());
+
+        checkReturnByReference("struct S {\n" // #13845
+                               "    std::string m;\n"
+                               "    std::string get() { return m; }\n"
+                               "};\n"
+                               "std::string f(std::optional<S> o) {\n"
+                               "    return o.transform(&S::get).value_or(\"\");\n"
+                               "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
 };
 
 REGISTER_TEST(TestClass)
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index fffa19f5ff7..7b5c646e4bf 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-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
@@ -16,49 +16,136 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "checkers.h"
+#include "cmdlinelogger.h"
 #include "cmdlineparser.h"
 #include "config.h"
-#include "cppcheckexecutor.h"
+#include "errorlogger.h"
 #include "errortypes.h"
+#include "filesettings.h"
+#include "fixture.h"
+#include "helpers.h"
+#include "path.h"
 #include "platform.h"
 #include "redirect.h"
 #include "settings.h"
 #include "standards.h"
 #include "suppressions.h"
-#include "fixture.h"
 #include "timer.h"
+#include "utils.h"
 
-#include <cstdint>
 #include <cstdio>
 #include <list>
+#include <memory>
 #include <set>
+#include <stdexcept>
 #include <string>
+#include <unordered_set>
 #include <vector>
 
 class TestCmdlineParser : public TestFixture {
 public:
     TestCmdlineParser() : TestFixture("TestCmdlineParser")
+    {}
+
+private:
+    class CmdLineLoggerTest : public CmdLineLogger
     {
-#if defined(_WIN64) || defined(_WIN32)
-        CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;
-#endif
+    public:
+        CmdLineLoggerTest() = default;
+
+        void printMessage(const std::string &message) override
+        {
+            printInternal("cppcheck: " + message + '\n');
+        }
+
+        void printError(const std::string &message) override
+        {
+            printMessage("error: " + message);
+        }
+
+        void printRaw(const std::string &message) override
+        {
+            printInternal(message + '\n'); // TODO: should not append newline
+        }
+
+        std::string str()
+        {
+            std::string s;
+            std::swap(buf, s);
+            return s;
+        }
+
+        void destroy()
+        {
+            if (!buf.empty())
+                throw std::runtime_error("unconsumed messages: " + buf);
+        }
+
+    private:
+        void printInternal(const std::string &message)
+        {
+            buf += message;
+        }
+
+        std::string buf;
+    };
+
+    class CmdLineParserTest : 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<CmdLineParserTest> parser;
+
+    void prepareTestInternal() override {
+        logger.reset(new CmdLineLoggerTest());
+        settings.reset(new Settings());
+        supprs.reset(new Suppressions());
+        parser.reset(new CmdLineParserTest(*logger, *settings, *supprs));
     }
 
-    ~TestCmdlineParser() override {
-#if defined(_WIN64) || defined(_WIN32)
-        CmdLineParser::SHOW_DEF_PLATFORM_MSG = true;
-#endif
+    void teardownTestInternal() override {
+        logger->destroy();
     }
 
-private:
-    Settings settings; // TODO: reset after each test
-    CmdLineParser defParser{settings, settings.nomsg, settings.nofail}; // TODO: reset after each test
+    void asPremium() {
+        // set this so we think it is the premium
+        settings->cppcheckCfgProductName = "Cppcheck Premium 0.0.0";
+    }
+
+    template<size_t size>
+    CmdLineParser::Result parseFromArgs(const char* const (&argv)[size]) {
+        return parser->parseFromArgs(size, argv);
+    }
+
+    template<size_t size>
+    bool fillSettingsFromArgs(const char* const (&argv)[size]) {
+        return parser->fillSettingsFromArgs(size, argv);
+    }
 
     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(showversion);
+        TEST_CASE(helplongExclusive);
+        TEST_CASE(helplongWithCfg);
+        TEST_CASE(version);
+        TEST_CASE(versionWithCfg);
+        TEST_CASE(versionExclusive);
+        TEST_CASE(checkVersionCorrect);
+        TEST_CASE(checkVersionIncorrect);
         TEST_CASE(onefile);
         TEST_CASE(onepath);
         TEST_CASE(optionwithoutfile);
@@ -68,7 +155,10 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(debugwarnings);
         TEST_CASE(forceshort);
         TEST_CASE(forcelong);
-        TEST_CASE(relativePaths);
+        TEST_CASE(relativePaths1);
+        TEST_CASE(relativePaths2);
+        TEST_CASE(relativePaths3);
+        TEST_CASE(relativePaths4);
         TEST_CASE(quietshort);
         TEST_CASE(quietlong);
         TEST_CASE(defines_noarg);
@@ -78,7 +168,13 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(defines2);
         TEST_CASE(defines3);
         TEST_CASE(defines4);
-        TEST_CASE(enforceLanguage);
+        TEST_CASE(enforceLanguage1);
+        TEST_CASE(enforceLanguage2);
+        TEST_CASE(enforceLanguage3);
+        TEST_CASE(enforceLanguage4);
+        TEST_CASE(enforceLanguage5);
+        TEST_CASE(enforceLanguage6);
+        TEST_CASE(enforceLanguage7);
         TEST_CASE(includesnopath);
         TEST_CASE(includes);
         TEST_CASE(includesslash);
@@ -96,6 +192,9 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(enabledInformation);
         TEST_CASE(enabledUnusedFunction);
         TEST_CASE(enabledMissingInclude);
+        TEST_CASE(disabledMissingIncludeWithInformation);
+        TEST_CASE(enabledMissingIncludeWithInformation);
+        TEST_CASE(enabledMissingIncludeWithInformationReverseOrder);
 #ifdef CHECK_INTERNAL
         TEST_CASE(enabledInternal);
 #endif
@@ -118,24 +217,70 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(exitcodeSuppressionsOld);
         TEST_CASE(exitcodeSuppressions);
         TEST_CASE(exitcodeSuppressionsNoFile);
+        TEST_CASE(fileFilterFileWithDetailsSimplifiedPath);
+        TEST_CASE(fileFilterFileWithDetailsCase);
+        TEST_CASE(fileFilterStdin);
+        TEST_CASE(fileFilterPlus);
+        TEST_CASE(fileFilterNoMatch);
         TEST_CASE(fileList);
         TEST_CASE(fileListNoFile);
-        // TEST_CASE(fileListStdin);  // Disabled since hangs the test run
+        TEST_CASE(fileListStdin);
         TEST_CASE(fileListInvalid);
         TEST_CASE(inlineSuppr);
         TEST_CASE(jobs);
         TEST_CASE(jobs2);
         TEST_CASE(jobsMissingCount);
         TEST_CASE(jobsInvalid);
+        TEST_CASE(jobsNoJobs);
         TEST_CASE(jobsTooBig);
         TEST_CASE(maxConfigs);
         TEST_CASE(maxConfigsMissingCount);
         TEST_CASE(maxConfigsInvalid);
         TEST_CASE(maxConfigsTooSmall);
-        TEST_CASE(reportProgressTest); // "Test" suffix to avoid hiding the parent's reportProgress
+        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(premiumOptionsInvalid1);
+        TEST_CASE(premiumOptionsInvalid2);
+        TEST_CASE(premiumSafety);
+        TEST_CASE(premiumDebugProgress);
+        TEST_CASE(reportProgress1);
+        TEST_CASE(reportProgress2);
+        TEST_CASE(reportProgress3);
+        TEST_CASE(reportProgress4);
+        TEST_CASE(reportProgress5);
         TEST_CASE(stdc99);
+        TEST_CASE(stdgnu17);
+        TEST_CASE(stdiso9899_1999);
         TEST_CASE(stdcpp11);
-        TEST_CASE(stdunknown);
+        TEST_CASE(stdgnupp23);
+        TEST_CASE(stdunknown1);
+        TEST_CASE(stdunknown2);
+        TEST_CASE(stdunknown3);
+        TEST_CASE(stdoverwrite1);
+        TEST_CASE(stdoverwrite2);
+        TEST_CASE(stdoverwrite3);
+        TEST_CASE(stdoverwrite4);
+        TEST_CASE(stdmulti1);
+        TEST_CASE(stdmulti2);
         TEST_CASE(platformWin64);
         TEST_CASE(platformWin32A);
         TEST_CASE(platformWin32W);
@@ -147,15 +292,14 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(platformUnspecified);
         TEST_CASE(platformPlatformFile);
         TEST_CASE(platformUnknown);
-#if defined(_WIN64) || defined(_WIN32)
-        TEST_CASE(platformDefault);
-        TEST_CASE(platformDefault2);
-#endif
+        TEST_CASE(platformEmpty);
         TEST_CASE(plistEmpty);
         TEST_CASE(plistDoesNotExist);
         TEST_CASE(suppressionsOld);
         TEST_CASE(suppressions);
-        TEST_CASE(suppressionsNoFile);
+        TEST_CASE(suppressionsNoFile1);
+        TEST_CASE(suppressionsNoFile2);
+        TEST_CASE(suppressionsNoFile3);
         TEST_CASE(suppressionSingle);
         TEST_CASE(suppressionSingleFile);
         TEST_CASE(suppressionTwo);
@@ -167,12 +311,11 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(templatesCppcheck1);
         TEST_CASE(templatesDaca2);
         TEST_CASE(templatesSelfcheck);
+        TEST_CASE(templatesSimple);
         TEST_CASE(templatesNoPlaceholder);
         TEST_CASE(templateFormatInvalid);
-        TEST_CASE(templateFormatInvalid2);
         TEST_CASE(templateFormatEmpty);
         TEST_CASE(templateLocationInvalid);
-        TEST_CASE(templateLocationInvalid2);
         TEST_CASE(templateLocationEmpty);
         TEST_CASE(xml);
         TEST_CASE(xmlver2);
@@ -181,18 +324,32 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(xmlverunknown);
         TEST_CASE(xmlverinvalid);
         TEST_CASE(doc);
-        TEST_CASE(showtime);
-        TEST_CASE(errorlist1);
-        TEST_CASE(errorlistverbose1);
-        TEST_CASE(errorlistverbose2);
+        TEST_CASE(docExclusive);
+        TEST_CASE(showtimeSummary);
+        TEST_CASE(showtimeFile);
+        TEST_CASE(showtimeFileTotal);
+        TEST_CASE(showtimeTop5);
+        TEST_CASE(showtimeTop5File);
+        TEST_CASE(showtimeTop5Summary);
+        TEST_CASE(showtimeNone);
+        TEST_CASE(showtimeEmpty);
+        TEST_CASE(showtimeInvalid);
+        TEST_CASE(errorlist);
+        TEST_CASE(errorlistWithCfg);
+        TEST_CASE(errorlistExclusive);
         TEST_CASE(ignorepathsnopath);
+#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
         TEST_CASE(exceptionhandling);
         TEST_CASE(exceptionhandling2);
         TEST_CASE(exceptionhandling3);
         TEST_CASE(exceptionhandlingInvalid);
         TEST_CASE(exceptionhandlingInvalid2);
+#else
+        TEST_CASE(exceptionhandlingNotSupported);
+        TEST_CASE(exceptionhandlingNotSupported2);
+#endif
         TEST_CASE(clang);
-        TEST_CASE(clang2);
+        TEST_CASE(clangCustom);
         TEST_CASE(clangInvalid);
         TEST_CASE(valueFlowMaxIterations);
         TEST_CASE(valueFlowMaxIterations2);
@@ -202,12 +359,16 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(checksMaxTime);
         TEST_CASE(checksMaxTime2);
         TEST_CASE(checksMaxTimeInvalid);
-#ifdef THREADING_MODEL_FORK
+#ifdef HAS_THREADING_MODEL_FORK
         TEST_CASE(loadAverage);
         TEST_CASE(loadAverage2);
         TEST_CASE(loadAverageInvalid);
+#else
+        TEST_CASE(loadAverageNotSupported);
 #endif
         TEST_CASE(maxCtuDepth);
+        TEST_CASE(maxCtuDepth2);
+        TEST_CASE(maxCtuDepthLimit);
         TEST_CASE(maxCtuDepthInvalid);
         TEST_CASE(performanceValueflowMaxTime);
         TEST_CASE(performanceValueflowMaxTimeInvalid);
@@ -221,6 +382,117 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(typedefMaxTimeInvalid2);
         TEST_CASE(templateMaxTime);
         TEST_CASE(templateMaxTime);
+        TEST_CASE(project);
+        TEST_CASE(projectMultiple);
+        TEST_CASE(projectAndSource);
+        TEST_CASE(projectEmpty);
+        TEST_CASE(projectMissing);
+        TEST_CASE(projectNoPaths);
+        TEST_CASE(addon);
+        TEST_CASE(addonMissing);
+#ifdef HAVE_RULES
+        TEST_CASE(rule);
+        TEST_CASE(ruleMissingPattern);
+        TEST_CASE(ruleInvalidPattern);
+#else
+        TEST_CASE(ruleNotSupported);
+#endif
+#ifdef HAVE_RULES
+        TEST_CASE(ruleFileMulti);
+        TEST_CASE(ruleFileSingle);
+        TEST_CASE(ruleFileEmpty);
+        TEST_CASE(ruleFileMissing);
+        TEST_CASE(ruleFileInvalid);
+        TEST_CASE(ruleFileNoRoot);
+        TEST_CASE(ruleFileEmptyElements1);
+        TEST_CASE(ruleFileEmptyElements2);
+        TEST_CASE(ruleFileUnknownElement1);
+        TEST_CASE(ruleFileUnknownElement2);
+        TEST_CASE(ruleFileMissingTokenList);
+        TEST_CASE(ruleFileUnknownTokenList);
+        TEST_CASE(ruleFileMissingId);
+        TEST_CASE(ruleFileInvalidSeverity1);
+        TEST_CASE(ruleFileInvalidSeverity2);
+        TEST_CASE(ruleFileInvalidPattern);
+#else
+        TEST_CASE(ruleFileNotSupported);
+#endif
+        TEST_CASE(signedChar);
+        TEST_CASE(signedChar2);
+        TEST_CASE(unsignedChar);
+        TEST_CASE(unsignedChar2);
+        TEST_CASE(signedCharUnsignedChar);
+        TEST_CASE(library);
+        TEST_CASE(libraryMissing);
+        TEST_CASE(libraryMultiple);
+        TEST_CASE(libraryMultipleEmpty);
+        TEST_CASE(libraryMultipleEmpty2);
+        TEST_CASE(suppressXml);
+        TEST_CASE(suppressXmlEmpty);
+        TEST_CASE(suppressXmlMissing);
+        TEST_CASE(suppressXmlInvalid);
+        TEST_CASE(suppressXmlNoRoot);
+        TEST_CASE(executorDefault);
+        TEST_CASE(executorAuto);
+        TEST_CASE(executorAutoNoJobs);
+#if defined(HAS_THREADING_MODEL_THREAD)
+        TEST_CASE(executorThread);
+        TEST_CASE(executorThreadNoJobs);
+#else
+        TEST_CASE(executorThreadNotSupported);
+#endif
+#if defined(HAS_THREADING_MODEL_FORK)
+        TEST_CASE(executorProcess);
+        TEST_CASE(executorProcessNoJobs);
+#else
+        TEST_CASE(executorProcessNotSupported);
+#endif
+        TEST_CASE(checkLevelDefault);
+        TEST_CASE(checkLevelNormal);
+        TEST_CASE(checkLevelExhaustive);
+        TEST_CASE(checkLevelUnknown);
+        TEST_CASE(cppHeaderProbe);
+        TEST_CASE(cppHeaderProbe2);
+        TEST_CASE(noCppHeaderProbe);
+        TEST_CASE(noCppHeaderProbe2);
+        TEST_CASE(debugLookup);
+        TEST_CASE(debugLookupAll);
+        TEST_CASE(debugLookupAddon);
+        TEST_CASE(debugLookupConfig);
+        TEST_CASE(debugLookupLibrary);
+        TEST_CASE(debugLookupPlatform);
+        TEST_CASE(maxTemplateRecursion);
+        TEST_CASE(maxTemplateRecursionMissingCount);
+        TEST_CASE(emitDuplicates);
+        TEST_CASE(debugClangOutput);
+        TEST_CASE(debugXmlMultiple);
+        TEST_CASE(debugNormalXmlMultiple);
+        TEST_CASE(debugIgnore);
+        TEST_CASE(checkHeaders);
+        TEST_CASE(noCheckHeaders);
+        TEST_CASE(noCheckHeaders2);
+        TEST_CASE(filesdir);
+        TEST_CASE(checkUnusedTemplates);
+        TEST_CASE(noCheckUnusedTemplates);
+        TEST_CASE(noCheckUnusedTemplates);
+        TEST_CASE(clangTidy);
+        TEST_CASE(clangTidyCustom);
+        TEST_CASE(projectConfigurationNoProject);
+        TEST_CASE(projectConfigurationEmpty);
+        TEST_CASE(analyzeAllVsConfigs);
+        TEST_CASE(noAnalyzeAllVsConfigs);
+        TEST_CASE(noAnalyzeAllVsConfigs2);
+        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(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -228,6 +500,15 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(ignorepaths4);
         TEST_CASE(ignorefilepaths1);
         TEST_CASE(ignorefilepaths2);
+        TEST_CASE(ignorefilepaths3);
+        TEST_CASE(ignorefilepaths4);
+        TEST_CASE(ignorefilepaths5);
+        TEST_CASE(ignorefilepaths6);
+        TEST_CASE(ignorefilepaths7);
+        TEST_CASE(ignorefilepaths8);
+        TEST_CASE(ignorefilepaths9);
+
+        TEST_CASE(nonexistentpath);
 
         TEST_CASE(checkconfig);
         TEST_CASE(unknownParam);
@@ -237,1715 +518,3233 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(undefs_noarg3);
         TEST_CASE(undefs);
         TEST_CASE(undefs2);
-    }
 
+        TEST_CASE(cppcheckBuildDirExistent);
+        TEST_CASE(cppcheckBuildDirNonExistent);
+        TEST_CASE(cppcheckBuildDirEmpty);
+        TEST_CASE(cppcheckBuildDirMultiple);
+        TEST_CASE(noCppcheckBuildDir);
+        TEST_CASE(noCppcheckBuildDir2);
+
+        TEST_CASE(invalidCppcheckCfg);
+
+        TEST_CASE(reportTypeAutosar);
+        TEST_CASE(reportTypeCertCpp);
+        TEST_CASE(reportTypeCertC);
+        TEST_CASE(reportTypeMisraC2012);
+        TEST_CASE(reportTypeMisraC2023);
+        TEST_CASE(reportTypeMisraC2025);
+        TEST_CASE(reportTypeMisraCpp2008);
+        TEST_CASE(reportTypeMisraCpp2023);
+        TEST_CASE(invalidReportType);
+        TEST_CASE(defaultReportType);
+    }
 
     void nooptions() {
         REDIRECT;
         const char * const argv[] = {"cppcheck"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(1, argv));
-        ASSERT_EQUALS(true, parser.getShowHelp());
-        ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        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"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, parser.getShowHelp());
-        ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
+    }
+
+    void helpshortExclusive() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=missing", "-h"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        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"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, parser.getShowHelp());
-        ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT(startsWith(logger->str(), "Cppcheck - A tool for static C/C++ code analysis"));
+    }
+
+    void helplongExclusive() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=missing", "--help"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        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"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT(logger->str().compare(0, 11, "Cppcheck 2.") == 0);
     }
 
-    void showversion() {
+    void versionWithCfg() {
         REDIRECT;
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        "{\n"
+                        "\"productName\": \"The Product\""
+                        "}\n");
         const char * const argv[] = {"cppcheck", "--version"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, parser.getShowVersion());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); // version is not actually shown
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        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
+
+    void versionExclusive() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=missing", "--version"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT(logger->str().compare(0, 11, "Cppcheck 2.") == 0);
+    }
+
+    void checkVersionCorrect() {
+        REDIRECT;
+        const std::string currentVersion = parser->getVersion();
+        const std::string checkVersion = "--check-version=" + currentVersion;
+        const char * const argv[] = {"cppcheck", checkVersion.c_str(), "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+    }
+
+    void checkVersionIncorrect() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--check-version=Cppcheck 2.0", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --check-version check failed. Aborting.\n", logger->str());
     }
 
     void onefile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(1, (int)parser.getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser.getPathNames().at(0));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("file.cpp", parser->mPathNames[0]);
     }
 
     void onepath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "src"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(1, (int)parser.getPathNames().size());
-        ASSERT_EQUALS("src", parser.getPathNames().at(0));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        ASSERT_EQUALS("src", parser->mPathNames[0]);
     }
 
     void optionwithoutfile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-v"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT_EQUALS(false, parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(0, (int)parser.getPathNames().size());
-        ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS(0, parser->mPathNames.size());
+        ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
     }
 
     void verboseshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-v", "file.cpp"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.verbose);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->verbose);
     }
 
     void verboselong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--verbose", "file.cpp"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.verbose);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->verbose);
     }
 
     void debugSimplified() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--debug-simplified", "file.cpp"};
-        settings.debugSimplified = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.debugSimplified);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugSimplified);
     }
 
     void debugwarnings() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--debug-warnings", "file.cpp"};
-        settings.debugwarnings = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.debugwarnings);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugwarnings);
     }
 
     void forceshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-f", "file.cpp"};
-        settings.force = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.force);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->force);
     }
 
     void forcelong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--force", "file.cpp"};
-        settings.force = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.force);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->force);
     }
 
-    void relativePaths() {
+    void relativePaths1() {
         REDIRECT;
-        settings.relativePaths = false;
-
-        const char * const argvs[] = {"cppcheck", "-rp", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvs));
-        ASSERT_EQUALS(true, settings.relativePaths);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-
-        CLEAR_REDIRECT_OUTPUT;
-        settings.relativePaths = false;
-
-        const char * const argvl[] = {"cppcheck", "--relative-paths", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvl));
-        ASSERT_EQUALS(true, settings.relativePaths);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-
-        CLEAR_REDIRECT_OUTPUT;
-        settings.relativePaths = false;
-        settings.basePaths.clear();
+        const char * const argv[] = {"cppcheck", "-rp", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
+    }
 
-        const char * const argvsp[] = {"cppcheck", "-rp=C:/foo;C:\\bar", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvsp));
-        ASSERT_EQUALS(true, settings.relativePaths);
-        ASSERT_EQUALS(2, settings.basePaths.size());
-        ASSERT_EQUALS("C:/foo", settings.basePaths[0]);
-        ASSERT_EQUALS("C:/bar", settings.basePaths[1]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    void relativePaths2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--relative-paths", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
+    }
 
-        CLEAR_REDIRECT_OUTPUT;
-        settings.relativePaths = false;
-        settings.basePaths.clear();
+    void relativePaths3() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-rp=C:/foo;C:\\bar", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
+        ASSERT_EQUALS(2, settings->basePaths.size());
+        ASSERT_EQUALS("C:/foo", settings->basePaths[0]);
+        ASSERT_EQUALS("C:/bar", settings->basePaths[1]);
+    }
 
-        const char * const argvlp[] = {"cppcheck", "--relative-paths=C:/foo;C:\\bar", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvlp));
-        ASSERT_EQUALS(true, settings.relativePaths);
-        ASSERT_EQUALS(2, settings.basePaths.size());
-        ASSERT_EQUALS("C:/foo", settings.basePaths[0]);
-        ASSERT_EQUALS("C:/bar", settings.basePaths[1]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    void relativePaths4() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--relative-paths=C:/foo;C:\\bar", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
+        ASSERT_EQUALS(2, settings->basePaths.size());
+        ASSERT_EQUALS("C:/foo", settings->basePaths[0]);
+        ASSERT_EQUALS("C:/bar", settings->basePaths[1]);
     }
 
     void quietshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-q", "file.cpp"};
-        settings.quiet = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.quiet);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->quiet);
     }
 
     void quietlong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--quiet", "file.cpp"};
-        settings.quiet = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.quiet);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->quiet);
     }
 
     void defines_noarg() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D"};
         // Fails since -D has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", logger->str());
     }
 
     void defines_noarg2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D", "-v", "file.cpp"};
         // Fails since -D has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", logger->str());
     }
 
     void defines_noarg3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D", "--quiet", "file.cpp"};
         // Fails since -D has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", logger->str());
     }
 
     void defines() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D_WIN32", "file.cpp"};
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("_WIN32=1", settings.userDefines);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("_WIN32=1", settings->userDefines);
     }
 
     void defines2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D_WIN32", "-DNODEBUG", "file.cpp"};
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("_WIN32=1;NODEBUG=1", settings.userDefines);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("_WIN32=1;NODEBUG=1", settings->userDefines);
     }
 
     void defines3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D", "DEBUG", "file.cpp"};
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("DEBUG=1", settings.userDefines);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("DEBUG=1", settings->userDefines);
     }
 
     void defines4() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-DDEBUG=", "file.cpp"}; // #5137 - defining empty macro
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("DEBUG=", settings.userDefines);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("DEBUG=", settings->userDefines);
     }
 
-    void enforceLanguage() {
+    void enforceLanguage1() {
         REDIRECT;
-        {
-            const char * const argv[] = {"cppcheck", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(2, argv));
-            ASSERT_EQUALS(Settings::Language::None, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(4, argv));
-            ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "-x"};
-            ASSERT(!defParser.parseFromArgs(2, argv));
-            ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "-x", "--inconclusive", "file.cpp"};
-            ASSERT(!defParser.parseFromArgs(4, argv));
-            ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(Settings::Language::C, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--language=unknownLanguage", "file.cpp"};
-            ASSERT(!defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS("cppcheck: error: unknown language 'unknownLanguage' enforced.\n", GET_REDIRECT_OUTPUT);
-        }
+        const char * const argv[] = {"cppcheck", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        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, parser->mEnforcedLang);
+    }
+
+    void enforceLanguage3() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-x"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", logger->str());
+    }
+
+    void enforceLanguage4() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-x", "--inconclusive", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", logger->str());
+    }
+
+    void enforceLanguage5() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        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, parser->mEnforcedLang);
+    }
+
+    void enforceLanguage7() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--language=unknownLanguage", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unknown language 'unknownLanguage' enforced.\n", logger->str());
     }
 
     void includesnopath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I"};
         // Fails since -I has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-I' is missing.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-I' is missing.\n", logger->str());
     }
 
     void includes() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
     }
 
     void includesslash() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include/", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
     }
 
     void includesbackslash() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include\\", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
     }
 
     void includesnospace() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-Iinclude", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
     }
 
     void includes2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include/", "-I", "framework/", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(6, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
-        settings.includePaths.pop_front();
-        ASSERT_EQUALS("framework/", settings.includePaths.front());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
+        settings->includePaths.pop_front();
+        ASSERT_EQUALS("framework/", settings->includePaths.front());
     }
 
-    // TODO: fails since the file is not found
     void includesFile() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--includes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
+        ScopedFile file("includes.txt",
+                        "path/sub\n"
+                        "path2/sub1\n");
+        const char * const argv[] = {"cppcheck", "--includes-file=includes.txt", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(2, settings->includePaths.size());
+        auto it = settings->includePaths.cbegin();
+        ASSERT_EQUALS("path/sub/", *it++);
+        ASSERT_EQUALS("path2/sub1/", *it);
     }
 
     void includesFileNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--includes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", logger->str());
     }
 
-    // TODO: fails since the file is not found
     void configExcludesFile() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--config-excludes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        settings.includePaths.clear();
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        // TODO: add checks
-        TODO_ASSERT_EQUALS("", "cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
+        ScopedFile file("excludes.txt",
+                        "path/sub\n"
+                        "path2/sub1\n");
+        const char * const argv[] = {"cppcheck", "--config-excludes-file=excludes.txt", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(2, settings->configExcludePaths.size());
+        auto it = settings->configExcludePaths.cbegin();
+        ASSERT_EQUALS("path/sub/", *it++);
+        ASSERT_EQUALS("path2/sub1/", *it);
     }
 
     void configExcludesFileNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--config-excludes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        ASSERT_EQUALS( false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", logger->str());
     }
 
     void enabledAll() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=all", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.severity.isEnabled(Severity::style));
-        ASSERT(settings.severity.isEnabled(Severity::warning));
-        ASSERT(settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT(!settings.checks.isEnabled(Checks::internalCheck));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->severity.isEnabled(Severity::style));
+        ASSERT(settings->severity.isEnabled(Severity::warning));
+        ASSERT(settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT(!settings->checks.isEnabled(Checks::internalCheck));
     }
 
     void enabledStyle() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=style", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.severity.isEnabled(Severity::style));
-        ASSERT(settings.severity.isEnabled(Severity::warning));
-        ASSERT(settings.severity.isEnabled(Severity::performance));
-        ASSERT(settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(!settings.checks.isEnabled(Checks::internalCheck));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->severity.isEnabled(Severity::style));
+        ASSERT(settings->severity.isEnabled(Severity::warning));
+        ASSERT(settings->severity.isEnabled(Severity::performance));
+        ASSERT(settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(!settings->checks.isEnabled(Checks::internalCheck));
     }
 
     void enabledPerformance() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=performance", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::style));
-        ASSERT(!settings.severity.isEnabled(Severity::warning));
-        ASSERT(settings.severity.isEnabled(Severity::performance));
-        ASSERT(!settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(!settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(!settings->severity.isEnabled(Severity::style));
+        ASSERT(!settings->severity.isEnabled(Severity::warning));
+        ASSERT(settings->severity.isEnabled(Severity::performance));
+        ASSERT(!settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
     }
 
     void enabledPortability() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=portability", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::style));
-        ASSERT(!settings.severity.isEnabled(Severity::warning));
-        ASSERT(!settings.severity.isEnabled(Severity::performance));
-        ASSERT(settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(!settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(!settings->severity.isEnabled(Severity::style));
+        ASSERT(!settings->severity.isEnabled(Severity::warning));
+        ASSERT(!settings->severity.isEnabled(Severity::performance));
+        ASSERT(settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
     }
 
     void enabledInformation() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=information", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.severity.isEnabled(Severity::information));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->severity.isEnabled(Severity::information));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
     }
 
     void enabledUnusedFunction() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=unusedFunction", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->checks.isEnabled(Checks::unusedFunction));
     }
 
     void enabledMissingInclude() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=missingInclude", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
+    }
+
+    void disabledMissingIncludeWithInformation() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--disable=missingInclude", "--enable=information", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->severity.isEnabled(Severity::information));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS("", logger->str());
+    }
+
+    void enabledMissingIncludeWithInformation() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--enable=information", "--enable=missingInclude", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->severity.isEnabled(Severity::information));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS("", logger->str());
+    }
+
+    void enabledMissingIncludeWithInformationReverseOrder() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--enable=missingInclude", "--enable=information", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->severity.isEnabled(Severity::information));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS("", logger->str());
     }
 
 #ifdef CHECK_INTERNAL
     void enabledInternal() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=internal", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.checks.isEnabled(Checks::internalCheck));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(settings->checks.isEnabled(Checks::internalCheck));
     }
 #endif
 
     void enabledMultiple() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=missingInclude,portability,warning", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::style));
-        ASSERT(settings.severity.isEnabled(Severity::warning));
-        ASSERT(!settings.severity.isEnabled(Severity::performance));
-        ASSERT(settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT(!settings->severity.isEnabled(Severity::style));
+        ASSERT(settings->severity.isEnabled(Severity::warning));
+        ASSERT(!settings->severity.isEnabled(Severity::performance));
+        ASSERT(settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
     }
 
     void enabledInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=warning,missingIncludeSystem,style", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'missingIncludeSystem'\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'missingIncludeSystem'\n", logger->str());
     }
 
     void enabledError() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=error", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'error'\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'error'\n", logger->str());
     }
 
     void enabledEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: --enable parameter is empty\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --enable parameter is empty\n", logger->str());
     }
 
+
     void disableAll() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=all"};
-        settings.severity.clear();
-        settings.checks.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::error));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::warning));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::style));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::performance));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::portability));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::debug));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::internalCheck));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=all", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::warning));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::style));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::performance));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::portability));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::debug));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck));
     }
 
     void disableMultiple() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=style", "--disable=unusedFunction"};
-        settings.severity.clear();
-        settings.checks.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::error));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::warning));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::style));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::performance));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::portability));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::debug));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT_EQUALS(true, settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::internalCheck));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=style", "--disable=unusedFunction", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::style));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::performance));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::portability));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::debug));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT_EQUALS(true, settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck));
     }
 
     // make sure the implied "style" checks are not added when "--enable=style" is specified
     void disableStylePartial() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--enable=style", "--disable=performance", "--enable=unusedFunction"};
-        settings.severity.clear();
-        settings.checks.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::error));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::warning));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::style));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::performance));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::portability));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::debug));
-        ASSERT_EQUALS(true, settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::internalCheck));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--enable=style", "--disable=performance", "--enable=unusedFunction", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::style));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::performance));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::portability));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::debug));
+        ASSERT_EQUALS(true, settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck));
     }
 
     void disableInformationPartial() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=information", "--disable=missingInclude", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(settings.severity.isEnabled(Severity::information));
-        ASSERT(!settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::information));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS("", logger->str());
     }
 
     void disableInformationPartial2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=missingInclude", "--disable=information", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::information));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(!settings->severity.isEnabled(Severity::information));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
     }
 
     void disableInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--disable=leaks", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'leaks'\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'leaks'\n", logger->str());
     }
 
     void disableError() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--disable=error", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'error'\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'error'\n", logger->str());
     }
 
     void disableEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--disable=", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: --disable parameter is empty\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --disable parameter is empty\n", logger->str());
     }
 
     void inconclusive() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--inconclusive"};
-        settings.certainty.clear();
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, settings.certainty.isEnabled(Certainty::inconclusive));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--inconclusive", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->certainty.isEnabled(Certainty::inconclusive));
     }
 
     void errorExitcode() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--error-exitcode=5", "file.cpp"};
-        settings.exitCode = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(5, settings.exitCode);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(5, settings->exitCode);
     }
 
     void errorExitcodeMissing() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--error-exitcode=", "file.cpp"};
         // Fails since exit code not given
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void errorExitcodeStr() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--error-exitcode=foo", "file.cpp"};
         // Fails since invalid exit code
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void exitcodeSuppressionsOld() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exitcode-suppressions", "suppr.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", logger->str());
     }
 
     void exitcodeSuppressions() {
-        // TODO: Fails since cannot open the file
         REDIRECT;
+        ScopedFile file("suppr.txt",
+                        "uninitvar\n"
+                        "unusedFunction\n");
         const char * const argv[] = {"cppcheck", "--exitcode-suppressions=suppr.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"suppr.txt\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        const auto supprsNofail = supprs->nofail.getSuppressions();
+        ASSERT_EQUALS(2, supprsNofail.size());
+        auto it = supprsNofail.cbegin();
+        ASSERT_EQUALS("uninitvar", (it++)->errorId);
+        ASSERT_EQUALS("unusedFunction", it->errorId);
     }
 
     void exitcodeSuppressionsNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exitcode-suppressions", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", logger->str());
+    }
+
+    void fileFilterFileWithDetailsSimplifiedPath() const {
+        // match against simplified path
+        const std::vector<std::string> fileFilters{"m1.c"};
+        const std::list<FileWithDetails> filesResolved{ FileWithDetails("./m1.c", Standards::Language::C, 123) };
+        const std::list<FileWithDetails> files = CmdLineParser::filterFiles(fileFilters, filesResolved);
+        ASSERT_EQUALS(1U, files.size());
+    }
+
+    void fileFilterFileWithDetailsCase() {
+        // in windows, paths are case insensitive
+        const std::vector<std::string> fileFilters{"m1.c"};
+        const std::list<FileWithDetails> filesResolved{ FileWithDetails("M1.C", Standards::Language::C, 123) };
+        const std::list<FileWithDetails> files = CmdLineParser::filterFiles(fileFilters, filesResolved);
+#ifdef _WIN32
+        ASSERT_EQUALS(1U, files.size());
+#else
+        ASSERT_EQUALS(0U, files.size());
+#endif
+    }
+
+    void fileFilterStdin() {
+        REDIRECT;
+        RedirectInput input("file1.c\nfile2.cpp\n");
+        const char * const argv[] = {"cppcheck", "--file-filter=-"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
+        ASSERT_EQUALS(2U, settings->fileFilters.size());
+        ASSERT_EQUALS("file1.c", settings->fileFilters[0]);
+        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());
     }
 
-    // TODO: file does not exist
     void fileList() {
         REDIRECT;
+        ScopedFile file("files.txt",
+                        "file1.c\n"
+                        "file2.cpp\n");
         const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        // TODO: settings are not being reset after each test
-        //TODO_ASSERT_EQUALS(4, 1, defParser.getPathNames().size());
-        TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"files.txt\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        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);
     }
 
     void fileListNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: couldn't open the file: \"files.txt\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: couldn't open the file: \"files.txt\".\n", logger->str());
     }
 
-    /*    void fileListStdin() {
-            // TODO: Give it some stdin to read from, fails because the list of
-            // files in stdin (_pathnames) is empty
-            REDIRECT;
-            const char * const argv[] = {"cppcheck", "--file-list=-", "file.cpp"};
-            TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-            TODO_ASSERT_EQUALS("", "", GET_REDIRECT_OUTPUT);
-        } */
+    void fileListStdin() {
+        REDIRECT;
+        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->mPathNames.size());
+        auto it = parser->mPathNames.cbegin();
+        ASSERT_EQUALS("file1.c", *it++);
+        ASSERT_EQUALS("file2.cpp", *it++);
+        ASSERT_EQUALS("file.cpp", *it);
+    }
 
     void fileListInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--file-list", "files.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--file-list\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--file-list\".\n", logger->str());
     }
 
     void inlineSuppr() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--inline-suppr", "file.cpp"};
-        settings.inlineSuppressions = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.inlineSuppressions);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->inlineSuppressions);
     }
 
     void jobs() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j", "3", "file.cpp"};
-        settings.jobs = 0;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(3, settings.jobs);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(3, settings->jobs);
     }
 
     void jobs2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j3", "file.cpp"};
-        settings.jobs = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(3, settings.jobs);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(3, settings->jobs);
     }
 
     void jobsMissingCount() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j", "file.cpp"};
         // Fails since -j is missing thread count
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str());
     }
 
     void jobsInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j", "e", "file.cpp"};
         // Fails since invalid count given for -j
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", logger->str());
+    }
+
+    void jobsNoJobs() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-j0", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument for '-j' must be greater than 0.\n", logger->str());
     }
 
     void jobsTooBig() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-j10001", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument for '-j' is allowed to be 10000 at max.\n", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "-j1025", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument for '-j' is allowed to be 1024 at max.\n", logger->str());
     }
 
     void maxConfigs() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-f", "--max-configs=12", "file.cpp"};
-        settings.force = false;
-        settings.maxConfigs = 0;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(12, settings.maxConfigs);
-        ASSERT_EQUALS(false, settings.force);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->maxConfigsOption);
+        ASSERT_EQUALS(false, settings->force);
     }
 
     void maxConfigsMissingCount() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-configs=", "file.cpp"};
         // Fails since --max-configs= is missing limit
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void maxConfigsInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-configs=e", "file.cpp"};
         // Fails since invalid count given for --max-configs=
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void maxConfigsTooSmall() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-configs=0", "file.cpp"};
         // Fails since limit must be greater than 0
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' must be greater than 0.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' must be greater than 0.\n", logger->str());
     }
 
-    void reportProgressTest() {
+    void outputFormatText() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--report-progress", "file.cpp"};
-        settings.reportProgress = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.reportProgress);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--output-format=text", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::text, settings->outputFormat);
     }
 
-    void stdc99() {
+    void outputFormatSarif() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--std=c99", "file.cpp"};
-        settings.standards.c = Standards::C89;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.standards.c == Standards::C99);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--output-format=sarif", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::sarif, settings->outputFormat);
     }
 
-    void stdcpp11() {
+    void outputFormatXml() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--std=c++11", "file.cpp"};
-        settings.standards.cpp = Standards::CPP03;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.standards.cpp == Standards::CPP11);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--output-format=xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
     }
 
-    void stdunknown() {
+    void outputFormatXmlv2() {
         REDIRECT;
-        {
-            const char *const argv[] = {"cppcheck", "--std=d++11", "file.cpp"};
-            ASSERT(!defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS("cppcheck: error: unknown --std value 'd++11'\n", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char *const argv[] = {"cppcheck", "--std=cplusplus11", "file.cpp"};
-            TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-            TODO_ASSERT_EQUALS("cppcheck: error: unknown --std value 'cplusplus11'\n", "", GET_REDIRECT_OUTPUT);
-        }
+        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 platformWin64() {
+    void outputFormatXmlv3() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=win64", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        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 platformWin32A() {
+    void outputFormatOther() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=win32A", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        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', 'xml' (deprecated), 'xmlv2' or 'xmlv3'.\n", logger->str());
     }
 
-    void platformWin32W() {
+    void outputFormatImplicitPlist() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=win32W", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--plist-output=.", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::plist, settings->outputFormat);
+        ASSERT_EQUALS("./", settings->plistOutput);
     }
 
-    void platformUnix32() {
+    void outputFormatImplicitXml() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=unix32", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
     }
 
-    void platformUnix32Unsigned() {
+    void outputFormatOverridePlist() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=unix32-unsigned", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--plist-output=.", "--output-format=text", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::text, settings->outputFormat);
+        ASSERT_EQUALS("", settings->plistOutput);
     }
 
-    void platformUnix64() {
+    void outputFormatMixed1() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=unix64", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        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 platformUnix64Unsigned() {
+    void outputFormatMixed2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=unix64-unsigned", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        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 platformNative() {
+    void outputFormatMixed3() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=native", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Native, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        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 platformUnspecified() {
+    void premiumOptions1() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=unspecified", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Native));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unspecified, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=autosar", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
     }
 
-    void platformPlatformFile() {
+    void premiumOptions2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=avr8", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT_EQUALS(true, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::File, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=misra-c-2012", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
     }
 
-    void platformUnknown() {
+    void premiumOptions3() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--platform=win128", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'win128'.\n", GET_REDIRECT_OUTPUT);
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=misra-c++-2023", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
     }
 
-#if defined(_WIN64) || defined(_WIN32)
-    void platformDefault() {
+    void premiumOptions4() {
         REDIRECT;
-
-        CmdLineParser::SHOW_DEF_PLATFORM_MSG = true;
-
-        const char * const argv[] = {"cppcheck", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(2, argv));
-#if defined(_WIN64)
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, settings.platform.type);
-        ASSERT_EQUALS("cppcheck: Windows 64-bit binaries currently default to the 'win64' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win64' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
-#elif defined(_WIN32)
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
-        ASSERT_EQUALS("cppcheck: Windows 32-bit binaries currently default to the 'win32A' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32A' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
-#endif
-
-        CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=cert-c++-2016", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
     }
 
-    void platformDefault2() {
+    void premiumOptions5() {
         REDIRECT;
-
-        CmdLineParser::SHOW_DEF_PLATFORM_MSG = true;
-
-        const char * const argv[] = {"cppcheck", "--platform=unix64", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings.platform.type);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-
-        CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=safety", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::warning));
     }
-#endif
 
-    void plistEmpty() {
+    void premiumOptionsAll() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--plist-output=", "file.cpp"};
-        settings.plistOutput = "";
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.plistOutput == "./");
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        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 plistDoesNotExist() {
+    void premiumOptionsMetrics() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--plist-output=./cppcheck_reports", "file.cpp"};
-        // Fails since folder pointed by --plist-output= does not exist
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-        // TODO: output contains non-native separator
-        //ASSERT_EQUALS("cppcheck: error: plist folder does not exist: \"cppcheck_reports/\".\n", GET_REDIRECT_OUTPUT);
+        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 suppressionsOld() {
+    void premiumOptionsCertCIntPrecision() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--suppressions", "suppr.txt", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--suppressions\".\n", GET_REDIRECT_OUTPUT);
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium-cert-c-int-precision=12", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("--cert-c-int-precision=12", settings->premiumArgs);
     }
 
-    void suppressions() {
-        // TODO: Fails because there is no suppr.txt file!
+    void premiumOptionsLicenseFile() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--suppressions-list=suppr.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"suppr.txt\".\n", GET_REDIRECT_OUTPUT);
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium-license-file=file.lic", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("--license-file=file.lic", settings->premiumArgs);
     }
 
-    void suppressionsNoFile() {
+    void premiumOptionsInvalid1() {
         REDIRECT;
-        {
-            const char * const argv[] = {"cppcheck", "--suppressions-list=", "file.cpp"};
-            ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(false, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
-        }
-
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr,b.suppr", "file.cpp"};
-            ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
-        }
-
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr b.suppr", "file.cpp"};
-            ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
-        }
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=misra", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: invalid --premium option 'misra'.\n", logger->str());
     }
 
-    static Suppressions::ErrorMessage errorMessage(const std::string &errorId, const std::string &fileName, int lineNumber) {
-        Suppressions::ErrorMessage e;
-        e.errorId = errorId;
-        e.setFileName(fileName);
-        e.lineNumber = lineNumber;
-        return e;
+    void premiumOptionsInvalid2() {
+        REDIRECT;
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=cert", "file.c"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: invalid --premium option 'cert'.\n", logger->str());
     }
 
-    void suppressionSingle() {
+    void premiumSafety() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1)));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=safety", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->safety);
     }
 
-    void suppressionSingleFile() {
+    void premiumDebugProgress() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--suppress=uninitvar:file.cpp", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        asPremium();
+        const char * const argv[] = {"cppcheck", "--premium=debug-progress", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("--debug-progress", settings->premiumArgs);
     }
 
-    void suppressionTwo() {
+    void reportProgress1() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--suppress=uninitvar,noConstructor", "file.cpp"};
-        settings = Settings();
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS(true, false, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
-        TODO_ASSERT_EQUALS(true, false, settings.nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--report-progress", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(10, settings->reportProgress);
     }
 
-    void suppressionTwoSeparate() {
+    void reportProgress2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "--suppress=noConstructor", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        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());
     }
 
-    void templates() {
+    void reportProgress3() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "{file}:{line},{severity},{id},{message}", "--template-location={file}:{line}:{column} {info}", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file}:{line},{severity},{id},{message}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column} {info}", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--report-progress=-1", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--report-progress=' needs to be a positive integer.\n", logger->str());
     }
 
-    void templatesGcc() {
+    void reportProgress4() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "gcc", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: warning: {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--report-progress=0", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(0, settings->reportProgress);
     }
 
-    void templatesVs() {
+    void reportProgress5() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "vs", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file}({line}): {severity}: {message}", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--report-progress=1", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->reportProgress);
     }
 
-    void templatesEdit() {
+    void stdc99() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "edit", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file} +{line}: {severity}: {message}", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--std=c99", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->standards.c == Standards::C99);
     }
 
-    void templatesCppcheck1() {
+    void stdgnu17() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template=cppcheck1", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{callstack}: ({severity}{inconclusive:, inconclusive}) {message}", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--std=gnu17", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->standards.c == Standards::C17);
     }
 
-    void templatesDaca2() {
+    void stdiso9899_1999() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template=daca2", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}", settings.templateLocation);
-        ASSERT_EQUALS(true, settings.daca);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--std=iso9899:1999", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->standards.c == Standards::C99);
     }
 
-    void templatesSelfcheck() {
+    void stdcpp11() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template=selfcheck", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--std=c++11", "file.cpp"};
+        settings->standards.cpp = Standards::CPP03;
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->standards.cpp == Standards::CPP11);
     }
 
-    // TODO: we should bail out on this
-    void templatesNoPlaceholder() {
+    void stdgnupp23() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template=selfchek", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("selfchek", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--std=gnu++23", "file.cpp"};
+        settings->standards.cpp = Standards::CPP03;
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->standards.cpp == Standards::CPP23);
     }
 
-    void templateFormatInvalid() {
+    void stdunknown1() {
         REDIRECT;
-        const char* const argv[] = { "cppcheck", "--template", "--template-location={file}", "file.cpp" };
-        ASSERT(!defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--template' is missing.\n", GET_REDIRECT_OUTPUT);
+        const char *const argv[] = {"cppcheck", "--std=d++11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unknown --std value 'd++11'\n", logger->str());
     }
 
-    // TODO: will not error out as he next option does not start with a "-"
-    void templateFormatInvalid2() {
+    void stdunknown2() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        const char* const argv[] = { "cppcheck", "--template", "file.cpp" };
-        TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("file.cpp", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char *const argv[] = {"cppcheck", "--std=cplusplus11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unknown --std value 'cplusplus11'\n", logger->str());
     }
 
-    // will use the default
-    // TODO: bail out on empty?
-    void templateFormatEmpty() {
+    void stdunknown3() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        const char* const argv[] = { "cppcheck", "--template=", "file.cpp" };
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char *const argv[] = {"cppcheck", "--std=C++11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unknown --std value 'C++11'\n", logger->str());
     }
 
-    void templateLocationInvalid() {
+    void stdoverwrite1() {
         REDIRECT;
-        const char* const argv[] = { "cppcheck", "--template-location", "--template={file}", "file.cpp" };
-        ASSERT(!defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--template-location' is missing.\n", GET_REDIRECT_OUTPUT);
+        const char *const argv[] = {"cppcheck", "--std=c++11", "--std=c++23", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Standards::CPP23, settings->standards.cpp);
+        ASSERT_EQUALS_ENUM(Standards::CLatest, settings->standards.c);
     }
 
-    // TODO: will not error out as he next option does not start with a "-"
-    void templateLocationInvalid2() {
+    void stdoverwrite2() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        const char* const argv[] = { "cppcheck", "--template-location", "file.cpp" };
-        TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("file.cpp", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char *const argv[] = {"cppcheck", "--std=c99", "--std=c11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Standards::C11, settings->standards.c);
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, settings->standards.cpp);
     }
 
-    // will use the default
-    // TODO: bail out on empty?
-    void templateLocationEmpty() {
+    void stdoverwrite3() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        const char* const argv[] = { "cppcheck", "--template-location=", "file.cpp" };
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char *const argv[] = {"cppcheck", "--std=c99", "--std=c++11", "--std=c11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Standards::C11, settings->standards.c);
+        ASSERT_EQUALS_ENUM(Standards::CPP11, settings->standards.cpp);
     }
 
-    void xml() {
+    void stdoverwrite4() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--xml", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(1, settings.xml_version);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char *const argv[] = {"cppcheck", "--std=c++11", "--std=c99", "--std=c++23", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Standards::CPP23, settings->standards.cpp);
+        ASSERT_EQUALS_ENUM(Standards::C99, settings->standards.c);
+    }
+
+    void stdmulti1() {
+        REDIRECT;
+        const char *const argv[] = {"cppcheck", "--std=c99", "--std=c++11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Standards::C99, settings->standards.c);
+        ASSERT_EQUALS_ENUM(Standards::CPP11, settings->standards.cpp);
+    }
+
+    void stdmulti2() {
+        REDIRECT;
+        const char *const argv[] = {"cppcheck", "--std=c++20", "--std=c11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Standards::C11, settings->standards.c);
+        ASSERT_EQUALS_ENUM(Standards::CPP20, settings->standards.cpp);
+    }
+
+    void platformWin64() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=win64", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Unspecified));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(Platform::Type::Win64, settings->platform.type);
+    }
+
+    void platformWin32A() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=win32A", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Unspecified));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(Platform::Type::Win32A, settings->platform.type);
+    }
+
+    void platformWin32W() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=win32W", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Unspecified));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(Platform::Type::Win32W, settings->platform.type);
+    }
+
+    void platformUnix32() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=unix32", "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);
+    }
+
+    void platformUnix32Unsigned() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=unix32-unsigned", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Unspecified));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'unix32-unsigned'.\n", logger->str());
+    }
+
+    void platformUnix64() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=unix64", "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);
+    }
+
+    void platformUnix64Unsigned() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=unix64-unsigned", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Unspecified));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'unix64-unsigned'.\n", logger->str());
+    }
+
+    void platformNative() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=native", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Unspecified));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(Platform::Type::Native, settings->platform.type);
+    }
+
+    void platformUnspecified() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=unspecified", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Native));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(Platform::Type::Unspecified, settings->platform.type);
+    }
+
+    void platformPlatformFile() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=avr8", "file.cpp"};
+        ASSERT(settings->platform.set(Platform::Type::Unspecified));
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(Platform::Type::File, settings->platform.type);
+    }
+
+    void platformUnknown() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=win128", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        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"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->plistOutput == "./");
+    }
+
+    void plistDoesNotExist() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--plist-output=./cppcheck_reports", "file.cpp"};
+        // Fails since folder pointed by --plist-output= does not exist
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: plist folder does not exist: 'cppcheck_reports'.\n", logger->str());
+    }
+
+    void suppressionsOld() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppressions", "suppr.txt", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--suppressions\".\n", logger->str());
+    }
+
+    void suppressions() {
+        REDIRECT;
+        ScopedFile file("suppr.txt",
+                        "uninitvar\n"
+                        "unusedFunction\n");
+        const char * const argv[] = {"cppcheck", "--suppressions-list=suppr.txt", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        const auto supprsNomsg = supprs->nomsg.getSuppressions();
+        ASSERT_EQUALS(2, supprsNomsg.size());
+        auto it = supprsNomsg.cbegin();
+        ASSERT_EQUALS("uninitvar", (it++)->errorId);
+        ASSERT_EQUALS("unusedFunction", it->errorId);
+    }
+
+    void suppressionsNoFile1() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppressions-list=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS(false, logger->str().find("If you want to pass two files") != std::string::npos);
+    }
+
+    void suppressionsNoFile2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr,b.suppr", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS(true, logger->str().find("If you want to pass two files") != std::string::npos);
+    }
+
+    void suppressionsNoFile3() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr b.suppr", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS(true, logger->str().find("If you want to pass two files") != std::string::npos);
+    }
+
+    static SuppressionList::ErrorMessage errorMessage(const std::string &errorId, const std::string &fileName, int lineNumber) {
+        SuppressionList::ErrorMessage e;
+        e.errorId = errorId;
+        e.setFileName(fileName);
+        e.lineNumber = lineNumber;
+        return e;
+    }
+
+    void suppressionSingle() {
+        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() {
+        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() {
+        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());
+    }
+
+    void suppressionTwoSeparate() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "--suppress=noConstructor", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, supprs->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+        ASSERT_EQUALS(true, supprs->nomsg.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"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}:{line},{severity},{id},{message}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column} {info}", settings->templateLocation);
+    }
+
+    void templatesGcc() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=gcc", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: warning: {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
+    }
+
+    void templatesVs() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=vs", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}({line}): {severity}: {message}", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
+    }
+
+    void templatesEdit() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=edit", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file} +{line}: {severity}: {message}", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
+    }
+
+    void templatesCppcheck1() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=cppcheck1", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{callstack}: ({severity}{inconclusive:, inconclusive}) {message}", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
+    }
+
+    void templatesDaca2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=daca2", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}", settings->templateLocation);
+        ASSERT_EQUALS(true, settings->daca);
+    }
+
+    void templatesSelfcheck() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=selfcheck", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
+    }
+
+    void templatesSimple() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=simple", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
+    }
+
+    // TODO: we should bail out on this
+    void templatesNoPlaceholder() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--template=selfchek", "file.cpp"};
+        TODO_ASSERT_EQUALS(static_cast<int>(CmdLineParser::Result::Fail), static_cast<int>(CmdLineParser::Result::Success), static_cast<int>(parseFromArgs(argv)));
+        ASSERT_EQUALS("selfchek", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
+    }
+
+    void templateFormatInvalid() {
+        REDIRECT;
+        const char* const argv[] = { "cppcheck", "--template", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--template\".\n", logger->str());
+    }
+
+    // will use the default
+    // TODO: bail out on empty?
+    void templateFormatEmpty() {
+        REDIRECT;
+        const char* const argv[] = { "cppcheck", "--template=", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
+    }
+
+    void templateLocationInvalid() {
+        REDIRECT;
+        const char* const argv[] = { "cppcheck", "--template-location", "--template={file}", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--template-location\".\n", logger->str());
+    }
+
+    // will use the default
+    // TODO: bail out on empty?
+    void templateLocationEmpty() {
+        REDIRECT;
+        const char* const argv[] = { "cppcheck", "--template-location=", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
+    }
+
+    void xml() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--xml", "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 xmlver2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml-version=2", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(2, settings.xml_version);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
+        ASSERT_EQUALS(2, settings->xml_version);
     }
 
     void xmlver2both() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml", "--xml-version=2", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(2, settings.xml_version);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
+        ASSERT_EQUALS(2, settings->xml_version);
     }
 
     void xmlver2both2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml-version=2", "--xml", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(2, settings.xml_version);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::OutputFormat::xml, settings->outputFormat);
+        ASSERT_EQUALS(2, settings->xml_version);
     }
 
     void xmlverunknown() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--xml", "--xml-version=3", "file.cpp"};
+        const char * const argv[] = {"cppcheck", "--xml", "--xml-version=4", "file.cpp"};
         // FAils since unknown XML format version
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: '--xml-version' can only be 2.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: '--xml-version' can only be 2 or 3.\n", logger->str());
     }
 
     void xmlverinvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml", "--xml-version=a", "file.cpp"};
         // FAils since unknown XML format version
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void doc() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--doc"};
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(defParser.exitAfterPrinting());
-        ASSERT(GET_REDIRECT_OUTPUT.find("## ") == 0);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT(startsWith(logger->str(), "## "));
+    }
+
+    void docExclusive() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=missing", "--doc"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        ASSERT(startsWith(logger->str(), "## "));
     }
 
-    void showtime() {
+    void showtimeSummary() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--showtime=summary"};
-        settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--showtime=summary", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->showtime == ShowTime::SUMMARY);
     }
 
-    void errorlist1() {
+    void showtimeFile() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=file", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->showtime == ShowTime::FILE);
+    }
+
+    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::FILE_TOTAL);
+    }
+
+    void showtimeTop5() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=top5", "file.cpp"};
+        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::TOP5_FILE);
+    }
+
+    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::TOP5_SUMMARY);
+    }
+
+    void showtimeNone() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=none", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->showtime == ShowTime::NONE);
+    }
+
+    void showtimeEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: no mode provided for --showtime\n", logger->str());
+    }
+
+    void showtimeInvalid() {
+        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_file, top5_summary.\n", logger->str());
+    }
+
+    void errorlist() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--errorlist"};
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(defParser.getShowErrorMessages());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        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 errorlistverbose1() {
+    void errorlistWithCfg() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--verbose", "--errorlist"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.verbose);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        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(errout_s, ErrorMessage::getXMLHeader("The Product")));
     }
 
-    void errorlistverbose2() {
+    void errorlistExclusive() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--errorlist", "--verbose"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.verbose);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--library=missing", "--errorlist"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+        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 ignorepathsnopath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
         // Fails since no ignored path given
-        ASSERT_EQUALS(false, parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-i' is missing.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-i' is missing.\n", logger->str());
     }
 
+#if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
     void exceptionhandling() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--exception-handling"};
-        settings.exceptionHandling = false;
-        CppCheckExecutor::setExceptionOutput(stderr);
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.exceptionHandling);
-        ASSERT_EQUALS(stderr, CppCheckExecutor::getExceptionOutput());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--exception-handling", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->exceptionHandling);
+        ASSERT_EQUALS(stdout, settings->exceptionOutput);
     }
 
     void exceptionhandling2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--exception-handling=stderr"};
-        settings.exceptionHandling = false;
-        CppCheckExecutor::setExceptionOutput(stdout);
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.exceptionHandling);
-        ASSERT_EQUALS(stderr, CppCheckExecutor::getExceptionOutput());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--exception-handling=stderr", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->exceptionHandling);
+        ASSERT_EQUALS(stderr, settings->exceptionOutput);
     }
 
     void exceptionhandling3() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--exception-handling=stdout"};
-        settings.exceptionHandling = false;
-        CppCheckExecutor::setExceptionOutput(stderr);
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.exceptionHandling);
-        ASSERT_EQUALS(stdout, CppCheckExecutor::getExceptionOutput());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--exception-handling=stdout", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->exceptionHandling);
+        ASSERT_EQUALS(stdout, settings->exceptionOutput);
     }
 
     void exceptionhandlingInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exception-handling=exfile"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: invalid '--exception-handling' argument\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: invalid '--exception-handling' argument\n", logger->str());
     }
 
     void exceptionhandlingInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exception-handling-foo"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exception-handling-foo\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exception-handling-foo\".\n", logger->str());
+    }
+#else
+    void exceptionhandlingNotSupported() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exception-handling", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Option --exception-handling is not supported since Cppcheck has not been built with any exception handling enabled.\n", logger->str());
+    }
+
+    void exceptionhandlingNotSupported2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--exception-handling=stderr", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Option --exception-handling is not supported since Cppcheck has not been built with any exception handling enabled.\n", logger->str());
     }
+#endif
 
     void clang() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--clang"};
-        settings.clang = false;
-        settings.clangExecutable = "exe";
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.clang);
-        ASSERT_EQUALS("exe", settings.clangExecutable);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--clang", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->clang);
+        ASSERT_EQUALS("clang", settings->clangExecutable);
     }
 
-    void clang2() {
+    void clangCustom() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--clang=clang-14"};
-        settings.clang = false;
-        settings.clangExecutable = "";
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.clang);
-        ASSERT_EQUALS("clang-14", settings.clangExecutable);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--clang=clang-14", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->clang);
+        ASSERT_EQUALS("clang-14", settings->clangExecutable);
     }
 
     void clangInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--clang-foo"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--clang-foo\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--clang-foo\".\n", logger->str());
     }
 
     void valueFlowMaxIterations() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=0"};
-        settings.valueFlowMaxIterations = SIZE_MAX;
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(0, settings.valueFlowMaxIterations);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=0", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(0, settings->vfOptions.maxIterations);
     }
 
     void valueFlowMaxIterations2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=11"};
-        settings.valueFlowMaxIterations = SIZE_MAX;
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(11, settings.valueFlowMaxIterations);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=11", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(11, settings->vfOptions.maxIterations);
     }
 
     void valueFlowMaxIterationsInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations"};
-        ASSERT(!defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--valueflow-max-iterations\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--valueflow-max-iterations\".\n", logger->str());
     }
 
     void valueFlowMaxIterationsInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=seven"};
-        ASSERT(!defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void valueFlowMaxIterationsInvalid3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=-1"};
-        ASSERT(!defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - needs to be positive.\n", logger->str());
     }
 
     void checksMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=12", "file.cpp"};
-        settings.checksMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.checksMaxTime);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->checksMaxTime);
     }
 
     void checksMaxTime2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=-1", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' needs to be a positive integer.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' needs to be a positive integer.\n", logger->str());
     }
 
     void checksMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
-#ifdef THREADING_MODEL_FORK
+#ifdef HAS_THREADING_MODEL_FORK
     void loadAverage() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l", "12", "file.cpp"};
-        settings.loadAverage = 0;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(12, settings.loadAverage);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->loadAverage);
     }
 
     void loadAverage2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l12", "file.cpp"};
-        settings.loadAverage = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.loadAverage);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->loadAverage);
     }
 
     void loadAverageInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l", "one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer.\n", logger->str());
+    }
+#else
+    void loadAverageNotSupported() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-l", "12", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Option -l cannot be used as Cppcheck has not been built with fork threading model.\n", logger->str());
     }
 #endif
 
     void maxCtuDepth() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--max-ctu-depth=5", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(5, settings->maxCtuDepth);
+    }
+
+    void maxCtuDepth2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--max-ctu-depth=10", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(10, settings->maxCtuDepth);
+    }
+
+    void maxCtuDepthLimit() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-ctu-depth=12", "file.cpp"};
-        settings.maxCtuDepth = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.maxCtuDepth);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(10, settings->maxCtuDepth);
+        ASSERT_EQUALS("cppcheck: --max-ctu-depth is being capped at 10. This limitation will be removed in a future Cppcheck version.\n", logger->str());
     }
 
     void maxCtuDepthInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-ctu-depth=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void performanceValueflowMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-time=12", "file.cpp"};
-        settings.performanceValueFlowMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.performanceValueFlowMaxTime);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->vfOptions.maxTime);
     }
 
     void performanceValueflowMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void performanceValueFlowMaxIfCount() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-if-count=12", "file.cpp"};
-        settings.performanceValueFlowMaxIfCount = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.performanceValueFlowMaxIfCount);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->vfOptions.maxIfCount);
     }
 
     void performanceValueFlowMaxIfCountInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-if-count=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void templateMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=12", "file.cpp"};
-        settings.templateMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.templateMaxTime);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->templateMaxTime);
     }
 
     void templateMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void templateMaxTimeInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=-1", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - needs to be positive.\n", logger->str());
     }
 
     void typedefMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=12", "file.cpp"};
-        settings.typedefMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.typedefMaxTime);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->typedefMaxTime);
     }
 
     void typedefMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
+        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());
     }
 
     void typedefMaxTimeInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=-1", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - needs to be positive.\n", logger->str());
     }
 
-    void ignorepaths1() {
+    void project() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ScopedFile file("project.cppcheck",
+                        "<project>\n"
+                        "<paths>\n"
+                        "<dir name=\"dir\"/>\n"
+                        "</paths>\n"
+                        "</project>");
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, parser->mPathNames.size());
+        auto it = parser->mPathNames.cbegin();
+        ASSERT_EQUALS("dir", *it);
     }
 
-    void ignorepaths2() {
+    void projectMultiple() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-i", "src", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ScopedFile file("project.cppcheck", "<project></project>");
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "--project=project.cppcheck", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: multiple --project options are not supported.\n", logger->str());
     }
 
-    void ignorepaths3() {
+    void projectAndSource() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(2, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("module", parser.getIgnoredPaths()[1]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ScopedFile file("project.cppcheck", "<project></project>");
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --project cannot be used in conjunction with source files.\n", logger->str());
     }
 
-    void ignorepaths4() {
+    void projectEmpty() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(6, argv));
-        ASSERT_EQUALS(2, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("module", parser.getIgnoredPaths()[1]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--project=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: failed to open project ''. The file does not exist.\n", logger->str());
     }
 
-    void ignorefilepaths1() {
+    void projectMissing() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("foo.cpp", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: failed to open project 'project.cppcheck'. The file does not exist.\n", logger->str());
     }
 
-    void ignorefilepaths2() {
-        REDIRECT;
-        const char * const argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src/foo.cpp", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    void projectNoPaths() {
+        ScopedFile file("project.cppcheck", "<project></project>");
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
     }
 
-    void checkconfig() {
+    void addon() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--check-config", "file.cpp"};
-        settings.checkConfiguration = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.checkConfiguration);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--addon=misra", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->addons.size());
+        ASSERT_EQUALS("misra", *settings->addons.cbegin());
     }
 
-    void unknownParam() {
+    void addonMissing() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--foo", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--foo\".\n", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--addon=misra2", "file.cpp"};
+        ASSERT(!fillSettingsFromArgs(argv));
+        ASSERT_EQUALS(1, settings->addons.size());
+        ASSERT_EQUALS("misra2", *settings->addons.cbegin());
+        ASSERT_EQUALS("Did not find addon misra2.py\n", logger->str());
     }
 
-    void undefs() {
+    void signedChar() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-U_WIN32", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, settings.userUndefs.size());
-        ASSERT(settings.userUndefs.find("_WIN32") != settings.userUndefs.end());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--fsigned-char", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS('s', settings->platform.defaultSign);
     }
 
-    void undefs2() {
+    void signedChar2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-U_WIN32", "-UNODEBUG", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(2, settings.userUndefs.size());
-        ASSERT(settings.userUndefs.find("_WIN32") != settings.userUndefs.end());
-        ASSERT(settings.userUndefs.find("NODEBUG") != settings.userUndefs.end());
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--platform=avr8", "--fsigned-char", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS('s', settings->platform.defaultSign);
     }
 
-    void undefs_noarg() {
+    void unsignedChar() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-U"};
-        // Fails since -U has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "--funsigned-char", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS('u', settings->platform.defaultSign);
+    }
+
+    void unsignedChar2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--platform=mips32", "--funsigned-char", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS('u', settings->platform.defaultSign);
+    }
+
+    void signedCharUnsignedChar() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--fsigned-char", "--funsigned-char", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS('u', settings->platform.defaultSign);
+    }
+
+#ifdef HAVE_RULES
+    void rule() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--rule=.+", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->rules.size());
+        auto it = settings->rules.cbegin();
+        ASSERT_EQUALS(".+", it->pattern);
+    }
+
+    void ruleMissingPattern() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--rule=", "file.cpp"};
+        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 '.*\\' (pcre_compile failed: \\ at end of pattern).\n", logger->str());
+    }
+#else
+    void ruleNotSupported() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--rule=.+", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Option --rule cannot be used as Cppcheck has not been built with rules support.\n", logger->str());
+    }
+#endif
+
+#ifdef HAVE_RULES
+    void ruleFileMulti() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rules>\n"
+                        "<rule>\n"
+                        "<tokenlist>raw</tokenlist>\n"
+                        "<pattern>.+</pattern>\n"
+                        "<message>\n"
+                        "<severity>error</severity>\n"
+                        "<id>ruleId1</id>\n"
+                        "<summary>ruleSummary1</summary>\n"
+                        "</message>\n"
+                        "</rule>\n"
+                        "<rule>\n"
+                        "<tokenlist>define</tokenlist>\n"
+                        "<pattern>.*</pattern>\n"
+                        "<message>\n"
+                        "<severity>warning</severity>\n"
+                        "<id>ruleId2</id>\n"
+                        "<summary>ruleSummary2</summary>\n"
+                        "</message>\n"
+                        "</rule>\n"
+                        "</rules>");
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(2, settings->rules.size());
+        auto it = settings->rules.cbegin();
+        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("define", it->tokenlist);
+        ASSERT_EQUALS(".*", it->pattern);
+        ASSERT_EQUALS_ENUM(Severity::warning, it->severity);
+        ASSERT_EQUALS("ruleId2", it->id);
+        ASSERT_EQUALS("ruleSummary2", it->summary);
+    }
+
+    void ruleFileSingle() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<tokenlist>define</tokenlist>\n"
+                        "<pattern>.+</pattern>\n"
+                        "<message>\n"
+                        "<severity>error</severity>\n"
+                        "<id>ruleId</id>\n"
+                        "<summary>ruleSummary</summary>\n"
+                        "</message>\n"
+                        "</rule>\n");
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->rules.size());
+        auto it = settings->rules.cbegin();
+        ASSERT_EQUALS("define", it->tokenlist);
+        ASSERT_EQUALS(".+", it->pattern);
+        ASSERT_EQUALS_ENUM(Severity::error, it->severity);
+        ASSERT_EQUALS("ruleId", it->id);
+        ASSERT_EQUALS("ruleSummary", it->summary);
+    }
+
+    void ruleFileEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--rule-file=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file '' (XML_ERROR_FILE_NOT_FOUND).\n", logger->str());
+    }
+
+    void ruleFileMissing() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' (XML_ERROR_FILE_NOT_FOUND).\n", logger->str());
+    }
+
+    void ruleFileInvalid() {
+        REDIRECT;
+        ScopedFile file("rule.xml", "");
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
+    }
+
+    void ruleFileNoRoot() {
+        REDIRECT;
+        ScopedFile file("rule.xml", "<?xml version=\"1.0\"?>");
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(0, settings->rules.size());
+    }
+
+    void ruleFileEmptyElements1() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>"
+                        "<tokenlist/>"
+                        "<pattern/>"
+                        "<message/>"
+                        "</rule>"
+                        );
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv)); // do not crash
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a pattern.\n", logger->str());
+    }
+
+    void ruleFileEmptyElements2() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>"
+                        "<message>"
+                        "<severity/>"
+                        "<id/>"
+                        "<summary/>"
+                        "</message>"
+                        "</rule>"
+                        );
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv)); // do not crash
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - a rule is lacking a pattern.\n", logger->str());
+    }
+
+    void ruleFileUnknownElement1() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>"
+                        "<messages/>"
+                        "</rule>"
+                        );
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - unknown element 'messages' encountered in 'rule'.\n", logger->str());
+    }
+
+    void ruleFileUnknownElement2() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>"
+                        "<message>"
+                        "<pattern/>"
+                        "</message>"
+                        "</rule>"
+                        );
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unable to load rule-file 'rule.xml' - unknown element 'pattern' encountered in 'message'.\n", logger->str());
+    }
+
+    void ruleFileMissingTokenList() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<tokenlist/>\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: unable to load rule-file 'rule.xml' - a rule is lacking a tokenlist.\n", logger->str());
+    }
+
+    void ruleFileUnknownTokenList() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<tokenlist>simple</tokenlist>\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: unable to load rule-file 'rule.xml' - a rule is using the unsupported tokenlist 'simple'.\n", logger->str());
+    }
+
+    void ruleFileMissingId() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<pattern>.+</pattern>\n"
+                        "<message>\n"
+                        "<id/>"
+                        "</message>\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: unable to load rule-file 'rule.xml' - a rule is lacking an id.\n", logger->str());
+    }
+
+    void ruleFileInvalidSeverity1() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<pattern>.+</pattern>\n"
+                        "<message>\n"
+                        "<severity/>"
+                        "</message>\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: unable to load rule-file 'rule.xml' - a rule has an invalid severity.\n", logger->str());
+    }
+
+    void ruleFileInvalidSeverity2() {
+        REDIRECT;
+        ScopedFile file("rule.xml",
+                        "<rule>\n"
+                        "<pattern>.+</pattern>\n"
+                        "<message>\n"
+                        "<severity>none</severity>"
+                        "</message>\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: 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 (pcre_compile failed: \\ at end of pattern).\n", logger->str());
+    }
+#else
+    void ruleFileNotSupported() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--rule-file=rule.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Option --rule-file cannot be used as Cppcheck has not been built with rules support.\n", logger->str());
+    }
+#endif
+
+    void library() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=posix", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->libraries.size());
+        ASSERT_EQUALS("posix", *settings->libraries.cbegin());
+    }
+
+    void libraryMissing() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=posix2", "file.cpp"};
+        ASSERT_EQUALS(false, fillSettingsFromArgs(argv));
+        ASSERT_EQUALS(1, settings->libraries.size());
+        ASSERT_EQUALS("posix2", *settings->libraries.cbegin());
+        ASSERT_EQUALS("cppcheck: Failed to load library configuration file 'posix2'. File not found\n", logger->str());
+    }
+
+    void libraryMultiple() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=posix,gnu", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(2, settings->libraries.size());
+        auto it = settings->libraries.cbegin();
+        ASSERT_EQUALS("posix", *it++);
+        ASSERT_EQUALS("gnu", *it);
+    }
+
+    void libraryMultipleEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=posix,,gnu", "file.cpp"};
+        ASSERT_EQUALS(false, fillSettingsFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: empty library specified.\n", logger->str());
+    }
+
+    void libraryMultipleEmpty2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--library=posix,gnu,", "file.cpp"};
+        ASSERT_EQUALS(false, fillSettingsFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: empty library specified.\n", logger->str());
+    }
+
+    void suppressXml() {
+        REDIRECT;
+        ScopedFile file("suppress.xml",
+                        "<suppressions>\n"
+                        "<suppress>\n"
+                        "<id>uninitvar</id>\n"
+                        "</suppress>\n"
+                        "</suppressions>");
+        const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        const auto supprsNomsg = supprs->nomsg.getSuppressions();
+        ASSERT_EQUALS(1, supprsNomsg.size());
+        const auto it = supprsNomsg.cbegin();
+        ASSERT_EQUALS("uninitvar", it->errorId);
+    }
+
+    void suppressXmlEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppress-xml=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML '' (XML_ERROR_FILE_NOT_FOUND).\n", logger->str());
+    }
+
+    void suppressXmlMissing() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress.xml' (XML_ERROR_FILE_NOT_FOUND).\n", logger->str());
+    }
+
+    void suppressXmlInvalid() {
+        REDIRECT;
+        ScopedFile file("suppress.xml", "");
+        const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress.xml' (XML_ERROR_EMPTY_DOCUMENT).\n", logger->str());
+    }
+
+    void suppressXmlNoRoot() {
+        REDIRECT;
+        ScopedFile file("suppress.xml", "<?xml version=\"1.0\"?>");
+        const char * const argv[] = {"cppcheck", "--suppress-xml=suppress.xml", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: failed to load suppressions XML 'suppress.xml' (no root node found).\n", logger->str());
+    }
+
+    void executorDefault() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+#if defined(HAS_THREADING_MODEL_FORK)
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Process, settings->executor);
+#elif defined(HAS_THREADING_MODEL_THREAD)
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Thread, settings->executor);
+#endif
+    }
+
+    void executorAuto() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-j2", "--executor=auto", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+#if defined(HAS_THREADING_MODEL_FORK)
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Process, settings->executor);
+#elif defined(HAS_THREADING_MODEL_THREAD)
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Thread, settings->executor);
+#endif
+    }
+
+    void executorAutoNoJobs() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--executor=auto", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+#if defined(HAS_THREADING_MODEL_FORK)
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Process, settings->executor);
+#elif defined(HAS_THREADING_MODEL_THREAD)
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Thread, settings->executor);
+#endif
+    }
+
+#if defined(HAS_THREADING_MODEL_THREAD)
+    void executorThread() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-j2", "--executor=thread", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Thread, settings->executor);
+    }
+
+    void executorThreadNoJobs() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--executor=thread", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Thread, settings->executor);
+        ASSERT_EQUALS("cppcheck: '--executor' has no effect as only a single job will be used.\n", logger->str());
+    }
+#else
+    void executorThreadNotSupported() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-j2", "--executor=thread", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: executor type 'thread' cannot be used as Cppcheck has not been built with a respective threading model.\n", logger->str());
+    }
+#endif
+
+#if defined(HAS_THREADING_MODEL_FORK)
+    void executorProcess() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-j2", "--executor=process", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Process, settings->executor);
+    }
+
+    void executorProcessNoJobs() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--executor=process", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::ExecutorType::Process, settings->executor);
+        ASSERT_EQUALS("cppcheck: '--executor' has no effect as only a single job will be used.\n", logger->str());
+    }
+#else
+    void executorProcessNotSupported() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-j2", "--executor=process", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: executor type 'process' cannot be used as Cppcheck has not been built with a respective threading model.\n", logger->str());
+    }
+#endif
+
+    // the CLI default to --check-level=normal
+    void checkLevelDefault() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::CheckLevel::normal, settings->checkLevel);
+        ASSERT_EQUALS(100, settings->vfOptions.maxIfCount);
+        ASSERT_EQUALS(8, settings->vfOptions.maxSubFunctionArgs);
+        ASSERT_EQUALS(false, settings->vfOptions.doConditionExpressionAnalysis);
+        ASSERT_EQUALS(4, settings->vfOptions.maxForwardBranches);
+    }
+
+    void checkLevelNormal() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--check-level=normal", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::CheckLevel::normal, settings->checkLevel);
+        ASSERT_EQUALS(100, settings->vfOptions.maxIfCount);
+        ASSERT_EQUALS(8, settings->vfOptions.maxSubFunctionArgs);
+        ASSERT_EQUALS(false, settings->vfOptions.doConditionExpressionAnalysis);
+        ASSERT_EQUALS(4, settings->vfOptions.maxForwardBranches);
+    }
+
+    void checkLevelExhaustive() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--check-level=exhaustive", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(Settings::CheckLevel::exhaustive, settings->checkLevel);
+        ASSERT_EQUALS(-1, settings->vfOptions.maxIfCount);
+        ASSERT_EQUALS(256, settings->vfOptions.maxSubFunctionArgs);
+        ASSERT_EQUALS(true, settings->vfOptions.doConditionExpressionAnalysis);
+        ASSERT_EQUALS(-1, settings->vfOptions.maxForwardBranches);
+    }
+
+    void checkLevelUnknown() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--check-level=default", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unknown '--check-level' value 'default'.\n", logger->str());
+    }
+
+    void cppHeaderProbe() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--cpp-header-probe", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->cppHeaderProbe);
+    }
+
+    void cppHeaderProbe2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--no-cpp-header-probe", "--cpp-header-probe", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->cppHeaderProbe);
+    }
+
+    void noCppHeaderProbe() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--no-cpp-header-probe", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(false, settings->cppHeaderProbe);
+    }
+
+    void noCppHeaderProbe2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--cpp-header-probe", "--no-cpp-header-probe", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(false, settings->cppHeaderProbe);
+    }
+
+    void debugLookup() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-lookup", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        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));
+        GET_REDIRECT_OUTPUT; // ignore config lookup output
+        ASSERT_EQUALS(true, settings->debuglookup);
+    }
+
+    void debugLookupAddon() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-lookup=addon", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debuglookupAddon);
+    }
+
+    void debugLookupConfig() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-lookup=config", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        GET_REDIRECT_OUTPUT; // ignore config lookup output
+        ASSERT_EQUALS(true, settings->debuglookupConfig);
+    }
+
+    void debugLookupLibrary() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-lookup=library", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debuglookupLibrary);
+    }
+
+    void debugLookupPlatform() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-lookup=platform", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debuglookupPlatform);
+    }
+
+    void maxTemplateRecursion() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--max-template-recursion=12", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(12, settings->maxTemplateRecursion);
+    }
+
+    void maxTemplateRecursionMissingCount() {
+        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());
+    }
+
+    void emitDuplicates() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--emit-duplicates", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->emitDuplicates);
+    }
+
+    void debugClangOutput() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-clang-output", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugClangOutput);
+    }
+
+    void debugXmlMultiple() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug", "--xml", "1.cpp", "2.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: printing debug output in XML format does not support multiple input files.\n", logger->str());
+    }
+
+    void debugNormalXmlMultiple() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-normal", "--xml", "1.cpp", "2.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: printing debug output in XML format does not support multiple input files.\n", logger->str());
+    }
+
+    void debugIgnore() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-ignore", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugignore);
+    }
+
+    void checkHeaders() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--check-headers", "file.cpp"};
+        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, 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, parseFromArgs(argv));
+        ASSERT_EQUALS(false, settings->checkHeaders);
+    }
+
+    void filesdir() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--filesdir"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+#ifdef FILESDIR
+        ASSERT_EQUALS(std::string(FILESDIR) + '\n', logger->str());
+#else
+        ASSERT_EQUALS("", logger->str());
+#endif
+    }
+
+    void checkUnusedTemplates() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--check-unused-templates", "file.cpp"};
+        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, 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, 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, parseFromArgs(argv));
+        ASSERT(settings->clangTidy);
+        ASSERT_EQUALS("clang-tidy", settings->clangTidyExecutable);
+    }
+
+    void clangTidyCustom() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--clang-tidy=clang-tidy-14", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->clangTidy);
+        ASSERT_EQUALS("clang-tidy-14", settings->clangTidyExecutable);
+    }
+
+    void projectConfigurationNoProject() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--project-configuration=Debug|Win32", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --project-configuration has no effect - no Visual Studio project provided.\n", logger->str());
+    }
+
+    void projectConfigurationEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--project-configuration=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: --project-configuration parameter is empty.\n", logger->str());
+    }
+
+    void analyzeAllVsConfigs() {
+        REDIRECT;
+        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() {
+        REDIRECT;
+        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() {
+        REDIRECT;
+        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() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-symdb", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugsymdb);
+    }
+
+    void debugAst() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-ast", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->debugast);
+    }
+
+    void debugValueflow() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--debug-valueflow", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        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 ignorepaths1() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        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->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->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->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->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->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->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->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());
+    }
+
+    void ignorefilepaths5() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-ifile.cpp", "file.cpp"};
+        ASSERT(!fillSettingsFromArgs(argv));
+        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());
+    }
+
+    void ignorefilepaths6() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-isrc/file.cpp", "src/file.cpp"};
+        ASSERT(!fillSettingsFromArgs(argv));
+        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());
+    }
+
+    void ignorefilepaths7() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-isrc\\file.cpp", "src/file.cpp"};
+        ASSERT(!fillSettingsFromArgs(argv));
+        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());
+    }
+
+    void ignorefilepaths8() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-isrc/file.cpp", "src\\file.cpp"};
+        ASSERT(!fillSettingsFromArgs(argv));
+        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());
+    }
+
+    void ignorefilepaths9() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-isrc\\", "src\\file.cpp"};
+        ASSERT(!fillSettingsFromArgs(argv));
+        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());
+    }
+
+    void nonexistentpath() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "file.cpp"};
+        ASSERT(!fillSettingsFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\n", logger->str());
+    }
+
+    void checkconfig() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--check-config", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(true, settings->checkConfiguration);
+    }
+
+    void unknownParam() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--foo", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--foo\".\n", logger->str());
+    }
+
+    void undefs() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-U_WIN32", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(1, settings->userUndefs.size());
+        ASSERT(settings->userUndefs.find("_WIN32") != settings->userUndefs.end());
+    }
+
+    void undefs2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-U_WIN32", "-UNODEBUG", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(2, settings->userUndefs.size());
+        ASSERT(settings->userUndefs.find("_WIN32") != settings->userUndefs.end());
+        ASSERT(settings->userUndefs.find("NODEBUG") != settings->userUndefs.end());
+    }
+
+    void undefs_noarg() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-U"};
+        // Fails since -U has no param
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", logger->str());
     }
 
     void undefs_noarg2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-U", "-v", "file.cpp"};
         // Fails since -U has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", logger->str());
     }
 
     void undefs_noarg3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-U", "--quiet", "file.cpp"};
         // Fails since -U has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", logger->str());
+    }
+
+    void cppcheckBuildDirExistent() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=.", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(".", settings->buildDir);
+    }
+
+    void cppcheckBuildDirNonExistent() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=non-existent-path", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Directory 'non-existent-path' specified by --cppcheck-build-dir argument has to be existent.\n", logger->str());
+    }
+
+    void cppcheckBuildDirEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: no path has been specified for --cppcheck-build-dir\n", logger->str());
+    }
+
+    void cppcheckBuildDirMultiple() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=non-existent-path", "--cppcheck-build-dir=.", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS(".", settings->buildDir);
+    }
+
+    void noCppcheckBuildDir()
+    {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--no-cppcheck-build-dir", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->buildDir.empty());
+    }
+
+    void noCppcheckBuildDir2()
+    {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=b1", "--no-cppcheck-build-dir", "file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT(settings->buildDir.empty());
+    }
+
+    void invalidCppcheckCfg() {
+        REDIRECT;
+        ScopedFile file(Path::join(Path::getPathFromFilename(Path::getCurrentExecutablePath("")), "cppcheck.cfg"),
+                        "{\n");
+        const char * const argv[] = {"cppcheck", "test.cpp"};
+        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 reportTypeAutosar() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=autosar", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::autosar, settings->reportType);
+    }
+
+    void reportTypeCertCpp() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=cert-cpp-2016", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::certCpp, settings->reportType);
+    }
+
+    void reportTypeCertC() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=cert-c-2016", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::certC, settings->reportType);
+    }
+
+    void reportTypeMisraC2012() {
+        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::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::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() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=misra-cpp-2008", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::misraCpp2008, settings->reportType);
+    }
+
+    void reportTypeMisraCpp2023() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=misra-cpp-2023", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::misraCpp2023, settings->reportType);
+    }
+
+    void invalidReportType() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=invalid", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+        ASSERT_EQUALS("cppcheck: error: Unknown report type 'invalid'\n", logger->str());
+    }
+
+    void defaultReportType() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::normal, settings->reportType);
     }
 };
 
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index c9e33172da1..ffeca5c5be7 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-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
@@ -18,37 +18,32 @@
 
 #include "checkcondition.h"
 #include "errortypes.h"
-#include "library.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
-#include "preprocessor.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <list>
-#include <map>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
+#include <limits>
 #include <string>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
 class TestCondition : public TestFixture {
 public:
     TestCondition() : TestFixture("TestCondition") {}
 
 private:
-    const Settings settings0 = settingsBuilder().library("qt.cfg").library("std.cfg").severity(Severity::style).severity(Severity::warning).platform(cppcheck::Platform::Type::Native).build();
-    Settings settings1 = settingsBuilder().severity(Severity::style).severity(Severity::warning).platform(cppcheck::Platform::Type::Native).build();
+    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"
                            "<def>\n"
                            "  <function name=\"bar\"> <pure/> </function>\n"
                            "</def>";
-        ASSERT(settings1.library.loadxmldata(cfg, sizeof(cfg)));
+        settings1 = settingsBuilder(settings1).libraryxml(cfg).build();
 
+        mNewTemplate = true;
         TEST_CASE(assignAndCompare);   // assignment and comparison don't match
         TEST_CASE(mismatchingBitAnd);  // overlapping bitmasks
         TEST_CASE(comparison);         // CheckCondition::comparison test cases
@@ -74,6 +69,7 @@ class TestCondition : public TestFixture {
         TEST_CASE(incorrectLogicOperator14);
         TEST_CASE(incorrectLogicOperator15);
         TEST_CASE(incorrectLogicOperator16); // #10070
+        TEST_CASE(incorrectLogicOperator17);
         TEST_CASE(secondAlwaysTrueFalseWhenFirstTrueError);
         TEST_CASE(incorrectLogicOp_condSwapping);
         TEST_CASE(testBug5895);
@@ -92,6 +88,7 @@ class TestCondition : public TestFixture {
         TEST_CASE(oppositeInnerConditionOr);
         TEST_CASE(oppositeInnerConditionEmpty);
         TEST_CASE(oppositeInnerConditionFollowVar);
+        TEST_CASE(oppositeInnerConditionLambda);
 
         TEST_CASE(identicalInnerCondition);
 
@@ -126,37 +123,44 @@ class TestCondition : public TestFixture {
         TEST_CASE(compareOutOfTypeRange);
         TEST_CASE(knownConditionCast); // #9976
         TEST_CASE(knownConditionIncrementLoop); // #9808
+        TEST_CASE(knownConditionAfterBailout); // #12526
+        TEST_CASE(knownConditionIncDecOperator);
+        TEST_CASE(knownConditionFloating);
     }
 
-    void check(const char code[], Settings &settings, const char* filename = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Raw tokens..
-        std::vector<std::string> files(1, filename);
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
+    struct CheckOptions
+    {
+        bool cpp = true;
+    };
 
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+#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()) {
+        check_(file, line, code, settings0, options.cpp);
+    }
 
-        Preprocessor preprocessor(settings);
-        preprocessor.setDirectives(tokens1);
+    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..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Run checks..
-        runChecks<CheckCondition>(&tokenizer, &settings, this);
+        runChecks<CheckCondition>(tokenizer, this);
     }
 
-    void check(const char code[], const char* filename = "test.cpp", bool inconclusive = false) {
-        Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive, inconclusive).build();
-        check(code, settings, filename);
+#define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size])
+    {
+        SimpleTokenizer2 tokenizer(settings2, *this, code, "test.cpp");
+
+        // Tokenizer..
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
+
+        // Run checks..
+        runChecks<CheckCondition>(tokenizer, this);
     }
 
     void assignAndCompare() {
@@ -166,59 +170,59 @@ class TestCondition : public TestFixture {
               "    int y = x & 4;\n"
               "    if (y == 3);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Mismatching assignment and comparison, comparison 'y!=3' is always true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching assignment and comparison, comparison 'y==0x710' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // various simple assignments
         check("void foo(int x) {\n"
               "    int y = (x+1) | 1;\n"
               "    if (y == 2);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching assignment and comparison, comparison 'y==2' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching assignment and comparison, comparison 'y==2' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching assignment and comparison, comparison 'y==3' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // recursive checking into scopes
         check("void f(int x) {\n"
@@ -226,20 +230,20 @@ class TestCondition : public TestFixture {
               "    if (z) y=0;\n"
               "    else { if (y==8); }\n" // always false
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false.\n", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false.\n", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    int a = 100;\n"
@@ -248,7 +252,7 @@ class TestCondition : public TestFixture {
               "        while (y != 0) y--;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int x);\n"
               "void f(int x) {\n"
@@ -259,8 +263,8 @@ class TestCondition : public TestFixture {
               "    }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:6]: (style) Mismatching assignment and comparison, comparison 'y!=0' is always true.\n",
-            errout.str());
+            "[test.cpp:5:15] -> [test.cpp:6:15]: (style) Mismatching assignment and comparison, comparison 'y!=0' is always true. [assignIfError]\n",
+            errout_str());
 
         check("void g(int &x);\n"
               "void f(int x) {\n"
@@ -270,7 +274,7 @@ class TestCondition : public TestFixture {
               "        while (y != 0) g(y);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // calling function
         check("void f(int x) {\n"
@@ -278,14 +282,14 @@ class TestCondition : public TestFixture {
               "    do_something();\n"
               "    if (y==8);\n" // local variable => always false
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void do_something(int);\n"
               "void f(int x) {\n"
@@ -293,14 +297,14 @@ class TestCondition : public TestFixture {
               "    do_something(y);\n"
               "    if (y==8);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (style) Mismatching assignment and comparison, comparison 'y==8' is always false.\n", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4434 : false positive: ?:
         check("void f(int x) {\n"
@@ -308,28 +312,28 @@ class TestCondition : public TestFixture {
               "    x = x & 1 ? 1 : -1;\n"
               "    if(x != -1) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4735
         check("void f() {\n"
               "    int x = *(char*)&0x12345678;\n"
               "    if (x==18) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // bailout: pass variable to function
         check("void foo(int x) {\n"
@@ -337,7 +341,7 @@ class TestCondition : public TestFixture {
               "    bar(&y);\n"  // pass variable to function => no error
               "    if (y==1) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // no crash on unary operator& (#5643)
         // #11610
@@ -345,9 +349,9 @@ class TestCondition : public TestFixture {
               "    if (&rHitObject) {}\n"
               "    else if (rHitObject.IsClosedObj() && !&rHitObject) { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition '&rHitObject' is always true\n"
-                      "[test.cpp:3]: (style) Condition '!&rHitObject' is always false\n",
-                      errout.str());
+        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());
 
         // #5695: increment
         check("void f(int a0, int n) {\n"
@@ -358,7 +362,7 @@ class TestCondition : public TestFixture {
               "      c  = 0;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a) {\n" // #6662
               "  int x = a & 1;\n"
@@ -366,7 +370,7 @@ class TestCondition : public TestFixture {
               "    if (x != 5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Mismatching assignment and comparison, comparison 'x!=5' is always true.\n", errout.str());
+        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
               "  int x = a & 1;\n"
@@ -374,7 +378,7 @@ class TestCondition : public TestFixture {
               "    if (x != 5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int x = 100;\n"
@@ -382,7 +386,7 @@ class TestCondition : public TestFixture {
               "        g(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int x);\n"
               "void f() {\n"
@@ -391,7 +395,7 @@ class TestCondition : public TestFixture {
               "        g(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'x' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void g(int & x);\n"
               "void f() {\n"
@@ -400,7 +404,7 @@ class TestCondition : public TestFixture {
               "        g(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -409,13 +413,13 @@ class TestCondition : public TestFixture {
               "    int b = a & 0xf0;\n"
               "    b &= 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching bitmasks. Result is always 0 (X = Y & 0xf0; Z = X & 0x1; => Z=0).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Mismatching bitmasks. Result is always 0 (X = Y & 0xf0; Z = X & 0x1; => Z=0).\n", errout.str());
+        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"
               "    int b = a;"
@@ -424,84 +428,119 @@ class TestCondition : public TestFixture {
               "    case 2: b &= 2; break;\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void comparison() {
         // CheckCondition::comparison test cases
         // '=='
         check("void f(int a) {\n assert( (a & 0x07) == 8U );\n}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X & 0x7) == 0x8' is always false.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X & 0x4) == 0x3' is always false.\n", errout.str());
+        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}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X | 0x7) == 0x8' is always false.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int a) {\n assert( (a | 0x01) == -15 );\n}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // '!='
         check("void f(int a) {\n assert( (a & 0x07) != 8U );\n}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X & 0x7) != 0x8' is always true.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X | 0x7) != 0x8' is always true.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int a) {\n assert( (a | 0x07) != 7U );\n}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // '>='
         check("void f(int a) {\n assert( (a & 0x07) >= 8U );\n}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X & 0x7) >= 0x8' is always false.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X | 0x7) >= 0x7' is always true.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
         check("void f(int a) {\n assert( (a | 0x07) >= 8U );\n}");
-        ASSERT_EQUALS("",errout.str()); //correct for negative 'a'
+        ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '>'
         check("void f(int a) {\n assert( (a & 0x07) > 7U );\n}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X & 0x7) > 0x7' is always false.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X | 0x7) > 0x6' is always true.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
         check("void f(int a) {\n assert( (a | 0x07) > 7U );\n}");
-        ASSERT_EQUALS("",errout.str()); //correct for negative 'a'
+        ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '<='
         check("void f(int a) {\n assert( (a & 0x07) <= 7U );\n}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X & 0x7) <= 0x7' is always true.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X | 0x8) <= 0x7' is always false.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
         check("void f(int a) {\n assert( (a | 0x08) <= 7U );\n}");
-        ASSERT_EQUALS("",errout.str()); //correct for negative 'a'
+        ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
         // '<'
         check("void f(int a) {\n assert( (a & 0x07) < 8U );\n}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X & 0x7) < 0x8' is always true.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression '(X | 0x7) < 0x7' is always false.\n",errout.str());
+        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}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
         check("void f(int a) {\n assert( (a | 0x07) < 7U );\n}");
-        ASSERT_EQUALS("",errout.str()); //correct for negative 'a'
+        ASSERT_EQUALS("",errout_str()); //correct for negative 'a'
+
+        check("void f(int i) {\n" // #11998
+              "    if ((i & 0x100) == 0x200) {}\n"
+              "    if (0x200 == (i & 0x100)) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:21] -> [test.cpp:3:15]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n"
+                      "[test.cpp:2:12]: (style) Expression '(X & 0x100) == 0x200' is always false. [comparisonError]\n"
+                      "[test.cpp:3:21]: (style) Expression '(X & 0x100) == 0x200' is always false. [comparisonError]\n",
+                      errout_str());
+
+        checkP("#define MACRO1 (0x0010)\n" // #13222
+               "#define MACRO2 (0x0020)\n"
+               "#define MACRO_ALL (MACRO1 | MACRO2)\n"
+               "void f() {\n"
+               "    if (MACRO_ALL == 0) {}\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("void f(int i, int j) {\n" // #13360
+               "    int X = 0x10;\n"
+               "    if ((i & 0xff00) == X) {}\n"
+               "    if (X == (j & 0xff00)) {}\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) Expression '(X & 0xff00) == 0x10' is always false. [comparisonError]\n"
+                      "[test.cpp:4:17]: (style) Expression '(X & 0xff00) == 0x10' is always false. [comparisonError]\n",
+                      errout_str());
+    }
+
+#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);
+
+        runChecks<CheckCondition>(tokenizer, this);
     }
 
-#define checkPureFunction(code) checkPureFunction_(code, __FILE__, __LINE__)
     void multicompare() {
         check("void foo(int x)\n"
               "{\n"
               "    if (x & 7);\n"
               "    else { if (x == 1); }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 3.\n", errout.str());
+        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"
               "void foo(int x)\n"
@@ -509,7 +548,7 @@ class TestCondition : public TestFixture {
               "    if ( bar() >1 && b) {}\n"
               "    else if (bar() >1 && b) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Expression is always false because 'else if' condition matches previous condition at line 4.\n", errout.str());
+        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"
                           "void foo(int x)\n"
@@ -517,14 +556,14 @@ class TestCondition : public TestFixture {
                           "    if ( bar() >1 && b) {}\n"
                           "    else if (bar() >1 && b) {}\n"
                           "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Expression is always false because 'else if' condition matches previous condition at line 4.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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
         check("int f();\n"
@@ -534,7 +573,7 @@ class TestCondition : public TestFixture {
               "    else if ((i = f()) == 5) {}\n"
               "    else if (i == 3) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f();\n"
               "void g() {\n"
@@ -543,19 +582,7 @@ class TestCondition : public TestFixture {
               "    else if ((i = f()) == 5) {}\n"
               "    else if (i != 3) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
-    }
-
-    void checkPureFunction_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
-
-        runChecks<CheckCondition>(&tokenizer, &settings1, this);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void overlappingElseIfCondition() {
@@ -563,53 +590,53 @@ class TestCondition : public TestFixture {
               "    if (a) { b = 1; }\n"
               "    else { if (a) { b = 2; } }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Expression is always false because 'else if' condition matches previous condition at line 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             check("void f(Class &c) {\n"
                   "    if (c.dostuff() == 3) {}\n"
                   "    else { if (c.dostuff() == 3) {} }\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             check("void f(const Class &c) {\n"
                   "    if (c.dostuff() == 3) {}\n"
                   "    else { if (c.dostuff() == 3) {} }\n"
                   "}");
-            ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+            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());
         }
 
         check("void f(int a, int &b) {\n"
@@ -617,13 +644,13 @@ class TestCondition : public TestFixture {
               "   if (x < 100) { b = 1; }\n"
               "   else { x = x / 2; if (x < 100) { b = 2; } }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket 3689 ( avoid false positive )
         check("int fitInt(long long int nValue){\n"
@@ -645,13 +672,13 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(WIDGET *widget) {\n"
               "  if (dynamic_cast<BUTTON*>(widget)){}\n"
               "  else if (dynamic_cast<LABEL*>(widget)){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class B { virtual void v() {} };\n" // #11037
               "class D1 : public B {};\n"
@@ -662,73 +689,73 @@ class TestCondition : public TestFixture {
               "    if (d1) {}\n"
               "    else if (d2) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n" // #6482
               "  if (x & 1) {}\n"
               "  else if (x == 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 15) {}\n"
               "  else if (x == 40) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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)) {} }"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 0x08) {}\n"
               "  else if (x & 0xF8) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x & 0xF8) {}\n"
               "  else if (x & 0x08) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Expression is always false because 'else if' condition matches previous condition at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8168
         check("enum MaskValues\n"
@@ -740,19 +767,19 @@ class TestCondition : public TestFixture {
               "    if ( value & (int)Value1 ) {}\n"
               "    else if ( value & (int)Value2 ) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeElseIfCondition() {
@@ -762,19 +789,19 @@ class TestCondition : public TestFixture {
               "    if (x) {}\n"
               "    else if (!x) {}\n"
               "}");
-        ASSERT_EQUALS("test.cpp:3:style:Expression is always true because 'else if' condition is opposite to previous condition at line 2.\n"
-                      "test.cpp:2:note:first condition\n"
-                      "test.cpp:3:note:else if condition is opposite to first condition\n", errout.str());
+        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());
 
         check("void f(int x) {\n"
               "    int y = x;\n"
               "    if (x) {}\n"
               "    else if (!y) {}\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Expression is always true because 'else if' condition is opposite to previous condition at line 3.\n"
-                      "test.cpp:2:note:'y' is assigned value 'x' here.\n"
-                      "test.cpp:3:note:first condition\n"
-                      "test.cpp:4:note:else if condition is opposite to first condition\n", errout.str());
+        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"
+                      "[test.cpp:4:14]: note: else if condition is opposite to first condition\n", errout_str());
     }
 
     void checkBadBitmaskCheck() {
@@ -782,31 +809,31 @@ class TestCondition : public TestFixture {
               "    bool b = x | 0x02;\n"
               "    return b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    bool b = x & 0x02;\n"
               "    return b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    if(x | 0x02)\n"
               "        return b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "    int y = 0x1;\n"
@@ -814,27 +841,27 @@ class TestCondition : public TestFixture {
               "    if(x | y)\n"
               "        return b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    foo(a && (x | 0x02));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int x) {\n"
               "    return x | 0x02;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "  if (x) {\n"
@@ -842,19 +869,19 @@ class TestCondition : public TestFixture {
               "  }\n"
               "  return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "  typedef bool b_t;\n"
@@ -862,12 +889,12 @@ class TestCondition : public TestFixture {
               "F::b_t f(int x) {\n"
               "  return x | 0x02;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Result of operator '|' is always true if one operand is non-zero. Did you intend to use '&'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void create_rop_masks_4( rop_mask_bits *bits) {\n"
               "DWORD mask_offset;\n"
@@ -875,7 +902,7 @@ class TestCondition : public TestFixture {
               "rop_mask *rop_mask;\n"
               "and_bits[mask_offset] |= (rop_mask->and & 0x0f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned a, unsigned b) {\n"
               "  unsigned cmd1 = b & 0x0F;\n"
@@ -883,25 +910,25 @@ class TestCondition : public TestFixture {
               "    if (b == 0x0C) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n" // #11082
               "    int j = 0;\n"
               "    if (i | j) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Operator '|' with one operand equal to zero is redundant.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Operator '|' with one operand equal to zero is redundant. [badBitmaskCheck]\n", errout_str());
 
         check("#define EIGHTTOIS(x) (((x) << 8) | (x))\n"
               "int f() {\n"
               "    return EIGHTTOIS(0);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("#define O_RDONLY 0\n"
               "void f(const char* s, int* pFd) {\n"
               "    *pFd = open(s, O_RDONLY | O_BINARY, 0);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const int FEATURE_BITS = x |\n"
               "#if FOO_ENABLED\n"
@@ -911,12 +938,17 @@ class TestCondition : public TestFixture {
               "    FEATURE_BAR |\n"
               "#endif\n"
               "    0;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("enum precedence { PC0, UNARY };\n"
               "int x = PC0   | UNARY;\n"
               "int y = UNARY | PC0;\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("#define MASK 0\n"
+              "#define SHIFT 1\n"
+              "int x = 1 | (MASK << SHIFT);\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -925,84 +957,84 @@ class TestCondition : public TestFixture {
               "    if ((x != 1) || (x != 3))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x != 1 || x != 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x != 1 || x != 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 0 && !x.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x == 0 && x.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x == 1 && x == 7.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((y == 1) && (x != 1) || (x != 3))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 1) || (x != 3) && (y == 1))\n"
               "        a++;\n"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Condition 'x!=3' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) || (x == 3))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 1) || (y != 3))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != hotdog) || (y != hotdog))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if ((x != 5) || (y != 5))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("void f(int x) {\n"
               "    if ((x != 5) || (x != 6))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x != 5 || x != 6.\n", errout.str());
+        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"
               "    if((a != b) || (c != b) || (c != a))\n"
@@ -1011,7 +1043,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Condition 'c!=a' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:23] -> [test.cpp:2:35]: (style) Condition 'c!=a' is always false [knownConditionTrueFalse]\n", errout_str());
     }
 
     void incorrectLogicOperator2() {
@@ -1019,224 +1051,224 @@ class TestCondition : public TestFixture {
               "    if ((x == 1) && (x == 1.0))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x == 1) && (x == 0x00000001))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Condition 'x==0x00000001' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x == 1 && x == 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str()); // float comparisons with == and != are not checked right now - such comparison is a bad idea
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void bar(float f) {\n" // #5246
               "    if ((f > 0) && (f < 1)) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 1)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1.0 && x > 1.0.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 1.0.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 && x > 3)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1.0 && x > 3.0.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 3 || x < 10)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x > 3 || x < 10.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x >= 3 || x <= 10.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x >= 3 || x < 10.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x > 3 || x <= 10.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x >= 3 || x <= 3)\n"
               "        a++;\n"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x >= 3 || x <= 3.\n", errout.str());
+        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"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x >= 3 || x < 3.\n", errout.str());
+        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"
               "}"
               );
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x > 3 || x <= 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x != 4' is redundant since 'x == 3' is sufficient.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:4]: (style) Condition '*ptr!=1' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x != 4' is redundant since 'x == 3' is sufficient.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x == 3' is redundant since 'x != 4' is sufficient.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x == 3' is redundant since 'x != 4' is sufficient.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x == 3 && x != 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x == 6 || x != 6.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x > 5 && x == 1)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x > 5 && x == 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x == 6' is sufficient.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x <= 1.0e20 && x >= -1.0e20) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x >= 1.0e20 && x <= 1.0e21) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(float x) {\n" // x+1 => x
               "  if (x <= -1.0e20 && x >= -1.0e21) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incorrectLogicOperator3() {
@@ -1246,10 +1278,10 @@ class TestCondition : public TestFixture {
               "    d = x >= 5 && x == 1;\n"
               "    e = x <= 1 && x == 3;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x > 5 && x == 1.\n"
-                      "[test.cpp:3]: (warning) Logical conjunction always evaluates to false: x < 1 && x == 3.\n"
-                      "[test.cpp:4]: (warning) Logical conjunction always evaluates to false: x >= 5 && x == 1.\n"
-                      "[test.cpp:5]: (warning) Logical conjunction always evaluates to false: x <= 1 && x == 3.\n", errout.str());
+        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"
+                      "[test.cpp:5:16]: (warning) Logical conjunction always evaluates to false: x <= 1 && x == 3. [incorrectLogicOperator]\n", errout_str());
     }
 
     void incorrectLogicOperator4() {
@@ -1257,7 +1289,7 @@ class TestCondition : public TestFixture {
               "void f(int x) {\n"
               "  if (x && x != ZERO) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int N) {\n" // #9789
               "    T a[20] = { 0 };\n"
@@ -1265,65 +1297,66 @@ class TestCondition : public TestFixture {
               "        if (0 < a[i] && a[i] < 1) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incorrectLogicOperator5() { // complex expressions
         check("void f(int x) {\n"
               "  if (x+3 > 2 || x+3 < 10) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: x+3 > 2 || x+3 < 10.\n", errout.str());
+        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"
-              "}", "test.cpp", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char x) {\n"
               "  if (x == '1' && x == '2') {}\n"
-              "}", "test.cpp", true);
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x == '1' && x == '2'.\n", errout.str());
+              "}", 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"
-              "}", "test.cpp", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(char c) {\n"
               "  return (c <= 'a' && c >= 'z');\n"
-              "}", "test.cpp", true);
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Logical conjunction always evaluates to false: c <= 'a' && c >= 'z'.\n", errout.str());
+              "}", 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"
-              "}", "test.cpp", false);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Return value 'c>='z'' is always false\n", errout.str());
+              "}"); // 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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: i || !(i).\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical disjunction always evaluates to true: a > b || a <= b.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6081 False positive: incorrectLogicOperator, with close negative comparisons
         check("double neg = -1.0 - 1.0e-13;\n"
@@ -1333,14 +1366,14 @@ class TestCondition : public TestFixture {
               "    else\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incorrectLogicOperator8() { // opposite expressions
         check("void f(int i) {\n"
               "  if (!(i!=10) && !(i!=20)) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: !(i != 10) && !(i != 20).\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:16]: (warning) Logical conjunction always evaluates to false: !(i != 10) && !(i != 20). [incorrectLogicOperator]\n", errout_str());
     }
 
     void incorrectLogicOperator9() { //  #6069 "False positive incorrectLogicOperator due to dynamic_cast"
@@ -1349,7 +1382,7 @@ class TestCondition : public TestFixture {
               "void foo (OtherType* obj) {\n"
               "    assert((!obj) || dynamic_cast<MyType*>(obj));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incorrectLogicOperator10() { //  #7794 - enum
@@ -1358,21 +1391,21 @@ class TestCondition : public TestFixture {
               "    if ((t == A) && (t == B))\n"
               "    {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Logical conjunction always evaluates to false: t == 0 && t == 1.\n", errout.str());
+        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 ) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i < n && i == n.\n", errout.str());
+        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 ) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i > n && i == n.\n", errout.str());
+        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 ) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i == n && i > n.\n", errout.str());
+        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 ) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i == n && i < n.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:44]: (warning) Logical conjunction always evaluates to false: i == n && i < n. [incorrectLogicOperator]\n", errout_str());
     }
 
     void incorrectLogicOperator12() { // #8696
@@ -1387,8 +1420,8 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:6] -> [test.cpp:8]: (warning) Logical conjunction always evaluates to false: a > x && a < y.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    void f();\n"
@@ -1400,7 +1433,7 @@ class TestCondition : public TestFixture {
               "  if (a > x && a < y)\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(A a, A b) {\n"
               "  A x = b;\n"
@@ -1409,7 +1442,7 @@ class TestCondition : public TestFixture {
               "  if (a > x && a < y)\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(A a, A b) {\n"
               "  const A x = b;\n"
@@ -1419,8 +1452,8 @@ class TestCondition : public TestFixture {
               "    return;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:3] -> [test.cpp:5]: (warning) Logical conjunction always evaluates to false: a > x && a < y.\n",
-            errout.str());
+            "[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());
 
         check("struct A {\n"
               "    void f() const;\n"
@@ -1432,9 +1465,9 @@ class TestCondition : public TestFixture {
               "  if (a > x && a < y)\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Condition 'a>x' is always false\n"
-                      "[test.cpp:8]: (style) Condition 'a<y' is always false\n",
-                      errout.str());
+        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());
 
         check("struct A {\n"
               "    void f();\n"
@@ -1446,7 +1479,7 @@ class TestCondition : public TestFixture {
               "  if (a > x && a < y)\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Condition 'a>x' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(A a) {\n"
               "  A x = a;\n"
@@ -1455,7 +1488,7 @@ class TestCondition : public TestFixture {
               "  if (a > x && a < y)\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'a>x' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'a>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(A a) {\n"
               "  const A x = a;\n"
@@ -1464,9 +1497,9 @@ class TestCondition : public TestFixture {
               "  if (a > x && a < y)\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'a>x' is always false\n"
-                      "[test.cpp:5]: (style) Condition 'a<y' is always false\n",
-                      errout.str());
+        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());
     }
 
     void incorrectLogicOperator13() {
@@ -1475,13 +1508,13 @@ class TestCondition : public TestFixture {
               "    const int x=v;\n"
               "    if ((v == 1) && (x == 2)) {;}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Logical conjunction always evaluates to false: v == 1 && x == 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Logical conjunction always evaluates to false: *(v) == 1 && *(x) == 2.\n", errout.str());
+        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());
     }
 
     void incorrectLogicOperator14() {
@@ -1688,7 +1721,7 @@ class TestCondition : public TestFixture {
               "        ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:200] -> [test.cpp:200]: (style) Condition 'g' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:200:11] -> [test.cpp:200:16]: (style) Condition 'g' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
     void incorrectLogicOperator15() {
@@ -1711,14 +1744,32 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incorrectLogicOperator16() { // #10070
         check("void foo(void* p) {\n"
               "    if (!p || p == -1) { }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void incorrectLogicOperator17() { // #12471
+        check("struct R {\n"
+              "    void set() { i = 1; }\n"
+              "    int get() const { return i; }\n"
+              "    int i;\n"
+              "};\n"
+              "struct P {\n"
+              "    void f();\n"
+              "    R* r;\n"
+              "};\n"
+              "void P::f() {\n"
+              "    int a = r->get();\n"
+              "    r->set();\n"
+              "    if (a == 0 && r->get()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void secondAlwaysTrueFalseWhenFirstTrueError() {
@@ -1726,31 +1777,31 @@ class TestCondition : public TestFixture {
               "    const char c[1] = { \'x\' }; \n"
               "    if(c[0] == \'x\'){;}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'c[0]=='x'' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x != 1' is redundant since 'x > 5' is sufficient.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if ((x > 5) && (x != 1))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x != 1' is redundant since 'x > 5' is sufficient.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, bool& b) {\n"
               "    b = x > 3 || x == 4;\n"
@@ -1758,11 +1809,11 @@ class TestCondition : public TestFixture {
               "    d = x >= 3 || x == 4;\n"
               "    e = x <= 5 || x == 4;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x > 3' is sufficient.\n"
-                      "[test.cpp:3]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x < 5' is sufficient.\n"
-                      "[test.cpp:4]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x >= 3' is sufficient.\n"
-                      "[test.cpp:5]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x <= 5' is sufficient.\n",
-                      errout.str());
+        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"
+                      "[test.cpp:5:16]: (style) Redundant condition: The condition 'x == 4' is redundant since 'x <= 5' is sufficient. [redundantCondition]\n",
+                      errout_str());
 
         check("void f(int x, bool& b) {\n"
               "    b = x > 5 || x != 1;\n"
@@ -1770,11 +1821,11 @@ class TestCondition : public TestFixture {
               "    d = x >= 5 || x != 1;\n"
               "    e = x <= 1 || x != 3;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x != 1' is sufficient.\n"
-                      "[test.cpp:3]: (style) Redundant condition: The condition 'x < 1' is redundant since 'x != 3' is sufficient.\n"
-                      "[test.cpp:4]: (style) Redundant condition: The condition 'x >= 5' is redundant since 'x != 1' is sufficient.\n"
-                      "[test.cpp:5]: (style) Redundant condition: The condition 'x <= 1' is redundant since 'x != 3' is sufficient.\n",
-                      errout.str());
+        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"
+                      "[test.cpp:5:16]: (style) Redundant condition: The condition 'x <= 1' is redundant since 'x != 3' is sufficient. [redundantCondition]\n",
+                      errout_str());
 
         check("void f(int x, bool& b) {\n"
               "    b = x > 6 && x > 5;\n"
@@ -1782,11 +1833,11 @@ class TestCondition : public TestFixture {
               "    d = x < 6 && x < 5;\n"
               "    e = x < 5 || x < 6;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x > 5' is redundant since 'x > 6' is sufficient.\n"
-                      "[test.cpp:3]: (style) Redundant condition: The condition 'x > 6' is redundant since 'x > 5' is sufficient.\n"
-                      "[test.cpp:4]: (style) Redundant condition: The condition 'x < 6' is redundant since 'x < 5' is sufficient.\n"
-                      "[test.cpp:5]: (style) Redundant condition: The condition 'x < 5' is redundant since 'x < 6' is sufficient.\n",
-                      errout.str());
+        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"
+                      "[test.cpp:5:15]: (style) Redundant condition: The condition 'x < 5' is redundant since 'x < 6' is sufficient. [redundantCondition]\n",
+                      errout_str());
 
         check("void f(double x, bool& b) {\n"
               "    b = x > 6.5 && x > 5.5;\n"
@@ -1794,17 +1845,17 @@ class TestCondition : public TestFixture {
               "    d = x < 6.5 && x < 5.5;\n"
               "    e = x < 5.5 || x < 6.5;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition 'x > 5.5' is redundant since 'x > 6.5' is sufficient.\n"
-                      "[test.cpp:3]: (style) Redundant condition: The condition 'x > 6.5' is redundant since 'x > 5.5' is sufficient.\n"
-                      "[test.cpp:4]: (style) Redundant condition: The condition 'x < 6.5' is redundant since 'x < 5.5' is sufficient.\n"
-                      "[test.cpp:5]: (style) Redundant condition: The condition 'x < 5.5' is redundant since 'x < 6.5' is sufficient.\n",
-                      errout.str());
+        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"
+                      "[test.cpp:5:17]: (style) Redundant condition: The condition 'x < 5.5' is redundant since 'x < 6.5' is sufficient. [redundantCondition]\n",
+                      errout_str());
 
         check("void f(const char *p) {\n" // #10320
               "    if (!p || !*p || *p != 'x') {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: The condition '!*p' is redundant since '*p != 'x'' is sufficient.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (style) Redundant condition: The condition '!*p' is redundant since '*p != 'x'' is sufficient. [redundantCondition]\n",
+                      errout_str());
     }
 
     void incorrectLogicOp_condSwapping() {
@@ -1812,49 +1863,49 @@ class TestCondition : public TestFixture {
               "    if (x < 1 && x > 3)\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x < 1 && x > 3.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (warning) Logical conjunction always evaluates to false: x > 3 && x < 1. [incorrectLogicOperator]\n", errout_str());
     }
 
     void modulo() {
@@ -1864,7 +1915,7 @@ class TestCondition : public TestFixture {
               "    b3 = a % 5 == c;\n"
               "    return a % 5 == 5-p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool& b1, bool& b2, bool& b3, bool& b4, bool& b5) {\n"
               "    b1 = a % 5 < 5;\n"
@@ -1875,14 +1926,13 @@ class TestCondition : public TestFixture {
               "    return a % 5 > 5;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7]: (style) Return value 'a%5>5' is always false\n"
-            "[test.cpp:2]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n"
-            "[test.cpp:3]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n"
-            "[test.cpp:4]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n"
-            "[test.cpp:5]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n"
-            "[test.cpp:6]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n"
-            "[test.cpp:7]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n",
-            errout.str());
+            "[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"
+            "[test.cpp:4:16]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
+            "[test.cpp:5:16]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
+            "[test.cpp:6:16]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n"
+            "[test.cpp:7:18]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n",
+            errout_str());
 
         check("void f(bool& b1, bool& b2) {\n"
               "    b1 = bar() % 5 < 889;\n"
@@ -1890,17 +1940,16 @@ class TestCondition : public TestFixture {
               "        b2 = x.a % 5 == 5;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3]: (style) Condition 'x[593]%5<=5' is always true\n"
-            "[test.cpp:2]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n"
-            "[test.cpp:3]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n"
-            "[test.cpp:4]: (warning) Comparison of modulo result is predetermined, because it is always less than 5.\n",
-            errout.str());
+            "[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"
+            "[test.cpp:4:22]: (warning) Comparison of modulo result is predetermined, because it is always less than 5. [moduloAlwaysTrueFalse]\n",
+            errout_str());
 
         check("void f() {\n"
               "    if (a % 2 + b % 2 == 2)\n"
               "        foo();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeInnerCondition() {
@@ -1909,21 +1958,21 @@ class TestCondition : public TestFixture {
               "        if(a!=b)\n"
               "            cout << a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'return' condition leads to a dead code block.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "    if(a >= 50) {\n"
@@ -1933,7 +1982,7 @@ class TestCondition : public TestFixture {
               "            cout << 100;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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
         check("void foo(int a) {\n"
@@ -1944,7 +1993,7 @@ class TestCondition : public TestFixture {
               "            cout << 100;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // 4170
         check("class foo {\n"
@@ -1963,7 +2012,7 @@ class TestCondition : public TestFixture {
               "    void next();\n"
               "    const char *tok;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i)\n"
               "{\n"
@@ -1974,7 +2023,7 @@ class TestCondition : public TestFixture {
               "       }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i) {\n"
               "    i=6;\n"
@@ -1986,7 +2035,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int& i);\n"
               "void bar() {\n"
@@ -1997,7 +2046,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i);\n"
               "void bar(int i) {\n"
@@ -2007,7 +2056,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "void bar(int i) {\n"
@@ -2017,7 +2066,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "void bar() {\n"
@@ -2028,7 +2077,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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
               "void foo(C c, int i) {\n"
@@ -2037,7 +2086,7 @@ class TestCondition : public TestFixture {
               "    if (i != 5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // see linux revision 1f80c0cc
         check("int generic_write_sync(int,int,int);\n"
@@ -2051,7 +2100,7 @@ class TestCondition : public TestFixture {
               "       }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:7]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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());
 
 
         // #5874 - array
@@ -2062,7 +2111,7 @@ class TestCondition : public TestFixture {
               "    if (array[0] > 2) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6227 - FP caused by simplifications of casts and known variables
         check("void foo(A *a) {\n"
@@ -2071,7 +2120,7 @@ class TestCondition : public TestFixture {
               "       if(!b) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a) {\n"
               "   if(a) {\n"
@@ -2079,7 +2128,7 @@ class TestCondition : public TestFixture {
               "       if(!b) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "  if (u != 0) {\n"
@@ -2089,7 +2138,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8186
         check("void f() {\n"
@@ -2097,7 +2146,7 @@ class TestCondition : public TestFixture {
               "    if (i==5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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
         check("void Delete(SS_CELLCOORD upperleft) {\n"
@@ -2106,7 +2155,7 @@ class TestCondition : public TestFixture {
               "        if (upperleft.Row == -1) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9702
         check("struct A {\n"
@@ -2119,7 +2168,16 @@ class TestCondition : public TestFixture {
               "    bool IsSet() const { return m_value; }\n"
               "    bool m_value = false;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #12725
+        check("bool f(bool b) {\n"
+              "    if (b)\n"
+              "        return !b;\n"
+              "    b = g();\n"
+              "    return b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:16]: (style) Return value '!b' is always false [knownConditionTrueFalse]\n", errout_str());
     }
 
     void oppositeInnerConditionPointers() {
@@ -2132,7 +2190,7 @@ class TestCondition : public TestFixture {
               "       }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Fred::f() {\n" // daca: ace
               "  if (this->next_ == map_man_->table_) {\n"
@@ -2140,7 +2198,7 @@ class TestCondition : public TestFixture {
               "    if (this->next_ != map_man_->table_) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(float *f) {\n" // #7405
               "  if(*f>10) {\n"
@@ -2148,13 +2206,13 @@ class TestCondition : public TestFixture {
               "    if(*f<10) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int * f(int * x, int * y) {\n"
               "    if(!x) return x;\n"
               "    return y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeInnerConditionClass() {
@@ -2166,7 +2224,7 @@ class TestCondition : public TestFixture {
               "    if (!fred.isValid()) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "void f() {\n"
@@ -2176,7 +2234,7 @@ class TestCondition : public TestFixture {
               "    if (!fred.isValid()) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "  Fred fred;\n"
@@ -2185,7 +2243,7 @@ class TestCondition : public TestFixture {
               "    if (!fred.isValid()) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6385 "crash in Variable::getFlag()"
         check("class TranslationHandler {\n"
@@ -2196,14 +2254,14 @@ class TestCondition : public TestFixture {
               "        }\n"
               "   }\n"
               "};");
-        ASSERT_EQUALS("", errout.str()); // just don't crash...
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeInnerConditionUndeclaredVariable() {
@@ -2214,7 +2272,7 @@ class TestCondition : public TestFixture {
               "       if (x != -1) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5750 - another fp when undeclared variable is used
         check("void f() {\n"
@@ -2223,7 +2281,7 @@ class TestCondition : public TestFixture {
               "       if (r > w) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6574 - another fp when undeclared variable is used
         check("void foo() {\n"
@@ -2232,7 +2290,7 @@ class TestCondition : public TestFixture {
               "       if(!i) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // undeclared array
         check("void f(int x) {\n"
@@ -2241,7 +2299,7 @@ class TestCondition : public TestFixture {
               "    if (a[x] < 0) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6313 - false positive: opposite conditions in nested if blocks when condition changed
         check("void Foo::Bar() {\n"
@@ -2251,7 +2309,7 @@ class TestCondition : public TestFixture {
               "      else {}\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // daca hyphy
         check("bool f() {\n"
@@ -2260,7 +2318,7 @@ class TestCondition : public TestFixture {
               "    if (rec.lLength!=0) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeInnerConditionAlias() {
@@ -2274,7 +2332,7 @@ class TestCondition : public TestFixture {
               "    if (hasFailed) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Condition '!hasFailed' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:7]: (style) Condition '!hasFailed' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
     void oppositeInnerCondition2() {
@@ -2285,45 +2343,45 @@ class TestCondition : public TestFixture {
               "    if (x==5) {}\n" // <- Warning
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        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"
               "\n"
               "  if (x<4) {\n"
               "    if (x!=5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x!=5' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        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"
               "\n"
               "  if (x<4) {\n"
               "    if (x>=5) {}\n" // <- Warning
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        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"
               "\n"
               "  if (x<4) {\n"
               "    if (x<5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x<5' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x<=5' is always true\n", errout.str());
+        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"
@@ -2331,49 +2389,49 @@ class TestCondition : public TestFixture {
               "    if (x==4) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x!=4) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x!=6) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x!=6' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x>4' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x<4) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x<5) {\n"
               "    if (x<=4) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x<=4' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:4:10]: (style) Condition 'x<=4' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // first comparison: >
         check("void f(int x) {\n"
@@ -2382,35 +2440,35 @@ class TestCondition : public TestFixture {
               "    if (x==5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x>5) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int x) {\n"
               "\n"
               "  if (x>4) {\n"
               "    if (x>=5) {}\n" // <- Warning
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x>=5' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x<5' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "\n"
@@ -2418,100 +2476,100 @@ class TestCondition : public TestFixture {
               "    if (x==4) {}\n" // <- Warning
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        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"
               "\n"
               "  if (x>5) {\n"
               "    if (x>4) {}\n" // <- Warning
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x>4' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'x>=4' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        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"
               "\n"
               "  if (x>5) {\n"
               "    if (x<=4) {}\n" // <- Warning
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        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"
               "  if (x < 4) {\n"
               "    if (10 < x) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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') {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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') {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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') {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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') {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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') {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f3(char a, char b) { if(a==b) if(a==0) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { if (x == 1) if (x != 1) {} }");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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());
     }
 
     void oppositeInnerConditionAnd() {
@@ -2520,13 +2578,13 @@ class TestCondition : public TestFixture {
               "    if (x < 10) {}\n"
               "  }"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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"
               "        if(x && a < b)\n"
               "            if( x && a > b){}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14] -> [test.cpp:3:19]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n", errout_str());
     }
 
     void oppositeInnerConditionOr()
@@ -2536,92 +2594,92 @@ class TestCondition : public TestFixture {
               "        if (x == 3) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:15]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
+                      errout_str());
 
         check("void f(int x) {\n"
               "    if (x == 1 || x == 2) {\n"
               "        if (x == 1) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x == 1 || x == 2) {\n"
               "        if (x == 2) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string x) {\n"
               "    if (x == \"1\" || x == \"2\") {\n"
               "        if (x == \"1\") {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if (x < 1 || x > 3) {\n"
               "        if (x == 3) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Opposite inner 'if' condition leads to a dead code block.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:3:15]: (warning) Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]\n",
+                      errout_str());
     }
 
     void oppositeInnerConditionEmpty() {
         check("void f1(const std::string &s) { if(s.size() > 42) if(s.empty()) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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()) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Condition 's.empty()' is always false\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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()) {}}");
-        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.
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Opposite inner 'if' condition leads to a dead code block.\n", errout.str());
+        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)) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(const std::string &x, const std::string &y) { if(x.size() > 42) if(y.empty()) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(const std::string &x, const std::string &y) { if(y.empty()) if(x.size() > 42) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(const std::string v[10]) { if(v[0].size() > 42) if(v[1].empty()) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(const std::string &s) { if(s.size() <= 1) if(s.empty()) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(const std::string &s) { if(s.size() <= 2) if(s.empty()) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(const std::string &s) { if(s.size() < 2) if(s.empty()) {}}");
-        ASSERT_EQUALS("", errout.str());
+        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]
-        ASSERT_EQUALS("", errout.str());
+        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()) {}}");
-        ASSERT_EQUALS("", errout.str());
+        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()) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeInnerConditionFollowVar() {
@@ -2636,7 +2694,7 @@ class TestCondition : public TestFixture {
               "    void bar();\n"
               "    int get() const;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct CD {\n"
               "    bool state;\n"
@@ -2650,7 +2708,7 @@ class TestCondition : public TestFixture {
               "    bool get() const;\n"
               "    void bar();\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
               "public:\n"
@@ -2664,7 +2722,7 @@ class TestCondition : public TestFixture {
               "  x += 1;\n"
               "  if (!b && f()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(double d) {\n"
               "    if (d != 0) {\n"
@@ -2672,15 +2730,31 @@ class TestCondition : public TestFixture {
               "        if (i == 0) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void oppositeInnerConditionLambda() {
+        check("void f() {\n" // #13728
+              "    for (int i = 0; i < 2;) {\n"
+              "        auto inc = [&]() {\n"
+              "            if (i >= 2)\n"
+              "                throw 0;\n"
+              "            return i++;\n"
+              "        };\n"
+              "        inc();\n"
+              "        inc();\n"
+              "        inc();\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void identicalInnerCondition() {
         check("void f1(int a, int b) { if(a==b) if(a==b) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Identical inner 'if' condition is always true.\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (warning) Identical inner 'if' condition is always true.\n", errout.str());
+        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
         check("void f(bool a, bool b) {\n"
@@ -2689,38 +2763,38 @@ class TestCondition : public TestFixture {
               "     else  {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Identical inner 'if' condition is always true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (warning) Identical inner 'return' condition is always true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int* f(int* a, int * b) {\n"
               "    if(a) { return a; }\n"
               "    return b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    uint32_t value;\n"
@@ -2732,7 +2806,19 @@ class TestCondition : public TestFixture {
               "        if ((value >> 28) & 1) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("#define TYPE_1 \"a\"\n" // #13202
+               "#define TYPE_2 \"b\"\n"
+               "#define TYPE_3 \"c\"\n"
+               "void f(const std::string& s) {\n"
+               "    if (s == TYPE_1) {}\n"
+               "    else if (s == TYPE_2 || s == TYPE_3) {\n"
+               "        if (s == TYPE_2) {}\n"
+               "        else if (s == TYPE_3) {}\n"
+               "    }\n"
+               "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void identicalConditionAfterEarlyExit() {
@@ -2740,54 +2826,53 @@ class TestCondition : public TestFixture {
               "  if (x > 100) { return; }\n"
               "  if (x > 100) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Identical condition 'x>100', second condition is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Identical condition and return expression 'x>100', return value is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Identical condition 'x>100', second condition is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Identical condition 'x>100', second condition is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Identical condition 'x>100', second condition is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Identical condition 'x>100', second condition is always false\n", errout.str());
+        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"  // #8217 - crash for incomplete code
-              "  if (x > 100) { return; }\n"
-              "  X(do);\n"
-              "  if (x > 100) {}\n"
-              "}");
-        // TODO: we should probably throw unknownMacro InternalError. Complain that the macro X must be defined. We can't check the code well without the definition.
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Condition 'x>100' is always false\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"
+                                    "}"),
+                              SYNTAX);
 
         check("void f(const int *i) {\n"
               "  if (!i) return;\n"
               "  if (!num1tok) { *num1 = *num2; }\n"
               "  if (!i) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Identical condition '!i', second condition is always false\n", errout.str());
+        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
               "  if(!coreTree.build())\n"
@@ -2795,7 +2880,7 @@ class TestCondition : public TestFixture {
               "  coreTree.dostuff();\n"
               "  if(!coreTree.build()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C { void f(const Tree &coreTree); };\n"
               "void C::f(const Tree &coreTree) {\n"
@@ -2804,7 +2889,7 @@ class TestCondition : public TestFixture {
               "  coreTree.dostuff();\n"
               "  if(!coreTree.build()) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) Identical condition '!coreTree.build()', second condition is always false\n", errout.str());
+        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
               "  switch(type) {\n"
@@ -2817,7 +2902,7 @@ class TestCondition : public TestFixture {
               "  }\n"
               "  return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("static int failed = 0;\n"
               "void f() {\n"
@@ -2825,14 +2910,14 @@ class TestCondition : public TestFixture {
               "  checkBuffer();\n"
               "  if (failed) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // daca iqtree
         check("void readNCBITree(std::istream &in) {\n"
@@ -2842,7 +2927,7 @@ class TestCondition : public TestFixture {
               "  in >> ch;\n"
               "  if (ch != '|') {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8924
         check("struct A {\n"
@@ -2853,7 +2938,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    int FileIndex;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'this->FileIndex<0' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:29]: (style) Condition 'this->FileIndex<0' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8858 - #if
         check("short Do() {\n"
@@ -2865,7 +2950,7 @@ class TestCondition : public TestFixture {
               "#endif\n"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10456
         check("int f() {\n"
@@ -2876,7 +2961,7 @@ class TestCondition : public TestFixture {
               "    if (i) return i;\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11478
         check("struct S {\n"
@@ -2893,7 +2978,7 @@ class TestCondition : public TestFixture {
               "            return;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void innerConditionModified() {
@@ -2903,7 +2988,7 @@ class TestCondition : public TestFixture {
               "    if (x == 0) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x == 0) {\n"
@@ -2911,7 +2996,7 @@ class TestCondition : public TestFixture {
               "    if (x == 1) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int * x, int * y) {\n"
               "  if (x[*y] == 0) {\n"
@@ -2919,7 +3004,7 @@ class TestCondition : public TestFixture {
               "    if (x[*y] == 0) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // clarify conditions with = and comparison
@@ -2927,102 +3012,102 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "    if (x = b() < 0) {}\n" // don't simplify and verify this code
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Suspicious condition (assignment + comparison); Clarify expression with parentheses.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    x = a<int>(); if (x) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (x = b < 0 ? 1 : 2) {}\n" // don't simplify and verify this code
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int y = rand(), z = rand();\n"
               "    if (y || (!y && z));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition: !y. 'y || (!y && z)' is equivalent to 'y || z'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition: !y. 'y || (!y && z)' is equivalent to 'y || z'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: a. '!a || (a && b)' is equivalent to '!a || b'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: tok->next()->function(). '!A || (A && B)' is equivalent to '!A || B'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (!tok->next()->function() ||\n"
               "        (!tok2->next()->function() && tok->next()->function()->isConstructor()));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: tok->next(1)->function(1). '!A || (A && B)' is equivalent to '!A || B'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int y = rand(), z = rand();\n"
               "   if (y==0 || y!=0 && z);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Redundant condition: y!=0. 'y==0 || (y!=0 && z)' is equivalent to 'y==0 || z'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test Token::expressionString, TODO move this test
         check("void f() {\n"
               "  if (!dead || (dead && (*it).ticks > 0)) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: dead. '!dead || (dead && (*it).ticks>0)' is equivalent to '!dead || (*it).ticks>0'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: x. '!x || (x && 2>(y-1))' is equivalent to '!x || 2>(y-1)'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: a. 'a || (a && b)' is equivalent to 'a'\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant condition: a. 'a && (a || b)' is equivalent to 'a'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Redundant condition: a. 'a && (a || b)' is equivalent to 'a' [redundantCondition]\n", errout_str());
     }
 
     // clarify conditions with bitwise operator and comparison
@@ -3030,16 +3115,16 @@ class TestCondition : public TestFixture {
         check("void f() {\n"
               "    if (x & 3 == 2) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Suspicious condition (bitwise operator + comparison); Clarify expression with parentheses.\n"
-                      "[test.cpp:2]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses.\n"
-                      "[test.cpp:2]: (style) Condition 'x&3==2' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Suspicious condition (bitwise operator + comparison); Clarify expression with parentheses.\n"
-                      "[test.cpp:2]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses.\n"
-                      , errout.str());
+        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());
     }
 
     // clarify condition that uses ! operator and then bitwise operator
@@ -3047,50 +3132,50 @@ class TestCondition : public TestFixture {
         check("void f(int w) {\n"
               "    if(!w & 0x8000) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (x == foo() & 2) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::list<int> &ints) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { A<x &> a; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a(x<y|z,0); }", "test.c");  // filename is c => there are never templates
-        ASSERT_EQUALS("[test.c:1]: (style) Boolean result is used in bitwise operation. Clarify expression with parentheses.\n", errout.str());
+        check("void f() { a(x<y|z,0); }", 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>;", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+        check("class A<B&,C>;");
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (result != (char *)&inline_result) { }\n" // don't simplify and verify cast
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8495
         check("void f(bool a, bool b) {\n"
               "    C & a & b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCondition4() { // ticket #3110
@@ -3105,13 +3190,13 @@ class TestCondition : public TestFixture {
               "         return left.first < right.first;\n"
               "     }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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);");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCondition6() {
@@ -3120,7 +3205,7 @@ class TestCondition : public TestFixture {
               "    px = r.px;\n"
               "    return *this;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCondition7() {
@@ -3129,7 +3214,7 @@ class TestCondition : public TestFixture {
               "    bool & withoutSideEffects=found.first->second;\n" // Declaring a reference to a boolean; & is no operator at all
               "    execute(secondExpression, &programMemory, &result, &error);\n" // Unary &
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCondition8() {
@@ -3139,24 +3224,24 @@ class TestCondition : public TestFixture {
               "bool f(bool b) {\n"
               "    return (a() & b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool *a, bool b) {\n"
               "    return (a[10] & b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { bool a; };\n"
               "bool f(struct A a, bool b) {\n"
               "    return (a.a & b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { bool a; };\n"
               "bool f(struct A a, bool b) {\n"
               "    return (A::a & b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testBug5895() {
@@ -3164,7 +3249,7 @@ class TestCondition : public TestFixture {
               "    if (init == 0x89504e470d0a1a0a || init == 0x8a4d4e470d0a1a0a)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testBug5309() {
@@ -3173,7 +3258,7 @@ class TestCondition : public TestFixture {
               "    if( ( value >= 0x7ff0000000000001ULL )\n"
               "            && ( value <= 0x7fffffffffffffffULL ) );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrue() {
@@ -3183,7 +3268,7 @@ class TestCondition : public TestFixture {
               "  int x2 = s->x;\n"
               "  if (x1 == 10 && x2 == 10) {}\n" // <<
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:4]: (style) Condition 'x2==10' is always true\n", errout.str());
+        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
               "{\n"
@@ -3199,27 +3284,29 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    ret = b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:8]: (style) Condition '8<a' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition '!x' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Return value 'x==0' is always false\n", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("function argument is always true? however is code really weird/suspicious?", "", errout.str());
+        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());
 
         check("bool foo(int bar) {\n"
               "  bool ret = false;\n"
@@ -3229,68 +3316,68 @@ class TestCondition : public TestFixture {
               "    ret = true;\n"
               "  return ret;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(const std::string &s) { if(s.empty()) if(s.size() == 0) {}}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Condition 's.size()==0' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'buf!=0' is always true\n", errout.str()); // #8924
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition '!buf' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'b' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition '!b' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'buf==p' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'buf' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   int p[42];\n"
               "   if( buf == p ) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int buf[42];\n"
               "   if( buf == 1) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Avoid FP when condition comes from macro
         check("#define NOT !\n"
@@ -3299,7 +3386,7 @@ class TestCondition : public TestFixture {
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (NOT x) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("#define M  x != 0\n"
               "void f() {\n"
@@ -3307,20 +3394,20 @@ class TestCondition : public TestFixture {
               "  if (a) { return; }\n" // <- this is just here to fool simplifyKnownVariabels
               "  if (M) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("#define IF(X)  if (X && x())\n"
               "void f() {\n"
               "  IF(1) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Avoid FP for sizeof condition
         check("void f() {\n"
               "  if (sizeof(char) != 123) {}\n"
               "  if (123 != sizeof(char)) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x = 123;\n"
@@ -3328,7 +3415,7 @@ class TestCondition : public TestFixture {
               "  if (x != sizeof(char)) {}\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());
+                           "[test.cpp:4]: (style) Condition 'x!=sizeof(char)' is always true\n", "", errout_str());
 
         // Don't warn in assertions. Condition is often 'always true' by intention.
         // If platform,defines,etc cause an 'always false' assertion then that is not very dangerous neither
@@ -3336,7 +3423,7 @@ class TestCondition : public TestFixture {
               "  int x = 0;\n"
               "  assert(x == 0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9363 - do not warn about value passed to function
         check("void f(bool b) {\n"
@@ -3344,7 +3431,7 @@ class TestCondition : public TestFixture {
               "        if (bar(!b)) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         // #7783  FP knownConditionTrueFalse on assert(0 && "message")
@@ -3359,7 +3446,7 @@ class TestCondition : public TestFixture {
               "        assert((int)(0==0) && \"bla\");\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7750 char literals in boolean expressions
         check("void f() {\n"
@@ -3368,7 +3455,7 @@ class TestCondition : public TestFixture {
               "  if(1 && 'c'){}\n"
               "  int x = 'd' ? 1 : 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8206 - knownCondition always false
         check("void f(int i)\n"
@@ -3376,26 +3463,26 @@ class TestCondition : public TestFixture {
               "        if(i > 4)\n"
               "          for( int x = 0; i < 3; ++x){}\n" // <<
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Condition 'i<3' is always false\n", errout.str());
+        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) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { if(false) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { if(!true) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { if(!false) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { if(0) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { if(1) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
               "    bool b = false;\n"
@@ -3404,36 +3491,36 @@ class TestCondition : public TestFixture {
               "    if (b)\n"
               "    {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition '!b' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14]: (style) Condition '!b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("bool f() { return nullptr; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("enum E { A };\n"
               "bool f() { return A; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    const int x = 0;\n"
               "    return x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(void){return 1/abs(10);}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    int x = 0;\n"
               "    return x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    const int a = 50;\n"
               "    const int b = 52;\n"
               "    return a+b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Return value 'a+b' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (style) Return value 'a+b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("int f() {\n"
               "    int a = 50;\n"
@@ -3442,7 +3529,7 @@ class TestCondition : public TestFixture {
               "    b++;\n"
               "    return a+b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool& g();\n"
               "bool f() {\n"
@@ -3450,7 +3537,7 @@ class TestCondition : public TestFixture {
               "    b = false;\n"
               "    return b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    bool b;\n"
@@ -3459,13 +3546,13 @@ class TestCondition : public TestFixture {
               "        return b;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(long maxtime) {\n"
               "  if (std::time(0) > maxtime)\n"
               "    return std::time(0) > maxtime;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(double param) {\n"
               "  while(bar()) {\n"
@@ -3475,7 +3562,7 @@ class TestCondition : public TestFixture {
               "  if (param<0.)\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i) {\n"
               "  if (i==42)\n"
@@ -3485,7 +3572,7 @@ class TestCondition : public TestFixture {
               "  if (cond && (42==i))\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // 8842 crash
         check("class a {\n"
@@ -3495,15 +3582,15 @@ class TestCondition : public TestFixture {
               "    if (b) return;\n"
               "  }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const char* x, const char* t) {\n"
               "    if (!(strcmp(x, y) == 0)) { return; }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const int a[]){ if (a == 0){} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "  bool operator<(const S&);\n"
@@ -3514,7 +3601,7 @@ class TestCondition : public TestFixture {
               "  if (c) return 0;\n"
               "  else return 42;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("long X::g(bool unknown, int& result) {\n"
               "    long ret = 0;\n"
@@ -3523,28 +3610,35 @@ class TestCondition : public TestFixture {
               "    f ? result = 42 : ret = -1;\n"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(void *handle) {\n"
               "    if (!handle) return 0;\n"
               "    if (handle) return 1;\n"
               "    else return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Condition 'handle' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'handle' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Identical condition 'handle!=0', second condition is always false\n", errout.str());
+        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"
+              "}");
+        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(void* x, void* y) {\n"
               "    if (x == nullptr && y == nullptr)\n"
@@ -3552,7 +3646,7 @@ class TestCondition : public TestFixture {
               "    if (x == nullptr || y == nullptr)\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void* g();\n"
               "void f(void* a, void* b) {\n"
@@ -3563,7 +3657,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    if (a) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void* g();\n"
               "void f(void* a, void* b) {\n"
@@ -3572,26 +3666,26 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    if (a) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'a' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const std::string x=\"xyz\";\n"
               "    if(!x.empty()){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition '!x.empty()' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *array, int size ) {\n"
               "    for(int i = 0; i < size; ++i) {\n"
@@ -3600,7 +3694,7 @@ class TestCondition : public TestFixture {
               "        if(array){}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'array' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (style) Condition 'array' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int *array, int size ) {\n"
               "    for(int i = 0; i < size; ++i) {\n"
@@ -3609,7 +3703,7 @@ class TestCondition : public TestFixture {
               "        else if(array){}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'array' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:17]: (style) Condition 'array' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9277
         check("int f() {\n"
@@ -3619,7 +3713,7 @@ class TestCondition : public TestFixture {
               "    else\n"
               "        return 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9954
         check("void f() {\n"
@@ -3628,7 +3722,7 @@ class TestCondition : public TestFixture {
               "    if constexpr (a == 16 && b == 16) {}\n"
               "    else if constexpr (a == 16 && b == 32) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9319
         check("struct S {\n"
@@ -3641,7 +3735,7 @@ class TestCondition : public TestFixture {
               "  g({0, 1}, x);\n"
               "  if (x) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9318
         check("class A {};\n"
@@ -3652,7 +3746,7 @@ class TestCondition : public TestFixture {
               "  auto b = dynamic_cast<B*>(x);\n"
               "  if (b) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    auto x = getX();\n"
@@ -3663,14 +3757,14 @@ class TestCondition : public TestFixture {
               "        return 2;\n"
               "    return 3;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // handleKnownValuesInLoop
         check("bool g();\n"
               "void f(bool x) {\n"
               "    if (x) while(x) x = g();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // isLikelyStream
         check("void f(std::istringstream& iss) {\n"
@@ -3680,7 +3774,7 @@ class TestCondition : public TestFixture {
               "       if (!iss) break;\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9332
         check("struct A { void* g(); };\n"
@@ -3692,14 +3786,14 @@ class TestCondition : public TestFixture {
               "    if (!c) return;\n"
               "    bool compare = c == b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9361
         check("void f(char c) {\n"
               "    if (c == '.') {}\n"
               "    else if (isdigit(c) != 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9351
         check("int f(int x) {\n"
@@ -3707,7 +3801,7 @@ class TestCondition : public TestFixture {
               "    if(b) return b?0:-1;\n"
               "    return 42;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (style) Condition 'b' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8] -> [test.cpp:3:18]: (style) Condition 'b' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9362
         check("uint8_t g();\n"
@@ -3717,7 +3811,7 @@ class TestCondition : public TestFixture {
               "        if( (v & 0x01) == 0x00) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9367
         check("void f(long x) {\n"
@@ -3726,25 +3820,25 @@ class TestCondition : public TestFixture {
               "    if (x % 360L == 0)\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int a, int b) {\n"
               "    static const int x = 10;\n"
               "    return x == 1 ? a : b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const bool x = false;\n"
               "void f() {\n"
               "    if (x) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const bool x = false;\n"
               "void f() {\n"
               "    if (!x) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9709
         check("void f(int a) {\n"
@@ -3755,7 +3849,7 @@ class TestCondition : public TestFixture {
               "        ok = a != 0;\n"
               "    if (ok) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9816
         check("bool g();\n"
@@ -3769,7 +3863,7 @@ class TestCondition : public TestFixture {
               "        } while(false);\n"
               "    } while(!b);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9865
         check("void f(const std::string &s) {\n"
@@ -3781,7 +3875,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9711
         check("int main(int argc, char* argv[]) {\n"
@@ -3793,7 +3887,7 @@ class TestCondition : public TestFixture {
               "  getopt_long(argc, argv, \"f\", options, NULL);\n"
               "  if (foo) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // TODO: if (!v) is a known condition as well
         check("struct a {\n"
@@ -3809,7 +3903,7 @@ class TestCondition : public TestFixture {
               "  if (v == nullptr && e) {}\n"
               "  return d;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:11]: (style) Condition 'e' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:23]: (style) Condition 'e' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10037
         check("struct a {\n"
@@ -3824,7 +3918,7 @@ class TestCondition : public TestFixture {
               "    if (r == 0)\n"
               "        if (p != (uint32_t) -1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9890
         check("int g(int);\n"
@@ -3841,7 +3935,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:11]: (style) Condition '!y' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:11:13]: (style) Condition '!y' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10134
         check("bool foo(bool b);\n"
@@ -3853,7 +3947,7 @@ class TestCondition : public TestFixture {
               "    return foo(OldFormat);\n"
               "  return false;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10208
         check("bool GetFirst(std::string &first);\n"
@@ -3863,7 +3957,7 @@ class TestCondition : public TestFixture {
               "  for (std::string name; name.empty() ? GetFirst(name) : GetNext(name);)\n"
               "    g(name);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool GetFirst(std::string &first);\n"
               "bool GetNext(std::string &next);\n"
@@ -3872,7 +3966,7 @@ class TestCondition : public TestFixture {
               "  for (std::string name{}; name.empty() ? GetFirst(name) : GetNext(name);)\n"
               "    g(name);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool GetFirst(std::string &first);\n"
               "bool GetNext(std::string &next);\n"
@@ -3881,7 +3975,7 @@ class TestCondition : public TestFixture {
               "  for (std::string name{'a', 'b'}; name.empty() ? GetFirst(name) : GetNext(name);)\n"
               "    g(name);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool GetFirst(const std::string &first);\n"
               "bool GetNext(const std::string &next);\n"
@@ -3890,19 +3984,19 @@ class TestCondition : public TestFixture {
               "  for (std::string name; name.empty() ? GetFirst(name) : GetNext(name);)\n"
               "    g(name);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'name.empty()' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:36]: (style) Condition 'name.empty()' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10278
         check("void foo(unsigned int x) {\n"
               "    if ((100 - x) > 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10298
         check("void foo(unsigned int x) {\n"
               "    if (x == -1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10121
         check("struct AB {\n"
@@ -3923,28 +4017,28 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    return err;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10323
         check("void foo(int x) {\n"
               "    if(x)\n"
               "        if(x == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    if(x) {}\n"
               "    else\n"
               "        if(x == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Condition 'x==1' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:4:14]: (style) Condition 'x==1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // do not report both unsignedLessThanZero and knownConditionTrueFalse
         check("void foo(unsigned int max) {\n"
               "    unsigned int num = max - 1;\n"
               "    if (num < 0) {}\n" // <- do not report knownConditionTrueFalse
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10297
         check("void foo(size_t len, int start) {\n"
@@ -3953,7 +4047,7 @@ class TestCondition : public TestFixture {
               "        if (start < 0) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10362
         check("int tok;\n"
@@ -3970,35 +4064,35 @@ class TestCondition : public TestFixture {
               "        } while (parenthesis && tok != -1);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7843
         check("void f(int i) {\n"
               "    if(abs(i) == -1) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'abs(i)==-1' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (style) Condition 'abs(i)==-1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #7844
         check("void f(int i) {\n"
               "    if(i > 0 && abs(i) == i) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'abs(i)==i' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:24]: (style) Condition 'abs(i)==i' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
               "    if(i < 0 && abs(i) == i) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Condition 'abs(i)==i' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:10] -> [test.cpp:2:24]: (style) Condition 'abs(i)==i' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int i) {\n"
               "    if(i > -3 && abs(i) == i) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9948
         check("bool f(bool a, bool b) {\n"
               "    return a || ! b || ! a;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Return value '!a' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:2:24]: (style) Return value '!a' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10148
         check("void f(int i) {\n"
@@ -4009,14 +4103,14 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10548
         check("void f() {\n"
               "    int i = 0;\n"
               "    do {} while (i++ == 0);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10582
         check("static void fun(message_t *message) {\n"
@@ -4025,7 +4119,7 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    uint8_t d0 = message->length > 0 ? data[0] : 0xff;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8266
         check("void f(bool b) {\n"
@@ -4034,7 +4128,7 @@ class TestCondition : public TestFixture {
               "    if (g(&b) || b)\n"
               "        return;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9720
         check("bool bar(int &);\n"
@@ -4043,7 +4137,7 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    if (bar(a) && (a + b == 3)) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10437
         check("void f() {\n"
@@ -4053,7 +4147,7 @@ class TestCondition : public TestFixture {
               "    b = true;\n"
               "  if (b) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10223
         check("static volatile sig_atomic_t is_running;\n"
@@ -4065,7 +4159,7 @@ class TestCondition : public TestFixture {
               "    is_running = 1;\n"
               "    while (is_running) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10659
         check("auto func(const std::tuple<int, int>& t) {\n"
@@ -4073,7 +4167,7 @@ class TestCondition : public TestFixture {
               "  std::cout << foo << bar << std::endl;\n"
               "  return foo < bar;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10484
         check("void f() {\n"
@@ -4081,34 +4175,34 @@ class TestCondition : public TestFixture {
               "    if (init)\n"
               "        init = false;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (style) The statement 'if (init) init=false' is logically equivalent to 'init=false'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14] -> [test.cpp:3:9]: (style) The statement 'if (init) init=false' is logically equivalent to 'init=false'. [duplicateConditionalAssign]\n", errout_str());
 
         check("void f() {\n"
               "    static bool init(true);\n"
               "    if (init)\n"
               "        init = false;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (style) The statement 'if (init) init=false' is logically equivalent to 'init=false'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14] -> [test.cpp:3:9]: (style) The statement 'if (init) init=false' is logically equivalent to 'init=false'. [duplicateConditionalAssign]\n", errout_str());
 
         check("void f() {\n"
               "    static bool init{ true };\n"
               "    if (init)\n"
               "        init = false;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (style) The statement 'if (init) init=false' is logically equivalent to 'init=false'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14] -> [test.cpp:3:9]: (style) The statement 'if (init) init=false' is logically equivalent to 'init=false'. [duplicateConditionalAssign]\n", errout_str());
 
         // #10248
         check("void f() {\n"
               "    static int var(1);\n"
               "    if (var == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static int var{ 1 };\n"
               "    if (var == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Fun();\n"
               "using Fn = void (*)();\n"
@@ -4117,7 +4211,7 @@ class TestCondition : public TestFixture {
               "    if (logger == nullptr)\n"
               "        logger = Fun;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Fun();\n"
               "using Fn = void (*)();\n"
@@ -4126,7 +4220,7 @@ class TestCondition : public TestFixture {
               "    if (logger == nullptr)\n"
               "        logger = Fun;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Fun();\n"
               "using Fn = void (*)();\n"
@@ -4135,7 +4229,7 @@ class TestCondition : public TestFixture {
               "    if (logger == nullptr)\n"
               "        logger = Fun;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Fun();\n"
               "typedef void (*Fn)();\n"
@@ -4144,7 +4238,7 @@ class TestCondition : public TestFixture {
               "    if (logger == nullptr)\n"
               "        logger = Fun;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Fun();\n"
               "typedef void (*Fn)();\n"
@@ -4153,7 +4247,7 @@ class TestCondition : public TestFixture {
               "    if (logger == nullptr)\n"
               "        logger = Fun;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Fun();\n"
               "typedef void (*Fn)();\n"
@@ -4162,7 +4256,7 @@ class TestCondition : public TestFixture {
               "    if (logger == nullptr)\n"
               "        logger = Fun;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9256
         check("bool f() {\n"
@@ -4170,7 +4264,7 @@ class TestCondition : public TestFixture {
               "    b = true;\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10702
         check("struct Object {\n"
@@ -4194,7 +4288,7 @@ class TestCondition : public TestFixture {
               "      return;\n"
               "  }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Object {\n"
               "  int _count=0;\n"
@@ -4216,7 +4310,7 @@ class TestCondition : public TestFixture {
               "      return;\n"
               "  }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const uint32_t u) {\n"
               "	const uint32_t v = u < 4;\n"
@@ -4225,7 +4319,9 @@ class TestCondition : public TestFixture {
               "		if (w) {}\n"
               "	}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'w' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:24]: (style) Condition 'v<2' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:5:7]: (style) Condition 'w' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
 
         check("void f(double d) {\n" // #10792
               "    if (d != 0) {\n"
@@ -4233,7 +4329,7 @@ class TestCondition : public TestFixture {
               "        if (i == 0) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(double d) {\n"
               "    if (0 != d) {\n"
@@ -4241,7 +4337,7 @@ class TestCondition : public TestFixture {
               "        if (i == 0) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { double d; }\n"
               "void f(A a) {\n"
@@ -4250,7 +4346,7 @@ class TestCondition : public TestFixture {
               "        if (i == 0) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if(strlen(\"abc\") == 3) {;}\n"
@@ -4258,18 +4354,18 @@ class TestCondition : public TestFixture {
               "    if(wcslen(L\"abc\") == 3) {;}\n"
               "    if(wcslen(L\"abc\") == 1) {;}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'strlen(\"abc\")==3' is always true\n"
-                      "[test.cpp:3]: (style) Condition 'strlen(\"abc\")==1' is always false\n"
-                      "[test.cpp:4]: (style) Condition 'wcslen(L\"abc\")==3' is always true\n"
-                      "[test.cpp:5]: (style) Condition 'wcslen(L\"abc\")==1' is always false\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:22]: (style) Condition 'strlen(\"abc\")==3' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:3:22]: (style) Condition 'strlen(\"abc\")==1' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:23]: (style) Condition 'wcslen(L\"abc\")==3' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:5:23]: (style) Condition 'wcslen(L\"abc\")==1' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
 
         check("int foo(bool a, bool b) {\n"
               "  if(!a && b && (!a == !b))\n"
               "   return 1;\n"
               "  return 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Condition '!a==!b' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:6] -> [test.cpp:2:21]: (style) Condition '!a==!b' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #10454
         check("struct S {\n"
@@ -4277,11 +4373,11 @@ class TestCondition : public TestFixture {
               "    bool g() const { return u == 18446744073709551615ULL; }\n"
               "    unsigned long long u{};\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8358
         check("void f(double d) { if ((d * 0) != 0) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6870
         check("struct S {\n"
@@ -4292,7 +4388,7 @@ class TestCondition : public TestFixture {
               "void S::f() {\n"
               "    if ((p == NULL) || ((p) && (g() >= *p))) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Condition 'p' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:26]: (style) Condition 'p' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10749
         check("struct Interface {\n"
@@ -4310,7 +4406,7 @@ class TestCondition : public TestFixture {
               "struct GrandChild : Child {\n"
               "   int method() override  { return 1; }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6855
         check("struct S { int i; };\n"
@@ -4320,23 +4416,23 @@ class TestCondition : public TestFixture {
               "    else if (s.i < 0)\n"
               "        s.s = 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (style) Condition 's.i<0' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:15] -> [test.cpp:5:18]: (style) Condition 's.i<0' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #6857
         check("int bar(int i) { return i; }\n"
               "void foo() {\n"
               "    if (bar(1) == 0 && bar(1) > 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'bar(1)==0' is always false\n"
-                      "[test.cpp:3]: (style) Condition 'bar(1)>0' is always true\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:16]: (style) Condition 'bar(1)==0' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:3:31]: (style) Condition 'bar(1)>0' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
 
         check("struct S { int bar(int i) const; };\n"
               "void foo(const S& s) {\n"
               "    if (s.bar(1) == 0 && s.bar(1) > 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Logical conjunction always evaluates to false: s.bar(1) == 0 && s.bar(1) > 0.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:23]: (warning) Logical conjunction always evaluates to false: s.bar(1) == 0 && s.bar(1) > 0. [incorrectLogicOperator]\n",
+                      errout_str());
 
         check("struct B {\n" // #10618
               "    void Modify();\n"
@@ -4359,7 +4455,7 @@ class TestCondition : public TestFixture {
               "    B::Static();\n"
               "    if (i == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:20]: (style) Condition 'i==1' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:20:11]: (style) Condition 'i==1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("typedef struct { bool x; } s_t;\n" // #8446
               "unsigned f(bool a, bool b) {\n"
@@ -4368,7 +4464,7 @@ class TestCondition : public TestFixture {
               "    if (!s.x) {}\n"
               "    return col;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #11233
               "    static std::string m;\n"
@@ -4379,7 +4475,7 @@ class TestCondition : public TestFixture {
               "        if (m.empty()) {}\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11203
         check("void f() {\n"
@@ -4388,31 +4484,32 @@ class TestCondition : public TestFixture {
               "    float f = 9.9f;\n"
               "    if(f < 10) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'i>9.9' is always true\n"
-                      "[test.cpp:5]: (style) Condition 'f<10' is always true\n",
-                      errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:10]: (style) Condition 'i>9.9' is always true [knownConditionTrueFalse]\n"
+            "[test.cpp:5:10]: (style) Condition 'f<10' is always true [knownConditionTrueFalse]\n",
+            errout_str());
         check("constexpr int f() {\n" // #11238
               "    return 1;\n"
               "}\n"
               "constexpr bool g() {\n"
               "    return f() == 1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int g() { return -1; }\n"
               "void f() {\n"
               "    if (g() == 1 && g() == -1) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'g()==1' is always false\n"
-                      "[test.cpp:3]: (style) Condition 'g()==-1' is always true\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Condition 'g()==1' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:3:25]: (style) Condition 'g()==-1' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
 
         // #9817
         check("void f(float x) {\n"
               "    if (x <= 0) {}\n"
               "    else if (x < 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10426
         check("int f() {\n"
@@ -4423,12 +4520,12 @@ class TestCondition : public TestFixture {
               "    if ((bool)0) {}\n"
               "    return s.empty();"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition '!s.empty()' is always false\n"
-                      "[test.cpp:4]: (style) Condition 's.empty()' is always true\n"
-                      "[test.cpp:5]: (style) Condition 's.empty()' is always true\n"
-                      "[test.cpp:6]: (style) Condition '(bool)0' is always false\n"
-                      "[test.cpp:7]: (style) Return value 's.empty()' is always true\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) Condition '!s.empty()' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:19]: (style) Condition 's.empty()' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:5:16]: (style) Condition 's.empty()' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:6:9]: (style) Condition '(bool)0' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:7:19]: (style) Return value 's.empty()' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
 
         check("int f(bool b) {\n"
               "    if (b) return static_cast<int>(1);\n"
@@ -4438,24 +4535,24 @@ class TestCondition : public TestFixture {
               "    if (b) return static_cast<int>(1);\n"
               "    return (int)0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Return value 'static_cast<int>(1)' is always true\n"
-                      "[test.cpp:7]: (style) Return value '(int)0' is always false\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:35]: (style) Return value 'static_cast<int>(1)' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:7:12]: (style) Return value '(int)0' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
 
         check("int f() { return 3; }\n"
               "int g() { return f(); }\n"
               "int h() { if (f()) {} }\n"
               "int i() { return f() == 3; }\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'f()' is always true\n"
-                      "[test.cpp:4]: (style) Return value 'f()==3' is always true\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:16]: (style) Condition 'f()' is always true [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:22]: (style) Return value 'f()==3' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
 
         check("int f() {\n"
               "    const char *n;\n"
               "    return((n=42) &&\n"
               "           *n == 'A');\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::istringstream& i) {\n" // #9327
               "    std::string s;\n"
@@ -4464,7 +4561,7 @@ class TestCondition : public TestFixture {
               "    if (!(i >> s))\n"
               "        return;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11227
         check("struct S {\n"
@@ -4475,7 +4572,7 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    g(s ? s->get() : 0);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:7]: (style) Condition 's' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:7:7]: (style) Condition 's' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(const char* o) {\n" // #11558
               "    if (!o || !o[0])\n"
@@ -4485,7 +4582,11 @@ class TestCondition : public TestFixture {
               "        if (o[1] == '\\0') {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Condition 'o[1]=='\\0'' is always false\n", errout.str());
+        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:25] -> [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"
@@ -4495,21 +4596,197 @@ class TestCondition : public TestFixture {
               "    j = (::std::min)(j, 1);\n"
               "    if (j == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void h(int);\n" // #11679
               "bool g(int a) { h(a); return false; }\n"
               "bool f(int i) {\n"
               "    return g(i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string a) {\n" // #11051
               "    a = \"x\";\n"
               "    if (a == \"x\") {}\n"
               "    return a;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'a==\"x\"' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'a==\"x\"' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void g(bool);\n"
+              "void f() {\n"
+              "    int i = 5;\n"
+              "    int* p = &i;\n"
+              "    g(i == 7);\n"
+              "    g(p == nullptr);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (style) Condition 'i==7' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:6:9]: (style) Condition 'p==nullptr' is always false [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("enum E { E0, E1 };\n"
+              "void f() {\n"
+              "	static_assert(static_cast<int>(E::E1) == 1);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct a {\n"
+              "  bool g();\n"
+              "  int h();\n"
+              "};\n"
+              "void f(a c, int d, int e) {\n"
+              "  if (c.g() && c.h()) {}\n"
+              "  else {\n"
+              "    bool u = false;\n"
+              "    if (d && e)\n"
+              "      u = true;\n"
+              "    if (u) {}\n"
+              "  }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int i) {\n" // #11741
+              "    i = -i - 1;\n"
+              "    if (i < 0 || i >= 20)\n"
+              "        return 0;\n"
+              "    return 1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("namespace S { int s{}; };\n" // #11046
+              "void f(bool b) {\n"
+              "    if (S::s) {\n"
+              "        if (b) {\n"
+              "            if (S::s) {}\n"
+              "        }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:18]: (style) Condition 'S::s' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f() {\n" // #10811
+              "    int i = 0;\n"
+              "    if ((i = g(), 1) != 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:22]: (style) Condition '(i=g(),1)!=0' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f(unsigned i) {\n"
+              "    const int a[2] = {};\n"
+              "    const int* q = a + i;\n"
+              "    if (q) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Condition 'q' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f() {\n" // #12786
+              "    const int b[2] = {};\n"
+              "    if (b) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Condition 'b' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f(int i) {\n"
+              "    int j = 0;\n"
+              "    switch (i) {\n"
+              "    case 1:\n"
+              "        j = 0;\n"
+              "        break;\n"
+              "    default:\n"
+              "        j = 1;\n"
+              "    }\n"
+              "    if (j != 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const char *s1 = foo();\n"
+              "    const char *s2 = bar();\n"
+              "    if (s2 == NULL)\n"
+              "        return;\n"
+              "    size_t len = s2 - s1;\n"
+              "    if (len == 0)\n"
+              "        return;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int h();\n" // #12858
+              "bool g() {\n"
+              "    bool b{};\n"
+              "    try {\n"
+              "        int x = h();\n"
+              "        switch (x) {\n"
+              "        default:\n"
+              "            b = true;\n"
+              "        }\n"
+              "    }\n"
+              "    catch (...) {\n"
+              "        b = false;\n"
+              "    }\n"
+              "    return b;\n"
+              "}\n"
+              "void f() {\n"
+              "    if (g()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int x, int y) {\n" // #11822
+              "    if (x) {\n"
+              "        switch (y) {\n"
+              "        case 1:\n"
+              "            return 7;\n"
+              "        }\n"
+              "    }\n"
+              " \n"
+              "    if (y)\n"
+              "        return 8;\n"
+              " \n"
+              "    if (x)\n"
+              "        return 9;\n"
+              " \n"
+              "    return 0;\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int g();\n" // #10561
+              "bool h();\n"
+              "int f() {\n"
+              "    bool b = false;\n"
+              "    try {\n"
+              "        switch (g()) {\n"
+              "        default:\n"
+              "            b = h();\n"
+              "        }\n"
+              "    }\n"
+              "    catch (...) {}\n"
+              "    return b ? 1 : 0;\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    const S* get2() const {\n"
+              "        if (mS)\n"
+              "            return mS;\n"
+              "        return this;\n"
+              "    }\n"
+              "    S* mS = nullptr;\n"
+              "};\n"
+              "void f2() {\n"
+              "    const S s;\n"
+              "    const S* sp2 = s.get2();\n"
+              "    if (sp2) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:12:9]: (style) Condition 'sp2' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("struct S {\n"
+              "    void f(int i);\n"
+              "    bool g() const { return !m.empty(); }\n"
+              "    std::set<int> m;\n"
+              "};\n"
+              "void S::f(int i) {\n"
+              "    bool b = g();\n"
+              "    auto it = m.find(i);\n"
+              "    if (it != m.end()) {\n"
+              "        m.erase(it);\n"
+              "        if (g() != b) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueSymbolic()
@@ -4519,7 +4796,7 @@ class TestCondition : public TestFixture {
               "    y[0]=x;\n"
               "    if(x > 0 || y[0] < 42){}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:4]: (style) Condition 'y[0]<42' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10] -> [test.cpp:4:22]: (style) Condition 'y[0]<42' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(int x, int y) {\n"
               "    if(x < y && x < 42) {\n"
@@ -4527,13 +4804,13 @@ class TestCondition : public TestFixture {
               "        if(x == y) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Condition 'x==y' is always false\n", errout.str());
+        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){} }");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Condition '!b' is always false\n", errout.str());
+        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)){} }");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Condition '!a' is always false\n", errout.str());
+        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"
               "  if (x < y) {\n"
@@ -4541,7 +4818,7 @@ class TestCondition : public TestFixture {
               "    if (z < 1) {}\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Condition 'z<1' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:11]: (style) Condition 'z<1' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("bool f(int &index, const int s, const double * const array, double & x) {\n"
               "    if (index >= s)\n"
@@ -4551,7 +4828,7 @@ class TestCondition : public TestFixture {
               "        return (index++) >= s;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:6]: (style) Return value '(index++)>=s' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:6:26]: (style) Return value '(index++)>=s' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("struct a {\n"
               "  a *b() const;\n"
@@ -4561,7 +4838,7 @@ class TestCondition : public TestFixture {
               "  e = c.b();\n"
               "  if (e) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int g(int i) {\n"
               "  if (i < 256)\n"
@@ -4572,7 +4849,7 @@ class TestCondition : public TestFixture {
               "    return 0;\n"
               "  return N;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, int j) {\n"
               "    if (i < j) {\n"
@@ -4583,7 +4860,7 @@ class TestCondition : public TestFixture {
               "        if (i >= j) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int get_delta() {\n"
               "    clock_t now_ms = (clock() / (CLOCKS_PER_SEC / 1000));\n"
@@ -4594,7 +4871,7 @@ class TestCondition : public TestFixture {
               "        delta = 50;\n"
               "    return delta;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10555
         check("struct C {\n"
@@ -4613,7 +4890,7 @@ class TestCondition : public TestFixture {
               "    Modify();\n"
               "    if (m_PC->GetI() != I) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10624
         check("struct Data {\n"
@@ -4626,7 +4903,7 @@ class TestCondition : public TestFixture {
               "  Derived* pD = dynamic_cast<Derived*>(PObj);\n"
               "  if (pD) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9549
         check("void f(const uint32_t v) {\n"
@@ -4636,7 +4913,7 @@ class TestCondition : public TestFixture {
               "        if (v8) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10649
         check("void foo(struct diag_msg *msg) {\n"
@@ -4647,14 +4924,14 @@ class TestCondition : public TestFixture {
               "    if (msg == NULL)\n"
               "        return CMD_OK;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(bool a, bool b) {\n"
               "  if((!a == !b) && !a && b)\n"
               "   return 1;\n"
               "  return 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Condition 'b' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:2:26]: (style) Condition 'b' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #11124
         check("struct Basket {\n"
@@ -4674,13 +4951,13 @@ class TestCondition : public TestFixture {
               "        fruit = preferApples ? apple : banana;\n"
               "    return fruit;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string & s, int i) {\n"
               "    const char c = s[i];\n"
               "    if (!std::isalnum(c)) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #11404
               "    int f() const;\n"
@@ -4692,14 +4969,57 @@ class TestCondition : public TestFixture {
               "    auto j = (*it)->f();\n"
               "    if (i == j) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11384
         check("bool f(const int* it, const int* end) {\n"
               "	return (it != end) && *it++ &&\n"
               "           (it != end) && *it;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #12116
+        check("void f(int n) {\n"
+              "    for (int i = 0; i < N; ++i) {\n"
+              "        if (i < n) {}\n"
+              "        else if (i > n) {}\n"
+              "        else {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #12681
+        check("void f(unsigned u) {\n"
+              "      if (u > 0) {\n"
+              "             u--;\n"
+              "             if (u == 0) {}\n"
+              "      }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(unsigned u) {\n"
+              "      if (u < 0xFFFFFFFF) {\n"
+              "             u++;\n"
+              "             if (u == 0xFFFFFFFF) {}\n"
+              "      }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(bool a, bool b) {\n" // #12937
+              "    bool c = !a && b;\n"
+              "    if (a) {}\n"
+              "    else {\n"
+              "        if (c) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(unsigned x) {\n" // #13522
+              "    unsigned u = x;\n"
+              "    int i = u - 0;\n"
+              "    if (i < 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueInfer() {
@@ -4709,7 +5029,7 @@ class TestCondition : public TestFixture {
               "        if (x == 1) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Condition 'x==1' is always false\n", errout.str());
+        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"
               "    if (x > 5) {\n"
@@ -4717,7 +5037,7 @@ class TestCondition : public TestFixture {
               "        if (x != 1) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (style) Condition 'x!=1' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:15]: (style) Condition 'x!=1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #6890
         check("void f(int i) {\n"
@@ -4729,7 +5049,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'x==-1' is always false\n", errout.str());
+        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"
               "    int x = i;\n"
@@ -4740,7 +5060,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'x!=-1' is always true\n", errout.str());
+        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"
               "    int x = i;\n"
@@ -4751,7 +5071,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'x>=-1' is always true\n", errout.str());
+        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"
               "    int x = i;\n"
@@ -4762,7 +5082,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'x>-1' is always true\n", errout.str());
+        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"
               "    int x = i;\n"
@@ -4773,7 +5093,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'x<-1' is always false\n", errout.str());
+        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"
               "    int x = i;\n"
@@ -4784,7 +5104,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'x<=-1' is always false\n", errout.str());
+        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"
               "    int x = i;\n"
@@ -4795,7 +5115,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) Condition 'x>7' is always true\n", errout.str());
+        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"
               "    int x = i;\n"
@@ -4806,7 +5126,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
               "    int x = i;\n"
@@ -4817,7 +5137,7 @@ class TestCondition : public TestFixture {
               "        else {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11100
         check("struct T {\n"
@@ -4831,7 +5151,7 @@ class TestCondition : public TestFixture {
               "	set(b);\n"
               "	if (tmp != get()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9541
         check("int f(int pos, int a) {\n"
@@ -4842,7 +5162,7 @@ class TestCondition : public TestFixture {
               "            --pos;\n"
               "    return pos;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (style) Condition 'pos>0' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:13] -> [test.cpp:5:16]: (style) Condition 'pos>0' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9721
         check("void f(int x) {\n"
@@ -4851,21 +5171,21 @@ class TestCondition : public TestFixture {
               "            return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Condition '-128>x' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:30]: (style) Condition '-128>x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8778
         check("void f() {\n"
               "    for(int i = 0; i < 19; ++i)\n"
               "        if(i<=18) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'i<=18' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Condition 'i<=18' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #8209
         check("void f() {\n"
               "    for(int x = 0; x < 3; ++x)\n"
               "        if(x == -5) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'x==-5' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (style) Condition 'x==-5' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #8407
         check("int f(void) {\n"
@@ -4874,14 +5194,14 @@ class TestCondition : public TestFixture {
               "        else return 0;\n"
               "    return -1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'i==0' is always true\n", errout.str());
+        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"
               "    if (u1 <= 10 && u2 >= 20) {\n"
               "        if (u1 != u2) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Condition 'u1!=u2' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12] -> [test.cpp:3:16]: (style) Condition 'u1!=u2' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10544
         check("void f(int N) {\n"
@@ -4890,16 +5210,16 @@ class TestCondition : public TestFixture {
               "            N = test();\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11098
         check("void f(unsigned int x) { if (x == -1u) {} }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(const int *p, const int *q) {\n"
               "    return p != NULL && q != NULL && p == NULL;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Return value 'p==NULL' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:40]: (style) Return value 'p==NULL' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("struct S {\n" // #11789
               "    std::vector<int> v;\n"
@@ -4909,7 +5229,28 @@ class TestCondition : public TestFixture {
               "    int j = i - v.size();\n"
               "    if (j >= 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int i) {\n" // #12039
+              "    if ((128 + i < 255 ? 128 + i : 255) > 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12727
+              "    bool f() const {\n"
+              "        return g() > 0;\n"
+              "    }\n"
+              "    std::size_t g() const {\n"
+              "        return 5 - h();\n"
+              "    }\n"
+              "    std::size_t h() const {\n"
+              "        if (x > 7)\n"
+              "            return 5;\n"
+              "        return (5 + x) % 5;\n"
+              "    }\n"
+              "    std::size_t x;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueContainer() {
@@ -4925,7 +5266,7 @@ class TestCondition : public TestFixture {
               "    if ( !g.empty() )\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int flag) {\n"
               "    std::vector<double> g;\n"
@@ -4936,7 +5277,7 @@ class TestCondition : public TestFixture {
               "    if ( !g.empty() )\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::vector<int> v;\n"
@@ -4947,7 +5288,7 @@ class TestCondition : public TestFixture {
               "        return !v.empty();\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10409
         check("void foo(const std::string& s) {\n"
@@ -4955,14 +5296,14 @@ class TestCondition : public TestFixture {
               "    if( s == \"ab\" ) return;\n"
               "    if( s.size() < 3 ) return;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const std::string& s) {\n"
               "    if( s.size() < 2 ) return;\n"
               "    if( s != \"ab\" )\n"
               "        if( s.size() < 3 ) return;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10226
         check("int f(std::vector<int>::iterator it, const std::vector<int>& vector) {\n"
@@ -4972,7 +5313,7 @@ class TestCondition : public TestFixture {
               "        return -1;\n"
               "    return *it;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'it!=vector.end()' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (style) Condition 'it!=vector.end()' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #11303
         check("void f(int n) {\n"
@@ -4981,23 +5322,36 @@ class TestCondition : public TestFixture {
               "       buffer.back() == '\\n' ||\n"
               "       buffer.back() == '\\0') {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'buffer.back()=='\\0'' is always false\n", errout.str());
+        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:22] -> [test.cpp:5:22]: (style) Condition 'buffer.back()=='\\0'' is always false [knownConditionTrueFalse]\n", errout_str());
+        }
 
         // #9353
-        check("typedef struct { std::string s; } X;\n"
+        check("struct X { std::string s; };\n"
               "void f(const std::vector<X>&v) {\n"
               "    for (std::vector<X>::const_iterator it = v.begin(); it != v.end(); ++it)\n"
               "        if (!it->s.empty()) {\n"
               "            if (!it->s.empty()) {}\n"
               "        }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5]: (style) Condition '!it->s.empty()' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:5:17]: (style) Condition '!it->s.empty()' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        check("struct X { std::string s; };\n"
+              "void f(const std::vector<struct X>&v) {\n"
+              "    for (std::vector<struct X>::const_iterator it = v.begin(); it != v.end(); ++it)\n"
+              "        if (!it->s.empty()) {\n"
+              "            if (!it->s.empty()) {}\n"
+              "        }\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:5:17]: (style) Condition '!it->s.empty()' is always true [knownConditionTrueFalse]\n", "", errout_str());
 
         // #10508
         check("bool f(const std::string& a, const std::string& b) {\n"
               "    return a.empty() || (b.empty() && a.empty());\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Return value 'a.empty()' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19] -> [test.cpp:2:46]: (style) Return value 'a.empty()' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("struct A {\n"
               "    struct iterator;\n"
@@ -5013,7 +5367,70 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    if(!s.empty()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(std::string s) {\n"
+              "    if (s.empty())\n"
+              "        return -1;\n"
+              "    s += '\\n';\n"
+              "    if (s.empty())\n"
+              "        return -1;\n"
+              "    return -1;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:16]: (style) Condition 's.empty()' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f(std::string& p) {\n"
+              "    const std::string d{ \"abc\" };\n"
+              "    p += d;\n"
+              "    if(p.empty()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:15]: (style) Condition 'p.empty()' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("bool f(int i, FILE* fp) {\n"
+              "  std::string s = \"abc\";\n"
+              "  s += std::to_string(i);\n"
+              "  s += \"\\n\";\n"
+              "  return fwrite(s.c_str(), 1, s.length(), fp) == s.length();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const std::string& s) {\n" // #9148
+              "    if (s.empty() || s.size() < 1) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:2:31]: (style) Condition 's.size()<1' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void bar(std::vector<int>& vv) {\n" // #11464
+              "    class F {\n"
+              "    public:\n"
+              "        F(int, std::vector<int>& lv) : mV(lv) {\n"
+              "            mV.push_back(0);\n"
+              "        }\n"
+              "    private:\n"
+              "        std::vector<int>& mV;\n"
+              "    } fi(1, vv);\n"
+              "}\n"
+              "void g() {\n"
+              "    std::vector<int> v;\n"
+              "    bar(v);\n"
+              "    if (v.empty()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct F {\n"
+              "    F(int, std::vector<int>&lv) : mV(lv) {\n"
+              "        mV.push_back(0);\n"
+              "    }\n"
+              "    std::vector<int>& mV;\n"
+              "};\n"
+              "void g(std::vector<int>& vv) {\n"
+              "    F(1, vv);\n"
+              "}\n"
+              "void f() {\n"
+              "    std::vector<int> v;\n"
+              "    g(v);\n"
+              "    if (v.empty()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueLoop()
@@ -5034,7 +5451,7 @@ class TestCondition : public TestFixture {
               "  while (bUpdated);\n"
               "  return Ret;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo() {\n"
               "  bool bFirst = true;\n"
@@ -5047,7 +5464,7 @@ class TestCondition : public TestFixture {
               "  } while (true);\n"
               "  return bFirst;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   void * pool = NULL;\n"
@@ -5060,7 +5477,7 @@ class TestCondition : public TestFixture {
               "   while (0);\n"
               "   if (pool) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8499
         check("void f(void)\n"
@@ -5075,7 +5492,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:7]: (style) Condition 'i==1' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:20] -> [test.cpp:7:27]: (style) Condition 'i==1' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #10863
         check("void f(const int A[], int Len) {\n"
@@ -5091,14 +5508,35 @@ class TestCondition : public TestFixture {
               "    I = K;   \n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11434
               "    const int N = 5;\n"
               "    bool a[N];\n"
               "    for (int i = 0; i < N; a[i++] = false);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        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());
+
+        check("void f() {\n"
+              "    for (int i = 1000; i < 20; ++i) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:26]: (style) Condition 'i<20' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("int foo(int foo, int bar, bool baz, bool flag) {\n"
+              "    if (baz && flag) {\n"
+              "        do {\n"
+              "            if (bar==42)\n"
+              "                return 0;\n"
+              "        } while (flag);\n"
+              "    }\n"
+              "    return foo;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:6:18]: (style) Condition 'flag' is always true [knownConditionTrueFalse]\n", errout_str());
     }
 
     void alwaysTrueTryCatch()
@@ -5119,7 +5557,7 @@ class TestCondition : public TestFixture {
               "        g();\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g();\n"
               "void h();\n"
@@ -5136,7 +5574,20 @@ class TestCondition : public TestFixture {
               "        g();\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #10701
+              "    std::string s;\n"
+              "    try {\n"
+              "        try {\n"
+              "            s = g();\n"
+              "        }\n"
+              "        catch (const Err& err) {}\n"
+              "    }\n"
+              "    catch (const std::exception& e) {}\n"
+              "    if (s != \"abc\") {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void multiConditionAlwaysTrue() {
@@ -5145,7 +5596,7 @@ class TestCondition : public TestFixture {
               "  if (val < 0) continue;\n"
               "  if (val > 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int val = 0;\n"
@@ -5153,7 +5604,7 @@ class TestCondition : public TestFixture {
               "    if (val > 0) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int val = 0;\n"
@@ -5161,7 +5612,7 @@ class TestCondition : public TestFixture {
               "    if (val < 0) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int activate = 0;\n"
@@ -5169,15 +5620,15 @@ class TestCondition : public TestFixture {
               "  if (activate) {}\n"
               "  else if (foo) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'activate' is always false\n"
-                      "[test.cpp:5]: (style) Condition 'foo' is always false\n", errout.str());
+        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());
 
         // #6904
         check("void f() {\n"
               "  const int b[2] = { 1,0 };\n"
               "  if(b[1] == 2) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'b[1]==2' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'b[1]==2' is always false [knownConditionTrueFalse]\n", errout_str());
 
         // #9878
         check("void f(bool a, bool b) {\n"
@@ -5186,7 +5637,7 @@ class TestCondition : public TestFixture {
               "    else if (!a && !b){;}\n"
               "    else {;}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateCondition() {
@@ -5194,40 +5645,40 @@ class TestCondition : public TestFixture {
               "    if(x) {}\n"
               "    if(x) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The if condition is the same as the previous if condition\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The if condition is the same as the previous if condition\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) {}\n"
               "    if(x != 1) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool x) {\n"
               "    if(x) {}\n"
               "    g();\n"
               "    if(x) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    if(x == 1) { x++; }\n"
               "    if(x == 1) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8996
         check("void g(int** v);\n"
@@ -5239,7 +5690,7 @@ class TestCondition : public TestFixture {
               "  if (a) {}\n"
               "  if (b) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9311
         check("struct c {\n"
@@ -5254,7 +5705,7 @@ class TestCondition : public TestFixture {
               "  if (a) {}\n"
               "  if (b) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8993
         check("void f(const std::string& x) {\n"
@@ -5262,7 +5713,7 @@ class TestCondition : public TestFixture {
               "  if (x.empty()) y = \"1\";\n"
               "  if (y.empty()) return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9106
         check("struct A {int b;};\n"
@@ -5270,7 +5721,7 @@ class TestCondition : public TestFixture {
               "    if (a.b) a.b = c;\n"
               "    if (a.b) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int a;\n"
@@ -5287,7 +5738,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int a;\n"
@@ -5303,7 +5754,7 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int a;\n"
@@ -5318,8 +5769,8 @@ class TestCondition : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9]: (style) The if condition is the same as the previous if condition\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:7:13] -> [test.cpp:9:14]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n",
+                      errout_str());
 
         check("void f(bool a, bool b) {\n"
               "    auto g = [&] { b = !a; };\n"
@@ -5327,7 +5778,7 @@ class TestCondition : public TestFixture {
               "        g();\n"
               "    if (b) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(bool& a);\n"
               "void f(bool b) {\n"
@@ -5336,7 +5787,7 @@ class TestCondition : public TestFixture {
               "        h();\n"
               "    if (b) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *i) {\n"
               "  if (*i == 0) {\n"
@@ -5345,7 +5796,7 @@ class TestCondition : public TestFixture {
               "  if (*i == 0) {\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(std::function<void()>);\n"
               "void f(std::vector<int> v) {\n"
@@ -5357,7 +5808,7 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "    return;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int i; };\n"
               "int f(const S& s) {\n"
@@ -5368,7 +5819,22 @@ class TestCondition : public TestFixture {
               "        b = 1;\n"
               "    return a + b;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (style) The if condition is the same as the previous if condition\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13] -> [test.cpp:6:13]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n", errout_str());
+
+        check("void f(double d) {\n" // #12712
+              "    if (std::isfinite(d)) {}\n"
+              "    if (std::isfinite(d)) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:22] -> [test.cpp:3:22]: (style) The if condition is the same as the previous if condition [duplicateCondition]\n", errout_str());
+
+        check("struct S { int x; };\n" // #12391
+              "int f(const struct S* a, const struct S* b) {\n"
+              "    const struct S* p = b;\n"
+              "    if (a->x < p->x) p++;\n"
+              "    if (a->x < p->x) p++;\n"
+              "    return p->x;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         // do not crash
         check("void assign(const MMA& other) {\n"
@@ -5377,91 +5843,112 @@ class TestCondition : public TestFixture {
               "    if (other.mPA.cols > 0 && other.mPA.rows > 0)\n"
               "        ;\n"
               "}");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo() {\n" // #11202
+              "    float f = 0x1.4p+3;\n"
+              "    if (f > 10.0) {}\n"
+              "    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());
     }
 
     void checkInvalidTestForOverflow() {
         check("void f(char *p, unsigned int x) {\n"
               "    assert((p + x) < p);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (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.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (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.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (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.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (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.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         // x + c < x
 
-#define MSG(EXPR, RESULT)   "[test.cpp:1]: (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 ".\n"
+#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; }");
-        ASSERT_EQUALS(MSG("x+10>x", "true"), errout.str());
+        ASSERT_EQUALS(MSG("x+10>x", "true"), errout_str());
 
         check("int f(int x) { return x + 10 >= x; }");
-        ASSERT_EQUALS(MSG("x+10>=x", "true"), errout.str());
+        ASSERT_EQUALS(MSG("x+10>=x", "true"), errout_str());
 
         check("int f(int x) { return x + 10 < x; }");
-        ASSERT_EQUALS(MSG("x+10<x", "false"), errout.str());
+        ASSERT_EQUALS(MSG("x+10<x", "false"), errout_str());
 
         check("int f(int x) { return x + 10 <= x; }");
-        ASSERT_EQUALS(MSG("x+10<=x", "false"), errout.str());
+        ASSERT_EQUALS(MSG("x+10<=x", "false"), errout_str());
 
         check("int f(int x) { return x - 10 > x; }");
-        ASSERT_EQUALS(MSG("x-10>x", "false"), errout.str());
+        ASSERT_EQUALS(MSG("x-10>x", "false"), errout_str());
 
         check("int f(int x) { return x - 10 >= x; }");
-        ASSERT_EQUALS(MSG("x-10>=x", "false"), errout.str());
+        ASSERT_EQUALS(MSG("x-10>=x", "false"), errout_str());
 
         check("int f(int x) { return x - 10 < x; }");
-        ASSERT_EQUALS(MSG("x-10<x", "true"), errout.str());
+        ASSERT_EQUALS(MSG("x-10<x", "true"), errout_str());
 
         check("int f(int x) { return x - 10 <= x; }");
-        ASSERT_EQUALS(MSG("x-10<=x", "true"), errout.str());
+        ASSERT_EQUALS(MSG("x-10<=x", "true"), errout_str());
 
         // x + y < x
 #undef MSG
-#define MSG(EXPR, RESULT)   "[test.cpp:1]: (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 "'.\n"
+#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; }");
-        ASSERT_EQUALS(MSG("x+y<x", "y<0"), errout.str());
+        ASSERT_EQUALS(MSG("x+y<x", "y<0"), errout_str());
 
         check("int f(int x, int y) { return x + y <= x; }");
-        ASSERT_EQUALS(MSG("x+y<=x", "y<=0"), errout.str());
+        ASSERT_EQUALS(MSG("x+y<=x", "y<=0"), errout_str());
 
         check("int f(int x, int y) { return x + y > x; }");
-        ASSERT_EQUALS(MSG("x+y>x", "y>0"), errout.str());
+        ASSERT_EQUALS(MSG("x+y>x", "y>0"), errout_str());
 
         check("int f(int x, int y) { return x + y >= x; }");
-        ASSERT_EQUALS(MSG("x+y>=x", "y>=0"), errout.str());
+        ASSERT_EQUALS(MSG("x+y>=x", "y>=0"), errout_str());
 
         // x - y < x
         check("int f(int x, int y) { return x - y < x; }");
-        ASSERT_EQUALS(MSG("x-y<x", "y>0"), errout.str());
+        ASSERT_EQUALS(MSG("x-y<x", "y>0"), errout_str());
 
         check("int f(int x, int y) { return x - y <= x; }");
-        ASSERT_EQUALS(MSG("x-y<=x", "y>=0"), errout.str());
+        ASSERT_EQUALS(MSG("x-y<=x", "y>=0"), errout_str());
 
         check("int f(int x, int y) { return x - y > x; }");
-        ASSERT_EQUALS(MSG("x-y>x", "y<0"), errout.str());
+        ASSERT_EQUALS(MSG("x-y>x", "y<0"), errout_str());
 
         check("int f(int x, int y) { return x - y >= x; }");
-        ASSERT_EQUALS(MSG("x-y>=x", "y<=0"), errout.str());
+        ASSERT_EQUALS(MSG("x-y>=x", "y<=0"), errout_str());
     }
 
     void checkConditionIsAlwaysTrueOrFalseInsideIfWhile() {
@@ -5470,68 +5957,75 @@ class TestCondition : public TestFixture {
               "    const unsigned g_flags = B|C;\n"
               "    if(g_flags & A) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'g_flags&A' is always false\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'a' is always true\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 5;"
               "    while(a + 1) { return; }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'a+1' is always true\n", errout.str());
+        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()) {}}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'x' is always true\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Condition 'x' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:38]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(bool b) { if(true||b) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
               "void foo() { bool x = false; if(x||f()) {}}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'x' is always false\n", errout.str());
+        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()) {}}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'x' is always false\n", errout.str());
+        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) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Condition 'x' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:39]: (style) Condition 'x' is always false [knownConditionTrueFalse]\n", errout_str());
 
         check("void foo(bool b) { if(false&&b) {}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f();\n"
               "void foo() { bool x = true; if(x&&f()) {}}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'x' is always true\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:32]: (style) Condition 'x' is always true [knownConditionTrueFalse]\n", errout_str());
 
         // #9578
         check("bool f(const std::string &s) {\n"
               "        return s.size()>2U && s[0]=='4' && s[0]=='2';\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2]: (style) Return value 's[0]=='2'' is always false\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:35] -> [test.cpp:2:48]: (style) Return value 's[0]=='2'' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void f(int i) { if (i == 1 || 2) {} }\n"); // #12487
+        ASSERT_EQUALS("[test.cpp:1:28]: (style) Condition 'i==1||2' is always true [knownConditionTrueFalse]\n", errout_str());
+
+        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());
     }
 
     void pointerAdditionResultNotNull() {
         check("void f(char *ptr) {\n"
               "  if (ptr + 1 != 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison is wrong. Result of 'ptr+1' can't be 0 unless there is pointer overflow, and pointer overflow is undefined behaviour.\n", errout.str());
+        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());
     }
 
     void duplicateConditionalAssign() {
@@ -5541,17 +6035,17 @@ class TestCondition : public TestFixture {
               "    if (x == y)\n"
               "        x = y;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:3:style:Assignment 'x=y' is redundant with condition 'x==y'.\n"
-                      "test.cpp:2:note:Condition 'x==y'\n"
-                      "test.cpp:3:note:Assignment 'x=y' is redundant\n", errout.str());
+        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());
 
         check("void f(int& x, int y) {\n"
               "    if (x != y)\n"
               "        x = y;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:2:style:The statement 'if (x!=y) x=y' is logically equivalent to 'x=y'.\n"
-                      "test.cpp:3:note:Assignment 'x=y'\n"
-                      "test.cpp:2:note:Condition 'x!=y' is redundant\n", errout.str());
+        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());
 
         check("void f(int& x, int y) {\n"
               "    if (x == y)\n"
@@ -5559,9 +6053,9 @@ class TestCondition : public TestFixture {
               "    else\n"
               "        x = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:3:style:Assignment 'x=y' is redundant with condition 'x==y'.\n"
-                      "test.cpp:2:note:Condition 'x==y'\n"
-                      "test.cpp:3:note:Assignment 'x=y' is redundant\n", errout.str());
+        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());
 
         check("void f(int& x, int y) {\n"
               "    if (x != y)\n"
@@ -5569,13 +6063,13 @@ class TestCondition : public TestFixture {
               "    else\n"
               "        x = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int& x, int y) {\n"
               "    if (x == y)\n"
               "        x = y + 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g();\n"
               "void f(int& x, int y) {\n"
@@ -5584,7 +6078,7 @@ class TestCondition : public TestFixture {
               "        g();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool b) {\n"
               "    if (b)\n"
@@ -5593,13 +6087,13 @@ class TestCondition : public TestFixture {
               "        g();\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int& i) {\n"
               "    if (!i)\n"
               "        i = 1; \n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #9406
               "    S() : b(false) {}\n"
@@ -5611,105 +6105,105 @@ class TestCondition : public TestFixture {
               "    }\n"
               "    bool b;\n"
               "};\n");
-        ASSERT_EQUALS("test.cpp:4:style:The statement 'if (b) b=true' is redundant.\n"
-                      "test.cpp:4:note:Assignment 'b=true'\n"
-                      "test.cpp:4:note:Condition 'b' is redundant\n"
-                      "test.cpp:5:style:The statement 'if (b) b=false' is logically equivalent to 'b=false'.\n"
-                      "test.cpp:5:note:Assignment 'b=false'\n"
-                      "test.cpp:5:note:Condition 'b' is redundant\n"
-                      "test.cpp:6:style:The statement 'if (!b) b=true' is logically equivalent to 'b=true'.\n"
-                      "test.cpp:6:note:Assignment 'b=true'\n"
-                      "test.cpp:6:note:Condition '!b' is redundant\n"
-                      "test.cpp:7:style:The statement 'if (!b) b=false' is redundant.\n"
-                      "test.cpp:7:note:Assignment 'b=false'\n"
-                      "test.cpp:7:note:Condition '!b' is redundant\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: style: The statement 'if (b) b=true' is redundant. [duplicateConditionalAssign]\n"
+                      "[test.cpp:4:18]: note: Assignment 'b=true'\n"
+                      "[test.cpp:4:13]: note: Condition 'b' is redundant\n"
+                      "[test.cpp:5:13]: style: The statement 'if (b) b=false' is logically equivalent to 'b=false'. [duplicateConditionalAssign]\n"
+                      "[test.cpp:5:18]: note: Assignment 'b=false'\n"
+                      "[test.cpp:5:13]: note: Condition 'b' is redundant\n"
+                      "[test.cpp:6:13]: style: The statement 'if (!b) b=true' is logically equivalent to 'b=true'. [duplicateConditionalAssign]\n"
+                      "[test.cpp:6:19]: note: Assignment 'b=true'\n"
+                      "[test.cpp:6:13]: note: Condition '!b' is redundant\n"
+                      "[test.cpp:7:13]: style: The statement 'if (!b) b=false' is redundant. [duplicateConditionalAssign]\n"
+                      "[test.cpp:7:19]: note: Assignment 'b=false'\n"
+                      "[test.cpp:7:13]: note: Condition '!b' is redundant\n",
+                      errout_str());
     }
 
     void checkAssignmentInCondition() {
         check("void f(std::string s) {\n"
               "    if (s=\"123\"){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Suspicious assignment in condition. Condition 's=\"123\"' is always true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(uint32_t u) {\n" // #2490
               "    if ((u = 0x00000000) || (u = 0xffffffff)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Condition 'u=0x00000000' is always false\n"
-                      "[test.cpp:2]: (style) Condition 'u=0xffffffff' is always true\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12]: (style) Condition 'u=0x00000000' is always false [knownConditionTrueFalse]\n"
+                      "[test.cpp:2:32]: (style) Condition 'u=0xffffffff' is always true [knownConditionTrueFalse]\n",
+                      errout_str());
     }
 
     void compareOutOfTypeRange() {
-        Settings settingsUnix64 = settingsBuilder().severity(Severity::style).platform(cppcheck::Platform::Type::Unix64).build();
+        const Settings settingsUnix64 = settingsBuilder().severity(Severity::style).platform(Platform::Type::Unix64).build();
 
         check("void f(unsigned char c) {\n"
               "  if (c == 256) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Comparing expression of type 'unsigned char' against value 256. Condition is always false.\n", errout.str());
+        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"
               "}", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Comparing expression of type 'unsigned char' against value 256. Condition is always false.\n", errout.str());
+        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"
               "}", settingsUnix64);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "  if (b == true) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10372
         check("void f(signed char x) {\n"
               "  if (x == 0xff) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Comparing expression of type 'signed char' against value 255. Condition is always false.\n", errout.str());
+        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"
               "}", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Comparing expression of type 'signed short' against value 65535. Condition is always false.\n", errout.str());
+        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"
               "}", settingsUnix64);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(long x) {\n"
               "  if (x == ~0L) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(long long x) {\n"
               "  if (x == ~0LL) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n"
               "    const int i = 0xFFFFFFFF;\n"
               "    if (x == i) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  char c;\n"
               "  if ((c = foo()) != -1) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "  if (x < 3000000000) {}\n"
               "}", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Comparing expression of type 'signed int' against value 3000000000. Condition is always true.\n", errout.str());
+        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
               "    if (i >  -129) {}\n" // warn
@@ -5719,11 +6213,11 @@ class TestCondition : public TestFixture {
               "    if (i <= +127) {}\n" // warn
               "    if (i <= +126) {}\n"
               "}\n", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Comparing expression of type 'const signed char' against value -129. Condition is always true.\n"
-                      "[test.cpp:3]: (style) Comparing expression of type 'const signed char' against value -128. Condition is always true.\n"
-                      "[test.cpp:5]: (style) Comparing expression of type 'const signed char' against value 128. Condition is always true.\n"
-                      "[test.cpp:6]: (style) Comparing expression of type 'const signed char' against value 127. Condition is always true.\n",
-                      errout.str());
+        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"
+                      "[test.cpp:6:15]: (style) Comparing expression of type 'const signed char' against value 127. Condition is always true. [compareValueOutOfTypeRangeError]\n",
+                      errout_str());
 
         check("void f(const unsigned char u) {\n"
               "    if (u >  0) {}\n"
@@ -5743,22 +6237,42 @@ class TestCondition : public TestFixture {
               "    if (255 <= u) {}\n"
               "    if (255 >= u) {}\n" // warn
               "}\n", settingsUnix64);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always false.\n"
-                      "[test.cpp:4]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always true.\n"
-                      "[test.cpp:6]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false.\n"
-                      "[test.cpp:9]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always true.\n"
-                      "[test.cpp:11]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always false.\n"
-                      "[test.cpp:12]: (style) Comparing expression of type 'const unsigned char' against value 0. Condition is always true.\n"
-                      "[test.cpp:14]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always false.\n"
-                      "[test.cpp:17]: (style) Comparing expression of type 'const unsigned char' against value 255. Condition is always true.\n",
-                      errout.str());
+        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"
+                      "[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());
     }
 
-    void knownConditionCast() { // #9976
-        check("void f(int i) {\n"
+    void knownConditionCast() {
+        check("void f(int i) {\n" // #9976
               "    if (i < 0 || (unsigned)i > 5) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct B {\n" // #12941
+              "    virtual void f();\n"
+              "};\n"
+              "struct One : public B {};\n"
+              "struct Two : public B {};\n"
+              "void g(const B& b) {\n"
+              "    const Two* two = nullptr;\n"
+              "    const One* one = dynamic_cast<const One*>(&b);\n"
+              "    if (one == nullptr)\n"
+              "        two = dynamic_cast<const Two*>(&b);\n"
+              "    if (two) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void knownConditionIncrementLoop() { // #9808
@@ -5768,7 +6282,227 @@ class TestCondition : public TestFixture {
               "    if (a == 1) {}\n"
               "    std::cout << a;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void knownConditionAfterBailout() { // #12526
+        check(
+            "#include <list>\n"
+            "int func()\n"
+            "{\n"
+            "  return VALUE_1;"
+            "}\n"
+            "\n"
+            "struct S1 {\n"
+            "  bool b{};\n"
+            "};\n"
+            "\n"
+            "struct S {\n"
+            "  void f(const std::list<int>& l) const\n"
+            "  {\n"
+            "    if (mS.b)\n"
+            "      return;\n"
+            "    for (int i : l)\n"
+            "    {\n"
+            "      (void)i;\n"
+            "      if (mS.b)\n"
+            "        continue;\n"
+            "    }\n"
+            "  }\n"
+            "\n"
+            "  S1 mS;\n"
+            "};"
+            );
+        ASSERT_EQUALS("[test.cpp:13:11] -> [test.cpp:18:13]: (style) Condition 'mS.b' is always false [knownConditionTrueFalse]\n", errout_str());
+    }
+
+    void knownConditionIncDecOperator() {
+        check(
+            "void f() {\n"
+            "    unsigned int d = 0;\n"
+            "    for (int i = 0; i < 4; ++i) {\n"
+            "        if (i < 3)\n"
+            "            ++d;\n"
+            "        else if (--d == 0)\n"
+            "            ;\n"
+            "    }\n"
+            "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void knownConditionFloating() {
+        check("void foo() {\n"   // #11199
+              "    float f = 1.0;\n"
+              "    if (f > 1.0f) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'f>1.0f' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"     // #11199
+              "    float f = 1.0;\n"
+              "    if (f > 1.0L) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'f>1.0L' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"   // #11199
+              "    float f = 1.0f;\n"
+              "    if (f > 1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'f>1.0' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"     // #11199
+              "    float f = 1.0f;\n"
+              "    if (f > 1.0L) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'f>1.0L' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"     // #11199
+              "    float f = 1.0L;\n"
+              "    if (f > 1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'f>1.0' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"     // #11199
+              "    float f = 1.0L;\n"
+              "    if (f > 1.0f) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'f>1.0f' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"   // #11201
+              "    float f = 0x1.4p+3;\n" // hex fraction 1.4 (decimal 1.25) scaled by 2^3, that is 10.0
+              "    if (f > 9.9) {}\n"
+              "    if (f < 9.9) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:11]: (style) Condition 'f>9.9' is always true [knownConditionTrueFalse]\n"
+            "[test.cpp:4:11]: (style) Condition 'f<9.9' is always false [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #12330
+              "    double d = 1.0;\n"
+              "    if (d < 0.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'd<0.0' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"     // #12330
+              "    long double ld = 1.0;\n"
+              "    if (ld < 0.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) Condition 'ld<0.0' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"     // #12330
+              "    float f = 1.0;\n"
+              "    if (f < 0.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Condition 'f<0.0' is always false [knownConditionTrueFalse]\n", errout_str());
+
+        check("void foo() {\n"     // #12774
+              "    float f = 1.0f;\n"
+              "    if (f > 1.01f) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:11]: (style) Condition 'f>1.01f' is always false [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n"     // #12774
+              "    float f = 1.0;\n"
+              "    if (f > 1.01) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:11]: (style) Condition 'f>1.01' is always false [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float f = 1.0f;\n"
+              "    if (f > 1) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:11]: (style) Condition 'f>1' is always false [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float f = 1.0f;\n"
+              "    if (f > 1.00f) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Condition 'f>1.00f' is always false\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float f = 1.0;\n"
+              "    if (f > 1) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:11]: (style) Condition 'f>1' is always false [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n"// #13508
+              "    float f = 1.0;\n"
+              "    if (f > 1.00) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Condition 'f>1.00' is always false\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n" // #13506
+              "    float nf = -1.0;\n"
+              "    if (nf > +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:12]: (style) Condition 'nf>+1.0' is always false [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #11200
+              "    float f = 1.0;\n"
+              "    if (f > -1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:11]: (style) Condition 'f>-1.0' is always true [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float f = 1.0;\n"
+              "    if (f > 1.0) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Condition 'f>1.0' is always true\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n" // #11200
+              "    float pf = +1.0;\n"
+              "    if (pf > -1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:12]: (style) Condition 'pf>-1.0' is always true [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float pf = +1.0;\n"
+              "    if (pf > 1.0) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Condition 'pf>1.0' is always true\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n" // #11200
+              "    float nf = -1.0;\n"
+              "    if (nf > 1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3:12]: (style) Condition 'nf>1.0' is always false [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // / #13508
+              "    float nf = -1.0;\n"
+              "    if (nf > -1.0) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Condition 'nf>-1.0' is always false\n",
+            "",
+            errout_str());
     }
 };
 
diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
index 55925648811..54af2d0a1c3 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-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
@@ -16,16 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkclass.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "standards.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
-
-#include <sstream> // IWYU pragma: keep
 
+#include <cstddef>
 
 class TestConstructors : public TestFixture {
 public:
@@ -33,39 +31,33 @@ 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();
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool inconclusive = false) {
-        // Clear the error buffer..
-        errout.str("");
-
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
+    struct CheckOptions
+    {
+        bool inconclusive = false;
+    };
 
-        // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#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 = options.inconclusive ? settings_i : settings;
 
-        // Check class constructors..
-        CheckClass checkClass(&tokenizer, &settings1, this);
-        checkClass.constructors();
+        check_(file, line, code, settings1);
     }
 
-    void check_(const char* file, int line, const char code[], const Settings &s) {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Tokenize..
-        Tokenizer tokenizer(&s, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+    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, &s, this);
+        CheckClass checkClass(&tokenizer, &settings1, this);
         checkClass.constructors();
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(simple1);
         TEST_CASE(simple2);
         TEST_CASE(simple3);
@@ -83,6 +75,7 @@ class TestConstructors : public TestFixture {
         TEST_CASE(simple15); // #8942 multiple arguments, decltype
         TEST_CASE(simple16); // copy members with c++11 init
         TEST_CASE(simple17); // #10360
+        TEST_CASE(simple18);
 
         TEST_CASE(noConstructor1);
         TEST_CASE(noConstructor2);
@@ -112,10 +105,14 @@ class TestConstructors : public TestFixture {
         TEST_CASE(initvar_operator_eq6);
         TEST_CASE(initvar_operator_eq7);
         TEST_CASE(initvar_operator_eq8);
+        TEST_CASE(initvar_operator_eq9);
+        TEST_CASE(initvar_operator_eq10);
+        TEST_CASE(initvar_operator_eq11);
         TEST_CASE(initvar_same_classname);      // BUG 2208157
         TEST_CASE(initvar_chained_assign);      // BUG 2270433
         TEST_CASE(initvar_2constructors);       // BUG 2270353
         TEST_CASE(initvar_constvar);
+        TEST_CASE(initvar_mutablevar);
         TEST_CASE(initvar_staticvar);
         TEST_CASE(initvar_brace_init);
         TEST_CASE(initvar_union);
@@ -125,6 +122,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
@@ -177,6 +175,9 @@ class TestConstructors : public TestFixture {
         TEST_CASE(uninitVar32); // ticket #8835
         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);
@@ -192,6 +193,7 @@ class TestConstructors : public TestFixture {
         TEST_CASE(uninitVarArray8);
         TEST_CASE(uninitVarArray9); // ticket #6957, #6959
         TEST_CASE(uninitVarArray10);
+        TEST_CASE(uninitVarArray11);
         TEST_CASE(uninitVarArray2D);
         TEST_CASE(uninitVarArray3D);
         TEST_CASE(uninitVarCpp11Init1);
@@ -238,21 +240,21 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
               "private:\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The class 'Fred' does not declare a constructor although it has private member variables which likely require initialization.\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The struct 'Fred' does not declare a constructor although it has private member variables which likely require initialization.\n", errout.str());
+        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());
     }
 
 
@@ -265,7 +267,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred && other) : i(other.i) {}\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -275,7 +277,7 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred && other) {i=other.i}\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -285,9 +287,9 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred && other) {}\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n"
-                      "[test.cpp:5]: (warning) Member variable 'Fred::i' is not initialized in the copy constructor.\n"
-                      "[test.cpp:6]: (warning) Member variable 'Fred::i' is not initialized in the move constructor.\n", errout.str());
+        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());
 
         check("struct Fred\n"
               "{\n"
@@ -296,9 +298,9 @@ class TestConstructors : public TestFixture {
               "    Fred(Fred && other) {}\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n"
-                      "[test.cpp:4]: (warning) Member variable 'Fred::i' is not initialized in the copy constructor.\n"
-                      "[test.cpp:5]: (warning) Member variable 'Fred::i' is not initialized in the move constructor.\n", errout.str());
+        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());
     }
 
 
@@ -310,7 +312,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred() :i(0)\n"
               "{ }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
               "{\n"
@@ -319,7 +321,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred()\n"
               "{ i = 0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
               "{\n"
@@ -328,7 +330,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred()\n"
               "{ }");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:7]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
 
@@ -345,8 +347,8 @@ class TestConstructors : public TestFixture {
               "Fred::Fred(int _i)\n"
               "{\n"
               "    i = _i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:8]: (warning, inconclusive) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:8:7]: (warning, inconclusive) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void simple5() { // ticket #2560
@@ -363,7 +365,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int mValue;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simple6() { // ticket #4085 - uninstantiated template class
@@ -373,7 +375,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <class T> struct A {\n"
               "    A<T>() : x(0) { }\n"
@@ -381,7 +383,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <class T> struct A {\n"
               "    A<T>() : x(0) { }\n"
@@ -390,8 +392,8 @@ class TestConstructors : public TestFixture {
               "    int x;\n"
               "    int y;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Member variable 'A::y' is not initialized in the constructor.\n"
-                      "[test.cpp:3]: (warning) Member variable 'A::y' is not initialized in the constructor.\n", errout.str());
+        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());
     }
 
     void simple7() { // ticket #4531
@@ -399,15 +401,15 @@ class TestConstructors : public TestFixture {
               "struct Fred {\n"
               "    int x;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simple8() {
         check("struct Fred { int x; };\n"
               "class Barney { Fred fred; };\n"
               "class Wilma { struct Betty { int x; } betty; };");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The class 'Barney' does not declare a constructor although it has private member variables which likely require initialization.\n"
-                      "[test.cpp:3]: (style) The class 'Wilma' does not declare a constructor although it has private member variables which likely require initialization.\n", errout.str());
+        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());
     }
 
     void simple9() { // ticket #4574
@@ -417,7 +419,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simple10() {
@@ -427,7 +429,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n", errout.str());
+        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
               "    S() = default;\n"
@@ -438,7 +440,7 @@ class TestConstructors : public TestFixture {
               "    S& operator=(S&&) = default;\n"
               "    int i;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Member variable 'S::i' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) Member variable 'S::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void simple11() { // ticket #4536, #6214
@@ -455,8 +457,8 @@ class TestConstructors : public TestFixture {
               "    int d, e{3};\n"
               "    int f{4}, g;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'Fred::d' is not initialized in the constructor.\n"
-                      "[test.cpp:3]: (warning) Member variable 'Fred::g' is not initialized in the constructor.\n", errout.str());
+        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());
     }
 
     void simple12() { // ticket #4620
@@ -467,7 +469,7 @@ class TestConstructors : public TestFixture {
               "    void Init(int i = 0);\n"
               "};\n"
               "void Fred::Init(int i) { x = i; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
               "    int x;\n"
@@ -477,7 +479,7 @@ class TestConstructors : public TestFixture {
               "    void Init(int i, int j = 0);\n"
               "};\n"
               "void Fred::Init(int i, int j) { x = i; y = j; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simple13() { // #5498
@@ -485,7 +487,7 @@ class TestConstructors : public TestFixture {
               "    int x=1;\n"
               "    int *y=0;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simple14() { // #6253 template base
@@ -498,7 +500,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred : public Base<A, B> {"
               "public:"
@@ -509,7 +511,24 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simple15() { // #8942
+        check("class A\n"
+              "{\n"
+              "public:\n"
+              "  int member;\n"
+              "};\n"
+              "class B\n"
+              "{\n"
+              "public:\n"
+              "  B(const decltype(A::member)& x, const decltype(A::member)& y) : x(x), y(y) {}\n"
+              "private:\n"
+              "  const decltype(A::member)& x;\n"
+              "  const decltype(A::member)& y;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simple16() {
@@ -518,10 +537,10 @@ class TestConstructors : public TestFixture {
               "    S() = default;\n"
               "    S(const S& s) {}\n"
               "    S& operator=(const S& s) { return *this; }\n"
-              "};\n", /*inconclusive*/ true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Member variable 'S::i' is not assigned in the copy constructor. Should it be copied?\n"
-                      "[test.cpp:5]: (warning) Member variable 'S::i' is not assigned a value in 'S::operator='.\n",
-                      errout.str());
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning, inconclusive) Member variable 'S::i' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n"
+                      "[test.cpp:5:8]: (warning) Member variable 'S::i' is not assigned a value in 'S::operator='. [operatorEqVarError]\n",
+                      errout_str());
 
         check("struct S {\n"
               "    int i;\n"
@@ -529,9 +548,9 @@ class TestConstructors : public TestFixture {
               "    S(const S& s) {}\n"
               "    S& operator=(const S& s) { return *this; }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'S::i' is not initialized in the copy constructor.\n"
-                      "[test.cpp:5]: (warning) Member variable 'S::i' is not assigned a value in 'S::operator='.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'S::i' is not initialized in the copy constructor. [uninitMemberVar]\n"
+                      "[test.cpp:5:8]: (warning) Member variable 'S::i' is not assigned a value in 'S::operator='. [operatorEqVarError]\n",
+                      errout_str());
     }
 
     void simple17() { // #10360
@@ -553,24 +572,16 @@ class TestConstructors : public TestFixture {
               "    auto d = dynamic_cast<const Derived&>(Src);\n"
               "    i = d.i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
-    void simple15() { // #8942
-        check("class A\n"
-              "{\n"
-              "public:\n"
-              "  int member;\n"
-              "};\n"
-              "class B\n"
-              "{\n"
-              "public:\n"
-              "  B(const decltype(A::member)& x, const decltype(A::member)& y) : x(x), y(y) {}\n"
-              "private:\n"
-              "  const decltype(A::member)& x;\n"
-              "  const decltype(A::member)& y;\n"
-              "};\n");
-        ASSERT_EQUALS("", errout.str());
+    void simple18() { // #13302
+        check("struct S {};\n"
+              "class C1 { S& r; };\n"
+              "class C2 { S* p; };\n");
+        ASSERT_EQUALS("[test.cpp:2:1]: (style) The class 'C1' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n"
+                      "[test.cpp:3:1]: (style) The class 'C2' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n",
+                      errout_str());
     }
 
     void noConstructor1() {
@@ -579,7 +590,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The class 'Fred' does not declare a constructor although it has private member variables which likely require initialization.\n", errout.str());
+        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());
     }
 
     void noConstructor2() {
@@ -591,7 +602,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "void Fred::foobar()\n"
               "{ }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor3() {
@@ -600,7 +611,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    static int foobar;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor4() {
@@ -609,7 +620,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    int foobar;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor5() {
@@ -617,7 +628,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "    int i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor6() {
@@ -631,14 +642,14 @@ class TestConstructors : public TestFixture {
               "    cpucyclesT m_v;\n"
               "    bool m_b;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor7() {
         // ticket #4391
         check("short bar;\n"
               "class foo;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor8() {
@@ -646,7 +657,7 @@ class TestConstructors : public TestFixture {
         check("class LineSegment;\n"
               "class PointArray  { };\n"
               "void* tech_ = NULL;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor9() {
@@ -657,7 +668,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               " bool MessageSet;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor10() {
@@ -677,28 +688,28 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    wxTimer *WxTimer1;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
     void noConstructor11() { // #3552
         check("class Fred { int x; };\n"
               "union U { int y; Fred fred; };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor12() { // #8951
         check("class Fred { int x{0}; };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred { int x=0; };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred { int x[1]={0}; };"); // #8850
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred { int x[1]{0}; };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor13() { // #9998
@@ -708,7 +719,7 @@ class TestConstructors : public TestFixture {
               "    A() {}\n"
               "    B b;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor14() { // #10770
@@ -719,7 +730,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    Func fp = nullptr;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noConstructor15() { // #5499
@@ -728,14 +739,14 @@ class TestConstructors : public TestFixture {
               "    int i1 = 0;\n"
               "    int i2;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'C::i2' is not initialized.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'C::i2' is not initialized. [uninitMemberVarPrivate]\n", errout_str());
 
         check("class C {\n"
               "private:\n"
               "    int i1;\n"
               "    int i2;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The class 'C' does not declare a constructor although it has private member variables which likely require initialization.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:1]: (style) The class 'C' does not declare a constructor although it has private member variables which likely require initialization. [noConstructor]\n", errout_str());
 
         check("class C {\n"
               "public:\n"
@@ -744,7 +755,7 @@ class TestConstructors : public TestFixture {
               "    int i1;\n"
               "    int i2;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'C::i2' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'C::i2' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     // ticket #4290 "False Positive: style (noConstructor): The class 'foo' does not have a constructor."
@@ -752,15 +763,15 @@ class TestConstructors : public TestFixture {
     void forwardDeclaration() {
         check("class foo;\n"
               "int bar;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class foo;\n"
               "class foo;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class foo{};\n"
               "class foo;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_with_this() {
@@ -770,7 +781,7 @@ class TestConstructors : public TestFixture {
               "    { this->i = 0; }\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_if() {
@@ -785,7 +796,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_operator_eq1() {
@@ -804,7 +815,7 @@ class TestConstructors : public TestFixture {
               "    const Fred & operator=(const Fred &fred)\n"
               "    { i = fred.i; return *this; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Fred {\n"
               "    int i;\n"
@@ -815,7 +826,7 @@ class TestConstructors : public TestFixture {
               "    const Fred & operator=(const Fred &fred)\n"
               "    { i = fred.i; return *this; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
               "{\n"
@@ -830,7 +841,7 @@ class TestConstructors : public TestFixture {
               "  int i;\n"
               "  int j;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -841,7 +852,7 @@ class TestConstructors : public TestFixture {
               "    void operator=(const Fred &fred) { }\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
     void initvar_operator_eq3() {
@@ -853,7 +864,7 @@ class TestConstructors : public TestFixture {
               "    void Init() { i = 0; }\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_operator_eq4() {
@@ -870,7 +881,7 @@ class TestConstructors : public TestFixture {
               "        return *this\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='.\n", errout.str());
+        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"
               "{\n"
@@ -885,7 +896,7 @@ class TestConstructors : public TestFixture {
               "        return *this\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='.\n", errout.str());
+        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"
               "{\n"
@@ -900,7 +911,7 @@ class TestConstructors : public TestFixture {
               "        return *this\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'Fred::i' is not assigned a value in 'Fred::operator='.\n", errout.str());
+        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"
               "{\n"
@@ -915,7 +926,7 @@ class TestConstructors : public TestFixture {
               "        return *this\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_operator_eq5() { // #4119 - false positive when using swap to assign variables
@@ -930,7 +941,7 @@ class TestConstructors : public TestFixture {
               "        return *this;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_operator_eq6() { // std::vector
@@ -939,24 +950,24 @@ class TestConstructors : public TestFixture {
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Member variable 'Fred::data' is not assigned a value in 'Fred::operator='.\n", errout.str());
+              "};",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"
               "    std::vector<int> ints;\n"
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='.\n", errout.str());
+              "};",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"
               "    Data data;\n"
               "    Fred & operator=(const Fred &rhs) {\n"
               "        return *this;\n"
               "    }\n"
-              "};",true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Member variable 'Fred::data' is not assigned a value in 'Fred::operator='.\n", errout.str());
+              "};",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());
     }
 
     void initvar_operator_eq7() {
@@ -974,8 +985,8 @@ class TestConstructors : public TestFixture {
               "    if (this != &Src)\n"
               "        Copy(Src);\n"
               "    return *this;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_operator_eq8() {
@@ -998,10 +1009,50 @@ class TestConstructors : public TestFixture {
               "    int d3_1;\n"
               "    int d3_2;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:13]: (warning) Member variable 'D3::d3_2' is not assigned a value in 'D3::operator='.\n"
-                      "[test.cpp:13]: (warning) Member variable 'D3::d2' is not assigned a value in 'D3::operator='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:13:9]: (warning) Member variable 'D3::d3_2' is not assigned a value in 'D3::operator='. [operatorEqVarError]\n"
+                      "[test.cpp:13:9]: (warning) Member variable 'D3::d2' is not assigned a value in 'D3::operator='. [operatorEqVarError]\n", errout_str());
     }
 
+    void initvar_operator_eq9() {  // ticket #13203
+        check("struct S {\n"
+              "    int* m_data;\n"
+              "    S() : m_data(new int()) {}\n"
+              "    S& operator=(const S& s) {\n"
+              "        if (&s != this) {\n"
+              "            *(m_data) = *(s.m_data);\n"
+              "        }\n"
+              "        return *this;\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void initvar_operator_eq10() {
+        check("struct S {\n"
+              "    int* m_data;\n"
+              "    S() : m_data(new int()) {}\n"
+              "    S& operator=(const S& s) {\n"
+              "        if (&s != this) {\n"
+              "            (*m_data) = *(s.m_data);\n"
+              "        }\n"
+              "        return *this;\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void initvar_operator_eq11() {
+        check("struct S {\n"
+              "    int* m_data;\n"
+              "    S() : m_data(new int()) {}\n"
+              "    S& operator=(const S& s) {\n"
+              "        return *this;\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:4:8]: (warning) Member variable 'S::m_data' is not assigned a value in 'S::operator='. [operatorEqVarError]\n", errout_str());
+    }
+
+
     void initvar_same_classname() {
         // Bug 2208157 - False positive: Uninitialized variable, same class name
 
@@ -1023,7 +1074,7 @@ class TestConstructors : public TestFixture {
               "    };\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void func1()\n"
               "{\n"
@@ -1043,7 +1094,7 @@ class TestConstructors : public TestFixture {
               "    };\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void func1()\n"
               "{\n"
@@ -1063,7 +1114,7 @@ class TestConstructors : public TestFixture {
               "    };\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
               "    void func1()\n"
@@ -1085,7 +1136,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
               "    void func1()\n"
@@ -1107,8 +1158,8 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "};");
 
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Fred::a' is not initialized in the constructor.\n"
-                      "[test.cpp:16]: (warning) Member variable 'Fred::b' is not initialized in the constructor.\n", errout.str());
+        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());
     }
 
     void initvar_chained_assign() {
@@ -1127,7 +1178,7 @@ class TestConstructors : public TestFixture {
               "    m_iMyInt1 = m_iMyInt2 = 0;\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1160,7 +1211,7 @@ class TestConstructors : public TestFixture {
               "    m_iMyInt = 0;\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1172,7 +1223,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred() : s(NULL)\n"
               "{ }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
               "{\n"
@@ -1181,7 +1232,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred()\n"
               "{ s = NULL; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Fred\n"
               "{\n"
@@ -1190,7 +1241,19 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Fred::Fred()\n"
               "{ }");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'Fred::s' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:7]: (warning) Member variable 'Fred::s' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
+    }
+
+
+    void initvar_mutablevar() {
+        check("class Foo {\n"
+              "public:\n"
+              "    Foo() { update(); }\n"
+              "private:\n"
+              "    void update() const;\n"
+              "    mutable int x;\n"
+              "};");
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1201,7 +1264,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { }\n"
               "    static void *p;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1214,7 +1277,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "  std::map<int, double> * values_{};\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1232,7 +1295,7 @@ class TestConstructors : public TestFixture {
               "        U.a = 0;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -1246,7 +1309,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "};");
-        TODO_ASSERT_EQUALS("[test.cpp:9]: (warning) Member variable 'Fred::U' is not initialized in the constructor.\n", "", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Fred::U' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
 
@@ -1257,8 +1320,8 @@ class TestConstructors : public TestFixture {
               "    A(int n) { }\n"
               "    A() : A(42) {}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'A::number' is not initialized in the constructor.\n"
-                      "[test.cpp:5]: (warning) Member variable 'A::number' is not initialized in the constructor.\n", errout.str());
+        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());
 
         check("class A {\n"
               "    int number;\n"
@@ -1266,16 +1329,16 @@ class TestConstructors : public TestFixture {
               "    A(int n) { number = n; }\n"
               "    A() : A(42) {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "    int number;\n"
               "public:\n"
               "    A(int n) : A() { }\n"
               "    A() {}\n"
-              "};", true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'A::number' is not initialized in the constructor.\n"
-                      "[test.cpp:5]: (warning, inconclusive) Member variable 'A::number' is not initialized in the constructor.\n", errout.str());
+              "};", 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());
 
         check("class A {\n"
               "    int number;\n"
@@ -1283,7 +1346,7 @@ class TestConstructors : public TestFixture {
               "    A(int n) : A() { }\n"
               "    A() { number = 42; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "    int number;\n"
@@ -1291,8 +1354,8 @@ class TestConstructors : public TestFixture {
               "    A(int n) { }\n"
               "    A() : A{42} {}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'A::number' is not initialized in the constructor.\n"
-                      "[test.cpp:5]: (warning) Member variable 'A::number' is not initialized in the constructor.\n", errout.str());
+        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());
 
         check("class A {\n"
               "    int number;\n"
@@ -1300,16 +1363,16 @@ class TestConstructors : public TestFixture {
               "    A(int n) { number = n; }\n"
               "    A() : A{42} {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "    int number;\n"
               "public:\n"
               "    A(int n) : A{} { }\n"
               "    A() {}\n"
-              "};", true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'A::number' is not initialized in the constructor.\n"
-                      "[test.cpp:5]: (warning, inconclusive) Member variable 'A::number' is not initialized in the constructor.\n", errout.str());
+              "};", 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());
 
         check("class A {\n"
               "    int number;\n"
@@ -1317,7 +1380,7 @@ class TestConstructors : public TestFixture {
               "    A(int n) : A{} { }\n"
               "    A() { number = 42; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #6675
         check("struct Foo {\n"
@@ -1327,7 +1390,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "Foo::Foo() : Foo(0) {}\n"
               "Foo::Foo(int foo) : foo_(foo) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Noexcept ctors
         check("class A {\n"
@@ -1339,7 +1402,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "\n"
               "A::A() noexcept: A(0) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #8581
         check("class A {\n"
@@ -1349,7 +1412,7 @@ class TestConstructors : public TestFixture {
               "    A(int a) : _a(a) {}\n"
               "    A(float a) : A(int(a)) {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #8258
         check("struct F{};\n"
@@ -1361,7 +1424,7 @@ class TestConstructors : public TestFixture {
               "    int _b;\n"
               "    F _f;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_delegate2() {
@@ -1385,7 +1448,7 @@ class TestConstructors : public TestFixture {
               "    , b(0)\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_derived_class() {
@@ -1400,7 +1463,7 @@ class TestConstructors : public TestFixture {
               "  Derived() {}\n"
               "  void foo() override;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Member variable 'Base::x' is not initialized in the constructor. Maybe it should be initialized directly in the class Base?\n", errout.str());
+        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
               "    char ca;\n"
@@ -1416,7 +1479,7 @@ class TestConstructors : public TestFixture {
               "        return *this;\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'B::cb' is not assigned a value in 'B::operator='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:8]: (warning) Member variable 'B::cb' is not assigned a value in 'B::operator='. [operatorEqVarError]\n", errout_str());
 
         check("struct A {\n"
               "    char ca;\n"
@@ -1431,10 +1494,10 @@ class TestConstructors : public TestFixture {
               "        return *this;\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'A::ca' is not assigned a value in 'A::operator='.\n"
-                      "[test.cpp:9]: (warning) Member variable 'B::cb' is not assigned a value in 'B::operator='.\n"
-                      "[test.cpp:9]: (warning) Member variable 'B::ca' is not assigned a value in 'B::operator='.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (warning) Member variable 'A::ca' is not assigned a value in 'A::operator='. [operatorEqVarError]\n"
+                      "[test.cpp:9:8]: (warning) Member variable 'B::cb' is not assigned a value in 'B::operator='. [operatorEqVarError]\n"
+                      "[test.cpp:9:8]: (warning) Member variable 'B::ca' is not assigned a value in 'B::operator='. [operatorEqVarError]\n",
+                      errout_str());
 
         check("class C : B {\n" // don't crash
               "    virtual C& operator=(C& c);\n"
@@ -1442,7 +1505,7 @@ class TestConstructors : public TestFixture {
               "class D : public C {\n"
               "    virtual C& operator=(C& c) { return C::operator=(c); };\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct B;\n" // don't crash
               "struct D : B { D& operator=(const D&); };\n"
@@ -1452,8 +1515,24 @@ class TestConstructors : public TestFixture {
               "        D::operator=(rhs);\n"
               "    return *this;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
+        check("template <class T>\n" // #12128
+              "struct B {\n"
+              "    T x;\n"
+              "};\n"
+              "struct D : B<double> {\n"
+              "    D(double x) : B{ x } {}\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct B {\n"
+              "    int x;\n"
+              "};\n"
+              "struct D : B {\n"
+              "    D(int i) : B{ i } {}\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_derived_pod_struct_with_union() {
@@ -1471,7 +1550,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    C() { all = 0; tick = 0; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    union {\n"
@@ -1487,7 +1566,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    C() { flag1 = flag2 = 0; tick = 0; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    union {\n"
@@ -1503,9 +1582,9 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    C() {}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:13]: (warning) Member variable 'S::all' is not initialized in the constructor. Maybe it should be initialized directly in the class S?\n"
-                      "[test.cpp:13]: (warning) Member variable 'S::flag1' is not initialized in the constructor. Maybe it should be initialized directly in the class S?\n"
-                      "[test.cpp:13]: (warning) Member variable 'S::flag2' is not initialized in the constructor. Maybe it should be initialized directly in the class S?\n", errout.str());
+        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());
     }
 
     void initvar_private_constructor() {
@@ -1519,7 +1598,7 @@ class TestConstructors : public TestFixture {
                   "};\n"
                   "Fred::Fred()\n"
                   "{ }", s);
-            ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Fred::var' is not initialized in the constructor.\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:7:7]: (warning) Member variable 'Fred::var' is not initialized in the constructor. [uninitMemberVarPrivate]\n", errout_str());
         }
 
         {
@@ -1532,9 +1611,18 @@ class TestConstructors : public TestFixture {
                   "};\n"
                   "Fred::Fred()\n"
                   "{ }", s);
-            ASSERT_EQUALS("", errout.str());
+            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"
@@ -1545,7 +1633,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { };\n"
               "    Fred(const Fred &) { };\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -1554,8 +1642,8 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { };\n"
               "    Fred(const Fred &) { };\n"
-              "};", true);
-        ASSERT_EQUALS("[test.cpp:7]: (warning, inconclusive) Member variable 'Fred::var' is not assigned in the copy constructor. Should it be copied?\n", errout.str());
+              "};", 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"
               "{\n"
@@ -1566,8 +1654,8 @@ class TestConstructors : public TestFixture {
               "    Fred(const Fred &);\n"
               "};\n"
               "Fred::Fred() { };\n"
-              "Fred::Fred(const Fred &) { };\n", true);
-        ASSERT_EQUALS("[test.cpp:10]: (warning, inconclusive) Member variable 'Fred::var' is not assigned in the copy constructor. Should it be copied?\n", errout.str());
+              "Fred::Fred(const Fred &) { };\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:10:7]: (warning, inconclusive) Member variable 'Fred::var' is not assigned in the copy constructor. Should it be copied? [missingMemberCopy]\n", errout_str());
 
         check("class Baz {};\n" // #8496
               "class Bar {\n"
@@ -1575,8 +1663,8 @@ class TestConstructors : public TestFixture {
               "    explicit Bar(Baz* pBaz = NULL) : i(0) {}\n"
               "    Bar(const Bar& bar) {}\n"
               "    int i;\n"
-              "};\n", true);
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Bar::i' is not initialized in the copy constructor.\n", errout.str());
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Bar::i' is not initialized in the copy constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void initvar_nested_constructor() { // ticket #1375
@@ -1605,10 +1693,10 @@ class TestConstructors : public TestFixture {
               "A::B::C::D::D(int z){}");
         // 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]: (warning) Member variable 'A::a' is not initialized in the constructor.\n"
-                      "[test.cpp:21]: (warning) Member variable 'B::b' is not initialized in the constructor.\n"
-                      "[test.cpp:22]: (warning) Member variable 'C::c' is not initialized in the constructor.\n"
-                      "[test.cpp:23]: (warning) Member variable 'D::d' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:20:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:21:7]: (warning) Member variable 'B::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:22:10]: (warning) Member variable 'C::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:23:13]: (warning) Member variable 'D::d' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("class A {\n"
               "public:\n"
@@ -1635,10 +1723,10 @@ class TestConstructors : public TestFixture {
               "A::B::C::D::D(const A::B::C::D & d){}");
         // 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]: (warning) Member variable 'A::a' is not initialized in the constructor.\n"
-                      "[test.cpp:21]: (warning) Member variable 'B::b' is not initialized in the constructor.\n"
-                      "[test.cpp:22]: (warning) Member variable 'C::c' is not initialized in the constructor.\n"
-                      "[test.cpp:23]: (warning) Member variable 'D::d' is not initialized in the copy constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:20:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:21:7]: (warning) Member variable 'B::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:22:10]: (warning) Member variable 'C::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:23:13]: (warning) Member variable 'D::d' is not initialized in the copy constructor. [uninitMemberVar]\n", errout_str());
 
         check("class A {\n"
               "public:\n"
@@ -1666,10 +1754,10 @@ class TestConstructors : public TestFixture {
               "A::B::C::D::D(const A::B::C::D::E & e){}");
         // 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]: (warning) Member variable 'A::a' is not initialized in the constructor.\n"
-                      "[test.cpp:22]: (warning) Member variable 'B::b' is not initialized in the constructor.\n"
-                      "[test.cpp:23]: (warning) Member variable 'C::c' is not initialized in the constructor.\n"
-                      "[test.cpp:24]: (warning) Member variable 'D::d' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:21:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:22:7]: (warning) Member variable 'B::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:23:10]: (warning) Member variable 'C::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:24:13]: (warning) Member variable 'D::d' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void initvar_nocopy1() { // ticket #2474
@@ -1686,7 +1774,7 @@ class TestConstructors : public TestFixture {
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
               "{\n"
@@ -1701,7 +1789,7 @@ class TestConstructors : public TestFixture {
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
               "{\n"
@@ -1718,7 +1806,7 @@ class TestConstructors : public TestFixture {
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
               "{\n"
@@ -1734,7 +1822,7 @@ class TestConstructors : public TestFixture {
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A : public std::vector<int>\n"
               "{\n"
@@ -1749,11 +1837,11 @@ class TestConstructors : public TestFixture {
               "    B(const B&){}\n"
               "    B(B &&){}\n"
               "    const B& operator=(const B&){return *this;}\n"
-              "};", true);
-        ASSERT_EQUALS("[test.cpp:11]: (warning, inconclusive) Member variable 'B::a' is not assigned in the copy constructor. Should it be copied?\n"
-                      "[test.cpp:12]: (warning, inconclusive) Member variable 'B::a' is not assigned in the move constructor. Should it be moved?\n"
-                      "[test.cpp:13]: (warning, inconclusive) Member variable 'B::a' is not assigned a value in 'B::operator='.\n",
-                      errout.str());
+              "};", 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",
+                      errout_str());
 
         check("class B\n"
               "{\n"
@@ -1770,7 +1858,7 @@ class TestConstructors : public TestFixture {
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:13]: (warning) Member variable 'A::m_SemVar' is not initialized in the move constructor.\n", errout.str());
+        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"
               "{\n"
@@ -1788,7 +1876,7 @@ class TestConstructors : public TestFixture {
               "    A(A &&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -1798,7 +1886,7 @@ class TestConstructors : public TestFixture {
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_nocopy2() { // ticket #2484
@@ -1815,8 +1903,8 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};", true);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
               "{\n"
@@ -1832,10 +1920,10 @@ class TestConstructors : public TestFixture {
               "    A(){}\n"
               "    A(const A&){}\n"
               "    const A& operator=(const A&){return *this;}\n"
-              "};", true);
-        ASSERT_EQUALS("[test.cpp:12]: (warning) Member variable 'A::m_SemVar' is not initialized in the constructor.\n"
-                      "[test.cpp:13]: (warning) Member variable 'A::m_SemVar' is not initialized in the copy constructor.\n"
-                      "[test.cpp:14]: (warning) Member variable 'A::m_SemVar' is not assigned a value in 'A::operator='.\n", errout.str());
+              "};", 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());
     }
 
     void initvar_nocopy3() { // #3611 - unknown type is non-copyable
@@ -1844,14 +1932,14 @@ class TestConstructors : public TestFixture {
               "    A() {}\n"
               "    A(const A& rhs) {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    B b;\n"
               "    A() {}\n"
               "    A(const A& rhs) {}\n"
-              "};", true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Member variable 'A::b' is not assigned in the copy constructor. Should it be copied?\n", errout.str());
+              "};", 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());
     }
 
     void initvar_nocopy4() { // #9247
@@ -1866,8 +1954,8 @@ class TestConstructors : public TestFixture {
               "}\n"
               "void S::Set(const T& val) {\n"
               "    t = val;\n"
-              "}", /*inconclusive*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_with_member_function_this() {
@@ -1876,7 +1964,7 @@ class TestConstructors : public TestFixture {
               "  void setMember(int m) { member = m; }\n"
               "  int member;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_destructor() {
@@ -1888,7 +1976,7 @@ class TestConstructors : public TestFixture {
               "    Fred() : var(0) {}\n"
               "    ~Fred() {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_func_ret_func_ptr() { // ticket #4449 (segmentation fault)
@@ -1896,7 +1984,7 @@ class TestConstructors : public TestFixture {
               "    int * ( something :: * process()) () { return 0; }\n"
               "    something() { process(); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_alias() { // #6921
@@ -1907,7 +1995,7 @@ class TestConstructors : public TestFixture {
               "        pa = 4;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    int a;\n"
@@ -1916,7 +2004,7 @@ class TestConstructors : public TestFixture {
               "        *pa = 4;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    int a[2];\n"
@@ -1926,7 +2014,7 @@ class TestConstructors : public TestFixture {
               "            *pa++ = i;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    int* a[2];\n"
@@ -1935,7 +2023,7 @@ class TestConstructors : public TestFixture {
               "        *pa = 0;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'S::a' is not initialized in the constructor.\n", errout.str());
+        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"
               "    int a;\n"
@@ -1944,7 +2032,7 @@ class TestConstructors : public TestFixture {
               "        pa = 4;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'S::a' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'S::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void initvar_templateMember() {
@@ -1963,7 +2051,7 @@ class TestConstructors : public TestFixture {
               "        Wrapper<dim>::foo(x);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initvar_smartptr() { // #10237
@@ -1981,7 +2069,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    double d;\n"
               "};", s);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #8485
               "    explicit S(const T& rhs) { set(*rhs); }\n"
@@ -1990,7 +2078,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    double d; \n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorEqSTL() {
@@ -2007,15 +2095,15 @@ class TestConstructors : public TestFixture {
               "{ }\n"
               "\n"
               "void Fred::operator=(const Fred &f)\n"
-              "{ }", true);
-        ASSERT_EQUALS("[test.cpp:13]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='.\n", errout.str());
+              "{ }", 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", s);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar1() {
@@ -2034,7 +2122,7 @@ class TestConstructors : public TestFixture {
               "    ECODES _code;\n"
               "};");
 
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'Fred::_code' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'Fred::_code' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
 
         check("class A{};\n"
@@ -2046,7 +2134,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "  float f;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'B::f' is not initialized in the constructor.\n", errout.str());
+        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"
               "{\n"
@@ -2059,7 +2147,7 @@ class TestConstructors : public TestFixture {
               "C::C(FILE *fp) {\n"
               "    C::fp = fp;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar2() {
@@ -2070,7 +2158,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar3() {
@@ -2085,7 +2173,7 @@ class TestConstructors : public TestFixture {
               "    };\n"
               "    Bar bars[2];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Using struct that doesn't have constructor
         check("class Foo\n"
@@ -2098,7 +2186,7 @@ class TestConstructors : public TestFixture {
               "    };\n"
               "    Bar bars[2];\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Foo::bars' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Foo::bars' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar4() {
@@ -2112,7 +2200,7 @@ class TestConstructors : public TestFixture {
               "    };\n"
               "    struct Bar bar;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar5() {
@@ -2124,7 +2212,7 @@ class TestConstructors : public TestFixture {
               "    { return *this; }\n"
               "    static int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar6() {
@@ -2135,7 +2223,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int mi;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo : public Bar\n"
               "{\n"
@@ -2144,7 +2232,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int mi;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar7() {
@@ -2165,7 +2253,7 @@ class TestConstructors : public TestFixture {
               "    copy.Swap(*this);\n"
               "    return *this;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar8() {
@@ -2182,7 +2270,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    return *this;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Member variable 'Foo::a' is not assigned a value in 'Foo::operator='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:11]: (warning) Member variable 'Foo::a' is not assigned a value in 'Foo::operator='. [operatorEqVarError]\n", errout_str());
     }
 
     void uninitVar9() { // ticket #1730
@@ -2196,7 +2284,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "    SetMinSize( wxSize( 48,48 ) );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Prefs::xasd' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:8]: (warning) Member variable 'Prefs::xasd' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar10() { // ticket #1993
@@ -2208,7 +2296,7 @@ class TestConstructors : public TestFixture {
               "        int var2;\n"
               "};\n"
               "A::A() : var1(0) { }");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Member variable 'A::var2' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:4]: (warning) Member variable 'A::var2' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar11() {
@@ -2219,7 +2307,7 @@ class TestConstructors : public TestFixture {
               "        int var;\n"
               "};\n"
               "A::A(int a) { }");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'A::var' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:4]: (warning) Member variable 'A::var' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar12() { // ticket #2078
@@ -2235,8 +2323,8 @@ class TestConstructors : public TestFixture {
               "    {}\n"
               "    int x, y;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Point::x' is not initialized in the constructor.\n"
-                      "[test.cpp:4]: (warning) Member variable 'Point::y' is not initialized in the constructor.\n", errout.str());
+        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());
     }
 
     void uninitVar13() { // ticket #1195
@@ -2247,7 +2335,7 @@ class TestConstructors : public TestFixture {
               "    A()\n"
               "    {}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'A::ints' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'A::ints' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar14() { // ticket #2149
@@ -2262,7 +2350,7 @@ class TestConstructors : public TestFixture {
               "Foo::Foo()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:6]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // single namespace
         check("namespace Output\n"
@@ -2278,7 +2366,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:10]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // constructor outside namespace
         check("namespace Output\n"
@@ -2294,7 +2382,7 @@ class TestConstructors : public TestFixture {
               "Foo::Foo()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // constructor outside namespace
         check("namespace Output\n"
@@ -2310,7 +2398,7 @@ class TestConstructors : public TestFixture {
               "Output::Foo::Foo()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:11]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor.\n", errout.str());
+        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
         check("namespace Output\n"
@@ -2327,7 +2415,7 @@ class TestConstructors : public TestFixture {
               "Foo::Foo()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:11]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor.\n", errout.str());
+        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
         check("namespace Output\n"
@@ -2346,7 +2434,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:13]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor.\n", errout.str());
+        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
         check("namespace Output\n"
@@ -2365,7 +2453,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // constructor in different separate namespace (won't compile)
         check("namespace Output\n"
@@ -2384,7 +2472,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // constructor in nested separate namespace
         check("namespace A\n"
@@ -2406,7 +2494,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:15]: (warning) Member variable 'Foo::mMember' is not initialized in the constructor.\n", errout.str());
+        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
         check("namespace A\n"
@@ -2428,7 +2516,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // constructor in nested different separate namespace
         check("namespace A\n"
@@ -2450,7 +2538,7 @@ class TestConstructors : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar15() {
@@ -2464,7 +2552,7 @@ class TestConstructors : public TestFixture {
               "Fred::~Fred()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar16() {
@@ -2482,7 +2570,7 @@ class TestConstructors : public TestFixture {
               "        foo.set(0);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo\n"
               "{\n"
@@ -2497,7 +2585,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'Bar::foo' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:5]: (warning) Member variable 'Bar::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar17() {
@@ -2514,7 +2602,7 @@ class TestConstructors : public TestFixture {
               "        foo[0].a = 0;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo\n"
               "{\n"
@@ -2528,7 +2616,7 @@ class TestConstructors : public TestFixture {
               "    {\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Member variable 'Bar::foo' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Bar::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar18() { // ticket #2465
@@ -2544,7 +2632,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    Altren value;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar19() { // ticket #2792
@@ -2568,7 +2656,7 @@ class TestConstructors : public TestFixture {
               "        free(m_str);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar20() { // ticket #2867
@@ -2580,7 +2668,7 @@ class TestConstructors : public TestFixture {
               "        double bitsInData_;\n"
               "    } obj;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor.\n", errout.str());
+        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"
               "Object::MemFunc() {\n"
@@ -2592,8 +2680,8 @@ class TestConstructors : public TestFixture {
               "    } obj;\n"
               "};");
         ASSERT_EQUALS(
-            "[test.cpp:5]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor.\n",
-            errout.str());
+            "[test.cpp:5:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n",
+            errout_str());
 
         check("struct copy_protected;\n"
               "Object::MemFunc() {\n"
@@ -2605,8 +2693,8 @@ class TestConstructors : public TestFixture {
               "    } obj;\n"
               "};");
         ASSERT_EQUALS(
-            "[test.cpp:5]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor.\n",
-            errout.str());
+            "[test.cpp:5:9]: (warning) Member variable 'LocalClass::bitsInData_' is not initialized in the constructor. [uninitMemberVar]\n",
+            errout_str());
     }
 
     void uninitVar21() { // ticket #2947
@@ -2619,7 +2707,7 @@ class TestConstructors : public TestFixture {
               "Fred::Fred() {\n"
               "    a[x::y] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar22() { // ticket #3043
@@ -2636,7 +2724,7 @@ class TestConstructors : public TestFixture {
               "    x = 0;\n"
               "    return *this;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
               "  public:\n"
@@ -2650,7 +2738,7 @@ class TestConstructors : public TestFixture {
               "Fred & Fred::clone(const Fred & other) {\n"
               "    return *this;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Fred::x' is not assigned a value in 'Fred::operator='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:14]: (warning) Member variable 'Fred::x' is not assigned a value in 'Fred::operator='. [operatorEqVarError]\n", errout_str());
     }
 
     void uninitVar23() { // ticket #3702
@@ -2668,11 +2756,11 @@ class TestConstructors : public TestFixture {
               "Fred::Fred(E e, struct F f) { }\n"
               "Fred::Fred(G g, H h) { }\n"
               "Fred::Fred(struct I i, struct J j) { }");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
-                      "[test.cpp:11]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
-                      "[test.cpp:12]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
-                      "[test.cpp:13]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n"
-                      "[test.cpp:14]: (warning) Member variable 'Fred::x' is not initialized in the constructor.\n", errout.str());
+        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"
+                      "[test.cpp:13:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:14:7]: (warning) Member variable 'Fred::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar24() { // ticket #3190
@@ -2698,11 +2786,11 @@ class TestConstructors : public TestFixture {
               "::Foo::Sub::Sub() { }\n"
               "class Foo;\n"
               "class Bar;\n"
-              "class Sub;\n", true);
+              "class Sub;\n", dinit(CheckOptions, $.inconclusive = true));
 
-        ASSERT_EQUALS("[test.cpp:9]: (warning, inconclusive) Member variable 'Sub::b' is not initialized in the constructor.\n"
-                      "[test.cpp:12]: (warning) Member variable 'Sub::b' is not initialized in the constructor.\n"
-                      "[test.cpp:20]: (warning) Member variable 'Sub::f' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:5]: (warning, inconclusive) Member variable 'Sub::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:12:11]: (warning) Member variable 'Sub::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:20:13]: (warning) Member variable 'Sub::f' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar25() { // ticket #4789
@@ -2747,25 +2835,25 @@ class TestConstructors : public TestFixture {
               "    int c;\n"
               "    F(int x = 0, int y = 0, int z = 0);\n"
               "};\n"
-              "F::F(int, int, int) { }\n", true);
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'A::a' is not initialized in the constructor.\n"
-                      "[test.cpp:7]: (warning) Member variable 'A::b' is not initialized in the constructor.\n"
-                      "[test.cpp:7]: (warning) Member variable 'A::c' is not initialized in the constructor.\n"
-                      "[test.cpp:14]: (warning) Member variable 'B::a' is not initialized in the constructor.\n"
-                      "[test.cpp:14]: (warning) Member variable 'B::b' is not initialized in the constructor.\n"
-                      "[test.cpp:14]: (warning) Member variable 'B::c' is not initialized in the constructor.\n"
-                      "[test.cpp:21]: (warning) Member variable 'C::a' is not initialized in the constructor.\n"
-                      "[test.cpp:21]: (warning) Member variable 'C::b' is not initialized in the constructor.\n"
-                      "[test.cpp:21]: (warning) Member variable 'C::c' is not initialized in the constructor.\n"
-                      "[test.cpp:28]: (warning) Member variable 'D::a' is not initialized in the constructor.\n"
-                      "[test.cpp:28]: (warning) Member variable 'D::b' is not initialized in the constructor.\n"
-                      "[test.cpp:28]: (warning) Member variable 'D::c' is not initialized in the constructor.\n"
-                      "[test.cpp:35]: (warning) Member variable 'E::a' is not initialized in the constructor.\n"
-                      "[test.cpp:35]: (warning) Member variable 'E::b' is not initialized in the constructor.\n"
-                      "[test.cpp:35]: (warning) Member variable 'E::c' is not initialized in the constructor.\n"
-                      "[test.cpp:42]: (warning) Member variable 'F::a' is not initialized in the constructor.\n"
-                      "[test.cpp:42]: (warning) Member variable 'F::b' is not initialized in the constructor.\n"
-                      "[test.cpp:42]: (warning) Member variable 'F::c' is not initialized in the constructor.\n", errout.str());
+              "F::F(int, int, int) { }\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:7:4]: (warning) Member variable 'A::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:7:4]: (warning) Member variable 'A::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:7:4]: (warning) Member variable 'A::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:14:4]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:14:4]: (warning) Member variable 'B::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:14:4]: (warning) Member variable 'B::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:21:4]: (warning) Member variable 'C::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:21:4]: (warning) Member variable 'C::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:21:4]: (warning) Member variable 'C::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:28:4]: (warning) Member variable 'D::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:28:4]: (warning) Member variable 'D::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:28:4]: (warning) Member variable 'D::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:35:4]: (warning) Member variable 'E::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:35:4]: (warning) Member variable 'E::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:35:4]: (warning) Member variable 'E::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:42:4]: (warning) Member variable 'F::a' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:42:4]: (warning) Member variable 'F::b' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:42:4]: (warning) Member variable 'F::c' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar26() {
@@ -2777,7 +2865,7 @@ class TestConstructors : public TestFixture {
               "        v = new int [sz = s];\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar27() {
@@ -2788,7 +2876,7 @@ class TestConstructors : public TestFixture {
               "        rtl::math::setNan(&d);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("class A {\n"
               "    double d;\n"
               "public:\n"
@@ -2796,7 +2884,7 @@ class TestConstructors : public TestFixture {
               "        ::rtl::math::setNan(&d);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar28() {
@@ -2811,7 +2899,7 @@ class TestConstructors : public TestFixture {
               "    void foo(int a) { i = a; }\n"
               "    void foo(float a) { f = a; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar29() {
@@ -2843,8 +2931,8 @@ class TestConstructors : public TestFixture {
               "	void foo() { }\n"
               "	void foo() const { i = 0; }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:18]: (warning) Member variable 'C::i' is not initialized in the constructor.\n"
-                      "[test.cpp:25]: (warning) Member variable 'D::i' is not initialized in the constructor.\n", errout.str());
+        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());
     }
 
     void uninitVar30() { // ticket #6417
@@ -2860,7 +2948,7 @@ class TestConstructors : public TestFixture {
               "using namespace NS;\n"
               "MyClass::~MyClass() { }\n"
               "MyClass::MyClass() : SomeVar(false) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar31() { // ticket #8271
@@ -2878,7 +2966,7 @@ class TestConstructors : public TestFixture {
               "void MyClass::Restart() {\n"
               "    m_retCode = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVar32() { // ticket #8835
@@ -2891,7 +2979,7 @@ class TestConstructors : public TestFixture {
               "      if (1) {}\n"
               "   }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Foo::member' is not initialized in the constructor.\n", errout.str());
+        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"
               "   int member;\n"
@@ -2901,7 +2989,7 @@ class TestConstructors : public TestFixture {
               "      while (1) {}\n"
               "   }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Foo::member' is not initialized in the constructor.\n", errout.str());
+        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"
               "   int member;\n"
@@ -2911,7 +2999,7 @@ class TestConstructors : public TestFixture {
               "      for (;;) {}\n"
               "   }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Foo::member' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:4]: (warning) Member variable 'Foo::member' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar33() { // ticket #10295
@@ -2923,7 +3011,7 @@ class TestConstructors : public TestFixture {
               "    };\n"
               "};\n"
               "app::B::B(void){}");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Member variable 'B::x' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:9]: (warning) Member variable 'B::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVar34() { // ticket #10841
@@ -2932,7 +3020,38 @@ class TestConstructors : public TestFixture {
               "    B() { a->f(); }\n"
               "    A* a;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'B::a' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'B::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
+    }
+
+    void uninitVar35() {
+        check("struct S {\n" // #12908
+              "    int a, b;\n"
+              "    explicit S(int h = 0);\n"
+              "    S(S&& s) : a(s.a), b(a.b) {\n"
+              "        s.a = 0;\n"
+              "    }\n"
+              "};\n"
+              "S::S(int h) : a(h), b(0) {}\n");
+        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() {
@@ -2944,7 +3063,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    char name[255];\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'John::name' is not initialized in the constructor.\n", errout.str());
+        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"
               "{\n"
@@ -2954,7 +3073,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    char name[255];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class John\n"
               "{\n"
@@ -2964,7 +3083,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    char name[255];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class John\n"
               "{\n"
@@ -2973,7 +3092,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double  operator[](const unsigned long i);\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A;\n"
               "class John\n"
@@ -2982,7 +3101,7 @@ class TestConstructors : public TestFixture {
               "    John() { }\n"
               "    A a[5];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A;\n"
               "class John\n"
@@ -2991,7 +3110,7 @@ class TestConstructors : public TestFixture {
               "    John() { }\n"
               "    A (*a)[5];\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'John::a' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'John::a' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVarArray2() {
@@ -3003,7 +3122,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    char name[255];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5754
         check("class John\n"
@@ -3014,7 +3133,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    char name[255];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray3() {
@@ -3031,7 +3150,7 @@ class TestConstructors : public TestFixture {
               "        memset(b,0,sizeof(b));\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray4() {
@@ -3048,7 +3167,7 @@ class TestConstructors : public TestFixture {
               "        if (snprintf(b,10,\"b\")) { }\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray5() {
@@ -3060,7 +3179,7 @@ class TestConstructors : public TestFixture {
               "    Foo()\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray6() {
@@ -3072,7 +3191,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "const char Foo::STR[] = \"abc\";\n"
               "Foo::Foo() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray7() {
@@ -3082,7 +3201,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Foo::array' is not initialized in the constructor.\n", errout.str());
+        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"
               "{\n"
@@ -3090,7 +3209,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { memset(array, 0, sizeof(array)); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo\n"
               "{\n"
@@ -3098,7 +3217,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { ::memset(array, 0, sizeof(array)); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray8() {
@@ -3107,7 +3226,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Foo() { ::ZeroMemory(a); }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray9() { // #6957
@@ -3118,7 +3237,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    IxExprListT() {}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'IxExprListT::eArr' is not initialized in the constructor.\n", errout.str());
+        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"
               "  ~sRAIUnitDefBL();\n"
@@ -3127,7 +3246,7 @@ class TestConstructors : public TestFixture {
               "  sRAIUnitDef() {}\n"
               "  sRAIUnitDefBL *List[35];\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'sRAIUnitDef::List' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:3]: (warning) Member variable 'sRAIUnitDef::List' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVarArray10() { // #11650
@@ -3144,11 +3263,25 @@ class TestConstructors : public TestFixture {
               "S() {}\n"
               "};\n", s);
 
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'S::a' is not initialized in the constructor.\n"
-                      "[test.cpp:10]: (warning) Member variable 'S::b' is not initialized in the constructor.\n"
-                      "[test.cpp:10]: (warning) Member variable 'S::c' is not initialized in the constructor.\n"
-                      "[test.cpp:10]: (warning) Member variable 'S::d' is not initialized in the constructor.\n",
-                      errout.str());
+        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"
+                      "[test.cpp:10:1]: (warning) Member variable 'S::c' is not initialized in the constructor. [uninitMemberVar]\n"
+                      "[test.cpp:10:1]: (warning) Member variable 'S::d' is not initialized in the constructor. [uninitMemberVar]\n",
+                      errout_str());
+    }
+
+    void uninitVarArray11() {
+        check("class C {\n" // #12150
+              "private:\n"
+              "    int buf[10];\n"
+              "public:\n"
+              "    C() {\n"
+              "        for (int& i : buf)\n"
+              "            i = 0;\n"
+              "    }\n"
+              "};\n");
+
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray2D() {
@@ -3160,7 +3293,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    char a[2][2];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarArray3D() {
@@ -3171,7 +3304,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    John() { a[0][0][0] = 0; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarCpp11Init1() {
@@ -3182,7 +3315,7 @@ class TestConstructors : public TestFixture {
               "        : bar({\"a\", \"b\"})\n"
               "    {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarCpp11Init2() {
@@ -3198,7 +3331,7 @@ class TestConstructors : public TestFixture {
               "    float get() const;\n"
               "};\n"
               "float Fred::get() const { return g; }");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Member variable 'Fred::g' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:5]: (warning) Member variable 'Fred::g' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVarStruct1() { // ticket #2172
@@ -3214,7 +3347,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -3228,7 +3361,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Member variable 'A::b' is not initialized in the constructor.\n", errout.str());
+        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"
               "{\n"
@@ -3243,7 +3376,7 @@ class TestConstructors : public TestFixture {
               "    A() {\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarStruct2() { // ticket #838
@@ -3260,7 +3393,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:11]: (warning) Member variable 'Fred::p' is not initialized in the constructor.\n", errout.str());
+        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"
               "{\n"
@@ -3276,7 +3409,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct POINT\n"
               "{\n"
@@ -3292,7 +3425,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
         check("struct POINT\n"
@@ -3308,7 +3441,7 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarUnion1() {
@@ -3320,19 +3453,16 @@ class TestConstructors : public TestFixture {
               "    Fred()\n"
               "    { a = 0; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred {\n"
               "private:\n"
               "    union { int a{}; int b; };\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarUnion2() {
-        // If the "data_type" is 0 it means union member "data" is invalid.
-        // So it's ok to not initialize "data".
-        // related forum: http://sourceforge.net/apps/phpbb/cppcheck/viewtopic.php?f=3&p=1806
         check("union Data { int id; int *ptr; };\n"
               "\n"
               "class Fred {\n"
@@ -3343,7 +3473,7 @@ class TestConstructors : public TestFixture {
               "    Fred() : data_type(0)\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (warning) Member variable 'Fred::data' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitMissingFuncDef() {
@@ -3356,7 +3486,7 @@ class TestConstructors : public TestFixture {
               "    void Init();"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown non-member function (friend class)
         check("class Fred\n"
@@ -3367,7 +3497,7 @@ class TestConstructors : public TestFixture {
               "    friend ABC;\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown non-member function (is Init a virtual function?)
         check("class Fred : private ABC\n"
@@ -3377,7 +3507,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
+        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
         check("class Fred\n"
@@ -3387,7 +3517,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
+        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
         check("class ABC { };\n"
@@ -3398,7 +3528,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
+        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
         check("class ABC {\n"
@@ -3418,6 +3548,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int i;\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
         check("class Fred : private ABC {\n"
@@ -3430,8 +3561,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
-
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarEnum1() {
@@ -3444,7 +3574,7 @@ class TestConstructors : public TestFixture {
               "    unsigned int i;\n"
               "};");
 
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Member variable 'Fred::i' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitVarEnum2() { // ticket #8146
@@ -3455,7 +3585,7 @@ class TestConstructors : public TestFixture {
               "    X x;\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarStream() {
@@ -3471,7 +3601,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarTypedef() {
@@ -3483,7 +3613,7 @@ class TestConstructors : public TestFixture {
               "    pointer a;\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarMemset() {
@@ -3494,7 +3624,7 @@ class TestConstructors : public TestFixture {
               "    Foo() { memset(this, 0, sizeof(*this)); }\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo\n"
               "{\n"
@@ -3503,7 +3633,7 @@ class TestConstructors : public TestFixture {
               "    Foo() { ::memset(this, 0, sizeof(*this)); }\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #7068
         check("struct Foo {\n"
@@ -3511,13 +3641,13 @@ class TestConstructors : public TestFixture {
               "    char c;\n"
               "    Foo() { memset(p, 0, sizeof(int)); }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Foo::c' is not initialized in the constructor.\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Foo::c' is not initialized in the constructor.\n", errout.str());
+        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"
               "struct FooBar {\n"
@@ -3531,7 +3661,7 @@ class TestConstructors : public TestFixture {
               "  FooBar foobar;\n"
               "  return foobar.foo.f + foobar.bar.b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'FooBar::bar' is not initialized in the constructor.\n", errout.str());
+        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"
               "struct FooBar {\n"
@@ -3545,7 +3675,7 @@ class TestConstructors : public TestFixture {
               "  FooBar foobar;\n"
               "  return foobar.foo.f + foobar.bar.b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'FooBar::bar' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:3]: (warning) Member variable 'FooBar::bar' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         // #7755
         check("struct A {\n"
@@ -3554,7 +3684,7 @@ class TestConstructors : public TestFixture {
               "  }\n"
               "  char data[42];\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void privateCtor1() {
@@ -3564,7 +3694,7 @@ class TestConstructors : public TestFixture {
                   "    int foo;\n"
                   "    Foo() { }\n"
                   "};", s);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3573,7 +3703,7 @@ class TestConstructors : public TestFixture {
                   "    int foo;\n"
                   "    Foo() { }\n"
                   "};", s);
-            ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'Foo::foo' is not initialized in the constructor.\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:5]: (warning) Member variable 'Foo::foo' is not initialized in the constructor. [uninitMemberVarPrivate]\n", errout_str());
         }
     }
 
@@ -3587,7 +3717,7 @@ class TestConstructors : public TestFixture {
               "    explicit Foo(int _i) { }\n"
               "};");
 
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'Foo::foo' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:14]: (warning) Member variable 'Foo::foo' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
 
@@ -3608,7 +3738,7 @@ class TestConstructors : public TestFixture {
               "    return p;\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -3621,7 +3751,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "    Fred() { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarInheritClassInit() {
@@ -3635,7 +3765,7 @@ class TestConstructors : public TestFixture {
               "private:\n"
               "    int x;\n"
               "};", s);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitOperator() {
@@ -3645,7 +3775,7 @@ class TestConstructors : public TestFixture {
               "    Fred() { }\n"
               "    int *operator [] (int index) { return 0; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitFunction1() {
@@ -3659,7 +3789,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -3671,7 +3801,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::d' is not initialized in the constructor.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "", errout_str());
     }
 
     void uninitFunction2() {
@@ -3685,7 +3815,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -3697,7 +3827,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::d' is not initialized in the constructor.\n", "",  errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "",  errout_str());
     }
 
     void uninitFunction3() {
@@ -3711,7 +3841,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -3723,7 +3853,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::d' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitFunction4() {
@@ -3737,7 +3867,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -3749,7 +3879,7 @@ class TestConstructors : public TestFixture {
               "\n"
               "    double d;\n"
               "};");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'Fred::d' is not initialized in the constructor.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4:5]: (warning) Member variable 'Fred::d' is not initialized in the constructor. [uninitMemberVar]\n", "", errout_str());
     }
 
     void uninitFunction5() { // #4072 - FP about struct that is initialized in function
@@ -3763,7 +3893,7 @@ class TestConstructors : public TestFixture {
               "    A() { Init( B ); };\n"
               "    void Init( Structure& S ) { S.C = 0; };\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Structure {\n"
               "    int C;\n"
@@ -3775,7 +3905,7 @@ class TestConstructors : public TestFixture {
               "    A() { Init( B ); };\n"
               "    void Init(const Structure& S) { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Member variable 'A::B' is not initialized in the constructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (warning) Member variable 'A::B' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
     }
 
     void uninitSameClassName() {
@@ -3800,7 +3930,7 @@ class TestConstructors : public TestFixture {
               "{\n"
               "    i = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class B\n"
               "{\n"
@@ -3826,8 +3956,8 @@ class TestConstructors : public TestFixture {
               "A::B::B()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:18]: (warning) Member variable 'B::j' is not initialized in the constructor.\n"
-                      "[test.cpp:22]: (warning) Member variable 'B::i' is not initialized in the constructor.\n", errout.str());
+        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());
 
         // Ticket #1700
         check("namespace n1\n"
@@ -3847,7 +3977,7 @@ class TestConstructors : public TestFixture {
               "    Foo() { }\n"
               "};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace n1\n"
               "{\n"
@@ -3869,7 +3999,7 @@ class TestConstructors : public TestFixture {
               "    Foo() { }\n"
               "};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:11]: (warning) Member variable 'Foo::i' is not initialized in the constructor.\n", errout.str());
+        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"
               "{\n"
@@ -3891,7 +4021,7 @@ class TestConstructors : public TestFixture {
               "    Foo() { }\n"
               "};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitFunctionOverload() {
@@ -3912,7 +4042,7 @@ class TestConstructors : public TestFixture {
               "    void init(int value)\n"
               "    { i = value; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -3930,7 +4060,7 @@ class TestConstructors : public TestFixture {
               "    void init(int value)\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Member variable 'A::i' is not initialized in the constructor.\n", errout.str());
+        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
               "    int length;\n"
@@ -3942,7 +4072,7 @@ class TestConstructors : public TestFixture {
               "    void Set(int num) { x = 1; }\n"
               "    void Set(bar num) { x = num.length; }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitVarOperatorEqual() { // ticket #2415
@@ -3951,7 +4081,7 @@ class TestConstructors : public TestFixture {
               "    A() { a=0; }\n"
               "    A(A const &a) { operator=(a); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int a;\n"
@@ -3962,7 +4092,7 @@ class TestConstructors : public TestFixture {
               "        return *this;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int a;\n"
@@ -3972,8 +4102,8 @@ class TestConstructors : public TestFixture {
               "        return *this;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'A::a' is not initialized in the copy constructor.\n"
-                      "[test.cpp:5]: (warning) Member variable 'A::a' is not assigned a value in 'A::operator='.\n", errout.str());
+        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());
     }
 
     void uninitVarPointer() { // #3801
@@ -3984,28 +4114,28 @@ class TestConstructors : public TestFixture {
               "    A* a;\n"
               "    B() { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Member variable 'B::a' is not initialized in the constructor.\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'B::a' is not initialized in the constructor.\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'B::a' is not initialized in the constructor.\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'B::a' is not initialized in the constructor.\n", errout.str());
+        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
               "public:\n"
@@ -4013,7 +4143,7 @@ class TestConstructors : public TestFixture {
               "    std::map<int, int>* pMap = nullptr;\n"
               "    std::string* pStr = nullptr;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <typename U>\n"
               "class C1 {}; \n"
@@ -4034,7 +4164,19 @@ class TestConstructors : public TestFixture {
               "    A::D2<int, int >* d2 = nullptr;\n"
               "    std::map<int, int>* pMap = nullptr;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        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() {
@@ -4044,29 +4186,29 @@ class TestConstructors : public TestFixture {
               "    B() { }\n"
               "    B(B& b) { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Member variable 'B::a' is not initialized in the constructor.\n"
-                      "[test.cpp:5]: (warning) Member variable 'B::a' is not initialized in the copy constructor.\n", errout.str());
+        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());
 
         check("struct A;\n"
               "struct B {\n"
               "    A* const a;\n"
               "    B& operator=(const B& r) { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str()); // #3804
+        ASSERT_EQUALS("", errout_str()); // #3804
 
         check("struct B {\n"
               "    const int a;\n"
               "    B() { }\n"
               "    B(B& b) { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Member variable 'B::a' is not initialized in the constructor.\n"
-                      "[test.cpp:4]: (warning) Member variable 'B::a' is not initialized in the copy constructor.\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Ticket #5641 "Regression. Crash for 'C() _STLP_NOTHROW {}'"
@@ -4076,7 +4218,7 @@ class TestConstructors : public TestFixture {
               "  C() _STLP_NOTHROW {}\n"
               "  C(const C&) _STLP_NOTHROW {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void classWithOperatorInName() { // ticket #2827
@@ -4085,7 +4227,7 @@ class TestConstructors : public TestFixture {
               "public:\n"
               "  operatorX() : mValue(0) {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void templateConstructor() { // ticket #7942
@@ -4095,7 +4237,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "template <class T> Container<T>::Container() : mElements(nullptr) {}\n"
               "Container<int> intContainer;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void typedefArray() { // ticket #5766
@@ -4105,7 +4247,7 @@ class TestConstructors : public TestFixture {
               "    SelectionPosition() {}\n"
               "    const rvec &x() const;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitAssignmentWithOperator() {
@@ -4119,9 +4261,9 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};", true);
+              "};", 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]: (warning) Member variable 'C::x' is not initialized in the constructor.\n", errout.str());
+                           "[test.cpp:3:5]: (warning) Member variable 'C::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4133,9 +4275,9 @@ class TestConstructors : public TestFixture {
               "        x = 1;\n"
               "        return true;\n"
               "    }\n"
-              "};", true);
+              "};", 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]: (warning) Member variable 'C::x' is not initialized in the constructor.\n", errout.str());
+                           "[test.cpp:3:5]: (warning) Member variable 'C::x' is not initialized in the constructor. [uninitMemberVar]\n", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4148,7 +4290,7 @@ class TestConstructors : public TestFixture {
               "        return true;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4161,7 +4303,7 @@ class TestConstructors : public TestFixture {
               "        return true;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4171,7 +4313,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4181,7 +4323,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4191,7 +4333,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4201,7 +4343,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4211,7 +4353,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4221,7 +4363,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4231,7 +4373,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4241,7 +4383,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitCompoundAssignment() {
@@ -4256,7 +4398,7 @@ class TestConstructors : public TestFixture {
               "        return true;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4269,7 +4411,7 @@ class TestConstructors : public TestFixture {
               "        return true;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4279,7 +4421,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4289,7 +4431,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4299,7 +4441,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4309,7 +4451,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4319,7 +4461,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4329,7 +4471,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4339,7 +4481,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4349,7 +4491,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitComparisonAssignment() {
@@ -4364,7 +4506,7 @@ class TestConstructors : public TestFixture {
               "        return true;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4377,7 +4519,7 @@ class TestConstructors : public TestFixture {
               "        return true;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4386,7 +4528,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4395,7 +4537,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4404,7 +4546,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n"
               "    int x;\n"
@@ -4413,7 +4555,7 @@ class TestConstructors : public TestFixture {
               "    }\n"
               "    int SetValue() { return x = 1; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitTemplate1() {
@@ -4431,7 +4573,7 @@ class TestConstructors : public TestFixture {
               "  private:\n"
               "    A* b;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<class T> class A{};\n"
               "template<class T1, class T2> class B{};\n"
@@ -4443,7 +4585,7 @@ class TestConstructors : public TestFixture {
               "};\n"
               "template<class T1, class T2>\n"
               "A<B<T1, T2>>::A() : m_value(false) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <typename T> struct S;\n" // #11177
               "template <> struct S<void> final {\n"
@@ -4451,7 +4593,7 @@ class TestConstructors : public TestFixture {
               "    int& m;\n"
               "};\n"
               "S<void>::S(int& i) : m(i) {}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unknownTemplateType() {
@@ -4462,7 +4604,7 @@ class TestConstructors : public TestFixture {
               "    A& operator=() { return *this; }\n"
               "};\n"
               "A<decltype(SOMETHING)> a;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 };
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
index 08b1adcbd94..2de32efb022 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-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
@@ -16,73 +16,87 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "check.h"
+#include "addoninfo.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 <algorithm>
+#include <cstdio>
+#include <cstdlib>
 #include <list>
 #include <string>
+#include <unordered_set>
+#include <utility>
+#include <vector>
 
+#include <simplecpp.h>
 
 class TestCppcheck : public TestFixture {
 public:
     TestCppcheck() : TestFixture("TestCppcheck") {}
 
 private:
+    const std::string templateFormat{"{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]"};
 
     class ErrorLogger2 : public ErrorLogger {
     public:
-        std::list<std::string> id;
+        std::list<std::string> ids;
+        std::list<ErrorMessage> errmsgs;
 
+    private:
         void reportOut(const std::string & /*outmsg*/, Color /*c*/ = Color::Reset) override {}
 
         void reportErr(const ErrorMessage &msg) override {
-            id.push_back(msg.id);
+            ids.push_back(msg.id);
+            errmsgs.push_back(msg);
+        }
+
+        void reportMetric(const std::string &metric) override {
+            (void) metric;
         }
     };
 
     void run() override {
-        TEST_CASE(instancesSorted);
-        TEST_CASE(classInfoFormat);
         TEST_CASE(getErrorMessages);
-    }
-
-    void instancesSorted() const {
-        for (std::list<Check *>::const_iterator i = Check::instances().cbegin(); i != Check::instances().cend(); ++i) {
-            std::list<Check *>::const_iterator j = i;
-            ++j;
-            if (j != Check::instances().cend()) {
-                ASSERT_EQUALS(true, (*i)->name() < (*j)->name());
-            }
-        }
-    }
-
-    void classInfoFormat() const {
-        for (std::list<Check *>::const_iterator i = Check::instances().cbegin(); i != Check::instances().cend(); ++i) {
-            const std::string info = (*i)->classInfo();
-            if (!info.empty()) {
-                ASSERT('\n' != info[0]);         // No \n in the beginning
-                ASSERT('\n' == info.back());     // \n at end
-                if (info.size() > 1)
-                    ASSERT('\n' != info[info.length()-2]); // Only one \n at end
-            }
-        }
+        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);
     }
 
     void getErrorMessages() const {
         ErrorLogger2 errorLogger;
         CppCheck::getErrorMessages(errorLogger);
-        ASSERT(!errorLogger.id.empty());
+        ASSERT(!errorLogger.ids.empty());
 
         // Check if there are duplicate error ids in errorLogger.id
         std::string duplicate;
-        for (std::list<std::string>::const_iterator it = errorLogger.id.cbegin();
-             it != errorLogger.id.cend();
+        for (auto it = errorLogger.ids.cbegin();
+             it != errorLogger.ids.cend();
              ++it) {
-            if (std::find(errorLogger.id.cbegin(), it, *it) != it) {
+            if (std::find(errorLogger.ids.cbegin(), it, *it) != it) {
                 duplicate = "Duplicate ID: " + *it;
                 break;
             }
@@ -92,15 +106,524 @@ class TestCppcheck : public TestFixture {
         // Check for error ids from this class.
         bool foundPurgedConfiguration = false;
         bool foundTooManyConfigs = false;
-        for (const std::string & it : errorLogger.id) {
+        bool foundMissingInclude = false; // #11984
+        bool foundMissingIncludeSystem = false; // #11984
+        for (const std::string & it : errorLogger.ids) {
             if (it == "purgedConfiguration")
                 foundPurgedConfiguration = true;
             else if (it == "toomanyconfigs")
                 foundTooManyConfigs = true;
+            else if (it == "missingInclude")
+                foundMissingInclude = true;
+            else if (it == "missingIncludeSystem")
+                foundMissingIncludeSystem = true;
         }
         ASSERT(foundPurgedConfiguration);
         ASSERT(foundTooManyConfigs);
+        ASSERT(foundMissingInclude);
+        ASSERT(foundMissingIncludeSystem);
+    }
+
+    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
+    {
+        REDIRECT;
+        ScopedFile file(fname,
+                        "void f()\n"
+                        "{\n"
+                        "  (void)(*((int*)0));\n"
+                        "}");
+
+        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::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());
+        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 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
+    {
+        REDIRECT;
+        ScopedFile file(fname,
+                        "void f()\n"
+                        "{\n"
+                        "  (void)(*((int*)0));\n"
+                        "}");
+
+        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::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());
+        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("suppr_err_lib.c",
+                        "void f()\n"
+                        "{\n"
+                        "  (void)(*((int*)0));\n"
+                        "}");
+
+        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, 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) {
+            return id == "logChecker";
+        }), errorLogger.ids.end());
+        ASSERT_EQUALS(0, errorLogger.ids.size());
     }
+
+    // TODO: how to actually get duplicated findings
+    void unique_errors() const
+    {
+        ScopedFile file("inc.h",
+                        "inline void f()\n"
+                        "{\n"
+                        "  (void)(*((int*)0));\n"
+                        "}");
+        ScopedFile test_file_a("a.c",
+                               "#include \"inc.h\"");
+        ScopedFile test_file_b("b.c",
+                               "#include \"inc.h\"");
+
+        // 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, 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?
+        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(2, errorLogger.errmsgs.size());
+        auto it = errorLogger.errmsgs.cbegin();
+        ASSERT_EQUALS("a.c", it->file0);
+        ASSERT_EQUALS("nullPointer", it->id);
+        ++it;
+        ASSERT_EQUALS("b.c", it->file0);
+        ASSERT_EQUALS("nullPointer", it->id);
+    }
+
+    void unique_errors_2() const
+    {
+        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"
+                             "}");
+
+        // 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, 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(2, errorLogger.errmsgs.size());
+        auto it = errorLogger.errmsgs.cbegin();
+        ASSERT_EQUALS("c.c", it->file0);
+        ASSERT_EQUALS(1, it->callStack.size());
+        {
+            auto stack = it->callStack.cbegin();
+            ASSERT_EQUALS(4, stack->line);
+            ASSERT_EQUALS(9, stack->column);
+        }
+        ASSERT_EQUALS("arrayIndexOutOfBounds", it->id);
+        ++it;
+        ASSERT_EQUALS("c.c", it->file0);
+        ASSERT_EQUALS(1, it->callStack.size());
+        {
+            auto stack = it->callStack.cbegin();
+            ASSERT_EQUALS(4, stack->line);
+            ASSERT_EQUALS(17, stack->column);
+        }
+        ASSERT_EQUALS("arrayIndexOutOfBounds", it->id);
+    }
+
+    void isPremiumCodingStandardId() const {
+        Suppressions supprs;
+        ErrorLogger2 errorLogger;
+
+        {
+            const auto s = dinit(Settings, $.premiumArgs = "");
+            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-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"));
+        }
+
+        {
+            const auto s = dinit(Settings, $.premiumArgs = "--misra-c-2012 --cert-c++-2016 --autosar");
+
+            CppCheck cppcheck(s, supprs, errorLogger, nullptr, false, {});
+
+            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"));
+        }
+    }
+
+    void getDumpFileContentsRawTokens() const {
+        Settings s;
+        s.relativePaths = true;
+        s.basePaths.emplace_back("/some/path");
+        Suppressions supprs;
+        ErrorLogger2 errorLogger;
+        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.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 {
+        Suppressions supprs;
+        ErrorLogger2 errorLogger;
+
+        {
+            Settings s;
+            s.libraries.emplace_back("std.cfg");
+            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());
+        }
+
+        {
+            Settings s;
+            s.libraries.emplace_back("std.cfg");
+            s.libraries.emplace_back("posix.cfg");
+            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;
+        std::vector<std::string> files = {"textfile.txt"};
+
+        {
+            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, files);
+            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, files);
+            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), files);
+        }
+    }
+
+    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.loadFiles(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' was not checked because its code equals another one. [purgedConfiguration]",
+                      it->toString(false, templateFormat, ""));
+    }
+
+    // TODO: test suppressions
+    // TODO: test all with FS
 };
 
 REGISTER_TEST(TestCppcheck)
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
index 1f48090e802..42537ca36fb 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-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
@@ -16,42 +16,51 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#include "checkers.h"
 #include "cppcheck.h"
 #include "errorlogger.h"
 #include "errortypes.h"
-#include "suppressions.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "suppressions.h"
 
-#include <iosfwd>
 #include <list>
 #include <string>
+#include <utility>
 
-#include <tinyxml2.h>
+#include "xml.h"
 
 class TestErrorLogger : public TestFixture {
 public:
     TestErrorLogger() : TestFixture("TestErrorLogger") {}
 
 private:
+    const std::string templateFormat{"{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"};
+
     const ErrorMessage::FileLocation fooCpp5{"foo.cpp", 5, 1};
     const ErrorMessage::FileLocation barCpp8{"bar.cpp", 8, 1};
+    const ErrorMessage::FileLocation barCpp8_i{"bar.cpp", "ä", 8, 1};
 
     void run() override {
         TEST_CASE(PatternSearchReplace);
-        TEST_CASE(FileLocationDefaults);
+        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(ErrorMessageFromInternalError);
         TEST_CASE(CustomFormat);
         TEST_CASE(CustomFormat2);
         TEST_CASE(CustomFormatLocations);
         TEST_CASE(ToXmlV2);
-        TEST_CASE(ToXmlV2Locations);
+        TEST_CASE(ToXmlV2RemarkComment);
+        TEST_CASE(ToXmlLocations);
         TEST_CASE(ToXmlV2Encoding);
         TEST_CASE(FromXmlV2);
+        TEST_CASE(ToXmlV3);
 
         // Inconclusive results in xml reports..
         TEST_CASE(InconclusiveXml);
@@ -61,10 +70,14 @@ class TestErrorLogger : public TestFixture {
         TEST_CASE(DeserializeInvalidInput);
         TEST_CASE(SerializeSanitize);
         TEST_CASE(SerializeFileLocation);
+        TEST_CASE(SerializeAndDeserialize);
 
-        TEST_CASE(suppressUnmatchedSuppressions);
         TEST_CASE(substituteTemplateFormatStatic);
         TEST_CASE(substituteTemplateLocationStatic);
+
+        TEST_CASE(isCriticalErrorId);
+
+        TEST_CASE(TestReportType);
     }
 
     void TestPatternSearchReplace(const std::string& idPlaceholder, const std::string& id) const {
@@ -73,13 +86,13 @@ class TestErrorLogger : public TestFixture {
         ErrorMessage message;
         message.id = id;
 
-        std::string serialized = message.toString(true, idPlaceholder + plainText + idPlaceholder);
+        std::string serialized = message.toString(true, idPlaceholder + plainText + idPlaceholder, "");
         ASSERT_EQUALS(id + plainText + id, serialized);
 
-        serialized = message.toString(true, idPlaceholder + idPlaceholder);
+        serialized = message.toString(true, idPlaceholder + idPlaceholder, "");
         ASSERT_EQUALS(id + id, serialized);
 
-        serialized = message.toString(true, plainText + idPlaceholder + plainText);
+        serialized = message.toString(true, plainText + idPlaceholder + plainText, "");
         ASSERT_EQUALS(plainText + id + plainText, serialized);
     }
 
@@ -102,136 +115,318 @@ class TestErrorLogger : public TestFixture {
         TestPatternSearchReplace(idPlaceholder, longIdValue);
     }
 
-    void FileLocationDefaults() const {
-        ErrorMessage::FileLocation loc;
-        ASSERT_EQUALS("", loc.getfile());
-        ASSERT_EQUALS(0, loc.line);
+    void FileLocationConstruct() const {
+        {
+            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", "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", "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", "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", "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;
+        ErrorMessage::FileLocation loc("foo1.cpp", 0, 0);
         loc.setfile("foo.cpp");
-        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
+        ASSERT_EQUALS("[foo.cpp:0]", loc.stringify(false));
+        ASSERT_EQUALS("[foo.cpp:0:0]", loc.stringify(true));
+    }
+
+    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(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));
+        ASSERT_EQUALS("[foo.cpp]", loc.stringify(true));
     }
 
     void ErrorMessageConstruct() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.", "errorId", Certainty::normal);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.", "errorId", Certainty::normal);
         ASSERT_EQUALS(1, msg.callStack.size());
         ASSERT_EQUALS("Programming error.", msg.shortMessage());
         ASSERT_EQUALS("Programming error.", msg.verboseMessage());
-        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(false));
-        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(true));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(true, templateFormat, ""));
     }
 
     void ErrorMessageConstructLocations() const {
         std::list<ErrorMessage::FileLocation> locs = { fooCpp5, barCpp8 };
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.", "errorId", Certainty::normal);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.", "errorId", Certainty::normal);
         ASSERT_EQUALS(2, msg.callStack.size());
         ASSERT_EQUALS("Programming error.", msg.shortMessage());
         ASSERT_EQUALS("Programming error.", msg.verboseMessage());
-        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Programming error.", msg.toString(false));
-        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Programming error.", msg.toString(true));
+        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Programming error.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Programming error.", msg.toString(true, templateFormat, ""));
     }
 
     void ErrorMessageVerbose() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        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("[foo.cpp:5]: (error) Programming error.", msg.toString(false));
-        ASSERT_EQUALS("[foo.cpp:5]: (error) Verbose error", msg.toString(true));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5]: (error) Verbose error", msg.toString(true, templateFormat, ""));
     }
 
     void ErrorMessageVerboseLocations() const {
         std::list<ErrorMessage::FileLocation> locs = { fooCpp5, barCpp8 };
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
         ASSERT_EQUALS(2, msg.callStack.size());
         ASSERT_EQUALS("Programming error.", msg.shortMessage());
         ASSERT_EQUALS("Verbose error", msg.verboseMessage());
-        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Programming error.", msg.toString(false));
-        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Verbose error", msg.toString(true));
+        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Programming error.", msg.toString(false, templateFormat, ""));
+        ASSERT_EQUALS("[foo.cpp:5] -> [bar.cpp:8]: (error) Verbose error", msg.toString(true, templateFormat, ""));
+    }
+
+    void ErrorMessageFromInternalError() const {
+        // TODO: test with token
+        {
+            InternalError internalError(nullptr, "message", InternalError::INTERNAL);
+            const auto msg = ErrorMessage::fromInternalError(internalError, nullptr, "file.c");
+            ASSERT_EQUALS(1, msg.callStack.size());
+            const auto &loc = *msg.callStack.cbegin();
+            ASSERT_EQUALS(0, loc.fileIndex);
+            ASSERT_EQUALS(0, loc.line);
+            ASSERT_EQUALS(0, loc.column);
+            ASSERT_EQUALS("message", msg.shortMessage());
+            ASSERT_EQUALS("message", msg.verboseMessage());
+            ASSERT_EQUALS("[file.c:0]: (error) message", msg.toString(false, templateFormat, ""));
+            ASSERT_EQUALS("[file.c:0]: (error) message", msg.toString(true, templateFormat, ""));
+        }
+        {
+            InternalError internalError(nullptr, "message", "details", InternalError::INTERNAL);
+            const auto msg = ErrorMessage::fromInternalError(internalError, nullptr, "file.cpp", "msg");
+            ASSERT_EQUALS(1, msg.callStack.size());
+            const auto &loc = *msg.callStack.cbegin();
+            ASSERT_EQUALS(0, loc.fileIndex);
+            ASSERT_EQUALS(0, loc.line);
+            ASSERT_EQUALS(0, loc.column);
+            ASSERT_EQUALS("msg: message", msg.shortMessage());
+            ASSERT_EQUALS("msg: message: details", msg.verboseMessage());
+            ASSERT_EQUALS("[file.cpp:0]: (error) msg: message", msg.toString(false, templateFormat, ""));
+            ASSERT_EQUALS("[file.cpp:0]: (error) msg: message: details", msg.toString(true, templateFormat, ""));
+        }
+    }
+
+    #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 mapping = createGuidelineMapping(reportType);
+
+        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_LOC(expectedClassification, msg.classification, file, line);
+        ASSERT_EQUALS_LOC(expectedGuideline, msg.guideline, file, line);
+    }
+
+    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, "misra-c2012-dir-4.6", "Advisory", "Dir 4.6");
+        testReportType(ReportType::certC, Severity::error, "resourceLeak", "L3", "FIO42-C");
     }
 
     void CustomFormat() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        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("foo.cpp:5,error,errorId,Programming error.", msg.toString(false, "{file}:{line},{severity},{id},{message}"));
-        ASSERT_EQUALS("foo.cpp:5,error,errorId,Verbose error", msg.toString(true, "{file}:{line},{severity},{id},{message}"));
+        ASSERT_EQUALS("foo.cpp:5,error,errorId,Programming error.", msg.toString(false, "{file}:{line},{severity},{id},{message}", ""));
+        ASSERT_EQUALS("foo.cpp:5,error,errorId,Verbose error", msg.toString(true, "{file}:{line},{severity},{id},{message}", ""));
     }
 
     void CustomFormat2() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        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("Programming error. - foo.cpp(5):(error,errorId)", msg.toString(false, "{message} - {file}({line}):({severity},{id})"));
-        ASSERT_EQUALS("Verbose error - foo.cpp(5):(error,errorId)", msg.toString(true, "{message} - {file}({line}):({severity},{id})"));
+        ASSERT_EQUALS("Programming error. - foo.cpp(5):(error,errorId)", msg.toString(false, "{message} - {file}({line}):({severity},{id})", ""));
+        ASSERT_EQUALS("Verbose error - foo.cpp(5):(error,errorId)", msg.toString(true, "{message} - {file}({line}):({severity},{id})", ""));
     }
 
     void CustomFormatLocations() const {
         // Check that first location from location stack is used in template
         std::list<ErrorMessage::FileLocation> locs = { fooCpp5, barCpp8 };
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
         ASSERT_EQUALS(2, msg.callStack.size());
         ASSERT_EQUALS("Programming error.", msg.shortMessage());
         ASSERT_EQUALS("Verbose error", msg.verboseMessage());
-        ASSERT_EQUALS("Programming error. - bar.cpp(8):(error,errorId)", msg.toString(false, "{message} - {file}({line}):({severity},{id})"));
-        ASSERT_EQUALS("Verbose error - bar.cpp(8):(error,errorId)", msg.toString(true, "{message} - {file}({line}):({severity},{id})"));
+        ASSERT_EQUALS("Programming error. - bar.cpp(8):(error,errorId)", msg.toString(false, "{message} - {file}({line}):({severity},{id})", ""));
+        ASSERT_EQUALS("Verbose error - bar.cpp(8):(error,errorId)", msg.toString(true, "{message} - {file}({line}):({severity},{id})", ""));
     }
 
     void ToXmlV2() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);
+        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());
+        ASSERT_EQUALS("    </errors>\n</results>", ErrorMessage::getXMLFooter(2));
         std::string message("        <error id=\"errorId\" severity=\"error\"");
         message += " msg=\"Programming error.\" verbose=\"Verbose error\">\n";
         message += "            <location file=\"foo.cpp\" line=\"5\" column=\"1\"/>\n        </error>";
         ASSERT_EQUALS(message, msg.toXML());
     }
 
-    void ToXmlV2Locations() const {
-        std::list<ErrorMessage::FileLocation> locs = { fooCpp5, barCpp8 };
-        locs.back().setinfo("ä");
-        ErrorMessage msg(locs, emptyString, 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());
-        std::string message("        <error id=\"errorId\" severity=\"error\"");
-        message += " msg=\"Programming error.\" verbose=\"Verbose error\">\n";
+    void ToXmlV2RemarkComment() const {
+        ErrorMessage msg({}, "", Severity::warning, "", "id", Certainty::normal);
+        msg.remark = "remark";
+        ASSERT_EQUALS("        <error id=\"id\" severity=\"warning\" msg=\"\" verbose=\"\" remark=\"remark\"/>", msg.toXML());
+    }
+
+    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 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(locs, emptyString, 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());
         }
         {
             const char code1[]="äöü";
             const char code2[]="\x12\x00\x00\x01";
-            std::list<ErrorMessage::FileLocation> locs;
-            ErrorMessage msg1(locs, emptyString, Severity::error, std::string("Programming error.\nReading \"")+code1+"\"", "errorId", Certainty::normal);
+            ErrorMessage msg1({}, "", Severity::error, std::string("Programming error.\nReading \"")+code1+"\"", "errorId", Certainty::normal);
             ASSERT_EQUALS("        <error id=\"errorId\" severity=\"error\" msg=\"Programming error.\" verbose=\"Reading &quot;\\303\\244\\303\\266\\303\\274&quot;\"/>", msg1.toXML());
-            ErrorMessage msg2(locs, emptyString, Severity::error, std::string("Programming error.\nReading \"")+code2+"\"", "errorId", Certainty::normal);
+            ErrorMessage msg2({}, "", Severity::error, std::string("Programming error.\nReading \"")+code2+"\"", "errorId", Certainty::normal);
             ASSERT_EQUALS("        <error id=\"errorId\" severity=\"error\" msg=\"Programming error.\" verbose=\"Reading &quot;\\022&quot;\"/>", msg2.toXML());
         }
     }
@@ -247,33 +442,47 @@ 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);
+        const auto * const rootnode = doc.FirstChildElement();
+        ASSERT(rootnode);
         ErrorMessage msg(doc.FirstChildElement());
         ASSERT_EQUALS("errorId", msg.id);
-        ASSERT_EQUALS(Severity::error, msg.severity);
+        ASSERT_EQUALS_ENUM(Severity::error, msg.severity);
         ASSERT_EQUALS(123u, msg.cwe.id);
-        ASSERT_EQUALS(static_cast<int>(Certainty::inconclusive), static_cast<int>(msg.certainty));
+        ASSERT_EQUALS_ENUM(Certainty::inconclusive, msg.certainty);
         ASSERT_EQUALS("Programming error.", msg.shortMessage());
         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);
     }
 
+    void ToXmlV3() const {
+        std::string header("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<results version=\"3\">\n");
+        header += "    <cppcheck version=\"";
+        header += CppCheck::version();
+        header += "\"/>\n    <errors>";
+        ASSERT_EQUALS(header, ErrorMessage::getXMLHeader("", 3));
+
+        ASSERT_EQUALS("</results>", ErrorMessage::getXMLFooter(3));
+    }
+
     void InconclusiveXml() const {
         // Location
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
 
         // Inconclusive error message
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error", "errorId", Certainty::inconclusive);
+        ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error", "errorId", Certainty::inconclusive);
 
         // xml version 2 error message
         ASSERT_EQUALS("        <error id=\"errorId\" severity=\"error\" msg=\"Programming error\" verbose=\"Programming error\" inconclusive=\"true\">\n"
@@ -284,8 +493,7 @@ class TestErrorLogger : public TestFixture {
 
     void SerializeInconclusiveMessage() const {
         // Inconclusive error message
-        std::list<ErrorMessage::FileLocation> locs;
-        ErrorMessage msg(locs, emptyString, 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();
@@ -293,18 +501,20 @@ class TestErrorLogger : public TestFixture {
                       "5 error"
                       "1 0"
                       "1 0"
+                      "0 "
                       "8 test.cpp"
-                      "12 inconclusive"
+                      "1 1"
                       "17 Programming error"
                       "17 Programming error"
+                      "0 "
                       "0 ", msg_str);
 
         ErrorMessage msg2;
         ASSERT_NO_THROW(msg2.deserialize(msg_str));
         ASSERT_EQUALS("errorId", msg2.id);
-        ASSERT_EQUALS(Severity::error, msg2.severity);
+        ASSERT_EQUALS_ENUM(Severity::error, msg2.severity);
         ASSERT_EQUALS("test.cpp", msg2.file0);
-        ASSERT_EQUALS(static_cast<int>(Certainty::inconclusive), static_cast<int>(msg2.certainty));
+        ASSERT_EQUALS_ENUM(Certainty::inconclusive, msg2.certainty);
         ASSERT_EQUALS("Programming error", msg2.shortMessage());
         ASSERT_EQUALS("Programming error", msg2.verboseMessage());
     }
@@ -314,22 +524,22 @@ class TestErrorLogger : public TestFixture {
             // missing/invalid length
             // missing separator
             ErrorMessage msg;
-            ASSERT_THROW_EQUALS(msg.deserialize("500foobar"), InternalError, "Internal Error: Deserialization of error message failed - invalid separator");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize("500foobar"), INTERNAL, "Internal Error: Deserialization of error message failed - invalid separator");
         }
         {
             // invalid length
             ErrorMessage msg;
-            ASSERT_THROW_EQUALS(msg.deserialize("foo foobar"), InternalError, "Internal Error: Deserialization of error message failed - invalid length");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize("foo foobar"), INTERNAL, "Internal Error: Deserialization of error message failed - invalid length");
         }
         {
             // mismatching length
             ErrorMessage msg;
-            ASSERT_THROW_EQUALS(msg.deserialize("8 errorId"), InternalError, "Internal Error: Deserialization of error message failed - premature end of data");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize("8 errorId"), INTERNAL, "Internal Error: Deserialization of error message failed - premature end of data");
         }
         {
             // incomplete message
             ErrorMessage msg;
-            ASSERT_THROW_EQUALS(msg.deserialize("7 errorId"), InternalError, "Internal Error: Deserialization of error message failed - invalid length");
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize("7 errorId"), INTERNAL, "Internal Error: Deserialization of error message failed - invalid length");
         }
         {
             // invalid CWE ID
@@ -337,12 +547,14 @@ class TestErrorLogger : public TestFixture {
                                "5 error"
                                "7 invalid" // cwe
                                "1 0"
+                               "0 "
                                "8 test.cpp"
                                "17 Programming error"
                                "17 Programming error"
+                               "0 "
                                "0 ";
             ErrorMessage msg;
-            ASSERT_THROW_EQUALS(msg.deserialize(str), InternalError, "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 hash
@@ -350,12 +562,15 @@ class TestErrorLogger : public TestFixture {
                                "5 error"
                                "1 0"
                                "7 invalid" // hash
+                               "1 0"
+                               "0 "
                                "8 test.cpp"
                                "17 Programming error"
                                "17 Programming error"
+                               "0 "
                                "0 ";
             ErrorMessage msg;
-            ASSERT_THROW_EQUALS(msg.deserialize(str), InternalError, "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");
         }
         {
             // out-of-range CWE ID
@@ -363,18 +578,20 @@ class TestErrorLogger : public TestFixture {
                                "5 error"
                                "5 65536" // max +1
                                "1 0"
+                               "1 0"
+                               "0 "
                                "8 test.cpp"
                                "17 Programming error"
                                "17 Programming error"
+                               "0 "
                                "0 ";
             ErrorMessage msg;
-            ASSERT_THROW(msg.deserialize(str), InternalError);
+            ASSERT_THROW_INTERNAL_EQUALS(msg.deserialize(str), INTERNAL, "Internal Error: Deserialization of error message failed - invalid CWE ID - out of range (limits)");
         }
     }
 
     void SerializeSanitize() const {
-        std::list<ErrorMessage::FileLocation> locs;
-        ErrorMessage msg(locs, emptyString, 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();
@@ -382,28 +599,28 @@ class TestErrorLogger : public TestFixture {
                       "5 error"
                       "1 0"
                       "1 0"
+                      "0 "
                       "3 1.c"
+                      "1 0"
                       "33 Illegal character in \"foo\\001bar\""
                       "33 Illegal character in \"foo\\001bar\""
+                      "0 "
                       "0 ", msg_str);
 
         ErrorMessage msg2;
         ASSERT_NO_THROW(msg2.deserialize(msg_str));
         ASSERT_EQUALS("errorId", msg2.id);
-        ASSERT_EQUALS(Severity::error, msg2.severity);
+        ASSERT_EQUALS_ENUM(Severity::error, msg2.severity);
         ASSERT_EQUALS("1.c", msg2.file0);
         ASSERT_EQUALS("Illegal character in \"foo\\001bar\"", msg2.shortMessage());
         ASSERT_EQUALS("Illegal character in \"foo\\001bar\"", msg2.verboseMessage());
     }
 
     void SerializeFileLocation() const {
-        ErrorMessage::FileLocation loc1(":/,;", 654, 33);
+        ErrorMessage::FileLocation loc1(":/,;", "abcd:/,", 654, 33);
         loc1.setfile("[]:;,()");
-        loc1.setinfo("abcd:/,");
-
-        std::list<ErrorMessage::FileLocation> locs{loc1};
 
-        ErrorMessage msg(locs, emptyString, Severity::error, "Programming error", "errorId", Certainty::inconclusive);
+        ErrorMessage msg({std::move(loc1)}, "", Severity::error, "Programming error", "errorId", Certainty::inconclusive);
 
         const std::string msg_str = msg.serialize();
         ASSERT_EQUALS("7 errorId"
@@ -411,9 +628,11 @@ class TestErrorLogger : public TestFixture {
                       "1 0"
                       "1 0"
                       "0 "
-                      "12 inconclusive"
+                      "0 "
+                      "1 1"
                       "17 Programming error"
                       "17 Programming error"
+                      "0 "
                       "1 "
                       "27 654\t33\t[]:;,()\t:/,;\tabcd:/,", msg_str);
 
@@ -426,62 +645,24 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("abcd:/,", msg2.callStack.front().getinfo());
     }
 
-    void suppressUnmatchedSuppressions() {
-        std::list<Suppressions::Suppression> suppressions;
-
-        // No unmatched suppression
-        errout.str("");
-        suppressions.clear();
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress all unmatchedSuppression
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "*", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress all unmatchedSuppression (corresponds to "--suppress=unmatchedSuppression")
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress all unmatchedSuppression in a.c
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress unmatchedSuppression in a.c at line 10
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", 10U);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // don't suppress unmatchedSuppression when file is mismatching
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "b.c", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("[a.c:10]: (information) Unmatched suppression: abc\n", errout.str());
-
-        // don't suppress unmatchedSuppression when line is mismatching
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", 1U);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("[a.c:10]: (information) Unmatched suppression: abc\n", errout.str());
+    void SerializeAndDeserialize() const {
+        ErrorMessage msg({}, "", Severity::warning, "$symbol:var\nmessage $symbol", "id", Certainty::normal);
+        msg.remark = "some remark";
+
+        ErrorMessage msg2;
+        ASSERT_NO_THROW(msg2.deserialize(msg.serialize()));
+
+        ASSERT_EQUALS(msg.callStack.size(), msg2.callStack.size());
+        ASSERT_EQUALS(msg.file0, msg2.file0);
+        ASSERT_EQUALS_ENUM(msg.severity, msg2.severity);
+        ASSERT_EQUALS(msg.shortMessage(), msg2.shortMessage());
+        ASSERT_EQUALS(msg.verboseMessage(), msg2.verboseMessage());
+        ASSERT_EQUALS(msg.id, msg2.id);
+        ASSERT_EQUALS_ENUM(msg.certainty, msg2.certainty);
+        ASSERT_EQUALS(msg.cwe.id, msg2.cwe.id);
+        ASSERT_EQUALS(msg.hash, msg2.hash);
+        ASSERT_EQUALS(msg.remark, msg2.remark);
+        ASSERT_EQUALS(msg.symbolNames(), msg2.symbolNames());
     }
 
     void substituteTemplateFormatStatic() const
@@ -546,6 +727,11 @@ class TestErrorLogger : public TestFixture {
             ASSERT_EQUALS("{", s);
         }
     }
+
+    void isCriticalErrorId() const {
+        // It does not abort all the analysis of the file. Like "missingInclude" there can be false negatives.
+        ASSERT_EQUALS(false, ErrorLogger::isCriticalErrorId("misra-config"));
+    }
 };
 
 REGISTER_TEST(TestErrorLogger)
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index 997c672ee62..753a1ddd454 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-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
@@ -16,26 +16,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkexceptionsafety.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <list>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 
 class TestExceptionSafety : public TestFixture {
 public:
     TestExceptionSafety() : TestFixture("TestExceptionSafety") {}
 
 private:
-    Settings settings;
+    /*const*/ Settings settings;
 
     void run() override {
         settings.severity.fill();
 
+        mNewTemplate = true;
         TEST_CASE(destructors);
         TEST_CASE(deallocThrow1);
         TEST_CASE(deallocThrow2);
@@ -57,22 +56,27 @@ class TestExceptionSafety : public TestFixture {
         TEST_CASE(rethrowNoCurrentException1);
         TEST_CASE(rethrowNoCurrentException2);
         TEST_CASE(rethrowNoCurrentException3);
+        TEST_CASE(noFunctionCall);
+        TEST_CASE(entryPoint);
     }
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool inconclusive = false, const Settings *s = nullptr) {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        bool inconclusive = false;
+        const Settings *s = nullptr;
+    };
 
-        Settings settings1 = settingsBuilder(s ? *s : settings).certainty(Certainty::inconclusive, inconclusive).build();
+#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();
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check char variable usage..
-        runChecks<CheckExceptionSafety>(&tokenizer, &settings1, this);
+        runChecks<CheckExceptionSafety>(tokenizer, this);
     }
 
     void destructors() {
@@ -81,7 +85,8 @@ class TestExceptionSafety : public TestFixture {
               "        throw e;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Class x is not safe, destructor throws exception\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (warning) Class x is not safe, destructor throws exception [exceptThrowInDestructor]\n"
+                      "[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"
@@ -89,7 +94,8 @@ class TestExceptionSafety : public TestFixture {
               "x::~x() {\n"
               "    throw e;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Class x is not safe, destructor throws exception\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Class x is not safe, destructor throws exception [exceptThrowInDestructor]\n"
+                      "[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"
@@ -100,7 +106,7 @@ class TestExceptionSafety : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class x {\n"
               "    ~x() {\n"
@@ -109,7 +115,16 @@ class TestExceptionSafety : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
+              "public:\n"
+              "    ~A() noexcept(false) {\n"
+              "        throw 30;\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocThrow1() {
@@ -120,7 +135,7 @@ class TestExceptionSafety : public TestFixture {
               "        throw 123;\n"
               "    p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory.\n", errout.str());
+        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"
               "    static int* p = foo;\n"
@@ -129,7 +144,7 @@ class TestExceptionSafety : public TestFixture {
               "        throw 1;\n"
               "    p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory. [exceptDeallocThrow]\n", errout_str());
     }
 
     void deallocThrow2() {
@@ -139,16 +154,16 @@ class TestExceptionSafety : public TestFixture {
               "    if (foo)\n"
               "        throw 1;\n"
               "    p = new int;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static int* p = 0;\n"
               "    delete p;\n"
               "    reset(p);\n"
               "    throw 1;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocThrow3() {
@@ -157,14 +172,14 @@ class TestExceptionSafety : public TestFixture {
               "    delete p;\n"
               "    throw 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static int* p = 0;\n"
               "    delete p;\n"
               "    throw 1;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Exception thrown in invalid state, 'p' points at deallocated memory.\n", errout.str());
+              "}", 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());
     }
 
     void rethrowCopy1() {
@@ -178,7 +193,7 @@ class TestExceptionSafety : public TestFixture {
               "        throw err;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
     void rethrowCopy2() {
@@ -192,7 +207,7 @@ class TestExceptionSafety : public TestFixture {
               "        throw err;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
     void rethrowCopy3() {
@@ -204,7 +219,7 @@ class TestExceptionSafety : public TestFixture {
               "        throw err;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception. [exceptRethrowCopy]\n", errout_str());
     }
 
     void rethrowCopy4() {
@@ -219,7 +234,7 @@ class TestExceptionSafety : public TestFixture {
               "        throw err2;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void rethrowCopy5() {
@@ -236,7 +251,7 @@ class TestExceptionSafety : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Throwing a copy of the caught exception instead of rethrowing the original exception.\n", errout.str());
+        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"
               "    try {\n"
@@ -251,7 +266,7 @@ class TestExceptionSafety : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void catchExceptionByValue() {
@@ -263,7 +278,7 @@ class TestExceptionSafety : public TestFixture {
               "        foo(err);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Exception should be caught by reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (style) Exception should be caught by reference. [catchExceptionByValue]\n", errout_str());
 
         check("void f() {\n"
               "    try {\n"
@@ -273,7 +288,7 @@ class TestExceptionSafety : public TestFixture {
               "        foo(err);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Exception should be caught by reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (style) Exception should be caught by reference. [catchExceptionByValue]\n", errout_str());
 
         check("void f() {\n"
               "    try {\n"
@@ -283,7 +298,7 @@ class TestExceptionSafety : public TestFixture {
               "        foo(err);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    try {\n"
@@ -293,7 +308,7 @@ class TestExceptionSafety : public TestFixture {
               "        foo(err);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    try {\n"
@@ -303,7 +318,7 @@ class TestExceptionSafety : public TestFixture {
               "        foo(err);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    try {\n"
@@ -313,7 +328,7 @@ class TestExceptionSafety : public TestFixture {
               "        foo(err);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    try {\n"
@@ -323,7 +338,7 @@ class TestExceptionSafety : public TestFixture {
               "        foo(err);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void noexceptThrow() {
@@ -333,14 +348,14 @@ class TestExceptionSafety : public TestFixture {
               "void func4() noexcept(false) { throw 1; }\n"
               "void func5() noexcept(true) { func1(); }\n"
               "void func6() noexcept(false) { func1(); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Exception thrown in function declared not to throw exceptions.\n"
-                      "[test.cpp:3]: (error) Exception thrown in function declared not to throw exceptions.\n"
-                      "[test.cpp:5]: (error) Exception thrown in function declared not to throw exceptions.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nothrowThrow() {
@@ -349,12 +364,23 @@ class TestExceptionSafety : public TestFixture {
               "void func3() throw(int) { throw 1; }\n"
               "void func4() throw() { func1(); }\n"
               "void func5() throw(int) { func1(); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Exception thrown in function declared not to throw exceptions.\n"
-                      "[test.cpp:4]: (error) Exception thrown in function declared not to throw exceptions.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+
+        // #11691: FP throwInNoexceptFunction with if constexpr in template
+        check("template<bool IsNoThrow>\n"
+              "static void foo(size_t Size) noexcept(IsNoThrow) {\n"
+              "    if constexpr (!IsNoThrow) {\n"
+              "        throw std::bad_alloc();\n"
+              "    }\n"
+              "}\n"
+              "foo<true>(123);\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unhandledExceptionSpecification1() { // #4800
@@ -368,8 +394,8 @@ class TestExceptionSafety : public TestFixture {
               "  try {\n"
               "    myThrowingFoo();\n"
               "  } catch(MyException &) {}\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:1]: (style, inconclusive) Unhandled exception specification when calling function myThrowingFoo().\n", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:3] -> [test.cpp:1:6]: (style, inconclusive) Unhandled exception specification when calling function myThrowingFoo(). [unhandledExceptionSpecification]\n", errout_str());
     }
 
     void unhandledExceptionSpecification2() {
@@ -377,8 +403,8 @@ class TestExceptionSafety : public TestFixture {
               "int main()\n"
               "{\n"
               "    f();\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Unhandled exception thrown in function that is an entry point. [throwInEntryPoint]\n", errout_str());
     }
 
     void unhandledExceptionSpecification3() {
@@ -394,25 +420,29 @@ class TestExceptionSafety : public TestFixture {
                             "    f();\n"
                             "}\n";
 
-        check(code, true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:1]: (style, inconclusive) Unhandled exception specification when calling function f().\n"
-                      "[test.cpp:6] -> [test.cpp:1]: (style, inconclusive) Unhandled exception specification when calling function f().\n", errout.str());
-
-        const Settings s = settingsBuilder(settings).library("gnu.cfg").build();
-        check(code, true, &s);
-        ASSERT_EQUALS("", errout.str());
+        check(code, dinit(CheckOptions, $.inconclusive = true));
+        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("[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]: (error) Exception thrown in function declared not to throw exceptions.\n"
-                      "[test.cpp:3]: (error) Exception thrown in function declared not to throw exceptions.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nothrowAttributeThrow2() {
@@ -421,38 +451,73 @@ class TestExceptionSafety : public TestFixture {
               "      copyMemberValues();\n"
               "   }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        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]: (error) Exception thrown in function declared not to throw exceptions.\n"
-                      "[test.cpp:3]: (error) Exception thrown in function declared not to throw exceptions.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void rethrowNoCurrentException1() {
         check("void func1(const bool flag) { try{ if(!flag) throw; } catch (int&) { ; } }");
-        ASSERT_EQUALS("[test.cpp:1]: (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\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (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\n", errout.str());
+        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());
     }
 
     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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void noFunctionCall() {
+        check("void f() {\n" // #13803
+              "    throw \"error\";\n"
+              "}\n"
+              "void g() noexcept {\n"
+              "    auto pF = &f;\n"
+              "}\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());
     }
 };
 
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
new file mode 100644
index 00000000000..a0e5e02f1fb
--- /dev/null
+++ b/test/testexecutor.cpp
@@ -0,0 +1,88 @@
+/*
+ * 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 "config.h"
+#include "errorlogger.h"
+#include "errortypes.h"
+#include "executor.h"
+#include "filesettings.h"
+#include "fixture.h"
+#include "helpers.h"
+#include "settings.h"
+#include "standards.h"
+#include "suppressions.h"
+
+#include <list>
+#include <stdexcept>
+#include <string>
+#include <utility>
+
+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, nullptr)
+    {}
+
+    NORETURN unsigned int check() override
+    {
+        throw std::runtime_error("not implemented");
+    }
+
+    bool hasToLog_(const ErrorMessage &msg)
+    {
+        return hasToLog(msg);
+    }
+};
+
+class TestExecutor : public TestFixture {
+public:
+    TestExecutor() : TestFixture("TestExecutor") {}
+
+private:
+    void run() override {
+        TEST_CASE(hasToLogSimple);
+    }
+
+    void hasToLogSimple() {
+        const std::list<FileWithDetails> files{FileWithDetails{"test.c", Standards::Language::C, 0}};
+        const std::list<FileSettings> fileSettings;
+        // this is the "simple" format
+        const auto settings = dinit(Settings,
+                                    $.templateFormat = "{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]");
+        Suppressions supprs;
+        DummyExecutor executor(files, fileSettings, settings, supprs, *this);
+
+        ErrorMessage::FileLocation loc1("test.c", 1, 2);
+        ErrorMessage msg({std::move(loc1)}, "test.c", Severity::error, "error", "id", Certainty::normal);
+
+        ASSERT(executor.hasToLog_(msg));
+        ASSERT(!executor.hasToLog_(msg));
+
+        ErrorMessage::FileLocation loc2("test.c", 1, 12);
+        msg.callStack = {std::move(loc2)};
+
+        ASSERT(executor.hasToLog_(msg));
+
+        msg.id = "id2";
+
+        ASSERT(executor.hasToLog_(msg));
+    }
+};
+
+REGISTER_TEST(TestExecutor)
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
index d9e43979c16..13057735513 100644
--- a/test/testfilelister.cpp
+++ b/test/testfilelister.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
@@ -17,15 +17,16 @@
  */
 
 #include "filelister.h"
-#include "pathmatch.h"
+#include "filesettings.h"
 #include "fixture.h"
+#include "path.h"
+#include "pathmatch.h"
+#include "standards.h"
 
-#include <cstddef>
-#include <fstream>
-#include <map>
+#include <algorithm>
+#include <list>
+#include <stdexcept>
 #include <string>
-#include <vector>
-#include <utility>
 
 class TestFileLister : public TestFixture {
 public:
@@ -33,66 +34,170 @@ class TestFileLister : public TestFixture {
 
 private:
     void run() override {
-        // bail out if the tests are not executed from the base folder
-        {
-            std::ifstream fin("test/testfilelister.cpp");
-            if (!fin.is_open()) {
-                // TODO: log
-                return;
-            }
-        }
-
-        TEST_CASE(isDirectory);
         TEST_CASE(recursiveAddFiles);
-        TEST_CASE(excludeFile);
-        TEST_CASE(fileExists);
+        TEST_CASE(recursiveAddFilesEmptyPath);
+        TEST_CASE(excludeFile1);
+        TEST_CASE(excludeFile2);
+        TEST_CASE(excludeDir);
+        TEST_CASE(addFiles);
     }
 
-    void isDirectory() const {
-        ASSERT_EQUALS(false, FileLister::isDirectory("readme.txt"));
-        ASSERT_EQUALS(true, FileLister::isDirectory("lib"));
+    // TODO: generate file list instead
+    static std::string findBaseDir() {
+        std::string basedir;
+        while (!Path::isDirectory(Path::join(basedir, ".github"))) {
+            const std::string abspath = Path::getAbsoluteFilePath(basedir);
+            basedir += "../";
+            // no more going up
+            if (Path::getAbsoluteFilePath(basedir) == abspath)
+                throw std::runtime_error("could not find repository root directory");
+        }
+        return basedir;
     }
 
     void recursiveAddFiles() const {
+        const std::string adddir = findBaseDir() + ".";
+
         // Recursively add add files..
-        std::map<std::string, std::size_t> files;
-        std::vector<std::string> masks;
-        PathMatch matcher(masks);
-        std::string err = FileLister::recursiveAddFiles(files, ".", matcher);
-        ASSERT(err.empty());
-
-        // In case there are leading "./"..
-        for (std::map<std::string, std::size_t>::iterator i = files.begin(); i != files.end();) {
-            if (i->first.compare(0,2,"./") == 0) {
-                files[i->first.substr(2)] = i->second;
-                i = files.erase(i);
-            } else
-                ++i;
-        }
+        std::list<FileWithDetails> files;
+        std::string err = FileLister::recursiveAddFiles(files, adddir, {}, PathMatch());
+        ASSERT_EQUALS("", err);
+
+        ASSERT(!files.empty());
+
+#ifdef _WIN32
+        std::string dirprefix;
+        if (adddir != ".")
+            dirprefix = adddir + "/";
+#else
+        const std::string dirprefix = adddir + "/";
+#endif
+
+        const auto find_file = [&](const std::string& name) {
+            return std::find_if(files.cbegin(), files.cend(), [&name](const FileWithDetails& entry) {
+                return entry.path() == name;
+            });
+        };
 
         // Make sure source files are added..
-        ASSERT(files.find("cli/main.cpp") != files.end());
-        ASSERT(files.find("lib/token.cpp") != files.end());
-        ASSERT(files.find("lib/tokenize.cpp") != files.end());
-        ASSERT(files.find("test/testfilelister.cpp") != files.end());
+        auto it = find_file(dirprefix + "cli/main.cpp");
+        ASSERT(it != files.end());
+        ASSERT_EQUALS_ENUM(Standards::Language::CPP, it->lang());
+
+        it = find_file(dirprefix + "lib/token.cpp");
+        ASSERT(it != files.end());
+        ASSERT_EQUALS_ENUM(Standards::Language::CPP, it->lang());
+
+        it = find_file(dirprefix + "lib/tokenize.cpp");
+        ASSERT(it != files.end());
+        ASSERT_EQUALS_ENUM(Standards::Language::CPP, it->lang());
+
+        it = find_file(dirprefix + "gui/main.cpp");
+        ASSERT(it != files.end());
+        ASSERT_EQUALS_ENUM(Standards::Language::CPP, it->lang());
+
+        it = find_file(dirprefix + "test/testfilelister.cpp");
+        ASSERT(it != files.end());
+        ASSERT_EQUALS_ENUM(Standards::Language::CPP, it->lang());
 
         // Make sure headers are not added..
-        ASSERT(files.find("lib/tokenize.h") == files.end());
+        ASSERT(find_file(dirprefix + "lib/tokenize.h") == files.end());
     }
 
-    void excludeFile() const {
-        std::map<std::string, std::size_t> files;
-        std::vector<std::string> ignored{"lib/token.cpp"};
-        PathMatch matcher(ignored);
-        std::string err = FileLister::recursiveAddFiles(files, "lib/token.cpp", matcher);
-        ASSERT(err.empty());
+    void recursiveAddFilesEmptyPath() const {
+        std::list<FileWithDetails> files;
+        const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch());
+        ASSERT_EQUALS("no path specified", err);
+    }
+
+    void excludeFile1() const {
+        const std::string basedir = findBaseDir();
+
+        std::list<FileWithDetails> files;
+        PathMatch matcher({"lib/token.cpp"});
+        std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
+        ASSERT_EQUALS("", err);
         ASSERT(files.empty());
     }
 
-    void fileExists() const {
-        ASSERT_EQUALS(false, FileLister::fileExists("lib"));
-        ASSERT_EQUALS(true, FileLister::fileExists("readme.txt"));
+    void excludeFile2() const {
+        const std::string basedir = findBaseDir();
+
+        std::list<FileWithDetails> files;
+        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());
     }
+
+    void excludeDir() const {
+        const std::string basedir = findBaseDir() + ".";
+
+        std::list<FileWithDetails> files;
+        PathMatch matcher({"lib/"});
+        std::string err = FileLister::recursiveAddFiles(files, basedir, {}, matcher);
+        ASSERT_EQUALS("", err);
+        ASSERT(!files.empty());
+        const auto it = std::find_if(files.cbegin(), files.cend(), [](const FileWithDetails& f){
+            return f.spath().find("/lib/") != std::string::npos;
+        });
+        ASSERT(it == files.cend());
+    }
+
+    void addFiles() const {
+        const std::string adddir = findBaseDir() + ".";
+
+        // TODO: on Windows the prefix is different from when a recursive a folder (see recursiveAddFiles test)
+        const std::string dirprefix = adddir + "/";
+#ifdef _WIN32
+        const std::string dirprefix_nat = Path::toNativeSeparators(dirprefix);
+#endif
+
+        std::list<FileWithDetails> files;
+
+        {
+            const std::string addfile = Path::join(Path::join(adddir, "cli"), "main.cpp");
+            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());
+            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());
+            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());
+            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());
+            ASSERT_EQUALS("", err);
+        }
+
+        ASSERT_EQUALS(3, files.size());
+        auto it = files.cbegin();
+        ASSERT_EQUALS(dirprefix + "cli/main.cpp", it->path());
+        ASSERT_EQUALS(Path::simplifyPath(dirprefix + "cli/main.cpp"), it->spath());
+        ASSERT_EQUALS_ENUM(Standards::Language::None, it->lang());
+        it++;
+        ASSERT_EQUALS(dirprefix + "lib/token.cpp", it->path());
+        ASSERT_EQUALS(Path::simplifyPath(dirprefix + "lib/token.cpp"), it->spath());
+        ASSERT_EQUALS_ENUM(Standards::Language::None, it->lang());
+        it++;
+        ASSERT_EQUALS(dirprefix + "lib/matchcompiler.h", it->path());
+        ASSERT_EQUALS(Path::simplifyPath(dirprefix + "lib/matchcompiler.h"), it->spath());
+        ASSERT_EQUALS_ENUM(Standards::Language::None, it->lang());
+    }
+
+    // TODO: test errors
+    // TODO: test wildcards
 };
 
 REGISTER_TEST(TestFileLister)
diff --git a/test/testfilesettings.cpp b/test/testfilesettings.cpp
new file mode 100644
index 00000000000..c815cb8aa01
--- /dev/null
+++ b/test/testfilesettings.cpp
@@ -0,0 +1,78 @@
+/*
+ * 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 "standards.h"
+
+class TestFileSettings : public TestFixture {
+public:
+    TestFileSettings() : TestFixture("TestFileSettings") {}
+
+private:
+    void run() override {
+        TEST_CASE(test);
+    }
+
+    void test() const {
+        {
+            const FileWithDetails p{"file.c", Standards::Language::C, 456};
+            ASSERT_EQUALS("file.c", p.path());
+            ASSERT_EQUALS("file.c", p.spath());
+            ASSERT_EQUALS_ENUM(Standards::Language::C, p.lang());
+            ASSERT_EQUALS(456, p.size());
+        }
+        {
+            const FileWithDetails p{"file.cpp", Standards::Language::CPP, 123};
+            ASSERT_EQUALS("file.cpp", p.path());
+            ASSERT_EQUALS("file.cpp", p.spath());
+            ASSERT_EQUALS_ENUM(Standards::Language::CPP, p.lang());
+            ASSERT_EQUALS(123, p.size());
+        }
+        {
+            const FileWithDetails p{"in/file.cpp", Standards::Language::CPP, 123};
+            ASSERT_EQUALS("in/file.cpp", p.path());
+            ASSERT_EQUALS("in/file.cpp", p.spath());
+            ASSERT_EQUALS_ENUM(Standards::Language::CPP, p.lang());
+            ASSERT_EQUALS(123, p.size());
+        }
+        {
+            const FileWithDetails p{"in\\file.cpp", Standards::Language::CPP, 123};
+            ASSERT_EQUALS("in\\file.cpp", p.path());
+            ASSERT_EQUALS("in/file.cpp", p.spath());
+            ASSERT_EQUALS_ENUM(Standards::Language::CPP, p.lang());
+            ASSERT_EQUALS(123, p.size());
+        }
+        {
+            const FileWithDetails p{"in/../file.cpp", Standards::Language::CPP, 123};
+            ASSERT_EQUALS("in/../file.cpp", p.path());
+            ASSERT_EQUALS("file.cpp", p.spath());
+            ASSERT_EQUALS_ENUM(Standards::Language::CPP, p.lang());
+            ASSERT_EQUALS(123, p.size());
+        }
+        {
+            const FileWithDetails p{"in\\..\\file.cpp", Standards::Language::CPP, 123};
+            ASSERT_EQUALS("in\\..\\file.cpp", p.path());
+            ASSERT_EQUALS("file.cpp", p.spath());
+            ASSERT_EQUALS_ENUM(Standards::Language::CPP, p.lang());
+            ASSERT_EQUALS(123, p.size());
+        }
+    }
+};
+
+REGISTER_TEST(TestFileSettings)
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 2d82961d9fe..6aa4e6534a2 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-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
@@ -18,14 +18,13 @@
 
 #include "checkfunctions.h"
 #include "errortypes.h"
-#include "library.h"
+#include "fixture.h"
+#include "helpers.h"
+#include "platform.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <list>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
 
 class TestFunctions : public TestFixture {
@@ -37,6 +36,7 @@ class TestFunctions : public TestFixture {
                               certainty(Certainty::inconclusive).c(Standards::C11).cpp(Standards::CPP11).library("std.cfg").library("posix.cfg").build();
 
     void run() override {
+        mNewTemplate = true;
         // Prohibited functions
         TEST_CASE(prohibitedFunctions_posix);
         TEST_CASE(prohibitedFunctions_index);
@@ -57,6 +57,9 @@ class TestFunctions : public TestFixture {
         TEST_CASE(invalidFunctionUsage1);
         TEST_CASE(invalidFunctionUsageStrings);
 
+        // Invalid function argument
+        TEST_CASE(invalidFunctionArg1);
+
         // Math function usage
         TEST_CASE(mathfunctionCall_fmod);
         TEST_CASE(mathfunctionCall_sqrt);
@@ -76,7 +79,13 @@ class TestFunctions : public TestFixture {
         TEST_CASE(memsetInvalid2ndParam);
 
         // missing "return"
-        TEST_CASE(checkMissingReturn);
+        TEST_CASE(checkMissingReturn1);
+        TEST_CASE(checkMissingReturn2); // #11798
+        TEST_CASE(checkMissingReturn3);
+        TEST_CASE(checkMissingReturn4);
+        TEST_CASE(checkMissingReturn5);
+        TEST_CASE(checkMissingReturn6); // #13180
+        TEST_CASE(checkMissingReturn7); // #14370 - FN try/catch
 
         // std::move for locar variable
         TEST_CASE(returnLocalStdMove1);
@@ -106,30 +115,23 @@ class TestFunctions : public TestFixture {
         TEST_CASE(checkUseStandardLibrary14);
     }
 
+    struct CheckOptions
+    {
+        bool cpp = true;
+    };
+
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp", const Settings* settings_ = nullptr) {
-        // Clear the error buffer..
-        errout.str("");
-
-        if (!settings_)
-            settings_ = &settings;
-
-        // Tokenize..
-        Tokenizer tokenizer(settings_, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
-
-        // filter out ValueFlow messages..
-        const std::string debugwarnings = errout.str();
-        errout.str("");
-        std::istringstream istr2(debugwarnings);
-        std::string errline;
-        while (std::getline(istr2, errline)) {
-            if (errline.find("valueflow.cpp") == std::string::npos)
-                errout << errline << "\n";
-        }
+    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, settings, options.cpp);
+    }
 
-        runChecks<CheckFunctions>(&tokenizer, settings_, this);
+    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);
     }
 
     void prohibitedFunctions_posix() {
@@ -137,14 +139,14 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    bsd_signal(SIGABRT, SIG_IGN);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Obsolescent function 'bsd_signal' called. It is recommended to use 'sigaction' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -153,7 +155,7 @@ class TestFunctions : public TestFixture {
               "        exit(1);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Obsolescent function 'gethostbyname' called. It is recommended to use 'getaddrinfo' instead.\n", errout.str());
+        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"
               "{\n"
@@ -163,13 +165,13 @@ class TestFunctions : public TestFixture {
               "        exit(1);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Obsolescent function 'gethostbyaddr' called. It is recommended to use 'getnameinfo' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Obsolescent function 'usleep' called. It is recommended to use 'nanosleep' or 'setitimer' instead.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) Obsolescent function 'usleep' called. It is recommended to use 'nanosleep' or 'setitimer' instead. [usleepCalled]\n", errout_str());
     }
 
     void prohibitedFunctions_index() {
@@ -181,7 +183,7 @@ class TestFunctions : public TestFixture {
               "    n1::index();\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::size_t f()\n"
               "{\n"
@@ -189,19 +191,19 @@ class TestFunctions : public TestFixture {
               "    index++;\n"
               "    return index;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f()\n"
               "{\n"
               "    return this->index();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    int index( 0 );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const char f()\n"
               "{\n"
@@ -209,15 +211,18 @@ class TestFunctions : public TestFixture {
               "    const char i = index(var, 0);\n"
               "    return i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:20]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead. [indexCalled]\n",
+                      errout_str());
     }
 
     void prohibitedFunctions_qt_index() {
         check("void TDataModel::forceRowRefresh(int row) {\n"
               "    emit dataChanged(index(row, 0), index(row, columnCount() - 1));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Obsolescent function 'index' called. It is recommended to use 'strchr' instead.\n", errout.str());
+        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
+            errout_str());
     }
 
     void prohibitedFunctions_rindex() {
@@ -225,14 +230,14 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    int rindex( 0 );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    const char var[7] = \"rindex\";\n"
               "    print(rindex(var, 0));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Obsolescent function 'rindex' called. It is recommended to use 'strrchr' instead.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Obsolescent function 'rindex' called. It is recommended to use 'strrchr' instead. [rindexCalled]\n", errout_str());
     }
 
 
@@ -242,7 +247,7 @@ class TestFunctions : public TestFixture {
               "    Fred() : index(0) { }\n"
               "    int index;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void prohibitedFunctions_gets() {
@@ -250,46 +255,46 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    char *x = gets(a);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead.\n", errout.str());
+        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());
     }
 
     void prohibitedFunctions_alloca() {
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.cpp");  // #4382 - there are no VLAs in C++
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Obsolete function 'alloca' called.\n", errout.str());
+              "}");  // #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"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (warning) Obsolete function 'alloca' called. In C99 and later it is recommended to use a variable length array instead.\n", errout.str());
+              "}", 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"
-              "}", "test.cpp", &s);  // #4382 - there are no VLAs in C++
-        ASSERT_EQUALS("", errout.str());
+              "}", s);  // #4382 - there are no VLAs in C++
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.c", &s); // #7558 - no alternative to alloca in C89
-        ASSERT_EQUALS("", errout.str());
+              "}", s, false); // #7558 - no alternative to alloca in C89
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "    char *x = alloca(10);\n"
-              "}", "test.c", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}", s, false);
+        ASSERT_EQUALS("", errout_str());
     }
 
     // ticket #3121
@@ -303,7 +308,7 @@ class TestFunctions : public TestFixture {
               "    int b ; b = ftime ( 1 ) ;\n"
               "    return 0 ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // test std::gets
@@ -313,8 +318,8 @@ class TestFunctions : public TestFixture {
               "    char *x = std::gets(str);\n"
               "    char *y = gets(str);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead.\n"
-                      "[test.cpp:4]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead.\n", errout.str());
+        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());
     }
 
     // multiple use
@@ -324,8 +329,8 @@ class TestFunctions : public TestFixture {
               "    char *x = std::gets(str);\n"
               "    usleep( 1000 );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead.\n"
-                      "[test.cpp:4]: (style) Obsolescent function 'usleep' called. It is recommended to use 'nanosleep' or 'setitimer' instead.\n", errout.str());
+        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());
     }
 
     void prohibitedFunctions_c_declaration() {
@@ -336,14 +341,14 @@ class TestFunctions : public TestFixture {
               "    gets ( s ) ;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Obsolete function 'gets' called. It is recommended to use 'fgets' or 'gets_s' instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (portability) Obsolescent function 'getcontext' called. Applications are recommended to be rewritten to use POSIX threads.\n", errout.str());
+        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());
     }
 
     void prohibitedFunctions_functionWithBody() {
@@ -354,7 +359,7 @@ class TestFunctions : public TestFixture {
               "    gets ( s ) ;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void prohibitedFunctions_crypt() {
@@ -363,8 +368,8 @@ class TestFunctions : public TestFixture {
               "    char *cpwd;"
               "    crypt(pwd, cpwd);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function crypt() is not used.\n"
-                      "[test.cpp:3]: (portability) Non reentrant function 'crypt' called. For threadsafe applications it is recommended to use the reentrant replacement function 'crypt_r'.\n", errout.str());
+        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());
 
         check("void f()\n"
               "{\n"
@@ -372,15 +377,15 @@ class TestFunctions : public TestFixture {
               "    char *cpwd;"
               "    crypt(pwd, cpwd);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function crypt() is not used.\n"
-                      "[test.cpp:3]: (portability) Non reentrant function 'crypt' called. For threadsafe applications it is recommended to use the reentrant replacement function 'crypt_r'.\n", errout.str());
+        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());
 
         check("int f()\n"
               "{\n"
               "    int crypt = 0;"
               "    return crypt;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void prohibitedFunctions_namespaceHandling() {
@@ -389,14 +394,14 @@ class TestFunctions : public TestFixture {
               "    time_t t = 0;"
               "    auto lt = std::localtime(&t);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Non reentrant function 'localtime' called. For threadsafe applications it is recommended to use the reentrant replacement function 'localtime_r'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Non reentrant function 'getpwent' called. For threadsafe applications it is recommended to use the reentrant replacement function 'getpwent_r'.\n", errout.str());
+        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
         check("void f()\n"
@@ -404,83 +409,83 @@ class TestFunctions : public TestFixture {
               "    time_t t = 0;"
               "    struct tm *foo = localtime(&t);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Non reentrant function 'localtime' called. For threadsafe applications it is recommended to use the reentrant replacement function 'localtime_r'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function getpwent() is not used.\n"
-                      "[test.cpp:3]: (portability) Non reentrant function 'getpwent' called. For threadsafe applications it is recommended to use the reentrant replacement function 'getpwent_r'.\n", errout.str());
+        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());
 
         // Be quiet on function definitions
         check("int getpwent()\n"
               "{\n"
               "    return 123;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Be quiet on other namespaces
         check("void f()\n"
               "{\n"
               "    foobar::getpwent();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Be quiet on class member functions
         check("void f()\n"
               "{\n"
               "    foobar.getpwent();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void invalidFunctionUsage1() {
         check("void f() { memset(a,b,sizeof(a)!=12); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
+        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 */
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:2]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
+              "}", 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 */
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid div() argument nr 2. The value is 0 or 1 (boolean) but the valid values are ':-1,1:'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid strtol() argument nr 3. The value is 0 or 1 (boolean) but the valid values are '0,2:36'.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strtol() argument nr 3. The value is 1 but the valid values are '0,2:36'.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n" //  #10754
               "    int N = -1;\n"
@@ -488,51 +493,51 @@ class TestFunctions : public TestFixture {
               "        N = h(N);\n"
               "    v.resize(N);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'. [invalidFunctionArg]\n", errout_str());
 
         check("void f(std::vector<int>& v, int N) {\n"
               "    if (N < -1)\n"
               "        return;\n"
               "    v.resize(N);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'N<-1' is redundant or v.resize() argument nr 1 can have invalid value. The value is -1 but the valid values are '0:'.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:4:14]: (warning) Either the condition 'N<-1' is redundant or v.resize() argument nr 1 can have invalid value. The value is -1 but the valid values are '0:'. [invalidFunctionArg]\n",
+                      errout_str());
 
         check("void f(std::vector<int>& v, int N) {\n"
               "    if (N == -1) {}\n"
               "    v.resize(N);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'N==-1' is redundant or v.resize() argument nr 1 can have invalid value. The value is -1 but the valid values are '0:'.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:3:14]: (warning) Either the condition 'N==-1' is redundant or v.resize() argument nr 1 can have invalid value. The value is -1 but the valid values are '0:'. [invalidFunctionArg]\n",
+                      errout_str());
 
         check("void f(std::vector<int>& v, int N, bool b) {\n"
               "    if (b)\n"
               "        N = -1;\n"
               "    v.resize(N);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14]: (warning) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'. [invalidFunctionArg]\n",
+                      errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    int N = -1;\n"
               "    v.resize(N);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Invalid v.resize() argument nr 1. The value is -1 but the valid values are '0:'. [invalidFunctionArg]\n",
+                      errout_str());
     }
 
     void invalidFunctionUsageStrings() {
         check("size_t f() { char x = 'x'; return strlen(&x); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f(char x) { return strlen(&x); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
               "  char x;\n"
@@ -542,41 +547,41 @@ class TestFunctions : public TestFixture {
               "    x = 'a';\n"
               "  return strlen(&x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() { char x = 'x'; return strcmp(\"Hello world\", &x); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strcmp() argument nr 2. A nul-terminated string is required.\n", errout.str());
+        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); }");
-        TODO_ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", "", errout.str());
+        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); }");
-        TODO_ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", "", errout.str());
+        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); }");
-        TODO_ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", "", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f() { char x[] = \"Hello world\"; return strlen(x); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f(char x[]) { return strlen(x); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(char x, char y) { return strcmp(&x, &y); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strcmp() argument nr 1. A nul-terminated string is required.\n"
-                      "[test.cpp:1]: (error) Invalid strcmp() argument nr 2. A nul-terminated string is required.\n", errout.str());
+        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]); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f() { char* x = \"Hello world\"; return strlen(&x[0]); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "  char x;\n"
@@ -589,11 +594,11 @@ class TestFunctions : public TestFixture {
               "  size_t l2 = strlen(&s2.x);\n"
               "  return l1 + l2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n"
-                      "[test.cpp:9]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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"
               "    union {\n"
@@ -608,7 +613,7 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    return strcmp(&tp->x.buf[k], \"needle\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct someStruct {\n"
               "    char buf[42];\n"
@@ -617,29 +622,29 @@ class TestFunctions : public TestFixture {
               "{\n"
               "    return strcmp(&tp->buf[k], \"needle\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const char x = 'x'; size_t f() { char y = x; return strlen(&y); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const char x = '\\0'; size_t f() { char y = x; return strlen(&y); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
               "  char * a = \"Hello world\";\n"
               "  char ** b = &a;\n"
               "  return strlen(&b[0][0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f() {\n"
               "  char ca[] = \"asdf\";\n"
               "  return strlen((char*) &ca);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5225
         check("int main(void)\n"
@@ -650,67 +655,67 @@ class TestFunctions : public TestFixture {
               "  puts(str);\n"
               "  return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Invalid strcat() argument nr 2. A nul-terminated string is required.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[3] = { \'x\', \'\\0\' ,\'y\' };\n"
               "  return fopen(fileName, \"r\"); \n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { \'\\0\' };\n"
               "  return fopen(fileName, \"r\"); \n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid fopen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("FILE* f(void) {\n"
               "  const char fileName[] = { };\n"
               "  return fopen(fileName, \"r\"); \n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void scanMetaTypes()\n" // don't crash
               "{\n"
@@ -721,31 +726,31 @@ class TestFunctions : public TestFixture {
               "            metaTypes.push_back(mtId);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    const char c[3] = \"abc\";\n"
               "    return strlen(c);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Invalid strlen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("int f() {\n"
               "    const wchar_t c[3] = L\"abc\";\n"
               "    return wcslen(c);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid wcslen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19]: (error) Invalid wcslen() argument nr 1. A nul-terminated string is required. [invalidFunctionArgStr]\n", errout_str());
 
         check("void f(char* dest) {\n"
               "    char if_name[(IF_NAMESIZE > 21 ? IF_NAMESIZE : 21) + 1] = \"%\";\n"
               "    strcat(dest, if_name);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    const char c[3] = \"ab\\0\";\n"
               "    return strlen(c);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int n) {\n" // #11179
               "    char s[8] = \"        \";\n"
@@ -753,13 +758,28 @@ class TestFunctions : public TestFixture {
               "    sprintf(s, \"lwip%02d\", n);\n"
               "    s[strlen(s)] = ' ';\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t f() { wchar_t x = L'x'; return wcslen(&x); }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid wcslen() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        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); }", "test.c"); // #1770
-        ASSERT_EQUALS("[test.c:1]: (error) Invalid puts() argument nr 1. A nul-terminated string is required.\n", errout.str());
+        check("void f() { char a[10] = \"1234567890\"; puts(a); }", 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());
+    }
+
+    void invalidFunctionArg1() {
+        const Settings settingsUnix32 = settingsBuilder(settings).platform(Platform::Unix32).build();
+        check("int main() {\n"
+              "    char tgt[7];\n"
+              "    char src[7+1] = \"7777777\";\n"
+              "    if (sizeof tgt <= sizeof src) {\n"
+              "        memmove(&tgt, &src, sizeof tgt);\n"
+              "    } else {\n"
+              "        memmove(&tgt, &src, sizeof src);\n"
+              "        memset(&tgt + sizeof src, ' ', sizeof tgt - sizeof src);\n"
+              "    }\n"
+              "}\n", settingsUnix32, false);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mathfunctionCall_sqrt() {
@@ -770,9 +790,9 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrtf(-1) << std::endl;\n"
               "    std::cout <<  sqrtl(-1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid sqrt() argument nr 1. The value is -1 but the valid values are '0.0:'.\n"
-                      "[test.cpp:4]: (error) Invalid sqrtf() argument nr 1. The value is -1 but the valid values are '0.0:'.\n"
-                      "[test.cpp:5]: (error) Invalid sqrtl() argument nr 1. The value is -1 but the valid values are '0.0:'.\n", errout.str());
+        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());
 
         // implementation-defined behaviour for "finite values of x<0" only:
         check("void foo()\n"
@@ -781,7 +801,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrtf(-0.) << std::endl;\n"
               "    std::cout <<  sqrtl(-0.) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -789,7 +809,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  sqrtf(1) << std::endl;\n"
               "    std::cout <<  sqrtl(1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mathfunctionCall_log() {
@@ -809,27 +829,27 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1pf(-3) << std::endl;\n"
               "    std::cout <<  log1pl(-3) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid log() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:4]: (error) Invalid logf() argument nr 1. The value is -2 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:5]: (error) Invalid logl() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:6]: (error) Invalid log10() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:7]: (error) Invalid log10f() argument nr 1. The value is -2 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:8]: (error) Invalid log10l() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:9]: (error) Invalid log2() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:10]: (error) Invalid log2f() argument nr 1. The value is -2 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:11]: (error) Invalid log2l() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:3]: (warning) Passing value -2 to log() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing value -2 to logf() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing value -2 to logl() leads to implementation-defined result.\n"
-                      "[test.cpp:6]: (warning) Passing value -2 to log10() leads to implementation-defined result.\n"
-                      "[test.cpp:7]: (warning) Passing value -2 to log10f() leads to implementation-defined result.\n"
-                      "[test.cpp:8]: (warning) Passing value -2 to log10l() leads to implementation-defined result.\n"
-                      "[test.cpp:9]: (warning) Passing value -2 to log2() leads to implementation-defined result.\n"
-                      "[test.cpp:10]: (warning) Passing value -2 to log2f() leads to implementation-defined result.\n"
-                      "[test.cpp:11]: (warning) Passing value -2 to log2l() leads to implementation-defined result.\n"
-                      "[test.cpp:12]: (warning) Passing value -3 to log1p() leads to implementation-defined result.\n"
-                      "[test.cpp:13]: (warning) Passing value -3 to log1pf() leads to implementation-defined result.\n"
-                      "[test.cpp:14]: (warning) Passing value -3 to log1pl() leads to implementation-defined result.\n", errout.str());
+        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"
+                      "[test.cpp:6:26]: (error) Invalid log10() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:7:27]: (error) Invalid log10f() argument nr 1. The value is -2 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:8:27]: (error) Invalid log10l() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:9:25]: (error) Invalid log2() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:10:26]: (error) Invalid log2f() argument nr 1. The value is -2 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:11:26]: (error) Invalid log2l() argument nr 1. The value is -2 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:3:19]: (warning) Passing value -2 to log() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:4:19]: (warning) Passing value -2 to logf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:5:19]: (warning) Passing value -2 to logl() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:6:19]: (warning) Passing value -2 to log10() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:7:19]: (warning) Passing value -2 to log10f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:8:19]: (warning) Passing value -2 to log10l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:9:19]: (warning) Passing value -2 to log2() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:10:19]: (warning) Passing value -2 to log2f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:11:19]: (warning) Passing value -2 to log2l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:12:19]: (warning) Passing value -3 to log1p() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:13:19]: (warning) Passing value -3 to log1pf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:14:19]: (warning) Passing value -3 to log1pl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -846,27 +866,27 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1pf(-2) << std::endl;\n"
               "    std::cout <<  log1pl(-2) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:4]: (error) Invalid logf() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:5]: (error) Invalid logl() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:6]: (error) Invalid log10() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:7]: (error) Invalid log10f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:8]: (error) Invalid log10l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:9]: (error) Invalid log2() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:10]: (error) Invalid log2f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:11]: (error) Invalid log2l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:3]: (warning) Passing value -1 to log() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing value -1 to logf() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing value -1 to logl() leads to implementation-defined result.\n"
-                      "[test.cpp:6]: (warning) Passing value -1 to log10() leads to implementation-defined result.\n"
-                      "[test.cpp:7]: (warning) Passing value -1 to log10f() leads to implementation-defined result.\n"
-                      "[test.cpp:8]: (warning) Passing value -1 to log10l() leads to implementation-defined result.\n"
-                      "[test.cpp:9]: (warning) Passing value -1 to log2() leads to implementation-defined result.\n"
-                      "[test.cpp:10]: (warning) Passing value -1 to log2f() leads to implementation-defined result.\n"
-                      "[test.cpp:11]: (warning) Passing value -1 to log2l() leads to implementation-defined result.\n"
-                      "[test.cpp:12]: (warning) Passing value -2 to log1p() leads to implementation-defined result.\n"
-                      "[test.cpp:13]: (warning) Passing value -2 to log1pf() leads to implementation-defined result.\n"
-                      "[test.cpp:14]: (warning) Passing value -2 to log1pl() leads to implementation-defined result.\n", errout.str());
+        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"
+                      "[test.cpp:6:26]: (error) Invalid log10() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:7:27]: (error) Invalid log10f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:8:27]: (error) Invalid log10l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:9:25]: (error) Invalid log2() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:10:26]: (error) Invalid log2f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:11:26]: (error) Invalid log2l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:3:19]: (warning) Passing value -1 to log() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:4:19]: (warning) Passing value -1 to logf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:5:19]: (warning) Passing value -1 to logl() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:6:19]: (warning) Passing value -1 to log10() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:7:19]: (warning) Passing value -1 to log10f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:8:19]: (warning) Passing value -1 to log10l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:9:19]: (warning) Passing value -1 to log2() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:10:19]: (warning) Passing value -1 to log2f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:11:19]: (warning) Passing value -1 to log2l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:12:19]: (warning) Passing value -2 to log1p() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:13:19]: (warning) Passing value -2 to log1pf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:14:19]: (warning) Passing value -2 to log1pl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -883,27 +903,27 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1pf(-2.0) << std::endl;\n"
               "    std::cout <<  log1pl(-2.0) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid log() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:4]: (error) Invalid logf() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:5]: (error) Invalid logl() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:6]: (error) Invalid log10() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:7]: (error) Invalid log10f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:8]: (error) Invalid log10l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:9]: (error) Invalid log2() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:10]: (error) Invalid log2f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:11]: (error) Invalid log2l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:3]: (warning) Passing value -1.0 to log() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing value -1.0 to logf() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing value -1.0 to logl() leads to implementation-defined result.\n"
-                      "[test.cpp:6]: (warning) Passing value -1.0 to log10() leads to implementation-defined result.\n"
-                      "[test.cpp:7]: (warning) Passing value -1.0 to log10f() leads to implementation-defined result.\n"
-                      "[test.cpp:8]: (warning) Passing value -1.0 to log10l() leads to implementation-defined result.\n"
-                      "[test.cpp:9]: (warning) Passing value -1.0 to log2() leads to implementation-defined result.\n"
-                      "[test.cpp:10]: (warning) Passing value -1.0 to log2f() leads to implementation-defined result.\n"
-                      "[test.cpp:11]: (warning) Passing value -1.0 to log2l() leads to implementation-defined result.\n"
-                      "[test.cpp:12]: (warning) Passing value -2.0 to log1p() leads to implementation-defined result.\n"
-                      "[test.cpp:13]: (warning) Passing value -2.0 to log1pf() leads to implementation-defined result.\n"
-                      "[test.cpp:14]: (warning) Passing value -2.0 to log1pl() leads to implementation-defined result.\n", errout.str());
+        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"
+                      "[test.cpp:6:27]: (error) Invalid log10() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:7:28]: (error) Invalid log10f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:8:28]: (error) Invalid log10l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:9:26]: (error) Invalid log2() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:10:27]: (error) Invalid log2f() argument nr 1. The value is -1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:11:27]: (error) Invalid log2l() argument nr 1. The value is -1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:3:19]: (warning) Passing value -1.0 to log() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:4:19]: (warning) Passing value -1.0 to logf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:5:19]: (warning) Passing value -1.0 to logl() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:6:19]: (warning) Passing value -1.0 to log10() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:7:19]: (warning) Passing value -1.0 to log10f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:8:19]: (warning) Passing value -1.0 to log10l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:9:19]: (warning) Passing value -1.0 to log2() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:10:19]: (warning) Passing value -1.0 to log2f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:11:19]: (warning) Passing value -1.0 to log2l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:12:19]: (warning) Passing value -2.0 to log1p() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:13:19]: (warning) Passing value -2.0 to log1pf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:14:19]: (warning) Passing value -2.0 to log1pl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -920,27 +940,27 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1pf(-1.1) << std::endl;\n"
               "    std::cout <<  log1pl(-1.1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid log() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:4]: (error) Invalid logf() argument nr 1. The value is -0.1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:5]: (error) Invalid logl() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:6]: (error) Invalid log10() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:7]: (error) Invalid log10f() argument nr 1. The value is -0.1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:8]: (error) Invalid log10l() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:9]: (error) Invalid log2() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:10]: (error) Invalid log2f() argument nr 1. The value is -0.1 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:11]: (error) Invalid log2l() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:3]: (warning) Passing value -0.1 to log() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing value -0.1 to logf() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing value -0.1 to logl() leads to implementation-defined result.\n"
-                      "[test.cpp:6]: (warning) Passing value -0.1 to log10() leads to implementation-defined result.\n"
-                      "[test.cpp:7]: (warning) Passing value -0.1 to log10f() leads to implementation-defined result.\n"
-                      "[test.cpp:8]: (warning) Passing value -0.1 to log10l() leads to implementation-defined result.\n"
-                      "[test.cpp:9]: (warning) Passing value -0.1 to log2() leads to implementation-defined result.\n"
-                      "[test.cpp:10]: (warning) Passing value -0.1 to log2f() leads to implementation-defined result.\n"
-                      "[test.cpp:11]: (warning) Passing value -0.1 to log2l() leads to implementation-defined result.\n"
-                      "[test.cpp:12]: (warning) Passing value -1.1 to log1p() leads to implementation-defined result.\n"
-                      "[test.cpp:13]: (warning) Passing value -1.1 to log1pf() leads to implementation-defined result.\n"
-                      "[test.cpp:14]: (warning) Passing value -1.1 to log1pl() leads to implementation-defined result.\n", errout.str());
+        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"
+                      "[test.cpp:6:27]: (error) Invalid log10() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:7:28]: (error) Invalid log10f() argument nr 1. The value is -0.1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:8:28]: (error) Invalid log10l() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:9:26]: (error) Invalid log2() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:10:27]: (error) Invalid log2f() argument nr 1. The value is -0.1 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:11:27]: (error) Invalid log2l() argument nr 1. The value is -0.1 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:3:19]: (warning) Passing value -0.1 to log() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:4:19]: (warning) Passing value -0.1 to logf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:5:19]: (warning) Passing value -0.1 to logl() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:6:19]: (warning) Passing value -0.1 to log10() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:7:19]: (warning) Passing value -0.1 to log10f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:8:19]: (warning) Passing value -0.1 to log10l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:9:19]: (warning) Passing value -0.1 to log2() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:10:19]: (warning) Passing value -0.1 to log2f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:11:19]: (warning) Passing value -0.1 to log2l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:12:19]: (warning) Passing value -1.1 to log1p() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:13:19]: (warning) Passing value -1.1 to log1pf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:14:19]: (warning) Passing value -1.1 to log1pl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -957,27 +977,27 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1pf(-1.0) << std::endl;\n"
               "    std::cout <<  log1pl(-1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid log() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:4]: (error) Invalid logf() argument nr 1. The value is 0 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:5]: (error) Invalid logl() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:6]: (error) Invalid log10() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:7]: (error) Invalid log10f() argument nr 1. The value is 0 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:8]: (error) Invalid log10l() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:9]: (error) Invalid log2() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:10]: (error) Invalid log2f() argument nr 1. The value is 0 but the valid values are '1.4013e-45:'.\n"
-                      "[test.cpp:11]: (error) Invalid log2l() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'.\n"
-                      "[test.cpp:3]: (warning) Passing value 0 to log() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing value 0. to logf() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing value 0.0 to logl() leads to implementation-defined result.\n"
-                      "[test.cpp:6]: (warning) Passing value 0.0 to log10() leads to implementation-defined result.\n"
-                      "[test.cpp:7]: (warning) Passing value 0 to log10f() leads to implementation-defined result.\n"
-                      "[test.cpp:8]: (warning) Passing value 0. to log10l() leads to implementation-defined result.\n"
-                      "[test.cpp:9]: (warning) Passing value 0. to log2() leads to implementation-defined result.\n"
-                      "[test.cpp:10]: (warning) Passing value 0.0 to log2f() leads to implementation-defined result.\n"
-                      "[test.cpp:11]: (warning) Passing value 0 to log2l() leads to implementation-defined result.\n"
-                      "[test.cpp:12]: (warning) Passing value -1. to log1p() leads to implementation-defined result.\n"
-                      "[test.cpp:13]: (warning) Passing value -1.0 to log1pf() leads to implementation-defined result.\n"
-                      "[test.cpp:14]: (warning) Passing value -1 to log1pl() leads to implementation-defined result.\n", errout.str());
+        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"
+                      "[test.cpp:6:26]: (error) Invalid log10() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:7:26]: (error) Invalid log10f() argument nr 1. The value is 0 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:8:27]: (error) Invalid log10l() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:9:25]: (error) Invalid log2() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:10:26]: (error) Invalid log2f() argument nr 1. The value is 0 but the valid values are '1.4013e-45:'. [invalidFunctionArg]\n"
+                      "[test.cpp:11:25]: (error) Invalid log2l() argument nr 1. The value is 0 but the valid values are '4.94066e-324:'. [invalidFunctionArg]\n"
+                      "[test.cpp:3:19]: (warning) Passing value 0 to log() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:4:19]: (warning) Passing value 0. to logf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:5:19]: (warning) Passing value 0.0 to logl() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:6:19]: (warning) Passing value 0.0 to log10() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:7:19]: (warning) Passing value 0 to log10f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:8:19]: (warning) Passing value 0. to log10l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:9:19]: (warning) Passing value 0. to log2() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:10:19]: (warning) Passing value 0.0 to log2f() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:11:19]: (warning) Passing value 0 to log2l() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:12:19]: (warning) Passing value -1. to log1p() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:13:19]: (warning) Passing value -1.0 to log1pf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:14:19]: (warning) Passing value -1 to log1pl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1030,21 +1050,21 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  log1pf(2.0)       << std::endl;\n"
               "    std::cout <<  log1pf(2.0f)      << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    std::string *log(0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3473 - no warning if "log" is a variable
         check("Fred::Fred() : log(0) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5748
         check("void f() { foo.log(0); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mathfunctionCall_acos() {
@@ -1082,7 +1102,7 @@ class TestFunctions : public TestFixture {
               "    + acosl(+0.1E-1) \n"
               "    + acosl(-0.1E-1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1090,9 +1110,9 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  acosf(1.1) << std::endl;\n"
               "    std::cout <<  acosl(1.1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid acos() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:4]: (error) Invalid acosf() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:5]: (error) Invalid acosl() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'.\n", errout.str());
+        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());
 
         check("void foo()\n"
               "{\n"
@@ -1100,9 +1120,9 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  acosf(-1.1) << std::endl;\n"
               "    std::cout <<  acosl(-1.1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid acos() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:4]: (error) Invalid acosf() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:5]: (error) Invalid acosl() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'.\n", errout.str());
+        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());
     }
 
     void mathfunctionCall_asin() {
@@ -1143,7 +1163,7 @@ class TestFunctions : public TestFixture {
               "    + asinl(+0.1E-1) \n"
               "    + asinl(-0.1E-1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1151,9 +1171,9 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  asinf(1.1) << std::endl;\n"
               "    std::cout <<  asinl(1.1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid asin() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:4]: (error) Invalid asinf() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:5]: (error) Invalid asinl() argument nr 1. The value is 1.1 but the valid values are '-1.0:1.0'.\n", errout.str());
+        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());
 
         check("void foo()\n"
               "{\n"
@@ -1161,9 +1181,9 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  asinf(-1.1) << std::endl;\n"
               "    std::cout <<  asinl(-1.1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid asin() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:4]: (error) Invalid asinf() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'.\n"
-                      "[test.cpp:5]: (error) Invalid asinl() argument nr 1. The value is -1.1 but the valid values are '-1.0:1.0'.\n", errout.str());
+        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());
     }
 
     void mathfunctionCall_pow() {
@@ -1174,9 +1194,9 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  powf(0,-10) << std::endl;\n"
               "    std::cout <<  powl(0,-10) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Passing values 0 and -10 to pow() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing values 0 and -10 to powf() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing values 0 and -10 to powl() leads to implementation-defined result.\n", errout.str());
+        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());
 
         check("void foo()\n"
               "{\n"
@@ -1184,7 +1204,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  powf(0,10) << std::endl;\n"
               "    std::cout <<  powl(0,10) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mathfunctionCall_atan2() {
@@ -1225,7 +1245,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  atan2l(+0.1E-1,1)  ;\n"
               "    std::cout <<  atan2l(-0.1E-1,8)  ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1233,9 +1253,9 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  atan2f(0,0) << std::endl;\n"
               "    std::cout <<  atan2l(0,0) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Passing values 0 and 0 to atan2() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing values 0 and 0 to atan2f() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing values 0 and 0 to atan2l() leads to implementation-defined result.\n", errout.str());
+        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());
     }
 
     void mathfunctionCall_fmod() {
@@ -1246,12 +1266,12 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  fmodf(1.0,0) << std::endl;\n"
               "    std::cout <<  fmodl(1.0,0) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid fmod() argument nr 2. The value is 0 but the valid values are '!0.0'.\n"
-                      "[test.cpp:4]: (error) Invalid fmodf() argument nr 2. The value is 0 but the valid values are '!0.0'.\n"
-                      "[test.cpp:5]: (error) Invalid fmodl() argument nr 2. The value is 0 but the valid values are '!0.0'.\n"
-                      "[test.cpp:3]: (warning) Passing values 1.0 and 0 to fmod() leads to implementation-defined result.\n"
-                      "[test.cpp:4]: (warning) Passing values 1.0 and 0 to fmodf() leads to implementation-defined result.\n"
-                      "[test.cpp:5]: (warning) Passing values 1.0 and 0 to fmodl() leads to implementation-defined result.\n", errout.str());
+        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"
+                      "[test.cpp:3:19]: (warning) Passing values 1.0 and 0 to fmod() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:4:19]: (warning) Passing values 1.0 and 0 to fmodf() leads to implementation-defined result. [wrongmathcall]\n"
+                      "[test.cpp:5:19]: (warning) Passing values 1.0 and 0 to fmodl() leads to implementation-defined result. [wrongmathcall]\n", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1259,7 +1279,7 @@ class TestFunctions : public TestFixture {
               "    std::cout <<  fmodf(1.0,1) << std::endl;\n"
               "    std::cout <<  fmodl(1.0,1) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mathfunctionCall_precision() {
@@ -1268,110 +1288,110 @@ class TestFunctions : public TestFixture {
               "    print(log(1 + x));\n"
               "    print(1 - erf(x));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision.\n"
-                      "[test.cpp:3]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision.\n"
-                      "[test.cpp:4]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision.\n", errout.str());
+        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());
 
         check("void foo() {\n"
               "    print(exp(x) - 1.0);\n"
               "    print(log(1.0 + x));\n"
               "    print(1.0 - erf(x));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision.\n"
-                      "[test.cpp:3]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision.\n"
-                      "[test.cpp:4]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision.\n", errout.str());
+        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());
 
         check("void foo() {\n"
               "    print(exp(3 + x*f(a)) - 1);\n"
               "    print(log(x*4 + 1));\n"
               "    print(1 - erf(34*x + f(x) - c));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Expression 'exp(x) - 1' can be replaced by 'expm1(x)' to avoid loss of precision.\n"
-                      "[test.cpp:3]: (style) Expression 'log(1 + x)' can be replaced by 'log1p(x)' to avoid loss of precision.\n"
-                      "[test.cpp:4]: (style) Expression '1 - erf(x)' can be replaced by 'erfc(x)' to avoid loss of precision.\n", errout.str());
+        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());
 
         check("void foo() {\n"
               "    print(2*exp(x) - 1);\n"
               "    print(1 - erf(x)/2.0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkIgnoredReturnValue() {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def version=\"2\">\n"
-                               "  <function name=\"mystrcmp,foo::mystrcmp\">\n"
-                               "    <use-retval/>\n"
-                               "    <arg nr=\"1\"/>\n"
-                               "    <arg nr=\"2\"/>\n"
-                               "  </function>\n"
-                               "</def>";
-        const Settings settings2 = settingsBuilder().severity(Severity::warning).libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def version=\"2\">\n"
+                                   "  <function name=\"mystrcmp,foo::mystrcmp\">\n"
+                                   "    <use-retval/>\n"
+                                   "    <arg nr=\"1\"/>\n"
+                                   "    <arg nr=\"2\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        const Settings settings2 = settingsBuilder().severity(Severity::warning).libraryxml(xmldata).build();
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Return value of function mystrcmp() is not used.\n", errout.str());
+              "}", 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"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Return value of function foo::mystrcmp() is not used.\n", errout.str());
+              "}", 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"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function x.mystrcmp() is not used.\n", errout.str());
+              "}", 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"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function mystrcmp() is not used.\n", errout.str());
+              "}", 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"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    class mystrcmp { mystrcmp() {} };\n" // strcmp is a constructor definition here
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    return foo::mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if(mystrcmp(a, b));\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    bool b = mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         // #6194
         check("void foo() {\n"
               "    MyStrCmp mystrcmp(x, y);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         // #6197
         check("void foo() {\n"
               "    abc::def.mystrcmp(a,b);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         // #6233
         check("int main() {\n"
@@ -1382,29 +1402,29 @@ class TestFunctions : public TestFixture {
               "    lambda(13.3);\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #6669
         check("void foo(size_t size) {\n"
               "   void * res{malloc(size)};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #7447
         check("void foo() {\n"
               "   int x{mystrcmp(a,b)};\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         // #7905
         check("void foo() {\n"
               "   int x({mystrcmp(a,b)});\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("", errout.str());
+              "}", settings2);
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // don't crash
               "  DEBUG(123)(mystrcmp(a,b))(fd);\n"
-              "}", "test.c", &settings2);
+              "}", settings2);
         check("struct teststruct {\n"
               "    int testfunc1() __attribute__ ((warn_unused_result)) { return 1; }\n"
               "    [[nodiscard]] int testfunc2() { return 1; }\n"
@@ -1415,18 +1435,18 @@ class TestFunctions : public TestFixture {
               "    TestStruct1.testfunc1();\n"
               "    TestStruct1.testfunc2();\n"
               "    return 0;\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Return value of function testfunc1() is not used.\n"
-                      "[test.cpp:4]: (warning) Return value of function testfunc2() is not used.\n"
-                      "[test.cpp:8]: (warning) Return value of function TestStruct1.testfunc1() is not used.\n"
-                      "[test.cpp:9]: (warning) Return value of function TestStruct1.testfunc2() is not used.\n", errout.str());
+              "}", 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"
+                      "[test.cpp:9:17]: (warning) Return value of function TestStruct1.testfunc2() is not used. [ignoredReturnValue]\n", errout_str());
 
         // #9006
         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());
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         check("struct A { int x; };\n"
               "template <class... Ts>\n"
@@ -1434,18 +1454,28 @@ class TestFunctions : public TestFixture {
               "    return {std::move(x), static_cast<int>(xs)...};\n"
               "}\n"
               "A g() { return f(1); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str()); // TODO: use settings2?
 
         // #8412 - unused operator result
         check("void foo() {\n"
               "  !mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Return value of function mystrcmp() is not used.\n", errout.str());
+              "}", 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"); // 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());
     }
 
     void checkIgnoredErrorCode() {
@@ -1457,29 +1487,29 @@ class TestFunctions : public TestFixture {
                                "    <arg nr=\"2\"/>\n"
                                "  </function>\n"
                                "</def>";
-        const Settings settings2 = settingsBuilder().severity(Severity::style).libraryxml(xmldata, sizeof(xmldata)).build();
+        const Settings settings2 = settingsBuilder().severity(Severity::style).libraryxml(xmldata).build();
 
         check("void foo() {\n"
               "  mystrcmp(a, b);\n"
-              "}", "test.cpp", &settings2);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Error code from the return value of function mystrcmp() is not used.\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) memset() called to fill 0 bytes.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) memset() called to fill 0 bytes.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6269 false positives in case of overloaded standard library functions
         check("class c {\n"
@@ -1488,13 +1518,13 @@ class TestFunctions : public TestFixture {
               "     memset( 0 );\n"
               "  }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7285
         check("void f() {\n"
               "    memset(&tm, sizeof(tm), 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) memset() called to fill 0 bytes.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning) memset() called to fill 0 bytes. [memsetZeroBytes]\n", errout_str());
 
     }
 
@@ -1505,27 +1535,27 @@ class TestFunctions : public TestFixture {
               "    int* is2 = new int[10];\n"
               "    memset(is2, 0.1f, 40);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) The 2nd memset() argument '1.0f' is a float, its representation is implementation defined.\n"
-                      "[test.cpp:5]: (portability) The 2nd memset() argument '0.1f' is a float, its representation is implementation defined.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "    int* is = new int[10];\n"
               "    float g = computeG();\n"
               "    memset(is, g, 40);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (portability) The 2nd memset() argument 'g' is a float, its representation is implementation defined.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // FP
               "    float x = 2.3f;\n"
               "    memset(a, (x?64:0), 40);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    short ss[] = {1, 2};\n"
@@ -1533,8 +1563,8 @@ class TestFunctions : public TestFixture {
               "    short ss2[2];\n"
               "    memset(ss2, -129, 4);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) The 2nd memset() argument '256' doesn't fit into an 'unsigned char'.\n"
-                      "[test.cpp:5]: (warning) The 2nd memset() argument '-129' doesn't fit into an 'unsigned char'.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "    int is[10];\n"
@@ -1548,47 +1578,50 @@ class TestFunctions : public TestFixture {
               "    char cs3[30];\n"
               "    memset(cs3, 0, 30);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int is[10];\n"
               "    const int i = g();\n"
               "    memset(is, 1.0f + i, 40);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (portability) The 2nd memset() argument '1.0f+i' is a float, its representation is implementation defined.\n", errout.str());
+        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 checkMissingReturn() {
+    void checkMissingReturn1() {
         check("int f() {}");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout.str());
+        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) {}";
-            Settings s;
+            {
+                const Settings s = settingsBuilder().c(Standards::C89).build();
 
-            s.standards.c = Standards::C89;
-            check(code, "test.c", &s); // c code (c89)
-            ASSERT_EQUALS("[test.c:1]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout.str());
+                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());
+            }
 
-            s.standards.c = Standards::C99;
-            check(code, "test.c", &s); // c code (c99)
-            ASSERT_EQUALS("", errout.str());
+            {
+                const Settings s = settingsBuilder().c(Standards::C99).build();
+                check(code, s, false); // c code (c99)
+                ASSERT_EQUALS("", errout_str());
 
-            check(code, "test.cpp", &s); // c++ code
-            ASSERT_EQUALS("", errout.str());
+                check(code, s); // c++ code
+                ASSERT_EQUALS("", errout_str());
+            }
         }
 
         check("F(A,B) { x=1; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto foo4() -> void {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void STDCALL foo() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void operator=(int y) { x=y; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "back:\n"
@@ -1597,21 +1630,21 @@ class TestFunctions : public TestFixture {
               "    x=y;\n"
               "    goto back;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unreachable code..
         check("int foo(int x) {\n"
               "  return 1;\n"
               "  (void)x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int x) {\n"
               "  if (x) goto out;\n"
               "  return 1;\n"
               "out:\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout.str());
+        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
         check("int f() {\n"
@@ -1620,7 +1653,7 @@ class TestFunctions : public TestFixture {
               "        case 2: return 1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout.str());
+        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"
               "    switch (x) {\n"
@@ -1628,7 +1661,7 @@ class TestFunctions : public TestFixture {
               "        default: return 1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool test(unsigned char v1, int v2) {\n"
               "    switch (v1) {\n"
@@ -1642,7 +1675,7 @@ class TestFunctions : public TestFixture {
               "            return true;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // if/else
         check("int f(int x) {\n"
@@ -1650,7 +1683,7 @@ class TestFunctions : public TestFixture {
               "        return 1;\n"
               "    }\n" // <- error (missing else)
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout.str());
+        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"
               "    if (x) {\n"
@@ -1659,19 +1692,19 @@ class TestFunctions : public TestFixture {
               "        return 1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    if (!0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Found an exit path from function with non-void return type that has missing return statement\n", errout.str());
+        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
         check("int f(int x) {\n"
@@ -1679,7 +1712,7 @@ class TestFunctions : public TestFixture {
               "        dostuff();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return {..}
         check("std::pair<int, int> typeDecl(int tok) {\n"
@@ -1688,20 +1721,20 @@ class TestFunctions : public TestFixture {
               "    else\n"
               "        return {1, 2};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // noreturn function
         check("int f(int x) { exit(0); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) { assert(0); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) { if (x) return 1; else return bar({1}, {}); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("auto f() -> void {}"); // #10342
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S1 {\n" // #7433
               "    S1& operator=(const S1& r) { if (this != &r) { i = r.i; } }\n"
@@ -1715,86 +1748,208 @@ class TestFunctions : public TestFixture {
               "    S3& operator=(const S3& t) { if (this != &t) { k = t.k; return *this; } }\n"
               "    int k;\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Found an exit path from function with non-void return type that has missing return statement\n"
-                      "[test.cpp:10]: (error) Found an exit path from function with non-void return type that has missing return statement\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:61]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n"
+                      "[test.cpp:10:75]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n",
+                      errout_str());
 
         // #11171
         check("std::enable_if_t<sizeof(uint64_t) == 8> f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::enable_if_t<sizeof(uint64_t) == 8, int> f() {}");
         ASSERT_EQUALS(
-            "[test.cpp:1]: (error) Found an exit path from function with non-void return type that has missing return statement\n",
-            errout.str());
+            "[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) {}");
         ASSERT_EQUALS(
-            "[test.cpp:1]: (error) Found an exit path from function with non-void return type that has missing return statement\n",
-            errout.str());
+            "[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) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typename std::enable_if<sizeof(uint64_t) == 8>::type f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typename std::enable_if<sizeof(uint64_t) == 8, int>::type f() {}");
         ASSERT_EQUALS(
-            "[test.cpp:1]: (error) Found an exit path from function with non-void return type that has missing return statement\n",
-            errout.str());
+            "[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) {}");
         ASSERT_EQUALS(
-            "[test.cpp:1]: (error) Found an exit path from function with non-void return type that has missing return statement\n",
-            errout.str());
+            "[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) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "     [[noreturn]] void f();\n"
               "     int g() { this->f(); }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { [[noreturn]] void f(); };\n"
               "int g(S& s) { s.f(); }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturn2() { // #11798
+        check("int f(bool const a) {\n"
+              "      switch (a) {\n"
+              "      case true:\n"
+              "            return 1;\n"
+              "      case false:\n"
+              "            return 2;\n"
+              "      }\n"
+              "}\n"
+              "int main(int argc, char* argv[])\n"
+              "{\n"
+              "      auto const b= f(true);\n"
+              "      auto const c= f(false);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturn3() {
+        check("enum Enum {\n"
+              "    A,\n"
+              "    B,\n"
+              "    C,\n"
+              "};\n"
+              "int f(Enum e) {\n"
+              "    switch (e) {\n"
+              "    case A:\n"
+              "          return 1;\n"
+              "    case B:\n"
+              "          return 2;\n"
+              "    case C:\n"
+              "          return 2;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturn4() {
+        check("enum Enum {\n"
+              "    A,\n"
+              "    B,\n"
+              "    C,\n"
+              "};\n"
+              "int f(Enum e) {\n"
+              "    switch (e) {\n"
+              "    case A:\n"
+              "          return 1;\n"
+              "    case B:\n"
+              "          return 2;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7:16]: (error) Found an exit path from function with non-void return type that has missing return statement [missingReturn]\n", errout_str());
+    }
+
+    void checkMissingReturn5() {
+        check("enum Enum {\n"
+              "    A,\n"
+              "    B,\n"
+              "    C,\n"
+              "};\n"
+              "int f(Enum e, bool b) {\n"
+              "    switch (e) {\n"
+              "    case A:\n"
+              "          return 1;\n"
+              "    case B:\n"
+              "          return 2;\n"
+              "    case C:\n"
+              "          switch (b) {\n"
+              "          case true:\n"
+              "              return 3;\n"
+              "          case false:\n"
+              "              return 4;\n"
+              "          }\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void checkMissingReturn6() {// #13180
+        check("int foo(void)\n"
+              "{\n"
+              "    i = readData();\n"
+              "}\n");
+        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());
     }
 
     // NRVO check
     void returnLocalStdMove1() {
         check("struct A{}; A f() { A var; return std::move(var); }");
-        ASSERT_EQUALS("[test.cpp:1]: (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\n", errout.str());
+        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() ); }");
-        ASSERT_EQUALS("[test.cpp:1]: (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\n", errout.str());
+        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{}); }");
-        ASSERT_EQUALS("[test.cpp:1]: (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\n", errout.str());
+        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{}); }");
-        ASSERT_EQUALS("[test.cpp:1]: (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\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { std::string msg{ \"abc\" }; };\n"
               "std::unique_ptr<S> get(std::vector<std::unique_ptr<S>>& v) {\n"
@@ -1806,7 +1961,13 @@ class TestFunctions : public TestFixture {
               "    auto p = get(v);\n"
               "    std::cout << p->msg;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("std::string&& f() {\n" // #11881
+              "    std::string s;\n"
+              "    return std::move(s);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void negativeMemoryAllocationSizeError() { // #389
@@ -1815,31 +1976,30 @@ class TestFunctions : public TestFixture {
               "   a = malloc( -10 );\n"
               "   free(a);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid malloc() argument nr 1. The value is -10 but the valid values are '0:'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Obsolete function 'alloca' called.\n"
-                      "[test.cpp:3]: (error) Invalid alloca() argument nr 1. The value is -10 but the valid values are '0:'.\n", errout.str());
+        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());
     }
 
     void checkLibraryMatchFunctions() {
-        Settings s = settingsBuilder(settings).checkLibrary().build();
+        /*const*/ Settings s = settingsBuilder(settings).checkLibrary().debugwarnings().build();
         s.daca = true;
-        s.debugwarnings = true;
 
         check("void f() {\n"
               "    lib_func();"
-              "}", "test.cpp", &s);
-        ASSERT_EQUALS("[test.cpp:2]: (information) --check-library: There is no matching configuration for function lib_func()\n", errout.str());
+              "}", 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);"
-              "}", "test.cpp", &s);
-        ASSERT_EQUALS("[test.cpp:2]: (information) --check-library: There is no matching configuration for function lib_func()\n", errout.str());
+              "}", s);
+        ASSERT_EQUALS("[test.cpp:2:5]: (information) --check-library: There is no matching configuration for function lib_func() [checkLibraryFunction]\n", errout_str());
 
         // #10105
         check("class TestFixture {\n"
@@ -1854,8 +2014,8 @@ class TestFunctions : public TestFixture {
               "\n"
               "        void testFunctionReturnType() {\n"
               "        }\n"
-              "};", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "};", s);
+        ASSERT_EQUALS("", errout_str());
 
         // #11183
         check("#include <string>\n"
@@ -1864,47 +2024,47 @@ class TestFunctions : public TestFixture {
               "\n"
               "void f() {\n"
               "    cb(std::string(\"\"));\n"
-              "}", "test.cpp", &s);
-        TODO_ASSERT_EQUALS("", "[test.cpp:6]: (information) --check-library: There is no matching configuration for function cb()\n", errout.str());
+              "}", s);
+        TODO_ASSERT_EQUALS("", "[test.cpp:6:5]: (information) --check-library: There is no matching configuration for function cb() [checkLibraryFunction]\n", errout_str());
 
         // #7375
         check("void f() {\n"
               "    struct S { int i; char c; };\n"
               "    size_t s = sizeof(S);\n"
               "    static_assert(s == 9);\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char) {}\n"
               "void g() {\n"
               "    f(int8_t(1));\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { throw(1); }\n", "test.cpp", &s); // #8958
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { throw(1); }\n", s); // #8958
+        ASSERT_EQUALS("", errout_str());
 
         check("using namespace std;\n"
-              "void f() { throw range_error(\"abc\"); }\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "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", "test.cpp", &s);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Return value of function s.find() is not used.\n", errout.str());
+              "}\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"
               "    auto* p = new std::vector<int>(5);\n"
@@ -1913,20 +2073,20 @@ class TestFunctions : public TestFixture {
               "    q->push_back(1);\n"
               "    auto* r = new std::vector<int>;\n"
               "    r->push_back(1);\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    auto v = std::vector<int>{};\n"
@@ -1935,36 +2095,36 @@ class TestFunctions : public TestFixture {
               "    w.push_back(1);\n"
               "    auto x = std::vector<int>(1);\n"
               "    x.push_back(1);\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    auto p(std::make_shared<std::vector<int>>());\n"
               "    p->push_back(1);\n"
               "    auto q{ std::make_shared<std::vector<int>>{} };\n"
               "    q->push_back(1);\n"
-              "}\n", "test.cpp", &s);
+              "}\n", s);
         TODO_ASSERT_EQUALS("",
-                           "[test.cpp:2]: (debug) auto token with no type.\n"
-                           "[test.cpp:4]: (debug) auto token with no type.\n"
-                           "[test.cpp:3]: (information) --check-library: There is no matching configuration for function auto::push_back()\n"
-                           "[test.cpp:5]: (information) --check-library: There is no matching configuration for function auto::push_back()\n",
-                           errout.str());
+                           "[test.cpp:2:5]: (debug) auto token with no type. [autoNoType]\n"
+                           "[test.cpp:4:5]: (debug) auto token with no type. [autoNoType]\n"
+                           "[test.cpp:3:8]: (information) --check-library: There is no matching configuration for function auto::push_back() [checkLibraryFunction]\n"
+                           "[test.cpp:5:8]: (information) --check-library: There is no matching configuration for function auto::push_back() [checkLibraryFunction]\n",
+                           errout_str());
 
         check("struct F { void g(int); };\n"
               "void f(std::list<F>& l) {\n"
               "    std::list<F>::iterator it;\n"
               "    for (it = l.begin(); it != l.end(); ++it)\n"
               "        it->g(0);\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         check("auto f() {\n"
               "    return std::runtime_error(\"abc\");\n"
-              "}\n", "test.cpp", &s);
+              "}\n", s);
         TODO_ASSERT_EQUALS("",
-                           "[test.cpp:1]: (debug) auto token with no type.\n",
-                           errout.str());
+                           "[test.cpp:1:1]: (debug) auto token with no type. [autoNoType]\n",
+                           errout_str());
 
         check("struct S {\n" // #11543
               "    S() {}\n"
@@ -1974,8 +2134,8 @@ 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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace N {\n"
               "    struct S { static const std::set<std::string> s; };\n"
@@ -1983,30 +2143,30 @@ class TestFunctions : public TestFixture {
               "void f() {\n"
               "    const auto& t = N::S::s;\n"
               "    if (t.find(\"abc\") != t.end()) {}\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11604
               "    int (*g)() = nullptr;\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    INT (*g)() = nullptr;\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T;\n"
               "std::shared_ptr<T> get();\n"
@@ -2014,14 +2174,14 @@ class TestFunctions : public TestFixture {
               "    auto p = get();\n"
               "    p->h(i);\n"
               "    p.reset(nullptr);\n"
-              "}\n", "test.cpp", &s);
-        ASSERT_EQUALS("[test.cpp:5]: (information) --check-library: There is no matching configuration for function T::h()\n",
-                      errout.str());
+              "}\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", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "};\n", s);
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    auto g = []() -> std::string { return \"abc\"; };\n"
@@ -2030,8 +2190,30 @@ class TestFunctions : public TestFixture {
               "    auto h{ []() -> std::string { return \"xyz\"; } };\n"
               "    auto t = h();\n"
               "    if (t.at(0)) {}\n"
-              "};\n", "test.cpp", &s);
-        ASSERT_EQUALS("", errout.str());
+              "};\n", s);
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
+
+        check("::std::string f(const char* c) {\n" // #12365
+              "    return ::std::string(c);\n"
+              "}\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", s);
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct P {\n" // #13105
+              "    bool g(int i) const;\n"
+              "    std::shared_ptr<std::map<int, int>> m;\n"
+              "};\n"
+              "bool P::g(int i) const {\n"
+              "    auto it = m->find(i);\n"
+              "    const bool b = it != m->end();\n"
+              "    return b;\n"
+              "}\n", s);
+        TODO_ASSERT_EQUALS("", "[test.cpp:6:5]: (debug) auto token with no type. [autoNoType]\n", errout_str());
     }
 
     void checkUseStandardLibrary1() {
@@ -2040,7 +2222,7 @@ class TestFunctions : public TestFixture {
               "    for (i = 0; count > i; ++i)\n"
               "        (reinterpret_cast<uint8_t*>(dest))[i] = (reinterpret_cast<const uint8_t*>(src))[i];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::memcpy instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Consider using std::memcpy instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary2() {
@@ -2048,7 +2230,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < count; i++) {\n"
               "        (reinterpret_cast<uint8_t*>(dest))[i] = (reinterpret_cast<const uint8_t*>(src))[i];\n"
               "}}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::memcpy instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::memcpy instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary3() {
@@ -2057,7 +2239,7 @@ class TestFunctions : public TestFixture {
               "    for (i = 0; count > i; i++)\n"
               "        ((char*)dst)[i] = ((const char*)src)[i];\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::memcpy instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Consider using std::memcpy instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary4() {
@@ -2065,7 +2247,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < size; i += 1) {\n"
               "        ((int8_t*)dst)[i] = ((int8_t*)src)[i];\n"
               "}}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::memcpy instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::memcpy instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     // different indexes
@@ -2074,7 +2256,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < size; ++i) {\n"
               "        ((int8_t*)dst)[i] = ((int8_t*)src)[from_idx];\n"
               "}}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // unknown count
@@ -2083,7 +2265,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; ((int8_t*)src)[i] != 0; ++i) {\n"
               "        ((int8_t*)dst)[i] = ((int8_t*)src)[i];\n"
               "}}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // increment with 2
@@ -2092,7 +2274,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < size; i += 2) {\n"
               "        ((int8_t*)dst)[i] = ((int8_t*)src)[i];\n"
               "}}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // right argument of assignment could be static_cast, functional cast, c-style and implicit cast
@@ -2103,7 +2285,7 @@ class TestFunctions : public TestFixture {
               "    for (i = 0; i < count; ++i)\n"
               "        (reinterpret_cast<int8_t*>(dest))[i] = static_cast<const int8_t>(0);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::memset instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Consider using std::memset instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary9() {
@@ -2111,7 +2293,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < count; i++) {\n"
               "        (reinterpret_cast<uint8_t*>(dest))[i] = (static_cast<const uint8_t>(0));\n"
               "}}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::memset instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::memset instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary10() {
@@ -2120,7 +2302,7 @@ class TestFunctions : public TestFixture {
               "    for (i = 0; i < size; i++)\n"
               "        ((char*)dst)[i] = (const char)0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::memset instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Consider using std::memset instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary11() {
@@ -2128,7 +2310,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < size; i += 1) {\n"
               "        ((int8_t*)dst)[i] = ((int8_t)0);\n"
               "}}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::memset instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::memset instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary12() {
@@ -2136,7 +2318,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < size; i += 1) {\n"
               "        ((int8_t*)dst)[i] = 42;\n"
               "}}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::memset instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::memset instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary13() {
@@ -2144,7 +2326,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < count; i++) {\n"
               "        reinterpret_cast<unsigned char*>(dest)[i] = '0';\n"
               "}}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::memset instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::memset instead of loop. [useStandardLibrary]\n", errout_str());
     }
 
     void checkUseStandardLibrary14() {
@@ -2152,7 +2334,7 @@ class TestFunctions : public TestFixture {
               "    for (size_t i = 0; i < sizeof(int)*(15 + 42/2 - 7); i++) {\n"
               "        reinterpret_cast<unsigned char*>(dest)[i] = '0';\n"
               "}}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::memset instead of loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::memset instead of loop. [useStandardLibrary]\n", errout_str());
     }
 };
 
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 83219bacf76..2bfb1283587 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-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
@@ -18,29 +18,28 @@
 
 #include "check.h"
 #include "errortypes.h"
-#include "mathlib.h"
-#include "preprocessor.h"
-#include "settings.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "settings.h"
 #include "token.h"
-#include "tokenize.h"
 
+#include <cstddef>
 #include <list>
-#include <sstream> // IWYU pragma: keep
 #include <string>
 
-
 class TestGarbage : public TestFixture {
 public:
     TestGarbage() : TestFixture("TestGarbage") {}
 
 private:
-    Settings settings = settingsBuilder().debugwarnings().build();
+    /*const*/ Settings settings = settingsBuilder().debugwarnings().build();
 
     void run() override {
         settings.severity.fill();
         settings.certainty.fill();
 
+        mNewTemplate = true;
+
         // don't freak out when the syntax is wrong
 
         TEST_CASE(final_class_x);
@@ -253,6 +252,12 @@ class TestGarbage : public TestFixture {
         TEST_CASE(garbageCode221);
         TEST_CASE(garbageCode222); // #10763
         TEST_CASE(garbageCode223); // #11639
+        TEST_CASE(garbageCode224);
+        TEST_CASE(garbageCode225);
+        TEST_CASE(garbageCode226);
+        TEST_CASE(garbageCode227);
+        TEST_CASE(garbageCode228);
+        TEST_CASE(garbageCode229);
 
         TEST_CASE(garbageCodeFuzzerClientMode1); // test cases created with the fuzzer client, mode 1
 
@@ -270,48 +275,43 @@ class TestGarbage : public TestFixture {
         TEST_CASE(nonGarbageCode1); // #8346
     }
 
-#define checkCodeInternal(code, filename) checkCodeInternal_(code, filename, __FILE__, __LINE__)
-    std::string checkCode(const std::string &code, bool cpp = true) {
-        // double the tests - run each example as C as well as C++
-        const char* const filename = cpp ? "test.cpp" : "test.c";
-        const char* const alternatefilename = cpp ? "test.c" : "test.cpp";
-
-        // run alternate check first. It should only ensure stability - so we catch exceptions here.
-        try {
-            checkCodeInternal(code, alternatefilename);
-        } catch (const InternalError&) {}
-
-        return checkCodeInternal(code, filename);
-    }
-
-    std::string checkCodeInternal_(const std::string &code, const char* filename, const char* file, int line) {
-        errout.str("");
-
-        Preprocessor preprocessor(settings);
-
+#define checkCodeInternal(...) checkCodeInternal_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string checkCodeInternal_(const char* file, int line, const char (&code)[size], bool cpp) {
         // tokenize..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // call all "runChecks" in all registered Check classes
-        for (std::list<Check *>::const_iterator it = Check::instances().cbegin(); it != Check::instances().cend(); ++it) {
-            (*it)->runChecks(&tokenizer, &settings, this);
+        for (auto it = Check::instances().cbegin(); it != Check::instances().cend(); ++it) {
+            (*it)->runChecks(tokenizer, this);
         }
 
         return tokenizer.tokens()->stringifyList(false, false, false, true, false, nullptr, nullptr);
     }
 
-#define getSyntaxError(code) getSyntaxError_(code, __FILE__, __LINE__)
-    std::string getSyntaxError_(const char code[], const char* file, int line) {
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
+    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]) {
+        SimpleTokenizer tokenizer(settings, *this);
         try {
-            ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+            ASSERT_LOC(tokenizer.tokenize(code), file, line);
         } catch (InternalError& e) {
             if (e.id != "syntaxError")
                 return "";
-            return "[test.cpp:" + MathLib::toString(e.token->linenr()) + "] " + e.errorMessage;
+            return "[test.cpp:" + std::to_string(e.token->linenr()) + "] " + e.errorMessage;
         }
         return "";
     }
@@ -320,30 +320,26 @@ class TestGarbage : public TestFixture {
     void final_class_x() {
 
         const char code[] = "class __declspec(dllexport) x final { };";
-        {
-            errout.str("");
-            Tokenizer tokenizer(&settings, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
-            ASSERT_EQUALS("", errout.str());
-        }
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT(tokenizer.tokenize(code));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void wrong_syntax1() {
         {
             const char code[] ="TR(kvmpio, PROTO(int rw), ARGS(rw), TP_(aa->rw;))";
-            ASSERT_THROW(checkCode(code), InternalError);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_THROW_INTERNAL(checkCode(code), UNKNOWN_MACRO);
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] ="struct A { template<int> struct { }; };";
-            ASSERT_THROW(checkCode(code), InternalError);
+            ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
 
         {
             const char code[] ="enum ABC { A,B, typedef enum { C } };";
-            ASSERT_THROW(checkCode(code), InternalError);
+            ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
         }
     }
 
@@ -356,7 +352,8 @@ class TestGarbage : public TestFixture {
                             "void G( template <typename T> class (j) ) {}";
 
         // don't segfault..
-        ASSERT_THROW(checkCode(code), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
+        ignore_errout(); // we are not interested in the output
     }
 
 
@@ -369,10 +366,9 @@ class TestGarbage : public TestFixture {
                             " )\n"
                             "}";
 
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
+        SimpleTokenizer tokenizer(settings, *this);
         try {
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            ASSERT(tokenizer.tokenize(code));
             assertThrowFail(__FILE__, __LINE__);
         } catch (InternalError& e) {
             ASSERT_EQUALS("syntax error", e.errorMessage);
@@ -384,18 +380,18 @@ class TestGarbage : public TestFixture {
     void wrong_syntax4() {   // #3618
         const char code[] = "typedef void (x) (int);    return x&";
 
-        ASSERT_THROW(checkCode(code), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void wrong_syntax_if_macro() {
         // #2518 #4171
-        ASSERT_THROW(checkCode("void f() { if MACRO(); }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if MACRO(); }"), SYNTAX);
 
         // #4668 - note there is no semicolon after MACRO()
-        ASSERT_THROW(checkCode("void f() { if (x) MACRO() {} }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() {} }"), SYNTAX);
 
         // #4810 - note there is no semicolon after MACRO()
-        ASSERT_THROW(checkCode("void f() { if (x) MACRO() else ; }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { if (x) MACRO() else ; }"), SYNTAX);
     }
 
     void wrong_syntax_class_x_y() {
@@ -403,51 +399,47 @@ class TestGarbage : public TestFixture {
         const char code[] = "class x y { };";
 
         {
-            errout.str("");
-            Tokenizer tokenizer(&settings, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.c"));
-            ASSERT_EQUALS("", errout.str());
+            SimpleTokenizer tokenizer(settings, *this, false);
+            ASSERT(tokenizer.tokenize(code));
+            ASSERT_EQUALS("", errout_str());
         }
         {
-            errout.str("");
-            Tokenizer tokenizer(&settings, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
-            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());
+            SimpleTokenizer tokenizer(settings, *this);
+            ASSERT(tokenizer.tokenize(code));
+            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(checkCode("struct { int x; } = {0};"), InternalError);
-        ASSERT_THROW(checkCode("struct { int x; } * = {0};"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } = {0};"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("struct { int x; } * = {0};"), SYNTAX);
     }
 
     void syntax_case_default() {
-        ASSERT_THROW(checkCode("void f() {switch (n) { case: z(); break;}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case: z(); break;}}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f() {switch (n) { case;: z(); break;}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case;: z(); break;}}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f() {switch (n) { case {}: z(); break;}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case {}: z(); break;}}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f() {switch (n) { case 0?{1}:{2} : z(); break;}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?{1}:{2} : z(); break;}}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f() {switch (n) { case 0?1;:{2} : z(); break;}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?1;:{2} : z(); break;}}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f() {switch (n) { case 0?(1?{3:4}):2 : z(); break;}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {switch (n) { case 0?(1?{3:4}):2 : z(); break;}}"), AST);
 
         //ticket #4234
-        ASSERT_THROW(checkCode("( ) { switch break ; { switch ( x ) { case } y break ; : } }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { switch break ; { switch ( x ) { case } y break ; : } }"), SYNTAX);
 
         //ticket #4267
-        ASSERT_THROW(checkCode("f ( ) { switch break; { switch ( x ) { case } case break; -6: ( ) ; } }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("f ( ) { switch break; { switch ( x ) { case } case break; -6: ( ) ; } }"), SYNTAX);
 
         // Missing semicolon
-        ASSERT_THROW(checkCode("void foo () { switch(0) case 0 : default : }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void foo () { switch(0) case 0 : default : }"), SYNTAX);
     }
 
     void garbageCode1() {
-        checkCode("struct x foo_t; foo_t typedef y;");
+        (void)checkCode("struct x foo_t; foo_t typedef y;");
     }
 
     void garbageCode2() { //#4300 (segmentation fault)
@@ -459,21 +451,21 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode4() { // #4887
-        ASSERT_THROW(checkCode("void f ( ) { = a ; if ( 1 ) if = ( 0 ) ; }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f ( ) { = a ; if ( 1 ) if = ( 0 ) ; }"), SYNTAX);
     }
 
-    void garbageCode5() { // #5168
-        checkCode("( asm : ; void : );");
+    void garbageCode5() { // #5168 (segmentation fault)
+        ASSERT_THROW_INTERNAL(checkCode("( asm : ; void : );"), SYNTAX);
     }
 
     void garbageCode6() { // #5214
-        ASSERT_THROW(checkCode("int b = ( 0 ? ? ) 1 : 0 ;"), InternalError);
-        ASSERT_THROW(checkCode("int a = int b = ( 0 ? ? ) 1 : 0 ;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("int b = ( 0 ? ? ) 1 : 0 ;"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("int a = int b = ( 0 ? ? ) 1 : 0 ;"), SYNTAX);
     }
 
     void garbageCode7() {
-        ASSERT_THROW(checkCode("1 (int j) { return return (c) * sizeof } y[1];"), InternalError);
-        ASSERT_THROW(checkCode("foo(Args&&...) fn void = { } auto template<typename... bar(Args&&...)"), InternalError);
+        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);
     }
 
     void garbageCode8() { // #5604
@@ -493,33 +485,35 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode10() { // #6127
-        ASSERT_THROW(checkCode("for( rl=reslist; rl!=NULL; rl=rl->next )"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("for( rl=reslist; rl!=NULL; rl=rl->next )"), SYNTAX);
     }
 
     void garbageCode12() { // do not crash
-        checkCode("{ g; S (void) { struct } { } int &g; }");
+        (void)checkCode("{ g; S (void) { struct } { } int &g; }");
+        ignore_errout(); // we do not care about the output
     }
 
-    void garbageCode13() {
-        checkCode("struct C {} {} x");
+    void garbageCode13() { // Ticket #2607 - crash
+        (void)checkCode("struct C {} {} x");
     }
 
     void garbageCode15() { // Ticket #5203
-        ASSERT_THROW(checkCode("int f ( int* r ) { {  int s[2] ; f ( s ) ; if ( ) } }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("int f ( int* r ) { {  int s[2] ; f ( s ) ; if ( ) } }"), SYNTAX);
     }
 
-    void garbageCode16() {
-        checkCode("{ } A() { delete }"); // #6080
+    void garbageCode16() { // #6080 (segmentation fault)
+        (void)checkCode("{ } A() { delete }"); // #6080
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode17() {
-        ASSERT_THROW(checkCode("void h(int l) {\n"
-                               "    while\n" // Don't crash (#3870)
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void h(int l) {\n"
+                                        "    while\n" // Don't crash (#3870)
+                                        "}"), SYNTAX);
     }
 
     void garbageCode18() {
-        ASSERT_THROW(checkCode("switch(){case}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("switch(){case}"), SYNTAX);
     }
 
     void garbageCode20() {
@@ -529,91 +523,95 @@ class TestGarbage : public TestFixture {
 
     void garbageCode21() {
         // Ticket #3486 - Don't crash garbage code
-        ASSERT_THROW(checkCode("void f()\n"
-                               "{\n"
-                               "  (\n"
-                               "    x;\n"
-                               "    int a, a2, a2*x; if () ;\n"
-                               "  )\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f()\n"
+                                        "{\n"
+                                        "  (\n"
+                                        "    x;\n"
+                                        "    int a, a2, a2*x; if () ;\n"
+                                        "  )\n"
+                                        "}"), SYNTAX);
     }
 
     void garbageCode22() {
         // Ticket #3480 - Don't crash garbage code
-        ASSERT_THROW(checkCode("int f()\n"
-                               "{\n"
-                               "    return if\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("int f()\n"
+                                        "{\n"
+                                        "    return if\n"
+                                        "}"), SYNTAX);
     }
 
     void garbageCode23() {
         //garbage code : don't crash (#3481)
-        ASSERT_THROW_EQUALS(checkCode("{\n"
-                                      "    if (1) = x\n"
-                                      "    else abort s[2]\n"
-                                      "}"),
-                            InternalError,
-                            "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(checkCode("{\n"
+                                               "    if (1) = x\n"
+                                               "    else abort s[2]\n"
+                                               "}"),
+                                     SYNTAX,
+                                     "syntax error");
     }
 
     void garbageCode24() {
         // don't crash (example from #6361)
-        ASSERT_THROW(checkCode("float buffer[64];\n"
-                               "main (void)\n"
-                               "{\n"
-                               "  char *cptr;\n"
-                               "  cptr = (char *)buffer;\n"
-                               "  cptr += (-(long int) buffer & (16 * sizeof (float) - 1));\n"
-                               "}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("float buffer[64];\n"
+                                        "main (void)\n"
+                                        "{\n"
+                                        "  char *cptr;\n"
+                                        "  cptr = (char *)buffer;\n"
+                                        "  cptr += (-(long int) buffer & (16 * sizeof (float) - 1));\n"
+                                        "}\n"), SYNTAX);
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode25() {
         // Ticket #2386 - Segmentation fault upon strange syntax
-        ASSERT_THROW(checkCode("void f() {\n"
-                               "    switch ( x ) {\n"
-                               "        case struct Tree : break;\n"
-                               "    }\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {\n"
+                                        "    switch ( x ) {\n"
+                                        "        case struct Tree : break;\n"
+                                        "    }\n"
+                                        "}"), SYNTAX);
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode26() {
         // See tickets #2518 #2555 #4171
-        ASSERT_THROW(checkCode("void f() {\n"
-                               "    switch MAKEWORD(1)\n"
-                               "    {\n"
-                               "    case 0:\n"
-                               "        return;\n"
-                               "    }\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {\n"
+                                        "    switch MAKEWORD(1)\n"
+                                        "    {\n"
+                                        "    case 0:\n"
+                                        "        return;\n"
+                                        "    }\n"
+                                        "}"), SYNTAX);
     }
 
     void garbageCode27() {
-        ASSERT_THROW(checkCode("int f() {\n"
-                               "    return if\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("int f() {\n"
+                                        "    return if\n"
+                                        "}"), SYNTAX);
     }
 
-    void garbageCode28() {
+    void garbageCode28() { // #5702 (segmentation fault)
         // 5702
-        checkCode("struct R1 {\n"
-                  "  int a;\n"
-                  "  R1 () : a { }\n"
-                  "};");
+        (void)checkCode("struct R1 {\n"
+                        "  int a;\n"
+                        "  R1 () : a { }\n"
+                        "};");
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode30() {
         // simply survive - a syntax error would be even better (#5867)
-        checkCode("void f(int x) {\n"
-                  " x = 42\n"
-                  "}");
+        (void)checkCode("void f(int x) {\n"
+                        " x = 42\n"
+                        "}");
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode31() {
-        ASSERT_THROW(checkCode("typedef struct{}x[([],)]typedef e y;(y,x 0){}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("typedef struct{}x[([],)]typedef e y;(y,x 0){}"), SYNTAX);
     }
 
-    void garbageCode33() { // #6613
-        checkCode("main(()B{});");
+    void garbageCode33() { // #6613 (segmentation fault)
+        (void)checkCode("main(()B{});");
     }
 
     // Bug #6626 crash: Token::astOperand2() const ( do while )
@@ -622,282 +620,286 @@ class TestGarbage : public TestFixture {
                             " do\n"
                             " while (0);\n"
                             "}";
-        ASSERT_THROW(checkCode(code), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void garbageCode35() {
         // ticket #2604 segmentation fault
-        ASSERT_THROW(checkCode("sizeof <= A"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("sizeof <= A"), AST);
     }
 
     void garbageCode36() { // #6334
-        ASSERT_THROW(checkCode("{ } < class template < > , { = } ; class... >\n"
-                               "struct Y { }\n"
-                               "class Types { }\n"
-                               "( X < int > \"uses template\" ) ( < ( ) \"uses ;"
-                               "( int int ::primary \"uses template\" ) int double \"uses )"
-                               "::primary , \"uses template\" ;\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } < class template < > , { = } ; class... >\n"
+                                        "struct Y { }\n"
+                                        "class Types { }\n"
+                                        "( X < int > \"uses template\" ) ( < ( ) \"uses ;"
+                                        "( int int ::primary \"uses template\" ) int double \"uses )"
+                                        "::primary , \"uses template\" ;\n"), SYNTAX);
     }
 
     void garbageCode37() {
         // #5166 segmentation fault (invalid code) in lib/checkother.cpp:329 ( void * f { } void b ( ) { * f } )
-        checkCode("void * f { } void b ( ) { * f }");
+        (void)checkCode("void * f { } void b ( ) { * f }");
+        ignore_errout(); // we do not care about the output
     }
 
-    void garbageCode38() { // Ticket #6666
-        checkCode("{ f2 { } } void f3 () { delete[] } { }");
+    void garbageCode38() { // Ticket #6666 (segmentation fault)
+        (void)checkCode("{ f2 { } } void f3 () { delete[] } { }");
+        ignore_errout(); // we do not care about the output
     }
 
-    void garbageCode40() { // #6620
-        checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }");
+    void garbageCode40() { // #6620 (segmentation fault)
+        (void)checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }");
         // test doesn't seem to work on any platform: ASSERT_THROW(checkCode("{ ( ) () { virtual } ; { } E } A { : { } ( ) } * const ( ) const { }", "test.c"), InternalError);
     }
 
-    void garbageCode41() { // #6685
-        checkCode(" { } { return } *malloc(__SIZE_TYPE__ size); *memcpy(void n); static * const () { memcpy (*slot, 3); } { (); } { }");
+    void garbageCode41() { // #6685 (segmentation fault)
+        (void)checkCode(" { } { return } *malloc(__SIZE_TYPE__ size); *memcpy(void n); static * const () { memcpy (*slot, 3); } { (); } { }");
     }
 
-    void garbageCode42() { // #5760
-        checkCode("{  } * const ( ) { }");
+    void garbageCode42() { // #5760 (segmentation fault)
+        (void)checkCode("{  } * const ( ) { }");
     }
 
-    void garbageCode43() { // #6703
-        checkCode("int { }; struct A<void> a = { }");
+    void garbageCode43() { // #6703 (segmentation fault)
+        (void)checkCode("int { }; struct A<void> a = { }");
     }
 
     void garbageCode44() { // #6704
-        ASSERT_THROW(checkCode("{ { }; }; { class A : }; public typedef b;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ { }; }; { class A : }; public typedef b;"), SYNTAX);
     }
 
     void garbageCode45() { // #6608
-        ASSERT_THROW(checkCode("struct true template < > { = } > struct Types \"s\" ; static_assert < int > ;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("struct true template < > { = } > struct Types \"s\" ; static_assert < int > ;"), SYNTAX);
     }
 
-    void garbageCode46() { // #6705
-        checkCode(" { bar(char *x); void foo (int ...) { struct } va_list ap; va_start(ap, size); va_arg(ap, (d)); }");
+    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)); }");
+        ignore_errout(); // we do not care about the output
     }
 
-    void garbageCode47() { // #6706
-        checkCode(" { { }; }; * new private: B: B;");
+    void garbageCode47() { // #6706 (segmentation fault)
+        (void)checkCode(" { { }; }; * new private: B: B;");
     }
 
-    void garbageCode48() { // #6712
-        checkCode(" { d\" ) d ...\" } int main ( ) { ( ) catch ( A a ) { { } catch ( ) \"\" } }");
+    void garbageCode48() { // #6712 (segmentation fault)
+        ASSERT_THROW_INTERNAL(checkCode(" { d\" ) d ...\" } int main ( ) { ( ) catch ( A a ) { { } catch ( ) \"\" } }"), SYNTAX);
     }
 
     void garbageCode49() { // #6715
-        ASSERT_THROW(checkCode(" ( ( ) ) { } ( { ( __builtin_va_arg_pack ( ) ) ; } ) { ( int { ( ) ( ( ) ) } ( ) { } ( ) ) += ( ) }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode(" ( ( ) ) { } ( { ( __builtin_va_arg_pack ( ) ) ; } ) { ( int { ( ) ( ( ) ) } ( ) { } ( ) ) += ( ) }"), AST);
     }
 
     void garbageCode51() { // #6719
-        ASSERT_THROW(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 = }"), InternalError);
+        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);
     }
 
     void garbageCode53() { // #6721
-        ASSERT_THROW(checkCode("{ { } }; void foo (struct int i) { x->b[i] = = }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; void foo (struct int i) { x->b[i] = = }"), SYNTAX);
     }
 
     void garbageCode54() { // #6722
-        ASSERT_THROW(checkCode("{ typedef long ((pf) p) (); }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ typedef long ((pf) p) (); }"), SYNTAX);
     }
 
     void garbageCode55() { // #6724
-        ASSERT_THROW(checkCode("() __attribute__((constructor)); { } { }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("() __attribute__((constructor)); { } { }"), SYNTAX);
     }
 
     void garbageCode56() { // #6713
-        ASSERT_THROW(checkCode("void foo() { int a = 0; int b = ???; }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void foo() { int a = 0; int b = ???; }"), AST);
     }
 
     void garbageCode57() { // #6731
-        ASSERT_THROW(checkCode("{ } if () try { } catch (...) B::~B { }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } if () try { } catch (...) B::~B { }"), SYNTAX);
     }
 
     void garbageCode58() { // #6732, #6762
-        ASSERT_THROW(checkCode("{ }> {= ~A()^{} }P { }"), InternalError);
-        ASSERT_THROW(checkCode("{= ~A()^{} }P { } { }> is"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ }> {= ~A()^{} }P { }"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("{= ~A()^{} }P { } { }> is"), SYNTAX);
     }
 
     void garbageCode59() { // #6735
-        ASSERT_THROW(checkCode("{ { } }; char font8x8[256][8]"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; char font8x8[256][8]"), SYNTAX);
     }
 
     void garbageCode60() { // #6736
-        ASSERT_THROW(checkCode("{ } { } typedef int int_array[]; int_array &right ="), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int int_array[]; int_array &right ="), SYNTAX);
     }
 
     void garbageCode61() { // #6737
-        ASSERT_THROW(checkCode("{ (const U&) }; { }; { }; struct U : virtual public"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ (const U&) }; { }; { }; struct U : virtual public"), SYNTAX);
     }
 
     void garbageCode63() { // #6739
-        ASSERT_THROW(checkCode("{ } { } typedef int u_array[]; typedef u_array &u_array_ref; (u_array_ref arg) { } u_array_ref u_array_ref_gbl_obj0"), InternalError);
+        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);
     }
 
     void garbageCode64() { // #6740
-        ASSERT_THROW(checkCode("{ } foo(void (*bar)(void))"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } foo(void (*bar)(void))"), SYNTAX);
     }
 
-    void garbageCode65() { // #6741
+    void garbageCode65() { // #6741 (segmentation fault)
         // TODO write some syntax error
-        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");
     }
 
     void garbageCode66() { // #6742
-        ASSERT_THROW(checkCode("{ { } }; { { } }; { }; class bar : public virtual"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ { } }; { { } }; { }; class bar : public virtual"), SYNTAX);
     }
 
-    void garbageCode68() { // #6745
-        checkCode("(int a[3]); typedef void (*fp) (void); fp");
+    void garbageCode68() { // #6745 (segmentation fault)
+        (void)checkCode("(int a[3]); typedef void (*fp) (void); fp");
     }
 
     void garbageCode69() { // #6746
-        ASSERT_THROW(checkCode("{ (make_mess, aux); } typedef void F(void); aux(void (*x)()) { } (void (*y)()) { } F*"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ (make_mess, aux); } typedef void F(void); aux(void (*x)()) { } (void (*y)()) { } F*"), SYNTAX);
     }
 
     void garbageCode70() { // #6747
-        ASSERT_THROW(checkCode("{ } __attribute__((constructor)) void"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } __attribute__((constructor)) void"), SYNTAX);
     }
 
     void garbageCode71() { // #6748
-        ASSERT_THROW(checkCode("( ) { } typedef void noattr_t ( ) ; noattr_t __attribute__ ( )"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { } typedef void noattr_t ( ) ; noattr_t __attribute__ ( )"), SYNTAX);
     }
 
     void garbageCode72() { // #6749
-        ASSERT_THROW(checkCode("{ } { } typedef void voidfn(void); <voidfn&"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void voidfn(void); <voidfn&"), SYNTAX);
     }
 
     void garbageCode73() { // #6750
-        ASSERT_THROW(checkCode("typedef int IRT[2]; IRT&"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("typedef int IRT[2]; IRT&"), SYNTAX);
     }
 
     void garbageCode74() { // #6751
-        ASSERT_THROW(checkCode("_lenraw(const char* digits) { } typedef decltype(sizeof(0)) { } operator"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("_lenraw(const char* digits) { } typedef decltype(sizeof(0)) { } operator"), SYNTAX);
     }
 
     void garbageCode76() { // #6754
-        ASSERT_THROW(checkCode(" ( ) ( ) { ( ) [ ] } TEST ( ) { ( _broadcast_f32x4 ) ( ) ( ) ( ) ( ) if ( ) ( ) ; } E mask = ( ) [ ] ( ) res1.x ="), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode(" ( ) ( ) { ( ) [ ] } TEST ( ) { ( _broadcast_f32x4 ) ( ) ( ) ( ) ( ) if ( ) ( ) ; } E mask = ( ) [ ] ( ) res1.x ="), SYNTAX);
     }
 
     void garbageCode77() { // #6755
-        ASSERT_THROW(checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void foo (int **p) { { { };>= } } unsigned *d = (b b--) --*d"), SYNTAX);
     }
 
     void garbageCode78() { // #6756
-        ASSERT_THROW(checkCode("( ) { [ ] } ( ) { } const_array_of_int ( ) { } typedef int A [ ] [ ] ; A a = { { } { } }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { [ ] } ( ) { } const_array_of_int ( ) { } typedef int A [ ] [ ] ; A a = { { } { } }"), SYNTAX);
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode79() { // #6757
-        ASSERT_THROW(checkCode("{ } { } typedef void ( func_type ) ( ) ; func_type & ( )"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef void ( func_type ) ( ) ; func_type & ( )"), SYNTAX);
     }
 
     void garbageCode80() { // #6759
-        ASSERT_THROW(checkCode("( ) { ; ( ) ; ( * ) [ ] ; [ ] = ( ( ) ( ) h ) ! ( ( ) ) } { ; } { } head heads [ ] = ; = & heads [ 2 ]"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ; ( ) ; ( * ) [ ] ; [ ] = ( ( ) ( ) h ) ! ( ( ) ) } { ; } { } head heads [ ] = ; = & heads [ 2 ]"), SYNTAX);
     }
 
     void garbageCode81() { // #6760
-        ASSERT_THROW(checkCode("{ } [ ] { ( ) } { } typedef void ( *fptr1 ) ( ) const"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } [ ] { ( ) } { } typedef void ( *fptr1 ) ( ) const"), SYNTAX);
     }
 
     void garbageCode82() { // #6761
-        ASSERT_THROW(checkCode("p(\"Hello \" 14) _yn(const size_t) typedef bool pfunk (*pfunk)(const size_t)"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("p(\"Hello \" 14) _yn(const size_t) typedef bool pfunk (*pfunk)(const size_t)"), SYNTAX);
     }
 
     void garbageCode83() { // #6771
-        ASSERT_THROW(checkCode("namespace A { class } class A { friend C ; } { } ;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("namespace A { class } class A { friend C ; } { } ;"), SYNTAX);
     }
 
     void garbageCode84() { // #6780
-        ASSERT_THROW(checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }"), InternalError); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("int main ( [ ] ) { " " [ ] ; int i = 0 ; do { } ; } ( [ ] ) { }"), SYNTAX); // do not crash
     }
 
-    void garbageCode85() { // #6784
-        ASSERT_THROW(checkCode("{ } { } typedef void ( *VoidFunc() ) ( ) ; VoidFunc"), InternalError); // do not crash
+    void garbageCode85() { // #6784 (segmentation fault)
+        (void)checkCode("{ } { } typedef void ( *VoidFunc() ) ( ) ; VoidFunc"); // do not crash
     }
 
     void garbageCode86() { // #6785
-        ASSERT_THROW(checkCode("{ } typedef char ( *( X ) ( void) , char ) ;"), InternalError); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } typedef char ( *( X ) ( void) , char ) ;"), SYNTAX); // do not crash
     }
 
     void garbageCode87() { // #6788
-        ASSERT_THROW(checkCode("((X (128))) (int a) { v[ = {} (x 42) a] += }"), InternalError); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("((X (128))) (int a) { v[ = {} (x 42) a] += }"), SYNTAX); // do not crash
     }
 
     void garbageCode88() { // #6786
-        ASSERT_THROW(checkCode("( ) { ( 0 ) { ( ) } } g ( ) { i( ( false ?) ( ) : 1 ) ; } ;"), InternalError); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ( 0 ) { ( ) } } g ( ) { i( ( false ?) ( ) : 1 ) ; } ;"), SYNTAX); // do not crash
     }
 
     void garbageCode90() { // #6790
-        ASSERT_THROW(checkCode("{ } { } typedef int u_array [[ ] ; typedef u_array & u_array_ref] ( ) { } u_array_ref_gbl_obj0"), InternalError); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("{ } { } typedef int u_array [[ ] ; typedef u_array & u_array_ref] ( ) { } u_array_ref_gbl_obj0"), SYNTAX); // do not crash
     }
 
     void garbageCode91() { // #6791
-        ASSERT_THROW(checkCode("typedef __attribute__((vector_size (16))) { return[ (v2df){ } ;] }"), InternalError); // throw syntax error
+        ASSERT_THROW_INTERNAL(checkCode("typedef __attribute__((vector_size (16))) { return[ (v2df){ } ;] }"), SYNTAX); // throw syntax error
     }
 
     void garbageCode92() { // #6792
-        ASSERT_THROW(checkCode("template < typename _Tp ( ( ) ; _Tp ) , decltype > { } { ( ) ( ) }"), InternalError); // do not crash
+        ASSERT_THROW_INTERNAL(checkCode("template < typename _Tp ( ( ) ; _Tp ) , decltype > { } { ( ) ( ) }"), SYNTAX); // do not crash
     }
 
     void garbageCode94() { // #6803
         //checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }");
-        ASSERT_THROW(checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("typedef long __m256i __attribute__ ( ( ( ) ) )[ ; ( ) { } typedef __m256i __attribute__ ( ( ( ) ) ) < ] ( ) { ; }"), SYNTAX);
     }
 
     void garbageCode95() { // #6804
-        ASSERT_THROW(checkCode("{ } x x ; { } h h [ ] ( ) ( ) { struct x ( x ) ; int __attribute__ ( ) f ( ) { h - > first = & x ; struct x * n = h - > first ; ( ) n > } }"), InternalError); // 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 > } }"), AST); // do not crash
     }
 
     void garbageCode96() { // #6807
-        ASSERT_THROW(checkCode("typedef J J[ ; typedef ( ) ( ) { ; } typedef J J ;] ( ) ( J cx ) { n } ;"), InternalError); // throw syntax error
+        ASSERT_THROW_INTERNAL(checkCode("typedef J J[ ; typedef ( ) ( ) { ; } typedef J J ;] ( ) ( J cx ) { n } ;"), SYNTAX); // throw syntax error
     }
 
     void garbageCode97() { // #6808
-        ASSERT_THROW(checkCode("namespace A {> } class A{ { }} class A : T< ;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("namespace A {> } class A{ { }} class A : T< ;"), SYNTAX);
     }
 
     void garbageCode98() { // #6838
-        ASSERT_THROW(checkCode("for (cocon To::ta@Taaaaaforconst oken aaaaaaaaaaaa5Dl()\n"
-                               "const unsigned in;\n"
-                               "fon *tok = f);.s(Token i = d-)L;"), InternalError);
+        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);
     }
 
     void garbageCode99() { // #6726
-        ASSERT_THROW(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"), InternalError);
+        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");
     }
 
     void garbageCode100() { // #6840
-        ASSERT_THROW(checkCode("( ) { ( i< ) } int foo ( ) { int i ; ( for ( i => 1 ) ; ) }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ( i< ) } int foo ( ) { int i ; ( for ( i => 1 ) ; ) }"), SYNTAX);
     }
 
     void garbageCode101() { // #6835
         // Reported case
-        ASSERT_THROW(checkCode("template < class , =( , int) X = 1 > struct A { } ( ) { = } [ { } ] ( ) { A < void > 0 }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("template < class , =( , int) X = 1 > struct A { } ( ) { = } [ { } ] ( ) { A < void > 0 }"), SYNTAX);
         // Reduced case
-        ASSERT_THROW(checkCode("template < class =( , ) X = 1> struct A {}; A<void> a;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("template < class =( , ) X = 1> struct A {}; A<void> a;"), SYNTAX);
     }
 
-    void garbageCode102() { // #6846
-        checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }");
+    void garbageCode102() { // #6846 (segmentation fault)
+        ASSERT_THROW_INTERNAL(checkCode("struct Object { ( ) ; Object & operator= ( Object ) { ( ) { } if ( this != & b ) } }"), SYNTAX);
     }
 
     void garbageCode103() { // #6824
-        ASSERT_THROW(checkCode("a f(r) int * r; { { int s[2]; [f(s); if () ]  } }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("a f(r) int * r; { { int s[2]; [f(s); if () ]  } }"), SYNTAX);
     }
 
     void garbageCode104() { // #6847
-        ASSERT_THROW(checkCode("template < Types > struct S {> ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) } { ( )> >} { ( ) { } } ( ) { ( ) }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("template < Types > struct S {> ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) } { ( )> >} { ( ) { } } ( ) { ( ) }"), SYNTAX);
     }
 
     void garbageCode105() { // #6859
-        ASSERT_THROW(checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void foo (int i) { int a , for (a 1; a( < 4; a++) if (a) (b b++) (b);) n++; }"), SYNTAX);
     }
 
     void garbageCode106() { // #6880
-        ASSERT_THROW(checkCode("[ ] typedef typedef b_array b_array_ref [ ; ] ( ) b_array_ref b_array_ref_gbl_obj0 { ; { b_array_ref b_array_ref_gbl_obj0 } }"), InternalError);
+        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);
     }
 
     void garbageCode107() { // #6881
@@ -905,15 +907,15 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode108() { //  #6895 "segmentation fault (invalid code) in CheckCondition::isOppositeCond"
-        ASSERT_THROW(checkCode("A( ) { } bool f( ) { ( ) F; ( ) { ( == ) if ( !=< || ( !A( ) && r[2] ) ) ( !A( ) ) ( ) } }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("A( ) { } bool f( ) { ( ) F; ( ) { ( == ) if ( !=< || ( !A( ) && r[2] ) ) ( !A( ) ) ( ) } }"), SYNTAX);
     }
 
     void garbageCode109() { //  #6900 "segmentation fault (invalid code) in CheckStl::runSimplifiedChecks"
-        checkCode("( *const<> (( ) ) { } ( *const ( ) ( ) ) { } ( * const<> ( size_t )) ) { } ( * const ( ) ( ) ) { }");
+        (void)checkCode("( *const<> (( ) ) { } ( *const ( ) ( ) ) { } ( * const<> ( size_t )) ) { } ( * const ( ) ( ) ) { }");
     }
 
     void garbageCode110() { //  #6902 "segmentation fault (invalid code) in CheckStl::string_c_str"
-        ASSERT_THROW(checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( *const<> ( size_t ) ; foo ) { } * ( *const ( size_t ) ( ) ;> foo )< { }"), SYNTAX);
     }
 
     void garbageCode111() { //  #6907
@@ -925,18 +927,18 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode114() { // #2118
-        checkCode("Q_GLOBAL_STATIC_WITH_INITIALIZER(Qt4NodeStaticData, qt4NodeStaticData, {\n"
-                  "    for (unsigned i = 0 ; i < count; i++) {\n"
-                  "    }\n"
-                  "});");
+        ASSERT_NO_THROW(checkCode("Q_GLOBAL_STATIC_WITH_INITIALIZER(Qt4NodeStaticData, qt4NodeStaticData, {\n"
+                                  "    for (unsigned i = 0 ; i < count; i++) {\n"
+                                  "    }\n"
+                                  "});"));
     }
 
     void garbageCode115() { // #5506
-        ASSERT_THROW(checkCode("A template < int { int = -1 ; } template < int N > struct B { int [ A < N > :: zero ] ;  } ; B < 0 > b ;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("A template < int { int = -1 ; } template < int N > struct B { int [ A < N > :: zero ] ;  } ; B < 0 > b ;"), UNKNOWN_MACRO);
     }
 
     void garbageCode116() { // #5356
-        ASSERT_THROW(checkCode("struct template<int { = }; > struct B { }; B < 0 > b;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("struct template<int { = }; > struct B { }; B < 0 > b;"), SYNTAX);
     }
 
     void garbageCode117() { // #6121
@@ -945,68 +947,72 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode118() { // #5600 - missing include causes invalid enum
-        ASSERT_THROW(checkCode("enum {\n"
-                               "    NUM_OPCODES =\n"
-                               // #include "definition"
-                               "};\n"
-                               "struct bytecode {};\n"
-                               "jv jq_next() { opcode = ((opcode) +NUM_OPCODES);\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("enum {\n"
+                                        "    NUM_OPCODES =\n"
+                                        // #include "definition"
+                                        "};\n"
+                                        "struct bytecode {};\n"
+                                        "jv jq_next() { opcode = ((opcode) +NUM_OPCODES);\n"
+                                        "}"), SYNTAX);
     }
 
-    void garbageCode119() { // #5598
-        checkCode("{ { void foo() { struct }; template <typename> struct S { Used x; void bar() } auto f = [this] { }; } };");
+    void garbageCode119() { // #5598 (segmentation fault)
+        (void)checkCode("{ { void foo() { struct }; template <typename> struct S { Used x; void bar() } auto f = [this] { }; } };");
+        ignore_errout(); // we do not care about the output
     }
 
-    void garbageCode120() { // #4927
-        checkCode("int main() {\n"
-                  "   return 0\n"
-                  "}");
-        ASSERT_EQUALS("", errout.str());
+    void garbageCode120() { // #4927 (segmentation fault)
+        (void)checkCode("int main() {\n"
+                        "   return 0\n"
+                        "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void garbageCode121() { // #2585
-        ASSERT_THROW(checkCode("abcdef?" "?<"
-                               "123456?" "?>"
-                               "+?" "?="), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("abcdef?" "?<"
+                                        "123456?" "?>"
+                                        "+?" "?="), SYNTAX);
     }
 
-    void garbageCode122() { // #6303
-        checkCode("void foo() {\n"
-                  "char *a = malloc(10);\n"
-                  "a[0]\n"
-                  "}");
+    void garbageCode122() { // #6303 (segmentation fault)
+        (void)checkCode("void foo() {\n"
+                        "char *a = malloc(10);\n"
+                        "a[0]\n"
+                        "}");
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode123() {
-        checkCode("namespace pr16989 {\n"
-                  "    class C {\n"
-                  "        C tpl_mem(T *) { return }\n"
-                  "    };\n"
-                  "}");
+        (void)checkCode("namespace pr16989 {\n"
+                        "    class C {\n"
+                        "        C tpl_mem(T *) { return }\n"
+                        "    };\n"
+                        "}");
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode125() {
-        ASSERT_THROW(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 ; ( ) ( ) }"), InternalError);
-        ASSERT_THROW(checkCode("template < Types > struct S :{ ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) }"),
-                     InternalError);
+        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 > ( ) }"),
+                              SYNTAX);
     }
 
     void garbageCode126() {
-        ASSERT_THROW(checkCode("{ } float __ieee754_sinhf ( float x ) { float t , , do { gf_u ( jx ) { } ( 0 ) return ; ( ) { } t } ( 0x42b17180 ) { } }"),
-                     InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } float __ieee754_sinhf ( float x ) { float t , , do { gf_u ( jx ) { } ( 0 ) return ; ( ) { } t } ( 0x42b17180 ) { } }"),
+                              SYNTAX);
     }
 
-    void garbageCode127() { // #6667
-        checkCode("extern \"C\" int printf(const char* fmt, ...);\n"
-                  "class A {\n"
-                  "public:\n"
-                  "  int Var;\n"
-                  "  A(int arg) { Var = arg; }\n"
-                  "  ~A() { printf(\"A d'tor\\n\"); }\n"
-                  "};\n"
-                  " const A& foo(const A& arg) { return arg; }\n"
-                  " foo(A(12)).Var");
+    void garbageCode127() { // #6667 (segmentation fault)
+        (void)checkCode("extern \"C\" int printf(const char* fmt, ...);\n"
+                        "class A {\n"
+                        "public:\n"
+                        "  int Var;\n"
+                        "  A(int arg) { Var = arg; }\n"
+                        "  ~A() { printf(\"A d'tor\\n\"); }\n"
+                        "};\n"
+                        " const A& foo(const A& arg) { return arg; }\n"
+                        " foo(A(12)).Var");
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode128() {
@@ -1015,8 +1021,8 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode129() {
-        ASSERT_THROW(checkCode("operator - ( { } typedef typename x ; ( ) ) { ( { { ( ( ) ) } ( { } ) } ) }"),
-                     InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("operator - ( { } typedef typename x ; ( ) ) { ( { { ( ( ) ) } ( { } ) } ) }"),
+                              SYNTAX);
     }
 
     void garbageCode130() {
@@ -1025,33 +1031,33 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode131() {
-        ASSERT_THROW(checkCode("( void ) { ( ) } ( ) / { ( ) }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( void ) { ( ) } ( ) / { ( ) }"), SYNTAX);
         // actually the invalid code should trigger an syntax error...
     }
 
     void garbageCode132() { // #7022
-        ASSERT_THROW(checkCode("() () { } { () () ({}) i() } void i(void(*ptr) ()) { ptr(!) () }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("() () { } { () () ({}) i() } void i(void(*ptr) ()) { ptr(!) () }"), SYNTAX);
     }
 
     void garbageCode133() {
-        ASSERT_THROW(checkCode("void f() {{}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {{}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f()) {}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f()) {}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f()\n"
-                               "{\n"
-                               " foo(;\n"
-                               "}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f()\n"
+                                        "{\n"
+                                        " foo(;\n"
+                                        "}\n"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f()\n"
-                               "{\n"
-                               " for(;;){ foo();\n"
-                               "}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f()\n"
+                                        "{\n"
+                                        " for(;;){ foo();\n"
+                                        "}\n"), SYNTAX);
 
-        ASSERT_THROW(checkCode("void f()\n"
-                               "{\n"
-                               " a[10;\n"
-                               "}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f()\n"
+                                        "{\n"
+                                        " a[10;\n"
+                                        "}\n"), SYNTAX);
 
         {
             const char code[] = "{\n"
@@ -1087,72 +1093,76 @@ class TestGarbage : public TestFixture {
 
     void garbageCode134() {
         // Ticket #5605, #5759, #5762, #5774, #5823, #6059
-        ASSERT_THROW(checkCode("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }"), InternalError);
-        ASSERT_THROW(checkCode("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }"), InternalError);
-        ASSERT_THROW(checkCode("() template < T = typename = x > struct a {} { f <int> () }"), InternalError);
-        ASSERT_THROW(checkCode("template < T = typename = > struct a { f <int> }"), InternalError);
-        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>();");
-        checkCode("template <typename T> struct A {}; "
-                  "template <> struct A<void> {}; "
-                  "void foo(const void* f = 0) {}");
-        checkCode("template<typename... T> struct A { "
-                  "  static const int s = 0; "
-                  "}; "
-                  "A<int> a;");
-        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; "
-                  "};");
-        checkCode("template<class... T> struct A { "
-                  "  static int i; "
-                  "}; "
-                  "void f() { A<int>::i = 0; }");
-    }
-
-    void garbageCode135() { // #4994
-        checkCode("long f () {\n"
-                  "  return a >> extern\n"
-                  "}\n"
-                  "long a = 1 ;\n"
-                  "long b = 2 ;");
+        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);
+        (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>();");
+        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)checkCode("template<typename... T> struct A { "
+                        "  static const int s = 0; "
+                        "}; "
+                        "A<int> a;");
+        (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; "
+                        "};");
+        (void)checkCode("template<class... T> struct A { "
+                        "  static int i; "
+                        "}; "
+                        "void f() { A<int>::i = 0; }");
+        ignore_errout(); // we are not interested in the output
+    }
+
+    void garbageCode135() { // #4994 (segmentation fault)
+        (void)checkCode("long f () {\n"
+                        "  return a >> extern\n"
+                        "}\n"
+                        "long a = 1 ;\n"
+                        "long b = 2 ;");
+        ignore_errout(); // we are not interested in the output
     }
 
     void garbageCode136() { // #7033
-        ASSERT_THROW(checkCode("{ } () { void f() { node_t * n; for (; -n) {} } } { }"),
-                     InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ } () { void f() { node_t * n; for (; -n) {} } } { }"),
+                              SYNTAX);
     }
 
     void garbageCode137() { // #7034
-        ASSERT_THROW(checkCode("\" \" typedef signed char f; \" \"; void a() { f * s = () &[]; (; ) (; ) }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("\" \" typedef signed char f; \" \"; void a() { f * s = () &[]; (; ) (; ) }"), SYNTAX);
     }
 
-    void garbageCode138() { // #6660
-        checkCode("CS_PLUGIN_NAMESPACE_BEGIN(csparser)\n"
-                  "{\n"
-                  "    struct foo\n"
-                  "    {\n"
-                  "      union\n"
-                  "      {};\n"
-                  "    } halo;\n"
-                  "}\n"
-                  "CS_PLUGIN_NAMESPACE_END(csparser)");
+    void garbageCode138() { // #6660 (segmentation fault)
+        (void)checkCode("CS_PLUGIN_NAMESPACE_BEGIN(csparser)\n"
+                        "{\n"
+                        "    struct foo\n"
+                        "    {\n"
+                        "      union\n"
+                        "      {};\n"
+                        "    } halo;\n"
+                        "}\n"
+                        "CS_PLUGIN_NAMESPACE_END(csparser)");
+        ignore_errout(); // we are not interested in the output
     }
 
     void garbageCode139() { // #6659 heap user after free: kernel: sm750_accel.c
-        ASSERT_THROW(checkCode("void hw_copyarea() {\n"
-                               "   de_ctrl = (nDirection == RIGHT_TO_LEFT) ?\n"
-                               "    ( (0 & ~(((1 << (1 - (0 ? DE_CONTROL_DIRECTION))) - 1) << (0 ? DE_CONTROL_DIRECTION))) )\n"
-                               "    : 42;\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void hw_copyarea() {\n"
+                                        "   de_ctrl = (nDirection == RIGHT_TO_LEFT) ?\n"
+                                        "    ( (0 & ~(((1 << (1 - (0 ? DE_CONTROL_DIRECTION))) - 1) << (0 ? DE_CONTROL_DIRECTION))) )\n"
+                                        "    : 42;\n"
+                                        "}"), SYNTAX);
     }
 
     void garbageCode140() { // #7035
-        ASSERT_THROW(checkCode("int foo(int align) { int off(= 0 % align;  return off) ? \\ align - off  :  0;  \\ }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("int foo(int align) { int off(= 0 % align;  return off) ? \\ align - off  :  0;  \\ }"), SYNTAX);
     }
 
     void garbageCode141() { // #7043
@@ -1160,175 +1170,182 @@ class TestGarbage : public TestFixture {
     }
 
     void garbageCode142() { // #7050
-        checkCode("{ } (  ) { void mapGraphs ( ) { node_t * n ; for (!oid n ) { } } } { }");
+        ASSERT_THROW_INTERNAL(checkCode("{ } (  ) { void mapGraphs ( ) { node_t * n ; for (!oid n ) { } } } { }"), SYNTAX);
     }
 
     void garbageCode143() { // #6922
-        ASSERT_THROW(checkCode("void neoProgramShadowRegs() {\n"
-                               "    int i;\n"
-                               "    Bool noProgramShadowRegs;\n"
-                               "    if (noProgramShadowRegs) {\n"
-                               "    } else {\n"
-                               "        switch (nPtr->NeoPanelWidth) {\n"
-                               "        case 1280:\n"
-                               "            VGAwCR(0x64,0x?? );\n"
-                               "        }\n"
-                               "    }\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void neoProgramShadowRegs() {\n"
+                                        "    int i;\n"
+                                        "    Bool noProgramShadowRegs;\n"
+                                        "    if (noProgramShadowRegs) {\n"
+                                        "    } else {\n"
+                                        "        switch (nPtr->NeoPanelWidth) {\n"
+                                        "        case 1280:\n"
+                                        "            VGAwCR(0x64,0x?? );\n"
+                                        "        }\n"
+                                        "    }\n"
+                                        "}"), AST);
     }
 
     void garbageCode144() { // #6865
-        ASSERT_THROW(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("template < typename > struct A { } ; template < typename > struct A < INVALID > : A < int[ > { }] ;"), SYNTAX);
     }
 
     void garbageCode146() { // #7081
-        ASSERT_THROW(checkCode("void foo() {\n"
-                               "    ? std::cout << pow((, 1) << std::endl;\n"
-                               "    double <ip = NUO ip) << std::end;\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void foo() {\n"
+                                        "    ? std::cout << pow((, 1) << std::endl;\n"
+                                        "    double <ip = NUO ip) << std::end;\n"
+                                        "}"), SYNTAX);
     }
 
     void garbageCode147() { // #7082
-        ASSERT_THROW(checkCode("free(3();\n"
-                               "$  vWrongAllocp1) test1<int, -!>() ^ {\n"
-                               "    int *p<ynew int[n];\n"
-                               "    delete[]p;\n"
-                               "    int *p1 = (int*)malloc(n*sizeof(int));\n"
-                               "    free(p1);\n"
-                               "}\n"
-                               "void est2() {\n"
-                               "    for (int ui = 0; ui < 1z; ui++)\n"
-                               "        ;\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("free(3();\n"
+                                        "$  vWrongAllocp1) test1<int, -!>() ^ {\n"
+                                        "    int *p<ynew int[n];\n"
+                                        "    delete[]p;\n"
+                                        "    int *p1 = (int*)malloc(n*sizeof(int));\n"
+                                        "    free(p1);\n"
+                                        "}\n"
+                                        "void est2() {\n"
+                                        "    for (int ui = 0; ui < 1z; ui++)\n"
+                                        "        ;\n"
+                                        "}"), SYNTAX);
 
-        ASSERT_THROW(checkCode("; void f ^ { return } int main ( ) { }"), InternalError); // #4941
+        ASSERT_THROW_INTERNAL(checkCode("; void f ^ { return } int main ( ) { }"), SYNTAX); // #4941
     }
 
     void garbageCode148() { // #7090
-        ASSERT_THROW(checkCode("void f_1() {\n"
-                               "    typedef S0 b[][1][1] != 0\n"
-                               "};\n"
-                               "b[K][0] S0 b[][1][1] != 4{ 0 };\n"
-                               "b[0][0]"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f_1() {\n"
+                                        "    typedef S0 b[][1][1] != 0\n"
+                                        "};\n"
+                                        "b[K][0] S0 b[][1][1] != 4{ 0 };\n"
+                                        "b[0][0]"), UNKNOWN_MACRO);
     }
 
-    void garbageCode149() { // #7085
-        checkCode("int main() {\n"
-                  "    for (j = 0; j < 1; j)\n"
-                  "        j6;\n"
-                  "}");
+    void garbageCode149() { // #7085 (segmentation fault)
+        (void)checkCode("int main() {\n"
+                        "    for (j = 0; j < 1; j)\n"
+                        "        j6;\n"
+                        "}");
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode150() { // #7089
-        ASSERT_THROW(checkCode("class A {\n"
-                               "    pl vFoo() {\n"
-                               "        A::\n"
-                               "    };\n"
-                               "    A::\n"
-                               "}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("class A {\n"
+                                        "    pl vFoo() {\n"
+                                        "        A::\n"
+                                        "    };\n"
+                                        "    A::\n"
+                                        "}\n"), SYNTAX);
     }
 
     void garbageCode151() { // #4911 - bad simplification => don't crash
-        checkCode("void f() {\n"
-                  "    int a;\n"
-                  "    do { a=do_something() } while (a);\n"
-                  "}");
+        (void)checkCode("void f() {\n"
+                        "    int a;\n"
+                        "    do { a=do_something() } while (a);\n"
+                        "}");
     }
 
-    void garbageCode152() { // happened in travis, originally from llvm clang code
-        const char* code = "template <bool foo = std::value &&>\n"
-                           "static std::string foo(char *Bla) {\n"
-                           "    while (Bla[1] && Bla[1] != ',') }\n";
-        checkCode(code);
+    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";
+        ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
     }
 
     void garbageCode153() {
         TODO_ASSERT_THROW(checkCode("enum { X = << { X } } { X X } enum { X = << { ( X ) } } { } X */"), InternalError);
     }
 
-    void garbageCode154() {
-        checkCode("\"abc\"[];");
+    void garbageCode154() { // #7112 (segmentation fault)
+        (void)checkCode("\"abc\"[];");
     }
 
     void garbageCode156() { // #7120
-        ASSERT_THROW(checkCode("struct {}a; d f() { c ? : } {}a.p"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("struct {}a; d f() { c ? : } {}a.p"), AST);
     }
 
     void garbageCode157() { // #7131
-        ASSERT_THROW(checkCode("namespace std {\n"
-                               "  template < typename >\n"
-                               "  void swap();\n"
-                               "}"
-                               "template std::swap\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("namespace std {\n"
+                                        "  template < typename >\n"
+                                        "  void swap();\n"
+                                        "}"
+                                        "template std::swap\n"), SYNTAX);
     }
 
-    void garbageCode158() { // #3238
-        checkCode("__FBSDID(\"...\");");
+    void garbageCode158() { // #3238 (segmentation fault)
+        (void)checkCode("__FBSDID(\"...\");");
     }
 
     void garbageCode159() { // #7119
-        ASSERT_THROW(checkCode("({}typedef typename x;typename x!){({{}()})}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("({}typedef typename x;typename x!){({{}()})}"), SYNTAX);
     }
 
     void garbageCode160() { // #7190
-        ASSERT_THROW(checkCode("f(a,b,c,d)float [  a[],d;int ]  b[],c;{} "), InternalError); // don't hang
+        ASSERT_THROW_INTERNAL(checkCode("f(a,b,c,d)float [  a[],d;int ]  b[],c;{} "), SYNTAX); // don't hang
     }
 
 
     void garbageCodeFuzzerClientMode1() {
-        ASSERT_THROW(checkCode("void f() { x= name2 & name3 name2 = | 0.1 , | 0.1 , | 0.1 name4 <= >( ); }"), InternalError);
-        ASSERT_THROW(checkCode("void f() { x = , * [ | + 0xff | > 0xff]; }"), InternalError);
-        ASSERT_THROW(checkCode("void f() {  x = , | 0xff , 0.1 < ; }"), InternalError);
-        ASSERT_THROW(checkCode("void f() { x = [ 1 || ] ; }"), InternalError);
-        ASSERT_THROW(checkCode("void f1() { x = name6 1 || ? name3 [  ( 1 || +) ] ; }"), InternalError);
+        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);
     }
 
     void garbageValueFlow() {
-        // #6089
-        const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n"
-                           "{\n"
-                           "    (foo(s, , 2, , , 5, , 7)) abort()\n"
-                           "}\n";
-        ASSERT_THROW(checkCode(code), InternalError);
+        { // #6089
+            const char code[] = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n"
+                                "{\n"
+                                "    (foo(s, , 2, , , 5, , 7)) abort()\n"
+                                "}\n";
+            ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
+        }
 
-        // 6122 survive garbage code
-        code = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }";
-        ASSERT_THROW(checkCode(code), InternalError);
+        { // 6122 survive garbage code
+            const char code[] = "; { int i ; for ( i = 0 ; = 123 ; ) - ; }";
+            ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
+        }
 
-        code = "void f1() { for (int n = 0 n < 10 n++); }";
-        checkCode(code);
+        {
+            const char code[] = "void f1() { for (int n = 0 n < 10 n++); }";
+            ASSERT_THROW_INTERNAL(checkCode(code), SYNTAX);
+        }
     }
 
     void garbageSymbolDatabase() {
-        checkCode("void f( { u = 1 ; } ) { }");
+        (void)checkCode("void f( { u = 1 ; } ) { }");
 
-        ASSERT_THROW(checkCode("{ }; void namespace A::f; { g() { int } }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ }; void namespace A::f; { g() { int } }"), SYNTAX);
 
-        ASSERT_THROW(checkCode("class Foo {}; class Bar : public Foo"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("class Foo {}; class Bar : public Foo"), SYNTAX);
 
-        checkCode("YY_DECL { switch (yy_act) {\n"
-                  "    case 65: YY_BREAK\n"
-                  "    case YY_STATE_EOF(block):\n"
-                  "        yyterminate();\n"
-                  "} }"); // #5663
+        // #5663 (segmentation fault)
+        (void)checkCode("YY_DECL { switch (yy_act) {\n"
+                        "    case 65: YY_BREAK\n"
+                        "    case YY_STATE_EOF(block):\n"
+                        "        yyterminate();\n"
+                        "} }");
+        ignore_errout(); // we are not interested in the output
     }
 
     void garbageAST() {
-        ASSERT_THROW(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] * {}"), InternalError); // Don't hang (#5787)
+        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)
 
-        checkCode("START_SECTION([EXTRA](bool isValid(const String &filename)))"); // Don't crash (#5991)
+        (void)checkCode("START_SECTION([EXTRA](bool isValid(const String &filename)))"); // Don't crash (#5991)
 
         // #8352
-        ASSERT_THROW(checkCode("else return % name5 name2 - =name1 return enum | { - name3 1 enum != >= 1 >= ++ { { || "
-                               "{ return return { | { - name3 1 enum != >= 1 >= ++ { name6 | ; ++}}}}}}}"), InternalError);
-        ASSERT_THROW(checkCode("else return % name5 name2 - =name1 return enum | { - name3 1 enum != >= 1 >= ++ { { || "
-                               "{ return return { | { - name3 1 enum != >= 1 >= ++ { { || ; ++}}}}}}}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("else return % name5 name2 - =name1 return enum | { - name3 1 enum != >= 1 >= ++ { { || "
+                                        "{ return return { | { - name3 1 enum != >= 1 >= ++ { name6 | ; ++}}}}}}}"), 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);
     }
 
     void templateSimplifierCrashes() {
-        checkCode( // #5950
+        (void)checkCode( // #5950 (segmentation fault)
             "struct A {\n"
             "  template <class T> operator T*();\n"
             "};\n"
@@ -1350,21 +1367,21 @@ class TestGarbage : public TestFixture {
             "  }\n"
             "}");
 
-        checkCode( // #6034
-            "template<template<typename...> class T, typename... Args>\n"
-            "struct foo<T<Args...> > {\n"
-            "    const bool value = true;\n"
-            "};\n"
-            "\n"
-            "template<int I>\n"
-            "struct int_\n"
-            "{};\n"
-            "\n"
-            "int main() {\n"
-            "  foo<int_<0> >::value;\n"
-            "}");
+        ASSERT_NO_THROW(checkCode( // #6034
+                            "template<template<typename...> class T, typename... Args>\n"
+                            "struct foo<T<Args...> > {\n"
+                            "    const bool value = true;\n"
+                            "};\n"
+                            "\n"
+                            "template<int I>\n"
+                            "struct int_\n"
+                            "{};\n"
+                            "\n"
+                            "int main() {\n"
+                            "  foo<int_<0> >::value;\n"
+                            "}"));
 
-        checkCode( // #6117
+        (void)checkCode( // #6117 (segmentation fault)
             "template <typename ...> struct something_like_tuple\n"
             "{};\n"
             "template <typename, typename> struct is_last {\n"
@@ -1381,8 +1398,9 @@ class TestGarbage : public TestFixture {
             "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));");
+        ignore_errout(); // we are not interested in the output
 
-        checkCode( // #6225
+        (void)checkCode( // #6225 (use-after-free)
             "template <typename...>\n"
             "void templ_fun_with_ty_pack() {}\n"
             "\n"
@@ -1402,104 +1420,106 @@ class TestGarbage : public TestFixture {
     }
     void garbageCode161() {
         //7200
-        ASSERT_THROW(checkCode("{ }{ if () try { } catch (...)} B : : ~B { }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{ }{ if () try { } catch (...)} B : : ~B { }"), SYNTAX);
     }
 
     void garbageCode162() {
         //7208
-        ASSERT_THROW(checkCode("return <<  >>  x return <<  >>  x ", false), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("return <<  >>  x return <<  >>  x ", false), UNKNOWN_MACRO);
     }
 
     void garbageCode163() {
         //7228
-        ASSERT_THROW(checkCode("typedef s f[](){typedef d h(;f)}", false), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("typedef s f[](){typedef d h(;f)}", false), SYNTAX);
     }
 
     void garbageCode164() {
         //7234
-        ASSERT_THROW(checkCode("class d{k p;}(){d::d():B<()}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("class d{k p;}(){d::d():B<()}"), SYNTAX);
     }
 
     void garbageCode165() {
         //7235
-        ASSERT_THROW(checkCode("for(;..)", false),InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("for(;..)", false),SYNTAX);
     }
 
     void garbageCode167() {
         //7237
-        ASSERT_THROW(checkCode("class D00i000{:D00i000::}i"),InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("class D00i000{:D00i000::}i"),SYNTAX);
     }
 
     void garbageCode168() {
-        // 7246
-        checkCode("long foo(void) { return *bar; }", false);
+        // #7246 (segmentation fault)
+        (void)checkCode("long foo(void) { return *bar; }", false);
+        ignore_errout(); // we do not care about the output
     }
 
     void garbageCode169() {
         // 6713
-        ASSERT_THROW(checkCode("( ) { ( ) ; { return } switch ( ) i\n"
-                               "set case break ; default: ( ) }", false), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("( ) { ( ) ; { return } switch ( ) i\n"
+                                        "set case break ; default: ( ) }", false), SYNTAX);
     }
 
     void garbageCode170() {
         // 7255
-        ASSERT_THROW(checkCode("d i(){{f*s=typeid(()0,)}}", false), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("d i(){{f*s=typeid(()0,)}}", false), SYNTAX);
     }
 
     void garbageCode171() {
         // 7270
-        ASSERT_THROW(checkCode("(){case()?():}:", false), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("(){case()?():}:", false), SYNTAX);
     }
 
     void garbageCode172() {
         // #7357
-        ASSERT_THROW(checkCode("p<e T=l[<]<>>,"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("p<e T=l[<]<>>,"), SYNTAX);
     }
 
     void garbageCode173() {
         // #6781  heap corruption ;  TemplateSimplifier::simplifyTemplateInstantiations
-        ASSERT_THROW(checkCode(" template < Types > struct S : >( S < ...Types... > S <) > { ( ) { } } ( ) { return S < void > ( ) }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode(" template < Types > struct S : >( S < ...Types... > S <) > { ( ) { } } ( ) { return S < void > ( ) }"), SYNTAX);
     }
 
     void garbageCode174() { // #7356
-        ASSERT_THROW(checkCode("{r e() { w*constD = (())D = cast< }}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{r e() { w*constD = (())D = cast< }}"), SYNTAX);
     }
 
     void garbageCode175() { // #7027
-        ASSERT_THROW(checkCode("int f() {\n"
-                               "  int i , j;\n"
-                               "  for ( i = t3 , i < t1 ; i++ )\n"
-                               "    for ( j = 0 ; j < = j++ )\n"
-                               "        return t1 ,\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("int f() {\n"
+                                        "  int i , j;\n"
+                                        "  for ( i = t3 , i < t1 ; i++ )\n"
+                                        "    for ( j = 0 ; j < = j++ )\n"
+                                        "        return t1 ,\n"
+                                        "}"), SYNTAX);
     }
 
-    void garbageCode176() { // #7527
-        checkCode("class t { { struct } enum class f : unsigned { q } b ; operator= ( T ) { switch ( b ) { case f::q: } } { assert ( b ) ; } } { ; & ( t ) ( f::t ) ; } ;");
+    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 ) ; } ;");
+        ignore_errout(); // we are not interested in the output
     }
 
     void garbageCode181() {
-        ASSERT_THROW(checkCode("int test() { int +; }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("int test() { int +; }"), SYNTAX);
     }
 
     // #4195 - segfault for "enum { int f ( ) { return = } r = f ( ) ; }"
     void garbageCode182() {
-        ASSERT_THROW(checkCode("enum { int f ( ) { return = } r = f ( ) ; }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("enum { int f ( ) { return = } r = f ( ) ; }"), SYNTAX);
     }
     // #7505 - segfault
     void garbageCode183() {
-        ASSERT_THROW(checkCode("= { int } enum return { r = f() f(); }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("= { int } enum return { r = f() f(); }"), SYNTAX);
     }
 
     void garbageCode184() { // #7699
-        ASSERT_THROW(checkCode("unsigned int AquaSalSystem::GetDisplayScreenCount() {\n"
-                               "    NSArray* pScreens = [NSScreen screens];\n"
-                               "    return pScreens ? [pScreens count] : 1;\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("unsigned int AquaSalSystem::GetDisplayScreenCount() {\n"
+                                        "    NSArray* pScreens = [NSScreen screens];\n"
+                                        "    return pScreens ? [pScreens count] : 1;\n"
+                                        "}"), SYNTAX);
     }
 
     void garbageCode185() { // #6011 crash in libreoffice failure to create proper AST
-        checkCode(
+        (void)checkCode(
             "namespace binfilter\n"
             "{\n"
             "       BOOL EnhWMFReader::ReadEnhWMF()\n"
@@ -1508,287 +1528,320 @@ class TestGarbage : public TestFixture {
             "               return bStatus;\n"
             "       };\n"
             "}");
+        ignore_errout(); // we are not interested in the output
     }
 
     // #8151 - segfault due to incorrect template syntax
     void garbageCode186() {
-        ASSERT_THROW(checkCode("A<B<><>C"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("A<B<><>C"), SYNTAX);
     }
 
     void garbageCode187() { // # 8152 - segfault in handling
-        const std::string inp("0|\0|0>;\n", 8);
-        ASSERT_THROW(checkCode(inp), InternalError);
+        const char inp[] = "0|\0|0>;\n";
+        ASSERT_THROW_INTERNAL(checkCode(inp), SYNTAX);
 
-        checkCode("template<class T> struct S : A< B<T> || C<T> > {};"); // No syntax error: #8390
-        checkCode("static_assert(A<x> || B<x>, ab);");
+        (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 garbageCode188() { // #8255
-        ASSERT_THROW(checkCode("{z r(){(){for(;<(x);){if(0==0)}}}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{z r(){(){for(;<(x);){if(0==0)}}}}"), SYNTAX);
     }
 
-    void garbageCode189() { // #8317
-        checkCode("t&n(){()()[](){()}}$");
+    void garbageCode189() { // #8317 (segmentation fault)
+        (void)checkCode("t&n(){()()[](){()}}$");
     }
 
     void garbageCode190() { // #8307
-        ASSERT_THROW(checkCode("void foo() {\n"
-                               "    int i;\n"
-                               "    i *= 0;\n"
-                               "    !i <;\n"
-                               "}"),
-                     InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void foo() {\n"
+                                        "    int i;\n"
+                                        "    i *= 0;\n"
+                                        "    !i <;\n"
+                                        "}"),
+                              AST);
     }
 
     void garbageCode191() { // #8333
-        ASSERT_THROW(checkCode("struct A { int f(const); };"), InternalError);
-        ASSERT_THROW(checkCode("struct A { int f(int, const, char); };"), InternalError);
-        ASSERT_THROW(checkCode("struct A { int f(struct); };"), InternalError);
+        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);
 
         // The following code is valid and should not trigger any error
-        checkCode("struct A { int f ( char ) ; } ;");
+        ASSERT_NO_THROW(checkCode("struct A { int f ( char ) ; } ;"));
     }
 
     void garbageCode192() { // #8386 (segmentation fault)
-        ASSERT_THROW(checkCode("{(()[((0||0xf||))]0[])}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{(()[((0||0xf||))]0[])}"), SYNTAX);
     }
 
     // #8740
     void garbageCode193() {
-        ASSERT_THROW(checkCode("d f(){!=[]&&0()!=0}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){!=[]&&0()!=0}"), SYNTAX);
     }
 
     // #8384
     void garbageCode194() {
-        ASSERT_THROW(checkCode("{((()))(return 1||);}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{((()))(return 1||);}"), SYNTAX);
     }
 
-    // #8709 - no garbage but to avoid stability regression
+    // #8709 - no garbage but to avoid stability regression (segmentation fault)
     void garbageCode195() {
-        checkCode("a b;\n"
-                  "void c() {\n"
-                  "  switch (d) { case b:; }\n"
-                  "  double e(b);\n"
-                  "  if(e <= 0) {}\n"
-                  "}");
+        (void)checkCode("a b;\n"
+                        "void c() {\n"
+                        "  switch (d) { case b:; }\n"
+                        "  double e(b);\n"
+                        "  if(e <= 0) {}\n"
+                        "}");
+        ignore_errout(); // we do not care about the output
     }
 
     // #8265
     void garbageCode196() {
-        ASSERT_THROW(checkCode("0|,0<<V"), InternalError);
-        ASSERT_THROW(checkCode(";|4|<0;"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("0|,0<<V"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode(";|4|<0;"), SYNTAX);
     }
 
     // #8385
     void garbageCode197() {
-        ASSERT_THROW(checkCode("(){e break,{(case)|{e:[()]}}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)|{e:[()]}}}"), SYNTAX);
     }
 
     // #8383
     void garbageCode198() {
-        ASSERT_THROW(checkCode("void f(){\n"
-                               "x= ={(continue continue { ( struct continue { ( ++ name5 name5 ) ( name5 name5 n\n"
-                               "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"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f(){\n"
+                                        "x= ={(continue continue { ( struct continue { ( ++ name5 name5 ) ( name5 name5 n\n"
+                                        "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);
     }
 
-    // #8752
+    // #8752 (segmentation fault)
     void garbageCode199() {
-        checkCode("d f(){e n00e0[]n00e0&" "0+f=0}");
+        ASSERT_THROW_INTERNAL(checkCode("d f(){e n00e0[]n00e0&" "0+f=0}"), SYNTAX);
     }
 
     // #8757
     void garbageCode200() {
-        ASSERT_THROW(checkCode("(){e break,{(case)!{e:[]}}}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("(){e break,{(case)!{e:[]}}}"), SYNTAX);
     }
 
     // #8873
     void garbageCode201() {
-        ASSERT_THROW(checkCode("void f() { std::string s=\"abc\"; return s + }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { std::string s=\"abc\"; return s + }"), SYNTAX);
     }
 
     // #8907
     void garbageCode202() {
-        ASSERT_THROW(checkCode("void f() { UNKNOWN_MACRO(return); }"), InternalError);
-        ASSERT_THROW(checkCode("void f() { UNKNOWN_MACRO(throw); }"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(return); }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(checkCode("void f() { UNKNOWN_MACRO(throw); }"), UNKNOWN_MACRO);
+        ignore_errout();
     }
 
-    void garbageCode203() { // #8972
-        checkCode("{ > () {} }");
-        checkCode("template <> a > ::b();");
+    void garbageCode203() { // #8972 (segmentation fault)
+        ASSERT_THROW_INTERNAL(checkCode("{ > () {} }"), SYNTAX);
+        (void)checkCode("template <> a > ::b();");
     }
 
     void garbageCode204() {
-        ASSERT_THROW(checkCode("template <a, = b<>()> c; template <a> a as() {} as<c<>>();"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("template <a, = b<>()> c; template <a> a as() {} as<c<>>();"), SYNTAX);
     }
 
     void garbageCode205() {
-        checkCode("class CodeSnippetsEvent : public wxCommandEvent {\n"
-                  "public :\n"
-                  "    CodeSnippetsEvent ( wxEventType commandType =  wxEventType , int id = 0 ) ;\n"
-                  "    CodeSnippetsEvent ( const CodeSnippetsEvent & event ) ;\n"
-                  "virtual wxEvent * Clone ( ) const { return new CodeSnippetsEvent ( * this ) ; }\n"
-                  "private :\n"
-                  "    int m_SnippetID ;\n"
-                  "} ;\n"
-                  "const  wxEventType wxEVT_CODESNIPPETS_GETFILELINKS  =  wxNewEventType  (  )\n"
-                  "CodeSnippetsEvent :: CodeSnippetsEvent ( wxEventType commandType , int id )\n"
-                  ": wxCommandEvent ( commandType , id ) {\n"
-                  "}\n"
-                  "CodeSnippetsEvent :: CodeSnippetsEvent ( const CodeSnippetsEvent & Event )\n"
-                  ": wxCommandEvent ( Event )\n"
-                  ", m_SnippetID ( 0 ) {\n"
-                  "}"); // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("class CodeSnippetsEvent : public wxCommandEvent {\n"
+                                        "public :\n"
+                                        "    CodeSnippetsEvent ( wxEventType commandType =  wxEventType , int id = 0 ) ;\n"
+                                        "    CodeSnippetsEvent ( const CodeSnippetsEvent & event ) ;\n"
+                                        "virtual wxEvent * Clone ( ) const { return new CodeSnippetsEvent ( * this ) ; }\n"
+                                        "private :\n"
+                                        "    int m_SnippetID ;\n"
+                                        "} ;\n"
+                                        "const  wxEventType wxEVT_CODESNIPPETS_GETFILELINKS  =  wxNewEventType  (  )\n"
+                                        "CodeSnippetsEvent :: CodeSnippetsEvent ( wxEventType commandType , int id )\n"
+                                        ": wxCommandEvent ( commandType , id ) {\n"
+                                        "}\n"
+                                        "CodeSnippetsEvent :: CodeSnippetsEvent ( const CodeSnippetsEvent & Event )\n"
+                                        ": wxCommandEvent ( Event )\n"
+                                        ", m_SnippetID ( 0 ) {\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: operator", getSyntaxError("void foo() { for (a operator== :) }"));
+        ASSERT_EQUALS("[test.cpp:1] syntax error", getSyntaxError("void foo() { for (a operator== :) }"));
     }
 
     void garbageCode207() { // #8750
-        ASSERT_THROW(checkCode("d f(){(.n00e0(return%n00e0''('')));}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){(.n00e0(return%n00e0''('')));}"), SYNTAX);
     }
 
     void garbageCode208() { // #8753
-        ASSERT_THROW(checkCode("d f(){(for(((((0{t b;((((((((()))))))))}))))))}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("d f(){(for(((((0{t b;((((((((()))))))))}))))))}"), SYNTAX);
     }
 
     void garbageCode209() { // #8756
-        ASSERT_THROW(checkCode("{(- -##0xf/-1 0)[]}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{(- -##0xf/-1 0)[]}"), SYNTAX);
     }
 
     void garbageCode210() { // #8762
-        ASSERT_THROW(checkCode("{typedef typedef c n00e0[]c000(;n00e0&c000)}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{typedef typedef c n00e0[]c000(;n00e0&c000)}"), SYNTAX);
     }
 
     void garbageCode211() { // #8764
-        ASSERT_THROW(checkCode("{typedef f typedef[]({typedef e e,>;typedef(((typedef<typedef|)))})}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{typedef f typedef[]({typedef e e,>;typedef(((typedef<typedef|)))})}"), SYNTAX);
     }
 
     void garbageCode212() { // #8765
-        ASSERT_THROW(checkCode("{(){}[]typedef r n00e0[](((n00e0 0((;()))))){(0 typedef n00e0 bre00 n00e0())}[]();typedef n n00e0()[],(bre00)}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{(){}[]typedef r n00e0[](((n00e0 0((;()))))){(0 typedef n00e0 bre00 n00e0())}[]();typedef n n00e0()[],(bre00)}"), SYNTAX);
     }
 
     void garbageCode213() { // #8758
-        ASSERT_THROW(checkCode("{\"\"[(1||)];}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("{\"\"[(1||)];}"), SYNTAX);
     }
 
-    void garbageCode214() {
-        checkCode("THIS FILE CONTAINS VARIOUS TEXT");
+    void garbageCode214() { // segmentation fault
+        (void)checkCode("THIS FILE CONTAINS VARIOUS TEXT");
     }
 
     void garbageCode215() { // daca@home script with extension .c
-        ASSERT_THROW(checkCode("a = [1,2,3];"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("a = [1,2,3];"), SYNTAX);
     }
 
-    void garbageCode216() { // #7884
-        checkCode("template<typename> struct A {};\n"
-                  "template<typename...T> struct A<T::T...> {}; \n"
-                  "A<int> a;");
+    void garbageCode216() { // #7884 (out-of-memory)
+        (void)checkCode("template<typename> struct A {};\n"
+                        "template<typename...T> struct A<T::T...> {}; \n"
+                        "A<int> a;");
     }
 
     void garbageCode217() { // #10011
-        ASSERT_THROW(checkCode("void f() {\n"
-                               "    auto p;\n"
-                               "    if (g(p)) {}\n"
-                               "    assert();\n"
-                               "}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {\n"
+                                        "    auto p;\n"
+                                        "    if (g(p)) {}\n"
+                                        "    assert();\n"
+                                        "}"), AST);
     }
 
     void garbageCode218() { // #8763
-        checkCode("d f(){t n0000 const[]n0000+0!=n0000,(0)}"); // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("d f(){t n0000 const[]n0000+0!=n0000,(0)}"), SYNTAX);
     }
     void garbageCode219() { // #10101
-        checkCode("typedef void (*func) (addr) ;\n"
-                  "void bar(void) {\n"
-                  "    func f;\n"
-                  "    f & = (func)42;\n"
-                  "}\n"); // don't crash
+        (void)checkCode("typedef void (*func) (addr) ;\n"
+                        "void bar(void) {\n"
+                        "    func f;\n"
+                        "    f & = (func)42;\n"
+                        "}\n"); // don't crash
+        ignore_errout(); // we are not interested in the output
     }
     void garbageCode220() { // #6832
-        ASSERT_THROW(checkCode("(){(){{()}}return;{switch()0 case(){}break;l:()}}\n"), InternalError);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("(){(){{()}}return;{switch()0 case(){}break;l:()}}\n"), SYNTAX);  // don't crash
     }
     void garbageCode221() {
-        ASSERT_THROW(checkCode("struct A<0<;\n"), InternalError);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("struct A<0<;\n"), SYNTAX);  // don't crash
     }
     void garbageCode222() { // #10763
-        ASSERT_THROW(checkCode("template<template<class>\n"), InternalError);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("template<template<class>\n"), SYNTAX);  // don't crash
     }
     void garbageCode223() { // #11639
-        ASSERT_THROW(checkCode("struct{}*"), InternalError);  // don't crash
+        ASSERT_THROW_INTERNAL(checkCode("struct{}*"), SYNTAX);  // don't crash
+    }
+    void garbageCode224() {
+        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast<const }"), SYNTAX);  // don't crash
+        ASSERT_EQUALS("", errout_str());
+        ASSERT_THROW_INTERNAL(checkCode("void f(){ auto* b = dynamic_cast x; }"), 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);
+    }
+    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);
+    }
+    void garbageCode227() { // #12615
+        ASSERT_NO_THROW(checkCode("f(&S::operator=);"));
+    }
+    void garbageCode228() {
+        ASSERT_NO_THROW(checkCode("void f() { enum { A = [=]() mutable { return 0; }() }; }"));
+        ASSERT_NO_THROW(checkCode("enum { A = [=](void) mutable -> int { return 0; }() };"));
+    }
+    void garbageCode229() { // #14126
+        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[maybe_unused]]"), SYNTAX);
+        ASSERT_THROW_INTERNAL(checkCode("void f() {} [[unused]]"), SYNTAX);
     }
 
+
     void syntaxErrorFirstToken() {
-        ASSERT_THROW(checkCode("&operator(){[]};"), InternalError); // #7818
-        ASSERT_THROW(checkCode("*(*const<> (size_t); foo) { } *(*const (size_t)() ; foo) { }"), InternalError); // #6858
-        ASSERT_THROW(checkCode(">{ x while (y) z int = }"), InternalError); // #4175
-        ASSERT_THROW(checkCode("&p(!{}e x){({(0?:?){({})}()})}"), InternalError); // #7118
-        ASSERT_THROW(checkCode("<class T> { struct { typename D4:typename Base<T*> }; };"), InternalError); // #3533
-        ASSERT_THROW(checkCode(" > template < . > struct Y < T > { = } ;\n"), InternalError); // #6108
+        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(" > template < . > struct Y < T > { = } ;\n"), SYNTAX); // #6108
     }
 
     void syntaxErrorLastToken() {
-        ASSERT_THROW(checkCode("int *"), InternalError); // #7821
-        ASSERT_THROW(checkCode("x[y]"), InternalError); // #2986
-        ASSERT_THROW(checkCode("( ) &"), InternalError);
-        ASSERT_THROW(checkCode("|| #if #define <="), InternalError); // #2601
-        ASSERT_THROW(checkCode("f::y:y : <x::"), InternalError); // #6613
-        ASSERT_THROW(checkCode("a \"b\" not_eq \"c\""), InternalError); // #6720
-        ASSERT_THROW(checkCode("(int arg2) { } { } typedef void (func_type) (int, int); typedef func_type&"), InternalError); // #6738
-        ASSERT_THROW(checkCode("&g[0]; { (g[0] 0) } =", false), InternalError); // #6744
-        ASSERT_THROW(checkCode("{ { void foo() { struct }; { }; } }; struct S { } f =", false), InternalError); // #6753
-        ASSERT_THROW(checkCode("{ { ( ) } P ( ) ^ { } { } { } ( ) } 0"), InternalError); // #6772
-        ASSERT_THROW(checkCode("+---+"), InternalError); // #6948
-        ASSERT_THROW(checkCode("template<>\n"), InternalError);
-        ASSERT_THROW(checkCode("++4++ +  + E++++++++++ + ch " "tp.oed5[.]"), InternalError); // #7074
-        ASSERT_THROW(checkCode("d a(){f s=0()8[]s?():0}*()?:0", false), InternalError); // #7236
-        ASSERT_THROW(checkCode("!2 : #h2 ?:", false), InternalError); // #7769
-        ASSERT_THROW(checkCode("--"), InternalError);
-        ASSERT_THROW(checkCode("volatile true , test < test < #ifdef __ppc__ true ,"), InternalError); // #4169
-        ASSERT_THROW(checkCode("a,b--\n"), InternalError); // #2847
-        ASSERT_THROW(checkCode("x a[0] ="), InternalError); // #2682
-        ASSERT_THROW(checkCode("auto_ptr<x>\n"), InternalError); // #2967
-        ASSERT_THROW(checkCode("char a[1]\n"), InternalError); // #2865
-        ASSERT_THROW(checkCode("<><<"), InternalError); // #2612
-        ASSERT_THROW(checkCode("z<y<x>"), InternalError); // #2831
-        ASSERT_THROW(checkCode("><,f<i,"), InternalError); // #2835
-        ASSERT_THROW(checkCode("0; (a) < (a)"), InternalError); // #2875
-        ASSERT_THROW(checkCode(" ( * const ( size_t ) ; foo )"), InternalError); // #6135
-        ASSERT_THROW(checkCode("({ (); strcat(strcat(() ()) ()) })"), InternalError); // #6686
-        ASSERT_THROW(checkCode("%: return ; ()"), InternalError); // #3441
-        ASSERT_THROW(checkCode("__attribute__((destructor)) void"), InternalError); // #7816
-        ASSERT_THROW(checkCode("1 *p = const"), InternalError); // #3512
-        ASSERT_THROW(checkCode("sizeof"), InternalError); // #2599
-        ASSERT_THROW(checkCode(" enum struct"), InternalError); // #6718
-        ASSERT_THROW(checkCode("{(){(())}}r&const"), InternalError); // #7321
-        ASSERT_THROW(checkCode("int"), InternalError);
-        ASSERT_THROW(checkCode("struct A :\n"), InternalError); // #2591
-        ASSERT_THROW(checkCode("{} const const\n"), InternalError); // #2637
-        ASSERT_THROW(checkCode("re2c: error: line 14, column 4: can only difference char sets"), InternalError);
+        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("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("a,b--\n"), SYNTAX); // #2847
+        ASSERT_THROW_INTERNAL(checkCode("x a[0] ="), 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("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(  , InternalError)
     }
 
     void syntaxErrorCase() {
         // case must be inside switch block
-        ASSERT_THROW(checkCode("void f() { switch (a) {}; case 1: }"), InternalError); // #8184
-        ASSERT_THROW(checkCode("struct V : { public case {} ; struct U : U  void { V *f (int x) (x) } }"), InternalError); // #5120
-        ASSERT_THROW(checkCode("void f() { 0 0; }"), InternalError);
-        ASSERT_THROW(checkCode("void f() { true 0; }"), InternalError);
-        ASSERT_THROW(checkCode("void f() { 'a' 0; }"), InternalError);
-        ASSERT_THROW(checkCode("void f() { 1 \"\"; }"), InternalError);
+        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);
     }
 
     void syntaxErrorFuzzerCliType1() {
-        ASSERT_THROW(checkCode("void f(){x=0,return return''[]()}"), InternalError);
-        ASSERT_THROW(checkCode("void f(){x='0'++'0'(return)[];}"), InternalError); // #9063
-        checkCode("void f(){*(int *)42=0;}"); // no syntax error
-        ASSERT_THROW(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }"), InternalError); // #9067
-        ASSERT_THROW(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }"), InternalError); // #9068
-        ASSERT_THROW(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }"), InternalError); // #9069
+        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
+        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
     }
 
     void cliCode() {
@@ -1800,36 +1853,42 @@ class TestGarbage : public TestFixture {
                             "bool bReturn(false);\n"
                             "}\n"
                             "};"));
+        ignore_errout(); // we are not interested in the output
     }
 
     void enumTrailingComma() {
-        ASSERT_THROW(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;"), InternalError); // #8079
+        ASSERT_THROW_INTERNAL(checkCode("enum ssl_shutdown_t {ssl_shutdown_none = 0,ssl_shutdown_close_notify = , } ;"), SYNTAX); // #8079
     }
 
     void nonGarbageCode1() {
-        checkCode("template <class T> class List {\n"
-                  "public:\n"
-                  "   List();\n"
-                  "   virtual ~List();\n"
-                  "   template< class Predicate > u_int DeleteIf( const Predicate &pred );\n"
-                  "};\n"
-                  "template< class T >\n"
-                  "template< class Predicate > int\n"
-                  "List<T>::DeleteIf( const Predicate &pred )\n"
-                  "{}");
+        ASSERT_NO_THROW(checkCode("template <class T> class List {\n"
+                                  "public:\n"
+                                  "   List();\n"
+                                  "   virtual ~List();\n"
+                                  "   template< class Predicate > u_int DeleteIf( const Predicate &pred );\n"
+                                  "};\n"
+                                  "template< class T >\n"
+                                  "template< class Predicate > int\n"
+                                  "List<T>::DeleteIf( const Predicate &pred )\n"
+                                  "{}"));
+        ignore_errout(); // we are not interested in the output
 
         // #8749
-        checkCode(
-            "struct A {\n"
-            "    void operator+=(A&) && = delete;\n"
-            "};");
+        ASSERT_NO_THROW(checkCode(
+                            "struct A {\n"
+                            "    void operator+=(A&) && = delete;\n"
+                            "};"));
 
         // #8788
-        checkCode(
-            "struct foo;\n"
-            "void f() {\n"
-            "    auto fn = []() -> foo* { return new foo(); };\n"
-            "}");
+        ASSERT_NO_THROW(checkCode(
+                            "struct foo;\n"
+                            "void f() {\n"
+                            "    auto fn = []() -> foo* { return new foo(); };\n"
+                            "}"));
+        ignore_errout(); // we do not care about the output
+
+        // #13892
+        ASSERT_NO_THROW(checkCode("void foovm(int x[const *]);"));
     }
 };
 
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
index e01457ff214..5e6db0163c8 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-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
@@ -16,24 +16,28 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "filesettings.h"
+#include "fixture.h"
 #include "importproject.h"
+#include "redirect.h"
 #include "settings.h"
-#include "fixture.h"
+#include "standards.h"
+#include "suppressions.h"
+#include "xml.h"
 
 #include <list>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
+#include <utility>
 #include <vector>
 
 class TestImporter : public ImportProject {
 public:
     using ImportProject::importCompileCommands;
     using ImportProject::importCppcheckGuiProject;
-
-    bool sourceFileExists(const std::string & /*file*/) override {
-        return true;
-    }
+    using ImportProject::importVcxproj;
+    using ImportProject::SharedItemsProject;
 };
 
 
@@ -52,70 +56,79 @@ class TestImportProject : public TestFixture {
         TEST_CASE(importCompileCommands2); // #8563, #9567
         TEST_CASE(importCompileCommands3); // check with existing trailing / in directory
         TEST_CASE(importCompileCommands4); // only accept certain file types
-        TEST_CASE(importCompileCommands5); // Windows/CMake/Ninja generated comile_commands.json
-        TEST_CASE(importCompileCommands6); // Windows/CMake/Ninja generated comile_commands.json with spaces
+        TEST_CASE(importCompileCommands5); // Windows/CMake/Ninja generated compile_commands.json
+        TEST_CASE(importCompileCommands6); // Windows/CMake/Ninja generated compile_commands.json with spaces
         TEST_CASE(importCompileCommands7); // linux: "/home/danielm/cppcheck 2"
         TEST_CASE(importCompileCommands8); // Windows: "C:\Users\danielm\cppcheck"
         TEST_CASE(importCompileCommands9);
         TEST_CASE(importCompileCommands10); // #10887: include path with space
         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(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(importCppcheckGuiProjectPremiumMisra);
         TEST_CASE(ignorePaths);
+        TEST_CASE(testVcxprojUnicode);
     }
 
     void setDefines() const {
-        ImportProject::FileSettings fs;
+        FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
 
-        fs.setDefines("A");
+        ImportProject::fsSetDefines(fs, "A");
         ASSERT_EQUALS("A=1", fs.defines);
 
-        fs.setDefines("A;B;");
+        ImportProject::fsSetDefines(fs, "A;B;");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
 
-        fs.setDefines("A;;B;");
+        ImportProject::fsSetDefines(fs, "A;;B;");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
 
-        fs.setDefines("A;;B");
+        ImportProject::fsSetDefines(fs, "A;;B");
         ASSERT_EQUALS("A=1;B=1", fs.defines);
     }
 
     void setIncludePaths1() const {
-        ImportProject::FileSettings fs;
+        FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
         std::list<std::string> in(1, "../include");
         std::map<std::string, std::string, cppcheck::stricmp> variables;
-        fs.setIncludePaths("abc/def/", in, variables);
+        ImportProject::fsSetIncludePaths(fs, "abc/def/", in, variables);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("abc/include/", fs.includePaths.front());
     }
 
     void setIncludePaths2() const {
-        ImportProject::FileSettings fs;
+        FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
         std::list<std::string> in(1, "$(SolutionDir)other");
         std::map<std::string, std::string, cppcheck::stricmp> variables;
         variables["SolutionDir"] = "c:/abc/";
-        fs.setIncludePaths("/home/fred", in, variables);
+        ImportProject::fsSetIncludePaths(fs, "/home/fred", in, variables);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
     }
 
     void setIncludePaths3() const { // macro names are case insensitive
-        ImportProject::FileSettings fs;
+        FileSettings fs{"test.cpp", Standards::Language::CPP, 0};
         std::list<std::string> in(1, "$(SOLUTIONDIR)other");
         std::map<std::string, std::string, cppcheck::stricmp> variables;
         variables["SolutionDir"] = "c:/abc/";
-        fs.setIncludePaths("/home/fred", in, variables);
+        ImportProject::fsSetIncludePaths(fs, "/home/fred", in, variables);
         ASSERT_EQUALS(1U, fs.includePaths.size());
         ASSERT_EQUALS("c:/abc/other/", fs.includePaths.front());
     }
 
     void importCompileCommands1() const {
-        const char json[] = R"([{
+        REDIRECT;
+        constexpr char json[] = R"([{
                                    "directory": "/tmp",
                                    "command": "gcc -DTEST1 -DTEST2=2 -o /tmp/src.o -c /tmp/src.c",
                                    "file": "/tmp/src.c"
-                               }])";
+                                   }])";
         std::istringstream istr(json);
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
@@ -124,6 +137,7 @@ class TestImportProject : public TestFixture {
     }
 
     void importCompileCommands2() const {
+        REDIRECT;
         // Absolute file path
 #ifdef _WIN32
         const char json[] = R"([{
@@ -135,22 +149,23 @@ class TestImportProject : public TestFixture {
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
-        ASSERT_EQUALS("C:/bar.c", importer.fileSettings.cbegin()->filename);
+        ASSERT_EQUALS("C:/bar.c", importer.fileSettings.cbegin()->filename());
 #else
-        const char json[] = R"([{
+        constexpr char json[] = R"([{
                                    "directory": "/foo",
                                    "command": "gcc -c bar.c",
                                    "file": "/bar.c"
-                               }])";
+                                   }])";
         std::istringstream istr(json);
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
-        ASSERT_EQUALS("/bar.c", importer.fileSettings.cbegin()->filename);
+        ASSERT_EQUALS("/bar.c", importer.fileSettings.cbegin()->filename());
 #endif
     }
 
     void importCompileCommands3() const {
+        REDIRECT;
         const char json[] = R"([{
                                     "directory": "/tmp/",
                                     "command": "gcc -c src.c",
@@ -160,15 +175,16 @@ class TestImportProject : public TestFixture {
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
-        ASSERT_EQUALS("/tmp/src.c", importer.fileSettings.cbegin()->filename);
+        ASSERT_EQUALS("/tmp/src.c", importer.fileSettings.cbegin()->filename());
     }
 
     void importCompileCommands4() const {
-        const char json[] = R"([{
+        REDIRECT;
+        constexpr char json[] = R"([{
                                     "directory": "/tmp/",
                                     "command": "gcc -c src.mm",
                                     "file": "src.mm"
-                               }])";
+                                   }])";
         std::istringstream istr(json);
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
@@ -176,7 +192,8 @@ class TestImportProject : public TestFixture {
     }
 
     void importCompileCommands5() const {
-        const char json[] =
+        REDIRECT;
+        constexpr char json[] =
             R"([{
                 "directory": "C:/Users/dan/git/build-test-cppcheck-Desktop_Qt_5_15_0_MSVC2019_64bit-Debug",
                 "command": "C:\\PROGRA~2\\MICROS~1\\2019\\COMMUN~1\\VC\\Tools\\MSVC\\1427~1.291\\bin\\HostX64\\x64\\cl.exe /nologo /TP -IC:\\Users\\dan\\git\\test-cppcheck\\mylib\\src /DWIN32 /D_WINDOWS /GR /EHsc /Zi /Ob0 /Od /RTC1 -MDd -std:c++17 /Fomylib\\CMakeFiles\\mylib.dir\\src\\foobar\\mylib.cpp.obj /FdTARGET_COMPILE_PDB /FS -c C:\\Users\\dan\\git\\test-cppcheck\\mylib\\src\\foobar\\mylib.cpp",
@@ -195,7 +212,8 @@ class TestImportProject : public TestFixture {
     }
 
     void importCompileCommands6() const {
-        const char json[] =
+        REDIRECT;
+        constexpr char json[] =
             R"([{
                 "directory": "C:/Users/dan/git/build-test-cppcheck-Desktop_Qt_5_15_0_MSVC2019_64bit-Debug",
                 "command": "C:\\PROGRA~2\\MICROS~1\\2019\\COMMUN~1\\VC\\Tools\\MSVC\\1427~1.291\\bin\\HostX64\\x64\\cl.exe /nologo /TP -IC:\\Users\\dan\\git\\test-cppcheck\\mylib\\src -I\"C:\\Users\\dan\\git\\test-cppcheck\\mylib\\second src\" /DWIN32 /D_WINDOWS /GR /EHsc /Zi /Ob0 /Od /RTC1 -MDd -std:c++17 /Fomylib\\CMakeFiles\\mylib.dir\\src\\foobar\\mylib.cpp.obj /FdTARGET_COMPILE_PDB /FS -c C:\\Users\\dan\\git\\test-cppcheck\\mylib\\src\\foobar\\mylib.cpp",
@@ -216,8 +234,9 @@ class TestImportProject : public TestFixture {
 
 
     void importCompileCommands7() const {
+        REDIRECT;
         // cmake -DFILESDIR="/some/path" ..
-        const char json[] =
+        constexpr char json[] =
             R"([{
                 "directory": "/home/danielm/cppcheck 2/b/lib",
                 "command": "/usr/bin/c++  -DFILESDIR=\\\"/some/path\\\" -I\"/home/danielm/cppcheck 2/b/lib\" -isystem \"/home/danielm/cppcheck 2/externals\" \"/home/danielm/cppcheck 2/lib/astutils.cpp\"",
@@ -236,8 +255,9 @@ class TestImportProject : public TestFixture {
     }
 
     void importCompileCommands8() const {
+        REDIRECT;
         // cmake -DFILESDIR="C:\Program Files\Cppcheck" -G"NMake Makefiles" ..
-        const char json[] =
+        constexpr char json[] =
             R"([{
               "directory": "C:/Users/danielm/cppcheck/build/lib",
               "command": "C:\\PROGRA~2\\MICROS~2\\2017\\COMMUN~1\\VC\\Tools\\MSVC\\1412~1.258\\bin\\Hostx64\\x64\\cl.exe  /nologo /TP -DFILESDIR=\"\\\"C:\\Program Files\\Cppcheck\\\"\" -IC:\\Users\\danielm\\cppcheck\\build\\lib -IC:\\Users\\danielm\\cppcheck\\lib -c C:\\Users\\danielm\\cppcheck\\lib\\astutils.cpp",
@@ -249,8 +269,9 @@ class TestImportProject : public TestFixture {
     }
 
     void importCompileCommands9() const {
+        REDIRECT;
         // IAR output (https://sourceforge.net/p/cppcheck/discussion/general/thread/608af51e0a/)
-        const char json[] =
+        constexpr char json[] =
             R"([{
               "arguments" : [
                  "powershell.exe -WindowStyle Hidden -NoProfile -ExecutionPolicy Bypass -File d:\\Projekte\\xyz\\firmware\\app\\xyz-lib\\build.ps1 -IAR -COMPILER_PATH \"c:\\Program Files (x86)\\IAR Systems\\Embedded Workbench 9.0\" -CONTROLLER CC1310F128 -LIB LIB_PERMANENT -COMPILER_DEFINES \"CC1310_HFXO_FREQ=24000000 DEBUG\""
@@ -265,7 +286,8 @@ class TestImportProject : public TestFixture {
     }
 
     void importCompileCommands10() const { // #10887
-        const char json[] =
+        REDIRECT;
+        constexpr char json[] =
             R"([{
                "file": "/home/danielm/cppcheck/1/test folder/1.c" ,
                "directory": "",
@@ -279,12 +301,13 @@ class TestImportProject : public TestFixture {
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
-        const ImportProject::FileSettings &fs = importer.fileSettings.front();
+        const FileSettings &fs = importer.fileSettings.front();
         ASSERT_EQUALS("/home/danielm/cppcheck/test folder/", fs.includePaths.front());
     }
 
     void importCompileCommands11() const { // include path order
-        const char json[] =
+        REDIRECT;
+        constexpr char json[] =
             R"([{
                "file": "1.c" ,
                "directory": "/x",
@@ -300,74 +323,284 @@ class TestImportProject : public TestFixture {
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
-        const ImportProject::FileSettings &fs = importer.fileSettings.front();
+        const FileSettings &fs = importer.fileSettings.front();
         ASSERT_EQUALS("/x/def/", fs.includePaths.front());
         ASSERT_EQUALS("/x/abc/", fs.includePaths.back());
     }
 
+    void importCompileCommands12() const { // #13040
+        REDIRECT;
+        constexpr char json[] =
+            R"([{
+               "file": "/x/src/1.c" ,
+               "directory": "/x",
+               "command": "cc -c -I. src/1.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(1, fs.includePaths.size());
+        ASSERT_EQUALS("/x/", fs.includePaths.front());
+    }
+
+    void importCompileCommands13() const { // #13333
+        REDIRECT;
+        constexpr char json[] =
+            R"([{
+               "file": "/x/src/1.c" ,
+               "directory": "/x",
+               "command": "cc -c -I. src/1.c"
+            },{
+               "file": "/x/src/1.c" ,
+               "directory": "/x",
+               "command": "cc -c -I. src/1.c"
+            }])";
+        std::istringstream istr(json);
+        TestImporter importer;
+        ASSERT_EQUALS(true, importer.importCompileCommands(istr));
+        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);
+    }
+
+    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 importCompileCommandsArgumentsSection() const {
-        const char json[] = "[ { \"directory\": \"/tmp/\","
-                            "\"arguments\": [\"gcc\", \"-c\", \"src.c\"],"
-                            "\"file\": \"src.c\" } ]";
+        REDIRECT;
+        constexpr char json[] = "[ { \"directory\": \"/tmp/\","
+                                "\"arguments\": [\"gcc\", \"-c\", \"src.c\"],"
+                                "\"file\": \"src.c\" } ]";
         std::istringstream istr(json);
         TestImporter importer;
         ASSERT_EQUALS(true, importer.importCompileCommands(istr));
         ASSERT_EQUALS(1, importer.fileSettings.size());
-        ASSERT_EQUALS("/tmp/src.c", importer.fileSettings.cbegin()->filename);
+        ASSERT_EQUALS("/tmp/src.c", importer.fileSettings.cbegin()->filename());
     }
 
     void importCompileCommandsNoCommandSection() const {
-        const char json[] = "[ { \"directory\": \"/tmp/\","
-                            "\"file\": \"src.mm\" } ]";
+        REDIRECT;
+        constexpr char json[] = "[ { \"directory\": \"/tmp/\","
+                                "\"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("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 {
-        const char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                           "<project version=\"1\">\n"
-                           "    <root name=\".\"/>\n"
-                           "    <builddir>out1</builddir>\n"
-                           "    <analyze-all-vs-configs>true</analyze-all-vs-configs>\n"
-                           "    <includedir>\n"
-                           "        <dir name=\"lib/\"/>\n"
-                           "    </includedir>\n"
-                           "    <paths>\n"
-                           "        <dir name=\"cli/\"/>\n"
-                           "    </paths>\n"
-                           "    <exclude>\n"
-                           "        <path name=\"gui/temp/\"/>\n"
-                           "    </exclude>\n"
-                           "</project>\n";
+        REDIRECT;
+        constexpr char xml[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                               "<project version=\"1\">\n"
+                               "    <root name=\".\"/>\n"
+                               "    <builddir>out1</builddir>\n"
+                               "    <analyze-all-vs-configs>true</analyze-all-vs-configs>\n"
+                               "    <includedir>\n"
+                               "        <dir name=\"lib/\"/>\n"
+                               "    </includedir>\n"
+                               "    <paths>\n"
+                               "        <dir name=\"cli/\"/>\n"
+                               "    </paths>\n"
+                               "    <exclude>\n"
+                               "        <path name=\"gui/temp/\"/>\n"
+                               "    </exclude>\n"
+                               "    <inline-suppression>true</inline-suppression>\n"
+                               "    <project-name>test test</project-name>\n"
+                               "</project>\n";
         std::istringstream istr(xml);
         Settings s;
+        Suppressions supprs;
         TestImporter project;
-        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, &s));
+        ASSERT_EQUALS(true, project.importCppcheckGuiProject(istr, s, supprs));
         ASSERT_EQUALS(1, project.guiProject.pathNames.size());
         ASSERT_EQUALS("cli/", project.guiProject.pathNames[0]);
         ASSERT_EQUALS(1, s.includePaths.size());
         ASSERT_EQUALS("lib/", s.includePaths.front());
+        ASSERT_EQUALS(true, s.inlineSuppressions);
+    }
+
+    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 {
-        ImportProject::FileSettings fs1, fs2;
-        fs1.filename = "foo/bar";
-        fs2.filename = "qwe/rty";
+        FileSettings fs1{"foo/bar", Standards::Language::CPP, 0};
+        FileSettings fs2{"qwe/rty", Standards::Language::CPP, 0};
         TestImporter project;
-        project.fileSettings = {fs1, fs2};
+        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());
-        ASSERT_EQUALS("qwe/rty", project.fileSettings.front().filename);
+        ASSERT_EQUALS("qwe/rty", project.fileSettings.front().filename());
 
         project.ignorePaths({ "*e/r*" });
         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);
+    }
+
+    // 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 c1b50772bba..7a1fbdb2dab 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-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
@@ -18,45 +18,36 @@
 
 #include "checkother.h"
 #include "errortypes.h"
+#include "helpers.h"
 #include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
 
-#include <map>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
 class TestIncompleteStatement : public TestFixture {
 public:
     TestIncompleteStatement() : TestFixture("TestIncompleteStatement") {}
 
 private:
-    const Settings settings = settingsBuilder().severity(Severity::warning).build();
-
-    void check(const char code[], bool inconclusive = false) {
-        // Clear the error buffer..
-        errout.str("");
+    const Settings settings = settingsBuilder().severity(Severity::warning).library("std.cfg").build();
+    const Settings settings_i = settingsBuilder(settings).certainty(Certainty::inconclusive).build();
 
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
+    struct CheckOptions
+    {
+        bool inconclusive = false;
+        bool cpp = true;
+    };
 
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
+#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 = options.inconclusive ? settings_i : settings;
 
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+        SimpleTokenizer2 tokenizer(settings1, *this, code, options.cpp ? "test.cpp" : "test.c");
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for incomplete statements..
         CheckOther checkOther(&tokenizer, &settings1, this);
@@ -64,6 +55,7 @@ class TestIncompleteStatement : public TestFixture {
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(test1);
         TEST_CASE(test2);
         TEST_CASE(test3);
@@ -93,6 +85,7 @@ class TestIncompleteStatement : public TestFixture {
         TEST_CASE(archive);             // ar & x
         TEST_CASE(ast);
         TEST_CASE(oror);                // dostuff() || x=32;
+        TEST_CASE(functioncall);
     }
 
     void test1() {
@@ -102,7 +95,7 @@ class TestIncompleteStatement : public TestFixture {
               "    \"abc\";\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test2() {
@@ -111,7 +104,7 @@ class TestIncompleteStatement : public TestFixture {
               "    \"abc\";\n"
               "}");
 
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Redundant code: Found a statement that begins with string constant.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with string constant. [constStatement]\n", errout_str());
     }
 
     void test3() {
@@ -120,7 +113,7 @@ class TestIncompleteStatement : public TestFixture {
               "    const char *str[] = { \"abc\" };\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test4() {
@@ -134,7 +127,7 @@ class TestIncompleteStatement : public TestFixture {
               "};\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test5() {
@@ -143,7 +136,7 @@ class TestIncompleteStatement : public TestFixture {
               "    50;\n"
               "}");
 
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Redundant code: Found a statement that begins with numeric constant.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with numeric constant. [constStatement]\n", errout_str());
     }
 
     void test6() {
@@ -168,7 +161,7 @@ class TestIncompleteStatement : public TestFixture {
               "    (void)c;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test_numeric() {
@@ -183,21 +176,21 @@ class TestIncompleteStatement : public TestFixture {
               "    };\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void void0() { // #6327
         check("void f() { (void*)0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("#define X  0\n"
               "void f() { X; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void intarray() {
         check("int arr[] = { 100/2, 1*100 };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structarraynull() {
@@ -205,7 +198,7 @@ class TestIncompleteStatement : public TestFixture {
               "    { 100/2, 1*100 }\n"
               "    { 90, 70 }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structarray() {
@@ -213,14 +206,14 @@ class TestIncompleteStatement : public TestFixture {
               "    { 100/2, 1*100 }\n"
               "    { 90, 70 }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void conditionalcall() {
         check("void f() {\n"
               "    0==x ? X() : Y();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structinit() {
@@ -228,7 +221,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void f() {\n"
               "    ABC abc{1,2,3};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6260 - C++11 array initialization
         check("void foo() {\n"
@@ -236,30 +229,30 @@ class TestIncompleteStatement : public TestFixture {
               "        {\"b\", \"\"},\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2482 - false positive for empty struct
         check("struct A {};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4387 - C++11 initializer list
         check("A::A() : abc{0} {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5042 - C++11 initializer list
         check("A::A() : abc::def<int>{0} {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4503 - vector init
         check("void f() { vector<int> v{1}; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnstruct() {
         check("struct s foo() {\n"
               "    return (struct s){0,0};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4754
         check("unordered_map<string, string>  foo() {\n"
@@ -268,19 +261,19 @@ class TestIncompleteStatement : public TestFixture {
               "        {\"happy\", \"sad\"}\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct s foo() {\n"
               "  return (struct s){0};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void cast() {
         check("void f() {\n"
               "    ((struct foo *)(0x1234))->xy = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(const std::exception& e) {\n" // #10918
               "    try {\n"
@@ -291,7 +284,7 @@ class TestIncompleteStatement : public TestFixture {
               "        return false;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void increment() {
@@ -299,26 +292,26 @@ class TestIncompleteStatement : public TestFixture {
               "    int x = 1;\n"
               "    x++, x++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void cpp11init() {
         check("void f() {\n"
               "    int x{1};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> f(int* p) {\n"
               "    return std::vector<int>({ p[0] });\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void cpp11init2() {
         check("x<string> handlers{\n"
               "  { \"mode2\", []() { return 2; } },\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void cpp11init3() {
@@ -326,33 +319,33 @@ class TestIncompleteStatement : public TestFixture {
               "void f() {\n"
               "A{}(0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<class> struct A { void operator()(int); };\n"
               "void f() {\n"
               "A<int>{}(0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void block() {
         check("void f() {\n"
               "    ({ do_something(); 0; });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "out:\n"
               "    ({ do_something(); 0; });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mapindex() {
         check("void f() {\n"
               "  map[{\"1\",\"2\"}]=0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void commaoperator1() {
@@ -360,52 +353,52 @@ class TestIncompleteStatement : public TestFixture {
               "void f(int value) {\n"
               "    foo(42,\"test\",42),(value&42);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found suspicious operator ',', result is not used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:22]: (warning) Found suspicious operator ',', result is not used. [constStatement]\n", errout_str());
 
         check("int f() {\n" // #11257
               "    int y;\n"
               "    y = (3, 4);\n"
               "    return y;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found suspicious operator ',', result is not used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (warning) Found suspicious operator ',', result is not used. [constStatement]\n", errout_str());
     }
 
     void commaoperator2() {
         check("void f() {\n"
               "    for(unsigned int a=0, b; a<10; a++ ) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g();\n" // #10952
               "bool f() {\n"
               "    return (void)g(), false;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b, int c, int d) {\n"
               "    Eigen::Vector4d V;\n"
               "    V << a, b, c, d;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { Eigen::Vector4d V; };\n"
               "struct T { int a, int b, int c, int d; };\n"
               "void f(S& s, const T& t) {\n"
               "    s.V << t.a, t.b, t.c, t.d;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { Eigen::Vector4d V[2]; };\n"
               "void f(int a, int b, int c, int d) {\n"
               "    S s[1];\n"
               "    s[0].V[1] << a, b, c, d;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    a.b[4][3].c()->d << x , y, z;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct V {\n"
               "    Eigen::Vector3d& operator[](int i) { return v[i]; }\n"
@@ -415,14 +408,14 @@ class TestIncompleteStatement : public TestFixture {
               "void V::f(int a, int b, int c) {\n"
               "    (*this)[0] << a, b, c;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11359
               "    struct S {\n"
               "        S(int x, int y) {}\n"
               "    } s(1, 2);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #8451
@@ -436,25 +429,25 @@ class TestIncompleteStatement : public TestFixture {
               "    (!x);\n"
               "    (unsigned int)!x;\n"
               "    ~x;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Redundant code: Found a statement that begins with numeric constant.\n"
-                      "[test.cpp:3]: (warning) Redundant code: Found a statement that begins with numeric constant.\n"
-                      "[test.cpp:4]: (warning) Redundant code: Found a statement that begins with numeric constant.\n"
-                      "[test.cpp:5]: (warning) Redundant code: Found a statement that begins with numeric constant.\n"
-                      "[test.cpp:6]: (warning, inconclusive) Found suspicious operator '!', result is not used.\n"
-                      "[test.cpp:7]: (warning, inconclusive) Found suspicious operator '!', result is not used.\n"
-                      "[test.cpp:8]: (warning) Redundant code: Found unused cast of expression '!x'.\n"
-                      "[test.cpp:9]: (warning, inconclusive) Found suspicious operator '~', result is not used.\n",
-                      errout.str());
-
-        check("void f1(int x) { x; }", true);
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Unused variable value 'x'\n", errout.str());
+              "}\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: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: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));
+        ASSERT_EQUALS("[test.cpp:1:18]: (warning) Unused variable value 'x' [constStatement]\n", errout_str());
 
         check("void f() { if (Type t; g(t)) {} }"); // #9776
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { static_cast<unsigned>(x); }");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Redundant code: Found unused cast of expression 'x'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:38]: (warning) Redundant code: Found unused cast of expression 'x'. [constStatement]\n", errout_str());
 
         check("void f(int x, int* p) {\n"
               "    static_cast<void>(x);\n"
@@ -462,20 +455,20 @@ class TestIncompleteStatement : public TestFixture {
               "    static_cast<void*>(p);\n"
               "    (void*)p;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { false; }"); // #10856
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Redundant code: Found a statement that begins with bool constant.\n", errout.str());
+        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"
               "    (float)(char)i;\n"
               "    static_cast<float>((char)i);\n"
               "    (char)static_cast<float>(i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Redundant code: Found unused cast of expression 'i'.\n"
-                      "[test.cpp:3]: (warning) Redundant code: Found unused cast of expression 'i'.\n"
-                      "[test.cpp:4]: (warning) Redundant code: Found unused cast of expression 'i'.\n",
-                      errout.str());
+        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",
+                      errout_str());
 
         check("namespace M {\n"
               "    namespace N { typedef char T; }\n"
@@ -483,7 +476,7 @@ class TestIncompleteStatement : public TestFixture {
               "void f(int i) {\n"
               "    (M::N::T)i;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Redundant code: Found unused cast of expression 'i'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) Redundant code: Found unused cast of expression 'i'. [constStatement]\n", errout_str());
 
         check("void f(int (g)(int a, int b)) {\n" // #10873
               "    int p = 0, q = 1;\n"
@@ -494,7 +487,7 @@ class TestIncompleteStatement : public TestFixture {
               "  (sprintf)(buf, \"%d\", 42);\n"
               "  (printf)(\"abc\");\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S; struct T; struct U;\n"
               "void f() {\n"
@@ -503,16 +496,16 @@ class TestIncompleteStatement : public TestFixture {
               "    (S)static_cast<U>(t);\n"
               "    static_cast<S>((U)t);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) { b ? true : false; }\n"); // #10865
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Redundant code: Found unused result of ternary operator.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:20]: (warning) Redundant code: Found unused result of ternary operator. [constStatement]\n", errout_str());
 
         check("struct S { void (*f)() = nullptr; };\n" // #10877
               "void g(S* s) {\n"
               "    (s->f == nullptr) ? nullptr : (s->f(), nullptr);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    g() ? true : false;\n"
@@ -522,7 +515,7 @@ class TestIncompleteStatement : public TestFixture {
               "    C c{ b ? true : false, 1 };\n"
               "    b = (b ? true : false);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
               "    for (i; ;) {}\n"
@@ -534,15 +527,15 @@ class TestIncompleteStatement : public TestFixture {
               "    for (\"x\"; ;) {}\n"
               "    for (L\"y\"; ;) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Unused variable value 'i'\n"
-                      "[test.cpp:3]: (warning) Redundant code: Found unused cast of expression 'i'.\n"
-                      "[test.cpp:4]: (warning) Redundant code: Found a statement that begins with numeric constant.\n"
-                      "[test.cpp:5]: (warning) Redundant code: Found a statement that begins with bool constant.\n"
-                      "[test.cpp:6]: (warning) Redundant code: Found a statement that begins with character constant.\n"
-                      "[test.cpp:7]: (warning) Redundant code: Found a statement that begins with character constant.\n"
-                      "[test.cpp:8]: (warning) Redundant code: Found a statement that begins with string constant.\n"
-                      "[test.cpp:9]: (warning) Redundant code: Found a statement that begins with string constant.\n",
-                      errout.str());
+        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: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"
+                      "[test.cpp:7:10]: (warning) Redundant code: Found a statement that begins with character constant. [constStatement]\n"
+                      "[test.cpp:8:10]: (warning) Redundant code: Found a statement that begins with string constant. [constStatement]\n"
+                      "[test.cpp:9:10]: (warning) Redundant code: Found a statement that begins with string constant. [constStatement]\n",
+                      errout_str());
 
         check("struct S { bool b{}; };\n"
               "struct T {\n"
@@ -560,12 +553,12 @@ class TestIncompleteStatement : public TestFixture {
               "    u[0].g();\n"
               "    u[1].s[0].b;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Redundant code: Found unused member access.\n"
-                      "[test.cpp:8]: (warning) Redundant code: Found unused member access.\n"
-                      "[test.cpp:10]: (warning) Redundant code: Found unused member access.\n"
-                      "[test.cpp:12]: (warning) Redundant code: Found unused member access.\n"
-                      "[test.cpp:15]: (warning) Redundant code: Found unused member access.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (warning) Redundant code: Found unused member access. [constStatement]\n"
+                      "[test.cpp:8:6]: (warning) Redundant code: Found unused member access. [constStatement]\n"
+                      "[test.cpp:10:7]: (warning) Redundant code: Found unused member access. [constStatement]\n"
+                      "[test.cpp:12:11]: (warning) Redundant code: Found unused member access. [constStatement]\n"
+                      "[test.cpp:15:14]: (warning) Redundant code: Found unused member access. [constStatement]\n",
+                      errout_str());
 
         check("struct S { int a[2]{}; };\n"
               "struct T { S s; };\n"
@@ -580,11 +573,11 @@ class TestIncompleteStatement : public TestFixture {
               "    int j[2][2][1] = {};\n"
               "    j[0][0][0];\n" // <--
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Redundant code: Found unused array access.\n"
-                      "[test.cpp:8]: (warning) Redundant code: Found unused array access.\n"
-                      "[test.cpp:10]: (warning) Redundant code: Found unused array access.\n"
-                      "[test.cpp:12]: (warning) Redundant code: Found unused array access.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:6]: (warning) Redundant code: Found unused array access. [constStatement]\n"
+                      "[test.cpp:8:11]: (warning) Redundant code: Found unused array access. [constStatement]\n"
+                      "[test.cpp:10:10]: (warning) Redundant code: Found unused array access. [constStatement]\n"
+                      "[test.cpp:12:6]: (warning) Redundant code: Found unused array access. [constStatement]\n",
+                      errout_str());
 
         check("void g(std::map<std::string, std::string>& map) {\n"
               "    int j[2]{};\n"
@@ -603,13 +596,13 @@ class TestIncompleteStatement : public TestFixture {
               "    map[\"abc\"];\n" // #10928
               "    std::auto_ptr<Int> app[4];" // #10919
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { void* p; };\n" // #10875
               "void f(S s) {\n"
               "    delete (int*)s.p;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n" // #10874
               "    T* p;\n"
@@ -617,37 +610,37 @@ class TestIncompleteStatement : public TestFixture {
               "void f(T* t) {\n"
               "    for (decltype(t->p) (c) = t->p; ;) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, std::vector<int*> v);\n" // #10880
               "void g() {\n"
               "    f(1, { static_cast<int*>(nullptr) });\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int i; };\n" // #10882
               "enum E {};\n"
               "void f(const S* s) {\n"
               "    E e = (E)!s->i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int* p) {\n" // #10932
               "    int& r(*p[0]);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int i; };\n" // #10917
               "bool f(S s) {\n"
               "    return [](int i) { return i > 0; }(s.i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("extern int (*p);\n" // #10936
               "void f() {\n"
               "    for (int i = 0; ;) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class T {};\n" // #10849
               "void f() {\n"
@@ -656,7 +649,7 @@ class TestIncompleteStatement : public TestFixture {
               "        return 0;\n"
               "    };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace N {\n" // #10876
               "    template <class R, class S, void(*T)(R&, float, S)>\n"
@@ -666,114 +659,173 @@ class TestIncompleteStatement : public TestFixture {
               "        for (typename T::iterator v = c.begin(); v != c.end(); ++v) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string a, std::string b) {\n" // #7529
               "    const std::string s = \" x \" + a;\n"
               "    +\" y = \" + b;\n"
-              "}\n", /*inconclusive*/ true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Found suspicious operator '+', result is not used.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:14]: (warning, inconclusive) Found suspicious operator '+', result is not used. [constStatement]\n", errout_str());
 
         check("void f() {\n"
               "    *new int;\n"
-              "}\n", /*inconclusive*/ true);
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n", errout_str());
+
+        check("void f(int x, int y) {\n" // #12525
+              "    x * y;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:7]: (warning, inconclusive) Found suspicious operator '*', result is not used. [constStatement]\n", errout_str());
 
         check("void f() {\n" // #5475
               "    std::string(\"a\") + \"a\";\n"
               "}\n"
               "void f(std::string& a) {\n"
               "    a.erase(3) + \"suf\";\n"
-              "}\n", /*inconclusive*/ true);
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious operator '+', result is not used.\n"
-                      "[test.cpp:5]: (warning, inconclusive) Found suspicious operator '+', result is not used.\n",
-                      errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:22]: (warning, inconclusive) Found suspicious operator '+', result is not used. [constStatement]\n"
+                      "[test.cpp:5:16]: (warning, inconclusive) Found suspicious operator '+', result is not used. [constStatement]\n",
+                      errout_str());
 
         check("void f(XMLElement& parent) {\n" // #11234
               "    auto** elem = &parent.firstChild;\n"
-              "}\n", /*inconclusive*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11301
               "    NULL;\n"
               "    nullptr;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Redundant code: Found a statement that begins with NULL constant.\n"
-                      "[test.cpp:3]: (warning) Redundant code: Found a statement that begins with NULL constant.\n",
-                      errout.str());
+        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
               "void f(S* s) {\n"
               "    (*s).i;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Redundant code: Found unused member access.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (warning) Redundant code: Found unused member access. [constStatement]\n", errout_str());
 
         check("int a[2];\n" // #11370
               "void f() {\n"
               "    auto g = [](decltype(a[0]) i) {};\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("enum E { E0 };\n"
+              "void f() {\n"
+              "    E0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found a statement that begins with enumerator constant. [constStatement]\n",
+                      errout_str());
+
+        check("void f(int* a) {\n" // #12534
+              "    a[a[3]];\n"
+              "    a[a[g()]];\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:6]: (warning) Redundant code: Found unused array access. [constStatement]\n",
+                      errout_str());
+
+        check("void f() {\n" // #13153
+              "    []() {} ();\n"
+              "    []() {};\n"
+              "}\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());
     }
 
     void vardecl() {
         // #8984
-        check("void f() { a::b *c = d(); }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { a::b *c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> *c; }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { std::vector<b> *c; }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a::b &c = d(); }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { a::b &c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> &c; }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { std::vector<b> &c; }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { a::b &&c = d(); }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { a::b &&c = d(); }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { std::vector<b> &&c; }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { std::vector<b> &&c; }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a, * const * b; }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { char * const * a, * const * b; }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a = 0, * volatile restrict * b; }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { char * const * a = 0, * volatile restrict * b; }", dinit(CheckOptions, $.inconclusive = true, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a = 0, * volatile const * b; }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { char * const * a = 0, * volatile const * b; }", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void archive() {
         check("void f(Archive &ar) {\n"
               "  ar & x;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int ar) {\n"
               "  ar & x;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious operator '&', result is not used.\n", errout.str());
+              "}", 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;); } };", true);
-        ASSERT_EQUALS("", errout.str());
+        check("struct c { void a() const { for (int x=0; x;); } };", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oror() {
         check("void foo() {\n"
               "    params_given (params, \"overrides\") || (overrides = \"1\");\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::ifstream& file) {\n" // #10930
               "    int a{}, b{};\n"
               "    (file >> a) || (file >> b);\n"
               "    (file >> a) && (file >> b);\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void functioncall() {
+        check("void g();\n" // #13794
+              "void f() {\n"
+              "    g;\n"
+              "    exit;\n"
+              "    std::free;\n"
+              "    ::std::terminate;\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Redundant code: Found unused function. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning) Redundant code: Found unused function. [constStatement]\n"
+                      "[test.cpp:5:8]: (warning) Redundant code: Found unused function. [constStatement]\n"
+                      "[test.cpp:6:10]: (warning) Redundant code: Found unused function. [constStatement]\n",
+                      errout_str());
     }
 };
 
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
index 0904b62e014..009129c5dc1 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-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
@@ -18,24 +18,24 @@
 
 #ifdef CHECK_INTERNAL
 
-#include "tokenize.h"
 #include "checkinternal.h"
 #include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
 
-#include <list>
-#include <sstream>
+#include <cstddef>
 
 class TestInternal : public TestFixture {
 public:
     TestInternal() : TestFixture("TestInternal") {}
 
 private:
-    Settings settings;
+    /*const*/ Settings settings;
 
     void run() override {
-        settings.addEnabled("internal");
+        ASSERT_EQUALS("", settings.addEnabled("internal"));
 
+        mNewTemplate = true;
         TEST_CASE(simplePatternInTokenMatch);
         TEST_CASE(complexPatternInTokenSimpleMatch);
         TEST_CASE(simplePatternSquareBrackets);
@@ -49,18 +49,15 @@ class TestInternal : public TestFixture {
         TEST_CASE(checkRedundantTokCheck);
     }
 
-#define check(code) check_(code, __FILE__, __LINE__)
-    void check_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        runChecks<CheckInternal>(&tokenizer, &settings, this);
+        runChecks<CheckInternal>(tokenizer, this);
     }
 
     void simplePatternInTokenMatch() {
@@ -68,25 +65,25 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    Token::Match(tok, \";\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found simple pattern inside Token::Match() call: \";\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found simple pattern inside Token::Match() call: \";\" [simplePatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"%type%\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"%or%\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found simple pattern inside Token::Match() call: \"%or%\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found simple pattern inside Token::Match() call: \"%or%\" [simplePatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::findmatch(tok, \";\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found simple pattern inside Token::findmatch() call: \";\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found simple pattern inside Token::findmatch() call: \";\" [simplePatternError]\n", errout_str());
     }
 
     void complexPatternInTokenSimpleMatch() {
@@ -94,31 +91,31 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"%type%\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found complex pattern inside Token::simpleMatch() call: \"%type%\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Found complex pattern inside Token::simpleMatch() call: \"%type%\" [complexPatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::findsimplematch(tok, \"%type%\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found complex pattern inside Token::findsimplematch() call: \"%type%\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Found complex pattern inside Token::findsimplematch() call: \"%type%\" [complexPatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::findsimplematch(tok, \"} !!else\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found complex pattern inside Token::findsimplematch() call: \"} !!else\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Found complex pattern inside Token::findsimplematch() call: \"} !!else\" [complexPatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::findsimplematch(tok, \"foobar\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::findsimplematch(tok, \"%\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplePatternSquareBrackets() {
@@ -126,37 +123,37 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"[\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"[ ]\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"[]\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found complex pattern inside Token::simpleMatch() call: \"[]\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Found complex pattern inside Token::simpleMatch() call: \"[]\" [complexPatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"] [\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"] [ [abc]\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found complex pattern inside Token::simpleMatch() call: \"] [ [abc]\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Found complex pattern inside Token::simpleMatch() call: \"] [ [abc]\" [complexPatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"[.,;]\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found complex pattern inside Token::simpleMatch() call: \"[.,;]\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Found complex pattern inside Token::simpleMatch() call: \"[.,;]\" [complexPatternError]\n", errout_str());
     }
 
     void simplePatternAlternatives() {
@@ -164,31 +161,31 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"||\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"|\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"a|b\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Found complex pattern inside Token::simpleMatch() call: \"a|b\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Found complex pattern inside Token::simpleMatch() call: \"a|b\" [complexPatternError]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"|= 0\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"| 0 )\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void missingPercentCharacter() {
@@ -196,126 +193,130 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    Token::Match(tok, \"%type%\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"foo %type% bar\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Missing % at the end of string
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"%type\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Missing percent end character in Token::Match() pattern: \"%type\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Missing percent end character in Token::Match() pattern: \"%type\" [missingPercentCharacter]\n", errout_str());
 
         // Missing % in the middle of a pattern
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"foo %type bar\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Missing percent end character in Token::Match() pattern: \"foo %type bar\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Missing percent end character in Token::Match() pattern: \"foo %type bar\" [missingPercentCharacter]\n", errout_str());
 
         // Bei quiet on single %
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"foo % %type% bar\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"foo % %type % bar\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Missing percent end character in Token::Match() pattern: \"foo % %type % bar\"\n"
-                      "[test.cpp:3]: (error) Unknown pattern used: \"%type %\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Missing percent end character in Token::Match() pattern: \"foo % %type % bar\" [missingPercentCharacter]\n"
+                      "[test.cpp:3:5]: (error) Unknown pattern used: \"%type %\" [unknownPattern]\n", errout_str());
 
         // Find missing % also in 'alternatives' pattern
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"foo|%type|bar\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Missing percent end character in Token::Match() pattern: \"foo|%type|bar\"\n"
-                      , errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Missing percent end character in Token::Match() pattern: \"foo|%type|bar\" [missingPercentCharacter]\n"
+                      , errout_str());
 
         // Make sure we don't take %or% for a broken %oror%
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"foo|%oror%|bar\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unknownPattern() {
         check("void f() {\n"
               "    Token::Match(tok, \"%typ%\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Unknown pattern used: \"%typ%\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Unknown pattern used: \"%typ%\" [unknownPattern]\n", errout_str());
 
         // Make sure we don't take %or% for a broken %oror%
         check("void f() {\n"
               "    Token::Match(tok, \"%type%\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantNextPrevious() {
         check("void f() {\n"
               "    return tok->next()->previous();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Call to 'Token::next()' followed by 'Token::previous()' can be simplified.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::next()' followed by 'Token::previous()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         check("void f() {\n"
               "    return tok->tokAt(5)->previous();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Call to 'Token::tokAt()' followed by 'Token::previous()' can be simplified.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::tokAt()' followed by 'Token::previous()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         check("void f() {\n"
               "    return tok->previous()->linkAt(5);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Call to 'Token::previous()' followed by 'Token::linkAt()' can be simplified.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::previous()' followed by 'Token::linkAt()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         check("void f() {\n"
               "    tok->next()->previous(foo);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
-              "    return tok->next()->next();\n" // Simplification won't make code much shorter/readable
+              "    return tok->next()->next();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::next()' followed by 'Token::next()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         check("void f() {\n"
-              "    return tok->previous()->previous();\n" // Simplification won't make code much shorter/readable
+              "    return tok->previous()->previous();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::previous()' followed by 'Token::previous()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         check("void f() {\n"
               "    return tok->tokAt(foo+bar)->tokAt();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Call to 'Token::tokAt()' followed by 'Token::tokAt()' can be simplified.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::tokAt()' followed by 'Token::tokAt()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         check("void f() {\n"
               "    return tok->tokAt(foo+bar)->link();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Call to 'Token::tokAt()' followed by 'Token::link()' can be simplified.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::tokAt()' followed by 'Token::link()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         check("void f() {\n"
               "    tok->tokAt(foo+bar)->link(foo);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    return tok->next()->next()->str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Call to 'Token::next()' followed by 'Token::str()' can be simplified.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::next()' followed by 'Token::next()' can be simplified. [redundantNextPrevious]\n"
+                      "[test.cpp:2:25]: (style) Call to 'Token::next()' followed by 'Token::str()' can be simplified. [redundantNextPrevious]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    return tok->previous()->next()->str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Call to 'Token::previous()' followed by 'Token::next()' can be simplified.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Call to 'Token::previous()' followed by 'Token::next()' can be simplified. [redundantNextPrevious]\n"
+                      "[test.cpp:2:29]: (style) Call to 'Token::next()' followed by 'Token::str()' can be simplified. [redundantNextPrevious]\n",
+                      errout_str());
 
     }
 
@@ -332,39 +333,39 @@ class TestInternal : public TestFixture {
               "      z[0] = 0;\n"
               "   }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void orInComplexPattern() {
         check("void f() {\n"
               "    Token::Match(tok, \"||\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Token::Match() pattern \"||\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\".\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Token::Match() pattern \"||\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\". [orInComplexPattern]\n", errout_str());
 
         check("void f() {\n"
               "    Token::Match(tok, \"|\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Token::Match() pattern \"|\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\".\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Token::Match() pattern \"|\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\". [orInComplexPattern]\n", errout_str());
 
         check("void f() {\n"
               "    Token::Match(tok, \"[|+-]\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    Token::Match(tok, \"foo | bar\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Token::Match() pattern \"foo | bar\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\".\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Token::Match() pattern \"foo | bar\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\". [orInComplexPattern]\n", errout_str());
 
         check("void f() {\n"
               "    Token::Match(tok, \"foo |\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Token::Match() pattern \"foo |\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\".\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Token::Match() pattern \"foo |\" contains \"||\" or \"|\". Replace it by \"%oror%\" or \"%or%\". [orInComplexPattern]\n", errout_str());
 
         check("void f() {\n"
               "    Token::Match(tok, \"bar foo|\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void extraWhitespace() {
@@ -373,42 +374,42 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    Token::Match(tok, \"%str% \");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found extra whitespace inside Token::Match() call: \"%str% \"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found extra whitespace inside Token::Match() call: \"%str% \" [extraWhitespaceError]\n", errout_str());
 
         // whitespace at the begin
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \" %str%\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found extra whitespace inside Token::Match() call: \" %str%\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found extra whitespace inside Token::Match() call: \" %str%\" [extraWhitespaceError]\n", errout_str());
 
         // two whitespaces or more
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::Match(tok, \"%str%  bar\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found extra whitespace inside Token::Match() call: \"%str%  bar\"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found extra whitespace inside Token::Match() call: \"%str%  bar\" [extraWhitespaceError]\n", errout_str());
 
         // test simpleMatch
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::simpleMatch(tok, \"foobar \");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found extra whitespace inside Token::simpleMatch() call: \"foobar \"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found extra whitespace inside Token::simpleMatch() call: \"foobar \" [extraWhitespaceError]\n", errout_str());
 
         // test findmatch
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::findmatch(tok, \"%str% \");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found extra whitespace inside Token::findmatch() call: \"%str% \"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found extra whitespace inside Token::findmatch() call: \"%str% \" [extraWhitespaceError]\n", errout_str());
 
         // test findsimplematch
         check("void f() {\n"
               "    const Token *tok;\n"
               "    Token::findsimplematch(tok, \"foobar \");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Found extra whitespace inside Token::findsimplematch() call: \"foobar \"\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Found extra whitespace inside Token::findsimplematch() call: \"foobar \" [extraWhitespaceError]\n", errout_str());
     }
 
     void checkRedundantTokCheck() {
@@ -417,59 +418,59 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    if(tok && Token::findsimplematch(tok, \"foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:38]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         // findmatch
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(tok && Token::findmatch(tok, \"%str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:32]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         // Match
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(tok && Token::Match(tok, \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:28]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(a && tok && Token::Match(tok, \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:33]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(a && b && tok && Token::Match(tok, \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:38]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(a && b && c && tok && Token::Match(tok, \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:43]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(a && b && c && tok && d && Token::Match(tok, \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // simpleMatch
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(tok && Token::simpleMatch(tok, \"foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:34]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         // Match
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(tok->previous() && Token::Match(tok->previous(), \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok->previous()\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:53]: (style) Unnecessary check of \"tok->previous()\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         // don't report:
         // tok->previous() vs tok
@@ -477,55 +478,57 @@ class TestInternal : public TestFixture {
               "    const Token *tok;\n"
               "    if(tok->previous() && Token::Match(tok, \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // tok vs tok->previous())
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(tok && Token::Match(tok->previous(), \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // tok->previous() vs tok->previous()->previous())
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(tok->previous() && Token::Match(tok->previous()->previous(), \"5str% foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:45]: (style) Call to 'Token::previous()' followed by 'Token::previous()' can be simplified. [redundantNextPrevious]\n", errout_str());
 
         // if a && fn(a) triggers, make sure !a || !fn(a) triggers as well!
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(!tok || !Token::simpleMatch(tok, \"foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:36]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(a || !tok || !Token::simpleMatch(tok, \"foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:41]: (style) Unnecessary check of \"tok\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
 
         // if tok || !Token::simpleMatch...
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(tok || !Token::simpleMatch(tok, \"foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // if !tok || Token::simpleMatch...
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(!tok || Token::simpleMatch(tok, \"foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // something more complex
         check("void f() {\n"
               "    const Token *tok;\n"
               "    if(!tok->previous()->previous() || !Token::simpleMatch(tok->previous()->previous(), \"foobar\")) {};\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok->previous()->previous()\", match-function already checks if it is null.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (style) Call to 'Token::previous()' followed by 'Token::previous()' can be simplified. [redundantNextPrevious]\n"
+                      "[test.cpp:3:65]: (style) Call to 'Token::previous()' followed by 'Token::previous()' can be simplified. [redundantNextPrevious]\n"
+                      "[test.cpp:3:85]: (style) Unnecessary check of \"tok->previous()->previous()\", match-function already checks if it is null. [redundantTokCheck]\n", errout_str());
     }
 };
 
diff --git a/test/testio.cpp b/test/testio.cpp
index 81fb3707620..b402f5c0aa1 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-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
@@ -16,29 +16,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkio.h"
-#include "config.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <list>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
 
-
 class TestIO : public TestFixture {
 public:
     TestIO() : TestFixture("TestIO") {}
 
 private:
     const Settings settings = settingsBuilder().library("std.cfg").library("windows.cfg").library("qt.cfg").build();
-    Settings settings1 = settingsBuilder().library("std.cfg").library("windows.cfg").library("qt.cfg").build();
+    /*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);
@@ -55,9 +52,11 @@ class TestIO : public TestFixture {
         TEST_CASE(testScanf4); // #ticket 2553
         TEST_CASE(testScanf5); // #10632
 
+        mNewTemplate = false;
         TEST_CASE(testScanfArgument);
         TEST_CASE(testPrintfArgument);
         TEST_CASE(testPrintfArgumentVariables);
+        mNewTemplate = true;
         TEST_CASE(testPosixPrintfScanfParameterPosition);  // #4900
 
         TEST_CASE(testMicrosoftPrintfArgument); // ticket #4902
@@ -80,36 +79,41 @@ class TestIO : public TestFixture {
         TEST_CASE(testPrintfParenthesis); // #8489
         TEST_CASE(testStdDistance); // #10304
         TEST_CASE(testParameterPack); // #11289
+
+        TEST_CASE(testDefaultSignInt); // #13363
+        TEST_CASE(testPrintfWithGeneric); // #13592
     }
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char* code, bool inconclusive = false, bool portability = false, cppcheck::Platform::Type platform = cppcheck::Platform::Type::Unspecified, bool onlyFormatStr = false, bool cpp = true) {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        bool inconclusive = false;
+        bool portability = false;
+        Platform::Type platform = Platform::Type::Unspecified;
+        char defaultSign = '\0';
+        bool onlyFormatStr = false;
+        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()) {
         // TODO: using dedicated Settings (i.e. copying it) object causes major slowdown
-        settings1.severity.clear();
-        settings1.severity.enable(Severity::warning);
-        settings1.severity.enable(Severity::style);
-        if (portability)
-            settings1.severity.enable(Severity::portability);
-        settings1.certainty.setEnabled(Certainty::inconclusive, inconclusive);
-        PLATFORM(settings1.platform, platform);
+        settings1.severity.setEnabled(Severity::portability, options.portability);
+        settings1.certainty.setEnabled(Certainty::inconclusive, options.inconclusive);
+        PLATFORM(settings1.platform, options.platform);
+        settings1.platform.defaultSign = options.defaultSign;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        const std::string file_in = cpp ? "test.cpp" : "test.c";
-        ASSERT_LOC(tokenizer.tokenize(istr, file_in.c_str()), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        CheckIO checkIO(&tokenizer, &settings1, this);
-        checkIO.checkWrongPrintfScanfArguments();
-        if (!onlyFormatStr) {
-            checkIO.checkCoutCerrMisusage();
-            checkIO.checkFileUsage();
-            checkIO.invalidScanf();
+        if (options.onlyFormatStr) {
+            CheckIO checkIO(&tokenizer, &settings1, this);
+            checkIO.checkWrongPrintfScanfArguments();
+            return;
         }
+        runChecks<CheckIO>(tokenizer, this);
     }
 
     void coutCerrMisusage() {
@@ -117,50 +121,50 @@ class TestIO : public TestFixture {
             "void foo() {\n"
             "  std::cout << std::cout;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Invalid usage of output stream: '<< std::cout'.\n", errout.str());
+        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());
+        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());
+        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());
+        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"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  std::cout << std::cout.good();\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "    unknownObject << std::cout;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  MACRO(std::cout <<, << std::cout)\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -173,103 +177,103 @@ class TestIO : public TestFixture {
               "    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());
+        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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = _wfopen(name, L\"r+\");\n"
               "    fwrite(buffer, 5, 6, f);\n"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("", errout_str());
 
         // Write mode
         check("void foo(FILE*& f) {\n"
@@ -278,19 +282,19 @@ class TestIO : public TestFixture {
               "    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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = tmpfile();\n"
               "    fread(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Append mode
         check("void foo(FILE*& f) {\n"
@@ -299,14 +303,14 @@ class TestIO : public TestFixture {
               "    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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Variable declared locally
         check("void foo() {\n"
@@ -314,7 +318,7 @@ class TestIO : public TestFixture {
               "    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());
+        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"
@@ -323,57 +327,57 @@ class TestIO : public TestFixture {
               "    bar(f);\n"
               "    fread(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
-              "}", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Write operation on a file that was opened only for reading.\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void fopen(std::string const &filepath, std::string const &mode);"); // #3832
     }
@@ -385,7 +389,7 @@ class TestIO : public TestFixture {
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f;\n"
@@ -394,14 +398,14 @@ class TestIO : public TestFixture {
               "    if(a) fwrite(buffer, 5, 6, f);\n"
               "    else  fread(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        ASSERT_EQUALS("[test.cpp:4:11]: (error) Read operation on a file that was opened only for writing. [readWriteOnlyFile]\n", errout_str());
     }
 
     void useClosedFile() {
@@ -414,12 +418,12 @@ class TestIO : public TestFixture {
               "    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());
+        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"
@@ -428,40 +432,40 @@ class TestIO : public TestFixture {
               "    }\n"
               "    fwrite(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    fclose(f);\n"
               "    f = fopen(name, \"r\");\n"
               "    fread(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(name, \"r\");\n"
               "    f = g;\n"
               "    fwrite(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #3965
               "    FILE* f[3];\n"
               "    f[0] = fopen(name, mode);\n"
               "    fclose(f[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4368: multiple functions
         check("static FILE *fp = NULL;\n"
@@ -484,7 +488,7 @@ class TestIO : public TestFixture {
               "  close();\n"
               "  return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("static FILE *fp = NULL;\n"
               "\n"
@@ -498,7 +502,7 @@ class TestIO : public TestFixture {
               "  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());
+        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"
@@ -511,7 +515,7 @@ class TestIO : public TestFixture {
               "            return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void chdcd_parse_nero(FILE *infile) {\n"
               "    switch (mode) {\n"
@@ -523,7 +527,7 @@ class TestIO : public TestFixture {
               "            return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4649
         check("void foo() {\n"
@@ -533,14 +537,14 @@ class TestIO : public TestFixture {
               "    fclose(a.f1);\n"
               "    fclose(a.f2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        TODO_ASSERT_EQUALS("[test.cpp:3:5]: (error) Used file that is not opened. [useClosedFile]\n", "", errout_str());
 
         // #6823
         check("void foo() {\n"
@@ -550,7 +554,15 @@ class TestIO : public TestFixture {
               "    fclose(f[0]);\n"
               "    fclose(f[1]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #12236
+        check("void f() {\n"
+              "    FILE* f = fopen(\"abc\", \"r\");\n"
+              "    decltype(fclose(f)) y;\n"
+              "    y = fclose(f);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void fileIOwithoutPositioning() {
@@ -558,13 +570,13 @@ class TestIO : public TestFixture {
               "    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());
+        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());
+        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"
@@ -572,42 +584,42 @@ class TestIO : public TestFixture {
               "    else\n"
               "        fwrite(buffer, 5, 6, f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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"
@@ -620,7 +632,7 @@ class TestIO : public TestFixture {
               "    seek(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class FileStream {\n"
               "    void insert(const ByteVector &data, ulong start);\n"
@@ -631,7 +643,7 @@ class TestIO : public TestFixture {
               "    unknown(writePosition);\n"
               "    fwrite(buffer.data(), sizeof(char), buffer.size(), d->file);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class FileStream {\n"
               "    void insert(const ByteVector &data, ulong start);\n"
@@ -643,7 +655,7 @@ class TestIO : public TestFixture {
               "    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());
+        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"
@@ -655,7 +667,7 @@ class TestIO : public TestFixture {
               "    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());
+        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());
     }
 
     void seekOnAppendedFile() {
@@ -663,25 +675,25 @@ class TestIO : public TestFixture {
               "    FILE* f = fopen(\"\", \"a+\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"w\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str()); // #5578
+        ASSERT_EQUALS("", errout_str()); // #5578
 
         check("void foo() {\n"
               "    FILE* f = fopen(\"\", \"a\");\n"
@@ -689,38 +701,38 @@ class TestIO : public TestFixture {
               "    f = fopen(\"\", \"r\");\n"
               "    fseek(f, 0, SEEK_SET);\n"
               "}");
-        ASSERT_EQUALS("", errout.str()); // #6566
+        ASSERT_EQUALS("", errout_str()); // #6566
     }
 
     void fflushOnInputStream() {
         check("void foo()\n"
               "{\n"
               "    fflush(stdin);\n"
-              "}", false, 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());
+              "}", 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"
-              "}", false, true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    f = fopen(path, \"r\");\n"
               "    fflush(f);\n"
-              "}", false, 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());
+              "}", 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"
-              "}", false, true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(FILE*& f) {\n"
               "    fflush(f);\n"
-              "}", false, true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incompatibleFileOpen() {
@@ -728,7 +740,7 @@ class TestIO : public TestFixture {
               "    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());
+        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());
     }
 
 
@@ -743,11 +755,11 @@ class TestIO : public TestFixture {
               "    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());
+        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() {
@@ -759,7 +771,7 @@ class TestIO : public TestFixture {
               "    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());
+        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
@@ -769,7 +781,7 @@ class TestIO : public TestFixture {
               "  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());
+        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
@@ -778,7 +790,7 @@ class TestIO : public TestFixture {
               "  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());
+        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
@@ -786,8 +798,8 @@ class TestIO : public TestFixture {
               "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());
+        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());
     }
 
 
@@ -821,68 +833,83 @@ class TestIO : public TestFixture {
 #define TEST_PRINTF_ERR_AKA_CPP(format, requiredType, actualType, akaType) \
     TEST_PRINTF_ERR_AKA_("test.cpp", format, requiredType, actualType, akaType)
 
-    void testFormatStrNoWarn(const char *filename, unsigned int linenr, const char* code,
+    template<size_t size>
+    void testFormatStrNoWarn(const char *filename, unsigned int linenr, const char (&code)[size],
                              bool cpp = false) {
-        check(code, true, false, cppcheck::Platform::Type::Unix32, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
-        check(code, true, false, cppcheck::Platform::Type::Unix64, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
-        check(code, true, false, cppcheck::Platform::Type::Win32A, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
-        check(code, true, false, cppcheck::Platform::Type::Win64, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Unix32, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Unix64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win32A, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win32W, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
     }
 
+    template<size_t size>
     void testFormatStrWarn(const char *filename, unsigned int linenr,
-                           const char* code, const char* testScanfErrString,
+                           const char (&code)[size], const char* testScanfErrString,
                            bool cpp = false) {
-        check(code, true, false, cppcheck::Platform::Type::Unix32, true, cpp);
-        assertEquals(filename, linenr, testScanfErrString, errout.str());
-        check(code, true, false, cppcheck::Platform::Type::Unix64, true, cpp);
-        assertEquals(filename, linenr, testScanfErrString, errout.str());
-        check(code, true, false, cppcheck::Platform::Type::Win32A, true, cpp);
-        assertEquals(filename, linenr, testScanfErrString, errout.str());
-        check(code, true, false, cppcheck::Platform::Type::Win64, true, cpp);
-        assertEquals(filename, linenr, testScanfErrString, errout.str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Unix32, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Unix64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win32A, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win32W, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrString, errout_str());
     }
 
+    template<size_t size>
     void testFormatStrWarnAka(const char *filename, unsigned int linenr,
-                              const char* code, const char* testScanfErrAkaString, const char* testScanfErrAkaWin64String,
+                              const char (&code)[size], const char* testScanfErrAkaString, const char* testScanfErrAkaWin64String,
                               bool cpp = false) {
-        check(code, true, true, cppcheck::Platform::Type::Unix32, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Unix64, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Win32A, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Win64, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaWin64String, errout.str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Unix32, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Unix64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win32A, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win32W, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaWin64String, errout_str());
     }
 
+    template<size_t size>
     void testFormatStrWarnAkaWin64(const char *filename, unsigned int linenr,
-                                   const char* code, const char* testScanfErrAkaWin64String,
+                                   const char (&code)[size], const char* testScanfErrAkaWin64String,
                                    bool cpp = false) {
-        check(code, true, true, cppcheck::Platform::Type::Unix32, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Unix64, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Win32A, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Win64, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaWin64String, errout.str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Unix32, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Unix64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win32A, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win32W, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaWin64String, errout_str());
     }
 
+    template<size_t size>
     void testFormatStrWarnAkaWin32(const char *filename, unsigned int linenr,
-                                   const char* code, const char* testScanfErrAkaString,
+                                   const char (&code)[size], const char* testScanfErrAkaString,
                                    bool cpp = false) {
-        check(code, true, true, cppcheck::Platform::Type::Unix32, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Unix64, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Win32A, true, cpp);
-        assertEquals(filename, linenr, testScanfErrAkaString, errout.str());
-        check(code, true, true, cppcheck::Platform::Type::Win64, true, cpp);
-        assertEquals(filename, linenr, emptyString, errout.str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Unix32, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Unix64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win32A, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win32W, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, testScanfErrAkaString, errout_str());
+        check(code, dinit(CheckOptions, $.inconclusive = true, $.portability = true, $.platform = Platform::Type::Win64, $.onlyFormatStr = true, $.cpp = cpp));
+        assertEquals(filename, linenr, "", errout_str());
     }
 
 #define TEST_SCANF_NOWARN(FORMAT, FORMATSTR, TYPE) \
@@ -932,7 +959,7 @@ class TestIO : public TestFixture {
               "    fscanf(f, \"%7ms\", &ref);\n" // #3461
               "    sscanf(ip_port, \"%*[^:]:%4d\", &port);\n" // #3468
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    scanf(\"\", &foo);\n"
@@ -943,7 +970,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:5]: (warning) scanf format string requires 2 parameters but 3 are given.\n", errout.str());
+                      "[test.cpp:5]: (warning) scanf format string requires 2 parameters but 3 are given.\n", errout_str());
 
         check("void foo() {\n"
               "    scanf(\"%1d\");\n"
@@ -954,7 +981,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:5]: (error) scanf format string requires 2 parameters but only 1 is given.\n", errout.str());
+                      "[test.cpp:5]: (error) scanf format string requires 2 parameters but only 1 is given.\n", errout_str());
 
         check("void foo() {\n"
               "    char input[10];\n"
@@ -962,8 +989,8 @@ class TestIO : public TestFixture {
               "    sscanf(input, \"%3s\", output);\n"
               "    sscanf(input, \"%4s\", output);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}", false);
-        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());
+              "}");
+        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"
               "    char input[10];\n"
@@ -972,10 +999,10 @@ class TestIO : public TestFixture {
               "    sscanf(input, \"%3s\", output);\n"
               "    sscanf(input, \"%4s\", output);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}", true);
+              "}", 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());
+                      "[test.cpp:4]: (warning) sscanf() without field width limits can crash with huge input data.\n", errout_str());
 
         check("void foo() {\n"
               "    const size_t BUFLENGTH(2048);\n"
@@ -984,8 +1011,8 @@ class TestIO : public TestFixture {
               "    bufT projectId= {0};\n"
               "    const int scanrc=sscanf(line, \"Project(\\\"{%36s}\\\")\", projectId);\n"
               "    sscanf(input, \"%5s\", output);\n"
-              "}", 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());
+              "}", 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"
               "  scanf(\"%h\", &i);\n"
@@ -1006,7 +1033,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:7]: (warning) 'z' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:8]: (warning) 't' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:9]: (warning) 'L' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:10]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n", errout.str());
+                      "[test.cpp:10]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n", errout_str());
 
         // Unrecognized (and non-existent in standard library) specifiers.
         // Perhaps should emit warnings
@@ -1053,14 +1080,14 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%u\", \"s3\");\n"
               "    scanf(\"%u\", L\"s5W\");\n"
-              "}", true);
+              "}", 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());
+                      "[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"
-              "}", 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());
+              "}", 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");
         TEST_SCANF_WARN("%lu","unsigned long","char");
@@ -1441,14 +1468,14 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%Ld\", \"s3\");\n"
               "    scanf(\"%Ld\", L\"s5W\");\n"
-              "}", true);
+              "}", 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());
+                      "[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"
-              "}", 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());
+              "}", 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");
         TEST_SCANF_WARN("%ju", "uintmax_t", "char");
@@ -1918,14 +1945,14 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%d\", \"s3\");\n"
               "    scanf(\"%d\", L\"s5W\");\n"
-              "}", true);
+              "}", 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());
+                      "[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"
-              "}", 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());
+              "}", 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");
         TEST_SCANF_WARN("%x", "unsigned int", "char");
@@ -1962,14 +1989,14 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%x\", \"s3\");\n"
               "    scanf(\"%x\", L\"s5W\");\n"
-              "}", true);
+              "}", 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());
+                      "[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"
-              "}", 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());
+              "}", 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");
         TEST_SCANF_WARN("%f", "float", "char");
@@ -2002,14 +2029,14 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%f\", \"s3\");\n"
               "    scanf(\"%f\", L\"s5W\");\n"
-              "}", true);
+              "}", 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());
+                      "[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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2]: (warning) %f in format string (no. 1) requires 'float *' but the argument type is 'float'.\n", errout.str());
+              "}", 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");
         TEST_SCANF_WARN("%lf", "double", "char");
@@ -2098,14 +2125,14 @@ class TestIO : public TestFixture {
         check("void foo() {\n"
               "    scanf(\"%n\", \"s3\");\n"
               "    scanf(\"%n\", L\"s5W\");\n"
-              "}", true);
+              "}", 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());
+                      "[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"
-              "}", 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());
+              "}", 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
               "    myvector<int> v1(1);\n"
@@ -2119,10 +2146,10 @@ class TestIO : public TestFixture {
               "    myvector<char *> v5(1);\n"
               "    scanf(\"%10s\",v5[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
-            const char * code = "void g() {\n" // #5348
+            const char code[] = "void g() {\n" // #5348
                                 "    size_t s1;\n"
                                 "    ptrdiff_t s2;\n"
                                 "    ssize_t s3;\n"
@@ -2135,14 +2162,16 @@ class TestIO : public TestFixture {
             const char* result_win64("[test.cpp:5]: (portability) %zd in format string (no. 1) requires 'ssize_t *' but the argument type is 'size_t * {aka unsigned long long *}'.\n"
                                      "[test.cpp:6]: (portability) %zd in format string (no. 1) requires 'ssize_t *' but the argument type is 'ptrdiff_t * {aka signed long long *}'.\n");
 
-            check(code, false, true, cppcheck::Platform::Type::Unix32);
-            ASSERT_EQUALS(result, errout.str());
-            check(code, false, true, cppcheck::Platform::Type::Unix64);
-            ASSERT_EQUALS(result, errout.str());
-            check(code, false, true, cppcheck::Platform::Type::Win32A);
-            ASSERT_EQUALS(result, errout.str());
-            check(code, false, true, cppcheck::Platform::Type::Win64);
-            ASSERT_EQUALS(result_win64, errout.str());
+            check(code, dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+            ASSERT_EQUALS(result, errout_str());
+            check(code, dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+            ASSERT_EQUALS(result, errout_str());
+            check(code, dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+            ASSERT_EQUALS(result, errout_str());
+            check(code, dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32W));
+            ASSERT_EQUALS(result, errout_str());
+            check(code, dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+            ASSERT_EQUALS(result_win64, errout_str());
         }
         {
             check("void g() {\n"
@@ -2150,13 +2179,19 @@ class TestIO : public TestFixture {
                   "    scanf(\"%s\", c);\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());
+                          "[test.cpp:3]: (warning) scanf() without field width limits can crash with huge input data.\n", errout_str());
         }
 
         check("void f() {\n" // #7038
               "    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());
+        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]; };" // #14302
+              "void f(S s) {\n"
+              "    scanf(\"%hhu\", s.a);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testPrintfArgument() {
@@ -2179,7 +2214,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:7]: (error) fprintf format string requires 2 parameters but only 0 are given.\n"
                       "[test.cpp:8]: (error) snprintf format string requires 2 parameters but only 0 are given.\n"
                       "[test.cpp:9]: (error) sprintf format string requires 3 parameters but only 2 are given.\n"
-                      "[test.cpp:10]: (error) snprintf format string requires 2 parameters but only 1 is given.\n", errout.str());
+                      "[test.cpp:10]: (error) snprintf format string requires 2 parameters but only 1 is given.\n", errout_str());
 
         check("void foo(char *str) {\n"
               "    printf(\"\", 0);\n"
@@ -2188,7 +2223,7 @@ class TestIO : public TestFixture {
               "}");
         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());
+                      "[test.cpp:4]: (warning) printf format string requires 2 parameters but 3 are given.\n", errout_str());
 
         check("void foo() {\n" // swprintf exists as MSVC extension and as standard function: #4790
               "    swprintf(string1, L\"%i\", 32, string2);\n" // MSVC implementation
@@ -2197,7 +2232,7 @@ class TestIO : public TestFixture {
               "    swprintf(string1, 6, L\"%i%s\", 32, string2);\n" // Standard implementation
               "}");
         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());
+                      "[test.cpp:4]: (warning) swprintf format string requires 1 parameter but 2 are given.\n", errout_str());
 
         check("void foo(char *str) {\n"
               "    printf(\"%i\", 0);\n"
@@ -2213,7 +2248,7 @@ class TestIO : public TestFixture {
               "    fprintf(stderr, \"%*cText.\", indent, ' ');\n" // #3313
               "    sprintf(string1, \"%*\", 32);\n" // #3364
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* s, const char* s2, std::string s3, int i) {\n"
               "    printf(\"%s%s\", s, s2);\n"
@@ -2226,7 +2261,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:7]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'char *'.\n", errout.str());
+                      "[test.cpp:7]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'char *'.\n", errout_str());
 
         check("void foo(char* s, const char* s2, std::string s3, int i) {\n"
               "    printf(\"%jd\", s);\n"
@@ -2241,7 +2276,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:4]: (warning) %ju in format string (no. 1) requires 'uintmax_t' but the argument type is 'const char *'.\n"
                       "[test.cpp:5]: (warning) %jo in format string (no. 1) requires 'uintmax_t' but the argument type is 'std::string'.\n"
                       "[test.cpp:6]: (warning) %jx in format string (no. 1) requires 'uintmax_t' but the argument type is 'signed int'.\n"
-                      "[test.cpp:7]: (warning) %jX in format string (no. 1) requires 'uintmax_t' but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:7]: (warning) %jX in format string (no. 1) requires 'uintmax_t' but the argument type is 'signed int'.\n", errout_str());
 
         check("void foo(uintmax_t uim, std::string s3, unsigned int ui, int i) {\n"
               "    printf(\"%ju\", uim);\n"
@@ -2253,7 +2288,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:6]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:6]: (warning) %jd in format string (no. 1) requires 'intmax_t' but the argument type is 'signed int'.\n", errout_str());
 
         check("void foo(const int* cpi, const int ci, int i, int* pi, std::string s) {\n"
               "    printf(\"%n\", cpi);\n"
@@ -2266,12 +2301,12 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:7]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n", errout.str());
+                      "[test.cpp:7]: (warning) %n in format string (no. 1) requires 'int *' but the argument type is 'const char *'.\n", errout_str());
 
         check("void foo() {\n"
               "    printf(\"%n\", L\"s5W\");\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());
+        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"
               "void foo(const int* cpi, foo f, bar b, bar* bp, double d, int i, unsigned int u) {\n"
@@ -2288,7 +2323,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:6]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'const signed int *'.\n"
-                      "[test.cpp:8]: (warning) %X in format string (no. 1) requires 'unsigned int' but the argument type is 'bar *'.\n", errout.str());
+                      "[test.cpp:8]: (warning) %X in format string (no. 1) requires 'unsigned int' but the argument type is 'bar *'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo(const char* cpc, char* pc) {\n"
@@ -2296,7 +2331,7 @@ class TestIO : public TestFixture {
               "    printf(\"%x\", pc);\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());
+                      "[test.cpp:4]: (warning) %x in format string (no. 1) requires 'unsigned int' but the argument type is 'char *'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo() {\n"
@@ -2308,7 +2343,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:6]: (warning) %o in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n", errout.str());
+                      "[test.cpp:6]: (warning) %o in format string (no. 1) requires 'unsigned int' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo(const int* cpi, foo f, bar b, bar* bp, double d, unsigned int u, unsigned char uc) {\n"
@@ -2326,7 +2361,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:5]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'double'.\n"
                       "[test.cpp:6]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:7]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const signed int *'.\n"
-                      "[test.cpp:9]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'bar *'.\n", errout.str());
+                      "[test.cpp:9]: (warning) %i in format string (no. 1) requires 'int' but the argument type is 'bar *'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo() {\n"
@@ -2334,7 +2369,7 @@ class TestIO : public TestFixture {
               "    printf(\"%d\", L\"s5W\");\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());
+                      "[test.cpp:4]: (warning) %d in format string (no. 1) requires 'int' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo(const int* cpi, foo f, bar b, bar* bp, double d, int i, bool bo) {\n"
@@ -2352,13 +2387,13 @@ class TestIO : public TestFixture {
                       "[test.cpp:5]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'double'.\n"
                       "[test.cpp:6]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'.\n"
                       "[test.cpp:7]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'const signed int *'.\n"
-                      "[test.cpp:9]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'bar *'.\n", errout.str());
+                      "[test.cpp:9]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'bar *'.\n", errout_str());
 
         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"
               "}");
-        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());
+        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"
               "void foo(const int* cpi, foo f, bar b, bar* bp, char c) {\n"
@@ -2369,7 +2404,7 @@ class TestIO : public TestFixture {
               "    printf(\"%p\", b);\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());
+                      "[test.cpp:4]: (warning) %p in format string (no. 1) requires an address but the argument type is 'char'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo(char* pc, const char* cpc, wchar_t* pwc, const wchar_t* cpwc) {\n"
@@ -2380,7 +2415,7 @@ class TestIO : public TestFixture {
               "    printf(\"%p\", \"s4\");\n"
               "    printf(\"%p\", L\"s5W\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class foo {};\n"
               "void foo(const int* cpi, foo f, bar b, bar* bp, double d) {\n"
@@ -2395,7 +2430,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:6]: (warning) %G in format string (no. 1) requires 'double' but the argument type is 'bar *'.\n", errout.str());
+                      "[test.cpp:6]: (warning) %G in format string (no. 1) requires 'double' but the argument type is 'bar *'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo(const char* cpc, char* pc) {\n"
@@ -2409,7 +2444,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:6]: (warning) %G in format string (no. 1) requires 'double' but the argument type is 'char *'.\n"
-                      "[test.cpp:7]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'char *'.\n", errout.str());
+                      "[test.cpp:7]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'char *'.\n", errout_str());
 
         check("class foo {};\n"
               "void foo() {\n"
@@ -2421,7 +2456,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:6]: (warning) %G in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n", errout.str());
+                      "[test.cpp:6]: (warning) %G in format string (no. 1) requires 'double' but the argument type is 'const wchar_t *'.\n", errout_str());
 
         check("class foo;\n"
               "void foo(foo f) {\n"
@@ -2431,7 +2466,7 @@ class TestIO : public TestFixture {
               "}");
         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());
+                      "[test.cpp:5]: (warning) %p in format string (no. 1) requires an address but the argument type is 'foo'.\n", errout_str());
 
         // Ticket #4189 (Improve check (printf("%l") not detected)) tests (according to C99 7.19.6.1.7)
         // False positive tests
@@ -2440,13 +2475,13 @@ class TestIO : public TestFixture {
               "  printf(\"%hd %hu\", si, usi);\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());
+                      "[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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "  printf(\"%jd %jo\", im, uim);\n"
@@ -2456,7 +2491,7 @@ class TestIO : public TestFixture {
               "  printf(\"%zx\", ss);\n"
               "  printf(\"%ti\", sp);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unrecognized (and non-existent in standard library) specifiers.
         // Perhaps should emit warnings
@@ -2468,32 +2503,32 @@ class TestIO : public TestFixture {
               "  printf(\"%zv\", ss);\n"
               "  printf(\"%tp\", sp);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        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());
+        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"
               "}");
         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());
+                      "[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"
               "}");
         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());
+                      "[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"
               "}");
         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());
+                      "[test.cpp:2]: (warning) %tu in format string (no. 2) requires 'unsigned ptrdiff_t' but the argument type is 'long double'.\n", errout_str());
 
         // False negative test
         check("void foo(unsigned int i) {\n"
@@ -2515,7 +2550,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:7]: (warning) 'z' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:8]: (warning) 't' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
                       "[test.cpp:9]: (warning) 'L' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n"
-                      "[test.cpp:10]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n", errout.str());
+                      "[test.cpp:10]: (warning) 'I' in format string (no. 1) is a length modifier and cannot be used without a conversion specifier.\n", errout_str());
 
         check("void foo(unsigned int i) {\n"
               "  printf(\"%hd\", i);\n"
@@ -2526,74 +2561,74 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:5]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'unsigned int'.\n", errout.str());
+                      "[test.cpp:5]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'unsigned int'.\n", errout_str());
 
         check("void foo(size_t s, ptrdiff_t p) {\n"
               "  printf(\"%zd\", s);\n"
               "  printf(\"%tu\", p);\n"
-              "}", false, true, cppcheck::Platform::Type::Unix32);
+              "}", 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());
+                      "[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"
-              "}", false, true, cppcheck::Platform::Type::Unix32);
+              "}", 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());
+                      "[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"
-              "}", false, true, cppcheck::Platform::Type::Unix64);
+              "}", 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());
+                      "[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"
-              "}", false, true, cppcheck::Platform::Type::Unix64);
+              "}", 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());
+                      "[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"
-              "}", false, true, cppcheck::Platform::Type::Win32A);
+              "}", 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());
+                      "[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"
-              "}", false, true, cppcheck::Platform::Type::Win32A);
+              "}", 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());
+                      "[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"
-              "}", false, true, cppcheck::Platform::Type::Win64);
+              "}", 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());
+                      "[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"
-              "}", false, true, cppcheck::Platform::Type::Win64);
+              "}", 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());
+                      "[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());
 
         check("void foo(size_t s, uintmax_t um) {\n"
               "  printf(\"%lu\", s);\n"
               "  printf(\"%lu\", um);\n"
               "  printf(\"%llu\", s);\n"
               "  printf(\"%llu\", um);\n"
-              "}", false, true, cppcheck::Platform::Type::Win64);
+              "}", 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"
-                      "[test.cpp:5]: (portability) %llu in format string (no. 1) requires 'unsigned long long' but the argument type is 'uintmax_t {aka unsigned long long}'.\n", errout.str());
+                      "[test.cpp:5]: (portability) %llu in format string (no. 1) requires 'unsigned long long' but the argument type is 'uintmax_t {aka unsigned long long}'.\n", errout_str());
 
         check("void foo(unsigned int i) {\n"
               "  printf(\"%ld\", i);\n"
@@ -2608,21 +2643,21 @@ class TestIO : public TestFixture {
                       "[test.cpp:4]: (warning) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:5]: (warning) %llu in format string (no. 1) requires 'unsigned long long' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:6]: (warning) %lx in format string (no. 1) requires 'unsigned long' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:7]: (warning) %llx in format string (no. 1) requires 'unsigned long long' but the argument type is 'unsigned int'.\n", errout.str());
+                      "[test.cpp:7]: (warning) %llx in format string (no. 1) requires 'unsigned long long' but the argument type is 'unsigned int'.\n", errout_str());
 
         check("void foo(int i, intmax_t im, ptrdiff_t p) {\n"
               "  printf(\"%lld\", i);\n"
               "  printf(\"%lld\", im);\n"
               "  printf(\"%lld\", p);\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());
+        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"
-              "}", false, true, cppcheck::Platform::Type::Win64);
+              "}", 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());
+                      "[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());
 
         check("class Foo {\n"
               "    double d;\n"
@@ -2645,7 +2680,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:13]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'int'.\n"
                       "[test.cpp:13]: (warning) %d in format string (no. 4) requires 'int' but the argument type is 'double'.\n"
                       "[test.cpp:13]: (warning) %f in format string (no. 5) requires 'double' but the argument type is 'int'.\n"
-                      "[test.cpp:13]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'int'.\n", errout.str());
+                      "[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()); }");
@@ -2655,7 +2690,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64d in format string (no. 5) requires '__int64' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'signed short'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'signed short'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed short'.\n", errout.str());
+                      "[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()); }");
@@ -2664,7 +2699,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires 'unsigned __int64' but the argument type is 'unsigned short'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'unsigned short'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'unsigned short'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned short'.\n", errout.str());
+                      "[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()); }");
@@ -2674,7 +2709,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64d in format string (no. 5) requires '__int64' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[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()); }");
@@ -2684,7 +2719,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires 'unsigned __int64' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned int'.\n", errout.str());
+                      "[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()); }");
@@ -2694,7 +2729,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64d in format string (no. 5) requires '__int64' but the argument type is 'signed long'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'signed long'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'signed long'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed long'.\n", errout.str());
+                      "[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()); }");
@@ -2704,7 +2739,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires 'unsigned __int64' but the argument type is 'unsigned long'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'unsigned long'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'unsigned long'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned long'.\n", errout.str());
+                      "[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()); }");
@@ -2713,7 +2748,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires 'unsigned __int64' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'signed long long'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'signed long long'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'signed long long'.\n", errout.str());
+                      "[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()); }");
@@ -2722,7 +2757,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires '__int64' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 6) requires 'double' but the argument type is 'unsigned long long'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 7) requires 'long double' but the argument type is 'unsigned long long'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address but the argument type is 'unsigned long long'.\n", errout.str());
+                      "[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()); }");
@@ -2733,7 +2768,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64d in format string (no. 6) requires '__int64' but the argument type is 'float'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 7) requires 'unsigned __int64' but the argument type is 'float'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 8) requires 'long double' but the argument type is 'float'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'float'.\n", errout.str());
+                      "[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()); }");
@@ -2744,7 +2779,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64d in format string (no. 6) requires '__int64' but the argument type is 'double'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 7) requires 'unsigned __int64' but the argument type is 'double'.\n"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 8) requires 'long double' but the argument type is 'double'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'double'.\n", errout.str());
+                      "[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()); }");
@@ -2755,37 +2790,37 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %I64d in format string (no. 6) requires '__int64' but the argument type is 'long double'.\n"
                       "[test.cpp:2]: (warning) %I64u in format string (no. 7) requires 'unsigned __int64' but the argument type is 'long double'.\n"
                       "[test.cpp:2]: (warning) %f in format string (no. 8) requires 'double' but the argument type is 'long double'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address but the argument type is 'long double'.\n", errout.str());
+                      "[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()); }");
         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());
+                      "[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()); }");
         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());
+                      "[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()); }");
         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());
+                      "[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()); }");
         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());
+                      "[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()); }");
         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());
+                      "[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()); }");
@@ -2793,7 +2828,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[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); }");
@@ -2801,7 +2836,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[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); }");
@@ -2809,7 +2844,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'unsigned int'.\n", errout.str());
+                      "[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()); }");
@@ -2817,14 +2852,14 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:2]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'unsigned int'.\n"
-                      "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'unsigned int'.\n", errout.str());
+                      "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address but the argument type is 'unsigned int'.\n", errout_str());
 
         // #4975
         check("void f(int len, int newline) {\n"
               "    printf(\"%s\", newline ? a : str + len);\n"
               "    printf(\"%s\", newline + newline);\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());
+        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"
@@ -2833,7 +2868,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:3]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:3]: (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"
               "const struct Fred & bar() { };\n"
@@ -2842,7 +2877,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:3]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:3]: (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"
               "static const struct Fred & bar() { };\n"
@@ -2851,7 +2886,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:3]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:3]: (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[2];\n"
               "struct Fred * bar() { return f; };\n"
@@ -2860,7 +2895,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:3]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:3]: (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[2];\n"
               "const struct Fred * bar() { return f; };\n"
@@ -2869,7 +2904,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:3]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:3]: (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[2];\n"
               "static const struct Fred * bar() { return f; };\n"
@@ -2878,7 +2913,7 @@ class TestIO : public TestFixture {
                       "[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"
                       "[test.cpp:3]: (warning) %Lf in format string (no. 5) requires 'long double' but the argument type is 'signed int'.\n"
-                      "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout.str());
+                      "[test.cpp:3]: (warning) %p in format string (no. 6) requires an address but the argument type is 'signed int'.\n", errout_str());
 
         check("struct Fred { int32_t i; } f;\n"
               "struct Fred & bar() { };\n"
@@ -2888,111 +2923,111 @@ class TestIO : public TestFixture {
                       "[test.cpp:3]: (warning) %lu in format string (no. 4) requires 'unsigned long' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %f in format string (no. 5) requires 'double' but the argument type is 'signed int'.\n"
                       "[test.cpp:3]: (warning) %Lf in format string (no. 6) requires 'long double' but the argument type is 'signed int'.\n",
-                      errout.str());
+                      errout_str());
 
         // #4984
         check("void f(double *x) {\n"
               "    printf(\"%f\", x[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int array[10];\n"
               "int * foo() { return array; }\n"
               "void f() {\n"
               "    printf(\"%f\", foo()[0]);\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());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) %f in format string (no. 1) requires 'double' but the argument type is 'signed int'.\n", errout.str());
+        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"
               "}");
         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());
+                      "[test.cpp:3]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'signed int'.\n", errout_str());
 
         // #4999 (crash)
         check("int bar(int a);\n"
               "void foo() {\n"
               "    printf(\"%d\", bar(0));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int> v;\n"
               "std::string s;\n"
               "void foo() {\n"
               "    printf(\"%zu %Iu %d %f\", v.size(), v.size(), v.size(), v.size());\n"
               "    printf(\"%zu %Iu %d %f\", s.size(), s.size(), s.size(), s.size());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Win32A);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:4]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:4]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:5]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long}'.\n"
-                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout.str());
+                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout_str());
 
         check("std::vector<int> v;\n"
               "std::string s;\n"
               "void foo() {\n"
               "    printf(\"%zu %Iu %d %f\", v.size(), v.size(), v.size(), v.size());\n"
               "    printf(\"%zu %Iu %d %f\", s.size(), s.size(), s.size(), s.size());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Win64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
         ASSERT_EQUALS("[test.cpp:4]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long long}'.\n"
                       "[test.cpp:4]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long long}'.\n"
                       "[test.cpp:5]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long long}'.\n"
-                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long long}'.\n", errout.str());
+                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long long}'.\n", errout_str());
 
         check("std::vector<int> v;\n"
               "std::string s;\n"
               "void foo() {\n"
               "    printf(\"%zu %Iu %d %f\", v.size(), v.size(), v.size(), v.size());\n"
               "    printf(\"%zu %Iu %d %f\", s.size(), s.size(), s.size(), s.size());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix32);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
         ASSERT_EQUALS("[test.cpp:4]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:4]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:5]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long}'.\n"
-                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout.str());
+                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout_str());
 
         check("std::vector<int> v;\n"
               "std::string s;\n"
               "void foo() {\n"
               "    printf(\"%zu %Iu %d %f\", v.size(), v.size(), v.size(), v.size());\n"
               "    printf(\"%zu %Iu %d %f\", s.size(), s.size(), s.size(), s.size());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:4]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:4]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:5]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long}'.\n"
-                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout.str());
+                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout_str());
 
         check("class Fred : public std::vector<int> {} v;\n"
               "std::string s;\n"
               "void foo() {\n"
               "    printf(\"%zu %Iu %d %f\", v.size(), v.size(), v.size(), v.size());\n"
               "    printf(\"%zu %Iu %d %f\", s.size(), s.size(), s.size(), s.size());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:4]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:4]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:5]: (portability) %d in format string (no. 3) requires 'int' but the argument type is 'std::size_t {aka unsigned long}'.\n"
-                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout.str());
+                      "[test.cpp:5]: (portability) %f in format string (no. 4) requires 'double' but the argument type is 'std::size_t {aka unsigned long}'.\n", errout_str());
 
         check("class Fred : public std::vector<int> {} v;\n"
               "void foo() {\n"
               "    printf(\"%d %u %f\", v[0], v[0], v[0]);\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'int'.\n"
-                      "[test.cpp:3]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'int'.\n", errout.str());
+                      "[test.cpp:3]: (warning) %f in format string (no. 3) requires 'double' but the argument type is 'int'.\n", errout_str());
 
         check("std::string s;\n"
               "void foo() {\n"
               "    printf(\"%s %p %u %d %f\", s.c_str(), s.c_str(), s.c_str(), s.c_str(), s.c_str());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:3]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'const char *'.\n"
                       "[test.cpp:3]: (warning) %d in format string (no. 4) requires 'int' but the argument type is 'const char *'.\n"
-                      "[test.cpp:3]: (warning) %f in format string (no. 5) requires 'double' but the argument type is 'const char *'.\n", errout.str());
+                      "[test.cpp:3]: (warning) %f in format string (no. 5) requires 'double' but the argument type is 'const char *'.\n", errout_str());
 
         check("std::vector<int> array;\n"
               "char * p = 0;\n"
@@ -3005,7 +3040,7 @@ class TestIO : public TestFixture {
               "    printf(\"%u %u\", array.size(), s);\n"
               "    printf(\"%lu %lu\", array.size(), s);\n"
               "    printf(\"%llu %llu\", array.size(), s);\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:8]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'char *'.\n"
                       "[test.cpp:8]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'char *'.\n"
                       "[test.cpp:8]: (warning) %u in format string (no. 3) requires 'unsigned int' but the argument type is 'char *'.\n"
@@ -3014,7 +3049,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:10]: (portability) %lu in format string (no. 1) requires 'unsigned long' but the argument type is 'std::size_t {aka unsigned long}'.\n"
                       "[test.cpp:10]: (portability) %lu in format string (no. 2) requires 'unsigned long' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:11]: (portability) %llu in format string (no. 1) requires 'unsigned long long' but the argument type is 'std::size_t {aka unsigned long}'.\n"
-                      "[test.cpp:11]: (portability) %llu in format string (no. 2) requires 'unsigned long long' but the argument type is 'size_t {aka unsigned long}'.\n", errout.str());
+                      "[test.cpp:11]: (portability) %llu in format string (no. 2) requires 'unsigned long long' but the argument type is 'size_t {aka unsigned long}'.\n", errout_str());
 
         check("bool b; bool bf();\n"
               "char c; char cf();\n"
@@ -3029,13 +3064,13 @@ class TestIO : public TestFixture {
               "char ca[3];\n"
               "void foo() {\n"
               "    printf(\"%td %zd %d %d %d %d %d %d %d %d %d %d %d\", pt, pt, b, c, sc, uc, s, us, st, pt, pc, cl, ca);\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:13]: (portability) %zd in format string (no. 2) requires 'ssize_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
                       "[test.cpp:13]: (portability) %d in format string (no. 9) requires 'int' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:13]: (portability) %d in format string (no. 10) requires 'int' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
                       "[test.cpp:13]: (warning) %d in format string (no. 11) requires 'int' but the argument type is 'char *'.\n"
                       "[test.cpp:13]: (warning) %d in format string (no. 12) requires 'int' but the argument type is 'char *'.\n"
-                      "[test.cpp:13]: (warning) %d in format string (no. 13) requires 'int' but the argument type is 'char *'.\n", errout.str());
+                      "[test.cpp:13]: (warning) %d in format string (no. 13) requires 'int' but the argument type is 'char *'.\n", errout_str());
 
         check("bool b; bool bf();\n"
               "char c; char cf();\n"
@@ -3050,7 +3085,7 @@ class TestIO : public TestFixture {
               "char ca[3];\n"
               "void foo() {\n"
               "    printf(\"%ld %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld\", b, c, sc, uc, s, us, st, pt, pc, cl, ca);\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:13]: (warning) %ld in format string (no. 1) requires 'long' but the argument type is 'bool'.\n"
                       "[test.cpp:13]: (warning) %ld in format string (no. 2) requires 'long' but the argument type is 'char'.\n"
                       "[test.cpp:13]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'signed char'.\n"
@@ -3061,7 +3096,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:13]: (portability) %ld in format string (no. 8) requires 'long' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
                       "[test.cpp:13]: (warning) %ld in format string (no. 9) requires 'long' but the argument type is 'char *'.\n"
                       "[test.cpp:13]: (warning) %ld in format string (no. 10) requires 'long' but the argument type is 'char *'.\n"
-                      "[test.cpp:13]: (warning) %ld in format string (no. 11) requires 'long' but the argument type is 'char *'.\n", errout.str());
+                      "[test.cpp:13]: (warning) %ld in format string (no. 11) requires 'long' but the argument type is 'char *'.\n", errout_str());
 
 
         check("bool b; bool bf();\n"
@@ -3077,11 +3112,11 @@ class TestIO : public TestFixture {
               "char ca[3];\n"
               "void foo() {\n"
               "    printf(\"%td %zd %d %d %d %d %d %d %d %d %d\", ptf(), ptf(), bf(), cf(), scf(), ucf(), sf(), usf(), stf(), ptf(), pcf());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:13]: (portability) %zd in format string (no. 2) requires 'ssize_t' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
                       "[test.cpp:13]: (portability) %d in format string (no. 9) requires 'int' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:13]: (portability) %d in format string (no. 10) requires 'int' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
-                      "[test.cpp:13]: (warning) %d in format string (no. 11) requires 'int' but the argument type is 'char *'.\n", errout.str());
+                      "[test.cpp:13]: (warning) %d in format string (no. 11) requires 'int' but the argument type is 'char *'.\n", errout_str());
 
         check("bool b; bool bf();\n"
               "char c; char cf();\n"
@@ -3096,7 +3131,7 @@ class TestIO : public TestFixture {
               "char ca[3];\n"
               "void foo() {\n"
               "    printf(\"%ld %ld %ld %ld %ld %ld %ld %ld %ld\", bf(), cf(), scf(), ucf(), sf(), usf(), stf(), ptf(), pcf());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:13]: (warning) %ld in format string (no. 1) requires 'long' but the argument type is 'bool'.\n"
                       "[test.cpp:13]: (warning) %ld in format string (no. 2) requires 'long' but the argument type is 'char'.\n"
                       "[test.cpp:13]: (warning) %ld in format string (no. 3) requires 'long' but the argument type is 'signed char'.\n"
@@ -3105,7 +3140,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:13]: (warning) %ld in format string (no. 6) requires 'long' but the argument type is 'unsigned short'.\n"
                       "[test.cpp:13]: (portability) %ld in format string (no. 7) requires 'long' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:13]: (portability) %ld in format string (no. 8) requires 'long' but the argument type is 'ptrdiff_t {aka signed long}'.\n"
-                      "[test.cpp:13]: (warning) %ld in format string (no. 9) requires 'long' but the argument type is 'char *'.\n", errout.str());
+                      "[test.cpp:13]: (warning) %ld in format string (no. 9) requires 'long' but the argument type is 'char *'.\n", errout_str());
 
         check("struct A {};\n"
               "class B : public std::vector<const int *> {} b;\n"
@@ -3116,11 +3151,11 @@ class TestIO : public TestFixture {
               "    printf(\"%p %d\", b[0], b[0]);\n"
               "    printf(\"%p %d\", c[0], c[0]);\n"
               "    printf(\"%p %d\", s.c_str(), s.c_str());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:6]: (portability) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'size_t {aka unsigned long}'.\n"
                       "[test.cpp:7]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const int *'.\n"
                       "[test.cpp:8]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const struct A *'.\n"
-                      "[test.cpp:9]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const char *'.\n", errout.str());
+                      "[test.cpp:9]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const char *'.\n", errout_str());
 
         check("class A : public std::vector<std::string> {} a;\n"
               "class B : public std::string {} b;\n"
@@ -3129,10 +3164,10 @@ class TestIO : public TestFixture {
               "    printf(\"%p %d\", a[0].c_str(), a[0].c_str());\n"
               "    printf(\"%c %p\", b[0], b[0]);\n"
               "    printf(\"%c %p\", s[0], s[0]);\n"
-              "}\n", false, false, cppcheck::Platform::Type::Unix64);
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Unix64));
         ASSERT_EQUALS("[test.cpp:5]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'const char *'.\n"
                       "[test.cpp:6]: (warning) %p in format string (no. 2) requires an address but the argument type is 'char'.\n"
-                      "[test.cpp:7]: (warning) %p in format string (no. 2) requires an address but the argument type is 'char'.\n", errout.str());
+                      "[test.cpp:7]: (warning) %p in format string (no. 2) requires an address but the argument type is 'char'.\n", errout_str());
 
         check("template <class T>\n"
               "struct buffer {\n"
@@ -3141,41 +3176,41 @@ class TestIO : public TestFixture {
               "buffer<int> b;\n"
               "void foo() {\n"
               "    printf(\"%u\", b.size());\n"
-              "}\n", false, true, cppcheck::Platform::Type::Unix64);
-        ASSERT_EQUALS("[test.cpp:7]: (portability) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'size_t {aka unsigned long}'.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+        ASSERT_EQUALS("[test.cpp:7]: (portability) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'size_t {aka unsigned long}'.\n", errout_str());
 
         check("DWORD a;\n"
               "DWORD_PTR b;\n"
               "void foo() {\n"
               "    printf(\"%u %u\", a, b);\n"
-              "}\n", false, true, cppcheck::Platform::Type::Win32A);
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
         ASSERT_EQUALS("[test.cpp:4]: (portability) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'DWORD {aka unsigned long}'.\n"
-                      "[test.cpp:4]: (portability) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'DWORD_PTR {aka unsigned long}'.\n", errout.str());
+                      "[test.cpp:4]: (portability) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'DWORD_PTR {aka unsigned long}'.\n", errout_str());
 
         check("unsigned long a[] = { 1, 2 };\n"
               "void foo() {\n"
               "    printf(\"%d %d %x \", a[0], a[0], a[0]);\n"
-              "}\n", false, false, cppcheck::Platform::Type::Win32A);
+              "}\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 'unsigned long'.\n"
                       "[test.cpp:3]: (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned long'.\n"
-                      "[test.cpp:3]: (warning) %x in format string (no. 3) requires 'unsigned int' but the argument type is 'unsigned long'.\n", errout.str());
+                      "[test.cpp:3]: (warning) %x in format string (no. 3) requires 'unsigned int' but the argument type is 'unsigned long'.\n", errout_str());
 
         check("void foo (wchar_t c) {\n" // ticket #5051 false positive
               "    printf(\"%c\", c);\n"
-              "}\n", false, false, cppcheck::Platform::Type::Win64);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    printf(\"%f %d\", static_cast<int>(1.0f), reinterpret_cast<const void *>(0));\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());
+                      "[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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    long * l;\n"
@@ -3184,7 +3219,7 @@ class TestIO : public TestFixture {
         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"
-                      "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed long'.\n", errout.str());
+                      "[test.cpp:3]: (warning) %f in format string (no. 4) requires 'double' but the argument type is 'signed long'.\n", errout_str());
 
         check("void f() {\n" // #5104
               "    myvector<unsigned short> v1(1,0);\n"
@@ -3202,27 +3237,27 @@ class TestIO : public TestFixture {
               "    myvector<char *> v7(1,0);\n"
               "    printf(\"%s\",v7[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
         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());
+                      "[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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5486
         check("void foo() {\n"
               "    ssize_t test = 0;\n"
               "    printf(\"%zd\", test);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6009
         check("extern std::string StringByReturnValue();\n"
@@ -3231,7 +3266,7 @@ class TestIO : public TestFixture {
               "    printf( \"%s - %s\", StringByReturnValue(), IntByReturnValue() );\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());
+                      "[test.cpp:4]: (warning) %s in format string (no. 2) requires 'char *' but the argument type is 'signed int'.\n", errout_str());
 
         check("template <class T, size_t S>\n"
               "struct Array {\n"
@@ -3244,21 +3279,21 @@ class TestIO : public TestFixture {
               "    printf(\"%u %u\", array1[0], array2[0]);\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());
+                      "[test.cpp:9]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'float'.\n", errout_str());
 
         // Ticket #7445
         check("struct S { unsigned short x; } s = {0};\n"
               "void foo() {\n"
               "    printf(\"%d\", s.x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
         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());
+                      "[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"
@@ -3269,7 +3304,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %hhd in format string (no. 5) requires 'char' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 6) requires 'char' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %hhd in format string (no. 7) requires 'char' but the argument type is 'signed long'.\n"
-                      "[test.cpp:2]: (warning) %hhd in format string (no. 8) requires 'char' but the argument type is 'unsigned long'.\n", errout.str());
+                      "[test.cpp:2]: (warning) %hhd in format string (no. 8) requires 'char' but the argument type is 'unsigned long'.\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(\"%hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu\", c, uc, s, us, i, ui, l, ul);\n"
@@ -3280,7 +3315,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %hhu in format string (no. 5) requires 'unsigned char' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %hhu in format string (no. 6) requires 'unsigned char' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %hhu in format string (no. 7) requires 'unsigned char' but the argument type is 'signed long'.\n"
-                      "[test.cpp:2]: (warning) %hhu in format string (no. 8) requires 'unsigned char' but the argument type is 'unsigned long'.\n", errout.str());
+                      "[test.cpp:2]: (warning) %hhu in format string (no. 8) requires 'unsigned char' but the argument type is 'unsigned long'.\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(\"%hhx %hhx %hhx %hhx %hhx %hhx %hhx %hhx\", c, uc, s, us, i, ui, l, ul);\n"
@@ -3291,7 +3326,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %hhx in format string (no. 5) requires 'unsigned char' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %hhx in format string (no. 6) requires 'unsigned char' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %hhx in format string (no. 7) requires 'unsigned char' but the argument type is 'signed long'.\n"
-                      "[test.cpp:2]: (warning) %hhx in format string (no. 8) requires 'unsigned char' but the argument type is 'unsigned long'.\n", errout.str());
+                      "[test.cpp:2]: (warning) %hhx in format string (no. 8) requires 'unsigned char' but the argument type is 'unsigned long'.\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(\"%hd %hd %hd %hd %hd %hd %hd %hd\", c, uc, s, us, i, ui, l, ul);\n"
@@ -3302,7 +3337,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %hd in format string (no. 5) requires 'short' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %hd in format string (no. 6) requires 'short' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %hd in format string (no. 7) requires 'short' but the argument type is 'signed long'.\n"
-                      "[test.cpp:2]: (warning) %hd in format string (no. 8) requires 'short' but the argument type is 'unsigned long'.\n", errout.str());
+                      "[test.cpp:2]: (warning) %hd in format string (no. 8) requires 'short' but the argument type is 'unsigned long'.\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(\"%hu %hu %hu %hu %hu %hu %hu %hu\", c, uc, s, us, i, ui, l, ul);\n"
@@ -3313,7 +3348,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %hu in format string (no. 5) requires 'unsigned short' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %hu in format string (no. 6) requires 'unsigned short' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %hu in format string (no. 7) requires 'unsigned short' but the argument type is 'signed long'.\n"
-                      "[test.cpp:2]: (warning) %hu in format string (no. 8) requires 'unsigned short' but the argument type is 'unsigned long'.\n", errout.str());
+                      "[test.cpp:2]: (warning) %hu in format string (no. 8) requires 'unsigned short' but the argument type is 'unsigned long'.\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(\"%hx %hx %hx %hx %hx %hx %hx %hx\", c, uc, s, us, i, ui, l, ul);\n"
@@ -3324,7 +3359,7 @@ class TestIO : public TestFixture {
                       "[test.cpp:2]: (warning) %hx in format string (no. 5) requires 'unsigned short' but the argument type is 'signed int'.\n"
                       "[test.cpp:2]: (warning) %hx in format string (no. 6) requires 'unsigned short' but the argument type is 'unsigned int'.\n"
                       "[test.cpp:2]: (warning) %hx in format string (no. 7) requires 'unsigned short' but the argument type is 'signed long'.\n"
-                      "[test.cpp:2]: (warning) %hx in format string (no. 8) requires 'unsigned short' but the argument type is 'unsigned long'.\n", errout.str());
+                      "[test.cpp:2]: (warning) %hx in format string (no. 8) requires 'unsigned short' but the argument type is 'unsigned long'.\n", errout_str());
 
         // #7837 - Use ValueType for function call
         check("struct S {\n"
@@ -3334,13 +3369,13 @@ class TestIO : public TestFixture {
               "void foo(struct S x) {\n"
               "  printf(\"%f\", x.f(4.0));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    printf(\"%lu\", sizeof(char));\n"
-              "}\n", false, true, cppcheck::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",
-                      errout.str());
+                      errout_str());
     }
 
     void testPrintfArgumentVariables() {
@@ -4095,7 +4130,7 @@ class TestIO : public TestFixture {
               "  printf(\"%1$d, %d, %1$d\", 1, 2);"
               "  scanf(\"%1$d\", &bar);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  int bar;\n"
@@ -4104,11 +4139,11 @@ class TestIO : public TestFixture {
               "  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"
-                      "", errout.str());
+        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());
     }
 
 
@@ -4126,14 +4161,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"
-              "}", false, true, cppcheck::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());
+              "}", 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"
@@ -4148,14 +4183,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"
-              "}", false, true, cppcheck::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());
+              "}", 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"
@@ -4175,43 +4210,43 @@ class TestIO : public TestFixture {
               "    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());
+        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"
               "    printf(\"%Ix %Ix %Ix\", lp, wp, lr);\n"
-              "}\n", false, true, cppcheck::Platform::Type::Win64);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win64));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(LPARAM lp, WPARAM wp, LRESULT lr) {\n"
               "    printf(\"%Ix %Ix %Ix\", lp, wp, lr);\n"
-              "}\n", false, true, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(UINT32 a, ::UINT32 b, Fred::UINT32 c) {\n"
               "    printf(\"%d %d %d\", a, b, c);\n"
-              "};\n", false, true, cppcheck::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());
+              "};\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        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", false, true, cppcheck::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());
+              "};\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        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>
@@ -4219,8 +4254,8 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", false, true, cppcheck::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());
+              "}", 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>
@@ -4228,8 +4263,8 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", false, true, cppcheck::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());
+              "}", 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.
@@ -4237,8 +4272,8 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", false, true, cppcheck::Platform::Type::Unix64);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    typedef SSIZE_T ssize_t;\n" // Test using typedef
@@ -4247,8 +4282,8 @@ class TestIO : public TestFixture {
               "    printf(\"%zd\", s);\n"
               "    printf(\"%zd%i\", s, i);\n"
               "    printf(\"%zu\", s);\n"
-              "}", false, true, cppcheck::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());
+              "}", 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());
 
     }
 
@@ -4266,16 +4301,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"
-              "}", false, true, cppcheck::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());
+              "}", 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"
@@ -4290,16 +4325,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"
-              "}", false, true, cppcheck::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());
+              "}", 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"
@@ -4319,20 +4354,20 @@ class TestIO : public TestFixture {
               "    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());
+        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>
@@ -4340,8 +4375,8 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", false, true, cppcheck::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());
+              "}", 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>
@@ -4349,8 +4384,8 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", false, true, cppcheck::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());
+              "}", 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.
@@ -4358,8 +4393,8 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", false, true, cppcheck::Platform::Type::Unix64);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    typedef SSIZE_T ssize_t;\n" // Test using typedef
@@ -4368,8 +4403,8 @@ class TestIO : public TestFixture {
               "    scanf(\"%zd\", &s);\n"
               "    scanf(\"%zd%i\", &s, &i);\n"
               "    scanf(\"%zu\", &s);\n"
-              "}", false, true, cppcheck::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());
+              "}", 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());
 
     }
 
@@ -4379,16 +4414,16 @@ class TestIO : public TestFixture {
               "    String string;\n"
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
-              "}", false, true, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    unsigned __int32 u32;\n"
               "    CString string;\n"
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
-              "}", false, true, cppcheck::Platform::Type::Unix32);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix32));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    unsigned __int32 u32;\n"
@@ -4396,10 +4431,10 @@ class TestIO : public TestFixture {
               "    string.Format(\"%I32d\", u32);\n"
               "    string.AppendFormat(\"%I32d\", u32);\n"
               "    CString::Format(\"%I32d\", u32);\n"
-              "}", false, true, cppcheck::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());
+              "}", 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() {
@@ -4407,181 +4442,181 @@ class TestIO : public TestFixture {
               "    int i;\n"
               "    unsigned int u;\n"
               "    _tprintf_s(_T(\"%d %u\"), u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _stprintf_s(str, sizeof(str) / sizeof(TCHAR), _T(\"%d %u\"), u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _stprintf_s(str, sizeof(str) / sizeof(TCHAR), _T(\"%d %u\"), u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    sprintf_s(str, sizeof(str), \"%d %u\", u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    sprintf_s(str, \"%d %u\", u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    swprintf_s(str, sizeof(str) / sizeof(wchar_t), L\"%d %u\", u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    swprintf_s(str, L\"%d %u\", u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _sntprintf_s(str, sizeof(str) / sizeof(TCHAR), _TRUNCATE, _T(\"%d %u\"), u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _sntprintf_s(str, sizeof(str) / sizeof(TCHAR), _TRUNCATE, _T(\"%d %u\"), u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _snprintf_s(str, sizeof(str), _TRUNCATE, \"%d %u\", u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    int i;\n"
               "    unsigned int u;\n"
               "    _snwprintf_s(str, sizeof(str) / sizeof(wchar_t), _TRUNCATE, L\"%d %u\", u, i, 0);\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    const char * const format = \"%15s%17s%17s%17s%17s\";\n"
               "    sprintf_s(lineBuffer, 600, format, \"type\", \"sum\", \"avg\", \"min\", \"max\");\n"
               "    sprintf_s(lineBuffer, format, \"type\", \"sum\", \"avg\", \"min\", \"max\");\n"
-              "}\n", false, false, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    const char * const format1 = \"%15s%17s%17s%17s%17s\";\n"
@@ -4600,31 +4635,31 @@ class TestIO : public TestFixture {
               "    sprintf_s(lineBuffer, 100, format1, \"type\", \"sum\", \"avg\", \"min\", i, 0);\n"
               "    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", true, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.inconclusive = true, $.platform = Platform::Type::Win32A));
+        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());
 
     }
 
@@ -4634,50 +4669,47 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    TCHAR str[10];\n"
               "    _tscanf_s(_T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    unsigned int u;\n"
               "    TCHAR str[10];\n"
               "    _tscanf_s(_T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    unsigned int u;\n"
               "    char str[10];\n"
               "    scanf_s(\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    unsigned int u;\n"
               "    wchar_t str[10];\n"
               "    wscanf_s(L\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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",
-              false,
-              false,
-              cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
@@ -4685,10 +4717,10 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    TCHAR str[10];\n"
               "    _stscanf_s(txt, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
@@ -4696,10 +4728,10 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    TCHAR str[10];\n"
               "    _stscanf_s(txt, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
@@ -4707,10 +4739,10 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    char str[10];\n"
               "    sscanf_s(txt, \"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
@@ -4718,77 +4750,77 @@ class TestIO : public TestFixture {
               "    unsigned int u;\n"
               "    wchar_t str[10];\n"
               "    swscanf_s(txt, L\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    unsigned int u;\n"
               "    TCHAR str[10];\n"
               "    _ftscanf_s(fp, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    unsigned int u;\n"
               "    TCHAR str[10];\n"
               "    _ftscanf_s(fp, _T(\"%s %d %u %[a-z]\"), str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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"
               "    unsigned int u;\n"
               "    char str[10];\n"
               "    fscanf_s(fp, \"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        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"
               "    unsigned int u;\n"
               "    wchar_t str[10];\n"
               "    fwscanf_s(fp, L\"%s %d %u %[a-z]\", str, 10, &u, &i, str, 10, 0)\n"
-              "}\n", false, false, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        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", false, false, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.platform = Platform::Type::Win32W));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testQStringFormatArguments() {
         check("void foo(float f) {\n"
               "    QString string;\n"
               "    string.sprintf(\"%d\", f);\n"
-              "}", false, false, cppcheck::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());
+              "}", 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"
-              "}", false, false, cppcheck::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());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testUnsignedConst() {  // ticket #6321
@@ -4796,30 +4828,30 @@ class TestIO : public TestFixture {
               "    unsigned const x = 5;\n"
               "    printf(\"%u\", x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testAstType() { // ticket #7014
         check("void test() {\n"
               "    printf(\"%c\", \"hello\"[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    printf(\"%lld\", (long long)1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testPrintf0WithSuffix() { // ticket #7069
@@ -4827,7 +4859,7 @@ class TestIO : public TestFixture {
               "    printf(\"%u %lu %llu\", 0U, 0UL, 0ULL);\n"
               "    printf(\"%u %lu %llu\", 0u, 0ul, 0ull);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testReturnValueTypeStdLib() {
@@ -4835,13 +4867,13 @@ class TestIO : public TestFixture {
               "   const char *s = \"0\";\n"
               "   printf(\"%ld%lld\", atol(s), atoll(s));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // 8141
         check("void f(int i) {\n"
               "   printf(\"%f\", imaxabs(i));\n"
-              "}\n", false, true, cppcheck::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());
+              "}\n", dinit(CheckOptions, $.portability = true, $.platform = Platform::Type::Unix64));
+        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() {
@@ -4854,7 +4886,7 @@ class TestIO : public TestFixture {
               "void foo() {\n"
               "    printf(\"%d %p %p\", i, pi, pci);\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("using INT = int;\n\n"
               "using PINT = INT *;\n"
@@ -4865,9 +4897,9 @@ class TestIO : public TestFixture {
               "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());
+        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
@@ -4875,33 +4907,33 @@ class TestIO : public TestFixture {
               "    auto s = sizeof(int);\n"
               "    printf(\"%zu\", s);\n"
               "    printf(\"%f\", s);\n"
-              "}\n", false, 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());
+              "}\n", dinit(CheckOptions, $.portability = true));
+        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());
+        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());
+        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());
+        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"
-              "}", /*inconclusive*/ false, /*portability*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.portability = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testParameterPack() { // #11289
@@ -4911,7 +4943,33 @@ class TestIO : public TestFixture {
               "void g() {\n"
               "    f(\"%d%d\", 1, 2);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    // TODO: we need to run big tests with a platform that has unsigned chars
+    void testDefaultSignInt() { // #13363
+        // Platform::defaultSign should only affect char
+        const char code[] =
+            "void f() {\n"
+            "    double d = 1\n;"
+            "    printf(\"%i\", int(d));\n"
+            "}\n";
+        check(code);
+        ASSERT_EQUALS("", errout_str());
+        check(code, dinit(CheckOptions, $.defaultSign = 's'));
+        ASSERT_EQUALS("", errout_str());
+        check(code, dinit(CheckOptions, $.defaultSign = 'u'));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void testPrintfWithGeneric() { // #13592
+        const char code[] =
+            "void f(void) {\n"
+            "    float x = 27.0f;\n"
+            "    printf(\"%s\\n\", _Generic(x, double: cbrt, float: cbrtf)(x));\n"
+            "}\n";
+        check(code);
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index 24369323966..7aa64c1cd3c 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-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
@@ -16,57 +16,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkleakautovar.h"
-#include "errortypes.h"
-#include "library.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <list>
-#include <map>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
-
-class TestLeakAutoVarStrcpy;
-class TestLeakAutoVarWindows;
 
 class TestLeakAutoVar : public TestFixture {
 public:
     TestLeakAutoVar() : TestFixture("TestLeakAutoVar") {}
 
 private:
-    Settings settings;
+    const Settings settings = settingsBuilder().library("std.cfg").checkLibrary().build();
 
     void run() override {
-        int id = 0;
-        while (!Library::ismemory(++id));
-        settings.library.setalloc("malloc", id, -1);
-        settings.library.setrealloc("realloc", id, -1);
-        settings.library.setdealloc("free", id, 1);
-        while (!Library::isresource(++id));
-        settings.library.setalloc("socket", id, -1);
-        settings.library.setdealloc("close", id, 1);
-        while (!Library::isresource(++id));
-        settings.library.setalloc("fopen", id, -1);
-        settings.library.setrealloc("freopen", id, -1, 3);
-        settings.library.setdealloc("fclose", id, 1);
-        settings.library.smartPointers["std::shared_ptr"];
-        settings.library.smartPointers["std::unique_ptr"];
-        settings.library.smartPointers["std::unique_ptr"].unique = true;
-
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <podtype name=\"uint8_t\" sign=\"u\" size=\"1\"/>\n"
-                               "</def>";
-        ASSERT(settings.library.loadxmldata(xmldata, sizeof(xmldata)));
-
+        mNewTemplate = true;
         // Assign
         TEST_CASE(assign1);
         TEST_CASE(assign2);
@@ -92,6 +58,11 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(assign22); // #9139
         TEST_CASE(assign23);
         TEST_CASE(assign24); // #7440
+        TEST_CASE(assign25);
+        TEST_CASE(assign26);
+
+        TEST_CASE(memcpy1); // #11542
+        TEST_CASE(memcpy2);
 
         TEST_CASE(isAutoDealloc);
 
@@ -114,6 +85,10 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(deallocuse10);
         TEST_CASE(deallocuse11); // #8302
         TEST_CASE(deallocuse12);
+        TEST_CASE(deallocuse13);
+        TEST_CASE(deallocuse14);
+        TEST_CASE(deallocuse15);
+        TEST_CASE(deallocuse16); // #8109: delete with comma operator
 
         TEST_CASE(doublefree1);
         TEST_CASE(doublefree2);
@@ -129,11 +104,17 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(doublefree12); // #10502
         TEST_CASE(doublefree13); // #11008
         TEST_CASE(doublefree14); // #9708
+        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);
         TEST_CASE(exit2);
         TEST_CASE(exit3);
+        TEST_CASE(exit4);
 
         // handling function calls
         TEST_CASE(functioncall1);
@@ -172,6 +153,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(ifelse26);
         TEST_CASE(ifelse27);
         TEST_CASE(ifelse28); // #11038
+        TEST_CASE(ifelse29);
 
         // switch
         TEST_CASE(switch1);
@@ -197,6 +179,9 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(return8);
         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);
@@ -230,35 +215,33 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(functionCallLeakIgnoreConfig); // #7923
     }
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool cpp = false, const Settings *s = nullptr) {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        bool cpp = false;
+        const Settings *s = nullptr;
+    };
 
-        const Settings settings1 = settingsBuilder(s ? *s : settings).checkLibrary().build();
+#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 = options.s ? *options.s : settings;
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, cpp ? "test.cpp" : "test.c"), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings1, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
-    void check_(const char* file, int line, const char code[], const Settings & s) {
-        // Clear the error buffer..
-        errout.str("");
-
-        const Settings settings0 = settingsBuilder(s).checkLibrary().build();
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const Settings & s) {
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(s, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings0, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void assign1() {
@@ -267,7 +250,7 @@ class TestLeakAutoVar : public TestFixture {
               "    p = NULL;\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign2() {
@@ -276,7 +259,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *q = p;\n"
               "    free(q);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign3() {
@@ -285,7 +268,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *q = p + 1;\n"
               "    free(q - 1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign4() {
@@ -294,7 +277,7 @@ class TestLeakAutoVar : public TestFixture {
               "    a += 10;\n"
               "    free(a - 10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign5() {
@@ -303,7 +286,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = new char[100];\n"
               "    list += p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign6() { // #2806 - FP when there is redundant assignment
@@ -312,7 +295,7 @@ class TestLeakAutoVar : public TestFixture {
               "    p = strcpy(p,q);\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign7() {
@@ -320,7 +303,7 @@ class TestLeakAutoVar : public TestFixture {
               "    struct str *p = malloc(10);\n"
               "    d->p = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign8() {  // linux list
@@ -328,7 +311,7 @@ class TestLeakAutoVar : public TestFixture {
               "    struct str *p = malloc(10);\n"
               "    d->p = &p->x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign9() {
@@ -337,7 +320,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    p = NULL;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign10() {
@@ -347,7 +330,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!x) { p = NULL; }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign11() { // #3942 - FP for x = a(b(p));
@@ -355,7 +338,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    x = a(b(p));\n"
               "}");
-        ASSERT_EQUALS("[test.c:4]: (information) --check-library: Function b() should have <use>/<leak-ignore> configuration\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:1]: (information) --check-library: Function b() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
     void assign12() { // #4236: FP. bar(&x)
@@ -365,7 +348,7 @@ class TestLeakAutoVar : public TestFixture {
               "    bar(&p);\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign13() { // #4237: FP. char *&ref=p; p=malloc(10); free(ref);
@@ -374,8 +357,8 @@ class TestLeakAutoVar : public TestFixture {
               "    char * &ref = p;\n"
               "    p = malloc(10);\n"
               "    free(ref);\n"
-              "}", /*cpp*/ true);
-        TODO_ASSERT_EQUALS("", "[test.cpp:6]: (error) Memory leak: p\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        TODO_ASSERT_EQUALS("", "[test.cpp:6:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign14() {
@@ -383,13 +366,13 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p;\n"
               "    if (x && (p = malloc(10))) { }"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:35]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f(int x) {\n"
               "    char *p;\n"
               "    if (x && (p = new char[10])) { }"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: p\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:37]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign15() {
@@ -401,7 +384,7 @@ class TestLeakAutoVar : public TestFixture {
               "   p = malloc(sizeof *p);\n"
               "   free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign16() {
@@ -410,19 +393,19 @@ class TestLeakAutoVar : public TestFixture {
               "   free(p);\n"
               "   if (p=dostuff()) *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign17() { // #9047
         check("void f() {\n"
               "    char *p = (char*)malloc(10);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign18() {
@@ -430,13 +413,13 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p;\n"
               "    if (x && (p = (char*)malloc(10))) { }"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:42]: (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]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:48]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign19() {
@@ -444,38 +427,46 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    free((void*)p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign20() { // #9187
         check("void f() {\n"
               "    char *p = static_cast<int>(malloc(10));\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: p\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
-    void assign21() { // #10186
-        check("void f(int **x) {\n"
+    void assign21() {
+        check("void f(int **x) {\n" // #10186
               "    void *p = malloc(10);\n"
               "    *x = (int*)p;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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));
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: s [memleak]\n", errout_str());
     }
 
     void assign22() { // #9139
+        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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Resource leak: fd\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: p\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void assign23() {
-        const Settings s = settingsBuilder(settings).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"
@@ -492,22 +483,22 @@ class TestLeakAutoVar : public TestFixture {
               "    ((*&n12)) = open(\"xx.log\", O_RDONLY);\n"
               "    *(&(*&n13)) = open(\"xx.log\", O_RDONLY);\n"
               "    ((*&(*&n14))) = open(\"xx.log\", O_RDONLY);\n"
-              "}\n", true, &s);
-        ASSERT_EQUALS("[test.cpp:17]: (error) Resource leak: n1\n"
-                      "[test.cpp:17]: (error) Resource leak: n2\n"
-                      "[test.cpp:17]: (error) Resource leak: n3\n"
-                      "[test.cpp:17]: (error) Resource leak: n4\n"
-                      "[test.cpp:17]: (error) Resource leak: n5\n"
-                      "[test.cpp:17]: (error) Resource leak: n6\n"
-                      "[test.cpp:17]: (error) Resource leak: n7\n"
-                      "[test.cpp:17]: (error) Resource leak: n8\n"
-                      "[test.cpp:17]: (error) Resource leak: n9\n"
-                      "[test.cpp:17]: (error) Resource leak: n10\n"
-                      "[test.cpp:17]: (error) Resource leak: n11\n"
-                      "[test.cpp:17]: (error) Resource leak: n12\n"
-                      "[test.cpp:17]: (error) Resource leak: n13\n"
-                      "[test.cpp:17]: (error) Resource leak: n14\n",
-                      errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true, $.s = &s));
+        ASSERT_EQUALS("[test.cpp:17:1]: (error) Resource leak: n1 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n2 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n3 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n4 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n5 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n6 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n7 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n8 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n9 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n10 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n11 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n12 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n13 [resourceLeak]\n"
+                      "[test.cpp:17:1]: (error) Resource leak: n14 [resourceLeak]\n",
+                      errout_str());
     }
 
     void assign24() {
@@ -515,80 +506,174 @@ class TestLeakAutoVar : public TestFixture {
               "    char* data = new char[100];\n"
               "    char** dataPtr = &data;\n"
               "    delete[] *dataPtr;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* data = new char[100];\n"
               "    char** dataPtr = &data;\n"
               "    printf(\"test\");\n"
               "    delete[] *dataPtr;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #9279
               "    int* p = new int;\n"
               "    *p = 42;\n"
               "    g();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("[test.cpp:4]: (information) --check-library: Function g() should have <noreturn> configuration\n",
-                      errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:4:8]: (information) --check-library: Function g() should have <noreturn> configuration [checkLibraryNoReturn]\n",
+                      errout_str());
 
         check("void g();\n"
               "void f() {\n"
               "    int* p = new int;\n"
               "    *p = 42;\n"
               "    g();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("[test.cpp:6]: (error) Memory leak: p\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:6:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void g() {}\n"
               "void f() {\n"
               "    int* p = new int;\n"
               "    *p = 42;\n"
               "    g();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("[test.cpp:6]: (error) Memory leak: p\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:6:1]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("[[noreturn]] void g();\n"
               "void f() {\n"
               "    int* p = new int;\n"
               "    *p = 42;\n"
               "    g();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void g() { exit(1); }\n"
               "void f() {\n"
               "    int* p = new int;\n"
               "    *p = 42;\n"
               "    g();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void g() {}\n" // #10517
               "void f() {\n"
               "    char* p = malloc(10);\n"
               "    g();\n"
               "}\n");
-        ASSERT_EQUALS("[test.c:5]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:5:1]: (error) Memory leak: p [memleak]\n", errout_str());
+    }
+
+    void assign25() {
+        check("void f() {\n" // #11796
+              "    int* p{ new int };\n"
+              "    int* q(new int);\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());
+
+        check("struct S : B {\n" // #12239
+              "    void f();\n"
+              "    void g();\n"
+              "};\n"
+              "void S::f() {\n"
+              "    FD* fd(new FD(this));\n"
+              "    fd->exec();\n"
+              "}\n"
+              "void S::g() {\n"
+              "    FD* fd{ new FD(this) };\n"
+              "    fd->exec();\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct C {\n" // #12327
+              "    char* m_p;\n"
+              "    C(char* p) : m_p(p) {}\n"
+              "};\n"
+              "std::list<C> gli;\n"
+              "void f() {\n"
+              "    std::list<C> li;\n"
+              "    char* p = new char[1];\n"
+              "    C c(p);\n"
+              "    li.push_back(c);\n"
+              "    C c2(li.front());\n"
+              "    delete[] c2.m_p;\n"
+              "}\n"
+              "void g() {\n"
+              "    char* p = new char[1];\n"
+              "    C c(p);\n"
+              "    gli.push_back(c);\n"
+              "}\n"
+              "void h() {\n"
+              "    std::list<C> li;\n"
+              "    char* p = new char[1];\n"
+              "    C c(p);\n"
+              "    li.push_back(c);\n"
+              "    delete[] li.front().m_p;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12890
+              "    int** p;\n"
+              "    S() {\n"
+              "        p = std::malloc(sizeof(int*));\n"
+              "        p[0] = new int;\n"
+              "    }\n"
+              "    ~S() {\n"
+              "        delete p[0];\n"
+              "        std::free(p);\n"
+              "    }\n"
+              "};\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void assign26() {
+        check("void f(int*& x) {\n" // #8235
+              "    int* p = (int*)malloc(10);\n"
+              "    x = p ? p : nullptr;\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));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void memcpy1() { // #11542
+        check("void f(char** old, char* value) {\n"
+              "    char *str = strdup(value);\n"
+              "    memcpy(old, &str, sizeof(char*));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void memcpy2() {
+        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));
+        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];"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Memory leak: p\n", errout.str());
+              "}", 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;"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::string *str = new std::string;"
-              "}", true);
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (error) Memory leak: str\n", "", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:2:40]: (error) Memory leak: str [memleak]\n", errout_str());
 
         check("class TestType {\n" // #9028
               "public:\n"
@@ -596,14 +681,33 @@ class TestLeakAutoVar : public TestFixture {
               "};\n"
               "void f() {\n"
               "    TestType *tt = new TestType();\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:7]: (error) Memory leak: tt\n", errout.str());
+              "}", 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"
-              "}", /*cpp*/ true);
-        ASSERT_EQUALS("[test.cpp:4]: (information) --check-library: Function Foo() should have <use>/<leak-ignore> configuration\n", errout.str());
+              "}", 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"
+              "    class D : public B {};\n"
+              "    void g() {\n"
+              "        auto d = new D();\n"
+              "        if (d) {}\n"
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:6:1]: (error) Memory leak: d [memleak]\n", errout_str());
+
+        check("struct S {\n" // #12354
+              "    int i{};\n"
+              "    void f();\n"
+              "};\n"
+              "void f(S* p, bool b) {\n"
+              "    if (b)\n"
+              "        p = new S();\n"
+              "    p->f();\n"
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:9:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void realloc1() {
@@ -612,7 +716,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *q = realloc(p, 20);\n"
               "    free(q)\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc2() {
@@ -620,7 +724,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *p = malloc(10);\n"
               "    void *q = realloc(p, 20);\n"
               "}");
-        ASSERT_EQUALS("[test.c:4]: (error) Memory leak: q\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
     void realloc3() {
@@ -628,7 +732,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    char *q = (char*) realloc(p, 20);\n"
               "}");
-        ASSERT_EQUALS("[test.c:4]: (error) Memory leak: q\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
     void realloc4() {
@@ -637,7 +741,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (q == NULL)\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("[test.c:5]: (error) Memory leak: q\n", errout.str());
+        ASSERT_EQUALS("[test.c:5:1]: (error) Memory leak: q [memleak]\n", errout_str());
     }
 
     void realloc5() {
@@ -648,7 +752,7 @@ class TestLeakAutoVar : public TestFixture {
               "        free(ptr);\n"
               "    return datap;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9990
         check("void f() {\n"
@@ -662,7 +766,7 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    free(p2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void freopen1() {
@@ -671,7 +775,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *q = freopen(name, b, p);\n"
               "    fclose(q)\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void freopen2() {
@@ -679,7 +783,7 @@ class TestLeakAutoVar : public TestFixture {
               "    void *p = fopen(name,a);\n"
               "    void *q = freopen(name, b, p);\n"
               "}");
-        ASSERT_EQUALS("[test.c:4]: (error) Resource leak: q\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:1]: (error) Resource leak: q [resourceLeak]\n", errout_str());
     }
 
     void deallocuse1() {
@@ -687,13 +791,13 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Dereferencing 'p' after it is deallocated / released\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Dereferencing 'p' after it is deallocated / released\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:15]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
     void deallocuse3() {
@@ -701,7 +805,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    p = p->next;\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Dereferencing 'p' after it is deallocated / released\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:9]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
     void deallocuse4() {
@@ -709,25 +813,25 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    return p;\n"
               "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:3]: (error) Returning/dereferencing 'p' after it is deallocated / released\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) delete p;\n"
               "  return p;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p) {\n"
               "  if (!p) delete [] p;\n"
               "  return p;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void* p) {\n"
               "   if (a) {\n"
@@ -737,7 +841,7 @@ class TestLeakAutoVar : public TestFixture {
               "   g(p);\n"
               "   return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocuse5() {  // #4018
@@ -745,7 +849,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p), p = 0;\n"
               "    *p = 0;\n"  // <- Make sure pointer info is reset. It is NOT a freed pointer dereference
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocuse6() {  // #4034
@@ -753,7 +857,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    x = p = foo();\n"  // <- p is not dereferenced
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocuse7() {  // #6467, #6469, #6473, #6648
@@ -761,15 +865,15 @@ class TestLeakAutoVar : public TestFixture {
               "void f(Foo* foo) {\n"
               "    delete foo->ptr;\n"
               "    foo->ptr = new Foo;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Dereferencing 'ptr' after it is deallocated / released\n", "", errout.str());
+              "}", 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"
               "    struct Buf {\n"
@@ -777,8 +881,8 @@ class TestLeakAutoVar : public TestFixture {
               "        ~Buf() { delete[]m_buf; }\n"
               "        uint8_t *m_buf;\n"
               "    };\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {\n"
               "    Foo();\n"
@@ -789,15 +893,15 @@ class TestLeakAutoVar : public TestFixture {
               "    delete foo->ptr;\n"
               "    foo->ptr = new Foo;\n"
               "    foo->ptr->func();\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocuse8() {  // #1765
@@ -805,8 +909,8 @@ class TestLeakAutoVar : public TestFixture {
               "    int *ptr = new int;\n"
               "    delete(ptr);\n"
               "    *ptr = 0;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Dereferencing 'ptr' after it is deallocated / released\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Dereferencing 'ptr' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
     void deallocuse9() {
@@ -814,8 +918,8 @@ class TestLeakAutoVar : public TestFixture {
               "  std::shared_ptr<Type> sp(p);\n"
               "  bool b = p->foo();\n"
               "  return b;\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n" // #8635
               "    std::vector<std::unique_ptr<A>> array_;\n"
@@ -824,8 +928,8 @@ class TestLeakAutoVar : public TestFixture {
               "        array_.push_back(std::unique_ptr<A>(a));\n"
               "        return a;\n"
               "    }\n"
-              "};\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "};\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int g(int *p) {\n" // #9838
               "    std::unique_ptr<int> temp(p);\n"
@@ -833,8 +937,8 @@ class TestLeakAutoVar : public TestFixture {
               "}\n"
               "int f() {\n"
               "    return g(new int(3));\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocuse10() {
@@ -842,13 +946,13 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    p[0] = 10;\n"
               "}\n");
-        ASSERT_EQUALS("[test.c:3]: (error) Dereferencing 'p' after it is deallocated / released\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:5]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n", errout_str());
 
         check("int f(int* p) {\n"
               "    free(p);\n"
               "    return p[1];\n"
               "}\n");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:3]: (error) Returning/dereferencing 'p' after it is deallocated / released\n", errout.str());
+        ASSERT_EQUALS("[test.c:2:5] -> [test.c:3:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n", errout_str());
     }
 
     void deallocuse11() { // #8302
@@ -856,15 +960,15 @@ class TestLeakAutoVar : public TestFixture {
               "  int *array = new int[42];\n"
               "  delete [] array;\n"
               "  return array[1];" // <<
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Returning/dereferencing 'array' after it is deallocated / released\n", errout.str());
+              "}", 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];" // <<
               "}");
-        ASSERT_EQUALS("[test.c:3] -> [test.c:4]: (error) Returning/dereferencing 'array' after it is deallocated / released\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:3] -> [test.c:4:3]: (error) Returning/dereferencing 'array' after it is deallocated / released [deallocret]\n", errout_str());
     }
 
     void deallocuse12() {
@@ -875,7 +979,134 @@ class TestLeakAutoVar : public TestFixture {
               "void f2(struct foo *f, int *out) {\n"
               "  *out = f->x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void deallocuse13() {
+        check("void f() {\n" // #9695
+              "    auto* a = new int[2];\n"
+              "    delete[] a;\n"
+              "    a[1] = 0;\n"
+              "    auto* b = static_cast<int*>(malloc(8));\n"
+              "    free(b);\n"
+              "    b[1] = 0;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Dereferencing 'a' after it is deallocated / released [deallocuse]\n"
+                      "[test.cpp:7:5]: (error) Dereferencing 'b' after it is deallocated / released [deallocuse]\n",
+                      errout_str());
+    }
+
+    void deallocuse14() {
+        check("struct S { void f(); };\n" // #10905
+              "void g() {\n"
+              "    S* s = new S;\n"
+              "    delete s;\n"
+              "    s->f();\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Dereferencing 's' after it is deallocated / released [deallocuse]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    int *p = (int*)malloc(4);\n"
+              "    free(p);\n"
+              "    if (*p == 5) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:10]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n",
+                      errout_str());
+
+        check("int g(int);\n"
+              "void f(int* p) {\n"
+              "    free(p);\n"
+              "    g(*p);\n"
+              "}\n"
+              "int h(int* p) {\n"
+              "    free(p);\n"
+              "    return g(*p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:8]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n"
+                      "[test.c:7:5] -> [test.c:8:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n",
+                      errout_str());
+
+        check("int g(int);\n"
+              "void f(int* p) {\n"
+              "    free(p);\n"
+              "    g(1 + *p);\n"
+              "}\n"
+              "int h(int* p) {\n"
+              "    free(p);\n"
+              "    return g(1 + *p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:12]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n"
+                      "[test.c:7:5] -> [test.c:8:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n",
+                      errout_str());
+
+        check("int g(int, int);\n"
+              "void f(int* p) {\n"
+              "    free(p);\n"
+              "    g(0, 1 + *p);\n"
+              "}\n"
+              "int h(int* p) {\n"
+              "    free(p);\n"
+              "    return g(0, 1 + *p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:4:15]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n"
+                      "[test.c:7:5] -> [test.c:8:5]: (error) Returning/dereferencing 'p' after it is deallocated / released [deallocret]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    FOREACH(callables, ());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:2:27]: (information) --check-library: Function FOREACH() should have <noreturn> configuration [checkLibraryNoReturn]\n", errout_str()); // don't crash
+
+        check("int f() {\n" // #12321
+              "    std::invoke([](int i) {\n"
+              "        int* p = (int*)malloc(4);\n"
+              "        *p = 0;\n"
+              "        if (i) {\n"
+              "            free(p);\n"
+              "            return;\n"
+              "        }\n"
+              "        free(p);\n"
+              "    }, 1);\n"
+              "    return 0;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void deallocuse15() {
+        check("bool FileExists(const char* filename) {\n" // #12490
+              "    FILE* f = fopen(filename, \"rb\");\n"
+              "    if (f) fclose(f);\n"
+              "    return f;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f() {\n" // #12590
+              "    FILE* fd = fopen(\"/foo/bar\", \"w\");\n"
+              "    if (fd == nullptr)\n"
+              "        return false;\n"
+              "    return fclose(fd) == 0;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(const char* fileName) {\n" // #13136
+              "    FILE* h = fopen(fileName, \"rb\");\n"
+              "    if (fseek(h, 0L, SEEK_END) == -1)\n"
+              "        fclose(h);\n"
+              "    int i = ftell(h);\n"
+              "    return i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:5:19]: (error) Dereferencing 'h' after it is deallocated / released [deallocuse]\n", errout_str());
+    }
+
+    void deallocuse16() {
+        check("void f() {\n"
+              "    int *a = nullptr;\n"
+              "    int *c = new int;\n"
+              "    delete (a, c);\n"
+              "    *c = 10;\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:5:6]: (error) Dereferencing 'c' after it is deallocated / released [deallocuse]\n", errout_str());
     }
 
     void doublefree1() {  // #3895
@@ -886,35 +1117,35 @@ class TestLeakAutoVar : public TestFixture {
               "        p = 0;\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3] -> [test.c:6]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        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"
             "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:3]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        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"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo() {\n"
             "  free(p);\n"
             "  free(r);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  if (x < 3) free(p);\n"
             "  else { if (x > 9) free(p); }\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
@@ -922,7 +1153,7 @@ class TestLeakAutoVar : public TestFixture {
             "  getNext(&p);\n"
             "  free(p);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
@@ -930,7 +1161,7 @@ class TestLeakAutoVar : public TestFixture {
             "  bar();\n"
             "  free(p);\n"
             "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:4]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void foo(char *p) {\n"
@@ -938,28 +1169,30 @@ class TestLeakAutoVar : public TestFixture {
             "  printf(\"Freed memory at location %x\", p);\n"
             "  free(p);\n"
             "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:4]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        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());
 
         check(
             "void foo(FILE *p) {\n"
             "  fclose(p);\n"
             "  fclose(p);\n"
             "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:3]: (error) Resource handle 'p' freed twice.\n", errout.str());
+        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"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(FILE *p) {\n"
             "  if (x < 3) fclose(p);\n"
             "  else { if (x > 9) fclose(p); }\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(FILE *p) {\n"
@@ -967,7 +1200,7 @@ class TestLeakAutoVar : public TestFixture {
             "  gethandle(&p);\n"
             "  fclose(p);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(FILE *p) {\n"
@@ -975,14 +1208,14 @@ class TestLeakAutoVar : public TestFixture {
             "  gethandle();\n"
             "  fclose(p);\n"
             "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:4]: (error) Resource handle 'p' freed twice.\n", errout.str());
+        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"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void f() {\n"
@@ -993,7 +1226,7 @@ class TestLeakAutoVar : public TestFixture {
             "    }\n"
             "    free(p);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void f() {\n"
@@ -1004,7 +1237,7 @@ class TestLeakAutoVar : public TestFixture {
             "    }\n"
             "    free(p);\n"
             "}");
-        ASSERT_EQUALS("[test.c:4] -> [test.c:7]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:9] -> [test.c:7:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void f() {\n"
@@ -1013,81 +1246,81 @@ class TestLeakAutoVar : public TestFixture {
             "    p = do_something();\n"
             "    free(p);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete p;\n"
             "  delete p;\n"
-            "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+            "}", 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"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(P p) {\n"
             "  delete p.x;\n"
             "  delete p;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char **p) {\n"
             "  delete p[0];\n"
             "  delete p[1];\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete p;\n"
             "  getNext(&p);\n"
             "  delete p;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete p;\n"
             "  bar();\n"
             "  delete p;\n"
-            "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+            "}", 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"
-            "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+            "}", 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"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete[] p;\n"
             "  getNext(&p);\n"
             "  delete[] p;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(char *p) {\n"
             "  delete[] p;\n"
             "  bar();\n"
             "  delete[] p;\n"
-            "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+            "}", 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(
             "LineMarker::~LineMarker() {\n"
@@ -1097,8 +1330,8 @@ class TestLeakAutoVar : public TestFixture {
             "  delete pxpm;\n"
             "  pxpm = NULL;\n"
             "  return *this;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo()\n"
@@ -1114,8 +1347,8 @@ class TestLeakAutoVar : public TestFixture {
             "      throw;\n"
             "    }\n"
             "  delete ptr;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "int foo()\n"
@@ -1130,8 +1363,8 @@ class TestLeakAutoVar : public TestFixture {
             "   if(doDelete)\n"
             "       delete a;\n"
             "   return 0;\n"
-            "}", true);
-        TODO_ASSERT_EQUALS("", "[test.cpp:8] -> [test.cpp:11]: (error) Memory pointed to by 'a' is freed twice.\n", errout.str());
+            "}", 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(
             "void foo(int y)\n"
@@ -1144,8 +1377,8 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(int y)\n"
@@ -1156,8 +1389,8 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", true);
-        TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
             "void foo(int y)\n"
@@ -1168,8 +1401,8 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", true);
-        TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
             "void foo(int y)\n"
@@ -1181,7 +1414,7 @@ class TestLeakAutoVar : public TestFixture {
             "    }\n"
             "    free(x);\n"
             "}");
-        TODO_ASSERT_EQUALS("[test.c:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.c:8]: (error) Memory pointed to by 'x' is freed twice.\n", "", errout_str());
 
         check(
             "void foo(int y)\n"
@@ -1194,8 +1427,8 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    }\n"
             "    delete[] x;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void foo(int y)\n"
@@ -1208,8 +1441,8 @@ class TestLeakAutoVar : public TestFixture {
             "        delete[] x;\n"
             "    } while (true);\n"
             "    delete[] x;\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void f()\n"
@@ -1221,7 +1454,7 @@ class TestLeakAutoVar : public TestFixture {
             "    }\n"
             "    free(p);\n"
             "}");
-        ASSERT_EQUALS("[test.c:6] -> [test.c:8]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        ASSERT_EQUALS("[test.c:6:9] -> [test.c:8:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
 
         check(
             "void MyFunction()\n"
@@ -1241,8 +1474,8 @@ class TestLeakAutoVar : public TestFixture {
             "void MyThrow(err)\n"
             "{\n"
             "    throw(err);\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "void MyFunction()\n"
@@ -1262,8 +1495,8 @@ class TestLeakAutoVar : public TestFixture {
             "void MyExit(err)\n"
             "{\n"
             "    exit(err);\n"
-            "}", true);
-        ASSERT_EQUALS("", errout.str());
+            "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check( // #6252
             "struct Wrapper {\n"
@@ -1277,15 +1510,15 @@ class TestLeakAutoVar : public TestFixture {
             "        delete m_thing;\n"
             "        m_thing = new Thing;\n"
             "    }\n"
-            "};", true);
-        ASSERT_EQUALS("", errout.str());
+            "};", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #7401
         check("void pCodeLabelDestruct(pCode *pc) {\n"
               "    free(PCL(pc)->label);\n"
               "    free(pc);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree2() {  // #3891
@@ -1295,7 +1528,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree3() {  // #4914
@@ -1313,7 +1546,7 @@ class TestLeakAutoVar : public TestFixture {
               "   return;"
               "}"
               );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree4() {
@@ -1324,7 +1557,7 @@ class TestLeakAutoVar : public TestFixture {
               "  }\n"
               "  free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void* p, int i) {\n" // #11391
               "    if (i)\n"
@@ -1335,7 +1568,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    exit(1);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree5() {  // #5522
@@ -1344,15 +1577,15 @@ class TestLeakAutoVar : public TestFixture {
               "  x = (q == p);\n"
               "  free(p);\n"
               "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:4]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        ASSERT_EQUALS("[test.c:2:3] -> [test.c:4:3]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
     }
 
     void doublefree6() { // #7685
         check("void do_wordexp(FILE *f) {\n"
               "  free(getword(f));\n"
               "  fclose(f);\n"
-              "}", /*cpp=*/ false);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree7() {
@@ -1361,14 +1594,14 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x && (p = malloc(10)))\n"
               "        free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
-              "}");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree8() {
@@ -1376,59 +1609,59 @@ class TestLeakAutoVar : public TestFixture {
               "    int * i = new int;\n"
               "    std::unique_ptr<int> x(i);\n"
               "    delete i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:4:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         check("void f() {\n"
               "    int * i = new int;\n"
               "    delete i;\n"
               "    std::unique_ptr<int> x(i);\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:4:28]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         check("void f() {\n"
               "    int * i = new int;\n"
               "    std::unique_ptr<int> x{i};\n"
               "    delete i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:4:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         check("void f() {\n"
               "    int * i = new int;\n"
               "    std::shared_ptr<int> x(i);\n"
               "    delete i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:4:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         check("void f() {\n"
               "    int * i = new int;\n"
               "    std::shared_ptr<int> x{i};\n"
               "    delete i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:4:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         // Check for use-after-free FP
         check("void f() {\n"
               "    int * i = new int;\n"
               "    std::shared_ptr<int> x{i};\n"
               "    *i = 123;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int * i = new int[1];\n"
               "    std::unique_ptr<int[]> x(i);\n"
               "    delete i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:4:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
 
         check("using namespace std;\n" // #9708
               "void f() {\n"
               "    int* i = new int;\n"
               "    unique_ptr<int> x(i);\n"
               "    delete i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:5:12]: (error) Memory pointed to by 'i' is freed twice. [doubleFree]\n", errout_str());
     }
 
     void doublefree9() {
@@ -1438,8 +1671,8 @@ class TestLeakAutoVar : public TestFixture {
               "void f(foo* b) {\n"
               "    std::unique_ptr<int> x(b->get(0));\n"
               "    std::unique_ptr<int> y(b->get(1));\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree10() {
@@ -1452,8 +1685,8 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    if (p != NULL)\n"
               "        free(p);\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char* s) {\n"
               "    char *p = malloc(strlen(s));\n"
@@ -1464,8 +1697,8 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    if (p != NULL)\n"
               "        free(p);\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree11() {
@@ -1479,9 +1712,9 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    if (q == NULL)\n"
               "        return;\n"
-              "    free(q)\n"
+              "    free(q);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3] -> [test.c:8]: (error) Memory pointed to by 'p' is freed twice.\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:16] -> [test.c:8:5]: (error) Memory pointed to by 'p' is freed twice. [doubleFree]\n", errout_str());
     }
 
     void doublefree12() { // #10502
@@ -1491,7 +1724,7 @@ class TestLeakAutoVar : public TestFixture {
               "    fclose(fp);\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree13() { // #11008
@@ -1505,7 +1738,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(buf.ptr);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree14() { // #9708
@@ -1516,8 +1749,8 @@ class TestLeakAutoVar : public TestFixture {
               "    int *i = new int;\n"
               "    unique_ptr<int> x(i);\n"
               "    delete i;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:7]: (error) Memory pointed to by 'i' is freed twice.\n", errout.str());
+              "}", 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"
               " \n"
@@ -1525,8 +1758,69 @@ class TestLeakAutoVar : public TestFixture {
               "{\n"
               "    int *i = new int;\n"
               "    unique_ptr<int> x(i);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void doublefree16() { // #12236
+        check("void f() {\n"
+              "    FILE* f = fopen(\"abc\", \"r\");\n"
+              "    decltype(fclose(f)) y;\n"
+              "    y = fclose(f);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    FILE *fp = fopen(\"abc\", \"r\");\n"
+              "    if (({\n"
+              "        __typeof__(fclose(fp)) r;\n"
+              "        r = (fclose(fp));\n"
+              "        r;\n"
+              "    })) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void doublefree17() {
+        check("void f() {\n"
+              "    int *a = nullptr;\n"
+              "    int *b = nullptr;\n"
+              "    int *c = new int;\n"
+              "    delete (a, c);\n"
+              "    delete (b, c);\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        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() {
@@ -1534,7 +1828,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    exit(0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void exit2() {
@@ -1542,8 +1836,8 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    fatal_error();\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function fatal_error() should have <noreturn> configuration\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.c:3:18]: (information) --check-library: Function fatal_error() should have <noreturn> configuration [checkLibraryNoReturn]\n",
+                      errout_str());
     }
 
     void exit3() {
@@ -1554,8 +1848,8 @@ class TestLeakAutoVar : public TestFixture {
               "    ::exit(0);\n"
               "  }"
               "  free(p);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  char *p = malloc(100);\n"
@@ -1564,8 +1858,21 @@ class TestLeakAutoVar : public TestFixture {
               "    std::exit(0);\n"
               "  }"
               "  free(p);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void exit4() {
+        check("void __attribute__((__noreturn__)) (*func_notret)(void);\n"
+              "int main(int argc) {\n"
+              "    void* ptr = malloc(1000);\n"
+              "    if (argc == 1) {\n"
+              "        free(ptr);\n"
+              "        func_notret();\n"
+              "    }\n"
+              "    free(ptr);\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void functioncall1() {
@@ -1574,14 +1881,29 @@ class TestLeakAutoVar : public TestFixture {
               "  free(p->x);\n"
               "  p->x = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(s_t s) {\n" // #11061
               "    s->p = (char*)malloc(10);\n"
               "    free((void*)s->p);\n"
               "    s->p = NULL;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        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));
+        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));
+        ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: b [memleak]\n", errout_str());
     }
 
     void goto1() {
@@ -1592,7 +1914,7 @@ class TestLeakAutoVar : public TestFixture {
               "        free(reg);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void goto2() { // #4231
@@ -1605,7 +1927,7 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    return p;\n"  // no error since there is a goto
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void goto3() { // #11431
@@ -1620,7 +1942,7 @@ class TestLeakAutoVar : public TestFixture {
               "err:\n"
               "    (void)0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse1() {
@@ -1630,7 +1952,7 @@ class TestLeakAutoVar : public TestFixture {
               "    else { return 0; }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse2() {
@@ -1639,7 +1961,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    else { return 0; }\n"
               "}");
-        ASSERT_EQUALS("[test.c:5]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:5:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void ifelse3() {
@@ -1648,7 +1970,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!p) { return; }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char * f(size_t size) {"
               "    void *p = malloc(1);"
@@ -1656,14 +1978,14 @@ class TestLeakAutoVar : public TestFixture {
               "        return NULL;"
               "    return p;"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    if (p) { } else { return; }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3866 - UNLIKELY
         check("void f() {\n"
@@ -1671,7 +1993,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (UNLIKELY(!p)) { return; }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse4() {
@@ -1680,7 +2002,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { p = malloc(10); }\n"
               "    if (x) { free(p); }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    char *p;\n"
@@ -1688,7 +2010,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!x) { return; }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse5() {
@@ -1697,7 +2019,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!p && x) { p = malloc(10); }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse6() { // #3370
@@ -1708,7 +2030,7 @@ class TestLeakAutoVar : public TestFixture {
               "    else\n"
               "        a = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.c:6]: (error) Memory leak: a\n", errout.str());
+        ASSERT_EQUALS("[test.c:6:9]: (error) Memory leak: a [memleak]\n", errout_str());
     }
 
     void ifelse7() { // #5576
@@ -1718,7 +2040,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse8() { // #5747
@@ -1728,7 +2050,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return -1;\n"
               "    return fd;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int fd = socket(AF_INET, SOCK_PACKET, 0 );\n"
@@ -1736,7 +2058,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return fd;\n"
               "    return -1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse9() { // #5273
@@ -1746,7 +2068,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse10() { // #8794
@@ -1756,7 +2078,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse11() { // #8365
@@ -1766,7 +2088,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse12() { // #8340
@@ -1774,7 +2096,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if ((*p = malloc(4)) == NULL)\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse13() { // #8392
@@ -1785,7 +2107,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(path);\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int fd, const char *mode) {\n"
               "    char *path;\n"
@@ -1794,7 +2116,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(path);\n"
               "    return 0;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4] memory leak", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:4] memory leak", "", errout_str());
     }
 
     void ifelse14() { // #9130
@@ -1804,7 +2126,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return NULL;\n"
               "    return buf;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse15() { // #9206
@@ -1813,15 +2135,15 @@ class TestLeakAutoVar : public TestFixture {
               "void test_alloc() {\n"
               "   if ( global_ptr = new SSS()) {}\n"
               "   return;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse16() { // #9635
@@ -1832,7 +2154,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "    char *p, q;\n"
@@ -1841,7 +2163,7 @@ class TestLeakAutoVar : public TestFixture {
               "    free(p);\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse17() {
@@ -1851,7 +2173,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return NULL;\n"
               "    return p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int *f() {\n"
               "    int *p = realloc(nullptr, 10);\n"
@@ -1859,7 +2181,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return NULL;\n"
               "    return p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse18() {
@@ -1870,7 +2192,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    free(q);\n"
               "}");
-        ASSERT_EQUALS("[test.c:5]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:5:9]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    void * p = malloc(10);\n"
@@ -1881,7 +2203,7 @@ class TestLeakAutoVar : public TestFixture {
               "    } else\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("[test.c:8]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:8:9]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void ifelse19() {
@@ -1892,7 +2214,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    a = b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse20() {
@@ -1903,8 +2225,8 @@ class TestLeakAutoVar : public TestFixture {
               "        void * p2 = malloc(2);\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p1\n"
-                      "[test.c:5]: (error) Memory leak: p2\n", errout.str());
+        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"
@@ -1912,8 +2234,8 @@ class TestLeakAutoVar : public TestFixture {
               "    else\n"
               "        void * p2 = malloc(2);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p1\n"
-                      "[test.c:5]: (error) Memory leak: p2\n", errout.str());
+        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() {
@@ -1925,7 +2247,7 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("[test.c:6]: (error) Memory leak: p\n",  errout.str());
+        ASSERT_EQUALS("[test.c:6:5]: (error) Memory leak: p [memleak]\n",  errout_str());
     }
 
     void ifelse22() { // #10187
@@ -1935,7 +2257,7 @@ class TestLeakAutoVar : public TestFixture {
               "        return fd;\n"
               "    return -1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(const char * pathname, int flags) {\n"
               "    int fd = socket(pathname, flags);\n"
@@ -1943,18 +2265,18 @@ class TestLeakAutoVar : public TestFixture {
               "        return -1;\n"
               "    return fd;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse23() { // #5473
         check("void f() {\n"
               "    if (FILE* fp = fopen(\"x\", \"r\")) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.c:2]: (error) Resource leak: fp\n", errout.str());
+        ASSERT_EQUALS("[test.c:2:38]: (error) Resource leak: fp [resourceLeak]\n", errout_str());
     }
 
     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"
@@ -1962,17 +2284,17 @@ class TestLeakAutoVar : public TestFixture {
               "    if (NULL == x || NULL == (fp = fopen(temp, \"rt\")))\n"
               "        return;\n"
               "}\n", s);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: temp\n"
-                      "[test.cpp:6]: (error) Memory leak: temp\n"
-                      "[test.cpp:6]: (error) Resource leak: fp\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (error) Memory leak: temp [memleak]\n"
+                      "[test.cpp:6:1]: (error) Memory leak: temp [memleak]\n"
+                      "[test.cpp:6:1]: (error) Resource leak: fp [resourceLeak]\n",
+                      errout_str());
 
         check("FILE* f() {\n"
               "    char* temp = strdup(\"temp.txt\");\n"
               "    FILE* fp = fopen(temp, \"rt\");\n"
               "    return fp;\n"
               "}\n", s);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: temp\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Memory leak: temp [memleak]\n", errout_str());
 
         check("FILE* f() {\n"
               "    char* temp = strdup(\"temp.txt\");\n"
@@ -1980,7 +2302,7 @@ class TestLeakAutoVar : public TestFixture {
               "    fopen_s(&fp, temp, \"rt\");\n"
               "    return fp;\n"
               "}\n", s);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: temp\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Memory leak: temp [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    char* temp = strdup(\"temp.txt\");\n"
@@ -1988,15 +2310,15 @@ class TestLeakAutoVar : public TestFixture {
               "    if (fp)\n"
               "        freopen(temp, \"rt\", fp);\n"
               "}\n", s);
-        ASSERT_EQUALS("[test.cpp:6]: (error) Memory leak: temp\n"
-                      "[test.cpp:6]: (error) Resource leak: fp\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:1]: (error) Memory leak: temp [memleak]\n"
+                      "[test.cpp:6:1]: (error) Resource leak: fp [resourceLeak]\n",
+                      errout_str());
 
         check("FILE* f() {\n"
               "    char* temp = strdup(\"temp.txt\");\n"
               "    return fopen(temp, \"rt\");\n"
               "}\n", s);
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: temp\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: temp\n", "", errout_str());
     }
 
     void ifelse25() { // #9966
@@ -2007,7 +2329,7 @@ class TestLeakAutoVar : public TestFixture {
               "    (void)p;\n"
               "    free(p2);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse26() { // don't crash
@@ -2018,7 +2340,7 @@ class TestLeakAutoVar : public TestFixture {
               "void f(long long val) {\n"
               "    if (val == ({ union tidi d = {.di = {0x0, 0x80000000}}; d.ti; })) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse27() {
@@ -2034,7 +2356,7 @@ class TestLeakAutoVar : public TestFixture {
               "    *handle = key;\n"
               "    return 1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifelse28() { // #11038
@@ -2045,7 +2367,19 @@ class TestLeakAutoVar : public TestFixture {
               "   {  buf = temp;  }\n"
               "   return buf;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void ifelse29() { // #13296
+        check("struct S {\n"
+              "    typedef int (S::* func_t)(int) const;\n"
+              "    void f(func_t pfn);\n"
+              "    int g(int) const;\n"
+              "};\n"
+              "void S::f(func_t pfn) {\n"
+              "    if (pfn == (func_t)&S::g) {}\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str()); // don't crash
     }
 
     void switch1() {
@@ -2057,7 +2391,7 @@ class TestLeakAutoVar : public TestFixture {
               "    }\n"
               "    free(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loop1() {
@@ -2068,7 +2402,7 @@ class TestLeakAutoVar : public TestFixture {
               "    if (x) { free(p) }\n"
               "    else { a = p; }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loop2() {
@@ -2079,7 +2413,7 @@ class TestLeakAutoVar : public TestFixture {
               "        free(p);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(node **p) {\n"
               "    node* n = *p;\n"
@@ -2095,7 +2429,7 @@ class TestLeakAutoVar : public TestFixture {
               "        for (int i = 0; i < 4; ++i) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mismatchAllocDealloc() {
@@ -2103,13 +2437,13 @@ class TestLeakAutoVar : public TestFixture {
               "    FILE*f=fopen(fname,a);\n"
               "    free(f);\n"
               "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:3]: (error) Mismatching allocation and deallocation: f\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:3]: (error) Mismatching allocation and deallocation: f\n", errout.str());
+        ASSERT_EQUALS("[test.c:2:12] -> [test.c:3:5]: (error) Mismatching allocation and deallocation: f [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    char *cPtr = new char[100];\n"
@@ -2118,156 +2452,164 @@ class TestLeakAutoVar : public TestFixture {
               "    delete[] cPtr;\n"
               "    cPtr = new char[100];\n"
               "    delete cPtr;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:7]: (error) Mismatching allocation and deallocation: cPtr\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Mismatching allocation and deallocation: cPtr\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int * i = new int[1];\n"
               "    std::unique_ptr<int> x(i);\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Mismatching allocation and deallocation: i\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:3:28]: (error) Mismatching allocation and deallocation: i [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "    int * i = new int;\n"
               "    std::unique_ptr<int[]> x(i);\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Mismatching allocation and deallocation: i\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:3:30]: (error) Mismatching allocation and deallocation: i [mismatchAllocDealloc]\n", errout_str());
 
         check("void f() {\n"
               "   void* a = malloc(1);\n"
               "   void* b = freopen(f, p, a);\n"
               "   free(b);\n"
               "}");
-        ASSERT_EQUALS("[test.c:2] -> [test.c:3]: (error) Mismatching allocation and deallocation: a\n"
-                      "[test.c:3] -> [test.c:4]: (error) Mismatching allocation and deallocation: b\n", errout.str());
+        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());
 
         check("void f() {\n"
               "   void* a;\n"
               "   void* b = realloc(a, 10);\n"
               "   free(b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int * i = new int;\n"
               "   int * j = realloc(i, 2 * sizeof(int));\n"
               "   delete[] j;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Mismatching allocation and deallocation: i\n"
-                      "[test.cpp:3] -> [test.cpp:4]: (error) Mismatching allocation and deallocation: j\n", errout.str());
+              "}", 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());
 
         check("static void deleter(int* p) { free(p); }\n" // #11392
               "void f() {\n"
               "    if (int* p = static_cast<int*>(malloc(4))) {\n"
               "        std::unique_ptr<int, decltype(&deleter)> guard(p, &deleter);\n"
               "    }\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (int* p = static_cast<int*>(malloc(4))) {\n"
               "        std::unique_ptr<int, decltype(&deleter)> guard(p, &deleter);\n"
               "    }\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
               "    int* a = new int[i] {};\n"
               "    delete[] a;\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void smartPointerDeleter() {
         check("void f() {\n"
               "    FILE*f=fopen(fname,a);\n"
               "    std::unique_ptr<FILE> fp{f};\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Mismatching allocation and deallocation: f\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int * create();\n"
               "void destroy(int * x);\n"
               "void f() {\n"
               "    int x * = create()\n"
               "    std::unique_ptr<int, decltype(&destroy)> xp{x, &destroy()};\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int * create();\n"
               "void destroy(int * x);\n"
               "void f() {\n"
               "    int x * = create()\n"
               "    std::unique_ptr<int, decltype(&destroy)> xp(x, &destroy());\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Mismatching allocation and deallocation: f\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (error) Mismatching allocation and deallocation: f\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct DirDeleter {\n" // #12544
+              "    void operator()(DIR* d) { ::closedir(d); }\n"
+              "};\n"
+              "void openDir(DIR* dir) {\n"
+              "    std::shared_ptr<DIR> dp(dir, DirDeleter());\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:2:44]: (information) --check-library: Function closedir() should have <noreturn> configuration [checkLibraryNoReturn]\n", errout_str()); // don't crash
     }
     void smartPointerRelease() {
         check("void f() {\n"
@@ -2275,15 +2617,15 @@ class TestLeakAutoVar : public TestFixture {
               "    std::unique_ptr<int> x(i);\n"
               "    x.release();\n"
               "    delete i;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int * i = new int;\n"
               "    std::unique_ptr<int> x(i);\n"
               "    x.release();\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: i\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: i [memleak]\n", errout_str());
     }
 
     void return1() {
@@ -2291,7 +2633,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(100);\n"
               "    return 123;\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void return2() {
@@ -2299,7 +2641,7 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(100);\n"
               "    return p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void return3() {
@@ -2307,7 +2649,7 @@ class TestLeakAutoVar : public TestFixture {
               "    struct ABC *abc = malloc(100);\n"
               "    return &abc->dev;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void return4() { // ticket #3862
@@ -2318,8 +2660,8 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    free(p);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
               "    if (x==12) {\n"
@@ -2327,8 +2669,8 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    delete p;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *p, int x) {\n"
               "    if (x==12) {\n"
@@ -2336,8 +2678,8 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 1;\n"
               "    }\n"
               "    delete [] p;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void return5() { // ticket #6397 - conditional allocation/deallocation and conditional return
@@ -2350,94 +2692,94 @@ class TestLeakAutoVar : public TestFixture {
               "        return;\n"
               "    }\n"
               "    *p = 0;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void return6() { // #8282
         check("std::pair<char*, char*> f(size_t n) {\n"
               "   char* p = (char* )malloc(n);\n"
               "   return {p, p};\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void return7() { // #9343
         check("uint8_t *f() {\n"
               "    void *x = malloc(1);\n"
               "    return (uint8_t *)x;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("uint8_t f() {\n"
               "    void *x = malloc(1);\n"
               "    return (uint8_t)x;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: x\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (long long)x;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (void*)(short)x;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: x\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n" // Do not crash
               "    void *x = malloc(1);\n"
               "    return (mytype)y;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: x\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: x [memleak]\n", errout_str());
     }
 
     void return8() {
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (x);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return ((x));\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void* f() {\n"
               "    void *x = malloc(1);\n"
               "    return ((((x))));\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("char* f() {\n"
               "    void *x = malloc(1);\n"
               "    return (char*)(x);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void return9() {
         check("void* f() {\n"
               "    void *x = malloc (sizeof (struct alloc));\n"
               "    return x + sizeof (struct alloc);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void return10() {
@@ -2446,50 +2788,99 @@ class TestLeakAutoVar : public TestFixture {
               "    p[0] = 'x';\n"
               "    return p[0];\n"
               "}");
-        ASSERT_EQUALS("[test.c:4]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:5]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("struct S { int f(); };\n" // #11746
               "int g() {\n"
               "    S* s = new S;\n"
               "    delete s;\n"
               "    return s->f();\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5]: (error) Returning/dereferencing 's' after it is deallocated / released\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (error) Returning/dereferencing 'p' after it is deallocated / released\n", errout.str());
+              "}", 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());
+    }
+
+    void return11() { // #13098
+        check("char malloc_memleak(void) {\n"
+              "    bool flag = false;\n"
+              "    char *ptr = malloc(10);\n"
+              "    if (flag) {\n"
+              "        free(ptr);\n"
+              "    }\n"
+              "    return 'a';\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Memory leak: ptr [memleak]\n", errout_str());
+
+        check("char malloc_memleak(void) {\n"
+              "    bool flag = false;\n"
+              "    char *ptr = malloc(10);\n"
+              "    if (flag) {\n"
+              "        free(ptr);\n"
+              "    }\n"
+              "    return 'a';\n"
+              "}\n");
+        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"
-              "}", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int*& p) {\n" // #4400
               "    p = (int*)malloc(4);\n"
               "    p = (int*)malloc(4);\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: p\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    int* p = (int*)malloc(4);\n"
               "    int*& r = p;\n"
               "    r = (int*)malloc(4);\n"
-              "}\n", /*cpp*/ true);
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: p\n", "", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: p\n", "", errout_str());
 
         check("void f() {\n"
               "    int* p = (int*)malloc(4);\n"
               "    int*& r = p;\n"
               "    free(r);\n"
               "    p = (int*)malloc(4);\n"
-              "}\n", /*cpp*/ true);
-        TODO_ASSERT_EQUALS("", "[test.cpp:6]: (error) Memory leak: p\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        TODO_ASSERT_EQUALS("", "[test.cpp:6:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void test2() { // 3899
@@ -2497,15 +2888,15 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p;\n"
               "    void f1() { free(p); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test3() { // 3954 - reference pointer
         check("void f() {\n"
               "    char *&p = x();\n"
               "    p = malloc(10);\n"
-              "};", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test4() { // 5923 - static pointer
@@ -2514,29 +2905,29 @@ class TestLeakAutoVar : public TestFixture {
               "    if (!p) p = malloc(10);\n"
               "    if (x) { free(p); p = 0; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test5() { // unknown type
-        check("void f() { Fred *p = malloc(10); }", true);
-        ASSERT_EQUALS("[test.cpp:1]: (error) Memory leak: p\n", errout.str());
+        check("void f() { Fred *p = malloc(10); }", 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); }", false);
-        ASSERT_EQUALS("[test.c:1]: (error) Memory leak: p\n", errout.str());
+        check("void f() { Fred *p = malloc(10); }");
+        ASSERT_EQUALS("[test.c:1:34]: (error) Memory leak: p [memleak]\n", errout_str());
 
-        check("void f() { Fred *p = new Fred; }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { Fred *p = new Fred; }", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void f() { Fred fred = malloc(10); }", true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f() { Fred fred = malloc(10); }", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void throw1() { // 3987 - Execution reach a 'throw'
         check("void f() {\n"
               "    char *p = malloc(10);\n"
               "    throw 123;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory leak: p\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Memory leak: p [memleak]\n", errout_str());
 
         check("void f() {\n"
               "    char *p;\n"
@@ -2545,8 +2936,8 @@ class TestLeakAutoVar : public TestFixture {
               "        throw 123;\n"
               "    } catch (...) { }\n"
               "    free(p);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void throw2() { // do not miss ::NS::Except()
@@ -2562,8 +2953,8 @@ class TestLeakAutoVar : public TestFixture {
               "        throw ::NS::Except();\n"
               "    }\n"
               "    delete pi;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void configuration1() {
@@ -2576,15 +2967,15 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    x(p);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function x() should have <noreturn> configuration\n"
-                      "[test.c:4]: (information) --check-library: Function x() should have <use>/<leak-ignore> configuration\n",
-                      errout.str());
+        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());
 
         check("void cb();\n" // #11190, #11523
               "void f() {\n"
               "    cb();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void configuration2() {
@@ -2594,33 +2985,37 @@ class TestLeakAutoVar : public TestFixture {
               "    char *p = malloc(10);\n"
               "    x(&p);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function x() should have <noreturn> configuration\n"
-                      "[test.c:4]: (information) --check-library: Function x() should have <use>/<leak-ignore> configuration\n",
-                      errout.str());
+        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());
     }
 
     void configuration3() {
-        const char * code = "void f() {\n"
-                            "    char *p = malloc(10);\n"
-                            "    if (set_data(p)) { }\n"
-                            "}";
-        check(code);
-        ASSERT_EQUALS("[test.c:4]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration\n", errout.str());
-        check(code, true);
-        ASSERT_EQUALS("[test.cpp:4]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration\n", errout.str());
-
-        code = "void f() {\n"
-               "    char *p = malloc(10);\n"
-               "    if (set_data(p)) { return; }\n"
-               "}";
-        check(code);
-        ASSERT_EQUALS("[test.c:3]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration\n"
-                      "[test.c:4]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration\n"
-                      , errout.str());
-        check(code, true);
-        ASSERT_EQUALS("[test.cpp:3]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration\n"
-                      "[test.cpp:4]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration\n"
-                      , errout.str());
+        {
+            const char code[] = "void f() {\n"
+                                "    char *p = malloc(10);\n"
+                                "    if (set_data(p)) { }\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));
+            ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
+        }
+
+        {
+            const char code[] = "void f() {\n"
+                                "    char *p = malloc(10);\n"
+                                "    if (set_data(p)) { return; }\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"
+                          , errout_str());
+            check(code, dinit(CheckOptions, $.cpp = true));
+            ASSERT_EQUALS("[test.cpp:3:24]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n"
+                          "[test.cpp:4:1]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n"
+                          , errout_str());
+        }
     }
 
     void configuration4() {
@@ -2629,50 +3024,50 @@ class TestLeakAutoVar : public TestFixture {
               "    int ret = set_data(p);\n"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("[test.c:4]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:5]: (information) --check-library: Function set_data() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 
     void configuration5() {
         check("void f() {\n"
               "    int(i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static_assert(1 == sizeof(char), \"test\");\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace pal {\n" // #11237
               "    struct AutoTimer {};\n"
               "}\n"
               "int main() {\n"
               "    pal::AutoTimer();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct AutoTimer {};\n"
               "int main() {\n"
               "    AutoTimer();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #8666
               "    asm(\"assembler code\");\n"
               "    asm volatile(\"assembler code\");\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11239
               "    asm goto(\"assembler code\");\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    FILE* p = fopen(\"abc.txt\", \"r\");\n"
               "    if (fclose(p) != 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S;\n"
               "void f(int a, int b, S*& p) {\n"
@@ -2683,8 +3078,8 @@ class TestLeakAutoVar : public TestFixture {
               "        void* buf = malloc(10);\n"
               "        p = reinterpret_cast<S*>(buf);\n"
               "    }\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Resource leak: file\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Resource leak: file [resourceLeak]\n", errout_str());
     }
 
     void configuration6() {
@@ -2692,42 +3087,42 @@ class TestLeakAutoVar : public TestFixture {
               "void g() {\n"
               "    f();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::function<void()> cb) {\n" // #11189
               "    cb();\n"
               "}\n"
               "void g(void (*cb)()) {\n"
               "    cb();\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ptrptr() {
         check("void f() {\n"
               "    char **p = malloc(10);\n"
               "}");
-        ASSERT_EQUALS("[test.c:3]: (error) Memory leak: p\n", errout.str());
+        ASSERT_EQUALS("[test.c:3:1]: (error) Memory leak: p [memleak]\n", errout_str());
     }
 
     void nestedAllocation() {
         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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4]: (information) --check-library: Function DSMCCPacket() should have <use>/<leak-ignore> configuration\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: dataCopy\n", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4]: (information) --check-library: Function C() should have <use>/<leak-ignore> configuration\n", errout.str());
+              "}", 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());
     }
 
     void testKeywords() {
@@ -2735,8 +3130,8 @@ class TestLeakAutoVar : public TestFixture {
               "  double *new = malloc(1*sizeof(double));\n"
               "  free(new);\n"
               "  return 0;\n"
-              "}", false);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void inlineFunction() {
@@ -2749,7 +3144,7 @@ class TestLeakAutoVar : public TestFixture {
               "    c = malloc(128);\n"
               "    return ret();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #8262
@@ -2759,33 +3154,32 @@ class TestLeakAutoVar : public TestFixture {
               "  int *pt = new int(1);\n"
               "  mList.push_back(std::shared_ptr<int>(pt));\n"
               "}\n",
-              true
+              dinit(CheckOptions, $.cpp = true)
               );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void functionCallCastConfig() { // #9652
-        Settings settingsFunctionCall = settings;
-
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def format=\"2\">\n"
-                               "  <function name=\"free_func\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "    <arg nr=\"1\">\n"
-                               "      <not-uninit/>\n"
-                               "    </arg>\n"
-                               "    <arg nr=\"2\">\n"
-                               "      <not-uninit/>\n"
-                               "    </arg>\n"
-                               "  </function>\n"
-                               "</def>";
-        ASSERT(settingsFunctionCall.library.loadxmldata(xmldata, sizeof(xmldata)));
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def format=\"2\">\n"
+                                   "  <function name=\"free_func\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "    <arg nr=\"1\">\n"
+                                   "      <not-uninit/>\n"
+                                   "    </arg>\n"
+                                   "    <arg nr=\"2\">\n"
+                                   "      <not-uninit/>\n"
+                                   "    </arg>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        const Settings settingsFunctionCall = settingsBuilder(settings).libraryxml(xmldata).build();
+
         check("void test_func()\n"
               "{\n"
               "    char * buf = malloc(4);\n"
               "    free_func((void *)(1), buf);\n"
               "}", settingsFunctionCall);
-        ASSERT_EQUALS("[test.cpp:5]: (information) --check-library: Function free_func() should have <use>/<leak-ignore> configuration\n", errout.str());
+        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"
               "void h(int, void*);\n"
@@ -2796,27 +3190,43 @@ class TestLeakAutoVar : public TestFixture {
               "void f2() {\n"
               "    int* p = new int;\n"
               "    h(1, static_cast<void*>(p));\n"
-              "}\n", /*cpp*/ true);
-        ASSERT_EQUALS("[test.cpp:6]: (information) --check-library: Function g() should have <use>/<leak-ignore> configuration\n"
-                      "[test.cpp:10]: (information) --check-library: Function h() should have <use>/<leak-ignore> configuration\n",
-                      errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:6:1]: (information) --check-library: Function g() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n"
+                      "[test.cpp:10:1]: (information) --check-library: Function h() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n",
+                      errout_str());
     }
 
     void functionCallLeakIgnoreConfig() { // #7923
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def format=\"2\">\n"
-                               "  <function name=\"SomeClass::someMethod\">\n"
-                               "    <leak-ignore/>\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "    <arg nr=\"1\" direction=\"in\"/>\n"
-                               "  </function>\n"
-                               "</def>\n";
-        const Settings settingsLeakIgnore = settingsBuilder(settings).libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def format=\"2\">\n"
+                                   "  <function name=\"SomeClass::someMethod\">\n"
+                                   "    <leak-ignore/>\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "    <arg nr=\"1\" direction=\"in\"/>\n"
+                                   "  </function>\n"
+                                   "</def>\n";
+        const Settings settingsLeakIgnore = settingsBuilder().libraryxml(xmldata).checkLibrary().build();
         check("void f() {\n"
               "    double* a = new double[1024];\n"
               "    SomeClass::someMethod(a);\n"
               "}\n", settingsLeakIgnore);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: a [memleak]\n", errout_str());
+
+        check("void bar(int* p) {\n"
+              "    if (p)\n"
+              "        free(p);\n"
+              "}\n"
+              "void f() {\n"
+              "    int* p = malloc(4);\n"
+              "    bar(p);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int n) {\n"
+              "    char* p = new char[n];\n"
+              "    v.push_back(p);\n"
+              "}\n", dinit(CheckOptions, $.cpp = true));
+        ASSERT_EQUALS("[test.cpp:4:1]: (information) --check-library: Function unknown::push_back() should have <use>/<leak-ignore> configuration [checkLibraryUseIgnore]\n", errout_str());
     }
 };
 
@@ -2829,42 +3239,32 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
 private:
     const Settings settings = settingsBuilder().library("std.cfg").checkLibrary().build();
 
-    void checkP(const char code[], bool cpp = false) {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Raw tokens..
-        std::vector<std::string> files(1, cpp?"test.cpp":"test.c");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+#define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.c");
 
         // Tokenizer..
-        Tokenizer tokenizer(&settings, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(recursiveCountLimit); // #5872 #6157 #9097
     }
 
     void recursiveCountLimit() { // #5872 #6157 #9097
-        ASSERT_THROW(checkP("#define ONE     else 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"
-                            "#define THOU    HUN HUN HUN HUN HUN HUN HUN HUN HUN HUN\n"
-                            "void foo() {\n"
-                            "  if (0) { }\n"
-                            "  THOU THOU\n"
-                            "}"), InternalError);
+        ASSERT_THROW_INTERNAL_EQUALS(checkP("#define ONE     else 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"
+                                            "#define THOU    HUN HUN HUN HUN HUN HUN HUN HUN HUN HUN\n"
+                                            "void foo() {\n"
+                                            "  if (0) { }\n"
+                                            "  THOU THOU\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"
@@ -2876,7 +3276,10 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
     }
 };
 
+#if !defined(__MINGW32__) && !defined(__CYGWIN__)
+// TODO: this crashes with a stack overflow for MinGW and error 2816 for Cygwinin the CI
 REGISTER_TEST(TestLeakAutoVarRecursiveCountLimit)
+#endif
 
 class TestLeakAutoVarStrcpy : public TestFixture {
 public:
@@ -2885,23 +3288,24 @@ class TestLeakAutoVarStrcpy : public TestFixture {
 private:
     const Settings settings = settingsBuilder().library("std.cfg").checkLibrary().build();
 
-    void check_(const char* file, int line, const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(returnedValue); // #9298
         TEST_CASE(deallocuse2);
         TEST_CASE(fclose_false_positive); // #9575
+        TEST_CASE(strcpy_false_negative);
+        TEST_CASE(doubleFree);
+        TEST_CASE(memleak_std_string);
     }
 
     void returnedValue() { // #9298
@@ -2911,7 +3315,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
               "    char* ptr = new char[strlen(str)+1];\n"
               "    m = strcpy(ptr, str);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deallocuse2() {
@@ -2919,20 +3323,64 @@ class TestLeakAutoVarStrcpy : public TestFixture {
               "    free(p);\n"
               "    strcpy(a, p);\n"
               "}");
-        TODO_ASSERT_EQUALS("error (free,use)", "", errout.str());
+        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
+              "    free(p);\n"
+              "    strcpy(p, q);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Dereferencing 'p' after it is deallocated / released [deallocuse]\n",
+                      errout_str());
 
         check("void f(char *p) {\n"   // #3041 - assigning pointer when it's used
               "    free(p);\n"
               "    strcpy(a, p=b());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void fclose_false_positive() { // #9575
         check("int  f(FILE *fp) { return fclose(fp); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
+    void strcpy_false_negative() { // #12289
+        check("void f() {\n"
+              "    char* buf = new char[12];\n"
+              "    strcpy(buf, \"123\");\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:1]: (error) Memory leak: buf [memleak]\n", errout_str());
+    }
+
+    void doubleFree() {
+        check("void f(char* p) {\n"
+              "    free(p);\n"
+              "    printf(\"%s\", p = strdup(\"abc\"));\n"
+              "    free(p);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void memleak_std_string() {
+        check("struct S {\n" // #12354
+              "    std::string s;\n"
+              "    void f();\n"
+              "};\n"
+              "void f(S* p, bool b) {\n"
+              "    if (b)\n"
+              "        p = new S();\n"
+              "    p->f();\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:9:1]: (error) Memory leak: p [memleak]\n", errout_str());
+
+        check("class B { std::string s; };\n" // #12062
+              "class D : public B {};\n"
+              "void g() {\n"
+              "    auto d = new D();\n"
+              "    if (d) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:1]: (error) Memory leak: d [memleak]\n", errout_str());
+    }
 };
 
 REGISTER_TEST(TestLeakAutoVarStrcpy)
@@ -2945,71 +3393,147 @@ class TestLeakAutoVarWindows : public TestFixture {
 private:
     const Settings settings = settingsBuilder().library("windows.cfg").build();
 
-    void check_(const char* file, int line, const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.c"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, false);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(heapDoubleFree);
     }
 
     void heapDoubleFree() {
-        check("void f() {"
-              "  HANDLE MyHeap = HeapCreate(0, 0, 0);"
-              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  HeapFree(MyHeap, 0, a);"
-              "  HeapFree(MyHeap, 0, b);"
-              "  HeapDestroy(MyHeap);"
-              "}");
-        ASSERT_EQUALS("", errout.str());
-
-        check("void f() {"
-              "  int *a = HeapAlloc(GetProcessHeap(), 0, sizeof(int));"
-              "  int *b = HeapAlloc(GetProcessHeap(), 0, sizeof(int));"
-              "  HeapFree(GetProcessHeap(), 0, a);"
-              "  HeapFree(GetProcessHeap(), 0, b);"
-              "}");
-        ASSERT_EQUALS("", errout.str());
-
-        check("void f() {"
-              "  HANDLE MyHeap = HeapCreate(0, 0, 0);"
-              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  HeapFree(MyHeap, 0, a);"
-              "  HeapDestroy(MyHeap);"
-              "}");
-        ASSERT_EQUALS("[test.c:1]: (error) Memory leak: b\n", errout.str());
-
-        check("void f() {"
-              "  HANDLE MyHeap = HeapCreate(0, 0, 0);"
-              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  HeapFree(MyHeap, 0, a);"
-              "  HeapFree(MyHeap, 0, b);"
-              "}");
-        TODO_ASSERT_EQUALS("[test.c:1] (error) Resource leak: MyHeap",
-                           "", errout.str());
-
-        check("void f() {"
-              "  HANDLE MyHeap = HeapCreate(0, 0, 0);"
-              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));"
-              "  HeapFree(MyHeap, 0, a);"
-              "}");
-        TODO_ASSERT_EQUALS("[test.c:1] (error) Memory leak: MyHeap\n"
-                           "[test.c:1] (error) Memory leak: b",
-                           "[test.c:1]: (error) Memory leak: b\n", errout.str());
+        check("void f() {\n"
+              "  HANDLE MyHeap = HeapCreate(0, 0, 0);\n"
+              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  HeapFree(MyHeap, 0, a);\n"
+              "  HeapFree(MyHeap, 0, b);\n"
+              "  HeapDestroy(MyHeap);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "  int *a = HeapAlloc(GetProcessHeap(), 0, sizeof(int))\n"
+              "  int *b = HeapAlloc(GetProcessHeap(), 0, sizeof(int));\n"
+              "  HeapFree(GetProcessHeap(), 0, a);\n"
+              "  HeapFree(GetProcessHeap(), 0, b);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "  HANDLE MyHeap = HeapCreate(0, 0, 0);\n"
+              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  HeapFree(MyHeap, 0, a);\n"
+              "  HeapDestroy(MyHeap);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:7:1]: (error) Memory leak: b [memleak]\n", errout_str());
+
+        check("void f() {\n"
+              "  HANDLE MyHeap = HeapCreate(0, 0, 0);\n"
+              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  HeapFree(MyHeap, 0, a);\n"
+              "  HeapFree(MyHeap, 0, b);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:7:1]: (error) Resource leak: MyHeap [resourceLeak]\n", errout_str());
+
+        check("void f() {\n"
+              "  HANDLE MyHeap = HeapCreate(0, 0, 0);\n"
+              "  int *a = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  int *b = HeapAlloc(MyHeap, 0, sizeof(int));\n"
+              "  HeapFree(MyHeap, 0, a);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:6:1]: (error) Resource leak: MyHeap [resourceLeak]\n"
+                      "[test.c:6:1]: (error) Memory leak: b [memleak]\n",
+                      errout_str());
     }
 };
 
 REGISTER_TEST(TestLeakAutoVarWindows)
+
+class TestLeakAutoVarPosix : public TestFixture {
+public:
+    TestLeakAutoVarPosix() : TestFixture("TestLeakAutoVarPosix") {}
+
+private:
+    const Settings settings = settingsBuilder().library("std.cfg").library("posix.cfg").build();
+
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        // Check for leaks..
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
+    }
+
+    void run() override {
+        mNewTemplate = true;
+        TEST_CASE(memleak_getline);
+        TEST_CASE(deallocuse_fdopen);
+        TEST_CASE(doublefree_fdopen); // #12781
+        TEST_CASE(memleak_open); // #13356
+    }
+
+    void memleak_getline() {
+        check("void f(std::ifstream &is) {\n" // #12297
+              "    std::string str;\n"
+              "    if (getline(is, str, 'x').good()) {};\n"
+              "    if (!getline(is, str, 'x').good()) {};\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void deallocuse_fdopen() {
+        check("struct FileCloser {\n" // #13126
+              "    void operator()(std::FILE * ptr) const {\n"
+              "        std::fclose(ptr);\n"
+              "    }\n"
+              "};\n"
+              "void f(char* fileName) {\n"
+              "    std::unique_ptr<std::FILE, FileCloser> out;\n"
+              "    int fd = mkstemps(fileName, 4);\n"
+              "    if (fd != -1)\n"
+              "        out.reset(fdopen(fd, \"w\"));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void doublefree_fdopen() { // #12781
+        check("void foo(void) {\n"
+              "    int fd;\n"
+              "    FILE *stream;\n"
+              "    fd = open(\"/foo\", O_RDONLY);\n"
+              "    if (fd == -1) return;\n"
+              "    stream = fdopen(fd, \"r\");\n"
+              "    if (!stream) {\n"
+              "        close(fd);\n"
+              "        return;\n"
+              "    }\n"
+              "    fclose(stream);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void memleak_open() { // #13356
+        check("int f() {\n"
+              "    int fd = open(\"abc \", O_RDONLY);\n"
+              "    if (fd > -1) {\n"
+              "        return fd;\n"
+              "    }\n"
+              "    return -1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+};
+
+REGISTER_TEST(TestLeakAutoVarPosix)
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index fe3bd036c4e..a531ac4cba9 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-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
@@ -17,23 +17,21 @@
  */
 
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "library.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
-#include "helpers.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <map>
-#include <sstream> // IWYU pragma: keep
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <tinyxml2.h>
-
 #define ASSERT_EQ(expected, actual)   ASSERT(expected == actual)
 
 class TestLibrary : public TestFixture {
@@ -41,8 +39,6 @@ class TestLibrary : public TestFixture {
     TestLibrary() : TestFixture("TestLibrary") {}
 
 private:
-    const Settings settings;
-
     void run() override {
         TEST_CASE(isCompliantValidationExpression);
         TEST_CASE(empty);
@@ -67,14 +63,12 @@ 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);
-    }
-
-    static bool loadxmldata(Library &lib, const char xmldata[], std::size_t len)
-    {
-        tinyxml2::XMLDocument doc;
-        return (tinyxml2::XML_SUCCESS == doc.Parse(xmldata, len)) && (lib.load(doc).errorcode == Library::ErrorCode::OK);
+        TEST_CASE(loadLibCombinations);
+        TEST_CASE(smartpointer);
     }
 
     void isCompliantValidationExpression() const {
@@ -101,120 +95,121 @@ class TestLibrary : public TestFixture {
 
     void empty() const {
         // Reading an empty library file is considered to be OK
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n<def/>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n<def/>";
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT(library.functions.empty());
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(library.functions().empty());
     }
 
     void function() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "  </function>\n"
-                               "</def>";
-
-        TokenList tokenList(nullptr);
-        std::istringstream istr("foo();");
-        tokenList.createTokens(istr);
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "  </function>\n"
+                                   "</def>";
+
+        const char code[] = "foo();";
+        SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT_EQUALS(library.functions.size(), 1U);
-        ASSERT(library.functions.at("foo").argumentChecks.empty());
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT_EQUALS(library.functions().size(), 1U);
+        ASSERT(library.functions().at("foo").argumentChecks.empty());
         ASSERT(library.isnotnoreturn(tokenList.front()));
     }
 
     void function_match_scope() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <arg nr=\"1\"/>"
-                               "  </function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <arg nr=\"1\"/>"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("fred.foo(123);"); // <- wrong scope, not library function
-            tokenList.createTokens(istr);
+            const char code[] = "fred.foo(123);"; // <- wrong scope, not library function
+            const SimpleTokenList tokenList(code);
 
             ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
         }
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("Fred::foo(123);"); // <- wrong scope, not library function
-            tokenList.createTokens(istr);
+            const char code[] = "Fred::foo(123);"; // <- wrong scope, not library function
+            const SimpleTokenList tokenList(code);
 
             ASSERT(library.isNotLibraryFunction(tokenList.front()->tokAt(2)));
         }
     }
 
     void function_match_args() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <arg nr=\"1\"/>"
-                               "  </function>\n"
-                               "</def>";
-
-        TokenList tokenList(nullptr);
-        std::istringstream istr("foo();"); // <- too few arguments, not library function
-        tokenList.createTokens(istr);
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <arg nr=\"1\"/>"
+                                   "  </function>\n"
+                                   "</def>";
+
+        TokenList tokenList(settingsDefault, Standards::Language::CPP);
+        const char code[] = "foo();"; // <- too few arguments, not library function
+        ASSERT(tokenList.createTokensFromString(code));
         Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
         tokenList.createAst();
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         ASSERT(library.isNotLibraryFunction(tokenList.front()));
     }
 
     void function_match_args_default() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <arg nr=\"1\"/>"
-                               "    <arg nr=\"2\" default=\"0\"/>"
-                               "  </function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <arg nr=\"1\"/>"
+                                   "    <arg nr=\"2\" default=\"0\"/>"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("foo();"); // <- too few arguments, not library function
-            tokenList.createTokens(istr);
+            TokenList tokenList(settingsDefault, Standards::Language::CPP);
+            const char code[] = "foo();"; // <- too few arguments, not library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
             ASSERT(library.isNotLibraryFunction(tokenList.front()));
         }
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("foo(a);"); // <- library function
-            tokenList.createTokens(istr);
+            TokenList tokenList(settingsDefault, Standards::Language::CPP);
+            const char code[] = "foo(a);"; // <- library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
-            ASSERT(!library.isNotLibraryFunction(tokenList.front()));
+            const Library::Function* func = nullptr;
+            ASSERT(!library.isNotLibraryFunction(tokenList.front(), &func));
+            ASSERT(func);
         }
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("foo(a, b);"); // <- library function
-            tokenList.createTokens(istr);
+            TokenList tokenList(settingsDefault, Standards::Language::CPP);
+            const char code[] = "foo(a, b);"; // <- library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
-            ASSERT(!library.isNotLibraryFunction(tokenList.front()));
+            const Library::Function* func = nullptr;
+            ASSERT(!library.isNotLibraryFunction(tokenList.front(), &func));
+            ASSERT(func);
         }
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("foo(a, b, c);"); // <- too much arguments, not library function
-            tokenList.createTokens(istr);
+            TokenList tokenList(settingsDefault, Standards::Language::CPP);
+            const char code[] = "foo(a, b, c);"; // <- too much arguments, not library function
+            ASSERT(tokenList.createTokensFromString(code));
             Token::createMutualLinks(tokenList.front()->next(), tokenList.back()->previous());
             tokenList.createAst();
 
@@ -223,76 +218,75 @@ class TestLibrary : public TestFixture {
     }
 
     void function_match_var() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <arg nr=\"1\"/>"
-                               "  </function>\n"
-                               "</def>";
-
-        TokenList tokenList(nullptr);
-        std::istringstream istr("Fred foo(123);"); // <- Variable declaration, not library function
-        tokenList.createTokens(istr);
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <arg nr=\"1\"/>"
+                                   "  </function>\n"
+                                   "</def>";
+
+        const char code[] = "Fred foo(123);"; // <- Variable declaration, not library function
+        SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
         tokenList.front()->next()->varId(1);
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         ASSERT(library.isNotLibraryFunction(tokenList.front()->next()));
     }
 
     void function_arg() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <arg nr=\"1\"><not-uninit/></arg>\n"
-                               "    <arg nr=\"2\"><not-null/></arg>\n"
-                               "    <arg nr=\"3\"><formatstr/></arg>\n"
-                               "    <arg nr=\"4\"><strz/></arg>\n"
-                               "    <arg nr=\"5\" default=\"0\"><not-bool/></arg>\n"
-                               "  </function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <arg nr=\"1\"><not-uninit/></arg>\n"
+                                   "    <arg nr=\"2\"><not-null/></arg>\n"
+                                   "    <arg nr=\"3\"><formatstr/></arg>\n"
+                                   "    <arg nr=\"4\"><strz/></arg>\n"
+                                   "    <arg nr=\"5\" default=\"0\"><not-bool/></arg>\n"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT_EQUALS(0, library.functions["foo"].argumentChecks[1].notuninit);
-        ASSERT_EQUALS(true, library.functions["foo"].argumentChecks[2].notnull);
-        ASSERT_EQUALS(true, library.functions["foo"].argumentChecks[3].formatstr);
-        ASSERT_EQUALS(true, library.functions["foo"].argumentChecks[4].strz);
-        ASSERT_EQUALS(false, library.functions["foo"].argumentChecks[4].optional);
-        ASSERT_EQUALS(true, library.functions["foo"].argumentChecks[5].notbool);
-        ASSERT_EQUALS(true, library.functions["foo"].argumentChecks[5].optional);
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        const auto& foo_fn_args = library.functions().at("foo").argumentChecks;
+        ASSERT_EQUALS(0, foo_fn_args.at(1).notuninit);
+        ASSERT_EQUALS(true, foo_fn_args.at(2).notnull);
+        ASSERT_EQUALS(true, foo_fn_args.at(3).formatstr);
+        ASSERT_EQUALS(true, foo_fn_args.at(4).strz);
+        ASSERT_EQUALS(false, foo_fn_args.at(4).optional);
+        ASSERT_EQUALS(true, foo_fn_args.at(5).notbool);
+        ASSERT_EQUALS(true, foo_fn_args.at(5).optional);
     }
 
     void function_arg_any() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "<function name=\"foo\">\n"
-                               "   <arg nr=\"any\"><not-uninit/></arg>\n"
-                               "</function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "<function name=\"foo\">\n"
+                                   "   <arg nr=\"any\"><not-uninit/></arg>\n"
+                                   "</function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT_EQUALS(0, library.functions["foo"].argumentChecks[-1].notuninit);
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT_EQUALS(0, library.functions().at("foo").argumentChecks.at(-1).notuninit);
     }
 
     void function_arg_variadic() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "<function name=\"foo\">\n"
-                               "   <arg nr=\"1\"></arg>\n"
-                               "   <arg nr=\"variadic\"><not-uninit/></arg>\n"
-                               "</function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "<function name=\"foo\">\n"
+                                   "   <arg nr=\"1\"></arg>\n"
+                                   "   <arg nr=\"variadic\"><not-uninit/></arg>\n"
+                                   "</function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT_EQUALS(0, library.functions["foo"].argumentChecks[-1].notuninit);
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT_EQUALS(0, library.functions().at("foo").argumentChecks.at(-1).notuninit);
 
-        TokenList tokenList(nullptr);
-        std::istringstream istr("foo(a,b,c,d,e);");
-        tokenList.createTokens(istr);
+        const char code[] = "foo(a,b,c,d,e);";
+        SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
         ASSERT_EQUALS(false, library.isuninitargbad(tokenList.front(), 1));
@@ -302,22 +296,21 @@ class TestLibrary : public TestFixture {
     }
 
     void function_arg_direction() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "<function name=\"foo\">\n"
-                               "   <arg nr=\"1\" direction=\"in\"></arg>\n"
-                               "   <arg nr=\"2\" direction=\"out\"></arg>\n"
-                               "   <arg nr=\"3\" direction=\"inout\"></arg>\n"
-                               "   <arg nr=\"4\"></arg>\n"
-                               "</function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "<function name=\"foo\">\n"
+                                   "   <arg nr=\"1\" direction=\"in\"></arg>\n"
+                                   "   <arg nr=\"2\" direction=\"out\"></arg>\n"
+                                   "   <arg nr=\"3\" direction=\"inout\"></arg>\n"
+                                   "   <arg nr=\"4\"></arg>\n"
+                                   "</function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        TokenList tokenList(nullptr);
-        std::istringstream istr("foo(a,b,c,d);");
-        tokenList.createTokens(istr);
+        const char code[] = "foo(a,b,c,d);";
+        SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
         ASSERT(Library::ArgumentChecks::Direction::DIR_IN == library.getArgDirection(tokenList.front(), 1));
@@ -327,171 +320,169 @@ class TestLibrary : public TestFixture {
     }
 
     void function_arg_valid() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <arg nr=\"1\"><valid>1:</valid></arg>\n"
-                               "    <arg nr=\"2\"><valid>-7:0</valid></arg>\n"
-                               "    <arg nr=\"3\"><valid>1:5,8</valid></arg>\n"
-                               "    <arg nr=\"4\"><valid>-1,5</valid></arg>\n"
-                               "    <arg nr=\"5\"><valid>:1,5</valid></arg>\n"
-                               "    <arg nr=\"6\"><valid>1.5:</valid></arg>\n"
-                               "    <arg nr=\"7\"><valid>-6.7:-5.5,-3.3:-2.7</valid></arg>\n"
-                               "    <arg nr=\"8\"><valid>0.0:</valid></arg>\n"
-                               "    <arg nr=\"9\"><valid>:2.0</valid></arg>\n"
-                               "    <arg nr=\"10\"><valid>0.0</valid></arg>\n"
-                               "    <arg nr=\"11\"><valid>!0.0</valid></arg>\n"
-                               "  </function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <arg nr=\"1\"><valid>1:</valid></arg>\n"
+                                   "    <arg nr=\"2\"><valid>-7:0</valid></arg>\n"
+                                   "    <arg nr=\"3\"><valid>1:5,8</valid></arg>\n"
+                                   "    <arg nr=\"4\"><valid>-1,5</valid></arg>\n"
+                                   "    <arg nr=\"5\"><valid>:1,5</valid></arg>\n"
+                                   "    <arg nr=\"6\"><valid>1.5:</valid></arg>\n"
+                                   "    <arg nr=\"7\"><valid>-6.7:-5.5,-3.3:-2.7</valid></arg>\n"
+                                   "    <arg nr=\"8\"><valid>0.0:</valid></arg>\n"
+                                   "    <arg nr=\"9\"><valid>:2.0</valid></arg>\n"
+                                   "    <arg nr=\"10\"><valid>0.0</valid></arg>\n"
+                                   "    <arg nr=\"11\"><valid>!0.0</valid></arg>\n"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        TokenList tokenList(nullptr);
-        std::istringstream istr("foo(a,b,c,d,e,f,g,h,i,j,k);");
-        tokenList.createTokens(istr);
+        const char code[] = "foo(a,b,c,d,e,f,g,h,i,j,k);";
+        SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
         // 1-
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 1, -10));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 1, -10.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 1, 0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 1, 0.0));
-        ASSERT_EQUALS(true, library.isIntArgValid(tokenList.front(), 1, 1));
-        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 1, 1.0));
-        ASSERT_EQUALS(true, library.isIntArgValid(tokenList.front(), 1, 10));
-        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 1, 10.0));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 1, -10, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 1, -10.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 1, 0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 1, 0.0, settingsDefault));
+        ASSERT_EQUALS(true, library.isIntArgValid(tokenList.front(), 1, 1, settingsDefault));
+        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 1, 1.0, settingsDefault));
+        ASSERT_EQUALS(true, library.isIntArgValid(tokenList.front(), 1, 10, settingsDefault));
+        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 1, 10.0, settingsDefault));
 
         // -7-0
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 2, -10));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, -10.0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, -7.5));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, -7.1));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 2, -7));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, -7.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 2, -3));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, -3.0));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, -3.5));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 2, 0));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, 0.0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, 0.5));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 2, 1));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, 1.0));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 2, -10, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, -10.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, -7.5, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, -7.1, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 2, -7, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, -7.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 2, -3, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, -3.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, -3.5, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 2, 0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 2, 0.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, 0.5, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 2, 1, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 2, 1.0, settingsDefault));
 
         // 1-5,8
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 0.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 1));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 3, 1.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 3));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 3, 3.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 5));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 3, 5.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 6));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 6.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 7));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 7.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 8));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 8.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 9));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 9.0));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 0.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 1, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 3, 1.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 3, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 3, 3.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 5, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 3, 5.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 6, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 6.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 7, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 7.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 3, 8, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 8.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 3, 9, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 3, 9.0, settingsDefault));
 
         // -1,5
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 4, -10));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, -10.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 4, -1));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, -1.0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, 5.000001));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, 5.5));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 4, -10, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, -10.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 4, -1, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, -1.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, 5.000001, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 4, 5.5, settingsDefault));
 
         // :1,5
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 5, -10));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 5, -10.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 5, 1));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 5, 1.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 5, 2));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 5, 2.0));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 5, -10, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 5, -10.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 5, 1, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 5, 1.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 5, 2, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 5, 2.0, settingsDefault));
 
         // 1.5:
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 6, 0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 6, 0.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 6, 1));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 6, 1.499999));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 6, 1.5));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 6, 2));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 6, 10));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 6, 0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 6, 0.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 6, 1, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 6, 1.499999, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 6, 1.5, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 6, 2, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 6, 10, settingsDefault));
 
         // -6.7:-5.5,-3.3:-2.7
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, -7));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -7.0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -6.7000001));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -6.7));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 7, -6));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -6.0));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -5.5));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -5.4999999));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -3.3000001));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -3.3));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 7, -3));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -3.0));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -2.7));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -2.6999999));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, -2));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -2.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, 0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, 0.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, 3));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, 3.0));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, 6));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, 6.0));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, -7, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -7.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -6.7000001, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -6.7, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 7, -6, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -6.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -5.5, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -5.4999999, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -3.3000001, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -3.3, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 7, -3, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -3.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 7, -2.7, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -2.6999999, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, -2, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, -2.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, 0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, 0.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, 3, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, 3.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 7, 6, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 7, 6.0, settingsDefault));
 
         // 0.0:
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 8, -1));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 8, -1.0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 8, -0.00000001));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 8, 0));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 8, 0.0));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 8, 0.000000001));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 8, 1));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 8, 1.0));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 8, -1, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 8, -1.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 8, -0.00000001, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 8, 0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 8, 0.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 8, 0.000000001, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 8, 1, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 8, 1.0, settingsDefault));
 
         // :2.0
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 9, -1));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 9, -1.0));
-        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 9, 2));
-        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 9, 2.0));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 9, 2.00000001));
-        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 9, 200));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 9, 200.0));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 9, -1, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 9, -1.0, settingsDefault));
+        ASSERT_EQUALS(true,  library.isIntArgValid(tokenList.front(), 9, 2, settingsDefault));
+        ASSERT_EQUALS(true,  library.isFloatArgValid(tokenList.front(), 9, 2.0, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 9, 2.00000001, settingsDefault));
+        ASSERT_EQUALS(false, library.isIntArgValid(tokenList.front(), 9, 200, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 9, 200.0, settingsDefault));
 
         // 0.0
-        ASSERT_EQUALS(true, library.isIntArgValid(tokenList.front(), 10, 0));
-        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 10, 0.0));
+        ASSERT_EQUALS(true, library.isIntArgValid(tokenList.front(), 10, 0, settingsDefault));
+        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 10, 0.0, settingsDefault));
 
         // ! 0.0
-        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 11, -0.42));
-        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 11, 0.0));
-        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 11, 0.42));
+        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 11, -0.42, settingsDefault));
+        ASSERT_EQUALS(false, library.isFloatArgValid(tokenList.front(), 11, 0.0, settingsDefault));
+        ASSERT_EQUALS(true, library.isFloatArgValid(tokenList.front(), 11, 0.42, settingsDefault));
     }
 
     void function_arg_minsize() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"foo\">\n"
-                               "    <arg nr=\"1\"><minsize type=\"strlen\" arg=\"2\"/></arg>\n"
-                               "    <arg nr=\"2\"><minsize type=\"argvalue\" arg=\"3\"/></arg>\n"
-                               "    <arg nr=\"3\"/>\n"
-                               "    <arg nr=\"4\"><minsize type=\"value\" value=\"500\"/></arg>\n"
-                               "    <arg nr=\"5\"><minsize type=\"value\" value=\"4\" baseType=\"int\"/></arg>\n"
-                               "  </function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"foo\">\n"
+                                   "    <arg nr=\"1\"><minsize type=\"strlen\" arg=\"2\"/></arg>\n"
+                                   "    <arg nr=\"2\"><minsize type=\"argvalue\" arg=\"3\"/></arg>\n"
+                                   "    <arg nr=\"3\"/>\n"
+                                   "    <arg nr=\"4\"><minsize type=\"value\" value=\"500\"/></arg>\n"
+                                   "    <arg nr=\"5\"><minsize type=\"value\" value=\"4\" baseType=\"int\"/></arg>\n"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        TokenList tokenList(nullptr);
-        std::istringstream istr("foo(a,b,c,d,e);");
-        tokenList.createTokens(istr);
+        const char code[] = "foo(a,b,c,d,e);";
+        SimpleTokenList tokenList(code);
         tokenList.front()->next()->astOperand1(tokenList.front());
 
         // arg1: type=strlen arg2
@@ -538,135 +529,132 @@ class TestLibrary : public TestFixture {
     }
 
     void function_namespace() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"Foo::foo,bar\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "  </function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"Foo::foo,bar\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT_EQUALS(library.functions.size(), 2U);
-        ASSERT(library.functions.at("Foo::foo").argumentChecks.empty());
-        ASSERT(library.functions.at("bar").argumentChecks.empty());
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT_EQUALS(library.functions().size(), 2U);
+        ASSERT(library.functions().at("Foo::foo").argumentChecks.empty());
+        ASSERT(library.functions().at("bar").argumentChecks.empty());
 
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("Foo::foo();");
-            tokenList.createTokens(istr);
+            const char code[] = "Foo::foo();";
+            const SimpleTokenList tokenList(code);
             ASSERT(library.isnotnoreturn(tokenList.front()->tokAt(2)));
         }
 
         {
-            TokenList tokenList(nullptr);
-            std::istringstream istr("bar();");
-            tokenList.createTokens(istr);
+            const char code[] = "bar();";
+            const SimpleTokenList tokenList(code);
             ASSERT(library.isnotnoreturn(tokenList.front()));
         }
     }
 
-    void function_method() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"CString::Format\">\n"
-                               "    <noreturn>false</noreturn>\n"
-                               "  </function>\n"
-                               "</def>";
+    void function_method() {
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"CString::Format\">\n"
+                                   "    <noreturn>false</noreturn>\n"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT_EQUALS(library.functions.size(), 1U);
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT_EQUALS(library.functions().size(), 1U);
 
         {
-            Tokenizer tokenizer(&settings, nullptr);
-            std::istringstream istr("CString str; str.Format();");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            const char code[] = "CString str; str.Format();";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
 
         {
-            Tokenizer tokenizer(&settings, nullptr);
-            std::istringstream istr("HardDrive hd; hd.Format();");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            const char code[] = "HardDrive hd; hd.Format();";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnotnoreturn(Token::findsimplematch(tokenizer.tokens(), "Format")));
         }
     }
 
-    void function_baseClassMethod() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"Base::f\">\n"
-                               "    <arg nr=\"1\"><not-null/></arg>\n"
-                               "  </function>\n"
-                               "</def>";
+    void function_baseClassMethod() {
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"Base::f\">\n"
+                                   "    <arg nr=\"1\"><not-null/></arg>\n"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
         {
-            Tokenizer tokenizer(&settings, nullptr);
-            std::istringstream istr("struct X : public Base { void dostuff() { f(0); } };");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            const char code[] = "struct X : public Base { void dostuff() { f(0); } };";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
 
         {
-            Tokenizer tokenizer(&settings, nullptr);
-            std::istringstream istr("struct X : public Base { void dostuff() { f(1,2); } };");
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settingsDefault, *this);
+            const char code[] = "struct X : public Base { void dostuff() { f(1,2); } };";
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(!library.isnullargbad(Token::findsimplematch(tokenizer.tokens(), "f"),1));
         }
     }
 
     void function_warn() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"a\">\n"
-                               "    <warn severity=\"style\" cstd=\"c99\">Message</warn>\n"
-                               "  </function>\n"
-                               "  <function name=\"b\">\n"
-                               "    <warn severity=\"performance\" cppstd=\"c++11\" reason=\"Obsolescent\" alternatives=\"c,d,e\"/>\n"
-                               "  </function>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"a\">\n"
+                                   "    <warn severity=\"style\" cstd=\"c99\">Message</warn>\n"
+                                   "  </function>\n"
+                                   "  <function name=\"b\">\n"
+                                   "    <warn severity=\"performance\" cppstd=\"c++11\" reason=\"Obsolescent\" alternatives=\"c,d,e\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        TokenList tokenList(nullptr);
-        std::istringstream istr("a(); b();");
-        tokenList.createTokens(istr);
+        const char code[] = "a(); b();";
+        const SimpleTokenList tokenList(code);
 
         const Library::WarnInfo* a = library.getWarnInfo(tokenList.front());
         const Library::WarnInfo* b = library.getWarnInfo(tokenList.front()->tokAt(4));
 
-        ASSERT_EQUALS(2, library.functionwarn.size());
+        ASSERT_EQUALS(2, library.functionwarn().size());
         ASSERT(a && b);
         if (a && b) {
             ASSERT_EQUALS("Message", a->message);
-            ASSERT_EQUALS(Severity::style, a->severity);
+            ASSERT_EQUALS_ENUM(Severity::style, a->severity);
             ASSERT_EQUALS(Standards::C99, a->standards.c);
             ASSERT_EQUALS(Standards::CPP03, a->standards.cpp);
 
             ASSERT_EQUALS("Obsolescent function 'b' called. It is recommended to use 'c', 'd' or 'e' instead.", b->message);
-            ASSERT_EQUALS(Severity::performance, b->severity);
+            ASSERT_EQUALS_ENUM(Severity::performance, b->severity);
             ASSERT_EQUALS(Standards::C89, b->standards.c);
             ASSERT_EQUALS(Standards::CPP11, b->standards.cpp);
         }
     }
 
     void memory() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <memory>\n"
-                               "    <alloc>CreateX</alloc>\n"
-                               "    <dealloc>DeleteX</dealloc>\n"
-                               "  </memory>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <memory>\n"
+                                   "    <alloc>CreateX</alloc>\n"
+                                   "    <dealloc>DeleteX</dealloc>\n"
+                                   "  </memory>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT(library.functions.empty());
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(library.functions().empty());
 
         const Library::AllocFunc* af = library.getAllocFuncInfo("CreateX");
         ASSERT(af && af->arg == -1);
@@ -676,40 +664,40 @@ class TestLibrary : public TestFixture {
         ASSERT(df && df->arg == 1);
     }
     void memory2() const {
-        const char xmldata1[] = "<?xml version=\"1.0\"?>\n"
-                                "<def>\n"
-                                "  <memory>\n"
-                                "    <alloc>malloc</alloc>\n"
-                                "    <dealloc>free</dealloc>\n"
-                                "  </memory>\n"
-                                "</def>";
-        const char xmldata2[] = "<?xml version=\"1.0\"?>\n"
-                                "<def>\n"
-                                "  <memory>\n"
-                                "    <alloc>foo</alloc>\n"
-                                "    <dealloc>free</dealloc>\n"
-                                "  </memory>\n"
-                                "</def>";
+        constexpr char xmldata1[] = "<?xml version=\"1.0\"?>\n"
+                                    "<def>\n"
+                                    "  <memory>\n"
+                                    "    <alloc>malloc</alloc>\n"
+                                    "    <dealloc>free</dealloc>\n"
+                                    "  </memory>\n"
+                                    "</def>";
+        constexpr char xmldata2[] = "<?xml version=\"1.0\"?>\n"
+                                    "<def>\n"
+                                    "  <memory>\n"
+                                    "    <alloc>foo</alloc>\n"
+                                    "    <dealloc>free</dealloc>\n"
+                                    "  </memory>\n"
+                                    "</def>";
 
         Library library;
-        ASSERT_EQUALS(true, loadxmldata(library, xmldata1, sizeof(xmldata1)));
-        ASSERT_EQUALS(true, loadxmldata(library, xmldata2, sizeof(xmldata2)));
+        ASSERT_EQUALS(true, LibraryHelper::loadxmldata(library, xmldata1, sizeof(xmldata1)));
+        ASSERT_EQUALS(true, LibraryHelper::loadxmldata(library, xmldata2, sizeof(xmldata2)));
 
         ASSERT_EQUALS(library.deallocId("free"), library.allocId("malloc"));
         ASSERT_EQUALS(library.deallocId("free"), library.allocId("foo"));
     }
     void memory3() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <memory>\n"
-                               "    <alloc arg=\"5\" init=\"false\">CreateX</alloc>\n"
-                               "    <dealloc arg=\"2\">DeleteX</dealloc>\n"
-                               "  </memory>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <memory>\n"
+                                   "    <alloc arg=\"5\" init=\"false\">CreateX</alloc>\n"
+                                   "    <dealloc arg=\"2\">DeleteX</dealloc>\n"
+                                   "  </memory>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT(library.functions.empty());
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(library.functions().empty());
 
         const Library::AllocFunc* af = library.getAllocFuncInfo("CreateX");
         ASSERT(af && af->arg == 5 && !af->initData);
@@ -718,17 +706,17 @@ class TestLibrary : public TestFixture {
     }
 
     void resource() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <resource>\n"
-                               "    <alloc>CreateX</alloc>\n"
-                               "    <dealloc>DeleteX</dealloc>\n"
-                               "  </resource>\n"
-                               "</def>";
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <resource>\n"
+                                   "    <alloc>CreateX</alloc>\n"
+                                   "    <dealloc>DeleteX</dealloc>\n"
+                                   "  </resource>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
-        ASSERT(library.functions.empty());
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(library.functions().empty());
 
         ASSERT(Library::isresource(library.allocId("CreateX")));
         ASSERT_EQUALS(library.allocId("CreateX"), library.deallocId("DeleteX"));
@@ -736,18 +724,18 @@ class TestLibrary : public TestFixture {
 
     void podtype() const {
         {
-            const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                                   "<def>\n"
-                                   "  <podtype name=\"s8\" sign=\"s\" size=\"1\"/>\n"
-                                   "  <podtype name=\"u8\" sign=\"u\" size=\"1\"/>\n"
-                                   "  <podtype name=\"u16\" sign=\"u\" size=\"2\"/>\n"
-                                   "  <podtype name=\"s16\" sign=\"s\" size=\"2\"/>\n"
-                                   "</def>";
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <podtype name=\"s8\" sign=\"s\" size=\"1\"/>\n"
+                                       "  <podtype name=\"u8\" sign=\"u\" size=\"1\"/>\n"
+                                       "  <podtype name=\"u16\" sign=\"u\" size=\"2\"/>\n"
+                                       "  <podtype name=\"s16\" sign=\"s\" size=\"2\"/>\n"
+                                       "</def>";
             Library library;
-            ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+            ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
             // s8
             {
-                const struct Library::PodType * const type = library.podtype("s8");
+                const Library::PodType * const type = library.podtype("s8");
                 ASSERT_EQUALS(true, type != nullptr);
                 if (type) {
                     ASSERT_EQUALS(1U, type->size);
@@ -756,7 +744,7 @@ class TestLibrary : public TestFixture {
             }
             // u8
             {
-                const struct Library::PodType * const type = library.podtype("u8");
+                const Library::PodType * const type = library.podtype("u8");
                 ASSERT_EQUALS(true, type != nullptr);
                 if (type) {
                     ASSERT_EQUALS(1U, type->size);
@@ -765,7 +753,7 @@ class TestLibrary : public TestFixture {
             }
             // u16
             {
-                const struct Library::PodType * const type = library.podtype("u16");
+                const Library::PodType * const type = library.podtype("u16");
                 ASSERT_EQUALS(true, type != nullptr);
                 if (type) {
                     ASSERT_EQUALS(2U, type->size);
@@ -774,7 +762,7 @@ class TestLibrary : public TestFixture {
             }
             // s16
             {
-                const struct Library::PodType * const type = library.podtype("s16");
+                const Library::PodType * const type = library.podtype("s16");
                 ASSERT_EQUALS(true, type != nullptr);
                 if (type) {
                     ASSERT_EQUALS(2U, type->size);
@@ -783,50 +771,55 @@ class TestLibrary : public TestFixture {
             }
             // robustness test: provide cfg without PodType
             {
-                const struct Library::PodType * const type = library.podtype("nonExistingPodType");
+                const Library::PodType * const type = library.podtype("nonExistingPodType");
                 ASSERT_EQUALS(true, type == nullptr);
             }
         }
     }
 
-    void container() const {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <container id=\"A\" startPattern=\"std :: A &lt;\" endPattern=\"&gt; !!::\" itEndPattern=\"&gt; :: iterator\">\n"
-                               "    <type templateParameter=\"1\"/>\n"
-                               "    <size templateParameter=\"4\">\n"
-                               "      <function name=\"resize\" action=\"resize\"/>\n"
-                               "      <function name=\"clear\" action=\"clear\"/>\n"
-                               "      <function name=\"size\" yields=\"size\"/>\n"
-                               "      <function name=\"empty\" yields=\"empty\"/>\n"
-                               "      <function name=\"push_back\" action=\"push\"/>\n"
-                               "      <function name=\"pop_back\" action=\"pop\"/>\n"
-                               "    </size>\n"
-                               "    <access>\n"
-                               "      <function name=\"at\" yields=\"at_index\"/>\n"
-                               "      <function name=\"begin\" yields=\"start-iterator\"/>\n"
-                               "      <function name=\"end\" yields=\"end-iterator\"/>\n"
-                               "      <function name=\"data\" yields=\"buffer\"/>\n"
-                               "      <function name=\"c_str\" yields=\"buffer-nt\"/>\n"
-                               "      <function name=\"front\" yields=\"item\"/>\n"
-                               "      <function name=\"find\" action=\"find\"/>\n"
-                               "    </access>\n"
-                               "  </container>\n"
-                               "  <container id=\"B\" startPattern=\"std :: B &lt;\" inherits=\"A\" opLessAllowed=\"false\">\n"
-                               "    <size templateParameter=\"3\"/>\n" // Inherits all but templateParameter
-                               "  </container>\n"
-                               "  <container id=\"C\">\n"
-                               "    <type string=\"std-like\"/>\n"
-                               "    <access indexOperator=\"array-like\"/>\n"
-                               "  </container>\n"
-                               "</def>";
+    void container() {
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <container id=\"A\" startPattern=\"std :: A &lt;\" endPattern=\"&gt; !!::\" itEndPattern=\"&gt; :: iterator\">\n"
+                                   "    <type templateParameter=\"1\"/>\n"
+                                   "    <size templateParameter=\"4\">\n"
+                                   "      <function name=\"resize\" action=\"resize\"/>\n"
+                                   "      <function name=\"clear\" action=\"clear\"/>\n"
+                                   "      <function name=\"size\" yields=\"size\"/>\n"
+                                   "      <function name=\"empty\" yields=\"empty\"/>\n"
+                                   "      <function name=\"push_back\" action=\"push\"/>\n"
+                                   "      <function name=\"pop_back\" action=\"pop\"/>\n"
+                                   "    </size>\n"
+                                   "    <access>\n"
+                                   "      <function name=\"at\" yields=\"at_index\"/>\n"
+                                   "      <function name=\"begin\" yields=\"start-iterator\"/>\n"
+                                   "      <function name=\"end\" yields=\"end-iterator\"/>\n"
+                                   "      <function name=\"data\" yields=\"buffer\"/>\n"
+                                   "      <function name=\"c_str\" yields=\"buffer-nt\"/>\n"
+                                   "      <function name=\"front\" yields=\"item\"/>\n"
+                                   "      <function name=\"find\" action=\"find\"/>\n"
+                                   "      <function name=\"cfind\" action=\"find-const\"/>\n"
+                                   "    </access>\n"
+                                   "  </container>\n"
+                                   "  <container id=\"B\" startPattern=\"std :: B &lt;\" inherits=\"A\" opLessAllowed=\"false\">\n"
+                                   "    <size templateParameter=\"3\"/>\n" // Inherits all but templateParameter
+                                   "  </container>\n"
+                                   "  <container id=\"C\">\n"
+                                   "    <type string=\"std-like\"/>\n"
+                                   "    <access indexOperator=\"array-like\"/>\n"
+                                   "  </container>\n"
+                                   "  <container id=\"E\" startPattern=\"std :: E\"/>\n"
+                                   "  <container id=\"F\" startPattern=\"std :: F\" itEndPattern=\":: iterator\"/>\n"
+                                   "</def>";
 
         Library library;
-        ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+        ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
-        Library::Container& A = library.containers["A"];
-        Library::Container& B = library.containers["B"];
-        const Library::Container& C = library.containers["C"];
+        const Library::Container& A = library.containers().at("A");
+        const Library::Container& B = library.containers().at("B");
+        const Library::Container& C = library.containers().at("C");
+        const Library::Container& E = library.containers().at("E");
+        const Library::Container& F = library.containers().at("F");
 
         ASSERT_EQUALS(A.type_templateArgNo, 1);
         ASSERT_EQUALS(A.size_templateArgNo, 4);
@@ -850,6 +843,7 @@ class TestLibrary : public TestFixture {
         ASSERT_EQ(Library::Container::Action::PUSH, A.getAction("push_back"));
         ASSERT_EQ(Library::Container::Action::POP, A.getAction("pop_back"));
         ASSERT_EQ(Library::Container::Action::FIND, A.getAction("find"));
+        ASSERT_EQ(Library::Container::Action::FIND_CONST, A.getAction("cfind"));
         ASSERT_EQ(Library::Container::Action::NO_ACTION, A.getAction("foo"));
 
         ASSERT_EQUALS(B.type_templateArgNo, 1);
@@ -866,8 +860,19 @@ class TestLibrary : public TestFixture {
         ASSERT_EQUALS(C.stdStringLike, true);
         ASSERT_EQUALS(C.arrayLike_indexOp, true);
 
+        ASSERT_EQUALS(E.startPattern, "std :: E");
+        ASSERT_EQUALS(E.endPattern, "");
+        ASSERT_EQUALS(E.itEndPattern, "");
+
+        ASSERT_EQUALS(F.startPattern, "std :: F");
+        ASSERT_EQUALS(F.endPattern, "");
+        ASSERT_EQUALS(F.itEndPattern, ":: iterator");
+
+        ASSERT(!library.detectContainerOrIterator(nullptr));
+
         {
-            givenACodeSampleToTokenize var("std::A<int> a;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::A<int> a;"));
             ASSERT_EQUALS(&A, library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -876,14 +881,16 @@ class TestLibrary : public TestFixture {
         }
 
         {
-            givenACodeSampleToTokenize var("std::A<int>::size_type a_s;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::A<int>::size_type a_s;"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
         }
 
         {
-            givenACodeSampleToTokenize var("std::A<int>::iterator a_it;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::A<int>::iterator a_it;"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT_EQUALS(&A, library.detectIterator(var.tokens()));
             bool isIterator;
@@ -892,7 +899,8 @@ class TestLibrary : public TestFixture {
         }
 
         {
-            givenACodeSampleToTokenize var("std::B<int> b;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::B<int> b;"));
             ASSERT_EQUALS(&B, library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             bool isIterator;
@@ -901,14 +909,16 @@ class TestLibrary : public TestFixture {
         }
 
         {
-            givenACodeSampleToTokenize var("std::B<int>::size_type b_s;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::B<int>::size_type b_s;"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
         }
 
         {
-            givenACodeSampleToTokenize var("std::B<int>::iterator b_it;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::B<int>::iterator b_it;"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT_EQUALS(&B, library.detectIterator(var.tokens()));
             bool isIterator;
@@ -917,57 +927,139 @@ class TestLibrary : public TestFixture {
         }
 
         {
-            givenACodeSampleToTokenize var("C c;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("C c;"));
+            ASSERT(!library.detectContainer(var.tokens()));
+            ASSERT(!library.detectIterator(var.tokens()));
+            ASSERT(!library.detectContainerOrIterator(var.tokens()));
+        }
+
+        {
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("D d;"));
+            ASSERT(!library.detectContainer(var.tokens()));
+            ASSERT(!library.detectIterator(var.tokens()));
+            ASSERT(!library.detectContainerOrIterator(var.tokens()));
+        }
+
+        {
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::E e;"));
+            ASSERT(library.detectContainer(var.tokens()));
+            ASSERT(!library.detectIterator(var.tokens()));
+            bool isIterator;
+            ASSERT_EQUALS(&E, library.detectContainerOrIterator(var.tokens(), &isIterator));
+            ASSERT(!isIterator);
+            ASSERT(!library.detectContainerOrIterator(var.tokens(), nullptr, true));
+        }
+
+        {
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("E e;"));
+            ASSERT(!library.detectContainer(var.tokens()));
+            ASSERT(!library.detectIterator(var.tokens()));
+            ASSERT(!library.detectContainerOrIterator(var.tokens()));
+            ASSERT_EQUALS(&E, library.detectContainerOrIterator(var.tokens(), nullptr, true));
+        }
+
+        {
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::E::iterator I;"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
+            ASSERT(!library.detectContainerOrIterator(var.tokens(), nullptr, true));
         }
 
         {
-            givenACodeSampleToTokenize var("D d;");
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::E::size_type p;"));
             ASSERT(!library.detectContainer(var.tokens()));
             ASSERT(!library.detectIterator(var.tokens()));
             ASSERT(!library.detectContainerOrIterator(var.tokens()));
+            ASSERT(!library.detectContainerOrIterator(var.tokens(), nullptr, true));
         }
+
+        {
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::F f;"));
+            ASSERT(library.detectContainer(var.tokens()));
+            ASSERT(!library.detectIterator(var.tokens()));
+            bool isIterator;
+            ASSERT_EQUALS(&F, library.detectContainerOrIterator(var.tokens(), &isIterator));
+            ASSERT(!isIterator);
+        }
+
+        {
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("std::F::iterator I;"));
+            ASSERT(!library.detectContainer(var.tokens()));
+            TODO_ASSERT(library.detectIterator(var.tokens()));
+            bool isIterator = false;
+            TODO_ASSERT_EQUALS(reinterpret_cast<intptr_t>(&F), 0, reinterpret_cast<intptr_t>(library.detectContainerOrIterator(var.tokens(), &isIterator)));
+            TODO_ASSERT(isIterator);
+        }
+
+        {
+            SimpleTokenizer var(*this);
+            ASSERT(var.tokenize("F::iterator I;"));
+            ASSERT(!library.detectContainer(var.tokens()));
+            ASSERT(!library.detectIterator(var.tokens()));
+            ASSERT(!library.detectContainerOrIterator(var.tokens()));
+            bool isIterator = false;
+            TODO_ASSERT_EQUALS(reinterpret_cast<intptr_t>(&F), 0, reinterpret_cast<intptr_t>(library.detectContainerOrIterator(var.tokens(), &isIterator, true)));
+            TODO_ASSERT(isIterator);
+        }
+    }
+
+#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 {
         {
-            const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                                   "<def>\n"
-                                   "</def>";
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "</def>";
             Library library;
-            ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+            ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         }
         {
-            const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                                   "<def format=\"1\">\n"
-                                   "</def>";
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def format=\"1\">\n"
+                                       "</def>";
             Library library;
-            ASSERT(loadxmldata(library, xmldata, sizeof(xmldata)));
+            ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
         }
         {
-            const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                                   "<def format=\"42\">\n"
-                                   "</def>";
-            Library library;
-            const Library::Error err = readLibrary(library, xmldata);
-            ASSERT_EQUALS(true, err.errorcode == Library::ErrorCode::UNSUPPORTED_FORMAT);
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def format=\"42\">\n"
+                                       "</def>";
+            LOADLIBERROR(xmldata, Library::ErrorCode::UNSUPPORTED_FORMAT);
         }
     }
 
-    static Library::Error readLibrary(Library& library, const char* xmldata) {
-        tinyxml2::XMLDocument doc;
-        doc.Parse(xmldata); // TODO: check result
-        return library.load(doc);
+    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 loadLibError(const char xmldata[], Library::ErrorCode errorcode, const char* file, unsigned line) const {
-        Library library;
-        assertEquals(file, line, true, errorcode == readLibrary(library, xmldata).errorcode);
+    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 LOADLIBERROR(xmldata, errorcode) loadLibError(xmldata, errorcode, __FILE__, __LINE__)
 #define LOADLIB_ERROR_INVALID_RANGE(valid) LOADLIBERROR("<?xml version=\"1.0\"?>\n" \
                                                         "<def>\n" \
                                                         "<function name=\"f\">\n" \
@@ -980,6 +1072,9 @@ class TestLibrary : public TestFixture {
 
     void loadLibErrors() const {
 
+        LOADLIBERROR("<?xml version=\"1.0\"?>",
+                     Library::ErrorCode::BAD_XML);
+
         LOADLIBERROR("<?xml version=\"1.0\"?>\n"
                      "<def>\n"
                      "   <X name=\"uint8_t,std::uint8_t\" size=\"1\"/>\n"
@@ -1062,6 +1157,30 @@ class TestLibrary : public TestFixture {
         // comma followed by dot
         LOADLIB_ERROR_INVALID_RANGE("-10:0,.5:");
     }
+
+    void loadLibCombinations() const {
+        {
+            const Settings s = settingsBuilder().library("std.cfg").library("gnu.cfg").library("bsd.cfg").build();
+            ASSERT_EQUALS(s.library.defines().empty(), false);
+        }
+        {
+            const Settings s = settingsBuilder().library("std.cfg").library("microsoft_sal.cfg").build();
+            ASSERT_EQUALS(s.library.defines().empty(), false);
+        }
+        {
+            const Settings s = settingsBuilder().library("std.cfg").library("windows.cfg").library("mfc.cfg").build();
+            ASSERT_EQUALS(s.library.defines().empty(), false);
+        }
+    }
+
+    void smartpointer() const {
+        const Settings s = settingsBuilder().library("std.cfg").build();
+        const Library& library = s.library;
+
+        ASSERT(!library.detectSmartPointer(nullptr));
+
+        // TODO: add more tests
+    }
 };
 
 REGISTER_TEST(TestLibrary)
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index e49d08afa17..a2f9526162c 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-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
@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "errortypes.h"
-#include "mathlib.h"
 #include "fixture.h"
+#include "mathlib.h"
+#include "standards.h"
+#include "token.h"
+#include "tokenlist.h"
 
 #include <limits>
+#include <memory>
 #include <string>
-
-
+#include <utility>
 
 class TestMathLib : public TestFixture {
 public:
@@ -53,8 +54,8 @@ class TestMathLib : public TestFixture {
         TEST_CASE(calculate);
         TEST_CASE(calculate1);
         TEST_CASE(typesuffix);
-        TEST_CASE(toLongNumber);
-        TEST_CASE(toULongNumber);
+        TEST_CASE(toBigNumber);
+        TEST_CASE(toBigUNumber);
         TEST_CASE(toDoubleNumber);
         TEST_CASE(naninf);
         TEST_CASE(isNullValue);
@@ -63,7 +64,6 @@ class TestMathLib : public TestFixture {
         TEST_CASE(tan);
         TEST_CASE(abs);
         TEST_CASE(toString);
-        TEST_CASE(CPP14DigitSeparators);
     }
 
     void isGreater() const {
@@ -146,13 +146,13 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("5.0",  MathLib::divide("25.5", "5.1"));
         ASSERT_EQUALS("7.0",  MathLib::divide("21.", "3"));
         ASSERT_EQUALS("1",    MathLib::divide("3", "2"));
-        ASSERT_THROW_EQUALS(MathLib::divide("123", "0"), InternalError, "Internal Error: Division by zero");  // decimal zero: throw
-        ASSERT_THROW_EQUALS(MathLib::divide("123", "00"), InternalError, "Internal Error: Division by zero"); // octal zero: throw
-        ASSERT_THROW_EQUALS(MathLib::divide("123", "0x0"), InternalError, "Internal Error: Division by zero"); // hex zero: throw
-        MathLib::divide("123", "0.0f"); // float zero: don't throw
-        MathLib::divide("123", "0.0"); // double zero: don't throw
-        MathLib::divide("123", "0.0L"); // long double zero: don't throw
-        ASSERT_THROW_EQUALS(MathLib::divide("-9223372036854775808", "-1"), InternalError, "Internal Error: Division overflow"); // #4520 - out of range => throw
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::divide("123", "0"), INTERNAL, "Internal Error: Division by zero");  // decimal zero: throw
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::divide("123", "00"), INTERNAL, "Internal Error: Division by zero"); // octal zero: throw
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::divide("123", "0x0"), INTERNAL, "Internal Error: Division by zero"); // hex zero: throw
+        ASSERT_NO_THROW(MathLib::divide("123", "0.0f")); // float zero
+        ASSERT_NO_THROW(MathLib::divide("123", "0.0")); // double zero
+        ASSERT_NO_THROW(MathLib::divide("123", "0.0L")); // long double zero
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::divide("-9223372036854775808", "-1"), INTERNAL, "Internal Error: Division overflow"); // #4520 - out of range => throw
         ASSERT_EQUALS("4611686018427387904",  MathLib::divide("-9223372036854775808", "-2")); // #6679
 
 
@@ -167,7 +167,7 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("1", MathLib::calculate("0", "1", '^'));
 
         // Unknown action should throw exception
-        ASSERT_THROW_EQUALS(MathLib::calculate("1","2",'j'),InternalError, "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(). Please report this to Cppcheck developers.");
     }
 
     void calculate1() const {
@@ -181,10 +181,10 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("12.0", MathLib::calculate("12.0", "13.0", '%'));
         ASSERT_EQUALS("1.3",  MathLib::calculate("5.3",  "2.0",  '%'));
         ASSERT_EQUALS("1.7",  MathLib::calculate("18.5", "4.2",  '%'));
-        MathLib::calculate("123", "0.0", '%'); // don't throw
+        ASSERT_NO_THROW(MathLib::calculate("123", "0.0", '%'));
 #endif
 
-        ASSERT_THROW_EQUALS(MathLib::calculate("123", "0", '%'), InternalError, "Internal Error: Division by zero"); // throw
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("123", "0", '%'), INTERNAL, "Internal Error: Division by zero"); // throw
 
         ASSERT_EQUALS("0", MathLib::calculate("1", "1", '^'));
         ASSERT_EQUALS("3", MathLib::calculate("2", "1", '^'));
@@ -250,156 +250,173 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("2ULL",  MathLib::add("1ULL", "1LLU"));
     }
 
-    void toLongNumber() const {
+    void toBigNumber() const {
         // zero input
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("-0"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("+0"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0L"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0l"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0LL"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0ll"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0U"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0u"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0UL"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0ul"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0ULL"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0ull"));
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0i64")); // Visual Studio-specific
-        ASSERT_EQUALS(0, MathLib::toLongNumber("0ui64")); // Visual Studio-specific
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("-0"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("+0"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0L"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0l"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0LL"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0ll"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0U"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0u"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0UL"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0ul"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0ULL"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0ull"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0i64")); // Visual Studio-specific
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0ui64")); // Visual Studio-specific
 
         // TODO: needs to fail
-        //ASSERT_EQUALS(0, MathLib::toLongNumber("0lll"));
-        //ASSERT_EQUALS(0, MathLib::toLongNumber("0uu"));
+        //ASSERT_EQUALS(0, MathLib::toBigNumber("0lll"));
+        //ASSERT_EQUALS(0, MathLib::toBigNumber("0uu"));
 
-        ASSERT_EQUALS(1U,     MathLib::toLongNumber("1U"));
-        ASSERT_EQUALS(10000U, MathLib::toLongNumber("1e4"));
-        ASSERT_EQUALS(10000U, MathLib::toLongNumber("1e4"));
-        ASSERT_EQUALS(0xFF00000000000000UL, MathLib::toLongNumber("0xFF00000000000000UL"));
-        ASSERT_EQUALS(0x0A00000000000000UL, MathLib::toLongNumber("0x0A00000000000000UL"));
+        ASSERT_EQUALS(1U, MathLib::toBigNumber("1U"));
+        ASSERT_EQUALS(10000U, MathLib::toBigNumber("1e4"));
+        ASSERT_EQUALS(10000U, MathLib::toBigNumber("1e4"));
+        ASSERT_EQUALS(0xFF00000000000000UL, MathLib::toBigNumber("0xFF00000000000000UL"));
+        ASSERT_EQUALS(0x0A00000000000000UL, MathLib::toBigNumber("0x0A00000000000000UL"));
 
         // from hex
-        ASSERT_EQUALS(0,      MathLib::toLongNumber("0x0"));
-        ASSERT_EQUALS(0,      MathLib::toLongNumber("-0x0"));
-        ASSERT_EQUALS(0,      MathLib::toLongNumber("+0x0"));
-        ASSERT_EQUALS(10,     MathLib::toLongNumber("0xa"));
-        ASSERT_EQUALS(10995,  MathLib::toLongNumber("0x2AF3"));
-        ASSERT_EQUALS(-10,    MathLib::toLongNumber("-0xa"));
-        ASSERT_EQUALS(-10995, MathLib::toLongNumber("-0x2AF3"));
-        ASSERT_EQUALS(10,     MathLib::toLongNumber("+0xa"));
-        ASSERT_EQUALS(10995,  MathLib::toLongNumber("+0x2AF3"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0x0"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("-0x0"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("+0x0"));
+        ASSERT_EQUALS(10, MathLib::toBigNumber("0xa"));
+        ASSERT_EQUALS(10995, MathLib::toBigNumber("0x2AF3"));
+        ASSERT_EQUALS(-10, MathLib::toBigNumber("-0xa"));
+        ASSERT_EQUALS(-10995, MathLib::toBigNumber("-0x2AF3"));
+        ASSERT_EQUALS(10, MathLib::toBigNumber("+0xa"));
+        ASSERT_EQUALS(10995, MathLib::toBigNumber("+0x2AF3"));
 
         // from octal
-        ASSERT_EQUALS(8,    MathLib::toLongNumber("010"));
-        ASSERT_EQUALS(8,    MathLib::toLongNumber("+010"));
-        ASSERT_EQUALS(-8,   MathLib::toLongNumber("-010"));
-        ASSERT_EQUALS(125,  MathLib::toLongNumber("0175"));
-        ASSERT_EQUALS(125,  MathLib::toLongNumber("+0175"));
-        ASSERT_EQUALS(-125, MathLib::toLongNumber("-0175"));
+        ASSERT_EQUALS(8, MathLib::toBigNumber("010"));
+        ASSERT_EQUALS(8, MathLib::toBigNumber("+010"));
+        ASSERT_EQUALS(-8, MathLib::toBigNumber("-010"));
+        ASSERT_EQUALS(125, MathLib::toBigNumber("0175"));
+        ASSERT_EQUALS(125, MathLib::toBigNumber("+0175"));
+        ASSERT_EQUALS(-125, MathLib::toBigNumber("-0175"));
 
         // from binary
-        ASSERT_EQUALS(0,    MathLib::toLongNumber("0b0"));
-        ASSERT_EQUALS(1,    MathLib::toLongNumber("0b1"));
-        ASSERT_EQUALS(1,    MathLib::toLongNumber("0b1U"));
-        ASSERT_EQUALS(1,    MathLib::toLongNumber("0b1L"));
-        ASSERT_EQUALS(1,    MathLib::toLongNumber("0b1LU"));
-        ASSERT_EQUALS(1,    MathLib::toLongNumber("0b1LL"));
-        ASSERT_EQUALS(1,    MathLib::toLongNumber("0b1LLU"));
-        ASSERT_EQUALS(1,    MathLib::toLongNumber("+0b1"));
-        ASSERT_EQUALS(-1,   MathLib::toLongNumber("-0b1"));
-        ASSERT_EQUALS(9U,   MathLib::toLongNumber("011"));
-        ASSERT_EQUALS(5U,   MathLib::toLongNumber("0b101"));
-        ASSERT_EQUALS(215,  MathLib::toLongNumber("0b11010111"));
-        ASSERT_EQUALS(-215, MathLib::toLongNumber("-0b11010111"));
-        ASSERT_EQUALS(215,  MathLib::toLongNumber("0B11010111"));
+        ASSERT_EQUALS(0, MathLib::toBigNumber("0b0"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("0b1"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("0b1U"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("0b1L"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("0b1LU"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("0b1LL"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("0b1LLU"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("+0b1"));
+        ASSERT_EQUALS(-1, MathLib::toBigNumber("-0b1"));
+        ASSERT_EQUALS(9U, MathLib::toBigNumber("011"));
+        ASSERT_EQUALS(5U, MathLib::toBigNumber("0b101"));
+        ASSERT_EQUALS(215, MathLib::toBigNumber("0b11010111"));
+        ASSERT_EQUALS(-215, MathLib::toBigNumber("-0b11010111"));
+        ASSERT_EQUALS(215, MathLib::toBigNumber("0B11010111"));
 
         // from base 10
-        ASSERT_EQUALS(10,  MathLib::toLongNumber("10"));
-        ASSERT_EQUALS(10,  MathLib::toLongNumber("10."));
-        ASSERT_EQUALS(10,  MathLib::toLongNumber("10.0"));
-        ASSERT_EQUALS(100, MathLib::toLongNumber("10E+1"));
-        ASSERT_EQUALS(1,   MathLib::toLongNumber("10E-1"));
-        ASSERT_EQUALS(100, MathLib::toLongNumber("+10E+1"));
-        ASSERT_EQUALS(-1,  MathLib::toLongNumber("-10E-1"));
-        ASSERT_EQUALS(100, MathLib::toLongNumber("+10.E+1"));
-        ASSERT_EQUALS(-1,  MathLib::toLongNumber("-10.E-1"));
-        ASSERT_EQUALS(100, MathLib::toLongNumber("+10.0E+1"));
-        ASSERT_EQUALS(-1,  MathLib::toLongNumber("-10.0E-1"));
+        ASSERT_EQUALS(10, MathLib::toBigNumber("10"));
+        ASSERT_EQUALS(10, MathLib::toBigNumber("10."));
+        ASSERT_EQUALS(10, MathLib::toBigNumber("10.0"));
+        ASSERT_EQUALS(100, MathLib::toBigNumber("10E+1"));
+        ASSERT_EQUALS(1, MathLib::toBigNumber("10E-1"));
+        ASSERT_EQUALS(100, MathLib::toBigNumber("+10E+1"));
+        ASSERT_EQUALS(-1, MathLib::toBigNumber("-10E-1"));
+        ASSERT_EQUALS(100, MathLib::toBigNumber("+10.E+1"));
+        ASSERT_EQUALS(-1, MathLib::toBigNumber("-10.E-1"));
+        ASSERT_EQUALS(100, MathLib::toBigNumber("+10.0E+1"));
+        ASSERT_EQUALS(-1, MathLib::toBigNumber("-10.0E-1"));
 
         // from char
-        ASSERT_EQUALS((int)('A'),    MathLib::toLongNumber("'A'"));
-        ASSERT_EQUALS((int)('\x10'), MathLib::toLongNumber("'\\x10'"));
-        ASSERT_EQUALS((int)('\100'), MathLib::toLongNumber("'\\100'"));
-        ASSERT_EQUALS((int)('\200'), MathLib::toLongNumber("'\\200'"));
-        ASSERT_EQUALS((int)(L'A'),   MathLib::toLongNumber("L'A'"));
+        ASSERT_EQUALS(static_cast<int>('A'), MathLib::toBigNumber("'A'"));
+        ASSERT_EQUALS(static_cast<int>('\x10'), MathLib::toBigNumber("'\\x10'"));
+        ASSERT_EQUALS(static_cast<int>('\100'), MathLib::toBigNumber("'\\100'"));
+        ASSERT_EQUALS(static_cast<int>('\200'), MathLib::toBigNumber("'\\200'"));
+        ASSERT_EQUALS(static_cast<int>(L'A'), MathLib::toBigNumber("L'A'"));
 
-        ASSERT_EQUALS(-8552249625308161526, MathLib::toLongNumber("0x89504e470d0a1a0a"));
-        ASSERT_EQUALS(-8481036456200365558, MathLib::toLongNumber("0x8a4d4e470d0a1a0a"));
+        ASSERT_EQUALS(-8552249625308161526, MathLib::toBigNumber("0x89504e470d0a1a0a"));
+        ASSERT_EQUALS(-8481036456200365558, MathLib::toBigNumber("0x8a4d4e470d0a1a0a"));
 
         // from long long
         /*
-         * ASSERT_EQUALS(0xFF00000000000000LL, MathLib::toLongNumber("0xFF00000000000000LL"));
+         * ASSERT_EQUALS(0xFF00000000000000LL, MathLib::toBigNumber("0xFF00000000000000LL"));
          * This does not work in a portable way!
          * While it succeeds on 32bit Visual Studio it fails on Linux 64bit because it is greater than 0x7FFFFFFFFFFFFFFF (=LLONG_MAX)
          */
 
-        ASSERT_EQUALS(0x0A00000000000000LL, MathLib::toLongNumber("0x0A00000000000000LL"));
+        ASSERT_EQUALS(0x0A00000000000000LL, MathLib::toBigNumber("0x0A00000000000000LL"));
 
         // min/max numeric limits
-        ASSERT_EQUALS(std::numeric_limits<long long>::min(), MathLib::toLongNumber(std::to_string(std::numeric_limits<long long>::min())));
-        ASSERT_EQUALS(std::numeric_limits<long long>::max(), MathLib::toLongNumber(std::to_string(std::numeric_limits<long long>::max())));
-        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::min(), MathLib::toLongNumber(std::to_string(std::numeric_limits<unsigned long long>::min())));
-        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::max(), MathLib::toLongNumber(std::to_string(std::numeric_limits<unsigned long long>::max())));
+        ASSERT_EQUALS(std::numeric_limits<long long>::min(),
+                      MathLib::toBigNumber(std::to_string(std::numeric_limits<long long>::min())));
+        ASSERT_EQUALS(std::numeric_limits<long long>::max(),
+                      MathLib::toBigNumber(std::to_string(std::numeric_limits<long long>::max())));
+        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::min(),
+                      MathLib::toBigNumber(std::to_string(std::numeric_limits<unsigned long long>::min())));
+        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::max(),
+                      MathLib::toBigNumber(std::to_string(std::numeric_limits<unsigned long long>::max())));
 
         // min/max and out-of-bounds - hex
         {
-            const MathLib::bigint i = 0xFFFFFFFFFFFFFFFF;
-            ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
-            ASSERT_EQUALS(i, MathLib::toLongNumber("0xFFFFFFFFFFFFFFFF"));
+            constexpr MathLib::bigint i = 0xFFFFFFFFFFFFFFFF;
+            ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
+            ASSERT_EQUALS(i, MathLib::toBigNumber("0xFFFFFFFFFFFFFFFF"));
         }
         {
-            const MathLib::bigint i = -0xFFFFFFFFFFFFFFFF;
-            ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
-            ASSERT_EQUALS(i, MathLib::toLongNumber("-0xFFFFFFFFFFFFFFFF"));
+            constexpr MathLib::bigint i = -0xFFFFFFFFFFFFFFFF;
+            ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
+            ASSERT_EQUALS(i, MathLib::toBigNumber("-0xFFFFFFFFFFFFFFFF"));
         }
 
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("0x10000000000000000"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: 0x10000000000000000");
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("-0x10000000000000000"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: -0x10000000000000000");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("0x10000000000000000"), INTERNAL, "Internal Error. MathLib::toBigNumber: out_of_range: 0x10000000000000000");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("-0x10000000000000000"), INTERNAL, "Internal Error. MathLib::toBigNumber: out_of_range: -0x10000000000000000");
 
         // min/max and out-of-bounds - octal
         {
-            const MathLib::bigint i = 01777777777777777777777;
-            ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
-            ASSERT_EQUALS(i, MathLib::toLongNumber("01777777777777777777777"));
+            constexpr MathLib::bigint i = 01777777777777777777777;
+            ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
+            ASSERT_EQUALS(i, MathLib::toBigNumber("01777777777777777777777"));
         }
         {
-            const MathLib::bigint i = -01777777777777777777777;
-            ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
-            ASSERT_EQUALS(i, MathLib::toLongNumber("-01777777777777777777777"));
+            constexpr MathLib::bigint i = -01777777777777777777777;
+            ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
+            ASSERT_EQUALS(i, MathLib::toBigNumber("-01777777777777777777777"));
         }
 
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("02000000000000000000000"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: 02000000000000000000000");
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("-02000000000000000000000"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: -02000000000000000000000");
+        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
+        // min/max and out-of-range - decimal
         {
-            const MathLib::bigint i = 18446744073709551615;
-            ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
-            ASSERT_EQUALS(i, MathLib::toLongNumber("18446744073709551615"));
+            constexpr MathLib::bigint i = 18446744073709551615ULL;
+            ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
+            ASSERT_EQUALS(i, MathLib::toBigNumber("18446744073709551615"));
         }
         {
-            const MathLib::bigint i = -18446744073709551615;
-            ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
-            ASSERT_EQUALS(i, MathLib::toLongNumber("-18446744073709551615"));
+            constexpr MathLib::bigint i = -18446744073709551615ULL;
+            ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
+            ASSERT_EQUALS(i, MathLib::toBigNumber("-18446744073709551615"));
         }
 
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("18446744073709551616"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: 18446744073709551616");
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("-18446744073709551616"), InternalError, "Internal Error. MathLib::toLongNumber: 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_EQUALS(MathLib::toLongNumber("invalid"), InternalError, "Internal Error. MathLib::toLongNumber: invalid_argument: invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("invalid"), INTERNAL, "Internal Error. MathLib::toBigNumber: invalid_argument: invalid");
 
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("1invalid"), InternalError, "Internal Error. MathLib::toLongNumber: input was not completely consumed: 1invalid");
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("1 invalid"), InternalError, "Internal Error. MathLib::toLongNumber: input was not completely consumed: 1 invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toBigNumber: input was not completely consumed: 1invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("1 invalid"), INTERNAL, "Internal Error. MathLib::toBigNumber: input was not completely consumed: 1 invalid");
+
+        {
+            TokenList list{settingsDefault, Standards::Language::C};
+            list.appendFileIfNew("test.c");
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            auto *tok = new Token(list, std::move(tokensFrontBack));
+            tok->str("invalid");
+            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber(tok), INTERNAL, "Internal Error. MathLib::toBigNumber: invalid_argument: invalid");
+            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigNumber("invalid", tok), INTERNAL, "Internal Error. MathLib::toBigNumber: invalid_argument: invalid");
+            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
@@ -407,156 +424,173 @@ class TestMathLib : public TestFixture {
         // TODO: test with 128-bit values
     }
 
-    void toULongNumber() const {
+    void toBigUNumber() const {
         // zero input
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("-0"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("+0"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0L"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0l"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0LL"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0ll"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0U"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0u"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0UL"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0ul"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0ULL"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0ull"));
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0i64")); // Visual Studio-specific
-        ASSERT_EQUALS(0, MathLib::toULongNumber("0ui64")); // Visual Studio-specific
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("-0"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("+0"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0L"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0l"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0LL"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0ll"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0U"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0u"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0UL"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0ul"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0ULL"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0ull"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0i64")); // Visual Studio-specific
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0ui64")); // Visual Studio-specific
 
         // TODO: needs to fail
-        //ASSERT_EQUALS(0, MathLib::toULongNumber("0lll"));
-        //ASSERT_EQUALS(0, MathLib::toULongNumber("0uu"));
+        //ASSERT_EQUALS(0, MathLib::toBigUNumber("0lll"));
+        //ASSERT_EQUALS(0, MathLib::toBigUNumber("0uu"));
 
-        ASSERT_EQUALS(1U,     MathLib::toULongNumber("1U"));
-        ASSERT_EQUALS(10000U, MathLib::toULongNumber("1e4"));
-        ASSERT_EQUALS(10000U, MathLib::toULongNumber("1e4"));
-        ASSERT_EQUALS(0xFF00000000000000UL, MathLib::toULongNumber("0xFF00000000000000UL"));
-        ASSERT_EQUALS(0x0A00000000000000UL, MathLib::toULongNumber("0x0A00000000000000UL"));
+        ASSERT_EQUALS(1U, MathLib::toBigUNumber("1U"));
+        ASSERT_EQUALS(10000U, MathLib::toBigUNumber("1e4"));
+        ASSERT_EQUALS(10000U, MathLib::toBigUNumber("1e4"));
+        ASSERT_EQUALS(0xFF00000000000000UL, MathLib::toBigUNumber("0xFF00000000000000UL"));
+        ASSERT_EQUALS(0x0A00000000000000UL, MathLib::toBigUNumber("0x0A00000000000000UL"));
 
         // from hex
-        ASSERT_EQUALS(0,      MathLib::toULongNumber("0x0"));
-        ASSERT_EQUALS(0,      MathLib::toULongNumber("-0x0"));
-        ASSERT_EQUALS(0,      MathLib::toULongNumber("+0x0"));
-        ASSERT_EQUALS(10,     MathLib::toULongNumber("0xa"));
-        ASSERT_EQUALS(10995,  MathLib::toULongNumber("0x2AF3"));
-        ASSERT_EQUALS(-10,    MathLib::toULongNumber("-0xa"));
-        ASSERT_EQUALS(-10995, MathLib::toULongNumber("-0x2AF3"));
-        ASSERT_EQUALS(10,     MathLib::toULongNumber("+0xa"));
-        ASSERT_EQUALS(10995,  MathLib::toULongNumber("+0x2AF3"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0x0"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("-0x0"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("+0x0"));
+        ASSERT_EQUALS(10, MathLib::toBigUNumber("0xa"));
+        ASSERT_EQUALS(10995, MathLib::toBigUNumber("0x2AF3"));
+        ASSERT_EQUALS(-10, MathLib::toBigUNumber("-0xa"));
+        ASSERT_EQUALS(-10995, MathLib::toBigUNumber("-0x2AF3"));
+        ASSERT_EQUALS(10, MathLib::toBigUNumber("+0xa"));
+        ASSERT_EQUALS(10995, MathLib::toBigUNumber("+0x2AF3"));
 
         // from octal
-        ASSERT_EQUALS(8,    MathLib::toULongNumber("010"));
-        ASSERT_EQUALS(8,    MathLib::toULongNumber("+010"));
-        ASSERT_EQUALS(-8,   MathLib::toULongNumber("-010"));
-        ASSERT_EQUALS(125,  MathLib::toULongNumber("0175"));
-        ASSERT_EQUALS(125,  MathLib::toULongNumber("+0175"));
-        ASSERT_EQUALS(-125, MathLib::toULongNumber("-0175"));
+        ASSERT_EQUALS(8, MathLib::toBigUNumber("010"));
+        ASSERT_EQUALS(8, MathLib::toBigUNumber("+010"));
+        ASSERT_EQUALS(-8, MathLib::toBigUNumber("-010"));
+        ASSERT_EQUALS(125, MathLib::toBigUNumber("0175"));
+        ASSERT_EQUALS(125, MathLib::toBigUNumber("+0175"));
+        ASSERT_EQUALS(-125, MathLib::toBigUNumber("-0175"));
 
         // from binary
-        ASSERT_EQUALS(0,    MathLib::toULongNumber("0b0"));
-        ASSERT_EQUALS(1,    MathLib::toULongNumber("0b1"));
-        ASSERT_EQUALS(1,    MathLib::toULongNumber("0b1U"));
-        ASSERT_EQUALS(1,    MathLib::toULongNumber("0b1L"));
-        ASSERT_EQUALS(1,    MathLib::toULongNumber("0b1LU"));
-        ASSERT_EQUALS(1,    MathLib::toULongNumber("0b1LL"));
-        ASSERT_EQUALS(1,    MathLib::toULongNumber("0b1LLU"));
-        ASSERT_EQUALS(1,    MathLib::toULongNumber("+0b1"));
-        ASSERT_EQUALS(-1,   MathLib::toULongNumber("-0b1"));
-        ASSERT_EQUALS(9U,   MathLib::toULongNumber("011"));
-        ASSERT_EQUALS(5U,   MathLib::toULongNumber("0b101"));
-        ASSERT_EQUALS(215,  MathLib::toULongNumber("0b11010111"));
-        ASSERT_EQUALS(-215, MathLib::toULongNumber("-0b11010111"));
-        ASSERT_EQUALS(215,  MathLib::toULongNumber("0B11010111"));
+        ASSERT_EQUALS(0, MathLib::toBigUNumber("0b0"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("0b1"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("0b1U"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("0b1L"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("0b1LU"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("0b1LL"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("0b1LLU"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("+0b1"));
+        ASSERT_EQUALS(-1, MathLib::toBigUNumber("-0b1"));
+        ASSERT_EQUALS(9U, MathLib::toBigUNumber("011"));
+        ASSERT_EQUALS(5U, MathLib::toBigUNumber("0b101"));
+        ASSERT_EQUALS(215, MathLib::toBigUNumber("0b11010111"));
+        ASSERT_EQUALS(-215, MathLib::toBigUNumber("-0b11010111"));
+        ASSERT_EQUALS(215, MathLib::toBigUNumber("0B11010111"));
 
         // from base 10
-        ASSERT_EQUALS(10,  MathLib::toULongNumber("10"));
-        ASSERT_EQUALS(10,  MathLib::toULongNumber("10."));
-        ASSERT_EQUALS(10,  MathLib::toULongNumber("10.0"));
-        ASSERT_EQUALS(100, MathLib::toULongNumber("10E+1"));
-        ASSERT_EQUALS(1,   MathLib::toULongNumber("10E-1"));
-        ASSERT_EQUALS(100, MathLib::toULongNumber("+10E+1"));
-        ASSERT_EQUALS(-1,  MathLib::toULongNumber("-10E-1"));
-        ASSERT_EQUALS(100, MathLib::toULongNumber("+10.E+1"));
-        ASSERT_EQUALS(-1,  MathLib::toULongNumber("-10.E-1"));
-        ASSERT_EQUALS(100, MathLib::toULongNumber("+10.0E+1"));
-        ASSERT_EQUALS(-1,  MathLib::toULongNumber("-10.0E-1"));
+        ASSERT_EQUALS(10, MathLib::toBigUNumber("10"));
+        ASSERT_EQUALS(10, MathLib::toBigUNumber("10."));
+        ASSERT_EQUALS(10, MathLib::toBigUNumber("10.0"));
+        ASSERT_EQUALS(100, MathLib::toBigUNumber("10E+1"));
+        ASSERT_EQUALS(1, MathLib::toBigUNumber("10E-1"));
+        ASSERT_EQUALS(100, MathLib::toBigUNumber("+10E+1"));
+        ASSERT_EQUALS(-1, MathLib::toBigUNumber("-10E-1"));
+        ASSERT_EQUALS(100, MathLib::toBigUNumber("+10.E+1"));
+        ASSERT_EQUALS(-1, MathLib::toBigUNumber("-10.E-1"));
+        ASSERT_EQUALS(100, MathLib::toBigUNumber("+10.0E+1"));
+        ASSERT_EQUALS(-1, MathLib::toBigUNumber("-10.0E-1"));
 
         // from char
-        ASSERT_EQUALS((int)('A'),    MathLib::toULongNumber("'A'"));
-        ASSERT_EQUALS((int)('\x10'), MathLib::toULongNumber("'\\x10'"));
-        ASSERT_EQUALS((int)('\100'), MathLib::toULongNumber("'\\100'"));
-        ASSERT_EQUALS((int)('\200'), MathLib::toULongNumber("'\\200'"));
-        ASSERT_EQUALS((int)(L'A'),   MathLib::toULongNumber("L'A'"));
+        ASSERT_EQUALS(static_cast<int>('A'), MathLib::toBigUNumber("'A'"));
+        ASSERT_EQUALS(static_cast<int>('\x10'), MathLib::toBigUNumber("'\\x10'"));
+        ASSERT_EQUALS(static_cast<int>('\100'), MathLib::toBigUNumber("'\\100'"));
+        ASSERT_EQUALS(static_cast<int>('\200'), MathLib::toBigUNumber("'\\200'"));
+        ASSERT_EQUALS(static_cast<int>(L'A'), MathLib::toBigUNumber("L'A'"));
 
-        ASSERT_EQUALS(9894494448401390090ULL, MathLib::toULongNumber("0x89504e470d0a1a0a"));
-        ASSERT_EQUALS(9965707617509186058ULL, MathLib::toULongNumber("0x8a4d4e470d0a1a0a"));
+        ASSERT_EQUALS(9894494448401390090ULL, MathLib::toBigUNumber("0x89504e470d0a1a0a"));
+        ASSERT_EQUALS(9965707617509186058ULL, MathLib::toBigUNumber("0x8a4d4e470d0a1a0a"));
 
         // from long long
         /*
-         * ASSERT_EQUALS(0xFF00000000000000LL, MathLib::toULongNumber("0xFF00000000000000LL"));
+         * ASSERT_EQUALS(0xFF00000000000000LL, MathLib::toBigUNumber("0xFF00000000000000LL"));
          * This does not work in a portable way!
          * While it succeeds on 32bit Visual Studio it fails on Linux 64bit because it is greater than 0x7FFFFFFFFFFFFFFF (=LLONG_MAX)
          */
 
-        ASSERT_EQUALS(0x0A00000000000000LL, MathLib::toULongNumber("0x0A00000000000000LL"));
+        ASSERT_EQUALS(0x0A00000000000000LL, MathLib::toBigUNumber("0x0A00000000000000LL"));
 
         // min/max numeric limits
-        ASSERT_EQUALS(std::numeric_limits<long long>::min(), MathLib::toULongNumber(std::to_string(std::numeric_limits<long long>::min())));
-        ASSERT_EQUALS(std::numeric_limits<long long>::max(), MathLib::toULongNumber(std::to_string(std::numeric_limits<long long>::max())));
-        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::min(), MathLib::toULongNumber(std::to_string(std::numeric_limits<unsigned long long>::min())));
-        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::max(), MathLib::toULongNumber(std::to_string(std::numeric_limits<unsigned long long>::max())));
+        ASSERT_EQUALS(std::numeric_limits<long long>::min(),
+                      MathLib::toBigUNumber(std::to_string(std::numeric_limits<long long>::min())));
+        ASSERT_EQUALS(std::numeric_limits<long long>::max(),
+                      MathLib::toBigUNumber(std::to_string(std::numeric_limits<long long>::max())));
+        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::min(),
+                      MathLib::toBigUNumber(std::to_string(std::numeric_limits<unsigned long long>::min())));
+        ASSERT_EQUALS(std::numeric_limits<unsigned long long>::max(),
+                      MathLib::toBigUNumber(std::to_string(std::numeric_limits<unsigned long long>::max())));
 
         // min/max and out-of-bounds - hex
         {
-            const MathLib::biguint u = 0xFFFFFFFFFFFFFFFF;
-            ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
-            ASSERT_EQUALS(u, MathLib::toULongNumber("0xFFFFFFFFFFFFFFFF"));
+            constexpr MathLib::biguint u = 0xFFFFFFFFFFFFFFFF;
+            ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
+            ASSERT_EQUALS(u, MathLib::toBigUNumber("0xFFFFFFFFFFFFFFFF"));
         }
         {
-            const MathLib::biguint u = -0xFFFFFFFFFFFFFFFF;
-            ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
-            ASSERT_EQUALS(u, MathLib::toULongNumber("-0xFFFFFFFFFFFFFFFF"));
+            constexpr MathLib::biguint u = -0xFFFFFFFFFFFFFFFF;
+            ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
+            ASSERT_EQUALS(u, MathLib::toBigUNumber("-0xFFFFFFFFFFFFFFFF"));
         }
 
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("0x10000000000000000"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: 0x10000000000000000");
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("-0x10000000000000000"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: -0x10000000000000000");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("0x10000000000000000"), INTERNAL, "Internal Error. MathLib::toBigUNumber: out_of_range: 0x10000000000000000");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("-0x10000000000000000"), INTERNAL, "Internal Error. MathLib::toBigUNumber: out_of_range: -0x10000000000000000");
 
         // min/max and out-of-bounds - octal
         {
-            const MathLib::biguint u = 01777777777777777777777;
-            ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
-            ASSERT_EQUALS(u, MathLib::toULongNumber("01777777777777777777777"));
+            constexpr MathLib::biguint u = 01777777777777777777777;
+            ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
+            ASSERT_EQUALS(u, MathLib::toBigUNumber("01777777777777777777777"));
         }
         {
-            const MathLib::biguint u = -01777777777777777777777;
-            ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
-            ASSERT_EQUALS(u, MathLib::toULongNumber("-01777777777777777777777"));
+            constexpr MathLib::biguint u = -01777777777777777777777;
+            ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
+            ASSERT_EQUALS(u, MathLib::toBigUNumber("-01777777777777777777777"));
         }
 
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("02000000000000000000000"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: 02000000000000000000000");
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("-02000000000000000000000"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: -02000000000000000000000");
+        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
+        // min/max and out-of-range - decimal
         {
-            const MathLib::biguint u = 18446744073709551615;
-            ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
-            ASSERT_EQUALS(u, MathLib::toULongNumber("18446744073709551615"));
+            constexpr MathLib::biguint u = 18446744073709551615ULL;
+            ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
+            ASSERT_EQUALS(u, MathLib::toBigUNumber("18446744073709551615"));
         }
         {
-            const MathLib::biguint u = -18446744073709551615;
-            ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
-            ASSERT_EQUALS(u, MathLib::toULongNumber("-18446744073709551615"));
+            constexpr MathLib::biguint u = -18446744073709551615ULL;
+            ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
+            ASSERT_EQUALS(u, MathLib::toBigUNumber("-18446744073709551615"));
         }
 
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("18446744073709551616"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: 18446744073709551616");
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("-18446744073709551616"), InternalError, "Internal Error. MathLib::toULongNumber: 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_EQUALS(MathLib::toULongNumber("invalid"), InternalError, "Internal Error. MathLib::toULongNumber: invalid_argument: invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("invalid"), INTERNAL, "Internal Error. MathLib::toBigUNumber: invalid_argument: invalid");
 
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("1invalid"), InternalError, "Internal Error. MathLib::toULongNumber: input was not completely consumed: 1invalid");
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("1 invalid"), InternalError, "Internal Error. MathLib::toULongNumber: input was not completely consumed: 1 invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toBigUNumber: input was not completely consumed: 1invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("1 invalid"), INTERNAL, "Internal Error. MathLib::toBigUNumber: input was not completely consumed: 1 invalid");
+
+        {
+            TokenList list{settingsDefault, Standards::Language::C};
+            list.appendFileIfNew("test.c");
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            auto *tok = new Token(list, std::move(tokensFrontBack));
+            tok->str("invalid");
+            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber(tok), INTERNAL, "Internal Error. MathLib::toBigUNumber: invalid_argument: invalid");
+            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toBigUNumber("invalid", tok), INTERNAL, "Internal Error. MathLib::toBigUNumber: invalid_argument: invalid");
+            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
@@ -637,47 +671,60 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS_DOUBLE(0.0625, MathLib::toDoubleNumber("0x.1P0"), 0.000001);
 
         // from char
-        ASSERT_EQUALS_DOUBLE((double)('A'),    MathLib::toDoubleNumber("'A'"), 0.000001);
-        ASSERT_EQUALS_DOUBLE((double)('\x10'), MathLib::toDoubleNumber("'\\x10'"), 0.000001);
-        ASSERT_EQUALS_DOUBLE((double)('\100'), MathLib::toDoubleNumber("'\\100'"), 0.000001);
-        ASSERT_EQUALS_DOUBLE((double)('\200'), MathLib::toDoubleNumber("'\\200'"), 0.000001);
-        ASSERT_EQUALS_DOUBLE((double)(L'A'),   MathLib::toDoubleNumber("L'A'"), 0.000001);
-
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("invalid"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
-
-#ifdef _LIBCPP_VERSION
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1invalid"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.1invalid"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid");
+        ASSERT_EQUALS_DOUBLE(static_cast<double>('A'),    MathLib::toDoubleNumber("'A'"), 0.000001);
+        ASSERT_EQUALS_DOUBLE(static_cast<double>('\x10'), MathLib::toDoubleNumber("'\\x10'"), 0.000001);
+        ASSERT_EQUALS_DOUBLE(static_cast<double>('\100'), MathLib::toDoubleNumber("'\\100'"), 0.000001);
+        ASSERT_EQUALS_DOUBLE(static_cast<double>('\200'), MathLib::toDoubleNumber("'\\200'"), 0.000001);
+        ASSERT_EQUALS_DOUBLE(static_cast<double>(L'A'),   MathLib::toDoubleNumber("L'A'"), 0.000001);
+
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
+
+        // 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
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1invalid"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1invalid");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.1invalid"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.1invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.1invalid");
 #endif
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1 invalid"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1 invalid");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("-1e-08.0"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: -1e-08.0");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1 invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1 invalid");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("-1e-08.0"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: -1e-08.0");
 
         // invalid suffices
 #ifdef _LIBCPP_VERSION
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1f"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1f");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1F"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1F");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.ff"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.ff");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.FF"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.FF");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.0ff"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.0ff");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.0FF"), InternalError, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.0FF");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1f"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1f");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1F"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1F");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.ff"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.ff");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.FF"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.FF");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.0ff"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.0ff");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.0FF"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.0FF");
 #else
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1f"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1f");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1F"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1F");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.ff"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.ff");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.FF"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.FF");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.0ff"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0ff");
-        ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.0FF"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0FF");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1f"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1f");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1F"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1F");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.ff"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.ff");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.FF"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.FF");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.0ff"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0ff");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.0FF"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0FF");
 #endif
         // TODO: needs to fail
-        //ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.ll"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.ll");
-        //ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.0LL"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0LL");
-        //ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.0ll"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0ll");
-        //ASSERT_THROW_EQUALS(MathLib::toDoubleNumber("1.0LL"), InternalError, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0LL");
+        //ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.ll"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.ll");
+        //ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.0LL"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0LL");
+        //ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.0ll"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0ll");
+        //ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.0LL"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1.0LL");
+
+        {
+            TokenList list{settingsDefault, Standards::Language::C};
+            list.appendFileIfNew("test.c");
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            auto *tok = new Token(list, std::move(tokensFrontBack));
+            tok->str("invalid");
+            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber(tok), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
+            ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("invalid", tok), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
+            TokenList::deleteTokens(tok);
+        }
 
         // verify: string --> double --> string conversion
+        // TODO: add L, min/max
         ASSERT_EQUALS("1.0",  MathLib::toString(MathLib::toDoubleNumber("1.0f")));
         ASSERT_EQUALS("1.0",  MathLib::toString(MathLib::toDoubleNumber("1.0")));
         ASSERT_EQUALS("0.0",  MathLib::toString(MathLib::toDoubleNumber("0.0f")));
@@ -693,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 {
@@ -1455,41 +1504,12 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("0.0", MathLib::toString(0.0));
         ASSERT_EQUALS("0.0", MathLib::toString(+0.0));
         ASSERT_EQUALS("0.0", MathLib::toString(-0.0));
-        // float (trailing f or F)
-        ASSERT_EQUALS("0.000000", MathLib::toString(0.0f));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0f));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0f));
-        ASSERT_EQUALS("0.000000", MathLib::toString(0.0F));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0F));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0F));
-        // double (tailing l or L)
-        ASSERT_EQUALS("0.000000",  MathLib::toString(0.0l));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0l));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0l));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(0.0L));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0L));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0L));
 
         ASSERT_EQUALS("1e-08", MathLib::toString(0.00000001));
         ASSERT_EQUALS("-1e-08", MathLib::toString(-0.00000001));
-    }
 
-    void CPP14DigitSeparators() const { // Ticket #7137, #7565
-        ASSERT(MathLib::isDigitSeparator("'", 0) == false);
-        ASSERT(MathLib::isDigitSeparator("123'0;", 3));
-        ASSERT(MathLib::isDigitSeparator("foo(1'2);", 5));
-        ASSERT(MathLib::isDigitSeparator("foo(1,1'2);", 7));
-        ASSERT(MathLib::isDigitSeparator("int a=1'234-1'2-'0';", 7));
-        ASSERT(MathLib::isDigitSeparator("int a=1'234-1'2-'0';", 13));
-        ASSERT(MathLib::isDigitSeparator("int a=1'234-1'2-'0';", 16) == false);
-        ASSERT(MathLib::isDigitSeparator("int b=1+9'8;", 9));
-        ASSERT(MathLib::isDigitSeparator("if (1'2) { char c = 'c'; }", 5));
-        ASSERT(MathLib::isDigitSeparator("if (120%1'2) { char c = 'c'; }", 9));
-        ASSERT(MathLib::isDigitSeparator("if (120&1'2) { char c = 'c'; }", 9));
-        ASSERT(MathLib::isDigitSeparator("if (120|1'2) { char c = 'c'; }", 9));
-        ASSERT(MathLib::isDigitSeparator("if (120%1'2) { char c = 'c'; }", 24) == false);
-        ASSERT(MathLib::isDigitSeparator("if (120%1'2) { char c = 'c'; }", 26) == false);
-        ASSERT(MathLib::isDigitSeparator("0b0000001'0010'01110", 14));
+        ASSERT_EQUALS("2.22507385851e-308", MathLib::toString(std::numeric_limits<double>::min()));
+        ASSERT_EQUALS("1.79769313486e+308", MathLib::toString(std::numeric_limits<double>::max()));
     }
 };
 
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 2684e5b04cd..406f46de902 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-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
@@ -18,44 +18,33 @@
 
 #include "checkmemoryleak.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
 #include "symboldatabase.h"
-#include "fixture.h"
 #include "token.h"
-#include "tokenize.h"
 
+#include <cstddef>
 #include <list>
-#include <sstream> // IWYU pragma: keep
-#include <string>
-
-class TestMemleakInClass;
-class TestMemleakNoVar;
-class TestMemleakStructMember;
 
-
-class TestMemleak : private TestFixture {
+class TestMemleak : public TestFixture {
 public:
     TestMemleak() : TestFixture("TestMemleak") {}
 
 private:
-    const Settings settings;
-
     void run() override {
         TEST_CASE(testFunctionReturnType);
         TEST_CASE(open);
     }
 
-#define functionReturnType(code) functionReturnType_(code, __FILE__, __LINE__)
-    CheckMemoryLeak::AllocType functionReturnType_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define functionReturnType(...) functionReturnType_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    CheckMemoryLeak::AllocType functionReturnType_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        const CheckMemoryLeak c(&tokenizer, this, &settings);
+        const CheckMemoryLeak c(&tokenizer, this, &settingsDefault);
 
         return (c.functionReturnType)(&tokenizer.getSymbolDatabase()->scopeList.front().functionList.front());
     }
@@ -100,16 +89,12 @@ class TestMemleak : private TestFixture {
                             "  }\n"
                             "};\n";
 
-        // Clear the error buffer..
-        errout.str("");
-
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // there is no allocation
         const Token *tok = Token::findsimplematch(tokenizer.tokens(), "ret =");
-        const CheckMemoryLeak check(&tokenizer, nullptr, &settings);
+        const CheckMemoryLeak check(&tokenizer, nullptr, &settingsDefault);
         ASSERT_EQUALS(CheckMemoryLeak::No, check.getAllocationType(tok->tokAt(2), 1));
     }
 };
@@ -128,14 +113,11 @@ class TestMemleakInFunction : public TestFixture {
     const Settings settings = settingsBuilder().library("std.cfg").library("posix.cfg").build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &settings, this);
@@ -144,6 +126,7 @@ class TestMemleakInFunction : public TestFixture {
 
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(realloc1);
         TEST_CASE(realloc2);
         TEST_CASE(realloc3);
@@ -167,7 +150,6 @@ class TestMemleakInFunction : public TestFixture {
         TEST_CASE(realloc22);
         TEST_CASE(realloc23);
         TEST_CASE(realloc24); // #9228
-        TEST_CASE(reallocarray1);
     }
 
     void realloc1() {
@@ -176,7 +158,7 @@ class TestMemleakInFunction : public TestFixture {
               "    char *a = (char *)malloc(10);\n"
               "    a = realloc(a, 100);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
     void realloc2() {
@@ -187,7 +169,7 @@ class TestMemleakInFunction : public TestFixture {
               "    free(a);\n"
               "}");
 
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
     void realloc3() {
@@ -199,7 +181,7 @@ class TestMemleakInFunction : public TestFixture {
               "    free(a);\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc4() {
@@ -212,8 +194,8 @@ class TestMemleakInFunction : public TestFixture {
               "}");
 
         TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: a\n",
-                           "[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n",
-                           errout.str());
+                           "[test.cpp:4:10]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n",
+                           errout_str());
     }
 
     void realloc5() {
@@ -228,7 +210,7 @@ class TestMemleakInFunction : public TestFixture {
               "    else\n"
               "        free(new_buf);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc7() {
@@ -242,7 +224,7 @@ class TestMemleakInFunction : public TestFixture {
               "    free(pData);\n"
               "    return true;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc8() {
@@ -254,7 +236,7 @@ class TestMemleakInFunction : public TestFixture {
               "        m_buf = origBuf;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc9() {
@@ -262,7 +244,7 @@ class TestMemleakInFunction : public TestFixture {
               "{\n"
               "    x = realloc(x,100);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc10() {
@@ -272,7 +254,7 @@ class TestMemleakInFunction : public TestFixture {
               "    pa = realloc(pa, 20);"
               "    exit();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc11() {
@@ -283,7 +265,7 @@ class TestMemleakInFunction : public TestFixture {
               "        error();\n"
               "    usep(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc12() {
@@ -294,7 +276,7 @@ class TestMemleakInFunction : public TestFixture {
               "        return;\n"
               "    free(a);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc13() {
@@ -304,7 +286,7 @@ class TestMemleakInFunction : public TestFixture {
               "    *str = realloc(*str,100);\n"
               "    free (*str);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'str\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Common realloc mistake: \'str\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
     void realloc14() {
@@ -315,7 +297,7 @@ class TestMemleakInFunction : public TestFixture {
               "        error();\n"
               "    usep(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc15() {
@@ -326,7 +308,7 @@ class TestMemleakInFunction : public TestFixture {
               "        return false;\n"
               "    return true;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Common realloc mistake: \'m_options\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Common realloc mistake: \'m_options\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
     void realloc16() {
@@ -336,7 +318,7 @@ class TestMemleakInFunction : public TestFixture {
               "    free(zLine);\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc17() {
@@ -345,7 +327,7 @@ class TestMemleakInFunction : public TestFixture {
               "    void ***a = malloc(sizeof(a));\n"
               "    ***a = realloc(***(a), sizeof(a) * 2);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:8]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
     void realloc18() {
@@ -354,7 +336,7 @@ class TestMemleakInFunction : public TestFixture {
               "    void *a = malloc(sizeof(a));\n"
               "    a = realloc((void*)a, sizeof(a) * 2);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
     void realloc19() {
@@ -363,7 +345,7 @@ class TestMemleakInFunction : public TestFixture {
               "    void *a = malloc(sizeof(a));\n"
               "    a = (realloc((void*)((a)), sizeof(a) * 2));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure [memleakOnRealloc]\n", errout_str());
     }
 
     void realloc20() {
@@ -372,7 +354,7 @@ class TestMemleakInFunction : public TestFixture {
               "    void *a = malloc(sizeof(a));\n"
               "    a = realloc((a) + 1, sizeof(a) * 2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc21() {
@@ -383,7 +365,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (bs == NULL) return bs0;\n"
               "    return bs;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc22() {
@@ -394,7 +376,7 @@ class TestMemleakInFunction : public TestFixture {
               "    if (bs == NULL) return;\n"
               "    *bsp = bs;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc23() {
@@ -405,7 +387,7 @@ class TestMemleakInFunction : public TestFixture {
               "        return;\n"
               "    s->cigar = cigar;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void realloc24() { // #9228
@@ -413,37 +395,28 @@ class TestMemleakInFunction : public TestFixture {
               "void *a = NULL;\n"
               "a = realloc(a, 20);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "void *a = NULL;\n"
               "a = malloc(10);\n"
               "a = realloc(a, 20);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        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 = std::nullptr;\n"
+              "void *a = nullptr;\n"
               "a = malloc(10);\n"
               "a = realloc(a, 20);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common realloc mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
-    }
-
-    void reallocarray1() {
-        check("void foo()\n"
-              "{\n"
-              "    char *a = (char *)malloc(10);\n"
-              "    a = reallocarray(a, 100, 2);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Common reallocarray mistake: \'a\' nulled but not freed upon failure\n", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
@@ -467,14 +440,11 @@ class TestMemleakInClass : public TestFixture {
      * Tokenize and execute leak check for given code
      * @param code Source code
      */
-    void check_(const char* file, int line, const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &settings, this);
@@ -482,6 +452,7 @@ class TestMemleakInClass : public TestFixture {
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(class1);
         TEST_CASE(class2);
         TEST_CASE(class3);
@@ -543,7 +514,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete [] str2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage.\n", errout.str());
+        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"
               "{\n"
@@ -561,7 +532,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete [] str2;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
     void class2() {
@@ -583,7 +554,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    free(str1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:17]: (error) Mismatching allocation and deallocation: Fred::str1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:17:5]: (error) Mismatching allocation and deallocation: Fred::str1 [mismatchAllocDealloc]\n", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -599,7 +570,7 @@ class TestMemleakInClass : public TestFixture {
               "        free(str1);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:12]: (error) Mismatching allocation and deallocation: Fred::str1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:9]: (error) Mismatching allocation and deallocation: Fred::str1 [mismatchAllocDealloc]\n", errout_str());
     }
 
     void class3() {
@@ -636,7 +607,7 @@ class TestMemleakInClass : public TestFixture {
               "    }\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Token;\n"
               "\n"
@@ -665,7 +636,7 @@ class TestMemleakInClass : public TestFixture {
               "    }\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class4() {
@@ -688,7 +659,7 @@ class TestMemleakInClass : public TestFixture {
               "    ABC *p = new ABC;\n"
               "    addAbc( p );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct ABC;\n"
               "class Fred\n"
@@ -705,7 +676,7 @@ class TestMemleakInClass : public TestFixture {
               "        addAbc( p );\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class6() {
@@ -721,7 +692,7 @@ class TestMemleakInClass : public TestFixture {
               "    delete [] str;\n"
               "    hello();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -733,7 +704,7 @@ class TestMemleakInClass : public TestFixture {
               "        hello();\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class7() {
@@ -753,7 +724,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete this->i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -768,7 +739,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete this->i;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class8() {
@@ -785,7 +756,7 @@ class TestMemleakInClass : public TestFixture {
               "    delete c;\n"
               "    doNothing(c);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -798,7 +769,7 @@ class TestMemleakInClass : public TestFixture {
               "    }\n"
               "    void doNothing() { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class9() {
@@ -815,7 +786,7 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "A::~A()\n"
               "{ delete (p); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -826,7 +797,7 @@ class TestMemleakInClass : public TestFixture {
               "    ~A()\n"
               "    { delete (p); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class10() {
@@ -838,7 +809,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "A::A()\n"
               "{ p = new int; }");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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"
               "{\n"
@@ -846,7 +817,7 @@ class TestMemleakInClass : public TestFixture {
               "    int * p;\n"
               "    A() { p = new int; }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
     void class11() {
@@ -857,7 +828,7 @@ class TestMemleakInClass : public TestFixture {
               "    A() : p(new int[10])\n"
               "    { }"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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"
               "{\n"
@@ -867,7 +838,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "A::A() : p(new int[10])\n"
               "{ }");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
     void class12() {
@@ -889,7 +860,7 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "void A::cleanup()\n"
               "{ delete [] p; }");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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"
               "{\n"
@@ -903,7 +874,7 @@ class TestMemleakInClass : public TestFixture {
               "    void cleanup()\n"
               "    { delete [] p; }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
     void class13() {
@@ -925,7 +896,7 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "void A::foo()\n"
               "{ p = new int[10]; delete [] p; }");
-        ASSERT_EQUALS("[test.cpp:17]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n", errout.str());
+        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"
               "{\n"
@@ -939,7 +910,7 @@ class TestMemleakInClass : public TestFixture {
               "    void foo()\n"
               "    { p = new int[10]; delete [] p; }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:11]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n", errout.str());
+        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());
     }
 
     void class14() {
@@ -952,8 +923,8 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "void A::init()\n"
               "{ p = new int[10]; }");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n"
-                      "[test.cpp:3]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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());
 
         check("class A\n"
               "{\n"
@@ -962,8 +933,8 @@ class TestMemleakInClass : public TestFixture {
               "    void init()\n"
               "    { p = new int[10]; }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n"
-                      "[test.cpp:3]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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());
 
 
         check("class A\n"
@@ -975,8 +946,8 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "void A::init()\n"
               "{ p = new int; }");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n"
-                      "[test.cpp:3]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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());
 
         check("class A\n"
               "{\n"
@@ -985,8 +956,8 @@ class TestMemleakInClass : public TestFixture {
               "    void init()\n"
               "    { p = new int; }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n"
-                      "[test.cpp:3]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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());
 
 
         check("class A\n"
@@ -998,8 +969,8 @@ class TestMemleakInClass : public TestFixture {
               "\n"
               "void A::init()\n"
               "{ p = malloc(sizeof(int)*10); }");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n"
-                      "[test.cpp:3]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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());
 
         check("class A\n"
               "{\n"
@@ -1008,8 +979,8 @@ class TestMemleakInClass : public TestFixture {
               "    void init()\n"
               "    { p = malloc(sizeof(int)*10); }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Possible leak in public function. The pointer 'p' is not deallocated before it is allocated.\n"
-                      "[test.cpp:3]: (style) Class 'A' is unsafe, 'A::p' can leak by wrong usage.\n", errout.str());
+        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());
     }
 
     void class15() {
@@ -1022,7 +993,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "A::A()\n"
               "{ p = new int[10]; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -1032,7 +1003,7 @@ class TestMemleakInClass : public TestFixture {
               "    { p = new int[10]; }\n"
               "    ~A() { delete [] p; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("class A\n"
@@ -1044,7 +1015,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "A::A()\n"
               "{ p = new int; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -1054,7 +1025,7 @@ class TestMemleakInClass : public TestFixture {
               "    { p = new int; }\n"
               "    ~A() { delete p; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("class A\n"
@@ -1066,7 +1037,7 @@ class TestMemleakInClass : public TestFixture {
               "};\n"
               "A::A()\n"
               "{ p = malloc(sizeof(int)*10); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A\n"
               "{\n"
@@ -1076,7 +1047,7 @@ class TestMemleakInClass : public TestFixture {
               "    { p = malloc(sizeof(int)*10); }\n"
               "    ~A() { free(p); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class16() {
@@ -1089,7 +1060,7 @@ class TestMemleakInClass : public TestFixture {
               "    A() { a = b = new int[10]; }\n"
               "    ~A() { delete [] a; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class17() {
@@ -1106,7 +1077,7 @@ class TestMemleakInClass : public TestFixture {
               "    A::pd = new char[12];\n"
               "    delete [] A::pd;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated.\n", errout.str());
+        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"
               "private:\n"
@@ -1118,7 +1089,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete [] pd;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated.\n", errout.str());
+        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"
               "private:\n"
@@ -1132,7 +1103,7 @@ class TestMemleakInClass : public TestFixture {
               "    pd = new char[12];\n"
               "    delete [] pd;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Possible leak in public function. The pointer 'pd' is not deallocated before it is allocated.\n", errout.str());
+        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());
     }
 
     void class18() {
@@ -1148,7 +1119,7 @@ class TestMemleakInClass : public TestFixture {
               "private:\n"
               "  char *a;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class  A : public x\n"
               "{\n"
@@ -1162,7 +1133,7 @@ class TestMemleakInClass : public TestFixture {
               "  a = new char[10];\n"
               "  foo(a);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class19() {
@@ -1180,7 +1151,7 @@ class TestMemleakInClass : public TestFixture {
               "    rp1 = new TRadioButton(this);\n"
               "    rp2 = new TRadioButton(this);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class TRadioButton { };\n"
               "class Foo\n"
@@ -1196,8 +1167,8 @@ class TestMemleakInClass : public TestFixture {
               "    rp1 = new TRadioButton;\n"
               "    rp2 = new TRadioButton;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Class 'Foo' is unsafe, 'Foo::rp1' can leak by wrong usage.\n"
-                      "[test.cpp:6]: (style) Class 'Foo' is unsafe, 'Foo::rp2' can leak by wrong usage.\n", errout.str());
+        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());
 
         check("class TRadioButton { };\n"
               "class Foo\n"
@@ -1219,7 +1190,7 @@ class TestMemleakInClass : public TestFixture {
               "    delete rp1;\n"
               "    delete rp2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class20() {
@@ -1241,7 +1212,7 @@ class TestMemleakInClass : public TestFixture {
               "        }\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage.\n", errout.str());
+        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"
               "    class Fred\n"
@@ -1265,7 +1236,7 @@ class TestMemleakInClass : public TestFixture {
               "        delete [] str2;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage.\n", errout.str());
+        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"
               "    class Fred\n"
@@ -1288,7 +1259,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete [] str2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage.\n", errout.str());
+        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"
               "    namespace ns2 {\n"
@@ -1313,7 +1284,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete [] str2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage.\n", errout.str());
+        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"
               "    namespace ns2 {\n"
@@ -1340,7 +1311,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete [] str2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:23]: (style) Class 'Fred' is unsafe, 'Fred::str1' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
     void class21() { // ticket #2517
@@ -1357,10 +1328,10 @@ class TestMemleakInClass : public TestFixture {
               "public:\n"
               "    A() : b(new B()), c(new C(b)) { }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:9]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage.\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]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage.\n",
-                           errout.str());
+                           "[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n",
+                           errout_str());
 
         check("struct B { };\n"
               "struct C\n"
@@ -1379,10 +1350,10 @@ class TestMemleakInClass : public TestFixture {
               "       c = new C(b);\n"
               "    }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:9]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage.\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]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage.\n",
-                           errout.str());
+                           "[test.cpp:9:8]: (style) Class 'A' is unsafe, 'A::b' can leak by wrong usage. [unsafeClassCanLeak]\n",
+                           errout_str());
     }
 
     void class22() { // ticket #3012 - false positive
@@ -1393,7 +1364,7 @@ class TestMemleakInClass : public TestFixture {
               "    Fred() { a = new int; }\n"
               "    ~Fred() { (delete(a), (a)=NULL); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class23() { // ticket #3303 - false positive
@@ -1412,7 +1383,7 @@ class TestMemleakInClass : public TestFixture {
               "private:\n"
               "    CDataImpl *m_impl;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class24() { // ticket #3806 - false positive in copy constructor
@@ -1423,7 +1394,7 @@ class TestMemleakInClass : public TestFixture {
               "    Fred(const Fred &fred) { a = new int; }\n"
               "    ~Fred() { delete a; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class25() { // ticket #4367 - false positive when implementation for destructor is not seen
@@ -1434,7 +1405,7 @@ class TestMemleakInClass : public TestFixture {
               "    Fred() { a = new int; }\n"
               "    ~Fred();\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void class26() { // ticket #10789 - crash
@@ -1445,7 +1416,7 @@ class TestMemleakInClass : public TestFixture {
               "    C* p;\n"
               "};\n"
               "S::~S() = default;\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Class 'S' is unsafe, 'S::p' can leak by wrong usage.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:8]: (style) Class 'S' is unsafe, 'S::p' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
     void class27() { // ticket #8126 - array of pointers
@@ -1456,7 +1427,7 @@ class TestMemleakInClass : public TestFixture {
               "    }\n"
               "    char* a[5];\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Class 'S' is unsafe, 'S::a' can leak by wrong usage.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:11]: (style) Class 'S' is unsafe, 'S::a' can leak by wrong usage. [unsafeClassCanLeak]\n", errout_str());
     }
 
     void staticvar() {
@@ -1471,7 +1442,7 @@ class TestMemleakInClass : public TestFixture {
               "            p = new int[100];\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1503,7 +1474,7 @@ class TestMemleakInClass : public TestFixture {
               "{\n"
               "    delete tok;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Global function
         check("void deleteTokens(int *tok)\n"
@@ -1530,7 +1501,7 @@ class TestMemleakInClass : public TestFixture {
               "    deleteTokens(_tokens);\n"
               "    _tokens = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void mismatch1() {
@@ -1555,7 +1526,7 @@ class TestMemleakInClass : public TestFixture {
               "A::~A() {\n"
               "    delete [] pkt_buffer;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:14]: (error) Mismatching allocation and deallocation: A::pkt_buffer\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:14:9]: (error) Mismatching allocation and deallocation: A::pkt_buffer [mismatchAllocDealloc]\n", errout_str());
 
         check("struct S {\n" // 5678
               "    ~S();\n"
@@ -1567,7 +1538,7 @@ class TestMemleakInClass : public TestFixture {
               "    delete p;\n"
               "    p = 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Mismatching allocation and deallocation: S::p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Mismatching allocation and deallocation: S::p [mismatchAllocDealloc]\n", errout_str());
     }
 
     void mismatch2() { // #5659
@@ -1591,8 +1562,8 @@ class TestMemleakInClass : public TestFixture {
               "  delete data_;\n"
               "  data_ = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:17]: (warning) Possible leak in public function. The pointer 'data_' is not deallocated before it is allocated.\n"
-                      "[test.cpp:18]: (error) Mismatching allocation and deallocation: Foo::data_\n", errout.str());
+        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());
 
         check("namespace NS\n"
               "{\n"
@@ -1614,8 +1585,8 @@ class TestMemleakInClass : public TestFixture {
               "  delete data_;\n"
               "  data_ = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:17]: (warning) Possible leak in public function. The pointer 'data_' is not deallocated before it is allocated.\n"
-                      "[test.cpp:18]: (error) Mismatching allocation and deallocation: Foo::data_\n", errout.str());
+        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());
     }
 
     void func1() {
@@ -1629,7 +1600,7 @@ class TestMemleakInClass : public TestFixture {
               "    void xy()\n"
               "    { s = malloc(100); }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated.\n", errout.str());
+        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"
               "{\n"
@@ -1641,7 +1612,7 @@ class TestMemleakInClass : public TestFixture {
               "private:\n"
               "    char *s;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated.\n", errout.str());
+        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());
     }
 
     void func2() {
@@ -1655,7 +1626,7 @@ class TestMemleakInClass : public TestFixture {
               "    const Fred & operator = (const Fred &f)\n"
               "    { s = malloc(100); }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:9]: (warning) Possible leak in public function. The pointer 's' is not deallocated before it is allocated.\n", errout.str());
+        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());
     }
 };
 
@@ -1674,14 +1645,11 @@ class TestMemleakStructMember : public TestFixture {
 private:
     const Settings settings = settingsBuilder().library("std.cfg").library("posix.cfg").build();
 
-    void check_(const char* file, int line, const char code[], bool isCPP = true) {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], bool cpp = true) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, isCPP ? "test.cpp" : "test.c"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakStructMember checkMemoryLeakStructMember(&tokenizer, &settings, this);
@@ -1689,6 +1657,7 @@ class TestMemleakStructMember : public TestFixture {
     }
 
     void run() override {
+        mNewTemplate = true;
         // testing that errors are detected
         TEST_CASE(err);
 
@@ -1704,6 +1673,7 @@ class TestMemleakStructMember : public TestFixture {
         TEST_CASE(assign2);
         TEST_CASE(assign3);
         TEST_CASE(assign4); // #11019
+        TEST_CASE(assign5);
 
         // Failed allocation
         TEST_CASE(failedAllocation);
@@ -1747,14 +1717,14 @@ class TestMemleakStructMember : public TestFixture {
               "    abc->a = malloc(10);\n"
               "    free(abc);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: abc.a\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: abc.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static ABC * foo()\n"
               "{\n"
@@ -1767,7 +1737,7 @@ class TestMemleakStructMember : public TestFixture {
               "    }\n"
               "    return abc;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Memory leak: abc.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:9]: (error) Memory leak: abc.a [memleak]\n", errout_str());
 
         check("static void foo(int a)\n"
               "{\n"
@@ -1779,7 +1749,7 @@ class TestMemleakStructMember : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) Memory leak: abc.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
     void goto_() {
@@ -1795,7 +1765,7 @@ class TestMemleakStructMember : public TestFixture {
               "    free(abc->a);\n"
               "    free(abc);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ret1() {
@@ -1805,13 +1775,13 @@ class TestMemleakStructMember : public TestFixture {
               "    abc->a = malloc(10);\n"
               "    return abc;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("static void foo(struct ABC *abc)\n"
               "{\n"
               "    abc->a = malloc(10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7302
         check("void* foo() {\n"
@@ -1819,14 +1789,14 @@ class TestMemleakStructMember : public TestFixture {
               "    abc.a = malloc(10);\n"
               "    return abc.a;\n"
               "}", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "    struct ABC abc;\n"
               "    abc.a = malloc(10);\n"
               "    return abc.b;\n"
               "}", false);
-        ASSERT_EQUALS("[test.c:4]: (error) Memory leak: abc.a\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:5]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
     void ret2() {
@@ -1836,7 +1806,7 @@ class TestMemleakStructMember : public TestFixture {
               "    abc->a = malloc(10);\n"
               "    return &abc->self;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign1() {
@@ -1845,7 +1815,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = abc1;\n"
               "    abc->a = malloc(10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
               "{\n"
@@ -1853,7 +1823,7 @@ class TestMemleakStructMember : public TestFixture {
               "    abc1 = abc = malloc(sizeof(ABC));\n"
               "    abc->a = malloc(10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
               "{\n"
@@ -1862,7 +1832,7 @@ class TestMemleakStructMember : public TestFixture {
               " ptr->msn = malloc(100);\n"
               " back = ptr;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -1871,7 +1841,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC *abc = malloc(123);\n"
               "    abc->a = abc->b = malloc(10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign3() {
@@ -1880,7 +1850,7 @@ class TestMemleakStructMember : public TestFixture {
               "    f2.a = malloc(100);\n"
               "    *f1 = f2;\n"
               "}", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign4() {
@@ -1891,19 +1861,19 @@ class TestMemleakStructMember : public TestFixture {
               "    ((s).b) = open(\"xx.log\", O_RDONLY);\n"
               "    (&s)->c = open(\"xx.log\", O_RDONLY);\n"
               "}\n", false);
-        ASSERT_EQUALS("[test.c:7]: (error) Memory leak: s.a\n"
-                      "[test.c:7]: (error) Memory leak: s.b\n"
-                      "[test.c:7]: (error) Memory leak: s.c\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.c:7:1]: (error) Resource leak: s.a [resourceLeak]\n"
+                      "[test.c:7:1]: (error) Resource leak: s.b [resourceLeak]\n"
+                      "[test.c:7:1]: (error) Resource leak: s.c [resourceLeak]\n",
+                      errout_str());
 
         check("struct S { int *p, *q; };\n" // #7705
               "void f(S s) {\n"
               "    s.p = new int[10];\n"
               "    s.q = malloc(40);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Memory leak: s.p\n"
-                      "[test.cpp:5]: (error) Memory leak: s.q\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:1]: (error) Memory leak: s.p [memleak]\n"
+                      "[test.cpp:5:1]: (error) Memory leak: s.q [memleak]\n",
+                      errout_str());
 
         check("struct S** f(struct S** s) {\n" // don't throw
               "    struct S** ret = malloc(sizeof(*ret));\n"
@@ -1911,12 +1881,12 @@ class TestMemleakStructMember : public TestFixture {
               "    ret[0]->g = strdup(s[0]->g);\n"
               "    return ret;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void run_rcmd(enum rcommand rcmd, rsh_session *sess, char *cmd) {\n"
               "    sess->fp = popen(cmd, rcmd == RSH_PIPE_READ ? \"r\" : \"w\");\n"
               "}\n", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { char* a[2]; };\n"
               "enum E { E0, E1 };\n"
@@ -1924,13 +1894,13 @@ class TestMemleakStructMember : public TestFixture {
               "    free(s->a[e]);\n"
               "    s->a[e] = strdup(n);\n"
               "}\n", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(struct S** s, const char* c) {\n"
               "    *s = malloc(sizeof(struct S));\n"
               "    (*s)->value = strdup(c);\n"
               "}\n", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    size_t mpsz;\n"
@@ -1940,14 +1910,49 @@ class TestMemleakStructMember : public TestFixture {
               "    s->mpsz = size;\n"
               "    s->hdr = mmap(NULL, s->mpsz, PROT_READ, MAP_SHARED, fd, 0);\n"
               "}\n", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(type_t t) {\n"
               "    t->p = malloc(10);\n"
               "    t->x.p = malloc(10);\n"
               "    t->y[2].p = malloc(10);\n"
               "}\n", false);
-        ASSERT_EQUALS("", errout.str());
+        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 failedAllocation() {
@@ -1962,7 +1967,7 @@ class TestMemleakStructMember : public TestFixture {
               "    }\n"
               "    return abc;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void function1() {
@@ -1973,7 +1978,7 @@ class TestMemleakStructMember : public TestFixture {
               "    abc->a = malloc(10);\n"
               "    func(abc);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("static void foo()\n"
               "{\n"
@@ -1981,7 +1986,7 @@ class TestMemleakStructMember : public TestFixture {
               "    abclist.push_back(abc);\n"
               "    abc->a = malloc(10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #2848: Taking address in function 'assign'
@@ -1991,7 +1996,7 @@ class TestMemleakStructMember : public TestFixture {
               "  a.foo = (char *) malloc(10);\n"
               "  assign(&a);\n"
               "}", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #3024: kernel list
@@ -2001,7 +2006,7 @@ class TestMemleakStructMember : public TestFixture {
               "  abc.a = (char *) malloc(10);\n"
               "  list_add_tail(&abc->list, head);\n"
               "}", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #3038: deallocating in function
@@ -2012,7 +2017,7 @@ class TestMemleakStructMember : public TestFixture {
               "  abc.a = (char *) malloc(10);\n"
               "  a(abc.a);\n"
               "}", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void function5() {
@@ -2021,21 +2026,21 @@ class TestMemleakStructMember : public TestFixture {
               "    s1->x = malloc(1);\n"
               "    return (s1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("T* f(const char *str) {\n" // #10158
               "    S* s = malloc(sizeof(S));\n"
               "    s->str = strdup(str);\n"
               "    return NewT(s);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typedef struct s { char* str; } attr_t;\n" // #10152
               "attr_t* f(int type) {\n"
@@ -2049,7 +2054,7 @@ class TestMemleakStructMember : public TestFixture {
               "    }\n"
               "    return g(&a);\n"
               "}\n");
-        TODO_ASSERT_EQUALS("", "[test.cpp:9]: (error) Memory leak: a.str\n", errout.str());
+        TODO_ASSERT_EQUALS("", "[test.cpp:9:9]: (error) Memory leak: a.str [memleak]\n", errout_str());
     }
 
     void ifelse() {
@@ -2068,7 +2073,7 @@ class TestMemleakStructMember : public TestFixture {
               "    free(abc->a);\n"
               "    free(abc);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void linkedlist() {
@@ -2084,7 +2089,7 @@ class TestMemleakStructMember : public TestFixture {
               "        abc = next;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void globalvar() {
@@ -2096,7 +2101,7 @@ class TestMemleakStructMember : public TestFixture {
               "    abc->a = malloc(10);\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Ticket #933 Leaks with struct members not detected
@@ -2116,12 +2121,12 @@ class TestMemleakStructMember : public TestFixture {
                              "}";
 
         check(code1, true);
-        ASSERT_EQUALS("[test.cpp:12]: (error) Memory leak: a.f\n"
-                      "[test.cpp:12]: (error) Memory leak: a.c\n"
-                      "[test.cpp:12]: (error) Memory leak: a.m\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:1]: (error) Resource leak: a.f [resourceLeak]\n"
+                      "[test.cpp:12:1]: (error) Memory leak: a.c [memleak]\n"
+                      "[test.cpp:12:1]: (error) Memory leak: a.m [memleak]\n", errout_str());
         check(code1, false);
-        ASSERT_EQUALS("[test.c:12]: (error) Memory leak: a.f\n"
-                      "[test.c:12]: (error) Memory leak: a.m\n", errout.str());
+        ASSERT_EQUALS("[test.c:12:1]: (error) Resource leak: a.f [resourceLeak]\n"
+                      "[test.c:12:1]: (error) Memory leak: a.m [memleak]\n", errout_str());
 
         // Test OK case
         const char code2[] = "struct A {\n"
@@ -2141,9 +2146,7 @@ class TestMemleakStructMember : public TestFixture {
                              "}";
 
         check(code2, true);
-        ASSERT_EQUALS("", errout.str());
-        check(code2, false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test unknown struct. In C++, it might have a destructor
         const char code3[] = "void func() {\n"
@@ -2152,9 +2155,9 @@ class TestMemleakStructMember : public TestFixture {
                              "}";
 
         check(code3, true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check(code3, false);
-        ASSERT_EQUALS("[test.c:4]: (error) Memory leak: a.f\n", errout.str());
+        ASSERT_EQUALS("[test.c:4:1]: (error) Resource leak: a.f [resourceLeak]\n", errout_str());
 
         // Test struct with destructor
         const char code4[] = "struct A {\n"
@@ -2167,7 +2170,7 @@ class TestMemleakStructMember : public TestFixture {
                              "}";
 
         check(code4, true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void refvar() { // #8116
@@ -2181,7 +2184,7 @@ class TestMemleakStructMember : public TestFixture {
               "  Test& y = *x;\n"
               "  y.data = malloc(10);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // don't crash
@@ -2191,7 +2194,7 @@ class TestMemleakStructMember : public TestFixture {
               "char *const oldbuffer = otherbuffer.get();\n"
               "int const oldbufsize = otherbufsize;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varid() { // #5201
@@ -2204,7 +2207,7 @@ class TestMemleakStructMember : public TestFixture {
               "  if (s.state_check_buff == 0)\n"
               "    return;\n"
               "}", false);
-        ASSERT_EQUALS("[test.c:9]: (error) Memory leak: s.state_check_buff\n", errout.str());
+        ASSERT_EQUALS("[test.c:9:1]: (error) Memory leak: s.state_check_buff [memleak]\n", errout_str());
     }
 
     void varid_2() { // #5315
@@ -2214,7 +2217,7 @@ class TestMemleakStructMember : public TestFixture {
               "  ((f)->realm) = strdup(realm);\n"
               "  if(f->realm == NULL) {}\n"
               "}", false);
-        ASSERT_EQUALS("[test.c:6]: (error) Memory leak: f.realm\n", errout.str());
+        ASSERT_EQUALS("[test.c:6:1]: (error) Memory leak: f.realm [memleak]\n", errout_str());
     }
 
     void customAllocation() { // #4770
@@ -2225,7 +2228,7 @@ class TestMemleakStructMember : public TestFixture {
               "    struct ABC abc;\n"
               "    abc.a = myalloc();\n"
               "}", false);
-        ASSERT_EQUALS("[test.c:7]: (error) Memory leak: abc.a\n", errout.str());
+        ASSERT_EQUALS("[test.c:7:1]: (error) Memory leak: abc.a [memleak]\n", errout_str());
     }
 
     void lambdaInScope() {
@@ -2241,7 +2244,7 @@ class TestMemleakStructMember : public TestFixture {
             "    delete[] s.p;\n"
             "    return 0;\n"
             "}", true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "struct S { int* p; };\n"
@@ -2251,7 +2254,7 @@ class TestMemleakStructMember : public TestFixture {
             "      s.p = new int;\n"
             "    };\n"
             "}\n", true);
-        ASSERT_EQUALS("[test.cpp:6]: (error) Memory leak: s.p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Memory leak: s.p [memleak]\n", errout_str());
 
         check(
             "struct S { int* p; };\n"
@@ -2270,7 +2273,7 @@ class TestMemleakStructMember : public TestFixture {
             "        delete s.p;\n"
             "    }();\n"
             "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
@@ -2287,14 +2290,11 @@ class TestMemleakNoVar : public TestFixture {
 private:
     const Settings settings = settingsBuilder().certainty(Certainty::inconclusive).severity(Severity::warning).library("std.cfg").library("posix.cfg").build();
 
-    void check_(const char* file, int line, const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for memory leaks..
         CheckMemoryLeakNoVar checkMemoryLeakNoVar(&tokenizer, &settings, this);
@@ -2302,6 +2302,7 @@ class TestMemleakNoVar : public TestFixture {
     }
 
     void run() override {
+        mNewTemplate = true;
         // pass allocated memory to function..
         TEST_CASE(functionParameter);
 
@@ -2324,23 +2325,23 @@ class TestMemleakNoVar : public TestFixture {
         check("void x() {\n"
               "    strcpy(a, strdup(p));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Allocation with strdup, strcpy doesn't release it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char *x() {\n"
               "    return strcpy(malloc(10), \"abc\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void x() {\n"
               "    free(malloc(10));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // user function..
         check("void set_error(const char *msg) {\n"
@@ -2349,7 +2350,7 @@ class TestMemleakNoVar : public TestFixture {
               "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());
+        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"
@@ -2357,74 +2358,74 @@ class TestMemleakNoVar : public TestFixture {
               "    fd = mkstemp(strdup(\"/tmp/file.XXXXXXXX\"));\n"
               "    close(fd);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Allocation with strdup, mkstemp doesn't release it.\n", "", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Allocation with strdup, strcmp doesn't release it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Allocation with strdup, strcmp doesn't release it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Allocation with strdup, strcmp doesn't release it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void x() {\n"
               "    strcpy(a, (void*)strdup(p));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Allocation with strdup, strcpy doesn't release it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char *x() {\n"
               "    char *ret = (char*)strcpy(malloc(10), \"abc\");\n"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    free(malloc(1));\n"
               "    strcpy(a, strdup(p));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Allocation with strdup, strcpy doesn't release it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Allocation with calloc, memcmp doesn't release it.\n"
-                      "[test.cpp:2]: (error) Allocation with strdup, memcmp doesn't release it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int* f(int size) {\n"
               "    return static_cast<int*>(malloc(size));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { if (new int[42]) {} }\n" // #10857
               "void g() { if (malloc(42)) {} }\n");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Allocation with new, if doesn't release it.\n"
-                      "[test.cpp:2]: (error) Allocation with malloc, if doesn't release it.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:16]: (error) Allocation with new, if doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:2:16]: (error) Allocation with malloc, if doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
 
         check("const char* string(const char* s) {\n"
               "    StringSet::iterator it = strings_.find(s);\n"
@@ -2432,7 +2433,7 @@ class TestMemleakNoVar : public TestFixture {
               "        return *it;\n"
               "    return *strings_.insert(it, std::strcpy(new char[std::strlen(s) + 1], s));\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    static void load(const QString& projPath) {\n"
@@ -2444,19 +2445,72 @@ class TestMemleakNoVar : public TestFixture {
               "private:\n"
               "    static Core::ProjectBase* proj_;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string& s, int n) {\n"
               "    std::unique_ptr<char[]> u;\n"
               "    u.reset(strcpy(new char[n], s.c_str()));\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { char* p; };\n"
               "void f(S* s, int N) {\n"
               "    s->p = s->p ? strcpy(new char[N], s->p) : nullptr;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {};\n" // #11866
+              "void f(bool b);\n"
+              "void g() {\n"
+              "    f(new int());\n"
+              "    f(new std::vector<int>());\n"
+              "    f(new S());\n"
+              "    f(new tm());\n"
+              "    f(malloc(sizeof(S)));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Allocation with new, f doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:5:7]: (error) Allocation with new, f doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:6:7]: (error) Allocation with new, f doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:7:7]: (error) Allocation with new, f doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:8:7]: (error) Allocation with malloc, f doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
+
+        check("void f(uintptr_t u);\n"
+              "void g() {\n"
+              "    f((uintptr_t)new int());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(uint8_t u);\n"
+              "void g() {\n"
+              "    f((uint8_t)new int());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:16]: (error) Allocation with new, f doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
+
+        check("void f(int i, T t);\n"
+              "void g(int i, U* u);\n"
+              "void h() {\n"
+              "    f(1, new int());\n"
+              "    g(1, new int());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(T t);\n"
+              "struct U {};\n"
+              "void g() {\n"
+              "    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());
     }
 
     void missingAssignment() {
@@ -2464,31 +2518,25 @@ class TestMemleakNoVar : public TestFixture {
               "{\n"
               "    malloc(10);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'malloc' is not stored.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'calloc' is not stored.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'strdup' is not stored.\n", errout.str());
-
-        check("void x()\n"
-              "{\n"
-              "    reallocarray(NULL, 10, 10);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'reallocarray' is not stored.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'malloc' is not stored.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void x()\n"
               "{\n"
@@ -2496,19 +2544,28 @@ class TestMemleakNoVar : public TestFixture {
               "    foo(ptr);\n"
               "    free(ptr);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f( void ) {\n" // FP: #11246
+              "  void* address = malloc( 1 );\n"
+              "  int ok = address != 0;\n"
+              "  if ( ok )\n"
+              "    free( address ), address = 0;\n"
+              "  return 0;\n"
+              "} ");
+        ASSERT_EQUALS("", errout_str());
 
         check("char** x(const char* str) {\n"
               "    char* ptr[] = { malloc(10), malloc(5), strdup(str) };\n"
               "    return ptr;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void x()\n"
               "{\n"
               "    42,malloc(42);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'malloc' is not stored.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n", errout_str());
 
         check("void *f()\n"
               "{\n"
@@ -2518,7 +2575,7 @@ class TestMemleakNoVar : public TestFixture {
               "{\n"
               "    f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Return value of allocation function 'f' is not stored.\n", errout.str());
+        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
               "{\n"
@@ -2528,7 +2585,7 @@ class TestMemleakNoVar : public TestFixture {
               "{\n"
               "    f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void *f() {\n" // #8848
               "    struct S { void *alloc() { return malloc(10); } };\n"
@@ -2537,26 +2594,26 @@ class TestMemleakNoVar : public TestFixture {
               "{\n"
               "    f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void x()\n"
               "{\n"
               "    if(!malloc(5)) fail();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'malloc' is not stored.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #6536
         check("struct S { S(int) {} };\n"
               "void foo(int i) {\n"
               "  S socket(i);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #6693
         check("struct CTest {\n"
@@ -2566,12 +2623,12 @@ class TestMemleakNoVar : public TestFixture {
               "void CTest::Initialise() {\n"
               "    malloc();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #7348 - cast
               "    p = (::X*)malloc(42);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7182 "crash: CheckMemoryLeak::functionReturnType()"
         check("template<typename... Ts> auto unary_right_comma (Ts... ts) { return (ts , ...); }\n"
@@ -2579,7 +2636,7 @@ class TestMemleakNoVar : public TestFixture {
               "int main() {\n"
               "  unary_right_comma (a);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    new int[10];\n"
@@ -2595,28 +2652,28 @@ class TestMemleakNoVar : public TestFixture {
               "    new int{ 1 };\n"
               "    new uint8_t[4];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:3]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:4]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:5]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:6]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:7]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:8]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:9]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:10]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:11]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:12]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:13]: (error) Return value of allocation function 'new' is not stored.\n",
-                      errout.str());
+        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"
+                      "[test.cpp:5:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:6:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:7:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:8:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:9:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:10:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:11:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:12:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:13:5]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n",
+                      errout_str());
 
         check("void f(int* p) {\n"
               "    new auto('c');\n"
               "    new(p) int;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (error) Return value of allocation function 'new' is not stored.\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",
                            "",
-                           errout.str());
+                           errout_str());
 
         check("void g(int* p) {\n"
               "    new QWidget;\n"
@@ -2650,116 +2707,132 @@ class TestMemleakNoVar : public TestFixture {
               "    C{ new(p) int, 1 };\n"
               "    C{ new QWidget, 1 };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) { if (b && malloc(42)) {} }\n" //  // #10858
               "void g(bool b) { if (b || malloc(42)) {} }\n");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Return value of allocation function 'malloc' is not stored.\n"
-                      "[test.cpp:2]: (error) Return value of allocation function 'malloc' is not stored.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:27]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:2:27]: (error) Return value of allocation function 'malloc' is not stored. [leakReturnValNotUsed]\n",
+                      errout_str());
 
         check("void f0(const bool b) { b ? new int : nullptr; }\n" // #11155
               "void f1(const bool b) { b ? nullptr : new int; }\n"
               "int* g0(const bool b) { return b ? new int : nullptr; }\n"
               "void g1(const bool b) { h(b, b ? nullptr : new int); }\n");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Return value of allocation function 'new' is not stored.\n"
-                      "[test.cpp:2]: (error) Return value of allocation function 'new' is not stored.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:29]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n"
+                      "[test.cpp:2:39]: (error) Return value of allocation function 'new' is not stored. [leakReturnValNotUsed]\n",
+                      errout_str());
 
         check("void f() {\n" // #11157
               "    switch (*new int) { case 42: break; }\n"
               "    switch (*malloc(42)) { case 42: break; }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Allocation with new, switch doesn't release it.\n"
-                      "[test.cpp:3]: (error) Allocation with malloc, switch doesn't release it.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14]: (error) Allocation with new, switch doesn't release it. [leakNoVarFunctionCall]\n"
+                      "[test.cpp:3:14]: (error) Allocation with malloc, switch doesn't release it. [leakNoVarFunctionCall]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    Ref<StringBuffer> remove(new StringBuffer());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11039
               "    delete new int;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11327
               "    int* p = (new int[3]) + 1;\n"
               "    delete[] &p[-1];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        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());
     }
 
     void smartPointerFunctionParam() {
         check("void x() {\n"
               "    f(shared_ptr<int>(new int(42)), g());\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_unique<int>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_shared<int>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If g() throws, memory could be leaked. Use make_unique<int>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If make_unique<int>() throws, memory could be leaked. Use make_shared<char>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If h() throws, memory could be leaked. Use make_shared<char>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Unsafe allocation. If g<std::string>() throws, memory could be leaked. Use make_shared<std::string>() instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void __declspec(nothrow) g(int x) { }\n"
               "void x() {\n"
               "    f(g(124), shared_ptr<char>(new char));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
     void resourceLeak() {
+        check("bool f(const char* name)\n" // FP: #12253
+              "{\n"
+              "    FILE* fp = fopen(name, \"r\");\n"
+              "    bool result = (fp == nullptr);\n"
+              "    if (result) return !result;\n"
+              "    fclose(fp);\n"
+              "    return result;\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+
         check("void foo() {\n"
               "  fopen(\"file.txt\", \"r\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Return value of allocation function 'fopen' is not stored.\n", errout.str());
+        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"
+              "  FILE *f = fopen(\"file.txt\", \"r\");\n"
               "  freopen(\"file.txt\", \"r\", f);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Return value of allocation function 'freopen' is not stored.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
               "  Holder(FILE* f) : file(f) {}\n"
@@ -2769,7 +2842,7 @@ class TestMemleakNoVar : public TestFixture {
               "void foo() {\n"
               "  Holder h ( fopen(\"file.txt\", \"r\"));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
               "  Holder(FILE* f) : file(f) {}\n"
@@ -2779,7 +2852,7 @@ class TestMemleakNoVar : public TestFixture {
               "void foo() {\n"
               "  Holder ( fopen(\"file.txt\", \"r\"));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
               "  Holder(FILE* f) : file(f) {}\n"
@@ -2789,7 +2862,7 @@ class TestMemleakNoVar : public TestFixture {
               "void foo() {\n"
               "  Holder h { fopen(\"file.txt\", \"r\")};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
               "  Holder(FILE* f) : file(f) {}\n"
@@ -2799,7 +2872,7 @@ class TestMemleakNoVar : public TestFixture {
               "void foo() {\n"
               "  Holder h = fopen(\"file.txt\", \"r\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
               "  Holder(FILE* f) : file(f) {}\n"
@@ -2809,7 +2882,7 @@ class TestMemleakNoVar : public TestFixture {
               "void foo() {\n"
               "  Holder { fopen(\"file.txt\", \"r\")};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Holder {\n"
               "  Holder(int i, FILE* f) : file(f) {}\n"
@@ -2819,7 +2892,7 @@ class TestMemleakNoVar : public TestFixture {
               "void foo() {\n"
               "  Holder { 0, fopen(\"file.txt\", \"r\")};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void getAllocationType() {
@@ -2830,7 +2903,7 @@ class TestMemleakNoVar : public TestFixture {
               "void f() {\n"
               "  makeThing();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10631
         check("struct Thing {\n"
@@ -2850,19 +2923,19 @@ class TestMemleakNoVar : public TestFixture {
               "        delete t;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void crash1() { // #10729
         check("void foo() {\n"
               "    extern void *realloc (void *ptr, size_t size);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    extern void *malloc (size_t size);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void openDevNull() {
@@ -2870,7 +2943,7 @@ class TestMemleakNoVar : public TestFixture {
               "    (void)open(\"/dev/null\", O_RDONLY);\n"
               "    open(\"/dev/null\", O_WRONLY);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 REGISTER_TEST(TestMemleakNoVar)
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index 51d37e6eff9..ee971fd44a8 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-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
@@ -20,21 +20,16 @@
 #include "checknullpointer.h"
 #include "ctu.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "library.h"
 #include "settings.h"
-#include "fixture.h"
+#include "standards.h"
 #include "token.h"
-#include "tokenize.h"
 
+#include <cstddef>
 #include <list>
-#include <map>
-#include <sstream> // IWYU pragma: keep
 #include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
 class TestNullPointer : public TestFixture {
 public:
@@ -44,6 +39,7 @@ class TestNullPointer : public TestFixture {
     const Settings settings = settingsBuilder().library("std.cfg").severity(Severity::warning).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(nullpointerAfterLoop);
         TEST_CASE(nullpointer1);
         TEST_CASE(nullpointer2);
@@ -142,6 +138,10 @@ class TestNullPointer : public TestFixture {
         TEST_CASE(nullpointer99); // #10602
         TEST_CASE(nullpointer100);        // #11636
         TEST_CASE(nullpointer101);        // #11382
+        TEST_CASE(nullpointer102);
+        TEST_CASE(nullpointer103);
+        TEST_CASE(nullpointer104); // #13881
+        TEST_CASE(nullpointer105); // #13861
         TEST_CASE(nullpointer_addressOf); // address of
         TEST_CASE(nullpointerSwitch); // #2626
         TEST_CASE(nullpointer_cast); // #4692
@@ -158,12 +158,15 @@ class TestNullPointer : public TestFixture {
         TEST_CASE(nullpointer_in_typeid);
         TEST_CASE(nullpointer_in_alignof); // #11401
         TEST_CASE(nullpointer_in_for_loop);
+        TEST_CASE(nullpointerDeadCode); // #11311
         TEST_CASE(nullpointerDelete);
         TEST_CASE(nullpointerSubFunction);
         TEST_CASE(nullpointerExit);
         TEST_CASE(nullpointerStdString);
         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);
@@ -176,45 +179,36 @@ class TestNullPointer : public TestFixture {
         TEST_CASE(ctuTest);
     }
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool inconclusive = false, const char filename[] = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        bool inconclusive = false;
+        bool cpp = true;
+        Standards::cstd_t cstd = Standards::CLatest;
+    };
 
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
+#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).c(options.cstd).build();
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(&tokenizer, &settings1, this);
+        runChecks<CheckNullPointer>(tokenizer, this);
     }
 
-    void checkP(const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, false).build();
-
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+#define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenizer..
-        Tokenizer tokenizer(&settings1, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(&tokenizer, &settings1, this);
+        runChecks<CheckNullPointer>(tokenizer, this);
     }
 
 
@@ -225,8 +219,8 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "    while (tok);\n"
               "    tok = tok->next();\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok.\n", errout.str());
+              "}", 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
         {
@@ -240,7 +234,7 @@ class TestNullPointer : public TestFixture {
                                 "}\n";
 
             check(code);
-            ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok.\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:6:9]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok. [nullPointerRedundantCheck]\n", errout_str());
         }
 
         check("void foo()\n"
@@ -251,7 +245,7 @@ class TestNullPointer : public TestFixture {
               "            tok = tok->next();\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());
+        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"
               "{\n"
@@ -261,7 +255,7 @@ class TestNullPointer : public TestFixture {
               "            char c = tok.read();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -272,7 +266,7 @@ class TestNullPointer : public TestFixture {
               "        if( !tok ) break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -282,7 +276,7 @@ class TestNullPointer : public TestFixture {
               "            tok = tok->next();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(A*a)\n"
               "{\n"
@@ -297,7 +291,7 @@ class TestNullPointer : public TestFixture {
               "      break;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // dereference in outer scope..
         check("void foo(int x, const Token *tok) {\n"
@@ -306,20 +300,20 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    tok->str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (warning) Either the condition 'tok' is redundant or there is possible null pointer dereference: tok.\n", errout.str());
+        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"
               "{\n"
               "    while (tok){;}\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(const Token *tok)\n"
               "{\n"
               "    while (tok){;}\n"
               "    char a[2] = {0,0};\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct b {\n"
               "    b * c;\n"
@@ -331,7 +325,7 @@ class TestNullPointer : public TestFixture {
               "      d = d->c;\n"
               "  if (!d) throw;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct b {\n"
               "    b * c;\n"
@@ -342,7 +336,7 @@ class TestNullPointer : public TestFixture {
               "        if (d && d->i != 0) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:6]: (warning) Either the condition 'd' is redundant or there is possible null pointer dereference: d.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:13] -> [test.cpp:6:40]: (warning) Either the condition 'd' is redundant or there is possible null pointer dereference: d. [nullPointerRedundantCheck]\n", errout_str());
     }
 
     void nullpointer1() {
@@ -356,7 +350,7 @@ class TestNullPointer : public TestFixture {
               "    else if (a->x == 2) { }\n"
               "    if (a) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #2134 - sizeof doesn't dereference
         check("void f() {\n"
@@ -365,16 +359,16 @@ class TestNullPointer : public TestFixture {
               "    sizeof(*list);\n"
               "    if (!list)\n"
               "        ;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #2245 - sizeof doesn't dereference
         check("void f(Bar *p) {\n"
               "    if (!p) {\n"
               "        int sz = sizeof(p->x);\n"
               "    }\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -385,13 +379,13 @@ class TestNullPointer : public TestFixture {
               "    Fred fred;\n"
               "    while (fred);\n"
               "    fred.hello();\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Dereferencing a struct and then checking if it is null
     // This is checked by this function:
-    //        CheckOther::nullPointerStructByDeRefAndChec
+    //        CheckOther::nullPointerStructByDeRefAndCheck
     void structDerefAndCheck() {
         // extracttests.start: struct ABC { int a; int b; int x; };
 
@@ -402,7 +396,7 @@ class TestNullPointer : public TestFixture {
               "    if (!abc)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc.\n", errout.str());
+        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"
               "    bar(abc->a);\n"
@@ -411,9 +405,9 @@ class TestNullPointer : public TestFixture {
               "    if (!abc)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:2]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc.\n"
-                      "[test.cpp:5] -> [test.cpp:3]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc.\n"
-                      "[test.cpp:5] -> [test.cpp:4]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc.\n", errout.str());
+        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());
 
         check("void foo(ABC *abc) {\n"
               "    if (abc->a == 3) {\n"
@@ -422,8 +416,8 @@ class TestNullPointer : public TestFixture {
               "    if (abc) {}\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:2]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc.\n",
-            errout.str());
+            "[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());
 
         check("void f(ABC *abc) {\n"
               "    if (abc->x == 0) {\n"
@@ -431,7 +425,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    if (!abc);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:2]: (warning) Either the condition '!abc' is redundant or there is possible null pointer dereference: abc.\n", errout.str());
+        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
         check("void foo(ABC *abc) {\n"
@@ -439,7 +433,7 @@ class TestNullPointer : public TestFixture {
               "    if (abc->next)\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());
+        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"
@@ -447,8 +441,8 @@ class TestNullPointer : public TestFixture {
               "        ;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc.\n",
-            errout.str());
+            "[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());
 
         // ok dereferencing in a condition
         check("void foo(struct ABC *abc)\n"
@@ -457,13 +451,13 @@ class TestNullPointer : public TestFixture {
               "    if (!abc)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n"
               "    int x = abc && a(abc->x);\n"
               "    if (abc) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ok to use a linked list..
         check("void foo(struct ABC *abc)\n"
@@ -471,14 +465,14 @@ class TestNullPointer : public TestFixture {
               "    abc = abc->next;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n"
               "    abc = (ABC *)(abc->_next);\n"
               "    if (abc) { }"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // reassign struct..
         check("void foo(struct ABC *abc)\n"
@@ -487,8 +481,8 @@ class TestNullPointer : public TestFixture {
               "    abc = abc->next;\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct ABC *abc)\n"
               "{\n"
@@ -496,8 +490,8 @@ class TestNullPointer : public TestFixture {
               "    f(&abc);\n"
               "    if (!abc)\n"
               "        ;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // goto..
         check("void foo(struct ABC *abc)\n"
@@ -511,7 +505,7 @@ class TestNullPointer : public TestFixture {
               "    if (!abc)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // loops..
         check("void foo(struct ABC *abc)\n"
@@ -525,7 +519,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    while (a > 0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -537,7 +531,7 @@ class TestNullPointer : public TestFixture {
               "            return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // dynamic_cast..
         check("void foo(ABC *abc)\n"
@@ -546,7 +540,7 @@ class TestNullPointer : public TestFixture {
               "    if (!dynamic_cast<DEF *>(abc))\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2641 - global pointer, function call
         check("ABC *abc;\n"
@@ -555,14 +549,14 @@ class TestNullPointer : public TestFixture {
               "    do_stuff();\n"
               "    if (abc) { }\n"
               "}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         check("Fred *fred;\n"
               "void f() {\n"
               "    fred->foo();\n"
               "    if (fred) { }\n"
               "}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         // #2641 - local pointer, function call
         check("void f() {\n"
@@ -572,8 +566,8 @@ class TestNullPointer : public TestFixture {
               "    if (abc) { }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:3]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc.\n",
-            errout.str());
+            "[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());
 
         // #2641 - local pointer, function call
         check("void f(ABC *abc) {\n"
@@ -582,8 +576,8 @@ class TestNullPointer : public TestFixture {
               "    if (abc) { }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:2]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc.\n",
-            errout.str());
+            "[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());
 
         // #2691 - switch/break
         check("void f(ABC *abc) {\n"
@@ -596,32 +590,32 @@ class TestNullPointer : public TestFixture {
               "            break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3128
         check("void f(ABC *abc) {\n"
               "    x(!abc || y(abc->a));\n"
               "    if (abc) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "  x(def || !abc || y(def, abc->a));\n"
               "  if (abc) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "  x(abc && y(def, abc->a));\n"
               "  if (abc) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(ABC *abc) {\n"
               "    x(def && abc && y(def, abc->a));\n"
               "    if (abc) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3228 - calling function with null object
         {
@@ -631,8 +625,8 @@ class TestNullPointer : public TestFixture {
                                 "}";
             check(code);
             ASSERT_EQUALS(
-                "[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'fred' is redundant or there is possible null pointer dereference: fred.\n",
-                errout.str());
+                "[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",
+                errout_str());
         }
 
         // #3425 - false positives when there are macros
@@ -641,7 +635,7 @@ class TestNullPointer : public TestFixture {
                "    fred->x = 0;\n"
                "    IF(!fred){}\n"
                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  BUFFER *buffer = get_buffer();\n"
@@ -649,7 +643,7 @@ class TestNullPointer : public TestFixture {
               "    uv_fatal_error();\n"
               "  buffer->x = 11;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Dereferencing a pointer and then checking if it is null
@@ -663,7 +657,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
@@ -671,8 +665,8 @@ class TestNullPointer : public TestFixture {
               "    if (p) { }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n",
-            errout.str());
+            "[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"
@@ -680,8 +674,8 @@ class TestNullPointer : public TestFixture {
               "    if (p || q) { }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n",
-            errout.str());
+            "[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"
@@ -689,7 +683,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "{\n"
@@ -697,14 +691,14 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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
         check("void foo()\n"
@@ -714,15 +708,15 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int **p = f();\n"
               "    if (!p)\n"
               "        ;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p)\n"
               "{\n"
@@ -733,15 +727,15 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x)\n"
               "{\n"
               "    int a = 2 * x;"
               "    if (x == 0)\n"
               "        ;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p)\n"
               "{\n"
@@ -749,7 +743,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p, bool x)\n"
               "{\n"
@@ -758,23 +752,23 @@ class TestNullPointer : public TestFixture {
               "        ;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n",
-            errout.str());
+            "[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());
 
         // while
         check("void f(int *p) {\n"
               "    *p = 0;\n"
               "    while (p) { p = 0; }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 0;\n"
               "    while (p) { }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n",
-            errout.str());
+            "[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());
 
         // Ticket #3125
         check("void foo(ABC *p)\n"
@@ -783,7 +777,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(ABC *p)\n"
               "{\n"
@@ -791,29 +785,29 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int * a=0;\n"
               "    if (!a) {};\n"
               "    int c = a ? 0 : 1;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #3686
         check("void f() {\n"
               "    int * a=0;\n"
               "    if (!a) {};\n"
               "    int c = a ? b : b+1;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int * a=0;\n"
               "    if (!a) {};\n"
               "    int c = (a) ? b : b+1;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(P *p)\n"
               "{\n"
@@ -823,7 +817,7 @@ class TestNullPointer : public TestFixture {
               "    else\n"
               "      p = p->next();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(Document *doc) {\n"
               "    int x = doc && doc->x;\n"
@@ -831,20 +825,20 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3128 - false positive
         check("void f(int *p) {\n"
               "    assert(!p || (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    assert(p && (*p<=6));\n"
               "    if (p) { *p = 0; }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 12;\n"
@@ -852,8 +846,8 @@ class TestNullPointer : public TestFixture {
               "    if (p) { *p = 0; }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n",
-            errout.str());
+            "[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());
 
         check("void foo(x *p)\n"
               "{\n"
@@ -861,7 +855,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
               "{\n"
@@ -869,7 +863,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
               "{\n"
@@ -877,7 +871,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(x *p)\n"
               "{\n"
@@ -885,7 +879,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(struct ABC *abc)\n"
               "{\n"
@@ -893,25 +887,25 @@ class TestNullPointer : public TestFixture {
               "    if (!abc)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n" // #4523
               "    abc = (*abc).next;\n"
               "    if (abc) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(struct ABC *abc) {\n" // #4523
               "    abc = (*abc->ptr);\n"
               "    if (abc) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(Item *item) {\n"
               "    x = item ? ab(item->x) : 0;\n"
               "    if (item) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(Item *item) {\n"
               "    item->x = 0;\n"
@@ -919,8 +913,8 @@ class TestNullPointer : public TestFixture {
               "    if (item) { }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:2]: (warning) Either the condition 'item' is redundant or there is possible null pointer dereference: item.\n",
-            errout.str());
+            "[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());
 
         check("BOOL GotoFlyAnchor()\n"  // #2243
               "{\n"
@@ -932,7 +926,7 @@ class TestNullPointer : public TestFixture {
               "    if( !pFrm )\n"
               "        return FALSE;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #2463
         check("struct A\n"
@@ -952,7 +946,7 @@ class TestNullPointer : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2525 - sizeof
         check("void f() {\n"
@@ -960,27 +954,27 @@ class TestNullPointer : public TestFixture {
               "    int c = sizeof(test[0]);\n"
               "    if (!test)\n"
               "        ;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(type* p) {\n" // #4983
               "    x(sizeof p[0]);\n"
               "    if (!p)\n"
               "        ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3023 - checked deref
         check("void f(struct ABC *abc) {\n"
               "  WARN_ON(!abc || abc->x == 0);\n"
               "  if (!abc) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(struct ABC *abc) {\n"
               "  WARN_ON(!abc || abc->x == 7);\n"
               "  if (!abc) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3425 - false positives when there are macros
         checkP("#define IF if\n"
@@ -988,19 +982,19 @@ class TestNullPointer : public TestFixture {
                "    *p = 0;\n"
                "    IF(!p){}\n"
                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #3914 - false positive
               "    int *p;\n"
               "    ((p=ret()) && (x=*p));\n"
               "    if (p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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] -> [test.cpp:2]: (warning) Either the condition 's->p' is redundant or there is possible null pointer dereference: p.\n",
-                      errout.str());
+        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());
     }
 
     void nullpointer5() {
@@ -1011,7 +1005,7 @@ class TestNullPointer : public TestFixture {
               " if (!a)\n"
               "   return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Execution paths..
@@ -1027,17 +1021,17 @@ class TestNullPointer : public TestFixture {
               "    p->abcd();\n"
               "}");
         TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Possible null pointer dereference: p\n",
-                           "", errout.str());
+                           "", errout_str());
 
         check("static void foo() {\n"
               "    int &r = *(int*)0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference: (int*)0\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference: (int*)0\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         {
             const char code[] = "static void foo() {\n"
@@ -1046,13 +1040,13 @@ class TestNullPointer : public TestFixture {
                                 "}\n";
 
             check(code);
-            ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: abc\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:5]: (error) Null pointer dereference: abc [nullPointer]\n", errout_str());
         }
 
         check("static void foo() {\n"
               "    std::cout << *(int*)0;"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference: (int*)0\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -1062,12 +1056,12 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    c[0] = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Null pointer dereference: c\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference: (int*)0\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
 
         // no false positive..
         check("static void foo()\n"
@@ -1076,20 +1070,20 @@ class TestNullPointer : public TestFixture {
               "    p = new Foo;\n"
               "    p->abcd();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "    int sz = sizeof((*(struct dummy *)0).x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void get_offset(long &offset)\n"
               "{\n"
               "    mystruct * temp; temp = 0;\n"
               "    offset = (long)(&(temp->z));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #1893 - try/catch inside else
         check("int *test(int *Z)\n"
@@ -1108,7 +1102,7 @@ class TestNullPointer : public TestFixture {
               "    *Q=1;\n"
               "    return Q;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int *test(int *Z)\n"
               "{\n"
@@ -1124,7 +1118,7 @@ class TestNullPointer : public TestFixture {
               "    *Q=1;\n"
               "    return Q;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:12]: (warning) Possible null pointer dereference: Q\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:6]: (warning) Possible null pointer dereference: Q [nullPointer]\n", errout_str());
 
         // Ticket #2052 (false positive for 'else continue;')
         check("void f() {\n"
@@ -1135,7 +1129,7 @@ class TestNullPointer : public TestFixture {
               "        *p = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // function pointer..
         check("void foo()\n"
@@ -1144,7 +1138,7 @@ class TestNullPointer : public TestFixture {
               "    f = 0;\n"
               "    f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Null pointer dereference: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (error) Null pointer dereference: f [nullPointer]\n", errout_str());
 
         check("int* g();\n" // #11007
               "int* f() {\n"
@@ -1153,7 +1147,7 @@ class TestNullPointer : public TestFixture {
               "        fun = g;\n"
               "    return fun();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // loops..
         check("void f() {\n"
@@ -1162,7 +1156,7 @@ class TestNullPointer : public TestFixture {
               "        int x = *p + 1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("void f(int a) {\n"
               "    const char *p = 0;\n"
@@ -1172,22 +1166,22 @@ class TestNullPointer : public TestFixture {
               "    for (int i = 0; i < 3; i++) {\n"
               "        if (a && (p[i] == '1'));\n"
               "    }\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: fred\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Null pointer dereference: fred [nullPointer]\n", errout_str());
 
         // ticket #3570 - parsing of conditions
         {
@@ -1196,22 +1190,22 @@ class TestNullPointer : public TestFixture {
                   "    if (x)\n"
                   "        p = q;\n"
                   "    if (p && *p) { }\n"
-                  "}", true);
-            ASSERT_EQUALS("", errout.str());
+                  "}", 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"
-                  "}", true);
-            ASSERT_EQUALS("", errout.str());
+                  "}", 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"
                   "}");
-            ASSERT_EQUALS("[test.cpp:5]: (warning) Possible null pointer dereference: p\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:5:15]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
         }
 
         // ticket #8831 - FP triggered by if/return/else sequence
@@ -1226,15 +1220,15 @@ class TestNullPointer : public TestFixture {
                   "\n"
                   "void g() {\n"
                   "    f(NULL, NULL);\n"
-                  "}", true);
-            ASSERT_EQUALS("", errout.str());
+                  "}", dinit(CheckOptions, $.inconclusive = true));
+            ASSERT_EQUALS("", errout_str());
         }
 
         check("void f() {\n" // #5979
               "    int* const crash = 0;\n"
               "    *crash = 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: crash\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:6]: (error) Null pointer dereference: crash [nullPointer]\n", errout_str());
     }
 
     // Ticket #2350
@@ -1252,7 +1246,7 @@ class TestNullPointer : public TestFixture {
               "        argv32[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // No false negative:
         check("void foo() {\n"
@@ -1267,7 +1261,7 @@ class TestNullPointer : public TestFixture {
               "        argv32[i] = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Possible null pointer dereference: argv32\n", errout.str());
+        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
         // extracttests.start: int y[20];
@@ -1283,7 +1277,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:11]: (warning) Possible null pointer dereference: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:6]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer7() {
@@ -1291,8 +1285,8 @@ class TestNullPointer : public TestFixture {
               "{\n"
               "  wxLongLong x = 0;\n"
               "  int y = x.GetValue();\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer9() { //#ticket 1778
@@ -1301,7 +1295,7 @@ class TestNullPointer : public TestFixture {
               "  std::string * x = 0;\n"
               "  *x = \"test\";\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:4]: (error) Null pointer dereference: x [nullPointer]\n", errout_str());
     }
 
     void nullpointer10() {
@@ -1311,7 +1305,7 @@ class TestNullPointer : public TestFixture {
               "  struct my_type* p = 0;\n"
               "  p->x = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:3]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer11() { // ticket #2812
@@ -1323,7 +1317,7 @@ class TestNullPointer : public TestFixture {
               "  p = 0;\n"
               "  return p->x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Null pointer dereference: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer12() { // ticket #2470, #4035
@@ -1333,11 +1327,14 @@ class TestNullPointer : public TestFixture {
                             "  return *i;\n"
                             "}\n";
 
-        check(code, false, "test.cpp"); // C++ file => nullptr means NULL
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: i\n", errout.str());
+        check(code); // C++ file => nullptr means NULL
+        ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: i [nullPointer]\n", errout_str());
 
-        check(code, false, "test.c"); // C file => nullptr does not mean NULL
-        ASSERT_EQUALS("", errout.str());
+        check(code, dinit(CheckOptions, $.cpp = false, $.cstd = Standards::C17)); // 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
@@ -1346,7 +1343,7 @@ class TestNullPointer : public TestFixture {
               "    if (x) p = \"abcd\";\n"
               "    return p ? f(*p) : f(0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer16() {  // #3591
@@ -1354,8 +1351,8 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    bar(&p);\n"
               "    *p = 0;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer17() {  // #3567
@@ -1363,15 +1360,15 @@ class TestNullPointer : public TestFixture {
               "    int *p = 0;\n"
               "    if (x) { return 0; }\n"
               "    return !p || *p;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer18() {  // #1927
@@ -1384,14 +1381,14 @@ class TestNullPointer : public TestFixture {
               "    i++;\n"
               "  };\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Null pointer dereference: str\n", errout.str());
+        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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer20() {  // #3807
@@ -1400,14 +1397,16 @@ class TestNullPointer : public TestFixture {
               "    if (x) p = q;\n"
               "    if (p ? p->x || p->y : 0) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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;
@@ -1417,7 +1416,7 @@ class TestNullPointer : public TestFixture {
               "    else return;\n"
               "    *p = 0;\n" // <- p is not NULL
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer23() {  // #4665
@@ -1426,7 +1425,7 @@ class TestNullPointer : public TestFixture {
               "    char cBuf[10];\n"
               "    sprintf(cBuf, \"%s\", c ? c : \"0\" );\n"
               "}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
     }
 
     void nullpointer24() {  // #5083 - fp: chained assignment
@@ -1435,7 +1434,7 @@ class TestNullPointer : public TestFixture {
               "    x = c = new char[10];\n"
               "    *c = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer25() { // #5061
@@ -1445,7 +1444,7 @@ class TestNullPointer : public TestFixture {
               "    if (data == 1 && array[i] == 0)\n"
               "        std::cout << \"test\";\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: array\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:22]: (error) Null pointer dereference: array [nullPointer]\n", errout_str());
     }
 
     void nullpointer26() { // #3589
@@ -1462,7 +1461,7 @@ class TestNullPointer : public TestFixture {
               "        return 0.0;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer27() { // #6568
@@ -1476,7 +1475,7 @@ class TestNullPointer : public TestFixture {
               "    *pointer_=0;\n"
               "    return *this;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Null pointer dereference: pointer_\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:6]: (error) Null pointer dereference: pointer_ [nullPointer]\n", errout_str());
     }
 
     void nullpointer28() { // #6491
@@ -1487,8 +1486,8 @@ class TestNullPointer : public TestFixture {
               "  return i;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 's' is redundant or there is possible null pointer dereference: s.\n",
-            errout.str());
+            "[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());
     }
 
     void nullpointer30() { // #6392
@@ -1502,10 +1501,10 @@ class TestNullPointer : public TestFixture {
               "      values->push_back(\"test\");\n"
               "    }\n"
               "  }\n"
-              "}\n", true);
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3]: (warning) Either the condition 'values' is redundant or there is possible null pointer dereference: values.\n",
-            errout.str());
+            "[test.cpp:4:7] -> [test.cpp:3:3]: (warning) Either the condition 'values' is redundant or there is possible null pointer dereference: values. [nullPointerRedundantCheck]\n",
+            errout_str());
     }
 
     void nullpointer31() { // #8482
@@ -1519,8 +1518,8 @@ class TestNullPointer : public TestFixture {
               "    if( f ) {}\n"
               "    else { return; }\n"
               "    (void)f->x;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("typedef struct\n"
               "{\n"
@@ -1536,8 +1535,8 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "\n"
               "    (void)f->x;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer32() { // #8460
@@ -1548,8 +1547,8 @@ class TestNullPointer : public TestFixture {
               "    int *p1 = ptr;\n"
               "    return *p1;\n"
               "  }\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:6]: (warning) Either the condition 'ptr' is redundant or there is possible null pointer dereference: p1.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:6] -> [test.cpp:6:13]: (warning) Either the condition 'ptr' is redundant or there is possible null pointer dereference: p1. [nullPointerRedundantCheck]\n", errout_str());
     }
 
     void nullpointer33() {
@@ -1558,8 +1557,8 @@ class TestNullPointer : public TestFixture {
               "        *x = 2;\n"
               "    else\n"
               "        *x = 3;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (warning) Either the condition 'x!=nullptr' is redundant or there is possible null pointer dereference: x.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:11] -> [test.cpp:5:10]: (warning) Either the condition 'x!=nullptr' is redundant or there is possible null pointer dereference: x. [nullPointerRedundantCheck]\n", errout_str());
     }
 
     void nullpointer34() {
@@ -1570,8 +1569,8 @@ class TestNullPointer : public TestFixture {
               "    if (x) *x += 1;\n"
               "    if (!x) g();\n"
               "    return *x;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer35() {
@@ -1583,8 +1582,8 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "void h() {\n"
               "    g(0);\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int*);\n"
               "void g(int* x) {\n"
@@ -1596,8 +1595,8 @@ class TestNullPointer : public TestFixture {
               "void h() {\n"
               "    g(0);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer36() {
@@ -1608,8 +1607,8 @@ class TestNullPointer : public TestFixture {
               "    while (isspace(*start))\n"
               "        start++;\n"
               "    return (start);\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer37() {
@@ -1627,8 +1626,8 @@ class TestNullPointer : public TestFixture {
               "        ptr1++;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer38() {
@@ -1639,8 +1638,8 @@ class TestNullPointer : public TestFixture {
               "        *x;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer39() {
@@ -1650,8 +1649,8 @@ class TestNullPointer : public TestFixture {
               "    *(a->x);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'a->x==NULL' is redundant or there is possible null pointer dereference: a->x.\n",
-            errout.str());
+            "[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());
     }
 
     void nullpointer40() {
@@ -1661,8 +1660,8 @@ class TestNullPointer : public TestFixture {
               "    *(a->x);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'a->x==nullptr' is redundant or there is possible null pointer dereference: a->x.\n",
-            errout.str());
+            "[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());
     }
 
     void nullpointer41() {
@@ -1672,15 +1671,15 @@ class TestNullPointer : public TestFixture {
               "    *(a->g());\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'a->g()==nullptr' is redundant or there is possible null pointer dereference: a->g().\n",
-            errout.str());
+            "[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());
 
         check("struct A { int * g(); };\n"
               "void f(struct A *a) {\n"
               "    if (a->g() == nullptr) {}\n"
               "    *(a->g());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer42() {
@@ -1690,8 +1689,8 @@ class TestNullPointer : public TestFixture {
               "    *(a->g());\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'a->g()==nullptr' is redundant or there is possible null pointer dereference: a->g().\n",
-            errout.str());
+            "[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());
     }
 
     void nullpointer43() {
@@ -1702,7 +1701,7 @@ class TestNullPointer : public TestFixture {
               "        (void)*a->x;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer44() {
@@ -1714,7 +1713,7 @@ class TestNullPointer : public TestFixture {
               "        return 0;\n"
               "    return b->get();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // #9423
         check("extern F* GetF();\n"
               "extern L* GetL();\n"
@@ -1731,7 +1730,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    lPtr->Clear();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer45() {
@@ -1748,7 +1747,7 @@ class TestNullPointer : public TestFixture {
               "  a d = *c->b();\n"
               "  return d;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a {\n"
               "  a *b() const;\n"
@@ -1764,7 +1763,7 @@ class TestNullPointer : public TestFixture {
               "  a d = *c->b();\n"
               "  return d;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer46() {
@@ -1772,7 +1771,7 @@ class TestNullPointer : public TestFixture {
               "    char* p = new(std::nothrow) char[1];\n"
               "    if( p ) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer47() {
@@ -1781,7 +1780,7 @@ class TestNullPointer : public TestFixture {
               "   const int *const a = p;\n"
               "   if(!a){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2]: (warning) Either the condition '!a' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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());
     }
 
     void nullpointer48() {
@@ -1790,7 +1789,7 @@ class TestNullPointer : public TestFixture {
               "int& g(int* x) {\n"
               "    return f(*x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer49() {
@@ -1800,7 +1799,7 @@ class TestNullPointer : public TestFixture {
               "    *p +=2;\n"
               "    if(n < 120) *q+=12;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Possible null pointer dereference: q\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:18]: (warning) Possible null pointer dereference: q [nullPointer]\n", errout_str());
 
         check("void f(int *p, int n) {\n"
               "    int *q = 0;\n"
@@ -1808,7 +1807,7 @@ class TestNullPointer : public TestFixture {
               "    *p +=2;\n"
               "    if(n > 10) *q+=12;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer50() {
@@ -1823,8 +1822,8 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:6]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n",
-            errout.str());
+            "[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());
     }
 
     void nullpointer51() {
@@ -1838,7 +1837,7 @@ class TestNullPointer : public TestFixture {
               "    return nullptr;\n"
               "  return e->b();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer52() {
@@ -1848,7 +1847,7 @@ class TestNullPointer : public TestFixture {
               "    if (!c) c = &a;\n"
               "    return *c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int a, int* b) {\n"
               "    int* c = nullptr;\n"
@@ -1857,7 +1856,7 @@ class TestNullPointer : public TestFixture {
               "    if (d) c = &a;\n"
               "    return *c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
               "int f(int a, int* b) {\n"
@@ -1867,7 +1866,7 @@ class TestNullPointer : public TestFixture {
               "    if (!c.x) c.x = &a;\n"
               "    return *c.x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
               "int f(int a, int* b) {\n"
@@ -1878,7 +1877,7 @@ class TestNullPointer : public TestFixture {
               "    if (d) c.x = &a;\n"
               "    return *c.x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int* x; };\n"
               "int f(int a, int* b) {\n"
@@ -1889,7 +1888,7 @@ class TestNullPointer : public TestFixture {
               "    if (!d) c.x = &a;\n"
               "    return *c.x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Possible null pointer dereference: c.x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:14]: (warning) Possible null pointer dereference: c.x [nullPointer]\n", errout_str());
     }
 
     void nullpointer53() {
@@ -1901,7 +1900,7 @@ class TestNullPointer : public TestFixture {
               "void bar() {\n"
               "  f(0, 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Possible null pointer dereference: params\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning) Possible null pointer dereference: params [nullPointer]\n", errout_str());
     }
 
     void nullpointer54() {
@@ -1917,7 +1916,7 @@ class TestNullPointer : public TestFixture {
               "    int **array = NULL;\n"
               "    foo (array, 0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer55() {
@@ -1928,8 +1927,8 @@ class TestNullPointer : public TestFixture {
               "    if (tok3 && tok3->str() == \"(\") {}\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:3]: (warning) Either the condition 'tok3' is redundant or there is possible null pointer dereference: tok3.\n",
-            errout.str());
+            "[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());
 
         check("void f(int* t1, int* t2) {\n"
               "    while (t1 && t2 &&\n"
@@ -1940,7 +1939,7 @@ class TestNullPointer : public TestFixture {
               "    if (!t1 || !t2)\n"
               "        return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int* i);\n"
               "void g(int* i) {\n"
@@ -1948,7 +1947,7 @@ class TestNullPointer : public TestFixture {
               "        i++;\n"
               "    if (!i) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer56() {
@@ -1960,7 +1959,7 @@ class TestNullPointer : public TestFixture {
               "    for (ListEntry *cursor = listHead; cursor != NULL; prev = cursor, cursor = cursor->next) {}\n"
               "    if (prev) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer57() {
@@ -1975,7 +1974,7 @@ class TestNullPointer : public TestFixture {
               "        fn();\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer58() {
@@ -1985,7 +1984,7 @@ class TestNullPointer : public TestFixture {
               "    int sz = (!*(&sPtr) || ((*(&sPtr))->entry[0] > 15)) ?\n"
               "        sizeof((*(&sPtr))->entry[0]) : 123456789;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer59() {
@@ -2000,7 +1999,7 @@ class TestNullPointer : public TestFixture {
               "        (*pfreeboxes)->prev = nullptr;\n"
               "    b->next = nullptr;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer60() {
@@ -2013,7 +2012,7 @@ class TestNullPointer : public TestFixture {
               "    if (!strcmp(\"00000000000000000000000000000000\", s1) )\n"
               "        return;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer61() {
@@ -2031,7 +2030,7 @@ class TestNullPointer : public TestFixture {
               "      ;\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "  A* g() const;\n"
@@ -2046,7 +2045,7 @@ class TestNullPointer : public TestFixture {
               "  if (!b || b == b->g()->h())\n"
               "      return;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer62() {
@@ -2057,7 +2056,7 @@ class TestNullPointer : public TestFixture {
               "  std::string b = x && x->f() ? \"\" : \"\";\n"
               "  if (x) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "  bool f()() const;\n"
@@ -2066,7 +2065,7 @@ class TestNullPointer : public TestFixture {
               "  std::string b = (!x || x->f()) ? \"\" : \"\";\n"
               "  if (x) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "  A * aa;\n"
@@ -2076,7 +2075,7 @@ class TestNullPointer : public TestFixture {
               "  b(x ? x->aa : nullptr);\n"
               "  if (!x) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer63() {
@@ -2090,7 +2089,7 @@ class TestNullPointer : public TestFixture {
               "    d = f(d->b()) ? d->a() : nullptr;\n"
               "    if (d && f(d->b())) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer64() {
@@ -2108,7 +2107,7 @@ class TestNullPointer : public TestFixture {
               "    if (c)\n"
               "      for (A *d = c; d != aq; d = d->f()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "  A* g() const;\n"
@@ -2125,7 +2124,7 @@ class TestNullPointer : public TestFixture {
               "    if (!y) {}\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer65() {
@@ -2145,7 +2144,7 @@ class TestNullPointer : public TestFixture {
               "        return a->get();\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer66() {
@@ -2162,7 +2161,7 @@ class TestNullPointer : public TestFixture {
               "      MyFree(&v);\n"
               "    return ret;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer67() {
@@ -2177,7 +2176,7 @@ class TestNullPointer : public TestFixture {
               "        return 0;\n"
               "    return -1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int result;\n"
               "\n"
@@ -2189,7 +2188,7 @@ class TestNullPointer : public TestFixture {
               "        return 0;\n"
               "    return -1;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer68() {
@@ -2200,7 +2199,7 @@ class TestNullPointer : public TestFixture {
               "    c = c->b;\n"
               "    if (c->b) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    A* b;\n"
@@ -2210,7 +2209,7 @@ class TestNullPointer : public TestFixture {
               "    A *e = c;\n"
               "    while (nullptr != (e = e->b)) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer69() {
@@ -2222,8 +2221,8 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:5]: (warning) Either the condition 'scope' is redundant or there is possible null pointer dereference: scope.\n",
-            errout.str());
+            "[test.cpp:3:12] -> [test.cpp:5:22]: (warning) Either the condition 'scope' is redundant or there is possible null pointer dereference: scope. [nullPointerRedundantCheck]\n",
+            errout_str());
 
         check("void f(const Scope *scope) {\n"
               "    if (scope->definedType) {}\n"
@@ -2236,8 +2235,8 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:8]: (warning) Either the condition 'scope' is redundant or there is possible null pointer dereference: scope.\n",
-            errout.str());
+            "[test.cpp:3:12] -> [test.cpp:8:22]: (warning) Either the condition 'scope' is redundant or there is possible null pointer dereference: scope. [nullPointerRedundantCheck]\n",
+            errout_str());
 
         check("struct a {\n"
               "  a *b() const;\n"
@@ -2250,7 +2249,7 @@ class TestNullPointer : public TestFixture {
               "      e = e->b();\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer70() {
@@ -2272,7 +2271,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    return first->varId();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Token {\n"
               "    const Token* nextArgument() const;\n"
@@ -2289,7 +2288,7 @@ class TestNullPointer : public TestFixture {
         TODO_ASSERT_EQUALS(
             "[test.cpp:8] -> [test.cpp:10]: (warning) Either the condition 'first' is redundant or there is possible null pointer dereference: first.\n",
             "",
-            errout.str());
+            errout_str());
     }
 
     void nullpointer71() {
@@ -2299,7 +2298,7 @@ class TestNullPointer : public TestFixture {
               "  if (dev)\n"
               "    DoSomething(dev);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  Device* dev = Get();\n"
@@ -2307,7 +2306,7 @@ class TestNullPointer : public TestFixture {
               "  if (dev)\n"
               "    DoSomething(dev);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer72() { // #10215
@@ -2318,16 +2317,16 @@ class TestNullPointer : public TestFixture {
               "  if (!(p0 != nullptr && p1 != nullptr))\n"
               "    return {};\n"
               "  return *p0 + *p1;\n"
-              "}\n", true /*inconclusive*/);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int test2() {\n"
               "  int* p0 = nullptr;\n"
               "  if (!(getBaz(p0) && p0 != nullptr))\n"
               "    return 0;\n"
               "  return *p0;\n"
-              "}\n", true /*inconclusive*/);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int test3() {\n"
               "  Obj* PObj = nullptr;\n"
@@ -2336,8 +2335,8 @@ class TestNullPointer : public TestFixture {
               "  if (!PObj->foo())\n"
               "    test();\n"
               "  PObj->bar();\n"
-              "}\n", true /*inconclusive*/);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer73() {
@@ -2352,7 +2351,7 @@ class TestNullPointer : public TestFixture {
               "    if (flag1 && flag2)\n"
               "        (*ptr)++;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool flag2, int* ptr) {\n"
               "    bool flag1 = true;\n"
@@ -2365,7 +2364,7 @@ class TestNullPointer : public TestFixture {
               "    if (!flag1 && flag2)\n"
               "        (*ptr)++;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:10]: (warning) Either the condition 'ptr!=nullptr' is redundant or there is possible null pointer dereference: ptr.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:17] -> [test.cpp:10:11]: (warning) Either the condition 'ptr!=nullptr' is redundant or there is possible null pointer dereference: ptr. [nullPointerRedundantCheck]\n", errout_str());
     }
 
     void nullpointer74() {
@@ -2378,7 +2377,7 @@ class TestNullPointer : public TestFixture {
               "    if (f) {}\n"
               "  } while (0);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct d {\n"
               "  d* e();\n"
@@ -2391,8 +2390,8 @@ class TestNullPointer : public TestFixture {
               "  } while (i > 0);\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:8] -> [test.cpp:7]: (warning) Either the condition 'f' is redundant or there is possible null pointer dereference: f.\n",
-            errout.str());
+            "[test.cpp:8:9] -> [test.cpp:7:9]: (warning) Either the condition 'f' is redundant or there is possible null pointer dereference: f. [nullPointerRedundantCheck]\n",
+            errout_str());
 
         check("struct d {\n"
               "  d* e();\n"
@@ -2404,7 +2403,7 @@ class TestNullPointer : public TestFixture {
               "    if (f) {}\n"
               "  } while (f && i > 0);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer75() {
@@ -2419,7 +2418,7 @@ class TestNullPointer : public TestFixture {
               "  x->c();\n"
               "  if (x->b()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer76()
@@ -2431,7 +2430,7 @@ class TestNullPointer : public TestFixture {
               "    (*x) ++;\n"
               "    return x.release();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer77()
@@ -2441,7 +2440,7 @@ class TestNullPointer : public TestFixture {
               "    int* i = nullptr;\n"
               "    if (h(i) && *i == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool h(int*);\n"
               "void f(int* i) {\n"
@@ -2449,7 +2448,7 @@ class TestNullPointer : public TestFixture {
               "    if (h(i))\n"
               "        if (*i == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool h(int*);\n"
               "void f(int* x) {\n"
@@ -2458,7 +2457,7 @@ class TestNullPointer : public TestFixture {
               "        i = nullptr;\n"
               "    if (h(i) && *i == 1) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer78() // #7802
@@ -2470,7 +2469,7 @@ class TestNullPointer : public TestFixture {
               "    pp = &p;\n"
               "    **pp = 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Null pointer dereference: *pp\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:6]: (error) Null pointer dereference: *pp [nullPointer]\n", errout_str());
     }
 
     void nullpointer79() // #10400
@@ -2482,7 +2481,7 @@ class TestNullPointer : public TestFixture {
               "    for (size_t cc = 0; cc < nF * nT; ++cc)\n"
               "        pValues[cc] = 42;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer80() // #10410
@@ -2496,7 +2495,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer81() // #8724
@@ -2513,7 +2512,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer82() // #10331
@@ -2533,7 +2532,7 @@ class TestNullPointer : public TestFixture {
               "\n"
               "done:\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer83() // #9870
@@ -2548,7 +2547,7 @@ class TestNullPointer : public TestFixture {
               "  *p = 1;\n"
               "  return x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8]: (warning) Possible null pointer dereference: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:4]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer84() // #9873
@@ -2560,8 +2559,8 @@ class TestNullPointer : public TestFixture {
               "  }\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition '!RP' is redundant or there is possible null pointer dereference: P.\n",
-            errout.str());
+            "[test.cpp:3:7] -> [test.cpp:4:5]: (warning) Either the condition '!RP' is redundant or there is possible null pointer dereference: P. [nullPointerRedundantCheck]\n",
+            errout_str());
     }
 
     void nullpointer85() // #10210
@@ -2581,8 +2580,8 @@ class TestNullPointer : public TestFixture {
               "  return s.GetId();\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:5] -> [test.cpp:4]: (warning) Either the condition 'm_notebook' is redundant or there is possible null pointer dereference: m_notebook.\n",
-            errout.str());
+            "[test.cpp:5:11] -> [test.cpp:4:18]: (warning) Either the condition 'm_notebook' is redundant or there is possible null pointer dereference: m_notebook. [nullPointerRedundantCheck]\n",
+            errout_str());
     }
 
     void nullpointer86()
@@ -2601,7 +2600,7 @@ class TestNullPointer : public TestFixture {
               "    t = f(t->a());\n"
               "    if (!t->a()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer87() // #9291
@@ -2616,7 +2615,7 @@ class TestNullPointer : public TestFixture {
               "    else\n"
               "        return *x + 1;\n"
               "}\n");
-        TODO_ASSERT_EQUALS("", "[test.cpp:6] -> [test.cpp:9]: (warning) Either the condition 'x!=nullptr' is redundant or there is possible null pointer dereference: x.\n", errout.str());
+        TODO_ASSERT_EQUALS("", "[test.cpp:6:22] -> [test.cpp:9:17]: (warning) Either the condition 'x!=nullptr' is redundant or there is possible null pointer dereference: x. [nullPointerRedundantCheck]\n", errout_str());
 
         check("void f(int n, int* p) {\n"
               "    int* r = nullptr;\n"
@@ -2628,7 +2627,7 @@ class TestNullPointer : public TestFixture {
               "        r = p + 1;\n"
               "    *r;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer88() // #9949
@@ -2644,11 +2643,12 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "void f() {\n"
               "    struct S* s = malloc(sizeof(struct S));\n"
+              "    if (!s) return;\n"
               "    s->ppc = NULL;\n"
               "    if (alloc(s))\n"
               "        s->ppc[0] = \"\";\n"
-              "}\n", /*inconclusive*/ false, "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer89() // #10640
@@ -2664,8 +2664,28 @@ class TestNullPointer : public TestFixture {
               "        if(ptr->y != nullptr) {}\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:9] -> [test.cpp:8]: (warning) Either the condition 'ptr->y!=nullptr' is redundant or there is possible null pointer dereference: ptr->y.\n",
-            errout.str());
+            "[test.cpp:9:19] -> [test.cpp:8:11]: (warning) Either the condition 'ptr->y!=nullptr' is redundant or there is possible null pointer dereference: ptr->y. [nullPointerRedundantCheck]\n",
+            errout_str());
+
+        check("bool argsMatch(const Token *first, const Token *second) {\n" // #6145
+              "    if (first->str() == \")\")\n"
+              "        return true;\n"
+              "    else if (first->next()->str() == \"=\")\n"
+              "        first = first->nextArgument();\n"
+              "    else if (second->next()->str() == \"=\") {\n"
+              "        second = second->nextArgument();\n"
+              "        if (second)\n"
+              "            second = second->tokAt(-2);\n"
+              "        if (!first || !second) {\n"
+              "            return !first && !second;\n"
+              "        }\n"
+              "    }\n"
+              "    return false;\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:10:13] -> [test.cpp:2:9]: (warning) Either the condition '!first' is redundant or there is possible null pointer dereference: first. [nullPointerRedundantCheck]\n"
+            "[test.cpp:10:13] -> [test.cpp:4:14]: (warning) Either the condition '!first' is redundant or there is possible null pointer dereference: first. [nullPointerRedundantCheck]\n",
+            errout_str());
     }
 
     void nullpointer90() // #6098
@@ -2686,8 +2706,8 @@ class TestNullPointer : public TestFixture {
               "  return \"unknown\";\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:3]: (warning) Either the condition 'ctx' is redundant or there is possible null pointer dereference: ctx.\n",
-            errout.str());
+            "[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());
     }
 
     void nullpointer91() // #10678
@@ -2699,7 +2719,7 @@ class TestNullPointer : public TestFixture {
               "    const int Length = PEnd == nullptr ? 0 : PEnd - PBeg;\n"
               "  };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer92()
@@ -2709,14 +2729,14 @@ class TestNullPointer : public TestFixture {
               "    if (!g(!!i)) return 0;\n"
               "    return *i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool g(bool);\n"
               "int f(int* i) {\n"
               "    if (!g(!i)) return 0;\n"
               "    return *i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer93() // #3929
@@ -2727,7 +2747,7 @@ class TestNullPointer : public TestFixture {
               "        *myNull=42;\n"
               "        return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: myNull\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (error) Null pointer dereference: myNull [nullPointer]\n", errout_str());
 
         check("struct foo {\n"
               "    int* GetThing(void) { return 0; }\n"
@@ -2738,7 +2758,16 @@ class TestNullPointer : public TestFixture {
               "        *myNull=42;\n"
               "        return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Null pointer dereference: myNull\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:10]: (error) Null pointer dereference: myNull [nullPointer]\n", errout_str());
+
+        check("struct T { bool g() const; };\n"
+              "void f(T* p) {\n"
+              "    if (!p)\n"
+              "        return;\n"
+              "    while (p->g())\n"
+              "        p = nullptr;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:12]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer94() // #11040
@@ -2751,7 +2780,7 @@ class TestNullPointer : public TestFixture {
               "    (*kep)->next = 0;\n"
               "    (*kep)->len = slen;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:6]: (warning) If memory allocation fails, then there is a possible null pointer dereference: *kep [nullPointerOutOfMemory]\n", errout_str());
     }
 
     void nullpointer95() // #11142
@@ -2761,7 +2790,7 @@ class TestNullPointer : public TestFixture {
               "        if (*p < 2)\n"
               "            p = nullptr;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer96()
@@ -2780,7 +2809,7 @@ class TestNullPointer : public TestFixture {
               "  }\n"
               "  if (s) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer97() // #11229
@@ -2794,7 +2823,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer98() // #11458
@@ -2805,7 +2834,7 @@ class TestNullPointer : public TestFixture {
               "    void g(S* b) const { g(b->d(), nullptr); }\n"
               "    void g(S* b, S* d) const { g(b->d(), d->d()); }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer99() // #10602
@@ -2826,7 +2855,7 @@ class TestNullPointer : public TestFixture {
               "        buf[2] = 0;" // <<
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:14]: (error) Null pointer dereference: buf\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:14:9]: (error) Null pointer dereference: buf [nullPointer]\n", errout_str());
     }
 
     void nullpointer100() // #11636
@@ -2837,7 +2866,7 @@ class TestNullPointer : public TestFixture {
               "    const char* t = type_of(tmp);\n"
               "    std::cout << t;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer101() // #11382
@@ -2849,7 +2878,71 @@ class TestNullPointer : public TestFixture {
               "    const Derived* derived = dynamic_cast<const Derived*>(base);\n"
               "    if (derived && !is_valid(*derived) || base == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer102()
+    {
+        check("struct S { std::string str; };\n" // #11534
+              "struct T { S s; };\n"
+              "struct U { T t[1]; };\n"
+              "void f(const T& t, const U& u, std::string& str) {\n"
+              "    if (str.empty())\n"
+              "        str = t.s.str;\n"
+              "    else\n"
+              "        str = u.t[0].s.str;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointer103()
+    {
+        check("struct S {\n" // #10572
+              "    int f();\n"
+              "    int* m_P{};\n"
+              "};\n"
+              "int S::f() {\n"
+              "    if (!m_P) {\n"
+              "        try {\n"
+              "            m_P = new int(1);\n"
+              "        }\n"
+              "        catch (...) {\n"
+              "            return 0;\n"
+              "        }\n"
+              "    }\n"
+              "    return *m_P;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int* p, const int* q) {\n" // #11873
+              "    if (*q == -1)\n"
+              "        *p = 0;\n"
+              "}\n"
+              "void g() {\n"
+              "    int x = -2;\n"
+              "    f(nullptr, &x);\n"
+              "}\n");
+        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 nullpointer_addressOf() { // address of
@@ -2857,13 +2950,13 @@ class TestNullPointer : public TestFixture {
               "  struct X *x = 0;\n"
               "  if (addr == &x->y) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  struct X *x = 0;\n"
               "  if (addr == &x->y.z[0]) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkP("typedef int Count;\n" // #10018
                "#define offsetof(TYPE, MEMBER) ((Count) & ((TYPE*)0)->MEMBER)\n"
@@ -2873,7 +2966,7 @@ class TestNullPointer : public TestFixture {
                "int g(int i) {\n"
                "    return offsetof(S, a[i]);\n"
                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointerSwitch() { // #2626
@@ -2888,8 +2981,8 @@ class TestNullPointer : public TestFixture {
               "        break;\n"
               "    }\n"
               "    return p;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Possible null pointer dereference: p\n", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:7:10]: (warning) Possible null pointer dereference: p [nullPointer]\n", errout_str());
     }
 
     void nullpointer_cast() {
@@ -2899,22 +2992,22 @@ class TestNullPointer : public TestFixture {
               "            p++;\n"
               "    return p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char* origin) {\n" // #11449
               "    char* cp = (strchr)(origin, '\\0');\n"
               "    if (cp[-1] != '/')\n"
               "        *cp++ = '/';\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer_castToVoid() {  // #3771
         check("void f () {\n"
               "    int *buf; buf = NULL;\n"
               "    buf;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer_subfunction() {
@@ -2925,8 +3018,8 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "void g() {\n"
               "    f(nullptr, nullptr);\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Check if pointer is null and the dereference it
@@ -2936,27 +3029,27 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "}");
-        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());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "    if (p) {\n"
@@ -2964,7 +3057,7 @@ class TestNullPointer : public TestFixture {
               "    bar();\n"
               "    strcpy(p, \"abc\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "    if (!p) {\n"
@@ -2972,7 +3065,7 @@ class TestNullPointer : public TestFixture {
               "    else { if (!p->x) {\n"
               "    } }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             static const char code[] =
@@ -2982,11 +3075,11 @@ class TestNullPointer : public TestFixture {
                 "    }\n"
                 "    *p = 0;\n"
                 "}";
-            check(code, false);
-            ASSERT_EQUALS("", errout.str());
+            check(code);
+            ASSERT_EQUALS("", errout_str());
 
-            check(code, true);
-            ASSERT_EQUALS("", errout.str());
+            check(code, dinit(CheckOptions, $.inconclusive = true));
+            ASSERT_EQUALS("", errout_str());
         }
 
         check("void foo(char *p) {\n"
@@ -2995,7 +3088,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
@@ -3003,7 +3096,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
@@ -3011,21 +3104,21 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
               "        switch (x) { }\n"
               "    }\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "    if (!p) {\n"
               "    }\n"
               "    return *x;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int *p) {\n"
               "    if (!p) {\n"
@@ -3033,8 +3126,8 @@ class TestNullPointer : public TestFixture {
               "        return 5+*p;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n"
-                      "[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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());
 
         // operator!
         check("void f() {\n"
@@ -3043,7 +3136,7 @@ class TestNullPointer : public TestFixture {
               "        a.x();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // This is why this check can't be used on the simplified token list
         check("void f(Foo *foo) {\n"
@@ -3051,7 +3144,7 @@ class TestNullPointer : public TestFixture {
               "        *foo = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket: #2300 - calling unknown function that may initialize the pointer
         check("Fred *fred;\n"
@@ -3061,7 +3154,7 @@ class TestNullPointer : public TestFixture {
               "        fred->x = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #1219
         check("void foo(char *p) {\n"
@@ -3070,7 +3163,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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
         check("void f(Fred *fred) {\n"
@@ -3079,7 +3172,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    fred->a();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2493 - switch
         check("void f(Fred *fred) {\n"
@@ -3092,7 +3185,7 @@ class TestNullPointer : public TestFixture {
               "            break;\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4118 - second if
         check("void f(char *p) {\n"
@@ -3100,7 +3193,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p) x = 0;\n"
               "    if (x) *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2674 - different functions
         check("class Fred {\n"
@@ -3116,16 +3209,16 @@ class TestNullPointer : public TestFixture {
               "\n"
               "void Fred::b() {\n"
               "    wilma->Reload();\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(int *i) {\n"
               "  if(i == NULL) { }\n"
               "  else {\n"
               "    int b = *i;\n"
               "  }\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 1
         check("void f()\n"
@@ -3137,8 +3230,8 @@ class TestNullPointer : public TestFixture {
               "\n"
               "   if (pFoo)\n"
               "      bar();\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 2
         check("void f()\n"
@@ -3150,8 +3243,8 @@ class TestNullPointer : public TestFixture {
               "      pFoo = pFoo->next;\n"
               "\n"
               "   len = sizeof(pFoo->data);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #2696 - false positives nr 3
         check("void f()\n"
@@ -3163,14 +3256,14 @@ class TestNullPointer : public TestFixture {
               "      pFoo = pFoo->next;\n"
               "\n"
               "   len = decltype(*pFoo);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(struct Fred *fred) {\n"
               "    if (fred) { }\n"
               "    return fred->a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'fred' is redundant or there is possible null pointer dereference: fred.\n", errout.str());
+        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
         check("void f() {\n"
@@ -3178,7 +3271,7 @@ class TestNullPointer : public TestFixture {
               "    if (!p) { }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition '!p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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
         check("void f() {\n"
@@ -3187,7 +3280,7 @@ class TestNullPointer : public TestFixture {
               "        *p = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // check, assign and use
         check("void f() {\n"
@@ -3196,7 +3289,7 @@ class TestNullPointer : public TestFixture {
               "        *p = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // check, and use
         check("void f() {\n"
@@ -3205,7 +3298,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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
         check("void f() {\n"
@@ -3214,7 +3307,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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
         check("void f() {\n"
@@ -3223,7 +3316,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // check, and use
         check("void f() {\n"
@@ -3232,7 +3325,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'p==NULL' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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
         check("void f(struct X *p, int x) {\n"
@@ -3240,7 +3333,7 @@ class TestNullPointer : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             const char code[] = "void f(Fred *fred) {\n"
@@ -3249,59 +3342,73 @@ class TestNullPointer : public TestFixture {
                                 "}";
 
             check(code);     // inconclusive
-            ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'fred==NULL' is redundant or there is possible null pointer dereference: fred.\n", errout.str());
+            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());
         }
 
         check("void f(char *s) {\n"   // #3358
               "    if (s==0);\n"
               "    strcpy(a, s?b:c);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // sizeof
         check("void f(struct fred_t *fred) {\n"
               "    if (!fred)\n"
               "        int sz = sizeof(fred->x);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // check in macro
         check("void f(int *x) {\n"
               "    $if (!x) {}\n"
               "    *x = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return ?:
         check("int f(ABC *p) {\n" // FP : return ?:
               "    if (!p) {}\n"
               "    return p ? p->x : 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x, int *p) {\n"
               "    if (x || !p) {}\n"
               "    *p = 0;\n"
               "}");
-        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());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
@@ -3310,12 +3417,12 @@ class TestNullPointer : public TestFixture {
               "    int* p = 0;\n"
               "    return p[4];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("void f() {\n"
               "    typeof(*NULL) y;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int * f() {\n"
               "    return NULL;\n"
@@ -3323,7 +3430,7 @@ class TestNullPointer : public TestFixture {
               "int main() {\n"
               "  return *f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Null pointer dereference: f()\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Null pointer dereference: f() [nullPointer]\n", errout_str());
     }
 
     void gcc_statement_expression() {
@@ -3331,15 +3438,15 @@ class TestNullPointer : public TestFixture {
         check("void f(struct ABC *abc) {\n"
               "    ({ if (abc) dbg(); })\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void snprintf_with_zero_size() {
         // Ticket #2840
         check("void f() {\n"
               "    int bytes = snprintf(0, 0, \"%u\", 1);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void snprintf_with_non_zero_size() {
@@ -3347,131 +3454,150 @@ class TestNullPointer : public TestFixture {
         check("void f() {\n"
               "    int bytes = snprintf(0, 10, \"%u\", 1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("void f(char* s) {\n"
               "    printf(\"%s\", s);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* s = 0;\n"
               "    printf(\"%s\", s);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: s\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:18]: (error) Null pointer dereference: s [nullPointer]\n"
+            "[test.cpp:3:18]: (error) Null pointer dereference [nullPointer]\n",
+            errout_str());
 
         check("void f() {\n"
               "    char *s = 0;\n"
               "    printf(\"%s\", s == 0 ? a : s);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    printf(\"%u%s\", 0, 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* s = 0;\n"
               "    printf(\"%u%s\", 123, s);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: s\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:25]: (error) Null pointer dereference: s [nullPointer]\n"
+            "[test.cpp:3:25]: (error) Null pointer dereference [nullPointer]\n",
+            errout_str());
 
 
         check("void f() {\n"
               "    printf(\"%%%s%%\", 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("void f(char* s) {\n"
               "    printf(\"text: %m%s, %s\", s, 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void scanf_with_invalid_va_argument() {
         check("void f(char* s) {\n"
               "    sscanf(s, \"%s\", 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n"
+            "[test.cpp:2:21]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            errout_str());
 
         check("void f() {\n"
               "    scanf(\"%d\", 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n"
+            "[test.cpp:2:17]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            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"
               "}");
-        ASSERT_EQUALS("", errout.str()); // ticket #3207
+        ASSERT_EQUALS("", errout_str()); // ticket #3207
 
         check("void f(char *dummy) {\n"
               "    int iVal;\n"
               "    sscanf(dummy, \"%d%c\", &iVal);\n"
               "}");
-        ASSERT_EQUALS("", errout.str()); // ticket #3211
+        ASSERT_EQUALS("", errout_str()); // ticket #3211
 
         check("void f(char *dummy) {\n"
               "    int* iVal = 0;\n"
               "    sscanf(dummy, \"%d\", iVal);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: iVal\n", errout.str());
+        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
+            errout_str());
 
         check("void f(char *dummy) {\n"
               "    int* iVal;\n"
               "    sscanf(dummy, \"%d\", foo(iVal));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char *dummy) {\n"
               "    int* iVal = 0;\n"
               "    sscanf(dummy, \"%d%d\", foo(iVal), iVal);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char* dummy) {\n"
               "    sscanf(dummy, \"%*d%u\", 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n"
+            "[test.cpp:2:28]: (error) Null pointer dereference [nullPointer]\n",   // duplicate
+            errout_str());
     }
 
     void nullpointer_in_return() {
@@ -3481,12 +3607,12 @@ class TestNullPointer : public TestFixture {
               "    if(maybe()) iVal = g();\n"
               "    return iVal[0];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Possible null pointer dereference: iVal\n", errout.str());
+        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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer_in_typeid() {
@@ -3495,21 +3621,21 @@ class TestNullPointer : public TestFixture {
               "bool foo() {\n"
               "     PolymorphicA* a = 0;\n"
               "     return typeid(*a) == typeid(*a);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo() {\n"
               "     char* c = 0;\n"
               "     return typeid(*c) == typeid(*c);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer_in_alignof() // #11401
@@ -3517,41 +3643,41 @@ class TestNullPointer : public TestFixture {
         check("size_t foo() {\n"
               "    char* c = 0;\n"
               "    return alignof(*c);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return alignof(*0);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) {\n"
               "    f(alignof(*p));\n"
               "    if (p) {}\n"
               "    return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    char* c = 0;\n"
               "    return _Alignof(*c);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return _alignof(*0);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return __alignof(*0);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t foo() {\n"
               "    return __alignof__(*0);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointer_in_for_loop() {
@@ -3562,7 +3688,7 @@ class TestNullPointer : public TestFixture {
               " for (int i = 0; i < cnt; ++i)\n"
               "  *ptr++ = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11635
         check("void f(char *cons, int rlen, int pos) {\n"
@@ -3574,7 +3700,48 @@ class TestNullPointer : public TestFixture {
               "        else\n"
               "            i++;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void nullpointerDeadCode() {
+        // Ticket #11311
+        check ("void f() {\n"
+               "    if (0)\n"
+               "        *(int *)0 = 1;\n"
+               "    else\n"
+               "         ;\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check ("void f() {\n"
+               "    if (0)\n"
+               "        *(int *)0 = 1;\n"
+               "    else {\n"
+               "        if (0)\n"
+               "            *(int *)0 = 2;\n"
+               "        else\n"
+               "            ;\n"
+               "    }\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check ("void f() {\n"
+               "    while(0)\n"
+               "        *(int*)0 = 1;\n"
+               "    do {\n"
+               "    } while(0);\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check ("int f() {\n"
+               "    return 0 ? *(int*)0 = 1 : 1;\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check ("int f() {\n"
+               "    return 1 ? 1 : *(int*)0 = 1;\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointerDelete() {
@@ -3583,8 +3750,8 @@ class TestNullPointer : public TestFixture {
               "  if (k)\n"
               "     k->doStuff();\n"
               "  delete k;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  K *k = getK();\n"
@@ -3592,8 +3759,8 @@ class TestNullPointer : public TestFixture {
               "     k[0] = ptr;\n"
               "  delete [] k;\n"
               "  k = new K[10];\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointerSubFunction() {
@@ -3602,7 +3769,7 @@ class TestNullPointer : public TestFixture {
               "    if (x)\n"
               "        g(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointerExit() {
@@ -3611,8 +3778,8 @@ class TestNullPointer : public TestFixture {
               "  if (!k)\n"
               "     exit(1);\n"
               "  k->f();\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nullpointerStdString() {
@@ -3628,40 +3795,40 @@ class TestNullPointer : public TestFixture {
               "    std::string s4 = p;\n"
               "    std::string s5(p);\n"
               "    foo(std::string(p));\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:9]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:10]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:11]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:12]: (warning, inconclusive) Possible null pointer dereference: p\n"
-                      "[test.cpp:3]: (error) Null pointer dereference\n"
-                      "[test.cpp:5]: (error) Null pointer dereference\n"
-                      "[test.cpp:7]: (error) Null pointer dereference\n"
-                      "[test.cpp:8]: (error) Null pointer dereference\n"
-                      , errout.str());
+              "}", 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"
+                      "[test.cpp:12:21]: (error) Null pointer dereference: p [nullPointer]\n"
+                      "[test.cpp:3:10]: (error) Null pointer dereference [nullPointer]\n"
+                      "[test.cpp:5:22]: (error) Null pointer dereference [nullPointer]\n"
+                      "[test.cpp:7:17]: (error) Null pointer dereference [nullPointer]\n"
+                      "[test.cpp:8:9]: (error) Null pointer dereference [nullPointer]\n"
+                      , errout_str());
 
         check("void f(std::string s1) {\n"
               "    s1 = nullptr;\n"
               "    std::string s2 = nullptr;\n"
               "    std::string s3(nullptr);\n"
               "    foo(std::string(nullptr));\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n"
-                      "[test.cpp:3]: (error) Null pointer dereference\n"
-                      "[test.cpp:4]: (error) Null pointer dereference\n"
-                      "[test.cpp:5]: (error) Null pointer dereference\n"
-                      , errout.str());
+              "}", 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"
+                      "[test.cpp:5:9]: (error) Null pointer dereference [nullPointer]\n"
+                      , errout_str());
 
         check("void f(std::string s1) {\n"
               "    s1 = NULL;\n"
               "    std::string s2 = NULL;\n"
               "    std::string s3(NULL);\n"
               "    foo(std::string(NULL));\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference\n"
-                      "[test.cpp:3]: (error) Null pointer dereference\n"
-                      "[test.cpp:4]: (error) Null pointer dereference\n"
-                      "[test.cpp:5]: (error) Null pointer dereference\n"
-                      , errout.str());
+              "}", 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"
+                      "[test.cpp:5:9]: (error) Null pointer dereference [nullPointer]\n"
+                      , errout_str());
 
         check("void f(std::string s1, const std::string& s2, const std::string* s3) {\n"
               "    void* p = 0;\n"
@@ -3672,11 +3839,11 @@ class TestNullPointer : public TestFixture {
               "    foo(p == s1);\n"
               "    foo(p == s2);\n"
               "    foo(p == s3);\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:5]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:7]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:8]: (error) Null pointer dereference: p\n", errout.str());
+              "}", 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"
+                      "[test.cpp:8:9]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("void f(std::string s1, const std::string& s2, const std::string* s3) {\n"
               "    void* p = 0;\n"
@@ -3687,8 +3854,8 @@ class TestNullPointer : public TestFixture {
               "    foo(s1.size() == 0);\n"
               "    foo(s2.size() == 0);\n"
               "    foo(s3->size() == 0);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s1, const std::string& s2) {\n"
               "    if (x) { return; }\n"
@@ -3696,8 +3863,8 @@ class TestNullPointer : public TestFixture {
               "    foo(0 == s2[0]);\n"
               "    foo(s1[0] == 0);\n"
               "    foo(s2[0] == 0);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s1, const std::string& s2) {\n"
               "    if (x) { return; }\n"
@@ -3705,8 +3872,8 @@ class TestNullPointer : public TestFixture {
               "    foo(s2 == '\\0');\n"
               "    foo('\\0' == s1);\n"
               "    foo('\\0' == s2);\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("class Bar {\n"
               "    std::string s;\n"
@@ -3717,19 +3884,19 @@ class TestNullPointer : public TestFixture {
               "    Foo();\n"
               "};\n"
               "Foo::Foo() : s(0) {}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference\n"
-                      "[test.cpp:9]: (error) Null pointer dereference\n", errout.str());
+        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"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int i, std::string s);\n"
               "void bar() {\n"
@@ -3740,10 +3907,10 @@ class TestNullPointer : public TestFixture {
               "  foo(var, nullptr);\n"
               "  foo(0, var);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference\n"
-                      "[test.cpp:5]: (error) Null pointer dereference\n"
-                      "[test.cpp:6]: (error) Null pointer dereference\n"
-                      "[test.cpp:7]: (error) Null pointer dereference\n", errout.str());
+        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"
+                      "[test.cpp:7:12]: (error) Null pointer dereference [nullPointer]\n", errout_str());
 
         check("std::string f() {\n" // #9827
               "  char* p = NULL;\n"
@@ -3752,22 +3919,22 @@ class TestNullPointer : public TestFixture {
               "    return \"\";\n"
               "  std::string s(p);\n"
               "  return s;\n"
-              "}\n", /*inconclusive*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #11078
               "    const char* p = nullptr;\n"
               "    std::string s1{ p };\n"
               "    std::string s2{ nullptr };\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:4]: (error) Null pointer dereference\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:21]: (error) Null pointer dereference: p [nullPointer]\n"
+                      "[test.cpp:4:17]: (error) Null pointer dereference [nullPointer]\n",
+                      errout_str());
 
         check("const char* g(long) { return nullptr; }\n" // #11561
               "void f() { std::string s = g(0L); }\n");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Null pointer dereference: g(0L)\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:29]: (error) Null pointer dereference: g(0L) [nullPointer]\n",
+                      errout_str());
     }
 
     void nullpointerStdStream() {
@@ -3775,7 +3942,7 @@ class TestNullPointer : public TestFixture {
               "    char* p = 0;\n"
               "    is >> p;\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Possible null pointer dereference: p\n", "", errout.str());
+        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"
               "    char const* p = 0;\n" // Simplification makes detection of bug difficult
@@ -3783,10 +3950,10 @@ class TestNullPointer : public TestFixture {
               "    oss << foo << p;\n"
               "    if(q == 0)\n"
               "        oss << foo << q;\n"
-              "}", false);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:4]: (error) Null pointer dereference: p\n"
-                      "[test.cpp:5] -> [test.cpp:6]: (warning) Either the condition 'q==0' is redundant or there is possible null pointer dereference: q.\n", errout.str());
+              "}");
+        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());
 
         check("void f(const char* p) {\n"
               "    if(p == 0) {\n"
@@ -3795,14 +3962,14 @@ class TestNullPointer : public TestFixture {
               "        std::cin >> p;\n"
               "        std::cout << abc << p;\n"
               "    }\n"
-              "}", false);
-        TODO_ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:5]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:6]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n",
-                           "[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n"
-                           "[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p.\n",
-                           errout.str());
+              "}");
+        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"
+                           "[test.cpp:2:10] -> [test.cpp:6]: (warning) Either the condition 'p==0' is redundant or there is possible null pointer dereference: p. [nullPointerRedundantCheck]\n",
+                           "[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",
+                           errout_str());
 
         check("void f() {\n"
               "    void* p1 = 0;\n"
@@ -3810,22 +3977,22 @@ class TestNullPointer : public TestFixture {
               "    char* p2 = 0;\n"
               "    std::cin >> (int)p;\n" // result casted
               "    std::cout << (int)p;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string& str) {\n"
               "    long long ret = 0;\n"
               "    std::istringstream istr(str);\n"
               "    istr >> std::hex >> ret;\n" // Read integer
               "    return ret;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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)
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #5811 false positive: (error) Null pointer dereference
         check("using namespace std;\n"
@@ -3833,16 +4000,16 @@ class TestNullPointer : public TestFixture {
               "    stringstream out;\n"
               "    out << ((ip >> 0) & 0xFF);\n"
               "    return out.str();\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
         // avoid regression from first fix attempt for #5811...
         check("void deserialize(const std::string &data) {\n"
               "std::istringstream iss(data);\n"
               "unsigned int len = 0;\n"
               "if (!(iss >> len))\n"
               "    return;\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -3854,42 +4021,42 @@ class TestNullPointer : public TestFixture {
               "  if (p) {}\n"
               "  dostuff(p->x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        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"
@@ -3897,7 +4064,7 @@ class TestNullPointer : public TestFixture {
               "  p.reset(pp);\n"
               "  dostuff(p->x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Null pointer dereference: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:11]: (error) Null pointer dereference: p [nullPointer]\n", errout_str());
 
         check("struct Fred { int x; };\n"
               "void f(Fred& f) {\n"
@@ -3905,28 +4072,28 @@ class TestNullPointer : public TestFixture {
               "  p.reset(&f);\n"
               "  dostuff(p->x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Null pointer dereference: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9216
         check("struct A {\n"
@@ -3937,7 +4104,7 @@ class TestNullPointer : public TestFixture {
               "    var->reset();\n"
               "    var->f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9439
         check("char* g();\n"
@@ -3945,8 +4112,8 @@ class TestNullPointer : public TestFixture {
               "    std::unique_ptr<char> x(g());\n"
               "    if( x ) {}\n"
               "    return x.release();\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #9496
         check("std::shared_ptr<int> f() {\n"
@@ -3955,8 +4122,31 @@ class TestNullPointer : public TestFixture {
               "void g() {\n"
               "    int a = *f();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:5]: (error) Null pointer dereference: f()\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:15]: (error) Null pointer dereference: f() [nullPointer]\n", errout_str());
+    }
+
+    void nullpointerOutOfMemory() {
+        check("void f() {\n"
+              "    int *p = malloc(10);\n"
+              "    *p = 0;\n"
+              "    free(p);\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"
+              "}");
+        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"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3:6]: (warning) If memory allocation fails, then there is a possible null pointer dereference: q [nullPointerOutOfMemory]\n", errout_str());
     }
 
     void functioncall() {    // #3443 - function calls
@@ -3968,7 +4158,7 @@ class TestNullPointer : public TestFixture {
                   "    foo(p);\n"
                   "    if (p) { }\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             // function seen (taking pointer parameter)
             check("void foo(int *p) { }\n"
@@ -3979,8 +4169,8 @@ class TestNullPointer : public TestFixture {
                   "    if (p) { }\n"
                   "}");
             ASSERT_EQUALS(
-                "[test.cpp:6] -> [test.cpp:4]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n",
-                errout.str());
+                "[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());
 
             // function seen (taking reference parameter)
             check("void foo(int *&p) { }\n"
@@ -3989,8 +4179,8 @@ class TestNullPointer : public TestFixture {
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}", true);
-            ASSERT_EQUALS("", errout.str());
+                  "}", dinit(CheckOptions, $.inconclusive = true));
+            ASSERT_EQUALS("", errout_str());
 
             // function implementation not seen
             check("void foo(int *p);\n"
@@ -4001,18 +4191,18 @@ class TestNullPointer : public TestFixture {
                   "    if (p) { }\n"
                   "}");
             ASSERT_EQUALS(
-                "[test.cpp:6] -> [test.cpp:4]: (warning) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n",
-                errout.str());
+                "[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());
 
             // inconclusive
             check("void f(int *p) {\n"
                   "    *p = 0;\n"
                   "    foo(p);\n"
                   "    if (p) { }\n"
-                  "}", true);
+                  "}", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS(
-                "[test.cpp:4] -> [test.cpp:2]: (warning, inconclusive) Either the condition 'p' is redundant or there is possible null pointer dereference: p.\n",
-                errout.str());
+                "[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());
         }
 
         // dereference struct pointer and then check if it's null
@@ -4023,7 +4213,7 @@ class TestNullPointer : public TestFixture {
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             // function seen (taking pointer parameter)
             check("void foo(struct ABC *abc) { }\n"
@@ -4034,8 +4224,8 @@ class TestNullPointer : public TestFixture {
                   "    if (abc) { }\n"
                   "}");
             ASSERT_EQUALS(
-                "[test.cpp:6] -> [test.cpp:4]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc.\n",
-                errout.str());
+                "[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());
 
             // function implementation not seen
             check("void foo(struct ABC *abc);\n"
@@ -4046,52 +4236,74 @@ class TestNullPointer : public TestFixture {
                   "    if (abc) { }\n"
                   "}");
             ASSERT_EQUALS(
-                "[test.cpp:6] -> [test.cpp:4]: (warning) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc.\n",
-                errout.str());
+                "[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());
 
             // inconclusive
             check("void f(struct ABC *abc) {\n"
                   "    abc->a = 0;\n"
                   "    foo(abc);\n"
                   "    if (abc) { }\n"
-                  "}", true);
+                  "}", dinit(CheckOptions, $.inconclusive = true));
             ASSERT_EQUALS(
-                "[test.cpp:4] -> [test.cpp:2]: (warning, inconclusive) Either the condition 'abc' is redundant or there is possible null pointer dereference: abc.\n",
-                errout.str());
+                "[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());
+    }
+
     void functioncalllibrary() {
-        const Settings settings1;
-        Tokenizer tokenizer(&settings1,this);
-        std::istringstream code("void f() { int a,b,c; x(a,b,c); }");
-        ASSERT_EQUALS(true, tokenizer.tokenize(code, "test.c"));
+        SimpleTokenizer tokenizer(settingsDefault,*this,false);
+        const char code[] = "void f() { int a,b,c; x(a,b,c); }";
+        ASSERT_EQUALS(true, tokenizer.tokenize(code));
         const Token *xtok = Token::findsimplematch(tokenizer.tokens(), "x");
 
         // nothing bad..
         {
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <function name=\"x\">\n"
+                                       "    <arg nr=\"1\"></arg>\n"
+                                       "    <arg nr=\"2\"></arg>\n"
+                                       "    <arg nr=\"3\"></arg>\n"
+                                       "  </function>\n"
+                                       "</def>";
+
             Library library;
-            Library::ArgumentChecks arg;
-            library.functions["x"].argumentChecks[1] = arg;
-            library.functions["x"].argumentChecks[2] = arg;
-            library.functions["x"].argumentChecks[3] = arg;
+            ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
             std::list<const Token *> null;
-            CheckNullPointer::parseFunctionCall(*xtok, null, &library);
+            CheckNullPointer::parseFunctionCall(*xtok, null, library);
             ASSERT_EQUALS(0U, null.size());
         }
 
         // for 1st parameter null pointer is not ok..
         {
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <function name=\"x\">\n"
+                                       "    <arg nr=\"1\"><not-null/></arg>\n"
+                                       "    <arg nr=\"2\"></arg>\n"
+                                       "    <arg nr=\"3\"></arg>\n"
+                                       "  </function>\n"
+                                       "</def>";
+
             Library library;
-            Library::ArgumentChecks arg;
-            library.functions["x"].argumentChecks[1] = arg;
-            library.functions["x"].argumentChecks[2] = arg;
-            library.functions["x"].argumentChecks[3] = arg;
-            library.functions["x"].argumentChecks[1].notnull = true;
+            ASSERT(LibraryHelper::loadxmldata(library, xmldata, sizeof(xmldata)));
 
             std::list<const Token *> null;
-            CheckNullPointer::parseFunctionCall(*xtok, null, &library);
+            CheckNullPointer::parseFunctionCall(*xtok, null, library);
             ASSERT_EQUALS(1U, null.size());
             ASSERT_EQUALS("a", null.front()->str());
         }
@@ -4102,51 +4314,51 @@ class TestNullPointer : public TestFixture {
         check("void f(int *p = 0) {\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char a, int *p = 0) {\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p != 0 && bar())\n"
               "      *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p != 0)\n"
               "      *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    int y;\n"
@@ -4154,27 +4366,27 @@ class TestNullPointer : public TestFixture {
               "      p = &y;\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int *p = 0) {\n"
               "    if (a != 0)\n"
               "      *p = 0;\n"
-              "}", true);
+              "}", dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:3]: (warning) Possible null pointer dereference if the default parameter value is used: p\n",
-            errout.str());
+            "[test.cpp:3:8]: (warning) Possible null pointer dereference if the default parameter value is used: p [nullPointerDefaultArg]\n",
+            errout_str());
 
         check("void f(int *p = 0) {\n"
               "    p = a;\n"
               "    *p = 0;\n" // <- don't simplify and verify
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    p += a;\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int *p = 0) {\n"
               "    if (p == 0) {\n"
@@ -4182,42 +4394,45 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    return *p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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;
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str()); // Check the first branch of ternary
+        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;
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str());
+        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
+            errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << (p ? *p : 0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    std::cout << (p && p[0] ? *p : 42);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void isEmpty(int *p = 0) {\n"
               "    return p && *p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int *p = 0) {\n"
               "    return !p || *p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         // bar may initialize p but be can't know for sure without knowing
@@ -4226,13 +4441,13 @@ class TestNullPointer : public TestFixture {
               "    bar(p);\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    printf(\"%p\", p);\n"
               "    *p = 0;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str());
+              "}", 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
         // of p is passed in, it's a good bet that p may be modified and
@@ -4241,14 +4456,14 @@ class TestNullPointer : public TestFixture {
               "    init(&p);\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void init(int* &g);\n"
               "void f(int *p = 0) {\n"
               "    init(p);\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p == 0) {\n"
@@ -4256,7 +4471,7 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p = 0) {\n"
               "    if (p == 0) {\n"
@@ -4264,12 +4479,16 @@ class TestNullPointer : public TestFixture {
               "    }\n"
               "    *p = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x, int *p = 0) {\n"
               "    int var1 = x ? *p : 5;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible null pointer dereference if the default parameter value is used: p\n", errout.str());
+        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
+              "void g() { f(); }\n");
+        ASSERT_EQUALS("[test.cpp:1:29]: (warning) Possible null pointer dereference if the default parameter value is used: i [nullPointerDefaultArg]\n", errout_str());
     }
 
     void nullpointer_internal_error() { // ticket #5080
@@ -4280,7 +4499,7 @@ class TestNullPointer : public TestFixture {
               "    for (j = 0; j < b[0].a->size; ++j) {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ticket6505() {
@@ -4295,8 +4514,8 @@ class TestNullPointer : public TestFixture {
               "}\n"
               "void bar() {\n"
               "  foo(0);\n"
-              "}\n", true, "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void subtract() {
@@ -4304,33 +4523,33 @@ class TestNullPointer : public TestFixture {
               "  char *p = s - 20;\n"
               "}\n"
               "void bar() { foo(0); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!s' is redundant or there is overflow in pointer subtraction.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!s' is redundant or there is overflow in pointer subtraction.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted.\n", errout.str());
+        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--; }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:36]: (error) Overflow in pointer arithmetic, NULL pointer is subtracted. [nullPointerArithmetic]\n", errout_str());
     }
 
     void addNull() {
@@ -4338,48 +4557,48 @@ class TestNullPointer : public TestFixture {
               "  char * p = s + 20;\n"
               "}\n"
               "void bar() { foo(0); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Pointer addition with NULL pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Pointer addition with NULL pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Pointer addition with NULL pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition '!s' is redundant or there is pointer arithmetic with NULL pointer.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Pointer addition with NULL pointer.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:35]: (error) Pointer addition with NULL pointer. [nullPointerArithmetic]\n", errout_str());
 
         check("int* f10() { int *x = NULL; return x++; }");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Pointer addition with NULL pointer.\n", errout.str());
+        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(); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typedef struct { uint8_t* buf, *buf_end; } S;\n" // #11117
               "void f(S* s, uint8_t* buffer, int buffer_size) {\n"
@@ -4390,31 +4609,28 @@ class TestNullPointer : public TestFixture {
               "    s->buf = buffer;\n"
               "    s->buf_end = s->buf + buffer_size;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void isPointerDeRefFunctionDecl() {
         check("const char** get() { return 0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
-#define ctu(code) ctu_(code, __FILE__, __LINE__)
-    void ctu_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define ctu(...) ctu_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void ctu_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        CTU::FileInfo *ctu = CTU::getFileInfo(&tokenizer);
+        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
         // Check code..
         std::list<Check::FileInfo*> fileInfo;
-        CheckNullPointer checkNullPointer(&tokenizer, &settings, this);
-        fileInfo.push_back(checkNullPointer.getFileInfo(&tokenizer, &settings));
-        checkNullPointer.analyseWholeProgram(ctu, fileInfo, settings, *this);
+        Check& c = getCheck<CheckNullPointer>();
+        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();
@@ -4432,20 +4648,20 @@ class TestNullPointer : public TestFixture {
             "  int *p = 0;\n"
             "  f(p);\n"
             "}");
-        ASSERT_EQUALS("test.cpp:2:error:Null pointer dereference: fp\n"
-                      "test.cpp:5:note:Assignment 'p=0', assigned value is 0\n"
-                      "test.cpp:6:note:Calling function f, 1st argument is null\n"
-                      "test.cpp:2:note:Dereferencing argument fp that is null\n", errout.str());
+        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"
+                      "[test.cpp:2:10]: note: Dereferencing argument fp that is null\n", errout_str());
 
         ctu("void use(int *p) { a = *p + 3; }\n"
             "void call(int x, int *p) { x++; use(p); }\n"
             "int main() {\n"
             "  call(4,0);\n"
             "}");
-        ASSERT_EQUALS("test.cpp:1:error:Null pointer dereference: p\n"
-                      "test.cpp:4:note:Calling function call, 2nd argument is null\n"
-                      "test.cpp:2:note:Calling function use, 1st argument is null\n"
-                      "test.cpp:1:note:Dereferencing argument p that is null\n", errout.str());
+        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"
+                      "[test.cpp:1:25]: note: Dereferencing argument p that is null\n", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
             "  if (!var)\n"
@@ -4456,7 +4672,7 @@ class TestNullPointer : public TestFixture {
             "void f() {\n"
             "  dostuff(a, 0);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
             "  if (cond)\n"
@@ -4467,7 +4683,7 @@ class TestNullPointer : public TestFixture {
             "void f() {\n"
             "  dostuff(a, 0);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // else
         ctu("void dostuff(int mask, int *p) {\n"
@@ -4478,7 +4694,7 @@ class TestNullPointer : public TestFixture {
             "void f() {\n"
             "  dostuff(0, 0);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ?, &&, ||
         ctu("void dostuff(int mask, int *p) {\n"
@@ -4488,14 +4704,14 @@ class TestNullPointer : public TestFixture {
             "void f() {\n"
             "  dostuff(0, 0);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("void g(int* x) { *x; }\n"
             "void f(int* x) {\n"
             "    if (x)\n"
             "        g(x);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("size_t f(int* p) {\n"
             "    size_t len = sizeof(*p);\n"
@@ -4504,7 +4720,7 @@ class TestNullPointer : public TestFixture {
             "void g() {\n"
             "    f(NULL);\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("size_t f(int* p) {\n"
             "    size_t len = alignof(*p);\n"
@@ -4513,7 +4729,35 @@ class TestNullPointer : public TestFixture {
             "void g() {\n"
             "    f(NULL);\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // ctu: memory allocation fails
+        ctu("void f(int* p) {\n"
+            "    *p = 0;\n"
+            "}\n"
+            "void g() {\n"
+            "    int* q = (int*)malloc(4);\n"
+            "    f(q);\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:6]: warning: If memory allocation fails, then there is a possible null pointer dereference: p [ctunullpointerOutOfMemory]\n"
+                      "[test.cpp:5:26]: note: Assuming allocation function fails\n"
+                      "[test.cpp:5:14]: note: Assignment 'q=(int*)malloc(4)', assigned value is 0\n"
+                      "[test.cpp:6:6]: note: Calling function f, 1st argument is null\n"
+                      "[test.cpp:2:6]: note: Dereferencing argument p that is null\n", errout_str());
+
+        // ctu: resource allocation fails
+        ctu("void foo(FILE* f) {\n"
+            "    fprintf(f, a);\n"
+            "}\n"
+            "void bar() {\n"
+            "    FILE* f = fopen(notexist,t);\n"
+            "    foo(f);\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:2:13]: warning: If resource allocation fails, then there is a possible null pointer dereference: f [ctunullpointerOutOfResources]\n"
+                      "[test.cpp:5:20]: note: Assuming allocation function fails\n"
+                      "[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());
     }
 };
 
diff --git a/test/testoptions.cpp b/test/testoptions.cpp
index c97d59402ec..7c72b2de336 100644
--- a/test/testoptions.cpp
+++ b/test/testoptions.cpp
@@ -1,21 +1,24 @@
-// Cppcheck - A tool for static C/C++ code analysis
-// Copyright (C) 2007-2023 Cppcheck team.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * 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 "options.h"
 #include "fixture.h"
+#include "options.h"
+#include "utils.h"
 
 #include <set>
 #include <string>
@@ -40,84 +43,98 @@ class TestOptions : public TestFixture {
         TEST_CASE(multiple_testcases);
         TEST_CASE(multiple_testcases_ignore_duplicates);
         TEST_CASE(invalid_switches);
+        TEST_CASE(summary);
+        TEST_CASE(dry_run);
     }
 
 
     void which_test() const {
         const char* argv[] = {"./test_runner", "TestClass"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT(std::set<std::string> {"TestClass"} == args.which_test());
     }
 
 
     void which_test_method() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT(std::set<std::string> {"TestClass::TestMethod"} == args.which_test());
     }
 
 
     void no_test_method() const {
         const char* argv[] = {"./test_runner"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT(std::set<std::string> {""} == args.which_test());
     }
 
 
     void not_quiet() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-v"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(false, args.quiet());
     }
 
 
     void quiet() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-q"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.quiet());
     }
 
     void not_help() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-v"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(false, args.help());
     }
 
 
     void help() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-h"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.help());
     }
 
 
     void help_long() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "--help"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         ASSERT_EQUALS(true, args.help());
     }
 
     void multiple_testcases() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "TestClass::AnotherTestMethod"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         std::set<std::string> expected {"TestClass::TestMethod", "TestClass::AnotherTestMethod"};
         ASSERT(expected == args.which_test());
     }
 
     void multiple_testcases_ignore_duplicates() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "TestClass"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         std::set<std::string> expected {"TestClass"};
         ASSERT(expected == args.which_test());
     }
 
     void invalid_switches() const {
         const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-a", "-v", "-q"};
-        options args(sizeof argv / sizeof argv[0], argv);
+        options args(getArrayLength(argv), argv);
         std::set<std::string> expected {"TestClass::TestMethod"};
         ASSERT(expected == args.which_test());
         ASSERT_EQUALS(true, args.quiet());
     }
+
+    void summary() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-n"};
+        options args(getArrayLength(argv), argv);
+        ASSERT_EQUALS(false, args.summary());
+    }
+
+    void dry_run() const {
+        const char* argv[] = {"./test_runner", "TestClass::TestMethod", "-d"};
+        options args(getArrayLength(argv), argv);
+        ASSERT_EQUALS(true, args.dry_run());
+    }
 };
 
 REGISTER_TEST(TestOptions)
diff --git a/test/testother.cpp b/test/testother.cpp
index 91d1beef558..7a3f0a176cf 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-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
@@ -18,36 +18,38 @@
 
 #include "checkother.h"
 #include "errortypes.h"
-#include "library.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
-#include "preprocessor.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <list>
-#include <map>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
+#include <sstream>
 #include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
+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:
-    Settings _settings;
+    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 {
-        LOAD_LIB_2(_settings.library, "std.cfg");
-
-
+        mNewTemplate = true;
         TEST_CASE(emptyBrackets);
 
         TEST_CASE(zeroDiv1);
@@ -68,6 +70,10 @@ class TestOther : public TestFixture {
         TEST_CASE(zeroDiv16); // #11158
         TEST_CASE(zeroDiv17); // #9931
         TEST_CASE(zeroDiv18);
+        TEST_CASE(zeroDiv19);
+        TEST_CASE(zeroDiv20); // #11175
+        TEST_CASE(zeroDiv21);
+        TEST_CASE(zeroDiv22);
 
         TEST_CASE(zeroDivCond); // division by zero / useless condition
 
@@ -106,8 +112,18 @@ class TestOther : public TestFixture {
         TEST_CASE(varScope32);      // #11441
         TEST_CASE(varScope33);
         TEST_CASE(varScope34);
+        TEST_CASE(varScope35);
+        TEST_CASE(varScope36);      // #12158
+        TEST_CASE(varScope37);      // #12158
+        TEST_CASE(varScope38);
+        TEST_CASE(varScope39);
+        TEST_CASE(varScope40);
+        TEST_CASE(varScope41);      // #11845
+        TEST_CASE(varScope42);
+        TEST_CASE(varScope43);
 
         TEST_CASE(oldStylePointerCast);
+        TEST_CASE(intToPointerCast);
         TEST_CASE(invalidPointerCast);
 
         TEST_CASE(passedByValue);
@@ -117,6 +133,7 @@ class TestOther : public TestFixture {
         TEST_CASE(constVariable);
         TEST_CASE(constParameterCallback);
         TEST_CASE(constPointer);
+        TEST_CASE(constArray);
 
         TEST_CASE(switchRedundantAssignmentTest);
         TEST_CASE(switchRedundantOperationTest);
@@ -127,6 +144,7 @@ class TestOther : public TestFixture {
         TEST_CASE(suspiciousCase);
         TEST_CASE(suspiciousEqualityComparison);
         TEST_CASE(suspiciousUnaryPlusMinus); // #8004
+        TEST_CASE(suspiciousFloatingPointCast);
 
         TEST_CASE(selfAssignment);
         TEST_CASE(trac1132);
@@ -175,8 +193,13 @@ class TestOther : public TestFixture {
         TEST_CASE(duplicateExpression14); // #9871
         TEST_CASE(duplicateExpression15); // #10650
         TEST_CASE(duplicateExpression16); // #10569
+        TEST_CASE(duplicateExpression17); // #12036
+        TEST_CASE(duplicateExpression18);
+        TEST_CASE(duplicateExpression19);
+        TEST_CASE(duplicateExpression20);
         TEST_CASE(duplicateExpressionLoop);
         TEST_CASE(duplicateValueTernary);
+        TEST_CASE(duplicateValueTernarySizeof); // #13773
         TEST_CASE(duplicateExpressionTernary); // #6391
         TEST_CASE(duplicateExpressionTemplate); // #6930
         TEST_CASE(duplicateExpressionCompareWithZero);
@@ -206,6 +229,7 @@ class TestOther : public TestFixture {
         TEST_CASE(redundantVarAssignment);
         TEST_CASE(redundantVarAssignment_trivial);
         TEST_CASE(redundantVarAssignment_struct);
+        TEST_CASE(redundantVarAssignment_union);
         TEST_CASE(redundantVarAssignment_7133);
         TEST_CASE(redundantVarAssignment_stackoverflow);
         TEST_CASE(redundantVarAssignment_lambda);
@@ -216,7 +240,8 @@ class TestOther : public TestFixture {
         TEST_CASE(redundantVarAssignment_array);
         TEST_CASE(redundantVarAssignment_switch_break);
         TEST_CASE(redundantInitialization);
-        TEST_CASE(redundantMemWrite);
+        //TEST_CASE(redundantMemWrite); // FIXME: temporary hack
+        TEST_CASE(redundantAssignmentSameValue);
 
         TEST_CASE(varFuncNullUB);
 
@@ -234,6 +259,8 @@ class TestOther : public TestFixture {
         TEST_CASE(raceAfterInterlockedDecrement);
 
         TEST_CASE(testUnusedLabel);
+        TEST_CASE(testUnusedLabelConfiguration);
+        TEST_CASE(testUnusedLabelSwitchConfiguration);
 
         TEST_CASE(testEvaluationOrder);
         TEST_CASE(testEvaluationOrderSelfAssignment);
@@ -248,6 +275,7 @@ class TestOther : public TestFixture {
         TEST_CASE(doubleMoveMemberInitialization1);
         TEST_CASE(doubleMoveMemberInitialization2);
         TEST_CASE(doubleMoveMemberInitialization3); // #9974
+        TEST_CASE(doubleMoveMemberInitialization4);
         TEST_CASE(moveAndAssign1);
         TEST_CASE(moveAndAssign2);
         TEST_CASE(moveAssignMoveAssign);
@@ -270,6 +298,8 @@ class TestOther : public TestFixture {
         TEST_CASE(forwardAndUsed);
         TEST_CASE(moveAndReference);
         TEST_CASE(moveForRange);
+        TEST_CASE(moveTernary);
+        TEST_CASE(movePointerAlias);
 
         TEST_CASE(funcArgNamesDifferent);
         TEST_CASE(funcArgOrderDifferent);
@@ -290,88 +320,82 @@ class TestOther : public TestFixture {
         TEST_CASE(checkOverlappingWrite);
 
         TEST_CASE(constVariableArrayMember); // #10371
+
+        TEST_CASE(knownPointerToBool);
+        TEST_CASE(iterateByValue);
+
+        TEST_CASE(knownConditionFloating);
+        TEST_CASE(knownConditionPrefixed);
+
+        TEST_CASE(unionZeroInitBasic);
+        TEST_CASE(unionZeroInitArrayMember);
+        TEST_CASE(unionZeroInitStructMember);
+        TEST_CASE(unionZeroInitUnknownType);
+        TEST_CASE(unionZeroInitBitfields);
     }
 
-#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char *filename = nullptr, bool inconclusive = true, bool runSimpleChecks=true, bool verbose=false, Settings* settings = nullptr) {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckOptions
+    {
+        bool cpp = true;
+        bool inconclusive = true;
+        bool verbose = false;
+        Settings* settings = nullptr; // TODO: split from this
+    };
 
-        if (!settings) {
-            settings = &_settings;
+#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    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;
-
-        Preprocessor preprocessor(*settings);
+        else {
+            settings = opt.settings;
+            settings->severity.enable(Severity::style);
+            settings->severity.enable(Severity::warning);
+            settings->severity.enable(Severity::portability);
+            settings->severity.enable(Severity::performance);
+        }
+        settings->certainty.setEnabled(Certainty::inconclusive, opt.inconclusive);
+        settings->verbose = opt.verbose;
 
         // Tokenize..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename ? filename : "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(*settings, *this, opt.cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        runChecks<CheckOther>(&tokenizer, settings, this);
-
-        (void)runSimpleChecks; // TODO Remove this
-    }
-
-    void check_(const char* file, int line, const char code[], Settings *s) {
-        check_(file, line, code, "test.cpp", true, true, false, s);
+        runChecks<CheckOther>(tokenizer, this);
     }
 
-    void checkP(const char code[], const char *filename = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
-
-        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);
-
-        // Raw tokens..
-        std::vector<std::string> files(1, filename);
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+    struct CheckPOptions
+    {
+        bool cpp = true;
+    };
 
-        Preprocessor preprocessor(*settings);
-        preprocessor.setDirectives(tokens1);
+#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()) {
+        SimpleTokenizer2 tokenizer(settings2, *this, code, options.cpp ? "test.cpp" : "test.c");
 
         // Tokenizer..
-        Tokenizer tokenizer(settings, this, &preprocessor);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check..
-        runChecks<CheckOther>(&tokenizer, settings, this);
+        runChecks<CheckOther>(tokenizer, this);
     }
 
-    void checkInterlockedDecrement(const char code[]) {
-        Settings settings;
-        settings.platform.type = cppcheck::Platform::Type::Win32A;
+    template<size_t size>
+    void checkInterlockedDecrement(const char (&code)[size]) {
+        /*const*/ Settings settings = settingsBuilder().platform(Platform::Type::Win32A).build();
 
-        check(code, nullptr, false, true, false, &settings);
+        check(code, dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
     }
 
     void emptyBrackets() {
         check("{\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -379,22 +403,22 @@ class TestOther : public TestFixture {
         check("void foo() {\n"
               "    cout << 1. / 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (double)0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (float)0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    cout << 42 / (int)0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:16]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv2() {
@@ -407,34 +431,34 @@ class TestOther : public TestFixture {
               "    }\n"
               "    cout<<b/sum;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv3() {
         check("int foo(int i) {\n"
               "    return i / 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("int foo(int i) {\n"
               "    return i % 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void foo(int& i) {\n"
               "    i /= 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:7]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void foo(int& i) {\n"
               "    i %= 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv4() {
@@ -442,40 +466,40 @@ class TestOther : public TestFixture {
               "{\n"
               "   long a = b / 0x6;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0x0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0x0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0L;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0L;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0ul;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{\n"
               "   long a = b / 0ul;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Division by zero.\n", errout.str());
+        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)
         // and floating points are handled differently than integers.
@@ -483,13 +507,13 @@ class TestOther : public TestFixture {
               "{\n"
               "   long a = b / 0.0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
               "   long a = b / 0.5;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv5() {
@@ -497,12 +521,12 @@ class TestOther : public TestFixture {
               "{ { {\n"
               "   long a = b / 0;\n"
               "} } }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(long b)\n"
               "{ { {\n"
               "   long a = b / 0;\n"
               "} } }");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:15]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv6() {
@@ -510,12 +534,12 @@ class TestOther : public TestFixture {
               "{ { {\n"
               "   int a = b % 0;\n"
               "} } }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f(int b)\n"
               "{ { {\n"
               "   int a = b % 0;\n"
               "} } }");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv7() {
@@ -524,13 +548,13 @@ class TestOther : public TestFixture {
               "  int a = x/2*3/0;\n"
               "  int b = y/2*3%0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n"
-                      "[test.cpp:3]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:16]: (error) Division by zero. [zerodiv]\n"
+                      "[test.cpp:3:16]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv8() {
@@ -540,7 +564,7 @@ class TestOther : public TestFixture {
               "  do_something(a);\n"
               "  return 4 / a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error, inconclusive) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (error, inconclusive) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv9() {
@@ -554,7 +578,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv10() {
@@ -565,7 +589,7 @@ class TestOther : public TestFixture {
               "    << std::endl;\n"
               "  return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv11() {
@@ -573,13 +597,13 @@ class TestOther : public TestFixture {
               "  int res = (a+2)/0;\n"
               "  int res = (a*2)/0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n"
-                      "[test.cpp:3]: (error) Division by zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv12() {
@@ -587,7 +611,7 @@ class TestOther : public TestFixture {
         check("intmax_t f() {\n"
               "  return 1 / imaxabs(0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
     void zeroDiv13() {
         // #7324
@@ -597,7 +621,7 @@ class TestOther : public TestFixture {
               "    dividend = dividend / (--divisor);\n"
               "    return dividend;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:25]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv14() {
@@ -608,7 +632,7 @@ class TestOther : public TestFixture {
               "    std::cout << ix / (i >> 1) << std::endl;\n"
               "    std::cout << dx / (i >> 1) << std::endl;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:21]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     void zeroDiv15() { // #8319
@@ -618,7 +642,7 @@ class TestOther : public TestFixture {
               "    const int r = 1 / f(d);\n"
               "    return r;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Division by zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:21]: (error) Division by zero. [zerodiv]\n", errout_str());
     }
 
     // #11158
@@ -632,7 +656,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return a;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int i) {\n"
               "    int number = 10, a = 0;\n"
@@ -643,7 +667,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return a;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv17() { // #9931
@@ -652,7 +676,7 @@ class TestOther : public TestFixture {
               "    int x = len % sz;\n"
               "    return x;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void zeroDiv18()
@@ -662,8 +686,46 @@ class TestOther : public TestFixture {
               "    return 1 / (x-y);\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'x==y' is redundant or there is division by zero at line 3.\n",
-            errout.str());
+            "[test.cpp:2:11] -> [test.cpp:3:14]: (warning) Either the condition 'x==y' is redundant or there is division by zero at line 3. [zerodivcond]\n",
+            errout_str());
+    }
+
+    void zeroDiv19()
+    {
+        check("void f() {\n" // #2456
+              "    for (int i = 0;;)\n"
+              "        int j = 10 / i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:20]: (error) Division by zero. [zerodiv]\n", errout_str());
+    }
+
+    void zeroDiv20()
+    {
+        check("uint16_t f(void)\n" // #11175
+              "{\n"
+              "    uint16_t x = 0xFFFFU;\n" // UINT16_MAX=0xFFFF
+              "    return 42/(++x);\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:4:14]: (error) Division by zero. [zerodiv]\n", errout_str());
+    }
+
+    void zeroDiv21()
+    {
+        check("int f(int n) {\n"
+              "    return 1 / ((1 / n) - 1);\n"
+              "}\n"
+              "int g() {\n"
+              "    return f(1);\n"
+              "}\n");
+        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() {
@@ -671,25 +733,25 @@ class TestOther : public TestFixture {
               "  int y = 17 / x;\n"
               "  if (x > 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'x>0' is redundant or there is division by zero at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'x>=1' is redundant or there is division by zero at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'x==0' is redundant or there is division by zero at line 2.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'x!=0' is redundant or there is division by zero at line 2.\n", errout.str());
+        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
         check("void f1(int x, int y) { c=x/y; }\n"
@@ -698,8 +760,8 @@ class TestOther : public TestFixture {
               "    if (y>0){}\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:1]: (warning) Either the condition 'y>0' is redundant or there is division by zero at line 1.\n",
-            errout.str());
+            "[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());
 
         // avoid false positives when variable is changed after division
         check("void f() {\n"
@@ -708,7 +770,7 @@ class TestOther : public TestFixture {
               "  x = some+calculation;\n"
               "  if (x != 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             // function is called that might modify global variable
@@ -719,7 +781,7 @@ class TestOther : public TestFixture {
                   "  do_something();\n"
                   "  if (x != 0) {}\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             // function is called. but don't care, variable is local
             check("void do_something();\n"
@@ -729,7 +791,7 @@ class TestOther : public TestFixture {
                   "  do_something();\n"
                   "  if (x != 0) {}\n"
                   "}");
-            ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:4]: (warning) Either the condition 'x!=0' is redundant or there is division by zero at line 4.\n", errout.str());
+            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());
         }
 
         check("void do_something(int value);\n"
@@ -737,14 +799,14 @@ class TestOther : public TestFixture {
               "  int y = 17 / x;\n"
               "  do_something(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int x;\n"
               "void f() {\n"
               "  int y = 17 / x;\n"
               "  while (y || x == 0) { x--; }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket 5033 segmentation fault (valid code) in CheckOther::checkZeroDivisionOrUselessCondition
         check("void f() {\n"
@@ -753,33 +815,33 @@ class TestOther : public TestFixture {
               "double* p3= new double[1];\n"
               "double* pp[3] = {p1,p2,p3};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5105 - FP
         check("int f(int a, int b) {\n"
               "  int r = a / b;\n"
               "  if (func(b)) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  int r = a ? 1 / a : 0;\n"
               "  if (a == 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int a) {\n"
               "  int r = (a == 0) ? 0 : 1 / a;\n"
               "  if (a == 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int g();\n"
               "void f(int b) {\n"
@@ -789,7 +851,7 @@ class TestOther : public TestFixture {
               "  else\n"
               "    a = b / -x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int x;\n"
@@ -799,7 +861,7 @@ class TestOther : public TestFixture {
               "        a->x = 1;\n"
               "    return 1/a->x;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10049
         check("int f(int argc) {\n"
@@ -811,7 +873,7 @@ class TestOther : public TestFixture {
               "        return quotient;\n"
               "    return remainder;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11315
         checkP("#define STATIC_ASSERT(c) \\\n"
@@ -819,7 +881,7 @@ class TestOther : public TestFixture {
                "void f() {\n"
                "    STATIC_ASSERT(sizeof(int) == sizeof(FOO));\n"
                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11505
         check("void f(uint16_t num, uint8_t radix) {\n"
@@ -827,7 +889,7 @@ class TestOther : public TestFixture {
               "    num /= radix;\n"
               "    if (!num) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void nanInArithmeticExpression() {
@@ -836,35 +898,35 @@ class TestOther : public TestFixture {
               "   double x = 3.0 / 0.0 + 1.0;\n"
               "   printf(\"%f\", x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Using NaN/Inf in a computation.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Using NaN/Inf in a computation.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Using NaN/Inf in a computation.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Using NaN/Inf in a computation.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -895,7 +957,7 @@ class TestOther : public TestFixture {
               "\n"
               "    return 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope2() {
@@ -905,7 +967,7 @@ class TestOther : public TestFixture {
               "    e.SetValue(12);\n"
               "    throw e;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope3() {
@@ -919,7 +981,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    *p = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope4() {
@@ -927,7 +989,7 @@ class TestOther : public TestFixture {
               "{\n"
               "    int i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope5() {
@@ -938,7 +1000,7 @@ class TestOther : public TestFixture {
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) The scope of the variable 'i' can be reduced.\n", errout.str());
+        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"
               "    const unsigned char i = 0;\n"
@@ -946,7 +1008,7 @@ class TestOther : public TestFixture {
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x)\n"
               "{\n"
@@ -956,7 +1018,7 @@ class TestOther : public TestFixture {
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) The scope of the variable 'i' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope6() {
@@ -970,7 +1032,7 @@ class TestOther : public TestFixture {
               "        c(i);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #5398
               "    bool success = false;\n"
@@ -979,14 +1041,14 @@ class TestOther : public TestFixture {
               "        foo(notReducable);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(Test &test) {\n"
               "  int& x = test.getData();\n"
               "  if (test.process())\n"
               "    x = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -1001,7 +1063,7 @@ class TestOther : public TestFixture {
               " }\n"
               "}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int &x)\n"
               "{\n"
@@ -1012,7 +1074,7 @@ class TestOther : public TestFixture {
               "    ++x;\n"
               "  } while (x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope7() {
@@ -1024,7 +1086,7 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope8() {
@@ -1035,12 +1097,25 @@ class TestOther : public TestFixture {
               "        edgeResistance = (edge+1) / 2.0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'edgeResistance' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'edgeResistance' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope9() {
         // classes may have extra side effects
         check("class fred {\n"
+              "public:\n"
+              "    fred();\n"
+              "    void x();\n"
+              "};\n"
+              "void test(int a) {\n"
+              "    fred f;\n"
+              "    if (a == 2) {\n"
+              "        f.x();\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class fred {\n" // #2062
               "public:\n"
               "    void x();\n"
               "};\n"
@@ -1050,7 +1125,17 @@ class TestOther : public TestFixture {
               "        f.x();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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() {
@@ -1061,7 +1146,7 @@ class TestOther : public TestFixture {
               "        foo(x++);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope11() {
@@ -1069,21 +1154,21 @@ class TestOther : public TestFixture {
               "    int x = 0;\n"
               "    AB ab = { x, 0 };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    int x = 0;\n"
               "    if (a == 0) { ++x; }\n"
               "    AB ab = { x, 0 };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope12() {
@@ -1094,7 +1179,7 @@ class TestOther : public TestFixture {
               "        foo(i);\n"
               "    foo(j);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'i' can be reduced.\n", errout.str());
+        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"
               "    int i[5];\n"
@@ -1103,7 +1188,7 @@ class TestOther : public TestFixture {
               "        j = i;\n"
               "    foo(j);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    const bool b = true;\n"
@@ -1111,7 +1196,7 @@ class TestOther : public TestFixture {
               "    if (x == 5)\n"
               "        foo(b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    const bool b = x;\n"
@@ -1119,7 +1204,7 @@ class TestOther : public TestFixture {
               "    if (x == 5)\n"
               "        foo(b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope13() {
@@ -1130,7 +1215,7 @@ class TestOther : public TestFixture {
               "        if (i++ == 42) { break; }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope14() {
@@ -1141,7 +1226,7 @@ class TestOther : public TestFixture {
               "        for ( ; i < 10; ++i) ;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope15() {
@@ -1152,8 +1237,8 @@ class TestOther : public TestFixture {
               "    else if(b);\n"
               "    else if(c);\n"
               "    else;\n"
-              "}", nullptr, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope16() {
@@ -1163,7 +1248,7 @@ class TestOther : public TestFixture {
               "        foo();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
@@ -1171,7 +1256,7 @@ class TestOther : public TestFixture {
               "        foo();\n"
               "    } while((++a) < 56);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
@@ -1180,7 +1265,7 @@ class TestOther : public TestFixture {
               "        foo(a);\n"
               "    } while((++a) < 56);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
@@ -1189,7 +1274,7 @@ class TestOther : public TestFixture {
               "        foo(a);\n"
               "    } while(z());\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'a' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'a' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope17() {
@@ -1200,7 +1285,7 @@ class TestOther : public TestFixture {
               "        morestuff(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'x' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
               "    int x;\n"
@@ -1210,7 +1295,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    if (b) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'x' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope18() {
@@ -1230,7 +1315,7 @@ class TestOther : public TestFixture {
               "        do_something(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'x' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
               "    short x;\n"
@@ -1249,7 +1334,7 @@ class TestOther : public TestFixture {
               "        do_something(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    short x;\n"
@@ -1264,7 +1349,7 @@ class TestOther : public TestFixture {
               "            break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'x' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
 
         check("void f() {\n"
               "    short x;\n"
@@ -1281,7 +1366,7 @@ class TestOther : public TestFixture {
               "            break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope20() { // Ticket #5103 - constant variable only used in inner scope
@@ -1291,7 +1376,7 @@ class TestOther : public TestFixture {
               "  if (b > 32) b = x;\n"
               "  return b;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope21() { // Ticket #5382 - initializing two-dimensional array
@@ -1300,7 +1385,7 @@ class TestOther : public TestFixture {
               "    int test_array[1][1] = { { test_value } };\n"
               "    return sizeof(test_array);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope22() { // Ticket #5684 - "The scope of the variable 'p' can be reduced" - But it can not.
@@ -1313,7 +1398,7 @@ class TestOther : public TestFixture {
               "      ++i;\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // try to avoid an obvious false negative after applying the fix for the example above:
         check("void foo() {\n"
               "   int* p( 42 );\n"
@@ -1326,7 +1411,7 @@ class TestOther : public TestFixture {
               "      ++i;\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'p' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) The scope of the variable 'p' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope23() { // #6154: Don't suggest to reduce scope if inner scope is a lambda
@@ -1336,7 +1421,7 @@ class TestOther : public TestFixture {
               "       std::cout << myCounter += aX << std::endl;\n"
               "   });\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope24() {
@@ -1346,7 +1431,7 @@ class TestOther : public TestFixture {
               "       r.dostuff();\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'r' can be reduced.\n", errout.str());
+        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"
               "   Foo foo = x;\n"
@@ -1354,7 +1439,7 @@ class TestOther : public TestFixture {
               "       foo.dostuff();\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope25() {
@@ -1364,8 +1449,8 @@ class TestOther : public TestFixture {
               "        currtime = time(&dummy);\n"
               "        if (currtime > t) {}\n"
               "    }\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:2]: (style) The scope of the variable 'currtime' can be reduced.\n", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:2:12]: (style) The scope of the variable 'currtime' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope26() {
@@ -1377,7 +1462,7 @@ class TestOther : public TestFixture {
               "     }\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope27() {
@@ -1387,7 +1472,7 @@ class TestOther : public TestFixture {
                "#endif\n"
                "  if (id == ABC) { return x; }\n"
                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkP("void f() {\n"
                "#ifdef X\n"
@@ -1395,7 +1480,7 @@ class TestOther : public TestFixture {
                "  int x = 0;\n"
                "  if (id == ABC) { return x; }\n"
                "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) The scope of the variable 'x' can be reduced.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:7]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
     }
 
     void varScope28() {
@@ -1403,7 +1488,7 @@ class TestOther : public TestFixture {
               "    int i{};\n"
               "    if (double d = g(i); d == 1.0) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope29() { // #10888
@@ -1417,10 +1502,10 @@ class TestOther : public TestFixture {
               "        s.i = 0;\n"
               "        g(e, s);\n"
               "    }\n"
-              "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:4]: (style) The scope of the variable 'e' can be reduced.\n"
-                      "[test.c:5]: (style) The scope of the variable 's' can be reduced.\n",
-                      errout.str());
+              "}\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());
 
         check("void f(bool b) {\n"
               "    std::string s;\n"
@@ -1429,7 +1514,7 @@ class TestOther : public TestFixture {
               "        g(s);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 's' can be reduced.\n", errout.str());
+        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"
               "    std::vector<int> dummy;\n"
@@ -1442,7 +1527,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return *iter;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'vec' can be declared as reference to const\n", errout.str());
+        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"
               "    std::vector<int> dummy;\n"
@@ -1455,7 +1540,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return *iter;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope30() { // #8541
@@ -1471,7 +1556,7 @@ class TestOther : public TestFixture {
               "    });\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varScope31() { // #11099
@@ -1554,12 +1639,12 @@ class TestOther : public TestFixture {
               "        h(w);\n"
               "    h(v);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:25]: (style) The scope of the variable 'w' can be reduced.\n"
-                      "[test.cpp:32]: (style) The scope of the variable 'w' can be reduced.\n"
-                      "[test.cpp:60]: (style) The scope of the variable 'w' can be reduced.\n"
-                      "[test.cpp:67]: (style) The scope of the variable 'w' can be reduced.\n"
-                      "[test.cpp:74]: (style) The scope of the variable 'w' can be reduced.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:25:22]: (style) The scope of the variable 'w' can be reduced. [variableScope]\n"
+                      "[test.cpp:32:22]: (style) The scope of the variable 'w' can be reduced. [variableScope]\n"
+                      "[test.cpp:60:22]: (style) The scope of the variable 'w' can be reduced. [variableScope]\n"
+                      "[test.cpp:67:22]: (style) The scope of the variable 'w' can be reduced. [variableScope]\n"
+                      "[test.cpp:74:22]: (style) The scope of the variable 'w' can be reduced. [variableScope]\n",
+                      errout_str());
     }
 
     void varScope32() { // #11441
@@ -1570,7 +1655,7 @@ class TestOther : public TestFixture {
               "    for (auto x : v)\n"
               "        w = g([&]() { x; }, w);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Unused variable value 'x'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:23]: (warning) Unused variable value 'x' [constStatement]\n", errout_str());
     }
 
     void varScope33() { // #11131
@@ -1615,12 +1700,12 @@ class TestOther : public TestFixture {
               "        if (k == 5) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:21]: (style) The scope of the variable 'str' can be reduced.\n"
-                      "[test.cpp:22]: (style) The scope of the variable 'str2' can be reduced.\n"
-                      "[test.cpp:23]: (style) The scope of the variable 'str3' can be reduced.\n"
-                      "[test.cpp:31]: (style) The scope of the variable 'i' can be reduced.\n"
-                      "[test.cpp:37]: (style) The scope of the variable 'k' can be reduced.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:21:17]: (style) The scope of the variable 'str' can be reduced. [variableScope]\n"
+                      "[test.cpp:22:17]: (style) The scope of the variable 'str2' can be reduced. [variableScope]\n"
+                      "[test.cpp:23:17]: (style) The scope of the variable 'str3' can be reduced. [variableScope]\n"
+                      "[test.cpp:31:9]: (style) The scope of the variable 'i' can be reduced. [variableScope]\n"
+                      "[test.cpp:37:9]: (style) The scope of the variable 'k' can be reduced. [variableScope]\n",
+                      errout_str());
     }
 
     void varScope34() { // #11742
@@ -1633,131 +1718,392 @@ class TestOther : public TestFixture {
               "            i++;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void varScope35() { // #11845
+        check("void f(int err, const char* src) {\n"
+              "    const char* msg = \"Success\";\n"
+              "    char buf[42];\n"
+              "    if (err != 0)\n"
+              "        msg = strcpy(buf, src);\n"
+              "    printf(\"%d: %s\\n\", err, msg);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("char* g(char* dst, const char* src);\n"
+              "void f(int err, const char* src) {\n"
+              "    const char* msg = \"Success\";\n"
+              "    char buf[42];\n"
+              "    if (err != 0)\n"
+              "        msg = g(buf, src);\n"
+              "    printf(\"%d: %s\\n\", err, msg);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("char* g(char* dst, const char* src);\n"
+              "void f(int err, const char* src) {\n"
+              "    const char* msg = \"Success\";\n"
+              "    char buf[42];\n"
+              "    if (err != 0)\n"
+              "        g(buf, src);\n"
+              "    printf(\"%d: %s\\n\", err, msg);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The scope of the variable 'buf' can be reduced. [variableScope]\n", errout_str());
+    }
+
+    void varScope36() {
+        // #12158
+        check("void f( uint32_t value ) {\n"
+              "    uint32_t i = 0U;\n"
+              "    if ( value > 100U ) { }\n"
+              "    else if( value > 50U ) { }\n"
+              "    else{\n"
+              "         for( i = 0U; i < 5U; i++ ) {}\n"
+              "    }\n"
+              "}\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());
+    }
+
+    void varScope37() {
+        // #12158
+        check("void f( uint32_t value ) {\n"
+              "    uint32_t i = 0U;\n"
+              "    if ( value > 100U ) { }\n"
+              "    else {\n"
+              "        if( value > 50U ) { }\n"
+              "        else{\n"
+              "            for( i = 0U; i < 5U; i++ ) {}\n"
+              "        }\n"
+              "    }\n"
+              "}\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());
+    }
+
+    void varScope38() {
+        checkP("bool dostuff();\n" // #12519
+               "#define DOSTUFF(c) if (c < 5) { if (c) b = dostuff(); }\n"
+               "#define DOSTUFFEX(c) { bool b = false; DOSTUFF(c); }\n"
+               "void f(int a) {\n"
+               "    DOSTUFFEX(a);\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void varScope39() {
+        check("struct S {\n" // #12405
+              "    void f(const std::string&) const;\n"
+              "    const int* g(std::string&) const;\n"
+              "};\n"
+              "void h(int);\n"
+              "void S::f(const std::string& s) const {\n"
+              "    std::string n = s;\n"
+              "    const int* a = g(n);\n"
+              "    if (n == \"abc\") {\n"
+              "        h(a[0]);\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void varScope40() {
+        checkP("#define NUM (-999.9)\n" // #8862
+               "double f(int i) {\n"
+               "    double a = NUM;\n"
+               "    double b = -NUM;\n"
+               "    double c = -1.0 * NUM;\n"
+               "    if (i == 1) {\n"
+               "        return a;\n"
+               "    }\n"
+               "    if (i == 2) {\n"
+               "        return b;\n"
+               "    }\n"
+               "    if (i == 3) {\n"
+               "        return c;\n"
+               "    }\n"
+               "    return 0.0;\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) The scope of the variable 'a' can be reduced. [variableScope]\n"
+                      "[test.cpp:4:12]: (style) The scope of the variable 'b' can be reduced. [variableScope]\n"
+                      "[test.cpp:5:12]: (style) The scope of the variable 'c' can be reduced. [variableScope]\n",
+                      errout_str());
+
+        check("struct S { int a; };\n" // #12618
+              "int f(const S* s, int i) {\n"
+              "    int x = s->a;\n"
+              "    const int b[] = { 1, 2, 3 };\n"
+              "    int y = b[1];\n"
+              "    if (i)\n"
+              "        return x + y;\n"
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n"
+                      "[test.cpp:5:9]: (style) The scope of the variable 'y' can be reduced. [variableScope]\n",
+                      errout_str());
+    }
+
+    void varScope41() {    // #11845
+        check("void get_errmsg(const char **msg, char *buf, size_t bufsiz, int err);\n"
+              "void test(int err)\n"
+              "{\n"
+              "    const char *msg = \"Success\";\n"
+              "    char buf[42];\n"
+              "    if (err != 0)\n"
+              "        get_errmsg(&msg, buf, sizeof(buf), err);\n"
+              "    printf(\"%d: %s\\n\", err, msg);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void get_errmsg(char *buf, size_t bufsiz, int err);\n"
+              "void test(int err)\n"
+              "{\n"
+              "    const char *msg = \"Success\";\n"
+              "    char buf[42];\n"
+              "    if (err != 0)\n"
+              "        get_errmsg(buf, sizeof(buf), err);\n"
+              "    printf(\"%d: %s\\n\", err, msg);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) The scope of the variable 'buf' can be reduced. [variableScope]\n", errout_str());
+    }
+
+    void varScope42() {
+        check("void f(const char **, char *);\n"
+              "void g(int e) {\n"
+              "    const char *msg = \"Something\";\n"
+              "    char buf[42];\n"
+              "    if (e != 0)\n"
+              "        f(&msg, buf);\n"
+              "    printf(\"result: %s\\n\", msg);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(char *, char *);\n"
+              "void g(int e) {\n"
+              "    char msg [42] = \"Something\";\n"
+              "    char buf[42];\n"
+              "    if (e != 0)\n"
+              "        f(msg, buf);\n"
+              "    printf(\"result: %s\\n\", msg);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const char *, char *);\n"
+              "void g(int e) {\n"
+              "    const char *msg = \"Something\";\n"
+              "    char buf[42];\n"
+              "    if (e != 0)\n"
+              "        f(msg, buf);\n"
+              "    printf(\"result: %s\\n\", msg);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The scope of the variable 'buf' can be reduced. [variableScope]\n", errout_str());
+
+        check("void f(int **, char *);\n"
+              "void g(int e) {\n"
+              "    int *msg = calloc(0, sizeof(*msg));\n"
+              "    char buf[42];\n"
+              "    if (e != 0)\n"
+              "        f(&msg, buf);\n"
+              "    printf(\"result: %d\\n\", *msg);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) The scope of the variable 'buf' can be reduced. [variableScope]\n", errout_str());
+
+        check("void f(const char *&, const char *&);\n"
+              "void g(int e) {\n"
+              "    const char *msg = \"Something\";\n"
+              "    char *buf = malloc(42);\n"
+              "    if (e != 0)\n"
+              "        f(msg, buf);\n"
+              "    printf(\"result: %d\\n\", msg);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(const char* format, ...);\n"
+              "void f(bool b) {\n"
+              "    const char* s = \"abc\";\n"
+              "    if (b)\n"
+              "       g(\"%d %s\", 1, s);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) The scope of the variable 's' can be reduced. [variableScope]\n", errout_str());
     }
 
-#define checkOldStylePointerCast(code) checkOldStylePointerCast_(code, __FILE__, __LINE__)
-    void checkOldStylePointerCast_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
+    void varScope43() {
+        check("struct S { int a, b; };\n" // #13838
+              "int f(S s) {\n"
+              "    auto& [x, y] = s;\n"
+              "    if (x < 5) {\n"
+              "        return y;\n"
+              "    }\n"
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int a; };\n"
+              "int f(S s) {\n"
+              "    auto& [x] = s;\n"
+              "    if (y) {\n"
+              "        return x;\n"
+              "    }\n"
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) The scope of the variable 'x' can be reduced. [variableScope]\n", errout_str());
+    }
 
-        // #5560 - set c++03
-        const Settings settings = settingsBuilder().severity(Severity::style).cpp(Standards::CPP03).build();
+#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) {
 
-        Preprocessor preprocessor(settings);
+        const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).cpp(std).build();
 
         // Tokenize..
-        Tokenizer tokenizerCpp(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizerCpp.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizerCpp(settings, *this);
+        ASSERT_LOC(tokenizerCpp.tokenize(code), file, line);
 
         CheckOther 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"
+                                 "}");
+        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
+                                 "}");
+        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"
+                                 "}");
+        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"
+                                 "}");
+        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"
+                                 "    Derived * d = (const Derived *) ( new Base() );\n"
                                  "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) C-style pointer casting\n", errout.str());
+        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"
+                                 "    Derived * d = (const Derived *) new Base();\n"
                                  "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) C-style pointer casting\n", errout.str());
+        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"
+                                 "    Base * b = (Base *) new short[10];\n"
                                  "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) C-style pointer casting\n", errout.str());
+        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]: (style) C-style pointer casting\n", errout.str());
+        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]: (style) C-style pointer casting\n", errout.str());
+        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]: (style) C-style pointer casting\n", errout.str());
+        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]: (style) C-style pointer casting\n", errout.str());
+        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]: (style) C-style pointer casting\n", errout.str());
+        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]: (style) C-style pointer casting\n", errout.str());
+        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]: (style) C-style pointer casting\n", errout.str());
+        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"
                                  "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOldStylePointerCast("class B;\n"
                                  "class A\n"
                                  "{\n"
                                  "  virtual void abc(const B *) const = 0;\n"
                                  "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3630
-        checkOldStylePointerCast("class SomeType;\n"
+        checkOldStylePointerCast("class SomeType{};\n"
+                                 "class X : public Base {\n"
+                                 "    X() : Base((SomeType*)7) {}\n" // <- intToPointerCast
+                                 "};");
+        ASSERT_EQUALS("", errout_str());
+
+        checkOldStylePointerCast("class SomeType{};\n"
                                  "class X : public Base {\n"
-                                 "    X() : Base((SomeType*)7) {}\n"
+                                 "    X() : Base((SomeType*)0x7000) {}\n" // <- it's common in embedded code to cast address
                                  "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) C-style pointer casting\n", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkOldStylePointerCast("class SomeType;\n"
                                  "class X : public Base {\n"
                                  "    X() : Base((SomeType*)var) {}\n"
                                  "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) C-style pointer casting\n", errout.str());
+        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"
                                  "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5560
         checkOldStylePointerCast("class C;\n"
@@ -1766,8 +2112,8 @@ class TestOther : public TestFixture {
                                  "{ virtual G* createGui(S*, C*) const = 0; };\n"
                                  "\n"
                                  "class MS : public M\n"
-                                 "{ virtual void addController(C*) override {} };");
-        ASSERT_EQUALS("", errout.str());
+                                 "{ virtual void addController(C*) override {} };", Standards::CPP03);
+        ASSERT_EQUALS("", errout_str());
 
         // #6164
         checkOldStylePointerCast("class Base {};\n"
@@ -1776,7 +2122,8 @@ class TestOther : public TestFixture {
                                  "  std::vector<Base*> v;\n"
                                  "  v.push_back((Base*)new Derived);\n"
                                  "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) C-style pointer casting\n", errout.str());
+        // FIXME write a dangerousTypeCast warning instead
+        ASSERT_EQUALS("[test.cpp:5:15]: (style) C-style pointer casting [cstyleCast]\n", errout_str());
 
         // #7709
         checkOldStylePointerCast("typedef struct S S;\n"
@@ -1799,59 +2146,142 @@ class TestOther : public TestFixture {
                                  "    TT* tt = (TT*)i;\n"
                                  "    TT2* tt2 = (TT2*)i;\n"
                                  "}\n");
-        ASSERT_EQUALS("[test.cpp:10]: (style) C-style pointer casting\n"
-                      "[test.cpp:11]: (style) C-style pointer casting\n"
-                      "[test.cpp:12]: (style) C-style pointer casting\n"
-                      "[test.cpp:13]: (style) C-style pointer casting\n"
-                      "[test.cpp:14]: (style) C-style pointer casting\n"
-                      "[test.cpp:15]: (style) C-style pointer casting\n"
-                      "[test.cpp:16]: (style) C-style pointer casting\n"
-                      "[test.cpp:17]: (style) C-style pointer casting\n"
-                      "[test.cpp:18]: (style) C-style pointer casting\n"
-                      "[test.cpp:19]: (style) C-style pointer casting\n",
-                      errout.str());
+        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");
+        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());
+
+        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");
-        ASSERT_EQUALS("[test.cpp:4]: (style) C-style pointer casting\n"
-                      "[test.cpp:5]: (style) C-style pointer casting\n",
-                      errout.str());
+        // 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"
                                  "}\n");
-        ASSERT_EQUALS("", errout.str());
+        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: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
+        checkOldStylePointerCast("namespace N { struct S {}; }\n"
+                                 "union U {\n"
+                                 "    int i;\n"
+                                 "    char c[4];\n"
+                                 "};\n"
+                                 "void f(void* p) {\n"
+                                 "    auto ps = (N::S*)p;\n"
+                                 "    auto pu = (union U*)p;\n"
+                                 "    auto pv = (std::vector<int>*)(p);\n"
+                                 "}\n");
+        ASSERT_EQUALS("[test.cpp:7:15]: (style) C-style pointer casting [cstyleCast]\n"
+                      "[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("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]: (style) C-style pointer casting\n"
-                      "[test.cpp:3]: (style) C-style pointer casting\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"
+                                 "    float* data() const;\n"
+                                 "};\n"
+                                 "namespace N {\n"
+                                 "    bool f(float* v);\n"
+                                 "}\n"
+                                 "bool g(B& b) {\n"
+                                 "    using float_ptr = float*;\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__)
-    void checkInvalidPointerCast_(const char* file, int line, const char code[], bool portability = true, bool inconclusive = false) {
-        // Clear the error buffer..
-        errout.str("");
+#define checkIntToPointerCast(...) checkIntToPointerCast_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkIntToPointerCast_(const char* file, int line, const char (&code)[size]) {
 
-        Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability, portability).certainty(Certainty::inconclusive, inconclusive).build();
-        settings.platform.defaultSign = 's';
+        const Settings settings = settingsBuilder().severity(Severity::portability).build();
+
+        // Tokenize..
+        SimpleTokenizer tokenizerCpp(settings, *this);
+        ASSERT_LOC(tokenizerCpp.tokenize(code), file, line);
+
+        CheckOther checkOtherCpp(&tokenizerCpp, &settings, this);
+        checkOtherCpp.warningIntToPointerCast();
+    }
+
+    void intToPointerCast() {
+        // #3630
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)7;");
+        ASSERT_EQUALS("[test.cpp:1:16]: (portability) Casting non-zero decimal integer literal to pointer. [intToPointerCast]\n", errout_str());
+
+        checkIntToPointerCast("void* ptr = (void*)7;");
+        ASSERT_EQUALS("[test.cpp:1:13]: (portability) Casting non-zero decimal integer literal to pointer. [intToPointerCast]\n", errout_str());
+
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0;");
+        ASSERT_EQUALS("", errout_str());
+
+        checkIntToPointerCast("uint8_t* ptr = (uint8_t*)0x7000;"); // <- 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); }");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    struct CheckInvalidPointerCastOptions
+    {
+        bool portability = true;
+        bool inconclusive = false;
+    };
 
-        Preprocessor preprocessor(settings);
+#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..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         CheckOther checkOtherCpp(&tokenizer, &settings, this);
         checkOtherCpp.invalidPointerCast();
@@ -1864,66 +2294,66 @@ class TestOther : public TestFixture {
                                 "    delete [] (double*)f;\n"
                                 "    delete [] (long double const*)(new float[10]);\n"
                                 "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) Casting between float * and double * which have an incompatible binary data representation.\n"
-                      "[test.cpp:4]: (portability) Casting between float * and const long double * which have an incompatible binary data representation.\n", errout.str());
+        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"
                                 "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Casting between const float * and double * which have an incompatible binary data representation.\n", errout.str());
+        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"
                                 "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Casting between double * and long double * which have an incompatible binary data representation.\n"
-                      "[test.cpp:3]: (portability) Casting between long double * and double * which have an incompatible binary data representation.\n", errout.str());
+        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());
 
         checkInvalidPointerCast("char* test(int* i) {\n"
                                 "    long double *d = (long double*)(i);\n"
                                 "    double *d = (double*)(i);\n"
                                 "    float *f = reinterpret_cast<float*>(i);\n"
                                 "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Casting between signed int * and long double * which have an incompatible binary data representation.\n"
-                      "[test.cpp:3]: (portability) Casting between signed int * and double * which have an incompatible binary data representation.\n"
-                      "[test.cpp:4]: (portability) Casting between signed int * and float * which have an incompatible binary data representation.\n", errout.str());
+        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"
                                 "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Casting between unsigned int * and float * which have an incompatible binary data representation.\n", errout.str());
+        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"
                                 "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInvalidPointerCast("float* test(double& d) {\n"
                                 "    return (float*)&d;\n"
                                 "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Casting between double * and float * which have an incompatible binary data representation.\n", errout.str());
+        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);
-        ASSERT_EQUALS("", errout.str());
+                                "}");
+        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]: (portability, inconclusive) Casting from float * to signed char * is not portable due to different binary data representations on different platforms.\n", errout.str());
+                                "}", dinit(CheckInvalidPointerCastOptions, $.inconclusive = 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());
 
 
         checkInvalidPointerCast("long long* test(float* f) {\n"
                                 "    return (long long*)f;\n"
-                                "}", false);
-        ASSERT_EQUALS("", errout.str());
+                                "}", 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);
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Casting from float * to signed long long * is not portable due to different binary data representations on different platforms.\n", errout.str());
+                                "}");
+        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
     }
@@ -1931,101 +2361,101 @@ class TestOther : public TestFixture {
 
     void passedByValue() {
         check("void f(const std::string str) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::shared_ptr<std::string> ptr) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::function<F> ptr) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             check("void f(const std::pair<int,int> x) {}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             check("void f(const std::pair<std::string,std::string> x) {}");
-            TODO_ASSERT_EQUALS("error", "", errout.str());
+            TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
         check("void f(const std::string::size_type x) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo;\nvoid f(const Foo foo) {}"); // Unknown class
-        ASSERT_EQUALS("[test.cpp:2]: (performance, inconclusive) Function parameter 'foo' should be passed by const reference.\n", errout.str());
+        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)
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'foo' should be passed by const reference.\n", errout.str());
+        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
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo { int i[6]; };\nvoid f(const Foo foo) {}"); // Large class (array)
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'foo' should be passed by const reference.\n", errout.str());
+        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)
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo { static std::string s; };\nvoid f(const Foo foo) {}"); // Small class (static member)
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class X { std::string s; }; class Foo : X { };\nvoid f(const Foo foo) {}"); // Large class (inherited)
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'foo' should be passed by const reference.\n", errout.str());
+        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)
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'foo' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // The idiomatic way of passing a std::string_view is by value
         check("void f(const std::string_view str) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string_view str) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string_view &str) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<int> v) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<int> &v) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::map<int,int> &v) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::map<int,int> v) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::initializer_list<int> i) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5824
         check("void log(const std::string& file, int line, const std::string& function, const std::string str, ...) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5534
         check("struct float3 { };\n"
@@ -2034,30 +2464,30 @@ class TestOther : public TestFixture {
               "    vec Refract(vec &vec) const;\n"
               "    bool IntersectLinePlane(const vec &planeNormal);\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    virtual void func(const std::string str) {}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:41]: (performance) Function parameter 'str' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("enum X;\n"
               "void foo(X x1){}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("enum X { a, b, c };\n"
               "void foo(X x2){}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("enum X { a, b, c };\n"
               "enum X;"
               "void foo(X x3){}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("enum X;\n"
               "enum X { a, b, c };"
               "void foo(X x4){}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("union U {\n"
               "    char* pc;\n"
@@ -2065,18 +2495,18 @@ class TestOther : public TestFixture {
               "    int* pi;\n"
               "};\n"
               "void f(U u) {}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { char A[8][8]; };\n"
               "void f(S s) {}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 's' should be passed by const reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:10]: (performance) Function parameter 's' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("union U {\n" // don't crash
               "    int a;\n"
               "    decltype(nullptr) b;\n"
               "};\n"
               "int* f(U u) { return u.b; }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct B { virtual int f(std::string s) = 0; };\n" // #11432
               "struct D1 : B {\n"
@@ -2085,7 +2515,7 @@ class TestOther : public TestFixture {
               "struct D2 : B {\n"
               "  int f(std::string s) override { return s.size(); }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int x(int);\n"
               "void f(std::vector<int> v, int& j) {\n"
@@ -2112,97 +2542,181 @@ class TestOther : public TestFixture {
               "    for (int i = 0; i < v.size(); ++i)\n"
               "        v[i][0] = x(i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'v' should be passed by const reference.\n"
-                      "[test.cpp:10]: (performance) Function parameter 'v' should be passed by const reference.\n"
-                      "[test.cpp:18]: (performance) Function parameter 'v' should be passed by const reference.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:25]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n"
+                      "[test.cpp:10:25]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n"
+                      "[test.cpp:18:38]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n",
+                      errout_str());
+
+        check("struct S {\n" // #11995
+              "    explicit S(std::string s) noexcept;\n"
+              "    std::string m;\n"
+              "};\n"
+              "S::S(std::string s) noexcept : m(std::move(s)) {}\n"
+              "struct T {\n"
+              "    explicit S(std::string s) noexcept(true);\n"
+              "    std::string m;\n"
+              "};\n"
+              "T::T(std::string s) noexcept(true) : m(std::move(s)) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("namespace N {\n" // #12086
+              "    void g(int);\n"
+              "}\n"
+              "void f(std::vector<int> v) {\n"
+              "    N::g(v[0]);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:25]: (performance) Function parameter 'v' should be passed by const reference. [passedByValue]\n", errout_str());
+
+        check("void f(const std::string& s, std::string t) {\n" // #12083
+              "    const std::string& v = !s.empty() ? s : t;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:42]: (performance) Function parameter 't' should be passed by const reference. [passedByValue]\n", errout_str());
+
+        /*const*/ Settings settingsUnix64 = settingsBuilder(settings0).platform(Platform::Type::Unix64).build();
+        check("struct S {\n" // #12138
+              "    union {\n"
+              "        int a = 0;\n"
+              "        int x;\n"
+              "    };\n"
+              "    union {\n"
+              "        int b = 0;\n"
+              "        int y;\n"
+              "    };\n"
+              "    union {\n"
+              "        int c = 0;\n"
+              "        int z;\n"
+              "    };\n"
+              "};\n"
+              "void f(S s) {\n"
+              "    if (s.x > s.y) {}\n"
+              "}\n", dinit(CheckOptions, $.settings = &settingsUnix64));
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { std::list<int> l; };\n" // #12147
+              "class C { public: std::list<int> l; };\n"
+              "bool f(S s) {\n"
+              "    return s.l.empty();\n"
+              "}\n"
+              "bool f(C c) {\n"
+              "    return c.l.empty();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (performance) Function parameter 's' should be passed by const reference. [passedByValue]\n"
+                      "[test.cpp:6:10]: (performance) Function parameter 'c' should be passed by const reference. [passedByValue]\n",
+                      errout_str());
+
+        check("struct S { std::list<int> a[1][1]; };\n"
+              "bool f(S s) {\n"
+              "    return s.a[0][0].empty();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (performance) Function parameter 's' should be passed by const reference. [passedByValue]\n",
+                      errout_str());
+
+        check("struct S {\n"
+              "    enum class E : std::uint8_t { E0 };\n"
+              "    static void f(S::E e) {\n"
+              "        if (e == S::E::E0) {}\n"
+              "    }\n"
+              "    char a[20];\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const std::vector<int> v[2]);\n" // #13052
+              "void g(const std::vector<int> v[2]);\n"
+              "void g(const std::vector<int> v[2]) {}\n"
+              "int h(const std::array<std::vector<int>, 2> a) { return a[0][0]; }\n");
+        ASSERT_EQUALS("[test.cpp:4:45]: (performance) Function parameter 'a' should be passed by const reference. [passedByValue]\n", errout_str());
 
-        Settings settings1 = settingsBuilder().platform(cppcheck::Platform::Type::Win64).build();
+        check("void f(const std::array<int, 10> a[]) {}\n"); // #13524
+        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",
-              /*filename*/ nullptr, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings1);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.settings = &settingsWin64));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void passedByValue_nonConst() {
         check("void f(std::string str) {}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string str) {\n"
               "    std::string s2 = str;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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::string& s2 = str;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's2' can be declared as reference to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const std::string& str);\n"
               "void f(std::string str) {\n"
               "    foo(str);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::string* str);\n"
               "void f(std::string str) {\n"
               "    foo(&str);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    std::string s;\n"
@@ -2211,7 +2725,7 @@ class TestOther : public TestFixture {
               "Y f(X x) {\n"
               "    x.func();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (performance) Function parameter 'x' should be passed by const reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:7]: (performance) Function parameter 'x' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
               "    void func();\n"
@@ -2219,17 +2733,17 @@ class TestOther : public TestFixture {
               "Y f(X x) {\n"
               "    x.func();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    void func(std::string str) {}\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 'str' should be passed by const reference.\n", errout.str());
+        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
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class X {\n"
               "    char a[1024];\n"
@@ -2239,7 +2753,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void f(Y y) {\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (performance) Function parameter 'y' should be passed by const reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:10]: (performance) Function parameter 'y' should be passed by const reference. [passedByValue]\n", errout_str());
 
         check("class X {\n"
               "    void* a;\n"
@@ -2252,7 +2766,7 @@ class TestOther : public TestFixture {
               "};\n"
               "void f(X x, Y y) {\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (performance) Function parameter 'y' should be passed by const reference.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:15]: (performance) Function parameter 'y' should be passed by const reference. [passedByValue]\n", errout_str());
 
         {
             // 8-byte data should be passed by const reference on 32-bit platform but not on 64-bit platform
@@ -2262,13 +2776,13 @@ class TestOther : public TestFixture {
                                 "};\n"
                                 "void f(X x) {}";
 
-            Settings s32 = settingsBuilder(_settings).platform(cppcheck::Platform::Type::Unix32).build();
-            check(code, &s32);
-            ASSERT_EQUALS("[test.cpp:5]: (performance) Function parameter 'x' should be passed by const reference.\n", errout.str());
+            /*const*/ Settings s32 = settingsBuilder(settings0).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());
 
-            Settings s64 = settingsBuilder(_settings).platform(cppcheck::Platform::Type::Unix64).build();
-            check(code, &s64);
-            ASSERT_EQUALS("", errout.str());
+            /*const*/ Settings s64 = settingsBuilder(settings0).platform(Platform::Type::Unix64).build();
+            check(code, dinit(CheckOptions, $.settings = &s64));
+            ASSERT_EQUALS("", errout_str());
         }
 
         check("Writer* getWriter();\n"
@@ -2276,27 +2790,27 @@ class TestOther : public TestFixture {
               "void foo(Buffer& buffer) {\n"
               "    getWriter()->operator<<(buffer);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void passedByValue_externC() {
         check("struct X { int a[5]; }; void f(X v) { }");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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) { } }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct X { int a[5]; }; extern \"C\" void f(X v) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct X { int a[5]; }; void f(const X v);");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'v' should be passed by const reference.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct X { int a[5]; }; extern \"C\" void f(const X v) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void constVariable() {
@@ -2304,139 +2818,140 @@ class TestOther : public TestFixture {
               "    int& i = x[0];\n"
               "    return i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'i' can be declared as reference to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 'x' should be passed by const reference.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<int>& x) {\n"
               "    return x[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::vector<int>& x) {\n"
               "    return x[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const int& f(std::vector<int>& x) {\n"
               "    return x[0];\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T& x) {\n"
               "    return x[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "T f(T&& x) {\n"
               "    return x[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int& x) {\n"
               "    return std::move(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::ostream& os) {\n"
               "    os << \"Hello\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int*);\n"
               "void f(int& x) {\n"
               "    g(&x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(int*); };\n"
               "A f(int& x) {\n"
               "    return A(&x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { A(int*); };\n"
               "A f(int& x) {\n"
               "    return A{&x};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
-        // Perhaps unused variable should be checked as well.
         check("void f(int& x, int& y) {\n"
               "    y++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    std::vector<int> v;\n"
@@ -2444,7 +2959,7 @@ class TestOther : public TestFixture {
               "        v.swap(a.v);\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    template<class T>\n"
@@ -2455,25 +2970,25 @@ class TestOther : public TestFixture {
               "void g(A& a) {\n"
               "    a.f<int>();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto&& x:v)\n"
               "        x = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(auto x:v)\n"
               "        x = 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'v' can be declared as reference to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' can be declared as reference to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (style) Variable 'x' can be declared as reference to const [constVariableReference]\n",
+                      errout_str());
 
         check("void f(std::vector<int>& v) {\n" // #10980
               "    for (int& i : v)\n"
@@ -2486,39 +3001,39 @@ class TestOther : public TestFixture {
               "        if (i == 0) {}\n"
               "    v.clear();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'i' can be declared as reference to const\n"
-                      "[test.cpp:6]: (style) Variable 'i' can be declared as reference to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (style) Variable 'i' can be declared as reference to const [constVariableReference]\n"
+                      "[test.cpp:6:16]: (style) Variable 'i' can be declared as reference to const [constVariableReference]\n",
+                      errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    for(const auto& x:v) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'v' can be declared as reference to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    int& i = v[0];\n"
               "    i++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int& x;\n"
               "    A(int& y) : x(y)\n"
               "    {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    A(int& x);\n"
@@ -2527,14 +3042,14 @@ class TestOther : public TestFixture {
               "    B(int& x) : A(x)\n"
               "    {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "  int i;\n"
@@ -2542,7 +3057,7 @@ class TestOther : public TestFixture {
               "int& f(S& s) {\n"
               "  return s.i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int* f(std::list<int>& x, unsigned int y) {\n"
               "    for (int& m : x) {\n"
@@ -2551,7 +3066,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return nullptr;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& f(std::list<int>& x, int& y) {\n"
               "    for (int& m : x) {\n"
@@ -2560,13 +3075,13 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool from_string(int& t, const std::string& s) {\n"
               "    std::istringstream iss(s);\n"
               "    return !(iss >> t).fail();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9710
         check("class a {\n"
@@ -2577,7 +3092,7 @@ class TestOther : public TestFixture {
               "void f(int& i) {\n"
               "    a()(i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class a {\n"
               "    void operator()(int& i) const {\n"
@@ -2588,7 +3103,7 @@ class TestOther : public TestFixture {
               "    a x;\n"
               "    x(i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class a {\n"
               "    void operator()(const int& i) const;\n"
@@ -2597,187 +3112,182 @@ class TestOther : public TestFixture {
               "    a x;\n"
               "    x(i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'i' can be declared as reference to const\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'i' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         //cast or assignment to a non-const reference should prevent the warning
         check("struct T { void dostuff() const {}};\n"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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 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
+              "    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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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
+              "    U& y = x;\n"
+              "    y.mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
+              "    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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
+              "    const U& y = static_cast<const U&>(x);\n"
+              "    y.mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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
+              "    U& y = static_cast<U&>(x);\n"
+              "    y.mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\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"
-            "}"
-            );
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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"
+              "    const U& y = dynamic_cast<U const &>(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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
+              "    const U& y = dynamic_cast<U & const>(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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<typename const U&>(x)\n"
+              "    U& y = dynamic_cast<U&>(x);\n"
+              "    y.mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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<typename U&>(x)\n"
-              "    y.mutate();\n" //to avoid warnings that y can be const
+              "    const U& y = dynamic_cast<typename const U&>(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
+              "    U& y = dynamic_cast<typename U&>(x);\n"
+              "    y.mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("", errout.str());
-
+        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"
-              "    y->mutate();\n" //to avoid warnings that y can be const
+              "    U* y = dynamic_cast<U*>(&x);\n"
+              "    y->mutate();\n" // to avoid warnings that y can be const
               "}");
-        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
+        ASSERT_EQUALS("", errout_str());
+
         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
+              "    const U * y = dynamic_cast<const U *>(&x);\n"
+              "    y->mutate();\n" // to avoid warnings that y can be const
               "}");
-        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
+        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
+              "    U const * y = dynamic_cast<U const *>(&x);\n"
+              "    y->mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
+              "    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
               "}");
-        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
+        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 y = dynamic_cast<const U const * const *  * const>(&x)\n"
-              "    y->mutate();\n" //to avoid warnings that y can be const
+              "    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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
-              "    my::fancy<typename type const *> const * * const y = dynamic_cast<my::fancy<typename type const *> const * * const>(&x)\n"
-              "    y->mutate();\n" //to avoid warnings that y can be const
+              "    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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
+              "    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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
+              "    const U& y = (const U&)(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
-              "    U& y = (U&)(x)\n"
-              "    y.mutate();\n" //to avoid warnings that y can be const
+              "    U& y = (U&)(x);\n"
+              "    y.mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
+              "    const U& y = (typename const U&)(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as reference to const\n", errout.str());
+        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"
               "void a(T& x) {\n"
               "    x.dostuff();\n"
-              "    U& y = (typename U&)(x)\n"
-              "    y.mutate();\n" //to avoid warnings that y can be const
+              "    U& y = (typename U&)(x);\n"
+              "    y.mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
+              "    U* y = (U*)(&x);\n"
+              "    y->mutate();\n" // to avoid warnings that y can be const
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) C-style pointer casting\n", errout.str());
+        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"
@@ -2785,7 +3295,7 @@ class TestOther : public TestFixture {
               "   x.f();\n"
               "   foo( static_cast<U2>(0) );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("class a {\n"
               "    void foo(const int& i) const;\n"
@@ -2794,7 +3304,7 @@ class TestOther : public TestFixture {
               "void f(int& i) {\n"
               "    a()(i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class a {\n"
               "    void operator()(const int& i) const;\n"
@@ -2802,7 +3312,7 @@ class TestOther : public TestFixture {
               "void f(int& i) {\n"
               "    a()(i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'i' can be declared as reference to const\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (style) Parameter 'i' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         // #9767
         check("void fct1(MyClass& object) {\n"
@@ -2811,7 +3321,7 @@ class TestOther : public TestFixture {
               "bool fct2(std::function<void()> lambdaExpression, MyClass& object) {\n"
               "   object.modify();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9778
         check("struct A {};\n"
@@ -2819,14 +3329,14 @@ class TestOther : public TestFixture {
               "B& f(A& x) {\n"
               "    return static_cast<B&>(x);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10002
         check("using A = int*;\n"
               "void f(const A& x) {\n"
               "    ++(*x);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10086
         check("struct V {\n"
@@ -2836,7 +3346,11 @@ class TestOther : public TestFixture {
               "    }\n"
               "    std::vector<V> v;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        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"
@@ -2989,7 +3503,10 @@ class TestOther : public TestFixture {
               "void ah();\n"
               "void an();\n"
               "void h();");
-        ASSERT_EQUALS("", errout.str());
+        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",
+                      errout_str());
 
         check("class C\n"
               "{\n"
@@ -3010,7 +3527,7 @@ class TestOther : public TestFixture {
               "  : c(i)\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C\n"
               "{\n"
@@ -3030,7 +3547,7 @@ class TestOther : public TestFixture {
               "D::D(int& i) noexcept\n"
               "  : c(i)\n"
               "{}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C\n"
               "{\n"
@@ -3051,7 +3568,7 @@ class TestOther : public TestFixture {
               "  : c(i)\n"
               "{\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("class C\n"
               "{\n"
@@ -3072,7 +3589,7 @@ class TestOther : public TestFixture {
               "  : c(i)\n"
               "{\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout_str());
 
         check("class C\n"
               "{\n"
@@ -3093,21 +3610,21 @@ class TestOther : public TestFixture {
               "  : c(0, i)\n"
               "{\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:16]: (style) Parameter 'i' can be declared as reference to const\n", "", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { void f(); int i; };\n"
               "void call_f(S& s) { (s.*(&S::f))(); }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int a[1]; };\n"
               "void f(S& s) { int* p = s.a; *p = 0; }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {\n" // #9910
               "    int* p{};\n"
@@ -3118,7 +3635,7 @@ class TestOther : public TestFixture {
               "    int j{};\n"
               "    void f(Foo& foo) const { int* q = foo.get(); *q = j; }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #10679
               "    void g(long L, const C*& PC) const;\n"
@@ -3128,25 +3645,25 @@ class TestOther : public TestFixture {
               "    C* PC{};\n"
               "    s.g(0, PC);\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10785
         check("template <class T, class C>\n"
               "struct d {\n"
               "    T& g(C& c, T C::*f) { return c.*f; }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<int, int>& m) {\n"
               "    std::cout << m[0] << std::endl;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<std::map<int, int>>& v) {\n" // #11607
               "    for (auto& m : v)\n"
               "        std::cout << m[0];\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int i; };\n" // #11473
               "void f(std::vector<std::vector<S>>&m, int*& p) {\n"
@@ -3156,14 +3673,14 @@ class TestOther : public TestFixture {
               "        return;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& g(int* p, int& r) {\n" // #11625
               "    if (p)\n"
               "        return *p;\n"
               "    return r;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <typename T> void f(std::vector<T*>& d, const std::vector<T*>& s) {\n" // #11632
               "    for (const auto& e : s) {\n"
@@ -3171,15 +3688,7 @@ class TestOther : public TestFixture {
               "        d.push_back(newE);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
-
-        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]: (style) Parameter 'a' can be declared as const array\n", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11682
         check("struct b {\n"
@@ -3194,7 +3703,7 @@ class TestOther : public TestFixture {
               "        e.get().mutate();\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct B { virtual void f() const {} };\n" // #11528
               "struct D : B {};\n"
@@ -3203,14 +3712,18 @@ class TestOther : public TestFixture {
               "    if (d)\n"
               "        d->f();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'd' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:4:8]: (style) Variable 'd' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("void g(const int*);\n"
               "void f(const std::vector<int*>&v) {\n"
               "    for (int* i : v)\n"
               "        g(i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:15]: (style) Variable 'i' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("struct A {\n" // #11225
               "    A();\n"
@@ -3223,22 +3736,22 @@ class TestOther : public TestFixture {
               "void g(A* a) {\n"
               "    const B* b = (const B*)a;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:10]: (style) C-style pointer casting\n"
-                      "[test.cpp:6]: (style) Parameter 'a' can be declared as pointer to const\n"
-                      "[test.cpp:9]: (style) Parameter 'a' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("void g(int*);\n"
               "void f(std::vector<int>& v) {\n"
               "    g(v.data());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(const int*);\n"
               "void f(std::vector<int>& v) {\n"
               "    g(v.data());\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'v' can be declared as reference to const\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:26]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("struct a {\n"
               "    template <class T>\n"
@@ -3253,7 +3766,7 @@ class TestOther : public TestFixture {
               "void f(const b&)\n"
               "{}\n"
               "void g(a& c) { f<int>(c); }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    template <typename T>\n"
@@ -3269,195 +3782,406 @@ class TestOther : public TestFixture {
               "void f(S& s) {\n"
               "    const int* p = s.g<int>();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int x; };\n" // #11818
               "std::istream& f(std::istream& is, S& s) {\n"
               "    return is >> s.x;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
-    }
+        ASSERT_EQUALS("", errout_str());
 
-    void constParameterCallback() {
-        check("int callback(std::vector<int>& x) { return x[0]; }\n"
-              "void f() { dostuff(callback); }");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1]: (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).\n", errout.str());
+        check("bool f(std::string& s1, std::string& s2) {\n" // #12203
+              "    return &s1 == &s2;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:21]: (style) Parameter 's1' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:1:38]: (style) Parameter 's2' can be declared as reference to const [constParameterReference]\n",
+                      errout_str());
 
-        // #9906
-        check("class EventEngine : public IEventEngine {\n"
+        check("void f(int& r) {\n" // #12214
+              "    (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());
+
+        check("struct S { void f(int&); };\n" // #12216
+              "void g(S& s, int& r, void (S::* p2m)(int&)) {\n"
+              "    (s.*p2m)(r);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    void f(int& r) { p = &r; }\n"
+              "    int* p;\n"
+              "};\n"
+              "void g(std::vector<int>& v1, std::vector<int*>& v2) {\n"
+              "    std::transform(v1.begin(), v1.end(), v2.begin(), [](auto& x) { return &x; });\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class T;\n" // #11869
+              "class E {\n"
               "public:\n"
-              "    EventEngine();\n"
-              "\n"
-              "private:\n"
-              "    void signalEvent(ev::sig& signal, int revents);\n"
+              "    class F {\n"
+              "    public:\n"
+              "        explicit F(const T* t);\n"
+              "    };\n"
               "};\n"
-              "\n"
-              "EventEngine::EventEngine() {\n"
-              "    mSigWatcher.set<EventEngine, &EventEngine::signalEvent>(this);\n"
-              "}\n"
-              "\n"
-              "void EventEngine::signalEvent(ev::sig& signal, int revents) {\n"
-              "    switch (signal.signum) {}\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:10] -> [test.cpp:13]: (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).\n", errout.str());
-    }
+              "void f(T& t) {\n"
+              "    std::list<E::F> c(1, E::F(&t));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:9:11]: (style) Parameter 't' can be declared as reference to const [constParameterReference]\n", errout_str());
 
-    void constPointer() {
-        check("void foo(int *p) { return *p; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        check("struct T;\n"
+              "struct U {\n"
+              "    struct V { explicit V(const T* p); };\n"
+              "};\n"
+              "void g(U::V v);\n"
+              "void f(T& t) {\n"
+              "    g(U::V(&t));\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:11]: (style) Parameter 't' can be declared as reference to const [constParameterReference]\n", errout_str());
 
-        check("void foo(int *p) { x = *p; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        check("void f1(std::vector<int>& v) {\n" // #11207
+              "    auto it = v.cbegin();\n"
+              "    while (it != v.cend()) {\n"
+              "        if (*it > 12) {}\n"
+              "        ++it;\n"
+              "    }\n"
+              "}\n"
+              "void f2(std::vector<int>& v) {\n"
+              "    auto it = v.begin();\n"
+              "    while (it != v.end()) {\n"
+              "        if (*it > 12) {}\n"
+              "        ++it;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:27]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:8:27]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n",
+                      errout_str());
 
-        check("void foo(int *p) { int &ref = *p; ref = 12; }");
-        ASSERT_EQUALS("", errout.str());
+        check("void cb(const std::string&);\n" // #12349, #12350, #12351
+              "void f(std::string& s) {\n"
+              "    const std::string& str(s);\n"
+              "    cb(str);\n"
+              "}\n"
+              "void g(std::string& s) {\n"
+              "    const std::string& str{ s };\n"
+              "    cb(str);\n"
+              "}\n"
+              "void h(std::string* s) {\n"
+              "    const std::string& str(*s);\n"
+              "    cb(str);\n"
+              "}\n"
+              "void k(std::string* s) {\n"
+              "    const std::string& str = *s;\n"
+              "    cb(str);\n"
+              "}\n"
+              "void m(std::string& s) {\n"
+              "    const std::string str(s);\n"
+              "    cb(str);\n"
+              "}\n"
+              "void n(std::string* s) {\n"
+              "    const std::string& str(*s);\n"
+              "    cb(str);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:21]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:6:21]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:18:21]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:10:21]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:14:21]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:22:21]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
 
-        check("void foo(int *p) { x = *p + 10; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        check("struct S {\n"
+              "    S(std::string& r);\n"
+              "};\n"
+              "void f(std::string& str) {\n"
+              "    const S& s(str);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
-        check("void foo(int *p) { return p[10]; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        check("struct C {\n" // #10052
+              "    int& operator()(int);\n"
+              "};\n"
+              "void f(std::vector<C>& c) {\n"
+              "    c[0](5) = 12;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
-        check("void foo(int *p) { int &ref = p[0]; ref = 12; }");
-        ASSERT_EQUALS("", errout.str());
+        check("int f(int& t) {\n" // #11713
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:12]: (style) Parameter 't' can be declared as reference to const [constParameterReference]\n", errout_str());
+
+        check("void f(std::list<std::string>& v) {\n" // #12202
+              "    v.remove_if([](std::string& s) {\n"
+              "        return true;\n"
+              "    });\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:33]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n", errout_str());
+
+        check("struct S {\n" // #12762
+              "    std::vector<int> m;\n"
+              "    void f();\n"
+              "};\n"
+              "void S::f() {\n"
+              "    std::vector<int>& r = m;\n"
+              "    g(r[0] * 2);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:23]: (style) Variable 'r' can be declared as reference to const [constVariableReference]\n", errout_str());
+
+        check("std::iostream& get();\n" // #12940
+              "std::iostream& Fun() {\n"
+              "    auto lam = []() -> std::iostream& {\n"
+              "        std::iostream& ios = get();\n"
+              "        return ios;\n"
+              "    };\n"
+              "    return lam();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int x[3]; };\n" // #13226
+              "void g(int a, int* b);\n"
+              "void f(int a, S& s) {\n"
+              "    return g(a, s.x);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { std::vector<int> v; };\n" // #13317
+              "struct T { S s; };\n"
+              "int f(S& s) {\n"
+              "    for (std::vector<int>::const_iterator it = s.v.cbegin(); it != s.v.cend(); ++it) {}\n"
+              "    return *s.v.cbegin();\n"
+              "}\n"
+              "int f(T& t) {\n"
+              "    return *t.s.v.cbegin();\n"
+              "}\n"
+              "int f(std::vector<int>& v) {\n"
+              "    return *v.cbegin();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n"
+                      "[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 }); }"); // #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());
+    }
+
+    void constParameterCallback() {
+        check("int callback(std::vector<int>& x) { return x[0]; }\n"
+              "void f() { dostuff(callback); }");
+        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
+        check("class EventEngine : public IEventEngine {\n"
+              "public:\n"
+              "    EventEngine();\n"
+              "\n"
+              "private:\n"
+              "    void signalEvent(ev::sig& signal, int revents);\n"
+              "};\n"
+              "\n"
+              "EventEngine::EventEngine() {\n"
+              "    mSigWatcher.set<EventEngine, &EventEngine::signalEvent>(this);\n"
+              "}\n"
+              "\n"
+              "void EventEngine::signalEvent(ev::sig& signal, int revents) {\n"
+              "    switch (signal.signum) {}\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"
+              "}");
+        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());
+    }
+
+    void constPointer() {
+        check("void foo(int *p) { return *p; }");
+        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; }");
+        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; }");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void foo(int *p) { x = *p + 10; }");
+        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]; }");
+        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; }");
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int *p) { x[*p] = 12; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n", errout.str());
+        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) {}; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a { void b(); };\n"
               "struct c {\n"
               "    a* d;\n"
               "    a& g() { return *d; }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct a { void b(); };\n"
               "struct c { a* d; };\n"
               "void e(c);\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct V {\n"
               "    V& get(typename std::vector<V>::size_type i, std::vector<V>* arr) {\n"
               "        return arr->at(i);\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {};\n"
               "struct B : A {};\n"
               "B* f(A* x) {\n"
               "    return static_cast<B*>(x);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int>* x) {\n"
               "    int& i = (*x)[0];\n"
               "    i++;\n"
               "    return i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int>* v) {\n"
               "    for(auto&& x:*v)\n"
               "        x = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    int* x;\n"
               "    A(int* y) : x(y)\n"
               "    {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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; } };");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10547
         check("void foo(std::istream &istr) {\n"
               "  unsigned char x[2];\n"
               "  istr >> x[0];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10744
         check("S& f() {\n"
               "    static S* p = new S();\n"
               "    return *p;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
-
-        check("int f() {\n"
-              "    static int i[1] = {};\n"
-              "    return i[0];\n"
-              "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'i' can be declared as const array\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]: (style) Variable 'i' can be declared as const array\n", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10471
         check("void f(std::array<int, 1> const& i) {\n"
               "    if (i[0] == 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10466
         check("typedef void* HWND;\n"
@@ -3467,7 +4191,9 @@ class TestOther : public TestFixture {
               "    for (const auto& h : v)\n"
               "        if (h) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'h' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:5:22]: (style) Variable 'h' can be declared as pointer to const [constVariableReference]\n",
+            errout_str());
 
         check("void f(const std::vector<int*>& v) {\n"
               "    for (const auto& p : v)\n"
@@ -3475,7 +4201,9 @@ class TestOther : public TestFixture {
               "    for (const auto* p : v)\n"
               "        if (p == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'p' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:22]: (style) Variable 'p' can be declared as pointer to const [constVariableReference]\n",
+            errout_str());
 
         check("void f(std::vector<int*>& v) {\n"
               "    for (const auto& p : v)\n"
@@ -3487,9 +4215,9 @@ class TestOther : public TestFixture {
               "    for (const int* p : v)\n"
               "        if (p == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'v' can be declared as reference to const\n"
-                      "[test.cpp:2]: (style) Variable 'p' can be declared as pointer to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:27]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:2:22]: (style) Variable 'p' can be declared as pointer to const [constVariableReference]\n",
+                      errout_str());
 
         check("void f(std::vector<const int*>& v) {\n"
               "    for (const auto& p : v)\n"
@@ -3497,7 +4225,7 @@ class TestOther : public TestFixture {
               "    for (const auto* p : v)\n"
               "        if (p == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'v' can be declared as reference to const\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:33]: (style) Parameter 'v' can be declared as reference to const [constParameterReference]\n", errout_str());
 
         check("void f(const std::vector<const int*>& v) {\n"
               "    for (const auto& p : v)\n"
@@ -3505,69 +4233,56 @@ class TestOther : public TestFixture {
               "    for (const auto* p : v)\n"
               "        if (p == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const int* const p) {\n"
               "    if (p == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int*);\n"
               "void f(int* const* pp) {\n"
               "    int* p = pp[0];\n"
               "    g(p);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <typename T>\n"
               "struct S {\n"
               "    static bool f(const T& t) { return t != nullptr; }\n"
               "};\n"
               "S<int*> s;\n");
-        ASSERT_EQUALS("", 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]: (style) Variable 'a' can be declared as const array\n"
-                      "[test.cpp:4]: (style) Variable 'b' can be declared as const array\n",
-                      errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typedef void* HWND;\n" // #11084
               "void f(const HWND h) {\n"
               "    if (h == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("using HWND = void*;\n"
               "void f(const HWND h) {\n"
               "    if (h == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typedef int A;\n"
               "void f(A* x) {\n"
               "    if (x == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("using A = int;\n"
               "void f(A* x) {\n"
               "    if (x == nullptr) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Parameter 'x' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 'x' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("struct S { void v(); };\n" // #11095
               "void f(S* s) {\n"
               "    (s - 1)->v();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int*>& v) {\n" // #11085
               "    for (int* p : v) {\n"
@@ -3578,9 +4293,9 @@ class TestOther : public TestFixture {
               "    }\n"
               "    v.clear();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'p' can be declared as pointer to const\n"
-                      "[test.cpp:5]: (style) Variable 'p' can be declared as pointer to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n"
+                      "[test.cpp:5:16]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    char a[1][1];\n"
@@ -3588,21 +4303,21 @@ class TestOther : public TestFixture {
               "    b[0] = a[0];\n"
               "    **b = 0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("ptrdiff_t f(int *p0, int *p1) {\n" // #11148
               "    return p0 - p1;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p0' can be declared as pointer to const\n"
-                      "[test.cpp:1]: (style) Parameter 'p1' can be declared as pointer to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:18]: (style) Parameter 'p0' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:1:27]: (style) Parameter 'p1' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    std::array<int, 1> a{}, b{};\n"
               "    const std::array<int, 1>& r = a;\n"
               "    if (r == b) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {};\n" // #11599
               "void g(S);\n"
@@ -3629,12 +4344,12 @@ class TestOther : public TestFixture {
               "void f6(S& s) {\n"
               "    j(1, 2, &s);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:20]: (style) Parameter 's' can be declared as reference to const\n"
-                      "[test.cpp:23]: (style) Parameter 's' can be declared as reference to const\n"
-                      "[test.cpp:8]: (style) Parameter 's' can be declared as pointer to const\n"
-                      "[test.cpp:11]: (style) Parameter 's' can be declared as pointer to const\n"
-                      "[test.cpp:14]: (style) Parameter 's' can be declared as pointer to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:20:12]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:23:12]: (style) Parameter 's' can be declared as reference to const [constParameterReference]\n"
+                      "[test.cpp:8:12]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:11:12]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:14:12]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
 
         check("void g(int, const int*);\n"
               "void h(const int*);\n"
@@ -3642,14 +4357,14 @@ class TestOther : public TestFixture {
               "    g(1, p);\n"
               "    h(p);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Parameter 'p' can be declared as pointer to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
 
         check("void f(int, const int*);\n"
               "void f(int i, int* p) {\n"
               "    f(i, const_cast<const int*>(p));\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int a; };\n"
               "void f(std::vector<S>& v, int b) {\n"
@@ -3660,25 +4375,25 @@ class TestOther : public TestFixture {
               "            continue;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 's' can be declared as reference to const\n", errout.str()); // don't crash
+        ASSERT_EQUALS("[test.cpp:5:12]: (style) Variable 's' can be declared as reference to const [constVariableReference]\n", errout_str()); // don't crash
 
         check("void f(int& i) {\n"
               "    new (&i) int();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str()); // don't crash
+        ASSERT_EQUALS("", errout_str()); // don't crash
 
         check("void f(int& i) {\n"
               "    int& r = i;\n"
               "    if (!&r) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'r' can be declared as reference to const\n", errout.str()); // don't crash
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) Variable 'r' can be declared as reference to const [constVariableReference]\n", errout_str()); // don't crash
 
         check("class C;\n" // #11646
               "void g(const C* const p);\n"
               "void f(C* c) {\n"
               "    g(c);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Parameter 'c' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Parameter 'c' can be declared as pointer to const [constParameterPointer]\n", errout_str());
 
         check("typedef void (*cb_t)(int*);\n" // #11674
               "void cb(int* p) {\n"
@@ -3688,9 +4403,9 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    g(cb);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:2]: (style) Parameter 'p' can be declared as pointer to const. "
-                      "However it seems that 'cb' is a callback function, if 'p' is declared with const you might also need to cast function pointer(s).\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:7:7] -> [test.cpp:2:14]: (style) Parameter 'p' can be declared as pointer to const. "
+                      "However it seems that 'cb' is a callback function, if 'p' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n",
+                      errout_str());
 
         check("typedef void (*cb_t)(int*);\n"
               "void cb(int* p) {\n"
@@ -3700,9 +4415,9 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    g(::cb);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:2]: (style) Parameter 'p' can be declared as pointer to const. "
-                      "However it seems that 'cb' is a callback function, if 'p' is declared with const you might also need to cast function pointer(s).\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:2:14]: (style) Parameter 'p' can be declared as pointer to const. "
+                      "However it seems that 'cb' is a callback function, if 'p' is declared with const you might also need to cast function pointer(s). [constParameterCallback]\n",
+                      errout_str());
 
         check("void f1(std::vector<int>* p) {\n" // #11681
               "    if (p->empty()) {}\n" // warn
@@ -3731,10 +4446,10 @@ class TestOther : public TestFixture {
               "void g3(S* s) {\n"
               "    k(s->i);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'p' can be declared as pointer to const\n"
-                      "[test.cpp:13]: (style) Parameter 's' can be declared as pointer to const\n"
-                      "[test.cpp:19]: (style) Parameter 's' can be declared as pointer to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:27]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:13:12]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:19:12]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
 
         check("struct S {\n" // #11573
               "    const char* g() const {\n"
@@ -3747,13 +4462,227 @@ class TestOther : public TestFixture {
               "    for (const auto* p : t->v)\n"
               "        if (strcmp(p->g(), n) == 0) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Parameter 't' can be declared as pointer to const\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:8:11]: (style) Parameter 't' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
 
         check("void f(int*& p, int* q) {\n"
               "    p = q;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int a[1]; };\n"
+              "void f(S* s) {\n"
+              "    if (s->a[0]) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("size_t f(char* p) {\n" // #11842
+              "    return strlen(p);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:16]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
+
+        check("void f(int* p) {\n" // #11862
+              "    long long j = *(p++);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:13]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("void f(void *p, size_t nmemb, size_t size, int (*cmp)(const void *, const void *)) {\n"
+              "    qsort(p, nmemb, size, cmp);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(bool *r, std::size_t *b) {\n" // #12129
+              "    if (*r && *b >= 5) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:14]: (style) Parameter 'r' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:1:30]: (style) Parameter 'b' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("void f(int i) {\n" // #12185
+              "    void* p = &i;\n"
+              "    std::cout << p << '\\n';\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
+
+        check("struct S { const T* t; };\n" // #12206
+              "void f(S* s) {\n"
+              "    if (s->t.i) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("void f(char *a1, char *a2) {\n" // #12252
+              "    char* b = new char[strlen(a1) + strlen(a2) + 2];\n"
+              "    sprintf(b, \"%s_%s\", a1, a2);\n"
+              "    delete[] b;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:14]: (style) Parameter 'a1' can be declared as pointer to const [constParameterPointer]\n"
+                      "[test.cpp:1:24]: (style) Parameter 'a2' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("int f(int* p) {\n" // #11713
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:12]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("void f(int *src, int* dst) {\n" // #12518
+              "    *dst++ = (int)*src++;\n"
+              "    *dst++ = static_cast<int>(*src++);\n"
+              "    *dst = (int)*src;\n"
+              "}\n"
+              "void g(int* dst) {\n"
+              "    (int&)*dst = 5;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:13]: (style) Parameter 'src' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("struct S {};\n"
+              "void f(T* t) {\n"
+              "    S* s = (S*)t->p;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) C-style pointer casting [cstyleCast]\n"
+                      "[test.cpp:3:8]: (style) Variable 's' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str()); // don't crash
+
+        check("struct S { int i; };\n" // #12205
+              "void f(S* s) {\n"
+              "    (void)s->i;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Parameter 's' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("void f(int* a, int* b, int i) {\n" // #13072
+              "    a[b[i]] = 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:21]: (style) Parameter 'b' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("int f(int* a, int* b, int i) {\n" // #13085
+              "    a[*(b + i)] = 0;\n"
+              "    return *(b + i);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:20]: (style) Parameter 'b' can be declared as pointer to const [constParameterPointer]\n",
+                      errout_str());
+
+        check("struct S { int a; };\n" // #13286
+              "void f(struct S* s) {\n"
+              "    if ((--s)->a >= 0) {}\n"
+              "}\n"
+              "void g(struct S* s) {\n"
+              "    --s;\n"
+              "    if (s->a >= 0) {}\n"
+              "}\n");
+        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());
+
+        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:4:8]: (style) Variable 'tok1' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
+
+        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:3:13]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
+
+        check("void f(int* p) {\n"
+              "    for (int* q = p; q;)\n"
+              "        break;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:15]: (style) Variable 'q' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
+
+        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:4:15]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+                      errout_str());
+
+        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: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());
+    }
+
+    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() {
@@ -3769,7 +4698,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "{\n"
@@ -3785,7 +4714,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "{\n"
@@ -3802,7 +4731,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -3820,7 +4749,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -3835,7 +4764,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -3850,7 +4779,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -3867,7 +4796,7 @@ class TestOther : public TestFixture {
               "        bar(y);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -3884,7 +4813,7 @@ class TestOther : public TestFixture {
               "        bar(y);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -3899,7 +4828,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -3914,7 +4843,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:10]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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
               "void foo()\n"
@@ -3930,7 +4859,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    char str[10];\n"
@@ -3941,10 +4870,10 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", nullptr, false, false);
+              "}", 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());
+                           errout_str());
 
         check("void foo(int a) {\n"
               "    char str[10];\n"
@@ -3958,7 +4887,7 @@ class TestOther : public TestFixture {
               "}");
         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());
+                           errout_str());
 
         check("void foo(int a) {\n"
               "    char str[10];\n"
@@ -3972,10 +4901,10 @@ class TestOther : public TestFixture {
               "      strcpy(str, \"b'\");\n"
               "      z++;\n"
               "    }\n"
-              "}", nullptr, false, false);
+              "}", 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());
+                           errout_str());
 
         check("void foo(int a) {\n"
               "    char str[10];\n"
@@ -3989,7 +4918,7 @@ class TestOther : public TestFixture {
               "      break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a) {\n"
               "    char str[10];\n"
@@ -4001,8 +4930,8 @@ class TestOther : public TestFixture {
               "    case 3:\n"
               "      strcpy(str, \"b'\");\n"
               "    }\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #5158 "segmentation fault (valid code)"
         check("typedef struct ct_data_s {\n"
@@ -4015,18 +4944,18 @@ class TestOther : public TestFixture {
               "} deflate_state;\n"
               "void f(deflate_state *s) {\n"
               "    s->dyn_ltree[0].fc.freq++;\n"
-              "}\n", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #6132 "crash: daca: kvirc CheckOther::checkRedundantAssignment()"
-        check("void HttpFileTransfer :: transferTerminated ( bool bSuccess@1 ) {\n"
+        check("void HttpFileTransfer :: transferTerminated ( bool bSuccess ) {\n"
               "if ( m_szCompletionCallback . isNull ( ) ) {\n"
               "KVS_TRIGGER_EVENT ( KviEvent_OnHTTPGetTerminated , out ? out : ( g_pApp . activeConsole ( ) ) , & vParams )\n"
               "} else {\n"
               "KviKvsScript :: run ( m_szCompletionCallback , out ? out : ( g_pApp . activeConsole ( ) ) , & vParams ) ;\n"
               "}\n"
-              "}\n", nullptr, false, true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x;\n"
@@ -4035,7 +4964,7 @@ class TestOther : public TestFixture {
               "  case 1: x = 6; goto a;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void switchRedundantOperationTest() {
@@ -4051,7 +4980,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4066,7 +4995,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4079,7 +5008,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4092,7 +5021,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4105,7 +5034,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4120,7 +5049,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4133,7 +5062,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4146,7 +5075,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4159,7 +5088,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4174,7 +5103,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4186,8 +5115,8 @@ class TestOther : public TestFixture {
               "        y++;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4200,7 +5129,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4213,7 +5142,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:9]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4228,7 +5157,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:11]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    int y = 1;\n"
@@ -4240,8 +5169,8 @@ class TestOther : public TestFixture {
               "        y--;\n"
               "    }\n"
               "    bar(y);\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4254,7 +5183,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4270,7 +5199,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4287,7 +5216,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int x = a;\n"
@@ -4301,7 +5230,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4315,7 +5244,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4331,7 +5260,7 @@ class TestOther : public TestFixture {
               "        bar(y);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4347,7 +5276,7 @@ class TestOther : public TestFixture {
               "        bar(y);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4361,7 +5290,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "    int y = 1;\n"
@@ -4375,7 +5304,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    bar(y);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:10]: (style) Variable 'y' is reassigned a value before the old one has been used. 'break;' missing?\n", errout.str());
+        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"
               "    bool ret = false;\n"
@@ -4393,10 +5322,10 @@ class TestOther : public TestFixture {
               "    ret = true;\n"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:14]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n"
-                      "[test.cpp:8] -> [test.cpp:14]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n"
-                      "[test.cpp:11] -> [test.cpp:14]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n",
-                      errout.str());
+        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",
+                      errout_str());
     }
 
     void switchRedundantBitwiseOperationTest() {
@@ -4412,7 +5341,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing?\n", errout.str());
+        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"
               "{\n"
@@ -4426,7 +5355,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing?\n", errout.str());
+        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"
               "{\n"
@@ -4440,7 +5369,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing?\n", errout.str());
+        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"
               "{\n"
@@ -4455,7 +5384,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4464,13 +5393,13 @@ class TestOther : public TestFixture {
               "    {\n"
               "    case 2:\n"
               "        y |= z;\n"
-              "        z++\n"
+              "        z++;\n"
               "    default:\n"
               "        y |= z;\n"
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4485,7 +5414,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4500,7 +5429,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:8]: (style) Variable 'y' is reassigned a value before the old one has been used.\n", errout.str());
+        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"
               "{\n"
@@ -4514,7 +5443,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Redundant bitwise operation on 'y' in 'switch' statement. 'break;' missing?\n", errout.str());
+        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"
               "{\n"
@@ -4529,7 +5458,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4543,7 +5472,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4557,7 +5486,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4571,7 +5500,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4585,7 +5514,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unreachableCode() {
@@ -4596,30 +5525,36 @@ class TestOther : public TestFixture {
               "            continue;\n"
               "        }\n"
               "    }\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:5]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
+                                   "<def>\n"
+                                   "  <function name=\"exit\">\n"
+                                   "    <noreturn>true</noreturn>\n"
+                                   "    <arg nr=\"1\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).build();
 
-        Settings settings;
-        settings.library.setnoreturn("exit", true);
-        settings.library.functions["exit"].argumentChecks[1] = Library::ArgumentChecks();
         check("void foo() {\n"
               "    exit(0);\n"
               "    break;\n"
-              "}", nullptr, false, false, false, &settings);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
               "    void exit();\n"
@@ -4627,17 +5562,17 @@ class TestOther : public TestFixture {
               "void NeonSession::exit()\n"
               "{\n"
               "    SAL_INFO(\"ucb.ucp.webdav\", \"neon commands cannot be aborted\");\n"
-              "}", nullptr, false, false, false, &settings);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", nullptr, false, false, false, &settings);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
-        check("void foo() { xResAccess->exit(); }", nullptr, false, false, false, &settings);
-        ASSERT_EQUALS("", errout.str());
+        check("void foo() { xResAccess->exit(); }", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4650,8 +5585,8 @@ class TestOther : public TestFixture {
               "            c++;\n"
               "            break;\n"
               "         }\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:7]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
               "{\n"
@@ -4664,7 +5599,7 @@ class TestOther : public TestFixture {
               "            break;\n"
               "         }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a)\n"
               "{\n"
@@ -4674,8 +5609,8 @@ class TestOther : public TestFixture {
               "            break;\n"
               "          }\n"
               "       }\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:6]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
               "{\n"
@@ -4686,8 +5621,8 @@ class TestOther : public TestFixture {
               "          }\n"
               "          a+=2;\n"
               "       }\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:6]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
               "{\n"
@@ -4698,65 +5633,65 @@ class TestOther : public TestFixture {
               "          a+=2;\n"
               "       }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    throw 0;\n"
               "    return 1;\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
-              "}", "test.c", false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    return 0;\n"
               "    return 1;\n"
-              "}", nullptr, false, false, false);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Statements following 'return' will never be executed.\n", errout.str());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
               "    foo();\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:5]: (style) Statements following 'return' will never be executed.\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    while(bar) {\n"
@@ -4766,16 +5701,16 @@ class TestOther : public TestFixture {
               "        return 0;\n"
               "    }\n"
               "    return 124;\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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"
               "    while(bar) {\n"
               "        return;\n"
               "        break;\n"
               "    }\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}", 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
         check("extern int i,j;\n"
@@ -4785,21 +5720,21 @@ class TestOther : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "    j=2;\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:7]: (style) Statements following 'return' will never be executed.\n", errout.str());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Label 'label' is not used.\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo() {\n"
               "    goto label;\n"
@@ -4808,7 +5743,7 @@ class TestOther : public TestFixture {
               "     label:\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str()); // #3457
+        ASSERT_EQUALS("", errout_str()); // #3457
 
         check("int foo() {\n"
               "    goto label;\n"
@@ -4817,7 +5752,7 @@ class TestOther : public TestFixture {
               "     label:\n"
               "    } while (true);\n"
               "}");
-        ASSERT_EQUALS("", errout.str()); // #3457
+        ASSERT_EQUALS("", errout_str()); // #3457
 
         check("int foo() {\n"
               "    goto label;\n"
@@ -4826,7 +5761,7 @@ class TestOther : public TestFixture {
               "     label:\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str()); // #3457
+        ASSERT_EQUALS("", errout_str()); // #3457
 
         // #3383. TODO: Use preprocessor
         check("int foo() {\n"
@@ -4834,24 +5769,22 @@ class TestOther : public TestFixture {
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
         check("int foo() {\n"
               "\n" // #ifdef A
               "    return 0;\n"
               "\n" // #endif
               "    return 1;\n"
-              "}", nullptr, true, false);
-        ASSERT_EQUALS("[test.cpp:5]: (style, inconclusive) Consecutive return, break, continue, goto or throw statements are unnecessary.\n", errout.str());
+              "}");
+        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"
               "}",
-              nullptr,
-              false,
-              false);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #4756
         check("template <>\n"
@@ -4864,8 +5797,8 @@ class TestOther : public TestFixture {
               "             __asm__ (\"rorw $8, %w0\" : \"=r\" (__v) : \"0\" (__x) : \"cc\");\n"
               "         (void)__v;\n"
               "     }));\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #6008
         check("static std::function< int ( int, int ) > GetFunctor() {\n"
@@ -4873,48 +5806,48 @@ class TestOther : public TestFixture {
               "        int sum = a_ + b_;\n"
               "        return sum;\n"
               "    };\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #5789
         check("struct per_state_info {\n"
               "    uint64_t enter, exit;\n"
               "    uint64_t events;\n"
               "    per_state_info() : enter(0), exit(0), events(0) {}\n"
-              "};", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #6664
         check("void foo() {\n"
               "    (beat < 100) ? (void)0 : exit(0);\n"
               "    bar();\n"
-              "}", nullptr, false, false, false, &settings);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    (beat < 100) ? exit(0) : (void)0;\n"
               "    bar();\n"
-              "}", nullptr, false, false, false, &settings);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
         // #8261
         // TODO Do not throw AST validation exception
         TODO_ASSERT_THROW(check("void foo() {\n"
                                 "    (beat < 100) ? (void)0 : throw(0);\n"
                                 "    bar();\n"
-                                "}", nullptr, false, false, false, &settings), InternalError);
-        //ASSERT_EQUALS("", errout.str());
+                                "}", 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..
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum : uint8_t { A, B } var = A;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkP("#define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); })\n" // #4739
                "static unsigned char cmos_hal_read(unsigned index) {\n"
@@ -4930,21 +5863,21 @@ class TestOther : public TestFixture {
                "    }\n"
                "    OUTB(index, port_0);\n"
                "    return INB(port_1);\n"
-               "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+               "}\n", dinit(CheckPOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("[[noreturn]] void n();\n"
               "void f() {\n"
               "    n();\n"
               "    g();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Statements following noreturn function 'n()' will never be executed.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (style) Statements following noreturn function 'n()' will never be executed. [unreachableCode]\n", errout_str());
 
         check("void f() {\n"
               "    exit(1);\n"
               "    g();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Statements following noreturn function 'exit()' will never be executed.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) Statements following noreturn function 'exit()' will never be executed. [unreachableCode]\n", errout_str());
 
         check("void f() {\n"
               "    do {\n"
@@ -4952,7 +5885,145 @@ class TestOther : public TestFixture {
               "        g();\n"
               "    } while (0);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Statements following 'break' will never be executed.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Statements following 'break' will never be executed. [unreachableCode]\n", errout_str());
+
+        check("void f() {\n" // #12244
+              "    {\n"
+              "        std::cout << \"x\";\n"
+              "        return;\n"
+              "    }\n"
+              "    std::cout << \"y\";\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
+
+        check("void f() {\n"
+              "    {\n"
+              "        std::cout << \"x\";\n"
+              "        exit(1);\n"
+              "    }\n"
+              "    std::cout << \"y\";\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:5]: (style) Statements following noreturn function 'exit()' will never be executed. [unreachableCode]\n", errout_str());
+
+        check("int f() {\n" // #13475
+              "    { return 0; };\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int i) {\n" // #13478
+              "    int x = 0;\n"
+              "    switch (i) {\n"
+              "        { case 0: x = 5; break; }\n"
+              "        { case 1: x = 7; break; }\n"
+              "    }\n"
+              "    return x;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int c) {\n"
+              "    switch (c) {\n"
+              "    case '\\n':\n"
+              "    { return 1; };\n"
+              "    default:\n"
+              "    { return c; };\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int main(int argc, char *argv[]) {\n" // #11
+              "    switch (argc) {\n"
+              "        case 0: {\n"
+              "            return 1;\n"
+              "        }\n"
+              "        break;\n"
+              "    }\n"
+              "    return 0;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:9]: (style) Consecutive return, break, continue, goto or throw statements are unnecessary. [duplicateBreak]\n"
+                      "[test.cpp:1:26]: (style) Parameter 'argv' can be declared as const array [constParameter]\n",
+                      errout_str());
+
+        check("int f(int i) {\n" // #13491
+              "    switch (i) {\n"
+              "    case 0:\n"
+              "        return 0;\n"
+              "        int j;\n"
+              "    case 1:\n"
+              "    case 2:\n"
+              "        j = 5;\n"
+              "        return j + i;\n"
+              "    }\n"
+              "    return 3;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int i) {\n"
+              "    switch (i) {\n"
+              "    {\n"
+              "    case 0:\n"
+              "        return 0;\n"
+              "    }\n"
+              "    {\n"
+              "        int j;\n"
+              "    case 1:\n"
+              "    case 2:\n"
+              "        j = 5;\n"
+              "        return j + i;\n"
+              "    }\n"
+              "    }\n"
+              "    return 3;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int i) {\n"
+              "    switch (i) {\n"
+              "    case 0:\n"
+              "        return 0;\n"
+              "        int a[1];\n"
+              "    case 1:\n"
+              "    case 2:\n"
+              "        a[0] = 5;\n"
+              "        return a[0] + i;\n"
+              "    }\n"
+              "    return 3;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int i) {\n"
+              "    switch (i) {\n"
+              "    case 0:\n"
+              "        return 0;\n"
+              "        int j;\n"
+              "        dostuff();\n"
+              "    case 1:\n"
+              "    case 2:\n"
+              "        j = 5;\n"
+              "        return j + i;\n"
+              "    }\n"
+              "    return 3;\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:6:5]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", "", errout_str());
+
+        check("int f() {\n" // #13472
+              "    int var;\n"
+              "    auto int ret();\n"
+              "    int ret() {\n"
+              "        return var;\n"
+              "    }\n"
+              "    var = 42;\n"
+              "    return ret();\n"
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n" // #13516
+              "    io_uring_for_each_cqe(&ring, head, cqe) {\n"
+              "        if (cqe->res == -EOPNOTSUPP)\n"
+              "            printf(\"error\");\n"
+              "        goto ok;\n"
+              "    }\n"
+              "    usleep(10000);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantContinue() {
@@ -4962,7 +6033,7 @@ class TestOther : public TestFixture {
               "        continue;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) 'continue' is redundant since it is the last statement in a loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) 'continue' is redundant since it is the last statement in a loop. [redundantContinue]\n", errout_str());
 
         check("void f() {\n"
               "    int i = 0;"
@@ -4972,7 +6043,34 @@ class TestOther : public TestFixture {
               "        continue;\n"
               "    } while (i < 10);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) 'continue' is redundant since it is the last statement in a loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (style) 'continue' is redundant since it is the last statement in a loop. [redundantContinue]\n", errout_str());
+
+        check("int f() {\n" // #13475
+              "    { return 0; };\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(int i) {\n" // #13478
+              "    int x = 0;\n"
+              "    switch (i) {\n"
+              "        { case 0: x = 5; break; }\n"
+              "        { case 1: x = 7; break; }\n"
+              "    }\n"
+              "    return x;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int x, int y) {\n" // #13544
+              "    switch (x) {\n"
+              "    case 1: {\n"
+              "        return y != 0;\n"
+              "        int z = y + 5;\n"
+              "        return z != 7;\n"
+              "    }\n"
+              "    }\n"
+              "    return false;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9]: (style) Statements following 'return' will never be executed. [unreachableCode]\n", errout_str());
     }
 
 
@@ -4987,9 +6085,9 @@ class TestOther : public TestFixture {
               "            foo();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Found suspicious case label in switch(). Operator '&&' probably doesn't work as intended.\n"
-                      "[test.cpp:5]: (warning, inconclusive) Found suspicious case label in switch(). Operator '||' probably doesn't work as intended.\n"
-                      "[test.cpp:7]: (warning, inconclusive) Found suspicious case label in switch(). Operator '||' probably doesn't work as intended.\n", errout.str());
+        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());
 
         check("void foo() {\n"
               "    switch(a) {\n"
@@ -4997,7 +6095,7 @@ class TestOther : public TestFixture {
               "            a=A&&B;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // TODO Do not throw AST validation exception
         TODO_ASSERT_THROW(check("void foo() {\n"
@@ -5006,19 +6104,19 @@ class TestOther : public TestFixture {
                                 "            foo();\n"
                                 "    }\n"
                                 "}"), InternalError);
-        //ASSERT_EQUALS("", errout.str());
+        //ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousEqualityComparison() {
         check("void foo(int c) {\n"
               "    if (x) c == 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead? [constStatement]\n", errout_str());
 
 
         check("void foo(int c) {\n"
@@ -5026,90 +6124,90 @@ class TestOther : public TestFixture {
               "        c = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    c == 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    for (i == 0; i < 10; i ++) {\n"
               "        c ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int c) {\n"
               "    printf(\"%i\", ({x==0;}));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int arg) {\n"
               "    printf(\"%i\", ({int x = do_something(); x == 0;}));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    printf(\"%i\", ({x == 0; x > 0 ? 10 : 20}));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious equality comparison. Did you intend to assign a value instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int x) {\n"
               "    for (int i = (x == 0) ? 0 : 5; i < 10; i ++) {\n"
               "        x++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousUnaryPlusMinus() { // #8004
@@ -5118,46 +6216,73 @@ class TestOther : public TestFixture {
               "    +g();\n"
               "    -g();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Found suspicious operator '+', result is not used.\n"
-                      "[test.cpp:4]: (warning, inconclusive) Found suspicious operator '-', result is not used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (warning, inconclusive) Found suspicious operator '+', result is not used. [constStatement]\n"
+                      "[test.cpp:4:5]: (warning, inconclusive) Found suspicious operator '-', result is not used. [constStatement]\n",
+                      errout_str());
 
         check("void f(int i) {\n"
               "    +i;\n"
               "    -i;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious operator '+', result is not used.\n"
-                      "[test.cpp:3]: (warning, inconclusive) Found suspicious operator '-', result is not used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Found suspicious operator '+', result is not used. [constStatement]\n"
+                      "[test.cpp:3:5]: (warning, inconclusive) Found suspicious operator '-', result is not used. [constStatement]\n",
+                      errout_str());
     }
 
-    void selfAssignment() {
-        check("void foo()\n"
-              "{\n"
-              "    int x = 1;\n"
-              "    x = x;\n"
-              "    return 0;\n"
+    void suspiciousFloatingPointCast() {
+        check("double f(double a, double b, float c) {\n"
+              "    return a + (float)b + c;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) Floating-point cast causes loss of precision. [suspiciousFloatingPointCast]\n", errout_str());
+
+        check("double f(double a, double b, float c) {\n"
+              "    return a + static_cast<float>(b) + c;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:34]: (style) Floating-point cast causes loss of precision. [suspiciousFloatingPointCast]\n", errout_str());
+
+        check("long double f(long double a, long double b, float c) {\n"
+              "    return a + (double)b + c;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:16]: (style) Floating-point cast causes loss of precision. [suspiciousFloatingPointCast]\n", errout_str());
+
+        check("void g(int, double);\n"
+              "void h(double);\n"
+              "void f(double d) {\n"
+              "    g(1, (float)d);\n"
+              "    h((float)d);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) Floating-point cast causes loss of precision. [suspiciousFloatingPointCast]\n"
+                      "[test.cpp:5:7]: (style) Floating-point cast causes loss of precision. [suspiciousFloatingPointCast]\n",
+                      errout_str());
+    }
+
+    void selfAssignment() {
+        check("void foo()\n"
+              "{\n"
+              "    int x = 1;\n"
+              "    x = x;\n"
+              "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Redundant assignment of 'x' to itself.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Redundant assignment of 'x' to itself.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Redundant assignment of 'a1->b' to itself.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Redundant assignment of 'x' to itself.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:7]: (style) Redundant assignment of 'x' to itself. [selfAssignment]\n", errout_str());
 
         // #4073 (segmentation fault)
         check("void Foo::myFunc( int a )\n"
@@ -5172,52 +6297,52 @@ class TestOther : public TestFixture {
               "    x = x + 1;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
               "        int *x = getx();\n"
               "        *x = x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    BAR *x = getx();\n"
               "    x = x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Redundant assignment of 'x' to itself.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    x = (x == 0);"
               "    func(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) {\n"
               "    x = (x != 0);"
               "    func(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #3001 - false positive
         check("void foo(int x) {\n"
               "    x = x ? x : 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3800 - false negative when variable is extern
         check("extern int i;\n"
               "void f() {\n"
               "    i = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Redundant assignment of 'i' to itself.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) Redundant assignment of 'i' to itself. [selfAssignment]\n", errout_str());
 
         // #4291 - id for variables accessed through 'this'
         check("class Foo {\n"
@@ -5227,7 +6352,7 @@ class TestOther : public TestFixture {
               "void Foo::func() {\n"
               "    this->var = var;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Redundant assignment of 'this->var' to itself.\n", errout.str());
+        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"
@@ -5236,7 +6361,7 @@ class TestOther : public TestFixture {
               "void Foo::func(int var) {\n"
               "    this->var = var;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6406 - designated initializer doing bogus self assignment
         check("struct callbacks {\n"
@@ -5246,7 +6371,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    struct callbacks ops = { .s = ops.s };\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (warning) Redundant assignment of 'something' to itself.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Redundant assignment of 'something' to itself.\n", "", errout_str());
 
         check("class V\n"
               "{\n"
@@ -5261,19 +6386,19 @@ class TestOther : public TestFixture {
               "    }\n"
               "    double x, y, z;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:10]: (warning) Redundant assignment of 'x' to itself.\n"
-                      "[test.cpp:10]: (warning) Redundant assignment of 'y' to itself.\n"
-                      "[test.cpp:10]: (warning) Redundant assignment of 'z' to itself.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    int x = 1;\n"
               "    int &ref = x;\n"
               "    ref = x;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Redundant assignment of 'ref' to itself.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Redundant assignment of 'ref' to itself. [selfAssignment]\n", errout_str());
 
         check("class Foo {\n" // #9850
               "    int i{};\n"
@@ -5284,7 +6409,7 @@ class TestOther : public TestFixture {
               "        *this = copy;\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #11383
               "    void f() {\n"
@@ -5293,7 +6418,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    int i;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #10337
               "    int b[2] = { 1, 2 };\n"
@@ -5302,7 +6427,19 @@ class TestOther : public TestFixture {
               "    idx++;\n"
               "    i = b[idx];\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(int*);\n" // #12390
+              "void f() {\n"
+              "    int o = s.i;\n"
+              "    g(&s.i);\n"
+              "    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() {
@@ -5324,7 +6461,7 @@ class TestOther : public TestFixture {
               "    std::cout << \"hello\" << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:15]: (style) Instance of 'Lock' object is destroyed immediately.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:15:5]: (style) Instance of 'Lock' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
     void trac3693() {
@@ -5333,8 +6470,8 @@ class TestOther : public TestFixture {
               "    b = 300\n"
               "  };\n"
               "};\n"
-              "const int DFLT_TIMEOUT = A::b % 1000000 ;\n", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "const int DFLT_TIMEOUT = A::b % 1000000 ;\n", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickFunction1() {
@@ -5343,7 +6480,7 @@ class TestOther : public TestFixture {
               "    CouldBeFunction ( 123 ) ;\n"
               "    return 0 ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickFunction2() {
@@ -5360,7 +6497,7 @@ class TestOther : public TestFixture {
               "        do_something();\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectPicksClass() {
@@ -5370,7 +6507,7 @@ class TestOther : public TestFixture {
               "    NotAFunction ( 123 );\n"
               "    return 0 ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Instance of 'NotAFunction' object is destroyed immediately.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'NotAFunction' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
     void testMisusedScopeObjectPicksStruct() {
@@ -5380,7 +6517,7 @@ class TestOther : public TestFixture {
               "    NotAClass ( 123 ) ;\n"
               "    return true ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Instance of 'NotAClass' object is destroyed immediately.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'NotAClass' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickIf() {
@@ -5389,7 +6526,7 @@ class TestOther : public TestFixture {
               "    if ( a > b ) return c == a ;\n"
               "    return b == a ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickConstructorDeclaration() {
@@ -5399,7 +6536,7 @@ class TestOther : public TestFixture {
               "~Something ( ) ;\n"
               "Something ( ) ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickFunctor() {
@@ -5418,7 +6555,7 @@ class TestOther : public TestFixture {
               "    IncrementFunctor()(a);\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickLocalClassConstructors() {
@@ -5431,7 +6568,7 @@ class TestOther : public TestFixture {
               "    Foo();\n"
               "    do_something();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Instance of 'Foo' object is destroyed immediately.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:5]: (style) Instance of 'Foo' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickUsedObject() {
@@ -5443,7 +6580,7 @@ class TestOther : public TestFixture {
               "void fn() {\n"
               "    Foo().bar();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickPureC() {
@@ -5458,11 +6595,11 @@ class TestOther : public TestFixture {
                             "    do_something();\n"
                             "}\n";
 
-        check(code, "test.cpp");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Instance of 'cb_watch_bool' object is destroyed immediately.\n", errout.str());
+        check(code);
+        ASSERT_EQUALS("[test.cpp:7:5]: (style) Instance of 'cb_watch_bool' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
 
-        check(code, "test.c");
-        ASSERT_EQUALS("", errout.str());
+        check(code, dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #2639
         check("struct stat { int a; int b; };\n"
@@ -5472,7 +6609,7 @@ class TestOther : public TestFixture {
               "    stat(\"file.txt\", &st);\n"
               "    do_something();\n"
               "}");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
 
         check("struct AMethodObject {\n" // #4336
               "    AMethodObject(double, double, double);\n"
@@ -5483,7 +6620,7 @@ class TestOther : public TestFixture {
               "void S::A(double const a1, double const a2, double const a3) {\n"
               "    AMethodObject(a1, a2, a3);\n"
               "}\n");
-        ASSERT_EQUALS("",errout.str());
+        ASSERT_EQUALS("",errout_str());
     }
 
     void testMisusedScopeObjectDoesNotPickNestedClass() {
@@ -5503,8 +6640,8 @@ class TestOther : public TestFixture {
                             "  do_something();\n"
                             "}\n";
 
-        check(code, "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+        check(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectInConstructor() {
@@ -5516,8 +6653,8 @@ class TestOther : public TestFixture {
                             "  }\n"
                             "  Foo(char x, int y) { }\n"
                             "};\n";
-        check(code, "test.cpp");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Instance of 'Foo' object is destroyed immediately.\n", errout.str());
+        check(code);
+        ASSERT_EQUALS("[test.cpp:4:5]: (style) Instance of 'Foo' object is destroyed immediately. [unusedScopedObject]\n", errout_str());
     }
 
     void testMisusedScopeObjectStandardType() {
@@ -5531,30 +6668,30 @@ class TestOther : public TestFixture {
               "    int{ i };\n"
               "    int{ g() };\n" // don't warn
               "    g();\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Instance of 'int' object is destroyed immediately.\n"
-                      "[test.cpp:4]: (style) Instance of 'int' object is destroyed immediately.\n"
-                      "[test.cpp:6]: (style) Instance of 'int' object is destroyed immediately.\n"
-                      "[test.cpp:7]: (style) Instance of 'int' object is destroyed immediately.\n"
-                      "[test.cpp:8]: (style) Instance of 'int' object is destroyed immediately.\n",
-                      errout.str());
+              "}\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"
+                      "[test.cpp:7:5]: (style) Instance of 'int' object is destroyed immediately. [unusedScopedObject]\n"
+                      "[test.cpp:8:5]: (style) Instance of 'int' object is destroyed immediately. [unusedScopedObject]\n",
+                      errout_str());
 
         check("void f(int j) {\n"
               "    for (; bool(j); ) {}\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("void g() {\n"
               "    float (f);\n"
               "    float (*p);\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int i) {\n"
               "    void();\n"
               "    return i;\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectNamespace() {
@@ -5566,19 +6703,19 @@ class TestOther : public TestFixture {
               "int f() {\n"
               "    M::N::S();\n"
               "    return 0;\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Instance of 'M::N::S' object is destroyed immediately.\n", errout.str());
+              "}\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
               "    std::string(\"abc\");\n"
               "    std::string{ \"abc\" };\n"
               "    std::pair<int, int>(1, 2);\n"
               "    (void)0;\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Instance of 'std::string' object is destroyed immediately.\n"
-                      "[test.cpp:3]: (style) Instance of 'std::string' object is destroyed immediately.\n"
-                      "[test.cpp:4]: (style) Instance of 'std::pair' object is destroyed immediately.\n",
-                      errout.str());
+              "}\n");
+        ASSERT_EQUALS("[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());
 
         check("struct S {\n" // #10083
               "    void f() {\n"
@@ -5591,11 +6728,17 @@ class TestOther : public TestFixture {
               "        std::scoped_lock(m);\n"
               "    }\n"
               "    std::mutex m;\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Instance of 'std::lock_guard' object is destroyed immediately.\n"
-                      "[test.cpp:6]: (style) Instance of 'std::scoped_lock' object is destroyed immediately.\n"
-                      "[test.cpp:9]: (style) Instance of 'std::scoped_lock' object is destroyed immediately.\n",
-                      errout.str());
+              "}\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",
+                      errout_str());
+
+        check("struct S { int i; };\n"
+              "namespace {\n"
+              "    S s() { return ::S{42}; }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testMisusedScopeObjectAssignment() { // #11371
@@ -5607,8 +6750,8 @@ class TestOther : public TestFixture {
               "void t0() { f() = {}; }\n"
               "void t1() { g() = {}; }\n"
               "void t2() { h() = {}; }\n"
-              "void t3() { *i() = {}; }\n", "test.cpp");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Instance of 'S' object is destroyed immediately, assignment has no effect.\n", errout.str());
+              "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());
     }
 
     void trac2084() {
@@ -5619,7 +6762,7 @@ class TestOther : public TestFixture {
               "    { sigaction(SIGHUP, &sa, 0); };\n"
               "    { sigaction(SIGINT, &sa, 0); };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void trac2071() {
@@ -5630,76 +6773,76 @@ class TestOther : public TestFixture {
               "\n"
               "    const AB ab[3] = { AB(0), AB(1), AB(2) };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyCalculation() {
         check("int f(char c) {\n"
               "    return 10 * (c == 0) ? 1 : 2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '*' and '?'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '*' and '?'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char c) {\n"
               "    printf(\"%i\", a + b ? 1 : 2);\n"
-              "}",nullptr,false,false);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '+' and '?'.\n", errout.str());
+              "}",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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '<<' and '?'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '-' and '?'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '|' and '?'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Clarify calculation precedence for '>>' and '?'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { a = *p ? 1 : 2; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { const char *p = x & 1 ? \"1\" : \"0\"; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() { x = a % b ? \"1\" : \"0\"; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { return x & 1 ? '1' : '0'; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { return x & 16 ? 1 : 0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { return x % 16 ? 1 : 0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("enum {X,Y}; void f(int x) { return x & Y ? 1 : 0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void clarifyStatement() {
@@ -5708,97 +6851,102 @@ class TestOther : public TestFixture {
               "    return c;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n"
-            "[test.cpp:2]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("char* f(char** c) {\n"
               "    *c[5]--;\n"
               "    return *c;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n"
-            "[test.cpp:2]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("void f(Foo f) {\n"
               "    *f.a++;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n"
-            "[test.cpp:2]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("void f(Foo f) {\n"
               "    *f.a[5].v[3]++;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n"
-            "[test.cpp:2]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("void f(Foo f) {\n"
               "    *f.a(1, 5).v[x + y]++;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n"
-            "[test.cpp:2]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("char* f(char* c) {\n"
               "    (*c)++;\n"
               "    return c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(char* c) {\n"
               "    bar(*c++);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char*** f(char*** c) {\n"
               "    ***c++;\n"
               "    return c;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n"
-            "[test.cpp:2]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("char** f(char*** c) {\n"
               "    **c[5]--;\n"
               "    return **c;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2]: (warning, inconclusive) Found suspicious operator '*', result is not used.\n"
-            "[test.cpp:2]: (warning) In expression like '*A++' the result of '*' is unused. Did you intend to write '(*A)++;'?\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("char*** f(char*** c) {\n"
               "    (***c)++;\n"
               "    return c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const int*** p) {\n" // #10923
               "    delete[] **p;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void *f(char** c) {\n"
               "    bar(**c++);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void *f(char* p) {\n"
               "    for (p = path; *p++;) ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::array<std::array<double,3>,3> array;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const std::vector<int*>& v) {\n" // #12088
+              "    for (auto it = v.begin(); it != v.end(); delete *it++);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateBranch() {
@@ -5808,7 +6956,7 @@ class TestOther : public TestFixture {
               "    else\n"
               "        b = 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n", errout.str());
+        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"
               "    if (a) {\n"
@@ -5819,7 +6967,7 @@ class TestOther : public TestFixture {
               "    } else\n"
               "        b = 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n", errout.str());
+        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"
               "    if (a == 1)\n"
@@ -5831,7 +6979,7 @@ class TestOther : public TestFixture {
               "            b = 2;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n", errout.str());
+        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"
               "    int ret;\n"
@@ -5840,8 +6988,8 @@ class TestOther : public TestFixture {
               "    else\n"
               "        ret = (unsigned char)value;\n"
               "    return ret;\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (b)\n"
@@ -5849,7 +6997,7 @@ class TestOther : public TestFixture {
               "    else\n"
               "        __asm__(\"mov bx, bx\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str()); // #3407
+        ASSERT_EQUALS("", errout_str()); // #3407
 
         check("void f() {\n"
               "    if (b)\n"
@@ -5857,7 +7005,7 @@ class TestOther : public TestFixture {
               "    else\n"
               "        __asm__(\"mov ax, bx\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:2:5]: (style, inconclusive) Found duplicate branches for 'if' and 'else'. [duplicateBranch]\n", errout_str());
     }
 
     void duplicateBranch1() {
@@ -5871,7 +7019,7 @@ class TestOther : public TestFixture {
               "  else\n"
               "    frac = front/(front-back);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n", errout.str());
+        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"
               "{\n"
@@ -5880,7 +7028,7 @@ class TestOther : public TestFixture {
               "  else\n"
               "    frac = front/((front-back));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n", errout.str());
+        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)
         check("void f()\n"
@@ -5890,7 +7038,7 @@ class TestOther : public TestFixture {
               "  else\n"
               "  {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateBranch2() {
@@ -5902,7 +7050,7 @@ class TestOther : public TestFixture {
                "  else\n"
                "    DOSTUFF2\n"
                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateBranch3() {
@@ -5914,9 +7062,9 @@ class TestOther : public TestFixture {
               "        x = j;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5] -> [test.cpp:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n"
-                      "[test.cpp:2]: (style) The scope of the variable 'j' can be reduced.\n",
-                      errout.str());
+        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());
 
         check("void f(bool b, int i) {\n"
               "    int j = i;\n"
@@ -5927,7 +7075,7 @@ class TestOther : public TestFixture {
               "        x = j;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateBranch4() {
@@ -5938,7 +7086,7 @@ class TestOther : public TestFixture {
               "        return new A::Z(true);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateBranch5() {
@@ -5952,7 +7100,7 @@ class TestOther : public TestFixture {
               "        j = i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:3]: (style, inconclusive) Found duplicate branches for 'if' and 'else'.\n", errout.str());
+        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"
               "    int j;\n"
@@ -5964,7 +7112,7 @@ class TestOther : public TestFixture {
               "        j = 1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    int j;\n"
@@ -5974,7 +7122,7 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    int j;\n"
@@ -5986,7 +7134,7 @@ class TestOther : public TestFixture {
               "        j = i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateBranch6() {
@@ -5996,7 +7144,7 @@ class TestOther : public TestFixture {
               "        int i = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "    if (b) {\n"
@@ -6004,14 +7152,14 @@ class TestOther : public TestFixture {
               "    } else {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression1() {
         check("void foo(int a) {\n"
               "    if (a == a) { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '=='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("void fun(int b) {\n"
               "    return  a && a ||\n"
@@ -6020,90 +7168,90 @@ class TestOther : public TestFixture {
               "            e < e &&\n"
               "            f ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&&'.\n"
-                      "[test.cpp:3]: (style) Same expression on both sides of '=='.\n"
-                      "[test.cpp:4]: (style) Same expression on both sides of '>'.\n"
-                      "[test.cpp:5]: (style) Same expression on both sides of '<'.\n", errout.str());
+        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"
+                      "[test.cpp:5:15]: (style) Same expression on both sides of '<'. [duplicateExpression]\n", errout_str());
 
         check("void foo() {\n"
               "    return a && a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&&'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&&'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '=='.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '=='.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&&' because 'a<b' and 'b>a' represent the same value.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&&' because 'a<=b' and 'b>=a' represent the same value.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression 'x!=2' found multiple times in chain of '||' operators.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b || a && b) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b | b && c) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '|'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '|'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '=='.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void d(const char f, int o, int v)\n"
               "{\n"
@@ -6111,137 +7259,141 @@ class TestOther : public TestFixture {
               "         ((f=='R') && (o == 2) && ((v < 2) || (v > 99))) ||\n"
               "         ((f=='T') && (o == 2) && ((v < 200) || (v > 9999)))) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) { return x+x; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { while (x+=x) ; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (a && b && b) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&&'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int i) {\n"
               "    return i/i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '/'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() { return !!y; }"); // No FP
-        ASSERT_EQUALS("", errout.str());
+        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) {} }",
-              nullptr,  // filename
-              false, // inconclusive
-              false, // runSimpleChecks
-              false, // verbose
-              nullptr   // settings
+              dinit(CheckOptions, $.inconclusive = false)
               );
-        ASSERT_EQUALS("", errout.str());
+        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;})) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5535: Reference named like its type
         check("void foo() { UMSConfig& UMSConfig = GetUMSConfiguration(); }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Variable 'UMSConfig' can be declared as reference to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Same expression on both sides of '&&'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '|' because 'b+a' and 'a+b' represent the same value.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if ((b > a) | (a > b)) {}\n" // > is not commutative
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(double a, double b) {\n"
               "    if ((b + a) > (a + b)) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) The comparison 'b+a > a+b' is always false because 'b+a' and 'a+b' represent the same value.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&&' because 'x==1' and 'x==0x00000001' represent the same value.\n", errout.str());
+        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) {}"
-              "}", nullptr, true, false);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    enum { Four = 4 };\n"
+              "    _Static_assert(Four == 4, \"\");\n"
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { Four = 4 };\n"
               "    static_assert(4 == Four, \"\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    enum { FourInEnumOne = 4 };\n"
               "    enum { FourInEnumTwo = 4 };\n"
               "    if (FourInEnumOne == FourInEnumTwo) {}\n"
-              "}", nullptr, true, false);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        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());
 
         check("void f() {\n"
               "    enum { FourInEnumOne = 4 };\n"
               "    enum { FourInEnumTwo = 4 };\n"
               "    static_assert(FourInEnumOne == FourInEnumTwo, \"\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    if (sizeof(a) == sizeof(a)) { }\n"
               "    if (sizeof(a) == sizeof(b)) { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '=='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
 
         check("float bar(int) __attribute__((pure));\n"
               "char foo(int) __attribute__((pure));\n"
@@ -6250,7 +7402,7 @@ class TestOther : public TestFixture {
               "    if (unknown(a) == unknown(a)) { }\n"
               "    if (foo(a) == foo(a)) { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Same expression on both sides of '=='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:16]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
     }
 
     void duplicateExpression2() { // check if float is NaN or Inf
@@ -6260,42 +7412,42 @@ class TestOther : public TestFixture {
               "    if (flt != flt) have_nan = 1;\n"
               "    return have_nan;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("float f(float x) { return x-x; }"); // ticket #4485 (Inf)
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
-        check("float f(float x) { return (X double)x == (X double)x; }", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+        check("float f(float x) { return (X double)x == (X double)x; }", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct X { float f; };\n"
               "float f(struct X x) { return x.f == x.f; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct X { int i; };\n"
               "int f(struct X x) { return x.i == x.i; }");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '=='.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression3() {
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<def>\n"
-                               "  <function name=\"mystrcmp\">\n"
-                               "    <pure/>\n"
-                               "    <arg nr=\"1\"/>\n"
-                               "    <arg nr=\"2\"/>\n"
-                               "  </function>\n"
-                               "</def>";
-        Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<def>\n"
+                                   "  <function name=\"mystrcmp\">\n"
+                                   "    <pure/>\n"
+                                   "    <arg nr=\"1\"/>\n"
+                                   "    <arg nr=\"2\"/>\n"
+                                   "  </function>\n"
+                                   "</def>";
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).build();
 
         check("void foo() {\n"
               "    if (x() || x()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "  void foo() const;\n"
@@ -6304,7 +7456,7 @@ class TestOther : public TestFixture {
               "void A::foo() const {\n"
               "    if (bar() && bar()) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Same expression on both sides of '&&'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:15]: (style) Same expression on both sides of '&&'. [duplicateExpression]\n", errout_str());
 
         check("struct A {\n"
               "  void foo();\n"
@@ -6314,7 +7466,7 @@ class TestOther : public TestFixture {
               "void A::foo() {\n"
               "    if (bar() && bar()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class B {\n"
               "    void bar(int i);\n"
@@ -6328,71 +7480,74 @@ class TestOther : public TestFixture {
               "    if (b.bar(1) && b.bar(1)) {}\n"
               "    if (a.bar(1) && a.bar(1)) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:11]: (style) Same expression on both sides of '&&'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if ((mystrcmp(a, b) == 0) || (mystrcmp(a, b) == 0)) {}\n"
-              "}", "test.cpp", false, true, false, &settings);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void __attribute__((const)) GetValue() { return X; }\n"
               "void foo() {\n"
               "    if ((GetValue() == 0) || (GetValue() == 0)) { dostuff(); }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Same expression on both sides of '||'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Same expression on both sides of '||'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5334
         check("void f(C *src) {\n"
               "    if (x<A*>(src) || x<B*>(src))\n"
               "        a++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(A *src) {\n"
               "    if (dynamic_cast<B*>(src) || dynamic_cast<B*>(src)) {}\n"
-              "}\n", "test.cpp", false, false); // don't run simplifications
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||'.\n", errout.str());
+              "}\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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("Vector func(int vec1) {\n"
               "    return fabs(vec1 & vec1 & vec1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '&'.\n", errout.str());
+        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
+            errout_str());
 
     }
 
@@ -6400,32 +7555,47 @@ class TestOther : public TestFixture {
         check("void foo() {\n"
               "    if (*a++ != b || *a++ != b) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if (*a-- != b || *a-- != b) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assignment
         check("void f() {\n"
               "  while (*(a+=2)==*(b+=2) && *(a+=2)==*(b+=2)) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression5() {  // #3749 - macros with same values
         check("void f() {\n"
               "    if ($a == $a) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("#define X 1\n"
+               "#define Y 1\n"
+               "void f() {\n"
+               "    if (X == X) {}\n"
+               "    if (X == Y) {}\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Same expression on both sides of '=='. [duplicateExpression]\n", errout_str());
+
+        checkP("#define X 1\n"
+               "#define Y X\n"
+               "void f() {\n"
+               "    if (X == Y) {}\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression7() {
@@ -6433,36 +7603,36 @@ class TestOther : public TestFixture {
               "    const int i = sizeof(int);\n"
               "    if ( i != sizeof (int)){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'i != sizeof(int)' is always false because 'i' and 'sizeof(int)' represent the same value.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'sizeof(int) != i' is always false because 'sizeof(int)' and 'i' represent the same value.\n", errout.str());
+        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){}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    if ( a != 1){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'a != 1' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3] -> [test.cpp:4]: (style) The comparison 'a != b' is always false because 'a' and 'b' represent the same value.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) The comparison 'a != b' is always false because 'a' and 'b' represent the same value.\n", errout.str());
+        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"
               "void f() {\n"
@@ -6471,7 +7641,7 @@ class TestOther : public TestFixture {
               "    use(b);\n"
               "    if ( a != 1){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (style) The comparison 'a != 1' is always false.\n", errout.str());
+        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"
               "void f() {\n"
@@ -6480,7 +7650,7 @@ class TestOther : public TestFixture {
               "    a = 2;\n"
               "    if ( a != 1){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void use(int);\n"
               "void f() {\n"
@@ -6489,38 +7659,38 @@ class TestOther : public TestFixture {
               "    a = 1;\n"
               "    if ( a != 1){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const int a = 1;\n"
               "void f() {\n"
               "    if ( a != 1){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3]: (style) The comparison 'a != 1' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static const int a = 1;\n"
               "    if ( a != 1){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'a != 1' is always false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 1;\n"
               "    if ( a != 1){\n"
               "        a++;\n"
               "    }}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'a != 1' is always false.\n", errout.str());
+        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"
               "    int a = 1;\n"
@@ -6529,27 +7699,27 @@ class TestOther : public TestFixture {
               "        a++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(bool a, bool b) {\n"
               "    const bool c = a;\n"
               "    return a && b && c;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Same expression 'a' found multiple times in chain of '&&' operators because 'a' and 'c' represent the same value.\n",
-                      errout.str());
+        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());
 
         // 6906
         check("void f(const bool b) {\n"
               "   const bool b1 = !b;\n"
               "   if(!b && b1){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Same expression on both sides of '&&' because '!b' and 'b1' represent the same value.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||' because 'a' and '!!a' represent the same value.\n", errout.str());
+        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
         check("void f(int x) {\n"
@@ -6560,7 +7730,7 @@ class TestOther : public TestFixture {
               "       break;\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:5]: (style) The comparison 'Diag == 0' is always true.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15] -> [test.cpp:5:16]: (style) The comparison 'Diag == 0' is always true. [knownConditionTrueFalse]\n", errout_str());
 
         // #9744
         check("void f(const std::vector<int>& ints) {\n"
@@ -6569,7 +7739,7 @@ class TestOther : public TestFixture {
               "        if (p == 0) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) The comparison 'p == 0' is always true.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:18] -> [test.cpp:4:15]: (style) The comparison 'p == 0' is always true. [knownConditionTrueFalse]\n", errout_str());
 
         // #11820
         check("unsigned f(unsigned x) {\n"
@@ -6578,7 +7748,7 @@ class TestOther : public TestFixture {
               "unsigned g(unsigned x) {\n"
               "    return !!x - x;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression8() {
@@ -6588,13 +7758,13 @@ class TestOther : public TestFixture {
               "    a = 2;\n"
               "    if ( b != a){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int * a, int i) { int b = a[i]; a[i] = 2; if ( b != a[i]){}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int * a, int i) { int b = *a; *a = 2; if ( b != *a){}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A { int f() const; };\n"
               "A g();\n"
@@ -6605,7 +7775,7 @@ class TestOther : public TestFixture {
               "        if (x.f() == a) break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int i);\n"
               "struct A {\n"
@@ -6618,14 +7788,14 @@ class TestOther : public TestFixture {
               "    const bool y = a.f(A::C);\n"
               "    if(!x && !y) return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool * const b);\n"
               "void foo() {\n"
@@ -6634,17 +7804,17 @@ class TestOther : public TestFixture {
               "    f(&x);\n"
               "    if (!x && !y) return;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const int a = {};\n"
               "    if(a == 1) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("volatile const int var = 42;\n"
               "void f() { if(var == 42) {} }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a = 0;\n"
@@ -6653,7 +7823,7 @@ class TestOther : public TestFixture {
               "    g(&c);\n"
               "    if (a == 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression9() {
@@ -6663,7 +7833,7 @@ class TestOther : public TestFixture {
               "  uint8_t y = x;\n"
               "  if (x != y) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression10() {
@@ -6674,7 +7844,7 @@ class TestOther : public TestFixture {
               "   const int c = a+1;\n"
               "   return c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression11() {
@@ -6695,7 +7865,7 @@ class TestOther : public TestFixture {
               "        double scale_ratio = getScale() / old_scale;\n" // <- FP
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression12() { //#10026
@@ -6704,14 +7874,14 @@ class TestOther : public TestFixture {
               "        int var = buffer[index - 1];\n"
               "        return buffer[index - 1] - var;\n"  // <<
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) Same expression on both sides of '-'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpression14() { //#9871
@@ -6721,7 +7891,7 @@ class TestOther : public TestFixture {
               "    int* g = &k;\n"
               "    return (f + 4 != g + 4);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4] -> [test.cpp:5]: (style) The comparison 'f+4 != g+4' is always false because 'f+4' and 'g+4' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14] -> [test.cpp:4:14] -> [test.cpp:5:19]: (style) The comparison 'f+4 != g+4' is always false because 'f+4' and 'g+4' represent the same value. [knownConditionTrueFalse]\n", errout_str());
     }
 
     void duplicateExpression15() { //#10650
@@ -6733,9 +7903,9 @@ class TestOther : public TestFixture {
               "    const int i = int{ 0 };\n"
               "    return i == 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'i == 0' is always true.\n"
-                      "[test.cpp:6] -> [test.cpp:7]: (style) The comparison 'i == 0' is always true.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:22] -> [test.cpp:3:14]: (style) The comparison 'i == 0' is always true. [knownConditionTrueFalse]\n"
+                      "[test.cpp:6:22] -> [test.cpp:7:14]: (style) The comparison 'i == 0' is always true. [knownConditionTrueFalse]\n",
+                      errout_str());
     }
 
     void duplicateExpression16() {
@@ -6757,10 +7927,10 @@ class TestOther : public TestFixture {
               "        (a == \"y\") ||\n"
               "        (a == \"42\")) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:4]: (style) Same expression 'a==\"42\"' found multiple times in chain of '||' operators.\n"
-                      "[test.cpp:7] -> [test.cpp:9]: (style) Same expression 'a==\"42\"' found multiple times in chain of '||' operators.\n"
-                      "[test.cpp:13] -> [test.cpp:16]: (style) Same expression 'a==\"42\"' found multiple times in chain of '||' operators.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:28] -> [test.cpp:4:20]: (style) Same expression 'a==\"42\"' found multiple times in chain of '||' operators. [duplicateExpression]\n"
+                      "[test.cpp:7:28] -> [test.cpp:9:20]: (style) Same expression 'a==\"42\"' found multiple times in chain of '||' operators. [duplicateExpression]\n"
+                      "[test.cpp:13:28] -> [test.cpp:16:20]: (style) Same expression 'a==\"42\"' found multiple times in chain of '||' operators. [duplicateExpression]\n",
+                      errout_str());
 
         check("void f(const char* s) {\n" // #6371
               "    if (*s == '\x0F') {\n"
@@ -6768,7 +7938,83 @@ class TestOther : public TestFixture {
               "            break;\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Same expression '!s[1]' found multiple times in chain of '||' operators.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:28]: (style) Same expression '!s[1]' found multiple times in chain of '||' operators. [duplicateExpression]\n", errout_str());
+    }
+
+    void duplicateExpression17() {
+        check("enum { E0 };\n" // #12036
+              "void f() {\n"
+              "    if (0 > E0) {}\n"
+              "    if (E0 > 0) {}\n"
+              "    if (E0 == 0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) The comparison '0 > E0' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:4:12]: (style) The comparison 'E0 > 0' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:5:12]: (style) The comparison 'E0 == 0' is always true. [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("struct S {\n" // #12040, #12044
+              "    static const int I = 0;\n"
+              "    enum { E0 };\n"
+              "    enum F { F0 };\n"
+              "    void f() {\n"
+              "        if (0 > I) {}\n"
+              "        if (0 > S::I) {}\n"
+              "        if (0 > E0) {}\n"
+              "        if (0 > S::E0) {}\n"
+              "    }\n"
+              "};\n"
+              "void g() {\n"
+              "    if (0 > S::I) {}\n"
+              "    if (0 > S::E0) {}\n"
+              "    if (0 > S::F::F0) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:26] -> [test.cpp:6:15]: (style) The comparison '0 > I' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:2:26] -> [test.cpp:7:15]: (style) The comparison '0 > S::I' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:8:15]: (style) The comparison '0 > E0' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:9:15]: (style) The comparison '0 > S::E0' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:2:26] -> [test.cpp:13:11]: (style) The comparison '0 > S::I' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:14:11]: (style) The comparison '0 > S::E0' is always false. [knownConditionTrueFalse]\n"
+                      "[test.cpp:15:11]: (style) The comparison '0 > S::F::F0' is always false. [knownConditionTrueFalse]\n",
+                      errout_str());
+
+        check("template<typename T, typename U>\n" // #12122
+              "void f() {\n"
+              "    static_assert(std::is_same<T, U>::value || std::is_integral<T>::value);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void duplicateExpression18() {
+        checkP("#if defined(ABC)\n" // #13218
+               "#define MACRO1 (0x1)\n"
+               "#else\n"
+               "#define MACRO1 (0)\n"
+               "#endif\n"
+               "#if defined(XYZ)\n"
+               "#define MACRO2 (0x2)\n"
+               "#else\n"
+               "#define MACRO2 (0)\n"
+               "#endif\n"
+               "#define MACRO_ALL (MACRO1 | MACRO2)\n"
+               "void f() {\n"
+               "    if (MACRO_ALL == 0) {}\n"
+               "}\n");
+        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; }");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpressionLoop() {
@@ -6776,23 +8022,23 @@ class TestOther : public TestFixture {
               "    int a = 1;\n"
               "    while ( a != 1){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'a != 1' is always false.\n", errout.str());
+        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++; }}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() { int a = 1; for ( int i=0; i < 3 && a != 1; i++){ a++; }}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int b) { int a = 1; while (b) { if ( a != 1){} b++; } a++; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    for(int i = 0; i < 10;) {\n"
               "        if( i != 0 ) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'i != 0' is always false.\n", errout.str());
+        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"
               "    for(int i = 0; i < 10;) {\n"
@@ -6800,7 +8046,7 @@ class TestOther : public TestFixture {
               "        i++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    for(int i = 0; i < 10;) {\n"
@@ -6808,14 +8054,14 @@ class TestOther : public TestFixture {
               "        i++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    for(int i = 0; i < 10;) {\n"
               "        if( i != 0 ) { i++; }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int i = 0;\n"
@@ -6824,7 +8070,7 @@ class TestOther : public TestFixture {
               "        i++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int b) {\n"
               "    while (b) {\n"
@@ -6833,7 +8079,7 @@ class TestOther : public TestFixture {
               "        b++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style) The comparison 'a != 1' is always false.\n", errout.str());
+        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
               "    std::string m;\n"
@@ -6849,54 +8095,74 @@ class TestOther : public TestFixture {
               "    } while (t && t->str() == s);\n"
               "    for (; t && t->str() == s; t = t->next());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::string &out, const std::vector<std::string> &list) {\n" // #13669
+              "    for (int i = 0, size = list.size(); i < size; i++) {\n"
+              "        out += list[i];\n"
+              "        if (size > 0 && i < (size - 2))\n"
+              "            out += \",\";\n"
+              "        else if (i == (size - 1))\n"
+              "            out += \".\";\n"
+              "    }\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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression in both branches of ternary operator.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Same expression in both branches of ternary operator.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned char c) {\n"
               "  x = y ? (signed char)c : (unsigned char)c;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6426
         {
             const char code[] = "void foo(bool flag) {\n"
                                 "  bar( (flag) ? ~0u : ~0ul);\n"
                                 "}";
-            Settings settings = _settings;
+            /*const*/ Settings settings = settings0;
             settings.platform.sizeof_int = 4;
             settings.platform.int_bit = 32;
 
             settings.platform.sizeof_long = 4;
             settings.platform.long_bit = 32;
-            check(code, &settings);
-            ASSERT_EQUALS("[test.cpp:2]: (style) Same value in both branches of ternary operator.\n", errout.str());
+            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);
-            ASSERT_EQUALS("", errout.str());
+            check(code, dinit(CheckOptions, $.settings = &settings));
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -6904,31 +8170,31 @@ class TestOther : public TestFixture {
         check("void f() {\n"
               "    if( a ? (b ? false:false): false ) ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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]: (style) Same value in both branches of ternary operator.\n", errout.str());
+        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"
@@ -6938,14 +8204,14 @@ class TestOther : public TestFixture {
               "  Foo foo;\n"
               "  it = true ? foo.bar.begin() : foo.baz.begin();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool b) {\n"
               "  std::vector<int> bar{1,2,3};\n"
               "  std::vector<int> baz{4,5,6};\n"
               "  std::vector<int> v = b ? bar : baz;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool q) {\n" // #9570
               "    static int a = 0;\n"
@@ -6953,19 +8219,39 @@ class TestOther : public TestFixture {
               "    int& x = q ? a : b;\n"
               "    ++x;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { int a, b; };\n" // #10107
               "S f(bool x, S s) {\n"
               "    (x) ? f.a = 42 : f.b = 42;\n"
               "    return f;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("float f(float x) {\n" // # 11368
               "    return (x >= 0.0) ? 0.0 : -0.0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        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); }");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f() { return x ? sizeof(uint32_t) : sizeof(uint32_t); }");
+        ASSERT_EQUALS("[test.cpp:1:39]: (style) Same expression in both branches of ternary operator. [duplicateExpressionTernary]\n", errout_str());
     }
 
     void duplicateExpressionTemplate() {
@@ -6974,59 +8260,69 @@ class TestOther : public TestFixture {
               "}\n"
               "\n"
               "static auto a = f<0>();");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<typename T>\n" // #7754
               "void f() {\n"
               "    if (std::is_same_v<T, char> || std::is_same_v<T, unsigned char>) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("typedef long long int64_t;"
               "template<typename T>\n"
               "void f() {\n"
               "    if (std::is_same_v<T, long> || std::is_same_v<T, int64_t>) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkP("#define int32_t int"
                "template<typename T>\n"
                "void f() {\n"
                "    if (std::is_same_v<T, int> || std::is_same_v<T, int32_t>) {}\n"
                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("#define F(v) (v) != 0\n" // #12392
+               "template<class T>\n"
+               "void f() {\n"
+               "    if (F(0)) {}\n"
+               "}\n"
+               "void g() {\n"
+               "    f<int>();\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateExpressionCompareWithZero() {
         check("void f(const int* x, bool b) {\n"
               "    if ((x && b) || (x != 0 && b)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||' because 'x&&b' and 'x!=0&&b' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression on both sides of '||' because 'x&&b' and 'x!=0&&b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(const int* x, bool b) {\n"
               "    if ((x != 0 && b) || (x && b)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||' because 'x!=0&&b' and 'x&&b' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) Same expression on both sides of '||' because 'x!=0&&b' and 'x&&b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(const int* x, bool b) {\n"
               "    if ((x && b) || (b && x != 0)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||' because 'x&&b' and 'b&&x!=0' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18]: (style) Same expression on both sides of '||' because 'x&&b' and 'b&&x!=0' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(const int* x, bool b) {\n"
               "    if ((!x && b) || (x == 0 && b)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||' because '!x&&b' and 'x==0&&b' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (style) Same expression on both sides of '||' because '!x&&b' and 'x==0&&b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(const int* x, bool b) {\n"
               "    if ((x == 0 && b) || (!x && b)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||' because 'x==0&&b' and '!x&&b' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) Same expression on both sides of '||' because 'x==0&&b' and '!x&&b' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(const int* x, bool b) {\n"
               "    if ((!x && b) || (b && x == 0)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same expression on both sides of '||' because '!x&&b' and 'b&&x==0' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (style) Same expression on both sides of '||' because '!x&&b' and 'b&&x==0' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("struct A {\n"
               "    int* getX() const;\n"
@@ -7035,77 +8331,77 @@ class TestOther : public TestFixture {
               "        if ((getX() && getB()) || (getX() != 0 && getB())) {}\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Same expression on both sides of '||' because 'getX()&&getB()' and 'getX()!=0&&getB()' represent the same value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:32]: (style) Same expression on both sides of '||' because 'getX()&&getB()' and 'getX()!=0&&getB()' represent the same value. [knownConditionTrueFalse]\n", errout_str());
 
         check("void f(const int* x, bool b) {\n"
               "    if ((x && b) || (x == 0 && b)) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const int* x, bool b) {\n"
               "    if ((!x && b) || (x != 0 && b)) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void oppositeExpression() {
         check("void f(bool a) { if(a && !a) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '&&'.\n", errout.str());
+        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) {} }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
+        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) ) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        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) ) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
+        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 ) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        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 ) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
+        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) ) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        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) ) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Opposite expression on both sides of '=='.\n"
-                      "[test.cpp:2] -> [test.cpp:4]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        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());
 
         check("void f2(const bool *a) {\n"
               "    const bool b = *a;\n"
               "    if( *a == !(b) ) {}\n"
               "    if( b == !(*a) ) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Opposite expression on both sides of '=='.\n"
-                      "[test.cpp:2] -> [test.cpp:4]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a) { if( a < -a ) {}}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Opposite expression on both sides of '<'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:23]: (style) Opposite expression on both sides of '<'. [oppositeExpression]\n", errout_str());
 
         check("void f(int a) { a -= -a; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a) { a = a / (-a); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int i){ return !((i - 1) & i); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(unsigned i){ return (x > 0) && (x & (x-1)) == 0; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void A::f(bool a, bool c)\n"
               "{\n"
@@ -7113,51 +8409,51 @@ class TestOther : public TestFixture {
               "    if(c) { a = false; }\n"
               "    if(b && !a) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(bool c) {\n"
               "    const bool b = a;\n"
               "    if(c) { a = false; }\n"
               "    if(b && !a) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    bool x = a;\n"
               "    dostuff();\n"
               "    if (x && a) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  const bool b = g();\n"
               "  if (!b && g()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const bool *a) {\n"
               "    const bool b = a[42];\n"
               "    if( b == !(a[42]) ) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:21] -> [test.cpp:3:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
         check("void f(const bool *a) {\n"
               "    const bool b = a[42];\n"
               "    if( a[42] == !(b) ) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:21] -> [test.cpp:3:15]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
         check("void f(const bool *a) {\n"
               "    const bool b = *a;\n"
               "    if( b == !(*a) ) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:11]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
         check("void f(const bool *a) {\n"
               "    const bool b = *a;\n"
               "    if( *a == !(b) ) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Opposite expression on both sides of '=='.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:20] -> [test.cpp:3:12]: (style) Opposite expression on both sides of '=='. [oppositeExpression]\n", errout_str());
 
         check("void f(uint16_t u) {\n" // #9342
               "    if (u != (u & -u))\n"
@@ -7166,7 +8462,7 @@ class TestOther : public TestFixture {
               "        return false;\n"
               "    return true;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateVarExpression() {
@@ -7176,7 +8472,7 @@ class TestOther : public TestFixture {
               "    int i = f();\n"
               "    int j = f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "void test() {\n"
@@ -7184,7 +8480,7 @@ class TestOther : public TestFixture {
               "    int i = f.f();\n"
               "    int j = f.f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "void test() {\n"
@@ -7193,7 +8489,7 @@ class TestOther : public TestFixture {
               "    int i = f.f();\n"
               "    int j = f.f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:5]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "int g() __attribute__((pure));\n"
@@ -7201,7 +8497,7 @@ class TestOther : public TestFixture {
               "    int i = 1 + f();\n"
               "    int j = 1 + f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "int g() __attribute__((pure));\n"
@@ -7209,7 +8505,7 @@ class TestOther : public TestFixture {
               "    int i = f() + 1;\n"
               "    int j = 1 + f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() __attribute__((pure));\n"
               "int g() __attribute__((pure));\n"
@@ -7218,7 +8514,7 @@ class TestOther : public TestFixture {
               "    int i = x + 1;\n"
               "    int j = f() + 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() __attribute__((pure));\n"
               "int g() __attribute__((pure));\n"
@@ -7226,7 +8522,7 @@ class TestOther : public TestFixture {
               "    int i = f() + f();\n"
               "    int j = f() + f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "int g(int) __attribute__((pure));\n"
@@ -7234,7 +8530,7 @@ class TestOther : public TestFixture {
               "    int i = f(0);\n"
               "    int j = f(0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "int g(int) __attribute__((pure));\n"
@@ -7243,39 +8539,39 @@ class TestOther : public TestFixture {
               "    int i = f(0);\n"
               "    int j = f(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(const int * p, const int * q) {\n"
               "    int i = *p;\n"
               "    int j = *p;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (style) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    int i = -1;\n"
               "    int j = -1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int);\n"
               "void test() {\n"
               "    int i = f(0);\n"
               "    int j = f(1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f();\n"
               "int g();\n"
@@ -7283,21 +8579,21 @@ class TestOther : public TestFixture {
               "    int i = f() || f();\n"
               "    int j = f() && f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "void test() {\n"
               "    Foo i = Foo();\n"
               "    Foo j = Foo();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {};\n"
               "void test() {\n"
               "    Foo i = Foo{};\n"
               "    Foo j = Foo{};\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { int f() const; float g() const; };\n"
               "void test() {\n"
@@ -7305,7 +8601,7 @@ class TestOther : public TestFixture {
               "    int i = f.f();\n"
               "    int j = f.f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "void test() {\n"
@@ -7313,43 +8609,43 @@ class TestOther : public TestFixture {
               "    int i = f.f();\n"
               "    int j = f.f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test() {\n"
               "    int i = f();\n"
               "    int j = f();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = ++x;\n"
               "    int j = ++x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x++;\n"
               "    int j = x++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = --x;\n"
               "    int j = --x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x--;\n"
               "    int j = x--;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void test(int x) {\n"
               "    int i = x + 1;\n"
               "    int j = 1 + x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void duplicateVarExpressionUnique() {
@@ -7358,18 +8654,18 @@ class TestOther : public TestFixture {
               "    int start = x->first;\n"
               "    int end   = x->first;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (style, inconclusive) Same expression used in consecutive assignments of 'start' and 'end'.\n"
-                      "[test.cpp:2]: (style) Parameter 'x' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("struct SW { int first; };\n"
               "void foo(SW* x, int i, int j) {\n"
               "    int start = x->first;\n"
               "    int end   = x->first;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (style, inconclusive) Same expression used in consecutive assignments of 'start' and 'end'.\n"
-                      "[test.cpp:2]: (style) Parameter 'x' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("struct Foo { int f() const; };\n"
               "void test() {\n"
@@ -7377,13 +8673,13 @@ class TestOther : public TestFixture {
               "    int i = f.f();\n"
               "    int j = f.f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "void test() {\n"
@@ -7391,7 +8687,7 @@ class TestOther : public TestFixture {
               "    int i = f.f();\n"
               "    int j = f.f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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"
               "void test() {\n"
@@ -7399,7 +8695,7 @@ class TestOther : public TestFixture {
               "    int i = f.f();\n"
               "    int j = f.f();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:4]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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());
     }
 
     void duplicateVarExpressionAssign() {
@@ -7411,7 +8707,7 @@ class TestOther : public TestFixture {
               "    use(i);\n"
               "    i = j;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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; };"
               "void use(int);\n"
@@ -7421,7 +8717,7 @@ class TestOther : public TestFixture {
               "    use(j);\n"
               "    j = i;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n", errout.str());
+        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; };"
               "void use(int);\n"
@@ -7432,9 +8728,9 @@ class TestOther : public TestFixture {
               "    if (i == j) {}\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n"
-            "[test.cpp:3] -> [test.cpp:4] -> [test.cpp:6]: (style) The comparison 'i == j' is always true because 'i' and 'j' represent the same value.\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("struct A { int x; int y; };"
               "void use(int);\n"
@@ -7445,9 +8741,9 @@ class TestOther : public TestFixture {
               "    if (i == a.x) {}\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n"
-            "[test.cpp:3] -> [test.cpp:6]: (style) The comparison 'i == a.x' is always true because 'i' and 'a.x' represent the same value.\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         check("struct A { int x; int y; };"
               "void use(int);\n"
@@ -7458,9 +8754,9 @@ class TestOther : public TestFixture {
               "    if (j == a.x) {}\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:3]: (style, inconclusive) Same expression used in consecutive assignments of 'i' and 'j'.\n"
-            "[test.cpp:4] -> [test.cpp:6]: (style) The comparison 'j == a.x' is always true because 'j' and 'a.x' represent the same value.\n",
-            errout.str());
+            "[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",
+            errout_str());
 
         // Issue #8612
         check("struct P\n"
@@ -7489,7 +8785,7 @@ class TestOther : public TestFixture {
               "        previous = current;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:16] -> [test.cpp:15]: (style, inconclusive) Same expression used in consecutive assignments of 'current' and 'previous'.\n", errout.str());
+        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());
     }
 
     void duplicateVarExpressionCrash() {
@@ -7505,21 +8801,21 @@ class TestOther : public TestFixture {
               "        (void)a;\n"
               "        (void)b;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:7]: (style, inconclusive) Same expression used in consecutive assignments of 'a' and 'b'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <typename T>\n"
               "T f() {\n"
               "  T x = T();\n"
               "}\n"
               "int &a = f<int&>();");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Issue #8713
         check("class A {\n"
@@ -7531,7 +8827,7 @@ class TestOther : public TestFixture {
               "  uint32_t b = uint32_t(A ::B / 1024);\n"
               "  int32_t c = int32_t(a / b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Issue #8709
         check("a b;\n"
@@ -7540,7 +8836,7 @@ class TestOther : public TestFixture {
               "  double e(b);\n"
               "  if(e <= 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10718
         // Should probably not be inconclusive
@@ -7552,7 +8848,7 @@ class TestOther : public TestFixture {
               "    return e + f;\n"
               "  }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:5]: (style, inconclusive) Same expression used in consecutive assignments of 'e' and 'f'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:20] -> [test.cpp:5:9]: (style, inconclusive) Same expression used in consecutive assignments of 'e' and 'f'. [duplicateAssignExpression]\n", errout_str());
     }
 
     void multiConditionSameExpression() {
@@ -7561,8 +8857,8 @@ class TestOther : public TestFixture {
               "  if (val < 0) continue;\n"
               "  if ((val > 0)) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'val < 0' is always false.\n"
-                      "[test.cpp:2] -> [test.cpp:4]: (style) The comparison 'val > 0' is always false.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "  int val = 0;\n"
@@ -7571,7 +8867,9 @@ class TestOther : public TestFixture {
               "  if (*p < 0) continue;\n"
               "  if ((*p > 0)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'p' can be declared as pointer to const\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:8]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("void f() {\n"
               "  int val = 0;\n"
@@ -7581,8 +8879,8 @@ class TestOther : public TestFixture {
               "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison '*p < 0' is always false.\n"
                            "[test.cpp:2] -> [test.cpp:4]: (style) The comparison '*p > 0' is always false.\n",
-                           "[test.cpp:3]: (style) Variable 'p' can be declared as pointer to const\n",
-                           errout.str());
+                           "[test.cpp:3:8]: (style) Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+                           errout_str());
 
         check("void f() {\n"
               "  int val = 0;\n"
@@ -7590,8 +8888,8 @@ class TestOther : public TestFixture {
               "    if ((val > 0)) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'val < 0' is always false.\n"
-                      "[test.cpp:2] -> [test.cpp:4]: (style) The comparison 'val > 0' is always false.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "  int val = 0;\n"
@@ -7599,8 +8897,8 @@ class TestOther : public TestFixture {
               "    if ((val < 0)) {}\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'val < 0' is always false.\n"
-                      "[test.cpp:2] -> [test.cpp:4]: (style) The comparison 'val < 0' is always false.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "  int activate = 0;\n"
@@ -7608,49 +8906,49 @@ class TestOther : public TestFixture {
               "  if (activate) {}\n"
               "  else if (foo) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkSignOfUnsignedVariable() {
         check("void foo() {\n"
               "  for(unsigned char i = 10; i >= 0; i--) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'i' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'i' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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, nullptr, false, true, false);
-            ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
-            check(code, nullptr, false, true, true);
-            ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+            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, 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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             const char code[] = "void foo(unsigned x) {\n"
                                 "  int y = 0;\n"
                                 "  if (x < y) {}\n"
                                 "}";
-            check(code, nullptr, false, true, false);
-            ASSERT_EQUALS("[test.cpp:3]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
-            check(code, nullptr, false, true, true);
-            ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+            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, 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"
               "  int y = 0;\n"
@@ -7658,149 +8956,149 @@ class TestOther : public TestFixture {
               "    y = 1;\n"
               "  if (x < y) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0 > x) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (x >= 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x-y' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x) {\n"
               "  if (0 <= x) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x < 0 && y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (0 > x && y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x >= 0 && y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && x < 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && 0 > x) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (y && x >= 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x < 0 || y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (0 > x || y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(unsigned int x, bool y) {\n"
               "  if (x >= 0 || y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unsigned expression 'x' can't be negative so it is unnecessary to test it.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3233 - FP when template is used (template parameter is numeric constant)
         {
@@ -7808,18 +9106,17 @@ class TestOther : public TestFixture {
                                 "  if (x <= n);\n"
                                 "}\n"
                                 "foo<0>();";
-            check(code, nullptr, false);
-            ASSERT_EQUALS("", errout.str());
-            check(code, nullptr, true);
-            ASSERT_EQUALS("", errout.str());
+            check(code, dinit(CheckOptions, $.inconclusive = false));
+            ASSERT_EQUALS("", errout_str());
+            check(code);
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
-            Settings s = settingsBuilder().checkUnusedTemplates().build();
             check("template<int n> void foo(unsigned int x) {\n"
                   "if (x <= 0);\n"
-                  "}", &s);
-            ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
+                  "}");
+            ASSERT_EQUALS("[test.cpp:2:7]: (style) Checking if unsigned expression 'x' is less than zero. [unsignedLessThanZero]\n", errout_str());
         }
 
         // #8836
@@ -7830,16 +9127,16 @@ class TestOther : public TestFixture {
               "    value = 0u;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Checking if unsigned expression 'value' is less than zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Checking if unsigned expression 'value' is less than zero. [unsignedLessThanZero]\n", errout_str());
 
         // #9040
-        Settings settings1 = settingsBuilder().platform(cppcheck::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);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.settings = &settingsWin64));
+        ASSERT_EQUALS("", errout_str());
 
         // #10612
         check("void f(void) {\n"
@@ -7847,34 +9144,53 @@ class TestOther : public TestFixture {
               "   constexpr const auto y = 0xFFFFU;\n"
               "   if (y < x) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Checking if unsigned expression 'y' is less than zero.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) Checking if unsigned expression 'y' is less than zero. [unsignedLessThanZero]\n", errout_str());
+
+        // #12387
+        check("template<typename T>\n"
+              "void f(T t) {\n"
+              "    if constexpr (std::numeric_limits<T>::is_signed) {\n"
+              "        if (t < 0) {}\n"
+              "    }\n"
+              "}\n"
+              "void g() {\n"
+              "    f<uint32_t>(0);\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"
+              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkSignOfPointer() {
         check("void foo(const int* x) {\n"
               "  if (x >= 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n", errout.str());
+        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, nullptr, false, true, false);
-            ASSERT_EQUALS("[test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n", errout.str());
-            check(code, nullptr, false, true, true);
-            ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n", errout.str());
+            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, 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x) {\n"
               "  if (x < 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n", errout.str());
+        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"
@@ -7882,41 +9198,41 @@ class TestOther : public TestFixture {
                                 "  if (x < y) {}\n"
                                 "}";
 
-            check(code, nullptr, false, true, false);
-            ASSERT_EQUALS("[test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n", errout.str());
-            check(code, nullptr, false, true, true);
-            ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n", errout.str());
+            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, 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y < 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y <= 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y > 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const int* x, const int* y) {\n"
               "  if (x - y >= 0) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const Bar* x) {\n"
               "  if (0 <= x) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n", errout.str());
+        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"
               "  int* ptr;\n"
@@ -7924,9 +9240,9 @@ class TestOther : public TestFixture {
               "void foo(S* first) {\n"
               "  if (first.ptr >= 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n"
-                      "[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("struct S {\n"
               "  int* ptr;\n"
@@ -7934,9 +9250,9 @@ class TestOther : public TestFixture {
               "void foo(S* first, S* second) {\n"
               "  if((first.ptr - second.ptr) >= 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Parameter 'second' can be declared as pointer to const\n",
-                      errout.str());
+        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("struct S {\n"
               "  int* ptr;\n"
@@ -7944,9 +9260,9 @@ class TestOther : public TestFixture {
               "void foo(S* first) {\n"
               "  if((first.ptr) >= 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) A pointer can not be negative so it is either pointless or an error to check if it is not.\n"
-                      "[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("struct S {\n"
               "  int* ptr;\n"
@@ -7954,9 +9270,9 @@ class TestOther : public TestFixture {
               "void foo(S* first, S* second) {\n"
               "  if(0 <= first.ptr - second.ptr) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Parameter 'second' can be declared as pointer to const\n",
-                      errout.str());
+        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("struct S {\n"
               "  int* ptr;\n"
@@ -7964,9 +9280,9 @@ class TestOther : public TestFixture {
               "void foo(S* first, S* second) {\n"
               "  if(0 <= (first.ptr - second.ptr)) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Parameter 'second' can be declared as pointer to const\n",
-                      errout.str());
+        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("struct S {\n"
               "  int* ptr;\n"
@@ -7974,9 +9290,9 @@ class TestOther : public TestFixture {
               "void foo(S* first, S* second) {\n"
               "  if(first.ptr - second.ptr < 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Parameter 'second' can be declared as pointer to const\n",
-                      errout.str());
+        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("struct S {\n"
               "  int* ptr;\n"
@@ -7984,9 +9300,9 @@ class TestOther : public TestFixture {
               "void foo(S* first, S* second) {\n"
               "  if((first.ptr - second.ptr) < 0) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Parameter 'second' can be declared as pointer to const\n",
-                      errout.str());
+        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("struct S {\n"
               "  int* ptr;\n"
@@ -7994,9 +9310,9 @@ class TestOther : public TestFixture {
               "void foo(S* first, S* second) {\n"
               "  if(0 > first.ptr - second.ptr) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Parameter 'second' can be declared as pointer to const\n",
-                      errout.str());
+        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("struct S {\n"
               "  int* ptr;\n"
@@ -8004,106 +9320,106 @@ class TestOther : public TestFixture {
               "void foo(S* first, S* second) {\n"
               "  if(0 > (first.ptr - second.ptr)) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Parameter 'first' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Parameter 'second' can be declared as pointer to const\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 <= x.y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'x' can be declared as pointer to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'x' can be declared as pointer to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'x' can be declared as pointer to const\n"
-                      "[test.cpp:1]: (style) Parameter 'y' can be declared as pointer to const\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(Bar* x) {\n"
               "  if (0 > x.y) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'x' can be declared as pointer to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'x' can be declared as pointer to const\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  int (*t)(void *a, void *b);\n"
               "  if (0 > t(a, b)) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n"
-                      "[test.cpp:2]: (style) Parameter 'oi' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("struct object_info { int typep[10]; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (oi->typep < 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) A pointer can not be negative so it is either pointless or an error to check if it is.\n"
-                      "[test.cpp:2]: (style) Parameter 'oi' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("struct object_info { int *typep; };\n"
               "void packed_object_info(struct object_info *oi) {\n"
               "  if (*oi->typep < 0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Empty block
         check("void foo() {\n"
               "  for(int i = 0; i < 10; ++i); {\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious use of ; at the end of 'for' statement.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious use of ; at the end of 'while' statement.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:3]: (warning) Suspicious use of ; at the end of 'while' statement. [suspiciousSemicolon]\n", errout_str());
     }
 
     void checkSuspiciousSemicolon2() {
@@ -8112,21 +9428,21 @@ class TestOther : public TestFixture {
               "    do_something();\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious use of ; at the end of 'if' statement.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  if (Match());\n"
               "  else\n"
               "    do_something();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  if (i == 1)\n"
@@ -8135,7 +9451,7 @@ class TestOther : public TestFixture {
               "    do_something();\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "  if (i == 1);\n"
@@ -8144,7 +9460,7 @@ class TestOther : public TestFixture {
               "    do_something();\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkSuspiciousSemicolon3() {
@@ -8153,20 +9469,20 @@ class TestOther : public TestFixture {
                "  if (x == 123);\n"
                "  REQUIRE(y=z);\n"
                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkSuspiciousComparison() {
         checkP("void f(int a, int b) {\n"
                "  a > b;\n"
                "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found suspicious operator '>', result is not used.\n", errout.str());
+        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"
                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkInvalidFree() {
@@ -8174,38 +9490,42 @@ class TestOther : public TestFixture {
               "  char *a; a = malloc(1024);\n"
               "  free(a + 10);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset.\n", errout.str());
+        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());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
               "  delete a + 10;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset.\n", errout.str());
+        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());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
               "  bar(a);\n"
               "  delete a + 10;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
@@ -8214,7 +9534,7 @@ class TestOther : public TestFixture {
               "  delete a + 10;\n"
               "  delete b + 10;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset.\n", errout.str());
+        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"
               "  char *a; a = new char;\n"
@@ -8223,21 +9543,23 @@ class TestOther : public TestFixture {
               "  delete a + 10;\n"
               "  delete b + 10;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char *p) {\n"
               "  char *a; a = new char;\n"
               "  bar()\n"
               "  delete a + 10;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Mismatching address is deleted. The address you get from new must be deleted without offset.\n", errout.str());
+        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());
 
         check("void foo(size_t xx) {\n"
               "  char *ptr; ptr = malloc(42);\n"
               "  ptr += xx;\n"
               "  free(ptr + 1 - xx);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Mismatching address is freed. The address you get from malloc() must be freed without offset.\n", errout.str());
+        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"
               "  char *ptr; ptr = malloc(42);\n"
@@ -8245,7 +9567,9 @@ class TestOther : public TestFixture {
               "  ptr = otherPtr;\n"
               "  free(otherPtr - xx - 1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:9]: (style) Variable 'ptr' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
     }
 
     void checkRedundantCopy() {
@@ -8253,16 +9577,16 @@ class TestOther : public TestFixture {
               "void foo() {\n"
               "    const std::string a = getA();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying.\n", errout.str());
+        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(){}};\n"
+        check("class A { public: A() {} char x[100]; };\n"
               "const A& getA(){static A a;return a;}\n"
               "int main()\n"
               "{\n"
               "    const A a = getA();\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying.\n", errout.str());
+        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"
               "int main()\n"
@@ -8270,7 +9594,7 @@ class TestOther : public TestFixture {
               "    const int a = getA();\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const int& getA(){static int a;return a;}\n"
               "int main()\n"
@@ -8279,16 +9603,16 @@ class TestOther : public TestFixture {
               "    const int a = getA + 3;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:4]: (style) Local variable \'getA\' shadows outer function\n", errout.str());
+        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(){}};\n"
+        check("class A { public: A() {} char x[100]; };\n"
               "const A& getA(){static A a;return a;}\n"
               "int main()\n"
               "{\n"
               "    const A a(getA());\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (performance, inconclusive) Use const reference for 'a' to avoid unnecessary data copying.\n", errout.str());
+        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"
               "int main()\n"
@@ -8296,7 +9620,7 @@ class TestOther : public TestFixture {
               "    const int a(getA());\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A{\n"
               "public:A(int a=0){_a = a;}\n"
@@ -8308,7 +9632,7 @@ class TestOther : public TestFixture {
               "    const A a = getA() + 1;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A{\n"
               "public:A(int a=0){_a = a;}\n"
@@ -8320,7 +9644,7 @@ class TestOther : public TestFixture {
               "    const A a(getA()+1);\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5190 - FP when creating object with constructor that takes a reference
         check("class A {};\n"
@@ -8329,7 +9653,7 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    const B b(getA());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {};\n"
               "class B { B(const A& a); };\n"
@@ -8337,23 +9661,23 @@ class TestOther : public TestFixture {
               "void f() {\n"
               "    const B b{ getA() };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5618
-        const char* code5618 = "class Token {\n"
-                               "public:\n"
-                               "    const std::string& str();\n"
-                               "};\n"
-                               "void simplifyArrayAccessSyntax() {\n"
-                               "    for (Token *tok = list.front(); tok; tok = tok->next()) {\n"
-                               "        const std::string temp = tok->str();\n"
-                               "        tok->str(tok->strAt(2));\n"
-                               "    }\n"
-                               "}";
-        check(code5618, nullptr, true);
-        ASSERT_EQUALS("", errout.str());
-        check(code5618, nullptr, false);
-        ASSERT_EQUALS("", errout.str());
+        const char code5618[] = "class Token {\n"
+                                "public:\n"
+                                "    const std::string& str();\n"
+                                "};\n"
+                                "void simplifyArrayAccessSyntax() {\n"
+                                "    for (Token *tok = list.front(); tok; tok = tok->next()) {\n"
+                                "        const std::string temp = tok->str();\n"
+                                "        tok->str(tok->strAt(2));\n"
+                                "    }\n"
+                                "}";
+        check(code5618);
+        ASSERT_EQUALS("", errout_str());
+        check(code5618, dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #5890 - crash: wesnoth desktop_util.cpp / unicode.hpp
         check("typedef std::vector<char> X;\n"
@@ -8361,7 +9685,7 @@ class TestOther : public TestFixture {
               "    const X s = f<X>(in);\n"
               "    return f<X>(s);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7981 - False positive redundantCopyLocalConst - const ref argument to ctor
         check("class CD {\n"
@@ -8372,8 +9696,8 @@ class TestOther : public TestFixture {
               " \n"
               "void foo() {\n"
               "  const CD cd(CD::getOne());\n"
-              "}", nullptr, true);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #10545
               "    int modify();\n"
@@ -8385,8 +9709,8 @@ class TestOther : public TestFixture {
               "    if (i != 0)\n"
               "        return old;\n"
               "    return {};\n"
-              "}", nullptr, /*inconclusive*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("struct X { int x; };\n" // #10191
               "struct S {\n"
@@ -8403,8 +9727,8 @@ class TestOther : public TestFixture {
               "        modify();\n"
               "        return x.x;\n"
               "    }\n"
-              "};\n", nullptr, /*inconclusive*/ true);
-        ASSERT_EQUALS("", errout.str());
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
 
         // #10704
         check("struct C {\n"
@@ -8418,7 +9742,7 @@ class TestOther : public TestFixture {
               "        return s.empty();\n"
               "    }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:8]: (performance, inconclusive) Use const reference for 's' to avoid unnecessary data copying.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:21]: (performance, inconclusive) Use const reference for 's' to avoid unnecessary data copying. [redundantCopyLocalConst]\n", errout_str());
 
         check("struct C {\n"
               "    const std::string & get() const { return m; }\n"
@@ -8431,7 +9755,85 @@ class TestOther : public TestFixture {
               "void g() {\n"
               "    std::string s = getC().get();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12139
+              "    int x, y;\n"
+              "};\n"
+              "struct T {\n"
+              "    S s;\n"
+              "    const S& get() const { return s; }\n"
+              "};\n"
+              "void f(const T& t) {\n"
+              "    const S a = t.get();\n"
+              "    if (a.x > a.y) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12740
+              "    const std::string & get() const { return m; }\n"
+              "    void set(const std::string& v) { m = v; }\n"
+              "    std::string m;\n"
+              "};\n"
+              "struct T {\n"
+              "    void f();\n"
+              "    S* s;\n"
+              "};\n"
+              "void T::f() {\n"
+              "    const std::string o = s->get();\n"
+              "    s->set(\"abc\");\n"
+              "    s->set(o);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12196
+              "    std::string s;\n"
+              "    const std::string& get() const { return s; }\n"
+              "};\n"
+              "struct T {\n"
+              "    S* m;\n"
+              "    void f();\n"
+              "};\n"
+              "struct U {\n"
+              "    explicit U(S* p);\n"
+              "    void g();\n"
+              "    S* n;\n"
+              "};\n"
+              "void T::f() {\n"
+              "    U u(m);\n"
+              "    const std::string c = m->get();\n"
+              "    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());
+
+        check("struct S {\n" // #12925
+              "    const std::string & f() const { return str; }\n"
+              "    std::string str;\n"
+              "};\n"
+              "void f(const S* s) {\n"
+              "    const std::string v{ s->f() };\n"
+              "    if (v.empty()) {}\n"
+              "}\n"
+              "void g(const S* s) {\n"
+              "    const std::string w(s->f());\n"
+              "    if (w.empty()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:23]: (performance, inconclusive) Use const reference for 'v' to avoid unnecessary data copying. [redundantCopyLocalConst]\n"
+                      "[test.cpp:10:23]: (performance, inconclusive) Use const reference for 'w' to avoid unnecessary data copying. [redundantCopyLocalConst]\n",
+                      errout_str());
+
+        check("struct T {\n"
+              "    std::string s;\n"
+              "    const std::string& get() const { return s; }\n"
+              "};\n"
+              "void f(const T& t) {\n"
+              "    const auto s = t.get();\n"
+              "    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());
     }
 
     void checkNegativeShift() {
@@ -8440,65 +9842,101 @@ class TestOther : public TestFixture {
               "   int a; a = 123;\n"
               "   (void)(a << -1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Shifting by a negative value is undefined behaviour\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Shifting by a negative value is undefined behaviour\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Shifting by a negative value is undefined behaviour\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Shifting by a negative value is undefined behaviour\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << a << -1 ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo()\n"
               "{\n"
               "   std::cout << 3 << -1 ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void foo() {\n"
               "   x = (-10+2) << 3;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Shifting a negative value is technically undefined behaviour\n", errout.str());
+        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;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Negative LHS
         check("const int x = -1 >> 2;");
-        ASSERT_EQUALS("[test.cpp:1]: (portability) Shifting a negative value is technically undefined behaviour\n", errout.str());
+        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;");
-        ASSERT_EQUALS("", errout.str());
+        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 ;}");
-        ASSERT_EQUALS("[test.cpp:1]: (error) Shifting by a negative value is undefined behaviour\n"
-                      "[test.cpp:2]: (error) Shifting by a negative value is undefined behaviour\n"
-                      "[test.cpp:3]: (portability) Shifting a negative value is technically undefined behaviour\n"
-                      "[test.cpp:4]: (portability) Shifting a negative value is technically undefined behaviour\n", errout.str());
+        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"
+                      "[test.cpp:4:26]: (portability) Shifting a negative value is technically undefined behaviour [shiftNegativeLHS]\n", errout_str());
+
+        check("void f(int i) {\n" // #12916
+              "    if (i < 0) {\n"
+              "        g(\"abc\" << i);\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #13326
+        check("template<int b>\n"
+              "int f(int a)\n"
+              "{\n"
+              "    if constexpr (b >= 0) {\n"
+              "        return a << b;\n"
+              "    } else {\n"
+              "        return a << -b;\n"
+              "    }\n"
+              "}\n"
+              "int g() {\n"
+              "    return f<1>(2)\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("template<int b>\n"
+              "int f(int a)\n"
+              "{\n"
+              "    if constexpr (b >= 0) {\n"
+              "        return a << b;\n"
+              "    } else {\n"
+              "        return a << -b;\n"
+              "    }\n"
+              "}\n"
+              "int g() {\n"
+              "    return f<-1>(2)\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incompleteArrayFill() {
@@ -8509,9 +9947,9 @@ class TestOther : public TestFixture {
               "    memmove(a, b, 5);\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]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'?\n"
-            "[test.cpp:4]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memcpy()' with 'sizeof(*a)'?\n"
-            "[test.cpp:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memmove()' with 'sizeof(*a)'?\n", errout.str());
+            "[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"
+            "[test.cpp:5:5]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memmove()' with 'sizeof(*a)'? [incompleteArrayFill]\n", errout_str());
 
         check("int a[5];\n"
               "namespace Z { struct B { int a[5]; } b; }\n"
@@ -8519,46 +9957,53 @@ class TestOther : public TestFixture {
               "    memset(::a, 123, 5);\n"
               "    memset(Z::b.a, 123, 5);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Array '::a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*::a)'?\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]: (warning, inconclusive) Array '::a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*::a)'?\n", errout.str());
+                           "[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"
               "    memset(a, 'a', 5);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Array 'a' is filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char a[5];\n"
               "    memset(a, 'a', 5);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[5];\n"
               "    memset(a+15, 'a', 5);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    bool a[5];\n"
               "    memset(a, false, 5);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability, inconclusive) Array 'a' might be filled incompletely. Did you forget to multiply the size given to 'memset()' with 'sizeof(*a)'?\n", errout.str());
+        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"
+              "}");
+        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());
     }
 
     void redundantVarAssignment() {
@@ -8569,9 +10014,9 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:3:style:Variable 'i' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:2:note:i is assigned\n"
-                      "test.cpp:3:note:i is overwritten\n", errout.str());
+        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());
 
         // non-local variable => only show warning when inconclusive is used
         check("int i;\n"
@@ -8579,34 +10024,34 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'i' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:i is assigned\n"
-                      "test.cpp:4:note:i is overwritten\n", errout.str());
+        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());
 
         check("void f() {\n"
               "    int i;\n"
               "    i = 1;\n"
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'i' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:i is assigned\n"
-                      "test.cpp:4:note:i is overwritten\n", errout.str());
+        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());
 
         check("void f() {\n"
               "    static int i;\n"
               "    i = 1;\n"
               "    i = 1;\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("void f() {\n"
               "    int i[10];\n"
               "    i[2] = 1;\n"
               "    i[2] = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'i[2]' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:i[2] is assigned\n"
-                      "test.cpp:4:note:i[2] is overwritten\n", errout.str());
+        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());
 
         check("void f(int x) {\n"
               "    int i[10];\n"
@@ -8614,30 +10059,30 @@ class TestOther : public TestFixture {
               "    x=1;\n"
               "    i[x] = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const int x) {\n"
               "    int i[10];\n"
               "    i[x] = 1;\n"
               "    i[x] = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'i[x]' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:i[x] is assigned\n"
-                      "test.cpp:4:note:i[x] is overwritten\n", errout.str());
+        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());
 
         // Testing different types
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
               "    bar = y;\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("void f() {\n"
               "    Foo& bar = foo();\n" // #4425. bar might refer to something global, etc.
@@ -8645,7 +10090,7 @@ class TestOther : public TestFixture {
               "    foo();\n"
               "    bar = y();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Tests with function call between assignment
         check("void f(int i) {\n"
@@ -8653,9 +10098,9 @@ class TestOther : public TestFixture {
               "    bar();\n"
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'i' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:2:note:i is assigned\n"
-                      "test.cpp:4:note:i is overwritten\n", errout.str());
+        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());
 
         check("int i;\n"
               "void f() {\n"
@@ -8663,7 +10108,7 @@ class TestOther : public TestFixture {
               "    bar();\n" // Global variable might be accessed in bar()
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static int i;\n"
@@ -8671,7 +10116,7 @@ class TestOther : public TestFixture {
               "    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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int i;\n"
@@ -8679,9 +10124,9 @@ class TestOther : public TestFixture {
               "    bar();\n"
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:5:style:Variable 'i' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:i is assigned\n"
-                      "test.cpp:5:note:i is overwritten\n", errout.str());
+        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());
 
         check("void bar(int i) {}\n"
               "void f(int i) {\n"
@@ -8689,14 +10134,14 @@ class TestOther : public TestFixture {
               "    bar(i);\n" // Passed as argument
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    Foo bar = foo();\n"
               "    bar();\n" // #5568. operator() called
               "    bar = y();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Branch tests
         check("void f(int i) {\n"
@@ -8704,7 +10149,7 @@ class TestOther : public TestFixture {
               "    if(x)\n"
               "        i = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i) {\n"
               "    if(x)\n"
@@ -8712,9 +10157,9 @@ class TestOther : public TestFixture {
               "    i = 1;\n"
               "    i = 2;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:5:style:Variable 'i' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:4:note:i is assigned\n"
-                      "test.cpp:5:note:i is overwritten\n", errout.str());
+        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());
 
         // #4513
         check("int x;\n"
@@ -8725,7 +10170,7 @@ class TestOther : public TestFixture {
               "    x = 2;\n"
               "    x = g();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int g() {\n"
               "    return x*x;\n"
@@ -8734,16 +10179,16 @@ class TestOther : public TestFixture {
               "    x = 2;\n"
               "    x = g();\n"
               "}");
-        ASSERT_EQUALS("test.cpp:6:style:Variable 'x' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:5:note:x is assigned\n"
-                      "test.cpp:6:note:x is overwritten\n", errout.str());
+        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());
 
         check("void f() {\n"
               "    Foo& bar = foo();\n"
               "    bar = x;\n"
               "    bar = y();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
               "    int x;\n"
@@ -8755,7 +10200,7 @@ class TestOther : public TestFixture {
               "    x = 2;\n"
               "    x = g();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
               "    int x;\n"
@@ -8767,7 +10212,7 @@ class TestOther : public TestFixture {
               "    x = 2;\n"
               "    x = z.g();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ({ })
         check("void f() {\n"
@@ -8775,7 +10220,7 @@ class TestOther : public TestFixture {
               "  x = 321;\n"
               "  x = ({ asm(123); })\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // from #3103 (avoid a false negative)
         check("int foo(){\n"
@@ -8784,9 +10229,9 @@ class TestOther : public TestFixture {
               "    x = 1;\n"
               "    return x + 1;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'x' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:x is assigned\n"
-                      "test.cpp:4:note:x is overwritten\n", errout.str());
+        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());
 
         // from #3103 (avoid a false positive)
         check("int foo(){\n"
@@ -8796,27 +10241,31 @@ class TestOther : public TestFixture {
               "        x = 2;\n"
               "    return x + 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  state_t *x = NULL;\n"
               "  x = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:12]: style: Variable 'x' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("void f() {\n"
               "  state_t *x;\n"
               "  x = NULL;\n"
               "  x = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:12]: style: Variable 'x' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("int foo() {\n" // #4420
               "    int x;\n"
@@ -8824,7 +10273,7 @@ class TestOther : public TestFixture {
               "    x = 5;\n"
               "    return bar(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // struct member..
         check("struct AB { int a; int b; };\n"
@@ -8835,9 +10284,9 @@ class TestOther : public TestFixture {
               "    ab.a = 2;\n"
               "    return ab.a;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:6:style:Variable 'ab.a' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:5:note:ab.a is assigned\n"
-                      "test.cpp:6:note:ab.a is overwritten\n", errout.str());
+        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());
 
         check("struct AB { int a; int b; };\n"
               "\n"
@@ -8847,7 +10296,7 @@ class TestOther : public TestFixture {
               "    ab = do_something();\n"
               "    return ab.a;\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         check("struct AB { int a; int b; };\n"
               "\n"
@@ -8858,7 +10307,7 @@ class TestOther : public TestFixture {
               "    ab.a = 2;\n"
               "    return ab.a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
               "\n"
@@ -8869,7 +10318,7 @@ class TestOther : public TestFixture {
               "    ab.a = 2;\n"
               "    return ab.a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
               "\n"
@@ -8880,7 +10329,7 @@ class TestOther : public TestFixture {
               "    ab->a = 1;\n"
               "    ab->b = 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct AB { int a; int b; };\n"
               "\n"
@@ -8891,20 +10340,20 @@ class TestOther : public TestFixture {
               "    ab->a = 1;\n"
               "    ab->b = 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(struct AB *ab) {\n" // #
               "    ab->data->x = 1;\n"
               "    ab = &ab1;\n"
               "    ab->data->x = 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // don't crash
         check("struct data {\n"
@@ -8924,7 +10373,7 @@ class TestOther : public TestFixture {
               "    asm(\"foo\");\n"
               "    i = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6555
         check("void foo() {\n"
@@ -8937,7 +10386,7 @@ class TestOther : public TestFixture {
               "        barney(p);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    char *p = 0;\n"
@@ -8949,8 +10398,9 @@ class TestOther : public TestFixture {
               "        barney(x);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("test.cpp:2:style:The scope of the variable 'p' can be reduced.\n",
-                      errout.str());
+        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());
 
         check("void foo() {\n"
               "    char *p = 0;\n"
@@ -8964,7 +10414,7 @@ class TestOther : public TestFixture {
               "        barney(p);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Member variable pointers
         check("void podMemPtrs() {\n"
@@ -8974,9 +10424,9 @@ class TestOther : public TestFixture {
               "    if (memptr)\n"
               "        memptr = 0;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'memptr' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:memptr is assigned\n"
-                      "test.cpp:4:note:memptr is overwritten\n", errout.str());
+        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());
 
         // Pointer function argument (#3857)
         check("void f(float * var)\n"
@@ -8984,18 +10434,18 @@ class TestOther : public TestFixture {
               "  var[0] = 0.2f;\n"
               "  var[0] = 0.2f;\n" // <-- is initialized twice
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable 'var[0]' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:var[0] is assigned\n"
-                      "test.cpp:4:note:var[0] is overwritten\n", errout.str());
+        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());
 
         check("void f(float * var)\n"
               "{\n"
               "  *var = 0.2f;\n"
               "  *var = 0.2f;\n" // <-- is initialized twice
               "}");
-        ASSERT_EQUALS("test.cpp:4:style:Variable '*var' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:3:note:*var is assigned\n"
-                      "test.cpp:4:note:*var is overwritten\n", errout.str());
+        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());
 
         // Volatile variables
         check("void f() {\n"
@@ -9003,16 +10453,16 @@ class TestOther : public TestFixture {
               "  *reg = 12;\n"
               "  *reg = 34;\n"
               "}");
-        ASSERT_EQUALS("test.cpp:2:style:C-style pointer casting\n", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<int, int>& m, int key, int value) {\n" // #6379
               "    m[key] = value;\n"
               "    m[key] = value;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:3:style:Variable 'm[key]' is reassigned a value before the old one has been used.\n"
-                      "test.cpp:2:note:m[key] is assigned\n"
-                      "test.cpp:3:note:m[key] is overwritten\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: style: Variable 'm[key]' is reassigned a value before the old one has been used. [redundantAssignment]\n"
+                      "[test.cpp:2:12]: note: m[key] is assigned\n"
+                      "[test.cpp:3:12]: note: m[key] is overwritten\n",
+                      errout_str());
     }
 
     void redundantVarAssignment_trivial() {
@@ -9020,35 +10470,39 @@ class TestOther : public TestFixture {
               "   int a = 0;\n"
               "   a = 4;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   int a;\n"
               "   a = 0;\n"
               "   a = 4;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   unsigned a;\n"
               "   a = 0u;\n"
               "   a = 2u;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "   void* a;\n"
               "   a = (void*)0;\n"
               "   a = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:10]: (style) Variable 'a' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("void f() {\n"
               "   void* a;\n"
               "   a = (void*)0U;\n"
               "   a = p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:10]: (style) Variable 'a' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
     }
 
     void redundantVarAssignment_struct() {
@@ -9061,7 +10515,7 @@ class TestOther : public TestFixture {
               "  x.a = _mm_set1_ps(1.0);\n"
               "  x.a = _mm_set1_ps(2.0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:8]: (style) Variable 'x.a' is reassigned a value before the old one has been used.\n", errout.str());
+        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"
               "  struct AB ab;\n"
@@ -9069,13 +10523,117 @@ class TestOther : public TestFixture {
               "  ab.y = 41;\n"
               "  ab.x = 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (style) Variable 'ab.x' is reassigned a value before the old one has been used.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void redundantVarAssignment_union() {
+        // Ticket #5115 "redundantAssignment when using a union"
+        check("void main(void)\n"
+              "{\n"
+              "    short lTotal = 0;\n"
+              "    union\n"
+              "    {\n"
+              "        short l1;\n"
+              "        struct\n"
+              "        {\n"
+              "            unsigned char b1;\n"
+              "            unsigned char b2;\n"
+              "        } b;\n"
+              "    } u;\n"
+              "    u.l1 = 1;\n"
+              "    lTotal += u.b.b1;\n"
+              "    u.l1 = 2;\n" //Should not show RedundantAssignment
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
+
+        // Ticket #5115 "redundantAssignment when using a union"
+        check("void main(void)\n"
+              "{\n"
+              "    short lTotal = 0;\n"
+              "    union\n"
+              "    {\n"
+              "        short l1;\n"
+              "        struct\n"
+              "        {\n"
+              "            unsigned char b1;\n"
+              "            unsigned char b2;\n"
+              "        } b;\n"
+              "    } u;\n"
+              "    u.l1 = 1;\n"
+              "    u.l1 = 2;\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"
+        check("typedef union fixed32_union {\n"
+              "    struct {\n"
+              "        unsigned32 abcd;\n"
+              "    } u32;\n"
+              "    struct {\n"
+              "        unsigned16 ab;\n"
+              "        unsigned16 cd;\n"
+              "    } u16;"
+              "    struct {\n"
+              "        unsigned8 a;\n"
+              "        unsigned8 b;\n"
+              "        unsigned8 c;\n"
+              "        unsigned8 d;\n"
+              "        } b;\n"
+              "} fixed32;\n"
+              "void func1(void) {\n"
+              "    fixed32 m;\n"
+              "    m.u16.ab = 47;\n"
+              "    m.u16.cd = 0;\n"
+              "    m.u16.ab = m.u32.abcd / 53;\n"
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
+
+        // Ticket #10093 "redundantAssignment when using a union"
+        check("typedef union{\n"
+              "    char as_char[4];\n"
+              "    int as_int;\n"
+              "} union_t;\n"
+              "void fn(char *data, int len) {\n"
+              "    int i;\n"
+              "    for (i = 0; i < len; i++)\n"
+              "        data[i] = 'a';\n"
+              "}\n"
+              "int main(int argc, char *argv[]) {\n"
+              "    union_t u;\n"
+              "    u.as_int = 42;\n"
+              "    fn(&u.as_char[0], 4);\n"
+              "    u.as_int = 0;\n"
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
+
+        // Ticket #5115 "redundantAssignment when using a union"
+        check("void foo(char *ptr) {\n"
+              "    union {\n"
+              "        char * s8;\n"
+              "        unsigned long long u64;\n"
+              "    } addr;\n"
+              "    addr.s8 = ptr;\n"
+              "    addr.u64 += 8;\n"
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12895
+              "    int x, y;\n"
+              "};\n"
+              "union U {\n"
+              "    S* s;\n"
+              "};\n"
+              "void f(const U& Src, const U& Dst) {\n"
+              "    Dst.s->x = Src.s->x;\n"
+              "    Dst.s->y = Src.s->y;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantVarAssignment_7133() {
@@ -9097,8 +10655,8 @@ class TestOther : public TestFixture {
               "   }\n"
               "   catch (const uno::Exception&)  {\n"
               "   }\n"
-              "}", "test.cpp", true);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("void ConvertBitmapData(sal_uInt16 nDestBits) {\n"
               "    BitmapBuffer aSrcBuf;\n"
@@ -9106,8 +10664,8 @@ class TestOther : public TestFixture {
               "    BitmapBuffer aDstBuf;\n"
               "    aSrcBuf.mnBitCount = nDestBits;\n"
               "    bConverted = ::ImplFastBitmapConversion( aDstBuf, aSrcBuf, aTwoRects );\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:3] -> [test.c:5]: (style) Variable 'aSrcBuf.mnBitCount' is reassigned a value before the old one has been used.\n", errout.str());
+              "}", 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"
               "    aSrcBuf.mnBitCount = nSrcBits;\n"
@@ -9115,8 +10673,8 @@ class TestOther : public TestFixture {
               "    aSrcBuf.mnBitCount = nDestBits;\n"
               "    bConverted = ::ImplFastBitmapConversion( aDstBuf, aSrcBuf, aTwoRects );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (style) Variable 'aSrcBuf.mnBitCount' is reassigned a value before the old one has been used.\n",
-                      errout.str());
+        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());
 
         check("class C { void operator=(int x); };\n" // #8368 - assignment operator might have side effects => inconclusive
               "void f() {\n"
@@ -9124,7 +10682,7 @@ class TestOther : public TestFixture {
               "    c = x;\n"
               "    c = x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5]: (style, inconclusive) Variable 'c' is reassigned a value before the old one has been used if variable is no semaphore variable.\n", errout.str());
+        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());
     }
 
     void redundantVarAssignment_stackoverflow() {
@@ -9138,7 +10696,7 @@ class TestOther : public TestFixture {
               "    m->next->prev = m->prev;\n"
               "    return m->next;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantVarAssignment_lambda() {
@@ -9152,7 +10710,7 @@ class TestOther : public TestFixture {
               "    f();\n"
               "    return y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10228
         check("std::tuple<int, int> g();\n"
@@ -9161,7 +10719,7 @@ class TestOther : public TestFixture {
               "    auto [a, b] = g();\n"
               "    auto l = [a = a]() { h(i); };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantVarAssignment_loop() {
@@ -9172,7 +10730,7 @@ class TestOther : public TestFixture {
               "        buf[i] = 131;\n"
               "    buf[i] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void bar() {\n" // #9262 do-while with break
               "    int x = 0;\n"
@@ -9182,20 +10740,20 @@ class TestOther : public TestFixture {
               "        x = 1;\n"
               "     } while (false);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void redundantVarAssignment_after_switch() {
@@ -9208,7 +10766,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "    ret = 3;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:8]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n", errout.str());
+        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());
     }
 
     void redundantVarAssignment_pointer() {
@@ -9218,7 +10776,7 @@ class TestOther : public TestFixture {
               "    foo(ptr);\n"
               "    *x = 32;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8997
         check("void f() {\n"
@@ -9228,7 +10786,7 @@ class TestOther : public TestFixture {
               "  p += 1;\n"
               "  *p = 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantVarAssignment_pointer_parameter() {
@@ -9237,7 +10795,7 @@ class TestOther : public TestFixture {
               "    if (condition) return;\n"
               "    *p = 2;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantVarAssignment_array() {
@@ -9249,7 +10807,7 @@ class TestOther : public TestFixture {
               "    arr[i] = 3;\n"
               "    dostuff(arr);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantVarAssignment_switch_break() {
@@ -9265,7 +10823,7 @@ class TestOther : public TestFixture {
               "    }"
               "    return ret;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "    int ret = 0;\n"
@@ -9277,7 +10835,7 @@ class TestOther : public TestFixture {
               "        break;\n"
               "    }"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:7]: (style) Variable 'ret' is reassigned a value before the old one has been used.\n", errout.str());
+        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());
     }
 
     void redundantInitialization() {
@@ -9287,80 +10845,80 @@ class TestOther : public TestFixture {
               "    int err = -ENOMEM;\n"
               "    err = dostuff();\n"
               "}");
-        ASSERT_EQUALS("test.cpp:3:style:Redundant initialization for 'err'. The initialized value is overwritten before it is read.\n"
-                      "test.cpp:2:note:err is initialized\n"
-                      "test.cpp:3:note:err is overwritten\n",
-                      errout.str());
+        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",
+                      errout_str());
 
         check("void f() {\n"
               "    struct S s = {1,2,3};\n"
               "    s = dostuff();\n"
               "}");
-        ASSERT_EQUALS("test.cpp:3:style:Redundant initialization for 's'. The initialized value is overwritten before it is read.\n"
-                      "test.cpp:2:note:s is initialized\n"
-                      "test.cpp:3:note:s is overwritten\n",
-                      errout.str());
+        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",
+                      errout_str());
 
         check("void f() {\n"
               "    int *p = NULL;\n"
               "    p = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:10]: style: Variable 'p' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         // "trivial" initialization => do not warn
         check("void f() {\n"
               "    struct S s = {0};\n"
               "    s = dostuff();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #10143
               "    std::shared_ptr<int> i = g();\n"
               "    h();\n"
               "    i = nullptr;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<int>& v) {\n" // #9815
               "    int i = g();\n"
               "    i = std::distance(v.begin(), std::find_if(v.begin(), v.end(), [=](int j) { return i == j; }));\n"
               "    return i;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
+    // cppcheck-suppress unusedPrivateFunction
     void redundantMemWrite() {
-        return; // FIXME: temporary hack
-
         // 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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout.str());
+        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"
               "    char *p = strrchr(filename,'.');\n"
@@ -9368,14 +10926,14 @@ class TestOther : public TestFixture {
               "    dostuff(filename);\n"
               "    strcpy(p, \"foo\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Use variable as second argument
         check("void f(void* a, void* b) {\n"
@@ -9383,7 +10941,7 @@ class TestOther : public TestFixture {
               "    memcpy(b, a, 5);\n"
               "    memset(a, 1, 5);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // strcat is special
         check("void f() {\n"
@@ -9392,7 +10950,7 @@ class TestOther : public TestFixture {
               "    strcat(a, bar);\n" // Not redundant
               "    strcpy(a, x);\n" // Redundant
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (performance) Buffer 'a' is being written before its old content has been used.\n", errout.str());
+        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
         check("void f() {\n"
@@ -9401,7 +10959,7 @@ class TestOther : public TestFixture {
               "    bar();\n"
               "    memset(a, 0, size);\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());
+        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"
               "void f() {\n"
@@ -9409,7 +10967,7 @@ class TestOther : public TestFixture {
               "    bar();\n" // Global variable might be accessed in bar()
               "    memset(a, 0, size);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char a[10];\n"
@@ -9417,7 +10975,7 @@ class TestOther : public TestFixture {
               "    bar();\n"
               "    memset(a, 0, size);\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());
+        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"
               "void f(void* a) {\n"
@@ -9425,7 +10983,7 @@ class TestOther : public TestFixture {
               "    bar(a);\n" // Passed as argument
               "    memset(a, 0, size);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Branch tests
         check("void f(void* a) {\n"
@@ -9433,7 +10991,7 @@ class TestOther : public TestFixture {
               "    if(x)\n"
               "        memset(a, 0, size);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4455 - initialization of local buffer
         check("void f(void) {"
@@ -9441,14 +10999,14 @@ class TestOther : public TestFixture {
               "    memset(buf, 0, 10);\n"
               "    strcpy(buf, string);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "    char buf[10] = {0};\n"
               "    memset(buf, 0, 10);\n"
               "    strcpy(buf, string);\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());
+        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
         check("int f(void* a) {\n"
@@ -9456,7 +11014,7 @@ class TestOther : public TestFixture {
               "    strncpy(a, 0, bar);\n"
               "    return i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7175 - read+write
         check("void f() {\n"
@@ -9465,7 +11023,7 @@ class TestOther : public TestFixture {
               "    strcpy(buf, dostuff(buf));\n" // <- read + write
               "    strcpy(buf, x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char buf[100];\n"
@@ -9473,17 +11031,80 @@ class TestOther : public TestFixture {
               "    strcpy(buf, dostuff(buf));\n"
               "    strcpy(buf, x);\n"
               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
+    }
+
+    void redundantAssignmentSameValue() {
+        check("int main() {\n" // #11642
+              "    int a = 0;\n"
+              "    int b = a;\n"
+              "    int c = 1;\n"
+              "    a = b;\n"
+              "    return a * b * c;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:5:5]: (style) Variable 'a' is assigned an expression that holds the same value. [redundantAssignment]\n", errout_str());
+
+        check("int main() {\n"
+              "    int a = 0;\n"
+              "    int b = a;\n"
+              "    int c = 1;\n"
+              "    a = b + 1;\n"
+              "    return a * b * c;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int main() {\n"
+              "    int a = 0;\n"
+              "    int b = a;\n"
+              "    int c = 1;\n"
+              "    a = b = 5;\n"
+              "    return a * b * c;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11] -> [test.cpp:5:11]: (style) Redundant initialization for 'b'. The initialized value is overwritten before it is read. [redundantInitialization]\n", errout_str());
+
+        check("int f(int i) {\n" // #12874
+              "    int j = i + 1;\n"
+              "    if (i > 5)\n"
+              "        j = i;\n"
+              "    return j;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12894
+              "    std::string a;\n"
+              "    void f(const S& s);\n"
+              "    void g(const S& s);\n"
+              "};\n"
+              "void S::f(const S& s) {\n"
+              "    std::string x = a;\n"
+              "    this->operator=(s);\n"
+              "    a = x;\n"
+              "}\n"
+              "void S::g(const S& s) {\n"
+              "    std::string x = a;\n"
+              "    operator=(s);\n"
+              "    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: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); }");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Passing NULL after the last typed argument to a variadic function leads to undefined behaviour.\n", errout.str());
+        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); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkCastIntToCharAndBack() { // #160
@@ -9497,7 +11118,7 @@ class TestOther : public TestFixture {
               "    c = getchar();\n"
               "  } ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Storing getchar() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "unsigned char c = getchar();\n"
@@ -9506,7 +11127,7 @@ class TestOther : public TestFixture {
               "    bar(c);\n"
               "  } ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Storing getchar() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "  unsigned char c; c = getchar();\n"
@@ -9516,7 +11137,7 @@ class TestOther : public TestFixture {
               "    c = getchar();\n"
               "  } ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Storing getchar() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "  unsigned char c;\n"
@@ -9524,7 +11145,7 @@ class TestOther : public TestFixture {
               "  {\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Storing getchar() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "  int i; i = getchar();\n"
@@ -9534,7 +11155,7 @@ class TestOther : public TestFixture {
               "    i = getchar();\n"
               "  } ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int i; i = getchar();\n"
@@ -9544,7 +11165,7 @@ class TestOther : public TestFixture {
               "    i = getchar();\n"
               "  } ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         // check getc
@@ -9552,33 +11173,33 @@ class TestOther : public TestFixture {
               "unsigned char c;\n"
               "do {\n"
               "  c = getc (pFile);\n"
-              "} while (c != EOF)"
+              "} while (c != EOF);"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Storing getc() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "unsigned char c;\n"
               "do {\n"
               "  c = getc (pFile);\n"
-              "} while (EOF != c)"
+              "} while (EOF != c);"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Storing getc() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "int i;\n"
               "do {\n"
               "  i = getc (pFile);\n"
-              "} while (i != EOF)"
+              "} while (i != EOF);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
               "int i;\n"
               "do {\n"
               "  i = getc (pFile);\n"
-              "} while (EOF != i)"
+              "} while (EOF != i);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         // check fgetc
@@ -9586,41 +11207,41 @@ class TestOther : public TestFixture {
               "unsigned char c;\n"
               "do {\n"
               "  c = fgetc (pFile);\n"
-              "} while (c != EOF)"
+              "} while (c != EOF);"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Storing fgetc() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "char c;\n"
               "do {\n"
               "  c = fgetc (pFile);\n"
-              "} while (EOF != c)"
+              "} while (EOF != c);"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Storing fgetc() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "signed char c;\n"
               "do {\n"
               "  c = fgetc (pFile);\n"
-              "} while (EOF != c)"
+              "} while (EOF != c);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
               "int i;\n"
               "do {\n"
               "  i = fgetc (pFile);\n"
-              "} while (i != EOF)"
+              "} while (i != EOF);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f (FILE * pFile){\n"
               "int i;\n"
               "do {\n"
               "  i = fgetc (pFile);\n"
-              "} while (EOF != i)"
+              "} while (EOF != i);"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // cin.get()
         check("void f(){\n"
@@ -9630,7 +11251,7 @@ class TestOther : public TestFixture {
               "        ch = std::cin.get();\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Storing cin.get() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "   char ch; ch = std::cin.get();\n"
@@ -9639,7 +11260,7 @@ class TestOther : public TestFixture {
               "        ch = std::cin.get();\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Storing cin.get() return value in char variable and then comparing with EOF.\n", errout.str());
+        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"
               "   int i; i = std::cin.get();\n"
@@ -9648,7 +11269,7 @@ class TestOther : public TestFixture {
               "        i = std::cin.get();\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(){\n"
               "   int i; i = std::cin.get();\n"
@@ -9657,7 +11278,7 @@ class TestOther : public TestFixture {
               "        i = std::cin.get();\n"
               "   }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkCommaSeparatedReturn() {
@@ -9665,33 +11286,33 @@ class TestOther : public TestFixture {
               "  if (a < 0)\n"
               "    return a++,\n"
               "  do_something();\n"
-              "}", nullptr, false, 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());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", 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"
-              "}", nullptr, false, 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());
+              "}", 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"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("int fun(int a) {\n"
               "  if (a < 0)\n"
               "    return c<int,\nint>::b;\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #4943 take care of C++11 initializer lists
         check("std::vector<Foo> Bar() {\n"
@@ -9701,8 +11322,8 @@ class TestOther : public TestFixture {
               "        { \"2\" },\n"
               "        { \"3\" }\n"
               "    };\n"
-              "}", nullptr, false, false);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkPassByReference() {
@@ -9717,8 +11338,8 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a(std::move(a)) {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", nullptr, false, true);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
               "{\n"
@@ -9730,8 +11351,8 @@ class TestOther : public TestFixture {
               "    explicit B(A a) : a{std::move(a)} {}\n"
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
-              "};", nullptr, false, true);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
               "{\n"
@@ -9744,8 +11365,8 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", nullptr, false, true);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A\n"
               "{\n"
@@ -9758,8 +11379,8 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", nullptr, false, true);
-        ASSERT_EQUALS("[test.cpp:8]: (performance) Function parameter 'a2' should be passed by const reference.\n", errout.str());
+              "};", 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"
               "{\n"
@@ -9772,12 +11393,51 @@ class TestOther : public TestFixture {
               "    void Init(A _a) { a = std::move(_a); }\n"
               "    A a;"
               "    A a2;"
-              "};", nullptr, false, true);
-        ASSERT_EQUALS("[test.cpp:8]: (performance) Function parameter 'a2' should be passed by const reference.\n", errout.str());
+              "};", 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) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("int (*pf) (std::vector<int>) = nullptr;\n" // #12118
+              "int f(std::vector<int> v) {\n"
+              "    return v.size();\n"
+              "}\n"
+              "void g() {\n"
+              "    pf = f;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:10] -> [test.cpp:2:24]: (performance) Function parameter 'v' should be passed by const reference. However it seems that 'f' is a callback function. [passedByValueCallback]\n",
+                      errout_str());
+
+        check("template<typename T> struct A;\n" // #12621
+              "template<typename T>\n"
+              "struct B { A<T> a; };\n"
+              "template<typename T>\n"
+              "struct A { B<T> b; };\n"
+              "template<typename T>\n"
+              "struct C : public virtual A<T>, public virtual B<T> {\n"
+              "    A<T> x;\n"
+              "    B<T> y;\n"
+              "    C(A<T> x_, B<T> y_) : x(x_), y(y_) {}\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
+        check("template <typename T, int N>\n" // #13537
+              "    struct S {\n"
+              "    T a[N];\n"
+              "};\n"
+              "void f(S<char, 3> s) {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        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() {
@@ -9785,33 +11445,33 @@ class TestOther : public TestFixture {
         check("bool f(int x){\n"
               "   return isless(x,x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of two identical variables with isless(x,x) always evaluates to false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of two identical variables with isgreater(x,x) always evaluates to false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of two identical variables with islessgreater(x,x) always evaluates to false.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of two identical variables with islessequal(x,x) always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Comparison of two identical variables with isgreaterequal(x,x) always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void integerOverflow() { // 5895
@@ -9819,102 +11479,102 @@ class TestOther : public TestFixture {
         check("void f(unsigned long long ull) {\n"
               "    if (ull == 0x89504e470d0a1a0a || ull == 0x8a4d4e470d0a1a0a) ;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantPointerOp() {
         check("int *f(int *x) {\n"
               "    return &*x;\n"
-              "}\n", nullptr, true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'x' - it's already a pointer.\n", errout.str());
+              "}\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", nullptr, true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'y' - it's already a pointer.\n", errout.str());
+              "}\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
               "    int value = 4;\n"
               "    int result1 = *(&value);\n"
               "    int result2 = *&value;\n"
               "    return result1 + result2;\n"
-              "}\n", nullptr, true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Redundant pointer operation on 'value' - it's already a variable.\n"
-                      "[test.cpp:4]: (style) Redundant pointer operation on 'value' - it's already a variable.\n",
-                      errout.str());
+              "}\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", nullptr, true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'a' - it's already a variable.\n",
-                      errout.str());
+              "}\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", nullptr, true);
-        ASSERT_EQUALS("", errout.str());
+        check("void f(int**& p) {}\n");
+        ASSERT_EQUALS("", errout_str());
 
         checkP("#define	RESTORE(ORIG, COPY) { *ORIG = *COPY; }\n"
                "void f(int* p, int i) {\n"
                "    RESTORE(p, &i);\n"
                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // no warning for bitwise AND
         check("void f(const int *b) {\n"
               "    int x = 0x20 & *b;\n"
-              "}\n", nullptr, true);
-        ASSERT_EQUALS("", errout.str());
+              "}\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", nullptr, true);
-        ASSERT_EQUALS("", errout.str());
+              "}\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", nullptr, true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         // double pointer to array
         check("void f(char **ptr) {\n"
               "    int *x = &(*ptr)[10];\n"
-              "}\n", nullptr, true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' can be declared as pointer to const\n", errout.str());
+              "}\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", nullptr, false);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'mut' - it's already a pointer.\n", errout.str());
+              "}\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", nullptr, true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Redundant pointer operation on 'ptr' - it's already a pointer.\n", errout.str());
+              "}\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
         checkP("#define MUTEX_LOCK(m) pthread_mutex_lock(&(m))\n"
                "void f(struct mutex *mut) {\n"
                "    MUTEX_LOCK(*mut);\n"
                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkP("#define B(op)        bar(op)\n"
                "#define C(orf)       B(&orf)\n"
                "void foo(const int * pkey) {\n"
                "    C(*pkey);\n"
                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test_isSameExpression() { // see #5738
         check("bool isInUnoIncludeFile(StringRef name) {"
               "   return  name.startswith(SRCDIR \"/com/\") || name.startswith(SRCDIR \"/uno/\");\n"
-              "};", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.inconclusive = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void raceAfterInterlockedDecrement() {
@@ -9923,7 +11583,7 @@ class TestOther : public TestFixture {
                                   "    InterlockedDecrement(&counter);\n"
                                   "    whatever();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -9932,7 +11592,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -9940,7 +11600,7 @@ class TestOther : public TestFixture {
                                   "    if (!counter)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -9949,7 +11609,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -9958,7 +11618,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -9966,7 +11626,7 @@ class TestOther : public TestFixture {
                                   "    if (counter == 0)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -9974,7 +11634,7 @@ class TestOther : public TestFixture {
                                   "    if (0 == counter)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -9983,7 +11643,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy()\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -9992,7 +11652,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy()\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -10000,7 +11660,7 @@ class TestOther : public TestFixture {
                                   "    if (counter <= 0)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -10008,7 +11668,7 @@ class TestOther : public TestFixture {
                                   "    if (0 >= counter)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -10017,7 +11677,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10025,7 +11685,7 @@ class TestOther : public TestFixture {
                                   "    if (!newCount)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10034,7 +11694,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10043,7 +11703,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10051,7 +11711,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount == 0)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10059,7 +11719,7 @@ class TestOther : public TestFixture {
                                   "    if (0 == newCount)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10068,7 +11728,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy()\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10077,7 +11737,7 @@ class TestOther : public TestFixture {
                                   "        return;\n"
                                   "    destroy()\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10085,7 +11745,7 @@ class TestOther : public TestFixture {
                                   "    if (newCount <= 0)\n"
                                   "        destroy();\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("void f() {\n"
                                   "    int counter = 0;\n"
@@ -10093,7 +11753,7 @@ class TestOther : public TestFixture {
                                   "    if (0 >= newCount)\n"
                                   "        destroy;\n"
                                   "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkInterlockedDecrement("int f() {\n"
                                   "    int counter = 0;\n"
@@ -10104,7 +11764,7 @@ class TestOther : public TestFixture {
                                   "        return counter;\n"
                                   "    }\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -10115,7 +11775,7 @@ class TestOther : public TestFixture {
                                   "        return counter;\n"
                                   "    }\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
@@ -10126,7 +11786,7 @@ class TestOther : public TestFixture {
                                   "    }\n"
                                   "    return counter;\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -10136,7 +11796,7 @@ class TestOther : public TestFixture {
                                   "    }\n"
                                   "    return counter;\n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -10147,7 +11807,7 @@ class TestOther : public TestFixture {
                                   "        return counter;\n"
                                   "   \n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
                                   "    int counter = 0;\n"
@@ -10158,21 +11818,21 @@ class TestOther : public TestFixture {
                                   "        return counter;\n"
                                   "   \n"
                                   "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Race condition: non-interlocked access after InterlockedDecrement(). Use InterlockedDecrement() return value instead.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Label 'label' is not used.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    label:\n"
@@ -10182,28 +11842,28 @@ class TestOther : public TestFixture {
               "void g() {\n"
               "    label:\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Label 'label' is not used.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    class X {\n"
               "        protected:\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    class X {\n"
               "        my_protected:\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int test(char art) {\n"
               "    switch (art) {\n"
@@ -10215,8 +11875,8 @@ class TestOther : public TestFixture {
               "        return 2;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Label 'caseZERO' is not used. Should this be a 'case' of the enclosing switch()?\n"
-                      "[test.cpp:5]: (warning) Label 'case1' is not used. Should this be a 'case' of the enclosing switch()?\n", errout.str());
+        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());
 
         check("int test(char art) {\n"
               "    switch (art) {\n"
@@ -10225,60 +11885,128 @@ class TestOther : public TestFixture {
               "    }\n"
               "    label:\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Label 'label' is not used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (style) Label 'label' is not used. [unusedLabel]\n", errout_str());
+    }
+
+
+    void testUnusedLabelConfiguration() {
+        checkP("void f() {\n"
+               "#ifdef X\n"
+               "    goto END;\n"
+               "#endif\n"
+               "END:\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());
+    }
+
+    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"
+               "}");
+        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());
+    }
+
+    // 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) {
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        // Check..
+        runChecks<CheckOther>(tokenizer, this);
     }
 
     void testEvaluationOrder() {
         check("void f() {\n"
               "  int x = dostuff();\n"
               "  return x + x++;\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Expression 'x+x++' depends on order of evaluation of side effects\n", errout.str());
+              "}", 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"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("long int f1(const char *exp) {\n"
               "  return dostuff(++exp, exp, 10);\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:2]: (error) Expression '++exp,exp' depends on order of evaluation of side effects\n", errout.str());
+              "}", 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"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         // # 8717
         check("void f(int argc, char *const argv[]) {\n"
               "    char **local_argv = safe_malloc(sizeof (*local_argv));\n"
               "    int local_argc = 0;\n"
               "    local_argv[local_argc++] = argv[0];\n"
-              "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int x = 0;\n"
               "  return 0 + x++;\n"
-              "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Expression 'a[x+y]=a[y+x]++' depends on order of evaluation of side effects\n", errout.str());
+              "}\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"
+              "}");
+        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"
+              "}");
+        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"
+              "}");
+        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(settings0).cpp(Standards::CPP11).certainty(Certainty::inconclusive).build();
+
+        checkCustomSettings("void f(int i) {\n"
+                            "  i = i++ + 2;\n"
+                            "}", settings11);
+        ASSERT_EQUALS("[test.cpp:2:11]: (error) Expression 'i+++2' depends on order of evaluation of side effects [unknownEvaluationOrder]\n", errout_str());
     }
 
     void testEvaluationOrderSelfAssignment() {
         // self assignment
         check("void f() {\n"
               "  int x = x = y + 1;\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:2]: (warning) Redundant assignment of 'x' to itself.\n", errout.str());
+              "}", 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
+            errout_str());
     }
 
     void testEvaluationOrderMacro() {
@@ -10286,71 +12014,71 @@ class TestOther : public TestFixture {
         checkP("#define X x\n"
                "void f(int x) {\n"
                "  return x + X++;\n"
-               "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Expression 'x+x++' depends on order of evaluation of side effects\n", errout.str());
+               "}", 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());
     }
 
     void testEvaluationOrderSequencePointsFunctionCall() {
         // FP
         check("void f(int id) {\n"
               "  id = dostuff(id += 42);\n"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         // FN
         check("void f(int id) {\n"
               "  id = id + dostuff(id += 42);\n"
-              "}", "test.c");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void testEvaluationOrderSequencePointsComma() {
         check("int f(void) {\n"
               "  int t;\n"
               "  return (unsigned char)(t=1,t^c);\n"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void) {\n"
               "  int t;\n"
               "  dostuff(t=1,t^c);\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Expression 't=1,t^c' depends on order of evaluation of side effects\n", errout.str());
+              "}", 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"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         // #8230
         check("void hprf(const char* fp) {\n"
               "    do\n"
               "        ;\n"
               "    while (++fp, (*fp) <= 0177);\n"
-              "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}\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", "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Expression '++fp,(*fp)<=7' depends on order of evaluation of side effects\n", errout.str());
+              "}\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));"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testUnsignedLessThanZero() {
@@ -10368,10 +12096,10 @@ class TestOther : public TestFixture {
               "  if (0 > d.n) {\n"
               "    return;\n"
               "  }\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:8]: (style) Checking if unsigned expression 'd.n' is less than zero.\n"
-                      "[test.c:12]: (style) Checking if unsigned expression 'd.n' is less than zero.\n",
-                      errout.str());
+              "}", 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());
     }
 
     void doubleMove1() {
@@ -10381,7 +12109,7 @@ class TestOther : public TestFixture {
               "    g(std::move(a));\n"
               "    g(std::move(a));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Access of moved variable 'a'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:17]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
     void doubleMoveMemberInitialization1() {
@@ -10395,7 +12123,7 @@ class TestOther : public TestFixture {
               "    B b1;\n"
               "    B b2;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) Access of moved variable 'b'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:24]: (warning) Access of moved variable 'b'. [accessMoved]\n", errout_str());
     }
 
     void doubleMoveMemberInitialization2() {
@@ -10408,7 +12136,7 @@ class TestOther : public TestFixture {
               "    B b1;\n"
               "    B b2;\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Access of moved variable 'b'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:19]: (warning) Access of moved variable 'b'. [accessMoved]\n", errout_str());
     }
 
     void doubleMoveMemberInitialization3() { // #9974
@@ -10419,7 +12147,17 @@ class TestOther : public TestFixture {
               "    A a2 = { 2 };\n"
               "    return { .a1 = std::move(a1), .a2 = std::move(a2) };\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void doubleMoveMemberInitialization4() { // #11440
+        check("struct S { void f(int); };\n"
+              "struct T {\n"
+              "    T(int c, S&& d) : c{ c }, d{ std::move(d) } { d.f(c); }\n"
+              "    int c;\n"
+              "    S d;\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:3:51]: (warning, inconclusive) Access of moved variable 'd'. [accessMoved]\n", errout_str());
     }
 
     void moveAndAssign1() {
@@ -10429,7 +12167,7 @@ class TestOther : public TestFixture {
               "    a = g(std::move(a));\n"
               "    a = g(std::move(a));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moveAndAssign2() {
@@ -10439,7 +12177,7 @@ class TestOther : public TestFixture {
               "    B b = g(std::move(a));\n"
               "    C c = g(std::move(a));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Access of moved variable 'a'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
     void moveAssignMoveAssign() {
@@ -10455,8 +12193,8 @@ class TestOther : public TestFixture {
               "    a = b;\n"
               "    h(a);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Access of moved variable 'a'.\n"
-                      "[test.cpp:8]: (warning) Access of moved variable 'a'.\n", errout.str());
+        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());
     }
 
     void moveAndReset1() {
@@ -10466,7 +12204,7 @@ class TestOther : public TestFixture {
               "    a.reset(g(std::move(a)));\n"
               "    a.reset(g(std::move(a)));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moveAndReset2() {
@@ -10478,7 +12216,7 @@ class TestOther : public TestFixture {
               "    b.reset(g(std::move(a)));\n"
               "    c.reset(g(std::move(a)));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Access of moved variable 'a'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:25]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
     void moveResetMoveReset() {
@@ -10494,8 +12232,8 @@ class TestOther : public TestFixture {
               "    a.reset(b);\n"
               "    h(a);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Access of moved variable 'a'.\n"
-                      "[test.cpp:8]: (warning) Access of moved variable 'a'.\n", errout.str());
+        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());
     }
 
     void moveAndFunctionParameter() {
@@ -10506,8 +12244,8 @@ class TestOther : public TestFixture {
               "    g(a);\n"
               "    A c = a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Access of moved variable 'a'.\n"
-                      "[test.cpp:6]: (warning) Access of moved variable 'a'.\n", errout.str());
+        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());
     }
 
     void moveAndFunctionParameterReference() {
@@ -10518,7 +12256,7 @@ class TestOther : public TestFixture {
               "    g(a);\n"
               "    A c = a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moveAndFunctionParameterConstReference() {
@@ -10529,8 +12267,8 @@ class TestOther : public TestFixture {
               "    g(a);\n"
               "    A c = a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Access of moved variable 'a'.\n"
-                      "[test.cpp:6]: (warning) Access of moved variable 'a'.\n", errout.str());
+        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());
     }
 
     void moveAndFunctionParameterUnknown() {
@@ -10540,8 +12278,8 @@ class TestOther : public TestFixture {
               "    g(a);\n"
               "    A c = a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Access of moved variable 'a'.\n"
-                      "[test.cpp:5]: (warning, inconclusive) Access of moved variable 'a'.\n", errout.str());
+        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());
     }
 
     void moveAndReturn() {
@@ -10553,7 +12291,7 @@ class TestOther : public TestFixture {
               "        return g(std::move(b));\n"
               "    return h(std::move(a),std::move(b));\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Access of moved variable 'a'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:24]: (warning) Access of moved variable 'a'. [accessMoved]\n", errout_str());
     }
 
     void moveAndClear() {
@@ -10563,7 +12301,7 @@ class TestOther : public TestFixture {
               "    v.clear();\n"
               "    if (v.empty()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void movedPointer() {
@@ -10573,8 +12311,8 @@ class TestOther : public TestFixture {
               "    x = p->x;\n"
               "    y = p->y;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Access of moved variable 'p'.\n"
-                      "[test.cpp:5]: (warning) Access of moved variable 'p'.\n", errout.str());
+        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());
     }
 
     void moveAndAddressOf() {
@@ -10583,7 +12321,7 @@ class TestOther : public TestFixture {
               "    std::string s2 = std::move(s1);\n"
               "    p = &s1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void partiallyMoved() {
@@ -10592,7 +12330,7 @@ class TestOther : public TestFixture {
               "    gx(std::move(a).x());\n"
               "    gy(std::move(a).y());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moveAndLambda() {
@@ -10601,7 +12339,7 @@ class TestOther : public TestFixture {
               "    auto h = [a=std::move(a)](){return g(std::move(a));};"
               "    b = a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moveInLoop()
@@ -10612,7 +12350,7 @@ class TestOther : public TestFixture {
               "    while(true)\n"
               "        g(std::move(p));\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Access of moved variable 'p'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:21]: (warning) Access of moved variable 'p'. [accessMoved]\n", errout_str());
 
         check("std::list<int> g(std::list<int>&&);\n"
               "void f(std::list<int>l) {\n"
@@ -10620,7 +12358,7 @@ class TestOther : public TestFixture {
               "        for (auto &j : g(std::move(l))) { (void)j; }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Access of moved variable 'l'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:36]: (warning) Access of moved variable 'l'. [accessMoved]\n", errout_str());
     }
 
     void moveCallback()
@@ -10630,7 +12368,7 @@ class TestOther : public TestFixture {
               "    if(!f(std::move(callback)))\n"
               "        callback();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Access of moved variable 'callback'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (warning) Access of moved variable 'callback'. [accessMoved]\n", errout_str());
     }
 
     void moveClassVariable()
@@ -10645,18 +12383,16 @@ class TestOther : public TestFixture {
               "    D(std::unique_ptr<int> c) : m(std::move(c)) {}\n"
               "    std::unique_ptr<int> m;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void forwardAndUsed() {
-        Settings s = settingsBuilder().checkUnusedTemplates().build();
-
         check("template<typename T>\n"
               "void f(T && t) {\n"
               "    g(std::forward<T>(t));\n"
               "    T s = t;\n"
-              "}", &s);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Access of forwarded variable 't'.\n", errout.str());
+              "}");
+        ASSERT_EQUALS("[test.cpp:4:11]: (warning) Access of forwarded variable 't'. [accessForwarded]\n", errout_str());
     }
 
     void moveAndReference() { // #9791
@@ -10668,7 +12404,7 @@ class TestOther : public TestFixture {
               "    g(std::move(s));\n"
               "    h(r);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (warning) Access of moved variable 'r'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:7]: (warning) Access of moved variable 'r'. [accessMoved]\n", errout_str());
     }
 
     void moveForRange()
@@ -10680,7 +12416,47 @@ class TestOther : public TestFixture {
               "    cif::category mCategory;\n"
               "    cif::condition mWhere;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void moveTernary()
+    {
+        check("void gA(std::string);\n" // #12174
+              "void gB(std::string);\n"
+              "void f(bool b) {\n"
+              "    std::string s = \"abc\";\n"
+              "    b ? gA(std::move(s)) : gB(std::move(s));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int gA(std::string);\n"
+              "int gB(std::string);\n"
+              "void h(int);\n"
+              "void f(bool b) {\n"
+              "    std::string s = \"abc\";\n"
+              "    h(b ? gA(std::move(s)) : gB(std::move(s)));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int gA(int, std::string);\n"
+              "int gB(int, std::string);\n"
+              "int h(int);\n"
+              "void f(bool b) {\n"
+              "    std::string s = \"abc\";\n"
+              "    h(b ? h(gA(5, std::move(s))) : h(gB(7, std::move(s))));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void movePointerAlias()
+    {
+        check("void f() {\n"
+              "    std::string s;\n"
+              "    std::string s1 = std::move(s);\n"
+              "    const std::string* s_p = &s;\n"
+              "    s_p->size();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:8]: (warning) Access of moved variable '.'. [accessMoved]\n", errout_str());
     }
 
     void funcArgNamesDifferent() {
@@ -10698,15 +12474,15 @@ class TestOther : public TestFixture {
               "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) { }");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style, inconclusive) Function 'func2' argument 1 names different: declaration 'a' definition 'A'.\n"
-                      "[test.cpp:3] -> [test.cpp:4]: (style, inconclusive) Function 'func2' argument 2 names different: declaration 'b' definition 'B'.\n"
-                      "[test.cpp:3] -> [test.cpp:4]: (style, inconclusive) Function 'func2' argument 3 names different: declaration 'c' definition 'C'.\n"
-                      "[test.cpp:7] -> [test.cpp:12]: (style, inconclusive) Function 'func2' argument 1 names different: declaration 'a' definition 'A'.\n"
-                      "[test.cpp:7] -> [test.cpp:12]: (style, inconclusive) Function 'func2' argument 2 names different: declaration 'b' definition 'B'.\n"
-                      "[test.cpp:7] -> [test.cpp:12]: (style, inconclusive) Function 'func2' argument 3 names different: declaration 'c' definition 'C'.\n"
-                      "[test.cpp:9] -> [test.cpp:14]: (style, inconclusive) Function 'func4' argument 1 names different: declaration 'a' definition 'A'.\n"
-                      "[test.cpp:9] -> [test.cpp:14]: (style, inconclusive) Function 'func4' argument 2 names different: declaration 'b' definition 'B'.\n"
-                      "[test.cpp:9] -> [test.cpp:14]: (style, inconclusive) Function 'func4' argument 3 names different: declaration 'c' definition 'C'.\n", errout.str());
+        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"
+                      "[test.cpp:7:20] -> [test.cpp:12:22]: (style, inconclusive) Function 'func2' argument 1 names different: declaration 'a' definition 'A'. [funcArgNamesDifferent]\n"
+                      "[test.cpp:7:27] -> [test.cpp:12:29]: (style, inconclusive) Function 'func2' argument 2 names different: declaration 'b' definition 'B'. [funcArgNamesDifferent]\n"
+                      "[test.cpp:7:34] -> [test.cpp:12:36]: (style, inconclusive) Function 'func2' argument 3 names different: declaration 'c' definition 'C'. [funcArgNamesDifferent]\n"
+                      "[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());
     }
 
     void funcArgOrderDifferent() {
@@ -10726,12 +12502,12 @@ 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",
-              nullptr, false);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a'\n"
-                      "[test.cpp:5] -> [test.cpp:6]: (warning) Function 'func3' argument order different: declaration ', b, c' definition 'c, b, a'\n"
-                      "[test.cpp:9] -> [test.cpp:14]: (warning) Function 'func2' argument order different: declaration 'a, b, c' definition 'c, b, a'\n"
-                      "[test.cpp:10] -> [test.cpp:15]: (warning) Function 'func3' argument order different: declaration 'a, b, c' definition 'c, b, a'\n"
-                      "[test.cpp:11] -> [test.cpp:16]: (warning) Function 'func4' argument order different: declaration ', b, c' definition 'c, b, a'\n", errout.str());
+              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());
     }
 
     // #7846 - Syntax error when using C++11 braced-initializer in default argument
@@ -10741,46 +12517,46 @@ class TestOther : public TestFixture {
                               "\n   for (int i = 0; i < 10; i++) {}\n"
                               "\n }"
                               "\n  "));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void shadowVariables() {
         check("int x;\n"
               "void f() { int x; }");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2]: (style) Local variable \'x\' shadows outer variable\n", errout.str());
+        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; }");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2]: (style) Local variable \'x\' shadows outer function\n", errout.str());
+        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"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  if (cond) {int x;}\n" // <- not a shadow variable
               "  int x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int size() {\n"
               "  int size;\n" // <- not a shadow variable
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #8954 - lambda
               "  int x;\n"
               "  auto f = [](){ int x; }"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x) { int x; }");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Local variable 'x' shadows outer argument\n", errout.str());
+        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
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct C {\n" // #10091 - shadow destructor
               "    ~C();\n"
@@ -10789,7 +12565,7 @@ class TestOther : public TestFixture {
               "    }\n"
               "};\n"
               "C::~C() = default;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // 10752 - no
         check("struct S {\n"
@@ -10800,20 +12576,20 @@ class TestOther : public TestFixture {
               "        return i;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    int i{};\n"
               "    void f() { int i; }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (style) Local variable 'i' shadows outer variable\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:20]: (style) Local variable 'i' shadows outer variable [shadowVariable]\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] -> [test.cpp:4]: (style) Local variable 'i' shadows outer variable\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:4:38]: (style) Local variable 'i' shadows outer variable [shadowVariable]\n", errout_str());
 
         check("struct S {\n" // #10405
               "    F* f{};\n"
@@ -10823,15 +12599,28 @@ class TestOther : public TestFixture {
               "void S::f() const {\n"
               "    for (const F& f : fl) {}\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:7]: (style) Local variable 'f' shadows outer variable\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:8] -> [test.cpp:7:19]: (style) Local variable 'f' shadows outer variable [shadowVariable]\n", errout_str());
 
         check("extern int a;\n"
               "int a;\n"
               "static int f(void) {\n"
               "    int a;\n"
               "    return 0;\n"
-              "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:1] -> [test.c:4]: (style) Local variable 'a' shadows outer variable\n", errout.str());
+              "}\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
+              "    int g = 0;\n"
+              "    return g;\n"
+              "}\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());
     }
 
     void knownArgument() {
@@ -10839,77 +12628,85 @@ class TestOther : public TestFixture {
               "void f(int x) {\n"
               "   g((x & 0x01) >> 7);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Argument '(x&0x01)>>7' to function g is always 0. It does not matter what value 'x' has.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Argument '(int)((x&0x01)>>7)' to function g is always 0. It does not matter what value 'x' has.\n", errout.str());
+        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"
+              "}");
+        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());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g(0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void h() { return 1; }\n"
               "void f(int x) {\n"
               "    g(h());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g(std::strlen(\"a\"));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g((int)0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(Foo *);\n"
               "void f() {\n"
               "    g(reinterpret_cast<Foo*>(0));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f(int x) {\n"
               "    x = 0;\n"
               "    g(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f() {\n"
               "    const int x = 0;\n"
               "    g(x + 1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void g(int);\n"
               "void f() {\n"
               "    char i = 1;\n"
               "    g(static_cast<int>(i));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("char *yytext;\n"
               "void re_init_scanner() {\n"
               "  int size = 256;\n"
               "  yytext = xmalloc(size * sizeof *yytext);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const char *c) {\n"
               "    if (*c == '+' && (operand || !isalnum(*c))) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8986
         check("void f(int);\n"
@@ -10917,14 +12714,14 @@ class TestOther : public TestFixture {
               "    const int x[] = { 10, 10 };\n"
               "    f(x[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int);\n"
               "void g() {\n"
               "    int x[] = { 10, 10 };\n"
               "    f(x[0]);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x' can be declared as const array\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'x' can be declared as const array [constVariable]\n", errout_str());
 
         check("struct A { int x; };"
               "void g(int);\n"
@@ -10933,21 +12730,21 @@ class TestOther : public TestFixture {
               "    y.x = 1;\n"
               "    g(y.x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9909 - struct member with known value
         check("struct LongStack {\n"
@@ -10958,7 +12755,19 @@ class TestOther : public TestFixture {
               "    self->maxsize = 32;\n"
               "    dostuff(self->maxsize * sizeof(intptr_t));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #11894
+        check("struct S {\n"
+              "    int *p, n;\n"
+              "};\n"
+              "S* g() {\n"
+              "    S* s = static_cast<S*>(calloc(1, sizeof(S)));\n"
+              "    s->n = 100;\n"
+              "    s->p = static_cast<int*>(malloc(s->n * sizeof(int)));\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
         // #11679
         check("bool g(int);\n"
@@ -10967,7 +12776,53 @@ class TestOther : public TestFixture {
               "void f(int i) {\n"
               "    if (g(k(i))) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #11889
+        check("struct S {\n"
+              "    int a[5];\n"
+              "    void f(int i);\n"
+              "}\n"
+              "void g(int);\n"
+              "void S::f(int i) {\n"
+              "    if (a[i] == 1) {\n"
+              "        a[i] = 0;\n"
+              "        g(a[i]);\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #11927
+        check("void f(func_t func, int i) {\n"
+              "    (func)(i, 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { void operator()(int, int); };\n"
+              "void f(int i) {\n"
+              "    S()(i, 1);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(int& r) {\n"
+              "    g(static_cast<char>(r = 42));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S { int i; };\n"
+              "void f(int i) {\n"
+              "    const int a[] = { i - 1 * i, 0 };\n"
+              "    auto s = S{ i - 1 * i };\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:25]: (style) Argument 'i-1*i' to init list { is always 0. It does not matter what value 'i' has. [knownArgument]\n"
+                      "[test.cpp:4:19]: (style) Argument 'i-1*i' to constructor S is always 0. It does not matter what value 'i' has. [knownArgument]\n",
+                      errout_str());
+
+        checkP("#define MACRO(X) std::abs(X ? 0 : a)\n"
+               "int f(int a) {\n"
+               "    return MACRO(true);\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void knownArgumentHiddenVariableExpression() {
@@ -10980,10 +12835,10 @@ class TestOther : public TestFixture {
               "    dostuff(x * 0);\n"
               "    dostuff(0 * x);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Argument 'false&&x' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n"
-                      "[test.cpp:5]: (style) Argument 'true||x' to function dostuff is always 1. Constant literal calculation disable/hide variable expression 'x'.\n"
-                      "[test.cpp:6]: (style) Argument 'x*0' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n"
-                      "[test.cpp:7]: (style) Argument '0*x' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19]: (style) Argument 'false&&x' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'. [knownArgumentHiddenVariableExpression]\n"
+                      "[test.cpp:5:18]: (style) Argument 'true||x' to function dostuff is always 1. Constant literal calculation disable/hide variable expression 'x'. [knownArgumentHiddenVariableExpression]\n"
+                      "[test.cpp:6:15]: (style) Argument 'x*0' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'. [knownArgumentHiddenVariableExpression]\n"
+                      "[test.cpp:7:15]: (style) Argument '0*x' to function dostuff is always 0. Constant literal calculation disable/hide variable expression 'x'. [knownArgumentHiddenVariableExpression]\n", errout_str());
     }
 
     void knownArgumentTernaryOperator() { // #10374
@@ -10995,7 +12850,7 @@ class TestOther : public TestFixture {
               "    if (c ? a : b)\n"
               "      baz(P, N); \n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkComparePointers() {
@@ -11009,8 +12864,8 @@ class TestOther : public TestFixture {
               "    return diff;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:5] -> [test.cpp:5]: (error) Comparing pointers that point to different objects\n",
-            errout.str());
+            "[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());
 
         check("bool f() {\n"
               "    int x = 0;\n"
@@ -11020,10 +12875,10 @@ class TestOther : public TestFixture {
               "    return xp > yp;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:4] -> [test.cpp:3] -> [test.cpp:5] -> [test.cpp:6]: (error) Comparing pointers that point to different objects\n"
-            "[test.cpp:4]: (style) Variable 'xp' can be declared as pointer to const\n"
-            "[test.cpp:5]: (style) Variable 'yp' can be declared as pointer to const\n",
-            errout.str());
+            "[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"
+            "[test.cpp:5:10]: (style) Variable 'yp' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("bool f() {\n"
               "    int x = 0;\n"
@@ -11031,8 +12886,8 @@ class TestOther : public TestFixture {
               "    return &x > &y;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:4] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:4]: (error) Comparing pointers that point to different objects\n",
-            errout.str());
+            "[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());
 
         check("struct A {int data;};\n"
               "bool f() {\n"
@@ -11043,10 +12898,10 @@ class TestOther : public TestFixture {
               "    return xp > yp;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:1] -> [test.cpp:5] -> [test.cpp:1] -> [test.cpp:6] -> [test.cpp:7]: (error) Comparing pointers that point to different objects\n"
-            "[test.cpp:5]: (style) Variable 'xp' can be declared as pointer to const\n"
-            "[test.cpp:6]: (style) Variable 'yp' can be declared as pointer to const\n",
-            errout.str());
+            "[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"
+            "[test.cpp:6:10]: (style) Variable 'yp' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("struct A {int data;};\n"
               "bool f(A ix, A iy) {\n"
@@ -11057,17 +12912,17 @@ class TestOther : public TestFixture {
               "    return xp > yp;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:3] -> [test.cpp:5] -> [test.cpp:2] -> [test.cpp:4] -> [test.cpp:6] -> [test.cpp:7]: (error) Comparing pointers that point to different objects\n"
-            "[test.cpp:5]: (style) Variable 'xp' can be declared as pointer to const\n"
-            "[test.cpp:6]: (style) Variable 'yp' can be declared as pointer to const\n",
-            errout.str());
+            "[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"
+            "[test.cpp:6:10]: (style) Variable 'yp' can be declared as pointer to const [constVariablePointer]\n",
+            errout_str());
 
         check("bool f(int * xp, int* yp) {\n"
               "    return &xp > &yp;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:1] -> [test.cpp:2] -> [test.cpp:1] -> [test.cpp:2] -> [test.cpp:2]: (error) Comparing pointers that point to different objects\n",
-            errout.str());
+            "[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());
 
         check("int f() {\n"
               "    int x = 0;\n"
@@ -11075,8 +12930,8 @@ class TestOther : public TestFixture {
               "    return &x - &y;\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:4] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:4]: (error) Subtracting pointers that point to different objects\n",
-            errout.str());
+            "[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());
 
         check("bool f() {\n"
               "    int x[2] = {1, 2}m;\n"
@@ -11084,19 +12939,19 @@ class TestOther : public TestFixture {
               "    int* yp = &x[1];\n"
               "    return xp > yp;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'xp' can be declared as pointer to const\n"
-                      "[test.cpp:4]: (style) Variable 'yp' can be declared as pointer to const\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(const int & x, const int& y) {\n"
               "    return &x > &y;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int& g();\n"
               "bool f() {\n"
@@ -11106,7 +12961,7 @@ class TestOther : public TestFixture {
               "    const int* yp = &y;\n"
               "    return xp > yp;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {int data;};\n"
               "bool f(A ix) {\n"
@@ -11116,22 +12971,29 @@ class TestOther : public TestFixture {
               "    int* yp = &y->data;\n"
               "    return xp > yp;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'xp' can be declared as pointer to const\n"
-                      "[test.cpp:6]: (style) Variable 'yp' can be declared as pointer to const\n",
-                      errout.str());
+        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());
 
         check("struct S { int i; };\n" // #11576
               "int f(S s) {\n"
               "    return &s.i - (int*)&s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) C-style pointer casting\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"
               "    return &s1.i - reinterpret_cast<int*>(&s2);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:3]: (error) Subtracting pointers that point to different objects\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9] -> [test.cpp:3:12] -> [test.cpp:2:15] -> [test.cpp:3:43] -> [test.cpp:3:18]: (error) Subtracting pointers that point to different objects [subtractPointers]\n",
+                      errout_str());
+
+        check("struct S { int a; int b; };\n" // #12422
+              "int f() {\n"
+              "    S s;\n"
+              "    return &s.b - &s.a;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unusedVariableValueTemplate() {
@@ -11160,27 +13022,27 @@ class TestOther : public TestFixture {
               "        }\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void moduloOfOne() {
         check("void f(unsigned int x) {\n"
               "  int y = x % 1;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Modulo of one is always equal to zero\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int i, int j) {\n" // #11191
               "    const int c = pow(2, i);\n"
               "    if (j % c) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void sameExpressionPointers() {
@@ -11190,7 +13052,7 @@ class TestOther : public TestFixture {
               "    f(a);\n"
               "    if (b && c != *a) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkOverlappingWrite() {
@@ -11200,63 +13062,91 @@ class TestOther : public TestFixture {
               "    u.i = 0;\n"
               "    u.i = u.f;\n" // <- error
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Overlapping read/write of union is undefined behavior\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // memcpy
         check("void foo() {\n"
               "    char a[10];\n"
               "    memcpy(&a[5], &a[4], 2u);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Overlapping read/write in memcpy() is undefined behavior\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Overlapping read/write in memcpy() is undefined behavior\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Overlapping read/write in memcpy() is undefined behavior\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("_Bool a[10];\n" // #10350
+              "void foo() {\n"
+              "    memcpy(&a[5], &a[4], 2u * sizeof(a[0]));\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
+              "void f(int* p) {\n"
+              "    memcpy(&K[0], &K[1], sizeof(K[0]));\n"
+              "    memcpy(&K[1], &K[0], sizeof(K[0]));\n"
+              "    memcpy(p, p + 1, sizeof(*p));\n"
+              "    memcpy(p + 1, p, sizeof(*p));\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int K[2];\n"
+              "void f(int* p) {\n"
+              "    memcpy(&K[0], &K[1], 2 * sizeof(K[0]));\n"
+              "    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"
+              "}");
+        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"
+                      "[test.cpp:6:5]: (error) Overlapping read/write in memcpy() is undefined behavior [overlappingWriteFunction]\n",
+                      errout_str());
 
         // wmemcpy
         check("void foo() {\n"
               "    wchar_t a[10];\n"
               "    wmemcpy(&a[5], &a[4], 2u);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Overlapping read/write in wmemcpy() is undefined behavior\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Overlapping read/write in wmemcpy() is undefined behavior\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Overlapping read/write in wmemcpy() is undefined behavior\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Overlapping read/write in strcpy() is undefined behavior\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Overlapping read/write in strcpy() is undefined behavior [overlappingWriteFunction]\n", errout_str());
     }
 
     void constVariableArrayMember() { // #10371
@@ -11266,7 +13156,356 @@ class TestOther : public TestFixture {
               "    int GetVal() const { return m_Arr[0]; }\n"
               "    int m_Arr[1];\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void knownPointerToBool()
+    {
+        check("void g(bool);\n"
+              "void f() {\n"
+              "    int i = 5;\n"
+              "    int* p = &i;\n"
+              "    g(p);\n"
+              "    g(&i);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:7]: (style) Pointer expression 'p' converted to bool is always true. [knownPointerToBool]\n"
+                      "[test.cpp:6:7]: (style) Pointer expression '&i' converted to bool is always true. [knownPointerToBool]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    const int* x = nullptr;\n"
+              "    std::empty(x);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    const int* x = nullptr;\n"
+              "    std::empty(const_cast<int*>(x));\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct A { bool x; };\n"
+              "bool f(A* a) {\n"
+              "    if (a) {\n"
+              "        return a->x;\n"
+              "    }\n"
+              "    return false;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct A { int* x; };\n"
+              "bool f(A a) {\n"
+              "    if (a.x) {\n"
+              "        return a.x;\n"
+              "    }\n"
+              "    return false;\n"
+              "}\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; }");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f() {\n"
+              "    int* x = nullptr;\n"
+              "    return bool(x);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) Pointer expression 'x' converted to bool is always false. [knownPointerToBool]\n", errout_str());
+
+        check("bool f() {\n"
+              "    int* x = nullptr;\n"
+              "    return bool{x};\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:17]: (style) Pointer expression 'x' converted to bool is always false. [knownPointerToBool]\n", errout_str());
+
+        check("struct A { A(bool); };\n"
+              "A f() {\n"
+              "    int* x = nullptr;\n"
+              "    return A(x);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:14]: (style) Pointer expression 'x' converted to bool is always false. [knownPointerToBool]\n", errout_str());
+
+        check("struct A { A(bool); };\n"
+              "A f() {\n"
+              "    int* x = nullptr;\n"
+              "    return A{x};\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:14]: (style) Pointer expression 'x' converted to bool is always false. [knownPointerToBool]\n", errout_str());
+
+        check("struct B { virtual void f() {} };\n" // #11929
+              "struct D : B {};\n"
+              "void g(B* b) {\n"
+              "    if (!b)\n"
+              "        return;\n"
+              "    if (dynamic_cast<D*>(b)) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool (*ptr)();\n" // #12170
+              "void f() {\n"
+              "    if (!ptr || !ptr()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(bool b[2]);\n" // #12822
+              "void f() {\n"
+              "    bool b[2] = {};\n"
+              "    g(b);\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void iterateByValue() {
+        check("void f() {\n" // #9684
+              "    const std::set<std::string> ss = { \"a\", \"b\", \"c\" };\n"
+              "    for (auto s : ss)\n"
+              "        (void)s.size();\n"
+              "}\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()
+    {
+        check("void foo() {\n" // #11200
+              "    float f = 1.0;\n"
+              "    if (f > 1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:16] -> [test.cpp:3:11]: (style) The comparison 'f > 1.0' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float f = 1.0;\n"
+              "    if (f > -1.0) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'f > -1.0' is always false.\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n" // #13506
+              "    float f = 1.0;\n"
+              "    if (f > +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:16] -> [test.cpp:3:11]: (style) The comparison 'f > +1.0' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float f = 1.0;\n"
+              "    if (f < +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:16] -> [test.cpp:3:11]: (style) The comparison 'f < 1.0' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #11200
+              "    float pf = +1.0;\n"
+              "    if (pf > 1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:18] -> [test.cpp:3:12]: (style) The comparison 'pf > 1.0' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float pf = +1.0;\n"
+              "    if (pf > -1.0) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'pf > -1.0' is always false.\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n" // #13506
+              "    float pf = +1.0;\n"
+              "    if (pf > +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:18] -> [test.cpp:3:12]: (style) The comparison 'pf > +1.0' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float pf = +1.0;\n"
+              "    if (pf < +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:18] -> [test.cpp:3:12]: (style) The comparison 'pf < 1.0' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #11200
+              "    float nf = -1.0;\n"
+              "    if (nf > -1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:18] -> [test.cpp:3:12]: (style) The comparison 'nf > -1.0' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float nf = -1.0;\n"
+              "    if (nf > 1.0) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'nf > 1.0' is always false.\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float nf = -1.0;\n"
+              "    if (nf > +1.0) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'nf > +1.0' is always false.\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float f = 1.0f;\n"
+              "    if (f > 1.00f) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:16] -> [test.cpp:3:11]: (style) The comparison 'f > 1.00f' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float f = 1.0f;\n"
+              "    if (f > 1) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'f > 1' is always false.\n",
+            "",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float f = 1.0;\n"
+              "    if (f > 1.00) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:16] -> [test.cpp:3:11]: (style) The comparison 'f > 1.00' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13508
+              "    float f = 1.0;\n"
+              "    if (f > 1) {}\n"
+              "}\n");
+        TODO_ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'f > 1' is always false.\n",
+            "",
+            errout_str());
+    }
+
+    void knownConditionPrefixed()
+    {
+        check("void foo() {\n"
+              "    int i = 1;\n"
+              "    if (i < +1) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2:13] -> [test.cpp:3:11]: (style) The comparison 'i < 1' is always false. [knownConditionTrueFalse]\n",
+            errout_str());
+
+        check("void foo() {\n" // #13506
+              "    int i = 1;\n"
+              "    if (i > +1) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[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"
+            "}");
+        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"
+            "}");
+        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"
+            "}");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void unionZeroInitUnknownType() {
+        check(
+            "union u {\n"
+            "  Unknown x;\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"
+            "}");
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testpath.cpp b/test/testpath.cpp
index 0813c6b3824..7c181e28afb 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-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
@@ -18,10 +18,19 @@
 
 #include "path.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "standards.h"
 
+#include <initializer_list>
+#include <list>
+#include <set>
 #include <string>
 #include <vector>
 
+#ifndef _WIN32
+#include <stdexcept>
+#endif
+
 class TestPath : public TestFixture {
 public:
     TestPath() : TestFixture("TestPath") {}
@@ -35,10 +44,19 @@ class TestPath : public TestFixture {
         TEST_CASE(getCurrentExecutablePath);
         TEST_CASE(isAbsolute);
         TEST_CASE(getRelative);
-        TEST_CASE(is_c);
-        TEST_CASE(is_cpp);
         TEST_CASE(get_path_from_filename);
         TEST_CASE(join);
+        TEST_CASE(isDirectory);
+        TEST_CASE(isFile);
+        TEST_CASE(sameFileName);
+        TEST_CASE(getFilenameExtension);
+        TEST_CASE(identify);
+        TEST_CASE(identifyWithCppProbe);
+        TEST_CASE(is_header);
+        TEST_CASE(simplifyPath);
+        TEST_CASE(getAbsolutePath);
+        TEST_CASE(exists);
+        TEST_CASE(fromNativeSeparators);
     }
 
     void removeQuotationMarks() const {
@@ -54,6 +72,7 @@ class TestPath : public TestFixture {
     }
 
     void acceptFile() const {
+        ASSERT(Path::acceptFile("index.c"));
         ASSERT(Path::acceptFile("index.cpp"));
         ASSERT(Path::acceptFile("index.invalid.cpp"));
         ASSERT(Path::acceptFile("index.invalid.Cpp"));
@@ -63,10 +82,43 @@ class TestPath : public TestFixture {
         ASSERT(Path::acceptFile("index")==false);
         ASSERT(Path::acceptFile("")==false);
         ASSERT(Path::acceptFile("C")==false);
+        {
+            Standards::Language lang;
+            ASSERT(Path::acceptFile("index.c", &lang));
+            ASSERT_EQUALS_ENUM(Standards::Language::C, lang);
+        }
+        {
+            Standards::Language lang;
+            ASSERT(Path::acceptFile("index.cpp", &lang));
+            ASSERT_EQUALS_ENUM(Standards::Language::CPP, lang);
+        }
 
         // don't accept any headers
         ASSERT_EQUALS(false, Path::acceptFile("index.h"));
         ASSERT_EQUALS(false, Path::acceptFile("index.hpp"));
+
+        const std::set<std::string> extra = { ".extra", ".header" };
+        ASSERT(Path::acceptFile("index.c", extra));
+        ASSERT(Path::acceptFile("index.cpp", extra));
+        ASSERT(Path::acceptFile("index.extra", extra));
+        ASSERT(Path::acceptFile("index.header", extra));
+        ASSERT(Path::acceptFile("index.h", extra)==false);
+        ASSERT(Path::acceptFile("index.hpp", extra)==false);
+        {
+            Standards::Language lang;
+            ASSERT(Path::acceptFile("index.c", extra, &lang));
+            ASSERT_EQUALS_ENUM(Standards::Language::C, lang);
+        }
+        {
+            Standards::Language lang;
+            ASSERT(Path::acceptFile("index.cpp", extra, &lang));
+            ASSERT_EQUALS_ENUM(Standards::Language::CPP, lang);
+        }
+        {
+            Standards::Language lang;
+            ASSERT(Path::acceptFile("index.extra", extra, &lang));
+            ASSERT_EQUALS_ENUM(Standards::Language::None, lang);
+        }
     }
 
     void getCurrentPath() const {
@@ -112,48 +164,459 @@ class TestPath : public TestFixture {
         ASSERT_EQUALS("C:/foobar/test.cpp", Path::getRelativePath("C:/foobar/test.cpp", basePaths));
     }
 
-    void is_c() const {
-        ASSERT(Path::isC("index.cpp")==false);
-        ASSERT(Path::isC("")==false);
-        ASSERT(Path::isC("c")==false);
-        ASSERT(Path::isC("index.c"));
-        ASSERT(Path::isC("C:\\foo\\index.c"));
+    void get_path_from_filename() const {
+        ASSERT_EQUALS("", Path::getPathFromFilename("index.h"));
+        ASSERT_EQUALS("/tmp/", Path::getPathFromFilename("/tmp/index.h"));
+        ASSERT_EQUALS("a/b/c/", Path::getPathFromFilename("a/b/c/index.h"));
+        ASSERT_EQUALS("a/b/c/", Path::getPathFromFilename("a/b/c/"));
+    }
+
+    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"));
 
-        // In unix .C is considered C++
-#ifdef _WIN32
-        ASSERT_EQUALS(true, Path::isC("C:\\foo\\index.C"));
+        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"));
+
+        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"));
+    }
+
+    void isDirectory() const {
+        ScopedFile file("testpath.txt", "", "testpath");
+        ScopedFile file2("testpath2.txt", "");
+        ASSERT_EQUALS(false, Path::isDirectory("testpath.txt"));
+        ASSERT_EQUALS(true, Path::isDirectory("testpath"));
+        ASSERT_EQUALS(false, Path::isDirectory("testpath/testpath.txt"));
+        ASSERT_EQUALS(false, Path::isDirectory("testpath2.txt"));
+    }
+
+    void isFile() const {
+        ScopedFile file("testpath.txt", "", "testpath");
+        ScopedFile file2("testpath2.txt", "");
+        ASSERT_EQUALS(false, Path::isFile("testpath"));
+        ASSERT_EQUALS(false, Path::isFile("testpath.txt"));
+        ASSERT_EQUALS(true, Path::isFile("testpath/testpath.txt"));
+        ASSERT_EQUALS(true, Path::isFile("testpath2.txt"));
+    }
+
+    void sameFileName() const {
+        ASSERT(Path::sameFileName("test", "test"));
+
+        // case sensitivity cases
+#if defined(_WIN32) || (defined(__APPLE__) && defined(__MACH__))
+        ASSERT(Path::sameFileName("test", "Test"));
+        ASSERT(Path::sameFileName("test", "TesT"));
+        ASSERT(Path::sameFileName("test.h", "test.H"));
+        ASSERT(Path::sameFileName("test.hh", "test.Hh"));
+        ASSERT(Path::sameFileName("test.hh", "test.hH"));
 #else
-        ASSERT_EQUALS(false, Path::isC("C:\\foo\\index.C"));
+        ASSERT(!Path::sameFileName("test", "Test"));
+        ASSERT(!Path::sameFileName("test", "TesT"));
+        ASSERT(!Path::sameFileName("test.h", "test.H"));
+        ASSERT(!Path::sameFileName("test.hh", "test.Hh"));
+        ASSERT(!Path::sameFileName("test.hh", "test.hH"));
 #endif
     }
 
-    void is_cpp() const {
-        ASSERT(Path::isCPP("index.c")==false);
+    void getFilenameExtension() const {
+        ASSERT_EQUALS("", Path::getFilenameExtension("test"));
+        ASSERT_EQUALS("", Path::getFilenameExtension("Test"));
+        ASSERT_EQUALS(".h", Path::getFilenameExtension("test.h"));
+        ASSERT_EQUALS(".h", Path::getFilenameExtension("Test.h"));
+        ASSERT_EQUALS("", Path::getFilenameExtension("test", true));
+        ASSERT_EQUALS("", Path::getFilenameExtension("Test", true));
+        ASSERT_EQUALS(".h", Path::getFilenameExtension("test.h", true));
+        ASSERT_EQUALS(".h", Path::getFilenameExtension("Test.h", true));
+
+        // case sensitivity cases
+#if defined(_WIN32) || (defined(__APPLE__) && defined(__MACH__))
+        ASSERT_EQUALS(".h", Path::getFilenameExtension("test.H"));
+        ASSERT_EQUALS(".hh", Path::getFilenameExtension("test.Hh"));
+        ASSERT_EQUALS(".hh", Path::getFilenameExtension("test.hH"));
+        ASSERT_EQUALS(".h", Path::getFilenameExtension("test.H", true));
+        ASSERT_EQUALS(".hh", Path::getFilenameExtension("test.Hh", true));
+        ASSERT_EQUALS(".hh", Path::getFilenameExtension("test.hH", true));
+#else
+        ASSERT_EQUALS(".H", Path::getFilenameExtension("test.H"));
+        ASSERT_EQUALS(".Hh", Path::getFilenameExtension("test.Hh"));
+        ASSERT_EQUALS(".hH", Path::getFilenameExtension("test.hH"));
+        ASSERT_EQUALS(".h", Path::getFilenameExtension("test.H", true));
+        ASSERT_EQUALS(".hh", Path::getFilenameExtension("test.Hh", true));
+        ASSERT_EQUALS(".hh", Path::getFilenameExtension("test.hH", true));
+#endif
+    }
+
+
+    void identify() const {
+        Standards::Language lang;
+        bool header;
+
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("", false));
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("c", false));
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("cpp", false));
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("h", false));
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("hpp", false));
+
+        // TODO: what about files starting with a "."?
+        //ASSERT_EQUALS(Standards::Language::None, Path::identify(".c", false));
+        //ASSERT_EQUALS(Standards::Language::None, Path::identify(".cpp", false));
+        //ASSERT_EQUALS(Standards::Language::None, Path::identify(".h", false));
+        //ASSERT_EQUALS(Standards::Language::None, Path::identify(".hpp", false));
+
+        // C
+        ASSERT_EQUALS(Standards::Language::C, Path::identify("index.c", false));
+        ASSERT_EQUALS(Standards::Language::C, Path::identify("index.cl", false));
+        ASSERT_EQUALS(Standards::Language::C, Path::identify("C:\\foo\\index.c", false));
+        ASSERT_EQUALS(Standards::Language::C, Path::identify("/mnt/c/foo/index.c", false));
 
         // In unix .C is considered C++
 #ifdef _WIN32
-        ASSERT_EQUALS(false, Path::isCPP("index.C"));
+        ASSERT_EQUALS(Standards::Language::C, Path::identify("C:\\foo\\index.C", false));
+#endif
+
+        lang = Path::identify("index.c", false, &header);
+        ASSERT_EQUALS(Standards::Language::C, lang);
+        ASSERT_EQUALS(false, header);
+
+        // C++
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.cpp", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.cxx", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.cc", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.c++", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.tpp", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.txx", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.ipp", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.ixx", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("C:\\foo\\index.cpp", false));
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("C:\\foo\\index.Cpp", false));
+        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
+        // In unix .C is considered C++
+#if !defined(_WIN32) && !(defined(__APPLE__) && defined(__MACH__))
+        ASSERT_EQUALS(Standards::Language::CPP, Path::identify("index.C", false));
 #else
-        ASSERT_EQUALS(true, Path::isCPP("index.C"));
+        ASSERT_EQUALS(Standards::Language::C, Path::identify("index.C", false));
 #endif
-        ASSERT(Path::isCPP("index.cpp"));
-        ASSERT(Path::isCPP("C:\\foo\\index.cpp"));
-        ASSERT(Path::isCPP("C:\\foo\\index.Cpp"));
+
+        lang = Path::identify("index.cpp", false, &header);
+        ASSERT_EQUALS(Standards::Language::CPP, lang);
+        ASSERT_EQUALS(false, header);
+
+        // headers
+        lang = Path::identify("index.h", false, &header);
+        ASSERT_EQUALS(Standards::Language::C, lang);
+        ASSERT_EQUALS(true, header);
+
+        lang = Path::identify("index.hpp", false, &header);
+        ASSERT_EQUALS(Standards::Language::CPP, lang);
+        ASSERT_EQUALS(true, header);
+        lang = Path::identify("index.hxx", false, &header);
+        ASSERT_EQUALS(Standards::Language::CPP, lang);
+        ASSERT_EQUALS(true, header);
+        lang = Path::identify("index.h++", false, &header);
+        ASSERT_EQUALS(Standards::Language::CPP, lang);
+        ASSERT_EQUALS(true, header);
+        lang = Path::identify("index.hh", false, &header);
+        ASSERT_EQUALS(Standards::Language::CPP, lang);
+        ASSERT_EQUALS(true, header);
+
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("index.header", false));
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("index.htm", false));
+        ASSERT_EQUALS(Standards::Language::None, Path::identify("index.html", false));
     }
 
-    void get_path_from_filename() const {
-        ASSERT_EQUALS("", Path::getPathFromFilename("index.h"));
-        ASSERT_EQUALS("/tmp/", Path::getPathFromFilename("/tmp/index.h"));
-        ASSERT_EQUALS("a/b/c/", Path::getPathFromFilename("a/b/c/index.h"));
-        ASSERT_EQUALS("a/b/c/", Path::getPathFromFilename("a/b/c/"));
+#define identifyWithCppProbeInternal(...) identifyWithCppProbeInternal_(__FILE__, __LINE__, __VA_ARGS__)
+    void identifyWithCppProbeInternal_(const char* file, int line, const std::string& filename, const std::string& marker, Standards::Language std) const
+    {
+        const ScopedFile f(filename, marker);
+        ASSERT_EQUALS_LOC_MSG(std, Path::identify(f.path(), true), filename + "\n" + marker, file, line);
     }
 
-    void join() const {
-        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"));
+    void identifyWithCppProbe() const
+    {
+        const std::list<std::string> markers_cpp = {
+            "// -*- C++ -*-",
+            "// -*-C++-*-",
+            "// -*- Mode: C++; -*-",
+            "// -*-Mode: C++;-*-",
+            "// -*- Mode:C++; -*-",
+            "// -*-Mode:C++;-*-",
+            "// -*- Mode: C++ -*-",
+            "// -*-Mode: C++-*-",
+            "// -*- Mode:C++ -*-",
+            "// -*-Mode:C++-*-",
+            "// -*- Mode: C++; c-basic-offset: 8 -*-",
+            "// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil -*-",
+
+            "// -*- c++ -*-",
+            "// -*- mode: c++; -*-",
+
+            "/* -*- C++ -*- */",
+            "/* -*- C++ -*-",
+
+            "//-*- C++ -*-",
+            " //-*- C++ -*-",
+            "\t//-*- C++ -*-",
+            "\t //-*- C++ -*-",
+            " \t//-*- C++ -*-",
+            "//-*- C++ -*- ",
+            "//-*- C++ -*- \n",
+            "// -----*- C++ -*-----",
+            "// comment-*- C++ -*-comment",
+            "// -*- C++ -*-\n",
+            "//-*- C++ -*-\r// comment",
+            "//-*- C++ -*-\n// comment",
+            "//-*- C++ -*-\r\n// comment",
+
+            "/* -*-C++-*- */",
+            "/*-*-C++-*-*/",
+            " /*-*-C++-*-*/",
+        };
+
+        for (const auto& f : { "cppprobe.h", "cppprobe" }) {
+            for (const auto& m : markers_cpp) {
+                identifyWithCppProbeInternal(f, m, Standards::Language::CPP);
+            }
+        }
+
+        const std::list<std::string> markers_c = {
+            "-*- C++ -*-", // needs to be in comment
+            "// -*- C++", // no end marker
+            "// -*- C++ --*-", // incorrect end marker
+            "// -*- C++/-*-", // unexpected character
+            "// comment\n// -*- C++ -*-", // not on the first line
+            "// comment\r// -*- C++ -*-", // not on the first line
+            "// comment\r\n// -*- C++ -*-", // not on the first line
+            "// -*- C -*-",
+            "// -*- Mode: C; -*-",
+            "// -*- f90 -*-",
+            "// -*- fortran -*-",
+            "// -*- c-basic-offset: 2 -*-",
+            "// -*- c-basic-offset:4; indent-tabs-mode:nil -*-",
+            "// ", // no marker
+            "// -*-", // incomplete marker
+            "/*", // no marker
+            "/**/", // no marker
+            "/*\n*/", // no marker
+            "/* */", // no marker
+            "/* \n*/", // no marker
+            "/* -*-", // incomplete marker
+            "/* \n-*-", // incomplete marker
+            "/* \n-*- C++ -*-", // not on the first line
+            "/* \n-*- C++ -*- */" // not on the first line
+        };
+
+        for (const auto& m : markers_c) {
+            identifyWithCppProbeInternal("cppprobe.h", m, Standards::Language::C);
+        }
+        for (const auto& m : markers_c) {
+            identifyWithCppProbeInternal("cppprobe", m, Standards::Language::None);
+        }
+    }
+
+    void is_header() const {
+        ASSERT(Path::isHeader("index.h"));
+        ASSERT(Path::isHeader("index.hpp"));
+        ASSERT(Path::isHeader("index.hxx"));
+        ASSERT(Path::isHeader("index.h++"));
+        ASSERT(Path::isHeader("index.hh"));
+
+        ASSERT(Path::isHeader("index.c")==false);
+        ASSERT(Path::isHeader("index.cpp")==false);
+        ASSERT(Path::isHeader("index.header")==false);
+        ASSERT(Path::isHeader("index.htm")==false);
+        ASSERT(Path::isHeader("index.html")==false);
+    }
+
+    void simplifyPath() const {
+        ASSERT_EQUALS("file.cpp", Path::simplifyPath("file.cpp"));
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath("../file.cpp"));
+        ASSERT_EQUALS("file.cpp", Path::simplifyPath("test/../file.cpp"));
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath("../test/../file.cpp"));
+
+        ASSERT_EQUALS("file.cpp", Path::simplifyPath("./file.cpp"));
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath("./../file.cpp"));
+        ASSERT_EQUALS("file.cpp", Path::simplifyPath("./test/../file.cpp"));
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath("./../test/../file.cpp"));
+
+        ASSERT_EQUALS("test/", Path::simplifyPath("test/"));
+        ASSERT_EQUALS("../test/", Path::simplifyPath("../test/"));
+        ASSERT_EQUALS("../", Path::simplifyPath("../test/.."));
+        ASSERT_EQUALS("../", Path::simplifyPath("../test/../"));
+
+        ASSERT_EQUALS("/home/file.cpp", Path::simplifyPath("/home/test/../file.cpp"));
+        ASSERT_EQUALS("/file.cpp", Path::simplifyPath("/home/../test/../file.cpp"));
+
+        ASSERT_EQUALS("C:/home/file.cpp", Path::simplifyPath("C:/home/test/../file.cpp"));
+        ASSERT_EQUALS("C:/file.cpp", Path::simplifyPath("C:/home/../test/../file.cpp"));
+
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath("..\\file.cpp"));
+        ASSERT_EQUALS("file.cpp", Path::simplifyPath("test\\..\\file.cpp"));
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath("..\\test\\..\\file.cpp"));
+
+        ASSERT_EQUALS("file.cpp", Path::simplifyPath(".\\file.cpp"));
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath(".\\..\\file.cpp"));
+        ASSERT_EQUALS("file.cpp", Path::simplifyPath(".\\test\\..\\file.cpp"));
+        ASSERT_EQUALS("../file.cpp", Path::simplifyPath(".\\..\\test\\..\\file.cpp"));
+
+        ASSERT_EQUALS("test/", Path::simplifyPath("test\\"));
+        ASSERT_EQUALS("../test/", Path::simplifyPath("..\\test\\"));
+        ASSERT_EQUALS("../", Path::simplifyPath("..\\test\\.."));
+        ASSERT_EQUALS("../", Path::simplifyPath("..\\test\\..\\"));
+
+        ASSERT_EQUALS("C:/home/file.cpp", Path::simplifyPath("C:\\home\\test\\..\\file.cpp"));
+        ASSERT_EQUALS("C:/file.cpp", Path::simplifyPath("C:\\home\\..\\test\\..\\file.cpp"));
+
+        ASSERT_EQUALS("//home/file.cpp", Path::simplifyPath("\\\\home\\test\\..\\file.cpp"));
+        ASSERT_EQUALS("//file.cpp", Path::simplifyPath("\\\\home\\..\\test\\..\\file.cpp"));
+    }
+
+    void getAbsolutePath() const {
+        const std::string cwd = Path::getCurrentPath();
+
+        ScopedFile file("testabspath.txt", "");
+        std::string expected = Path::toNativeSeparators(Path::join(cwd, "testabspath.txt"));
+
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath("testabspath.txt"));
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath("./testabspath.txt"));
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath(".\\testabspath.txt"));
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath("test/../testabspath.txt"));
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath("test\\..\\testabspath.txt"));
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath("./test/../testabspath.txt"));
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath(".\\test\\../testabspath.txt"));
+
+        ASSERT_EQUALS(expected, Path::getAbsoluteFilePath(Path::join(cwd, "testabspath.txt")));
+
+        std::string cwd_up = Path::getPathFromFilename(cwd);
+        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, "..\\")));
+        ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, "./../")));
+        ASSERT_EQUALS(cwd_up, Path::getAbsoluteFilePath(Path::join(cwd, ".\\..\\")));
+
+        ASSERT_EQUALS(cwd, Path::getAbsoluteFilePath("."));
+#ifndef _WIN32
+        TODO_ASSERT_EQUALS(cwd, "", Path::getAbsoluteFilePath("./"));
+        TODO_ASSERT_EQUALS(cwd, "", Path::getAbsoluteFilePath(".\\"));
+#else
+        ASSERT_EQUALS(cwd, Path::getAbsoluteFilePath("./"));
+        ASSERT_EQUALS(cwd, Path::getAbsoluteFilePath(".\\"));
+#endif
+
+        ASSERT_EQUALS("", Path::getAbsoluteFilePath(""));
+
+#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");
+#else
+        ASSERT_EQUALS(Path::toNativeSeparators(Path::join(cwd, "testabspath2.txt")), Path::getAbsoluteFilePath("testabspath2.txt"));
+#endif
+
+#ifdef _WIN32
+        // determine an existing drive letter
+        std::string drive = Path::getCurrentPath().substr(0, 2);
+        ASSERT_EQUALS(drive + "", Path::getAbsoluteFilePath(drive + "\\"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "\\path"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "\\path\\"));
+        ASSERT_EQUALS(drive + "\\path\\files.txt", Path::getAbsoluteFilePath(drive + "\\path\\files.txt"));
+        ASSERT_EQUALS(drive + "", Path::getAbsoluteFilePath(drive + "//"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "//path"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "//path/"));
+        ASSERT_EQUALS(drive + "\\path\\files.txt", Path::getAbsoluteFilePath(drive + "//path/files.txt"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "\\\\path"));
+        ASSERT_EQUALS(drive + "", Path::getAbsoluteFilePath(drive + "/"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "/path"));
+
+        drive[0] = static_cast<char>(toupper(drive[0]));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "\\path"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "/path"));
+
+        drive[0] = static_cast<char>(tolower(drive[0]));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "\\path"));
+        ASSERT_EQUALS(drive + "\\path", Path::getAbsoluteFilePath(drive + "/path"));
+
+        ASSERT_EQUALS("1:\\path\\files.txt", Path::getAbsoluteFilePath("1:\\path\\files.txt")); // treated as valid drive
+        ASSERT_EQUALS(
+            Path::toNativeSeparators(Path::join(Path::getCurrentPath(), "CC:\\path\\files.txt")),
+            Path::getAbsoluteFilePath("CC:\\path\\files.txt")); // treated as filename
+        ASSERT_EQUALS("1:\\path\\files.txt", Path::getAbsoluteFilePath("1:/path/files.txt")); // treated as valid drive
+        ASSERT_EQUALS(
+            Path::toNativeSeparators(Path::join(Path::getCurrentPath(), "CC:\\path\\files.txt")),
+            Path::getAbsoluteFilePath("CC:/path/files.txt")); // treated as filename
+#endif
+
+#ifndef _WIN32
+        ASSERT_THROW_EQUALS_2(Path::getAbsoluteFilePath("C:\\path\\files.txt"), std::runtime_error, "path 'C:\\path\\files.txt' does not exist");
+#endif
+
+        // TODO: test UNC paths
+        // TODO: test with symlinks
+    }
+
+    void exists() const {
+        ScopedFile file("testpath.txt", "", "testpath");
+        ScopedFile file2("testpath2.txt", "");
+
+        ASSERT_EQUALS(true, Path::exists("testpath"));
+        ASSERT_EQUALS(true, Path::exists("testpath2.txt"));
+
+        ASSERT_EQUALS(false, Path::exists("testpath2"));
+
+        bool b = false;
+
+        ASSERT_EQUALS(true, Path::exists("testpath", &b));
+        ASSERT_EQUALS(true, b);
+        ASSERT_EQUALS(true, Path::exists("testpath/testpath.txt", &b));
+        ASSERT_EQUALS(false, b);
+        ASSERT_EQUALS(true, Path::exists("testpath2.txt", &b));
+        ASSERT_EQUALS(false, b);
+
+        ASSERT_EQUALS(false, Path::exists("testpath2", &b));
+        ASSERT_EQUALS(false, b);
+        ASSERT_EQUALS(false, Path::exists("testpath/testpath2.txt", &b));
+        ASSERT_EQUALS(false, b);
+        ASSERT_EQUALS(false, Path::exists("testpath.txt", &b));
+        ASSERT_EQUALS(false, b);
+    }
+
+    void fromNativeSeparators() const {
+        ASSERT_EQUALS("lib/file.c", Path::fromNativeSeparators("lib/file.c"));
+        ASSERT_EQUALS("lib//file.c", Path::fromNativeSeparators("lib//file.c"));
+        ASSERT_EQUALS("/lib/file.c", Path::fromNativeSeparators("/lib/file.c"));
+        ASSERT_EQUALS("//lib/file.c", Path::fromNativeSeparators("//lib/file.c"));
+        ASSERT_EQUALS("./lib/file.c", Path::fromNativeSeparators("./lib/file.c"));
+
+        ASSERT_EQUALS("lib/file.c", Path::fromNativeSeparators("lib\\file.c"));
+        ASSERT_EQUALS("lib//file.c", Path::fromNativeSeparators("lib\\\\file.c"));
+        ASSERT_EQUALS("/lib/file.c", Path::fromNativeSeparators("\\lib\\file.c"));
+        ASSERT_EQUALS("//lib/file.c", Path::fromNativeSeparators("\\\\lib\\file.c"));
+        ASSERT_EQUALS("./lib/file.c", Path::fromNativeSeparators(".\\lib\\file.c"));
     }
 };
 
diff --git a/test/testpathmatch.cpp b/test/testpathmatch.cpp
index 3ed2aede94a..2be6a943845 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-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
@@ -28,10 +28,19 @@ 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")};
+    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);
@@ -40,6 +49,7 @@ class TestPathMatch : public TestFixture {
         TEST_CASE(emptymaskpath3);
         TEST_CASE(onemaskemptypath);
         TEST_CASE(onemasksamepath);
+        TEST_CASE(onemasksamepathdifferentslash);
         TEST_CASE(onemasksamepathdifferentcase);
         TEST_CASE(onemasksamepathwithfile);
         TEST_CASE(onemaskshorterpath);
@@ -50,6 +60,7 @@ class TestPathMatch : public TestFixture {
         TEST_CASE(onemasklongerpath1);
         TEST_CASE(onemasklongerpath2);
         TEST_CASE(onemasklongerpath3);
+        TEST_CASE(onemaskcwd);
         TEST_CASE(twomasklongerpath1);
         TEST_CASE(twomasklongerpath2);
         TEST_CASE(twomasklongerpath3);
@@ -58,10 +69,17 @@ class TestPathMatch : public TestFixture {
         TEST_CASE(filemaskdifferentcase);
         TEST_CASE(filemask2);
         TEST_CASE(filemask3);
+        TEST_CASE(filemaskcwd);
         TEST_CASE(filemaskpath1);
         TEST_CASE(filemaskpath2);
         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
@@ -70,15 +88,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("/home/user/code/src/", ifdir));
+        ASSERT(!emptyMatcher.match("d:/home/user/code/src/", ifdir));
     }
 
     // Test PathMatch containing "src/"
@@ -87,13 +106,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 {
+        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(masks, false);
-        ASSERT(match.match("srC/"));
+        PathMatch match({"sRc/"}, basepath, windows);
+        ASSERT(match.match("srC/", ifdir));
+        ASSERT(!match.match("srC/", ifreg));
     }
 
     void onemasksamepathwithfile() const {
@@ -104,9 +130,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 {
@@ -126,39 +152,43 @@ class TestPathMatch : public TestFixture {
     }
 
     void onemasklongerpath1() const {
-        ASSERT(srcMatcher.match("/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", ifdir));
     }
 
     void twomasklongerpath1() const {
-        std::vector<std::string> masks = { "src/", "module/" };
-        PathMatch match(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(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(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(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"
@@ -167,8 +197,7 @@ class TestPathMatch : public TestFixture {
     }
 
     void filemaskdifferentcase() const {
-        std::vector<std::string> masks(1, "foo.cPp");
-        PathMatch match(masks, false);
+        PathMatch match({"foo.cPp"}, basepath, windows);
         ASSERT(match.match("fOo.cpp"));
     }
 
@@ -180,6 +209,10 @@ class TestPathMatch : public TestFixture {
         ASSERT(fooCppMatcher.match("src/foo.cpp"));
     }
 
+    void filemaskcwd() const {
+        ASSERT(fooCppMatcher.match("./lib/foo.cpp"));
+    }
+
     // Test PathMatch containing "src/foo.cpp"
     void filemaskpath1() const {
         ASSERT(srcFooCppMatcher.match("src/foo.cpp"));
@@ -196,6 +229,80 @@ class TestPathMatch : public TestFixture {
     void filemaskpath4() const {
         ASSERT(!srcFooCppMatcher.match("bar/foo.cpp"));
     }
+
+    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
+        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 = PathMatch::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 ambigous. 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 b7d3567018b..c0f7bb2c017 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-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
@@ -18,8 +18,11 @@
 
 #include "platform.h"
 #include "fixture.h"
+#include "standards.h"
 
-#include <tinyxml2.h>
+#include <string>
+
+#include "xml.h"
 
 
 class TestPlatform : public TestFixture {
@@ -41,26 +44,35 @@ class TestPlatform : public TestFixture {
         TEST_CASE(invalid_config_file_1);
         TEST_CASE(empty_elements);
         TEST_CASE(default_platform);
+        TEST_CASE(limitsDefines);
+        TEST_CASE(charMinMax);
+        TEST_CASE(no_root_node);
+        TEST_CASE(wrong_root_node);
     }
 
-    static bool readPlatform(cppcheck::Platform& platform, const char* xmldata) {
+    class PlatformTest : 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);
     }
 
     void empty() const {
         // An empty platform file does not change values, only the type.
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n<platform/>";
-        cppcheck::Platform platform;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n<platform/>";
+        PlatformTest platform;
         // TODO: this should fail - platform files need to be complete
         TODO_ASSERT(!readPlatform(platform, xmldata));
     }
 
     void valid_config_win32a() const {
         // Verify if native Win32A platform is loaded correctly
-        cppcheck::Platform platform;
-        PLATFORM(platform, cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, platform.type);
+        Platform platform;
+        PLATFORM(platform, Platform::Type::Win32A);
+        ASSERT_EQUALS(Platform::Type::Win32A, platform.type);
         ASSERT(platform.isWindows());
         ASSERT_EQUALS(1, platform.sizeof_bool);
         ASSERT_EQUALS(2, platform.sizeof_short);
@@ -83,9 +95,9 @@ class TestPlatform : public TestFixture {
 
     void valid_config_unix64() const {
         // Verify if native Unix64 platform is loaded correctly
-        cppcheck::Platform platform;
-        PLATFORM(platform, cppcheck::Platform::Type::Unix64);
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, platform.type);
+        Platform platform;
+        PLATFORM(platform, Platform::Type::Unix64);
+        ASSERT_EQUALS(Platform::Type::Unix64, platform.type);
         ASSERT(!platform.isWindows());
         ASSERT_EQUALS(1, platform.sizeof_bool);
         ASSERT_EQUALS(2, platform.sizeof_short);
@@ -104,13 +116,16 @@ class TestPlatform : public TestFixture {
         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 {
         // Verify if native Win32W platform is loaded correctly
-        cppcheck::Platform platform;
-        PLATFORM(platform, cppcheck::Platform::Type::Win32W);
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, platform.type);
+        Platform platform;
+        PLATFORM(platform, Platform::Type::Win32W);
+        ASSERT_EQUALS(Platform::Type::Win32W, platform.type);
         ASSERT(platform.isWindows());
         ASSERT_EQUALS(1, platform.sizeof_bool);
         ASSERT_EQUALS(2, platform.sizeof_short);
@@ -129,13 +144,16 @@ class TestPlatform : public TestFixture {
         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 {
         // Verify if native Unix32 platform is loaded correctly
-        cppcheck::Platform platform;
-        PLATFORM(platform, cppcheck::Platform::Type::Unix32);
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, platform.type);
+        Platform platform;
+        PLATFORM(platform, Platform::Type::Unix32);
+        ASSERT_EQUALS(Platform::Type::Unix32, platform.type);
         ASSERT(!platform.isWindows());
         ASSERT_EQUALS(1, platform.sizeof_bool);
         ASSERT_EQUALS(2, platform.sizeof_short);
@@ -154,13 +172,16 @@ class TestPlatform : public TestFixture {
         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 {
         // Verify if native Win64 platform is loaded correctly
-        cppcheck::Platform platform;
-        PLATFORM(platform, cppcheck::Platform::Type::Win64);
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, platform.type);
+        Platform platform;
+        PLATFORM(platform, Platform::Type::Win64);
+        ASSERT_EQUALS(Platform::Type::Win64, platform.type);
         ASSERT(platform.isWindows());
         ASSERT_EQUALS(1, platform.sizeof_bool);
         ASSERT_EQUALS(2, platform.sizeof_short);
@@ -179,32 +200,35 @@ class TestPlatform : public TestFixture {
         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 {
         // Valid platform configuration with all possible values specified.
         // Similar to the avr8 platform file.
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<platform>\n"
-                               "  <char_bit>8</char_bit>\n"
-                               "  <default-sign>unsigned</default-sign>\n"
-                               "  <sizeof>\n"
-                               "    <bool>1</bool>\n"
-                               "    <short>2</short>\n"
-                               "    <int>2</int>\n"
-                               "    <long>4</long>\n"
-                               "    <long-long>8</long-long>\n"
-                               "    <float>4</float>\n"
-                               "    <double>4</double>\n"
-                               "    <long-double>4</long-double>\n"
-                               "    <pointer>2</pointer>\n"
-                               "    <size_t>2</size_t>\n"
-                               "    <wchar_t>2</wchar_t>\n"
-                               "  </sizeof>\n"
-                               " </platform>";
-        cppcheck::Platform platform;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<platform>\n"
+                                   "  <char_bit>8</char_bit>\n"
+                                   "  <default-sign>unsigned</default-sign>\n"
+                                   "  <sizeof>\n"
+                                   "    <bool>1</bool>\n"
+                                   "    <short>2</short>\n"
+                                   "    <int>2</int>\n"
+                                   "    <long>4</long>\n"
+                                   "    <long-long>8</long-long>\n"
+                                   "    <float>4</float>\n"
+                                   "    <double>4</double>\n"
+                                   "    <long-double>4</long-double>\n"
+                                   "    <pointer>2</pointer>\n"
+                                   "    <size_t>2</size_t>\n"
+                                   "    <wchar_t>2</wchar_t>\n"
+                                   "  </sizeof>\n"
+                                   " </platform>";
+        PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
-        ASSERT_EQUALS(cppcheck::Platform::Type::File, platform.type);
+        ASSERT_EQUALS(Platform::Type::File, platform.type);
         ASSERT(!platform.isWindows());
         ASSERT_EQUALS(8, platform.char_bit);
         ASSERT_EQUALS('u', platform.defaultSign);
@@ -228,27 +252,27 @@ class TestPlatform : public TestFixture {
     void valid_config_file_2() const {
         // Valid platform configuration with all possible values specified and
         // char_bit > 8.
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<platform>\n"
-                               "  <char_bit>20</char_bit>\n"
-                               "  <default-sign>signed</default-sign>\n"
-                               "  <sizeof>\n"
-                               "    <bool>1</bool>\n"
-                               "    <short>2</short>\n"
-                               "    <int>3</int>\n"
-                               "    <long>4</long>\n"
-                               "    <long-long>5</long-long>\n"
-                               "    <float>6</float>\n"
-                               "    <double>7</double>\n"
-                               "    <long-double>8</long-double>\n"
-                               "    <pointer>9</pointer>\n"
-                               "    <size_t>10</size_t>\n"
-                               "    <wchar_t>11</wchar_t>\n"
-                               "  </sizeof>\n"
-                               " </platform>";
-        cppcheck::Platform platform;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<platform>\n"
+                                   "  <char_bit>20</char_bit>\n"
+                                   "  <default-sign>signed</default-sign>\n"
+                                   "  <sizeof>\n"
+                                   "    <bool>1</bool>\n"
+                                   "    <short>2</short>\n"
+                                   "    <int>3</int>\n"
+                                   "    <long>4</long>\n"
+                                   "    <long-long>5</long-long>\n"
+                                   "    <float>6</float>\n"
+                                   "    <double>7</double>\n"
+                                   "    <long-double>8</long-double>\n"
+                                   "    <pointer>9</pointer>\n"
+                                   "    <size_t>10</size_t>\n"
+                                   "    <wchar_t>11</wchar_t>\n"
+                                   "  </sizeof>\n"
+                                   " </platform>";
+        PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
-        ASSERT_EQUALS(cppcheck::Platform::Type::File, platform.type);
+        ASSERT_EQUALS(Platform::Type::File, platform.type);
         ASSERT(!platform.isWindows());
         ASSERT_EQUALS(20, platform.char_bit);
         ASSERT_EQUALS('s', platform.defaultSign);
@@ -272,25 +296,25 @@ class TestPlatform : public TestFixture {
     void valid_config_file_3() const {
         // Valid platform configuration without any usable information.
         // Similar like an empty file.
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<platform>\n"
-                               "  <char_bit1>8</char_bit1>\n"
-                               "  <default-sign1>unsigned</default-sign1>\n"
-                               "  <sizeof1>\n"
-                               "    <bool1>1</bool1>\n"
-                               "    <short1>2</short1>\n"
-                               "    <int1>3</int1>\n"
-                               "    <long1>4</long1>\n"
-                               "    <long-long1>5</long-long1>\n"
-                               "    <float1>6</float1>\n"
-                               "    <double1>7</double1>\n"
-                               "    <long-double1>8</long-double1>\n"
-                               "    <pointer1>9</pointer1>\n"
-                               "    <size_t1>10</size_t1>\n"
-                               "    <wchar_t1>11</wchar_t1>\n"
-                               "  </sizeof1>\n"
-                               " </platform>";
-        cppcheck::Platform platform;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<platform>\n"
+                                   "  <char_bit1>8</char_bit1>\n"
+                                   "  <default-sign1>unsigned</default-sign1>\n"
+                                   "  <sizeof1>\n"
+                                   "    <bool1>1</bool1>\n"
+                                   "    <short1>2</short1>\n"
+                                   "    <int1>3</int1>\n"
+                                   "    <long1>4</long1>\n"
+                                   "    <long-long1>5</long-long1>\n"
+                                   "    <float1>6</float1>\n"
+                                   "    <double1>7</double1>\n"
+                                   "    <long-double1>8</long-double1>\n"
+                                   "    <pointer1>9</pointer1>\n"
+                                   "    <size_t1>10</size_t1>\n"
+                                   "    <wchar_t1>11</wchar_t1>\n"
+                                   "  </sizeof1>\n"
+                                   " </platform>";
+        PlatformTest platform;
         // TODO: needs to fail - files need to be complete
         TODO_ASSERT(!readPlatform(platform, xmldata));
     }
@@ -298,27 +322,27 @@ class TestPlatform : public TestFixture {
     void valid_config_file_4() const {
         // Valid platform configuration with all possible values specified and
         // set to 0.
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<platform>\n"
-                               "  <char_bit>0</char_bit>\n"
-                               "  <default-sign>z</default-sign>\n"
-                               "  <sizeof>\n"
-                               "    <bool>0</bool>\n"
-                               "    <short>0</short>\n"
-                               "    <int>0</int>\n"
-                               "    <long>0</long>\n"
-                               "    <long-long>0</long-long>\n"
-                               "    <float>0</float>\n"
-                               "    <double>0</double>\n"
-                               "    <long-double>0</long-double>\n"
-                               "    <pointer>0</pointer>\n"
-                               "    <size_t>0</size_t>\n"
-                               "    <wchar_t>0</wchar_t>\n"
-                               "  </sizeof>\n"
-                               " </platform>";
-        cppcheck::Platform platform;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<platform>\n"
+                                   "  <char_bit>0</char_bit>\n"
+                                   "  <default-sign>z</default-sign>\n"
+                                   "  <sizeof>\n"
+                                   "    <bool>0</bool>\n"
+                                   "    <short>0</short>\n"
+                                   "    <int>0</int>\n"
+                                   "    <long>0</long>\n"
+                                   "    <long-long>0</long-long>\n"
+                                   "    <float>0</float>\n"
+                                   "    <double>0</double>\n"
+                                   "    <long-double>0</long-double>\n"
+                                   "    <pointer>0</pointer>\n"
+                                   "    <size_t>0</size_t>\n"
+                                   "    <wchar_t>0</wchar_t>\n"
+                                   "  </sizeof>\n"
+                                   " </platform>";
+        PlatformTest platform;
         ASSERT(readPlatform(platform, xmldata));
-        ASSERT_EQUALS(cppcheck::Platform::Type::File, platform.type);
+        ASSERT_EQUALS(Platform::Type::File, platform.type);
         ASSERT(!platform.isWindows());
         ASSERT_EQUALS(0, platform.char_bit);
         ASSERT_EQUALS('z', platform.defaultSign);
@@ -341,62 +365,89 @@ class TestPlatform : public TestFixture {
 
     void invalid_config_file_1() const {
         // Invalid XML file: mismatching elements "boolt" vs "bool".
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<platform>\n"
-                               "  <char_bit>8</char_bit>\n"
-                               "  <default-sign>unsigned</default-sign>\n"
-                               "  <sizeof>\n"
-                               "    <boolt>1</bool>\n"
-                               "    <short>2</short>\n"
-                               "    <int>2</int>\n"
-                               "    <long>4</long>\n"
-                               "    <long-long>8</long-long>\n"
-                               "    <float>4</float>\n"
-                               "    <double>4</double>\n"
-                               "    <long-double>4</long-double>\n"
-                               "    <pointer>2</pointer>\n"
-                               "    <size_t>2</size_t>\n"
-                               "    <wchar_t>2</wchar_t>\n"
-                               "  </sizeof>\n"
-                               " </platform>";
-        cppcheck::Platform platform;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<platform>\n"
+                                   "  <char_bit>8</char_bit>\n"
+                                   "  <default-sign>unsigned</default-sign>\n"
+                                   "  <sizeof>\n"
+                                   "    <boolt>1</bool>\n"
+                                   "    <short>2</short>\n"
+                                   "    <int>2</int>\n"
+                                   "    <long>4</long>\n"
+                                   "    <long-long>8</long-long>\n"
+                                   "    <float>4</float>\n"
+                                   "    <double>4</double>\n"
+                                   "    <long-double>4</long-double>\n"
+                                   "    <pointer>2</pointer>\n"
+                                   "    <size_t>2</size_t>\n"
+                                   "    <wchar_t>2</wchar_t>\n"
+                                   "  </sizeof>\n"
+                                   " </platform>";
+        PlatformTest platform;
         ASSERT(!readPlatform(platform, xmldata));
     }
 
     void empty_elements() const {
         // Valid platform configuration without any usable information.
         // Similar like an empty file.
-        const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                               "<platform>\n"
-                               "  <char_bit></char_bit>\n"
-                               "  <default-sign></default-sign>\n"
-                               "  <sizeof>\n"
-                               "    <bool></bool>\n"
-                               "    <short></short>\n"
-                               "    <int></int>\n"
-                               "    <long></long>\n"
-                               "    <long-long></long-long>\n"
-                               "    <float></float>\n"
-                               "    <double></double>\n"
-                               "    <long-double></long-double>\n"
-                               "    <pointer></pointer>\n"
-                               "    <size_t></size_t>\n"
-                               "    <wchar_t></wchar_t>\n"
-                               "  </sizeof>\n"
-                               " </platform>";
-        cppcheck::Platform platform;
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<platform>\n"
+                                   "  <char_bit></char_bit>\n"
+                                   "  <default-sign></default-sign>\n"
+                                   "  <sizeof>\n"
+                                   "    <bool></bool>\n"
+                                   "    <short></short>\n"
+                                   "    <int></int>\n"
+                                   "    <long></long>\n"
+                                   "    <long-long></long-long>\n"
+                                   "    <float></float>\n"
+                                   "    <double></double>\n"
+                                   "    <long-double></long-double>\n"
+                                   "    <pointer></pointer>\n"
+                                   "    <size_t></size_t>\n"
+                                   "    <wchar_t></wchar_t>\n"
+                                   "  </sizeof>\n"
+                                   " </platform>";
+        PlatformTest platform;
+        ASSERT(!readPlatform(platform, xmldata));
+    }
+
+    void default_platform() const {
+        Platform platform;
+        ASSERT_EQUALS(Platform::Type::Native, platform.type);
+    }
+
+    void limitsDefines() const {
+        Platform platform;
+        ASSERT_EQUALS(true, platform.set(Platform::Unix64));
+        const std::string defs = "CHAR_BIT=8;SCHAR_MIN=-128;SCHAR_MAX=127;UCHAR_MAX=255;CHAR_MIN=0;CHAR_MAX=127;SHRT_MIN=-32768;SHRT_MAX=32767;USHRT_MAX=65535;INT_MIN=(-2147483647 - 1);INT_MAX=2147483647;UINT_MAX=4294967295;LONG_MIN=(-9223372036854775807L - 1L);LONG_MAX=9223372036854775807L;ULONG_MAX=18446744073709551615UL";
+        const std::string defs_c99 = "CHAR_BIT=8;SCHAR_MIN=-128;SCHAR_MAX=127;UCHAR_MAX=255;CHAR_MIN=0;CHAR_MAX=127;SHRT_MIN=-32768;SHRT_MAX=32767;USHRT_MAX=65535;INT_MIN=(-2147483647 - 1);INT_MAX=2147483647;UINT_MAX=4294967295;LONG_MIN=(-9223372036854775807L - 1L);LONG_MAX=9223372036854775807L;ULONG_MAX=18446744073709551615UL;LLONG_MIN=(-9223372036854775807LL - 1LL);LLONG_MAX=9223372036854775807LL;ULLONG_MAX=18446744073709551615ULL";
+        ASSERT_EQUALS(defs, platform.getLimitsDefines(Standards::cstd_t::C89));
+        ASSERT_EQUALS(defs_c99, platform.getLimitsDefines(Standards::cstd_t::C99));
+        ASSERT_EQUALS(defs_c99, platform.getLimitsDefines(Standards::cstd_t::CLatest));
+        ASSERT_EQUALS(defs, platform.getLimitsDefines(Standards::cppstd_t::CPP03));
+        ASSERT_EQUALS(defs_c99, platform.getLimitsDefines(Standards::cppstd_t::CPP11));
+        ASSERT_EQUALS(defs_c99, platform.getLimitsDefines(Standards::cppstd_t::CPPLatest));
+    }
+
+    void charMinMax() const {
+        Platform platform;
+        ASSERT_EQUALS(255, platform.unsignedCharMax());
+        ASSERT_EQUALS(127, platform.signedCharMax());
+        ASSERT_EQUALS(-128, platform.signedCharMin());
+    }
+
+    void no_root_node() const {
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>";
+        PlatformTest platform;
         ASSERT(!readPlatform(platform, xmldata));
     }
 
-    void default_platform() {
-        cppcheck::Platform platform;
-#if defined(_WIN64)
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, platform.type);
-#elif defined(_WIN32)
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, platform.type);
-#else
-        ASSERT_EQUALS(cppcheck::Platform::Type::Native, platform.type);
-#endif
+    void wrong_root_node() const {
+        constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                   "<platforms/>";
+        PlatformTest platform;
+        ASSERT(!readPlatform(platform, xmldata));
     }
 };
 
diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp
index 48ff941f542..9e95fabc949 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-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
@@ -16,14 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkpostfixoperator.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 
 class TestPostfixOperator : public TestFixture {
 public:
@@ -32,15 +31,12 @@ class TestPostfixOperator : public TestFixture {
 private:
     const Settings settings = settingsBuilder().severity(Severity::performance).build();
 
-#define check(code) check_(code, __FILE__, __LINE__)
-    void check_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for postfix operators..
         CheckPostfixOperator checkPostfixOperator(&tokenizer, &settings, this);
@@ -48,6 +44,7 @@ class TestPostfixOperator : public TestFixture {
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(testsimple);
         TEST_CASE(testfor);
         TEST_CASE(testvolatile);
@@ -76,7 +73,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class K {};"
               "int main()\n"
@@ -87,7 +84,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("struct K {};"
               "void foo()\n"
@@ -95,14 +92,14 @@ class TestPostfixOperator : public TestFixture {
               "    K k(0);\n"
               "    k++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("union K {};"
               "void foo()\n"
@@ -110,7 +107,7 @@ class TestPostfixOperator : public TestFixture {
               "    K k(0);\n"
               "    k++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
               "int main()\n"
@@ -123,7 +120,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
               "int main()\n"
@@ -137,7 +134,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
 
         check("class K {};"
@@ -149,7 +146,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};"
               "int main()\n"
@@ -160,7 +157,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class K {};"
               "int main()\n"
@@ -171,7 +168,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #9042
         check("template <class T>\n"
@@ -182,7 +179,7 @@ class TestPostfixOperator : public TestFixture {
               "template <class T>\n"
               "class s {};\n"
               "using BOOL = char;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testfor() {
@@ -193,7 +190,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class K {};\n"
               "int main()\n"
@@ -203,7 +200,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:28]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};\n"
               "int main()\n"
@@ -213,7 +210,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class K {};\n"
               "int main()\n"
@@ -223,7 +220,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:27]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("class K {};\n"
               "int main(int argc, char *argv[])\n"
@@ -233,9 +230,12 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
-
+        ASSERT_EQUALS("", errout_str());
 
+        check("void f(const std::string &s) {\n" // #7731
+              "    for (std::string::const_iterator i = s.begin(), r = s.end() - 1; i != r; r--) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:78]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
     }
 
     void testvolatile() {
@@ -248,7 +248,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::cout << k << std::endl;\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
     }
 
     void testiterator() {
@@ -263,7 +263,7 @@ class TestPostfixOperator : public TestFixture {
               "    v.clear();\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:64]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
               "    std::vector<int> v;\n"
@@ -277,7 +277,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
               "    std::vector<int> v;\n"
@@ -290,7 +290,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("int main() {\n"
               "    std::vector<int> v;\n"
@@ -304,14 +304,14 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:8]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
     }
 
     void test2168() {
-        check("--> declare allocator lock here\n"
-              "int main(){}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_THROW_INTERNAL(check("--> declare allocator lock here\n"
+                                    "int main(){}"),
+                              AST);
     }
 
     void pointerSimplest() {
@@ -319,7 +319,7 @@ class TestPostfixOperator : public TestFixture {
               "    p++;\n"
               "    std::cout << *p;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pointer() {
@@ -329,7 +329,7 @@ class TestPostfixOperator : public TestFixture {
               "void f() {\n"
               "    p++;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testtemplate() {
@@ -337,7 +337,7 @@ class TestPostfixOperator : public TestFixture {
               "    std::vector<FilterConfigCacheEntry>::iterator aIter(aImport.begin());\n"
               "    aIter++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
     }
 
     void testmember() {
@@ -346,14 +346,14 @@ class TestPostfixOperator : public TestFixture {
               "    B b;\n"
               "    b.a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testcomma() {
@@ -362,7 +362,7 @@ class TestPostfixOperator : public TestFixture {
               "    A a;\n"
               "    i++, a++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Prefer prefix ++/-- operators for non-primitive types.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (performance) Prefer prefix ++/-- operators for non-primitive types. [postfixOperator]\n", errout_str());
 
         check("bool foo(int i) {\n"
               "    class A {};\n"
@@ -370,7 +370,7 @@ class TestPostfixOperator : public TestFixture {
               "    foo(i, a++);\n"
               "    foo(a++, i);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testauto() { // #8350
@@ -382,7 +382,7 @@ class TestPostfixOperator : public TestFixture {
               "    }\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index a696d006c8b..66b3e24062f 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-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
@@ -21,11 +21,14 @@
 // 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"
 #include "settings.h"
+#include "standards.h"
 #include "suppressions.h"
+#include "tokenlist.h"
 #include "fixture.h"
 #include "helpers.h"
 
@@ -33,8 +36,9 @@
 #include <list>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <stdexcept>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <simplecpp.h>
@@ -45,33 +49,111 @@ class TestPreprocessor : public TestFixture {
 public:
     TestPreprocessor() : TestFixture("TestPreprocessor") {}
 
-    class OurPreprocessor : public Preprocessor {
-    public:
+private:
+    template<size_t size>
+    std::string expandMacros(const char (&code)[size], ErrorLogger &errorLogger) const {
+        simplecpp::OutputList outputList;
+        std::vector<std::string> files;
+        simplecpp::TokenList tokens1 = simplecpp::TokenList(code, files, "file.cpp", &outputList);
+        Preprocessor p(tokens1, settingsDefault, errorLogger, Path::identify(tokens1.getFiles()[0], false));
+        ASSERT(p.loadFiles(files));
+        simplecpp::TokenList tokens2 = p.preprocess("", files, outputList);
+        (void)p.reportOutput(outputList, true);
+        return tokens2.stringify();
+    }
 
-        static std::string expandMacros(const char code[], ErrorLogger *errorLogger = nullptr) {
-            std::istringstream istr(code);
-            simplecpp::OutputList outputList;
-            std::vector<std::string> files;
-            const simplecpp::TokenList tokens1 = simplecpp::TokenList(istr, files, "file.cpp", &outputList);
-            std::map<std::string, simplecpp::TokenList*> filedata;
-            simplecpp::TokenList tokens2(files);
-            simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI(), &outputList);
-
-            if (errorLogger) {
-                const Settings settings;
-                Preprocessor p(settings, errorLogger);
-                p.reportOutput(outputList, true);
-            }
+    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");
+
+        if (tokenlist.front())
+            throw std::runtime_error("token list not empty");
+
+        simplecpp::OutputList outputList;
+        const simplecpp::TokenList tokens1(code, files, file0, &outputList);
+
+        // Preprocess..
+        simplecpp::TokenList tokens2(files);
+        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));
+    }
+
+    template<size_t size>
+    std::vector<RemarkComment> getRemarkComments(const char (&code)[size], ErrorLogger& errorLogger) const
+    {
+        std::vector<std::string> files;
+        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));
 
-            return tokens2.stringify();
+        // 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 = preprocessor.getConfigs();
+        for (const std::string & config : cfgs) {
+            try {
+                const bool writeLocations = (strstr(code, "#file") != nullptr) || (strstr(code, "#include") != nullptr);
+                cfgcode[config] = preprocessor.getcode(config, files, writeLocations);
+            } catch (const simplecpp::Output &) {
+                cfgcode[config] = "";
+            }
         }
-    };
 
-private:
+        return cfgcode;
+    }
+
     const Settings settings0 = settingsBuilder().severity(Severity::information).build();
-    Preprocessor preprocessor0{settings0, this};
 
     void run() override {
+        mNewTemplate = true;
 
         // The bug that started the whole work with the new preprocessor
         TEST_CASE(Bug2190219);
@@ -200,6 +282,12 @@ class TestPreprocessor : public TestFixture {
         // inline suppression, missingInclude/missingIncludeSystem
         TEST_CASE(inline_suppressions);
 
+        // remark comment
+        TEST_CASE(remarkComment1);
+        TEST_CASE(remarkComment2);
+        TEST_CASE(remarkComment3);
+        TEST_CASE(remarkComment4);
+
         // Using -D to predefine symbols
         TEST_CASE(predefine1);
         TEST_CASE(predefine2);
@@ -208,6 +296,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
@@ -225,6 +316,12 @@ 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(getConfigs14); // #1059
+        TEST_CASE(getConfigs15); // #1059
+        TEST_CASE(getConfigs16); // #1059
+        TEST_CASE(getConfigs17); // #1059
         TEST_CASE(getConfigsError);
 
         TEST_CASE(getConfigsD1);
@@ -245,10 +342,6 @@ class TestPreprocessor : public TestFixture {
 
         TEST_CASE(wrongPathOnErrorDirective);
 
-        TEST_CASE(testDirectiveIncludeTypes);
-        TEST_CASE(testDirectiveIncludeLocations);
-        TEST_CASE(testDirectiveIncludeComments);
-
         TEST_CASE(testMissingInclude);
         TEST_CASE(testMissingInclude2);
         TEST_CASE(testMissingInclude3);
@@ -262,58 +355,53 @@ class TestPreprocessor : public TestFixture {
         TEST_CASE(testMissingSystemInclude5);
         TEST_CASE(testMissingIncludeMixed);
         TEST_CASE(testMissingIncludeCheckConfig);
-    }
 
-    // TODO: merge with `PreprocessorHelper::getcode()`
-    void preprocess(const char* code, std::map<std::string, std::string>& actual, const char filename[] = "file.c") {
-        errout.str("");
-        std::istringstream istr(code);
-        simplecpp::OutputList outputList;
-        std::vector<std::string> files;
-        simplecpp::TokenList tokens(istr, files, Path::simplifyPath(filename), &outputList);
-        tokens.removeComments();
-        preprocessor0.simplifyPragmaAsm(&tokens);
-        preprocessor0.removeComments();
-        preprocessor0.setDirectives(tokens);
+        TEST_CASE(hasInclude);
 
-        preprocessor0.reportOutput(outputList, true);
+        TEST_CASE(limitsDefines);
 
-        if (Preprocessor::hasErrors(outputList))
-            return;
+        TEST_CASE(hashCalculation);
 
-        const std::set<std::string> configs(preprocessor0.getConfigs(tokens));
-        for (const std::string & config : configs) {
-            try {
-                const std::string &cfgcode = preprocessor0.getcode(tokens, config, files, std::string(code).find("#file") != std::string::npos);
-                actual[config] = cfgcode;
-            } catch (const simplecpp::Output &) {
-                actual[config] = "";
-            }
-        }
+        TEST_CASE(standard);
 
-        // Since "files" is a local variable the tracking info must be cleared..
-        preprocessor0.mMacroUsage.clear();
-        preprocessor0.mIfCond.clear();
+        TEST_CASE(writeLocations);
+
+        TEST_CASE(pragmaAsm);
     }
 
-    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);
-        Preprocessor preprocessor(settings, this);
+        if (library)
+            ASSERT(settings.library.load("", library, false).errorcode == Library::ErrorCode::OK);
         std::vector<std::string> files;
-        std::istringstream istr(filedata);
-        simplecpp::TokenList tokens(istr,files);
-        tokens.removeComments();
-        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); // TODO: do we need to consider #file?
+        ASSERT(preprocessor.loadFiles(files));
+        ASSERT(!preprocessor.reportOutput(outputList, true));
+        preprocessor.removeComments();
+        const std::set<std::string> configs = preprocessor.getConfigs();
         std::string ret;
         for (const std::string & config : configs)
             ret += config + '\n';
         return ret;
     }
 
+    template<size_t size>
+    std::size_t getHash(const char (&code)[size]) {
+        std::vector<std::string> files;
+        simplecpp::TokenList tokens(code,files,"test.c");
+        Preprocessor preprocessor(tokens, settingsDefault, *this, Standards::Language::C); // TODO: do we need to consider #file?
+        ASSERT(preprocessor.loadFiles(files));
+        preprocessor.removeComments();
+        return preprocessor.calculateHash("");
+    }
+
     void Bug2190219() {
         const char filedata[] = "#ifdef __cplusplus\n"
                                 "cpp\n"
@@ -323,23 +411,21 @@ class TestPreprocessor : public TestFixture {
 
         {
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual, "file.cpp");
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata, "file.cpp");
 
             // Compare results..
             ASSERT_EQUALS(1U, actual.size());
-            ASSERT_EQUALS("\ncpp", actual[""]);
+            ASSERT_EQUALS("\ncpp", actual.at(""));
         }
 
         {
             // Ticket #7102 - skip __cplusplus in C code
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual, "file.c");
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata, "file.c");
 
             // Compare results..
             ASSERT_EQUALS(1U, actual.size());
-            ASSERT_EQUALS("\n\n\nc", actual[""]);
+            ASSERT_EQUALS("\n\n\nc", actual.at(""));
         }
     }
 
@@ -365,49 +451,39 @@ class TestPreprocessor : public TestFixture {
     }
 
     void error3() {
-        errout.str("");
-        Settings settings;
-        settings.userDefines = "__cplusplus";
-        Preprocessor preprocessor(settings, this);
-        const std::string code("#error hello world!\n");
-        PreprocessorHelper::getcode(preprocessor, code, "X", "test.c");
-        ASSERT_EQUALS("[test.c:1]: (error) #error hello world!\n", errout.str());
+        const auto settings = dinit(Settings, $.userDefines = "__cplusplus");
+        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
         {
-            errout.str("");
-            Settings settings;
-            settings.userDefines = "TEST";
-            Preprocessor preprocessor(settings, this);
-            const std::string code("#file \"ab.h\"\n#error hello world!\n#endfile");
-            PreprocessorHelper::getcode(preprocessor, code, "TEST", "test.c");
-            ASSERT_EQUALS("[ab.h:1]: (error) #error hello world!\n", errout.str());
+            const auto settings = dinit(Settings, $.userDefines = "TEST");
+            const char code[] = "#file \"ab.h\"\n#error hello world!\n#endfile";
+            (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
         {
-            errout.str("");
-            Settings settings;
-            settings.userDefines = "TEST";
-            Preprocessor preprocessor(settings, this);
-            const std::string code("#file \"ab.h\"\n\n#endfile\n#error aaa");
-            PreprocessorHelper::getcode(preprocessor, code, "TEST", "test.c");
-            ASSERT_EQUALS("[test.c:2]: (error) #error aaa\n", errout.str());
+            const auto settings = dinit(Settings, $.userDefines = "TEST");
+            const char code[] = "#file \"ab.h\"\n\n#endfile\n#error aaa";
+            (void)getcodeforcfg(settings, *this, code, "TEST", "test.c");
+            ASSERT_EQUALS("[test.c:2:2]: (error) #error aaa [preprocessorErrorDirective]\n", errout_str());
         }
     }
 
     void error5() {
-        errout.str("");
-        Settings settings;
-        settings.userDefines = "FOO";
-        settings.force = true; // No message if --force is given
-        Preprocessor preprocessor(settings, this);
-        const std::string code("#error hello world!\n");
-        PreprocessorHelper::getcode(preprocessor, code, "X", "test.c");
-        ASSERT_EQUALS("", errout.str());
+        // No message if --force is given
+        const auto settings = dinit(Settings,
+                                    $.userDefines = "TEST",
+                                        $.force = true);
+        const char code[] = "#error hello world!\n";
+        (void)getcodeforcfg(settings, *this, code, "X", "test.c");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void error6() {
@@ -474,24 +550,25 @@ 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..
         {
-            const Settings settings = settingsBuilder().platform(cppcheck::Platform::Type::Unix32).build();
-            Preprocessor preprocessor(settings, this);
-            preprocessor.setPlatformInfo(&tokens);
-            ASSERT_EQUALS("\n1", preprocessor.getcode(tokens, "", files, false));
+            std::vector<std::string> files;
+            simplecpp::TokenList tokens(filedata, files, "test.c");
+            const Settings settings = settingsBuilder().platform(Platform::Type::Unix32).build();
+            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..
         {
-            const Settings settings = settingsBuilder().platform(cppcheck::Platform::Type::Unix64).build();
-            Preprocessor preprocessor(settings, this);
-            preprocessor.setPlatformInfo(&tokens);
-            ASSERT_EQUALS("\n\n\n2", preprocessor.getcode(tokens, "", files, false));
+            std::vector<std::string> files;
+            simplecpp::TokenList tokens(filedata, files, "test.c");
+            const Settings settings = settingsBuilder().platform(Platform::Type::Unix64).build();
+            Preprocessor preprocessor(tokens, settings, *this, Path::identify(tokens.getFiles()[0], false));
+            preprocessor.setPlatformInfo();
+            ASSERT_EQUALS("\n\n\n2", preprocessor.getcode("", files, false));
         }
     }
 
@@ -529,13 +606,12 @@ class TestPreprocessor : public TestFixture {
                                 "int main() {}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        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[""]);
-        ASSERT_EQUALS("\n#line 1 \"abc.h\"\nclass A { } ;\n#line 4 \"file.c\"\n int main ( ) { }", actual["ABC"]);
+        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"));
     }
 
     void if0() {
@@ -582,7 +658,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() {
@@ -748,8 +824,7 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => don't crash..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        (void)getcode(settings0, *this, filedata);
     }
 
     void if_cond11() {
@@ -758,9 +833,8 @@ class TestPreprocessor : public TestFixture {
                                 "#elif FLT_MANT_DIG < W_TYPE_SIZE\n"
                                 "#endif\n"
                                 "#endif\n";
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
-        ASSERT_EQUALS("", errout.str());
+        (void)getcode(settings0, *this, filedata);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void if_cond12() {
@@ -802,86 +876,83 @@ 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";
-        std::map<std::string, std::string> actual;
-        preprocess(code, actual);
+        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";
-        std::map<std::string, std::string> actual;
-        preprocess(code, actual);
+        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[""]);
+        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\");";
-        std::map<std::string, std::string> actual;
-        preprocess(code, actual);
+        const char code[] = "__asm__ \n"
+                            "{ int extern __value) 0; (double return (\"\" } extern\n"
+                            "__typeof __finite (__finite) __finite __inline \"__GI___finite\");";
+        (void)getcode(settings0, *this, code);
     }
 
-    void macro_simple1() const {
+    void macro_simple1() {
         {
             const char filedata[] = "#define AAA(aa) f(aa)\n"
                                     "AAA(5);\n";
-            ASSERT_EQUALS("\nf ( 5 ) ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\nf ( 5 ) ;", expandMacros(filedata, *this));
         }
 
         {
             const char filedata[] = "#define AAA(aa) f(aa)\n"
                                     "AAA (5);\n";
-            ASSERT_EQUALS("\nf ( 5 ) ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\nf ( 5 ) ;", expandMacros(filedata, *this));
         }
     }
 
-    void macro_simple2() const {
+    void macro_simple2() {
         const char filedata[] = "#define min(x,y) x<y?x:y\n"
                                 "min(a(),b());\n";
-        ASSERT_EQUALS("\na ( ) < b ( ) ? a ( ) : b ( ) ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\na ( ) < b ( ) ? a ( ) : b ( ) ;", expandMacros(filedata, *this));
     }
 
-    void macro_simple3() const {
+    void macro_simple3() {
         const char filedata[] = "#define A 4\n"
                                 "A AA\n";
-        ASSERT_EQUALS("\n4 AA", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n4 AA", expandMacros(filedata, *this));
     }
 
-    void macro_simple4() const {
+    void macro_simple4() {
         const char filedata[] = "#define TEMP_1 if( temp > 0 ) return 1;\n"
                                 "TEMP_1\n";
-        ASSERT_EQUALS("\nif ( temp > 0 ) return 1 ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nif ( temp > 0 ) return 1 ;", expandMacros(filedata, *this));
     }
 
-    void macro_simple5() const {
+    void macro_simple5() {
         const char filedata[] = "#define ABC if( temp > 0 ) return 1;\n"
                                 "\n"
                                 "void foo()\n"
@@ -889,132 +960,132 @@ class TestPreprocessor : public TestFixture {
                                 "    int temp = 0;\n"
                                 "    ABC\n"
                                 "}\n";
-        ASSERT_EQUALS("\n\nvoid foo ( )\n{\nint temp = 0 ;\nif ( temp > 0 ) return 1 ;\n}", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n\nvoid foo ( )\n{\nint temp = 0 ;\nif ( temp > 0 ) return 1 ;\n}", expandMacros(filedata, *this));
     }
 
-    void macro_simple6() const {
+    void macro_simple6() {
         const char filedata[] = "#define ABC (a+b+c)\n"
                                 "ABC\n";
-        ASSERT_EQUALS("\n( a + b + c )", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n( a + b + c )", expandMacros(filedata, *this));
     }
 
-    void macro_simple7() const {
+    void macro_simple7() {
         const char filedata[] = "#define ABC(str) str\n"
                                 "ABC(\"(\")\n";
-        ASSERT_EQUALS("\n\"(\"", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n\"(\"", expandMacros(filedata, *this));
     }
 
-    void macro_simple8() const {
+    void macro_simple8() {
         const char filedata[] = "#define ABC 123\n"
                                 "#define ABCD 1234\n"
                                 "ABC ABCD\n";
-        ASSERT_EQUALS("\n\n123 1234", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n\n123 1234", expandMacros(filedata, *this));
     }
 
-    void macro_simple9() const {
+    void macro_simple9() {
         const char filedata[] = "#define ABC(a) f(a)\n"
                                 "ABC( \"\\\"\" );\n"
                                 "ABC( \"g\" );\n";
-        ASSERT_EQUALS("\nf ( \"\\\"\" ) ;\nf ( \"g\" ) ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nf ( \"\\\"\" ) ;\nf ( \"g\" ) ;", expandMacros(filedata, *this));
     }
 
-    void macro_simple10() const {
+    void macro_simple10() {
         const char filedata[] = "#define ABC(t) t x\n"
                                 "ABC(unsigned long);\n";
-        ASSERT_EQUALS("\nunsigned long x ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nunsigned long x ;", expandMacros(filedata, *this));
     }
 
-    void macro_simple11() const {
+    void macro_simple11() {
         const char filedata[] = "#define ABC(x) delete x\n"
                                 "ABC(a);\n";
-        ASSERT_EQUALS("\ndelete a ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\ndelete a ;", expandMacros(filedata, *this));
     }
 
-    void macro_simple12() const {
+    void macro_simple12() {
         const char filedata[] = "#define AB ab.AB\n"
                                 "AB.CD\n";
-        ASSERT_EQUALS("\nab . AB . CD", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nab . AB . CD", expandMacros(filedata, *this));
     }
 
-    void macro_simple13() const {
+    void macro_simple13() {
         const char filedata[] = "#define TRACE(x)\n"
                                 "TRACE(;if(a))\n";
-        ASSERT_EQUALS("", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("", expandMacros(filedata, *this));
     }
 
-    void macro_simple14() const {
+    void macro_simple14() {
         const char filedata[] = "#define A \"  a  \"\n"
                                 "printf(A);\n";
-        ASSERT_EQUALS("\nprintf ( \"  a  \" ) ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nprintf ( \"  a  \" ) ;", expandMacros(filedata, *this));
     }
 
-    void macro_simple15() const {
+    void macro_simple15() {
         const char filedata[] = "#define FOO\"foo\"\n"
                                 "FOO\n";
-        ASSERT_EQUALS("\n\"foo\"", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n\"foo\"", expandMacros(filedata, *this));
     }
 
-    void macro_simple16() const {  // # 4703
+    void macro_simple16() {  // # 4703
         const char filedata[] = "#define MACRO( A, B, C ) class A##B##C##Creator {};\n"
                                 "MACRO( B\t, U , G )";
-        ASSERT_EQUALS("\nclass BUGCreator { } ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nclass BUGCreator { } ;", expandMacros(filedata, *this));
     }
 
-    void macro_simple17() const {  // # 5074 - the Token::isExpandedMacro() doesn't always indicate properly if token comes from macro
+    void macro_simple17() {  // # 5074 - the Token::isExpandedMacro() doesn't always indicate properly if token comes from macro
         // 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)";
-        ASSERT_EQUALS("\n123 + 123", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n123 + 123", expandMacros(filedata, *this));
     }
 
-    void macro_simple18() const {  // (1e-7)
+    void macro_simple18() {  // (1e-7)
         const char filedata1[] = "#define A (1e-7)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( 1e-7 ) ;", OurPreprocessor::expandMacros(filedata1));
+        ASSERT_EQUALS("\na = ( 1e-7 ) ;", expandMacros(filedata1, *this));
 
         const char filedata2[] = "#define A (1E-7)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( 1E-7 ) ;", OurPreprocessor::expandMacros(filedata2));
+        ASSERT_EQUALS("\na = ( 1E-7 ) ;", expandMacros(filedata2, *this));
 
         const char filedata3[] = "#define A (1e+7)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( 1e+7 ) ;", OurPreprocessor::expandMacros(filedata3));
+        ASSERT_EQUALS("\na = ( 1e+7 ) ;", expandMacros(filedata3, *this));
 
         const char filedata4[] = "#define A (1.e+7)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( 1.e+7 ) ;", OurPreprocessor::expandMacros(filedata4));
+        ASSERT_EQUALS("\na = ( 1.e+7 ) ;", expandMacros(filedata4, *this));
 
         const char filedata5[] = "#define A (1.7f)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( 1.7f ) ;", OurPreprocessor::expandMacros(filedata5));
+        ASSERT_EQUALS("\na = ( 1.7f ) ;", expandMacros(filedata5, *this));
 
         const char filedata6[] = "#define A (.1)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( .1 ) ;", OurPreprocessor::expandMacros(filedata6));
+        ASSERT_EQUALS("\na = ( .1 ) ;", expandMacros(filedata6, *this));
 
         const char filedata7[] = "#define A (1.)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( 1. ) ;", OurPreprocessor::expandMacros(filedata7));
+        ASSERT_EQUALS("\na = ( 1. ) ;", expandMacros(filedata7, *this));
 
         const char filedata8[] = "#define A (8.0E+007)\n"
                                  "a=A;";
-        ASSERT_EQUALS("\na = ( 8.0E+007 ) ;", OurPreprocessor::expandMacros(filedata8));
+        ASSERT_EQUALS("\na = ( 8.0E+007 ) ;", expandMacros(filedata8, *this));
     }
 
-    void macroInMacro1() const {
+    void macroInMacro1() {
         {
             const char filedata[] = "#define A(m) long n = m; n++;\n"
                                     "#define B(n) A(n)\n"
                                     "B(0)\n";
-            ASSERT_EQUALS("\n\nlong n = 0 ; n ++ ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\nlong n = 0 ; n ++ ;", expandMacros(filedata, *this));
         }
 
         {
             const char filedata[] = "#define A B\n"
                                     "#define B 3\n"
                                     "A\n";
-            ASSERT_EQUALS("\n\n3", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n3", expandMacros(filedata, *this));
         }
 
         {
@@ -1025,34 +1096,34 @@ class TestPreprocessor : public TestFixture {
                                     "ABC(2,3);\n"
                                     "ABC(4,5,6);\n";
 
-            ASSERT_EQUALS("\n\n\n1 + 0 * 0 ;\n2 + 03 * 0 ;\n4 + 05 * 06 ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n\n1 + 0 * 0 ;\n2 + 03 * 0 ;\n4 + 05 * 06 ;", expandMacros(filedata, *this));
         }
 
         {
             const char filedata[] = "#define A 4\n"
                                     "#define B(a) a,A\n"
                                     "B(2);\n";
-            ASSERT_EQUALS("\n\n2 , 4 ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n2 , 4 ;", expandMacros(filedata, *this));
         }
 
         {
             const char filedata[] = "#define A(x) (x)\n"
                                     "#define B )A(\n"
                                     "#define C )A(\n";
-            ASSERT_EQUALS("", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("", expandMacros(filedata, *this));
         }
 
         {
             const char filedata[] = "#define A(x) (x*2)\n"
                                     "#define B A(\n"
                                     "foo B(i));\n";
-            ASSERT_EQUALS("\n\nfoo ( ( i ) * 2 ) ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\nfoo ( ( i ) * 2 ) ;", expandMacros(filedata, *this));
         }
 
         {
             const char filedata[] = "#define foo foo\n"
                                     "foo\n";
-            ASSERT_EQUALS("\nfoo", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\nfoo", expandMacros(filedata, *this));
         }
 
         {
@@ -1061,7 +1132,7 @@ class TestPreprocessor : public TestFixture {
                 "#define A(name) void foo##name() { do { B(1, 2); }\n"
                 "A(0)\n"
                 "A(1)\n";
-            ASSERT_EQUALS("\n\nvoid foo0 ( ) { do { } while ( 0 ) ; }\nvoid foo1 ( ) { do { } while ( 0 ) ; }", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\nvoid foo0 ( ) { do { } while ( 0 ) ; }\nvoid foo1 ( ) { do { } while ( 0 ) ; }", expandMacros(filedata, *this));
         }
 
         {
@@ -1069,7 +1140,7 @@ class TestPreprocessor : public TestFixture {
                 "#define B(x) (\n"
                 "#define A() B(xx)\n"
                 "B(1) A() ) )\n";
-            ASSERT_EQUALS("\n\n( ( ) )", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n( ( ) )", expandMacros(filedata, *this));
         }
 
         {
@@ -1077,25 +1148,25 @@ class TestPreprocessor : public TestFixture {
                 "#define PTR1 (\n"
                 "#define PTR2 PTR1 PTR1\n"
                 "int PTR2 PTR2 foo )))) = 0;\n";
-            ASSERT_EQUALS("\n\nint ( ( ( ( foo ) ) ) ) = 0 ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\nint ( ( ( ( foo ) ) ) ) = 0 ;", expandMacros(filedata, *this));
         }
 
         {
             const char filedata[] =
                 "#define PTR1 (\n"
                 "PTR1 PTR1\n";
-            ASSERT_EQUALS("\n( (", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n( (", expandMacros(filedata, *this));
         }
     }
 
-    void macroInMacro2() const {
+    void macroInMacro2() {
         const char filedata[] = "#define A(x) a##x\n"
                                 "#define B 0\n"
                                 "A(B)\n";
-        ASSERT_EQUALS("\n\naB", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n\naB", expandMacros(filedata, *this));
     }
 
-    void macro_linenumbers() const {
+    void macro_linenumbers() {
         const char filedata[] = "#define AAA(a)\n"
                                 "AAA(5\n"
                                 "\n"
@@ -1106,23 +1177,23 @@ class TestPreprocessor : public TestFixture {
                       "\n"
                       "\n"
                       "int a ;",
-                      OurPreprocessor::expandMacros(filedata));
+                      expandMacros(filedata, *this));
     }
 
-    void macro_nopar() const {
+    void macro_nopar() {
         const char filedata[] = "#define AAA( ) { NULL }\n"
                                 "AAA()\n";
-        ASSERT_EQUALS("\n{ NULL }", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n{ NULL }", expandMacros(filedata, *this));
     }
 
-    void macro_incdec() const {
+    void macro_incdec() {
         const char filedata[] = "#define M1(X) 1+X\n"
                                 "#define M2(X) 2-X\n"
                                 "M1(+1) M2(-1)\n";
-        ASSERT_EQUALS("\n\n1 + + 1 2 - - 1", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n\n1 + + 1 2 - - 1", expandMacros(filedata, *this));
     }
 
-    void macro_switchCase() const {
+    void macro_switchCase() {
         {
             // Make sure "case 2" doesn't become "case2"
             const char filedata[] = "#define A( b ) "
@@ -1131,14 +1202,14 @@ class TestPreprocessor : public TestFixture {
                                     " break; "
                                     "}\n"
                                     "A( 5 );\n";
-            ASSERT_EQUALS("\nswitch ( a ) { case 2 : break ; } ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\nswitch ( a ) { case 2 : break ; } ;", expandMacros(filedata, *this));
         }
 
         {
             // Make sure "2 BB" doesn't become "2BB"
             const char filedata[] = "#define A() AA : 2 BB\n"
                                     "A();\n";
-            ASSERT_EQUALS("\nAA : 2 BB ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\nAA : 2 BB ;", expandMacros(filedata, *this));
         }
 
         {
@@ -1146,7 +1217,7 @@ class TestPreprocessor : public TestFixture {
                                     "#define B() A\n"
                                     "#define C( a ) B() break;\n"
                                     "{C( 2 );\n";
-            ASSERT_EQUALS("\n\n\n{ } break ; ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n\n{ } break ; ;", expandMacros(filedata, *this));
         }
 
 
@@ -1155,7 +1226,7 @@ class TestPreprocessor : public TestFixture {
                                     "#define B() A\n"
                                     "#define C( a ) B() _break;\n"
                                     "{C( 2 );\n";
-            ASSERT_EQUALS("\n\n\n{ } _break ; ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n\n{ } _break ; ;", expandMacros(filedata, *this));
         }
 
 
@@ -1164,14 +1235,14 @@ class TestPreprocessor : public TestFixture {
                                     "#define B() A\n"
                                     "#define C( a ) B() 5;\n"
                                     "{C( 2 );\n";
-            ASSERT_EQUALS("\n\n\n{ } 5 ; ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n\n{ } 5 ; ;", expandMacros(filedata, *this));
         }
     }
 
-    void macro_NULL() const {
+    void macro_NULL() {
         // See ticket #4482 - UB when passing NULL to variadic function
-        ASSERT_EQUALS("\n0", OurPreprocessor::expandMacros("#define null 0\nnull"));
-        TODO_ASSERT_EQUALS("\nNULL", "\n0", OurPreprocessor::expandMacros("#define NULL 0\nNULL")); // TODO: Let the tokenizer handle NULL?
+        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?
     }
 
     void string1() {
@@ -1181,27 +1252,26 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("int main ( ) { const char * a = \"#define A\" ; }", actual[""]);
+        ASSERT_EQUALS("int main ( ) { const char * a = \"#define A\" ; }", actual.at(""));
     }
 
-    void string2() const {
+    void string2() {
         const char filedata[] = "#define AAA 123\n"
                                 "str = \"AAA\"\n";
 
         // Compare results..
-        ASSERT_EQUALS("\nstr = \"AAA\"", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nstr = \"AAA\"", expandMacros(filedata, *this));
     }
 
-    void string3() const {
+    void string3() {
         const char filedata[] = "str(\";\");\n";
 
         // Compare results..
-        ASSERT_EQUALS("str ( \";\" ) ;", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("str ( \";\" ) ;", expandMacros(filedata, *this));
     }
 
 
@@ -1213,7 +1283,7 @@ class TestPreprocessor : public TestFixture {
                                     "AAA\n";
 
             // Compare results..
-            ASSERT_EQUALS("\n\n\nchar b = 0 ;", OurPreprocessor::expandMacros(filedata));
+            ASSERT_EQUALS("\n\n\nchar b = 0 ;", expandMacros(filedata, *this));
         }
 
         {
@@ -1222,48 +1292,48 @@ class TestPreprocessor : public TestFixture {
                                     "#undef z\n"
                                     "int z;\n"
                                     "z = 0;\n";
-            ASSERT_EQUALS("\n\nint z ;\nz = 0 ;", PreprocessorHelper::getcode(preprocessor0, filedata, "", ""));
+            ASSERT_EQUALS("\n\nint z ;\nz = 0 ;", getcodeforcfg(settings0, *this, filedata, "", "test.c"));
         }
     }
 
-    void defdef() const {
+    void defdef() {
         const char filedata[] = "#define AAA 123\n"
                                 "#define AAA 456\n"
                                 "#define AAA 789\n"
                                 "AAA\n";
 
         // Compare results..
-        ASSERT_EQUALS("\n\n\n789", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n\n\n789", expandMacros(filedata, *this));
     }
 
-    void preprocessor_doublesharp() const {
+    void preprocessor_doublesharp() {
         // simple testcase without ##
         const char filedata1[] = "#define TEST(var,val) var = val\n"
                                  "TEST(foo,20);\n";
-        ASSERT_EQUALS("\nfoo = 20 ;", OurPreprocessor::expandMacros(filedata1));
+        ASSERT_EQUALS("\nfoo = 20 ;", expandMacros(filedata1, *this));
 
         // simple testcase with ##
         const char filedata2[] = "#define TEST(var,val) var##_##val = val\n"
                                  "TEST(foo,20);\n";
-        ASSERT_EQUALS("\nfoo_20 = 20 ;", OurPreprocessor::expandMacros(filedata2));
+        ASSERT_EQUALS("\nfoo_20 = 20 ;", expandMacros(filedata2, *this));
 
         // concat macroname
         const char filedata3[] = "#define ABCD 123\n"
                                  "#define A(B) A##B\n"
                                  "A(BCD)\n";
-        ASSERT_EQUALS("\n\n123", OurPreprocessor::expandMacros(filedata3));
+        ASSERT_EQUALS("\n\n123", expandMacros(filedata3, *this));
 
         // Ticket #1802 - inner ## must be expanded before outer macro
         const char filedata4[] = "#define A(B) A##B\n"
                                  "#define a(B) A(B)\n"
                                  "a(A(B))\n";
-        ASSERT_EQUALS("\n\nAAB", OurPreprocessor::expandMacros(filedata4));
+        ASSERT_EQUALS("\n\nAAB", expandMacros(filedata4, *this));
 
         // Ticket #1802 - inner ## must be expanded before outer macro
         const char filedata5[] = "#define AB(A,B) A##B\n"
                                  "#define ab(A,B) AB(A,B)\n"
                                  "ab(a,AB(b,c))\n";
-        ASSERT_EQUALS("\n\nabc", OurPreprocessor::expandMacros(filedata5));
+        ASSERT_EQUALS("\n\nabc", expandMacros(filedata5, *this));
 
         // Ticket #1802
         const char filedata6[] = "#define AB_(A,B) A ## B\n"
@@ -1271,7 +1341,7 @@ class TestPreprocessor : public TestFixture {
                                  "#define ab(suf) AB(X, AB_(_, suf))\n"
                                  "#define X x\n"
                                  "ab(y)\n";
-        ASSERT_EQUALS("\n\n\n\nx_y", OurPreprocessor::expandMacros(filedata6));
+        ASSERT_EQUALS("\n\n\n\nx_y", expandMacros(filedata6, *this));
     }
 
 
@@ -1284,57 +1354,53 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("int main ( )\n{\nconst char * a = \"#include <string>\" ;\nreturn 0 ;\n}", actual[""]);
+        ASSERT_EQUALS("int main ( )\n{\nconst char * a = \"#include <string>\" ;\nreturn 0 ;\n}", actual.at(""));
     }
 
-
-
-
-    void va_args_1() const {
+    void va_args_1() {
         const char filedata[] = "#define DBG(fmt...) printf(fmt)\n"
                                 "DBG(\"[0x%lx-0x%lx)\", pstart, pend);\n";
 
         // Preprocess..
-        std::string actual = OurPreprocessor::expandMacros(filedata);
+        std::string actual = expandMacros(filedata, *this);
 
         ASSERT_EQUALS("\nprintf ( \"[0x%lx-0x%lx)\" , pstart , pend ) ;", actual);
     }
     /*
-        void va_args_2() const {
+        void va_args_2() {
             const char filedata[] = "#define DBG(fmt, args...) printf(fmt, ## args)\n"
                                     "DBG(\"hello\");\n";
 
             // Preprocess..
-            std::string actual = OurPreprocessor::expandMacros(filedata);
+            std::string actual = expandMacros(filedata, *this);
 
             // invalid code ASSERT_EQUALS("\nprintf ( \"hello\" ) ;", actual);
         }
      */
-    void va_args_3() const {
+    void va_args_3() {
         const char filedata[] = "#define FRED(...) { fred(__VA_ARGS__); }\n"
                                 "FRED(123)\n";
-        ASSERT_EQUALS("\n{ fred ( 123 ) ; }", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\n{ fred ( 123 ) ; }", expandMacros(filedata, *this));
     }
 
-    void va_args_4() const {
+    void va_args_4() {
         const char filedata[] = "#define FRED(name, ...) name (__VA_ARGS__)\n"
                                 "FRED(abc, 123)\n";
-        ASSERT_EQUALS("\nabc ( 123 )", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\nabc ( 123 )", expandMacros(filedata, *this));
     }
 
-    void va_args_5() const {
+    void va_args_5() {
         const char filedata1[] = "#define A(...) #__VA_ARGS__\n"
                                  "A(123)\n";
-        ASSERT_EQUALS("\n\"123\"", OurPreprocessor::expandMacros(filedata1));
+        ASSERT_EQUALS("\n\"123\"", expandMacros(filedata1, *this));
 
         const char filedata2[] = "#define A(X,...) X(#__VA_ARGS__)\n"
                                  "A(f,123)\n";
-        ASSERT_EQUALS("\nf ( \"123\" )", OurPreprocessor::expandMacros(filedata2));
+        ASSERT_EQUALS("\nf ( \"123\" )", expandMacros(filedata2, *this));
     }
 
 
@@ -1348,61 +1414,60 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("\nint main ( )\n{\nif ( $'ABCD' == 0 ) ;\nreturn 0 ;\n}", actual[""]);
+        ASSERT_EQUALS("\nint main ( )\n{\nif ( $'ABCD' == 0 ) ;\nreturn 0 ;\n}", actual.at(""));
     }
 
 
-    void stringify() const {
+    void stringify() {
         const char filedata[] = "#define STRINGIFY(x) #x\n"
                                 "STRINGIFY(abc)\n";
 
         // expand macros..
-        std::string actual = OurPreprocessor::expandMacros(filedata);
+        std::string actual = expandMacros(filedata, *this);
 
         ASSERT_EQUALS("\n\"abc\"", actual);
     }
 
-    void stringify2() const {
+    void stringify2() {
         const char filedata[] = "#define A(x) g(#x)\n"
                                 "A(abc);\n";
 
         // expand macros..
-        std::string actual = OurPreprocessor::expandMacros(filedata);
+        std::string actual = expandMacros(filedata, *this);
 
         ASSERT_EQUALS("\ng ( \"abc\" ) ;", actual);
     }
 
-    void stringify3() const {
+    void stringify3() {
         const char filedata[] = "#define A(x) g(#x)\n"
                                 "A( abc);\n";
 
         // expand macros..
-        std::string actual = OurPreprocessor::expandMacros(filedata);
+        std::string actual = expandMacros(filedata, *this);
 
         ASSERT_EQUALS("\ng ( \"abc\" ) ;", actual);
     }
 
-    void stringify4() const {
+    void stringify4() {
         const char filedata[] = "#define A(x) #x\n"
                                 "1 A(\n"
                                 "abc\n"
                                 ") 2\n";
 
         // expand macros..
-        std::string actual = OurPreprocessor::expandMacros(filedata);
+        std::string actual = expandMacros(filedata, *this);
 
         ASSERT_EQUALS("\n1 \"abc\"\n\n2", actual);
     }
 
-    void stringify5() const {
+    void stringify5() {
         const char filedata[] = "#define A(x) a(#x,x)\n"
                                 "A(foo(\"\\\"\"))\n";
-        ASSERT_EQUALS("\na ( \"foo(\\\"\\\\\\\"\\\")\" , foo ( \"\\\"\" ) )", OurPreprocessor::expandMacros(filedata));
+        ASSERT_EQUALS("\na ( \"foo(\\\"\\\\\\\"\\\")\" , foo ( \"\\\"\" ) )", expandMacros(filedata, *this));
     }
 
     void pragma() {
@@ -1412,12 +1477,11 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("\nvoid f ( )\n{\n}", actual[""]);
+        ASSERT_EQUALS("\nvoid f ( )\n{\n}", actual.at(""));
     }
 
     void pragma_asm_1() {
@@ -1431,12 +1495,11 @@ class TestPreprocessor : public TestFixture {
                                 "bbb";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("asm ( )\n;\n\naaa\nasm ( ) ;\n\n\nbbb", actual[""]);
+        ASSERT_EQUALS("asm ( )\n;\n\naaa\nasm ( ) ;\n\n\nbbb", actual.at(""));
     }
 
     void pragma_asm_2() {
@@ -1446,12 +1509,11 @@ class TestPreprocessor : public TestFixture {
                                 "bbb";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("asm ( )\n;\n\nbbb", actual[""]);
+        ASSERT_EQUALS("asm ( )\n;\n\nbbb", actual.at(""));
     }
 
     void endifsemicolon() {
@@ -1461,14 +1523,13 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        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[""]);
-        ASSERT_EQUALS(expected, actual["A"]);
+        ASSERT_EQUALS(expected, actual.at(""));
+        ASSERT_EQUALS(expected, actual.at("A"));
     }
 
     void handle_error() {
@@ -1482,11 +1543,10 @@ class TestPreprocessor : public TestFixture {
                                     "}\n";
 
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
-            ASSERT_EQUALS("", actual[""]);
-            ASSERT_EQUALS("[file.c:2]: (error) No pair for character ('). Can't process file. File is either invalid or unicode, which is currently not supported.\n", errout.str());
+            ASSERT_EQUALS(0, actual.size());
+            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());
         }
     }
 
@@ -1498,11 +1558,10 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // expand macros..
-            errout.str("");
-            const std::string actual(OurPreprocessor::expandMacros(filedata, this));
+            const std::string actual(expandMacros(filedata, *this));
 
             ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[file.cpp:3]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported.\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());
         }
 
         {
@@ -1512,11 +1571,10 @@ class TestPreprocessor : public TestFixture {
                                     "#endfile\n";
 
             // expand macros..
-            errout.str("");
-            const std::string actual(OurPreprocessor::expandMacros(filedata, this));
+            const std::string actual(expandMacros(filedata, *this));
 
             ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[abc.h:2]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported.\n", errout.str());
+            ASSERT_EQUALS("[abc.h: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());
         }
 
         {
@@ -1526,11 +1584,10 @@ class TestPreprocessor : public TestFixture {
                                     "\"\n";
 
             // expand macros..
-            errout.str("");
-            const std::string actual(OurPreprocessor::expandMacros(filedata, this));
+            const std::string actual(expandMacros(filedata, *this));
 
             ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[file.cpp:2]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported.\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());
         }
 
         {
@@ -1539,11 +1596,10 @@ class TestPreprocessor : public TestFixture {
                                     "int a = A;\n";
 
             // expand macros..
-            errout.str("");
-            const std::string actual(OurPreprocessor::expandMacros(filedata, this));
+            const std::string actual(expandMacros(filedata, *this));
 
             ASSERT_EQUALS("", actual);
-            ASSERT_EQUALS("[file.cpp:2]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported.\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());
         }
 
         {
@@ -1557,10 +1613,9 @@ class TestPreprocessor : public TestFixture {
                                     "}\n";
 
             // expand macros..
-            errout.str("");
-            OurPreprocessor::expandMacros(filedata, this);
+            (void)expandMacros(filedata, *this);
 
-            ASSERT_EQUALS("[file.cpp:7]: (error) No pair for character (\"). Can't process file. File is either invalid or unicode, which is currently not supported.\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());
         }
     }
 
@@ -1572,13 +1627,12 @@ class TestPreprocessor : public TestFixture {
                                 "  }\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("\nvoid f ( ) {\n$g $( ) ;\n}", actual[""]);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("\nvoid f ( ) {\n$g $( ) ;\n}", actual.at(""));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void conditionalDefine() {
@@ -1590,18 +1644,16 @@ class TestPreprocessor : public TestFixture {
                                 "N";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        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[""]);
-        ASSERT_EQUALS("\n\n\n\n\n$10", actual["A"]);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("\n\n\n\n\n$20", actual.at(""));
+        ASSERT_EQUALS("\n\n\n\n\n$10", actual.at("A"));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void macro_parameters() {
-        errout.str("");
         const char filedata[] = "#define BC(a, b, c, arg...) \\\n"
                                 "AB(a, b, c, ## arg)\n"
                                 "\n"
@@ -1611,13 +1663,12 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("", actual[""]);
-        ASSERT_EQUALS("[file.c:6]: (error) failed to expand 'BC', Wrong number of parameters for macro 'BC'.\n", errout.str());
+        ASSERT_EQUALS("", actual.at(""));
+        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() {
@@ -1628,13 +1679,12 @@ class TestPreprocessor : public TestFixture {
                                 "}\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1, actual.size());
-        ASSERT_EQUALS("\nvoid f ( )\n{\n$printf $( \"\\n\" $) ;\n}", actual[""]);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("\nvoid f ( )\n{\n$printf $( \"\\n\" $) ;\n}", actual.at(""));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ifdef_ifdefined() {
@@ -1646,13 +1696,12 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
-        ASSERT_EQUALS("", actual[""]);
-        ASSERT_EQUALS("\nA\n\n\nA", actual["ABC"]);
         ASSERT_EQUALS(2, actual.size());
+        ASSERT_EQUALS("", actual.at(""));
+        ASSERT_EQUALS("\nA\n\n\nA", actual.at("ABC"));
     }
 
     void define_if1() {
@@ -1661,14 +1710,14 @@ class TestPreprocessor : public TestFixture {
                                     "#if A\n"
                                     "FOO\n"
                                     "#endif";
-            ASSERT_EQUALS("", PreprocessorHelper::getcode(preprocessor0, filedata,"",""));
+            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(preprocessor0, filedata,"",""));
+            ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
     }
 
@@ -1678,7 +1727,7 @@ class TestPreprocessor : public TestFixture {
                                 "#if (B==A) || (B==C)\n"
                                 "FOO\n"
                                 "#endif";
-        ASSERT_EQUALS("\n\n\nFOO", PreprocessorHelper::getcode(preprocessor0, filedata,"",""));
+        ASSERT_EQUALS("\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
     void define_if3() {
@@ -1686,7 +1735,7 @@ class TestPreprocessor : public TestFixture {
                                 "#if (A==0)\n"
                                 "FOO\n"
                                 "#endif";
-        ASSERT_EQUALS("\n\nFOO", PreprocessorHelper::getcode(preprocessor0, filedata,"",""));
+        ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
     void define_if4() {
@@ -1694,7 +1743,7 @@ class TestPreprocessor : public TestFixture {
                                 "#if X==123\n"
                                 "FOO\n"
                                 "#endif";
-        ASSERT_EQUALS("\n\nFOO", PreprocessorHelper::getcode(preprocessor0, filedata,"",""));
+        ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
     }
 
     void define_if5() { // #4516 - #define B (A & 0x00f0)
@@ -1704,7 +1753,7 @@ class TestPreprocessor : public TestFixture {
                                     "#if B==0x0010\n"
                                     "FOO\n"
                                     "#endif";
-            ASSERT_EQUALS("\n\n\nFOO", PreprocessorHelper::getcode(preprocessor0, filedata,"",""));
+            ASSERT_EQUALS("\n\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
         {
             const char filedata[] = "#define A 0x00f0\n"
@@ -1713,14 +1762,14 @@ class TestPreprocessor : public TestFixture {
                                     "#if C==0x0010\n"
                                     "FOO\n"
                                     "#endif";
-            ASSERT_EQUALS("\n\n\n\nFOO", PreprocessorHelper::getcode(preprocessor0, filedata,"",""));
+            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(preprocessor0, filedata,"",""));
+            ASSERT_EQUALS("\n\nFOO", getcodeforcfg(settings0, *this, filedata,"","test.c"));
         }
     }
 
@@ -1736,10 +1785,10 @@ class TestPreprocessor : public TestFixture {
                                 "#if B >= 0\n"
                                 "456\n"
                                 "#endif\n";
-        const std::string actualA0 = PreprocessorHelper::getcode(preprocessor0, 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(preprocessor0, 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);
     }
@@ -1754,12 +1803,11 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
-            ASSERT_EQUALS(1, (int)actual.size());
-            ASSERT_EQUALS("\n\n\n\nB", actual[""]);
+            ASSERT_EQUALS(1, actual.size());
+            ASSERT_EQUALS("\n\n\n\nB", actual.at(""));
         }
 
         {
@@ -1769,12 +1817,11 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
-            ASSERT_EQUALS(1, (int)actual.size());
-            ASSERT_EQUALS("\n\n$1", actual[""]);
+            ASSERT_EQUALS(1, actual.size());
+            ASSERT_EQUALS("\n\n$1", actual.at(""));
         }
 
         {
@@ -1784,12 +1831,11 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
-            ASSERT_EQUALS(1, (int)actual.size());
-            ASSERT_EQUALS("\n\n$1", actual[""]);
+            ASSERT_EQUALS(1, actual.size());
+            ASSERT_EQUALS("\n\n$1", actual.at(""));
         }
 
         {
@@ -1799,12 +1845,11 @@ class TestPreprocessor : public TestFixture {
                                     "#endif\n";
 
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
-            ASSERT_EQUALS(1, (int)actual.size());
-            ASSERT_EQUALS("\n\n$1", actual[""]);
+            ASSERT_EQUALS(1, actual.size());
+            ASSERT_EQUALS("\n\n$1", actual.at(""));
         }
 
         {
@@ -1815,12 +1860,11 @@ class TestPreprocessor : public TestFixture {
                                     "A\n";
 
             // Preprocess => actual result..
-            std::map<std::string, std::string> actual;
-            preprocess(filedata, actual);
+            const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
             // Compare results..
-            ASSERT_EQUALS(1, (int)actual.size());
-            ASSERT_EQUALS("\n\n\n\n$1", actual[""]);
+            ASSERT_EQUALS(1, actual.size());
+            ASSERT_EQUALS("\n\n\n\n$1", actual.at(""));
         }
     }
 
@@ -1831,12 +1875,11 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
         ASSERT_EQUALS(1U, actual.size());
-        ASSERT_EQUALS("", actual[""]);
+        ASSERT_EQUALS("", actual.at(""));
     }
 
     void define_ifndef2() {
@@ -1849,8 +1892,8 @@ class TestPreprocessor : public TestFixture {
                                 "B me;\n";
 
         // Preprocess => actual result..
-        ASSERT_EQUALS("\n\n\n\n\n\n$int me ;", PreprocessorHelper::getcode(preprocessor0, filedata, "", "a.cpp"));
-        ASSERT_EQUALS("\n\n\n\n\n\n$char me ;", PreprocessorHelper::getcode(preprocessor0, 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() {
@@ -1860,11 +1903,10 @@ class TestPreprocessor : public TestFixture {
                                 "A(123);";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         ASSERT_EQUALS(1U, actual.size());
-        ASSERT_EQUALS("\n\n\n123 ;", actual[""]);
+        ASSERT_EQUALS("\n\n\n123 ;", actual.at(""));
     }
 
     void undef_ifdef() {
@@ -1874,8 +1916,8 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        ASSERT_EQUALS("", PreprocessorHelper::getcode(preprocessor0, filedata, "", "a.cpp"));
-        ASSERT_EQUALS("", PreprocessorHelper::getcode(preprocessor0, filedata, "A", "a.cpp"));
+        ASSERT_EQUALS("", getcodeforcfg(settings0, *this, filedata, "", "a.cpp"));
+        ASSERT_EQUALS("", getcodeforcfg(settings0, *this, filedata, "A", "a.cpp"));
     }
 
     void redundant_config() {
@@ -1895,11 +1937,10 @@ class TestPreprocessor : public TestFixture {
 
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
-        ASSERT_EQUALS(4, (int)actual.size());
+        ASSERT_EQUALS(4, actual.size());
         ASSERT(actual.find("") != actual.end());
         ASSERT(actual.find("BAR") != actual.end());
         ASSERT(actual.find("FOO") != actual.end());
@@ -1913,12 +1954,11 @@ class TestPreprocessor : public TestFixture {
                                 "#include \"notfound.h\"\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, filedata);
 
         // Compare results..
-        ASSERT_EQUALS("char a [ ] = \"#endfile\" ;\nchar b [ ] = \"#endfile\" ;", actual[""]);
-        ASSERT_EQUALS(1, (int)actual.size());
+        ASSERT_EQUALS(1, actual.size());
+        ASSERT_EQUALS("char a [ ] = \"#endfile\" ;\nchar b [ ] = \"#endfile\" ;", actual.at(""));
     }
 
     void dup_defines() {
@@ -1932,8 +1972,7 @@ class TestPreprocessor : public TestFixture {
                                 "#endif\n";
 
         // Preprocess => actual result..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        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
@@ -1945,30 +1984,26 @@ class TestPreprocessor : public TestFixture {
     }
 
     void invalid_define_1() {
-        std::map<std::string, std::string> actual;
-        preprocess("#define =\n", actual); // don't hang
+        (void)getcode(settings0, *this, "#define =\n");
+        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define [syntaxError]\n", errout_str());
     }
 
     void invalid_define_2() {  // #4036
-        std::map<std::string, std::string> actual;
-        preprocess("#define () {(int f(x) }\n", actual); // don't hang
+        (void)getcode(settings0, *this, "#define () {(int f(x) }\n");
+        ASSERT_EQUALS("[file.c:1:2]: (error) Failed to parse #define [syntaxError]\n", errout_str());
     }
 
     void inline_suppressions() {
-        errout.str("");
+        const auto settings = dinit(Settings,
+                                    $.inlineSuppressions = true,
+                                        $.checks.enable (Checks::missingInclude));
 
-        Settings settings;
-        settings.inlineSuppressions = true;
-        settings.severity.clear();
-        settings.checks.enable(Checks::missingInclude);
-        Preprocessor preprocessor(settings, this);
-
-        const std::string code("// cppcheck-suppress missingInclude\n"
-                               "#include \"missing.h\"\n"
-                               "// cppcheck-suppress missingIncludeSystem\n"
-                               "#include <missing2.h>\n");
-        Suppressions inlineSuppr;
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c", &inlineSuppr);
+        const char code[] = "// cppcheck-suppress missingInclude\n"
+                            "#include \"missing.h\"\n"
+                            "// cppcheck-suppress missingIncludeSystem\n"
+                            "#include <missing2.h>\n";
+        SuppressionList inlineSuppr;
+        (void)getcodeforcfg(settings, *this, code, "", "test.c", &inlineSuppr);
 
         auto suppressions = inlineSuppr.getSuppressions();
         ASSERT_EQUALS(2, suppressions.size());
@@ -1988,28 +2023,62 @@ class TestPreprocessor : public TestFixture {
         ASSERT_EQUALS(4, suppr.lineNumber);
         ASSERT_EQUALS(false, suppr.checked);
         ASSERT_EQUALS(false, suppr.matched);
+
+        ignore_errout(); // we are not interested in the output
+    }
+
+    void remarkComment1() {
+        const char code[] = "// REMARK: assignment with 1\n"
+                            "x=1;\n";
+        const auto remarkComments = getRemarkComments(code, *this);
+        ASSERT_EQUALS(1, remarkComments.size());
+        ASSERT_EQUALS(2, remarkComments[0].lineNumber);
+        ASSERT_EQUALS("assignment with 1", remarkComments[0].str);
+    }
+
+    void remarkComment2() {
+        const char code[] = "x=1; ///REMARK assignment with 1\n";
+        const auto remarkComments = getRemarkComments(code, *this);
+        ASSERT_EQUALS(1, remarkComments.size());
+        ASSERT_EQUALS(1, remarkComments[0].lineNumber);
+        ASSERT_EQUALS("assignment with 1", remarkComments[0].str);
+    }
+
+    void remarkComment3() {
+        const char code[] = "/**   REMARK: assignment with 1 */\n"
+                            "x=1;\n";
+        const auto remarkComments = getRemarkComments(code, *this);
+        ASSERT_EQUALS(1, remarkComments.size());
+        ASSERT_EQUALS(2, remarkComments[0].lineNumber);
+        ASSERT_EQUALS("assignment with 1 ", remarkComments[0].str);
+    }
+
+    void remarkComment4() {
+        const char code[] = "//REMARK /";
+        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(preprocessor0, 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(preprocessor0, src, "X=1", "test.c");
+            std::string actual = getcodeforcfg(settings0, *this, code, "X=1", "test.c");
             ASSERT_EQUALS("", actual);
         }
 
         {
-            std::string actual = PreprocessorHelper::getcode(preprocessor0, 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);
         }
     }
@@ -2021,35 +2090,53 @@ class TestPreprocessor : public TestFixture {
                             "#if (X == Y)\n"
                             "Fred & Wilma\n"
                             "#endif\n";
-        const std::string actual = PreprocessorHelper::getcode(preprocessor0, 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(preprocessor0, 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(preprocessor0, code, "", "test.c"));
-        ASSERT_EQUALS("\n123", PreprocessorHelper::getcode(preprocessor0, code, "", "test.cpp"));
+        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(preprocessor0, code, "", "test.c"));
-        ASSERT_EQUALS("",      PreprocessorHelper::getcode(preprocessor0, code, "", "test.cpp"));
+        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";
+        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(preprocessor0, code, "TEST", "test.c");
+        const std::string actual = getcodeforcfg(settings0, *this, code, "TEST", "test.c");
         ASSERT_EQUALS("", actual);
+        ASSERT_EQUALS("[test.c:1:2]: (error) #elif without #if [syntaxError]\n", errout_str());
     }
 
     void getConfigs1() {
@@ -2194,6 +2281,48 @@ class TestPreprocessor : public TestFixture {
         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 getConfigs14() { // #1059
+        const char filedata[] = "#if A >= 1\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs15() { // #1059
+        const char filedata[] = "#if A <= 1\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=1\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs16() { // #1059
+        const char filedata[] = "#if A > 1\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=2\n", getConfigsStr(filedata));
+    }
+
+    void getConfigs17() { // #1059
+        const char filedata[] = "#if A < 1\n"
+                                "1\n"
+                                "#endif\n";
+        ASSERT_EQUALS("\nA=0\n", getConfigsStr(filedata));
+    }
+
     void getConfigsError() {
         const char filedata1[] = "#ifndef X\n"
                                  "#error \"!X\"\n"
@@ -2272,16 +2401,15 @@ class TestPreprocessor : public TestFixture {
     }
 
     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 char code[] = "#if sizeof(unsigned short) == 2\n"
+                            "Fred & Wilma\n"
+                            "#elif sizeof(unsigned short) == 4\n"
+                            "Fred & Wilma\n"
+                            "#else\n"
+                            "#endif";
 
-        std::map<std::string, std::string> actual;
-        preprocess(code, actual);
-        ASSERT_EQUALS("\nFred & Wilma", actual[""]);
+        const std::map<std::string, std::string> actual = getcode(settings0, *this, code);
+        ASSERT_EQUALS("\nFred & Wilma", actual.at(""));
     }
 
     void invalid_ifs() {
@@ -2297,8 +2425,10 @@ class TestPreprocessor : public TestFixture {
                                 "int x;\n";
 
         // Preprocess => don't crash..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        (void)getcode(settings0, *this, filedata);
+        ASSERT_EQUALS(
+            "[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() {
@@ -2307,348 +2437,236 @@ class TestPreprocessor : public TestFixture {
                                 "#if ! defined ( Y )    #endif";
 
         // Preprocess => don't crash..
-        std::map<std::string, std::string> actual;
-        preprocess(filedata, actual);
+        (void)getcode(settings0, *this, filedata);
     }
 
     void wrongPathOnErrorDirective() {
-        errout.str("");
-        Settings settings;
-        settings.userDefines = "foo";
-        Preprocessor preprocessor(settings, this);
-        const std::string code("#error hello world!\n");
-        PreprocessorHelper::getcode(preprocessor, code, "X", "./././test.c");
-        ASSERT_EQUALS("[test.c:1]: (error) #error hello world!\n", errout.str());
-    }
-
-    void testDirectiveIncludeTypes() {
-        const char filedata[] = "#define macro some definition\n"
-                                "#undef macro\n"
-                                "#ifdef macro\n"
-                                "#elif some (complex) condition\n"
-                                "#else\n"
-                                "#endif\n"
-                                "#if some other condition\n"
-                                "#pragma some proprietary content\n"
-                                "#\n" /* may appear in old C code */
-                                "#ident some text\n" /* may appear in old C code */
-                                "#unknownmacro some unpredictable text\n"
-                                "#warning some warning message\n"
-                                "#error some error message\n";
-        const char dumpdata[] = "  <directivelist>\n"
-
-                                "    <directive file=\"test.c\" linenr=\"1\" str=\"#define macro some definition\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"2\" str=\"#undef macro\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#ifdef macro\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"4\" str=\"#elif some (complex) condition\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"5\" str=\"#else\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"6\" str=\"#endif\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"7\" str=\"#if some other condition\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"8\" str=\"#pragma some proprietary content\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"9\" str=\"#\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"10\" str=\"#ident some text\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"11\" str=\"#unknownmacro some unpredictable text\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"12\" str=\"#warning some warning message\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"13\" str=\"#error some error message\"/>\n"
-                                "  </directivelist>\n";
-
-        std::ostringstream ostr;
-        Preprocessor preprocessor(settings0, this);
-        PreprocessorHelper::getcode(preprocessor, filedata, "", "test.c");
-        preprocessor.dump(ostr);
-        ASSERT_EQUALS(dumpdata, ostr.str());
-    }
-
-    void testDirectiveIncludeLocations() {
-        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"
-                                "#define macro5 val\n";
-        const char dumpdata[] = "  <directivelist>\n"
-                                "    <directive file=\"test.c\" linenr=\"1\" str=\"#define macro1 val\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"2\" str=\"#include &quot;inc1.h&quot;\"/>\n"
-                                "    <directive file=\"inc1.h\" linenr=\"1\" str=\"#define macro2 val\"/>\n"
-                                "    <directive file=\"inc1.h\" linenr=\"2\" str=\"#include &quot;inc2.h&quot;\"/>\n"
-                                "    <directive file=\"inc2.h\" linenr=\"1\" str=\"#define macro3 val\"/>\n"
-                                "    <directive file=\"inc1.h\" linenr=\"3\" str=\"#define macro4 val\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#define macro5 val\"/>\n"
-                                "  </directivelist>\n";
-
-        std::ostringstream ostr;
-        Preprocessor preprocessor(settings0, this);
-        PreprocessorHelper::getcode(preprocessor, filedata, "", "test.c");
-        preprocessor.dump(ostr);
-        ASSERT_EQUALS(dumpdata, ostr.str());
-    }
-
-    void testDirectiveIncludeComments() {
-        const char filedata[] = "#ifdef macro2 /* this will be removed */\n"
-                                "#else /* this will be removed too */\n"
-                                "#endif /* this will also be removed */\n";
-        const char dumpdata[] = "  <directivelist>\n"
-                                "    <directive file=\"test.c\" linenr=\"1\" str=\"#ifdef macro2\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"2\" str=\"#else\"/>\n"
-                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#endif\"/>\n"
-                                "  </directivelist>\n";
-
-        std::ostringstream ostr;
-        Preprocessor preprocessor(settings0, this);
-        PreprocessorHelper::getcode(preprocessor, filedata, "", "test.c");
-        preprocessor.dump(ostr);
-        ASSERT_EQUALS(dumpdata, ostr.str());
+        const auto settings = dinit(Settings, $.userDefines = "foo");
+        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() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         ScopedFile header("header.h", "");
 
-        std::string code("#include \"header.h\"");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include \"header.h\"";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // test for missing local include
     void testMissingInclude2() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
-        std::string code("#include \"header.h\"");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include \"header.h\"";
+        (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() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         ScopedFile header("header.h", "", "inc");
 
-        std::string code("#include \"header.h\"");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include \"header.h\"";
+        (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() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         ScopedFile header("header.h", "", "inc");
 
-        std::string code("#include \"inc/header.h\"");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include \"inc/header.h\"";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // test for existing local include - absolute path
     void testMissingInclude5() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
 
         std::string code("#include \"" + header.path() + "\"");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // test for missing local include - absolute path
     void testMissingInclude6() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
 
         std::string code("#include \"" + header + "\"");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        (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() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         ScopedFile header("header.h", "");
 
-        std::string code("#include <header.h>");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include <header.h>";
+        (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: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing system include
     void testMissingSystemInclude2() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
-        std::string code("#include <header.h>");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include <header.h>";
+        (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: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for existing system include in system include path
     void testMissingSystemInclude3() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-
-        Preprocessor preprocessor(settings, this);
 
         ScopedFile header("header.h", "", "system");
 
-        std::string code("#include <header.h>");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include <header.h>";
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // test for existing system include - absolute path
     void testMissingSystemInclude4() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
 
         std::string code("#include <" + header.path() + ">");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // test for missing system include - absolute path
     void testMissingSystemInclude5() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
 
         std::string code("#include <" + header + ">");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        (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: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing local and system include
     void testMissingIncludeMixed() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
-        Preprocessor preprocessor(settings, this);
 
         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\"");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, code, "", "test.c");
+        const char code[] = "#include \"missing.h\"\n"
+                            "#include <header.h>\n"
+                            "#include <missing2.h>\n"
+                            "#include \"header2.h\"";
+        (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: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     void testMissingIncludeCheckConfig() {
-        Settings settings;
-        settings.clearIncludeCache = true;
-        settings.severity.clear();
-        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");
 
-        Preprocessor preprocessor(settings, this);
-
         ScopedFile header("header.h", "");
         ScopedFile header2("header2.h", "");
         ScopedFile header3("header3.h", "", "system");
@@ -2670,15 +2688,129 @@ class TestPreprocessor : public TestFixture {
                          "#include \"" + missing3 + "\"\n"
                          "#include <" + header6.path() + ">\n"
                          "#include <" + missing4 + ">\n");
-        errout.str("");
-        PreprocessorHelper::getcode(preprocessor, 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"
-                      "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());
+        (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: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: 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: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: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+    }
+
+    void hasInclude() {
+        const char code[] = "#if __has_include(<directory/non-existent-header.h>)\n123\n#endif";
+        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());
+
+        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 = getcodeforcfg(settings0, *this, code, "", "test.c");
+        ASSERT_EQUALS("void f ( long l ) {\n"
+                      "if ( l > $2147483647 ) { }\n"
+                      "}", actual);
+    }
+
+    void hashCalculation() {
+        // #12383
+        const char code[] = "int a;";
+        const char code2[] = "int  a;"; // extra space
+        const char code3[] = "\n\nint a;"; // extra new line
+
+        ASSERT_EQUALS(getHash(code), getHash(code));
+        ASSERT_EQUALS(getHash(code2), getHash(code2));
+        ASSERT_EQUALS(getHash(code3), getHash(code3));
+        ASSERT(getHash(code) != getHash(code2));
+        ASSERT(getHash(code) != getHash(code3));
+        ASSERT(getHash(code2) != getHash(code3));
+    }
+
+    void standard() {
+
+        const char code[] = "int a;";
+        // TODO: this bypasses the standard determined from the settings - the parameter should not be exposed
+        simplecpp::DUI dui;
+
+        {
+            dui.std = "c89";
+            std::vector<std::string> files;
+            TokenList tokenlist{settingsDefault, Standards::Language::CPP};
+            preprocess(code, files, "test.cpp", tokenlist, dui);
+            ASSERT(tokenlist.front());
+        }
+
+        {
+            dui.std = "gnu23";
+            std::vector<std::string> files;
+            TokenList tokenlist{settingsDefault, Standards::Language::CPP};
+            preprocess(code, files, "test.cpp", tokenlist, dui);
+            ASSERT(tokenlist.front());
+        }
+
+        {
+            dui.std = "c++98";
+            std::vector<std::string> files;
+            TokenList tokenlist{settingsDefault, Standards::Language::CPP};
+            preprocess(code, files, "test.cpp", tokenlist, dui);
+            ASSERT(tokenlist.front());
+        }
+
+        {
+            dui.std = "gnu++26";
+            std::vector<std::string> files;
+            TokenList tokenlist{settingsDefault, Standards::Language::CPP};
+            preprocess(code, files, "test.cpp", tokenlist, dui);
+            ASSERT(tokenlist.front());
+        }
+
+        {
+            dui.std = "gnu77";
+            std::vector<std::string> files;
+            TokenList tokenlist{settingsDefault, Standards::Language::CPP};
+            // TODO: can this happen from application code? if yes we need to turn it into a proper error
+            ASSERT_THROW_EQUALS_2(preprocess(code, files, "test.cpp", tokenlist, dui), std::runtime_error, "unexpected simplecpp::Output type 9");
+            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"
+                           "};";
+        const char code[] = R"(#include "test.h")";
+        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";
+        ASSERT_THROW_INTERNAL(getcodeforcfg(settingsDefault, *this, code, "", "test.cpp"), InternalError::SYNTAX);
     }
 };
 
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index cef576b5e66..c430116110e 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-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
@@ -16,75 +16,118 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+#include "fixture.h"
+
+#ifdef HAS_THREADING_MODEL_FORK
+#include "filesettings.h"
+#include "helpers.h"
 #include "processexecutor.h"
 #include "redirect.h"
 #include "settings.h"
-#include "fixture.h"
-#include "helpers.h"
+#include "standards.h"
+#include "suppressions.h"
 #include "timer.h"
-#include "library.h"
 
-#include <algorithm>
-#include <cstddef>
-#include <map>
+#include <cstdlib>
+#include <list>
 #include <memory>
-#include <set>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
+#endif // HAS_THREADING_MODEL_FORK
 
-class TestProcessExecutor : public TestFixture {
+class TestProcessExecutorBase : public TestFixture {
 public:
-    TestProcessExecutor() : TestFixture("TestProcessExecutor") {}
+    TestProcessExecutorBase(const char * const name, bool useFS)
+        : TestFixture(name)
+#ifdef HAS_THREADING_MODEL_FORK
+        , useFS(useFS)
+#endif // HAS_THREADING_MODEL_FORK
+    {
+        (void)useFS;
+    }
 
 private:
-    Settings settings = settingsBuilder().library("std.cfg").build();
+#ifdef HAS_THREADING_MODEL_FORK
+    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    bool useFS;
 
-    static std::string fprefix()
+    std::string fprefix() const
     {
+        if (useFS)
+            return "processfs";
         return "process";
     }
 
+    struct CheckOptions
+    {
+        bool quiet = true;
+        ShowTime showtime = ShowTime::NONE;
+        const char* plistOutput = nullptr;
+        std::vector<std::string> filesList;
+    };
+
     /**
      * Execute check using n jobs for y files which are have
      * identical data, given within data.
      */
-    void check(unsigned int jobs, int files, int result, const std::string &data, SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE, const char* const plistOutput = nullptr, const std::vector<std::string>& filesList = {}) {
-        errout.str("");
-        output.str("");
+    void check(unsigned int jobs, int files, int result, const std::string &data, const CheckOptions& opt = make_default_obj{}) {
+        std::list<FileSettings> fileSettings;
 
-        std::map<std::string, std::size_t> filemap;
-        if (filesList.empty()) {
+        std::list<FileWithDetails> filelist;
+        if (opt.filesList.empty()) {
             for (int i = 1; i <= files; ++i) {
-                std::ostringstream oss;
-                oss << fprefix() << "_" << i << ".cpp";
-                filemap[oss.str()] = 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::C, data.size());
+                }
             }
         }
         else {
-            for (const auto& f : filesList)
+            for (const auto& f : opt.filesList)
             {
-                filemap[f] = data.size();
+                filelist.emplace_back(f, Standards::Language::C, data.size());
+                if (useFS) {
+                    fileSettings.emplace_back(f, Standards::Language::C, data.size());
+                }
             }
         }
 
-        settings.jobs = jobs;
-        settings.showtime = showtime;
-        if (plistOutput)
-            settings.plistOutput = plistOutput;
-        // TODO: test with settings.project.fileSettings;
-        ProcessExecutor executor(filemap, settings, *this);
+        /*const*/ Settings s = settings;
+        s.jobs = jobs;
+        s.showtime = opt.showtime;
+        s.quiet = opt.quiet;
+        if (opt.plistOutput)
+            s.plistOutput = opt.plistOutput;
+        s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}";
+        Suppressions supprs;
+        TimerResults timerResults;
+
+        // NOLINTNEXTLINE(performance-unnecessary-value-param)
+        auto executeFn = [](std::string,std::vector<std::string>,std::string,std::string&){
+            return EXIT_SUCCESS;
+        };
+
         std::vector<std::unique_ptr<ScopedFile>> scopedfiles;
-        scopedfiles.reserve(filemap.size());
-        for (std::map<std::string, std::size_t>::const_iterator i = filemap.cbegin(); i != filemap.cend(); ++i)
-            scopedfiles.emplace_back(new ScopedFile(i->first, data));
+        scopedfiles.reserve(filelist.size());
+        for (auto i = filelist.cbegin(); i != filelist.cend(); ++i)
+            scopedfiles.emplace_back(new ScopedFile(i->path(), data));
+
+        // clear files list so only fileSettings are used
+        if (useFS)
+            filelist.clear();
 
+        ProcessExecutor executor(filelist, fileSettings, s, supprs, *this, &timerResults, executeFn);
         ASSERT_EQUALS(result, executor.check());
     }
+#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);
@@ -94,52 +137,64 @@ class TestProcessExecutor : public TestFixture {
         TEST_CASE(no_errors_equal_amount_files);
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
-        TEST_CASE(markup);
-#endif // !WIN32
+        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_FORK
     }
 
+#ifdef HAS_THREADING_MODEL_FORK
     void deadlock_with_many_errors() {
         std::ostringstream oss;
-        oss << "int main()\n"
+        oss << "void f()\n"
             << "{\n";
-        for (int i = 0; i < 500; i++)
-            oss << "  {char *a = malloc(10);}\n";
-
-        oss << "  return 0;\n"
-            << "}\n";
-        check(2, 3, 3, oss.str());
+        const int num_err = 1;
+        for (int i = 0; i < num_err; i++) {
+            oss << "  (void)(*((int*)0));\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"));
     }
 
     void many_threads() {
-        check(16, 100, 100,
-              "int main()\n"
+        const int num_files = 100;
+        check(16, num_files, num_files,
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
+        ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
     // #11249 - reports TSAN errors
     void many_threads_showtime() {
         SUPPRESS;
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_SUMMARY);
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions, $.showtime = ShowTime::SUMMARY));
+        // we are not interested in the results - so just consume them
+        ignore_errout();
     }
 
     void many_threads_plist() {
-        const char plistOutput[] = "plist";
-        ScopedFile plistFile("dummy", plistOutput);
+        const std::string plistOutput = "plist_" + fprefix() + "/";
+        ScopedFile plistFile("dummy", "", plistOutput);
 
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_NONE, plistOutput);
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
+        // we are not interested in the results - so just consume them
+        ignore_errout();
     }
 
     void no_errors_more_files() {
@@ -168,60 +223,125 @@ class TestProcessExecutor : public TestFixture {
 
     void one_error_less_files() {
         check(2, 1, 1,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {char *a = malloc(10);}\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
+        ASSERT_EQUALS("[" + fprefix() + "_1.c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     void one_error_several_files() {
-        check(2, 20, 20,
-              "int main()\n"
+        const int num_files = 20;
+        check(2, num_files, num_files,
+              "void f()\n"
               "{\n"
-              "  {char *a = malloc(10);}\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
+        ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
+    // TODO: provide data which actually shows values above 0
 
-    void markup() {
-        const Settings settingsOld = settings;
-        settings.library.mMarkupExtensions.emplace(".cp1");
-        settings.library.mProcessAfterCode.emplace(".cp1", true);
+    // 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() {}",
+              dinit(CheckOptions,
+                    $.showtime = 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'));
+    }
 
-        const std::vector<std::string> files = {
-            fprefix() + "_1.cp1", fprefix() + "_2.cpp", fprefix() + "_3.cp1", fprefix() + "_4.cpp"
-        };
+    void showtime_top5_summary() {
+        REDIRECT;
+        check(2, 2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::TOP5_SUMMARY));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // once: top5 results + overall + empty line
+        TODO_ASSERT_EQUALS(5 + 1 + 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);
+        TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
+    }
 
-        // the checks are not executed on the markup files => expected result is 2
-        check(2, 4, 2,
-              "int main()\n"
+    void showtime_file() {
+        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
+        check(2, 2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = 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::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::FILE_TOTAL));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        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=".c" reporterrors="false"/></def>)";
+        settings = settingsBuilder().libraryxml(xmldata).build();
+        check(2, 1, 0,
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}",
-              SHOWTIME_MODES::SHOWTIME_NONE, nullptr, files);
-        // TODO: order of "Checking" and "checked" is affected by thread
-        /*TODO_ASSERT_EQUALS("Checking " + fprefix() + "_2.cpp ...\n"
-                           "1/4 files checked 25% done\n"
-                           "Checking " + fprefix() + "_4.cpp ...\n"
-                           "2/4 files checked 50% done\n"
-                           "Checking " + fprefix() + "_1.cp1 ...\n"
-                           "3/4 files checked 75% done\n"
-                           "Checking " + fprefix() + "_3.cp1 ...\n"
-                           "4/4 files checked 100% done\n",
-                           "Checking " + fprefix() + "_1.cp1 ...\n"
-                           "1/4 files checked 25% done\n"
-                           "Checking " + fprefix() + "_2.cpp ...\n"
-                           "2/4 files checked 50% done\n"
-                           "Checking " + fprefix() + "_3.cp1 ...\n"
-                           "3/4 files checked 75% done\n"
-                           "Checking " + fprefix() + "_4.cpp ...\n"
-                           "4/4 files checked 100% done\n",
-                           output.str());*/
+              "  (void)(*((int*)0));\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
     }
+
+    void unique_errors() {
+        SUPPRESS;
+        ScopedFile inc_h(fprefix() + ".h",
+                         "inline void f()\n"
+                         "{\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: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 {
+public:
+    TestProcessExecutorFiles() : TestProcessExecutorBase("TestProcessExecutorFiles", false) {}
+};
+
+class TestProcessExecutorFS : public TestProcessExecutorBase {
+public:
+    TestProcessExecutorFS() : TestProcessExecutorBase("TestProcessExecutorFS", true) {}
 };
 
-REGISTER_TEST(TestProcessExecutor)
+REGISTER_TEST(TestProcessExecutorFiles)
+REGISTER_TEST(TestProcessExecutorFS)
diff --git a/test/testprogrammemory.cpp b/test/testprogrammemory.cpp
new file mode 100644
index 00000000000..a6cf933d843
--- /dev/null
+++ b/test/testprogrammemory.cpp
@@ -0,0 +1,106 @@
+/*
+ * 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 "config.h"
+#include "fixture.h"
+#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") {}
+
+private:
+    void run() override {
+        TEST_CASE(copyOnWrite);
+        TEST_CASE(hasValue);
+        TEST_CASE(getValue);
+        TEST_CASE(at);
+    }
+
+    void copyOnWrite() const {
+        SimpleTokenList tokenlist("1+1;");
+        Token* tok = tokenlist.front();
+        const nonneg int id = 123;
+        tok->exprId(id);
+
+        ProgramMemory pm;
+        const ValueFlow::Value* v = pm.getValue(id);
+        ASSERT(!v);
+        pm.setValue(tok, ValueFlow::Value{41});
+
+        v = pm.getValue(id);
+        ASSERT(v);
+        ASSERT_EQUALS(41, v->intvalue);
+
+        // create a copy
+        ProgramMemory pm2 = pm;
+
+        // make sure the value was copied
+        v = pm2.getValue(id);
+        ASSERT(v);
+        ASSERT_EQUALS(41, v->intvalue);
+
+        // set a value in the copy to trigger copy-on-write
+        pm2.setValue(tok, ValueFlow::Value{42});
+
+        // make another copy and set another value
+        ProgramMemory pm3 = pm2;
+
+        // set a value in the copy to trigger copy-on-write
+        pm3.setValue(tok, ValueFlow::Value{43});
+
+        // make sure the value was set
+        v = pm2.getValue(id);
+        ASSERT(v);
+        ASSERT_EQUALS(42, v->intvalue);
+
+        // make sure the value was set
+        v = pm3.getValue(id);
+        ASSERT(v);
+        ASSERT_EQUALS(43, v->intvalue);
+
+        // make sure the original value remains unchanged
+        v = pm.getValue(id);
+        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_2(pm.at(123), std::out_of_range, "ProgramMemory::at");
+        ASSERT_THROW_EQUALS_2(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..628ec3e6f5d
--- /dev/null
+++ b/test/testregex.cpp
@@ -0,0 +1,195 @@
+/*
+ * 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/>.
+ */
+
+#ifdef HAVE_RULES
+
+#include "fixture.h"
+#include "regex.h"
+
+#include <list>
+#include <memory>
+#include <string>
+#include <utility>
+
+class TestRegEx : public TestFixture {
+public:
+    TestRegEx() : TestFixture("TestRegEx") {}
+
+private:
+    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), regex_err);
+        if (exp_err.empty())
+            ASSERT_LOC(!!r.get(), 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 {
+        (void)assertRegex("[", "pcre_compile failed: missing terminating ] for character class");
+    }
+
+    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
+};
+
+REGISTER_TEST(TestRegEx)
+
+#endif // HAVE_RULES
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index 79903520643..cd7a039c418 100755
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -1,34 +1,18 @@
 <?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-PCRE|Win32">
-      <Configuration>Debug-PCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-PCRE|x64">
       <Configuration>Debug-PCRE</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release-PCRE|Win32">
-      <Configuration>Release-PCRE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-PCRE|x64">
       <Configuration>Release-PCRE</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -42,20 +26,17 @@
   <ItemGroup Label="SourceFiles">
     <ClCompile Include="..\cli\cmdlineparser.cpp" />
     <ClCompile Include="..\cli\cppcheckexecutor.cpp" />
-    <ClCompile Include="..\cli\cppcheckexecutorseh.cpp" />
-    <ClCompile Include="..\cli\cppcheckexecutorsig.cpp" />
     <ClCompile Include="..\cli\executor.cpp" />
     <ClCompile Include="..\cli\filelister.cpp" />
     <ClCompile Include="..\cli\processexecutor.cpp" />
+    <ClCompile Include="..\cli\sehwrapper.cpp" />
+    <ClCompile Include="..\cli\signalhandler.cpp" />
     <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|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">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>
@@ -69,9 +50,9 @@
     <ClCompile Include="testastutils.cpp" />
     <ClCompile Include="testautovariables.cpp" />
     <ClCompile Include="testbool.cpp" />
-    <ClCompile Include="testboost.cpp" />
     <ClCompile Include="testbufferoverrun.cpp" />
     <ClCompile Include="testcharvar.cpp" />
+    <ClCompile Include="testcheck.cpp" />
     <ClCompile Include="testclangimport.cpp" />
     <ClCompile Include="testclass.cpp" />
     <ClCompile Include="testcmdlineparser.cpp" />
@@ -81,7 +62,10 @@
     <ClCompile Include="testcppcheck.cpp" />
     <ClCompile Include="testerrorlogger.cpp" />
     <ClCompile Include="testexceptionsafety.cpp" />
+    <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" />
@@ -101,6 +85,9 @@
     <ClCompile Include="testpostfixoperator.cpp" />
     <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" />
@@ -108,6 +95,7 @@
     <ClCompile Include="testsimplifyusing.cpp" />
     <ClCompile Include="testsingleexecutor.cpp" />
     <ClCompile Include="testsizeof.cpp" />
+    <ClCompile Include="teststandards.cpp" />
     <ClCompile Include="teststl.cpp" />
     <ClCompile Include="teststring.cpp" />
     <ClCompile Include="testsummaries.cpp" />
@@ -128,18 +116,20 @@
     <ClCompile Include="testvaarg.cpp" />
     <ClCompile Include="testvalueflow.cpp" />
     <ClCompile Include="testvarid.cpp" />
+    <ClCompile Include="testvfvalue.cpp" />
   </ItemGroup>
   <ItemGroup Label="HeaderFiles">
     <ClInclude Include="..\cli\cmdlineparser.h" />
     <ClInclude Include="..\cli\cppcheckexecutor.h" />
-    <ClInclude Include="..\cli\cppcheckexecutorseh.h" />
-    <ClInclude Include="..\cli\cppcheckexecutorsig.h" />
     <ClInclude Include="..\cli\executor.h" />
     <ClInclude Include="..\cli\filelister.h" />
     <ClInclude Include="..\cli\processexecutor.h" />
+    <ClInclude Include="..\cli\sehwrapper.h" />
+    <ClInclude Include="..\cli\signalhandler.h" />
     <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" />
@@ -152,18 +142,6 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -176,18 +154,6 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -202,24 +168,12 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
   </ImportGroup>
@@ -228,113 +182,35 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\debug\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">$(SolutionDir)bin\debug\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\debug\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">$(SolutionDir)bin\debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">testrunner</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">testrunner</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">testrunner</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">testrunner</TargetName>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">true</IgnoreImportLibrary>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">$(SolutionDir)bin\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">$(SolutionDir)bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">temp\$(Configuration)_$(PlatformName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">testrunner</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">testrunner</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">testrunner</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">testrunner</TargetName>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
-    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">true</IgnoreImportLibrary>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">true</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\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;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
@@ -356,14 +232,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\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;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
@@ -383,90 +259,12 @@
       <LargeAddressAware>true</LargeAddressAware>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>CPPCHECKLIB_IMPORT;SIMPLECPP_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-      <AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <LanguageStandard>stdcpp14</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <LargeAddressAware>true</LargeAddressAware>
-      <StackReserveSize>8000000</StackReserveSize>
-      <StackCommitSize>8000000</StackCommitSize>
-      <DataExecutionPrevention>true</DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\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>
@@ -475,7 +273,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -503,10 +301,10 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\cli;..\lib;..\externals;..\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>
@@ -515,7 +313,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4701;4706;4800;4805</DisableSpecificWarnings>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/test/testrunner.vcxproj.filters b/test/testrunner.vcxproj.filters
index db85b4d9e37..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,10 +217,7 @@
     <ClCompile Include="testclangimport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cli\cppcheckexecutorseh.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\cli\cppcheckexecutorsig.cpp">
+    <ClCompile Include="..\cli\signalhandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\cli\executor.cpp">
@@ -256,6 +250,36 @@
     <ClCompile Include="testsingleexecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="testcheck.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="testfilesettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="testprogrammemory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <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">
@@ -279,10 +303,7 @@
     <ClInclude Include="..\cli\cppcheckexecutor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cli\cppcheckexecutorseh.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cli\cppcheckexecutorsig.h">
+    <ClInclude Include="..\cli\signalhandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\cli\executor.h">
@@ -303,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..b4d3056a762
--- /dev/null
+++ b/test/testsarifreport.cpp
@@ -0,0 +1,906 @@
+/*
+ * 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 "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 03cc6e7a671..7bc6aeb0352 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-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
@@ -20,6 +20,8 @@
 #include "errortypes.h"
 #include "settings.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "suppressions.h"
 
 class TestSettings : public TestFixture {
 public:
@@ -28,6 +30,18 @@ class TestSettings : public TestFixture {
 private:
     void run() override {
         TEST_CASE(simpleEnableGroup);
+        TEST_CASE(loadCppcheckCfg);
+        TEST_CASE(loadCppcheckCfgSafety);
+        TEST_CASE(getNameAndVersion);
+        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 {
@@ -85,6 +99,263 @@ class TestSettings : public TestFixture {
         ASSERT_EQUALS(false, group.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS(false, group.isEnabled(Checks::internalCheck));
     }
+
+    void loadCppcheckCfg()
+    {
+        {
+            Settings s;
+            Suppressions supprs;
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            "{}\n");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            "{\n");
+            ASSERT_EQUALS("not a valid JSON - syntax error at line 2 near: ", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"productName": ""}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS("", s.cppcheckCfgProductName);
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"productName": "product"}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS("product", s.cppcheckCfgProductName);
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"productName": 1}\n)");
+            ASSERT_EQUALS("'productName' is not a string", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"about": ""}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS("", s.cppcheckCfgAbout);
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"about": "about"}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS("about", s.cppcheckCfgAbout);
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"about": 1}\n)");
+            ASSERT_EQUALS("'about' is not a string", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"addons": []}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS(0, s.addons.size());
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"addons": 1}\n)");
+            ASSERT_EQUALS("'addons' is not an array", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"addons": ["addon"]}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS(1, s.addons.size());
+            ASSERT_EQUALS("addon", *s.addons.cbegin());
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"addons": [1]}\n)");
+            ASSERT_EQUALS("'addons' array entry is not a string", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"addons": []}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS(0, s.addons.size());
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"suppressions": 1}\n)");
+            ASSERT_EQUALS("'suppressions' is not an array", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"suppressions": ["id"]}\n)");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS(1, supprs.nomsg.getSuppressions().size());
+            ASSERT_EQUALS("id", supprs.nomsg.getSuppressions().cbegin()->errorId);
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            R"({"suppressions": [""]}\n)");
+            ASSERT_EQUALS("could not parse suppression '' - Failed to add suppression. No id.", Settings::loadCppcheckCfg(s, supprs));
+        }
+        {
+            Settings s;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg",
+                            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
+    }
+
+    void loadCppcheckCfgSafety() const
+    {
+        // Test the "safety" flag
+        {
+            Settings s;
+            s.safety = false;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg", "{}");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS(false, s.safety);
+        }
+
+        {
+            Settings s;
+            s.safety = true;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg", "{\"safety\": false}");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS(false, s.safety);
+        }
+
+        {
+            Settings s;
+            s.safety = false;
+            Suppressions supprs;
+            ScopedFile file("cppcheck.cfg", "{\"safety\": true}");
+            ASSERT_EQUALS("", Settings::loadCppcheckCfg(s, supprs));
+            ASSERT_EQUALS(true, s.safety);
+        }
+    }
+
+    void getNameAndVersion() const
+    {
+        {
+            const auto nameVersion = Settings::getNameAndVersion("Cppcheck Premium 12.3.4");
+            ASSERT_EQUALS("Cppcheck Premium", nameVersion.first);
+            ASSERT_EQUALS("12.3.4", nameVersion.second);
+        }
+
+        {
+            const auto nameVersion = Settings::getNameAndVersion("Cppcheck Premium 12.3.4s");
+            ASSERT_EQUALS("Cppcheck Premium", nameVersion.first);
+            ASSERT_EQUALS("12.3.4s", nameVersion.second);
+        }
+    }
+
+    void checkLevelDefault() const
+    {
+        Settings s;
+        ASSERT_EQUALS_ENUM(s.checkLevel, Settings::CheckLevel::exhaustive);
+        ASSERT_EQUALS(s.vfOptions.maxIfCount, -1);
+        ASSERT_EQUALS(s.vfOptions.maxSubFunctionArgs, 256);
+        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 92e66e36fdd..494127fbee8 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-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
@@ -16,29 +16,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "errortypes.h"
-#include "platform.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
+#include "standards.h"
 #include "templatesimplifier.h"
-#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
 #include <cstring>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
+#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).checkUnusedTemplates().build();
+    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);
@@ -216,8 +219,14 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(template175); // #10908
         TEST_CASE(template176); // #11146
         TEST_CASE(template177);
+        TEST_CASE(template178);
+        TEST_CASE(template179);
+        TEST_CASE(template180);
+        TEST_CASE(template181);
+        TEST_CASE(template182); // #13770
         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);
         TEST_CASE(template_enum);  // #6299 Syntax error in complex enum declaration (including template)
         TEST_CASE(template_unhandled);
         TEST_CASE(template_default_parameter);
@@ -238,6 +247,8 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(template_namespace_9);
         TEST_CASE(template_namespace_10);
         TEST_CASE(template_namespace_11); // #7145
+        TEST_CASE(template_namespace_12);
+        TEST_CASE(template_namespace_13);
         TEST_CASE(template_pointer_type);
         TEST_CASE(template_array_type);
 
@@ -304,21 +315,56 @@ class TestSimplifyTemplate : public TestFixture {
 
         TEST_CASE(explicitBool1);
         TEST_CASE(explicitBool2);
+
+        TEST_CASE(templateArgPreserveType); // #13882 - type of template argument
+
+        TEST_CASE(dumpTemplateArgFrom);
     }
 
-#define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tok_(const char* file, int line, const char code[], bool debugwarnings = false, cppcheck::Platform::Type type = cppcheck::Platform::Type::Native) {
-        errout.str("");
+    class TemplateSimplifierTest : public TemplateSimplifier
+    {
+        friend class TestSimplifyTemplate;
+    };
 
-        const Settings settings1 = settingsBuilder(settings).library("std.cfg").debugwarnings(debugwarnings).platform(type).build();
-        Tokenizer tokenizer(&settings1, this);
+    class TokenizerTest : public Tokenizer
+    {
+        friend class TestSimplifyTemplate;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
+    struct CheckOptions
+    {
+        bool debugwarnings = false;
+    };
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#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& 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);";
@@ -666,7 +712,7 @@ class TestSimplifyTemplate : public TestFixture {
                                  "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));
@@ -887,7 +933,7 @@ class TestSimplifyTemplate : public TestFixture {
     void template27() {
         // #3350 - template inside macro call
         const char code[] = "X(template<class T> class Fred);";
-        ASSERT_THROW(tok(code), InternalError);
+        ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void template28() {
@@ -976,7 +1022,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template <typename T> struct X { void f(X<T> &x) {} };\n"
                             "}\n"
                             "template <> int X<int>::Y(0);";
-        tok(code);
+        (void)tok(code);
     }
 
     void template35() { // #4074 - "A<'x'> a;" is not recognized as template instantiation
@@ -1069,7 +1115,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "  vector<vector<int>> v;"
                             "  const vector<int> vi = static_cast<vector<int>>(v);"
                             "}";
-        tok(code);
+        (void)tok(code);
     }
 
     void template40() { // #5055 - false negatives when there is template specialization outside struct
@@ -1108,7 +1154,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "    return sizeof...(args);\n"
                             "  }();\n"
                             "}";
-        ASSERT_THROW(tok(code), InternalError);
+        ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void template43() { // #5097 - Assert due to '>>' in 'B<A<C>>' not being treated as end of template instantiation
@@ -1204,38 +1250,38 @@ class TestSimplifyTemplate : public TestFixture {
                                 "struct TypeMath<int,Constants::fourtytwo> { "
                                 "static const int mult = sizeof ( int ) * Constants :: fourtytwo ; "
                                 "} ;";
-        ASSERT_EQUALS(expected, tok(code, true));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(CheckOptions, $.debugwarnings = true)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template46() { // #5816
-        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_EQUALS("", errout.str());
-        tok("template <class T, class U> struct A {}; "
-            "enum { e = sizeof(A<int, int>) }; "
-            "template <class T, class U> struct B {};");
-        ASSERT_EQUALS("", errout.str());
-        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_EQUALS("", errout.str());
+        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_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_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_EQUALS("", errout_str());
     }
 
     void template47() { // #6023
-        tok("template <typename T1, typename T2 = T3<T1> > class C1 {}; "
-            "class C2 : public C1<C2> {};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok("template <typename T1, typename T2 = T3<T1> > class C1 {}; "
+                            "class C2 : public C1<C2> {};"));
+        ASSERT_EQUALS("", errout_str());
     }
 
-    void template48() { // #6134
-        tok("template <int> int f( {  } ); "
-            "int foo = f<1>(0);");
-        ASSERT_EQUALS("", errout.str());
+    void template48() { // #6134 (hang)
+        (void)tok("template <int> int f( {  } ); "
+                  "int foo = f<1>(0);");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template49() { // #6237
@@ -1291,7 +1337,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "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 ; "
@@ -1321,28 +1367,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, true));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(CheckOptions, $.debugwarnings = true)));
+        ASSERT_EQUALS("", errout_str());
     }
 
-    void template54() { // #6587
-        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 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 template55() { // #6604
@@ -1392,8 +1438,8 @@ class TestSimplifyTemplate : public TestFixture {
                                 "} struct Foo<true> { "
                                 "std :: array < int , 1 > mfoo ; "
                                 "} ;";
-        ASSERT_EQUALS(expected, tok(code, true));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(CheckOptions, $.debugwarnings = true)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template57() { // #7891
@@ -1448,10 +1494,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));
     }
 
@@ -1547,11 +1593,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));
@@ -1975,7 +2021,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "template<typename U, typename std::enable_if<(!std::is_fundamental<U>::value)>::type>\n"
                             "void C<T>::foo() {}";
         // @todo the output is very wrong but we are only worried about the crash for now
-        tok(code);
+        (void)tok(code);
     }
 
     void template86() { // crash
@@ -1990,7 +2036,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "S<T> U<T>::u;\n"
                             "template S<int> U<int>::u;\n"
                             "S<int> &i = U<int>::u;";
-        tok(code);
+        (void)tok(code);
     }
 
     void template87() {
@@ -2495,7 +2541,7 @@ class TestSimplifyTemplate : public TestFixture {
                            "} ;";
 
         ASSERT_EQUALS(exp, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template102() { // #9005
@@ -2879,7 +2925,7 @@ class TestSimplifyTemplate : public TestFixture {
                            "struct f<b::B<0>> ; "
                            "} "
                            "} "
-                           "b :: f<b::B<0>> g1 ; struct b :: B<0> { using B<0> :: d ; } ; "
+                           "b :: f<b::B<0>> g1 ; struct b :: B<0> { using d = B<0> :: d ; } ; "
                            "struct b :: f<b::B<0>> { } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3059,14 +3105,14 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template125() {
-        ASSERT_THROW(tok("template<int M, int N>\n"
-                         "class GCD {\n"
-                         "public:\n"
-                         "  enum { val = (N == 0) ? M : GCD<N, M % N>::val };\n"
-                         "};\n"
-                         "int main() {\n"
-                         "  GCD< 1, 0 >::val;\n"
-                         "}"), InternalError);
+        ASSERT_THROW_INTERNAL(tok("template<int M, int N>\n"
+                                  "class GCD {\n"
+                                  "public:\n"
+                                  "  enum { val = (N == 0) ? M : GCD<N, M % N>::val };\n"
+                                  "};\n"
+                                  "int main() {\n"
+                                  "  GCD< 1, 0 >::val;\n"
+                                  "}"), INSTANTIATION);
     }
 
     void template126() { // #9217
@@ -3572,7 +3618,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "};";
         const char exp[] = "template < typename ... > struct a ; "
                            "template < typename b , typename c , typename ... d > struct a < b c :: * , d ... > { "
-                           "using b :: e ; "
+                           "using e = b :: e ; "
                            "static_assert ( e :: f ? sizeof... ( d ) : sizeof... ( d ) , \"\" ) ; "
                            "} ;";
         ASSERT_EQUALS(exp, tok(code));
@@ -3586,7 +3632,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "using A2 = struct B2 { void f(T){} };\n"
                             "A2<bool> a2;\n"
                             "template<class T>\n"
-                            "using A3 = enum B3 {b = 0;};\n"
+                            "using A3 = enum B3 {b = 0};\n"
                             "A3<int> a3;";
         const char exp[] = "template < int N > "
                            "using A1 = struct B1 { static auto constexpr value = N ; } ; "
@@ -3595,7 +3641,7 @@ class TestSimplifyTemplate : public TestFixture {
                            "using A2 = struct B2 { void f ( T ) { } } ; "
                            "A2 < bool > a2 ; "
                            "template < class T > "
-                           "using A3 = enum B3 { b = 0 ; } ; "
+                           "using A3 = enum B3 { b = 0 } ; "
                            "A3 < int > a3 ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -3662,7 +3708,7 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "BEGIN_VERSIONED_NAMESPACE_DECL\n"
                             "template<typename T> class Fred { };\n"
                             "END_VERSIONED_NAMESPACE_DECL";
-        ASSERT_THROW_EQUALS(tok(code), InternalError, "There is an unknown macro here somewhere. Configuration is required. If BEGIN_VERSIONED_NAMESPACE_DECL is a macro then please configure it.");
+        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.");
     }
 
     void template150() { // syntax error
@@ -3703,7 +3749,7 @@ class TestSimplifyTemplate : public TestFixture {
                                "class GenericConfigurationHandler<int,std::allocator,std::list> ; "
                                "class TargetConfigurationHandler : public GenericConfigurationHandler<int,std::allocator,std::list> { } ; "
                                "class GenericConfigurationHandler<int,std::allocator,std::list> { "
-                               "std :: list < int , std :: std :: allocator < int > > m_target_configurations ; "
+                               "std :: list < int , std :: allocator < int > > m_target_configurations ; "
                                "} ;";
             ASSERT_EQUALS(exp, tok(code));
         }
@@ -3807,7 +3853,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "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); }";
-        tok(code); // don't crash
+        (void)tok(code); // don't crash
     }
 
     void template157() { // #9854
@@ -4049,7 +4095,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "b<a99<int>> d99;\n"
                             "b<a100<int>> d100;";
         // don't bother checking the output because this is not instantiated properly
-        tok(code); // don't crash
+        (void)tok(code); // don't crash
 
         const char code2[] = "template<typename T> void f();\n" // #11489
                              "template<typename T> void f(int);\n"
@@ -4162,7 +4208,8 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template163() { // #9685 syntax error
         const char code[] = "extern \"C++\" template < typename T > T * test ( ) { return nullptr ; }";
-        ASSERT_EQUALS(code, tok(code));
+        const char expected[] = "template < typename T > T * test ( ) { return nullptr ; }";
+        ASSERT_EQUALS(expected, tok(code));
     }
 
     void template164() {  // #9394
@@ -4518,6 +4565,119 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(exp, tok(code));
     }
 
+    void template178() {
+        const char code[] = "template<typename T>\n" // #11893
+                            "void g() {\n"
+                            "    for (T i = 0; i < T{ 3 }; ++i) {}\n"
+                            "}\n"
+                            "void f() {\n"
+                            "    g<int>();\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));
+
+        const char code2[] = "template<typename T>\n"
+                             "struct S {\n"
+                             "    T c;\n"
+                             "    template<typename U>\n"
+                             "    void g() {\n"
+                             "        for (U i = 0; i < U{ 3 }; ++i) {}\n"
+                             "    }\n"
+                             "};\n"
+                             "void f() {\n"
+                             "    S<char> s{};\n"
+                             "    s.g<int>();\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));
+    }
+
+    void template179() {
+        const char code[] = "template <typename T, typename C>\n" // #13498
+                            "struct B {\n"
+                            "    int a;\n"
+                            "    int b;\n"
+                            "};\n"
+                            "template <typename T>\n"
+                            "struct B<T, void> {\n"
+                            "    int a;\n"
+                            "};\n"
+                            "void f() {\n"
+                            "    B<int, int>{ 0, {} };\n"
+                            "}\n";
+        const char exp[] = "struct B<int,int> ; "
+                           "template < typename T > struct B < T , void > { int a ; } ; "
+                           "void f ( ) { B<int,int> { 0 , { } } ; } "
+                           "struct B<int,int> { int a ; int b ; } ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void template180() {
+        const char code[] = "template<int C>\n" // #13680
+                            "int f() {\n"
+                            "    return dostuff(C);\n"
+                            "}\n"
+                            "void g() {\n"
+                            "    f<static_cast<int>(0U)>();\n"
+                            "}\n";
+        const char exp[] = "int f<static_cast<int>(0U)> ( ) ; "
+                           "void g ( ) { "
+                           "f<static_cast<int>(0U)> ( ) ; "
+                           "} "
+                           "int f<static_cast<int>(0U)> ( ) { "
+                           "return dostuff ( static_cast < int > ( 0U ) ) ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void template181() {
+        const char code[] = "struct K { bool b; };\n" // #13747
+                            "template<bool b>\n"
+                            "void f(struct K* k) {\n"
+                            "    assert(b == k->b);\n"
+                            "}\n"
+                            "void g(struct K* k) {\n"
+                            "    f<false>(k);\n"
+                            "}\n";
+        const char exp[] = "struct K { bool b ; } ; "
+                           "void f<false> ( struct K * k ) ; "
+                           "void g ( struct K * k ) { "
+                           "f<false> ( k ) ; "
+                           "} "
+                           "void f<false> ( struct K * k ) { "
+                           "assert ( false == k . b ) ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code));
+
+        const char code2[] = "namespace N { bool b = false; }\n" // #13759
+                             "template<bool b>\n"
+                             "void f() {\n"
+                             "    assert(b == N::b);\n"
+                             "}\n"
+                             "void g() {\n"
+                             "    f<false>();\n"
+                             "}\n";
+        const char exp2[] = "namespace N { bool b ; b = false ; } "
+                            "void f<false> ( ) ; "
+                            "void g ( ) { "
+                            "f<false> ( ) ; "
+                            "} "
+                            "void f<false> ( ) { "
+                            "assert ( false == N :: b ) ; "
+                            "}";
+        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 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"
@@ -4536,44 +4696,62 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(exp, tok(code));
     }
 
+    void template_specialization_3() {
+        const char code[] = "namespace N {\n" // #12312
+                            "    template <typename T>\n"
+                            "    bool equal(const T&);\n"
+                            "    template <>\n"
+                            "    bool equal<int>(const int&) { return false; }\n"
+                            "}\n"
+                            "void f(bool equal, int i) { if (equal) {} }\n";
+        const char exp[] = "namespace N { "
+                           "bool equal<int> ( const int & ) ; "
+                           "template < typename T > "
+                           "bool equal ( const T & ) ; "
+                           "bool equal<int> ( const int & ) { return false ; } "
+                           "} "
+                           "void f ( bool equal , int i ) { if ( equal ) { } }";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
     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"
+                            "};";
+        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() {
@@ -4631,15 +4809,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));
@@ -4839,10 +5017,10 @@ class TestSimplifyTemplate : public TestFixture {
                             "{\n"
                             "};\n";
 
-        tok(code);
+        (void)tok(code);
 
-        //ASSERT_EQUALS("[file1.cpp:15]: (error) Internal error: failed to instantiate template. The checking continues anyway.\n", errout.str());
-        ASSERT_EQUALS("", errout.str());
+        //ASSERT_EQUALS("[file1.cpp:15]: (error) Internal error: failed to instantiate template. The checking continues anyway.\n", errout_str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template_typename() {
@@ -4883,49 +5061,49 @@ class TestSimplifyTemplate : public TestFixture {
 
     void syntax_error_templates_1() {
         // ok code.. using ">" for a comparison
-        tok("x<y>z> xyz;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok("x<y>z> xyz;"));
+        ASSERT_EQUALS("", errout_str());
 
         // ok code
-        tok("template<class T> operator<(T a, T b) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok("template<class T> operator<(T a, T b) { }"));
+        ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #1984)
-        tok("void f(a) int a;\n"
-            "{ ;x<y; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok("void f(a) int a;\n"
+                            "{ ;x<y; }"));
+        ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #1985)
-        tok("void f()\n"
-            "{ try { ;x<y; } }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok("void f()\n"
+                            "{ try { ;x<y; } }"));
+        ASSERT_EQUALS("", errout_str());
 
         // ok code (ticket #3183)
-        tok("MACRO(({ i < x }))");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok("MACRO(({ i < x }))"));
+        ASSERT_EQUALS("", errout_str());
 
         // bad code.. missing ">"
-        ASSERT_THROW(tok("x<y<int> xyz;\n"), InternalError);
+        ASSERT_THROW_INTERNAL(tok("x<y<int> xyz;\n"), SYNTAX);
 
         // bad code
-        ASSERT_THROW(tok("typedef\n"
-                         "    typename boost::mpl::if_c<\n"
-                         "          _visitableIndex < boost::mpl::size< typename _Visitables::ConcreteVisitables >::value\n"
-                         "          , ConcreteVisitable\n"
-                         "          , Dummy< _visitableIndex >\n"
-                         "    >::type ConcreteVisitableOrDummy;\n"), InternalError);
+        ASSERT_THROW_INTERNAL(tok("typedef\n"
+                                  "    typename boost::mpl::if_c<\n"
+                                  "          _visitableIndex < boost::mpl::size< typename _Visitables::ConcreteVisitables >::value\n"
+                                  "          , ConcreteVisitable\n"
+                                  "          , Dummy< _visitableIndex >\n"
+                                  "    >::type ConcreteVisitableOrDummy;\n"), SYNTAX);
 
         // code is ok, don't show syntax error
-        tok("struct A {int a;int b};\n"
-            "class Fred {"
-            "public:\n"
-            "    Fred() : a({1,2}) {\n"
-            "        for (int i=0;i<6;i++);\n" // <- no syntax error
-            "    }\n"
-            "private:\n"
-            "    A a;\n"
-            "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok("struct A {int a;int b};\n"
+                            "class Fred {"
+                            "public:\n"
+                            "    Fred() : a({1,2}) {\n"
+                            "        for (int i=0;i<6;i++);\n" // <- no syntax error
+                            "    }\n"
+                            "private:\n"
+                            "    A a;\n"
+                            "};"));
+        ASSERT_EQUALS("", errout_str());
 
         //both of these should work but in cppcheck 2.1 only the first option will work (ticket #9843)
         {
@@ -4933,39 +5111,39 @@ class TestSimplifyTemplate : public TestFixture {
             ASSERT_EQUALS(expected,
                           tok("template <long Num>\n"
                               "constexpr bool foo<bar<Num> > = true;\n"));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             ASSERT_EQUALS(expected,
                           tok("template <long Num>\n"
                               "constexpr bool foo<bar<Num>> = true;\n"));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
-    void template_member_ptr() { // Ticket #5786
-        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); }"
-            "};");
-        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); }"
-            "};");
-        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); }"
-            "};");
-        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 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 template_namespace_1() {
@@ -5218,6 +5396,43 @@ class TestSimplifyTemplate : public TestFixture {
                       "} int MyNamespace :: TestClass :: TemplatedMethod<int> ( int t ) { return t ; }", tok(code));
     }
 
+    void template_namespace_12() {
+        const char code[] = "struct S {};\n" // #13444
+                            "namespace N {\n"
+                            "    template<>\n"
+                            "    struct hash<S> {};\n"
+                            "}\n"
+                            "struct T {\n"
+                            "    T(int i) : hash(i) {}\n"
+                            "    int hash;\n"
+                            "};\n";
+        ASSERT_EQUALS("struct S { } ; "
+                      "namespace N { "
+                      "struct hash<S> { } ; "
+                      "} "
+                      "struct T { "
+                      "T ( int i ) : hash ( i ) { } "
+                      "int hash ; "
+                      "} ;",
+                      tok(code));
+    }
+
+    void template_namespace_13() {
+        const char code[] = "namespace N {\n" // #13593
+                            "    template<typename T>\n"
+                            "    struct S {\n"
+                            "        using U = T*;\n"
+                            "    };\n"
+                            "}\n"
+                            "::N::S<int>::U u;\n";
+        ASSERT_EQUALS("namespace N { "
+                      "struct S<int> ; "
+                      "} "
+                      "int * u ; "
+                      "struct N :: S<int> { } ;",
+                      tok(code));
+    }
+
     void template_pointer_type() {
         const char code[] = "template<class T> void foo(const T x) {}\n"
                             "void bar() { foo<int*>(0); }";
@@ -5228,11 +5443,11 @@ class TestSimplifyTemplate : public TestFixture {
 
     void template_array_type() {
         ASSERT_EQUALS("void foo<int[]> ( int [ ] x ) ; "
-                      "void bar ( ) { int [ 3 ] y ; foo<int[]> ( y ) ; } "
-                      "void foo<int[]> ( int [ ] x ) { } ;",
+                      "void bar ( ) { int y [ 3 ] ; foo<int[]> ( y ) ; } "
+                      "void foo<int[]> ( int [ ] x ) { }",
                       tok("template <class T> void foo(T x) {};\n"
                           "void bar() {\n"
-                          "  int[3] y;\n"
+                          "  int y[3];\n"
                           "  foo<int[]>(y);\n"
                           "}"));
         ASSERT_EQUALS("struct A<int[2]> ; "
@@ -5256,11 +5471,13 @@ class TestSimplifyTemplate : public TestFixture {
                           "C<B<int>> y;"));
     }
 
-    unsigned int templateParameters(const char code[]) {
-        Tokenizer tokenizer(&settings, this);
-
-        std::istringstream istr(code);
-        tokenizer.createTokens(istr, "test.cpp");
+    template<size_t size>
+    unsigned int templateParameters(const char (&data)[size]) {
+        TokenList tokenlist{settings, Standards::Language::CPP};
+        tokenlist.appendFileIfNew("test.cpp");
+        if (!tokenlist.createTokensFromString(data))
+            return false;
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5318,14 +5535,19 @@ class TestSimplifyTemplate : public TestFixture {
         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
     }
 
     // Helper function to unit test TemplateSimplifier::getTemplateNamePosition
-    int templateNamePositionHelper(const char code[], unsigned offset = 0) {
-        Tokenizer tokenizer(&settings, this);
+    template<size_t size>
+    int templateNamePositionHelper(const char (&data)[size], unsigned offset = 0) {
+        TokenList tokenlist{settings, Standards::Language::CPP};
 
-        std::istringstream istr(code);
-        tokenizer.createTokens(istr, "test.cpp");
+        tokenlist.appendFileIfNew("test.cpp");
+        if (!tokenlist.createTokensFromString(data))
+            return false;
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5391,11 +5613,12 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     // Helper function to unit test TemplateSimplifier::findTemplateDeclarationEnd
-    bool findTemplateDeclarationEndHelper(const char code[], const char pattern[], unsigned offset = 0) {
-        Tokenizer tokenizer(&settings, this);
-
-        std::istringstream istr(code);
-        tokenizer.createTokens(istr, "test.cpp");
+    template<size_t size>
+    bool findTemplateDeclarationEndHelper(const char (&data)[size], const char pattern[], unsigned offset = 0) {
+        TokenList tokenlist{settings, Standards::Language::CPP};
+        if (!TokenListHelper::createTokensFromString(tokenlist, data, "test.cpp"))
+            return false;
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.splitTemplateRightAngleBrackets(false);
 
@@ -5420,16 +5643,18 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     // Helper function to unit test TemplateSimplifier::getTemplateParametersInDeclaration
-    bool getTemplateParametersInDeclarationHelper(const char code[], const std::vector<std::string> & params) {
-        Tokenizer tokenizer(&settings, this);
+    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);
-        tokenizer.createTokens(istr, "test.cpp");
+        if (!TokenListHelper::createTokensFromString(tokenlist, data, "test.cpp"))
+            return false;
+        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;
@@ -5722,14 +5947,14 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(expected, tok(code));
     }
 
-#define instantiateMatch(code, numberOfArguments, patternAfter) instantiateMatch_(code, numberOfArguments, patternAfter, __FILE__, __LINE__)
-    bool instantiateMatch_(const char code[], const std::size_t numberOfArguments, const char patternAfter[], const char* file, int line) {
-        Tokenizer tokenizer(&settings, this);
+#define instantiateMatch(...) instantiateMatch_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool instantiateMatch_(const char* file, int line, const char (&code)[size], const std::size_t numberOfArguments, const char patternAfter[]) {
+        SimpleTokenizer tokenizer(settings, *this);
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp", ""), file, line);
+        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() {
@@ -5837,7 +6062,7 @@ class TestSimplifyTemplate : public TestFixture {
                                 "void f<bool> ( bool n ) { ( void ) n ; }";
 
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void templateTypeDeduction2() {
@@ -6130,7 +6355,7 @@ class TestSimplifyTemplate : public TestFixture {
                             "}";
         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));
     }
 
@@ -6151,6 +6376,20 @@ class TestSimplifyTemplate : public TestFixture {
                                 "} "
                                 "} ;";
         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));
     }
 
     void template_variable_1() {
@@ -6316,11 +6555,11 @@ class TestSimplifyTemplate : public TestFixture {
                             "typedef Derived<C<static_cast<int>(-1)> > C_;\n"
                             "class C3 { C_ c; };";
         const char expected[] = "template < int N > class C { } ; "
-                                "class Base<C<static_cast<int>-1>> ; "
-                                "class Derived<C<static_cast<int>-1>> ; "
-                                "class C3 { Derived<C<static_cast<int>-1>> c ; } ; "
-                                "class Derived<C<static_cast<int>-1>> : private Base<C<static_cast<int>-1>> { } ; "
-                                "class Base<C<static_cast<int>-1>> { } ;";
+                                "class Base<C<static_cast<int>(-1)>> ; "
+                                "class Derived<C<static_cast<int>(-1)>> ; "
+                                "class C3 { Derived<C<static_cast<int>(-1)>> c ; } ; "
+                                "class Derived<C<static_cast<int>(-1)>> : private Base<C<static_cast<int>(-1)>> { } ; "
+                                "class Base<C<static_cast<int>(-1)>> { } ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
@@ -6405,6 +6644,41 @@ class TestSimplifyTemplate : public TestFixture {
         const char code[] = "class Fred { explicit(false) Fred(int); };";
         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 dumpTemplateArgFrom() {
+        const char code[] = "template<class T> void foo(T t) {}\n"
+                            "foo<int>(23);";
+        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 574e364e6bd..f55b1e83fc7 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-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
@@ -17,30 +17,29 @@
  */
 
 #include "errortypes.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
 #include "fixture.h"
 #include "token.h"
-#include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
 
-
 class TestSimplifyTokens : public TestFixture {
 public:
     TestSimplifyTokens() : TestFixture("TestSimplifyTokens") {}
 
 
 private:
-    // If there are unused templates, keep those
-    const Settings settings0 = settingsBuilder().severity(Severity::portability).checkUnusedTemplates().build();
-    const Settings settings1 = settingsBuilder().severity(Severity::style).checkUnusedTemplates().build();
-    const Settings settings_std = settingsBuilder().library("std.cfg").checkUnusedTemplates().build();
-    const Settings settings_windows = settingsBuilder().library("windows.cfg").severity(Severity::portability).checkUnusedTemplates().build();
+    const Settings settings0 = settingsBuilder().severity(Severity::portability).build();
+    const Settings settings1 = settingsBuilder().severity(Severity::style).build();
+    const Settings settings_std = settingsBuilder().library("std.cfg").build();
+    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);
@@ -90,6 +89,7 @@ class TestSimplifyTokens : public TestFixture {
         TEST_CASE(simplifyStructDecl6); // ticket #3732
         TEST_CASE(simplifyStructDecl7); // ticket #476 (static anonymous struct array)
         TEST_CASE(simplifyStructDecl8); // ticket #7698
+        TEST_CASE(simplifyStructDecl9);
 
         // register int var; => int var;
         // inline int foo() {} => int foo() {}
@@ -113,6 +113,7 @@ class TestSimplifyTokens : public TestFixture {
         TEST_CASE(simplifyNestedNamespace);
         TEST_CASE(simplifyNamespaceAliases1);
         TEST_CASE(simplifyNamespaceAliases2); // ticket #10281
+        TEST_CASE(simplifyNamespaceAliases3);
 
         TEST_CASE(simplifyKnownVariables2);
         TEST_CASE(simplifyKnownVariables3);
@@ -163,69 +164,48 @@ class TestSimplifyTokens : public TestFixture {
         TEST_CASE(simplifyVarDeclInitLists);
     }
 
-#define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tok_(const char* file, int line, const char code[], bool simplify = true, cppcheck::Platform::Type type = cppcheck::Platform::Type::Native) {
-        errout.str("");
-
-        const Settings settings = settingsBuilder(settings0).platform(type).build();
-        Tokenizer tokenizer(&settings, this);
-
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
-
-        return tokenizer.tokens()->stringifyList(nullptr, !simplify);
-    }
-
-    std::string tok_(const char* file, int line, const char code[], const char filename[], bool simplify = true) {
-        errout.str("");
-
-        Tokenizer tokenizer(&settings0, this);
+    struct TokOptions
+    {
+        bool cpp = true;
+        Platform::Type type = Platform::Type::Native;
+    };
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+#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).platform(options.type).build();
+        SimpleTokenizer tokenizer(settings, *this, options.cpp);
 
-        (void)simplify;
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
 
-#define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeAndStringify_(const char* file, int linenr, const char code[], bool simplify = false, bool expand = true, cppcheck::Platform::Type platform = cppcheck::Platform::Type::Native, const char* filename = "test.cpp", bool cpp11 = true) {
-        errout.str("");
+    struct TokenizeAndStringifyOptions
+    {
+        Platform::Type platform = Platform::Type::Native;
+        bool cpp = true;
+    };
 
-        const Settings settings = settingsBuilder(settings1).debugwarnings().platform(platform).cpp(cpp11 ? Standards::CPP11 : Standards::CPP03).build();
+#define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string tokenizeAndStringify_(const char* file, int linenr, const char (&code)[size], const TokenizeAndStringifyOptions& options = make_default_obj()) {
+        const Settings settings = settingsBuilder(settings1).debugwarnings().platform(options.platform).cpp(Standards::CPP03).build();
 
         // tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, linenr);
-
-        (void)simplify;
-
-        // filter out ValueFlow messages..
-        const std::string debugwarnings = errout.str();
-        errout.str("");
-        std::istringstream istr2(debugwarnings);
-        std::string line;
-        while (std::getline(istr2,line)) {
-            if (line.find("valueflow.cpp") == std::string::npos)
-                errout << line << "\n";
-        }
+        SimpleTokenizer tokenizer(settings, *this, options.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, true, false, true, false, nullptr, nullptr);
         return "";
     }
 
 #define tokenizeDebugListing(...) tokenizeDebugListing_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeDebugListing_(const char* file, int line, const char code[], bool simplify = false, const char filename[] = "test.cpp") {
-        errout.str("");
-
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
-
-        (void)simplify;
+    template<size_t size>
+    std::string tokenizeDebugListing_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // result..
         return tokenizer.tokens()->stringifyList(true);
@@ -253,10 +233,10 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS(tok(code2), tok(code1));
 
         const char code3[] = "x = L\"1\" TEXT(\"2\") L\"3\";";
-        ASSERT_EQUALS("x = L\"123\" ;", tok(code3, false, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS("x = L\"123\" ;", tok(code3, dinit(TokOptions, $.type = Platform::Type::Win64)));
 
         const char code4[] = "x = TEXT(\"1\") L\"2\";";
-        ASSERT_EQUALS("x = L\"1\" L\"2\" ;", tok(code4, false, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS("x = L\"1\" L\"2\" ;", tok(code4, dinit(TokOptions, $.type = Platform::Type::Win64)));
     }
 
     void combine_wstrings() {
@@ -264,9 +244,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "a = L\"hello world\" ;";
 
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -276,9 +255,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcd = u\"abcd\" ;";
 
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -288,9 +266,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcd = U\"abcd\" ;";
 
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -300,9 +277,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcd = u8\"abcd\" ;";
 
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -312,9 +288,8 @@ class TestSimplifyTokens : public TestFixture {
 
         const char expected[] =  "abcdef = L\"abcdef\" ;";
 
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
     }
@@ -624,78 +599,76 @@ class TestSimplifyTokens : public TestFixture {
         {
             const char code[] = "void f(int namespace) { }";
 
-            const char expected[] = "void f ( int namespace ) { }";
-
-            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
         }
     }
 
     void not1() {
-        ASSERT_EQUALS("void f ( ) { if ( ! p ) { ; } }", tok("void f() { if (not p); }", "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }", tok("void f() { if (p && not q); }", "test.c"));
-        ASSERT_EQUALS("void f ( ) { a = ! ( p && q ) ; }", tok("void f() { a = not(p && q); }", "test.c"));
+        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)));
         // 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; };", "test.c"));
-        ASSERT_EQUALS("void f ( ) { not p ; compl c ; }", tok(" void f() { not p; compl c; }", "test.c"));
-        ASSERT_EQUALS("void foo ( not i ) ;", tok("void foo(not i);", "test.c"));
-        ASSERT_EQUALS("int foo ( not i ) { return g ( i ) ; }", tok("int foo(not i) { return g(i); }", "test.c"));
+        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)));
     }
 
     void and1() {
         ASSERT_EQUALS("void f ( ) { if ( p && q ) { ; } }",
-                      tok("void f() { if (p and q) ; }", "test.c"));
+                      tok("void f() { if (p and q) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && q ) { ; } }",
-                      tok("void f() { if (foo() and q) ; }", "test.c"));
+                      tok("void f() { if (foo() and q) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) && bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() and bar()) ; }", "test.c"));
+                      tok("void f() { if (foo() and bar()) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p && bar ( ) ) { ; } }",
-                      tok("void f() { if (p and bar()) ; }", "test.c"));
+                      tok("void f() { if (p and bar()) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p && ! q ) { ; } }",
-                      tok("void f() { if (p and not q) ; }", "test.c"));
+                      tok("void f() { if (p and not q) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = a && b ; }",
-                      tok("void f() { r = a and b; }", "test.c"));
+                      tok("void f() { r = a and b; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = ( a || b ) && ( c || d ) ; }",
-                      tok("void f() { r = (a || b) and (c || d); }", "test.c"));
+                      tok("void f() { r = (a || b) and (c || d); }", 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') {} }", "test.c"));
+                      tok("void f() { if (test1[i] == 'A' and test2[i] == 'C') {} }", dinit(TokOptions, $.cpp = false)));
     }
 
     void or1() {
         ASSERT_EQUALS("void f ( ) { if ( p || q ) { ; } }",
-                      tok("void f() { if (p or q) ; }", "test.c"));
+                      tok("void f() { if (p or q) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || q ) { ; } }",
-                      tok("void f() { if (foo() or q) ; }", "test.c"));
+                      tok("void f() { if (foo() or q) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( foo ( ) || bar ( ) ) { ; } }",
-                      tok("void f() { if (foo() or bar()) ; }", "test.c"));
+                      tok("void f() { if (foo() or bar()) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p || bar ( ) ) { ; } }",
-                      tok("void f() { if (p or bar()) ; }", "test.c"));
+                      tok("void f() { if (p or bar()) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { if ( p || ! q ) { ; } }",
-                      tok("void f() { if (p or not q) ; }", "test.c"));
+                      tok("void f() { if (p or not q) ; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = a || b ; }",
-                      tok("void f() { r = a or b; }", "test.c"));
+                      tok("void f() { r = a or b; }", dinit(TokOptions, $.cpp = false)));
 
         ASSERT_EQUALS("void f ( ) { r = ( a && b ) || ( c && d ) ; }",
-                      tok("void f() { r = (a && b) or (c && d); }", "test.c"));
+                      tok("void f() { r = (a && b) or (c && d); }", 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); }", "test.c"));
+                      tok("void f() { err or_eq ((r bitand s) and not t); }", 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) ; }", "test.c"));
+                      tok("void f() const { r = f(a[4] bitor 0x0F, compl c, not d) ; }", dinit(TokOptions, $.cpp = false)));
 
     }
 
@@ -1067,7 +1040,7 @@ class TestSimplifyTokens : public TestFixture {
         // ticket #980
         {
             const char code[] = "void f() { int A(1),B(2),C=3,D,E(5),F=6; }";
-            const char expected[] = "void f ( ) { int A ; A = 1 ; int B ; B = 2 ; int C ; C = 3 ; int D ; int E ; E = 5 ; int F ; F = 6 ; }";
+            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));
         }
 
@@ -1258,6 +1231,63 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("enum class J : short { x , y , z } ; enum J j ; j = x ;", tok("enum class J : short { x, y, z } j{x};"));
     }
 
+    void simplifyStructDecl9() {
+        const char *exp{};
+        {
+            const char code[] = "enum E : int;\n" // #12588
+                                "void f() {}\n"
+                                "namespace {\n"
+                                "    struct S {\n"
+                                "        explicit S(int i) : m(i) {}\n"
+                                "        int m;\n"
+                                "    };\n"
+                                "}\n"
+                                "void g() { S s(0); }\n";
+            exp = "enum E : int ; "
+                  "void f ( ) { } "
+                  "namespace { "
+                  "struct S { "
+                  "explicit S ( int i ) : m ( i ) { } "
+                  "int m ; "
+                  "} ; "
+                  "} "
+                  "void g ( ) { S s ( 0 ) ; }";
+            ASSERT_EQUALS(exp, tok(code));
+        }
+
+        {
+            const char code[] = "struct S {\n" // 12595
+                                "    explicit S() {\n"
+                                "        e = E1;\n"
+                                "    }\n"
+                                "    enum { E1 } e = E1;\n"
+                                "};\n";
+            exp = "struct S { "
+                  "explicit S ( ) { e = E1 ; } "
+                  "enum Anonymous0 { E1 } ; "
+                  "enum Anonymous0 e ; "
+                  "e = E1 ; "
+                  "} ;";
+            ASSERT_EQUALS(exp, tok(code));
+        }
+
+        {
+            const char code[] = "struct S {\n"
+                                "    explicit S() {\n"
+                                "        e = E1;\n"
+                                "    }\n"
+                                "    enum : std::uint8_t { E1 } e = E1;\n"
+                                "};\n";
+            exp = "struct S { "
+                  "explicit S ( ) { e = E1 ; } "
+                  "enum Anonymous0 : std :: uint8_t { E1 } ; "
+                  "enum Anonymous0 e ; "
+                  "e = E1 ; "
+                  "} ;";
+            ASSERT_EQUALS(exp, tok(code));
+        }
+    }
+
     void removeUnwantedKeywords() {
         ASSERT_EQUALS("int var ;", tok("register int var ;"));
         ASSERT_EQUALS("short var ;", tok("register short int var ;"));
@@ -1268,20 +1298,20 @@ class TestSimplifyTokens : public TestFixture {
         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;", "test.c"));
-        ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", "test.c"));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * __restrict__ a, float * __restrict__ b);", "test.c"));
-        ASSERT_EQUALS("int * p ;", tok("int * restrict p;", "test.c"));
-        ASSERT_EQUALS("int * * p ;", tok("int * restrict * p;", "test.c"));
-        ASSERT_EQUALS("void foo ( float * a , float * b ) ;", tok("void foo(float * restrict a, float * restrict b);", "test.c"));
+        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;", "test.c"));
+        ASSERT_EQUALS("int * p ;", tok("typedef int * __restrict__ rint; rint p;", dinit(TokOptions, $.cpp = false)));
 
         // don't remove struct members:
         ASSERT_EQUALS("a = b . _inline ;", tok("a = b._inline;"));
 
-        ASSERT_EQUALS("int i ; i = 0 ;", tok("auto int i = 0;", "test.c"));
-        ASSERT_EQUALS("auto i ; i = 0 ;", tok("auto i = 0;", "test.cpp"));
+        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;"));
     }
 
     void simplifyCallingConvention() {
@@ -1301,12 +1331,12 @@ class TestSimplifyTokens : public TestFixture {
         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();", true, cppcheck::Platform::Type::Win32A));
-        ASSERT_EQUALS("int f ( ) ;", tok("int APIENTRY f();", true, cppcheck::Platform::Type::Win32A));
-        ASSERT_EQUALS("int f ( ) ;", tok("int CALLBACK f();", true, cppcheck::Platform::Type::Win32A));
+        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)));
 
         // don't simplify Microsoft defines in unix code (#7554)
-        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", true, cppcheck::Platform::Type::Unix32));
+        ASSERT_EQUALS("enum E { CALLBACK } ;", tok("enum E { CALLBACK } ;", dinit(TokOptions, $.type = Platform::Type::Unix32)));
     }
 
     void simplifyAttribute() {
@@ -1317,6 +1347,7 @@ class TestSimplifyTokens : public TestFixture {
         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
     }
 
     void simplifyFunctorCall() {
@@ -1382,7 +1413,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "  fact2<3> ();\n"
                                 "  fact2<2> ();\n"
                                 "}";
-            tok(code);
+            (void)tok(code);
         }
     }
 
@@ -1487,13 +1518,23 @@ class TestSimplifyTokens : public TestFixture {
                           "}"));
     }
 
-#define simplifyKnownVariables(code) simplifyKnownVariables_(code, __FILE__, __LINE__)
-    std::string simplifyKnownVariables_(const char code[], const char* file, int line) {
-        errout.str("");
+    void simplifyNamespaceAliases3() {
+        ASSERT_EQUALS("namespace N { namespace O { int g ( ) ; } } " // #12586
+                      "void f ( ) { "
+                      "int s ; s = 3 * :: N :: O :: g ( ) ; "
+                      "}",
+                      tok("namespace N { namespace O { int g(); } }\n"
+                          "namespace _n = ::N::O;\n"
+                          "void f() {\n"
+                          "    int s = 3 * ::_n::g();\n"
+                          "}\n"));
+    }
 
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+#define simplifyKnownVariables(...) simplifyKnownVariables_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string simplifyKnownVariables_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
@@ -1573,7 +1614,7 @@ class TestSimplifyTokens : public TestFixture {
     void simplifyKnownVariables16() {
         // ticket #807 - segmentation fault when macro isn't found
         const char code[] = "void f ( ) { int n = 1; DISPATCH(while); }";
-        ASSERT_THROW(simplifyKnownVariables(code), InternalError);
+        ASSERT_THROW_INTERNAL(simplifyKnownVariables(code), UNKNOWN_MACRO);
     }
 
     void simplifyKnownVariables17() {
@@ -1673,7 +1714,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 + v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1691,7 +1732,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 - v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1709,7 +1750,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 * v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1727,7 +1768,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 / v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1745,7 +1786,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 & v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1763,7 +1804,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 | v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1781,7 +1822,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 ^ v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1799,7 +1840,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 % v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1817,7 +1858,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 >> v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1835,7 +1876,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 << v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1853,7 +1894,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 == v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1871,7 +1912,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 != v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1889,7 +1930,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 > v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1907,7 +1948,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 >= v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1925,7 +1966,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 < v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1943,7 +1984,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 <= v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1961,7 +2002,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 && v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
 
         {
@@ -1979,7 +2020,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "4:\n"
                                     "5: return u@1 || v@2 ;\n"
                                     "6: }\n";
-            ASSERT_EQUALS(expected, tokenizeDebugListing(code, true));
+            ASSERT_EQUALS(expected, tokenizeDebugListing(code));
         }
     }
 
@@ -1994,7 +2035,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "iterator it2 ; it2 = it1 ;\n"
                                 "for ( ++ it2 ; it2 != ints . end ( ) ; ++ it2 ) { ; }\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyKnownVariables34() {
@@ -2008,7 +2049,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "do { cin >> x ; } while ( x > 5 ) ;\n"
                                 "a [ x ] = 0 ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:10]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyKnownVariables36() {
@@ -2019,7 +2063,7 @@ class TestSimplifyTokens : public TestFixture {
                              "    memset(buf, 0, 10);"
                              "}";
         const char expected2[] = "void f ( ) { char buf [ 10 ] = \"ab\" ; memset ( buf , 0 , 10 ) ; }";
-        ASSERT_EQUALS(expected2, tokenizeAndStringify(code2, true));
+        ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
     }
 
     void simplifyKnownVariables42() {
@@ -2034,7 +2078,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "strcpy ( a , \"hello\" ) ;\n"
                                     "strcat ( a , \"!\" ) ;\n"
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, true, cppcheck::Platform::Type::Native, "test.c"));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeAndStringifyOptions, $.cpp = false)));
         }
 
         {
@@ -2048,7 +2092,7 @@ class TestSimplifyTokens : public TestFixture {
                                     " strcpy ( s , \"\" ) ;"
                                     " free ( s ) ; "
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
@@ -2060,7 +2104,7 @@ class TestSimplifyTokens : public TestFixture {
                                     " strcpy ( p , \"abc\" ) ;"
                                     " q = p ; "
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         // 3538
@@ -2075,7 +2119,8 @@ class TestSimplifyTokens : public TestFixture {
                                     "strcpy ( s , \"123\" ) ;\n"
                                     "if ( s [ 6 ] == ' ' ) { ; }\n"
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code,true));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+            ASSERT_EQUALS("", filter_valueflow(errout_str()));
         }
     }
 
@@ -2089,7 +2134,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "int a ; int * p ; p = & a ;\n"
                                     "{ int a ; a = * p ; }\n"
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
 
         {
@@ -2101,7 +2146,7 @@ class TestSimplifyTokens : public TestFixture {
                                     "int * a ; int * * p ; p = & a ;\n"
                                     "{ int * a ; a = * p ; }\n"
                                     "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
     }
 
@@ -2114,7 +2159,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "static int i = 10 ;\n"
                                 "b ( i ++ ) ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyKnownVariables46() {
@@ -2124,14 +2169,15 @@ class TestSimplifyTokens : public TestFixture {
                             "    return x;\n"
                             "}";
 
-        {
-            const char expected[] = "void f ( ) {\n"
-                                    "int x ; x = 0 ;\n"
-                                    "cin >> x ;\n"
-                                    "return x ;\n"
-                                    "}";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, true, cppcheck::Platform::Type::Native, "test.cpp"));
-        }
+        const char expected[] = "void f ( ) {\n"
+                                "int x ; x = 0 ;\n"
+                                "cin >> x ;\n"
+                                "return x ;\n"
+                                "}";
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyKnownVariables47() {
@@ -2144,7 +2190,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "int x ; x = 0 ;\n"
                                 "cin >> std :: hex >> x ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, true, cppcheck::Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cin [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyKnownVariables48() {
@@ -2157,7 +2206,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "int i ;\n"
                                 "for ( i = 0 ; ( i < sz ) && ( sz > 3 ) ; ++ i ) { }\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeAndStringifyOptions, $.cpp = false)));
     }
 
     void simplifyKnownVariables49() { // #3691
@@ -2173,7 +2222,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "case 2 : ; x = sz ; break ;\n"
                                 "}\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeAndStringifyOptions, $.cpp = false)));
+        ASSERT_EQUALS(
+            "[test.c:2:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyKnownVariables50() { // #4066
@@ -2195,7 +2247,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "const char x7 = 'b' ;\n"
                                 "return & x7 ;\n"
                                 "}";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code, true));
+            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:5:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
+                errout_str());
         }
         {
             //don't simplify '&x'!
@@ -2215,7 +2270,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "const int x7 = 1 ;\n"
                                 "return & x7 ;\n"
                                 "}";
-            ASSERT_EQUALS(code, tokenizeAndStringify(code, true));
+            ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:5:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
+                errout_str());
         }
     }
 
@@ -2225,16 +2283,19 @@ class TestSimplifyTokens : public TestFixture {
                             "  BENCH1(q = _mhz_M(n); n = 1;)\n"
                             "  use_pointer(q);\n"
                             "}";
-        ASSERT_THROW(tokenizeAndStringify(code, true), InternalError);
+        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; }", true));
+        ASSERT_EQUALS("void f ( int * p ) { * -- p = 0 ; * p = 0 ; }", tokenizeAndStringify("void f(int*p) { *--p=0; *p=0; }"));
     }
 
     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; }", true));
+                      tokenizeAndStringify("void f() { int a=0,b=0; *p>>a>>b; return a/b; }"));
+        ASSERT_EQUALS(
+            "[test.cpp:1:26]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyKnownVariables58() { // #5268
@@ -2254,7 +2315,7 @@ class TestSimplifyTokens : public TestFixture {
                       "} "
                       "int baz ( ) { "
                       "return sizeof ( char [ VAL2 ] ) ; "
-                      "}", tokenizeAndStringify(code, true));
+                      "}", tokenizeAndStringify(code));
     }
 
     void simplifyKnownVariables59() { // #5062 - for head
@@ -2269,20 +2330,20 @@ class TestSimplifyTokens : public TestFixture {
                       "for ( i = 0 , j = 1 ; i < 3 , j < 12 ; i ++ , j ++ ) {\n"
                       "a [ i ] = 0 ;\n"
                       "}\n"
-                      "}", tokenizeAndStringify(code, true));
+                      "}", tokenizeAndStringify(code));
     }
 
     void simplifyKnownVariables61() { // #7805
-        tokenizeAndStringify("static const int XX = 0;\n"
-                             "enum E { XX };\n"
-                             "struct s {\n"
-                             "  enum Bar {\n"
-                             "    XX,\n"
-                             "    Other\n"
-                             "  };\n"
-                             "  enum { XX };\n"
-                             "};", /*simplify=*/ true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("static const int XX = 0;\n"
+                                             "enum E { XX };\n"
+                                             "struct s {\n"
+                                             "  enum Bar {\n"
+                                             "    XX,\n"
+                                             "    Other\n"
+                                             "  };\n"
+                                             "  enum { XX };\n"
+                                             "};"));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyKnownVariables62() { // #5666
@@ -2293,13 +2354,13 @@ class TestSimplifyTokens : public TestFixture {
                       tokenizeAndStringify("void foo(std::string str) {\n"
                                            "  char *p = &str[0];\n"
                                            "  *p = 0;\n"
-                                           "}", /*simplify=*/ true));
+                                           "}"));
     }
 
     void simplifyKnownVariables63() { // #10798
-        tokenizeAndStringify("typedef void (*a)();\n"
-                             "enum class E { a };\n");
-        ASSERT_EQUALS("", errout.str()); // don't throw
+        ASSERT_NO_THROW(tokenizeAndStringify("typedef void (*a)();\n"
+                                             "enum class E { a };\n"));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyKnownVariablesBailOutAssign1() {
@@ -2313,7 +2374,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "if ( x ) { i = 10 ; }\n"
                                 "return i ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void simplifyKnownVariablesBailOutAssign2() {
@@ -2326,7 +2390,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "struct ABC * last ; last = NULL ;\n"
                                 "nr = ( last = list . prev ) . nr ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable nr [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyKnownVariablesBailOutFor1() {
@@ -2336,8 +2403,8 @@ class TestSimplifyTokens : public TestFixture {
         const char expected[] = "void foo ( ) {\n"
                                 "for ( int i = 0 ; i < 10 ; ++ i ) { }\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
-        ASSERT_EQUALS("", errout.str());    // debug warnings
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS("", errout_str());    // debug warnings
     }
 
     void simplifyKnownVariablesBailOutFor2() {
@@ -2349,8 +2416,8 @@ class TestSimplifyTokens : public TestFixture {
                                 "int i ; i = 0 ;\n"
                                 "while ( i < 10 ) { ++ i ; }\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
-        ASSERT_EQUALS("", errout.str());    // debug warnings
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS("", errout_str());    // debug warnings
     }
 
     void simplifyKnownVariablesBailOutFor3() {
@@ -2362,8 +2429,8 @@ class TestSimplifyTokens : public TestFixture {
                                 "for ( std :: string :: size_type pos = 0 ; pos < 10 ; ++ pos )\n"
                                 "{ }\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
-        ASSERT_EQUALS("", errout.str());    // debug warnings
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS("", errout_str());    // debug warnings
     }
 
     void simplifyKnownVariablesBailOutMemberFunction() {
@@ -2375,7 +2442,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "obj b ; b = a ;\n"
                                 "b . f ( ) ;\n"
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyKnownVariablesBailOutConditionalIncrement() {
@@ -2386,8 +2453,10 @@ class TestSimplifyTokens : public TestFixture {
                             "    }\n"
                             "    return a;\n"
                             "}\n";
-        tokenizeAndStringify(code,true);
-        ASSERT_EQUALS("", errout.str());     // no debug warnings
+        (void)tokenizeAndStringify(code);
+        ASSERT_EQUALS(
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str())); // no debug warnings
     }
 
     void simplifyKnownVariablesBailOutSwitchBreak() {
@@ -2426,7 +2495,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "}\n"
                                 "}";
 
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code,true));
+        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
     void simplifyKnownVariablesFunctionCalls() {
@@ -2437,7 +2506,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    a(x);"       // <- don't replace with a(123);
                                 "}";
             const char expected[] = "void a ( int & x ) ; void b ( ) { int x ; x = 123 ; a ( x ) ; }";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code,true));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
     }
 
@@ -2448,7 +2517,8 @@ class TestSimplifyTokens : public TestFixture {
                             "    x = 123;"
                             "    while (!x) { dostuff(); }"
                             "}";
-        ASSERT_EQUALS("static int x ; void f ( ) { x = 123 ; while ( ! x ) { dostuff ( ) ; } }", tokenizeAndStringify(code,true));
+        ASSERT_EQUALS("static int x ; void f ( ) { x = 123 ; while ( ! x ) { dostuff ( ) ; } }", tokenizeAndStringify(code));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
     void simplifyKnownVariablesNamespace() {
@@ -2469,10 +2539,10 @@ class TestSimplifyTokens : public TestFixture {
                                 "3: namespace M { const int m@2 = 0 ; }\n"
                                 "4: }\n"
                                 "5: using namespace N ;\n"
-                                "6: int i ; i = n@1 ;\n"
+                                "6: int i ( n@1 ) ;\n"
                                 "7: int j ( M :: m@2 ) ;\n"
                                 "8: using namespace N :: M ;\n"
-                                "9: int k ; k = m@2 ;\n"
+                                "9: int k ( m@2 ) ;\n"
                                 "10: int l ( N :: M :: m@2 ) ;\n";
             ASSERT_EQUALS(exp, tokenizeDebugListing(code));
         }
@@ -2524,7 +2594,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    memcpy(a, s, 10);\n"   // <- don't simplify "a" here
                                 "}\n";
 
-            const std::string s(tokenizeAndStringify(code, true));
+            const std::string s(tokenizeAndStringify(code));
             ASSERT_EQUALS(true, s.find("memcpy ( a , s , 10 ) ;") != std::string::npos);
         }
 
@@ -2536,7 +2606,7 @@ class TestSimplifyTokens : public TestFixture {
                                 "    memcpy(a, s, 10);\n"   // <- simplify "a"
                                 "}\n";
 
-            const std::string s(tokenizeAndStringify(code, true));
+            const std::string s(tokenizeAndStringify(code));
             TODO_ASSERT_EQUALS(true, false, s.find("memcpy ( 0 , s , 10 ) ;") != std::string::npos);
         }
     }
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index 55b3c085c0f..087e3759901 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-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
@@ -16,23 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "errortypes.h"
-#include "platform.h"
-#include "settings.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "settings.h"
+#include "standards.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
-#include <map>
-#include <sstream>
+#include <cstddef>
 #include <string>
 #include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
+class ErrorLogger;
 
 class TestSimplifyTypedef : public TestFixture {
 public:
@@ -40,26 +37,28 @@ class TestSimplifyTypedef : public TestFixture {
 
 
 private:
-    // If there are unused templates, keep those
-    const Settings settings0 = settingsBuilder().severity(Severity::style).checkUnusedTemplates().build();
-    const Settings settings1 = settingsBuilder().severity(Severity::portability).checkUnusedTemplates().build();
-    const Settings settings2 = settingsBuilder().severity(Severity::style).checkUnusedTemplates().build();
+    const Settings settings0 = settingsBuilder().severity(Severity::style).build();
+    const Settings settings1 = settingsBuilder().severity(Severity::portability).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(c1);
         TEST_CASE(c2);
         TEST_CASE(canreplace1);
         TEST_CASE(canreplace2);
         TEST_CASE(canreplace3);
+        TEST_CASE(canreplace4);
         TEST_CASE(cconst);
         TEST_CASE(cstruct1);
         TEST_CASE(cstruct2);
         TEST_CASE(cstruct3);
         TEST_CASE(cstruct3);
         TEST_CASE(cstruct4);
+        TEST_CASE(cenum1);
         TEST_CASE(cfunction1);
         TEST_CASE(cfunction2);
         TEST_CASE(cfunction3);
+        TEST_CASE(cfunction4);
         TEST_CASE(cfp1);
         TEST_CASE(cfp2);
         TEST_CASE(cfp4);
@@ -69,6 +68,7 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(carray1);
         TEST_CASE(carray2);
         TEST_CASE(carray3);
+        TEST_CASE(carray4);
         TEST_CASE(cdonotreplace1);
         TEST_CASE(cppfp1);
         TEST_CASE(Generic1);
@@ -113,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
@@ -205,13 +207,29 @@ 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
         TEST_CASE(simplifyTypedef143); // #11506
         TEST_CASE(simplifyTypedef144); // #9353
         TEST_CASE(simplifyTypedef145); // #9353
+        TEST_CASE(simplifyTypedef146);
+        TEST_CASE(simplifyTypedef147);
+        TEST_CASE(simplifyTypedef148);
+        TEST_CASE(simplifyTypedef149);
+        TEST_CASE(simplifyTypedef150);
+        TEST_CASE(simplifyTypedef151);
+        TEST_CASE(simplifyTypedef152);
+        TEST_CASE(simplifyTypedef153);
+        TEST_CASE(simplifyTypedef154);
+        TEST_CASE(simplifyTypedef155);
+        TEST_CASE(simplifyTypedef156);
+        TEST_CASE(simplifyTypedef157);
+        TEST_CASE(simplifyTypedef158);
+        TEST_CASE(simplifyTypedef159);
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -223,82 +241,94 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedefFunction8);
         TEST_CASE(simplifyTypedefFunction9);
         TEST_CASE(simplifyTypedefFunction10); // #5191
+        TEST_CASE(simplifyTypedefFunction11);
+
+        TEST_CASE(simplifyTypedefStruct); // #12081 - volatile struct
 
         TEST_CASE(simplifyTypedefShadow);  // #4445 - shadow variable
 
         TEST_CASE(simplifyTypedefMacro);
+
+        TEST_CASE(simplifyTypedefOriginalName1);
+        TEST_CASE(simplifyTypedefOriginalName2);
+
+        TEST_CASE(simplifyTypedefTokenColumn1);
+        TEST_CASE(simplifyTypedefTokenColumn2);
+        TEST_CASE(simplifyTypedefTokenColumn3);
+
+        TEST_CASE(typedefInfo1);
+        TEST_CASE(typedefInfo2);
+        TEST_CASE(typedefInfo3);
     }
 
-#define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tok_(const char* file, int line, const char code[], bool simplify = true, cppcheck::Platform::Type type = cppcheck::Platform::Type::Native, bool debugwarnings = true) {
-        errout.str("");
+    class TokenizerTest : public Tokenizer
+    {
+        friend class TestSimplifyTypedef;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
+    struct TokOptions
+    {
+        bool simplify = true;
+        bool debugwarnings = true;
+    };
 
+#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()) {
         // show warnings about unhandled typedef
-        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(debugwarnings).platform(type).build();
-        Tokenizer tokenizer(&settings, this);
+        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(options.debugwarnings).build();
+        SimpleTokenizer tokenizer(settings, *this);
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        return tokenizer.tokens()->stringifyList(nullptr, !simplify);
+        return tokenizer.tokens()->stringifyList(nullptr, !options.simplify);
     }
 
-    std::string simplifyTypedef(const char code[]) {
-        errout.str("");
-
-        Tokenizer tokenizer(&settings1, this);
-
-        std::istringstream istr(code);
-        tokenizer.list.createTokens(istr);
+    template<size_t size>
+    std::string simplifyTypedef(const char (&data)[size]) {
+        TokenList tokenlist{settings1, Standards::Language::CPP};
+        if (!tokenlist.createTokensFromString(data))
+            return "";
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
 
-
-    std::string simplifyTypedefP(const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+    template<size_t size>
+    std::string simplifyTypedefP(const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings0, *this, code, "test.cpp");
 
         // Tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        tokenizer.createTokens(std::move(tokens2));
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
 
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
 
-#define checkSimplifyTypedef(code) checkSimplifyTypedef_(code, __FILE__, __LINE__)
-    void checkSimplifyTypedef_(const char code[], const char* file, int line) {
-        errout.str("");
+#define checkSimplifyTypedef(...) checkSimplifyTypedef_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkSimplifyTypedef_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
         // show warnings about unhandled typedef
-        const Settings settings = settingsBuilder(settings2).certainty(Certainty::inconclusive).debugwarnings().build();
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings().build();
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
     }
 
 
-    std::string simplifyTypedefC(const char code[]) {
-        errout.str("");
-
-        Tokenizer tokenizer(&settings1, this);
+    template<size_t size>
+    std::string simplifyTypedefC(const char (&data)[size]) {
+        TokenList tokenlist{settings1, Standards::Language::C};
 
-        std::istringstream istr(code);
-        tokenizer.list.createTokens(istr, "file.c");
+        if (!TokenListHelper::createTokensFromString(tokenlist, data, "file.c"))
+            return "";
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
         tokenizer.createLinks();
         tokenizer.simplifyTypedef();
         try {
@@ -309,6 +339,22 @@ class TestSimplifyTypedef : public TestFixture {
         return tokenizer.tokens()->stringifyList(nullptr, false);
     }
 
+    template<size_t size>
+    std::string dumpTypedefInfo(const char (&code)[size]) {
+        TokenList tokenlist{settings1, Standards::Language::C};
+        if (!TokenListHelper::createTokensFromString(tokenlist, code, "file.c"))
+            return {};
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+        try {
+            tokenizer.validate();
+        } catch (const InternalError&) {
+            return {};
+        }
+        return tokenizer.dumpTypedefInfo();
+    }
+
     void c1() {
         const char code[] = "typedef int t;\n"
                             "t x;";
@@ -352,6 +398,14 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS("struct S { const char * g ( ) const { return s . c_str ( ) ; } std :: string s ; } ;", simplifyTypedefC(code1));
     }
 
+    void canreplace4() {
+        const char code1[] = "typedef std::vector<int> X;\n" // #12026
+                             "struct S {\n"
+                             "    enum E { X };\n"
+                             "};\n";
+        ASSERT_EQUALS("struct S { enum E { X } ; } ;", simplifyTypedef(code1));
+    }
+
     void cconst() {
         const char code1[] = "typedef void* HWND;\n"
                              "const HWND x;";
@@ -372,8 +426,8 @@ class TestSimplifyTypedef : public TestFixture {
     void cstruct2() {
         const char code[] = "typedef enum { A, B } t;\n"
                             "t x;";
-        ASSERT_EQUALS("enum t { A , B } ; t x ;", simplifyTypedef(code));
-        ASSERT_EQUALS("enum t { A , B } ; t x ;", simplifyTypedefC(code));
+        ASSERT_EQUALS("enum t { A , B } ; enum t x ;", simplifyTypedef(code));
+        ASSERT_EQUALS("enum t { A , B } ; enum t x ;", simplifyTypedefC(code));
     }
 
     void cstruct3() {
@@ -388,6 +442,12 @@ class TestSimplifyTypedef : public TestFixture {
         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;";
+        ASSERT_EQUALS("enum E { a , b } ; enum E e ;", simplifyTypedefC(code));
+    }
+
     void cfunction1() {
         const char code[] = "typedef int callback(int);\n"
                             "callback* cb;";
@@ -404,8 +464,14 @@ class TestSimplifyTypedef : public TestFixture {
     void cfunction3() {
         const char code[] = "typedef int f(int);\n"
                             "typedef const f cf;\n";
-        simplifyTypedefC(code);
-        ASSERT_EQUALS("[file.c:2]: (portability) It is unspecified behavior to const qualify a function type.\n", errout.str());
+        (void)simplifyTypedefC(code);
+        ASSERT_EQUALS("[file.c:2:9]: (portability) It is unspecified behavior to const qualify a function type. [invalidConstFunctionType]\n", errout_str());
+    }
+
+    void cfunction4() {
+        const char code[] = "typedef int (func_t) (int);\n" // #12625
+                            "int f(int*, func_t*, int);\n";
+        ASSERT_EQUALS("int f ( int * , int ( * ) ( int ) , int ) ;", simplifyTypedefC(code));
     }
 
     void cfp1() {
@@ -460,17 +526,22 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     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() {
+        const char code[] = "typedef int arr[12];\n" // #12019
+                            "void foo() { arr temp = {0}; }\n";
+        ASSERT_EQUALS("void foo ( ) { int temp [ 12 ] = { 0 } ; }", tok(code));
     }
 
     void cdonotreplace1() {
@@ -521,7 +592,7 @@ class TestSimplifyTypedef : public TestFixture {
             "a . foo ( ) ; "
             "wchar_t c ; c = 0 ; "
             "}";
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef2() {
@@ -591,7 +662,7 @@ class TestSimplifyTypedef : public TestFixture {
             "unsigned int uvar ; uvar = 2 ; "
             "return uvar / ivar ; "
             "}";
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef5() {
@@ -609,7 +680,7 @@ class TestSimplifyTypedef : public TestFixture {
             "struct yy_buffer_state * state ; "
             "}";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef6() {
@@ -624,21 +695,21 @@ class TestSimplifyTypedef : public TestFixture {
             ""
             "float fast_atan2 ( float y , float x ) { } "
             "}";
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
 
         // ticket #11373
         const char code1[] =
             "typedef int foo;\n"
             "inline foo f();\n";
         const char expected1[] = "int f ( ) ;";
-        ASSERT_EQUALS(expected1, tok(code1, false));
+        ASSERT_EQUALS(expected1, tok(code1, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef7() {
         const char code[] = "typedef int abc ; "
                             "Fred :: abc f ;";
         const char expected[] = "Fred :: abc f ;";
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef8() {
@@ -669,7 +740,7 @@ class TestSimplifyTypedef : public TestFixture {
             "const int & trci ; "
             "const unsigned int & trcui ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef9() {
@@ -687,15 +758,15 @@ class TestSimplifyTypedef : public TestFixture {
         const char expected[] =
             "struct t { int a ; } ; "
             "struct U { int a ; } ; "
-            "struct Unnamed0 { int a ; } ; "
+            "struct V { int a ; } ; "
             "struct s s ; "
             "struct s * ps ; "
             "struct t t ; "
             "struct t * tp ; "
             "struct U u ; "
-            "struct Unnamed0 * v ;";
+            "struct V * v ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef10() {
@@ -713,15 +784,15 @@ class TestSimplifyTypedef : public TestFixture {
         const char expected[] =
             "union t { int a ; float b ; } ; "
             "union U { int a ; float b ; } ; "
-            "union Unnamed0 { int a ; float b ; } ; "
+            "union V { int a ; float b ; } ; "
             "union s s ; "
             "union s * ps ; "
             "union t t ; "
             "union t * tp ; "
             "union U u ; "
-            "union Unnamed0 * v ;";
+            "union V * v ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef11() {
@@ -732,10 +803,10 @@ class TestSimplifyTypedef : public TestFixture {
 
         const char expected[] = "enum abc { a = 0 , b = 1 , c = 2 } ; "
                                 "enum xyz { x = 0 , y = 1 , z = 2 } ; "
-                                "abc e1 ; "
+                                "enum abc e1 ; "
                                 "enum xyz e2 ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef12() {
@@ -754,18 +825,18 @@ class TestSimplifyTypedef : public TestFixture {
             "std :: vector < std :: vector < int > > v3 ; "
             "std :: list < int > :: iterator iter ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef13() {
-        // ticket # 1167
+        // ticket # 1167 (InternalError)
         const char code[] = "typedef std::pair<int(*)(void*), void*> Func;"
                             "typedef std::vector<Func> CallQueue;"
                             "int main() {}";
 
         // Tokenize and check output..
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok(code));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef14() {
@@ -783,8 +854,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "};";
 
         // Tokenize and check output..
-        TODO_ASSERT_THROW(tok(code, true, cppcheck::Platform::Type::Native, false), InternalError); // TODO: Do not throw exception
-        //ASSERT_EQUALS("", errout.str());
+        TODO_ASSERT_THROW(tok(code, dinit(TokOptions, $.debugwarnings = false)), InternalError); // TODO: Do not throw exception
+        //ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef15() {
@@ -794,7 +865,7 @@ class TestSimplifyTypedef : public TestFixture {
 
             const char expected[] = "char f [ 10 ] ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -803,12 +874,12 @@ class TestSimplifyTypedef : public TestFixture {
 
             const char expected[] = "unsigned char f [ 10 ] ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
     }
 
     void simplifyTypedef16() {
-        // ticket # 1252
+        // ticket # 1252 (InternalError)
         const char code[] = "typedef char MOT8;\n"
                             "typedef  MOT8 CHFOO[4096];\n"
                             "typedef struct {\n"
@@ -816,8 +887,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "} STRFOO;";
 
         // Tokenize and check output..
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tok(code));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef17() {
@@ -829,7 +900,7 @@ class TestSimplifyTypedef : public TestFixture {
             "char * pc ; "
             "char c ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef18() {
@@ -852,7 +923,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "struct A * b ; "
                 "struct A * * c ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -865,7 +936,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "struct A a ; "
                 "struct A * * * * * * * * * b ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -880,7 +951,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "struct Unnamed0 * b ; "
                 "struct Unnamed0 c ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
     }
 
@@ -920,7 +991,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "static void test ( ) { } "
                 "} ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -937,7 +1008,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "static void * test ( void * p ) { return p ; } "
                 "} ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -954,7 +1025,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "static unsigned int * test ( unsigned int * p ) { return p ; } "
                 "} ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -972,7 +1043,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "static const unsigned int * test ( const unsigned int * p ) { return p ; } "
                 "} ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -989,7 +1060,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "static void * test ( void * p ) { return p ; } "
                 "} ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
     }
 
@@ -1002,7 +1073,7 @@ class TestSimplifyTypedef : public TestFixture {
             "void addCallback ( bool ( * callback ) ( int ) ) { } "
             "void addCallback1 ( bool ( * callback ) ( int ) , int j ) { }";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef24() {
@@ -1019,7 +1090,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "int ( * f2 ) ( ) ; f2 = ( int * ) f ; "
                 "}";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -1035,7 +1106,7 @@ class TestSimplifyTypedef : public TestFixture {
                 "int ( * f2 ) ( ) ; f2 = static_cast < int * > ( f ) ; "
                 "}";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
     }
 
@@ -1077,7 +1148,7 @@ class TestSimplifyTypedef : public TestFixture {
 
             const char expected[] = "void addCallback ( void ( * ( * callback ) ( ) ) ( ) ) ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -1089,7 +1160,7 @@ class TestSimplifyTypedef : public TestFixture {
 
             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 ) ) ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
     }
 
@@ -1105,10 +1176,13 @@ class TestSimplifyTypedef : public TestFixture {
             "int main ( ) "
             "{ "
             ""
-            "VERIFY ( is_same < result_of < int ( * ( char , float ) ) ( float , double ) > :: type , int > :: value ) ; "
+            "VERIFY ( ( is_same < result_of < int ( * ( char , float ) ) ( float , double ) > :: type , int > :: value ) ) ; "
             "}";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS(
+            "[test.cpp:4:67]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable value [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyTypedef28() {
@@ -1117,7 +1191,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         const char expected[] = "std :: pair < double , double > ( * f ) ( double ) ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef29() {
@@ -1138,7 +1212,7 @@ class TestSimplifyTypedef : public TestFixture {
             "int t ; "
             "int ia [ N ] ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef30() {
@@ -1154,7 +1228,7 @@ class TestSimplifyTypedef : public TestFixture {
             ":: std :: list < int > :: iterator ili ; "
             ":: std :: list < int > ila [ 10 ] ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef31() {
@@ -1179,7 +1253,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "int A :: get ( ) const { return a ; } "
                                     "int i ; i = A :: a ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -1201,7 +1275,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "int A :: get ( ) const { return a ; } "
                                     "int i ; i = A :: a ;";
 
-            ASSERT_EQUALS(expected, tok(code, false));
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
         }
     }
 
@@ -1218,7 +1292,7 @@ class TestSimplifyTypedef : public TestFixture {
             "char * cp ; "
             "const char * ccp ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef33() {
@@ -1335,9 +1409,9 @@ class TestSimplifyTypedef : public TestFixture {
             "int A :: B :: C :: funC ( ) { return c ; } "
             "long A :: B :: C :: D :: funD ( ) { return d ; }";
 
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS(expected, tok(codePartialSpecified, false));
-        ASSERT_EQUALS(expected, tok(codeFullSpecified, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS(expected, tok(codePartialSpecified, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS(expected, tok(codeFullSpecified, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef34() {
@@ -1359,7 +1433,7 @@ class TestSimplifyTypedef : public TestFixture {
         //    int (**Foo)(int);
         //    Foo = new (int(*[2])(int)) ;
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef35() {
@@ -1430,8 +1504,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "return a + s ; "
                                 "}";
 
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout_str());
     }
 
     void simplifyTypedef36() {
@@ -1445,7 +1519,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "{ "
                                 "* va_arg ( ap , void ( * * ) ( ) ) = 0 ; "
                                 "}";
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef37() {
@@ -1458,15 +1532,15 @@ class TestSimplifyTypedef : public TestFixture {
                                 "{ "
                                 "int i ; { } "
                                 "}";
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef38() {
         const char code[] = "typedef C A;\n"
                             "struct AB : public A, public B { };";
         const char expected[] = "struct AB : public C , public B { } ;";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef43() {
@@ -1484,7 +1558,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "int alloclen ; "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1500,7 +1574,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "int alloclen ; "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1516,7 +1590,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "int alloclen ; "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -1532,7 +1606,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "{ "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1546,7 +1620,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "{ "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1560,7 +1634,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "{ "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1575,7 +1649,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "{ "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1590,7 +1664,32 @@ class TestSimplifyTypedef : public TestFixture {
                                     "{ "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        {
+            const char code[] = "struct B {};\n" // #12141
+                                "typedef struct B B;\n"
+                                "namespace N {\n"
+                                "    struct D : public B {};\n"
+                                "}\n";
+
+            const char expected[] = "struct B { } ; namespace N { struct D : public B { } ; }";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        {
+            const char code[] = "struct B {};\n"
+                                "typedef const struct B CB;\n"
+                                "namespace N {\n"
+                                "    struct D : public CB {};\n"
+                                "}\n"
+                                "CB cb;\n";
+
+            const char expected[] = "struct B { } ; namespace N { struct D : public B { } ; } const struct B cb ;";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -1603,8 +1702,9 @@ class TestSimplifyTypedef : public TestFixture {
 
         checkSimplifyTypedef(code);
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:3]: (debug) valueflow.cpp:6541:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n",
-            errout.str());
+            "[test.cpp:3]: (debug) valueflow.cpp:6541:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n"
+            "[test.cpp:3]: (debug) valueflow.cpp:6541:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n", // duplicate
+            errout_str());
     }
 
     void simplifyTypedef46() {
@@ -1708,7 +1808,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "char ( * foo ( ) ) [ 10 ] { }";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1716,7 +1816,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "LOCAL(type1) foo() { }";
 
             // this is invalid C, assert that an "unknown macro" warning is written
-            ASSERT_THROW(checkSimplifyTypedef(code), InternalError);
+            ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code), UNKNOWN_MACRO);
         }
     }
 
@@ -1735,7 +1835,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "}";
 
         checkSimplifyTypedef(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef55() {
@@ -1754,7 +1854,7 @@ class TestSimplifyTypedef : public TestFixture {
 
         // Check for output..
         checkSimplifyTypedef(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef56() { // ticket #1829
@@ -1771,7 +1871,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "operatorconstvoid(*)()& ( ) { return pr ; } "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef57() { // ticket #1846
@@ -1786,7 +1886,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "int a ; a = int ( 1 ) * int ( 2 ) ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef58() { // ticket #1963
@@ -1797,7 +1897,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "int coords [ 4 ] [ 2 ] = { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 } ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1807,7 +1907,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "int coords [ 4 ] [ 5 ] [ 6 + 1 ] [ 2 ] = { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 } ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -1818,7 +1918,7 @@ class TestSimplifyTypedef : public TestFixture {
         // The expected result..
         const char expected[] = "template < typename DISPATCHER > class SomeTemplateClass { } ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef60() { // ticket #2035
@@ -1830,9 +1930,9 @@ class TestSimplifyTypedef : public TestFixture {
                             "    localEntitiyAddFunc_t f;\n"
                             "}";
         // The expected result..
-        const char expected[] = "enum qboolean { qfalse , qtrue } ; void f ( ) { qboolean b ; qboolean ( * f ) ( struct le_s * , entity_t * ) ; }";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        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)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef61() { // ticket #2074 and 2075
@@ -1841,14 +1941,14 @@ class TestSimplifyTypedef : public TestFixture {
 
         // Check for output..
         checkSimplifyTypedef(code1);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const char code2[] = "typedef unsigned long uint32_t;\n"
                              "typedef uint32_t (*write_type_t) (uint32_t);";
 
         // Check for output..
         checkSimplifyTypedef(code2);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef62() { // ticket #2082
@@ -1860,8 +1960,8 @@ class TestSimplifyTypedef : public TestFixture {
 
         // The expected tokens..
         const char expected1[] = "void f ( ) { char a [ 256 ] ; char b [ 256 ] ; }";
-        ASSERT_EQUALS(expected1, tok(code1, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected1, tok(code1, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
 
         const char code2[] = "typedef char TString[256];\n"
                              "void f()\n"
@@ -1870,9 +1970,9 @@ class TestSimplifyTypedef : public TestFixture {
                              "}";
 
         // The expected tokens..
-        const char expected2[] = "void f ( ) { char a [ 256 ] ; a = { 0 } ; char b [ 256 ] ; b = { 0 } ; }";
-        ASSERT_EQUALS(expected2, tok(code2, false, cppcheck::Platform::Type::Native, false));
-        ASSERT_EQUALS("", errout.str());
+        const char expected2[] = "void f ( ) { char a [ 256 ] = { 0 } ; char b [ 256 ] = { 0 } ; }";
+        ASSERT_EQUALS(expected2, tok(code2, dinit(TokOptions, $.simplify = false, $.debugwarnings = false)));
+        ASSERT_EQUALS("", errout_str());
 
         const char code3[] = "typedef char TString[256];\n"
                              "void f()\n"
@@ -1882,8 +1982,8 @@ class TestSimplifyTypedef : public TestFixture {
 
         // The expected tokens..
         const char expected3[] = "void f ( ) { char a [ 256 ] ; a = \"\" ; char b [ 256 ] ; b = \"\" ; }";
-        ASSERT_EQUALS(expected3, tok(code3, false, cppcheck::Platform::Type::Native, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected3, tok(code3, dinit(TokOptions, $.simplify = false, $.debugwarnings = false)));
+        ASSERT_EQUALS("", errout_str());
 
         const char code4[] = "typedef char TString[256];\n"
                              "void f()\n"
@@ -1893,8 +1993,8 @@ class TestSimplifyTypedef : public TestFixture {
 
         // The expected tokens..
         const char expected4[] = "void f ( ) { char a [ 256 ] ; a = \"1234\" ; char b [ 256 ] ; b = \"5678\" ; }";
-        ASSERT_EQUALS(expected4, tok(code4, false, cppcheck::Platform::Type::Native, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected4, tok(code4, dinit(TokOptions, $.simplify = false, $.debugwarnings = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef63() { // ticket #2175 'typedef float x[3];'
@@ -1902,7 +2002,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "x a,b,c;";
         const std::string actual(tok(code));
         ASSERT_EQUALS("float a [ 3 ] ; float b [ 3 ] ; float c [ 3 ] ;", actual);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef64() {
@@ -1910,7 +2010,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "__type t;";
         const std::string actual(tok(code));
         ASSERT_EQUALS("typeof ( __type1 ( ) + __type2 ( ) ) t ;", actual);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef65() { // ticket #2314
@@ -1919,16 +2019,16 @@ class TestSimplifyTypedef : public TestFixture {
                             "    Foo b(0);\n"
                             "    return b > Foo(10);\n"
                             "}";
-        const std::string actual(tok(code, true, cppcheck::Platform::Type::Native, false));
+        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());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef66() { // ticket #2341
         const char code[] = "typedef long* GEN;\n"
                             "extern GEN (*foo)(long);";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef67() { // ticket #2354
@@ -1942,7 +2042,9 @@ class TestSimplifyTypedef : public TestFixture {
                                 "( ( int * * * ) global [ 6 ] ) ( \"assoc\" , \"eggdrop\" , 106 , 0 ) ; "
                                 "}";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS("[test.cpp:3]: (debug) valueflow.cpp:1319:valueFlowConditionExpressions bailout: Skipping function due to incomplete variable global\n", errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:50]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable global [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyTypedef68() { // ticket #2355
@@ -1950,7 +2052,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void *(*b) ();";
         const std::string actual(tok(code));
         ASSERT_EQUALS("void * ( * b ) ( ) ;", actual);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef69() { // ticket #2348
@@ -1964,7 +2066,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "int ( * * ( * compilerHookVector ) ( void ) ) ( ) ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef70() { // ticket #2348
@@ -1972,7 +2074,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "pread_f *(*test_func)(char *filename);";
         const char expected[] = "int ( * ( * test_func ) ( char * filename ) ) ( int ) ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef71() { // ticket #2348
@@ -1981,14 +2083,14 @@ class TestSimplifyTypedef : public TestFixture {
                                 "RexxFunctionHandler *(efuncs[1]);";
             const char expected[] = "int ( * ( efuncs [ 1 ] ) ) ( ) ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "typedef int RexxFunctionHandler();\n"
                                 "RexxFunctionHandler *(efuncs[]) = { NULL, NULL };";
             const char expected[] = "int ( * ( efuncs [ ] ) ) ( ) = { NULL , NULL } ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -2004,7 +2106,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "operatorint** ( ) const { } "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         // inline local variable
         {
@@ -2017,7 +2119,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "void f1 ( ) const { int i ; } "
                                     "} ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         // out of line member variable
         {
@@ -2032,7 +2134,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "} ; "
                                     "void Fred :: f1 ( ) const { int i ; f ( i ) ; }";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         // out of line operator
         {
@@ -2047,7 +2149,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     "} ; "
                                     "Fred :: operatorint** ( ) const { }";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -2061,7 +2163,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void f ( ) ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef74() { // ticket #2414
@@ -2072,17 +2174,17 @@ class TestSimplifyTypedef : public TestFixture {
         const char expected[] = "long ( * ( * current_state ) ( void ) ) ( void ) ; current_state = death ; "
                                 "static char get_runlevel ( long ( * ( * const ) ( void ) ) ( void ) ) ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef75() { // ticket #2426
         const char code[] = "typedef _Packed struct S { long l; };";
-        ASSERT_EQUALS(";", tok(code, true, cppcheck::Platform::Type::Native, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(";", tok(code, dinit(TokOptions, $.debugwarnings = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef76() { // ticket #2453 segmentation fault
-        ASSERT_THROW(checkSimplifyTypedef("void f1(typedef int x) {}"), InternalError);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef("void f1(typedef int x) {}"), SYNTAX);
     }
 
     void simplifyTypedef77() { // ticket #2554
@@ -2123,13 +2225,13 @@ class TestSimplifyTypedef : public TestFixture {
                                 "sizeof ( struct s ) ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef81() { // ticket #2603 segmentation fault
-        ASSERT_THROW(checkSimplifyTypedef("typedef\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef("typedef\n"), SYNTAX);
 
-        ASSERT_THROW(checkSimplifyTypedef("typedef constexpr\n"), InternalError);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef("typedef constexpr\n"), SYNTAX);
     }
 
     void simplifyTypedef82() { // ticket #2403
@@ -2146,7 +2248,7 @@ class TestSimplifyTypedef : public TestFixture {
                              "  B * b = new B;\n"
                              "  b->f = new A::F * [ 10 ];\n"
                              "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef83() { // ticket #2620
@@ -2161,20 +2263,20 @@ class TestSimplifyTypedef : public TestFixture {
 
     void simplifyTypedef84() { // ticket #2630 (segmentation fault)
         const char code1[] = "typedef y x () x";
-        ASSERT_THROW(checkSimplifyTypedef(code1), InternalError);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code1), SYNTAX);
 
         const char code2[] = "typedef struct template <>";
-        ASSERT_THROW(checkSimplifyTypedef(code2), InternalError);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code2), SYNTAX);
 
         const char code3[] = "typedef ::<>";
-        ASSERT_THROW(checkSimplifyTypedef(code3), InternalError);
+        ASSERT_THROW_INTERNAL(checkSimplifyTypedef(code3), SYNTAX);
     }
 
     void simplifyTypedef85() { // ticket #2651
         const char code[] = "typedef FOO ((BAR)(void, int, const int, int*));";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef86() { // ticket #2581
@@ -2191,21 +2293,21 @@ class TestSimplifyTypedef : public TestFixture {
                                 "safe_bool operator! ( ) const ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef87() { // ticket #2651
         const char code[] = "typedef FOO (*(*BAR)(void, int, const int, int*));";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef88() { // ticket #2675
         const char code[] = "typedef short int (*x)(...);";
         const char expected[] = ";";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef89() { // ticket #2717
@@ -2215,7 +2317,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "};";
         const char expected[] = "class Fred { void func ( int ) const ; } ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef90() { // ticket #2718
@@ -2223,7 +2325,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "void f(const IA&) {};";
         const char expected[] = "void f ( const int ( & ) [ 2 ] ) { } ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef91() { // ticket #2716
@@ -2246,7 +2348,7 @@ class TestSimplifyTypedef : public TestFixture {
                                  "int * A :: f ( ) { } "
                                  "}";
         ASSERT_EQUALS(expected1, tok(code1));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const char code2[] = "namespace NS {\n"
                              "    typedef int (*T)();\n"
@@ -2263,7 +2365,7 @@ class TestSimplifyTypedef : public TestFixture {
                                  "} "
                                  "int * NS :: A :: f ( ) { }";
         ASSERT_EQUALS(expected2, tok(code2));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const char code3[] = "namespace NS1 {\n"
                              "    namespace NS2 {\n"
@@ -2292,7 +2394,7 @@ class TestSimplifyTypedef : public TestFixture {
                                  "} "
                                  "}";
         ASSERT_EQUALS(expected3, tok(code3));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const char code4[] = "namespace NS1 {\n"
                              "    namespace NS2 {\n"
@@ -2317,7 +2419,7 @@ class TestSimplifyTypedef : public TestFixture {
                                  "int * NS2 :: A :: f ( ) { } "
                                  "}";
         ASSERT_EQUALS(expected4, tok(code4));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef92() { // ticket #2736 (segmentation fault)
@@ -2325,7 +2427,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "namespace NS {\n"
                             "}";
         ASSERT_EQUALS(";", tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef93() { // ticket #2738 (syntax error)
@@ -2333,7 +2435,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef struct s (*binop) (struct s, struct s);";
         const char expected[] = "struct s { double x ; } ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef94() { // ticket #1982
@@ -2352,7 +2454,7 @@ class TestSimplifyTypedef : public TestFixture {
                                  "} ; "
                                  "struct A :: data d ;";
         ASSERT_EQUALS(expected1, tok(code1));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const char code2[] = "class A {\n"
                              "public:\n"
@@ -2369,7 +2471,7 @@ class TestSimplifyTypedef : public TestFixture {
                                  "} ; "
                                  "struct :: A :: data d ;";
         ASSERT_EQUALS(expected2, tok(code2));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const char code3[] = "class A {\n"
                              "public:\n"
@@ -2386,7 +2488,7 @@ class TestSimplifyTypedef : public TestFixture {
                                  "} ; "
                                  "class B : public :: A :: data { } ;";
         ASSERT_EQUALS(expected3, tok(code3));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef95() { // ticket #2844
@@ -2399,32 +2501,32 @@ class TestSimplifyTypedef : public TestFixture {
                                 "public: "
                                 "expression_error :: error_code ( * f ) ( void * , const char * , expression_space ) ; "
                                 "} ;";
-        ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef96() { // ticket #2886 (segmentation fault)
         const char code[] = "typedef struct x { }";
-        ASSERT_THROW(tok(code), InternalError);
+        ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void simplifyTypedef97() { // ticket #2983 (segmentation fault)
         const char code[] = "typedef x y\n"
                             "(A); y";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef99() { // ticket #2999
         const char code[] = "typedef struct Fred Fred;\n"
                             "struct Fred { };";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
 
         const char code1[] = "struct Fred { };\n"
                              "typedef struct Fred Fred;";
-        tok(code1);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code1);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef100() { // ticket #3000
@@ -2434,8 +2536,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "    fred = se_alloc(sizeof(struct Fred));\n"
                             "    return fred;\n"
                             "}";
-        tok(code);
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout_str());
     }
 
     void simplifyTypedef101() { // ticket #3003 (segmentation fault)
@@ -2450,8 +2552,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "{\n"
                             "    Fred * Fred;\n"
                             "}";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef103() { // ticket #3007
@@ -2460,30 +2562,30 @@ class TestSimplifyTypedef : public TestFixture {
                             "{\n"
                             "    Fred Fred;\n"
                             "}";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef104() { // ticket #3070
         const char code[] = "typedef int (*in_func) (void FAR *, unsigned char FAR * FAR *);";
         ASSERT_EQUALS(";", tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef105() { // ticket #3616 (segmentation fault)
         const char code[] = "( int typedef char x; ){}";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_THROW_INTERNAL(tok(code), SYNTAX);
     }
 
     void simplifyTypedef106() { // ticket #3619 (segmentation fault)
         const char code[] = "typedef void f ();\ntypedef { f }";
-        ASSERT_THROW(tok(code), InternalError);
+        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 }";
         ASSERT_EQUALS("int main ( ) { return x }", tok(code));
+        ignore_errout(); // we do not care about the output
     }
 
     void simplifyTypedef108() { // ticket #4777
@@ -2502,9 +2604,9 @@ class TestSimplifyTypedef : public TestFixture {
     void simplifyTypedef109() {
         const char code[] = "typedef int&& rref;\n"
                             "rref var = 0;";
-        const char expected[] = "int && var ; var = 0 ;";
+        const char expected[] = "int && var = 0 ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef110() {
@@ -2563,8 +2665,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "} ; "
                                 "} "
                                 "}";
-        ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef111() {     // ticket #6345
@@ -2628,7 +2730,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "domain_dim = SpaceType :: TrafoType :: Evaluator < SpaceType :: TrafoType :: ShapeType , DataType > :: Type :: domain_dim , "
                                 "} ; } ;";
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef113() {     // ticket #7030
@@ -2651,8 +2753,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "unsigned t2 ;";
         const char expected[] = "unsigned int t1 ; "
                                 "unsigned int t2 ;";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef116() { // #5624
@@ -2667,8 +2769,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "for ( std :: vector < CharacterConversion > :: iterator it = c2c . begin ( ) ; it != c2c . end ( ) ; ++ it ) { } "
                                 "std :: vector < CharacterConversion > ( ) . swap ( c2c ) ; "
                                 "}";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS("", errout_str());
     }
 
     void simplifyTypedef117() { // #6507
@@ -2680,8 +2782,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "struct bstr bstr0 ( const char * s ) { "
                                 "return ( struct bstr ) { ( unsigned char * ) s , s ? strlen ( s ) : 0 } ; "
                                 "}";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef118() { // #5749
@@ -2696,8 +2798,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "operatorintClassyClass::* ( ) { "
                                 "return & ClassyClass :: id ; "
                                 "} }";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef119() { // #7541
@@ -2708,8 +2810,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "namespace Baz { }\n"
                             "enum Bar { XX = 1 };";
         const char exp[] = "enum Bar { XX = 1 } ;";
-        ASSERT_EQUALS(exp, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef120() { // #8357
@@ -2718,8 +2820,8 @@ class TestSimplifyTypedef : public TestFixture {
                             "static void report_good(bool passed, test_utf8_char const c) { };";
         const char exp[] = "static const char bad_chars [ ] [ 5 ] = { } ; "
                            "static void report_good ( bool passed , const char c [ 5 ] ) { } ;";
-        ASSERT_EQUALS(exp, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef121() { // #5766
@@ -2755,22 +2857,22 @@ class TestSimplifyTypedef : public TestFixture {
                            "float * * & Fred :: m ( ) { return m3x3 ; } "
                            "const float * & Fred :: vc ( ) const { return v3 ; } "
                            "const float * * & Fred :: mc ( ) const { return m3x3 ; }";
-        ASSERT_EQUALS(exp, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef122() { // segmentation fault
         const char code[] = "int result = [] { return git_run_cmd(\"update-index\",\"update-index -q --refresh\"); }();";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef123() { // ticket #7406
         const char code[] = "typedef int intvec[1];\n"
                             "Dummy<intvec> y;";
         const char exp[] = "Dummy < int [ 1 ] > y ;";
-        ASSERT_EQUALS(exp, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedef124() { // ticket #7792
@@ -2779,15 +2881,15 @@ class TestSimplifyTypedef : public TestFixture {
                             "size_t f(size_t s);";
 
         const char exp[] = "long f ( long s ) ;";
-        ASSERT_EQUALS(exp, tok(code, /*simplify*/ true));
-        ASSERT_EQUALS("", errout.str());
+        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 *);";
 
         // Check for output..
         checkSimplifyTypedef(code1);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -2795,14 +2897,14 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef char A[3];\n"
                             "char (*p)[3] = new A[4];";
         const char exp[] = "char ( * p ) [ 3 ] = new char [ 4 ] [ 3 ] ;";
-        ASSERT_EQUALS(exp, tok(code, false));
+        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) {}";
         const char exp[] = "void write_array ( char ( * data ) [ 100 ] ) { }";
-        ASSERT_EQUALS(exp, tok(code, false));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef127() { // #8878
@@ -2812,7 +2914,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char exp[] = "class a ; "
                            "template < long , class > struct c ; "
                            "template < int g > struct d { enum Anonymous0 { e = c < g , int ( a :: * ) > :: f } ; } ;";
-        ASSERT_EQUALS(exp, tok(code, false));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef128() { // #9053
@@ -2823,7 +2925,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char exp[] = "void f ( ) { "
                            "dostuff ( ( const int [ 4 ] ) { 1 , 2 , 3 , 4 } ) ; "
                            "}";
-        ASSERT_EQUALS(exp, tok(code, false));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef129() {
@@ -2834,7 +2936,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "};";
 
             const char exp[] = "class c { char ( & f ) [ 4 ] ; } ;";
-            ASSERT_EQUALS(exp, tok(code, false));
+            ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -2844,7 +2946,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "};";
 
             const char exp[] = "class c { const char ( & f ) [ 4 ] ; } ;";
-            ASSERT_EQUALS(exp, tok(code, false));
+            ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -2855,19 +2957,19 @@ class TestSimplifyTypedef : public TestFixture {
                                 "};";
 
             const char exp[] = "class c { char _a [ 4 ] ; const constexpr char ( & c_str ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
-            ASSERT_EQUALS(exp, tok(code, false));
+            ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
             const char code[] = "class c {\n"
                                 "  typedef char foo[4];\n"
                                 "  foo _a;\n"
-                                "  constexpr operator foo &() const noexcept { return _a; }\n"
+                                "  constexpr operator foo &() noexcept { return _a; }\n"
                                 "};";
 
-            const char actual[] = "class c { char _a [ 4 ] ; constexpr operatorchar ( & ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
-            const char exp[] = "class c { char _a [ 4 ] ; const operator char ( & ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
-            TODO_ASSERT_EQUALS(exp, actual, tok(code, false));
+            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 ; } } ;";
+            TODO_ASSERT_EQUALS(exp, actual, tok(code, dinit(TokOptions, $.simplify = false)));
         }
 
         {
@@ -2877,9 +2979,9 @@ class TestSimplifyTypedef : public TestFixture {
                                 "  constexpr operator const foo &() const noexcept { return _a; }\n"
                                 "};";
 
-            const char actual[] = "class c { char _a [ 4 ] ; constexpr operatorconstchar ( & ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
-            const char exp[] = "class c { char _a [ 4 ] ; const operator const char ( & ( ) const noexcept ( true ) ) [ 4 ] { return _a ; } } ;";
-            TODO_ASSERT_EQUALS(exp, actual, tok(code, false));
+            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 ; } } ;";
+            TODO_ASSERT_EQUALS(exp, actual, tok(code, dinit(TokOptions, $.simplify = false)));
         }
     }
 
@@ -2893,7 +2995,7 @@ class TestSimplifyTypedef : public TestFixture {
                            "a < int ( * ) [ 10 ] , int ( * ) [ 10 ] > ( ) ; "
                            "}";
 
-        ASSERT_EQUALS(exp, tok(code, false));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef131() {
@@ -2909,7 +3011,7 @@ class TestSimplifyTypedef : public TestFixture {
                            "a4p = & ( a4obj ) ; "
                            "unsigned char ( * && a4p_rref ) [ 4 ] = std :: move ( a4p ) ;";
 
-        ASSERT_EQUALS(exp, tok(code, false));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef132() {
@@ -2930,14 +3032,15 @@ class TestSimplifyTypedef : public TestFixture {
                            "} ; "
                            "void A :: DoSomething ( int wrongName ) { }";
 
-        ASSERT_EQUALS(exp, tok(code, false));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef133() { // #9812
         const char code[] = "typedef unsigned char array_t[16];\n"
                             "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, false));
+        ASSERT_EQUALS("using array_p = const unsigned char ( * ) [ 16 ] ; array_p x ;", tok(code, dinit(TokOptions, $.simplify = false)));
+        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() {
@@ -2945,7 +3048,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "typedef int int32;\n"
                             "namespace foo { int64 i; }\n"
                             "int32 j;";
-        ASSERT_EQUALS("; namespace foo { long long i ; } int j ;", tok(code, false));
+        ASSERT_EQUALS("; namespace foo { long long i ; } int j ;", tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef135() {
@@ -3005,7 +3108,7 @@ class TestSimplifyTypedef : public TestFixture {
                                 "class S3 s3 ; "
                                 "class S4 s4 ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedef137() { // #10054 debug: Executable scope 'x' with unknown function.
@@ -3041,8 +3144,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void A :: f ( external :: ns1 :: B<1> ) { } "
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
-            ASSERT_EQUALS(exp, tok(code, true, cppcheck::Platform::Type::Native, true));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(exp, tok(code));
+            ASSERT_EQUALS("", errout_str());
         }
         {
             // no using "namespace external::ns1;"
@@ -3074,8 +3177,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void A :: f ( external :: ns1 :: B<1> ) { } "
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
-            ASSERT_EQUALS(exp, tok(code, true, cppcheck::Platform::Type::Native, true));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(exp, tok(code));
+            ASSERT_EQUALS("", errout_str());
         }
         {
             // using "namespace external::ns1;" without redundant qualification
@@ -3124,8 +3227,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void A :: f ( V ) { } "
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
-            TODO_ASSERT_EQUALS(exp, act, tok(code, true, cppcheck::Platform::Type::Native, true));
-            TODO_ASSERT_EQUALS("", "[test.cpp:14]: (debug) Executable scope 'f' with unknown function.\n", errout.str());
+            TODO_ASSERT_EQUALS(exp, act, tok(code));
+            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
@@ -3173,8 +3276,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "namespace ns { "
                                 "void A :: f ( V ) { } "
                                 "}";
-            TODO_ASSERT_EQUALS(exp, act, tok(code, true, cppcheck::Platform::Type::Native, true));
-            ASSERT_EQUALS("", errout.str());
+            TODO_ASSERT_EQUALS(exp, act, tok(code));
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "namespace external {\n"
@@ -3203,8 +3306,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void A :: f ( external :: B<1> ) { } "
                                 "} "
                                 "struct external :: B<1> { } ;";
-            ASSERT_EQUALS(exp, tok(code, true, cppcheck::Platform::Type::Native, true));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(exp, tok(code));
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "template <int size> struct B { };\n"
@@ -3231,8 +3334,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void A :: f ( B<1> ) { } "
                                 "} "
                                 "struct B<1> { } ;";
-            ASSERT_EQUALS(exp, tok(code, true, cppcheck::Platform::Type::Native, true));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(exp, tok(code));
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -3258,6 +3361,10 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS(
             "struct Anonymous0 { struct c * b ; } ; struct Anonymous0 * d ; void e ( struct c * a ) { if ( a < d [ 0 ] . b ) { } }",
             tok(code));
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
+            "[test.cpp:6]: (debug) valueflow.cpp:6730:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n"
+            "[test.cpp:6]: (debug) valueflow.cpp:6730:(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n", // duplicate
+            errout_str());
     }
 
     void simplifyTypedef140() {
@@ -3276,8 +3383,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "    struct S { enum E { E0 }; };\n"
                                 "}\n"
                                 "typedef N::S T;\n"
-                                "enum class E { a = T::E0; };\n";
-            ASSERT_EQUALS("namespace N { struct S { enum E { E0 } ; } ; } enum class E { a = N :: S :: E0 ; } ;", tok(code));
+                                "enum class E { a = T::E0 };\n";
+            ASSERT_EQUALS("namespace N { struct S { enum E { E0 } ; } ; } enum class E { a = N :: S :: E0 } ;", tok(code));
         }
         { // #11494
             const char code[] = "typedef struct S {} KEY;\n"
@@ -3306,6 +3413,33 @@ class TestSimplifyTypedef : public TestFixture {
         const char code2[] = "typedef int* T;\n"
                              "void f(T = T()){}\n";
         ASSERT_EQUALS("void f ( int * = ( int * ) 0 ) { }", tok(code2));
+
+        // #11430
+        const char code3[] = "typedef char* T;\n"
+                             "T f() { return T(\"abc\"); }\n";
+        ASSERT_EQUALS("char * f ( ) { return ( ( char * ) ( \"abc\" ) ) ; }", tok(code3));
+
+        const char code4[] = "typedef struct _a *A;\n" // #13104
+                             "typedef struct _b* B;\n"
+                             "typedef A(get_t)(B);\n"
+                             "extern get_t* get;\n"
+                             "A f() {\n"
+                             "    return get(0);\n"
+                             "}\n";
+        ASSERT_EQUALS("extern struct _a * ( * get ) ( struct _b * ) ; "
+                      "struct _a * f ( ) { return get ( 0 ) ; }",
+                      tok(code4));
+
+        const char code5[] = "struct S { int x; };\n" // #13182
+                             "typedef S* PS;\n"
+                             "void f(void* a[], int i) {\n"
+                             "    PS(a[i])->x = i;\n"
+                             "}\n";
+        ASSERT_EQUALS("struct S { int x ; } ; "
+                      "void f ( void * a [ ] , int i ) { "
+                      "( ( S * ) ( a [ i ] ) ) . x = i ; "
+                      "}",
+                      tok(code5));
     }
 
     void simplifyTypedef143() { // #11506
@@ -3325,46 +3459,356 @@ class TestSimplifyTypedef : public TestFixture {
     }
 
     void simplifyTypedef145() {
-        // #11634
-        const char* code{};
-        code = "int typedef i;\n"
-               "i main() {}\n";
-        ASSERT_EQUALS("int main ( ) { }", tok(code));
-
-        code = "struct {} typedef S;\n"
-               "void f() {\n"
-               "    S();\n"
-               "}\n";
-        ASSERT_EQUALS("struct S { } ; void f ( ) { struct S ( ) ; }", tok(code));
-
-        code = "struct {} typedef S;\n" // don't crash
-               "S();\n";
-        ASSERT_EQUALS("struct S { } ; struct S ( ) ;", tok(code));
-
-        // #11693
-        code = "typedef unsigned char unsigned char;\n" // don't hang
-               "void f(char);\n";
-        ASSERT_EQUALS("void f ( char ) ;", tok(code));
-
-        // #10796
-        code = "typedef unsigned a[7];\n"
-               "void f(unsigned N) {\n"
-               "    a** p = new a * [N];\n"
-               "}\n";
-        TODO_ASSERT_EQUALS("does not compile", "void f ( int N ) { int ( * * p ) [ 7 ] ; p = new int ( * ) [ N ] [ 7 ] ; }", tok(code));
-
-        // #11772
-        code = "typedef t;\n" // don't crash on implicit int
-               "void g() {\n"
-               "    sizeof(t);\n"
-               "}\n";
-        ASSERT_EQUALS("void g ( ) { sizeof ( t ) ; }", tok(code)); // TODO: handle implicit int
-
-        code = "typedef t[3];\n"
-               "void g() {\n"
-               "    sizeof(t);\n"
-               "}\n";
-        ASSERT_EQUALS("void g ( ) { sizeof ( t ) ; }", tok(code)); // TODO: handle implicit int
+        { // #11634
+            const char code[] = "int typedef i;\n"
+                                "i main() {}\n";
+            ASSERT_EQUALS("int main ( ) { }", tok(code));
+        }
+
+        {
+            const char code[] = "struct {} typedef S;\n"
+                                "void f() {\n"
+                                "    S();\n"
+                                "}\n";
+            ASSERT_EQUALS("struct S { } ; void f ( ) { struct S ( ) ; }", tok(code));
+        }
+
+        {
+            const char code[] = "struct {} typedef S;\n" // don't crash
+                                "S();\n";
+            ASSERT_EQUALS("struct S { } ; struct S ( ) ;", tok(code));
+        }
+
+        { // #11693
+            const char code[] = "typedef unsigned char unsigned char;\n" // don't hang
+                                "void f(char);\n";
+            ASSERT_EQUALS("void f ( char ) ;", tok(code));
+        }
+
+        { // #10796
+            const char code[] = "typedef unsigned a[7];\n"
+                                "void f(unsigned N) {\n"
+                                "    a** p = new a * [N];\n"
+                                "}\n";
+            TODO_ASSERT_EQUALS("does not compile", "void f ( int N ) { int ( * * p ) [ 7 ] ; p = new int ( * ) [ N ] [ 7 ] ; }", tok(code));
+        }
+
+        { // #11772
+            const char code[] = "typedef t;\n" // don't crash on implicit int
+                                "void g() {\n"
+                                "    sizeof(t);\n"
+                                "}\n";
+            ASSERT_EQUALS("void g ( ) { sizeof ( t ) ; }", tok(code)); // TODO: handle implicit int
+            ignore_errout(); // we do not care about the output
+        }
+
+        {
+            const char code[] = "typedef t[3];\n"
+                                "void g() {\n"
+                                "    sizeof(t);\n"
+                                "}\n";
+            ASSERT_EQUALS("void g ( ) { sizeof ( t ) ; }", tok(code)); // TODO: handle implicit int
+            ignore_errout(); // we do not care about the output
+        }
+    }
+
+    void simplifyTypedef146() {
+        {
+            const char code[] = "namespace N {\n" // #11978
+                                "    typedef int T;\n"
+                                "    struct C {\n"
+                                "        C(T*);\n"
+                                "        void* p;\n"
+                                "    };\n"
+                                "}\n"
+                                "N::C::C(T*) : p(nullptr) {}\n";
+            ASSERT_EQUALS("namespace N { struct C { C ( int * ) ; void * p ; } ; } N :: C :: C ( int * ) : p ( nullptr ) { }", tok(code));
+        }
+
+        {
+            const char code[] = "namespace N {\n" // #11986
+                                "    typedef char U;\n"
+                                "    typedef int V;\n"
+                                "    struct S {};\n"
+                                "    struct T { void f(V*); };\n"
+                                "}\n"
+                                "void N::T::f(V*) {}\n"
+                                "namespace N {}\n";
+            ASSERT_EQUALS("namespace N { struct S { } ; struct T { void f ( int * ) ; } ; } void N :: T :: f ( int * ) { }", tok(code));
+        }
+
+        {
+            const char code[] = "namespace N {\n" // #12008
+                                "    typedef char U;\n"
+                                "    typedef int V;\n"
+                                "    struct S {\n"
+                                "        S(V* v);\n"
+                                "    };\n"
+                                "}\n"
+                                "void f() {}\n"
+                                "N::S::S(V* v) {}\n"
+                                "namespace N {}\n";
+            ASSERT_EQUALS("namespace N { struct S { S ( int * v ) ; } ; } void f ( ) { } N :: S :: S ( int * v ) { }", tok(code));
+        }
+    }
+
+    void simplifyTypedef147() {
+        const char code[] = "namespace N {\n" // #12014
+                            "    template<typename T>\n"
+                            "    struct S {};\n"
+                            "}\n"
+                            "typedef N::S<int> S;\n"
+                            "namespace N {\n"
+                            "    template<typename T>\n"
+                            "    struct U {\n"
+                            "        S<T> operator()() {\n"
+                            "            return {};\n"
+                            "        }\n"
+                            "    };\n"
+                            "}\n";
+        ASSERT_EQUALS("namespace N { template < typename T > struct S { } ; } namespace N { template < typename T > struct U { S < T > operator() ( ) { return { } ; } } ; }",
+                      tok(code));
+    }
+
+    void simplifyTypedef148() {
+        const char code[] = "typedef int& R;\n" // #12166
+                            "R r = i;\n";
+        ASSERT_EQUALS("int & r = i ;", tok(code));
+    }
+
+    void simplifyTypedef149() { // #12218
+        {
+            const char code[] = "namespace N {\n"
+                                "    typedef struct S {} S;\n"
+                                "}\n"
+                                "void g(int);\n"
+                                "void f() {\n"
+                                "    g(sizeof(struct N::S));\n"
+                                "}\n";
+            ASSERT_EQUALS("namespace N { struct S { } ; } void g ( int ) ; void f ( ) { g ( sizeof ( struct N :: S ) ) ; }", tok(code));
+        }
+
+        {
+            const char code[] = "namespace N {\n"
+                                "    typedef class C {} C;\n"
+                                "}\n"
+                                "void g(int);\n"
+                                "void f() {\n"
+                                "    g(sizeof(class N::C));\n"
+                                "}\n";
+            ASSERT_EQUALS("namespace N { class C { } ; } void g ( int ) ; void f ( ) { g ( sizeof ( class N :: C ) ) ; }", tok(code));
+        }
+
+        {
+            const char code[] = "namespace N {\n"
+                                "    typedef union U {} U;\n"
+                                "}\n"
+                                "void g(int);\n"
+                                "void f() {\n"
+                                "    g(sizeof(union N::U));\n"
+                                "}\n";
+            ASSERT_EQUALS("namespace N { union U { } ; } void g ( int ) ; void f ( ) { g ( sizeof ( union N :: U ) ) ; }", tok(code));
+        }
+
+        {
+            const char code[] = "namespace N {\n"
+                                "    typedef enum E {} E;\n"
+                                "}\n"
+                                "void g(int);\n"
+                                "void f() {\n"
+                                "    g(sizeof(enum N::E));\n"
+                                "}\n";
+            ASSERT_EQUALS("namespace N { enum E { } ; } void g ( int ) ; void f ( ) { g ( sizeof ( enum N :: E ) ) ; }", tok(code));
+        }
+    }
+
+    void simplifyTypedef150() { // #12475
+        const char *exp{};
+        const char code[] = "struct S {\n"
+                            "    std::vector<int> const& h(int);\n"
+                            "};\n"
+                            "typedef std::vector<int> const& (S::* func_t)(int);\n"
+                            "void g(func_t, int);\n"
+                            "void f() {\n"
+                            "    g(func_t(&S::h), 5);\n"
+                            "}\n";
+        exp = "struct S { "
+              "const std :: vector < int > & h ( int ) ; "
+              "} ; "
+              "void g ( const std :: vector < int > & ( S :: * ) ( int ) , int ) ; "
+              "void f ( ) { "
+              "g ( const std :: vector < int > & ( S :: * ( & S :: h ) ) ( int ) , 5 ) ; " // TODO: don't generate invalid code
+              "}";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef151() {
+        const char *exp{};
+        const char code[] = "namespace N {\n" // #12597
+                            "    typedef int T[10];\n"
+                            "    const T* f() { return static_cast<const T*>(nullptr); }\n"
+                            "}\n";
+        exp = "namespace N { "
+              "const int ( * f ( ) ) [ 10 ] { return static_cast < const int ( * ) [ 10 ] > ( nullptr ) ; } "
+              "}";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef152() {
+        const char *exp{};
+        const char code[] = "namespace O { struct T {}; }\n"
+                            "typedef O::T S;\n"
+                            "namespace M {\n"
+                            "    enum E { E0, S = 1 };\n"
+                            "    enum class F : ::std::int8_t { F0, S = 1 };\n"
+                            "}\n"
+                            "namespace N { enum { G0, S = 1 }; }\n";
+        exp = "namespace O { struct T { } ; } "
+              "namespace M { "
+              "enum E { E0 , S = 1 } ; "
+              "enum class F : :: std :: int8_t { F0 , S = 1 } ; "
+              "}"
+              " namespace N { enum Anonymous0 { G0 , S = 1 } ; "
+              "}";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef153() {
+        const char *exp{}; // #12647
+        const char code[] = "typedef unsigned long X;\n"
+                            "typedef unsigned long X;\n"
+                            "typedef X Y;\n"
+                            "typedef X* Yp;\n"
+                            "typedef X Ya[3];\n"
+                            "Y y;\n"
+                            "Yp yp;\n"
+                            "Ya ya;\n";
+        exp = "; long y ; long * yp ; long ya [ 3 ] ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef154() {
+        const char code[] = "typedef int T;\n"
+                            "typedef T T;\n"
+                            "T t = 0;\n";
+        const char exp[] = "int t ; t = 0 ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef155() {
+        const char code[] = "typedef struct S T;\n" // #12808
+                            "typedef struct S { int i; } T;\n"
+                            "extern \"C\" void f(T* t);\n";
+        const char exp[] = "struct S { int i ; } ; "
+                           "void f ( struct S * t ) ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef156() {
+        const char code[] = "typedef struct S_t {\n" // #12930
+                            "    enum E { E0 };\n"
+                            "    E e;\n"
+                            "} S;\n"
+                            "void f(S s) {\n"
+                            "    switch (s.e) {\n"
+                            "    case S::E0:\n"
+                            "        break;\n"
+                            "    }\n"
+                            "}\n";
+        const char exp[] = "struct S_t { "
+                           "enum E { E0 } ; "
+                           "E e ; "
+                           "} ; "
+                           "void f ( struct S_t s ) { "
+                           "switch ( s . e ) { "
+                           "case S_t :: E0 : ; "
+                           "break ; "
+                           "} "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code));
+
+        const char code2[] = "typedef enum E_t { E0 } E;\n"
+                             "void f(E e) {\n"
+                             "    switch (e) {\n"
+                             "    case E::E0:\n"
+                             "        break;\n"
+                             "    }\n"
+                             "}\n";
+        const char exp2[] = "enum E_t { E0 } ; "
+                            "void f ( enum E_t e ) { "
+                            "switch ( e ) { "
+                            "case E_t :: E0 : ; "
+                            "break ; "
+                            "} "
+                            "}";
+        ASSERT_EQUALS(exp2, tok(code2));
+
+        const char code3[] = "typedef union U_t {\n"
+                             "    int i;\n"
+                             "    enum { E0 } e;\n"
+                             "} U;\n"
+                             "void f(U u) {\n"
+                             "    switch (u.e) {\n"
+                             "    case U::E0:\n"
+                             "        break;\n"
+                             "    }\n"
+                             "}\n";
+        const char exp3[] = "union U_t { "
+                            "int i ; "
+                            "enum Anonymous0 { E0 } ; "
+                            "enum Anonymous0 e ; "
+                            "} ; "
+                            "void f ( union U_t u ) { "
+                            "switch ( u . e ) { "
+                            "case U_t :: E0 : ; "
+                            "break ; "
+                            "} "
+                            "}";
+        ASSERT_EQUALS(exp3, tok(code3));
+
+        const char code4[] = "struct A { static const int i = 1; };\n" // #12947
+                             "typedef A B;\n"
+                             "int f() {\n"
+                             "    return B::i;\n"
+                             "}\n";
+        const char exp4[] = "struct A { "
+                            "static const int i = 1 ; "
+                            "} ; "
+                            "int f ( ) { "
+                            "return A :: i ; "
+                            "}";
+        ASSERT_EQUALS(exp4, tok(code4));
+    }
+
+    void simplifyTypedef157() {
+        const char code[] = "namespace NS1 {\n" // #13451
+                            "    typedef NS2::Bar Bar;\n"
+                            "    using NS2::MyType;\n"
+                            "}\n"
+                            "enum E : unsigned int {\n"
+                            "    zero = 0,\n"
+                            "    MyType = 1\n"
+                            "};\n"
+                            "namespace NS1 {}\n";
+        const char exp[] = "enum E : int { zero = 0 , MyType = 1 } ;";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
+    void simplifyTypedef158() {
+        const char code[] = "void f() {\n"
+                            "    typedef const char* const triple[3];\n"
+                            "    static const triple data[] = { {\"a\" , \"b\" , \"c\" } };\n"
+                            "}\n";
+        const char exp[] = "void f ( ) { static const char * const data [ ] [ 3 ] = { { \"a\" , \"b\" , \"c\" } } ; }";
+        const char cur[] = "void f ( ) { static const char * const const data [ ] [ 3 ] = { { \"a\" , \"b\" , \"c\" } } ; }";
+        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 simplifyTypedefFunction1() {
@@ -3375,7 +3819,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3385,7 +3829,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3395,7 +3839,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3405,7 +3849,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3416,7 +3860,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
 
@@ -3427,7 +3871,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3437,7 +3881,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3447,7 +3891,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3457,7 +3901,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3467,7 +3911,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
 
@@ -3478,7 +3922,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3488,7 +3932,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3498,7 +3942,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3508,7 +3952,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3518,7 +3962,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
 
@@ -3529,7 +3973,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3539,7 +3983,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( void ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3549,7 +3993,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3559,7 +4003,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( int * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3569,7 +4013,7 @@ class TestSimplifyTypedef : public TestFixture {
             // The expected result..
             const char expected[] = "std :: queue < void ( * ) ( arg_class * ) > func_queue ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -3607,8 +4051,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "C ( * f5 ) ( ) ; "
                                     "C ( * f6 ) ( ) ; "
                                     "C ( * f7 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3636,8 +4080,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "const C ( * f5 ) ( ) ; "
                                     "const C ( * f6 ) ( ) ; "
                                     "const C ( * f7 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3664,8 +4108,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "const C ( * f5 ) ( ) ; "
                                     "const C ( * f6 ) ( ) ; "
                                     "const C ( * f7 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3692,8 +4136,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "C * ( * f5 ) ( ) ; "
                                     "C * ( * f6 ) ( ) ; "
                                     "C * ( * f7 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3720,8 +4164,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "const C * ( * f5 ) ( ) ; "
                                     "const C * ( * f6 ) ( ) ; "
                                     "const C * ( * f7 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3749,8 +4193,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "const C * ( * f5 ) ( ) ; "
                                     "const C * ( * f6 ) ( ) ; "
                                     "const C * ( * f7 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -3766,8 +4210,8 @@ class TestSimplifyTypedef : public TestFixture {
         const char expected[] = "int ( * ( * t1 ) ( bool ) ) ( int , int ) ; "
                                 "int * t2 ( bool ) ; "
                                 "int * t3 ( bool ) ;";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedefFunction5() {
@@ -3809,8 +4253,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "int ( :: C :: * const t10 ) ( float ) ; "
                                 "int ( :: C :: * volatile t11 ) ( float ) ; "
                                 "int ( :: C :: * const volatile t12 ) ( float ) ;";
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedefFunction6() {
@@ -3836,8 +4280,8 @@ class TestSimplifyTypedef : public TestFixture {
                                 "void * Fred :: get3 ( ) { return 0 ; } "
                                 "void * Fred :: get4 ( ) { return 0 ; }";
 
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedefFunction7() {
@@ -3847,8 +4291,8 @@ class TestSimplifyTypedef : public TestFixture {
         // The expected result..
         const char expected[] = "void ( __gnu_cxx :: _SGIAssignableConcept < _Tp > :: * X ) ( ) ;";
 
-        ASSERT_EQUALS(expected, tok(code, false));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.simplify = false)));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyTypedefFunction8() {
@@ -3856,7 +4300,7 @@ class TestSimplifyTypedef : public TestFixture {
         const char code[] = "typedef int f_expand(const nrv_byte *);\n"
                             "void f(f_expand *(*get_fexp(int))){}";
         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() {
@@ -3876,7 +4320,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     ":: C ( :: C :: * f3 ) ( ) volatile ; "
                                     ":: C ( :: C :: * f4 ) ( ) const volatile ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3894,8 +4338,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "B :: C ( * f2 ) ( ) ; "
                                     "B :: C ( * f3 ) ( ) ; "
                                     "B :: C ( * f4 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3914,7 +4358,7 @@ class TestSimplifyTypedef : public TestFixture {
                                     ":: B :: C ( :: B :: C :: * f3 ) ( ) volatile ; "
                                     ":: B :: C ( :: B :: C :: * f4 ) ( ) const volatile ;";
             ASSERT_EQUALS(expected, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -3932,8 +4376,8 @@ class TestSimplifyTypedef : public TestFixture {
                                     "A :: B :: C ( * f2 ) ( ) ; "
                                     "A :: B :: C ( * f3 ) ( ) ; "
                                     "A :: B :: C ( * f4 ) ( ) ;";
-            ASSERT_EQUALS(expected, tok(code, true, cppcheck::Platform::Type::Native, false));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS(expected, tok(code, dinit(TokOptions, $.debugwarnings = false)));
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -3952,7 +4396,42 @@ class TestSimplifyTypedef : public TestFixture {
                       "} "
                       "Format_E1 ( * * t1 ) ( ) ; "
                       "MySpace :: Format_E2 ( * * t2 ) ( ) ;",
-                      tok(code,false));
+                      tok(code,dinit(TokOptions, $.simplify = false)));
+    }
+
+    void simplifyTypedefFunction11() {
+        const char code[] = "typedef void (*func_t) (int);\n"
+                            "void g(int);\n"
+                            "void f(void* p) {\n"
+                            "    if (g != func_t(p)) {}\n"
+                            "    if (g != (func_t)p) {}\n"
+                            "}\n";
+        TODO_ASSERT_EQUALS("void g ( int ) ; "
+                           "void f ( void * p ) { "
+                           "if ( g != ( void ( * ) ( int ) ) ( p ) ) { } "
+                           "if ( g != ( void ( * ) ( int ) ) p ) { } "
+                           "}",
+                           "void g ( int ) ; "
+                           "void f ( void * p ) { "
+                           "if ( g != void * ( p ) ) { } "
+                           "if ( g != ( void * ) p ) { } "
+                           "}",
+                           tok(code,dinit(TokOptions, $.simplify = false)));
+        ignore_errout(); // we are not interested in the output
+    }
+
+    void simplifyTypedefStruct() {
+        const char code1[] = "typedef struct S { int x; } xyz;\n"
+                             "xyz var;";
+        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;";
+        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;";
+        ASSERT_EQUALS("struct S { int x ; } ; volatile struct S var ;", tok(code3,dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedefShadow() { // shadow variable (#4445)
@@ -3961,7 +4440,7 @@ class TestSimplifyTypedef : public TestFixture {
                             "    int abc, xyz;\n" // <- shadow variable
                             "}";
         ASSERT_EQUALS("struct xyz { int x ; } ; void f ( ) { int abc ; int xyz ; }",
-                      tok(code,false));
+                      tok(code,dinit(TokOptions, $.simplify = false)));
     }
 
     void simplifyTypedefMacro() {
@@ -3975,6 +4454,190 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS("void foo ( uint32_t prev_segment ) { if ( prev_segment == ( ( uint32_t ) 12 ) ) { } }",
                       simplifyTypedefP(code));
     }
+
+    void simplifyTypedefOriginalName1() {
+        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);";
+
+        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;
+        // Get the Token which is at the end of all the Typedef's in this case i placed a variable
+        const Token* endOfTypeDef = Token::findsimplematch(tokenizer.list.front(), "endOfTypeDef", tokenizer.list.back());
+        // Search for the simplified char token and check its original Name
+        token = Token::findsimplematch(endOfTypeDef, "char", tokenizer.list.back());
+        ASSERT_EQUALS("uint8_t", token->originalName());
+        // Search for the simplified eEnumDef token and check its original Name
+        token = Token::findsimplematch(endOfTypeDef, "eEnumDef", tokenizer.list.back());
+        ASSERT_EQUALS("eEnum_t", token->originalName());
+        // Search for the eEnum2_t token as it does not have a name it should be the direct type name
+        token = Token::findsimplematch(endOfTypeDef, "eEnum2_t", tokenizer.list.back());
+        ASSERT_EQUALS("eEnum2_t", token->str());
+        // Search for the simplified stStructDef token and check its original Name
+        token = Token::findsimplematch(endOfTypeDef, "stStructDef", tokenizer.list.back());
+        ASSERT_EQUALS("stStruct_t", token->originalName());
+        // 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
+        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;";
+        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 simplifyTypedefTokenColumn1() {  // #13155
+        const char code[] = "void foo(void) {\n"
+                            "    typedef signed int MY_INT;\n"
+                            "    MY_INT x = 0;\n"
+                            "}";
+
+        TokenList tokenlist{settings1, Standards::Language::C};
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+
+        const Token* x = Token::findsimplematch(tokenizer.list.front(), "x");
+        const Token* type = x->previous();
+        ASSERT_EQUALS("int", type->str());
+        ASSERT_EQUALS(5, type->column());
+    }
+
+    void simplifyTypedefTokenColumn2() {
+        const char code[] = "void foo(void) {\n"
+                            "    typedef signed int (*F)(int);\n"
+                            "    F x = 0;\n"
+                            "}";
+
+        TokenList tokenlist{settings1, Standards::Language::C};
+        ASSERT(TokenListHelper::createTokensFromString(tokenlist, code, "file.c"));
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+
+        const Token* x = Token::findsimplematch(tokenizer.list.front(), "x");
+        const Token* type = x->previous();
+        ASSERT_EQUALS("*", type->str());
+        ASSERT_EQUALS(5, type->column());
+    }
+
+    void simplifyTypedefTokenColumn3() { // #13368
+        const char code[] = "typedef struct S_ {} S;\n"
+                            "typedef S* P;\n"
+                            "void f(const P p);\n";
+        ASSERT_EQUALS("struct S_ { } ; void f ( struct S_ * const p ) ;", // don't crash
+                      tok(code));
+
+        const char code2[] = "struct S;\n"
+                             "typedef S& (S::* P)(const S&);\n"
+                             "void f(const P);\n";
+        ASSERT_EQUALS("struct S ; void f ( const S & ( S :: * ) ( const S & ) ) ;", // don't crash
+                      tok(code2));
+    }
+
+    void typedefInfo1() {
+        const std::string xml = dumpTypedefInfo("typedef int A;\nA x;");
+        ASSERT_EQUALS("  <typedef-info>\n"
+                      "    <info name=\"A\" file=\"file.c\" line=\"1\" column=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "  </typedef-info>\n",
+                      xml);
+    }
+
+    void typedefInfo2() {
+        const std::string xml = dumpTypedefInfo("typedef signed short int16_t;\n"
+                                                "typedef void ( *fp16 )( int16_t n );\n"
+                                                "void R_11_1 ( void ){\n"
+                                                "   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"
+                      "      <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=\"1\" used=\"1\" isFunctionPointer=\"0\"/>\n"
+                      "    <info name=\"pfp16\" file=\"file.c\" line=\"4\" column=\"20\" 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);
+    }
+
+    void typedefInfo3() {
+        const std::string xml = dumpTypedefInfo("int main() {\n"
+                                                "     using x::a;\n"
+                                                "     b = a + 2;\n"
+                                                "}\n");
+        ASSERT_EQUALS("",xml);
+    }
 };
 
 REGISTER_TEST(TestSimplifyTypedef)
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index fb6c92bb9ce..fa067f822ce 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-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
@@ -16,22 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
 #include "token.h"
-#include "tokenize.h"
+#include "utils.h"
 
-#include <simplecpp.h>
-
-#include <map>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
-#include <utility>
-#include <vector>
-
 
 class TestSimplifyUsing : public TestFixture {
 public:
@@ -39,12 +33,10 @@ class TestSimplifyUsing : public TestFixture {
 
 
 private:
-    // If there are unused templates, keep those
-    const Settings settings0 = settingsBuilder().severity(Severity::style).checkUnusedTemplates().build();
-    const Settings settings1 = settingsBuilder().checkUnusedTemplates().build();
-    const Settings settings2 = settingsBuilder().severity(Severity::style).checkUnusedTemplates().build();
+    const Settings settings0 = settingsBuilder().severity(Severity::style).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(simplifyUsing1);
         TEST_CASE(simplifyUsing2);
         TEST_CASE(simplifyUsing3);
@@ -73,6 +65,14 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing26); // #11090
         TEST_CASE(simplifyUsing27);
         TEST_CASE(simplifyUsing28);
+        TEST_CASE(simplifyUsing29);
+        TEST_CASE(simplifyUsing30);
+        TEST_CASE(simplifyUsing31);
+        TEST_CASE(simplifyUsing32);
+        TEST_CASE(simplifyUsing33);
+        TEST_CASE(simplifyUsing34);
+        TEST_CASE(simplifyUsing35);
+        TEST_CASE(simplifyUsing36);
 
         TEST_CASE(simplifyUsing8970);
         TEST_CASE(simplifyUsing8971);
@@ -93,33 +93,33 @@ class TestSimplifyUsing : public TestFixture {
         TEST_CASE(simplifyUsing10173);
         TEST_CASE(simplifyUsing10335);
         TEST_CASE(simplifyUsing10720);
+        TEST_CASE(simplifyUsing13873); // function declaration
 
         TEST_CASE(scopeInfo1);
         TEST_CASE(scopeInfo2);
     }
 
-#define tok(...) tok_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tok_(const char* file, int line, const char code[], cppcheck::Platform::Type type = cppcheck::Platform::Type::Native, bool debugwarnings = true, bool preprocess = false) {
-        errout.str("");
-
-        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).debugwarnings(debugwarnings).platform(type).build();
-
-        Tokenizer tokenizer(&settings, this);
+    struct TokOptions
+    {
+        Platform::Type type = Platform::Type::Native;
+        bool debugwarnings = true;
+        bool preprocess = false;
+    };
 
-        if (preprocess) {
-            std::vector<std::string> files{ "test.cpp" };
-            std::istringstream istr(code);
-            const simplecpp::TokenList tokens1(istr, files, files[0]);
+#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();
 
-            simplecpp::TokenList tokens2(files);
-            std::map<std::string, simplecpp::TokenList*> filedata;
-            simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+        if (options.preprocess) {
+            SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
-            tokenizer.createTokens(std::move(tokens2));
+            ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
+            return tokenizer.tokens()->stringifyList(nullptr);
         }
 
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return tokenizer.tokens()->stringifyList(nullptr);
     }
@@ -236,7 +236,7 @@ class TestSimplifyUsing : public TestFixture {
         const char expected[] =
             "void f ( ) "
             "{ "
-            "struct yy_buffer_state * state ; "
+            "yy_buffer_state * state ; "
             "}";
 
         ASSERT_EQUALS(expected, tok(code));
@@ -316,13 +316,13 @@ class TestSimplifyUsing : public TestFixture {
             "struct t { int a ; } ; "
             "struct U { int a ; } ; "
             "struct Unnamed0 { int a ; } ; "
-            "struct s s ; "
-            "struct s * ps ; "
-            "struct t t ; "
-            "struct t * tp ; "
-            "struct U u ; "
-            "struct U * v ; "
-            "struct Unnamed0 * w ;";
+            "s s ; "
+            "s * ps ; "
+            "t t ; "
+            "t * tp ; "
+            "U u ; "
+            "U * v ; "
+            "Unnamed0 * w ;";
 
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -347,13 +347,13 @@ class TestSimplifyUsing : public TestFixture {
             "union t { int a ; float b ; } ; "
             "union U { int a ; float b ; } ; "
             "union Unnamed0 { int a ; float b ; } ; "
-            "union s s ; "
-            "union s * ps ; "
-            "union t t ; "
-            "union t * tp ; "
-            "union U u ; "
-            "union U * v ; "
-            "union Unnamed0 * w ;";
+            "s s ; "
+            "s * ps ; "
+            "t t ; "
+            "t * tp ; "
+            "U u ; "
+            "U * v ; "
+            "Unnamed0 * w ;";
 
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -366,8 +366,8 @@ class TestSimplifyUsing : public TestFixture {
 
         const char expected[] = "enum abc { a = 0 , b = 1 , c = 2 } ; "
                                 "enum xyz { x = 0 , y = 1 , z = 2 } ; "
-                                "enum abc e1 ; "
-                                "enum xyz e2 ;";
+                                "abc e1 ; "
+                                "xyz e2 ;";
 
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -402,7 +402,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "}";
 
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyUsing14() {
@@ -418,8 +418,8 @@ class TestSimplifyUsing : public TestFixture {
                             "    FP_M(val);"
                             "};";
 
-        TODO_ASSERT_THROW(tok(code, cppcheck::Platform::Type::Native, false), InternalError); // TODO: Do not throw AST validation exception
-        //ASSERT_EQUALS("", errout.str());
+        TODO_ASSERT_THROW(tok(code, dinit(TokOptions, $.debugwarnings = false)), InternalError); // TODO: Do not throw AST validation exception
+        //ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyUsing15() {
@@ -453,10 +453,10 @@ class TestSimplifyUsing : public TestFixture {
         const char expected[] = "struct STRFOO { "
                                 "char freem [ 4096 ] ; "
                                 "} ; "
-                                "struct STRFOO s ;";
+                                "STRFOO s ;";
 
         ASSERT_EQUALS(expected, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyUsing17() {
@@ -475,17 +475,17 @@ class TestSimplifyUsing : public TestFixture {
                                 "class S2 : public C1 { } ; "
                                 "class S3 { } ; "
                                 "class S4 : public C1 { } ; "
-                                "class S1 s1 ; "
-                                "class S2 s2 ; "
-                                "class S3 s3 ; "
-                                "class S4 s4 ;";
+                                "S1 s1 ; "
+                                "S2 s2 ; "
+                                "S3 s3 ; "
+                                "S4 s4 ;";
 
         ASSERT_EQUALS(expected, tok(code));
     }
 
     void simplifyUsing18() {
         const char code[] = "{ { { using a = a; using a; } } }";
-        tok(code); // don't crash
+        (void)tok(code); // don't crash
     }
 
     void simplifyUsing19() {
@@ -497,7 +497,8 @@ class TestSimplifyUsing : public TestFixture {
                             "   using b = float;\n"
                             "}\n"
                             "}";
-        tok(code); // don't hang
+        (void)tok(code); // don't hang
+        ignore_errout(); // we are not interested in the output
     }
 
     void simplifyUsing20() {
@@ -541,13 +542,14 @@ class TestSimplifyUsing : public TestFixture {
                             "   return nullptr;\n"
                             "}\n"
                             "}}}}}}}";
-        tok(code); // don't hang
+        (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 {}";
-        tok(code); // don't crash
+        (void)tok(code); // don't crash
     }
 
     void simplifyUsing22() {
@@ -573,6 +575,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "} } } } }";
         ASSERT_EQUALS(expected, tok(code)); // don't hang
+        ignore_errout(); // we do not care about the output
     }
 
     void simplifyUsing23() {
@@ -682,8 +685,201 @@ class TestSimplifyUsing : public TestFixture {
                             "    T* p{ new T };\n"
                             "}\n";
         const char expected[] = "void f ( ) { int * p { new int } ; }";
-        ASSERT_EQUALS(expected, tok(code, cppcheck::Platform::Type::Native, /*debugwarnings*/ true));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing29() { // #11981
+        const char code[] = "using T = int*;\n"
+                            "void f(T = T()) {}\n";
+        const char expected[] = "void f ( int * = ( int * ) 0 ) { }";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing30() {
+        {
+            const char code[] = "using std::to_string;\n" // #8454
+                                "void f() {\n"
+                                "    std::string str = to_string(1);\n"
+                                "}\n";
+            const char expected[] = "void f ( ) { std :: string str ; str = std :: to_string ( 1 ) ; }";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS("", errout_str());
+        }
+        {
+            const char code[] = "using std::cout, std::endl, std::cerr, std::ostringstream;\n"
+                                "cerr << \"abc\";\n";
+            const char expected[] = "std :: cerr << \"abc\" ;";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS("", errout_str());
+        }
+        {
+            const char code[] = "using std::string_view_literals::operator\"\"sv;\n";
+            const char expected[] = "using std :: string_view_literals :: operator\"\"sv ;";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS("", errout_str());
+        }
+        {
+            const char code[] = "template <typename T>\n"
+                                "class vector : public ::std::vector<T> {\n"
+                                "public:\n"
+                                "    using ::std::vector<T>::vector;\n"
+                                "    vector() {}\n"
+                                "};\n"
+                                "vector <int> v;\n";
+            const char expected[] = "class vector<int> ; "
+                                    "vector<int> v ; "
+                                    "class vector<int> : public :: std :: vector<int> { "
+                                    "public: "
+                                    "using vector<int> = :: std :: vector<int> :: vector<int> ; "
+                                    "vector<int> ( ) { } "
+                                    "} ;";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS("", errout_str());
+        }
+        {
+            const char code[] = "using namespace ::std;\n"
+                                "void f(const char* c) {\n"
+                                "    cout << std::string(c) << \"abc\";\n"
+                                "}\n";
+            const char expected[] = "using namespace :: std ; " // TODO: simplify cout?
+                                    "void f ( const char * c ) { "
+                                    "cout << std :: string ( c ) << \"abc\" ; "
+                                    "}";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS(
+                "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cout [valueFlowBailoutIncompleteVar]\n",
+                errout_str());
+        }
+        {
+            const char code[] = "class T : private std::vector<std::pair<std::string, const int*>> {\n" // #12521
+                                "    using std::vector<std::pair<std::string, const int*>>::empty;\n"
+                                "};\n";
+            const char expected[] = "class T : private std :: vector < std :: pair < std :: string , const int * > > { "
+                                    "using empty = std :: vector < std :: pair < std :: string , const int * > > :: empty ; "
+                                    "} ;";
+            ASSERT_EQUALS(expected, tok(code));
+            ASSERT_EQUALS("", errout_str());
+        }
+    }
+
+    void simplifyUsing31() { // #11899
+        const char code[] = "struct B {\n"
+                            "    B();\n"
+                            "    void f();\n"
+                            "};\n"
+                            "struct D : B {\n"
+                            "    using B::B;\n"
+                            "    void g() {\n"
+                            "        B::f();\n"
+                            "    }\n"
+                            "    B b;\n"
+                            "};\n";
+        const char expected[] = "struct B { "
+                                "B ( ) ; "
+                                "void f ( ) ; "
+                                "} ; "
+                                "struct D : B { "
+                                "using B = B :: B ; "
+                                "void g ( ) { "
+                                "B :: f ( ) ; "
+                                "} "
+                                "B b ; "
+                                "} ;";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing32() {
+        const char code[] = "using T = int*;\n" // #11430
+                            "T f() { return T{}; }\n"
+                            "T g() { return T(malloc(4)); }\n";
+        const char expected[] = "int * f ( ) { return ( int * ) 0 ; } "
+                                "int * g ( ) { return ( int * ) ( malloc ( 4 ) ) ; }";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code2[] = "struct S {\n" // #13095
+                             "    using reference_type = int&;\n"
+                             "    reference_type get();\n"
+                             "    int i;\n"
+                             "};\n"
+                             "auto S::get() -> reference_type {\n"
+                             "    return i;\n"
+                             "}\n";
+        const char expected2[] = "struct S { "
+                                 "int & get ( ) ; "
+                                 "int i ; "
+                                 "} ; "
+                                 "auto S :: get ( ) . int & { return i ; }";
+        ASSERT_EQUALS(expected2, tok(code2));
+        TODO_ASSERT_EQUALS("",
+                           "[test.cpp:6:1]: (debug) auto token with no type. [autoNoType]\n"
+                           "", errout_str());
+
+        const char code3[] = "using V = int*;\n"
+                             "auto g() -> const volatile V { return {}; }\n";
+        const char expected3[] = "auto g ( ) . const volatile int * { return { } ; }";
+        ASSERT_EQUALS(expected3, tok(code3));
+        TODO_ASSERT_EQUALS("",
+                           "[test.cpp:2:1]: (debug) auto token with no type. [autoNoType]\n"
+                           "", errout_str());
+    }
+
+    void simplifyUsing33() { // #13090
+        const char code[] = "namespace N {\n"
+                            "    using T = int;\n"
+                            "    T f() { return (T)0; }\n"
+                            "}\n"
+                            "struct S {\n"
+                            "    using U = int;\n"
+                            "    U g() { return (U)0; }\n"
+                            "};\n";
+        const char expected[] = "namespace N { "
+                                "int f ( ) { return ( int ) 0 ; } "
+                                "} "
+                                "struct S { "
+                                "int g ( ) { return ( int ) 0 ; } "
+                                "} ;";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing34() { // #13295
+        const char code[] = "struct A {\n"
+                            "    static const int a = 1;\n"
+                            "};\n"
+                            "using B = struct A;\n"
+                            "void g(int);\n"
+                            "void f() {\n"
+                            "    g({ B::a });\n"
+                            "}\n";
+        const char expected[] = "struct A { "
+                                "static const int a = 1 ; "
+                                "} ; "
+                                "void g ( int ) ; "
+                                "void f ( ) { "
+                                "g ( { A :: a } ) ; "
+                                "}";
+        ASSERT_EQUALS(expected, tok(code));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void simplifyUsing35() { // #13492
+        const char code[] = "using a = b;\n"
+                            "using c = d;\n";
+        const char expected[] = ";";
+        ASSERT_EQUALS(expected, tok(code));
+        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 simplifyUsing8970() {
@@ -736,11 +932,11 @@ class TestSimplifyUsing : public TestFixture {
 
         const char exp[] = "int i ;";
 
-        ASSERT_EQUALS(exp, tok(code, cppcheck::Platform::Type::Unix32));
-        ASSERT_EQUALS(exp, tok(code, cppcheck::Platform::Type::Unix64));
-        ASSERT_EQUALS(exp, tok(code, cppcheck::Platform::Type::Win32A));
-        ASSERT_EQUALS(exp, tok(code, cppcheck::Platform::Type::Win32W));
-        ASSERT_EQUALS(exp, tok(code, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.type = Platform::Unix32)));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.type = Platform::Unix64)));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.type = Platform::Win32A)));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.type = Platform::Win32W)));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.type = Platform::Win64)));
     }
 
     void simplifyUsing9042() {
@@ -760,7 +956,7 @@ class TestSimplifyUsing : public TestFixture {
                            "} ; "
                            "template < class T > class s { } ;";
 
-        ASSERT_EQUALS(exp, tok(code, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS(exp, tok(code, dinit(TokOptions, $.type = Platform::Win64)));
     }
 
     void simplifyUsing9191() {
@@ -788,6 +984,7 @@ class TestSimplifyUsing : public TestFixture {
                            "}";
 
         ASSERT_EQUALS(exp, tok(code));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyUsing9381() {
@@ -957,7 +1154,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             // no using "namespace external::ns1;"
@@ -990,7 +1187,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             // using "namespace external::ns1;" without redundant qualification
@@ -1025,7 +1222,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             // using "namespace external::ns1;" without redundant qualification on declaration and definition
@@ -1060,7 +1257,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "struct external :: ns1 :: B<1> { } ;";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "namespace external {\n"
@@ -1090,7 +1287,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "struct external :: B<1> { } ;";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "template <int size> struct B { };\n"
@@ -1118,7 +1315,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "struct B<1> { } ;";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -1144,7 +1341,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} ; "
                                 "void A :: f ( const std :: vector < char > & ) const { }";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "namespace NS1 {\n"
@@ -1203,7 +1400,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "c . f ( v ) ; "
                                 "}";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "foo::ResultCodes_e\n"
@@ -1230,7 +1427,8 @@ class TestSimplifyUsing : public TestFixture {
                                 "   auto ret = foo::ResultCodes_e::NO_ERROR;\n"
                                 "   return ret;\n"
                                 "}";
-            tok(code); // don't crash
+            (void)tok(code); // don't crash
+            ignore_errout(); // we do not care about the output
         }
     }
 
@@ -1263,7 +1461,7 @@ class TestSimplifyUsing : public TestFixture {
                            "void B :: f ( const std :: vector < unsigned char > & ) const { } "
                            "}";
         ASSERT_EQUALS(exp, tok(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyUsing10172() {
@@ -1292,7 +1490,7 @@ class TestSimplifyUsing : public TestFixture {
                                "void B :: f ( std :: function < void ( ) > ) { } "
                                "}";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "namespace ns {\n"
@@ -1327,7 +1525,7 @@ class TestSimplifyUsing : public TestFixture {
                                "} "
                                "}";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -1353,7 +1551,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "Pr < st > p ; "
                                 "}";
             ASSERT_EQUALS(exp, tok(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             const char code[] = "namespace defsa {\n"
@@ -1376,6 +1574,7 @@ class TestSimplifyUsing : public TestFixture {
                                 "} "
                                 "}";
             ASSERT_EQUALS(exp, tok(code));
+            ignore_errout(); // we do not care about the output
         }
     }
 
@@ -1386,15 +1585,29 @@ class TestSimplifyUsing : public TestFixture {
         ASSERT_EQUALS(exp, tok(code));
     }
 
-    void simplifyUsing10720() {
+    void simplifyUsing10720() { // hang/segmentation fault
         const char code[] = "template <typename... Ts>\n"
                             "struct S {};\n"
                             "#define STAMP(thiz, prev) using thiz = S<prev, prev, prev, prev, prev, prev, prev, prev, prev, prev>;\n"
                             "STAMP(A, int);\n"
                             "STAMP(B, A);\n"
                             "STAMP(C, B);\n";
-        tok(code, cppcheck::Platform::Type::Native, /*debugwarnings*/ true, /*preprocess*/ true);
-        ASSERT_EQUALS(errout.str().compare(0, 64, "[test.cpp:6]: (debug) Failed to parse 'using C = S < S < S < int"), 0);
+        (void)tok(code, dinit(TokOptions, $.preprocess = true));
+        TODO_ASSERT(startsWith(errout_str(), "[test.cpp:6]: (debug) Failed to parse 'using C = S < S < S < int"));
+    }
+
+    void simplifyUsing13873() { // function declaration
+        const char code1[] = "using NS1::f;\n"
+                             "namespace NS1 { void f(); }\n";
+        ASSERT_EQUALS("namespace NS1 { void f ( ) ; }", tok(code1));
+
+        const char code2[] = "using NS1::f;\n"
+                             "void bar() { f(); }\n";
+        ASSERT_EQUALS("void bar ( ) { NS1 :: f ( ) ; }", tok(code2));
+
+        const char code3[] = "using NS1::f;\n"
+                             "namespace NS1 { void* f(); }\n";
+        ASSERT_EQUALS("namespace NS1 { void * f ( ) ; }", tok(code3));
     }
 
     void scopeInfo1() {
@@ -1404,8 +1617,8 @@ class TestSimplifyUsing : public TestFixture {
                             "\n"
                             "namespace spdlog { class logger; }\n"
                             "using LoggerPtr = std::shared_ptr<spdlog::logger>;";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void scopeInfo2() {
@@ -1416,8 +1629,8 @@ class TestSimplifyUsing : public TestFixture {
                             "\n"
                             "static void getInitialProgramState(const A::Map& vars = A::Map {})\n"
                             "{}\n";
-        tok(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tok(code);
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
index 1ebf9a83c58..4e1a258d19b 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-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
@@ -17,21 +17,19 @@
  */
 
 #include "cppcheck.h"
+#include "filesettings.h"
 #include "fixture.h"
 #include "helpers.h"
 #include "redirect.h"
-#include "library.h"
 #include "settings.h"
 #include "singleexecutor.h"
+#include "standards.h"
+#include "suppressions.h"
 #include "timer.h"
 
-#include <algorithm>
-#include <cstddef>
-#include <functional>
-#include <map>
+#include <cstdlib>
+#include <list>
 #include <memory>
-#include <set>
-#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
@@ -41,7 +39,7 @@ class TestSingleExecutorBase : public TestFixture {
     TestSingleExecutorBase(const char * const name, bool useFS) : TestFixture(name), useFS(useFS) {}
 
 private:
-    Settings settings = settingsBuilder().library("std.cfg").build();
+    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
     bool useFS;
 
     std::string fprefix() const
@@ -60,59 +58,67 @@ class TestSingleExecutorBase : public TestFixture {
         return std::to_string(i);
     }
 
-    void check(int files, int result, const std::string &data, SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE, const char* const plistOutput = nullptr, const std::vector<std::string>& filesList = {}) {
-        errout.str("");
-        output.str("");
-        settings.project.fileSettings.clear();
+    struct CheckOptions
+    {
+        bool quiet = true;
+        ShowTime showtime = ShowTime::NONE;
+        const char* plistOutput = nullptr;
+        std::vector<std::string> filesList;
+    };
+
+    void check(int files, int result, const std::string &data, const CheckOptions& opt = make_default_obj{}) {
+        std::list<FileSettings> fileSettings;
 
-        std::map<std::string, std::size_t> filemap;
-        if (filesList.empty()) {
+        std::list<FileWithDetails> filelist;
+        if (opt.filesList.empty()) {
             for (int i = 1; i <= files; ++i) {
-                const std::string s = fprefix() + "_" + zpad3(i) + ".cpp";
-                filemap[s] = data.size();
+                std::string f_s = fprefix() + "_" + zpad3(i) + ".c";
+                filelist.emplace_back(f_s, Standards::Language::C, data.size());
                 if (useFS) {
-                    ImportProject::FileSettings fs;
-                    fs.filename = s;
-                    settings.project.fileSettings.emplace_back(std::move(fs));
+                    fileSettings.emplace_back(std::move(f_s), Standards::Language::C, data.size());
                 }
             }
         }
         else {
-            for (const auto& f : filesList)
+            for (const auto& f : opt.filesList)
             {
-                filemap[f] = data.size();
+                filelist.emplace_back(f, Standards::Language::C, data.size());
                 if (useFS) {
-                    ImportProject::FileSettings fs;
-                    fs.filename = f;
-                    settings.project.fileSettings.emplace_back(std::move(fs));
+                    fileSettings.emplace_back(f, Standards::Language::C, data.size());
                 }
             }
         }
 
-        settings.showtime = showtime;
-        if (plistOutput)
-            settings.plistOutput = plistOutput;
+        /*const*/ Settings s = settings;
+        s.showtime = opt.showtime;
+        s.quiet = opt.quiet;
+        if (opt.plistOutput)
+            s.plistOutput = opt.plistOutput;
+        s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: remove when we only longer rely on toString() in unique message handling?
+
+        Suppressions supprs;
+        TimerResults timerResults;
+
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
-        CppCheck cppcheck(*this, true, [](std::string,std::vector<std::string>,std::string,std::string&){
-            return false;
+        CppCheck cppcheck(s, supprs, *this, &timerResults, true, [](std::string,std::vector<std::string>,std::string,std::string&){
+            return EXIT_SUCCESS;
         });
-        cppcheck.settings() = settings;
 
         std::vector<std::unique_ptr<ScopedFile>> scopedfiles;
-        scopedfiles.reserve(filemap.size());
-        for (std::map<std::string, std::size_t>::const_iterator i = filemap.cbegin(); i != filemap.cend(); ++i)
-            scopedfiles.emplace_back(new ScopedFile(i->first, data));
+        scopedfiles.reserve(filelist.size());
+        for (auto i = filelist.cbegin(); i != filelist.cend(); ++i)
+            scopedfiles.emplace_back(new ScopedFile(i->path(), data));
 
         // clear files list so only fileSettings are used
         if (useFS)
-            filemap.clear();
+            filelist.clear();
 
-        // TODO: test with settings.project.fileSettings;
-        SingleExecutor executor(cppcheck, filemap, settings, *this);
+        SingleExecutor executor(cppcheck, filelist, fileSettings, s, supprs, *this, &timerResults);
         ASSERT_EQUALS(result, executor.check());
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(many_files);
         TEST_CASE(many_files_showtime);
         TEST_CASE(many_files_plist);
@@ -121,49 +127,62 @@ 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(markup);
+        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);
     }
 
     void many_files() {
-        const Settings settingsOld = settings;
-        settings.quiet = false;
-
-        check(100, 100,
-              "int main()\n"
+        const int num_files = 100;
+        check(num_files, num_files,
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}");
-        std::string expected;
-        for (int i = 1; i <= 100; ++i) {
-            expected += "Checking " + fprefix() + "_" + zpad3(i) + ".cpp ...\n";
-            expected += std::to_string(i) + "/100 files checked " + std::to_string(i) + "% done\n";
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions,
+                         $.quiet = false));
+        {
+            std::string expected;
+            for (int i = 1; i <= num_files; ++i) {
+                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());
+        }
+        {
+            std::string expected;
+            for (int i = 1; i <= num_files; ++i) {
+                expected += "[" + fprefix() + "_" + zpad3(i) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
+            }
+            ASSERT_EQUALS(expected, errout_str());
         }
-        ASSERT_EQUALS(expected, output.str());
-
-        settings = settingsOld;
     }
 
     void many_files_showtime() {
         SUPPRESS;
         check(100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_SUMMARY);
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions, $.showtime = ShowTime::SUMMARY));
+        // we are not interested in the results - so just consume them
+        ignore_errout();
     }
 
     void many_files_plist() {
-        const char plistOutput[] = "plist";
-        ScopedFile plistFile("dummy", plistOutput);
+        const std::string plistOutput = "plist_" + fprefix() + "/";
+        ScopedFile plistFile("dummy", "", plistOutput);
 
         check(100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_NONE, plistOutput);
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
+        // we are not interested in the results - so just consume them
+        ignore_errout();
     }
 
     void no_errors_more_files() {
@@ -192,53 +211,121 @@ class TestSingleExecutorBase : public TestFixture {
 
     void one_error_less_files() {
         check(1, 1,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {char *a = malloc(10);}\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
+        ASSERT_EQUALS("[" + fprefix() + "_" + zpad3(1) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     void one_error_several_files() {
-        check(20, 20,
-              "int main()\n"
+        const int num_files = 20;
+        check(num_files, num_files,
+              "void f()\n"
               "{\n"
-              "  {char *a = malloc(10);}\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
+        {
+            std::string expected;
+            for (int i = 1; i <= num_files; ++i) {
+                expected += "[" + fprefix() + "_" + zpad3(i) + ".c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n";
+            }
+            ASSERT_EQUALS(expected, errout_str());
+        }
     }
 
-    void markup() {
-        const Settings settingsOld = settings;
-        settings.library.mMarkupExtensions.emplace(".cp1");
-        settings.library.mProcessAfterCode.emplace(".cp1", true);
+// TODO: provide data which actually shows values above 0
 
-        const std::vector<std::string> files = {
-            fprefix() + "_1.cp1", fprefix() + "_2.cpp", fprefix() + "_3.cp1", fprefix() + "_4.cpp"
-        };
+    void showtime_top5_file() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::TOP5_FILE));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // for each file: top5 results + overall + total
+        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
+    }
 
-        // checks are not executed on markup files => expected result is 2
-        check(4, 2,
-              "int main()\n"
+    void showtime_top5_summary() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::TOP5_SUMMARY));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // once: top5 results + newline
+        ASSERT_EQUALS(5 + 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);
+    }
+
+    void showtime_file() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::FILE));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        ASSERT_EQUALS(0, cppcheck::count_all_of(output_s, "Overall time:"));
+    }
+
+    void showtime_summary() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = 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);
+    }
+
+    void showtime_file_total() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::FILE_TOTAL));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        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=".c" reporterrors="false"/></def>)";
+        settings = settingsBuilder().libraryxml(xmldata).build();
+        check(1, 0,
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}",
-              SHOWTIME_MODES::SHOWTIME_NONE, nullptr, files);
-        // TODO: filter out the "files checked" messages
-        ASSERT_EQUALS("Checking " + fprefix() + "_2.cpp ...\n"
-                      "1/4 files checked 25% done\n"
-                      "Checking " + fprefix() + "_4.cpp ...\n"
-                      "2/4 files checked 50% done\n"
-                      "Checking " + fprefix() + "_1.cp1 ...\n"
-                      "3/4 files checked 75% done\n"
-                      "Checking " + fprefix() + "_3.cp1 ...\n"
-                      "4/4 files checked 100% done\n", output.str());
+              "  (void)(*((int*)0));\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
     }
 
-    // TODO: test clang-tidy
+    void unique_errors() {
+        SUPPRESS;
+        ScopedFile inc_h(fprefix() + ".h",
+                         "inline void f()\n"
+                         "{\n"
+                         "  (void)(*((int*)0));\n"
+                         "}");
+        check(2, 2,
+              "#include \"" + inc_h.name() + "\"");
+        // these are not actually made unique by the implementation. That needs to be done by the given ErrorLogger
+        ASSERT_EQUALS(
+            "[" + 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());
+    }
+
     // TODO: test whole program analysis
+    // TODO: test unique errors
 };
 
 class TestSingleExecutorFiles : public TestSingleExecutorBase {
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index fafc845267c..ad8aa3192af 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-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
@@ -18,18 +18,12 @@
 
 #include "checksizeof.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <list>
-#include <map>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
 class TestSizeof : public TestFixture {
 public:
@@ -39,6 +33,7 @@ class TestSizeof : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).certainty(Certainty::inconclusive).library("std.cfg").build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(sizeofsizeof);
         TEST_CASE(sizeofCalculation);
         TEST_CASE(sizeofFunction);
@@ -52,41 +47,27 @@ class TestSizeof : public TestFixture {
         TEST_CASE(customStrncat);
     }
 
-#define check(code) check_(code, __FILE__, __LINE__)
-    void check_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check...
-        runChecks<CheckSizeof>(&tokenizer, &settings, this);
+        runChecks<CheckSizeof>(tokenizer, this);
     }
 
-    void checkP(const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+#define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkP_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check...
-        runChecks<CheckSizeof>(&tokenizer, &settings, this);
+        runChecks<CheckSizeof>(tokenizer, this);
     }
 
     void sizeofsizeof() {
@@ -94,48 +75,48 @@ class TestSizeof : public TestFixture {
               "{\n"
               "    int i = sizeof sizeof char;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Calling 'sizeof' on 'sizeof'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Calling 'sizeof' on 'sizeof'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Calling 'sizeof' on 'sizeof'.\n", errout.str());
+        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)");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Found calculation inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:25]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         check("int a, b; sizeof(a*b)");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Found calculation inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:19]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         check("int a, b; sizeof(-a)");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Found calculation inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:18]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         check("int a, b; sizeof(*a)");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("sizeof(void * const)");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("sizeof(int*[2])");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("sizeof(Fred**)");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("sizeof(foo++)");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Found calculation inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:11]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         check("sizeof(--foo)");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Found calculation inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:8]: (warning) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
 
         // #6888
         checkP("#define SIZEOF1   sizeof(i != 2)\n"
@@ -149,7 +130,7 @@ class TestSizeof : public TestFixture {
                "  VOIDCAST2(SIZEOF2);\n"
                "  return i + foo(1);\n"
                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkP("#define SIZEOF1   sizeof(i != 2)\n"
                "#define SIZEOF2   ((sizeof(i != 2)))\n"
@@ -158,12 +139,12 @@ class TestSizeof : public TestFixture {
                "  SIZEOF2;\n"
                "  return i + foo(1);\n"
                "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning, inconclusive) Found calculation inside sizeof().\n"
-                      "[test.cpp:5]: (warning, inconclusive) Found calculation inside sizeof().\n", errout.str());
+        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);");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Found calculation inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (warning, inconclusive) Found calculation inside sizeof(). [sizeofCalculation]\n", errout_str());
     }
 
     void sizeofFunction() {
@@ -172,7 +153,7 @@ class TestSizeof : public TestFixture {
               "    int bar() { return 1; };\n"
               "}\n"
               "Foo f;int a=sizeof(f.bar());");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Found function call inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:13]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
         check("class Foo\n"
               "{\n"
@@ -180,35 +161,35 @@ class TestSizeof : public TestFixture {
               "    int bar() const { return 1; };\n"
               "}\n"
               "Foo f;int a=sizeof(f.bar());");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo\n"
               "{\n"
               "    int bar() { return 1; };\n"
               "}\n"
               "Foo * fp;int a=sizeof(fp->bar());");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Found function call inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:16]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
         check("int a=sizeof(foo());");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo() { return 1; }; int a=sizeof(foo());");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Found function call inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:32]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
         check("int foo() { return 1; }; sizeof(decltype(foo()));");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int) { return 1; }; int a=sizeof(foo(0))");
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Found function call inside sizeof().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:35]: (warning) Found function call inside sizeof(). [sizeofFunctionCall]\n", errout_str());
 
         check("char * buf; int a=sizeof(*buf);");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int a=sizeof(foo())");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(int) { return 1; }; char buf[1024]; int a=sizeof(buf), foo(0)");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template<class T>\n"
               "struct A\n"
@@ -224,7 +205,12 @@ class TestSizeof : public TestFixture {
               "        Z = X & Y\n"
               "    };\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        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() {
@@ -232,7 +218,7 @@ class TestSizeof : public TestFixture {
               "    int a[10];\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    unsigned int a = 2;\n"
@@ -240,7 +226,7 @@ class TestSizeof : public TestFixture {
               "    int c[(a+b)];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    unsigned int a = { 2 };\n"
@@ -248,7 +234,7 @@ class TestSizeof : public TestFixture {
               "    int c[a[b[0]]];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("void f() {\n"
@@ -257,56 +243,56 @@ class TestSizeof : public TestFixture {
               "    int c[(a[0]+b)];\n"
               "    std::cout << sizeof(c) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[] = { 1, 2, 3 };\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int a[3] = { 1, 2, 3 };\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f( int a[]) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Using 'sizeof' on array given as "
-                      "function argument returns size of a pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Using 'sizeof' on array given as "
-                      "function argument returns size of a pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Using 'sizeof' on array given as "
-                      "function argument returns size of a pointer.\n", errout.str());
+        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("typedef char Fixname[1000];\n"
               "int f2(Fixname& f2v) {\n"
               "  int i = sizeof(f2v);\n"
               "  printf(\"sizeof f2v %d\", i);\n"
               "   }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int *p) {\n"
               "    p[0] = 0;\n"
               "    int unused = sizeof(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char p[] = \"test\";\n"
               "    int unused = sizeof(p);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #2495
         check("void f() {\n"
@@ -320,33 +306,33 @@ class TestSizeof : public TestFixture {
               "    };\n"
               "    const int COL_MAX=sizeof(col)/sizeof(col[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #155
         check("void f() {\n"
               "    char buff1[1024*64],buff2[sizeof(buff1)*2];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #2510
         check("void f( int a[], int b) {\n"
               "    std::cout << sizeof(a) / sizeof(int) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Using 'sizeof' on array given as "
-                      "function argument returns size of a pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Using 'sizeof' on array given as "
-                      "function argument returns size of a pointer.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -354,22 +340,22 @@ class TestSizeof : public TestFixture {
         check("void f() {\n"
               "    std::cout << sizeof(10) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18]: (warning) Suspicious usage of 'sizeof' with a numeric constant as parameter. [sizeofwithnumericparameter]\n", errout_str());
     }
 
     void suspiciousSizeofCalculation() {
@@ -377,68 +363,68 @@ class TestSizeof : public TestFixture {
               "  int* p;\n"
               "  return sizeof(p)/5;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) Division of result of sizeof() on pointer type.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return sizeof(unknown)/5;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int p;\n"
               "  return sizeof(p)/5;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  int* p[5];\n"
               "  return sizeof(p)/5;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("void f() {\n"
               "  return sizeof(foo)*sizeof(bar);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Multiplying sizeof() with sizeof() indicates a logic error.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return sizeof(foo)*bar;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  return (end - source) / sizeof(encode_block_type) * sizeof(encode_block_type);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { T* t; };\n" // #10179
               "int f(S* s) {\n"
               "    return g(sizeof(*s->t) / 4);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    const char* a[N];\n"
               "    for (int i = 0; i < (int)(sizeof(a) / sizeof(char*)); i++) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(int** p) {\n"
               "    return sizeof(p[0]) / 4;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Division of result of sizeof() on pointer type.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12]: (warning, inconclusive) Division of result of sizeof() on pointer type. [divideSizeof]\n", errout_str());
 
         check("struct S {\n"
               "    unsigned char* s;\n"
@@ -449,7 +435,7 @@ class TestSizeof : public TestFixture {
               "void f(T* t) {\n"
               "    for (size_t i = 0; i < sizeof(t->s) / sizeof(t->s[0]); i++) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n"
               "    struct T {\n"
@@ -459,18 +445,18 @@ class TestSizeof : public TestFixture {
               "void f(S* s) {\n"
               "    for (int i = 0; i != sizeof(s->t[0].c) / sizeof(char*); i++) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int32_t* buf, size_t len) {\n"
               "    for (int i = 0; i < len / sizeof(buf[0]); i++) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int32_t*** buf, size_t len) {\n"
               "    for (int i = 0; i < len / sizeof(**buf[0]); i++) {}\n"
               "    for (int i = 0; i < len / sizeof(*buf[0][0]); i++) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkPointerSizeof() {
@@ -478,49 +464,49 @@ class TestSizeof : public TestFixture {
               "    char *x = malloc(10);\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(*x));\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(x));\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
@@ -528,155 +514,155 @@ class TestSizeof : public TestFixture {
               "    int **y = malloc(sizeof(int*));\n"
               "    free(y);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(100 * sizeof(x));\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof x);\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof *x);\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = calloc(1, sizeof(x));\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char x[10];\n"
               "    memset(x, 0, sizeof(x));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char* x[10];\n"
               "    memset(x, 0, sizeof(x));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    char x[10];\n"
               "    memset(x, 0, sizeof x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(int));\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof(*x));\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof *x);\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    int *x = malloc(sizeof(int));\n"
               "    memset(x, 0, sizeof x);\n"
               "    free(x);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Size of pointer 'x' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check(
             "int fun(const char *buf1)\n"
@@ -684,18 +670,18 @@ class TestSizeof : public TestFixture {
             "  const char *buf1_ex = \"foobarbaz\";\n"
             "  return strncmp(buf1, buf1_ex, sizeof(buf1_ex)) == 0;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Size of pointer 'buf1_ex' used instead of size of its data.\n", errout.str());
+        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"
             "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'buf1' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Size of pointer 'buf2' used instead of size of its data.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:24]: (warning) Size of pointer 'buf2' used instead of size of its data. [pointerSize]\n", errout_str());
 
         // #ticket 3874
         check("void f()\n"
@@ -703,25 +689,25 @@ class TestSizeof : public TestFixture {
               " int * pIntArray[10];\n"
               " memset(pIntArray, 0, sizeof(pIntArray));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "  module_config_t *tab = module;\n"
               "  memset(tab + confsize, 0, sizeof(tab[confsize]));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(char* aug) {\n"
               "  memmove(aug + extra_string, aug, buf - (bfd_byte *)aug);\n" // #7100
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7518
         check("bool create_iso_definition(cpp_reader *pfile, cpp_macro *macro) {\n"
@@ -729,13 +715,13 @@ class TestSizeof : public TestFixture {
               "  cpp_hashnode **params = malloc(sizeof(cpp_hashnode *) * macro->paramc);\n"
               "  memcpy(params, macro->params, sizeof(cpp_hashnode *) * macro->paramc);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void* foo() {\n"
               "  void* AtomName = malloc(sizeof(char *) * 34);\n"
               "  return AtomName;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkPointerSizeofStruct() {
@@ -743,7 +729,7 @@ class TestSizeof : public TestFixture {
               "    struct foo *ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    struct foo {\n"
@@ -751,7 +737,7 @@ class TestSizeof : public TestFixture {
               "    }* ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    struct foo {\n"
@@ -759,27 +745,27 @@ class TestSizeof : public TestFixture {
               "    }* ptr;\n"
               "    memset( ptr->bar, 0, sizeof ptr->bar );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Size of pointer 'bar' used instead of size of its data.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning, inconclusive) Division of result of sizeof() on pointer type.\n"
-                      "[test.cpp:2]: (warning) Division by result of sizeof(). memmove() expects a size in bytes, did you intend to multiply instead?\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Division by result of sizeof(). malloc() expects a size in bytes, did you intend to multiply instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #9648
               "    int a[5] = { 0 };\n"
@@ -787,20 +773,20 @@ class TestSizeof : public TestFixture {
               "    memcpy(b, a, ((sizeof(a) / sizeof(a[0])) - 1) * sizeof(a[0]));\n"
               "    memcpy(b, a, sizeof(a[0]) * ((sizeof(a) / sizeof(a[0])) - 1));\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void sizeofVoid() {
         check("void f() {\n"
               "  int size = sizeof(void);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) Behaviour of 'sizeof(void)' is not covered by the ISO C standard.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) '*p' is of type 'void', the behaviour of 'sizeof(void)' is not covered by the ISO C standard.\n", errout.str());
+        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"
               "  void* p = malloc(10);\n"
@@ -808,9 +794,9 @@ class TestSizeof : public TestFixture {
               "  int* p3 = p - 1;\n"
               "  int* p4 = 1 + p;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n"
-                      "[test.cpp:4]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n"
-                      "[test.cpp:5]: (portability) 'p' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "  void* p1 = malloc(10);\n"
@@ -818,8 +804,8 @@ class TestSizeof : public TestFixture {
               "  p1--;\n"
               "  p2++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (portability) 'p1' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n"
-                      "[test.cpp:5]: (portability) 'p2' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "  void* p1 = malloc(10);\n"
@@ -827,62 +813,62 @@ class TestSizeof : public TestFixture {
               "  p1-=4;\n"
               "  p2+=4;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (portability) 'p1' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n"
-                      "[test.cpp:5]: (portability) 'p2' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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());
 
         check("void f() {\n"
               "  void* p = malloc(10);\n"
               "  int* p2 = &p + 4;\n"
               "  int* p3 = &p - 1;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void** p1 = malloc(10);\n"
               "  p1--;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void** p1;\n"
               "  int j = sizeof(*p1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  void* p1[5];\n"
               "  int j = sizeof(*p1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Calculations on void* with casts
 
         check("void f(void *data) {\n"
               "  *((unsigned char *)data + 1) = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void *data) {\n"
               "  *((unsigned char *)(data) + 1) = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void *data) {\n"
               "  unsigned char* c = (unsigned char *)(data + 1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n"
-                      "[test.cpp:3]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (portability) 'data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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)
         check("struct FOO {\n"
@@ -893,8 +879,8 @@ class TestSizeof : public TestFixture {
               "  foo.data++;\n"
               "  return x;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (portability) 'foo.data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n"
-                      "[test.cpp:6]: (portability) 'foo.data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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());
 
         check("struct FOO {\n"
               "  void *data;\n"
@@ -917,7 +903,7 @@ class TestSizeof : public TestFixture {
               "void f4(struct BOO* boo) {\n"
               "  char c = *((char*)boo->data.data + 1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct FOO {\n"
               "  void *data;\n"
@@ -925,7 +911,7 @@ class TestSizeof : public TestFixture {
               "char f(struct FOO* foo) {\n"
               "  *(foo[1].data + 1) = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (portability) 'foo[1].data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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"
               "  void *data;\n"
@@ -933,12 +919,12 @@ class TestSizeof : public TestFixture {
               "void f2(struct FOO* foo) {\n"
               "  (foo[0]).data++;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (portability) '(foo[0]).data' is of type 'void *'. When using void pointers in calculations, the behaviour is undefined.\n", errout.str());
+        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;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void customStrncat() {
diff --git a/test/teststandards.cpp b/test/teststandards.cpp
new file mode 100644
index 00000000000..0786021dfc1
--- /dev/null
+++ b/test/teststandards.cpp
@@ -0,0 +1,144 @@
+/*
+ * 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 "fixture.h"
+#include "standards.h"
+
+class TestStandards : public TestFixture {
+public:
+    TestStandards() : TestFixture("TestStandards") {}
+
+private:
+    void run() override {
+        TEST_CASE(set);
+        TEST_CASE(setCPPAlias);
+        TEST_CASE(setCAlias);
+        TEST_CASE(getC);
+        TEST_CASE(getCPP);
+        TEST_CASE(setStd);
+    }
+
+    void set() const {
+        Standards stds;
+        ASSERT_EQUALS_ENUM(Standards::CLatest, stds.c);
+        ASSERT_EQUALS("", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
+        ASSERT_EQUALS("", stds.stdValueCPP);
+
+        ASSERT_EQUALS(true, stds.setC("c99"));
+        ASSERT_EQUALS_ENUM(Standards::C99, stds.c);
+        ASSERT_EQUALS("c99", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
+        ASSERT_EQUALS("", stds.stdValueCPP);
+
+        ASSERT_EQUALS(true, stds.setC("c11"));
+        ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
+        ASSERT_EQUALS("c11", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
+        ASSERT_EQUALS("", stds.stdValueCPP);
+
+        ASSERT_EQUALS(true, stds.setCPP("c++11"));
+        ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
+        ASSERT_EQUALS("c11", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPP11, stds.cpp);
+        ASSERT_EQUALS("c++11", stds.stdValueCPP);
+
+        ASSERT_EQUALS(true, stds.setCPP("c++23"));
+        ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
+        ASSERT_EQUALS("c11", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
+        ASSERT_EQUALS("c++23", stds.stdValueCPP);
+
+        ASSERT_EQUALS(false, stds.setC("c77"));
+        ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
+        ASSERT_EQUALS("c11", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
+        ASSERT_EQUALS("c++23", stds.stdValueCPP);
+
+        ASSERT_EQUALS(false, stds.setCPP("c+77"));
+        ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
+        ASSERT_EQUALS("c11", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
+        ASSERT_EQUALS("c++23", stds.stdValueCPP);
+
+        ASSERT_EQUALS(false, stds.setC("C23"));
+        ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
+        ASSERT_EQUALS("c11", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
+        ASSERT_EQUALS("c++23", stds.stdValueCPP);
+
+        ASSERT_EQUALS(false, stds.setCPP("C++11"));
+        ASSERT_EQUALS_ENUM(Standards::C11, stds.c);
+        ASSERT_EQUALS("c11", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPP23, stds.cpp);
+        ASSERT_EQUALS("c++23", stds.stdValueCPP);
+    }
+
+    void setCPPAlias() const {
+        Standards stds;
+        ASSERT_EQUALS(true, stds.setCPP("gnu++11"));
+        ASSERT_EQUALS_ENUM(Standards::CLatest, stds.c);
+        ASSERT_EQUALS("", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPP11, stds.cpp);
+        ASSERT_EQUALS("gnu++11", stds.stdValueCPP);
+    }
+
+    void setCAlias() const {
+        Standards stds;
+        ASSERT_EQUALS(true, stds.setC("gnu17"));
+        ASSERT_EQUALS_ENUM(Standards::C17, stds.c);
+        ASSERT_EQUALS("gnu17", stds.stdValueC);
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, stds.cpp);
+        ASSERT_EQUALS("", stds.stdValueCPP);
+    }
+
+    void getC() const {
+        ASSERT_EQUALS_ENUM(Standards::C99, Standards::getC("c99"));
+        ASSERT_EQUALS_ENUM(Standards::C11, Standards::getC("c11"));
+        ASSERT_EQUALS_ENUM(Standards::C17, Standards::getC("gnu17"));
+        ASSERT_EQUALS_ENUM(Standards::C11, Standards::getC("iso9899:2011"));
+
+        ASSERT_EQUALS_ENUM(Standards::CLatest, Standards::getC(""));
+        ASSERT_EQUALS_ENUM(Standards::CLatest, Standards::getC("c77"));
+        ASSERT_EQUALS_ENUM(Standards::CLatest, Standards::getC("C99"));
+    }
+
+    void getCPP() const {
+        ASSERT_EQUALS_ENUM(Standards::CPP11, Standards::getCPP("c++11"));
+        ASSERT_EQUALS_ENUM(Standards::CPP23, Standards::getCPP("c++23"));
+        ASSERT_EQUALS_ENUM(Standards::CPP23, Standards::getCPP("gnu++23"));
+
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, Standards::getCPP(""));
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, Standards::getCPP("c++77"));
+        ASSERT_EQUALS_ENUM(Standards::CPPLatest, Standards::getCPP("C++11"));
+    }
+
+    void setStd() const {
+        Standards stds;
+        ASSERT(stds.setStd("c11"));
+        ASSERT(stds.setStd("c++11"));
+        ASSERT(stds.setStd("gnu11"));
+        ASSERT(stds.setStd("gnu++17"));
+        ASSERT(stds.setStd("iso9899:2011"));
+
+        ASSERT(!stds.setStd("C++11"));
+        ASSERT(!stds.setStd("Gnu++11"));
+    }
+};
+
+REGISTER_TEST(TestStandards)
diff --git a/test/teststl.cpp b/test/teststl.cpp
index 10a33783cd3..2c4669dbeca 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-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
@@ -18,26 +18,26 @@
 
 #include "checkstl.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
-#include "tokenize.h"
 #include "utils.h"
 
 #include <cstddef>
-#include <list>
-#include <sstream> // IWYU pragma: keep
 #include <string>
 
-
 class TestStl : public TestFixture {
 public:
     TestStl() : TestFixture("TestStl") {}
 
 private:
-    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;
         TEST_CASE(outOfBounds);
         TEST_CASE(outOfBoundsSymbolic);
         TEST_CASE(outOfBoundsIndexExpression);
@@ -71,9 +71,13 @@ class TestStl : public TestFixture {
         TEST_CASE(iterator26); // #9176
         TEST_CASE(iterator27); // #10378
         TEST_CASE(iterator28); // #10450
+        TEST_CASE(iterator29);
+        TEST_CASE(iterator30);
+        TEST_CASE(iterator31);
         TEST_CASE(iteratorExpression);
         TEST_CASE(iteratorSameExpression);
         TEST_CASE(mismatchingContainerIterator);
+        TEST_CASE(eraseIteratorOutOfBounds);
 
         TEST_CASE(dereference);
         TEST_CASE(dereference_break);  // #3644 - handle "break"
@@ -176,38 +180,47 @@ class TestStl : public TestFixture {
         TEST_CASE(checkMutexes);
     }
 
+    struct CheckOptions
+    {
+        bool inconclusive = false;
+    };
+
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const bool inconclusive = false, const Standards::cppstd_t cppstandard = Standards::CPPLatest) {
-        // Clear the error buffer..
-        errout.str("");
+    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.inconclusive ? settings_i : settings;
 
-        const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).cpp(cppstandard).build();
+        check_(file, line, code, s);
+    }
 
-        // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
+    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(istr, "test.cpp"), file, line);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckStl>(&tokenizer, &settings1, this);
+        runChecks<CheckStl>(tokenizer, this);
     }
 
-    void check_(const char* file, int line, const std::string& code, const bool inconclusive = false) {
-        check_(file, line, code.c_str(), inconclusive);
-    }
+    // TODO: get rid of this
+    void check_(const char* file, int line, const std::string& code) {
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings, *this);
+
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-#define checkNormal(code) checkNormal_(code, __FILE__, __LINE__)
-    void checkNormal_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
+        runChecks<CheckStl>(tokenizer, this);
+    }
 
+#define checkNormal(...) checkNormal_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkNormal_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        runChecks<CheckStl>(&tokenizer, &settings, this);
+        runChecks<CheckStl>(tokenizer, this);
     }
 
     void outOfBounds() {
@@ -224,40 +237,40 @@ class TestStl : public TestFixture {
                     "            bar(v[2], v[3]) )\n"                          // v[3] is accessed
                     "    {;}\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:9:warning:Either the condition 'v.size()>=2' is redundant or v size can be 2. Expression 'v[2]' cause access out of bounds.\n"
-                      "test.cpp:8:note:condition 'v.size()>=2'\n"
-                      "test.cpp:9:note:Access out of bounds\n"
-                      "test.cpp:9:warning:Either the condition 'v.size()>=2' is redundant or v size can be 2. Expression 'v[3]' cause access out of bounds.\n"
-                      "test.cpp:8:note:condition 'v.size()>=2'\n"
-                      "test.cpp:9:note:Access out of bounds\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:18]: warning: Either the condition 'v.size()>=2' is redundant or size of 'v' can be 2. Expression 'v[2]' causes access out of bounds. [containerOutOfBounds]\n"
+                      "[test.cpp:8:17]: note: condition 'v.size()>=2'\n"
+                      "[test.cpp:9:18]: note: Access out of bounds\n"
+                      "[test.cpp:9:24]: warning: Either the condition 'v.size()>=2' is redundant or size of 'v' can be 2. Expression 'v[3]' causes access out of bounds. [containerOutOfBounds]\n"
+                      "[test.cpp:8:17]: note: condition 'v.size()>=2'\n"
+                      "[test.cpp:9:24]: note: Access out of bounds\n", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  s[10] = 1;\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in expression 's[10]' because 's' is empty.\n", errout.str());
+        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"
                     "}");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in 's[10]', if 's' size is 4 and '10' is 10\n", errout.str());
+        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"
                     "}");
-        ASSERT_EQUALS("test.cpp:2:warning:Either the condition 'v.empty()' is redundant or expression 'v.front()' cause access out of bounds.\n"
-                      "test.cpp:3:note:condition 'v.empty()'\n"
-                      "test.cpp:2:note:Access out of bounds\n", errout.str());
+        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());
 
         checkNormal("void f(std::vector<int> v) {\n"
                     "    if (v.size() == 3) {}\n"
                     "    v[16] = 0;\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:3:warning:Either the condition 'v.size()==3' is redundant or v size can be 3. Expression 'v[16]' cause access out of bounds.\n"
-                      "test.cpp:2:note:condition 'v.size()==3'\n"
-                      "test.cpp:3:note:Access out of bounds\n", errout.str());
+        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());
 
         checkNormal("void f(std::vector<int> v) {\n"
                     "    int i = 16;\n"
@@ -265,29 +278,29 @@ class TestStl : public TestFixture {
                     "        v[i] = 0;\n"
                     "    }\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:4:warning:Either the condition 'v.size()==3' is redundant or v size can be 3. Expression 'v[i]' cause access out of bounds.\n"
-                      "test.cpp:3:note:condition 'v.size()==3'\n"
-                      "test.cpp:4:note:Access out of bounds\n", errout.str());
+        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());
 
         checkNormal("void f(std::vector<int> v, int i) {\n"
                     "    if (v.size() == 3 || i == 16) {}\n"
                     "    v[i] = 0;\n"
                     "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::map<int,int> x) {\n"
                     "    if (x.empty()) { x[1] = 2; }\n"
                     "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::string s) {\n"
                     "    if (s.size() == 1) {\n"
                     "        s[2] = 0;\n"
                     "    }\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:3:warning:Either the condition 's.size()==1' is redundant or s size can be 1. Expression 's[2]' cause access out of bounds.\n"
-                      "test.cpp:2:note:condition 's.size()==1'\n"
-                      "test.cpp:3:note:Access out of bounds\n", errout.str());
+        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());
 
         // Do not crash
         checkNormal("void a() {\n"
@@ -295,53 +308,56 @@ class TestStl : public TestFixture {
                     "  for (auto c : b)\n"
                     "    c.data();\n"
                     "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("std::string f(std::string x) {\n"
                     "  if (x.empty()) return {};\n"
                     "  x[0];\n"
                     "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("std::string f(std::string x) {\n"
                     "  if (x.empty()) return std::string{};\n"
                     "  x[0];\n"
                     "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f() {\n"
                     "  std::string s;\n"
                     "  x = s.begin() + 1;\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in expression 's.begin()+1' because 's' is empty.\n", errout.str());
+        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
+            errout_str());
 
         checkNormal("void f(int x) {\n"
                     "  std::string s;\n"
-                    "  x = s.begin() + x;\n"
+                    "  auto it = s.begin() + x;\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in expression 's.begin()+x' because 's' is empty and 'x' may be non-zero.\n", errout.str());
+        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]; }");
-        ASSERT_EQUALS("test.cpp:1:error:Out of bounds access in 's[42]', if 's' size is 6 and '42' is 42\n"
-                      "test.cpp:2:error:Out of bounds access in 's[42]', if 's' size is 6 and '42' is 42\n", errout.str());
+        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]; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("int f() {\n"
                     "    std::vector<int> v;\n"
                     "    std::vector<int> * pv = &v;\n"
                     "    return (*pv)[42];\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in expression '(*pv)[42]' because '*pv' is empty.\n", errout.str());
+        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"
                     "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 9274
         checkNormal("char f(bool b) {\n"
@@ -350,14 +366,14 @@ class TestStl : public TestFixture {
                     "    if(b) ++x;\n"
                     "    return s[x];\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:5:error:Out of bounds access in 's[x]', if 's' size is 6 and 'x' is 6\n", errout.str());
+        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());
 
         checkNormal("void f() {\n"
                     "    static const int N = 4;\n"
                     "    std::array<int, N> x;\n"
                     "    x[0] = 0;\n"
                     "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(bool b) {\n"
                     "    std::vector<int> x;\n"
@@ -367,25 +383,25 @@ class TestStl : public TestFixture {
                     "        return;\n"
                     "    x[0] = 2;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(bool b) {\n"
                     "    std::vector<int> v;\n"
                     "    if(v.at(b?42:0)) {}\n"
                     "}\n");
         ASSERT_EQUALS(
-            "test.cpp:3:error:Out of bounds access in expression 'v.at(b?42:0)' because 'v' is empty and 'b?42:0' may be non-zero.\n",
-            errout.str());
+            "[test.cpp:3:12]: error: Out of bounds access in expression 'v.at(b?42:0)' because 'v' is empty. [containerOutOfBounds]\n",
+            errout_str());
 
         checkNormal("void f(std::vector<int> v, bool b){\n"
                     "    if (v.size() == 1)\n"
                     "        if(v.at(b?42:0)) {}\n"
                     "}\n");
         ASSERT_EQUALS(
-            "test.cpp:3:warning:Either the condition 'v.size()==1' is redundant or v size can be 1. Expression 'v.at(b?42:0)' cause access out of bounds.\n"
-            "test.cpp:2:note:condition 'v.size()==1'\n"
-            "test.cpp:3:note:Access out of bounds\n",
-            errout.str());
+            "[test.cpp:3:16]: warning: Either the condition 'v.size()==1' is redundant or size of 'v' can be 1. Expression 'v.at(b?42:0)' causes access out of bounds. [containerOutOfBounds]\n"
+            "[test.cpp:2:18]: note: condition 'v.size()==1'\n"
+            "[test.cpp:3:16]: note: Access out of bounds\n",
+            errout_str());
 
         check("struct T {\n"
               "  std::vector<int>* v;\n"
@@ -399,8 +415,8 @@ class TestStl : public TestFixture {
               "  S s = { { &ArrS } };\n"
               "  g(s);\n"
               "  return ArrS[0];\n"
-              "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n"
               "  std::vector<int>* v;\n"
@@ -415,8 +431,8 @@ class TestStl : public TestFixture {
               "  g(s);\n"
               "  return ArrS[0];\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n"
               "  std::vector<int>* v;\n"
@@ -431,8 +447,8 @@ class TestStl : public TestFixture {
               "  g(s);\n"
               "  return ArrS[0];\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n"
               "  std::vector<int>* v;\n"
@@ -447,8 +463,8 @@ class TestStl : public TestFixture {
               "  g(s);\n"
               "  return ArrS[0];\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n"
               "  std::vector<int>* v;\n"
@@ -463,8 +479,8 @@ class TestStl : public TestFixture {
               "  g(s);\n"
               "  return ArrS[0];\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n"
               "  std::vector<int>* v;\n"
@@ -479,8 +495,8 @@ class TestStl : public TestFixture {
               "  g(s);\n"
               "  return ArrS[0];\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("extern void Bar(const double, const double);\n"
                     "void f(std::vector<double> &r, const double ) {\n"
@@ -496,7 +512,7 @@ class TestStl : public TestFixture {
                     "    Bar(0.0, result[0]);\n"
                     "    Bar(0.34, result[1]);\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(size_t entries) {\n"
                     "    std::vector<uint8_t> v;\n"
@@ -504,7 +520,7 @@ class TestStl : public TestFixture {
                     "        v.resize(entries + 2);\n"
                     "    v[0] = 1;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(size_t entries) {\n"
                     "    std::vector<uint8_t> v;\n"
@@ -512,7 +528,7 @@ class TestStl : public TestFixture {
                     "        v.resize(entries);\n"
                     "    v[0] = 1;\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:5:error:Out of bounds access in expression 'v[0]' because 'v' is empty.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:6]: error: Out of bounds access in expression 'v[0]' because 'v' is empty. [containerOutOfBounds]\n", errout_str());
 
         checkNormal("void f(size_t entries) {\n"
                     "    if (entries < 2) return;\n"
@@ -521,7 +537,7 @@ class TestStl : public TestFixture {
                     "        v.resize(entries);\n"
                     "    v[0] = 1;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(size_t entries) {\n"
                     "    if (entries == 0) return;\n"
@@ -530,7 +546,7 @@ class TestStl : public TestFixture {
                     "        v.resize(entries);\n"
                     "    v[0] = 1;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void foo(std::vector<int>* PArr, int n) {\n"
                     " std::vector<int> Arr;\n"
@@ -540,15 +556,15 @@ class TestStl : public TestFixture {
                     " for (int i = 0; i < n; ++i)\n"
                     "   (*PArr)[i] = 1;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("int f() {\n"
                     "    std::vector<int> v;\n"
                     "    std::vector<int> * pv = &v;\n"
                     "    return (*pv).at(42);\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in expression '(*pv).at(42)' because '*pv' is empty.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:20]: error: Out of bounds access in expression '(*pv).at(42)' because '*pv' is empty. [containerOutOfBounds]\n",
+                      errout_str());
 
         checkNormal("std::string f(const char* DirName) {\n"
                     "  if (DirName == nullptr)\n"
@@ -558,7 +574,7 @@ class TestStl : public TestFixture {
                     "    Name += '\\\\';\n"
                     "  return Name;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("bool f(bool b) {\n"
                     "  std::vector<int> v;\n"
@@ -569,7 +585,7 @@ class TestStl : public TestFixture {
                     "      return true;\n"
                     "  return false;\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:5:style:Consider using std::any_of algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:3]: style: Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         checkNormal("std::vector<int> range(int n);\n"
                     "bool f(bool b) {\n"
@@ -582,7 +598,7 @@ class TestStl : public TestFixture {
                     "      return true;\n"
                     "  return false;\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:7:style:Consider using std::any_of algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:3]: style: Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         checkNormal("bool g();\n"
                     "int f(int x) {\n"
@@ -595,7 +611,7 @@ class TestStl : public TestFixture {
                     "            return i;\n"
                     "    return 0;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:0]: 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"
@@ -608,7 +624,7 @@ class TestStl : public TestFixture {
                     "            return i;\n"
                     "    return 0;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:0]: 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"
@@ -620,14 +636,14 @@ class TestStl : public TestFixture {
                     "    for (int i = 0; i < n; ++i)\n"
                     "        h(v[i]);\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void foo(const std::vector<int> &v) {\n"
                     "    if(v.size() >=1 && v[0] == 4 && v[1] == 2){}\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:2:warning:Either the condition 'v.size()>=1' is redundant or v size can be 1. Expression 'v[1]' cause access out of bounds.\n"
-                      "test.cpp:2:note:condition 'v.size()>=1'\n"
-                      "test.cpp:2:note:Access out of bounds\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:38]: warning: Either the condition 'v.size()>=1' is redundant or size of 'v' can be 1. Expression 'v[1]' causes access out of bounds. [containerOutOfBounds]\n"
+                      "[test.cpp:2:17]: note: condition 'v.size()>=1'\n"
+                      "[test.cpp:2:38]: note: Access out of bounds\n", errout_str());
 
         checkNormal("int f(int x, int y) {\n"
                     "    std::vector<int> a = {0,1,2};\n"
@@ -638,23 +654,23 @@ class TestStl : public TestFixture {
                     "    return y;\n"
                     "}\n");
         ASSERT_EQUALS(
-            "test.cpp:6:warning:Either the condition 'x<2' is redundant or 'x' can have the value greater or equal to 3. Expression 'a[x]' cause access out of bounds.\n"
-            "test.cpp:3:note:condition 'x<2'\n"
-            "test.cpp:6:note:Access out of bounds\n",
-            errout.str());
+            "[test.cpp:6:14]: warning: Either the condition 'x<2' is redundant or 'x' can have the value greater or equal to 3. Expression 'a[x]' causes access out of bounds. [containerOutOfBounds]\n"
+            "[test.cpp:3:9]: note: condition 'x<2'\n"
+            "[test.cpp:6:14]: note: Access out of bounds\n",
+            errout_str());
 
         checkNormal("int f(std::vector<int> v) {\n"
                     "    if (v.size() > 3)\n"
                     "        return v[v.size() - 3];\n"
                     "    return 0;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::vector<int> v) {\n"
                     "    v[v.size() - 1];\n"
                     "    if (v.size() == 1) {}\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(int n) {\n"
                     "    std::vector<int> v = {1, 2, 3, 4};\n"
@@ -662,7 +678,7 @@ class TestStl : public TestFixture {
                     "    if (i > 1)\n"
                     "        v[i] = 1;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::vector<int>& v, int i) {\n"
                     "    if (i > -1) {\n"
@@ -670,7 +686,7 @@ class TestStl : public TestFixture {
                     "        if (v.empty()) {}\n"
                     "    }\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void g(const char *, ...) { exit(1); }\n" // #10025
                     "void f(const char c[]) {\n"
@@ -679,7 +695,7 @@ class TestStl : public TestFixture {
                     "        g(\"\", c[0]);\n"
                     "    return h(&v[0], v.size()); \n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(int i, std::vector<int> v) {\n" // #9157
                     "    if (i <= (int)v.size()) {\n"
@@ -689,13 +705,13 @@ class TestStl : public TestFixture {
                     "        if (v[i]) {}\n"
                     "    }\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:3:warning:Either the condition 'i<=(int)v.size()' is redundant or 'i' can have the value v.size(). Expression 'v[i]' cause access out of bounds.\n"
-                      "test.cpp:2:note:condition 'i<=(int)v.size()'\n"
-                      "test.cpp:3:note:Access out of bounds\n"
-                      "test.cpp:6:warning:Either the condition 'i<=static_cast<int>(v.size())' is redundant or 'i' can have the value v.size(). Expression 'v[i]' cause access out of bounds.\n"
-                      "test.cpp:5:note:condition 'i<=static_cast<int>(v.size())'\n"
-                      "test.cpp:6:note:Access out of bounds\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: warning: Either the condition 'i<=(int)v.size()' is redundant or 'i' can have the value v.size(). Expression 'v[i]' causes access out of bounds. [containerOutOfBounds]\n"
+                      "[test.cpp:2:11]: note: condition 'i<=(int)v.size()'\n"
+                      "[test.cpp:3:14]: note: Access out of bounds\n"
+                      "[test.cpp:6:14]: warning: Either the condition 'i<=static_cast<int>(v.size())' is redundant or 'i' can have the value v.size(). Expression 'v[i]' causes access out of bounds. [containerOutOfBounds]\n"
+                      "[test.cpp:5:11]: note: condition 'i<=static_cast<int>(v.size())'\n"
+                      "[test.cpp:6:14]: note: Access out of bounds\n",
+                      errout_str());
 
         check("template<class Iterator>\n"
               "void b(Iterator d) {\n"
@@ -706,9 +722,9 @@ class TestStl : public TestFixture {
               "  std::string buf;\n"
               "  b(buf.begin());\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in expression 'd+c.length()' because 'buf' is empty.\n",
-                      errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:5]: error: Out of bounds access in expression 'd+c.length()' because 'buf' is empty. [containerOutOfBounds]\n",
+                      errout_str());
 
         check("template<class Iterator>\n"
               "void b(Iterator d) {\n"
@@ -719,18 +735,18 @@ class TestStl : public TestFixture {
               "  std::string buf;\n"
               "  b(buf.begin());\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<int> &v) {\n"
               "    return !v.empty() ? 42 : v.back();\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "test.cpp:2:warning:Either the condition 'v.empty()' is redundant or expression 'v.back()' cause access out of bounds.\n"
-            "test.cpp:2:note:condition 'v.empty()'\n"
-            "test.cpp:2:note:Access out of bounds\n",
-            errout.str());
+            "[test.cpp:2:36]: warning: Either the condition 'v.empty()' is redundant or expression 'v.back()' causes access out of bounds. [containerOutOfBounds]\n"
+            "[test.cpp:2:20]: note: condition 'v.empty()'\n"
+            "[test.cpp:2:36]: note: Access out of bounds\n",
+            errout_str());
 
         check("std::vector<int> g() {\n" // #10779
               "    std::vector<int> v(10);\n"
@@ -738,47 +754,47 @@ class TestStl : public TestFixture {
               "        v[i] = 42;\n"
               "    return v;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in 'v[i]', if 'v' size is 10 and 'i' is 10\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: error: Out of bounds access in 'v[i]', if 'v' size is 10 and 'i' is 10 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    int s = 2;\n"
               "    std::vector <int> v(s);\n"
               "    v[100] = 1;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in 'v[100]', if 'v' size is 2 and '100' is 100\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: error: Out of bounds access in 'v[100]', if 'v' size is 2 and '100' is 100 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    std::vector <int> v({ 1, 2, 3 });\n"
               "    v[100] = 1;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:6]: error: Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    char c[] = { 1, 2, 3 };\n"
               "    std::vector<char> v(c, sizeof(c) + c);\n"
               "    v[100] = 1;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: error: Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    char c[] = { 1, 2, 3 };\n"
               "    std::vector<char> v{ c, c + sizeof(c) };\n"
               "    v[100] = 1;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: error: Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    int i[] = { 1, 2, 3 };\n"
               "    std::vector<int> v(i, i + sizeof(i) / 4);\n"
               "    v[100] = 1;\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: error: Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n" // #6615
               "    int i[] = { 1, 2, 3 };\n"
@@ -787,7 +803,7 @@ class TestStl : public TestFixture {
               "}\n");
         TODO_ASSERT_EQUALS("test.cpp:4:error:Out of bounds access in 'v[100]', if 'v' size is 3 and '100' is 100\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         check("void f() {\n"
               "    std::array<int, 10> a = {};\n"
@@ -799,11 +815,11 @@ class TestStl : public TestFixture {
               "    static constexpr std::array<int, 10> d = {};\n"
               "    d[10];\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in 'a[10]', if 'a' size is 10 and '10' is 10\n"
-                      "test.cpp:5:error:Out of bounds access in 'b[10]', if 'b' size is 10 and '10' is 10\n"
-                      "test.cpp:7:error:Out of bounds access in 'c[10]', if 'c' size is 10 and '10' is 10\n"
-                      "test.cpp:9:error:Out of bounds access in 'd[10]', if 'd' size is 10 and '10' is 10\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:6]: error: Out of bounds access in 'a[10]', if 'a' size is 10 and '10' is 10 [containerOutOfBounds]\n"
+                      "[test.cpp:5:6]: error: Out of bounds access in 'b[10]', if 'b' size is 10 and '10' is 10 [containerOutOfBounds]\n"
+                      "[test.cpp:7:6]: error: Out of bounds access in 'c[10]', if 'c' size is 10 and '10' is 10 [containerOutOfBounds]\n"
+                      "[test.cpp:9:6]: error: Out of bounds access in 'd[10]', if 'd' size is 10 and '10' is 10 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("struct test_fixed {\n"
               "    std::array<int, 10> array = {};\n"
@@ -813,8 +829,8 @@ class TestStl : public TestFixture {
               "    test_fixed x = test_fixed();\n"
               "    x.index(10);\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in 'array[i]', if 'array' size is 10 and 'i' is 10\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:30]: error: Out of bounds access in 'array[i]', if 'array' size is 10 and 'i' is 10 [containerOutOfBounds]\n",
+                      errout_str());
 
         check("struct test_constexpr {\n"
               "    static constexpr std::array<int, 10> array = {};\n"
@@ -824,8 +840,8 @@ class TestStl : public TestFixture {
               "    test_constexpr x = test_constexpr();\n"
               "    x.index(10);\n"
               "}\n");
-        ASSERT_EQUALS("test.cpp:3:error:Out of bounds access in 'array[i]', if 'array' size is 10 and 'i' is 10\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:30]: error: Out of bounds access in 'array[i]', if 'array' size is 10 and 'i' is 10 [containerOutOfBounds]\n",
+                      errout_str());
 
         checkNormal("struct A {\n"
                     "    const std::vector<int>& v;\n"
@@ -835,7 +851,7 @@ class TestStl : public TestFixture {
                     "        return v[0];\n"
                     "    }\n"
                     "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("struct A {\n"
                     "    static const std::vector<int> v;\n"
@@ -844,7 +860,7 @@ class TestStl : public TestFixture {
                     "    }\n"
                     "};\n"
                     "const std::vector<int> A::v = {1, 2};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("struct a {\n"
                     "    std::vector<int> g() const;\n"
@@ -855,13 +871,13 @@ class TestStl : public TestFixture {
                     "    int d = c.front();\n"
                     "    return d;\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("std::string f() {\n"
                     "    std::map<int, std::string> m = { { 1, \"1\" } };\n"
                     "    return m.at(1);\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("struct A {\n"
                     "  virtual void init_v(std::vector<int> *v) = 0;\n"
@@ -880,14 +896,14 @@ class TestStl : public TestFixture {
                     "  b.init_v(&v);\n"
                     "  v[0];\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("void f(std::vector<int>* v) {\n"
                     "  if (v->empty())\n"
                     "    v->push_back(1);\n"
                     "  auto x = v->back();\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkNormal("template <typename T, uint8_t count>\n"
                     "struct Foo {\n"
@@ -907,7 +923,55 @@ class TestStl : public TestFixture {
                     "    Foo<uint8_t, 42U> x;\n"
                     "    if (x.Set(42U)) {}\n"
                     "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkNormal("struct S { void g(std::span<int>& r) const; };\n" // #11828
+                    "int f(const S& s) {\n"
+                    "    std::span<int> t;\n"
+                    "    s.g(t);\n"
+                    "    return t[0];\n"
+                    "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkNormal("char h() {\n"
+                    "    std::string s;\n"
+                    "    std::string_view sv(s);\n"
+                    "    return s[2];\n"
+                    "}\n");
+        ASSERT_EQUALS("[test.cpp:4:13]: error: Out of bounds access in expression 's[2]' because 's' is empty. [containerOutOfBounds]\n", errout_str());
+
+        checkNormal("void f() {\n" // #12738
+                    "    std::vector<double> v{ 0, 0.1 };\n"
+                    "    (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());
     }
 
     void outOfBoundsSymbolic()
@@ -918,8 +982,8 @@ class TestStl : public TestFixture {
               "    int x = textline[col];\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:4]: (warning) Either the condition 'col>textline.size()' is redundant or 'col' can have the value textline.size(). Expression 'textline[col]' cause access out of bounds.\n",
-            errout.str());
+            "[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());
     }
 
     void outOfBoundsIndexExpression() {
@@ -928,27 +992,27 @@ class TestStl : public TestFixture {
         checkNormal("void f(std::string s) {\n"
                     "  s[s.size()] = 1;\n"
                     "}");
-        ASSERT_EQUALS("test.cpp:2:error:Out of bounds access of s, index 's.size()' is out of bounds.\n", errout.str());
+        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"
                     "}");
-        ASSERT_EQUALS("test.cpp:2:error:Out of bounds access of s, index 's.size()+1' is out of bounds.\n", errout.str());
+        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"
                     "}");
-        ASSERT_EQUALS("test.cpp:2:error:Out of bounds access of s, index '1+s.size()' is out of bounds.\n", errout.str());
+        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"
                     "}");
-        ASSERT_EQUALS("test.cpp:2:error:Out of bounds access of s, index 'x*s.size()' is out of bounds.\n", errout.str());
+        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
                     "    return sv[sv.size()] == '\\0';\n"
                     "}\n");
-        ASSERT_EQUALS("test.cpp:2:error:Out of bounds access of sv, index 'sv.size()' is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:12]: error: Out of bounds access of sv, index 'sv.size()' is out of bounds. [containerOutOfBoundsIndexExpression]\n", errout_str());
     }
     void outOfBoundsIterator() {
         check("int f() {\n"
@@ -956,8 +1020,8 @@ class TestStl : public TestFixture {
               "    auto it = v.begin();\n"
               "    return *it;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Out of bounds access in expression 'it' because 'v' is empty.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Out of bounds access in expression 'it' because 'v' is empty. [containerOutOfBounds]\n",
+                      errout_str());
 
         check("int f() {\n"
               "    std::vector<int> v;\n"
@@ -965,8 +1029,8 @@ class TestStl : public TestFixture {
               "    auto it = v.begin() + 1;\n"
               "    return *it;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Out of bounds access in 'it', if 'v' size is 1 and 'it' is at position 1 from the beginning\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:13]: (error) Out of bounds access in 'it', if 'v' size is 1 and 'it' is at position 1 from the beginning [containerOutOfBounds]\n",
+                      errout_str());
 
         check("int f() {\n"
               "    std::vector<int> v;\n"
@@ -974,7 +1038,7 @@ class TestStl : public TestFixture {
               "    auto it = v.end() - 1;\n"
               "    return *it;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    std::vector<int> v;\n"
@@ -982,8 +1046,8 @@ class TestStl : public TestFixture {
               "    auto it = v.end() - 2;\n"
               "    return *it;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Out of bounds access in 'it', if 'v' size is 1 and 'it' is at position 2 from the end\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:13]: (error) Out of bounds access in 'it', if 'v' size is 1 and 'it' is at position 2 from the end [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void g(int);\n"
               "void f(std::vector<int> x) {\n"
@@ -992,23 +1056,23 @@ class TestStl : public TestFixture {
               "        g(m.begin()->second);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::vector<int> vec;\n"
               "    std::vector<int>::iterator it = vec.begin();\n"
               "    *it = 1;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Out of bounds access in expression 'it' because 'vec' is empty.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Out of bounds access in expression 'it' because 'vec' is empty. [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    std::vector<int> vec;\n"
               "    auto it = vec.begin();\n"
               "    *it = 1;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Out of bounds access in expression 'it' because 'vec' is empty.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Out of bounds access in expression 'it' because 'vec' is empty. [containerOutOfBounds]\n",
+                      errout_str());
     }
 
     void iterator1() {
@@ -1019,8 +1083,8 @@ class TestStl : public TestFixture {
               "    for (std::list<int>::iterator it = l1.begin(); it != l2.end(); ++it)\n"
               "    { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:40]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void f()\n"
               "{\n"
@@ -1029,8 +1093,8 @@ class TestStl : public TestFixture {
               "    for (std::list<int>::iterator it = l1.begin(); l2.end() != it; ++it)\n"
               "    { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l2' and 'l1' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:52]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("struct C { std::list<int> l1; void func(); };\n"
               "void C::func() {\n"
@@ -1039,7 +1103,7 @@ class TestStl : public TestFixture {
               "    C c;\n"
               "    for (it = c.l1.begin(); it != c.l1.end(); ++it) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Same check with reverse iterator
         check("void f()\n"
@@ -1049,8 +1113,8 @@ class TestStl : public TestFixture {
               "    for (std::list<int>::const_reverse_iterator it = l1.rbegin(); it != l2.rend(); ++it)\n"
               "    { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:54]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
     }
 
     void iterator2() {
@@ -1064,8 +1128,8 @@ class TestStl : public TestFixture {
               "        ++it;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:35]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1077,8 +1141,8 @@ class TestStl : public TestFixture {
               "        ++it;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers 'l2' and 'l1' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
+                      errout_str());
     }
 
     void iterator3() {
@@ -1089,9 +1153,9 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it, 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Same iterator is used with different containers 'l1' and 'l2'.\n"
-                      "[test.cpp:6]: (error) Iterator 'it' from different container 'l2' are used together.\n",
-                      errout.str());
+        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());
 
         check("void foo() {\n" // #5803
               "    std::list<int> l1;\n"
@@ -1099,7 +1163,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it, l1.end());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n" // #7658
               "    std::list<int> l1;\n"
@@ -1108,7 +1172,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator end = l1.end();\n"
               "    l2.insert(it, end);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // only warn for insert when there are preciself 2 arguments.
         check("void foo() {\n"
@@ -1117,14 +1181,14 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator it = l1.begin();\n"
               "    l2.insert(it);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -1139,7 +1203,7 @@ class TestStl : public TestFixture {
               "        result.insert(cit->size());\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator5() {
@@ -1147,8 +1211,8 @@ class TestStl : public TestFixture {
               "{\n"
               "    std::vector<int>::iterator it = std::find(ints1.begin(), ints2.end(), 22);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Iterators of different containers 'ints1' and 'ints2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:47]: (error) Iterators of different containers 'ints1' and 'ints2' are used together. [mismatchingContainers]\n",
+                      errout_str());
     }
 
     void iterator6() {
@@ -1160,7 +1224,7 @@ class TestStl : public TestFixture {
               "    std::set<int>::iterator it2 = ints1.end();\n"
               "    ints2.insert(it1, it2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const std::set<int> &ints1)\n"
               "{\n"
@@ -1169,7 +1233,7 @@ class TestStl : public TestFixture {
               "    std::set<int>::iterator it2 = ints2.end();\n"
               "    ints2.insert(it1, it2);\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers are used together.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers are used together.\n", "", errout_str());
     }
 
     void iterator7() {
@@ -1177,14 +1241,14 @@ class TestStl : public TestFixture {
               "{\n"
               "    std::vector<int>::iterator it = std::inplace_merge(ints1.begin(), std::advance(ints1.rbegin(), 5), ints2.end());\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Iterators of different containers 'ints1' and 'ints2' are used together.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator8() {
@@ -1192,28 +1256,28 @@ class TestStl : public TestFixture {
               "{\n"
               "    std::vector<int>::iterator it = std::find_first_of(ints1.begin(), ints2.end(), ints1.begin(), ints1.end());\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Iterators of different containers 'ints1' and 'ints2' are used together.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Iterators of different containers 'ints2' and 'ints1' are used together.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Iterators of different containers 'ints2' and 'ints1' are used together.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6839
         check("void f(const std::wstring& a, const std::wstring& b) {\n"
@@ -1226,9 +1290,9 @@ class TestStl : public TestFixture {
               "}");
         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]: (error) Iterators of different containers 'tp3' and 'a' are used together.\n"
-            "[test.cpp:5]: (error) Iterators of different containers 'tp4' and 'b' are used together.\n",
-            errout.str());
+            "[test.cpp:4:26]: (error) Iterators of different containers 'tp3' and 'a' are used together. [mismatchingContainers]\n"
+            "[test.cpp:5:26]: (error) Iterators of different containers 'tp4' and 'b' are used together. [mismatchingContainers]\n",
+            errout_str());
     }
 
     void iterator9() {
@@ -1246,7 +1310,7 @@ class TestStl : public TestFixture {
               "        ++aI;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #2481
         check("void foo(std::vector<int> &r)\n"
@@ -1262,7 +1326,7 @@ class TestStl : public TestFixture {
               "        ++aI;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Execution path checking..
         check("void foo(std::vector<int> &r, int c)\n"
@@ -1281,7 +1345,7 @@ class TestStl : public TestFixture {
               "        ++aI;\n"
               "    }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:14] (error) After insert(), the iterator 'aI' may be invalid.", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:14] (error) After insert(), the iterator 'aI' may be invalid.", "", errout_str());
     }
 
     void iterator10() {
@@ -1296,8 +1360,8 @@ class TestStl : public TestFixture {
               "        if (it != s2.end()) continue;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 's1' and 's2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:39]: (error) Iterators of different containers 's1' and 's2' are used together. [mismatchingContainers]\n",
+                      errout_str());
     }
 
     void iterator11() {
@@ -1308,7 +1372,7 @@ class TestStl : public TestFixture {
               "    for(vector<int>::iterator x = myVector.begin(); x != myVector.end(); x++)\n"
               "        myMap.erase(*x);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator12() {
@@ -1319,8 +1383,8 @@ class TestStl : public TestFixture {
               "    std::map<int, int>::const_iterator it = map1.find(123);\n"
               "    if (it == map2.end()) { }"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Iterators of different containers 'map1' and 'map2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:45]: (error) Iterators of different containers 'map1' and 'map2' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void f() {\n"
               "    std::map<int, int> map1;\n"
@@ -1328,15 +1392,15 @@ class TestStl : public TestFixture {
               "    std::map<int, int>::const_iterator it = map1.find(123);\n"
               "    if (map2.end() == it) { }"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'map2' and 'map1' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (error) Iterators of different containers 'map2' and 'map1' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void f(std::string &s) {\n"
               "    int pos = s.find(x);\n"
               "    s.erase(pos);\n"
               "    s.erase(pos);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator13() {
@@ -1351,8 +1415,8 @@ class TestStl : public TestFixture {
               "    while (it!=a.end())\n"
               "        ++it;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Iterators of different containers 't' and 'a' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:8:10]: (error) Iterators of different containers 't' and 'a' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         // #4062
         check("void f() {\n"
@@ -1361,12 +1425,12 @@ class TestStl : public TestFixture {
               "    std::vector<int>::const_iterator it;\n"
               "    it = a.begin();\n"
               "    while (it!=a.end())\n"
-              "        v++it;\n"
+              "        ++it;\n"
               "    it = t.begin();\n"
               "    while (it!=t.end())\n"
               "        ++it;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::vector<int> a;\n"
@@ -1377,11 +1441,11 @@ class TestStl : public TestFixture {
               "    else\n"
               "        it = t.begin();\n"
               "    while (z && it!=a.end())\n"
-              "        v++it;\n"
+              "        ++it;\n"
               "    while (!z && it!=t.end())\n"
-              "        v++it;\n"
+              "        ++it;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator14() {
@@ -1390,7 +1454,7 @@ class TestStl : public TestFixture {
               "    std::map<int,Foo>::const_iterator it;\n"
               "    for (it = x.find(0)->second.begin(); it != x.find(0)->second.end(); ++it) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator15() {
@@ -1398,7 +1462,7 @@ class TestStl : public TestFixture {
               "  std::list<int>::iterator pos = a.begin();\n"
               "  for(pos = x[0]->plist.begin(); pos != x[0]->plist.end(); ++pos) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator16() {
@@ -1413,8 +1477,8 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1427,8 +1491,8 @@ class TestStl : public TestFixture {
               "        ++it2;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers 'l2' and 'l1' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1441,8 +1505,8 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1455,8 +1519,8 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:35]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
     }
 
     void iterator17() {
@@ -1472,8 +1536,8 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1487,7 +1551,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "    it2 = l2.end();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1502,7 +1566,7 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1518,8 +1582,8 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:5:36]: (error) Iterators of different containers 'l1' and 'l2' are used together. [mismatchingContainers]\n",
+                      errout_str());
     }
 
     void iterator18() {
@@ -1531,7 +1595,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::list<int> l1, std::list<int> l2)\n"
               "{\n"
@@ -1541,7 +1605,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(std::list<int> l1, std::list<int> l2)\n"
               "{\n"
@@ -1551,7 +1615,7 @@ class TestStl : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:5]: (error) Dangerous comparison using operator< on iterator.\n", errout.str());
+        TODO_ASSERT_EQUALS("", "[test.cpp:5:15]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
     }
 
     void iterator19() {
@@ -1567,8 +1631,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:4]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes.\n",
-            errout.str());
+            "[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());
 
         check("void foo()\n"
               "{\n"
@@ -1583,8 +1647,9 @@ class TestStl : public TestFixture {
               "}");
         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] -> [test.cpp:7]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes.\n[test.cpp:7]: (error) Dangerous comparison using operator< on iterator.\n",
-            errout.str());
+            "[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"
+            "[test.cpp:7:22]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n",
+            errout_str());
 
         check("void foo()\n"
               "{\n"
@@ -1599,8 +1664,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:8] -> [test.cpp:4]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes.\n",
-            errout.str());
+            "[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());
 
         check("void foo()\n"
               "{\n"
@@ -1615,8 +1680,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:8] -> [test.cpp:7]: (error) Same iterator is used with containers 'l1' that are temporaries or defined in different scopes.\n",
-            errout.str());
+            "[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());
 
         check("std::set<int> g() {\n"
               "    static const std::set<int> s = {1};\n"
@@ -1626,8 +1691,8 @@ class TestStl : public TestFixture {
               "    if (g().find(2) == g().end()) {}\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:6] -> [test.cpp:6]: (error) Same iterator is used with containers 'g()' that are temporaries or defined in different scopes.\n",
-            errout.str());
+            "[test.cpp:6:17] -> [test.cpp:6:10]: (error) Same iterator is used with containers 'g()' that are temporaries or defined in different scopes. [iterators3]\n",
+            errout_str());
 
         check("std::set<long> f() {\n" // #5804
               "    std::set<long> s;\n"
@@ -1637,8 +1702,8 @@ class TestStl : public TestFixture {
               "    for (std::set<long>::iterator it = f().begin(); it != f().end(); ++it) {}\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:6] -> [test.cpp:6]: (error) Same iterator is used with containers 'f()' that are temporaries or defined in different scopes.\n",
-            errout.str());
+            "[test.cpp:6:53] -> [test.cpp:6:41]: (error) Same iterator is used with containers 'f()' that are temporaries or defined in different scopes. [iterators3]\n",
+            errout_str());
     }
 
     void iterator20() {
@@ -1654,8 +1719,8 @@ class TestStl : public TestFixture {
               "        ++it1;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Iterators of different containers 'l2' and 'l1' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:36]: (error) Iterators of different containers 'l2' and 'l1' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("std::list<int> l3;\n"
               "std::list<int>::iterator bar()\n"
@@ -1674,7 +1739,7 @@ class TestStl : public TestFixture {
               "        ++it1;\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());
+        TODO_ASSERT_EQUALS("[test.cpp:13] -> [test.cpp:10] -> [test.cpp:11]: (error) Comparison of iterators from containers 'l1' and 'l2'.\n", "", errout_str());
 
     }
 
@@ -1692,9 +1757,9 @@ class TestStl : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n"
-                      "[test.cpp:6]: (error) Iterators of different containers 'l2' and 'l1' are used together.\n",
-                      errout.str());
+        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());
 
         check("void foo()\n"
               "{\n"
@@ -1706,8 +1771,9 @@ class TestStl : public TestFixture {
               "    {\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Iterators of different containers 'l1' and 'l2' are used together.\n",
-                      errout.str());
+        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());
     }
 
     void iterator22() { // #7107
@@ -1716,7 +1782,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::iterator it = l.find(123);\n"
               "    x.l.erase(it);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator23() { // #9550
@@ -1731,7 +1797,7 @@ class TestStl : public TestFixture {
               "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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator24() {
@@ -1739,29 +1805,29 @@ class TestStl : public TestFixture {
         check("void f(int a, int b) {\n"
               "  if (&a == &b) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int a, int b) {\n"
               "  if (std::for_each(&a, &b + 1, [](auto) {})) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Iterators of different containers 'a' and 'b' are used together.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Iterators of different containers 'a' and 'b' are used together.\n",
-                      errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same iterators expression are used for algorithm.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator25() {
@@ -1774,7 +1840,7 @@ class TestStl : public TestFixture {
               "        return &lhs.v != &rhs.v;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator26() { // #9176
@@ -1788,7 +1854,7 @@ class TestStl : public TestFixture {
             "  }\n"
             "  return 0;\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator27() {
@@ -1803,7 +1869,7 @@ class TestStl : public TestFixture {
               "    const int b( it == m.cend() ? 0 : it->second.b );\n"
               "    return a + b;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iterator28()
@@ -1825,7 +1891,75 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return 0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Consider using std::find_if algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:24]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+    }
+
+    void iterator29()
+    {
+        // #11511
+        check("std::vector<int>& g();\n"
+              "void f() {\n"
+              "    auto v = g();\n"
+              "    auto it = g().begin();\n"
+              "    while (it != g().end())\n"
+              "        it = v.erase(it);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:14]: (error) Iterator 'it' referring to container 'g()' is used with container 'v'. [mismatchingContainerIterator]\n", errout_str());
+
+        check("std::vector<int>& g(int);\n"
+              "void f(int i, int j) {\n"
+              "    auto& r = g(i);\n"
+              "    auto it = g(j).begin();\n"
+              "    while (it != g(j).end())\n"
+              "        it = r.erase(it);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:14]: (error) Iterator 'it' referring to container 'g(j)' is used with container 'r'. [mismatchingContainerIterator]\n", errout_str());
+
+        check("std::vector<int>& g();\n"
+              "void f() {\n"
+              "    auto& r = g();\n"
+              "    auto it = g().begin();\n"
+              "    while (it != g().end())\n"
+              "        it = r.erase(it);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void iterator30()
+    {
+        check("struct S {\n" // #12641
+              "    bool b;\n"
+              "    std::list<int> A, B;\n"
+              "    void f();\n"
+              "};\n"
+              "void S::f() {\n"
+              "    std::list<int>::iterator i = (b ? B : A).begin();\n"
+              "    while (i != (b ? B : A).end()) {\n"
+              "        ++i;\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void iterator31()
+    {
+        check("struct S {\n" // #13327
+              "    std::string a;\n"
+              "};\n"
+              "struct T {\n"
+              "    S s;\n"
+              "};\n"
+              "bool f(const S& s) {\n"
+              "    std::string b;\n"
+              "    return s.a.c_str() == b.c_str();\n"
+              "}\n"
+              "bool g(const T& t) {\n"
+              "    std::string b;\n"
+              "    return t.s.a.c_str() == b.c_str();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:9:13]: (error) Iterators of different containers 's.a' and 'b' are used together. [mismatchingContainers]\n"
+                      "[test.cpp:13:15]: (error) Iterators of different containers 't.s.a' and 'b' are used together. [mismatchingContainers]\n",
+                      errout_str());
     }
 
     void iteratorExpression() {
@@ -1834,24 +1968,24 @@ class TestStl : public TestFixture {
               "void foo() {\n"
               "    (void)std::find(f().begin(), g().end(), 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Iterators of different containers 'f()' and 'g()' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:22]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("std::vector<int>& f();\n"
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    if(f().begin() == g().end()) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Iterators of different containers 'f()' and 'g()' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("std::vector<int>& f();\n"
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    auto size = f().end() - g().begin();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Iterators of different containers 'f()' and 'g()' are used together.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Iterators of different containers 'f()' and 'g()' are used together. [mismatchingContainers]\n",
+                      errout_str());
 
         check("struct A {\n"
               "    std::vector<int>& f();\n"
@@ -1861,8 +1995,8 @@ class TestStl : public TestFixture {
               "    (void)std::find(A().f().begin(), A().g().end(), 0);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:6]: (error) Iterators of different containers 'A().f()' and 'A().g()' are used together.\n",
-            errout.str());
+            "[test.cpp:6:26]: (error) Iterators of different containers 'A().f()' and 'A().g()' are used together. [mismatchingContainers]\n",
+            errout_str());
 
         check("struct A {\n"
               "    std::vector<int>& f();\n"
@@ -1872,15 +2006,15 @@ class TestStl : public TestFixture {
               "    (void)std::find(A{} .f().begin(), A{} .g().end(), 0);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:6]: (error) Iterators of different containers 'A{}.f()' and 'A{}.g()' are used together.\n",
-            errout.str());
+            "[test.cpp:6:27]: (error) Iterators of different containers 'A{}.f()' and 'A{}.g()' are used together. [mismatchingContainers]\n",
+            errout_str());
 
         check("std::vector<int>& f();\n"
               "std::vector<int>& g();\n"
               "void foo() {\n"
               "    (void)std::find(begin(f()), end(g()), 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (warning) Iterators to containers from different expressions 'f()' and 'g()' are used together.\n", errout.str());
+        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"
               "    std::vector<int>& f();\n"
@@ -1889,14 +2023,14 @@ class TestStl : public TestFixture {
               "void foo() {\n"
               "    (void)std::find(A().f().begin(), A().f().end(), 0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<int>& f();\n"
               "void foo() {\n"
@@ -1920,7 +2054,7 @@ class TestStl : public TestFixture {
               "    (void)std::find(begin(f()), end(f()) - 1, 0);\n"
               "    (void)std::find(begin(f()) + 1, end(f()) - 1, 0);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Dereference of an invalid iterator: f().end()+1\n", errout.str());
+        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"
               "void foo() {\n"
@@ -1929,9 +2063,9 @@ class TestStl : public TestFixture {
               "    if(f().begin()+1 == f().end()) {}\n"
               "    if(f().begin()+1 == f().end()+1) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Dereference of an invalid iterator: f().end()+1\n"
-                      "[test.cpp:6]: (error) Dereference of an invalid iterator: f().end()+1\n",
-                      errout.str());
+        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());
 
         check("std::vector<int>& f();\n"
               "void foo() {\n"
@@ -1940,32 +2074,32 @@ class TestStl : public TestFixture {
               "    if(std::begin(f())+1 == std::end(f())) {}\n"
               "    if(std::begin(f())+1 == std::end(f())+1) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Dereference of an invalid iterator: std::end(f())+1\n"
-                      "[test.cpp:6]: (error) Dereference of an invalid iterator: std::end(f())+1\n",
-                      errout.str());
+        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());
 
         check("template<int N>\n"
               "std::vector<int>& f();\n"
               "void foo() {\n"
               "    if(f<1>().begin() == f<1>().end()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  if (a.begin().x == b.begin().x) {}\n"
               "  if (begin(a).x == begin(b).x) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::list<int*> a, std::list<int*> b) {\n"
               "  if (*a.begin() == *b.begin()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    if(f().begin(1) == f().end()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(const uint8_t* data, const uint32_t dataLength) {\n"
               "    const uint32_t minimumLength = sizeof(uint16_t) + sizeof(uint16_t);\n"
@@ -1974,42 +2108,56 @@ class TestStl : public TestFixture {
               "        std::copy(&data[minimumLength], &data[dataLength], payload);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(const std::vector<int>& a, const std::vector<int>& b) {\n" // #11469
+              "    return (a.begin() - a.end()) == (b.begin() - b.end());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #11469
+              "    const std::vector<int>* vec() const { return &v; }\n"
+              "    const std::vector<int> v;\n"
+              "};\n"
+              "void f(const S& a, const S& b) {\n"
+              "    if (a.vec()->begin() - a.vec()->end() != b.vec()->begin() - b.vec()->end()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void iteratorSameExpression() {
         check("void f(std::vector<int> v) {\n"
               "    std::for_each(v.begin(), v.begin(), [](int){});\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same iterators expression are used for algorithm.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Same iterators expression are used for algorithm.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same iterators expression are used for algorithm.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Same iterators expression are used for algorithm.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Same iterators expression are used for algorithm.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Same iterators expression are used for algorithm.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (style) Same iterators expression are used for algorithm. [sameIteratorExpression]\n", errout_str());
     }
 
     void mismatchingContainerIterator() {
@@ -2018,13 +2166,13 @@ class TestStl : public TestFixture {
               "    a.insert(b.end(), value);\n"
               "    return a;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Iterator 'b.end()' from different container 'a' are used together.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Iterator 'b.begin()' from different container 'a' are used together.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (error) Iterator 'b.begin()' referring to container 'b' is used with container 'a'. [mismatchingContainerIterator]\n", errout_str());
 
         // #9973
         check("void f() {\n"
@@ -2038,7 +2186,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Consider using std::find_if algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:23]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         // #10012
         check("struct a {\n"
@@ -2048,7 +2196,7 @@ class TestStl : public TestFixture {
               "void f(a c, a d) {\n"
               "    if (c.end() == d.end()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10467
         check("void f(std::array<std::vector<int>, N>& A) {\n"
@@ -2058,7 +2206,7 @@ class TestStl : public TestFixture {
               "    if (it != a.end()) {}\n"
               "  }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10604
         check("struct S {\n"
@@ -2067,7 +2215,165 @@ class TestStl : public TestFixture {
               "void f(S& s, int m) {\n"
               "    s.v.erase(s.v.begin() + m);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        // #11093
+        check("struct S {\n"
+              "    std::vector<int> v1, v2;\n"
+              "    void f(bool b) {\n"
+              "        std::vector<int>& v = b ? v1 : v2;\n"
+              "        v.erase(v.begin());\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #12377
+        check("void f(bool b) {\n"
+              "    std::vector<int> *pv;\n"
+              "    if (b) {\n"
+              "        std::vector<int>& r = get1();\n"
+              "        pv = &r;\n"
+              "    }\n"
+              "    else {\n"
+              "        std::vector<int>& r = get2();\n"
+              "        pv = &r;\n"
+              "    }\n"
+              "    std::vector<int>::iterator it = pv->begin();\n"
+              "    it = pv->erase(it, it + 2);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    std::vector<int> v;\n"
+              "    void f() {\n"
+              "        std::vector<int>* p = &v;\n"
+              "        p->insert(std::find(p->begin(), p->end(), 0), 1);\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n"
+              "    std::vector<int> v;\n"
+              "    void f(int i) {\n"
+              "        std::vector<int>* p = &v;\n"
+              "        if (p->size() > i)\n"
+              "            p->erase(p->begin() + i, p->end());\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #11067
+        check("struct S {\n"
+              "    std::vector<int> v;\n"
+              "    std::list<std::vector<int>::const_iterator> li;\n"
+              "    void f();\n"
+              "};\n"
+              "void S::f() {\n"
+              "    v.erase(*li.begin());\n"
+              "    li.pop_front();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::set<std::string>& a, std::stack<std::set<std::string>::iterator>& b) {\n"
+              "    while (!b.empty()) {\n"
+              "        a.erase(b.top());\n"
+              "        b.pop();\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::vector<int>& a, std::vector<std::vector<int>::iterator>& b) {\n"
+              "    auto it = b.begin();\n"
+              "    a.erase(*it);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("namespace N {\n" // #12443
+              "    std::vector<int> v;\n"
+              "}\n"
+              "using namespace N;\n"
+              "void f() {\n"
+              "    auto it = std::find(v.begin(), v.end(), 0);\n"
+              "    if (it != N::v.end()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(void* p) {\n" // #12445
+              "    std::vector<int>&v = *(std::vector<int>*)(p);\n"
+              "    v.erase(v.begin(), v.end());\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #13408
+        check("void f(const std::vector<int>& v) {\n"
+              "    for (const auto& i : v) {\n"
+              "        if (std::distance(&*v.cbegin(), &i)) {}\n"
+              "    }   \n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void eraseIteratorOutOfBounds() {
+        check("void f() {\n"
+              "    std::vector<int> v;\n"
+              "    v.erase(v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (error) Calling function 'erase()' on the iterator 'v.begin()' which is out of bounds. [eraseIteratorOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v;\n"
+              "    v.erase(v.end());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (error) Calling function 'erase()' on the iterator 'v.end()' which is out of bounds. [eraseIteratorOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v;\n"
+              "    auto it = v.begin();\n"
+              "    v.erase(it);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Calling function 'erase()' on the iterator 'it' which is out of bounds. [eraseIteratorOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v{ 1, 2, 3 };\n"
+              "    auto it = v.end();\n"
+              "    v.erase(it);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Calling function 'erase()' on the iterator 'it' which is out of bounds. [eraseIteratorOutOfBounds]\n", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v{ 1, 2, 3 };\n"
+              "    auto it = v.begin();\n"
+              "    v.erase(it);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v{ 1, 2, 3 };\n"
+              "    v.erase(v.end() - 1);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v{ 1, 2, 3 };\n"
+              "    v.erase(v.begin() - 1);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (error) Calling function 'erase()' on the iterator 'v.begin()-1' which is out of bounds. [eraseIteratorOutOfBounds]\n"
+                      "[test.cpp:3:23]: (error) Dereference of an invalid iterator: v.begin()-1 [derefInvalidIterator]\n",
+                      errout_str());
+
+        check("void f(std::vector<int>& v, std::vector<int>::iterator it) {\n"
+              "    if (it == v.end()) {}\n"
+              "    v.erase(it);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (warning) Either the condition 'it==v.end()' is redundant or function 'erase()' is called on the iterator 'it' which is out of bounds. [eraseIteratorOutOfBoundsCond]\n",
+                      errout_str());
+
+        check("void f() {\n"
+              "    std::vector<int> v;\n"
+              "    ((v).erase)(v.begin());\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:10]: (error) Calling function 'erase()' on the iterator 'v.begin()' which is out of bounds. [eraseIteratorOutOfBounds]\n",
+                      errout_str());
     }
 
     // Dereferencing invalid pointer
@@ -2079,8 +2385,8 @@ class TestStl : public TestFixture {
               "    iter = ints.begin() + 2;\n"
               "    ints.erase(iter);\n"
               "    std::cout << (*iter) << std::endl;\n"
-              "}", 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] -> [test.cpp:6] -> [test.cpp:3] -> [test.cpp:7]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid.\n", errout.str());
+              "}", 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"
@@ -2092,7 +2398,7 @@ class TestStl : public TestFixture {
               "        for (unsigned pos = 0; pos < buf.size(); ) {     }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8509 Uniform initialization ignored for iterator
         check("void f() {\n"
@@ -2100,7 +2406,7 @@ class TestStl : public TestFixture {
               "  std::vector<int>::const_iterator iter {ints.cbegin()};\n"
               "  std::cout << (*iter) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void dereference_break() {  // #3644
@@ -2117,7 +2423,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void dereference_member() {
@@ -2129,7 +2435,9 @@ class TestStl : public TestFixture {
               "    ints.erase(iter);\n"
               "    std::cout << iter->first << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:6]: (error) Iterator 'iter' used after element has been erased.\n", errout.str());
+        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());
 
         // Reverse iterator
         check("void f()\n"
@@ -2140,7 +2448,9 @@ class TestStl : public TestFixture {
               "    ints.erase(iter);\n"
               "    std::cout << iter->first << std::endl;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:6]: (error) Iterator 'iter' used after element has been erased.\n", errout.str());
+        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());
     }
 
     void dereference_auto() {
@@ -2150,15 +2460,15 @@ class TestStl : public TestFixture {
               "    auto iter = ints.begin() + 2;\n"
               "    ints.erase(iter);\n"
               "    std::cout << (*iter) << std::endl;\n"
-              "}", 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] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:6]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid.\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("const CXXRecordDecl *CXXRecordDecl::getTemplateInstantiationPattern() const {\n"
               "    if (auto *TD = dyn_cast<ClassTemplateSpecializationDecl>(this)) {\n"
@@ -2166,7 +2476,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return nullptr;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void STLSize() {
@@ -2179,45 +2489,45 @@ class TestStl : public TestFixture {
               "    }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:6]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty and 'ii' may be non-zero.\n",
-            errout.str());
+            "[test.cpp:6:11]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty. [containerOutOfBounds]\n",
+            errout_str());
 
         check("void foo(std::vector<int> foo) {\n"
               "    for (unsigned int ii = 0; ii <= foo.size(); ++ii) {\n"
               "       foo.at(ii) = 0;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) When ii==foo.size(), foo.at(ii) is out of bounds.\n", errout.str());
+        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(const std::string& foo) {\n"
+        check("void foo(std::string& foo) {\n"
               "    for (unsigned int ii = 0; ii <= foo.length(); ++ii) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) When ii==foo.size(), foo[ii] is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
-        check("void foo(const std::string& foo, unsigned int ii) {\n"
+        check("void foo(std::string& foo, unsigned int ii) {\n"
               "    if (ii <= foo.length()) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) When ii==foo.size(), foo[ii] is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
-        check("void foo(const std::string& foo, unsigned int ii) {\n"
+        check("void foo(std::string& foo, unsigned int ii) {\n"
               "    do {\n"
               "       foo[ii] = 'x';\n"
               "       ++i;\n"
               "    } while(ii <= foo.length());\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) When ii==foo.size(), foo[ii] is out of bounds.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo[ii] is out of bounds. [stlOutOfBounds]\n", errout_str());
 
-        check("void foo(const std::string& foo, unsigned int ii) {\n"
+        check("void foo(std::string& foo, unsigned int ii) {\n"
               "    if (anything()) {\n"
               "    } else if (ii <= foo.length()) {\n"
               "       foo[ii] = 'x';\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) When ii==foo.size(), foo[ii] is out of bounds.\n", errout.str());
+        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"
               "{\n"
@@ -2229,19 +2539,19 @@ class TestStl : public TestFixture {
               "    int ii = 0;\n"
               "    foo[ii] = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    for (B b : D()) {}\n" // Don't crash on range-based for-loop
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) When ii==foo.size(), foo.at(ii) is out of bounds.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3:11]: (error) When ii==foo.size(), foo.at(ii) is out of bounds. [stlOutOfBounds]\n", "", errout_str());
     }
 
     void STLSizeNoErr() {
@@ -2254,7 +2564,7 @@ class TestStl : public TestFixture {
                   "       foo[ii] = 0;\n"
                   "    }\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -2265,7 +2575,7 @@ class TestStl : public TestFixture {
                   "    {\n"
                   "    }\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -2284,8 +2594,8 @@ class TestStl : public TestFixture {
                   "    }\n"
                   "}");
             ASSERT_EQUALS(
-                "[test.cpp:11]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty and 'ii' may be non-zero.\n",
-                errout.str());
+                "[test.cpp:11:16]: (error) Out of bounds access in expression 'foo[ii]' because 'foo' is empty. [containerOutOfBounds]\n",
+                errout_str());
         }
 
         {
@@ -2294,7 +2604,7 @@ class TestStl : public TestFixture {
                   "    for (int i = 5; i <= data.size(); i++)\n"
                   "        data[i] = 0;\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -2303,7 +2613,7 @@ class TestStl : public TestFixture {
                   "       foo.at(ii) = 0;\n"
                   "    }\n"
                   "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -2311,7 +2621,7 @@ class TestStl : public TestFixture {
         check("void f(const std::vector<int> &v) {\n"
               "  v[-11] = 123;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Array index -11 is out of bounds.\n", errout.str());
+        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"
               "    if (!(x < 5))\n"
@@ -2319,7 +2629,7 @@ class TestStl : public TestFixture {
               "    else\n"
               "        return a[4 - x];\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::array<int,6> values;\n"
               "int get_value();\n"
@@ -2332,23 +2642,45 @@ class TestStl : public TestFixture {
               "        sum += values[j-1];\n"
               "    return sum;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct B { virtual int g() { return 0; } };\n" // #11831
+              "struct C {\n"
+              "    int h() const { return b->g(); }\n"
+              "    B* b;\n"
+              "};\n"
+              "struct O {\n"
+              "    int f() const;\n"
+              "    std::vector<int> v;\n"
+              "    C c;\n"
+              "};\n"
+              "int O::f() const { return v[c.h() - 1]; }\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const std::vector<int>& v) {\n" // #13196
+              "    if (v.empty())\n"
+              "        return;\n"
+              "    int idx = -1;\n"
+              "    for (int i = 0; i < v.size(); ++i) {\n"
+              "        idx = i;\n"
+              "    }\n"
+              "    (void)v[idx];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
 
-        const auto oldSettings = settings;
-        settings.daca = true;
+        Settings s = settings;
+        s.daca = true;
 
         check("void f() {\n"
               "    const char a[][5] = { \"1\", \"true\", \"on\", \"yes\" };\n"
-              "}\n");
-        ASSERT_EQUALS("", errout.str());
-
-        settings = oldSettings;
+              "}\n", s);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void negativeIndexMultiline() {
         setMultiline();
-        const auto oldSettings = settings;
-        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"
@@ -2358,14 +2690,12 @@ class TestStl : public TestFixture {
               "}\n"
               "void g(const std::vector<int>& w) {\n"
               "    f(-1, w);\n"
-              "}\n");
-        ASSERT_EQUALS("test.cpp:5:warning:Array index -1 is out of bounds.\n"
-                      "test.cpp:8:note:Calling function 'f', 1st argument '-1' value is -1\n"
-                      "test.cpp:3:note:Assuming condition is false\n"
-                      "test.cpp:5:note:Negative array index\n",
-                      errout.str());
-
-        settings = oldSettings;
+              "}\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());
     }
 
     void erase1() {
@@ -2379,8 +2709,8 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:5]: (error) Iterator 'it' used after element has been erased.\n"
-                      "[test.cpp:7] -> [test.cpp:8]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        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());
 
         check("void f(std::list<int> &ints)\n"
               "{\n"
@@ -2388,7 +2718,7 @@ class TestStl : public TestFixture {
               "    i = ints.erase(i);\n"
               "    *i = 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -2396,7 +2726,7 @@ class TestStl : public TestFixture {
               "    while (i != x.y.end())\n"
               "        i = x.y.erase(i);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #2101
         check("void f(vector< std::list<int> > &ints, unsigned int i)\n"
@@ -2407,7 +2737,7 @@ class TestStl : public TestFixture {
               "            it = ints[i].erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void erase2() {
@@ -2420,7 +2750,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void erase3() {
@@ -2430,7 +2760,7 @@ class TestStl : public TestFixture {
               "    foo.erase(it->a);\n"
               "    if (it->b);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void erase4() {
@@ -2442,7 +2772,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        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"
               "{\n"
@@ -2452,7 +2782,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        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"
               "{\n"
@@ -2462,7 +2792,7 @@ class TestStl : public TestFixture {
               "        foo.erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        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"
               "{\n"
@@ -2472,7 +2802,7 @@ class TestStl : public TestFixture {
               "        foo.erase(++it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:6]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5] -> [test.cpp:6:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
     void erase5() {
@@ -2486,7 +2816,7 @@ class TestStl : public TestFixture {
               "            foo.erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:8]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:5] -> [test.cpp:8:22]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
     void erase6() {
@@ -2499,7 +2829,7 @@ class TestStl : public TestFixture {
               "        vec.erase(it);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseBreak() {
@@ -2512,7 +2842,7 @@ class TestStl : public TestFixture {
               "            break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        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"
               "{\n"
@@ -2524,7 +2854,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int x)\n"
               "{\n"
@@ -2535,7 +2865,7 @@ class TestStl : public TestFixture {
               "            return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5] -> [test.cpp:5:18]: (error) Iterator 'it' used after element has been erased. [eraseDereference]\n", errout_str());
 
     }
 
@@ -2552,7 +2882,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::map<uint32, uint32> my_map) {\n" // #7365
               "  std::map<uint32, uint32>::iterator itr = my_map.begin();\n"
@@ -2565,7 +2895,7 @@ class TestStl : public TestFixture {
               "    break;\n"
               "  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseReturn1() {
@@ -2579,7 +2909,7 @@ class TestStl : public TestFixture {
               "        return;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseReturn2() {
@@ -2599,7 +2929,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseReturn3() {
@@ -2618,7 +2948,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -2636,8 +2966,8 @@ class TestStl : public TestFixture {
               "}");
         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] -> [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, inconclusive) Using iterator to local container 'foo' that may be invalid.\n",
-            errout.str());
+            "[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",
+            errout_str());
     }
 
     void eraseGoto() {
@@ -2650,7 +2980,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "bar:\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseAssign1() {
@@ -2662,7 +2992,7 @@ class TestStl : public TestFixture {
               "        it = foo.begin();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseAssign2() {
@@ -2680,7 +3010,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseAssign3() {
@@ -2689,7 +3019,7 @@ class TestStl : public TestFixture {
               "    std::list<int>::const_iterator j = (*i).begin();\n"
               "    cout << *j << endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseAssign4() {
@@ -2698,14 +3028,14 @@ class TestStl : public TestFixture {
               "  it = data.erase(it);\n"
               "  it = data.erase(it);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseAssignByFunctionCall() {
@@ -2714,7 +3044,7 @@ class TestStl : public TestFixture {
               "    bar(i);\n"
               "    cout << *i;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseErase() {
@@ -2724,8 +3054,8 @@ class TestStl : public TestFixture {
               "    iter = ints.begin() + 2;\n"
               "    ints.erase(iter);\n"
               "    ints.erase(iter);\n"
-              "}", 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] -> [test.cpp:4] -> [test.cpp:5] -> [test.cpp:1] -> [test.cpp:6]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid.\n", errout.str());
+              "}", 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());
     }
 
     void eraseByValue() {
@@ -2737,21 +3067,21 @@ class TestStl : public TestFixture {
               "        foo.erase(*it);\n"
               "    }\n"
               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Iterator 'it' becomes invalid when deleted by value from 'foo'\n", "", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:3]: (error) Iterator 'it' used after element has been erased.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5669
         check("void f() {\n"
@@ -2759,14 +3089,14 @@ class TestStl : public TestFixture {
               "    m_SetLoadedFactories.erase(*aIt);\n"
               "    m_SetLoadedFactories.erase(aIt);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Invalid iterator: aIt\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Invalid iterator: aIt [invalidIterator1]\n", errout_str());
 
         check("void f(const std::list<int>& m_ImplementationMap) {\n"
               "    std::list<int>::iterator aIt = m_ImplementationMap.begin();\n"
@@ -2774,7 +3104,7 @@ class TestStl : public TestFixture {
               "    m_ImplementationMap.erase(*bIt);\n"
               "    m_ImplementationMap.erase(aIt);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseIf() {
@@ -2788,31 +3118,24 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (error) Iterator 'str' used after element has been erased.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5] -> [test.cpp:4:26]: (error) Iterator 'str' used after element has been erased. [eraseDereference]\n", errout_str());
     }
 
     void eraseOnVector() {
-        check("void f(const std::vector<int>& m_ImplementationMap) {\n"
-              "    std::vector<int>::iterator aIt = m_ImplementationMap.begin();\n"
-              "    m_ImplementationMap.erase(something(unknown));\n" // All iterators become invalidated when erasing from std::vector
-              "    m_ImplementationMap.erase(aIt);\n"
-              "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error) Using iterator to local container 'm_ImplementationMap' that may be invalid.\n", errout.str());
-
-        check("void f(const std::vector<int>& m_ImplementationMap) {\n"
-              "    std::vector<int>::iterator aIt = m_ImplementationMap.begin();\n"
-              "    m_ImplementationMap.erase(*aIt);\n" // All iterators become invalidated when erasing from std::vector
-              "    m_ImplementationMap.erase(aIt);\n"
+        check("void f(std::vector<int>& v) {\n"
+              "    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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error) Using iterator to local container 'm_ImplementationMap' that may be invalid.\n", errout.str());
+        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(const std::vector<int>& m_ImplementationMap) {\n"
-              "    std::vector<int>::iterator aIt = m_ImplementationMap.begin();\n"
-              "    std::vector<int>::iterator bIt = m_ImplementationMap.begin();\n"
-              "    m_ImplementationMap.erase(*bIt);\n" // All iterators become invalidated when erasing from std::vector
-              "    aIt = m_ImplementationMap.erase(aIt);\n"
+        check("void f(std::vector<int>& v) {\n"
+              "    std::vector<int>::iterator aIt = v.begin();\n"
+              "    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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:4] -> [test.cpp:1] -> [test.cpp:5]: (error) Using iterator to local container 'm_ImplementationMap' that may be invalid.\n", errout.str());
+        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());
     }
 
     void pushback1() {
@@ -2822,7 +3145,7 @@ class TestStl : public TestFixture {
               "    foo.push_back(123);\n"
               "    *it;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:1] -> [test.cpp:5]: (error) Using iterator to local container 'foo' that may be invalid.\n", errout.str());
+        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());
     }
 
     void pushback2() {
@@ -2835,7 +3158,7 @@ class TestStl : public TestFixture {
               "        *it = 456;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pushback3() {
@@ -2849,7 +3172,7 @@ class TestStl : public TestFixture {
               "        foo.push_back(123);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:6] -> [test.cpp:8] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'foo' that may be invalid.\n", errout.str());
+        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());
     }
 
     void pushback4() {
@@ -2861,7 +3184,7 @@ class TestStl : public TestFixture {
               "    ints.push_back(2);\n"
               "    *first;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:6] -> [test.cpp:3] -> [test.cpp:7]: (error) Using pointer to local variable 'ints' that may be invalid.\n", errout.str());
+        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());
     }
 
     void pushback5() {
@@ -2878,7 +3201,7 @@ class TestStl : public TestFixture {
               "        v.push_back(*i);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pushback6() {
@@ -2894,7 +3217,7 @@ class TestStl : public TestFixture {
               "            v.push_back(10);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:8] -> [test.cpp:8] -> [test.cpp:6] -> [test.cpp:9] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'v' that may be invalid.\n", errout.str());
+        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"
               "{\n"
@@ -2907,7 +3230,7 @@ class TestStl : public TestFixture {
               "            v.push_back(10);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:8] -> [test.cpp:8] -> [test.cpp:6] -> [test.cpp:9] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'v' that may be invalid.\n", errout.str());
+        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());
     }
 
     void pushback7() {
@@ -2921,7 +3244,7 @@ class TestStl : public TestFixture {
               "        foo.push_back(123);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:6] -> [test.cpp:8] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'foo' that may be invalid.\n", errout.str());
+        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());
     }
 
     void pushback8() {
@@ -2937,9 +3260,9 @@ class TestStl : public TestFixture {
               "        sum += *it;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n"
-                      "[test.cpp:4] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:8]: (error) Using iterator to local container 'ints' that may be invalid.\n",
-                      errout.str());
+        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());
     }
 
     void pushback9() {
@@ -2959,7 +3282,7 @@ class TestStl : public TestFixture {
               "        ++i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pushback10() {
@@ -2969,7 +3292,7 @@ class TestStl : public TestFixture {
               "    foo.reserve(100);\n"
               "    *it = 0;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:1] -> [test.cpp:5]: (error) Using iterator to local container 'foo' that may be invalid.\n", errout.str());
+        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
         check("void f()\n"
@@ -2982,7 +3305,7 @@ class TestStl : public TestFixture {
               "        foo.reserve(123);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:6] -> [test.cpp:8] -> [test.cpp:3] -> [test.cpp:6]: (error) Using iterator to local container 'foo' that may be invalid.\n", errout.str());
+        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());
     }
 
     void pushback11() {
@@ -2996,7 +3319,7 @@ class TestStl : public TestFixture {
               "        ints.insert(it,0);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pushback12() {
@@ -3013,8 +3336,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:6] -> [test.cpp:3] -> [test.cpp:9]: (error, inconclusive) Using iterator to local container 'vec' that may be invalid.\n",
-            errout.str());
+            "[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());
     }
 
     void pushback13() {
@@ -3024,7 +3347,7 @@ class TestStl : public TestFixture {
               "    const char *BufPtr = &FilenameBuffer[PreAppendSize];\n"
               "    return true;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void insert1() {
@@ -3034,7 +3357,7 @@ class TestStl : public TestFixture {
               "    ints.insert(ints.begin(), 1);\n"
               "    ++iter;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:1] -> [test.cpp:5]: (error) Using iterator to local container 'ints' that may be invalid.\n", errout.str());
+        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"
               "{\n"
@@ -3042,7 +3365,7 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator iter = ints.begin();\n"
               "    ints.insert(iter, 1);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -3050,8 +3373,8 @@ class TestStl : public TestFixture {
               "    std::vector<int>::iterator iter = ints.begin();\n"
               "    ints.insert(iter, 1);\n"
               "    ints.insert(iter, 2);\n"
-              "}", 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] -> [test.cpp:5] -> [test.cpp:3] -> [test.cpp:6]: (error, inconclusive) Using iterator to local container 'ints' that may be invalid.\n", errout.str());
+              "}", 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"
               "    std::vector<Bar>::iterator i = bars.begin();\n"
@@ -3059,21 +3382,21 @@ class TestStl : public TestFixture {
               "    void* v = &i->foo;\n"
               "    return v;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error) Using iterator to local container 'bars' that may be invalid.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error) Using iterator to local container 'bars' that may be invalid.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // TODO: This shouldn't be inconclusive
         check("void f(const std::vector<Bar>& bars) {\n"
@@ -3082,7 +3405,7 @@ class TestStl : public TestFixture {
               "        i = bars.insert(i, bar);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error, inconclusive) Using iterator to local container 'bars' that may be invalid.\n", errout.str());
+        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
         check("void* f(const std::vector<Bar>& bars) {\n"
@@ -3092,7 +3415,7 @@ class TestStl : public TestFixture {
               "    void* v = &i->foo;\n"
               "    return v;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error, inconclusive) Using iterator to local container 'bars' that may be invalid.\n", errout.str());
+        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());
     }
 
     void insert2() {
@@ -3104,7 +3427,7 @@ class TestStl : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> &vec) {\n"
               "    for(std::vector<int>::iterator iter = vec.begin(); iter != vec.end(); ++iter)\n"
@@ -3115,7 +3438,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void popback1() { // #11553
@@ -3125,22 +3448,22 @@ class TestStl : public TestFixture {
               "    std::list<int> l;\n"
               "    l.pop_front();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Out of bounds access in expression 'v.pop_back()' because 'v' is empty.\n"
-                      "[test.cpp:5]: (error) Out of bounds access in expression 'l.pop_front()' because 'l' is empty.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:15]: (error) Out of bounds access in expression 'v.pop_back()' because 'v' is empty. [containerOutOfBounds]\n"
+                      "[test.cpp:5:16]: (error) Out of bounds access in expression 'l.pop_front()' because 'l' is empty. [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    if (v.empty()) {}\n"
               "    v.pop_back();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'v.empty()' is redundant or expression 'v.pop_back()' cause access out of bounds.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:16] -> [test.cpp:3:15]: (warning) Either the condition 'v.empty()' is redundant or expression 'v.pop_back()' causes access out of bounds. [containerOutOfBounds]\n",
+                      errout_str());
 
         check("void f(std::vector<int>& v) {\n"
               "    v.pop_back();\n"
               "    if (v.empty()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void stlBoundaries1() {
@@ -3156,21 +3479,21 @@ class TestStl : public TestFixture {
                   "        ;\n"
                   "}");
 
-            ASSERT_EQUALS_MSG("[test.cpp:4]: (error) Dangerous comparison using operator< on iterator.\n", errout.str(), stlCont[i]);
+            ASSERT_EQUALS_MSG("[test.cpp:4:25]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str(), stlCont[i]);
         }
 
         check("void f() {\n"
               "    std::forward_list<int>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous comparison using operator< on iterator.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void stlBoundaries2() {
@@ -3182,7 +3505,7 @@ class TestStl : public TestFixture {
               "    for (it = files.begin(); it < files.end(); it++) { };\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void stlBoundaries3() {
@@ -3196,13 +3519,13 @@ class TestStl : public TestFixture {
               "    }\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    static set<Foo>::const_iterator current;\n"
               "    return 25 > current->bar;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Invalid iterator 'current' used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:17]: (error) Invalid iterator 'current' used. [eraseDereference]\n", errout_str());
     }
 
     void stlBoundaries4() {
@@ -3211,13 +3534,13 @@ class TestStl : public TestFixture {
               "    std::forward_list<std::vector<std::vector<int>>>::iterator it;\n"
               "    for (it = ab.begin(); ab.end() > it; ++it) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous comparison using operator< on iterator.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    if (list < 0) {\n"
@@ -3225,7 +3548,7 @@ class TestStl : public TestFixture {
               "        for (it = ab.begin(); ab.end() > it; ++it) {}\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Dangerous comparison using operator< on iterator.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:40]: (error) Dangerous comparison using operator< on iterator. [stlBoundaries]\n", errout_str());
     }
 
     void stlBoundaries5() {
@@ -3233,8 +3556,8 @@ class TestStl : public TestFixture {
               "int foo() {\n"
               "    iterator i;\n"
               "    return i.foo();;\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("class iterator {\n"
               "    Class operator*();\n"
@@ -3244,8 +3567,8 @@ class TestStl : public TestFixture {
               "int foo() {\n"
               "    iterator i;\n"
               "    return i.foo();;\n"
-              "}", true);
-        ASSERT_EQUALS("[test.cpp:8]: (error, inconclusive) Invalid iterator 'i' used.\n", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:8:12]: (error, inconclusive) Invalid iterator 'i' used. [eraseDereference]\n", errout_str());
     }
 
     void stlBoundaries6() { // #7106
@@ -3255,8 +3578,8 @@ class TestStl : public TestFixture {
               "        {\n"
               "        }\n"
               "    }\n"
-              "}", true);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -3270,109 +3593,109 @@ class TestStl : public TestFixture {
               "{\n"
               "    if (s.find(12)) { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ok (pointer)
         check("void f(std::set<int> *s)\n"
               "{\n"
               "    if ((*s).find(12) != s.end()) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ok (array)
         check("void f(std::set<int> s [10])\n"
               "{\n"
               "    if (s[0].find(123) != s->end()) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ok (assignment)
         check("void f(std::set<int> s)\n"
               "{\n"
               "    if (a || (x = s.find(12)) != s.end()) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ok (dereference, #6402)
         check("void f(std::set<Foo> s) {\n"
               "    if (s.find(12).member) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::set<int> s) {\n"
               "    if (auto result = s.find(123); result != s.end()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ---------------------------
         // std::find
@@ -3383,33 +3706,33 @@ class TestStl : public TestFixture {
               "{\n"
               "    if (std::find(a,b,c)) { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious condition. The result of find() is an iterator, but it is not properly checked.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3714 - segmentation fault for syntax error
-        ASSERT_THROW(check("void f() {\n"
-                           "    if (()) { }\n"
-                           "}"),
-                     InternalError);
+        ASSERT_THROW_INTERNAL(check("void f() {\n"
+                                    "    if (()) { }\n"
+                                    "}"),
+                              AST);
 
         // #3865
         check("void f() {\n"
               "    if ((std::find(a,b,c)) != b) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void if_str_find() {
@@ -3418,57 +3741,57 @@ class TestStl : public TestFixture {
               "{\n"
               "    if (s.find(\"abc\")) { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string a, std::string b) {\n"  // #4480
               "    if (a.find(\"<\") < b.find(\">\")) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::string &s) {\n"
               "    if (foo(s.find(\"abc\"))) { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 10153
         check("int main() {\n"
@@ -3479,265 +3802,312 @@ class TestStl : public TestFixture {
               "  }\n"
               "  return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
     void size1() {
-        const char* code = "struct Fred {\n"
-                           "    void foo();\n"
-                           "    std::list<int> x;\n"
-                           "};\n"
-                           "void Fred::foo()\n"
-                           "{\n"
-                           "    if (x.size() == 0) {}\n"
-                           "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:7]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "std::list<int> x;\n"
-               "void f()\n"
-               "{\n"
-               "    if (x.size() == 0) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (x.size() == 0) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (0 == x.size()) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (x.size() != 0) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (0 != x.size()) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (x.size() > 0) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (0 < x.size()) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code =  "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (x.size() >= 1) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (x.size() < 1) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (1 <= x.size()) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (1 > x.size()) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (x.size()) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    if (!x.size()) {}\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
+        {
+            const char code[] = "struct Fred {\n"
+                                "    void foo();\n"
+                                "    std::list<int> x;\n"
+                                "};\n"
+                                "void Fred::foo()\n"
+                                "{\n"
+                                "    if (x.size() == 0) {}\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());
+        }
+
+        {
+            const char code[] = "std::list<int> x;\n"
+                                "void f()\n"
+                                "{\n"
+                                "    if (x.size() == 0) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (x.size() == 0) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (0 == x.size()) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (x.size() != 0) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (0 != x.size()) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (x.size() > 0) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (0 < x.size()) {}\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());
+        }
+
+        {
+            const char code[] =  "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (x.size() >= 1) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (x.size() < 1) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (1 <= x.size()) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (1 > x.size()) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (x.size()) {}\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    if (!x.size()) {}\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());
+        }
 
         check("void f()\n"
               "{\n"
               "    std::list<int> x;\n"
               "    fun(x.size());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
-        code ="void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    fun(!x.size());\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
-
-        code = "void f()\n"
-               "{\n"
-               "    std::list<int> x;\n"
-               "    fun(a && x.size());\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:4]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
+        {
+            const char code[] ="void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    fun(!x.size());\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());
+        }
+
+        {
+            const char code[] = "void f()\n"
+                                "{\n"
+                                "    std::list<int> x;\n"
+                                "    fun(a && x.size());\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());
+        }
 
         check("void f() {\n" // #4039
               "    std::list<int> x;\n"
               "    fun(width % x.size() != 0);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4584
         check("void f() {\n"
               "    std::list<int> x;\n"
               "    if (foo + 1 > x.size()) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         check("void f() {\n"
               "    std::list<int> x;\n"
               "    if (x.size() < 1 + foo) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void size2() {
-        const char* code = "struct Fred {\n"
-                           "    std::list<int> x;\n"
-                           "};\n"
-                           "struct Wilma {\n"
-                           "    Fred f;\n"
-                           "    void foo();\n"
-                           "};\n"
-                           "void Wilma::foo()\n"
-                           "{\n"
-                           "    if (f.x.size() == 0) {}\n"
-                           "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:10]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
+        const char code[] = "struct Fred {\n"
+                            "    std::list<int> x;\n"
+                            "};\n"
+                            "struct Wilma {\n"
+                            "    Fred f;\n"
+                            "    void foo();\n"
+                            "};\n"
+                            "void Wilma::foo()\n"
+                            "{\n"
+                            "    if (f.x.size() == 0) {}\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
+            errout_str());
+
         check(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void size3() {
-        const char* code = "namespace N {\n"
-                           "    class Zzz {\n"
-                           "    public:\n"
-                           "        std::list<int> x;\n"
-                           "    };\n"
-                           "}\n"
-                           "using namespace N;\n"
-                           "Zzz * zzz;\n"
-                           "int main() {\n"
-                           "    if (zzz->x.size() > 0) { }\n"
-                           "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:10]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-
-        code = "namespace N {\n"
-               "    class Zzz {\n"
-               "    public:\n"
-               "        std::list<int> x;\n"
-               "    };\n"
-               "}\n"
-               "using namespace N;\n"
-               "int main() {\n"
-               "    Zzz * zzz;\n"
-               "    if (zzz->x.size() > 0) { }\n"
-               "}";
-        check(code, false, Standards::CPP03);
-        ASSERT_EQUALS("[test.cpp:10]: (performance) Possible inefficient checking for 'x' emptiness.\n", errout.str());
-        check(code);
-        ASSERT_EQUALS("", errout.str());
+        {
+            const char code[] = "namespace N {\n"
+                                "    class Zzz {\n"
+                                "    public:\n"
+                                "        std::list<int> x;\n"
+                                "    };\n"
+                                "}\n"
+                                "using namespace N;\n"
+                                "Zzz * zzz;\n"
+                                "int main() {\n"
+                                "    if (zzz->x.size() > 0) { }\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
+                errout_str());
+        }
+
+        {
+            const char code[] = "namespace N {\n"
+                                "    class Zzz {\n"
+                                "    public:\n"
+                                "        std::list<int> x;\n"
+                                "    };\n"
+                                "}\n"
+                                "using namespace N;\n"
+                                "int main() {\n"
+                                "    Zzz * zzz;\n"
+                                "    if (zzz->x.size() > 0) { }\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
+                errout_str());
+
+            check(code);
+            ASSERT_EQUALS("", errout_str());
+        }
     }
 
     void size4() { // #2652 - don't warn about vector/deque
         check("void f(std::vector<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::deque<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::array<int,3> &a) {\n"
               "    if (a.size() > 0U) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void redundantCondition1() {
@@ -3746,7 +4116,7 @@ class TestStl : public TestFixture {
               "    if (haystack.find(needle) != haystack.end())\n"
               "        haystack.remove(needle);"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Redundant checking of STL container element existence before removing it.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Redundant checking of STL container element existence before removing it. [redundantIfRemove]\n", errout_str());
     }
 
     void missingInnerComparison1() {
@@ -3757,14 +4127,14 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:2]: (warning) Missing bounds check for extra iterator increment in loop.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<std::string> &v) {\n"
               "    for(std::vector<std::string>::const_iterator it = v.begin(); it != v.end(); ++it) {\n"
@@ -3775,7 +4145,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void missingInnerComparison2() {
@@ -3788,7 +4158,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void missingInnerComparison3() {
@@ -3798,7 +4168,7 @@ class TestStl : public TestFixture {
               "        { }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void missingInnerComparison4() {
@@ -3810,7 +4180,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::find_if algorithm instead of a raw loop.\n", errout.str());
+        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"
               "    for(std::list<int>::iterator i = l1.begin(); i != l1.end(); i++) {\n"
@@ -3820,7 +4190,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::find_if algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:23]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
     }
 
     void missingInnerComparison5() {
@@ -3829,7 +4199,7 @@ class TestStl : public TestFixture {
               "        str[i++] = (*it).first;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void missingInnerComparison6() {
@@ -3838,7 +4208,7 @@ class TestStl : public TestFixture {
               "        it = s.insert(++it, 0);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void cstr() {
@@ -3846,50 +4216,50 @@ class TestStl : public TestFixture {
               "    std::string errmsg;\n"
               "    throw errmsg.c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after throwing exception.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "    const char *f();\n"
@@ -3898,7 +4268,7 @@ class TestStl : public TestFixture {
               "    std::string s;\n"
               "    return s.c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "    std::string GetVal() const;\n"
@@ -3907,27 +4277,27 @@ class TestStl : public TestFixture {
               "    Foo f;\n"
               "    return f.GetVal().c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str()); // #3427
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant.\n", errout.str());
+        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"
               "    std::string GetVal() const;\n"
@@ -3936,19 +4306,19 @@ class TestStl : public TestFixture {
               "    Foo f;\n"
               "    return f.GetVal().c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string get_msg() {\n" // #3678
               "    MyStringClass errmsg;\n"
               "    return errmsg.c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Foo1(const std::string& str) {}\n"
               "void Foo2(const char* c, const std::string str) {}\n"
@@ -3969,13 +4339,13 @@ class TestStl : public TestFixture {
               "    Foo4(str.c_str(), str.c_str());\n"
               "}");
 
-        ASSERT_EQUALS("[test.cpp:9]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:11]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 2 is slow and redundant.\n"
-                      "[test.cpp:14]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:15]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 2 is slow and redundant.\n"
-                      "[test.cpp:16]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 2 is slow and redundant.\n"
-                      "[test.cpp:17]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:17]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 2 is slow and redundant.\n", errout.str());
+        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"
+                      "[test.cpp:14: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:15: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"
+                      "[test.cpp:16: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"
+                      "[test.cpp:17: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:17: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", errout_str());
 
         check("void Foo1(const std::string& str) {}\n"
               "void Foo2(char* c, const std::string str) {}\n"
@@ -3984,7 +4354,7 @@ class TestStl : public TestFixture {
               "    Foo1(str, foo);\n" // Don't crash
               "    Foo2(str.c_str());\n" // Don't crash
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo {\n"
               "    void func(std::string str) const {}\n"
@@ -3998,10 +4368,10 @@ class TestStl : public TestFixture {
               "    Foo::sfunc(str.c_str());\n"
               "    foo.func(str.c_str());\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:10]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:11]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n",
-                      errout.str());
+        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",
+                      errout_str());
 
         check("void f(const std::string& s);\n" // #8336
               "struct T {\n"
@@ -4019,13 +4389,13 @@ class TestStl : public TestFixture {
               "    f(t.u.s.c_str());\n"
               "    f(N::O::s.c_str());\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:9]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:10]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:11]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:12]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:13]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
-                      "[test.cpp:14]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:9: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"
+                      "[test.cpp:10: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. 1 is slow and redundant. [stlcstrParam]\n"
+                      "[test.cpp:12: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:13: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:14: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",
+                      errout_str());
 
         check("void svgFile(const std::string &content, const std::string &fileName, const double end = 1000., const double start = 0.);\n"
               "void Bar(std::string filename) {\n"
@@ -4033,7 +4403,7 @@ class TestStl : public TestFixture {
               "    std::ofstream svgFile(filename.c_str(), std::ios::trunc);\n"
               "    svgFile << \"test\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Foo(const char* p) {}\n"
               "void Foo(const std::string& str) {Foo(str.c_str());}\n" // Overloaded
@@ -4042,12 +4412,12 @@ class TestStl : public TestFixture {
               "    Foo(str);\n"
               "    Foo(str.c_str());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int atoi(const std::string& str) {\n" // #3729: Don't suggest recursive call
               "    return atoi(str.c_str());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string hello()\n"
               "{\n"
@@ -4058,7 +4428,7 @@ class TestStl : public TestFixture {
               "{\n"
               "    return hello().c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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"
               "    std::string hello();\n"
@@ -4072,7 +4442,7 @@ class TestStl : public TestFixture {
               "{\n"
               "    return hello().c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:11]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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()
         check("void a(const std::string &str);\n"
@@ -4081,12 +4451,12 @@ class TestStl : public TestFixture {
               "    MyStringClass s;\n"
               "    a(s.c_str());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string Format(const char * name) {\n" // #4938
               "    return String::Format(\"%s:\", name).c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7480
         check("struct InternalMapInfo {\n"
@@ -4096,7 +4466,7 @@ class TestStl : public TestFixture {
               "    const InternalMapInfo* mapInfo = &internal_getMapInfo;\n"
               "    return mapInfo->author.c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct InternalMapInfo {\n"
               "    std::string author;\n"
@@ -4105,7 +4475,7 @@ class TestStl : public TestFixture {
               "    const InternalMapInfo* mapInfo = &internal_getMapInfo;\n"
               "    return mapInfo->author.c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (performance) Returning the result of c_str() in a function that returns std::string is slow and redundant.\n", errout.str());
+        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"
               "    std::string author;\n"
@@ -4114,7 +4484,7 @@ class TestStl : public TestFixture {
               "    const InternalMapInfo mapInfo = internal_getMapInfo;\n"
               "    return mapInfo.author.c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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
               "    std::string data;\n"
@@ -4124,7 +4494,7 @@ class TestStl : public TestFixture {
               "    const struct S &s = getS();\n"
               "    return s.data.c_str();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" // #7930
               "    std::string data;\n"
@@ -4134,22 +4504,22 @@ class TestStl : public TestFixture {
               "    std::string &ref = s.data;\n"
               "    return ref.c_str();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+        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
               "void f(const std::string& s, int i = 0);\n"
               "void g(const std::wstring& p) {\n"
               "    f(p.c_str());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S {\n" //#9161
               "    const char* f() const noexcept {\n"
               "        return (\"\" + m).c_str();\n"
               "    }\n"
               "    std::string m;\n"
-              "};\n", /*inconclusive*/ true);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dangerous usage of c_str(). The value returned by c_str() is invalid after this call.\n", errout.str());
+              "};\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:9]: (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" // #10493
               "    void f(const char** pp);\n"
@@ -4164,42 +4534,42 @@ class TestStl : public TestFixture {
               "        *pp = member.c_str();\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& a) {\n"
               "    std::string b(a.c_str());\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Constructing a std::string from the result of c_str() is slow and redundant.\n", errout.str());
+        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());
 
         check("std::string f(const std::string& a) {\n"
               "    std::string b{ a.c_str() };\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Constructing a std::string from the result of c_str() is slow and redundant.\n", errout.str());
+        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());
 
         check("std::string f(const std::string& a) {\n"
               "    std::string b = a.c_str();\n"
               "    return b;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Assigning the result of c_str() to a std::string is slow and redundant.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (performance) Assigning the result of c_str() to a std::string is slow and redundant. [stlcstrAssignment]\n", errout_str());
 
         check("std::string g(const std::string& a, const std::string& b) {\n"
               "    return a + b.c_str();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n", errout_str());
 
         check("std::string g(const std::string& a, const std::string& b) {\n"
               "    return a.c_str() + b;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:22]: (performance) Concatenating the result of c_str() and a std::string is slow and redundant. [stlcstrConcat]\n", errout_str());
 
         check("std::vector<double> v;\n" // don't crash
               "int i;\n"
               "void f() {\n"
               "    const double* const QM_R__ buf(v.data() + i);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct T {\n" // #7515
               "    std::string g();\n"
@@ -4216,14 +4586,22 @@ class TestStl : public TestFixture {
               "    auto it = t.v.begin()\n"
               "    strm << it->c_str();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (performance) Passing the result of c_str() to a stream is slow and redundant.\n"
-                      "[test.cpp:8]: (performance) Passing the result of c_str() to a stream is slow and redundant.\n"
-                      "[test.cpp:9]: (performance) Passing the result of c_str() to a stream is slow and redundant.\n"
-                      "[test.cpp:10]: (performance) Passing the result of c_str() to a stream is slow and redundant.\n"
-                      "[test.cpp:11]: (performance) Passing the result of c_str() to a stream is slow and redundant.\n"
-                      "[test.cpp:12]: (performance) Passing the result of c_str() to a stream is slow and redundant.\n"
-                      "[test.cpp:14]: (performance) Passing the result of c_str() to a stream is slow and redundant.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:7:10]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n"
+                      "[test.cpp:8:19]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n"
+                      "[test.cpp:9:19]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n"
+                      "[test.cpp:10:19]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n"
+                      "[test.cpp:11:10]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n"
+                      "[test.cpp:12:10]: (performance) Passing the result of c_str() to a stream is slow and redundant. [stlcstrStream]\n"
+                      "[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"
@@ -4234,16 +4612,16 @@ class TestStl : public TestFixture {
               "    else\n"
               "        str = u.t[0].s.str.c_str();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (performance) Assigning the result of c_str() to a std::string is slow and redundant.\n"
-                      "[test.cpp:8]: (performance) Assigning the result of c_str() to a std::string is slow and redundant.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (performance) Assigning the result of c_str() to a std::string is slow and redundant. [stlcstrAssignment]\n"
+                      "[test.cpp:8:9]: (performance) Assigning the result of c_str() to a std::string is slow and redundant. [stlcstrAssignment]\n",
+                      errout_str());
 
         check("void f(std::string_view);\n" // #11547
               "void g(const std::string & s) {\n"
               "    f(s.c_str());\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Passing the result of c_str() to a function that takes std::string_view as argument no. 1 is slow and redundant.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (performance) Passing the result of c_str() to a function that takes std::string_view as argument no. 1 is slow and redundant. [stlcstrParam]\n",
+                      errout_str());
 
         check("std::string_view f(const std::string& s) {\n"
               "    std::string_view sv = s.c_str();\n"
@@ -4253,14 +4631,14 @@ class TestStl : public TestFixture {
               "    std::string_view sv{ s.c_str() };\n"
               "    return sv;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Assigning the result of c_str() to a std::string_view is slow and redundant.\n"
-                      "[test.cpp:6]: (performance) Constructing a std::string_view from the result of c_str() is slow and redundant.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:22]: (performance) Assigning the result of c_str() to a std::string_view is slow and redundant. [stlcstrAssignment]\n"
+                      "[test.cpp:6:22]: (performance) Constructing a std::string_view from the result of c_str() is slow and redundant. [stlcstrConstructor]\n",
+                      errout_str());
 
         check("void f(const std::string& s) {\n" // #11819
               "    std::string_view sv(s.data(), 13);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct S { std::string x; };\n" // #11802
               "std::vector<std::shared_ptr<S>> global;\n"
@@ -4269,7 +4647,7 @@ class TestStl : public TestFixture {
               "    global.push_back(s);\n"
               "    return s->x.c_str();\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uselessCalls() {
@@ -4279,7 +4657,7 @@ class TestStl : public TestFixture {
               "    s1.swap(s2);\n"
               "    s2.swap(s2);\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -4287,7 +4665,7 @@ class TestStl : public TestFixture {
               "    s1.swap(s2);\n"
               "    s2.swap(s2);\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (performance) It is inefficient to swap a object with itself by calling 's2.swap(s2)'\n", errout.str());
+        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"
               "{\n"
@@ -4297,7 +4675,7 @@ class TestStl : public TestFixture {
               "    s1.compare(s2.c_str());\n"
               "    s1.compare(0, s1.size(), s1);\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) It is inefficient to call 's2.compare(s2)' as it always returns 0.\n", errout.str());
+        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
         check("class ReplayIteratorImpl{\n"
@@ -4308,7 +4686,7 @@ class TestStl : public TestFixture {
               "  }\n"
               "  WT_CURSOR *cursor_;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -4320,11 +4698,11 @@ class TestStl : public TestFixture {
               "    s1 = s2.substr(0,std::string::npos);\n"
               "    s1 = s2.substr(x+5-n, 0);\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (performance) Ineffective call of function \'substr\' because it returns a copy of "
-                      "the object. Use operator= instead.\n"
-                      "[test.cpp:8]: (performance) Ineffective call of function \'substr\' because it returns a copy of "
-                      "the object. Use operator= instead.\n"
-                      "[test.cpp:9]: (performance) Ineffective call of function \'substr\' because it returns an empty string.\n", errout.str());
+        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 "
+                      "the object. Use operator= instead. [uselessCallsSubstr]\n"
+                      "[test.cpp:9:10]: (performance) Ineffective call of function \'substr\' because it returns an empty string. [uselessCallsSubstr]\n", errout_str());
 
         check("void f()\n"
               "{\n"
@@ -4336,26 +4714,26 @@ class TestStl : public TestFixture {
               "    s1 = s2.substr(0,std::string::npos);\n"
               "    s1 = s2.substr(x+5-n, 0);\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
               "    std::string str = \"a1b1\";\n"
               "    return str.find(str[1], 2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(std::vector<int>& v) {\n"
               "    v.empty();\n"
               "    return v.empty();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Ineffective call of function 'empty()'. Did you intend to call 'clear()' instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n" // #4032
               "    const std::string greeting(\"Hello World !!!\");\n"
@@ -4363,7 +4741,7 @@ class TestStl : public TestFixture {
               "    if (npos != std::string::npos)\n"
               "        std::cout << greeting.substr(0, npos) << std::endl;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> a) {\n"
               "    std::remove(a.begin(), a.end(), val);\n"
@@ -4373,71 +4751,71 @@ class TestStl : public TestFixture {
               "    a.erase(std::remove(a.begin(), a.end(), val));\n"
               "    std::remove(\"foo.txt\");\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Return value of std::remove() ignored. Elements remain in container.\n"
-                      "[test.cpp:3]: (warning) Return value of std::remove_if() ignored. Elements remain in container.\n"
-                      "[test.cpp:4]: (warning) Return value of std::unique() ignored. Elements remain in container.\n", errout.str());
+        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());
 
         // #4431 - fp
         check("bool f() {\n"
               "    return x ? true : (y.empty());\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8360
         check("void f(std::string s) {\n"
               "    for (;s.empty();) {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11166
         check("std::string f(std::string s) {\n"
               "    s = s.substr(0, s.size() - 1);\n"
               "    return s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Ineffective call of function 'substr' because a prefix of the string is assigned to itself. Use resize() or pop_back() instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (performance) Ineffective call of function 'substr' because a prefix of the string is assigned to itself. Use resize() or pop_back() instead. [uselessCallsSubstr]\n",
+                      errout_str());
 
         check("std::string f(std::string s, std::size_t start, std::size_t end, const std::string& i) {\n"
               "    s = s.substr(0, start) + i + s.substr(end + 1);\n"
               "    return s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Ineffective call of function 'substr' because a prefix of the string is assigned to itself. Use replace() instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (performance) Ineffective call of function 'substr' because a prefix of the string is assigned to itself. Use replace() instead. [uselessCallsSubstr]\n",
+                      errout_str());
 
         check("std::string f(std::string s, std::size_t end) {\n"
               "    s = { s.begin(), s.begin() + end };\n"
               "    return s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Inefficient constructor call: container 's' is assigned a partial copy of itself. Use erase() or resize() instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (performance) Inefficient constructor call: container 's' is assigned a partial copy of itself. Use erase() or resize() instead. [uselessCallsConstructor]\n",
+                      errout_str());
 
         check("std::list<int> f(std::list<int> l, std::size_t end) {\n"
               "    l = { l.begin(), l.begin() + end };\n"
               "    return l;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Inefficient constructor call: container 'l' is assigned a partial copy of itself. Use erase() or resize() instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (performance) Inefficient constructor call: container 'l' is assigned a partial copy of itself. Use erase() or resize() instead. [uselessCallsConstructor]\n",
+                      errout_str());
 
         check("std::string f(std::string s, std::size_t end) {\n"
               "    s = std::string{ s.begin(), s.begin() + end };\n"
               "    return s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Inefficient constructor call: container 's' is assigned a partial copy of itself. Use erase() or resize() instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (performance) Inefficient constructor call: container 's' is assigned a partial copy of itself. Use erase() or resize() instead. [uselessCallsConstructor]\n",
+                      errout_str());
 
         check("std::string f(std::string s, std::size_t end) {\n"
               "    s = std::string(s.begin(), s.begin() + end);\n"
               "    return s;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Inefficient constructor call: container 's' is assigned a partial copy of itself. Use erase() or resize() instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (performance) Inefficient constructor call: container 's' is assigned a partial copy of itself. Use erase() or resize() instead. [uselessCallsConstructor]\n",
+                      errout_str());
 
         check("std::vector<int> f(std::vector<int> v, std::size_t end) {\n"
               "    v = std::vector<int>(v.begin(), v.begin() + end);\n"
               "    return v;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (performance) Inefficient constructor call: container 'v' is assigned a partial copy of itself. Use erase() or resize() instead.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (performance) Inefficient constructor call: container 'v' is assigned a partial copy of itself. Use erase() or resize() instead. [uselessCallsConstructor]\n",
+                      errout_str());
     }
 
     void stabilityOfChecks() {
@@ -4452,7 +4830,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "    void shift() { EffectivityRangeData<int>::iterator it;  }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void dereferenceInvalidIterator() {
@@ -4462,7 +4840,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        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"
               "    if(foo) { bar(); }\n"
@@ -4470,7 +4848,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        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
         check("void foo(std::string::iterator& i) {\n"
@@ -4478,7 +4856,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test "while" with "&&" case
         check("void foo(std::string::iterator& i) {\n"
@@ -4487,7 +4865,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        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"
               "    do {\n"
@@ -4495,7 +4873,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    } while (std::isalpha(*i) && i != str.end());\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:27]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test "while" with "||" case
         check("void foo(std::string::iterator& i) {\n"
@@ -4504,7 +4882,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:28]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test fix for "while" with "||" case
         check("void foo(std::string::iterator& i) {\n"
@@ -4513,7 +4891,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test "for" with "&&" case
         check("void foo(std::string::iterator& i) {\n"
@@ -4522,7 +4900,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:25]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         // Test "for" with "||" case
         check("void foo(std::string::iterator& i) {\n"
@@ -4531,7 +4909,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        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"
         // loop does not result in a false positive
@@ -4541,7 +4919,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test that other "&&" terms in the condition don't invalidate the check
         check("void foo(char* c, std::string::iterator& i) {\n"
@@ -4549,7 +4927,7 @@ class TestStl : public TestFixture {
               "        std::cout << *i;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        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
         check("void foo(const char* c, std::string::iterator& i) {\n"
@@ -4557,7 +4935,7 @@ class TestStl : public TestFixture {
               "        std::cout << *c;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Test case involving "rend()" instead of "end()"
         check("void foo(std::string::iterator& i) {\n"
@@ -4566,7 +4944,7 @@ class TestStl : public TestFixture {
               "        i ++;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        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
         check("void foo(std::string::iterator& i) {\n"
@@ -4574,51 +4952,51 @@ class TestStl : public TestFixture {
               "        std::cout << \"foo\";\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::vector <int> v;\n"
               "    std::vector <int>::iterator i = v.end();\n"
               "    *i=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Dereference of an invalid iterator: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void f() {\n"
               "    std::vector <int> v;\n"
               "    std::vector <int>::iterator i = std::end(v);\n"
               "    *i=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Dereference of an invalid iterator: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (error) Dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void f(std::vector <int> v) {\n"
               "    std::vector <int>::iterator i = v.end();\n"
               "    *i=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dereference of an invalid iterator: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:6]: (error) Dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void f(std::vector <int> v) {\n"
               "    std::vector <int>::iterator i = v.end();\n"
               "    *(i+1)=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dereference of an invalid iterator: i+1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (error) Dereference of an invalid iterator: i+1 [derefInvalidIterator]\n", errout_str());
 
         check("void f(std::vector <int> v) {\n"
               "    std::vector <int>::iterator i = v.end();\n"
               "    *(i-1)=0;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector <int> v) {\n"
               "    std::vector <int>::iterator i = v.begin();\n"
               "    *(i-1)=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dereference of an invalid iterator: i-1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (error) Dereference of an invalid iterator: i-1 [derefInvalidIterator]\n", errout_str());
 
         check("void f(std::vector <int> v) {\n"
               "    std::vector <int>::iterator i = std::begin(v);\n"
               "    *(i-1)=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Dereference of an invalid iterator: i-1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (error) Dereference of an invalid iterator: i-1 [derefInvalidIterator]\n", errout_str());
 
         check("void f(std::vector <int> v, bool b) {\n"
               "    std::vector <int>::iterator i = v.begin();\n"
@@ -4626,7 +5004,7 @@ class TestStl : public TestFixture {
               "        i = v.end();\n"
               "    *i=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Possible dereference of an invalid iterator: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:6]: (warning) Possible dereference of an invalid iterator: i [derefInvalidIterator]\n", errout_str());
 
         check("void f(std::vector <int> v, bool b) {\n"
               "    std::vector <int>::iterator i = v.begin();\n"
@@ -4634,7 +5012,7 @@ class TestStl : public TestFixture {
               "        i = v.end();\n"
               "    *(i+1)=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Possible dereference of an invalid iterator: i+1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:8]: (warning) Possible dereference of an invalid iterator: i+1 [derefInvalidIterator]\n", errout_str());
 
         check("void f(std::vector <int> v, bool b) {\n"
               "    std::vector <int>::iterator i = v.begin();\n"
@@ -4642,41 +5020,41 @@ class TestStl : public TestFixture {
               "        i = v.end();\n"
               "    *(i-1)=0;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (warning) Possible dereference of an invalid iterator: i-1\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:8]: (warning) Possible dereference of an invalid iterator: i-1 [derefInvalidIterator]\n", errout_str());
 
         check("int f(std::vector<int> v, int pos) {\n"
               "    if (pos >= 0)\n"
               "        return *(v.begin() + pos);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> v, int i) {\n"
               "    auto it = std::find(v.begin(), v.end(), i);\n"
               "    if (it != v.end()) {}\n"
               "    return *it;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'it!=v.end()' is redundant or there is possible dereference of an invalid iterator: it.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12] -> [test.cpp:4:13]: (warning) Either the condition 'it!=v.end()' is redundant or there is possible dereference of an invalid iterator: it. [derefInvalidIteratorRedundantCheck]\n", errout_str());
 
         check("void f(std::vector<int> & v) {\n"
               "    std::vector<int>::iterator i= v.begin();\n"
               "    if(i == v.end() && *(i+1) == *i) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n"
-                      "[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:3:27]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1. [derefInvalidIteratorRedundantCheck]\n"
+                      "[test.cpp:3:10] -> [test.cpp:3:35]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i. [derefInvalidIteratorRedundantCheck]\n", errout_str());
 
 
         check("void f(std::vector<int> & v) {\n"
               "    std::vector<int>::iterator i= v.begin();\n"
               "    if(i == v.end() && *i == *(i+1)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i.\n"
-                      "[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:3:25]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i. [derefInvalidIteratorRedundantCheck]\n"
+                      "[test.cpp:3:10] -> [test.cpp:3:33]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1. [derefInvalidIteratorRedundantCheck]\n", errout_str());
 
         check("void f(std::vector<int> & v) {\n"
               "    std::vector<int>::iterator i= v.begin();\n"
               "    if(i != v.end() && *i == *(i+1)) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:3]: (warning) Either the condition 'i!=v.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:3:33]: (warning) Either the condition 'i!=v.end()' is redundant or there is possible dereference of an invalid iterator: i+1. [derefInvalidIteratorRedundantCheck]\n", errout_str());
 
         check("void f(std::vector<int> & v) {\n"
               "    std::vector<int>::iterator i= v.begin();\n"
@@ -4684,20 +5062,20 @@ class TestStl : public TestFixture {
               "        if (*(i+1) == *i) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'i!=v.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:4:16]: (warning) Either the condition 'i!=v.end()' is redundant or there is possible dereference of an invalid iterator: i+1. [derefInvalidIteratorRedundantCheck]\n", errout_str());
 
         check("void f(std::vector<int> & v) {\n"
               "    std::vector<int>::iterator i= v.begin();\n"
               "    if(i == v.end()) { return; }\n"
               "    if (*(i+1) == *i) {}\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:4:12]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1. [derefInvalidIteratorRedundantCheck]\n", errout_str());
 
         check("void f(std::vector<int> & v) {\n"
               "    std::vector<int>::iterator i= v.begin();\n"
               "    if(i != v.end() && (i+1) != v.end() && *(i+1) == *i) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s) {\n"
               "    for (std::string::const_iterator i = s.begin(); i != s.end(); ++i) {\n"
@@ -4710,13 +5088,13 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Either the condition '(i+1)!=s.end()' is redundant or there is possible dereference of an invalid iterator: i+2.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:37] -> [test.cpp:4:30]: (warning) Either the condition '(i+1)!=s.end()' is redundant or there is possible dereference of an invalid iterator: i+2. [derefInvalidIteratorRedundantCheck]\n", errout_str());
 
         check("void f(int v, std::map<int, int> &items) {\n"
               "    for (auto it = items.begin(); it != items.end();)\n"
               "        (it->first == v) ? it = items.erase(it) : ++it;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::string s) {\n"
               "    for (std::string::const_iterator i = s.begin(); i != s.end(); ++i) {\n"
@@ -4729,7 +5107,7 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int>::iterator it, const std::vector<int>& vector) {\n"
               "    if (!(it != vector.end() && it != vector.begin()))\n"
@@ -4738,13 +5116,13 @@ class TestStl : public TestFixture {
               "        return -1;\n"
               "    return *it;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(std::vector<int> &vect) {\n"
               "    const int &v = *vect.emplace(vect.end());\n"
               "    return v;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("extern bool bar(int);\n"
               "void f(std::vector<int> & v) {\n"
@@ -4752,8 +5130,8 @@ class TestStl : public TestFixture {
               "    if(i == v.end() && bar(*(i+1)) ) {}\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:4]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n",
-            errout.str());
+            "[test.cpp:4:10] -> [test.cpp:4:31]: (warning) Either the condition 'i==v.end()' is redundant or there is possible dereference of an invalid iterator: i+1. [derefInvalidIteratorRedundantCheck]\n",
+            errout_str());
 
         // #10657
         check("std::list<int> mValues;\n"
@@ -4767,13 +5145,13 @@ class TestStl : public TestFixture {
               "    }\n"
               "    if (endValue == mValues.end()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10642
         check("int f(std::vector<int> v) {\n"
               "    return *(v.begin() + v.size() - 1);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10716
         check("struct a;\n"
@@ -4786,8 +5164,8 @@ class TestStl : public TestFixture {
               "  e.clear();\n"
               "  auto f = *e[d].begin();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Out of bounds access in expression 'e[d].begin()' because 'e[d]' is empty.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:9:23]: (error) Out of bounds access in expression 'e[d].begin()' because 'e[d]' is empty. [containerOutOfBounds]\n",
+                      errout_str());
 
         // #10151
         check("std::set<int>::iterator f(std::set<int>& s) {\n"
@@ -4796,7 +5174,7 @@ class TestStl : public TestFixture {
               "        return s.erase(it);\n"
               "    return s.end();\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::find_if algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:0]: (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"
@@ -4807,7 +5185,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return debug_valueflow(it)->second;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11557
         check("bool f(const std::vector<int*>& v, std::vector<int*>::iterator it, bool b) {\n"
@@ -4817,7 +5195,7 @@ class TestStl : public TestFixture {
               "        return false;\n"
               "    return true;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6925
         check("void f(const std::string& s, std::string::iterator i) {\n"
@@ -4825,8 +5203,39 @@ class TestStl : public TestFixture {
               "        if (i + 1 != s.end()) {}\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'i+1!=s.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:19] -> [test.cpp:2:29]: (warning) Either the condition 'i+1!=s.end()' is redundant or there is possible dereference of an invalid iterator: i+1. [derefInvalidIteratorRedundantCheck]\n",
+                      errout_str());
+
+        check("void f(bool b, std::vector<std::string> v) {\n" // #12680
+              "    if (!v.empty()) {\n"
+              "        auto it = v.begin();\n"
+              "        if (b) {\n"
+              "            v.clear();\n"
+              "            it = v.begin();\n"
+              "        }\n"
+              "        for (++it; it != v.end(); ++it) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
+        check("void f(int);\n" // #13064
+              "void g() {\n"
+              "    std::vector<int> v{ 0 };\n"
+              "    auto it = std::find(v.begin(), v.end(), 0);\n"
+              "    if (it == v.end()) {\n"
+              "        f({});\n"
+              "        it = v.begin();\n"
+              "    }\n"
+              "    *it;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int g() {\n" // #13332
+              "    const std::vector<int> v = { 1, 2, 3, 4 };\n"
+              "    const std::vector<int>::const_iterator a[2] = { v.begin(), v.end() };\n"
+              "    return *a[0];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void dereferenceInvalidIterator2() {
@@ -4850,8 +5259,8 @@ class TestStl : public TestFixture {
               "    iterator it;\n"
               "    it->m_place = 0;\n"
               "    return it;\n"
-              "}\n", true);
-        ASSERT_EQUALS("[test.cpp:18]: (error, inconclusive) Invalid iterator 'it' used.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:18:5]: (error, inconclusive) Invalid iterator 'it' used. [eraseDereference]\n", errout_str());
     }
 
     void loopAlgoElementAssign() {
@@ -4859,36 +5268,36 @@ class TestStl : public TestFixture {
               "    for(int& x:v)\n"
               "        x = 1;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::fill algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Consider using std::fill algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v)\n"
               "        x = x + 1;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo(int a, int b) {\n"
               "    for(int& x:v)\n"
               "        x = a + b;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::fill or std::generate algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Consider using std::fill or std::generate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v)\n"
               "        x += 1;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v)\n"
               "        x = f();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::generate algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Consider using std::generate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v) {\n"
@@ -4896,8 +5305,8 @@ class TestStl : public TestFixture {
               "        x = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v) {\n"
@@ -4905,8 +5314,8 @@ class TestStl : public TestFixture {
               "        f();\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // There should probably be a message for unconditional break
         check("void foo() {\n"
@@ -4915,15 +5324,15 @@ class TestStl : public TestFixture {
               "        break;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v)\n"
               "        x = ++x;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loopAlgoAccumulateAssign() {
@@ -4932,32 +5341,32 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        n += x;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        n = n + x;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        n += 1;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::distance algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::distance algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        n = n + 1;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::distance algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::distance algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool f(int);\n"
               "void foo() {\n"
@@ -4965,8 +5374,8 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        b &= f(x);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int);\n"
               "void foo() {\n"
@@ -4974,8 +5383,8 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        b |= f(x);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int);\n"
               "void foo() {\n"
@@ -4983,8 +5392,8 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        b = b && f(x);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f(int);\n"
               "void foo() {\n"
@@ -4992,16 +5401,16 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        b = b || f(x);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int& x:v)\n"
               "        n = ++x;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("std::size_t f(const std::map<std::string, std::size_t>& m) {\n" // #10412
               "    std::size_t t = 0;\n"
@@ -5013,9 +5422,9 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return t; \n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n"
-                      "[test.cpp:7]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n"
+                      "[test.cpp:7:11]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
 
         check("int g(const std::vector<int>& v) {\n"
               "    int t = 0;\n"
@@ -5024,7 +5433,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return t;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("auto g(const std::vector<int>& v) {\n"
               "    std::vector<std::vector<int>::iterator> r;\n"
@@ -5033,7 +5442,7 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return r;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(std::vector<std::string> v) {\n"
               "    std::string ret;\n"
@@ -5041,7 +5450,7 @@ class TestStl : public TestFixture {
               "        ret += s + '\\n';\n"
               "    return ret;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("std::string f(const std::string& s) {\n"
               "    std::string ret;\n"
@@ -5050,7 +5459,7 @@ class TestStl : public TestFixture {
               "            ret += i;\n"
               "    return ret;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<int>& v) {\n"
               "    int sum = 0;\n"
@@ -5058,7 +5467,41 @@ class TestStl : public TestFixture {
               "        sum += *it;\n"
               "    return sum;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(const std::vector<int>& v) {\n" // #12900
+              "    int x{};\n"
+              "    for (const auto i : v)\n"
+              "        x = dostuff(i);\n"
+              "    return x;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(const std::vector<int>& v) {\n" // #11493
+              "    int s = 0;\n"
+              "    for (std::size_t i = 0; i < v.size(); ++i)\n"
+              "        s += v[i];\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+
+        check("int f(int n) {\n"
+              "    int s = 0;\n"
+              "    for (int i = 0; i < n; ++i)\n"
+              "        s += g(i);\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("int g(int);\n"
+              "int f(const std::vector<int>&v, int n) {\n"
+              "    int s = 0;\n"
+              "    for (int i = 0; i < n; ++i) {\n"
+              "        s += g(i) + v[i];\n"
+              "    }\n"
+              "    return s;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loopAlgoContainerInsert() {
@@ -5067,64 +5510,64 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        c.push_back(x);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::copy algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::copy algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_back(f(x));\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_back(x + 1);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_front(x);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::copy algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::copy algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_front(f(x));\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_front(x + 1);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_back(v);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() {\n"
               "    std::vector<int> c;\n"
               "    for(int x:v)\n"
               "        c.push_back(0);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void loopAlgoIncrement() {
@@ -5133,30 +5576,30 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        n++;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::distance algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Consider using std::distance algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        ++n;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::distance algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::distance algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v)\n"
               "        x++;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    for(int& x:v)\n"
               "        ++x;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
     }
 
     void loopAlgoConditional() {
@@ -5168,8 +5611,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::replace_if algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:15]: (style) Consider using std::replace_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "void foo() {\n"
@@ -5180,8 +5623,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:6]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:6:15]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "void foo() {\n"
@@ -5192,8 +5635,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:6]: (style) Consider using std::count_if algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:6:15]: (style) Consider using std::count_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "void foo() {\n"
@@ -5204,8 +5647,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:6]: (style) Consider using std::count_if algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:6:13]: (style) Consider using std::count_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "void foo() {\n"
@@ -5215,8 +5658,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::transform algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:15]: (style) Consider using std::transform algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "void foo() {\n"
@@ -5227,8 +5670,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:6]: (style) Consider using std::copy_if algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:6:14]: (style) Consider using std::copy_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "bool foo() {\n"
@@ -5239,9 +5682,9 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return true;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Consider using std::all_of or std::none_of algorithm instead of a raw loop.\n",
-                      errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) Consider using std::all_of or std::none_of algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
 
         check("bool pred(int x);\n"
               "bool foo() {\n"
@@ -5252,8 +5695,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return true;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::any_of algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:22]: (style) Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "void f();\n"
@@ -5265,8 +5708,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::any_of algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:22]: (style) Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "void f(int x);\n"
@@ -5278,8 +5721,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::find_if algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:22]: (style) Consider using std::find_if algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("bool pred(int x);\n"
               "bool foo() {\n"
@@ -5292,8 +5735,8 @@ class TestStl : public TestFixture {
               "    if(b) {}\n"
               "    return true;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool pred(int x);\n"
               "bool foo() {\n"
@@ -5305,8 +5748,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return true;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool pred(int x);\n"
               "bool foo() {\n"
@@ -5318,8 +5761,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return true;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool pred(int x);\n"
               "bool foo() {\n"
@@ -5330,8 +5773,8 @@ class TestStl : public TestFixture {
               "        return true;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // There is no transform_if
         check("bool pred(int x);\n"
@@ -5343,8 +5786,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool pred(int x);\n"
               "void foo() {\n"
@@ -5355,8 +5798,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool pred(int x);\n"
               "void f();\n"
@@ -5368,8 +5811,8 @@ class TestStl : public TestFixture {
               "        }\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool g(int);\n"
               "int f(const std::vector<int>& v) {\n"
@@ -5379,7 +5822,7 @@ class TestStl : public TestFixture {
               "            ret = 1;\n"
               "    return ret;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f(const std::vector<int>& v) {\n"
               "    int ret = 0;\n"
@@ -5388,7 +5831,20 @@ class TestStl : public TestFixture {
               "            ret = 1;\n"
               "    return ret;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::any_of, std::all_of, std::none_of algorithm instead of a raw loop.\n", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Consider using std::any_of, std::all_of, std::none_of algorithm instead of a raw loop.\n",
+                           "",
+                           errout_str());
+
+        check("int f(const std::vector<int>& v) {\n"
+              "    int ret = 0;\n"
+              "    for (const auto i : v)\n"
+              "        if (i < 5) {\n"
+              "            ret = 1;\n"
+              "            break;\n"
+              "        }\n"
+              "    return ret;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:20]: (style) Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("struct T {\n"
               "    std::vector<int> v0, v1;\n"
@@ -5404,7 +5860,7 @@ class TestStl : public TestFixture {
               "            v1.erase(it1);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:9]: (style) Consider using std::find_if algorithm instead of a raw loop.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:0]: (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"
@@ -5414,8 +5870,66 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Consider using std::any_of algorithm instead of a raw loop.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
+
+        check("void f() {\n" // #12064
+              "    for (const auto& animal : { \"cat\", \"bat\", \"tiger\", \"rat\" })\n"
+              "        if (std::strlen(animal) > 4)\n"
+              "            throw 1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(const std::vector<int>& v, const std::vector<int>& w, int n) {\n"
+              "    for (int i = 0; i < n; ++i)\n"
+              "        if (v[i] == w[i])\n"
+              "            return true;\n"
+              "    return false;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool f(int n) {\n"
+              "    for (int i = 0; i < n; ++i)\n"
+              "        if (g(i))\n"
+              "            return true;\n"
+              "    return false;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("bool g(int);\n"
+              "bool f(const std::vector<int>&v, int n) {\n"
+              "    bool b{};\n"
+              "    for (int i = 0; i < n; ++i) {\n"
+              "        if (v[i] > 0 && g(i)) {\n"
+              "            b = true;\n"
+              "            break;\n"
+              "        }\n"
+              "    }\n"
+              "    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() {
@@ -5424,40 +5938,81 @@ class TestStl : public TestFixture {
               "    for(int x:v)\n"
               "        n = x > n ? x : n;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::max_element algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::max_element algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        n = x < n ? x : n;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::min_element algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::min_element algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        n = x > n ? n : x;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::min_element algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::min_element algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo() {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        n = x < n ? n : x;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::max_element algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::max_element algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("void foo(int m) {\n"
               "    int n = 0;\n"
               "    for(int x:v)\n"
               "        n = x > m ? x : n;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::accumulate algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Consider using std::accumulate algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+
+        check("void f(const std::vector<int>& v) {\n" // #9091
+              "    int maxY = 0;\n"
+              "    for (int y : v) {\n"
+              "        if (y > maxY)\n"
+              "            maxY = y;\n"
+              "    }\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:18]: (style) Consider using std::max_element algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+
+        check("int f(const std::vector<int>& v) {\n"
+              "    int minY = 0;\n"
+              "    for (int y : v) {\n"
+              "        if (y < minY)\n"
+              "            minY = y;\n"
+              "    }\n"
+              "    return minY;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:18]: (style) Consider using std::min_element algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
+
+        check("int f(const std::vector<int>& v) {\n"
+              "    int max = 0;\n"
+              "    for (int i = 0; i < n; ++i)\n"
+              "        max = v[i] > max ? v[i] : max;\n"
+              "    return max;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:13]: (style) Consider using std::max_element algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
+
+        check("int f(const std::vector<int>& v) {\n"
+              "    int min = 0;\n"
+              "    for (int i = 0; i < n; ++i)\n"
+              "        min = v[i] < min ? v[i] : min;\n"
+              "    return min;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:13]: (style) Consider using std::min_element algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
     }
 
     void loopAlgoMultipleReturn()
@@ -5471,9 +6026,9 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Consider using std::any_of algorithm instead of a raw loop.\n",
-                      errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
 
         check("bool g(const std::vector<int>& v) {\n"
               "    for (auto i : v) {\n"
@@ -5484,9 +6039,9 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Consider using std::any_of algorithm instead of a raw loop.\n",
-                      errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
 
         check("bool g(const std::vector<int>& v) {\n"
               "    for (auto i : v) {\n"
@@ -5497,8 +6052,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool g(std::vector<int>& v) {\n"
               "    for (auto& i : v) {\n"
@@ -5509,8 +6064,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool g(const std::vector<int>& v, int& j) {\n"
               "    for (auto i : v) {\n"
@@ -5521,8 +6076,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool g(const std::vector<int>& v, int& j) {\n"
               "    for (auto i : v) {\n"
@@ -5534,8 +6089,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool g(const std::vector<int>& v, int& j) {\n"
               "    for (auto i : v) {\n"
@@ -5547,8 +6102,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool g(const std::vector<int>& v, int j) {\n"
               "    for (auto i : v) {\n"
@@ -5560,9 +6115,9 @@ class TestStl : public TestFixture {
               "    }\n"
               "    return false;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:2]: (style) Consider using std::all_of or std::none_of algorithm instead of a raw loop.\n",
-                      errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) Consider using std::all_of or std::none_of algorithm instead of a raw loop. [useStlAlgorithm]\n",
+                      errout_str());
 
         check("class C {\n"
               "private:\n"
@@ -5578,8 +6133,8 @@ class TestStl : public TestFixture {
               "          QDir(s);\n"
               "    }\n"
               "};\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void invalidContainer() {
@@ -5588,8 +6143,8 @@ class TestStl : public TestFixture {
               "    v.push_back(123);\n"
               "    std::cout << *v0 << std::endl;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error) Using iterator to local container 'v' that may be invalid.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:22] -> [test.cpp:3:7] -> [test.cpp:1:26] -> [test.cpp:4:19]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("std::string e();\n"
               "void a() {\n"
@@ -5600,16 +6155,16 @@ class TestStl : public TestFixture {
               "    if (d != f.end()) {}\n"
               "  }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> &v) {\n"
               "    int *v0 = &v[0];\n"
               "    v.push_back(123);\n"
               "    std::cout << (*v0)[0] << std::endl;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:1] -> [test.cpp:4]: (error) Using pointer to local variable 'v' that may be invalid.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:1:27] -> [test.cpp:2:15] -> [test.cpp:3:7] -> [test.cpp:1:26] -> [test.cpp:4:20]: (error) Using pointer to local variable 'v' that may be invalid. [invalidContainer]\n", errout_str());
 
         check("void f() {\n"
               "    std::vector<int> v = {1};\n"
@@ -5617,10 +6172,10 @@ class TestStl : public TestFixture {
               "    v.push_back(123);\n"
               "    std::cout << v0 << std::endl;\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:5]: (error) Reference to v that may be invalid.\n",
-            errout.str());
+            "[test.cpp:3:13] -> [test.cpp:3:17] -> [test.cpp:4:7] -> [test.cpp:5:18]: (error) Reference to v that may be invalid. [invalidContainerReference]\n",
+            errout_str());
 
         check("void f() {\n"
               "    std::vector<int> v = {1};\n"
@@ -5628,37 +6183,37 @@ class TestStl : public TestFixture {
               "    v.push_back(123);\n"
               "    std::cout << v0 << std::endl;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4] -> [test.cpp:5]: (error) Reference to v that may be invalid.\n",
-                      errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:13] -> [test.cpp:4:7] -> [test.cpp:5:18]: (error) Reference to v that may be invalid. [invalidContainerReference]\n",
+                      errout_str());
 
         check("void f(std::vector<int> &v) {\n"
               "    int &v0 = v.front();\n"
               "    v.push_back(123);\n"
               "    std::cout << v0 << std::endl;\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:2] -> [test.cpp:1] -> [test.cpp:3] -> [test.cpp:4]: (error) Reference to v that may be invalid.\n",
-            errout.str());
+            "[test.cpp:2:13] -> [test.cpp:2:17] -> [test.cpp:1:27] -> [test.cpp:3:7] -> [test.cpp:4:18]: (error) Reference to v that may be invalid. [invalidContainerReference]\n",
+            errout_str());
 
         check("void f(std::vector<int> &v) {\n"
               "    int &v0 = v[0];\n"
               "    v.push_back(123);\n"
               "    std::cout << v0 << std::endl;\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:1] -> [test.cpp:3] -> [test.cpp:4]: (error) Reference to v that may be invalid.\n",
-            errout.str());
+            "[test.cpp:2:13] -> [test.cpp:1:27] -> [test.cpp:3:7] -> [test.cpp:4:18]: (error) Reference to v that may be invalid. [invalidContainerReference]\n",
+            errout_str());
 
         check("void f(std::vector<int> &v) {\n"
               "    std::vector<int> *v0 = &v;\n"
               "    v.push_back(123);\n"
               "    std::cout << (*v0)[0] << std::endl;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("const std::vector<int> * g(int);\n"
               "void f() {\n"
@@ -5673,8 +6228,8 @@ class TestStl : public TestFixture {
               "        if (m == 0) {}\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("std::vector<std::string> g();\n"
               "void f() {\n"
@@ -5683,8 +6238,8 @@ class TestStl : public TestFixture {
               "    std::string z;\n"
               "    z += \"\";\n"
               "    z += y;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<char> v)\n"
               "{\n"
@@ -5695,15 +6250,15 @@ class TestStl : public TestFixture {
               "        cur = v.data();\n"
               "        end = cur + v.size();\n"
               "    }\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #9598
         check("void f(std::vector<std::string> v) {\n"
               "    for (auto it = v.begin(); it != v.end(); it = v.erase(it))\n"
               "        *it;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #9714
         check("void f() {\n"
@@ -5711,8 +6266,8 @@ class TestStl : public TestFixture {
               "  std::string x;\n"
               "  v.push_back(x.insert(0, \"x\"));\n"
               "  v.push_back(\"y\");\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #9783
         check("std::string GetTaskIDPerUUID(int);\n"
@@ -5720,8 +6275,8 @@ class TestStl : public TestFixture {
               "void foo() {\n"
               "    CString sAppID = GetTaskIDPerUUID(123).c_str();\n"
               "    InitializeJumpList(sAppID);\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
         // #9796
         check("struct A {};\n"
               "void f() {\n"
@@ -5731,8 +6286,8 @@ class TestStl : public TestFixture {
               "    A *b = v.back();\n"
               "    v.pop_back();\n"
               "    delete b;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {};\n"
               "void f() {\n"
@@ -5742,8 +6297,8 @@ class TestStl : public TestFixture {
               "    A *b = v.back();\n"
               "    v.pop_back();\n"
               "    delete b;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {};\n"
               "void f() {\n"
@@ -5753,8 +6308,8 @@ class TestStl : public TestFixture {
               "    std::shared_ptr<A> b = v.back();\n"
               "    v.pop_back();\n"
               "    delete b;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #9780
         check("int f() {\n"
@@ -5763,8 +6318,8 @@ class TestStl : public TestFixture {
               "    info.vect = &vect;\n"
               "    vect.push_back(1);\n"
               "    return info.ret;\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #9133
         check("struct Fred {\n"
@@ -5780,10 +6335,10 @@ class TestStl : public TestFixture {
               "void Fred::bar() {\n"
               "    v.push_back(0);\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:8] -> [test.cpp:12] -> [test.cpp:9]: (error) Using iterator to member container 'v' that may be invalid.\n",
-            errout.str());
+            "[test.cpp:7:44] -> [test.cpp:8:5] -> [test.cpp:12:7] -> [test.cpp:9:5]: (error) Using iterator to member container 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
 
         check("void foo(std::vector<int>& v) {\n"
               "    std::vector<int>::iterator it = v.begin();\n"
@@ -5793,10 +6348,10 @@ class TestStl : public TestFixture {
               "void bar(std::vector<int>& v) {\n"
               "    v.push_back(0);\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:1] -> [test.cpp:2] -> [test.cpp:3] -> [test.cpp:7] -> [test.cpp:1] -> [test.cpp:4]: (error) Using iterator to local container 'v' that may be invalid.\n",
-            errout.str());
+            "[test.cpp:1:29] -> [test.cpp:2:44] -> [test.cpp:3:5] -> [test.cpp:7:7] -> [test.cpp:1:28] -> [test.cpp:4:5]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
 
         // #10264
         check("void f(std::vector<std::string>& x) {\n"
@@ -5806,8 +6361,8 @@ class TestStl : public TestFixture {
               "  I i = { &x };\n"
               "  x.clear();\n"
               "  Parse(i);\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  std::string x;\n"
@@ -5822,8 +6377,8 @@ class TestStl : public TestFixture {
               "  I cb[1];\n"
               "  for (long i = 0; i < 1; ++i)\n"
               "    cb[i] = b[i];\n"
-              "}\n",true);
-        ASSERT_EQUALS("", errout.str());
+              "}\n",dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #9836
         check("void f() {\n"
@@ -5832,10 +6387,10 @@ class TestStl : public TestFixture {
               "    v.clear();\n"
               "    std::cout << *p << std::endl;\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:3] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:2] -> [test.cpp:5]: (error) Using pointer to local variable 'v' that may be invalid.\n",
-            errout.str());
+            "[test.cpp:3:24] -> [test.cpp:3:18] -> [test.cpp:3:14] -> [test.cpp:4:7] -> [test.cpp:2:10] -> [test.cpp:5:19]: (error) Using pointer to local variable 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
 
         check("struct A {\n"
               "    const std::vector<int>* i;\n"
@@ -5849,8 +6404,8 @@ class TestStl : public TestFixture {
               "    v.push_back(1);\n"
               "    return a.i->front();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    const std::vector<int>* i;\n"
@@ -5865,8 +6420,8 @@ class TestStl : public TestFixture {
               "    v.push_back(1);\n"
               "    g(a);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #10984
         check("void f() {\n"
@@ -5875,8 +6430,8 @@ class TestStl : public TestFixture {
               "    v.push_back(1);\n"
               "    g();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(std::vector<int> v) {\n"
               "    auto it = v.begin();\n"
@@ -5884,10 +6439,10 @@ class TestStl : public TestFixture {
               "    v.push_back(1);\n"
               "    g();\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:3] -> [test.cpp:4] -> [test.cpp:1] -> [test.cpp:5]: (error) Using iterator to local container 'v' that may be invalid.\n",
-            errout.str());
+            "[test.cpp:2:22] -> [test.cpp:3:33] -> [test.cpp:4:7] -> [test.cpp:1:25] -> [test.cpp:5:5]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
 
         check("void f(std::vector<int> v) {\n"
               "    auto it = v.begin();\n"
@@ -5895,10 +6450,10 @@ class TestStl : public TestFixture {
               "    v.push_back(1);\n"
               "    g();\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:4] -> [test.cpp:1] -> [test.cpp:5]: (error) Using iterator to local container 'v' that may be invalid.\n",
-            errout.str());
+            "[test.cpp:2:22] -> [test.cpp:4:7] -> [test.cpp:1:25] -> [test.cpp:5:5]: (error) Using iterator to local container 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int* p;\n"
@@ -5910,10 +6465,10 @@ class TestStl : public TestFixture {
               "    v.push_back(1);\n"
               "    a.g();\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:7] -> [test.cpp:8] -> [test.cpp:5] -> [test.cpp:9]: (error) Using object that points to local variable 'v' that may be invalid.\n",
-            errout.str());
+            "[test.cpp:7:15] -> [test.cpp:8:7] -> [test.cpp:5:25] -> [test.cpp:9:5]: (error) Using object that points to local variable 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
 
         check("struct A {\n"
               "    int*& p;\n"
@@ -5925,10 +6480,10 @@ class TestStl : public TestFixture {
               "    v.push_back(1);\n"
               "    a.g();\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:6] -> [test.cpp:7] -> [test.cpp:8] -> [test.cpp:5] -> [test.cpp:9]: (error) Using object that points to local variable 'v' that may be invalid.\n",
-            errout.str());
+            "[test.cpp:6:21] -> [test.cpp:7:9] -> [test.cpp:8:7] -> [test.cpp:5:25] -> [test.cpp:9:5]: (error) Using object that points to local variable 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
 
         // #11028
         check("void f(std::vector<int> c) {\n"
@@ -5936,8 +6491,8 @@ class TestStl : public TestFixture {
               "    c.erase(c.begin());\n"
               "    d.push_back(0);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #11147
         check("void f(std::string& s) {\n"
@@ -5946,10 +6501,10 @@ class TestStl : public TestFixture {
               "        s = s.substr(it - s.begin());\n"
               "    }\n"
               "}\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:4]: (performance) Ineffective call of function 'substr' because a prefix of the string is assigned to itself. Use resize() or pop_back() instead.\n",
-            errout.str());
+            "[test.cpp:4:13]: (performance) Ineffective call of function 'substr' because a prefix of the string is assigned to itself. Use resize() or pop_back() instead. [uselessCallsSubstr]\n",
+            errout_str());
 
         // #11630
         check("int main(int argc, const char* argv[]) {\n"
@@ -5957,8 +6512,44 @@ class TestStl : public TestFixture {
               "    args.push_back(\"-h\");\n"
               "    args.front();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::vector<int>& v) {\n" // #13108
+              "    auto it = unknown(v);\n"
+              "    auto w = std::vector<int>{ it, v.end() };\n"
+              "    v.erase(it, v.end());\n"
+              "    for (const auto& i : w) {}\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+
+        // #13410
+        check("int f(std::vector<int>& v) {\n"
+              "    const int* i = &*v.cbegin();\n"
+              "    v.push_back(1);\n"
+              "    return *i;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:1:26] -> [test.cpp:2:30] -> [test.cpp:1:26] -> [test.cpp:2:20] -> [test.cpp:2:20] -> [test.cpp:3:7] -> [test.cpp:1:25] -> [test.cpp:4:13]: (error) Using pointer to local variable 'v' that may be invalid. [invalidContainer]\n",
+            errout_str());
+
+        // #9834
+        check("struct CJ {\n"
+              "    std::string m_string1 = \"hello\";\n"
+              "};\n"
+              "void f() {\n"
+              "    std::vector<CJ> vec1;\n"
+              "    vec1.push_back(CJ());\n"
+              "    auto& a_ref = vec1.at(0).m_string1;\n"
+              "    vec1.clear();\n"
+              "    std::cout << a_ref << std::endl;\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS(
+            "[test.cpp:7:17] -> [test.cpp:7:24] -> [test.cpp:8:10] -> [test.cpp:9:18]: (error) Reference to vec1 that may be invalid. [invalidContainerReference]\n",
+            errout_str());
     }
 
     void invalidContainerLoop() {
@@ -5969,8 +6560,8 @@ class TestStl : public TestFixture {
               "            v.push_back(i * 2);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (error) Calling 'push_back' while iterating the container is invalid.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:2:5] -> [test.cpp:4:15]: (error) Calling 'push_back' while iterating the container is invalid. [invalidContainerLoop]\n", errout_str());
 
         // #9713
         check("void f() {\n"
@@ -5982,8 +6573,8 @@ class TestStl : public TestFixture {
               "    }\n"
               "  }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Consider using std::any_of algorithm instead of a raw loop.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:17]: (style) Consider using std::any_of algorithm instead of a raw loop. [useStlAlgorithm]\n", errout_str());
 
         check("struct A {\n"
               "  std::vector<int> v;\n"
@@ -5995,10 +6586,32 @@ class TestStl : public TestFixture {
               "      add(i);\n"
               "  }\n"
               "};\n",
-              true);
+              dinit(CheckOptions, $.inconclusive = true));
         ASSERT_EQUALS(
-            "[test.cpp:4] -> [test.cpp:7] -> [test.cpp:8]: (error) Calling 'add' while iterating the container is invalid.\n",
-            errout.str());
+            "[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() {
@@ -6007,8 +6620,8 @@ class TestStl : public TestFixture {
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:18]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f2(std::map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.find(x) == m.end()) {\n"
@@ -6017,24 +6630,24 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f3(std::map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
               "        m.emplace(x, 1);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f4(std::set<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:18]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f5(std::map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
@@ -6043,24 +6656,24 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f6(std::map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
               "        m.emplace(x, 1);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f1(std::unordered_set<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:18]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f2(std::unordered_map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.find(x) == m.end()) {\n"
@@ -6069,24 +6682,24 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f3(std::unordered_map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
               "        m.emplace(x, 1);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f4(std::unordered_set<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:18]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f5(std::unordered_map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
@@ -6095,16 +6708,16 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void f6(std::unordered_map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
               "        m.emplace(x, 1);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (performance) Searching before insertion is not necessary. [stlFindInsert]\n", errout_str());
 
         check("void g1(std::map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.find(x) == m.end()) {\n"
@@ -6113,8 +6726,8 @@ class TestStl : public TestFixture {
               "        m[x] = 2;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void g1(std::map<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
@@ -6123,24 +6736,24 @@ class TestStl : public TestFixture {
               "        m[x] = 2;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(QSet<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(std::multiset<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f2(std::multimap<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.find(x) == m.end()) {\n"
@@ -6149,24 +6762,24 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f3(std::multimap<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
               "        m.emplace(x, 1);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f4(std::multiset<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f5(std::multimap<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
@@ -6175,16 +6788,16 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f1(std::unordered_multiset<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f2(std::unordered_multimap<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.find(x) == m.end()) {\n"
@@ -6193,24 +6806,24 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f3(std::unordered_multimap<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
               "        m.emplace(x, 1);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f4(std::unordered_multiset<unsigned>& s, unsigned x) {\n"
               "    if (s.find(x) == s.end()) {\n"
               "        s.insert(x);\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f5(std::unordered_multimap<unsigned, unsigned>& m, unsigned x) {\n"
               "    if (m.count(x) == 0) {\n"
@@ -6219,25 +6832,31 @@ class TestStl : public TestFixture {
               "        m[x] = 1;\n"
               "    }\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         // #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, true, Standards::CPP11);
-            ASSERT_EQUALS("", errout.str());
-            check(code, true, Standards::CPP14);
-            ASSERT_EQUALS("", errout.str());
-            check(code, true, Standards::CPP17);
-            ASSERT_EQUALS("[test.cpp:3]: (performance) Searching before insertion is not necessary.\n", errout.str());
+            s.standards.cpp = Standards::CPP11;
+            check(code, s);
+            ASSERT_EQUALS("", errout_str());
+            s.standards.cpp = Standards::CPP14;
+            check(code, s);
+            ASSERT_EQUALS("", errout_str());
+            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"
@@ -6246,9 +6865,10 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}", false, Standards::CPP03);
-            ASSERT_EQUALS("", errout.str());
+                  "}", s);
+            ASSERT_EQUALS("", errout_str());
 
+            s.standards.cpp = Standards::CPP11;
             check("void foo() {\n"
                   "   std::map<int, int> x;\n"
                   "   int data = 0;\n"
@@ -6257,8 +6877,8 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}", false, Standards::CPP11);
-            ASSERT_EQUALS("[test.cpp:7]: (performance) Searching before insertion is not necessary. Instead of 'x[5]=data' consider using 'x.emplace(5, data);'.\n", errout.str());
+                  "}", 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"
                   "   std::map<int, int> x;\n"
@@ -6268,8 +6888,8 @@ class TestStl : public TestFixture {
                   "      if(x.find(5) == x.end())\n"
                   "         x[5] = data;\n"
                   "   }\n"
-                  "}");
-            ASSERT_EQUALS("[test.cpp:7]: (performance) Searching before insertion is not necessary. Instead of 'x[5]=data' consider using 'x.try_emplace(5, data);'.\n", errout.str());
+                  "}"); // 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());
         }
     }
 
@@ -6278,51 +6898,51 @@ class TestStl : public TestFixture {
               "    std::vector<int> v;\n"
               "    for(auto x:v) {}\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Iterating over container 'v' that is always empty.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:16]: (style) Iterating over container 'v' that is always empty. [knownEmptyContainer]\n", errout_str());
 
         check("void f(std::vector<int> v) {\n"
               "    v.clear();\n"
               "    for(auto x:v) {}\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Iterating over container 'v' that is always empty.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:16]: (style) Iterating over container 'v' that is always empty. [knownEmptyContainer]\n", errout_str());
 
         check("void f(std::vector<int> v) {\n"
               "    if (!v.empty()) { return; }\n"
               "    for(auto x:v) {}\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Iterating over container 'v' that is always empty.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:16]: (style) Iterating over container 'v' that is always empty. [knownEmptyContainer]\n", errout_str());
 
         check("void f(std::vector<int> v) {\n"
               "    if (v.empty()) { return; }\n"
               "    for(auto x:v) {}\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::vector<int> v;\n"
               "    std::sort(v.begin(), v.end());\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (style) Using sort with iterator 'v.begin()' that is always empty.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:22]: (style) Using sort with iterator 'v.begin()' that is always empty. [knownEmptyContainer]\n", errout_str());
 
         check("void f() {\n" // #1201
               "    std::vector<int> v1{ 0, 1 };\n"
               "    std::vector<int> v2;\n"
               "    std::copy(v1.begin(), v1.end(), v2.begin());\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (style) Using copy with iterator 'v2.begin()' that is always empty.\n", errout.str());
+              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());
 
         check("void f() {\n"
               "    std::vector<int> v;\n"
               "    v.insert(v.end(), 1);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("struct A {\n"
               "    explicit A(std::vector<int>*);\n"
@@ -6333,8 +6953,8 @@ class TestStl : public TestFixture {
               "    for(auto&& x:v) {}\n"
               "    return a;\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("static void f1(std::list<std::string>& parameters) {\n"
               "    parameters.push_back(a);\n"
@@ -6347,8 +6967,8 @@ class TestStl : public TestFixture {
               "    int res = ::f2(parameters);\n"
               "    for (auto param : parameters) {}\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace ns {\n"
               "    using ArrayType = std::vector<int>;\n"
@@ -6358,8 +6978,8 @@ class TestStl : public TestFixture {
               "    const ArrayType arr;\n"
               "    for (const auto &a : arr) {}\n"
               "}",
-              true);
-        ASSERT_EQUALS("[test.cpp:7]: (style) Iterating over container 'arr' that is always empty.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:7:26]: (style) Iterating over container 'arr' that is always empty. [knownEmptyContainer]\n", errout_str());
 
         check("struct S {\n"
               "    std::vector<int> v;\n"
@@ -6369,8 +6989,8 @@ class TestStl : public TestFixture {
               "    bar(s);\n"
               "    std::sort(s.v.begin(), s.v.end());\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(const std::vector<int>& v, int e) {\n"
               " if (!v.empty()) {\n"
@@ -6381,8 +7001,8 @@ class TestStl : public TestFixture {
               " }\n"
               " for (auto i : v) {}\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::vector<int> v;\n"
@@ -6390,8 +7010,8 @@ class TestStl : public TestFixture {
               "    rv.push_back(42);\n"
               "    for (auto i : v) {}\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("extern void f(std::string&&);\n"
               "static void func() {\n"
@@ -6399,8 +7019,38 @@ class TestStl : public TestFixture {
               "    const std::string& s_ref = s;\n"
               "    f(std::move(s));\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct S {\n" // #12757
+              "    template<class T = int>\n"
+              "    void clear() {}\n"
+              "    template<class T = int>\n"
+              "    std::vector<T> get() const { return {}; }\n"
+              "    std::vector<int> m;\n"
+              "};\n"
+              "template<> void S::clear() { m.clear(); }\n"
+              "template<> std::vector<int> S::get() const {\n"
+              "    for (const auto& i : m) {}\n"
+              "    return {};\n"
+              "}\n",
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(bool b) {\n" // #13121
+              "    static std::string s = {};\n"
+              "    for (auto c : s) {}\n"
+              "    if (b)\n"
+              "        s += \'a\';\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::vector<int>::iterator it) {\n" // #13727
+              "    std::vector<int> v;\n"
+              "    v.insert<std::vector<int>::iterator>(v.end(), it, it + 1);\n"
+              "    for (auto i : v) {}\n"
+              "}\n", dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkMutexes() {
@@ -6408,53 +7058,53 @@ class TestStl : public TestFixture {
               "    static std::mutex m;\n"
               "    static std::lock_guard<std::mutex> g(m);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) 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.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:40]: (warning) 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. [globalLockGuard]\n", errout_str());
 
         check("void f() {\n"
               "    static std::mutex m;\n"
               "    std::lock_guard<std::mutex> g(m);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    static std::mutex m;\n"
               "    static std::unique_lock<std::mutex> g(m, std::defer_lock);\n"
               "    static std::lock(g);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) 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.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:41]: (warning) 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. [globalLockGuard]\n", errout_str());
 
         check("void f() {\n"
               "    static std::mutex m;\n"
               "    std::unique_lock<std::mutex> g(m, std::defer_lock);\n"
               "    std::lock(g);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "    std::mutex m;\n"
               "    std::lock_guard<std::mutex> g(m);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:33]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself. [localMutex]\n", errout_str());
 
         check("void f() {\n"
               "    std::mutex m;\n"
               "    std::unique_lock<std::mutex> g(m);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:34]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself. [localMutex]\n", errout_str());
 
         check("void f() {\n"
               "    std::mutex m;\n"
               "    std::unique_lock<std::mutex> g(m, std::defer_lock);\n"
               "    std::lock(g);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:3]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:3:34]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself. [localMutex]\n", errout_str());
 
         check("void g();\n"
               "void f() {\n"
@@ -6463,8 +7113,8 @@ class TestStl : public TestFixture {
               "    g();\n"
               "    m.unlock();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void g();\n"
               "void f() {\n"
@@ -6473,8 +7123,8 @@ class TestStl : public TestFixture {
               "    g();\n"
               "    m.unlock();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:5]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself. [localMutex]\n", errout_str());
 
         check("class A {\n"
               "    std::mutex m;\n"
@@ -6482,8 +7132,8 @@ class TestStl : public TestFixture {
               "        std::lock_guard<std::mutex> g(m);\n"
               "    }\n"
               "};\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "    std::mutex m;\n"
@@ -6494,8 +7144,8 @@ class TestStl : public TestFixture {
               "        m.unlock();\n"
               "    }\n"
               "};\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"
               "    std::mutex m;\n"
@@ -6503,16 +7153,16 @@ class TestStl : public TestFixture {
               "        static std::lock_guard<std::mutex> g(m);\n"
               "    }\n"
               "};\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) 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.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:44]: (warning) 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. [globalLockGuard]\n", errout_str());
 
         check("std::mutex& h();\n"
               "void f() {\n"
               "    auto& m = h();\n"
               "    std::lock_guard<std::mutex> g(m);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void g();\n"
               "std::mutex& h();\n"
@@ -6522,16 +7172,16 @@ class TestStl : public TestFixture {
               "    g();\n"
               "    m.unlock();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("std::mutex& h();\n"
               "void f() {\n"
               "    auto m = h();\n"
               "    std::lock_guard<std::mutex> g(m);\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:4]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:4:33]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself. [localMutex]\n", errout_str());
 
         check("void g();\n"
               "std::mutex& h();\n"
@@ -6541,8 +7191,8 @@ class TestStl : public TestFixture {
               "    g();\n"
               "    m.unlock();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("[test.cpp:5]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself.\n", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("[test.cpp:5:5]: (warning) The lock is ineffective because the mutex is locked at the same scope as the mutex itself. [localMutex]\n", errout_str());
 
         check("void foo();\n"
               "void bar();\n"
@@ -6557,8 +7207,8 @@ class TestStl : public TestFixture {
               "    bar();\n"
               "    m.unlock();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo();\n"
               "void bar();\n"
@@ -6571,11 +7221,11 @@ class TestStl : public TestFixture {
               "    std::unique_lock<std::mutex> g{m};\n"
               "    bar();\n"
               "}\n",
-              true);
-        ASSERT_EQUALS("", errout.str());
+              dinit(CheckOptions, $.inconclusive = true));
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() { int f = 0; auto g(f); g = g; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct foobar {\n"
               "    int foo;\n"
@@ -6591,7 +7241,7 @@ class TestStl : public TestFixture {
               "        std::scoped_lock shared_multi_lock(shared_foo_lock, shared_bar_lock);\n"
               "    }\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/teststring.cpp b/test/teststring.cpp
index 61bc1e5f055..051aa870788 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-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
@@ -19,13 +19,12 @@
 
 #include "checkstring.h"
 #include "errortypes.h"
+#include "helpers.h"
 #include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
-
-#include <list>
-#include <sstream> // IWYU pragma: keep
 
+#include <cstddef>
+#include <string>
 
 class TestString : public TestFixture {
 public:
@@ -35,6 +34,7 @@ class TestString : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::style).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(stringLiteralWrite);
 
         TEST_CASE(alwaysTrueFalseStringCompare);
@@ -61,18 +61,21 @@ class TestString : public TestFixture {
         TEST_CASE(deadStrcmp);
     }
 
+    struct CheckOptions
+    {
+        bool cpp = true;
+    };
+
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
+    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..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check char variable usage..
-        runChecks<CheckString>(&tokenizer, &settings, this);
+        runChecks<CheckString>(tokenizer, this);
     }
 
     void stringLiteralWrite() {
@@ -80,25 +83,25 @@ class TestString : public TestFixture {
               "  char *abc = \"abc\";\n"
               "  abc[0] = 'a';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (error) Modifying string literal \"abc\" directly or indirectly is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (error) Modifying string literal \"abc\" directly or indirectly is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (error) Modifying string literal \"A very long stri..\" directly or indirectly is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo_FP1(char *p) {\n"
               "  p[1] = 'B';\n"
@@ -108,8 +111,8 @@ class TestString : public TestFixture {
               "  foo_FP1(s);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:2] -> [test.cpp:5]: (error) Modifying string literal \"Y\" directly or indirectly is undefined behaviour.\n",
-            errout.str());
+            "[test.cpp:2:3] -> [test.cpp:5:13]: (error) Modifying string literal \"Y\" directly or indirectly is undefined behaviour. [stringLiteralWrite]\n",
+            errout_str());
 
         check("void foo_FP1(char *p) {\n"
               "  p[1] = 'B';\n"
@@ -118,19 +121,19 @@ class TestString : public TestFixture {
               "  char s[10] = \"Y\";\n"
               "  foo_FP1(s);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  wchar_t *abc = L\"abc\";\n"
               "  abc[0] = u'a';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (error) Modifying string literal L\"abc\" directly or indirectly is undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (error) Modifying string literal u\"abc\" directly or indirectly is undefined behaviour.\n", errout.str());
+        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
               "    int i;\n"
@@ -140,7 +143,7 @@ class TestString : public TestFixture {
               "    }\n"
               "    printf(\"%s\\n\", p);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:3]: (error) Modifying string literal \"string literal\" directly or indirectly is undefined behaviour.\n", errout.str());
+        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());
     }
 
     void alwaysTrueFalseStringCompare() {
@@ -158,18 +161,18 @@ class TestString : public TestFixture {
               "  if (wcscmp(L\"A\",L\"A\")){}\n"
               "  if (wcscasecmp(L\"A\",L\"A\")){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:3]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:4]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:5]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:6]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:7]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:8]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:9]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:10]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:11]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:12]: (warning) Unnecessary comparison of static strings.\n"
-                      "[test.cpp:13]: (warning) Unnecessary comparison of static strings.\n", errout.str());
+        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"
+                      "[test.cpp:5:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:6:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:7:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:8:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:9:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:10:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:11:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:12:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n"
+                      "[test.cpp:13:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         // avoid false positives when the address is modified #6415
         check("void f(void *p, int offset)  {\n"
@@ -178,7 +181,7 @@ class TestString : public TestFixture {
               "     if (!memcmp(offset + p, p, 42)){}\n"
               "     if (!memcmp(p, offset + p, 42)){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // avoid false positives when the address is modified #6415
         check("void f(char *c, int offset)  {\n"
@@ -187,7 +190,7 @@ class TestString : public TestFixture {
               "     if (!memcmp(offset + c, c, 42)){}\n"
               "     if (!memcmp(c, offset + c, 42)){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // avoid false positives when the address is modified #6415
         check("void f(std::string s, int offset)  {\n"
@@ -196,7 +199,13 @@ class TestString : public TestFixture {
               "     if (!memcmp(offset + s.c_str(), s.c_str(), 42)){}\n"
               "     if (!memcmp(s.c_str(), offset + s.c_str(), 42)){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("int f(void) {\n" // #13527
+              "    const wchar_t* str1 = L\"Hello\";\n"
+              "    return wcsicmp(str1, str1);\n" // <<
+              "}");
+        ASSERT_EQUALS("[test.cpp:3:12]: (warning) Comparison of identical string variables. [stringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
@@ -205,17 +214,17 @@ class TestString : public TestFixture {
               "    std::cout << \"Equal\";"
               "  }"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Unnecessary comparison of static strings.\n", errout.str());
+        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) {}"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() {\n"
               "  if ($strcmp(\"00FF00\", \"00FF00\") == 0) {}"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
@@ -224,7 +233,7 @@ class TestString : public TestFixture {
               "    std::cout << \"Equal\";"
               "  }"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Unnecessary comparison of static strings.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
@@ -233,7 +242,7 @@ class TestString : public TestFixture {
               "    std::cout << \"Equal\";"
               "  }"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Unnecessary comparison of static strings.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int main()\n"
               "{\n"
@@ -242,7 +251,7 @@ class TestString : public TestFixture {
               "    std::cout << \"Equal\";"
               "  }"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main()\n"
               "{\n"
@@ -251,7 +260,7 @@ class TestString : public TestFixture {
               "    std::cout << \"Equal\";"
               "  }"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Unnecessary comparison of static strings.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:7]: (warning) Unnecessary comparison of static strings. [staticStringCompare]\n", errout_str());
 
         check("int foo(const char *buf)\n"
               "{\n"
@@ -260,7 +269,7 @@ class TestString : public TestFixture {
               "    std::cout << \"Equal\";"
               "  }"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Comparison of identical string variables.\n", errout.str());
+        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"
@@ -269,123 +278,123 @@ class TestString : public TestFixture {
               "    std::cout << \"Equal\";"
               "  }"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Comparison of identical string variables.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Unnecessary comparison of static strings.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Unnecessary comparison of static strings.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousStringCompare() {
         check("bool foo(char* c) {\n"
               "    return c == \"x\";\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal compared with variable 'c'. Did you intend to use strcmp() instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal compared with variable 'c[3]'. Did you intend to use strcmp() instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal compared with variable 'c'. Did you intend to use wcscmp() instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal compared with variable 'c'. Did you intend to use strcmp() instead?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return \"x\" == c+foo;\n"
-              "}", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return \"x\" == c+foo;\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:2]: (warning) String literal compared with variable 'c+foo'. Did you intend to use strcmp() instead?\n", errout.str());
+              "}", 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"
-              "}", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(Foo c) {\n"
               "    return \"x\" == c.foo;\n"
-              "}", "test.c");
-        ASSERT_EQUALS("[test.c:2]: (warning) String literal compared with variable 'c.foo'. Did you intend to use strcmp() instead?\n", errout.str());
+              "}", 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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(const Foo* c) {\n"
               "    return \"x\" == c->bar();\n" // #4314
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #4257
         check("bool foo() {\n"
               "MyString *str=Getter();\n"
-              "return *str==\"bug\"; }\n", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (warning) String literal compared with variable '*str'. Did you intend to use strcmp() instead?\n", errout.str());
+              "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=Getter();\n"
               "return *str==\"bug\"; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #4257
         check("bool foo() {\n"
               "MyString **str=OtherGetter();\n"
-              "return *str==\"bug\"; }", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (warning) String literal compared with variable '*str'. Did you intend to use strcmp() instead?\n", errout.str());
+              "return *str==\"bug\"; }", 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\"; }", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (warning) String literal compared with variable '&str'. Did you intend to use strcmp() instead?\n", errout.str());
+              "return &str==\"bug\"; }", 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';}", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "return c == '4';}");
+        ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == '4';}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "return c == '4';}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == \"42\"[0];}", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+              "return c == \"42\"[0];}");
+        ASSERT_EQUALS("", errout_str());
         check("int foo(char c) {\n"
-              "return c == \"42\"[0];}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "return c == \"42\"[0];}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         // 5639 String literal compared with char buffer in a struct
         check("struct Example {\n"
@@ -394,97 +403,97 @@ class TestString : public TestFixture {
               "void foo() {\n"
               "   struct Example example;\n"
               "   if (example.buffer == \"test\") ;\n"
-              "}\n", "test.cpp");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) String literal compared with variable 'example.buffer'. Did you intend to use strcmp() instead?\n", errout.str());
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:6:23]: (warning) String literal compared with variable 'example.buffer'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
         check("struct Example {\n"
               "   char buffer[200];\n"
               "};\n"
               "void foo() {\n"
               "   struct Example example;\n"
               "   if (example.buffer == \"test\") ;\n"
-              "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:6]: (warning) String literal compared with variable 'example.buffer'. Did you intend to use strcmp() instead?\n", errout.str());
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:6:23]: (warning) String literal compared with variable 'example.buffer'. Did you intend to use strcmp() instead? [literalWithCharPtrCompare]\n", errout_str());
 
         // #9726
         check("void f(std::vector<std::string> theArgs) {\n"
               "   std::string arg1(*theArgs.begin());\n"
               "   if(arg1 == \"aaa\") {}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void suspiciousStringCompare_char() {
         check("bool foo(char* c) {\n"
               "    return c == 'x';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return c[0] == '\\0';\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char** c) {\n"
               "    return c[0] == '\\0';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Char literal compared with pointer 'c[0]'. Did you intend to dereference it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Char literal compared with pointer '*c'. Did you intend to dereference it?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return *c == 0;\n"
-              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(char* c) {\n"
               "    return *c == 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("bool foo(Foo* c) {\n"
               "    return 0 == c->x;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo(char* c) {\n"
               "    if(c == '\\0') bar();\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Char literal compared with pointer 'c'. Did you intend to dereference it?\n", errout.str());
+        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';"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) Char literal compared with pointer 'a.x.str'. Did you intend to dereference it?\n", errout.str());
+        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';"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -494,7 +503,7 @@ class TestString : public TestFixture {
               "    char buf[100];\n"
               "    snprintf(buf,100,\"%s\",buf);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in snprintf().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:27]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in snprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
     void sprintf1() {
@@ -503,7 +512,7 @@ class TestString : public TestFixture {
               "    char buf[100];\n"
               "    sprintf(buf,\"%s\",buf);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:22]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
     void sprintf2() {
@@ -512,7 +521,7 @@ class TestString : public TestFixture {
               "    char buf[100];\n"
               "    sprintf(buf,\"%i\",sizeof(buf));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void sprintf3() {
@@ -522,7 +531,7 @@ class TestString : public TestFixture {
               "    sprintf(buf,\"%i\",sizeof(buf));\n"
               "    if (buf[0]);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void sprintf4() {
@@ -537,7 +546,7 @@ class TestString : public TestFixture {
               "    struct A a;\n"
               "    snprintf(a.filename, 128, \"%s\", filename);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void sprintf5() {
@@ -550,7 +559,7 @@ class TestString : public TestFixture {
               "{\n"
               "    snprintf(a->filename, 128, \"%s\", a->filename);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Undefined behavior: Variable 'a->filename' is used as parameter and destination in snprintf().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:39]: (error) Undefined behavior: Variable 'a->filename' is used as parameter and destination in snprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
     void sprintf6() {
@@ -559,7 +568,7 @@ class TestString : public TestFixture {
               "    char buf[100];\n"
               "    sprintf((char*)buf,\"%s\",(char*)buf);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:29]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
     void sprintf7() {
@@ -568,7 +577,7 @@ class TestString : public TestFixture {
               "    char buf[100];\n"
               "    sprintf((char*)(void*)buf,\"%s\",(void*)(char*)buf);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:36]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in sprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
     void wsprintf1() {
@@ -577,7 +586,7 @@ class TestString : public TestFixture {
               "    wchar_t buf[100];\n"
               "    swprintf(buf,10, \"%s\",buf);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in swprintf().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:27]: (error) Undefined behavior: Variable 'buf' is used as parameter and destination in swprintf(). [sprintfOverlappingData]\n", errout_str());
     }
 
     void strPlusChar1() {
@@ -586,7 +595,7 @@ class TestString : public TestFixture {
               "{\n"
               "    const char *p = \"/usr\" + '/';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Unusual pointer arithmetic. A value of type 'char' is added to a string literal.\n", errout.str());
+        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());
     }
 
     void strPlusChar2() {
@@ -596,7 +605,7 @@ class TestString : public TestFixture {
               "    char ch = 1;\n"
               "    const char *p = ch + \"/usr\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Strange looking pointer arithmetic..
         check("void foo()\n"
@@ -605,7 +614,7 @@ class TestString : public TestFixture {
               "    const char* psz = \"Bla\";\n"
               "    const std::string str = i + psz;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void strPlusChar3() {
@@ -615,7 +624,7 @@ class TestString : public TestFixture {
               "    std::string temp = \"/tmp\";\n"
               "    std::string path = temp + '/' + \"sub\" + '/';\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void strPlusChar4() {
@@ -624,100 +633,100 @@ class TestString : public TestFixture {
               "{\n"
               "    const wchar_t *p = L\"/usr\" + L'/';\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Unusual pointer arithmetic. A value of type 'wchar_t' is added to a string literal.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Unusual pointer arithmetic. A value of type 'wchar_t' is added to a string literal.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal \"Hello\" doesn't match length argument for substr().\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal L\"Hello\" doesn't match length argument for substr().\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    return \"Hello\" == test.substr( 0 , 4 ) ? 0 : 1 ;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal \"Hello\" doesn't match length argument for substr().\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) String literal \"Hello\" doesn't match length argument for substr().\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    if (\"Hello\") { }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    assert (\"Hello\" || test);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of string literal \"Hello\" to bool always evaluates to true.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    BOOST_ASSERT (\"Hello\" && test);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int f() {\n"
               "    return f2(\"Hello\");\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7750 warn about char literals in boolean expressions
         check("void f() {\n"
@@ -726,36 +735,114 @@ class TestString : public TestFixture {
               "  if(1 && 'c'){}\n"
               "  int x = 'd' ? 1 : 2;\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of char literal 'a' to bool always evaluates to true.\n"
-                      "[test.cpp:3]: (warning) Conversion of char literal L'b' to bool always evaluates to true.\n"
-                      "[test.cpp:4]: (warning) Conversion of char literal 'c' to bool always evaluates to true.\n"
-                      "[test.cpp:5]: (warning) Conversion of char literal 'd' to bool always evaluates to true.\n"
-                      , errout.str());
+        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"
+                      "[test.cpp:5:11]: (warning) Conversion of char literal 'd' to bool always evaluates to true. [incorrectCharBooleanError]\n"
+                      , errout_str());
 
         check("void f() {\n"
               "  if('\\0'){}\n"
               "  if(L'\\0'){}\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
 
         check("void f() {\n"
               "  if('\\0' || cond){}\n"
               "  if(L'\\0' || cond){}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of char literal '\\0' to bool always evaluates to false.\n"
-                      "[test.cpp:3]: (warning) Conversion of char literal L'\\0' to bool always evaluates to false.\n", errout.str());
+        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());
+
+        check("void f(bool b);\n" // #9450
+              "void f(std::string s);\n"
+              "void g() {\n"
+              "    f(\"abc\");\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (warning) Conversion of string literal \"abc\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
+
+        check("void g(bool);\n"
+              "    void f(std::map<std::string, std::vector<int>>&m) {\n"
+              "    if (m.count(\"abc\"))\n"
+              "        g(m[\"abc\"][0] ? true : false);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(bool b);\n"
+              "void f() {\n"
+              "    g('\\0');\n"
+              "    g('a');\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (warning) Conversion of char literal '\\0' to bool always evaluates to false. [incorrectCharBooleanError]\n"
+                      "[test.cpp:4:7]: (warning) Conversion of char literal 'a' to bool always evaluates to true. [incorrectCharBooleanError]\n",
+                      errout_str());
+
+        check("#define ERROR(msg) if (msg) printf(\"%s\\n\", msg);\n"
+              "void f() {\n"
+              "	  ERROR(\"abc\")\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void g(int, bool);\n"
+              "void f() {\n"
+              "    MyAssert(!\"abc\");\n"
+              "    g(2, !\"def\");\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4:11]: (warning) Conversion of string literal \"def\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
+
+        check("bool f(const char *p) {\n"
+              "    if (*p == '\\0')\n"
+              "        return *p == '\\0';\n"
+              "    return false;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(const int* p, const int* q) {\n"
+              "    assert((p != NULL && q != NULL) || !\"abc\");\n"
+              "    ASSERT((void*)(\"def\") == 0);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class C {\n" // #6109
+              "    void check(const char code[], bool validate = true, const char* filename = \"test.cpp\");\n"
+              "    void f() {\n"
+              "        check(\"class A<B&, C>;\", \"test.C\");\n"
+              "    }\n"
+              "};\n");
+        ASSERT_EQUALS("[test.cpp:4:34]: (warning) Conversion of string literal \"test.C\" to bool always evaluates to true. [incorrectStringBooleanError]\n", errout_str());
+
+        check("#define MACRO(C) if(!(C)) { error(__FILE__, __LINE__, __FUNCTION__, #C); return; }\n" // #13067
+              "void f() {\n"
+              "    MACRO(false && \"abc\");\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("#define strequ(s1,s2) ((void *)s1 && (void *)s2 && strcmp(s1, s2) == 0)\n" // #13093
+              "void f(const char* p) {\n"
+              "    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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) The expression 'strcmp(str,\"def\") != 0' is suspicious. It overlaps 'strcmp(str,\"abc\") == 0'.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (warning) The expression 'wcscmp(str,L\"def\") != 0' is suspicious. It overlaps 'wcscmp(str,L\"abc\") == 0'.\n", errout.str());
+        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"
               "  char *str;\n"
@@ -764,7 +851,7 @@ class TestString : public TestFixture {
               "void f(const struct X *x) {\n"
               "  if (strcmp(x->str, \"abc\") == 0 || strcmp(x->str, \"def\")) {}\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (warning) The expression 'strcmp(x->str,\"def\") != 0' is suspicious. It overlaps 'strcmp(x->str,\"abc\") == 0'.\n", errout.str());
+        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 cfead86fdd7..7896ffeb750 100644
--- a/test/testsummaries.cpp
+++ b/test/testsummaries.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
@@ -16,16 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "settings.h"
-#include "summaries.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "summaries.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
 
-
 class TestSummaries : public TestFixture {
 public:
     TestSummaries() : TestFixture("TestSummaries") {}
@@ -39,16 +36,12 @@ class TestSummaries : public TestFixture {
     }
 
 #define createSummaries(...) createSummaries_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string createSummaries_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
-
+    template<size_t size>
+    std::string createSummaries_(const char* file, int line, const char (&code)[size]) {
         // tokenize..
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
-        return Summaries::create(&tokenizer, "");
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+        return Summaries::create(tokenizer, "", 0);
     }
 
     void createSummaries1() {
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 22061415bac..58ee72f28b3 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-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
@@ -19,23 +19,23 @@
 #include "config.h"
 #include "cppcheck.h"
 #include "cppcheckexecutor.h"
+#include "errorlogger.h"
 #include "errortypes.h"
+#include "filesettings.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "processexecutor.h"
 #include "settings.h"
+#include "singleexecutor.h"
+#include "standards.h"
 #include "suppressions.h"
-#include "fixture.h"
-#include "helpers.h"
 #include "threadexecutor.h"
-#include "singleexecutor.h"
 
-#include <algorithm>
-#include <cstddef>
 #include <cstring>
-#include <functional>
 #include <list>
 #include <map>
 #include <memory>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
@@ -46,25 +46,37 @@ class TestSuppressions : public TestFixture {
 
 private:
 
+    const std::string templateFormat{"{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"};
+
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(suppressionsBadId1);
         TEST_CASE(suppressionsDosFormat);     // Ticket #1836
         TEST_CASE(suppressionsFileNameWithColon);    // Ticket #1919 - filename includes colon
         TEST_CASE(suppressionsGlob);
+        TEST_CASE(suppressionsGlobId);
         TEST_CASE(suppressionsFileNameWithExtraPath);
-        TEST_CASE(suppressionsSettings);
-        TEST_CASE(suppressionsSettingsThreads);
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
-        TEST_CASE(suppressionsSettingsProcesses);
-#endif
-        TEST_CASE(suppressionsMultiFile);
+        TEST_CASE(suppressionsSettingsFiles);
+        TEST_CASE(suppressionsSettingsFS);
+#ifdef HAS_THREADING_MODEL_THREAD
+        TEST_CASE(suppressionsSettingsThreadsFiles);
+        TEST_CASE(suppressionsSettingsThreadsFS);
+#endif // HAS_THREADING_MODEL_THREAD
+#ifdef HAS_THREADING_MODEL_FORK
+        TEST_CASE(suppressionsSettingsProcessesFiles);
+        TEST_CASE(suppressionsSettingsProcessesFS);
+#endif // HAS_THREADING_MODEL_FORK
+        TEST_CASE(suppressionsMultiFileFiles);
+        TEST_CASE(suppressionsMultiFileFS);
         TEST_CASE(suppressionsPathSeparator);
         TEST_CASE(suppressionsLine0);
         TEST_CASE(suppressionsFileComment);
 
         TEST_CASE(inlinesuppress);
-        TEST_CASE(inlinesuppress_symbolname);
+        TEST_CASE(inlinesuppress_symbolname_Files);
+        TEST_CASE(inlinesuppress_symbolname_FS);
         TEST_CASE(inlinesuppress_comment);
+        TEST_CASE(inlinesuppress_unchecked);
 
         TEST_CASE(multi_inlinesuppress);
         TEST_CASE(multi_inlinesuppress_comment);
@@ -74,19 +86,39 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(inlinesuppress_unusedFunction); // #4210 - unusedFunction
         TEST_CASE(globalsuppress_unusedFunction); // #4946
         TEST_CASE(suppressionWithRelativePaths); // #4733
-        TEST_CASE(suppressingSyntaxErrors); // #7076
-        TEST_CASE(suppressingSyntaxErrorsInline); // #5917
-        TEST_CASE(suppressingSyntaxErrorsWhileFileRead); // PR #1333
+        TEST_CASE(suppressingSyntaxErrorsFiles); // #7076
+        TEST_CASE(suppressingSyntaxErrorsFS); // #7076
+        TEST_CASE(suppressingSyntaxErrorsInlineFiles); // #5917
+        TEST_CASE(suppressingSyntaxErrorsInlineFS); // #5917
+        TEST_CASE(suppressingSimplecppErrorsWhileFileReadFiles); // PR #1333
+        TEST_CASE(suppressingSimplecppErrorsWhileFileReadFS); // PR #1333
         TEST_CASE(symbol);
 
-        TEST_CASE(unusedFunction);
+        TEST_CASE(unusedFunctionFiles);
+        TEST_CASE(unusedFunctionFS);
 
-        TEST_CASE(suppressingSyntaxErrorAndExitCode);
+        TEST_CASE(suppressingSyntaxErrorAndExitCodeFiles);
+        TEST_CASE(suppressingSyntaxErrorAndExitCodeFS);
+        TEST_CASE(suppressingSyntaxErrorAndExitCodeMultiFileFiles);
+        TEST_CASE(suppressingSyntaxErrorAndExitCodeMultiFileFS);
         TEST_CASE(suppressLocal);
+
+        TEST_CASE(suppressUnmatchedSuppressions);
+        TEST_CASE(addSuppressionDuplicate);
+        TEST_CASE(updateSuppressionState);
+        TEST_CASE(addSuppressionLineMultiple);
+
+        TEST_CASE(suppressionsParseXmlFile);
+
+        TEST_CASE(toString);
+
+        TEST_CASE(suppressionFromErrorMessage);
+
+        TEST_CASE(suppressionWildcard);
     }
 
     void suppressionsBadId1() const {
-        Suppressions suppressions;
+        SuppressionList suppressions;
         std::istringstream s1("123");
         ASSERT_EQUALS("Failed to add suppression. Invalid id \"123\"", suppressions.parseFile(s1));
 
@@ -94,8 +126,8 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS("", suppressions.parseFile(s2));
     }
 
-    static Suppressions::ErrorMessage errorMessage(const std::string &errorId) {
-        Suppressions::ErrorMessage ret;
+    static SuppressionList::ErrorMessage errorMessage(const std::string &errorId) {
+        SuppressionList::ErrorMessage ret;
         ret.errorId = errorId;
         ret.hash = 0;
         ret.lineNumber = 0;
@@ -103,8 +135,8 @@ class TestSuppressions : public TestFixture {
         return ret;
     }
 
-    static Suppressions::ErrorMessage errorMessage(const std::string &errorId, const std::string &file, int line) {
-        Suppressions::ErrorMessage ret;
+    static SuppressionList::ErrorMessage errorMessage(const std::string &errorId, const std::string &file, int line) {
+        SuppressionList::ErrorMessage ret;
         ret.errorId = errorId;
         ret.setFileName(file);
         ret.lineNumber = line;
@@ -112,7 +144,7 @@ class TestSuppressions : public TestFixture {
     }
 
     void suppressionsDosFormat() const {
-        Suppressions suppressions;
+        SuppressionList suppressions;
         std::istringstream s("abc\r\n"
                              "def\r\n");
         ASSERT_EQUALS("", suppressions.parseFile(s));
@@ -121,7 +153,7 @@ class TestSuppressions : public TestFixture {
     }
 
     void suppressionsFileNameWithColon() const {
-        Suppressions suppressions;
+        SuppressionList suppressions;
         std::istringstream s("errorid:c:\\foo.cpp\n"
                              "errorid:c:\\bar.cpp:12");
         ASSERT_EQUALS("", suppressions.parseFile(s));
@@ -133,17 +165,19 @@ class TestSuppressions : public TestFixture {
     void suppressionsGlob() const {
         // Check for syntax errors in glob
         {
-            Suppressions suppressions;
-            std::istringstream s("errorid:**.cpp\n");
-            ASSERT_EQUALS("Failed to add suppression. Invalid glob pattern '**.cpp'.", suppressions.parseFile(s));
+            SuppressionList suppressions;
+            std::istringstream s("errorid:*?.cpp\n");
+            ASSERT_EQUALS("Failed to add suppression. Invalid glob pattern '*?.cpp'.", suppressions.parseFile(s));
         }
 
         // Check that globbing works
         {
-            Suppressions suppressions;
+            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)));
@@ -152,11 +186,18 @@ 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
         {
-            Suppressions suppressions;
+            SuppressionList suppressions;
             std::istringstream s("errorid:x*.cpp\n"
                                  "errorid:xyz.cpp:1\n"
                                  "errorid:a*.cpp:1\n"
@@ -169,120 +210,210 @@ class TestSuppressions : public TestFixture {
         }
     }
 
+    void suppressionsGlobId() const {
+        SuppressionList suppressions;
+        std::istringstream s("a*\n");
+        ASSERT_EQUALS("", suppressions.parseFile(s));
+        ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("abc", "xyz.cpp", 1)));
+        ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("def", "xyz.cpp", 1)));
+    }
+
     void suppressionsFileNameWithExtraPath() const {
         // Ticket #2797
-        Suppressions suppressions;
-        suppressions.addSuppressionLine("errorid:./a.c:123");
+        SuppressionList suppressions;
+        ASSERT_EQUALS("", suppressions.addSuppressionLine("errorid:./a.c:123"));
         ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "a.c", 123)));
         ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid", "x/../a.c", 123)));
     }
 
+    unsigned int checkSuppressionFiles(const char code[], const std::string &suppression = "") {
+        return _checkSuppression(code, false, suppression);
+    }
+
+    unsigned int checkSuppressionFS(const char code[], const std::string &suppression = "") {
+        return _checkSuppression(code, true, suppression);
+    }
+
     // Check the suppression
-    unsigned int checkSuppression(const char code[], const std::string &suppression = emptyString) {
+    unsigned int _checkSuppression(const char code[], bool useFS, const std::string &suppression = "") {
         std::map<std::string, std::string> files;
         files["test.cpp"] = code;
 
-        return checkSuppression(files, suppression);
+        return _checkSuppression(files, useFS, suppression);
+    }
+
+    unsigned int checkSuppressionFiles(std::map<std::string, std::string> &f, const std::string &suppression = "") {
+        return _checkSuppression(f, false, suppression);
+    }
+
+    unsigned int checkSuppressionFS(std::map<std::string, std::string> &f, const std::string &suppression = "") {
+        return _checkSuppression(f, true, suppression);
     }
 
     // Check the suppression for multiple files
-    unsigned int checkSuppression(std::map<std::string, std::string> &f, const std::string &suppression = emptyString) {
-        // Clear the error log
-        errout.str("");
-        output.str("");
+    unsigned int _checkSuppression(std::map<std::string, std::string> &f, bool useFS, const std::string &suppression = "") {
+        std::list<FileSettings> fileSettings;
+
+        std::list<FileWithDetails> filelist;
+        for (auto i = f.cbegin(); i != f.cend(); ++i) {
+            filelist.emplace_back(i->first, Standards::Language::CPP, i->second.size());
+            if (useFS) {
+                fileSettings.emplace_back(i->first, Standards::Language::CPP, i->second.size());
+            }
+        }
 
-        std::map<std::string, std::size_t> files;
-        for (std::map<std::string, std::string>::const_iterator i = f.cbegin(); i != f.cend(); ++i) {
-            files[i->first] = i->second.size();
+        Suppressions supprs;
+        if (!suppression.empty()) {
+            ASSERT_EQUALS("", supprs.nomsg.addSuppressionLine(suppression));
         }
 
-        CppCheck cppCheck(*this, true, nullptr);
-        Settings& settings = cppCheck.settings();
+        Settings settings;
         settings.jobs = 1;
+        settings.quiet = true;
         settings.inlineSuppressions = true;
         settings.severity.enable(Severity::information);
         if (suppression == "unusedFunction")
             settings.checks.setEnabled(Checks::unusedFunction, true);
-        if (!suppression.empty()) {
-            EXPECT_EQ("", settings.nomsg.addSuppressionLine(suppression));
-        }
-        SingleExecutor executor(cppCheck, files, settings, *this);
+        settings.templateFormat = templateFormat;
+
         std::vector<std::unique_ptr<ScopedFile>> scopedfiles;
-        scopedfiles.reserve(files.size());
-        for (std::map<std::string, std::string>::const_iterator i = f.cbegin(); i != f.cend(); ++i)
+        scopedfiles.reserve(filelist.size());
+        for (auto i = f.cbegin(); i != f.cend(); ++i)
             scopedfiles.emplace_back(new ScopedFile(i->first, i->second));
 
-        const unsigned int exitCode = executor.check();
+        // clear files list so only fileSettings are used
+        if (useFS)
+            filelist.clear();
 
-        CppCheckExecutor::reportSuppressions(settings, false, files, *this);
+        CppCheck cppCheck(settings, supprs, *this, nullptr, true, nullptr);
+        SingleExecutor executor(cppCheck, filelist, fileSettings, settings, supprs, *this, nullptr);
+        unsigned int exitCode = executor.check();
+
+        const bool err = CppCheckExecutor::reportUnmatchedSuppressions(settings, supprs.nomsg, filelist, fileSettings, *this);
+        if (err && exitCode == 0)
+            exitCode = 1;
 
         return exitCode;
     }
 
-    unsigned int checkSuppressionThreads(const char code[], const std::string &suppression = emptyString) {
-        errout.str("");
-        output.str("");
+#ifdef HAS_THREADING_MODEL_THREAD
+    unsigned int checkSuppressionThreadsFiles(const char code[], const std::string &suppression = "") {
+        return _checkSuppressionThreads(code, false, suppression);
+    }
 
-        std::map<std::string, std::size_t> files;
-        files["test.cpp"] = strlen(code);
+    unsigned int checkSuppressionThreadsFS(const char code[], const std::string &suppression = "") {
+        return _checkSuppressionThreads(code, true, suppression);
+    }
 
-        Settings settings;
-        settings.jobs = 2;
-        settings.inlineSuppressions = true;
-        settings.severity.enable(Severity::information);
+    unsigned int _checkSuppressionThreads(const char code[], bool useFS, const std::string &suppression = "") {
+        std::list<FileSettings> fileSettings;
+
+        std::list<FileWithDetails> filelist;
+        filelist.emplace_back("test.cpp", Standards::Language::CPP, strlen(code));
+        if (useFS) {
+            fileSettings.emplace_back("test.cpp", Standards::Language::CPP, strlen(code));
+        }
+
+        const auto settings = dinit(Settings,
+                                    $.jobs = 2,
+                                        $.quiet = true,
+                                        $.inlineSuppressions = true,
+                                        $.severity.enable (Severity::information),
+                                        $.templateFormat = templateFormat);
+
+        Suppressions supprs;
         if (!suppression.empty()) {
-            EXPECT_EQ("", settings.nomsg.addSuppressionLine(suppression));
+            ASSERT_EQUALS("", supprs.nomsg.addSuppressionLine(suppression));
         }
-        ThreadExecutor executor(files, settings, *this);
+
         std::vector<std::unique_ptr<ScopedFile>> scopedfiles;
-        scopedfiles.reserve(files.size());
-        for (std::map<std::string, std::size_t>::const_iterator i = files.cbegin(); i != files.cend(); ++i)
-            scopedfiles.emplace_back(new ScopedFile(i->first, code));
+        scopedfiles.reserve(filelist.size());
+        for (auto i = filelist.cbegin(); i != filelist.cend(); ++i)
+            scopedfiles.emplace_back(new ScopedFile(i->path(), code));
+
+        // clear files list so only fileSettings are used
+        if (useFS)
+            filelist.clear();
 
-        const unsigned int exitCode = executor.check();
+        ThreadExecutor executor(filelist, fileSettings, settings, supprs, *this, nullptr, CppCheckExecutor::executeCommand);
+        unsigned int exitCode = executor.check();
 
-        CppCheckExecutor::reportSuppressions(settings, false, files, *this);
+        const bool err = CppCheckExecutor::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__)
-    unsigned int checkSuppressionProcesses(const char code[], const std::string &suppression = emptyString) {
-        errout.str("");
-        output.str("");
+#ifdef HAS_THREADING_MODEL_FORK
+    unsigned int checkSuppressionProcessesFiles(const char code[], const std::string &suppression = "") {
+        return _checkSuppressionProcesses(code, false, suppression);
+    }
 
-        std::map<std::string, std::size_t> files;
-        files["test.cpp"] = strlen(code);
+    unsigned int checkSuppressionProcessesFS(const char code[], const std::string &suppression = "") {
+        return _checkSuppressionProcesses(code, true, suppression);
+    }
 
-        Settings settings;
-        settings.jobs = 2;
-        settings.inlineSuppressions = true;
+    unsigned int _checkSuppressionProcesses(const char code[], bool useFS, const std::string &suppression = "") {
+        std::list<FileSettings> fileSettings;
+
+        std::list<FileWithDetails> filelist;
+        filelist.emplace_back("test.cpp", Standards::Language::CPP, strlen(code));
+        if (useFS) {
+            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;
+
+        Suppressions supprs;
         if (!suppression.empty()) {
-            EXPECT_EQ("", settings.nomsg.addSuppressionLine(suppression));
+            ASSERT_EQUALS("", supprs.nomsg.addSuppressionLine(suppression));
         }
-        ProcessExecutor executor(files, settings, *this);
+
         std::vector<std::unique_ptr<ScopedFile>> scopedfiles;
-        scopedfiles.reserve(files.size());
-        for (std::map<std::string, std::size_t>::const_iterator i = files.cbegin(); i != files.cend(); ++i)
-            scopedfiles.emplace_back(new ScopedFile(i->first, code));
+        scopedfiles.reserve(filelist.size());
+        for (auto i = filelist.cbegin(); i != filelist.cend(); ++i)
+            scopedfiles.emplace_back(new ScopedFile(i->path(), code));
 
-        const unsigned int exitCode = executor.check();
+        // clear files list so only fileSettings are used
+        if (useFS)
+            filelist.clear();
 
-        CppCheckExecutor::reportSuppressions(settings, false, files, *this);
+        ProcessExecutor executor(filelist, fileSettings, settings, supprs, *this, nullptr, CppCheckExecutor::executeCommand);
+        unsigned int exitCode = executor.check();
+
+        const bool err = CppCheckExecutor::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 error is present
+        // check to make sure the appropriate errors are present
         ASSERT_EQUALS(1, (this->*check)("void f() {\n"
                                         "    int a;\n"
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n"
+                      "[test.cpp:5:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
 
         // suppress uninitvar globally
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -290,15 +421,76 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         "uninitvar"));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        ASSERT_EQUALS(1, (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 [invalidSuppression]\n"
+                      "[test.cpp:4:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
+
+        ASSERT_EQUALS(1, (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 [invalidSuppression]\n"
+                      "[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
+
+        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());
+
+        ASSERT_EQUALS(0, (this->*check)("/* Fake file description\n"
+                                        " * End\n"
+                                        " */\n"
+                                        "\n"
+                                        "// cppcheck-suppress-file uninitvar\n"
+                                        "\n"
+                                        "void f() {\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("", errout_str());
+
+        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\n", errout.str());
+        ASSERT_EQUALS("(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:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // suppress uninitvar for this file only
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -306,15 +498,15 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         "uninitvar:test.cpp"));
-        ASSERT_EQUALS("", errout.str());
+        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\n", errout.str());
+        ASSERT_EQUALS(1, (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());
 
         // suppress all for this file only
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -322,15 +514,15 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         "*:test.cpp"));
-        ASSERT_EQUALS("", errout.str());
+        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: *\n", errout.str());
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        "*:test.cpp"));
+        ASSERT_EQUALS("[test.cpp]: (information) Unmatched suppression: * [unmatchedSuppression]\n", errout_str());
 
         // suppress uninitvar for this file and line
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -338,15 +530,15 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         "uninitvar:test.cpp:3"));
-        ASSERT_EQUALS("", errout.str());
+        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("[test.cpp:3]: (information) Unmatched suppression: uninitvar\n", errout.str());
+        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
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -355,7 +547,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -365,7 +557,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -373,7 +565,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;// cppcheck-suppress uninitvar\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -382,7 +574,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -392,7 +584,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -400,7 +592,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;/* cppcheck-suppress uninitvar */\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -409,7 +601,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -420,7 +612,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -428,7 +620,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;// cppcheck-suppress[uninitvar]\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -437,7 +629,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -447,7 +639,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -455,7 +647,7 @@ class TestSuppressions : public TestFixture {
                                         "    a++;/* cppcheck-suppress[uninitvar]*/\n"
                                         "}\n",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // suppress uninitvar inline, with asm before (#6813)
         ASSERT_EQUALS(0, (this->*check)("void f() {\n"
@@ -467,16 +659,279 @@ class TestSuppressions : public TestFixture {
                                         "    a++;\n"
                                         "}",
                                         ""));
-        ASSERT_EQUALS("", errout.str());
+        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]: (information) Unmatched suppression: uninitvar\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:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
+
+        // suppress block inline checks
+        ASSERT_EQUALS(0, (this->*check)("void f() {\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:2:0]: (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());
+
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    a++;\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:6:0]: (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:0]: (error) unknown suppression type 'cppcheck-suppress:' [invalidSuppression]\n"
+                      "[test.cpp:2:0]: (error) unknown suppression type 'cppcheck-suppress-unknown' [invalidSuppression]\n"
+                      "[test.cpp:3:0]: (error) unknown suppression type 'cppcheck-suppress-begin-unknown' [invalidSuppression]\n"
+                      "[test.cpp:6:0]: (error) unknown suppression type 'cppcheck-suppress-end-unknown' [invalidSuppression]\n"
+                      "[test.cpp:4:0]: (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:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:7:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:10:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:8:0]: (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:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:2:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:3:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:4:0]: (error) suppression without error ID [invalidSuppression]\n"
+                      "[test.cpp:6:0]: (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"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin uninitvar\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end uninitvar\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin[uninitvar]\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end[uninitvar]\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
+
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    // cppcheck-suppress-begin [uninitvar]\n"
+                                        "    a++;\n"
+                                        "    // cppcheck-suppress-end [uninitvar]\n"
+                                        "    int b;\n"
+                                        "    b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:7:5]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
+
+        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());
+
+        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());
+
+        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());
+
+        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:0]: (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:0]: (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]",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:1:0]: (information) Unmatched suppression: syntaxError [unmatchedSuppression]\n", errout_str());
+
+        // test of multiple suppression types
+        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());
+
+        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());
+
+        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());
+
+        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());
+
+        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:0]: (information) Unmatched suppression: uninitvar [unmatchedSuppression]\n", errout_str());
 
         // #5746 - exitcode
         ASSERT_EQUALS(1U,
@@ -484,28 +939,59 @@ class TestSuppressions : public TestFixture {
                                      "  int a; return a;\n"
                                      "}\n",
                                      ""));
+        ASSERT_EQUALS("[test.cpp:2:17]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
+
         ASSERT_EQUALS(0U,
                       (this->*check)("int f() {\n"
                                      "  int a; return a;\n"
                                      "}\n",
                                      "uninitvar"));
+        ASSERT_EQUALS("", errout_str());
+
+        // 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());
     }
 
-    void suppressionsSettings() {
-        runChecks(&TestSuppressions::checkSuppression);
+    void suppressionsSettingsFiles() {
+        runChecks(&TestSuppressions::checkSuppressionFiles);
     }
 
-    void suppressionsSettingsThreads() {
-        runChecks(&TestSuppressions::checkSuppressionThreads);
+    void suppressionsSettingsFS() {
+        runChecks(&TestSuppressions::checkSuppressionFS);
     }
 
-#if !defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
-    void suppressionsSettingsProcesses() {
-        runChecks(&TestSuppressions::checkSuppressionProcesses);
+#ifdef HAS_THREADING_MODEL_THREAD
+    void suppressionsSettingsThreadsFiles() {
+        runChecks(&TestSuppressions::checkSuppressionThreadsFiles);
     }
-#endif
 
-    void suppressionsMultiFile() {
+    void suppressionsSettingsThreadsFS() {
+        runChecks(&TestSuppressions::checkSuppressionThreadsFS);
+    }
+#endif // HAS_THREADING_MODEL_THREAD
+
+#ifdef HAS_THREADING_MODEL_FORK
+    void suppressionsSettingsProcessesFiles() {
+        runChecks(&TestSuppressions::checkSuppressionProcessesFiles);
+    }
+
+    void suppressionsSettingsProcessesFS() {
+        runChecks(&TestSuppressions::checkSuppressionProcessesFS);
+    }
+#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;
         files["abc.cpp"] = "void f() {\n"
                            "}\n";
@@ -515,92 +1001,156 @@ class TestSuppressions : public TestFixture {
                            "}\n";
 
         // suppress uninitvar for this file and line
-        ASSERT_EQUALS(0, checkSuppression(files, "uninitvar:xyz.cpp:3"));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(0, (this->*check)(files, "uninitvar:xyz.cpp:3"));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void suppressionsMultiFileFiles() {
+        suppressionsMultiFileInternal(&TestSuppressions::checkSuppressionFiles);
     }
 
+    void suppressionsMultiFileFS() {
+        suppressionsMultiFileInternal(&TestSuppressions::checkSuppressionFS);
+    }
+
+    // TODO: this tests an internal function - should it be private?
     void suppressionsPathSeparator() const {
-        const Suppressions::Suppression s1("*", "test/foo/*");
-        ASSERT_EQUALS(true, s1.isSuppressed(errorMessage("someid", "test/foo/bar.cpp", 142)));
+        const SuppressionList::Suppression s1("*", "test/foo/*");
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Matched, s1.isSuppressed(errorMessage("someid", "test/foo/bar.cpp", 142)));
 
-        const Suppressions::Suppression s2("abc", "include/1.h");
-        ASSERT_EQUALS(true, s2.isSuppressed(errorMessage("abc", "include/1.h", 142)));
+        const SuppressionList::Suppression s2("abc", "include/1.h");
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Matched, s2.isSuppressed(errorMessage("abc", "include/1.h", 142)));
     }
 
     void suppressionsLine0() const {
-        Suppressions suppressions;
-        suppressions.addSuppressionLine("syntaxError:*:0");
+        SuppressionList suppressions;
+        ASSERT_EQUALS("", suppressions.addSuppressionLine("syntaxError:*:0"));
         ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("syntaxError", "test.cpp", 0)));
     }
 
     void suppressionsFileComment() const {
         std::istringstream file1("# comment\n"
                                  "abc");
-        Suppressions suppressions1;
-        suppressions1.parseFile(file1);
+        SuppressionList suppressions1;
+        ASSERT_EQUALS("", suppressions1.parseFile(file1));
         ASSERT_EQUALS(true, suppressions1.isSuppressed(errorMessage("abc", "test.cpp", 123)));
 
         std::istringstream file2("// comment\n"
                                  "abc");
-        Suppressions suppressions2;
-        suppressions2.parseFile(file2);
+        SuppressionList suppressions2;
+        ASSERT_EQUALS("", suppressions2.parseFile(file2));
         ASSERT_EQUALS(true, suppressions2.isSuppressed(errorMessage("abc", "test.cpp", 123)));
 
         std::istringstream file3("abc // comment");
-        Suppressions suppressions3;
-        suppressions3.parseFile(file3);
+        SuppressionList suppressions3;
+        ASSERT_EQUALS("", suppressions3.parseFile(file3));
         ASSERT_EQUALS(true, suppressions3.isSuppressed(errorMessage("abc", "test.cpp", 123)));
 
         std::istringstream file4("abc\t\t # comment");
-        Suppressions suppressions4;
-        suppressions4.parseFile(file4);
+        SuppressionList suppressions4;
+        ASSERT_EQUALS("", suppressions4.parseFile(file4));
         ASSERT_EQUALS(true, suppressions4.isSuppressed(errorMessage("abc", "test.cpp", 123)));
 
         std::istringstream file5("abc:test.cpp\t\t # comment");
-        Suppressions suppressions5;
-        suppressions5.parseFile(file5);
+        SuppressionList suppressions5;
+        ASSERT_EQUALS("", suppressions5.parseFile(file5));
         ASSERT_EQUALS(true, suppressions5.isSuppressed(errorMessage("abc", "test.cpp", 123)));
 
         std::istringstream file6("abc:test.cpp:123\t\t # comment with . inside");
-        Suppressions suppressions6;
-        suppressions6.parseFile(file6);
+        SuppressionList suppressions6;
+        ASSERT_EQUALS("", suppressions6.parseFile(file6));
         ASSERT_EQUALS(true, suppressions6.isSuppressed(errorMessage("abc", "test.cpp", 123)));
+
+        std::istringstream file7(" // comment\n" // #11450
+                                 "abc");
+        SuppressionList suppressions7;
+        ASSERT_EQUALS("", suppressions7.parseFile(file7));
+        ASSERT_EQUALS(true, suppressions7.isSuppressed(errorMessage("abc", "test.cpp", 123)));
     }
 
     void inlinesuppress() const {
-        Suppressions::Suppression s;
+        SuppressionList::Suppression s;
         std::string msg;
+
+        // Suppress without attribute
         ASSERT_EQUALS(false, s.parseComment("/* some text */", &msg));
         ASSERT_EQUALS(false, s.parseComment("/* cppcheck-suppress */", &msg));
+        ASSERT_EQUALS(false, s.parseComment("/* cppcheck-suppress-file  */", &msg));
+        ASSERT_EQUALS(false, s.parseComment("/* cppcheck-suppress-begin */", &msg));
+        ASSERT_EQUALS(false, s.parseComment("/* cppcheck-suppress-end */", &msg));
 
+        // Correct suppress
         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));
+        ASSERT_EQUALS("", msg);
+
+        msg.clear();
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress-begin id */", &msg));
+        ASSERT_EQUALS("", msg);
+
+        msg.clear();
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress-end id */", &msg));
+        ASSERT_EQUALS("", msg);
+
+        // Bad cppcheck-suppress comment
+        ASSERT_EQUALS(false, s.parseComment("/* cppcheck-suppress-beggin id */", &msg));
+
+        // Bad attribute construction
+        const std::string badSuppressionAttribute = "Bad suppression attribute 'some'. You can write comments in the comment after a ; or //. Valid suppression attributes; symbolName=sym";
 
         ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress id some text */", &msg));
-        ASSERT_EQUALS("Bad suppression attribute 'some'. You can write comments in the comment after a ; or //. Valid suppression attributes; symbolName=sym", msg);
+        ASSERT_EQUALS(badSuppressionAttribute, msg);
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress-file id some text */", &msg));
+        ASSERT_EQUALS(badSuppressionAttribute, msg);
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress-begin id some text */", &msg));
+        ASSERT_EQUALS(badSuppressionAttribute, msg);
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress-end id some text */", &msg));
+        ASSERT_EQUALS(badSuppressionAttribute, msg);
     }
 
-    void inlinesuppress_symbolname() {
-        ASSERT_EQUALS(0, checkSuppression("void f() {\n"
-                                          "    int a;\n"
-                                          "    /* cppcheck-suppress uninitvar symbolName=a */\n"
-                                          "    a++;\n"
-                                          "}\n",
-                                          ""));
-        ASSERT_EQUALS("", errout.str());
+    void inlinesuppress_symbolname_Internal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
+        ASSERT_EQUALS(0, (this->*check)("void f() {\n"
+                                        "    int a;\n"
+                                        "    /* cppcheck-suppress uninitvar symbolName=a */\n"
+                                        "    a++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("", errout_str());
 
-        ASSERT_EQUALS(1, checkSuppression("void f() {\n"
-                                          "    int a,b;\n"
-                                          "    /* cppcheck-suppress uninitvar symbolName=b */\n"
-                                          "    a++; b++;\n"
-                                          "}\n",
-                                          ""));
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS(1, (this->*check)("void f() {\n"
+                                        "    int a,b;\n"
+                                        "    /* cppcheck-suppress uninitvar symbolName=b */\n"
+                                        "    a++; b++;\n"
+                                        "}\n",
+                                        ""));
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
+    }
+
+    void inlinesuppress_symbolname_Files() {
+        inlinesuppress_symbolname_Internal(&TestSuppressions::checkSuppressionFiles);
+    }
+
+    void inlinesuppress_symbolname_FS() {
+        inlinesuppress_symbolname_Internal(&TestSuppressions::checkSuppressionFS);
     }
 
     void inlinesuppress_comment() const {
-        Suppressions::Suppression s;
+        SuppressionList::Suppression s;
         std::string errMsg;
         ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc ; some comment", &errMsg));
         ASSERT_EQUALS("", errMsg);
@@ -610,33 +1160,88 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS("", errMsg);
     }
 
+    // TODO: tests internal function - should it be private?
+    void inlinesuppress_unchecked() const {
+        SuppressionList::Suppression s;
+        std::string errMsg;
+        ASSERT_EQUALS(true, s.parseComment("// cppcheck-suppress abc", &errMsg));
+        ASSERT_EQUALS("", errMsg);
+        s.lineNumber = 5;
+
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::None, s.isSuppressed(errorMessage("id", "test.cpp", 11)));
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Checked, s.isSuppressed(errorMessage("id", "test.cpp", 5)));
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Matched, s.isSuppressed(errorMessage("abc", "test.cpp", 5)));
+    }
+
     void multi_inlinesuppress() const {
-        std::vector<Suppressions::Suppression> suppressions;
+        std::vector<SuppressionList::Suppression> suppressions;
         std::string errMsg;
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId]", &errMsg);
+        ASSERT_EQUALS(1, suppressions.size());
+        ASSERT_EQUALS("errorId", suppressions[0].errorId);
+        ASSERT_EQUALS("", suppressions[0].symbolName);
+        ASSERT_EQUALS("", errMsg);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress-begin[errorId]", &errMsg);
+        ASSERT_EQUALS(1, suppressions.size());
+        ASSERT_EQUALS("errorId", suppressions[0].errorId);
+        ASSERT_EQUALS("", suppressions[0].symbolName);
+        ASSERT_EQUALS("", errMsg);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress-begin [errorId]", &errMsg);
+        ASSERT_EQUALS(1, suppressions.size());
+        ASSERT_EQUALS("errorId", suppressions[0].errorId);
+        ASSERT_EQUALS("", suppressions[0].symbolName);
+        ASSERT_EQUALS("", errMsg);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress-end[errorId]", &errMsg);
+        ASSERT_EQUALS(1, suppressions.size());
+        ASSERT_EQUALS("errorId", suppressions[0].errorId);
+        ASSERT_EQUALS("", suppressions[0].symbolName);
+        ASSERT_EQUALS("", errMsg);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress-end [errorId]", &errMsg);
         ASSERT_EQUALS(1, suppressions.size());
         ASSERT_EQUALS("errorId", suppressions[0].errorId);
         ASSERT_EQUALS("", suppressions[0].symbolName);
         ASSERT_EQUALS("", errMsg);
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId symbolName=arr]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress-file[errorId]", &errMsg);
+        ASSERT_EQUALS(1, suppressions.size());
+        ASSERT_EQUALS("errorId", suppressions[0].errorId);
+        ASSERT_EQUALS("", suppressions[0].symbolName);
+        ASSERT_EQUALS("", errMsg);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress-file [errorId]", &errMsg);
+        ASSERT_EQUALS(1, suppressions.size());
+        ASSERT_EQUALS("errorId", suppressions[0].errorId);
+        ASSERT_EQUALS("", suppressions[0].symbolName);
+        ASSERT_EQUALS("", errMsg);
+
+        errMsg = "";
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId symbolName=arr]", &errMsg);
         ASSERT_EQUALS(1, suppressions.size());
         ASSERT_EQUALS("errorId", suppressions[0].errorId);
         ASSERT_EQUALS("arr", suppressions[0].symbolName);
         ASSERT_EQUALS("", errMsg);
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId symbolName=]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId symbolName=]", &errMsg);
         ASSERT_EQUALS(1, suppressions.size());
         ASSERT_EQUALS("errorId", suppressions[0].errorId);
         ASSERT_EQUALS("", suppressions[0].symbolName);
         ASSERT_EQUALS("", errMsg);
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId1, errorId2 symbolName=arr]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId1, errorId2 symbolName=arr]", &errMsg);
         ASSERT_EQUALS(2, suppressions.size());
         ASSERT_EQUALS("errorId1", suppressions[0].errorId);
         ASSERT_EQUALS("", suppressions[0].symbolName);
@@ -645,99 +1250,99 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS("", errMsg);
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[]", &errMsg);
         ASSERT_EQUALS(0, suppressions.size());
         ASSERT_EQUALS(true, errMsg.empty());
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId", &errMsg);
         ASSERT_EQUALS(0, suppressions.size());
         ASSERT_EQUALS(false, errMsg.empty());
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress errorId", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress errorId", &errMsg);
         ASSERT_EQUALS(0, suppressions.size());
         ASSERT_EQUALS(false, errMsg.empty());
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId1 errorId2 symbolName=arr]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId1 errorId2 symbolName=arr]", &errMsg);
         ASSERT_EQUALS(0, suppressions.size());
         ASSERT_EQUALS(false, errMsg.empty());
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId1, errorId2 symbol=arr]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId1, errorId2 symbol=arr]", &errMsg);
         ASSERT_EQUALS(0, suppressions.size());
         ASSERT_EQUALS(false, errMsg.empty());
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("// cppcheck-suppress[errorId1, errorId2 symbolName]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("// cppcheck-suppress[errorId1, errorId2 symbolName]", &errMsg);
         ASSERT_EQUALS(0, suppressions.size());
         ASSERT_EQUALS(false, errMsg.empty());
     }
 
     void multi_inlinesuppress_comment() const {
-        std::vector<Suppressions::Suppression> suppressions;
+        std::vector<SuppressionList::Suppression> suppressions;
         std::string errMsg;
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr]", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr]", &errMsg);
         ASSERT_EQUALS(2, suppressions.size());
         ASSERT_EQUALS(true, errMsg.empty());
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr] some text", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("//cppcheck-suppress[errorId1, errorId2 symbolName=arr] some text", &errMsg);
         ASSERT_EQUALS(2, suppressions.size());
         ASSERT_EQUALS(true, errMsg.empty());
 
         errMsg = "";
-        suppressions=Suppressions::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr]*/", &errMsg);
+        suppressions=SuppressionList::parseMultiSuppressComment("/*cppcheck-suppress[errorId1, errorId2 symbolName=arr]*/", &errMsg);
         ASSERT_EQUALS(2, suppressions.size());
         ASSERT_EQUALS(true, errMsg.empty());
     }
 
     void globalSuppressions() { // Testing that Cppcheck::useGlobalSuppressions works (#8515)
-        errout.str("");
+        const auto settings = dinit(Settings,
+                                    $.quiet = true,
+                                        $.exitCode = 1,
+                                        $.templateFormat = templateFormat);
+
+        Suppressions supprs;
+        ASSERT_EQUALS("", supprs.nomsg.addSuppressionLine("uninitvar"));
 
-        CppCheck cppCheck(*this, false, nullptr); // <- do not "use global suppressions". pretend this is a thread that just checks a file.
-        Settings& settings = cppCheck.settings();
-        settings.nomsg.addSuppressionLine("uninitvar");
-        settings.exitCode = 1;
+        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("test.c", code)); // <- no unsuppressed error is seen
-        ASSERT_EQUALS("[test.c:1]: (error) Uninitialized variable: a\n", errout.str()); // <- report error so ThreadExecutor can suppress it and make sure the global suppression is matched.
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("test.c", Standards::Language::C, 0),code, sizeof(code))); // <- 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.
     }
 
     void inlinesuppress_unusedFunction() const { // #4210, #4946 - wrong report of "unmatchedSuppression" for "unusedFunction"
-        Suppressions suppressions;
-        Suppressions::Suppression suppression("unusedFunction", "test.c", 3);
+        SuppressionList suppressions;
+        SuppressionList::Suppression suppression("unusedFunction", "test.c", 3);
         suppression.checked = true; // have to do this because fixes for #5704
-        suppressions.addSuppression(std::move(suppression));
-        ASSERT_EQUALS(true, !suppressions.getUnmatchedLocalSuppressions("test.c", true).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedGlobalSuppressions(true).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedLocalSuppressions("test.c", false).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedGlobalSuppressions(false).empty());
+        ASSERT_EQUALS("", suppressions.addSuppression(std::move(suppression)));
+        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"
-        Suppressions suppressions;
-        suppressions.addSuppressionLine("unusedFunction:*");
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedLocalSuppressions("test.c", true).empty());
-        ASSERT_EQUALS(true, !suppressions.getUnmatchedGlobalSuppressions(true).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedLocalSuppressions("test.c", false).empty());
-        ASSERT_EQUALS(false, !suppressions.getUnmatchedGlobalSuppressions(false).empty());
+        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)).empty());
+        ASSERT_EQUALS(true, !suppressions.getUnmatchedGlobalSuppressions().empty());
     }
 
     void suppressionWithRelativePaths() {
-        // Clear the error log
-        errout.str("");
+        Suppressions supprs;
 
-        CppCheck cppCheck(*this, true, nullptr);
-        Settings& settings = cppCheck.settings();
+        Settings settings;
+        settings.quiet = true;
         settings.severity.enable(Severity::style);
         settings.inlineSuppressions = true;
         settings.relativePaths = true;
         settings.basePaths.emplace_back("/somewhere");
+        settings.templateFormat = templateFormat;
         const char code[] =
             "struct Point\n"
             "{\n"
@@ -746,18 +1351,27 @@ class TestSuppressions : public TestFixture {
             "    // cppcheck-suppress unusedStructMember\n"
             "    int y;\n"
             "};";
-        cppCheck.check("/somewhere/test.cpp", code);
-        ASSERT_EQUALS("",errout.str());
+        CppCheck cppCheck(settings, supprs, *this, nullptr, true, nullptr);
+        ASSERT_EQUALS(0, cppCheck.checkBuffer(FileWithDetails("/somewhere/test.cpp", Standards::Language::CPP, 0), code, sizeof(code)));
+        ASSERT_EQUALS("",errout_str());
     }
 
-    void suppressingSyntaxErrors() { // syntaxErrors should be suppressible (#7076)
+    void suppressingSyntaxErrorsInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) { // syntaxErrors should be suppressible (#7076)
         const char code[] = "if if\n";
 
-        ASSERT_EQUALS(0, checkSuppression(code, "syntaxError:test.cpp:1"));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(0, (this->*check)(code, "syntaxError:test.cpp:1"));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void suppressingSyntaxErrorsFiles() {
+        suppressingSyntaxErrorsInternal(&TestSuppressions::checkSuppressionFiles);
+    }
+
+    void suppressingSyntaxErrorsFS() {
+        suppressingSyntaxErrorsInternal(&TestSuppressions::checkSuppressionFiles);
     }
 
-    void suppressingSyntaxErrorsInline() { // syntaxErrors should be suppressible (#5917)
+    void suppressingSyntaxErrorsInlineInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) { // syntaxErrors should be suppressible (#5917)
         const char code[] = "double result(0.0);\n"
                             "_asm\n"
                             "{\n"
@@ -768,11 +1382,19 @@ class TestSuppressions : public TestFixture {
                             "   fstp  QWORD PTR result  ; store a double (8 bytes)\n"
                             "   pop   EAX               ; restore EAX\n"
                             "}";
-        ASSERT_EQUALS(0, checkSuppression(code, ""));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(0, (this->*check)(code, ""));
+        ASSERT_EQUALS("", errout_str());
     }
 
-    void suppressingSyntaxErrorsWhileFileRead() { // syntaxError while file read should be suppressible (PR #1333)
+    void suppressingSyntaxErrorsInlineFiles() {
+        suppressingSyntaxErrorsInlineInternal(&TestSuppressions::checkSuppressionFiles);
+    }
+
+    void suppressingSyntaxErrorsInlineFS() {
+        suppressingSyntaxErrorsInlineInternal(&TestSuppressions::checkSuppressionFS);
+    }
+
+    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"
@@ -786,55 +1408,68 @@ class TestSuppressions : public TestFixture {
                             "[!VAR \"BC\" = \"$BC + 1\"!][!//\n"
                             "[!ENDIF!][!//\n"
                             "};";
-        ASSERT_EQUALS(0, checkSuppression(code, "syntaxError:test.cpp:4"));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS(0, (this->*check)(code, "syntaxError:test.cpp:4"));
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void suppressingSimplecppErrorsWhileFileReadFiles() {
+        suppressingSimplecppErrorsWhileFileReadInternal(&TestSuppressions::checkSuppressionFiles);
+    }
+
+    void suppressingSimplecppErrorsWhileFileReadFS() {
+        suppressingSimplecppErrorsWhileFileReadInternal(&TestSuppressions::checkSuppressionFiles);
     }
 
+    // TODO: this tests an internal function - should it be private?
     void symbol() const {
-        Suppressions::Suppression s;
+        SuppressionList::Suppression s;
+        s.fileName = "test.cpp";
         s.errorId = "foo";
         s.symbolName = "array*";
 
-        Suppressions::ErrorMessage errorMsg;
+        SuppressionList::ErrorMessage errorMsg;
         errorMsg.errorId = "foo";
+        errorMsg.symbolNames = "";
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::None, s.isSuppressed(errorMsg));
         errorMsg.setFileName("test.cpp");
         errorMsg.lineNumber = 123;
-        errorMsg.symbolNames = "";
-        ASSERT_EQUALS(false, s.isSuppressed(errorMsg));
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Checked, s.isSuppressed(errorMsg));
         errorMsg.symbolNames = "x\n";
-        ASSERT_EQUALS(false, s.isSuppressed(errorMsg));
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Checked, s.isSuppressed(errorMsg));
         errorMsg.symbolNames = "array1\n";
-        ASSERT_EQUALS(true, s.isSuppressed(errorMsg));
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Matched, s.isSuppressed(errorMsg));
         errorMsg.symbolNames = "x\n"
                                "array2\n";
-        ASSERT_EQUALS(true, s.isSuppressed(errorMsg));
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Matched, s.isSuppressed(errorMsg));
         errorMsg.symbolNames = "array3\n"
                                "x\n";
-        ASSERT_EQUALS(true, s.isSuppressed(errorMsg));
+        ASSERT_EQUALS_ENUM(SuppressionList::Suppression::Result::Matched, s.isSuppressed(errorMsg));
     }
 
-    void unusedFunction() {
-        ASSERT_EQUALS(0, checkSuppression("void f() {}", "unusedFunction"));
+    void unusedFunctionInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
+        ASSERT_EQUALS(0, (this->*check)("void f() {}", "unusedFunction"));
     }
 
-    void suppressingSyntaxErrorAndExitCode() {
-        const char code[] = "fi if;";
+    void unusedFunctionFiles() {
+        unusedFunctionInternal(&TestSuppressions::checkSuppressionFiles);
+    }
 
-        ASSERT_EQUALS(0, checkSuppression(code, "*:test.cpp"));
-        ASSERT_EQUALS("", errout.str());
+    void unusedFunctionFS() {
+        unusedFunctionInternal(&TestSuppressions::checkSuppressionFS);
+    }
 
-        // multi files, but only suppression one
-        std::map<std::string, std::string> mfiles;
-        mfiles["test.cpp"] = "fi if;";
-        mfiles["test2.cpp"] = "fi if";
-        ASSERT_EQUALS(2, checkSuppression(mfiles, "*:test.cpp"));
-        ASSERT_EQUALS("[test2.cpp:1]: (error) syntax error\n", errout.str());
+    void suppressingSyntaxErrorAndExitCodeInternal(unsigned int (TestSuppressions::*check)(const char[], const std::string &)) {
+        const char code[] = "fi if;";
+
+        ASSERT_EQUALS(0, (this->*check)(code, "*:test.cpp"));
+        ASSERT_EQUALS("", errout_str());
 
+        // TODO: this test never worked
         // multi error in file, but only suppression one error
-        const char code2[] = "fi fi\n"
-                             "if if;";
-        ASSERT_EQUALS(2, checkSuppression(code2, "*:test.cpp:1"));  // suppress all error at line 1 of test.cpp
-        ASSERT_EQUALS("[test.cpp:2]: (error) syntax error\n", errout.str());
+        //const char code2[] = "fi fi\n"
+        //                     "if if;";
+        //ASSERT_EQUALS(1, (this->*check)(code2, "*:test.cpp:1"));  // suppress all error at line 1 of test.cpp
+        //ASSERT_EQUALS("[test.cpp:2]: (error) syntax error\n", errout_str());
 
         // multi error in file, but only suppression one error (2)
         const char code3[] = "void f(int x, int y){\n"
@@ -842,11 +1477,37 @@ class TestSuppressions : public TestFixture {
                              "    int b = y/0;\n"
                              "}\n"
                              "f(0, 1);\n";
-        ASSERT_EQUALS(2, checkSuppression(code3, "zerodiv:test.cpp:3"));  // suppress 'errordiv' at line 3 of test.cpp
+        ASSERT_EQUALS(1, (this->*check)(code3, "zerodiv:test.cpp:3"));  // suppress 'zerodiv' at line 3 of test.cpp
+        ASSERT_EQUALS("[test.cpp:2:14]: (error) Division by zero. [zerodiv]\n", errout_str());
+    }
+
+    void suppressingSyntaxErrorAndExitCodeFiles() {
+        suppressingSyntaxErrorAndExitCodeInternal(&TestSuppressions::checkSuppressionFiles);
+    }
+
+    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";
+        ASSERT_EQUALS(1, (this->*check)(mfiles, "*:test.cpp"));
+        ASSERT_EQUALS("[test2.cpp:1:4]: (error) syntax error [syntaxError]\n", errout_str());
+    }
+
+    void suppressingSyntaxErrorAndExitCodeMultiFileFiles() {
+        suppressingSyntaxErrorAndExitCodeMultiFileInternal(&TestSuppressions::checkSuppressionFiles);
+    }
+
+    void suppressingSyntaxErrorAndExitCodeMultiFileFS() {
+        suppressingSyntaxErrorAndExitCodeMultiFileInternal(&TestSuppressions::checkSuppressionFS);
     }
 
     void suppressLocal() const {
-        Suppressions suppressions;
+        SuppressionList suppressions;
         std::istringstream s("errorid:test.cpp\n"
                              "errorid2");
         ASSERT_EQUALS("", suppressions.parseFile(s));
@@ -859,6 +1520,381 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid2", "test2.cpp", 1)));
         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() {
+        const std::list<FileWithDetails> files = { {"a.c", Standards::Language::C, 0}};
+        const std::list<FileSettings> fs;
+
+        // No unmatched suppression
+        {
+            SuppressionList suppressions;
+            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        // suppress all unmatchedSuppression
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "*", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        // suppress all unmatchedSuppression (corresponds to "--suppress=unmatchedSuppression")
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        // suppress all unmatchedSuppression in a.c
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        // suppress unmatchedSuppression in a.c at line 10
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", 10U});
+            ASSERT_EQUALS(false, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        // don't suppress unmatchedSuppression when file is mismatching
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "b.c", SuppressionList::Suppression::NO_LINE});
+            ASSERT_EQUALS(true, CppCheckExecutor::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
+        {
+            SuppressionList suppressions;
+            addCheckedSuppression(suppressions, {"abc", "a.c", 10U});
+            addCheckedSuppression(suppressions, {"unmatchedSuppression", "a.c", 1U});
+            ASSERT_EQUALS(true, CppCheckExecutor::reportUnmatchedSuppressions(settingsDefault, suppressions, files, fs, *this));
+            ASSERT_EQUALS("[a.c:10:0]: (information) Unmatched suppression: abc [unmatchedSuppression]\n", errout_str());
+        }
+    }
+
+    void suppressionsParseXmlFile() const {
+        {
+            ScopedFile file("suppressparsexml.xml",
+                            "<suppressions>\n"
+                            "<suppress>\n"
+                            "<id>uninitvar</id>\n"
+                            "<fileName>file.c</fileName>\n"
+                            "<lineNumber>10</lineNumber>\n"
+                            "<symbolName>sym</symbolName>\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("file.c", suppr.fileName);
+            ASSERT_EQUALS(10, suppr.lineNumber);
+            ASSERT_EQUALS("sym", suppr.symbolName);
+        }
+
+        // no file specified
+        {
+            SuppressionList supprList;
+            ASSERT_EQUALS("failed to load suppressions XML '' (XML_ERROR_FILE_NOT_FOUND).", supprList.parseXmlFile(""));
+        }
+
+        // missing file
+        {
+            SuppressionList supprList;
+            ASSERT_EQUALS("failed to load suppressions XML 'suppressparsexml.xml' (XML_ERROR_FILE_NOT_FOUND).", supprList.parseXmlFile("suppressparsexml.xml"));
+        }
+
+        // empty file
+        {
+            ScopedFile file("suppressparsexml.xml",
+                            "");
+
+            SuppressionList supprList;
+            ASSERT_EQUALS("failed to load suppressions XML 'suppressparsexml.xml' (XML_ERROR_EMPTY_DOCUMENT).", supprList.parseXmlFile(file.path().c_str()));
+        }
+
+        // wrong root node
+        {
+            ScopedFile file("suppressparsexml.xml",
+                            "<suppress/>\n");
+
+            SuppressionList supprList;
+            ASSERT_EQUALS("", supprList.parseXmlFile(file.path().c_str()));
+        }
+
+        // no root node
+        {
+            ScopedFile file("suppressparsexml.xml",
+                            "<?xml version=\"1.0\"?>\n");
+
+            SuppressionList supprList;
+            ASSERT_EQUALS("failed to load suppressions XML 'suppressparsexml.xml' (no root node found).", supprList.parseXmlFile(file.path().c_str()));
+        }
+
+        // unknown element
+        {
+            ScopedFile file("suppressparsexml.xml",
+                            "<suppressions>\n"
+                            "<suppress>\n"
+                            "<eid>uninitvar</eid>\n"
+                            "</suppress>\n"
+                            "</suppressions>");
+
+            SuppressionList supprList;
+            ASSERT_EQUALS("unknown element 'eid' in suppressions XML 'suppressparsexml.xml', expected id/fileName/lineNumber/symbolName/hash.", supprList.parseXmlFile(file.path().c_str()));
+        }
+    }
+
+    void addSuppressionDuplicate() const {
+        SuppressionList supprs;
+
+        SuppressionList::Suppression s;
+        s.errorId = "uninitvar";
+
+        ASSERT_EQUALS("", supprs.addSuppression(s));
+        ASSERT_EQUALS("suppression 'uninitvar' already exists", supprs.addSuppression(s));
+    }
+
+    void updateSuppressionState() const {
+        {
+            SuppressionList supprs;
+
+            SuppressionList::Suppression s;
+            s.errorId = "uninitVar";
+            ASSERT_EQUALS(false, supprs.updateSuppressionState(s));
+        }
+        {
+            SuppressionList supprs;
+
+            SuppressionList::Suppression s;
+            s.errorId = "uninitVar";
+
+            ASSERT_EQUALS("", supprs.addSuppression(s));
+
+            ASSERT_EQUALS(true, supprs.updateSuppressionState(s));
+
+            const std::list<SuppressionList::Suppression> l = supprs.getUnmatchedGlobalSuppressions();
+            ASSERT_EQUALS(1, l.size());
+        }
+        {
+            SuppressionList supprs;
+
+            SuppressionList::Suppression s;
+            s.errorId = "uninitVar";
+            s.matched = false;
+
+            ASSERT_EQUALS("", supprs.addSuppression(s));
+
+            s.matched = true;
+            ASSERT_EQUALS(true, supprs.updateSuppressionState(s));
+
+            const std::list<SuppressionList::Suppression> l = supprs.getUnmatchedGlobalSuppressions();
+            ASSERT_EQUALS(0, l.size());
+        }
+    }
+
+    void addSuppressionLineMultiple() const {
+        SuppressionList supprlist;
+
+        ASSERT_EQUALS("", supprlist.addSuppressionLine("syntaxError"));
+        ASSERT_EQUALS("", supprlist.addSuppressionLine("uninitvar:1.c"));
+        ASSERT_EQUALS("", supprlist.addSuppressionLine("memleak:1.c"));
+        ASSERT_EQUALS("", supprlist.addSuppressionLine("uninitvar:2.c"));
+        ASSERT_EQUALS("", supprlist.addSuppressionLine("memleak:3.c:12 # first"));
+        ASSERT_EQUALS("", supprlist.addSuppressionLine("memleak:3.c:22 // second"));
+
+        const auto& supprs = supprlist.getSuppressions();
+        ASSERT_EQUALS(6, supprs.size());
+
+        auto it = supprs.cbegin();
+
+        ASSERT_EQUALS("syntaxError", it->errorId);
+        ASSERT_EQUALS("", it->fileName);
+        ASSERT_EQUALS(SuppressionList::Suppression::NO_LINE, it->lineNumber);
+        ++it;
+
+        ASSERT_EQUALS("uninitvar", it->errorId);
+        ASSERT_EQUALS("1.c", it->fileName);
+        ASSERT_EQUALS(SuppressionList::Suppression::NO_LINE, it->lineNumber);
+        ++it;
+
+        ASSERT_EQUALS("memleak", it->errorId);
+        ASSERT_EQUALS("1.c", it->fileName);
+        ASSERT_EQUALS(SuppressionList::Suppression::NO_LINE, it->lineNumber);
+        ++it;
+
+        ASSERT_EQUALS("uninitvar", it->errorId);
+        ASSERT_EQUALS("2.c", it->fileName);
+        ASSERT_EQUALS(SuppressionList::Suppression::NO_LINE, it->lineNumber);
+        ++it;
+
+        ASSERT_EQUALS("memleak", it->errorId);
+        ASSERT_EQUALS("3.c", it->fileName);
+        ASSERT_EQUALS(12, it->lineNumber);
+        ++it;
+
+        ASSERT_EQUALS("memleak", it->errorId);
+        ASSERT_EQUALS("3.c", it->fileName);
+        ASSERT_EQUALS(22, it->lineNumber);
+    }
+
+    void toString() const
+    {
+        {
+            SuppressionList::Suppression s;
+            s.errorId = "unitvar";
+            ASSERT_EQUALS("unitvar", s.toString());
+        }
+        {
+            SuppressionList::Suppression s;
+            s.errorId = "unitvar";
+            s.fileName = "test.cpp";
+            ASSERT_EQUALS("unitvar:test.cpp", s.toString());
+        }
+        {
+            SuppressionList::Suppression s;
+            s.errorId = "unitvar";
+            s.fileName = "test.cpp";
+            s.lineNumber = 12;
+            ASSERT_EQUALS("unitvar:test.cpp:12", s.toString());
+        }
+        {
+            SuppressionList::Suppression s;
+            s.errorId = "unitvar";
+            s.symbolName = "sym";
+            ASSERT_EQUALS("unitvar:sym", s.toString());
+        }
+    }
+
+    void suppressionFromErrorMessage() const {
+        {
+            const ErrorMessage msg({}, "test1.cpp", Severity::information, "msg", "id", Certainty::inconclusive);
+            const auto msg_s = SuppressionList::ErrorMessage::fromErrorMessage(msg, {"m1", "m2"});
+            ASSERT_EQUALS("test1.cpp", msg_s.getFileName());
+            ASSERT_EQUALS(SuppressionList::Suppression::NO_LINE, msg_s.lineNumber);
+            ASSERT_EQUALS("id", msg_s.errorId);
+            ASSERT_EQUALS_ENUM(Certainty::inconclusive, msg_s.certainty);
+            ASSERT_EQUALS("", msg_s.symbolNames);
+            ASSERT_EQUALS(2, msg_s.macroNames.size());
+            auto it = msg_s.macroNames.cbegin();
+            ASSERT_EQUALS("m1", *it);
+            ++it;
+            ASSERT_EQUALS("m2", *it);
+        }
+        {
+            std::list<ErrorMessage::FileLocation> loc;
+            loc.emplace_back("test1.cpp", 1, 1);
+            const ErrorMessage msg(std::move(loc), "test1.cpp", Severity::information, "msg", "id", Certainty::normal);
+            const auto msg_s = SuppressionList::ErrorMessage::fromErrorMessage(msg, {});
+            ASSERT_EQUALS("test1.cpp", msg_s.getFileName());
+            ASSERT_EQUALS(1, msg_s.lineNumber);
+        }
+        {
+            std::list<ErrorMessage::FileLocation> loc;
+            loc.emplace_back("test1.cpp", 1, 1);
+            loc.emplace_back("test2.cpp", 2, 2);
+            loc.emplace_back("test3.cpp", 3, 3);
+            const ErrorMessage msg(std::move(loc), "test1.cpp", Severity::information, "msg", "id", Certainty::normal);
+            const auto msg_s = SuppressionList::ErrorMessage::fromErrorMessage(msg, {});
+            ASSERT_EQUALS("test3.cpp", msg_s.getFileName());
+            ASSERT_EQUALS(3, msg_s.lineNumber);
+        }
+    }
+
+    void suppressionWildcard() const {
+        {
+            SuppressionList suppressions;
+            ASSERT_EQUALS("", suppressions.addSuppressionLine("id:test*.cpp"));
+
+            ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("abc", "xyz.cpp", 1)));
+            {
+                const auto supprs = suppressions.getSuppressions();
+                const auto suppr = supprs.cbegin();
+                ASSERT(!suppr->checked);
+                ASSERT(!suppr->matched);
+            }
+            ASSERT(suppressions.getUnmatchedGlobalSuppressions().empty());
+        }
+
+        {
+            SuppressionList suppressions;
+            ASSERT_EQUALS("", suppressions.addSuppressionLine("id:test*.cpp"));
+
+            ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("abc", "test.cpp", 1)));
+            {
+                const auto supprs = suppressions.getSuppressions();
+                const auto suppr = supprs.cbegin();
+                ASSERT(suppr->checked);
+                ASSERT(!suppr->matched);
+            }
+            ASSERT(!suppressions.getUnmatchedGlobalSuppressions().empty());
+        }
+
+        {
+            SuppressionList suppressions;
+            ASSERT_EQUALS("", suppressions.addSuppressionLine("id:test*.cpp"));
+
+            ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("id2", "test.cpp", 1)));
+            {
+                const auto supprs = suppressions.getSuppressions();
+                const auto suppr = supprs.cbegin();
+                ASSERT(suppr->checked);
+                ASSERT(!suppr->matched);
+            }
+            ASSERT(!suppressions.getUnmatchedGlobalSuppressions().empty());
+        }
+
+        {
+            SuppressionList suppressions;
+            ASSERT_EQUALS("", suppressions.addSuppressionLine("id:test*.cpp"));
+            ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("id", "test.cpp", 1)));
+            {
+                const auto supprs = suppressions.getSuppressions();
+                const auto suppr = supprs.cbegin();
+                ASSERT(suppr->checked);
+                ASSERT(suppr->matched);
+            }
+            ASSERT(suppressions.getUnmatchedGlobalSuppressions().empty());
+        }
+
+        {
+            SuppressionList suppressions;
+            ASSERT_EQUALS("", suppressions.addSuppressionLine("*:test*.cpp"));
+            // the empty ID should be disallowed but it is use as a hack to mark wildcards on error IDs as checked
+            ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("", "test.cpp", 1)));
+            {
+                const auto supprs = suppressions.getSuppressions();
+                const auto suppr = supprs.cbegin();
+                ASSERT(suppr->checked);
+                ASSERT(!suppr->matched);
+            }
+            ASSERT(!suppressions.getUnmatchedGlobalSuppressions().empty());
+        }
+    }
 };
 
 REGISTER_TEST(TestSuppressions)
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index 8c2bec6bd8f..b33dcdbc30a 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-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
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "library.h"
-#include "platform.h"
-#include "settings.h"
-#include "symboldatabase.h"
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
+#include "platform.h"
+#include "settings.h"
+#include "sourcelocation.h"
+#include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
@@ -33,32 +33,29 @@
 #include <iterator>
 #include <limits>
 #include <list>
-#include <map>
 #include <set>
 #include <sstream>
 #include <stdexcept>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 class TestSymbolDatabase;
 
-#define GET_SYMBOL_DB_STD(code) \
-    Tokenizer tokenizer(&settings1, this); \
-    LOAD_LIB_2(settings1.library, "std.cfg"); \
-    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, "test.cpp"); \
-    ASSERT(db); \
-    do {} while (false)
-
 #define GET_SYMBOL_DB(code) \
-    Tokenizer tokenizer(&settings1, this); \
-    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, "test.cpp"); \
+    SimpleTokenizer tokenizer(settings1, *this); \
+    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code); \
     ASSERT(db); \
     do {} while (false)
 
 #define GET_SYMBOL_DB_C(code) \
-    Tokenizer tokenizer(&settings1, this); \
-    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code, "test.c"); \
+    SimpleTokenizer tokenizer(settings1, *this, false); \
+    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code); \
+    do {} while (false)
+
+#define GET_SYMBOL_DB_DBG(code) \
+    SimpleTokenizer tokenizer(settingsDbg, *this); \
+    const SymbolDatabase *db = getSymbolDB_inner(tokenizer, code); \
+    ASSERT(db); \
     do {} while (false)
 
 class TestSymbolDatabase : public TestFixture {
@@ -68,26 +65,78 @@ class TestSymbolDatabase : public TestFixture {
 private:
     const Token* vartok{nullptr};
     const Token* typetok{nullptr};
-    // If there are unused templates, keep those
-    Settings settings1 = settingsBuilder().library("std.cfg").checkUnusedTemplates().build();
-    const Settings settings2 = settingsBuilder().checkUnusedTemplates().platform(cppcheck::Platform::Type::Unspecified).build();
+    const Settings settings1 = settingsBuilder().library("std.cfg").build();
+    const Settings settings2 = settingsBuilder().platform(Platform::Type::Unspecified).build();
+    const Settings settingsDbg = settingsBuilder().library("std.cfg").debugwarnings(true).build();
 
     void reset() {
         vartok = nullptr;
         typetok = nullptr;
     }
 
-    const static SymbolDatabase* getSymbolDB_inner(Tokenizer& tokenizer, const char* code, const char* filename) {
-        errout.str("");
-        std::istringstream istr(code);
-        return tokenizer.tokenize(istr, filename) ? tokenizer.getSymbolDatabase() : nullptr;
+    template<size_t size>
+    static const SymbolDatabase* getSymbolDB_inner(SimpleTokenizer& tokenizer, const char (&code)[size]) {
+        return tokenizer.tokenize(code) ? tokenizer.getSymbolDatabase() : nullptr;
     }
 
-    static const Scope *findFunctionScopeByToken(const SymbolDatabase * db, const Token *tok) {
-        std::list<Scope>::const_iterator scope;
+    static const Token* findToken(Tokenizer& tokenizer, const std::string& expr, unsigned int exprline)
+    {
+        for (const Token* tok = tokenizer.tokens(); tok; tok = tok->next()) {
+            if (Token::simpleMatch(tok, expr.c_str(), expr.size()) && tok->linenr() == exprline) {
+                return tok;
+            }
+        }
+        return nullptr;
+    }
+
+    static std::string asExprIdString(const Token* tok)
+    {
+        return tok->expressionString() + "@" + std::to_string(tok->exprId());
+    }
+
+    template<size_t size>
+    std::string testExprIdEqual(const char (&code)[size],
+                                const std::string& expr1,
+                                unsigned int exprline1,
+                                const std::string& expr2,
+                                unsigned int exprline2,
+                                SourceLocation loc = SourceLocation::current())
+    {
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), loc.file_name(), loc.line());
+
+        const Token* tok1 = findToken(tokenizer, expr1, exprline1);
+        const Token* tok2 = findToken(tokenizer, expr2, exprline2);
+
+        if (!tok1)
+            return "'" + expr1 + "'" + " not found";
+        if (!tok2)
+            return "'" + expr2 + "'" + " not found";
+        if (tok1->exprId() == 0)
+            return asExprIdString(tok1) + " has not exprId";
+        if (tok2->exprId() == 0)
+            return asExprIdString(tok2) + " has not exprId";
+
+        if (tok1->exprId() != tok2->exprId())
+            return asExprIdString(tok1) + " != " + asExprIdString(tok2);
+
+        return "";
+    }
+    template<size_t size>
+    bool testExprIdNotEqual(const char (&code)[size],
+                            const std::string& expr1,
+                            unsigned int exprline1,
+                            const std::string& expr2,
+                            unsigned int exprline2,
+                            SourceLocation loc = SourceLocation::current())
+    {
+        std::string result = testExprIdEqual(code, expr1, exprline1, expr2, exprline2, loc);
+        return !result.empty();
+    }
 
-        for (scope = db->scopeList.cbegin(); scope != db->scopeList.cend(); ++scope) {
-            if (scope->type == Scope::eFunction) {
+    static const Scope *findFunctionScopeByToken(const SymbolDatabase * db, const Token *tok) {
+        for (auto scope = db->scopeList.cbegin(); scope != db->scopeList.cend(); ++scope) {
+            if (scope->type == ScopeType::eFunction) {
                 if (scope->classDef == tok)
                     return &(*scope);
             }
@@ -115,6 +164,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(array);
         TEST_CASE(array_ptr);
         TEST_CASE(stlarray1);
@@ -138,7 +188,9 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(test_isVariableDeclarationIdentifiesDeclarationWithMultipleIndirection);
         TEST_CASE(test_isVariableDeclarationIdentifiesArray);
         TEST_CASE(test_isVariableDeclarationIdentifiesPointerArray);
-        TEST_CASE(test_isVariableDeclarationIdentifiesOfArrayPointers);
+        TEST_CASE(test_isVariableDeclarationIdentifiesOfArrayPointers1);
+        TEST_CASE(test_isVariableDeclarationIdentifiesOfArrayPointers2);
+        TEST_CASE(test_isVariableDeclarationIdentifiesOfArrayPointers3);
         TEST_CASE(test_isVariableDeclarationIdentifiesArrayOfFunctionPointers);
         TEST_CASE(isVariableDeclarationIdentifiesTemplatedPointerVariable);
         TEST_CASE(isVariableDeclarationIdentifiesTemplatedPointerToPointerVariable);
@@ -168,7 +220,9 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(VariableValueType3);
         TEST_CASE(VariableValueType4); // smart pointer type
         TEST_CASE(VariableValueType5); // smart pointer type
+        TEST_CASE(VariableValueType6); // smart pointer type
         TEST_CASE(VariableValueTypeReferences);
+        TEST_CASE(VariableValueTypeTemplate);
 
         TEST_CASE(findVariableType1);
         TEST_CASE(findVariableType2);
@@ -213,6 +267,8 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(memberFunctionOfUnknownClassMacro2);
         TEST_CASE(memberFunctionOfUnknownClassMacro3);
         TEST_CASE(functionLinkage);
+        TEST_CASE(externalFunctionsInsideAFunction);    // #12420
+        TEST_CASE(namespacedFunctionInsideExternBlock); // #12420
 
         TEST_CASE(classWithFriend);
 
@@ -247,6 +303,8 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(functionArgs18); // #10376
         TEST_CASE(functionArgs19); // #10376
         TEST_CASE(functionArgs20);
+        TEST_CASE(functionArgs21);
+        TEST_CASE(functionArgs22); // #13945
 
         TEST_CASE(functionImplicitlyVirtual);
         TEST_CASE(functionGetOverridden);
@@ -261,6 +319,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);
@@ -364,6 +423,14 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(symboldatabase102);
         TEST_CASE(symboldatabase103);
         TEST_CASE(symboldatabase104);
+        TEST_CASE(symboldatabase105);
+        TEST_CASE(symboldatabase106);
+        TEST_CASE(symboldatabase107);
+        TEST_CASE(symboldatabase108);
+        TEST_CASE(symboldatabase109); // #13553
+        TEST_CASE(symboldatabase110);
+        TEST_CASE(symboldatabase111); // [[fallthrough]]
+        TEST_CASE(symboldatabase112); // explicit operator
 
         TEST_CASE(createSymbolDatabaseFindAllScopes1);
         TEST_CASE(createSymbolDatabaseFindAllScopes2);
@@ -371,6 +438,12 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(createSymbolDatabaseFindAllScopes4);
         TEST_CASE(createSymbolDatabaseFindAllScopes5);
         TEST_CASE(createSymbolDatabaseFindAllScopes6);
+        TEST_CASE(createSymbolDatabaseFindAllScopes7);
+        TEST_CASE(createSymbolDatabaseFindAllScopes8); // #12761
+        TEST_CASE(createSymbolDatabaseFindAllScopes9);
+        TEST_CASE(createSymbolDatabaseFindAllScopes10);
+
+        TEST_CASE(createSymbolDatabaseIncompleteVars);
 
         TEST_CASE(enum1);
         TEST_CASE(enum2);
@@ -384,6 +457,15 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(enum10); // #11001
         TEST_CASE(enum11);
         TEST_CASE(enum12);
+        TEST_CASE(enum13);
+        TEST_CASE(enum14);
+        TEST_CASE(enum15);
+        TEST_CASE(enum16);
+        TEST_CASE(enum17);
+        TEST_CASE(enum18);
+        TEST_CASE(enum19);
+
+        TEST_CASE(struct1);
 
         TEST_CASE(sizeOfType);
 
@@ -393,6 +475,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(isFunction1); // UNKNOWN_MACRO(a,b) { .. }
         TEST_CASE(isFunction2);
         TEST_CASE(isFunction3);
+        TEST_CASE(isFunction4);
 
         TEST_CASE(findFunction1);
         TEST_CASE(findFunction2); // mismatch: parameter passed by address => reference argument
@@ -441,6 +524,22 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(findFunction46);
         TEST_CASE(findFunction47);
         TEST_CASE(findFunction48);
+        TEST_CASE(findFunction49); // #11888
+        TEST_CASE(findFunction50); // #11904 - method with same name and arguments in derived class
+        TEST_CASE(findFunction51); // #11975 - method with same name in derived class
+        TEST_CASE(findFunction52);
+        TEST_CASE(findFunction53);
+        TEST_CASE(findFunction54);
+        TEST_CASE(findFunction55); // #13004
+        TEST_CASE(findFunction56);
+        TEST_CASE(findFunction57);
+        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(findFunctionRef1);
+        TEST_CASE(findFunctionRef2); // #13328
         TEST_CASE(findFunctionContainer);
         TEST_CASE(findFunctionExternC);
         TEST_CASE(findFunctionGlobalScope); // ::foo
@@ -457,6 +556,9 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(throwFunction1);
         TEST_CASE(throwFunction2);
 
+        TEST_CASE(constAttributeFunction);
+        TEST_CASE(pureAttributeFunction);
+
         TEST_CASE(nothrowAttributeFunction);
         TEST_CASE(nothrowDeclspecFunction);
 
@@ -509,10 +611,24 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(auto17); // #11163
         TEST_CASE(auto18);
         TEST_CASE(auto19);
+        TEST_CASE(auto20);
+        TEST_CASE(auto21);
+        TEST_CASE(auto22);
+        TEST_CASE(auto23);
 
         TEST_CASE(unionWithConstructor);
 
         TEST_CASE(incomplete_type); // #9255 (infinite recursion)
+        TEST_CASE(exprIds);
+        TEST_CASE(testValuetypeOriginalName);
+
+        TEST_CASE(dumpFriend); // Check if isFriend added to dump file
+
+        TEST_CASE(smartPointerLookupCtor); // #13719);
+
+        TEST_CASE(stdintFunction);
+
+        TEST_CASE(userDefinedLiteral);
     }
 
     void array() {
@@ -592,7 +708,8 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(1U, (*it)->dimensions().size());
         ASSERT_EQUALS(4U, (*it)->dimension(0));
         const ValueType* vt = (*it)->valueType();
-        ASSERT(vt && vt->container);
+        ASSERT(vt);
+        ASSERT(vt->container);
         ASSERT_EQUALS(vt->pointer, 0);
         const Token* tok = (*it)->nameToken();
         ASSERT(tok && (vt = tok->valueType()));
@@ -634,7 +751,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(false, result);
         ASSERT(nullptr == vartok);
         ASSERT(nullptr == typetok);
-        Variable v(nullptr, nullptr, nullptr, 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(nullptr, nullptr, nullptr, 0, AccessControl::Public, nullptr, nullptr, settings1);
     }
 
     void test_isVariableDeclarationIdentifiesSimpleDeclaration() {
@@ -644,7 +761,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -657,7 +774,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -670,7 +787,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -683,7 +800,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -696,7 +813,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
         ASSERT_EQUALS("string", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -709,7 +826,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
         ASSERT_EQUALS("string", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -722,7 +839,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("x", vartok->str());
         ASSERT_EQUALS("EE", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -736,15 +853,16 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS(true, result1);
             ASSERT_EQUALS("p", vartok->str());
             ASSERT_EQUALS("int", typetok->str());
-            Variable v1(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+            Variable v1(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             ASSERT(false == v1.isArray());
             ASSERT(true == v1.isPointer());
             ASSERT(false == v1.isReference());
         }
         {
             reset();
-            givenACodeSampleToTokenize constpointer("const int* p;");
-            Variable v2(constpointer.tokens()->tokAt(3), constpointer.tokens()->next(), constpointer.tokens()->tokAt(2), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+            SimpleTokenizer constpointer(*this);
+            ASSERT(constpointer.tokenize("const int* p;"));
+            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());
             ASSERT(false == v2.isConst());
@@ -757,7 +875,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT_EQUALS(true, result2);
             ASSERT_EQUALS("p", vartok->str());
             ASSERT_EQUALS("int", typetok->str());
-            Variable v3(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+            Variable v3(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             ASSERT(false == v3.isArray());
             ASSERT(true == v3.isPointer());
             ASSERT(true == v3.isConst());
@@ -793,7 +911,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("first", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -806,7 +924,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("p", vartok->str());
         ASSERT_EQUALS("EE", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -819,7 +937,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("pp", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -832,7 +950,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("p", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -845,7 +963,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("v", vartok->str());
         ASSERT_EQUALS("string", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(true == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isPointerArray());
@@ -859,7 +977,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
         ASSERT_EQUALS("A", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isPointer());
         ASSERT(true == v.isArray());
         ASSERT(false == v.isPointerToArray());
@@ -867,14 +985,44 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(false == v.isReference());
     }
 
-    void test_isVariableDeclarationIdentifiesOfArrayPointers() {
+    void test_isVariableDeclarationIdentifiesOfArrayPointers1() {
         reset();
         GET_SYMBOL_DB("A (*a)[5];");
         const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
         ASSERT_EQUALS("A", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
+        ASSERT(true == v.isPointer());
+        ASSERT(false == v.isArray());
+        ASSERT(true == v.isPointerToArray());
+        ASSERT(false == v.isPointerArray());
+        ASSERT(false == v.isReference());
+    }
+
+    void test_isVariableDeclarationIdentifiesOfArrayPointers2() {
+        reset();
+        GET_SYMBOL_DB("A (*const a)[5];");
+        const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
+        ASSERT_EQUALS(true, result);
+        ASSERT_EQUALS("a", vartok->str());
+        ASSERT_EQUALS("A", typetok->str());
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
+        ASSERT(true == v.isPointer());
+        ASSERT(false == v.isArray());
+        ASSERT(true == v.isPointerToArray());
+        ASSERT(false == v.isPointerArray());
+        ASSERT(false == v.isReference());
+    }
+
+    void test_isVariableDeclarationIdentifiesOfArrayPointers3() {
+        reset();
+        GET_SYMBOL_DB("A (** a)[5];");
+        const bool result = db->scopeList.front().isVariableDeclaration(tokenizer.tokens(), vartok, typetok);
+        ASSERT_EQUALS(true, result);
+        ASSERT_EQUALS("a", vartok->str());
+        ASSERT_EQUALS("A", typetok->str());
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointerToArray());
@@ -889,7 +1037,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("a", vartok->str());
         ASSERT_EQUALS("int", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isPointer());
         ASSERT(true == v.isArray());
         ASSERT(false == v.isPointerToArray());
@@ -905,7 +1053,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("chars", vartok->str());
         ASSERT_EQUALS("set", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -918,7 +1066,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
         ASSERT_EQUALS("deque", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -931,7 +1079,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
         ASSERT_EQUALS("deque", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(true == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -944,7 +1092,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("ints", vartok->str());
         ASSERT_EQUALS("vector", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -957,7 +1105,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("floats", vartok->str());
         ASSERT_EQUALS("const_iterator", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -970,7 +1118,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, result);
         ASSERT_EQUALS("intsets", vartok->str());
         ASSERT_EQUALS("deque", typetok->str());
-        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, &settings1);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(false == v.isReference());
@@ -982,7 +1130,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("int& foo;");
             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);
+            Variable v1(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             ASSERT(false == v1.isArray());
             ASSERT(false == v1.isPointer());
             ASSERT(true == v1.isReference());
@@ -992,7 +1140,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("foo*& bar;");
             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);
+            Variable v2(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             ASSERT(false == v2.isArray());
             ASSERT(true == v2.isPointer());
             ASSERT(true == v2.isReference());
@@ -1002,7 +1150,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("std::vector<int>& foo;");
             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);
+            Variable v3(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             ASSERT(false == v3.isArray());
             ASSERT(false == v3.isPointer());
             ASSERT(true == v3.isReference());
@@ -1028,7 +1176,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("std::string const* s;");
         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);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -1039,7 +1187,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("int&& i;");
         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);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(false == v.isPointer());
         ASSERT(true == v.isReference());
@@ -1152,6 +1300,16 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(p->valueType()->pointer == 1);
     }
 
+    void VariableValueType6() {
+        GET_SYMBOL_DB("struct Data{};\n"
+                      "void foo() { std::unique_ptr<Data> data = std::unique_ptr<Data>(new Data); }");
+
+        const Token* check = Token::findsimplematch(tokenizer.tokens(), "( new");
+        ASSERT(check);
+        ASSERT(check->valueType());
+        ASSERT(check->valueType()->smartPointerTypeToken);
+    }
+
     void VariableValueTypeReferences() {
         {
             GET_SYMBOL_DB("void foo(int x) {}\n");
@@ -1159,6 +1317,17 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 0);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
+            ASSERT(p->valueType()->reference == Reference::None);
+        }
+
+        {
+            GET_SYMBOL_DB("void foo(volatile int x) {}\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 0);
+            ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 1);
             ASSERT(p->valueType()->reference == Reference::None);
         }
         {
@@ -1167,6 +1336,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 1);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::None);
         }
         {
@@ -1175,6 +1345,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 0);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::LValue);
         }
         {
@@ -1183,6 +1354,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 0);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::RValue);
         }
         {
@@ -1191,6 +1363,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 1);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::LValue);
         }
         {
@@ -1199,6 +1372,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 1);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::RValue);
         }
         {
@@ -1207,6 +1381,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 2);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::LValue);
         }
         {
@@ -1215,6 +1390,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 2);
             ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::RValue);
         }
         {
@@ -1223,6 +1399,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 0);
             ASSERT(p->valueType()->constness == 1);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::LValue);
         }
         {
@@ -1231,6 +1408,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 0);
             ASSERT(p->valueType()->constness == 1);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::RValue);
         }
         {
@@ -1239,6 +1417,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 1);
             ASSERT(p->valueType()->constness == 1);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::LValue);
         }
         {
@@ -1247,6 +1426,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 1);
             ASSERT(p->valueType()->constness == 1);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::RValue);
         }
         {
@@ -1255,6 +1435,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 1);
             ASSERT(p->valueType()->constness == 2);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::LValue);
         }
         {
@@ -1263,8 +1444,94 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(p->valueType());
             ASSERT(p->valueType()->pointer == 1);
             ASSERT(p->valueType()->constness == 2);
+            ASSERT(p->valueType()->volatileness == 0);
             ASSERT(p->valueType()->reference == Reference::RValue);
         }
+        {
+            GET_SYMBOL_DB("extern const volatile int* test[];\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 1);
+            ASSERT(p->valueType()->constness == 1);
+            ASSERT(p->valueType()->volatileness == 1);
+            ASSERT(p->valueType()->reference == Reference::None);
+        }
+        {
+            GET_SYMBOL_DB("extern const int* volatile test[];\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 1);
+            ASSERT(p->valueType()->constness == 1);
+            ASSERT(p->valueType()->volatileness == 2);
+            ASSERT(p->valueType()->reference == Reference::None);
+        }
+        {
+            GET_SYMBOL_DB_C("typedef unsigned char uint8_t;\n uint8_t ubVar = 0;\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 0);
+            ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
+            ASSERT(p->valueType()->originalTypeName == "uint8_t");
+            ASSERT(p->valueType()->reference == Reference::None);
+        }
+        {
+            GET_SYMBOL_DB_C("typedef enum eEnumDef {CPPCHECK=0}eEnum_t;\n eEnum_t eVar = CPPCHECK;\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 0);
+            ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
+            ASSERT(p->valueType()->originalTypeName == "eEnum_t");
+            ASSERT(p->valueType()->reference == Reference::None);
+        }
+        {
+            GET_SYMBOL_DB_C("typedef unsigned char uint8_t;\n typedef struct stStructDef {uint8_t ubTest;}stStruct_t;\n stStruct_t stVar;\n");
+            const Variable* p = db->getVariableFromVarId(1);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 0);
+            ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
+            ASSERT(p->valueType()->originalTypeName == "uint8_t");
+            ASSERT(p->valueType()->reference == Reference::None);
+            p = db->getVariableFromVarId(2);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 0);
+            ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
+            ASSERT(p->valueType()->originalTypeName == "stStruct_t");
+            ASSERT(p->valueType()->reference == Reference::None);
+        }
+        {
+            GET_SYMBOL_DB_C("typedef int (*ubFunctionPointer_fp)(int);\n void test(ubFunctionPointer_fp functionPointer);\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 1);
+            ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->volatileness == 0);
+            ASSERT(p->valueType()->originalTypeName == "ubFunctionPointer_fp");
+            ASSERT(p->valueType()->reference == Reference::None);
+        }
+    }
+
+    void VariableValueTypeTemplate() {
+        {
+            GET_SYMBOL_DB("template <class T>\n" // #12393
+                          "struct S {\n"
+                          "    struct U {\n"
+                          "        S<T>* p;\n"
+                          "    };\n"
+                          "    U u;\n"
+                          "};\n");
+            const Variable* const p = db->getVariableFromVarId(1);
+            ASSERT_EQUALS(p->name(), "p");
+            ASSERT(p->valueType());
+            ASSERT(p->valueType()->pointer == 1);
+            ASSERT(p->valueType()->constness == 0);
+            ASSERT(p->valueType()->reference == Reference::None);
+            ASSERT_EQUALS(p->scope()->className, "U");
+            ASSERT_EQUALS(p->typeScope()->className, "S");
+        }
     }
 
     void findVariableType1() {
@@ -1351,7 +1618,7 @@ class TestSymbolDatabase : public TestFixture {
 
         ASSERT(db != nullptr);
 
-        ASSERT(db->scopeList.back().type == Scope::eFor);
+        ASSERT(db->scopeList.back().type == ScopeType::eFor);
         ASSERT_EQUALS(2, db->variableList().size());
 
         const Variable* e = db->getVariableFromVarId(1);
@@ -1363,7 +1630,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("std::string s;");
             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);
+            Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             static const std::set<std::string> types = { "string", "wstring" };
             static const std::set<std::string> no_types = { "set" };
             ASSERT_EQUALS(true, v.isStlType());
@@ -1376,7 +1643,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("std::vector<int> v;");
             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);
+            Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             static const std::set<std::string> types = { "bitset", "set", "vector", "wstring" };
             static const std::set<std::string> no_types = { "bitset", "map", "set" };
             ASSERT_EQUALS(true, v.isStlType());
@@ -1389,7 +1656,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("SomeClass s;");
             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);
+            Variable v(vartok, tokenizer.tokens(), tokenizer.list.back(), 0, AccessControl::Public, nullptr, nullptr, settings1);
             static const std::set<std::string> types = { "bitset", "set", "vector" };
             ASSERT_EQUALS(false, v.isStlType());
             ASSERT_EQUALS(false, v.isStlType(types));
@@ -1402,7 +1669,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("char* const * s;");
         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);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -1413,7 +1680,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("char* volatile * s;");
         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);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -1424,7 +1691,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("char* const volatile * s;");
         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);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -1435,7 +1702,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("const char* const volatile * const volatile * const volatile * const volatile s;");
         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);
+        Variable v(vartok, typetok, vartok->previous(), 0, AccessControl::Public, nullptr, nullptr, settings1);
         ASSERT(false == v.isArray());
         ASSERT(true == v.isPointer());
         ASSERT(false == v.isReference());
@@ -1503,7 +1770,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(db);
         ASSERT_EQUALS(2, db->scopeList.front().varlist.size());
         const Variable *x1 = Token::findsimplematch(tokenizer.tokens(), "x")->variable();
-        ASSERT(x1 && Token::simpleMatch(x1->typeStartToken(), "alignas ( 16 ) int x ;"));
+        ASSERT(x1 && Token::simpleMatch(x1->typeStartToken(), "int x ;"));
     }
 
     void memberVar1() {
@@ -1602,7 +1869,14 @@ class TestSymbolDatabase : public TestFixture {
         // three elements: varId 0 also counts via a fake-entry
         ASSERT(v && db->variableList().size() == 3);
 
-        ASSERT_THROW(db->getVariableFromVarId(3), std::out_of_range);
+        // 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");
+#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)");
+#else
+        ASSERT_THROW_EQUALS_2(db->getVariableFromVarId(3), std::out_of_range, "vector");
+#endif
     }
 
     void hasRegularFunction() {
@@ -1669,7 +1943,8 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(function && function->functionScope == scope && scope->function == function && function->nestedIn == db->findScopeByName("Fred"));
         ASSERT(function && function->retDef == functionToken->previous());
 
-        ASSERT(db && db->findScopeByName("Fred") && db->findScopeByName("Fred")->definedType->getFunction("func") == function);
+        ASSERT(db);
+        ASSERT(db->findScopeByName("Fred") && db->findScopeByName("Fred")->definedType->getFunction("func") == function);
     }
 
 
@@ -1695,7 +1970,8 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(function && function->functionScope == scope && scope->function == function && function->nestedIn == db->findScopeByName("Fred"));
         ASSERT(function && function->retDef == functionToken->tokAt(4));
 
-        ASSERT(db && db->findScopeByName("Fred") && db->findScopeByName("Fred")->definedType->getFunction("func") == function);
+        ASSERT(db);
+        ASSERT(db->findScopeByName("Fred") && db->findScopeByName("Fred")->definedType->getFunction("func") == function);
     }
 
     void hasMissingInlineClassFunction() {
@@ -1739,7 +2015,8 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(function && function->functionScope == scope && scope->function == function && function->nestedIn == db->findScopeByName("Fred"));
         ASSERT(function && function->retDef == functionToken->tokAt(-2));
 
-        ASSERT(db && db->findScopeByName("Fred") && db->findScopeByName("Fred")->definedType->getFunction("operator=") == function);
+        ASSERT(db);
+        ASSERT(db->findScopeByName("Fred") && db->findScopeByName("Fred")->definedType->getFunction("operator=") == function);
     }
 
     void hasClassFunction() {
@@ -1920,6 +2197,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(10, db->variableList().size() - 1);
         ASSERT_EQUALS(true, db->getVariableFromVarId(1) && db->getVariableFromVarId(1)->dimensions().size() == 1);
         ASSERT_EQUALS(true, db->getVariableFromVarId(2) != nullptr);
+        // NOLINTNEXTLINE(readability-container-size-empty)
         ASSERT_EQUALS(true, db->getVariableFromVarId(3) && db->getVariableFromVarId(3)->dimensions().size() == 0);
         ASSERT_EQUALS(true, db->getVariableFromVarId(4) != nullptr);
         ASSERT_EQUALS(true, db->getVariableFromVarId(5) != nullptr);
@@ -1928,7 +2206,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, db->getVariableFromVarId(8) && db->getVariableFromVarId(8)->dimensions().size() == 1);
         ASSERT_EQUALS(true, db->getVariableFromVarId(9) && db->getVariableFromVarId(9)->dimensions().size() == 1);
         ASSERT_EQUALS(true, db->getVariableFromVarId(10) && db->getVariableFromVarId(10)->dimensions().size() == 1);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void pointerToMemberFunction() {
@@ -1940,7 +2218,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(true, db->getVariableFromVarId(1) != nullptr);
 
         ASSERT_EQUALS("pFun", db->getVariableFromVarId(1)->name());
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void hasSubClassConstructor() {
@@ -1949,10 +2227,10 @@ class TestSymbolDatabase : public TestFixture {
 
         bool seen_something = false;
         for (const Scope & scope : db->scopeList) {
-            for (std::list<Function>::const_iterator func = scope.functionList.cbegin(); func != scope.functionList.cend(); ++func) {
+            for (auto func = scope.functionList.cbegin(); func != scope.functionList.cend(); ++func) {
                 ASSERT_EQUALS("Sub", func->token->str());
                 ASSERT_EQUALS(true, func->hasBody());
-                ASSERT_EQUALS(Function::eConstructor, func->type);
+                ASSERT_EQUALS_ENUM(FunctionType::eConstructor, func->type);
                 seen_something = true;
             }
         }
@@ -1963,69 +2241,75 @@ class TestSymbolDatabase : public TestFixture {
         {
             GET_SYMBOL_DB("class Foo { Foo(); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { Foo(Foo f); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eConstructor && !ctor->isExplicit());
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor && !ctor->isExplicit());
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { explicit Foo(Foo f); };");
             const Function* ctor = tokenizer.tokens()->tokAt(4)->function();
-            ASSERT(db && ctor && ctor->type == Function::eConstructor && ctor->isExplicit());
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor && ctor->isExplicit());
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { Foo(Bar& f); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { Foo(Foo& f); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eCopyConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { Foo(const Foo &f); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eCopyConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("template <T> class Foo { Foo(Foo<T>& f); };");
             const Function* ctor = tokenizer.tokens()->tokAt(7)->function();
-            ASSERT(db && ctor && ctor->type == Function::eCopyConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { Foo(Foo& f, int default = 0); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eCopyConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eCopyConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { Foo(Foo& f, char noDefault); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
         {
             GET_SYMBOL_DB("class Foo { Foo(Foo&& f); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eMoveConstructor);
+            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); };");
             const Function* ctor = tokenizer.tokens()->tokAt(3)->function();
-            ASSERT(db && ctor && ctor->type == Function::eMoveConstructor);
+            ASSERT(db && ctor && ctor->type == FunctionType::eMoveConstructor);
             ASSERT(ctor && ctor->retDef == nullptr);
         }
+        {
+            GET_SYMBOL_DB("void f() { extern void f(); }");
+            ASSERT(db && db->scopeList.size() == 2);
+            const Function* f = findFunctionByName("f", &db->scopeList.back());
+            ASSERT(f && f->type == FunctionType::eFunction);
+        }
     }
 
     void functionDeclarationTemplate() {
@@ -2070,8 +2354,7 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void functionDeclarations2() {
-        const Settings settingsOld = settings1;
-        GET_SYMBOL_DB_STD("std::array<int,2> foo(int x);");
+        GET_SYMBOL_DB("std::array<int,2> foo(int x);");
 
         // 1 scopes: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2087,15 +2370,12 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(!foo->hasBody());
 
         const Token*parenthesis = foo->tokenDef->next();
-        ASSERT(parenthesis->str() == "(" && parenthesis->previous()->str() == "foo");
+        ASSERT(parenthesis->str() == "(" && parenthesis->strAt(-1) == "foo");
         ASSERT(parenthesis->valueType()->type == ValueType::Type::CONTAINER);
-
-        settings1 = settingsOld;
     }
 
     void constexprFunction() {
-        const Settings settingsOld = settings1;
-        GET_SYMBOL_DB_STD("constexpr int foo();");
+        GET_SYMBOL_DB("constexpr int foo();");
 
         // 1 scopes: Global
         ASSERT(db && db->scopeList.size() == 1);
@@ -2110,8 +2390,6 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(foo->tokenDef->str() == "foo");
         ASSERT(!foo->hasBody());
         ASSERT(foo->isConstexpr());
-
-        settings1 = settingsOld;
     }
 
     void constructorInitialization() {
@@ -2132,7 +2410,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
                       "}");
 
-        ASSERT(db && errout.str().empty());
+        ASSERT(db && errout_str().empty());
 
         const Scope *scope = db->findScopeByName("getFormula1");
         ASSERT(scope != nullptr);
@@ -2146,7 +2424,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
                       "}");
 
-        ASSERT(db && errout.str().empty());
+        ASSERT(db && errout_str().empty());
 
         const Scope *scope = db->findScopeByName("getFormula1");
         ASSERT(scope != nullptr);
@@ -2164,7 +2442,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    if (pDocSh && !getCellRangesForAddress(nFlags)) ;\n"
                       "}");
 
-        ASSERT(db && errout.str().empty());
+        ASSERT(db && errout_str().empty());
 
         const Scope *scope = db->findScopeByName("getFormula1");
         ASSERT(scope != nullptr);
@@ -2179,7 +2457,7 @@ class TestSymbolDatabase : public TestFixture {
                       "extern void f5() { };\n"
                       "void f6() { }");
 
-        ASSERT(db && errout.str().empty());
+        ASSERT(db && errout_str().empty());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f1");
         ASSERT(f && f->function() && f->function()->isStaticLocal() && f->function()->retDef->str() == "void");
@@ -2200,6 +2478,36 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(f && f->function() && !f->function()->isExtern() && f->function()->retDef->str() == "void");
     }
 
+    void externalFunctionsInsideAFunction() {
+        GET_SYMBOL_DB("void foo( void )\n"
+                      "{\n"
+                      "    extern void bar( void );\n"
+                      "    bar();\n"
+                      "}\n");
+
+        ASSERT(db && errout_str().empty());
+
+        const Token *f = Token::findsimplematch(tokenizer.tokens(), "bar");
+        ASSERT(f && f->function() && f->function()->isExtern() && f == f->function()->tokenDef && f->function()->retDef->str() == "void");
+
+        const Token *call = Token::findsimplematch(f->next(), "bar");
+        ASSERT(call && call->function() == f->function());
+    }
+
+    void namespacedFunctionInsideExternBlock() {
+        // Should not crash
+        GET_SYMBOL_DB("namespace N {\n"
+                      "    void f();\n"
+                      "}\n"
+                      "extern \"C\" {\n"
+                      "    void f() {\n"
+                      "        N::f();\n"
+                      "    }\n"
+                      "}\n");
+
+        ASSERT(db && errout_str().empty());
+    }
+
     void classWithFriend() {
         GET_SYMBOL_DB("class Foo {}; class Bar1 { friend class Foo; }; class Bar2 { friend Foo; };");
         // 3 scopes: Global, 3 classes
@@ -2249,9 +2557,9 @@ class TestSymbolDatabase : public TestFixture {
 
         ASSERT(db && db->scopeList.size() == 1);
 
-        const std::list<Scope>::const_iterator it = db->scopeList.cbegin();
+        const auto it = db->scopeList.cbegin();
         ASSERT(it->varlist.size() == 1);
-        const std::list<Variable>::const_iterator var = it->varlist.cbegin();
+        const auto var = it->varlist.cbegin();
         ASSERT(var->name() == "i");
         ASSERT(var->typeStartToken()->str() == "int");
     }
@@ -2261,10 +2569,10 @@ class TestSymbolDatabase : public TestFixture {
 
         ASSERT(db && db->scopeList.size() == 1);
 
-        const std::list<Scope>::const_iterator it = db->scopeList.cbegin();
+        const auto it = db->scopeList.cbegin();
         ASSERT(it->varlist.size() == 1);
 
-        const std::list<Variable>::const_iterator var = it->varlist.cbegin();
+        const auto var = it->varlist.cbegin();
         ASSERT(var->name() == "array");
         ASSERT(var->typeStartToken()->str() == "int");
     }
@@ -2274,10 +2582,10 @@ class TestSymbolDatabase : public TestFixture {
 
         ASSERT(db && db->scopeList.size() == 1);
 
-        const std::list<Scope>::const_iterator it = db->scopeList.cbegin();
+        const auto it = db->scopeList.cbegin();
         ASSERT(it->varlist.size() == 1);
 
-        const std::list<Variable>::const_iterator var = it->varlist.cbegin();
+        const auto var = it->varlist.cbegin();
         ASSERT(var->name() == "array");
         ASSERT(var->typeStartToken()->str() == "int");
     }
@@ -2287,7 +2595,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) {}");
 
         ASSERT(db && db->variableList().size() == 6 && db->getVariableFromVarId(1) && db->getVariableFromVarId(2) && db->getVariableFromVarId(3) && db->getVariableFromVarId(4) && db->getVariableFromVarId(5));
 
@@ -2335,17 +2643,14 @@ class TestSymbolDatabase : public TestFixture {
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool debug = true, const char filename[] = "test.cpp") {
-        // Clear the error log
-        errout.str("");
-
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], bool debug = true, bool cpp = true, const Settings* pSettings = nullptr) {
         // Check..
-        const Settings settings = settingsBuilder(settings1).debugwarnings(debug).build();
+        const Settings settings = settingsBuilder(pSettings ? *pSettings : settings1).debugwarnings(debug).build();
 
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // force symbol database creation
         tokenizer.createSymbolDatabase();
@@ -2358,10 +2663,10 @@ class TestSymbolDatabase : public TestFixture {
             const Variable* v = db->getVariableFromVarId(1);
             ASSERT(v && v->isReference() && v->isConst() && v->isArgument());
             const Scope* f = db->findScopeByName("f");
-            ASSERT(f && f->type == Scope::eFunction && f->function);
+            ASSERT(f && f->type == ScopeType::eFunction && f->function);
 
             ASSERT(f->function->argumentList.size() == 2 && f->function->argumentList.front().index() == 0 && f->function->argumentList.front().name().empty() && f->function->argumentList.back().index() == 1);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             GET_SYMBOL_DB("void g(std::map<std::string, std::vector<int> > m) { }");
@@ -2369,32 +2674,32 @@ class TestSymbolDatabase : public TestFixture {
             const Variable* m = db->getVariableFromVarId(1);
             ASSERT(m && !m->isReference() && !m->isConst() && m->isArgument() && m->isClass());
             const Scope* g = db->findScopeByName("g");
-            ASSERT(g && g->type == Scope::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().index() == 0);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().index() == 0);
+            ASSERT_EQUALS("", errout_str());
         }
         {
             GET_SYMBOL_DB("void g(std::map<int, int> m = std::map<int, int>()) { }");
             const Scope* g = db->findScopeByName("g");
-            ASSERT(g && g->type == Scope::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().index() == 0 && g->function->initializedArgCount() == 1);
-            ASSERT_EQUALS("", errout.str());
+            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) { }");
             const Scope* g = db->findScopeByName("g");
-            ASSERT(g && g->type == Scope::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().hasDefault());
-            ASSERT_EQUALS("", errout.str());
+            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)
             const Scope* g = db->findScopeByName("g");
-            ASSERT(g && g->type == Scope::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().nameToken() == nullptr && g->function->argumentList.front().isPointer());
-            ASSERT_EQUALS("", errout.str());
+            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
             const Scope* g = db->findScopeByName("g");
-            ASSERT(g && g->type == Scope::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().nameToken() == nullptr);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT(g && g->type == ScopeType::eFunction && g->function && g->function->argumentList.size() == 1 && g->function->argumentList.front().nameToken() == nullptr);
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -2560,9 +2865,9 @@ class TestSymbolDatabase : public TestFixture {
                       "Fred::Fred(Whitespace whitespace) { }");
         ASSERT_EQUALS(true, db != nullptr);
         ASSERT_EQUALS(3, db->scopeList.size());
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
+        auto scope = db->scopeList.cbegin();
         ++scope;
-        ASSERT_EQUALS((unsigned int)Scope::eClass, (unsigned int)scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eClass, scope->type);
         ASSERT_EQUALS(1, scope->functionList.size());
         ASSERT(scope->functionList.cbegin()->functionScope != nullptr);
         const Scope * functionScope = scope->functionList.cbegin()->functionScope;
@@ -2578,9 +2883,9 @@ class TestSymbolDatabase : public TestFixture {
                       "void Fred::foo(char b[16]) { }");
         ASSERT_EQUALS(true, db != nullptr);
         ASSERT_EQUALS(3, db->scopeList.size());
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
+        auto scope = db->scopeList.cbegin();
         ++scope;
-        ASSERT_EQUALS((unsigned int)Scope::eClass, (unsigned int)scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eClass, scope->type);
         ASSERT_EQUALS(1, scope->functionList.size());
         ASSERT(scope->functionList.cbegin()->functionScope != nullptr);
         const Scope * functionScope = scope->functionList.cbegin()->functionScope;
@@ -2658,7 +2963,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(db);
         ASSERT_EQUALS(2, db->scopeList.size());
         const Scope& classScope = db->scopeList.back();
-        ASSERT_EQUALS(Scope::eClass, classScope.type);
+        ASSERT_EQUALS_ENUM(ScopeType::eClass, classScope.type);
         ASSERT_EQUALS("Class", classScope.className);
         ASSERT_EQUALS(1, classScope.functionList.size());
         const Function& method = classScope.functionList.front();
@@ -2710,15 +3015,80 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(3, func->argCount());
     }
 
-    void functionArgs20() { // #11769
-        const char code[] = "void f(void *(*g)(void *) = [](void *p) { return p; }) {}";
+    void functionArgs20() {
+        {
+            const char code[] = "void f(void *(*g)(void *) = [](void *p) { return p; }) {}"; // #11769
+            GET_SYMBOL_DB(code);
+            ASSERT(db != nullptr);
+            const Scope *scope = db->functionScopes.front();
+            const Function *func = scope->function;
+            ASSERT_EQUALS(1, func->argCount());
+            const Variable* arg = func->getArgumentVar(0);
+            TODO_ASSERT(arg->hasDefault());
+        }
+        {
+            const char code[] = "void f() { auto g = [&](const std::function<int(int)>& h = [](int i) -> int { return i; }) {}; }"; // #12338
+            GET_SYMBOL_DB(code);
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS_ENUM(ScopeType::eLambda, db->scopeList.back().type);
+        }
+        {
+            const char code[] = "void f() {\n"
+                                "    auto g = [&](const std::function<const std::vector<int>&(const std::vector<int>&)>& h = [](const std::vector<int>& v) -> const std::vector<int>& { return v; }) {};\n"
+                                "}\n";
+            GET_SYMBOL_DB(code);
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS_ENUM(ScopeType::eLambda, db->scopeList.back().type);
+        }
+        {
+            const char code[] = "void f() {\n"
+                                "    auto g = [&](const std::function<int(int)>& h = [](int i) -> decltype(0) { return i; }) {};\n"
+                                "}\n";
+            GET_SYMBOL_DB(code);
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS_ENUM(ScopeType::eLambda, db->scopeList.back().type);
+        }
+    }
+
+    void functionArgs21() {
+        const char code[] = "void f(std::vector<int>::size_type) {}\n" // #11408
+                            "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; }";
         GET_SYMBOL_DB(code);
         ASSERT(db != nullptr);
-        const Scope *scope = db->functionScopes.front();
-        const Function *func = scope->function;
+        auto it = db->functionScopes.begin();
+        const Function *func = (*it)->function;
+        ASSERT_EQUALS("f", func->name());
         ASSERT_EQUALS(1, func->argCount());
         const Variable* arg = func->getArgumentVar(0);
-        TODO_ASSERT(arg->hasDefault());
+        ASSERT_EQUALS("", arg->name());
+        ++it;
+        func = (*it)->function;
+        ASSERT_EQUALS("operator+", func->name());
+        ASSERT_EQUALS(2, func->argCount());
+        arg = func->getArgumentVar(1);
+        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() {
@@ -2835,8 +3205,8 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("namespace fred UNKNOWN_MACRO(default) {\n"
                       "}");
         ASSERT_EQUALS(2U, db->scopeList.size());
-        ASSERT_EQUALS(Scope::eGlobal, db->scopeList.front().type);
-        ASSERT_EQUALS(Scope::eNamespace, db->scopeList.back().type);
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, db->scopeList.front().type);
+        ASSERT_EQUALS_ENUM(ScopeType::eNamespace, db->scopeList.back().type);
     }
 
     void namespaces4() { // #4698 - type lookup
@@ -2849,18 +3219,44 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(2U, fredAType->classDef->linenr());
     }
 
-    void needInitialization() { // #10259
-        const auto oldSettings = settings1;
-        settings1.debugwarnings = true;
-
-        GET_SYMBOL_DB("template <typename T>\n"
-                      "struct A {\n"
-                      "    using type = T;\n"
-                      "    type t_;\n"
-                      "};\n");
-        ASSERT_EQUALS("", errout.str());
+    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);
+    }
 
-        settings1 = oldSettings;
+    void needInitialization() {
+        {
+            GET_SYMBOL_DB_DBG("template <typename T>\n" // #10259
+                              "struct A {\n"
+                              "    using type = T;\n"
+                              "    type t_;\n"
+                              "};\n");
+            ASSERT_EQUALS("", errout_str());
+        }
+        {
+            GET_SYMBOL_DB_DBG("class T;\n" // #12367
+                              "struct S {\n"
+                              "    S(T& t);\n"
+                              "    T& _t;\n"
+                              "};\n");
+            ASSERT_EQUALS("", errout_str());
+        }
+        {
+            GET_SYMBOL_DB_DBG("struct S {\n" // #12395
+                              "    static S s;\n"
+                              "};\n");
+            ASSERT_EQUALS("", errout_str());
+            const Variable* const s = db->getVariableFromVarId(1);
+            ASSERT(s->scope()->definedType->needInitialization == Type::NeedInitialization::False);
+        }
     }
 
     void tryCatch1() {
@@ -2872,7 +3268,7 @@ class TestSymbolDatabase : public TestFixture {
                            "    catch (X::Error4 x) { }\n"
                            "}";
         GET_SYMBOL_DB(str);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 5); // index 0 + 4 variables
         ASSERT(db && db->scopeList.size() == 7); // global + function + try + 4 catch
     }
@@ -2882,11 +3278,11 @@ class TestSymbolDatabase : public TestFixture {
         check("namespace foo {\n"
               "    class bar;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class foo : public bar < int, int> {\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase2() {
@@ -2894,13 +3290,13 @@ class TestSymbolDatabase : public TestFixture {
               "public:\n"
               "foo() { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class foo {\n"
               "class bar;\n"
               "foo() { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase3() {
@@ -2908,7 +3304,7 @@ class TestSymbolDatabase : public TestFixture {
               "struct A {\n"
               "    friend func_type f : 2;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase4() {
@@ -2916,10 +3312,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__));");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
-        check("main(int argc, char *argv[]) { }", true, "test.c");
-        ASSERT_EQUALS("[test.c:1]: (debug) SymbolDatabase::isFunction found C function 'main' without a return type.\n", errout.str());
+        check("main(int argc, char *argv[]) { }", 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: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"
               "    std::locale generate_locale()\n"
@@ -2927,7 +3328,7 @@ class TestSymbolDatabase : public TestFixture {
               "        return std::locale();\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace X {\n"
               "    static void function_declaration_before(void) __attribute__((__used__));\n"
@@ -2935,19 +3336,22 @@ class TestSymbolDatabase : public TestFixture {
               "    static void function_declaration_after(void) {}\n"
               "    static void function_declaration_after(void) __attribute__((__used__));\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("testing::testing()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:1]: (debug) Executable scope 'testing' with unknown function.\n", errout.str());
+        ASSERT_EQUALS(
+            "[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());
     }
 
     void symboldatabase5() {
         // ticket #2178 - segmentation fault
-        ASSERT_THROW(check("int CL_INLINE_DECL(integer_decode_float) (int x) {\n"
-                           "    return (sign ? cl_I() : 0);\n"
-                           "}"), InternalError);
+        ASSERT_THROW_INTERNAL(check("int CL_INLINE_DECL(integer_decode_float) (int x) {\n"
+                                    "    return (sign ? cl_I() : 0);\n"
+                                    "}"), UNKNOWN_MACRO);
     }
 
     void symboldatabase6() {
@@ -2959,7 +3363,7 @@ class TestSymbolDatabase : public TestFixture {
               "Y<X<1>> x3;\n"
               "Y<X<6>>1>> x4;\n"
               "Y<X<(6>>1)>> x5;\n", false);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase7() {
@@ -2974,7 +3378,7 @@ class TestSymbolDatabase : public TestFixture {
               "public:\n"
               "    int f() { return C< ::D,int>::f(); }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase8() {
@@ -2988,7 +3392,7 @@ class TestSymbolDatabase : public TestFixture {
               "    }\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase9() {
@@ -3002,7 +3406,7 @@ class TestSymbolDatabase : public TestFixture {
               "    }\n"
               "};\n", false);
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase10() {
@@ -3015,7 +3419,7 @@ class TestSymbolDatabase : public TestFixture {
               "  friend void A::f();\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase11() {
@@ -3025,7 +3429,7 @@ class TestSymbolDatabase : public TestFixture {
               "  int i : (false ? g () : 1);\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase12() {
@@ -3034,7 +3438,7 @@ class TestSymbolDatabase : public TestFixture {
               "    void bar2 () = __null;\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase13() {
@@ -3043,32 +3447,35 @@ class TestSymbolDatabase : public TestFixture {
               "    void bar2 () = A::f;\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase14() {
         // ticket #2589 - segmentation fault
-        ASSERT_THROW(check("struct B : A\n"), InternalError);
+        ASSERT_THROW_INTERNAL(check("struct B : A\n"), SYNTAX);
     }
 
     void symboldatabase17() {
         // ticket #2657 - segmentation fault
         check("{return f(){}}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase19() {
         // ticket #2991 - segmentation fault
         check("::y(){x}");
 
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS("[test.cpp:1]: (debug) Executable scope 'y' with unknown function.\n"
-                                          "[test.cpp:1]: (debug) valueflow.cpp:1321:valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x\n", errout.str());
+        ASSERT_EQUALS(
+            "[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());
     }
 
     void symboldatabase20() {
         // ticket #3013 - segmentation fault
-        ASSERT_THROW(check("struct x : virtual y\n"), InternalError);
+        ASSERT_THROW_INTERNAL(check("struct x : virtual y\n"), SYNTAX);
     }
 
     void symboldatabase21() {
@@ -3080,14 +3487,14 @@ class TestSymbolDatabase : public TestFixture {
               "    Foo foo;\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // ticket 3437 (segmentation fault)
     void symboldatabase22() {
         check("template <class C> struct A {};\n"
               "A<int> a;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // ticket 3435 (std::vector)
@@ -3126,9 +3533,9 @@ class TestSymbolDatabase : public TestFixture {
         unsigned int constructor = 0;
         unsigned int destructor = 0;
         for (const Function& f : fredScope->functionList) {
-            if (f.type == Function::eConstructor)
+            if (f.type == FunctionType::eConstructor)
                 constructor = f.token->linenr();  // line number for constructor body
-            if (f.type == Function::eDestructor)
+            if (f.type == FunctionType::eDestructor)
                 destructor = f.token->linenr();  // line number for destructor body
         }
 
@@ -3147,7 +3554,7 @@ class TestSymbolDatabase : public TestFixture {
                            "    throw bar;\n"
                            "}";
         GET_SYMBOL_DB(str);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 2); // index 0 + 1 variable
     }
 
@@ -3157,7 +3564,7 @@ class TestSymbolDatabase : public TestFixture {
                            "    throw bar;\n"
                            "}";
         GET_SYMBOL_DB_C(str);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT(db && db->variableList().size() == 2); // index 0 + 1 variable
     }
 
@@ -3168,7 +3575,7 @@ class TestSymbolDatabase : public TestFixture {
               "    B1()\n"
               "    {} C(int) : B1() class\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase28() {
@@ -3182,7 +3589,7 @@ class TestSymbolDatabase : public TestFixture {
         check("struct B : A {\n"
               "    B() : A {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase30() {
@@ -3217,7 +3624,7 @@ class TestSymbolDatabase : public TestFixture {
                       "class Sub;");
         ASSERT(db && db->typeList.size() == 5);
 
-        std::list<Type>::const_iterator i = db->typeList.cbegin();
+        auto i = db->typeList.cbegin();
         const Type* Foo = &(*i++);
         const Type* Bar = &(*i++);
         const Type* Sub = &(*i++);
@@ -3257,18 +3664,17 @@ class TestSymbolDatabase : public TestFixture {
               "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());
+        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"
               "{};");
-        ASSERT_EQUALS("", errout.str());
+        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 ( ) { }"), SYNTAX);
     }
 
     void symboldatabase37() {
@@ -3285,7 +3691,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};");
         ASSERT(db && db->typeList.size() == 3);
 
-        std::list<Type>::const_iterator i = db->typeList.cbegin();
+        auto i = db->typeList.cbegin();
         const Type* Fred = &(*i++);
         const Type* Wilma = &(*i++);
         const Type* Barney = &(*i++);
@@ -3316,7 +3722,7 @@ class TestSymbolDatabase : public TestFixture {
               "    try {  }\n"
               "    catch (std::bad_alloc) {  }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase41() { // ticket #5197 (unknown macro)
@@ -3336,7 +3742,7 @@ class TestSymbolDatabase : public TestFixture {
         check("void f() {\n"
               "    new int;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase44() {
@@ -3374,14 +3780,14 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(db->getVariableFromVarId(i) != nullptr);
 
         ASSERT_EQUALS(4U, db->scopeList.size());
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-        ASSERT_EQUALS(Scope::eGlobal, scope->type);
+        auto scope = db->scopeList.cbegin();
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eStruct, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eStruct, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eFunction, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, scope->type);
     }
 
     void symboldatabase46() { // #6171 (anonymous namespace)
@@ -3392,16 +3798,16 @@ class TestSymbolDatabase : public TestFixture {
 
         ASSERT(db != nullptr);
         ASSERT_EQUALS(4U, db->scopeList.size());
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-        ASSERT_EQUALS(Scope::eGlobal, scope->type);
+        auto scope = db->scopeList.cbegin();
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eStruct, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, scope->type);
         ASSERT_EQUALS(scope->className, "S");
         ++scope;
-        ASSERT_EQUALS(Scope::eNamespace, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eNamespace, scope->type);
         ASSERT_EQUALS(scope->className, "");
         ++scope;
-        ASSERT_EQUALS(Scope::eStruct, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, scope->type);
         ASSERT_EQUALS(scope->className, "S");
     }
 
@@ -3548,7 +3954,7 @@ class TestSymbolDatabase : public TestFixture {
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(0U, db->functionScopes.size());
-            ASSERT(db->scopeList.back().type == Scope::eClass && db->scopeList.back().className == "NestedClass");
+            ASSERT(db->scopeList.back().type == ScopeType::eClass && db->scopeList.back().className == "NestedClass");
             ASSERT(db->scopeList.back().functionList.size() == 1U && !db->scopeList.back().functionList.front().hasBody());
         }
         {
@@ -3559,7 +3965,7 @@ class TestSymbolDatabase : public TestFixture {
 
             ASSERT(db != nullptr);
             ASSERT_EQUALS(1U, db->functionScopes.size());
-            ASSERT(db->scopeList.back().type == Scope::eFunction && db->scopeList.back().className == "f2");
+            ASSERT(db->scopeList.back().type == ScopeType::eFunction && db->scopeList.back().className == "f2");
             ASSERT(db->scopeList.back().function && db->scopeList.back().function->hasBody());
         }
         {
@@ -3582,11 +3988,11 @@ class TestSymbolDatabase : public TestFixture {
                       "}");
         ASSERT(db != nullptr);
         ASSERT(db->scopeList.size() == 4U);
-        std::list<Scope>::const_iterator it = db->scopeList.cbegin();
-        ASSERT(it->type == Scope::eGlobal);
-        ASSERT((++it)->type == Scope::eFunction);
-        ASSERT((++it)->type == Scope::eIf);
-        ASSERT((++it)->type == Scope::eElse);
+        auto it = db->scopeList.cbegin();
+        ASSERT(it->type == ScopeType::eGlobal);
+        ASSERT((++it)->type == ScopeType::eFunction);
+        ASSERT((++it)->type == ScopeType::eIf);
+        ASSERT((++it)->type == ScopeType::eElse);
     }
 
     void symboldatabase58() { // #6985 (using namespace type lookup)
@@ -3602,7 +4008,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};");
         ASSERT(db != nullptr);
         ASSERT(db->typeList.size() == 3U);
-        std::list<Type>::const_iterator it = db->typeList.cbegin();
+        auto it = db->typeList.cbegin();
         const Type * classB = &(*it);
         const Type * classC = &(*(++it));
         const Type * classA = &(*(++it));
@@ -4522,13 +4928,13 @@ 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 ; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int g();\n" // #11385
               "void f(int i) {\n"
               "    if (i > ::g()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase66() { // #8540
@@ -4644,7 +5050,7 @@ class TestSymbolDatabase : public TestFixture {
         const Token * f = db ? Token::findsimplematch(tokenizer.tokens(), "B ( const B & ) { }") : nullptr;
         ASSERT(f != nullptr);
         ASSERT(f && f->function() && f->function()->token->linenr() == 4);
-        ASSERT(f && f->function() && f->function()->type == Function::eCopyConstructor);
+        ASSERT(f && f->function() && f->function()->type == FunctionType::eCopyConstructor);
     }
 
     void symboldatabase74() { // #8838 - final
@@ -4659,40 +5065,58 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase75() {
-        GET_SYMBOL_DB("template <typename T>\n"
-                      "class optional {\n"
-                      "  auto     value() & -> T &;\n"
-                      "  auto     value() && -> T &&;\n"
-                      "  auto     value() const& -> T const &;\n"
-                      "};\n"
-                      "template <typename T>\n"
-                      "auto optional<T>::value() & -> T & {}\n"
-                      "template <typename T>\n"
-                      "auto optional<T>::value() && -> T && {}\n"
-                      "template <typename T>\n"
-                      "auto optional<T>::value() const & -> T const & {}\n"
-                      "optional<int> i;");
-
-        ASSERT_EQUALS(5, db->scopeList.size());
-        ASSERT_EQUALS(3, db->functionScopes.size());
+        {
+            GET_SYMBOL_DB("template <typename T>\n"
+                          "class optional {\n"
+                          "  auto     value() & -> T &;\n"
+                          "  auto     value() && -> T &&;\n"
+                          "  auto     value() const& -> T const &;\n"
+                          "};\n"
+                          "template <typename T>\n"
+                          "auto optional<T>::value() & -> T & {}\n"
+                          "template <typename T>\n"
+                          "auto optional<T>::value() && -> T && {}\n"
+                          "template <typename T>\n"
+                          "auto optional<T>::value() const & -> T const & {}\n"
+                          "optional<int> i;");
 
-        const Scope *f = db->functionScopes[0];
-        ASSERT(f->function->hasBody());
-        ASSERT(!f->function->isConst());
-        ASSERT(f->function->hasTrailingReturnType());
-        ASSERT(f->function->hasLvalRefQualifier());
+            ASSERT_EQUALS(5, db->scopeList.size());
+            ASSERT_EQUALS(3, db->functionScopes.size());
+
+            const Scope *f = db->functionScopes[0];
+            ASSERT(f->function->hasBody());
+            ASSERT(!f->function->isConst());
+            ASSERT(f->function->hasTrailingReturnType());
+            ASSERT(f->function->hasLvalRefQualifier());
+
+            f = db->functionScopes[1];
+            ASSERT(f->function->hasBody());
+            ASSERT(!f->function->isConst());
+            ASSERT(f->function->hasTrailingReturnType());
+            ASSERT(f->function->hasRvalRefQualifier());
+
+            f = db->functionScopes[2];
+            ASSERT(f->function->hasBody());
+            ASSERT(f->function->isConst());
+            ASSERT(f->function->hasTrailingReturnType());
+            ASSERT(f->function->hasLvalRefQualifier());
+        }
+        {
+            GET_SYMBOL_DB("struct S {\n" // #12962
+                          "    auto bar() const noexcept -> std::string const& { return m; }\n"
+                          "    std::string m;\n"
+                          "};\n");
 
-        f = db->functionScopes[1];
-        ASSERT(f->function->hasBody());
-        ASSERT(!f->function->isConst());
-        ASSERT(f->function->hasTrailingReturnType());
-        ASSERT(f->function->hasRvalRefQualifier());
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS(1, db->functionScopes.size());
 
-        f = db->functionScopes[2];
-        ASSERT(f->function->hasBody());
-        ASSERT(f->function->isConst());
-        ASSERT(f->function->hasTrailingReturnType());
-        ASSERT(f->function->hasLvalRefQualifier());
+            const Scope* f = db->functionScopes[0];
+            ASSERT(f->function->hasBody());
+            ASSERT(f->function->isConst());
+            ASSERT(f->function->hasTrailingReturnType());
+            ASSERT(f->function->isNoExcept());
+            ASSERT(Function::returnsReference(f->function));
+        }
     }
 
     void symboldatabase76() { // #9056
@@ -4721,7 +5145,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n"
                       "void e() { using c = a<>; }");
         ASSERT(db != nullptr);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase79() { // #9392
@@ -4872,11 +5296,8 @@ class TestSymbolDatabase : public TestFixture {
     }
 
     void symboldatabase83() { // #9431
-        const Settings settingsOld = settings1;
-        settings1.debugwarnings = true;
-        GET_SYMBOL_DB("struct a { a() noexcept; };\n"
-                      "a::a() noexcept = default;");
-        settings1 = settingsOld;
+        GET_SYMBOL_DB_DBG("struct a { a() noexcept; };\n"
+                          "a::a() noexcept = default;");
         const Scope *scope = db->findScopeByName("a");
         ASSERT(scope);
         ASSERT(scope->functionList.size() == 1);
@@ -4885,16 +5306,13 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(scope->functionList.front().isConstructor() == true);
         ASSERT(scope->functionList.front().isDefault() == true);
         ASSERT(scope->functionList.front().isNoExcept() == true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase84() {
         {
-            const bool old = settings1.debugwarnings;
-            settings1.debugwarnings = true;
-            GET_SYMBOL_DB("struct a { a() noexcept(false); };\n"
-                          "a::a() noexcept(false) = default;");
-            settings1.debugwarnings = old;
+            GET_SYMBOL_DB_DBG("struct a { a() noexcept(false); };\n"
+                              "a::a() noexcept(false) = default;");
             const Scope *scope = db->findScopeByName("a");
             ASSERT(scope);
             ASSERT(scope->functionList.size() == 1);
@@ -4903,14 +5321,11 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(scope->functionList.front().isConstructor() == true);
             ASSERT(scope->functionList.front().isDefault() == true);
             ASSERT(scope->functionList.front().isNoExcept() == false);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
-            const bool old = settings1.debugwarnings;
-            settings1.debugwarnings = true;
-            GET_SYMBOL_DB("struct a { a() noexcept(true); };\n"
-                          "a::a() noexcept(true) = default;");
-            settings1.debugwarnings = old;
+            GET_SYMBOL_DB_DBG("struct a { a() noexcept(true); };\n"
+                              "a::a() noexcept(true) = default;");
             const Scope *scope = db->findScopeByName("a");
             ASSERT(scope);
             ASSERT(scope->functionList.size() == 1);
@@ -4919,7 +5334,7 @@ class TestSymbolDatabase : public TestFixture {
             ASSERT(scope->functionList.front().isConstructor() == true);
             ASSERT(scope->functionList.front().isDefault() == true);
             ASSERT(scope->functionList.front().isNoExcept() == true);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -4972,7 +5387,7 @@ class TestSymbolDatabase : public TestFixture {
               "static void make(external::ns::s ss) {\n"
               "  internal::ns1::make<A>(ss);\n"
               "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase89() { // valuetype name
@@ -5001,7 +5416,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void foo(const int * const x);\n"
                       "};\n"
                       "void Fred::foo(const int * x) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "foo ( const int * x )");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -5014,7 +5429,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    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) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(),
                                                       "foo ( const std :: vector < std :: function < void ( const Fred :: Value & ) > > & callbacks ) { }");
         ASSERT(functok);
@@ -5028,11 +5443,11 @@ class TestSymbolDatabase : public TestFixture {
                           "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...> {};");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             GET_SYMBOL_DB("b.f();");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -5059,7 +5474,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "void B::foo1() {}\n"
                       "void B::foo2(void) {}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "foo1 ( ) { }");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -5075,7 +5490,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    int i, j;\n"
                       "};\n"
                       "std::map<int, A> m{ { 0, A{0,0} }, {0, A{0,0} } };\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase97() { // #10598 - final class
@@ -5088,7 +5503,7 @@ class TestSymbolDatabase : public TestFixture {
         const Token *functok = Token::findmatch(tokenizer.tokens(), "%name% (");
         ASSERT(functok);
         ASSERT(functok->function());
-        ASSERT_EQUALS(functok->function()->type, Function::Type::eConstructor);
+        ASSERT_EQUALS_ENUM(functok->function()->type, FunctionType::eConstructor);
     }
 
     void symboldatabase98() { // #10451
@@ -5113,7 +5528,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void symboldatabase99() { // #10864
         check("void f() { std::map<std::string, int> m; }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase100() {
@@ -5198,7 +5613,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void g() {}");
         ASSERT(db);
         ASSERT(db->scopeList.size() == 2);
-        ASSERT(db->scopeList.front().type == Scope::eGlobal);
+        ASSERT(db->scopeList.front().type == ScopeType::eGlobal);
         ASSERT(db->scopeList.back().className == "g");
     }
 
@@ -5208,56 +5623,246 @@ class TestSymbolDatabase : public TestFixture {
                       "lambda{}();\n"
                       "}\n");
         ASSERT(db != nullptr);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void symboldatabase104() {
-        const bool oldDebug = settings1.debugwarnings;
-        settings1.debugwarnings = true;
-        {
-            GET_SYMBOL_DB("struct S {\n" // #11535
-                          "    void f1(char* const c);\n"
-                          "    void f2(char* const c);\n"
-                          "    void f3(char* const);\n"
-                          "    void f4(char* c);\n"
-                          "    void f5(char* c);\n"
-                          "    void f6(char*);\n"
-                          "};\n"
-                          "void S::f1(char* c) {}\n"
-                          "void S::f2(char*) {}\n"
-                          "void S::f3(char* c) {}\n"
-                          "void S::f4(char* const c) {}\n"
-                          "void S::f5(char* const) {}\n"
-                          "void S::f6(char* const c) {}\n");
+        {
+            GET_SYMBOL_DB_DBG("struct S {\n" // #11535
+                              "    void f1(char* const c);\n"
+                              "    void f2(char* const c);\n"
+                              "    void f3(char* const);\n"
+                              "    void f4(char* c);\n"
+                              "    void f5(char* c);\n"
+                              "    void f6(char*);\n"
+                              "};\n"
+                              "void S::f1(char* c) {}\n"
+                              "void S::f2(char*) {}\n"
+                              "void S::f3(char* c) {}\n"
+                              "void S::f4(char* const c) {}\n"
+                              "void S::f5(char* const) {}\n"
+                              "void S::f6(char* const c) {}\n");
             ASSERT(db != nullptr);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("struct S2 {\n" // #11602
-                          "    enum E {};\n"
-                          "};\n"
-                          "struct S1 {\n"
-                          "    void f(S2::E) const;\n"
-                          "};\n"
-                          "void S1::f(const S2::E) const {}\n");
+            GET_SYMBOL_DB_DBG("struct S2 {\n" // #11602
+                              "    enum E {};\n"
+                              "};\n"
+                              "struct S1 {\n"
+                              "    void f(S2::E) const;\n"
+                              "};\n"
+                              "void S1::f(const S2::E) const {}\n");
             ASSERT(db != nullptr);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
-            GET_SYMBOL_DB("struct S {\n"
-                          "    void f(const bool b = false);\n"
-                          "};\n"
-                          "void S::f(const bool b) {}\n");
+            GET_SYMBOL_DB_DBG("struct S {\n"
+                              "    void f(const bool b = false);\n"
+                              "};\n"
+                              "void S::f(const bool b) {}\n");
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS("", errout_str());
+        }
+    }
+
+    void symboldatabase105() {
+        {
+            GET_SYMBOL_DB_DBG("template <class T>\n"
+                              "struct S : public std::deque<T> {\n"
+                              "    using std::deque<T>::clear;\n"
+                              "    void f();\n"
+                              "};\n"
+                              "template <class T>\n"
+                              "void S<T>::f() {\n"
+                              "    clear();\n"
+                              "}\n");
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS("", errout_str());
+            const Token* const c = Token::findsimplematch(tokenizer.tokens(), "clear (");
+            ASSERT(!c->type());
+        }
+    }
+
+    void symboldatabase106() {
+        {
+            GET_SYMBOL_DB_DBG("namespace N {\n" // #12958 - don't crash
+                              "    namespace O {\n"
+                              "        using namespace N::O;\n"
+                              "    }\n"
+                              "}\n");
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS("", errout_str());
+        }
+        {
+            GET_SYMBOL_DB_DBG("namespace N {\n"
+                              "    struct S {};\n"
+                              "}\n"
+                              "namespace O {\n"
+                              "    using namespace N;\n"
+                              "}\n"
+                              "namespace N {\n"
+                              "    using namespace O;\n"
+                              "    struct T {};\n"
+                              "}\n");
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS("", errout_str());
+        }
+    }
+
+    void symboldatabase107() {
+        {
+            GET_SYMBOL_DB_DBG("void g(int);\n" // #13329
+                              "void f(int** pp) {\n"
+                              "    for (int i = 0; i < 2; i++) {\n"
+                              "        g(*pp[i]);\n"
+                              "    }\n"
+                              "}\n");
             ASSERT(db != nullptr);
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS_ENUM(ScopeType::eFor, db->scopeList.back().type);
+            ASSERT_EQUALS(1, db->scopeList.back().varlist.size());
+            ASSERT_EQUALS("i", db->scopeList.back().varlist.back().name());
+        }
+        {
+            GET_SYMBOL_DB_DBG("void bar(int) {}\n" // #9960
+                              "void foo() {\n"
+                              "    std::vector<int*> a(10);\n"
+                              "    for (int i = 0; i < 10; i++)\n"
+                              "        bar(*a[4]);\n"
+                              "}\n");
+            ASSERT(db != nullptr);
+            ASSERT_EQUALS("", errout_str());
+            ASSERT_EQUALS(4, db->scopeList.size());
+            ASSERT_EQUALS_ENUM(ScopeType::eFor, db->scopeList.back().type);
+            ASSERT_EQUALS(1, db->scopeList.back().varlist.size());
+            ASSERT_EQUALS("i", db->scopeList.back().varlist.back().name());
+        }
+    }
+
+    void symboldatabase108() {
+        {
+            GET_SYMBOL_DB("struct S {\n" // #13442
+                          "    S() = delete;\n"
+                          "    S(int a) : i(a) {}\n"
+                          "    ~S();\n"
+                          "    int i;\n"
+                          "};\n"
+                          "S::~S() = default;\n");
+            ASSERT_EQUALS(db->scopeList.size(), 3);
+            auto scope = db->scopeList.begin();
+            ++scope;
+            ASSERT_EQUALS(scope->className, "S");
+            const auto& flist = scope->functionList;
+            ASSERT_EQUALS(flist.size(), 3);
+            auto it = flist.begin();
+            ASSERT_EQUALS(it->name(), "S");
+            ASSERT_EQUALS(it->tokenDef->linenr(), 2);
+            ASSERT(it->isDelete());
+            ASSERT(!it->isDefault());
+            ASSERT_EQUALS_ENUM(it->type, FunctionType::eConstructor);
+            ++it;
+            ASSERT_EQUALS(it->name(), "S");
+            ASSERT_EQUALS(it->tokenDef->linenr(), 3);
+            ASSERT(!it->isDelete());
+            ASSERT(!it->isDefault());
+            ASSERT_EQUALS_ENUM(it->type, FunctionType::eConstructor);
+            ++it;
+            ASSERT_EQUALS(it->name(), "S");
+            ASSERT_EQUALS(it->tokenDef->linenr(), 4);
+            ASSERT(!it->isDelete());
+            ASSERT(it->isDefault());
+            ASSERT_EQUALS_ENUM(it->type, FunctionType::eDestructor);
+        }
+        {
+            GET_SYMBOL_DB("struct S {\n" // #13637
+                          "    ~S();\n"
+                          "};\n"
+                          "S::~S() = delete;\n");
+            ASSERT_EQUALS(db->scopeList.size(), 2);
+            auto scope = db->scopeList.begin();
+            ASSERT(!scope->functionOf);
+            ++scope;
+            ASSERT_EQUALS(scope->className, "S");
+            ASSERT_EQUALS(scope->functionList.size(), 1);
+            auto it = scope->functionList.begin();
+            ASSERT_EQUALS(it->name(), "S");
+            ASSERT_EQUALS(it->tokenDef->linenr(), 2);
+            ASSERT(it->isDelete());
+            ASSERT(!it->isDefault());
+            ASSERT_EQUALS_ENUM(it->type, FunctionType::eDestructor);
         }
-        settings1.debugwarnings = oldDebug;
+    }
+
+    void symboldatabase109() { // #13553
+        GET_SYMBOL_DB("extern \"C\" {\n"
+                      "class Base {\n"
+                      "public:\n"
+                      "    virtual void show(void) = 0;\n"
+                      "};\n"
+                      "}\n");
+        const Token *f = db ? Token::findsimplematch(tokenizer.tokens(), "show") : nullptr;
+        ASSERT(f != nullptr);
+        ASSERT(f && f->function() && f->function()->hasVirtualSpecifier());
+    }
+
+    void symboldatabase110() { // #13498
+        GET_SYMBOL_DB("struct A;\n"
+                      "template <typename T, typename C>\n"
+                      "struct B {\n"
+                      "    const A& a;\n"
+                      "    const std::vector<C>& c;\n"
+                      "};\n"
+                      "template <typename T>\n"
+                      "struct B<T, void> {\n"
+                      "    const A& a;\n"
+                      "};\n"
+                      "template <typename T, typename C>\n"
+                      "void f(const A & a, const std::vector<C>&c) {\n"
+                      "    B<T, C>{ a, c };\n"
+                      "}\n");
+        const Token *B = db ? Token::findsimplematch(tokenizer.tokens(), "B < T , C >") : nullptr;
+        ASSERT(B && !B->type());
+    }
+
+    void symboldatabase111() {
+        GET_SYMBOL_DB("void f(int n) {\n"
+                      "    void g(), h(), i();\n"
+                      "    switch (n) {\n"
+                      "        case 1:\n"
+                      "        case 2:\n"
+                      "            g();\n"
+                      "            [[fallthrough]];\n"
+                      "        case 3:\n"
+                      "            h();\n"
+                      "            break;\n"
+                      "        default:\n"
+                      "            i();\n"
+                      "            break;\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 createSymbolDatabaseFindAllScopes1() {
         GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }");
         ASSERT(db->scopeList.size() == 3);
-        ASSERT_EQUALS(Scope::eUnion, db->scopeList.back().type);
+        ASSERT_EQUALS_ENUM(ScopeType::eUnion, db->scopeList.back().type);
     }
 
     void createSymbolDatabaseFindAllScopes2() {
@@ -5290,7 +5895,7 @@ class TestSymbolDatabase : public TestFixture {
                       "static const int foo = 8;\n"
                       "}\n");
         ASSERT(db);
-        ASSERT_EQUALS(6, db->scopeList.size());
+        ASSERT_EQUALS(9, db->scopeList.size());
         ASSERT_EQUALS(1, db->scopeList.front().varlist.size());
         auto list = db->scopeList;
         list.pop_front();
@@ -5337,12 +5942,12 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "const S S::IN(1);\n");
         ASSERT(db);
-        ASSERT_EQUALS(6, db->scopeList.size());
+        ASSERT_EQUALS(7, db->scopeList.size());
         const Token* const var = Token::findsimplematch(tokenizer.tokens(), "IN (");
         ASSERT(var && var->variable());
         ASSERT_EQUALS(var->variable()->name(), "IN");
-        auto it = db->scopeList.begin();
-        std::advance(it, 4);
+        auto it = db->scopeList.cbegin();
+        std::advance(it, 5);
         ASSERT_EQUALS(it->className, "S");
         ASSERT_EQUALS(var->variable()->scope(), &*it);
     }
@@ -5388,11 +5993,240 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(classNC.derivedFrom[1].type, &classNB);
     }
 
-    void enum1() {
-        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;");
+    void createSymbolDatabaseFindAllScopes7()
+    {
+        {
+            GET_SYMBOL_DB("namespace {\n"
+                          "    struct S {\n"
+                          "        void f();\n"
+                          "    };\n"
+                          "}\n"
+                          "void S::f() {}\n");
+            ASSERT(db);
+            ASSERT_EQUALS(4, db->scopeList.size());
+            auto anon = db->scopeList.begin();
+            ++anon;
+            ASSERT(anon->className.empty());
+            ASSERT_EQUALS_ENUM(anon->type, ScopeType::eNamespace);
+            auto S = anon;
+            ++S;
+            ASSERT_EQUALS_ENUM(S->type, ScopeType::eStruct);
+            ASSERT_EQUALS(S->className, "S");
+            ASSERT_EQUALS(S->nestedIn, &*anon);
+            const Token* f = Token::findsimplematch(tokenizer.tokens(), "f ( ) {");
+            ASSERT(f && f->function() && f->function()->functionScope && f->function()->functionScope->bodyStart);
+            ASSERT_EQUALS(f->function()->functionScope->functionOf, &*S);
+            ASSERT_EQUALS(f->function()->functionScope->bodyStart->linenr(), 6);
+        }
+        {
+            GET_SYMBOL_DB("namespace {\n"
+                          "    int i = 0;\n"
+                          "}\n"
+                          "namespace N {\n"
+                          "    namespace {\n"
+                          "        template<typename T>\n"
+                          "        struct S {\n"
+                          "            void f();\n"
+                          "        };\n"
+                          "        template<typename T>\n"
+                          "        void S<T>::f() {}\n"
+                          "    }\n"
+                          "    S<int> g() { return {}; }\n"
+                          "}\n");
+            ASSERT(db); // don't crash
+            ASSERT_EQUALS("", errout_str());
+        }
+    }
+
+    void createSymbolDatabaseFindAllScopes8() // #12761
+    {
+        // There are 2 myst constructors. They should belong to different scopes.
+        GET_SYMBOL_DB("template <class A = void, class B = void, class C = void>\n"
+                      "class Test {\n"
+                      "private:\n"
+                      "  template <class T>\n"
+                      "  struct myst {\n"
+                      "    T* x;\n"
+                      "    myst(T* y) : x(y){};\n"  // <- myst constructor
+                      "  };\n"
+                      "};\n"
+                      "\n"
+                      "template <class A, class B> class Test<A, B, void> {};\n"
+                      "\n"
+                      "template <>\n"
+                      "class Test<void, void, void> {\n"
+                      "private:\n"
+                      "  template <class T>\n"
+                      "  struct myst {\n"
+                      "    T* x;\n"
+                      "    myst(T* y) : x(y){};\n"  // <- myst constructor
+                      "  };\n"
+                      "};");
+        ASSERT(db);
+
+        const Token* myst1 = Token::findsimplematch(tokenizer.tokens(), "myst ( T * y )");
+        const Token* myst2 = Token::findsimplematch(myst1->next(), "myst ( T * y )");
+        ASSERT(myst1);
+        ASSERT(myst2);
+        ASSERT(myst1->scope() != myst2->scope());
+    }
+
+    void createSymbolDatabaseFindAllScopes9() // #12943
+    {
+        GET_SYMBOL_DB("void f(int n) {\n"
+                      "    if ([](int i) { return i == 2; }(n)) {}\n"
+                      "}\n");
+        ASSERT(db && db->scopeList.size() == 4);
+        ASSERT_EQUALS_ENUM(db->scopeList.back().type, ScopeType::eLambda);
+    }
+
+    void createSymbolDatabaseFindAllScopes10() {
+        {
+            GET_SYMBOL_DB("void g() {\n"
+                          "    for (int i = 0, r = 1; i < r; ++i) {}\n"
+                          "}\n");
+            ASSERT(db);
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS(2, db->scopeList.back().varlist.size());
+            const Token* const iTok = Token::findsimplematch(tokenizer.tokens(), "i");
+            const Token* const rTok = Token::findsimplematch(iTok, "r");
+            const Variable* i = iTok->variable(), * r = rTok->variable();
+            ASSERT(i != nullptr && r != nullptr);
+            ASSERT_EQUALS(i->typeStartToken(), r->typeStartToken());
+            ASSERT(i->valueType()->isTypeEqual(r->valueType()));
+        }
+        {
+            GET_SYMBOL_DB("void f() {\n" // #13697
+                          "    typedef void (*func_t)();\n"
+                          "    func_t a[] = { nullptr };\n"
+                          "    for (func_t* fp = a; *fp; fp++) {}\n"
+                          "}\n");
+            ASSERT(db); // don't hang
+            ASSERT_EQUALS(3, db->scopeList.size());
+            ASSERT_EQUALS(1, db->scopeList.back().varlist.size());
+            const Token* const fp = Token::findsimplematch(tokenizer.tokens(), "fp");
+            ASSERT(fp && fp->variable());
+        }
+    }
+
+    void createSymbolDatabaseIncompleteVars()
+    {
+        {
+            GET_SYMBOL_DB("void f() {\n"
+                          "    auto s1 = std::string{ \"abc\" };\n"
+                          "    auto s2 = std::string(\"def\");\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* s1 = Token::findsimplematch(tokenizer.tokens(), "string {");
+            ASSERT(s1 && !s1->isIncompleteVar());
+            const Token* s2 = Token::findsimplematch(s1, "string (");
+            ASSERT(s2 && !s2->isIncompleteVar());
+        }
+        {
+            GET_SYMBOL_DB("std::string f(int n, std::type_info t) {\n"
+                          "    std::vector<std::string*> v(n);\n"
+                          "    g<const std::string &>();\n"
+                          "    if (static_cast<int>(x)) {}\n"
+                          "    if (t == typeid(std::string)) {}\n"
+                          "    return (std::string) \"abc\";\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* s1 = Token::findsimplematch(tokenizer.tokens(), "string *");
+            ASSERT(s1 && !s1->isIncompleteVar());
+            const Token* s2 = Token::findsimplematch(s1, "string &");
+            ASSERT(s2 && !s2->isIncompleteVar());
+            const Token* x = Token::findsimplematch(s2, "x");
+            ASSERT(x && x->isIncompleteVar());
+            const Token* s3 = Token::findsimplematch(x, "string )");
+            ASSERT(s3 && !s3->isIncompleteVar());
+            const Token* s4 = Token::findsimplematch(s3->next(), "string )");
+            ASSERT(s4 && !s4->isIncompleteVar());
+        }
+        {
+            GET_SYMBOL_DB("void destroy(int*, void (*cb_dealloc)(void *));\n"
+                          "void f(int* p, int* q, int* r) {\n"
+                          "    destroy(p, free);\n"
+                          "    destroy(q, std::free);\n"
+                          "    destroy(r, N::free);\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* free1 = Token::findsimplematch(tokenizer.tokens(), "free");
+            ASSERT(free1 && !free1->isIncompleteVar());
+            const Token* free2 = Token::findsimplematch(free1->next(), "free");
+            ASSERT(free2 && !free2->isIncompleteVar());
+            const Token* free3 = Token::findsimplematch(free2->next(), "free");
+            ASSERT(free3 && free3->isIncompleteVar());
+        }
+        {
+            GET_SYMBOL_DB("void f(QObject* p, const char* s) {\n"
+                          "    QWidget* w = dynamic_cast<QWidget*>(p);\n"
+                          "    g(static_cast<const std::string>(s));\n"
+                          "    const std::uint64_t* const data = nullptr;\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* qw = Token::findsimplematch(tokenizer.tokens(), "QWidget * >");
+            ASSERT(qw && !qw->isIncompleteVar());
+            const Token* s = Token::findsimplematch(qw, "string >");
+            ASSERT(s && !s->isIncompleteVar());
+            const Token* u = Token::findsimplematch(s, "uint64_t");
+            ASSERT(u && !u->isIncompleteVar());
+        }
+        {
+            GET_SYMBOL_DB("void f() {\n"
+                          "    std::string* p = new std::string;\n"
+                          "    std::string* q = new std::string(\"abc\");\n"
+                          "    std::string* r = new std::string{ \"def\" };\n"
+                          "    std::string* s = new std::string[3]{ \"ghi\" };\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* s1 = Token::findsimplematch(tokenizer.tokens(), "string ;");
+            ASSERT(s1 && !s1->isIncompleteVar());
+            const Token* s2 = Token::findsimplematch(s1->next(), "string (");
+            ASSERT(s2 && !s2->isIncompleteVar());
+            const Token* s3 = Token::findsimplematch(s2->next(), "string {");
+            ASSERT(s3 && !s3->isIncompleteVar());
+            const Token* s4 = Token::findsimplematch(s3->next(), "string [");
+            ASSERT(s4 && !s4->isIncompleteVar());
+        }
+        {
+            GET_SYMBOL_DB("void f() {\n"
+                          "    T** p;\n"
+                          "    T*** q;\n"
+                          "    T** const * r;\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* p = Token::findsimplematch(tokenizer.tokens(), "p");
+            ASSERT(p && !p->isIncompleteVar());
+            const Token* q = Token::findsimplematch(p, "q");
+            ASSERT(q && !q->isIncompleteVar());
+            const Token* r = Token::findsimplematch(q, "r");
+            ASSERT(r && !r->isIncompleteVar());
+        }
+        {
+            GET_SYMBOL_DB("void f() {\n" // #12571
+                          "    auto g = []() -> std::string* {\n"
+                          "        return nullptr;\n"
+                          "    };\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* s = Token::findsimplematch(tokenizer.tokens(), "string");
+            ASSERT(s && !s->isIncompleteVar());
+        }
+        {
+            GET_SYMBOL_DB("void f() {\n" // #12583
+                          "    using namespace N;\n"
+                          "}\n");
+            ASSERT(db && errout_str().empty());
+            const Token* N = Token::findsimplematch(tokenizer.tokens(), "N");
+            ASSERT(N && !N->isIncompleteVar());
+        }
+    }
+
+    void enum1() {
+        GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;");
 
         /* there is a enum scope with the name BOOL */
-        ASSERT(db && db->scopeList.back().type == Scope::eEnum && db->scopeList.back().className == "BOOL");
+        ASSERT(db && db->scopeList.back().type == ScopeType::eEnum && db->scopeList.back().className == "BOOL");
 
         /* b is a enum variable, type is BOOL */
         ASSERT(db && db->getVariableFromVarId(1)->isEnumType());
@@ -5402,7 +6236,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("enum BOOL { FALSE, TRUE } b;");
 
         /* there is a enum scope with the name BOOL */
-        ASSERT(db && db->scopeList.back().type == Scope::eEnum && db->scopeList.back().className == "BOOL");
+        ASSERT(db && db->scopeList.back().type == ScopeType::eEnum && db->scopeList.back().className == "BOOL");
 
         /* b is a enum variable, type is BOOL */
         ASSERT(db && db->getVariableFromVarId(1)->isEnumType());
@@ -5410,7 +6244,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void enum3() {
         GET_SYMBOL_DB("enum ABC { A=11,B,C=A+B };");
-        ASSERT(db && db->scopeList.back().type == Scope::eEnum);
+        ASSERT(db && db->scopeList.back().type == ScopeType::eEnum);
 
         /* There is an enum A with value 11 */
         const Enumerator *A = db->scopeList.back().findEnumerator("A");
@@ -5433,15 +6267,15 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(3U, db->scopeList.size());
 
         // Assert that all enum values are known
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
+        auto scope = db->scopeList.cbegin();
 
         // Offsets
         ++scope;
-        ASSERT_EQUALS((unsigned int)Scope::eEnum, (unsigned int)scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eEnum, scope->type);
         ASSERT_EQUALS(4U, scope->enumeratorList.size());
 
         ASSERT(scope->enumeratorList[0].name->enumerator() == &scope->enumeratorList[0]);
-        ASSERT_EQUALS((unsigned int)Token::eEnumerator, (unsigned int)scope->enumeratorList[0].name->tokType());
+        ASSERT_EQUALS_ENUM(Token::eEnumerator, scope->enumeratorList[0].name->tokType());
         ASSERT(scope->enumeratorList[0].scope == &*scope);
         ASSERT_EQUALS("O1", scope->enumeratorList[0].name->str());
         ASSERT(scope->enumeratorList[0].start == nullptr);
@@ -5450,7 +6284,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(0, scope->enumeratorList[0].value);
 
         ASSERT(scope->enumeratorList[1].name->enumerator() == &scope->enumeratorList[1]);
-        ASSERT_EQUALS((unsigned int)Token::eEnumerator, (unsigned int)scope->enumeratorList[1].name->tokType());
+        ASSERT_EQUALS_ENUM(Token::eEnumerator, scope->enumeratorList[1].name->tokType());
         ASSERT(scope->enumeratorList[1].scope == &*scope);
         ASSERT_EQUALS("O2", scope->enumeratorList[1].name->str());
         ASSERT(scope->enumeratorList[1].start == nullptr);
@@ -5459,7 +6293,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(1, scope->enumeratorList[1].value);
 
         ASSERT(scope->enumeratorList[2].name->enumerator() == &scope->enumeratorList[2]);
-        ASSERT_EQUALS((unsigned int)Token::eEnumerator, (unsigned int)scope->enumeratorList[2].name->tokType());
+        ASSERT_EQUALS_ENUM(Token::eEnumerator, scope->enumeratorList[2].name->tokType());
         ASSERT(scope->enumeratorList[2].scope == &*scope);
         ASSERT_EQUALS("O3", scope->enumeratorList[2].name->str());
         ASSERT(scope->enumeratorList[2].start != nullptr);
@@ -5468,7 +6302,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(5, scope->enumeratorList[2].value);
 
         ASSERT(scope->enumeratorList[3].name->enumerator() == &scope->enumeratorList[3]);
-        ASSERT_EQUALS((unsigned int)Token::eEnumerator, (unsigned int)scope->enumeratorList[3].name->tokType());
+        ASSERT_EQUALS_ENUM(Token::eEnumerator, scope->enumeratorList[3].name->tokType());
         ASSERT(scope->enumeratorList[3].scope == &*scope);
         ASSERT_EQUALS("O4", scope->enumeratorList[3].name->str());
         ASSERT(scope->enumeratorList[3].start == nullptr);
@@ -5478,11 +6312,11 @@ class TestSymbolDatabase : public TestFixture {
 
         // MyEnums
         ++scope;
-        ASSERT_EQUALS((unsigned int)Scope::eEnum, (unsigned int)scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eEnum, scope->type);
         ASSERT_EQUALS(3U, scope->enumeratorList.size());
 
         ASSERT(scope->enumeratorList[0].name->enumerator() == &scope->enumeratorList[0]);
-        ASSERT_EQUALS((unsigned int)Token::eEnumerator, (unsigned int)scope->enumeratorList[0].name->tokType());
+        ASSERT_EQUALS_ENUM(Token::eEnumerator, scope->enumeratorList[0].name->tokType());
         ASSERT(scope->enumeratorList[0].scope == &*scope);
         ASSERT_EQUALS("E1", scope->enumeratorList[0].name->str());
         ASSERT(scope->enumeratorList[0].start != nullptr);
@@ -5491,7 +6325,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(1, scope->enumeratorList[0].value);
 
         ASSERT(scope->enumeratorList[1].name->enumerator() == &scope->enumeratorList[1]);
-        ASSERT_EQUALS((unsigned int)Token::eEnumerator, (unsigned int)scope->enumeratorList[1].name->tokType());
+        ASSERT_EQUALS_ENUM(Token::eEnumerator, scope->enumeratorList[1].name->tokType());
         ASSERT(scope->enumeratorList[1].scope == &*scope);
         ASSERT_EQUALS("E2", scope->enumeratorList[1].name->str());
         ASSERT(scope->enumeratorList[1].start == nullptr);
@@ -5500,7 +6334,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(2, scope->enumeratorList[1].value);
 
         ASSERT(scope->enumeratorList[2].name->enumerator() == &scope->enumeratorList[2]);
-        ASSERT_EQUALS((unsigned int)Token::eEnumerator, (unsigned int)scope->enumeratorList[2].name->tokType());
+        ASSERT_EQUALS_ENUM(Token::eEnumerator, scope->enumeratorList[2].name->tokType());
         ASSERT(scope->enumeratorList[2].scope == &*scope);
         ASSERT_EQUALS("E3", scope->enumeratorList[2].name->str());
         ASSERT(scope->enumeratorList[2].start != nullptr);
@@ -5521,10 +6355,10 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(2U, db->scopeList.size());
 
         // Assert that all enum values are known
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
+        auto scope = db->scopeList.cbegin();
 
         ++scope;
-        ASSERT_EQUALS((unsigned int)Scope::eEnum, (unsigned int)scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eEnum, scope->type);
         ASSERT_EQUALS(2U, scope->enumeratorList.size());
         ASSERT_EQUALS(true, scope->enumeratorList[0].value_known);
         ASSERT_EQUALS(10, scope->enumeratorList[0].value);
@@ -5682,7 +6516,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void enum11() {
         check("enum class E;\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void enum12() {
@@ -5701,6 +6535,367 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(e->enumerator(), E0);
     }
 
+    void enum13() {
+        GET_SYMBOL_DB("struct S { enum E { E0, E1 }; };\n"
+                      "void f(bool b) {\n"
+                      "    auto e = b ? S::E0 : S::E1;\n"
+                      "}\n");
+        ASSERT(db != nullptr);
+        auto it = db->scopeList.begin();
+        std::advance(it, 2);
+        const Enumerator* E1 = it->findEnumerator("E1");
+        ASSERT(E1 && E1->value_known);
+        ASSERT_EQUALS(E1->value, 1);
+        const Token* const a = Token::findsimplematch(tokenizer.tokens(), "auto");
+        ASSERT(a && a->valueType());
+        ASSERT(E1->scope == a->valueType()->typeScope);
+    }
+
+    void enum14() {
+        GET_SYMBOL_DB("void f() {\n" // #11421
+                      "    enum E { A = 0, B = 0xFFFFFFFFFFFFFFFFull, C = 0x7FFFFFFFFFFFFFFF };\n"
+                      "    E e = B;\n"
+                      "    auto s1 = e >> 32;\n"
+                      "    auto s2 = B >> 32;\n"
+                      "    enum F { F0 = sizeof(int) };\n"
+                      "    F f = F0;\n"
+                      "}\n");
+        ASSERT(db != nullptr);
+        auto it = db->scopeList.begin();
+        std::advance(it, 2);
+        const Enumerator* B = it->findEnumerator("B");
+        ASSERT(B);
+        TODO_ASSERT(B->value_known);
+        const Enumerator* C = it->findEnumerator("C");
+        ASSERT(C && C->value_known);
+        const Token* const s1 = Token::findsimplematch(tokenizer.tokens(), "s1 =");
+        ASSERT(s1 && s1->valueType());
+        ASSERT_EQUALS(s1->valueType()->type, ValueType::Type::LONGLONG);
+        const Token* const s2 = Token::findsimplematch(s1, "s2 =");
+        ASSERT(s2 && s2->valueType());
+        ASSERT_EQUALS(s2->valueType()->type, ValueType::Type::LONGLONG);
+        ++it;
+        const Enumerator* F0 = it->findEnumerator("F0");
+        ASSERT(F0 && F0->value_known);
+        const Token* const f = Token::findsimplematch(s2, "f =");
+        ASSERT(f && f->valueType());
+        ASSERT_EQUALS(f->valueType()->type, ValueType::Type::INT);
+    }
+
+    void enum15() {
+        {
+            GET_SYMBOL_DB("struct S {\n"
+                          "    S();\n"
+                          "    enum E { E0 };\n"
+                          "};\n"
+                          "S::S() {\n"
+                          "    E e = E::E0;\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            const Enumerator* E0 = it->findEnumerator("E0");
+            ASSERT(E0 && E0->value_known && E0->value == 0);
+            const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E0 ;");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E0, e->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("struct S {\n"
+                          "    S(bool x);\n"
+                          "    enum E { E0 };\n"
+                          "};\n"
+                          "S::S(bool x) {\n"
+                          "    if (x)\n"
+                          "        E e = E::E0;\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            const Enumerator* E0 = it->findEnumerator("E0");
+            ASSERT(E0 && E0->value_known && E0->value == 0);
+            const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E0 ;");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E0, e->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("struct S {\n"
+                          "    enum E { E0 };\n"
+                          "    void f(int i);\n"
+                          "    S();\n"
+                          "    int m;\n"
+                          "};\n"
+                          "S::S() : m(E0) {}\n"
+                          "void S::f(int i) {\n"
+                          "    if (i != E0) {}\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            const Enumerator* E0 = it->findEnumerator("E0");
+            ASSERT(E0 && E0->value_known && E0->value == 0);
+            const Token* e = Token::findsimplematch(tokenizer.tokens(), "E0 )");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E0, e->enumerator());
+            e = Token::findsimplematch(e->next(), "E0 )");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E0, e->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("struct S {\n"
+                          "    enum class E {\n"
+                          "        A, D\n"
+                          "    } e = E::D;\n"
+                          "};\n"
+                          "struct E {\n"
+                          "    enum { A, B, C, D };\n"
+                          "};\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            ASSERT_EQUALS(it->className, "E");
+            ASSERT(it->nestedIn);
+            ASSERT_EQUALS(it->nestedIn->className, "S");
+            const Enumerator* D = it->findEnumerator("D");
+            ASSERT(D && D->value_known && D->value == 1);
+            const Token* tok = Token::findsimplematch(tokenizer.tokens(), "D ;");
+            ASSERT(tok && tok->enumerator());
+            ASSERT_EQUALS(D, tok->enumerator());
+        }
+    }
+
+    void enum16() {
+        {
+            GET_SYMBOL_DB("struct B {\n" // #12538
+                          "    struct S {\n"
+                          "        enum E { E0 = 0 };\n"
+                          "    };\n"
+                          "};\n"
+                          "struct D : B {\n"
+                          "    S::E f() const {\n"
+                          "        return S::E0;\n"
+                          "    }\n"
+                          "};\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 3);
+            const Enumerator* E0 = it->findEnumerator("E0");
+            ASSERT(E0 && E0->value_known && E0->value == 0);
+            const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E0 ;");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E0, e->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("namespace ns {\n" // #12567
+                          "    struct S1 {\n"
+                          "        enum E { E1 } e;\n"
+                          "    };\n"
+                          "    struct S2 {\n"
+                          "        static void f();\n"
+                          "    };\n"
+                          "}\n"
+                          "void ns::S2::f() {\n"
+                          "    S1 s;\n"
+                          "    s.e = S1::E1;\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 3);
+            const Enumerator* E1 = it->findEnumerator("E1");
+            ASSERT(E1 && E1->value_known && E1->value == 0);
+            const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E1 ;");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E1, e->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("namespace N {\n"
+                          "    struct S1 {\n"
+                          "        enum E { E1 } e;\n"
+                          "    };\n"
+                          "    namespace O {\n"
+                          "        struct S2 {\n"
+                          "            static void f();\n"
+                          "        };\n"
+                          "    }\n"
+                          "}\n"
+                          "void N::O::S2::f() {\n"
+                          "    S1 s;\n"
+                          "    s.e = S1::E1;\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 3);
+            const Enumerator* E1 = it->findEnumerator("E1");
+            ASSERT(E1 && E1->value_known && E1->value == 0);
+            const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E1 ;");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E1, e->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("enum class E { inc };\n" // #12585
+                          "struct C {\n"
+                          "    void f1();\n"
+                          "    bool f2(bool inc);\n"
+                          "};\n"
+                          "void C::f1() { const E e = E::inc; }\n"
+                          "void C::f2(bool inc) { return false; }\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 1);
+            const Enumerator* inc = it->findEnumerator("inc");
+            ASSERT(inc && inc->value_known && inc->value == 0);
+            const Token* const i = Token::findsimplematch(tokenizer.tokens(), "inc ;");
+            ASSERT(i && i->enumerator());
+            ASSERT_EQUALS(inc, i->enumerator());
+        }
+    }
+
+    void enum17() {
+        {
+            GET_SYMBOL_DB("struct S {\n" // #12564
+                          "    enum class E : std::uint8_t;\n"
+                          "    enum class E : std::uint8_t { E0 };\n"
+                          "    static void f(S::E e) {\n"
+                          "        if (e == S::E::E0) {}\n"
+                          "    }\n"
+                          "};\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            const Enumerator* E0 = it->findEnumerator("E0");
+            ASSERT(E0 && E0->value_known && E0->value == 0);
+            const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E0 )");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E0, e->enumerator());
+        }
+    }
+
+    void enum18() {
+        {
+            GET_SYMBOL_DB("namespace {\n"
+                          "    enum { E0 };\n"
+                          "}\n"
+                          "void f() {\n"
+                          "    if (0 > E0) {}\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            const Enumerator* E0 = it->findEnumerator("E0");
+            ASSERT(E0 && E0->value_known && E0->value == 0);
+            const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E0 )");
+            ASSERT(e && e->enumerator());
+            ASSERT_EQUALS(E0, e->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("namespace ns {\n" // #12114
+                          "    enum { V1 };\n"
+                          "    struct C1 {\n"
+                          "        enum { V2 };\n"
+                          "    };\n"
+                          "}\n"
+                          "using namespace ns;\n"
+                          "void f() {\n"
+                          "    if (0 > V1) {}\n"
+                          "    if (0 > C1::V2) {}\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            const Enumerator* V1 = it->findEnumerator("V1");
+            ASSERT(V1 && V1->value_known && V1->value == 0);
+            const Token* const e1 = Token::findsimplematch(tokenizer.tokens(), "V1 )");
+            ASSERT(e1 && e1->enumerator());
+            ASSERT_EQUALS(V1, e1->enumerator());
+            std::advance(it, 2);
+            const Enumerator* V2 = it->findEnumerator("V2");
+            ASSERT(V2 && V2->value_known && V2->value == 0);
+            const Token* const e2 = Token::findsimplematch(tokenizer.tokens(), "V2 )");
+            ASSERT(e2 && e2->enumerator());
+            ASSERT_EQUALS(V2, e2->enumerator());
+        }
+        {
+            GET_SYMBOL_DB("namespace ns {\n"
+                          "    enum { V1 };\n"
+                          "    struct C1 {\n"
+                          "        enum { V2 };\n"
+                          "    };\n"
+                          "}\n"
+                          "void f() {\n"
+                          "    using namespace ns;\n"
+                          "    if (0 > V1) {}\n"
+                          "    if (0 > C1::V2) {}\n"
+                          "}\n");
+            ASSERT(db != nullptr);
+            auto it = db->scopeList.begin();
+            std::advance(it, 2);
+            const Enumerator* V1 = it->findEnumerator("V1");
+            ASSERT(V1 && V1->value_known && V1->value == 0);
+            const Token* const e1 = Token::findsimplematch(tokenizer.tokens(), "V1 )");
+            ASSERT(e1 && e1->enumerator());
+            ASSERT_EQUALS(V1, e1->enumerator());
+            std::advance(it, 2);
+            const Enumerator* V2 = it->findEnumerator("V2");
+            ASSERT(V2 && V2->value_known && V2->value == 0);
+            const Token* const e2 = Token::findsimplematch(tokenizer.tokens(), "V2 )");
+            ASSERT(e2 && e2->enumerator());
+            ASSERT_EQUALS(V2, e2->enumerator());
+        }
+    }
+
+    void enum19() {
+        {
+            GET_SYMBOL_DB("enum : std::int8_t { I = -1 };\n" // #13528
+                          "enum : int8_t { J = -1 };\n"
+                          "enum : char { K = -1 };\n");
+            const Token* I = Token::findsimplematch(tokenizer.tokens(), "I");
+            ASSERT(I && I->valueType() && I->valueType()->isEnum());
+            ASSERT_EQUALS(I->valueType()->type, ValueType::CHAR);
+            const Token* J = Token::findsimplematch(I, "J");
+            ASSERT(J && J->valueType() && J->valueType()->isEnum());
+            ASSERT_EQUALS(J->valueType()->type, ValueType::CHAR);
+            const Token* K = Token::findsimplematch(J, "K");
+            ASSERT(K && K->valueType() && K->valueType()->isEnum());
+            ASSERT_EQUALS(K->valueType()->type, ValueType::CHAR);
+        }
+    }
+
+    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"
+                        "}");
+
+        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"
@@ -5709,7 +6904,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    int i = abc[ARRAY_SIZE(cats)];\n"
                       "}");
         const Token *e = Token::findsimplematch(tokenizer.tokens(), "e abc");
-        db->sizeOfType(e);  // <- don't crash
+        (void)db->sizeOfType(e);  // <- don't crash
     }
 
     void isImplicitlyVirtual() {
@@ -5834,7 +7029,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void g();\n"
                       "};");
         ASSERT(db && db->scopeList.back().functionList.size() == 4);
-        std::list<Function>::const_iterator it = db->scopeList.back().functionList.cbegin();
+        auto it = db->scopeList.back().functionList.cbegin();
         ASSERT((it++)->isPure());
         ASSERT((it++)->isPure());
         ASSERT(!(it++)->isPure());
@@ -5866,7 +7061,8 @@ class TestSymbolDatabase : public TestFixture {
                       "    *PTRRELOC(&x) = &y;\n"
                       "}");
         ASSERT(db != nullptr);
-        ASSERT(db && !db->isFunction(Token::findsimplematch(tokenizer.tokens(), "PTRRELOC ( &"), &db->scopeList.back(), nullptr, nullptr, nullptr));
+        const Token *funcStart, *argStart, *declEnd;
+        ASSERT(db && !db->isFunction(Token::findsimplematch(tokenizer.tokens(), "PTRRELOC ( &"), &db->scopeList.back(), funcStart, argStart, declEnd));
         ASSERT(db->findScopeByName("set_cur_cpu_spec") != nullptr);
         ASSERT(db->findScopeByName("setup_cpu_spec") != nullptr);
         ASSERT(db->findScopeByName("PTRRELOC") == nullptr);
@@ -5881,7 +7077,20 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(2, db->scopeList.size());
         const Token* ret = Token::findsimplematch(tokenizer.tokens(), "return");
         ASSERT(ret != nullptr);
-        ASSERT(ret->scope() && ret->scope()->type == Scope::eFunction);
+        ASSERT(ret->scope() && ret->scope()->type == ScopeType::eFunction);
+    }
+
+    void isFunction4() {
+        GET_SYMBOL_DB("struct S (*a[10]);\n" // #13787
+                      "void f(int i, struct S* p) {\n"
+                      "    a[i] = &p[i];\n"
+                      "}\n");
+        ASSERT(db != nullptr);
+        ASSERT_EQUALS(2, db->scopeList.size());
+        ASSERT_EQUALS(1, db->scopeList.front().functionList.size());
+        const Token* a = Token::findsimplematch(tokenizer.tokens(), "a [ i");
+        ASSERT(a && a->variable());
+        ASSERT(a->variable()->scope() && a->variable()->scope()->type == ScopeType::eGlobal);
     }
 
 
@@ -5892,11 +7101,11 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo();\n"      /* 4 */
                       "    foo(1);\n"     /* 5 */
                       "}");               /* 6 */
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT(db);
         const Scope * bar = db->findScopeByName("bar");
         ASSERT(bar != nullptr);
-        const unsigned int linenrs[2] = { 2, 1 };
+        constexpr unsigned int linenrs[2] = { 2, 1 };
         unsigned int index = 0;
         for (const Token * tok = bar->bodyStart->next(); tok != bar->bodyEnd; tok = tok->next()) {
             if (Token::Match(tok, "%name% (") && !tok->varId() && Token::simpleMatch(tok->linkAt(1), ") ;")) {
@@ -5922,7 +7131,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    func(x, &t);\n"
                       "}");
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "func ( x , & t ) ;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
         ASSERT_EQUALS(true,  callfunc != nullptr); // not null
         ASSERT_EQUALS(false, (callfunc && callfunc->function())); // callfunc->function() should be null
@@ -5937,7 +7146,7 @@ class TestSymbolDatabase : public TestFixture {
                       "}");
 
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "d . foo ( ) ;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
         ASSERT_EQUALS(true, callfunc != nullptr); // not null
         ASSERT_EQUALS(true, callfunc && callfunc->tokAt(2)->function() && callfunc->tokAt(2)->function()->tokenDef->linenr() == 2); // should find function on line 2
@@ -6004,7 +7213,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(crld);\n"
                       "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( 1 ) ;");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -6132,7 +7341,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    }\n"
                       "};");
         const Token *callfunc = Token::findsimplematch(tokenizer.tokens(), "power . nodeResults ( ) . size ( ) ;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true, db != nullptr); // not null
         ASSERT_EQUALS(true, callfunc != nullptr); // not null
         ASSERT_EQUALS(true, callfunc && callfunc->tokAt(2)->function() && callfunc->tokAt(2)->function()->tokenDef->linenr() == 3);
@@ -6159,7 +7368,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void S::g() const   { }\n"
                       "void S::g() const & { }\n"
                       "void S::g() const &&{ }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( ) {");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -6221,7 +7430,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void foo(const int * p);\n"
                       "};\n"
                       "void Fred::foo(const int * const p) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( const int * const p ) {");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -6232,7 +7441,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void foo(const int * p);\n"
                       "};\n"
                       "void Fred::foo(const int p []) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( const int p [ ] ) {");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -6250,7 +7459,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(\"\");\n"
                       "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( 0 ) ;");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -6288,7 +7497,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(\"\");\n"
                       "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token* f = Token::findsimplematch(tokenizer.tokens(), "foo ( 0.f ) ;");
         ASSERT_EQUALS(true, f && f->function());
@@ -6336,7 +7545,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo2(NULL);\n"
                       "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( ip ) ;");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 1);
@@ -6385,7 +7594,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo3(7, L'c');\n"
                       "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo1 ( 1");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -6425,7 +7634,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(c.fp);\n"
                       "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( c . i ) ;");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 3);
@@ -6462,7 +7671,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    foo(f + i);\n"
                       "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "foo ( i + i ) ;");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 1);
@@ -6488,7 +7697,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void b() { f(1.f); }\n"
                       "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "f ( 1 ) ;");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -6533,7 +7742,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    }\n"
                       "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT(db);
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v1 ) ) ;");
@@ -6634,7 +7843,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    int _y;\n"
                       "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "copy ( & f ) ;");
         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 7);
@@ -6996,7 +8205,7 @@ class TestSymbolDatabase : public TestFixture {
                       "namespace ns {\n"
                       "    void A::f(external::T link_type) { }\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( external :: T link_type )");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -7014,7 +8223,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "using ::ns::V;\n"
                       "void A::f(const V&) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( const :: ns :: V & )");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -7032,7 +8241,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "using ::ns::Var;\n"
                       "void A::f(const Var&) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( const :: ns :: V & )");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -7052,7 +8261,7 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n"
                       "using ::external::V;\n"
                       "void A::f(V::I) {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( int )");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -7068,7 +8277,7 @@ class TestSymbolDatabase : public TestFixture {
                       "const char* E::what() const noexcept {\n"
                       "    return nullptr;\n"
                       "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "what ( ) const noexcept ( true ) {");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -7085,7 +8294,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    int* y = g(x);\n"
                           "    *y = 0;\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( x )");
             ASSERT(functok);
             ASSERT(functok->function());
@@ -7100,7 +8309,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    int* y = g(x);\n"
                           "    *y = 0;\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( x )");
             ASSERT(functok);
             ASSERT(functok->function());
@@ -7113,7 +8322,7 @@ class TestSymbolDatabase : public TestFixture {
         GET_SYMBOL_DB("void a(const std::string &, const std::string &);\n"
                       "void a(long, long);\n"
                       "void b() { a(true, false); }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "a ( true , false )");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -7127,7 +8336,7 @@ class TestSymbolDatabase : public TestFixture {
                           "const A* g(const std::string&);\n"
                           "const A& g(std::vector<A>::size_type i);\n"
                           "const A& f(std::vector<A>::size_type i) { return g(i); }\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( i )");
             ASSERT(functok);
             ASSERT(functok->function());
@@ -7139,7 +8348,7 @@ class TestSymbolDatabase : public TestFixture {
                           "const A& g(std::vector<A>::size_type i);\n"
                           "const A* g(const std::string&);\n"
                           "const A& f(std::vector<A>::size_type i) { return g(i); }\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( i )");
             ASSERT(functok);
             ASSERT(functok->function());
@@ -7156,7 +8365,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(const int&, T::E) {}\n"
                           "    void g() { f(nullptr, T::E0); }\n"
                           "};\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( nullptr");
             ASSERT(functok);
             ASSERT(functok->function());
@@ -7170,7 +8379,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    void f(int, int) {}\n"
                           "    void g() { f(nullptr, E0); }\n"
                           "};\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( nullptr");
             ASSERT(functok);
             ASSERT(functok->function());
@@ -7184,7 +8393,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void g() {\n"
                           "    f(nullptr, t.E0);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "f ( nullptr");
             ASSERT(functok);
             ASSERT(functok->function());
@@ -7199,7 +8408,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    std::vector<S>::iterator it = v.begin();\n"
                       "    it->g(1);\n"
                       "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( 1");
         ASSERT(functok);
         ASSERT(functok->function());
@@ -7217,7 +8426,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    int* p = s.g(E0, i);\n"
                       "    *p = 0;\n"
                       "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token *functok = Token::findsimplematch(tokenizer.tokens(), "g ( E0");
         ASSERT(functok && functok->function());
         ASSERT(functok->function()->name() == "g");
@@ -7233,7 +8442,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    using namespace N;\n"
                           "    toupper(s);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "toupper ( s");
             ASSERT(functok && functok->function());
             ASSERT(functok->function()->name() == "toupper");
@@ -7247,7 +8456,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void f(std::string s) {\n"
                           "    toupper(s);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
             const Token *functok = Token::findsimplematch(tokenizer.tokens(), "toupper ( s");
             ASSERT(functok && functok->function());
             ASSERT(functok->function()->name() == "toupper");
@@ -7260,13 +8469,323 @@ class TestSymbolDatabase : public TestFixture {
                       "    S() {}\n"
                       "    std::list<S> l;\n"
                       "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         const Token* typeTok = Token::findsimplematch(tokenizer.tokens(), "S >");
         ASSERT(typeTok && typeTok->type());
         ASSERT(typeTok->type()->name() == "S");
         ASSERT_EQUALS(1, typeTok->type()->classDef->linenr());
     }
 
+    void findFunction49() {
+        GET_SYMBOL_DB("struct B {};\n"
+                      "struct D : B {};\n"
+                      "void f(bool = false, bool = true);\n"
+                      "void f(B*, bool, bool = true);\n"
+                      "void g() {\n"
+                      "    D d;\n"
+                      "    f(&d, true);\n"
+                      "}\n");
+        ASSERT_EQUALS("", errout_str());
+        const Token* ftok = Token::findsimplematch(tokenizer.tokens(), "f ( &");
+        ASSERT(ftok && ftok->function());
+        ASSERT(ftok->function()->name() == "f");
+        ASSERT_EQUALS(4, ftok->function()->tokenDef->linenr());
+    }
+
+    void findFunction50() {
+        {
+            GET_SYMBOL_DB("struct B { B(); void init(unsigned int value); };\n"
+                          "struct D: B { D(); void init(unsigned int value); };\n"
+                          "D::D() { init(0); }\n"
+                          "void D::init(unsigned int value) {}\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "init ( 0 ) ;");
+            ASSERT(call && call->function() && call->function()->functionScope);
+        }
+
+        {
+            GET_SYMBOL_DB("struct B { B(); void init(unsigned int value); };\n"
+                          "struct D: B { D(); void init(unsigned int value); };\n"
+                          "D::D() { init(0ULL); }\n"
+                          "void D::init(unsigned int value) {}\n");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "init ( 0ULL ) ;");
+            ASSERT(call && call->function() && call->function()->functionScope);
+        }
+    }
+
+    void findFunction51() {
+        // Both A and B defines the method test but with different arguments.
+        // The call to test in B should match the method in B. The match is close enough.
+        {
+            GET_SYMBOL_DB("class A {\n"
+                          "public:\n"
+                          "    void test(bool a = true);\n"
+                          "};\n"
+                          "\n"
+                          "class B : public A {\n"
+                          "public:\n"
+                          "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
+                          "  void test(const std::string& str_obj);\n"
+                          "  B* b_obj;\n"
+                          "};");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
+            ASSERT(call);
+            ASSERT(call->function());
+            ASSERT(call->function()->tokenDef);
+            ASSERT_EQUALS(9, call->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct STR { STR(const char * p); };\n"
+                          "class A {\n"
+                          "public:\n"
+                          "    void test(bool a = true);\n"
+                          "};\n"
+                          "\n"
+                          "class B : public A {\n"
+                          "public:\n"
+                          "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
+                          "  void test(const STR& str_obj);\n"
+                          "  B* b_obj;\n"
+                          "};");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
+            ASSERT(call);
+            ASSERT(call->function());
+            ASSERT(call->function()->tokenDef);
+            ASSERT_EQUALS(10, call->function()->tokenDef->linenr());
+        }
+        {
+            GET_SYMBOL_DB("struct STR { STR(const char * p); };\n"
+                          "class A {\n"
+                          "public:\n"
+                          "    void test(bool a = true, int b = 0);\n"
+                          "};\n"
+                          "\n"
+                          "class B : public A {\n"
+                          "public:\n"
+                          "  B(): b_obj(this) { b_obj->test(\"1\"); }\n"
+                          "  void test(const STR& str_obj);\n"
+                          "  B* b_obj;\n"
+                          "};");
+            const Token* call = Token::findsimplematch(tokenizer.tokens(), "test ( \"1\" ) ;");
+            ASSERT(call);
+            ASSERT(call->function());
+            ASSERT(call->function()->tokenDef);
+            ASSERT_EQUALS(10, call->function()->tokenDef->linenr());
+        }
+    }
+
+    void findFunction52() {
+        GET_SYMBOL_DB("int g();\n"
+                      "void f() {\n"
+                      "    if (g != 0) {}\n"
+                      "}\n");
+        const Token* g = Token::findsimplematch(tokenizer.tokens(), "g !=");
+        ASSERT(g->function() && g->function()->tokenDef);
+        ASSERT(g->function()->tokenDef->linenr() == 1);
+    }
+
+    void findFunction53() {
+        GET_SYMBOL_DB("namespace N {\n" // #12208
+                      "    struct S {\n"
+                      "        S(const int*);\n"
+                      "    };\n"
+                      "}\n"
+                      "void f(int& r) {\n"
+                      "    N::S(&r);\n"
+                      "}\n");
+        const Token* S = Token::findsimplematch(tokenizer.tokens(), "S ( &");
+        ASSERT(S->function() && S->function()->tokenDef);
+        ASSERT(S->function()->tokenDef->linenr() == 3);
+        ASSERT(S->function()->isConstructor());
+    }
+
+    void findFunction54() {
+        {
+            GET_SYMBOL_DB("struct S {\n"
+                          "    explicit S(int& r) { if (r) {} }\n"
+                          "    bool f(const std::map<int, S>& m);\n"
+                          "};\n");
+            const Token* S = Token::findsimplematch(tokenizer.tokens(), "S (");
+            ASSERT(S && S->function());
+            ASSERT(S->function()->isConstructor());
+            ASSERT(!S->function()->functionPointerUsage);
+            S = Token::findsimplematch(S->next(), "S >");
+            ASSERT(S && S->type());
+            ASSERT_EQUALS(S->type()->name(), "S");
+        }
+        {
+            GET_SYMBOL_DB("struct S {\n"
+                          "    explicit S(int& r) { if (r) {} }\n"
+                          "    bool f(const std::map<int, S, std::allocator<S>>& m);\n"
+                          "};\n");
+            const Token* S = Token::findsimplematch(tokenizer.tokens(), "S (");
+            ASSERT(S && S->function());
+            ASSERT(S->function()->isConstructor());
+            ASSERT(!S->function()->functionPointerUsage);
+            S = Token::findsimplematch(S->next(), "S ,");
+            ASSERT(S && S->type());
+            ASSERT_EQUALS(S->type()->name(), "S");
+            S = Token::findsimplematch(S->next(), "S >");
+            ASSERT(S && S->type());
+            ASSERT_EQUALS(S->type()->name(), "S");
+        }
+    }
+
+    void findFunction55() {
+        GET_SYMBOL_DB("struct Token { int x; };\n"
+                      "static void f(std::size_t s);\n"
+                      "static void f(const Token* ptr);\n"
+                      "static void f2(const std::vector<Token*>& args) { f(args[0]); }\n");
+        const Token* f = Token::findsimplematch(tokenizer.tokens(), "f ( args [ 0 ] )");
+        ASSERT(f && f->function());
+        ASSERT(Token::simpleMatch(f->function()->tokenDef, "f ( const Token * ptr ) ;"));
+    }
+
+    void findFunction56() { // #13125
+        GET_SYMBOL_DB("void f(const char* fn, int i, const char e[], const std::string& a);\n"
+                      "void f(const char* fn, int i, const char e[], const char a[]);\n"
+                      "void g(const char x[], const std::string& s) {\n"
+                      "    f(\"abc\", 65, x, s);\n"
+                      "}\n");
+        const Token* f = Token::findsimplematch(tokenizer.tokens(), "f ( \"abc\"");
+        ASSERT(f && f->function());
+        ASSERT_EQUALS(f->function()->tokenDef->linenr(), 1);
+    }
+
+    void findFunction57() { // #13051
+        GET_SYMBOL_DB("struct S {\n"
+                      "    ~S();\n"
+                      "    void f();\n"
+                      "};\n"
+                      "struct T {\n"
+                      "    T();\n"
+                      "};\n"
+                      "void S::f() {\n"
+                      "    auto s1 = new S;\n"
+                      "    auto s2 = new S();\n"
+                      "    auto t = new T();\n"
+                      "}\n");
+        const Token* S = Token::findsimplematch(tokenizer.tokens(), "S ;");
+        ASSERT(S && S->type());
+        ASSERT_EQUALS(S->type()->classDef->linenr(), 1);
+        S = Token::findsimplematch(S, "S (");
+        ASSERT(S && S->type());
+        ASSERT_EQUALS(S->type()->classDef->linenr(), 1);
+        const Token* T = Token::findsimplematch(S, "T (");
+        ASSERT(T && T->function());
+        ASSERT_EQUALS(T->function()->tokenDef->linenr(), 6);
+    }
+
+    void findFunction58() { // #13310
+        GET_SYMBOL_DB("class C {\n"
+                      "    enum class abc : uint8_t {\n"
+                      "        a,b,c\n"
+                      "    };\n"
+                      "    void a();\n"
+                      "};\n");
+        const Token *a1 = Token::findsimplematch(tokenizer.tokens(), "a ,");
+        ASSERT(a1 && !a1->function());
+        const Token *a2 = Token::findsimplematch(tokenizer.tokens(), "a (");
+        ASSERT(a2 && a2->function());
+    }
+
+    void findFunction59() { // #13464
+        GET_SYMBOL_DB("void foo(const char[], const std::string&);\n"
+                      "void foo(const std::string&, const std::string&);\n"
+                      "void f() {\n"
+                      "    foo(\"\", \"\");\n"
+                      "}\n");
+        const Token* foo = Token::findsimplematch(tokenizer.tokens(), "foo ( \"\"");
+        ASSERT(foo && foo->function());
+        ASSERT_EQUALS(foo->function()->tokenDef->linenr(), 1);
+    }
+
+    void findFunction60() { // #12910
+        GET_SYMBOL_DB("template <class T>\n"
+                      "void fun(T& t, bool x = false) {\n"
+                      "    t.push_back(0);\n"
+                      "}\n"
+                      "template <class T>\n"
+                      "void fun(bool x = false) {\n"
+                      "    T t;\n"
+                      "    fun(t, x);\n"
+                      "}\n"
+                      "int f() {\n"
+                      "    fun<std::vector<int>>(true);\n"
+                      "    std::vector<int> v;\n"
+                      "    fun(v);\n"
+                      "    return v.back();\n"
+                      "}\n");
+        const Token* fun = Token::findsimplematch(tokenizer.tokens(), "fun ( v");
+        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 findFunctionRef1() {
+        GET_SYMBOL_DB("struct X {\n"
+                      "    const std::vector<int> getInts() const & { return mInts; }\n"
+                      "    std::vector<int> getInts() && { return mInts; }\n"
+                      "    std::vector<int> mInts;\n"
+                      "}\n"
+                      "\n"
+                      "void foo(X &x) {\n"
+                      "    x.getInts();\n"
+                      "}\n");
+        const Token* x = Token::findsimplematch(tokenizer.tokens(), "x . getInts ( ) ;");
+        ASSERT(x);
+        const Token* f = x->tokAt(2);
+        ASSERT(f);
+        ASSERT(f->function());
+        ASSERT(f->function()->tokenDef);
+        ASSERT_EQUALS(2, f->function()->tokenDef->linenr());
+    }
+
+    void findFunctionRef2() {
+        GET_SYMBOL_DB("struct X {\n"
+                      "    const int& foo() const &;\n" // <- this function is called
+                      "    int foo() &&;\n"
+                      "}\n"
+                      "\n"
+                      "void foo() {\n"
+                      "    X x;\n"
+                      "    x.foo();\n"
+                      "}\n");
+        const Token* x = Token::findsimplematch(tokenizer.tokens(), "x . foo ( ) ;");
+        ASSERT(x);
+        const Token* f = x->tokAt(2);
+        ASSERT(f);
+        ASSERT(f->function());
+        ASSERT(f->function()->tokenDef);
+        ASSERT_EQUALS(2, f->function()->tokenDef->linenr());
+    }
+
     void findFunctionContainer() {
         {
             GET_SYMBOL_DB("void dostuff(std::vector<int> v);\n"
@@ -7333,22 +8852,22 @@ class TestSymbolDatabase : public TestFixture {
     void valueTypeMatchParameter() const {
         ValueType vt_int(ValueType::Sign::SIGNED, ValueType::Type::INT, 0);
         ValueType vt_const_int(ValueType::Sign::SIGNED, ValueType::Type::INT, 0, 1);
-        ASSERT_EQUALS((int)ValueType::MatchResult::SAME, (int)ValueType::matchParameter(&vt_int, &vt_int));
-        ASSERT_EQUALS((int)ValueType::MatchResult::SAME, (int)ValueType::matchParameter(&vt_const_int, &vt_int));
-        ASSERT_EQUALS((int)ValueType::MatchResult::SAME, (int)ValueType::matchParameter(&vt_int, &vt_const_int));
+        ASSERT_EQUALS_ENUM(ValueType::MatchResult::SAME, ValueType::matchParameter(&vt_int, &vt_int));
+        ASSERT_EQUALS_ENUM(ValueType::MatchResult::SAME, ValueType::matchParameter(&vt_const_int, &vt_int));
+        ASSERT_EQUALS_ENUM(ValueType::MatchResult::SAME, ValueType::matchParameter(&vt_int, &vt_const_int));
 
         ValueType vt_char_pointer(ValueType::Sign::SIGNED, ValueType::Type::CHAR, 1);
         ValueType vt_void_pointer(ValueType::Sign::SIGNED, ValueType::Type::VOID, 1); // compatible
         ValueType vt_int_pointer(ValueType::Sign::SIGNED, ValueType::Type::INT, 1); // not compatible
-        ASSERT_EQUALS((int)ValueType::MatchResult::FALLBACK1, (int)ValueType::matchParameter(&vt_char_pointer, &vt_void_pointer));
-        ASSERT_EQUALS((int)ValueType::MatchResult::NOMATCH, (int)ValueType::matchParameter(&vt_char_pointer, &vt_int_pointer));
+        ASSERT_EQUALS_ENUM(ValueType::MatchResult::FALLBACK1, ValueType::matchParameter(&vt_char_pointer, &vt_void_pointer));
+        ASSERT_EQUALS_ENUM(ValueType::MatchResult::NOMATCH, ValueType::matchParameter(&vt_char_pointer, &vt_int_pointer));
 
         ValueType vt_char_pointer2(ValueType::Sign::SIGNED, ValueType::Type::CHAR, 2);
-        ASSERT_EQUALS((int)ValueType::MatchResult::FALLBACK1, (int)ValueType::matchParameter(&vt_char_pointer2, &vt_void_pointer));
+        ASSERT_EQUALS_ENUM(ValueType::MatchResult::FALLBACK1, ValueType::matchParameter(&vt_char_pointer2, &vt_void_pointer));
 
         ValueType vt_const_float_pointer(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::FLOAT, 1, 1);
         ValueType vt_long_long(ValueType::Sign::SIGNED, ValueType::Type::LONGLONG, 0, 0);
-        ASSERT_EQUALS((int)ValueType::MatchResult::NOMATCH, (int)ValueType::matchParameter(&vt_const_float_pointer, &vt_long_long));
+        ASSERT_EQUALS_ENUM(ValueType::MatchResult::NOMATCH, ValueType::matchParameter(&vt_const_float_pointer, &vt_long_long));
     }
 
 #define FUNC(x) do { \
@@ -7362,7 +8881,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void func2() noexcept { }\n"
                       "void func3() noexcept(true);\n"
                       "void func4() noexcept(true) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         FUNC(func1);
@@ -7374,7 +8893,7 @@ class TestSymbolDatabase : public TestFixture {
     void noexceptFunction2() {
         GET_SYMBOL_DB("template <class T> void self_assign(T& t) noexcept(noexcept(t = t)) {t = t; }");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         FUNC(self_assign);
@@ -7402,7 +8921,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void func12() const noexcept(true) = 0;\n"
                       "    void func13() const noexcept(false) = 0;\n"
                       "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         const Scope *fred = db->findScopeByName("Fred");
@@ -7434,7 +8953,7 @@ class TestSymbolDatabase : public TestFixture {
                       "   B(B&& b) noexcept\n"
                       "   :a(std::move(b.a)) { }\n"
                       "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT(db != nullptr); // not null
         const Scope *b = db->findScopeByName("B");
         ASSERT(b != nullptr);
@@ -7452,7 +8971,7 @@ class TestSymbolDatabase : public TestFixture {
                       "void func2() throw() { }\n"
                       "void func3() throw(int);\n"
                       "void func4() throw(int) { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT(db != nullptr); // not null
 
         FUNC_THROW(func1);
@@ -7481,7 +9000,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    void func11() const throw() = 0;\n"
                       "    void func12() const throw(int) = 0;\n"
                       "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         const Scope *fred = db->findScopeByName("Fred");
@@ -7500,10 +9019,30 @@ class TestSymbolDatabase : public TestFixture {
         CLASS_FUNC_THROW(func12, fred);
     }
 
+    void constAttributeFunction() {
+        GET_SYMBOL_DB("void func(void) __attribute__((const));");
+        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS(true, db != nullptr); // not null
+
+        const Function* func = findFunctionByName("func", &db->scopeList.front());
+        ASSERT_EQUALS(true, func != nullptr);
+        ASSERT_EQUALS(true, func->isAttributeConst());
+    }
+
+    void pureAttributeFunction() {
+        GET_SYMBOL_DB("void func(void) __attribute__((pure));");
+        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS(true, db != nullptr); // not null
+
+        const Function* func = findFunctionByName("func", &db->scopeList.front());
+        ASSERT_EQUALS(true, func != nullptr);
+        ASSERT_EQUALS(true, func->isAttributePure());
+    }
+
     void nothrowAttributeFunction() {
         GET_SYMBOL_DB("void func() __attribute__((nothrow));\n"
                       "void func() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         const Function *func = findFunctionByName("func", &db->scopeList.front());
@@ -7513,7 +9052,7 @@ class TestSymbolDatabase : public TestFixture {
 
     void nothrowDeclspecFunction() {
         GET_SYMBOL_DB("void __declspec(nothrow) func() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         const Function *func = findFunctionByName("func", &db->scopeList.front());
@@ -7530,7 +9069,7 @@ class TestSymbolDatabase : public TestFixture {
                       "[[noreturn]] [[gnu::format(printf, 1, 2)]] void func5(const char*, ...);\n"
                       "[[gnu::format(printf, 1, 2)]] [[noreturn]] void func6(const char*, ...);\n"
                       );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         const Function *func = findFunctionByName("func1", &db->scopeList.front());
@@ -7568,7 +9107,7 @@ class TestSymbolDatabase : public TestFixture {
                       "std::pair<bool, char> [[nodiscard]] func5();\n"
                       "[[nodiscard]] std::pair<bool, char> func6();\n"
                       );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS(true,  db != nullptr); // not null
 
         const Function *func = findFunctionByName("func1", &db->scopeList.front());
@@ -7717,7 +9256,7 @@ class TestSymbolDatabase : public TestFixture {
               "    int func4(int);\n"
               "    return func4(x);\n"
               "}\n", true);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void lambda() {
@@ -7732,12 +9271,12 @@ class TestSymbolDatabase : public TestFixture {
                       "}");
 
         ASSERT(db && db->scopeList.size() == 3);
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-        ASSERT_EQUALS(Scope::eGlobal, scope->type);
+        auto scope = db->scopeList.cbegin();
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eFunction, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eLambda, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eLambda, scope->type);
     }
 
     void lambda2() {
@@ -7746,31 +9285,31 @@ class TestSymbolDatabase : public TestFixture {
                       "    auto lambda = [&]() -> bool\n"
                       "    {\n"
                       "        float x = 1.0f;\n"
-                      "    }\n"
+                      "    };\n"
                       "    lambda();\n"
                       "}");
 
         ASSERT(db && db->scopeList.size() == 3);
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-        ASSERT_EQUALS(Scope::eGlobal, scope->type);
+        auto scope = db->scopeList.cbegin();
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eFunction, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eLambda, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eLambda, scope->type);
     }
 
     void lambda3() {
         GET_SYMBOL_DB("void func() {\n"
-                      "    auto f = []() mutable {}\n"
+                      "    auto f = []() mutable {};\n"
                       "}");
 
         ASSERT(db && db->scopeList.size() == 3);
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-        ASSERT_EQUALS(Scope::eGlobal, scope->type);
+        auto scope = db->scopeList.cbegin();
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eFunction, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eLambda, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eLambda, scope->type);
     }
 
     void lambda4() { // #11719
@@ -7781,12 +9320,12 @@ class TestSymbolDatabase : public TestFixture {
                       "};\n");
 
         ASSERT(db && db->scopeList.size() == 3);
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-        ASSERT_EQUALS(Scope::eGlobal, scope->type);
+        auto scope = db->scopeList.cbegin();
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eStruct, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eStruct, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eLambda, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eLambda, scope->type);
         ASSERT_EQUALS(1, scope->varlist.size());
         const Variable& s = scope->varlist.front();
         ASSERT_EQUALS(s.name(), "s");
@@ -7804,15 +9343,15 @@ class TestSymbolDatabase : public TestFixture {
                       "}\n");
 
         ASSERT(db && db->scopeList.size() == 3);
-        std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-        ASSERT_EQUALS(Scope::eGlobal, scope->type);
+        auto scope = db->scopeList.cbegin();
+        ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eFunction, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eFunction, scope->type);
         ++scope;
-        ASSERT_EQUALS(Scope::eLambda, scope->type);
+        ASSERT_EQUALS_ENUM(ScopeType::eLambda, scope->type);
         const Token* ret = Token::findsimplematch(tokenizer.tokens(), "return true");
         ASSERT(ret && ret->scope());
-        ASSERT_EQUALS(ret->scope()->type, Scope::eLambda);
+        ASSERT_EQUALS_ENUM(ret->scope()->type, ScopeType::eLambda);
     }
 
     // #6298 "stack overflow in Scope::findFunctionInBase (endless recursion)"
@@ -7839,10 +9378,10 @@ class TestSymbolDatabase : public TestFixture {
                           "Fred::foo(const std::string & b) { }");
 
             ASSERT(db && db->scopeList.size() == 3);
-            std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-            ASSERT_EQUALS(Scope::eGlobal, scope->type);
+            auto scope = db->scopeList.cbegin();
+            ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
             ++scope;
-            ASSERT_EQUALS(Scope::eClass, scope->type);
+            ASSERT_EQUALS_ENUM(ScopeType::eClass, scope->type);
             const Scope* class_scope = &*scope;
             ++scope;
             ASSERT(class_scope->functionList.size() == 1);
@@ -7854,18 +9393,18 @@ class TestSymbolDatabase : public TestFixture {
                           "bool f(bool (*g)(int)) { return g(0); }\n");
 
             ASSERT(db && db->scopeList.size() == 2);
-            std::list<Scope>::const_iterator scope = db->scopeList.cbegin();
-            ASSERT_EQUALS(Scope::eGlobal, scope->type);
+            auto scope = db->scopeList.cbegin();
+            ASSERT_EQUALS_ENUM(ScopeType::eGlobal, scope->type);
             ASSERT(scope->functionList.size() == 1);
             ++scope;
-            ASSERT_EQUALS(Scope::eFunction, scope->type);
+            ASSERT_EQUALS_ENUM(ScopeType::eFunction, scope->type);
         }
     }
 #define typeOf(...) typeOf_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string typeOf_(const char* file, int line, const char code[], const char pattern[], const char filename[] = "test.cpp", const Settings *settings = nullptr) {
-        Tokenizer tokenizer(settings ? settings : &settings2, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+    template<size_t size>
+    std::string typeOf_(const char* file, int line, const char (&code)[size], const char pattern[], bool cpp = true, const Settings *settings = nullptr) {
+        SimpleTokenizer tokenizer(settings ? *settings : settings2, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token* tok;
         for (tok = tokenizer.list.back(); tok; tok = tok->previous())
             if (Token::simpleMatch(tok, pattern, strlen(pattern)))
@@ -7877,41 +9416,41 @@ class TestSymbolDatabase : public TestFixture {
         // stringification
         ASSERT_EQUALS("", ValueType().str());
 
-        Settings s;
-        s.platform.int_bit = 16;
-        s.platform.long_bit = 32;
-        s.platform.long_long_bit = 64;
+        const auto s = dinit(Settings,
+                             $.platform.int_bit = 16,
+                                 $.platform.long_bit = 32,
+                                 $.platform.long_long_bit = 64);
 
-        Settings sSameSize;
-        sSameSize.platform.int_bit = 32;
-        sSameSize.platform.long_bit = 64;
-        sSameSize.platform.long_long_bit = 64;
+        const auto sSameSize = dinit(Settings,
+                                     $.platform.int_bit = 32,
+                                         $.platform.long_bit = 64,
+                                         $.platform.long_long_bit = 64);
 
         // numbers
-        ASSERT_EQUALS("signed int", typeOf("1;", "1", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("(-1);", "-1", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("32767;", "32767", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("(-32767);", "-32767", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("32768;", "32768", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("(-32768);", "-32768", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("32768l;", "32768l", "test.c", &s));
-        ASSERT_EQUALS("unsigned int", typeOf("32768U;", "32768U", "test.c", &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648;", "2147483648", "test.c", &s));
-        ASSERT_EQUALS("unsigned long", typeOf("2147483648u;", "2147483648u", "test.c", &s));
-        ASSERT_EQUALS("signed long long", typeOf("2147483648L;", "2147483648L", "test.c", &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("18446744069414584320;", "18446744069414584320", "test.c", &s));
-        ASSERT_EQUALS("signed int", typeOf("0xFF;", "0xFF", "test.c", &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFU;", "0xFFU", "test.c", &s));
-        ASSERT_EQUALS("unsigned int", typeOf("0xFFFF;", "0xFFFF", "test.c", &s));
-        ASSERT_EQUALS("signed long", typeOf("0xFFFFFF;", "0xFFFFFF", "test.c", &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFU;", "0xFFFFFFU", "test.c", &s));
-        ASSERT_EQUALS("unsigned long", typeOf("0xFFFFFFFF;", "0xFFFFFFFF", "test.c", &s));
-        ASSERT_EQUALS("signed long long", typeOf("0xFFFFFFFFFFFF;", "0xFFFFFFFFFFFF", "test.c", &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFFFFFFU;", "0xFFFFFFFFFFFFU", "test.c", &s));
-        ASSERT_EQUALS("unsigned long long", typeOf("0xFFFFFFFF00000000;", "0xFFFFFFFF00000000", "test.c", &s));
-
-        ASSERT_EQUALS("signed long", typeOf("2147483648;", "2147483648", "test.c", &sSameSize));
-        ASSERT_EQUALS("unsigned long", typeOf("0xc000000000000000;", "0xc000000000000000", "test.c", &sSameSize));
+        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"));
@@ -7968,12 +9507,13 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS("unsigned long", typeOf("(unsigned long)1 + (signed int)2;", "+"));
 
         // char
-        ASSERT_EQUALS("char", typeOf("'a';", "'a'", "test.cpp"));
-        ASSERT_EQUALS("signed int", typeOf("'a';", "'a'", "test.c"));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", "test.cpp"));
-        ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", "test.c"));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", "test.cpp"));
-        ASSERT_EQUALS("signed int", typeOf("'aaa';", "'aaa'", "test.c"));
+        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));
 
         // char *
         ASSERT_EQUALS("const char *", typeOf("\"hello\" + 1;", "+"));
@@ -8034,10 +9574,10 @@ class TestSymbolDatabase : public TestFixture {
         // 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;", ">>", "test.cpp")); // >> might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 >> x;", ">>", "test.c"));
-        ASSERT_EQUALS("",           typeOf("a = 12 << x;", "<<", "test.cpp")); // << might be overloaded
-        ASSERT_EQUALS("signed int", typeOf("a = 12 << x;", "<<", "test.c"));
+        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;", "<<"));
 
         // assignment => result has same type as lhs
@@ -8047,8 +9587,8 @@ class TestSymbolDatabase : public TestFixture {
         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\"];", "[", "test.cpp"));
-        ASSERT_EQUALS("const char",  typeOf("a = x[\"hello\"];", "[", "test.c"));
+        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];", "&"));
 
@@ -8083,6 +9623,10 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS("s", typeOf("struct s { s foo(); s(int, int); }; s s::foo() { return s(1, 2); } ", "( 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
+
+        // calling constructor..
+        ASSERT_EQUALS("s", typeOf("struct s { s(int); }; s::s(int){} void foo() { throw s(1); } ", "( 1 )")); // #13100
 
         // struct member..
         ASSERT_EQUALS("signed int", typeOf("struct AB { int a; int b; } ab; x = ab.a;", "."));
@@ -8117,8 +9661,8 @@ class TestSymbolDatabase : public TestFixture {
                                "<returnValue type=\"" #type "\"/>\n" \
                                "</function>\n" \
                                "</def>";              \
-        const Settings sF = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build(); \
-        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }", "x", "test.cpp", &sF)); \
+        const Settings sF = settingsBuilder().libraryxml(xmldata).build(); \
+        ASSERT_EQUALS(#type, typeOf("void f() { auto x = g(); }", "x", true, &sF)); \
 } while (false)
         // *INDENT-OFF*
         CHECK_LIBRARY_FUNCTION_RETURN_TYPE(bool);
@@ -8141,31 +9685,32 @@ class TestSymbolDatabase : public TestFixture {
         // Library types
         {
             // Char types
-            Settings settings;
-            const Library::PodType char8 = { 1, 'u' };
-            const Library::PodType char16 = { 2, 'u' };
-            const Library::PodType char32 = { 4, 'u' };
-            settings.library.mPodTypes["char8_t"] = char8;
-            settings.library.mPodTypes["char16_t"] = char16;
-            settings.library.mPodTypes["char32_t"] = char32;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <podtype name=\"char8_t\" sign=\"u\" size=\"1\"/>\n"
+                                       "  <podtype name=\"char16_t\" sign=\"u\" size=\"2\"/>\n"
+                                       "  <podtype name=\"char32_t\" sign=\"u\" size=\"4\"/>\n"
+                                       "</def>";
+            /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).build();
             settings.platform.sizeof_short = 2;
             settings.platform.sizeof_int = 4;
 
-            ASSERT_EQUALS("unsigned char", typeOf("u8'a';", "u8'a'", "test.cpp", &settings));
-            ASSERT_EQUALS("unsigned short", typeOf("u'a';", "u'a'", "test.cpp", &settings));
-            ASSERT_EQUALS("unsigned int", typeOf("U'a';", "U'a'", "test.cpp", &settings));
-            ASSERT_EQUALS("const unsigned char *", typeOf("u8\"a\";", "u8\"a\"", "test.cpp", &settings));
-            ASSERT_EQUALS("const unsigned short *", typeOf("u\"a\";", "u\"a\"", "test.cpp", &settings));
-            ASSERT_EQUALS("const unsigned int *", typeOf("U\"a\";", "U\"a\"", "test.cpp", &settings));
+            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));
         }
         {
             // PodType
-            Settings settingsWin64 = settingsBuilder().platform(cppcheck::Platform::Type::Win64).build();
-            const Library::PodType u32 = { 4, 'u' };
-            const Library::PodType podtype2 = { 0, 'u', Library::PodType::Type::INT };
-            settingsWin64.library.mPodTypes["u32"] = u32;
-            settingsWin64.library.mPodTypes["xyz::x"] = u32;
-            settingsWin64.library.mPodTypes["podtype2"] = podtype2;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <podtype name=\"u32\" sign=\"u\" size=\"4\"/>\n"
+                                       "  <podtype name=\"xyz::x\" sign=\"u\" size=\"4\"/>\n"
+                                       "  <podtype name=\"podtype2\" sign=\"u\" size=\"0\" stdtype=\"int\"/>\n"
+                                       "</def>";
+            const Settings settingsWin64 = settingsBuilder().platform(Platform::Type::Win64).libraryxml(xmldata).build();
             ValueType vt;
             ASSERT_EQUALS(true, vt.fromLibraryType("u32", settingsWin64));
             ASSERT_EQUALS(true, vt.fromLibraryType("xyz::x", settingsWin64));
@@ -8173,88 +9718,92 @@ 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", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int *", typeOf(";void *data = new xyz::x[10];", "new", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("; x = (xyz::x)12;", "(", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf(";u32(12);", "(", "test.cpp", &settingsWin64));
-            ASSERT_EQUALS("unsigned int", typeOf("x = u32(y[i]);", "(", "test.cpp", &settingsWin64));
+            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));
         }
         {
             // PlatformType
-            Settings settingsUnix32 = settingsBuilder().platform(cppcheck::Platform::Type::Unix32).build();
-            Library::PlatformType s32;
-            s32.mType = "int";
-            settingsUnix32.library.mPlatforms[settingsUnix32.platform.toString()].mPlatformTypes["s32"] = s32;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <platformtype name=\"s32\" value=\"int\">\n"
+                                       "    <platform type=\"unix32\"/>\n"
+                                       "  </platformtype>\n"
+                                       "</def>";
+            const Settings settingsUnix32 = settingsBuilder().platform(Platform::Type::Unix32).libraryxml(xmldata).build();
             ValueType vt;
             ASSERT_EQUALS(true, vt.fromLibraryType("s32", settingsUnix32));
             ASSERT_EQUALS(ValueType::Type::INT, vt.type);
         }
         {
             // PlatformType - wchar_t
-            Settings settingsWin64 = settingsBuilder().platform(cppcheck::Platform::Type::Win64).build();
-            Library::PlatformType lpctstr;
-            lpctstr.mType = "wchar_t";
-            settingsWin64.library.mPlatforms[settingsWin64.platform.toString()].mPlatformTypes["LPCTSTR"] = lpctstr;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <platformtype name=\"LPCTSTR\" value=\"wchar_t\">\n"
+                                       "    <platform type=\"win64\"/>\n"
+                                       "  </platformtype>\n"
+                                       "</def>";
+            const Settings settingsWin64 = settingsBuilder().platform(Platform::Type::Win64).libraryxml(xmldata).build();
             ValueType vt;
             ASSERT_EQUALS(true, vt.fromLibraryType("LPCTSTR", settingsWin64));
             ASSERT_EQUALS(ValueType::Type::WCHAR_T, vt.type);
         }
         {
             // Container
-            Settings sC;
-            Library::Container c;
-            c.startPattern = "C";
-            c.startPattern2 = "C !!::";
-            sC.library.containers["C"] = c;
-            ASSERT_EQUALS("container(C) *", typeOf("C*c=new C;","new","test.cpp",&sC));
-            ASSERT_EQUALS("container(C) *", typeOf("x=(C*)c;","(","test.cpp",&sC));
-            ASSERT_EQUALS("container(C)", typeOf("C c = C();","(","test.cpp",&sC));
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <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));
         }
         {
             // Container (vector)
-            Settings set;
-            Library::Container vector;
-            vector.startPattern = "Vector <";
-            vector.startPattern2 = "Vector !!::";
-            vector.type_templateArgNo = 0;
-            vector.arrayLike_indexOp = true;
-            vector.functions["front"] =
-                Library::Container::Function{Library::Container::Action::NO_ACTION, Library::Container::Yield::ITEM};
-            vector.functions["data"] =
-                Library::Container::Function{Library::Container::Action::NO_ACTION, Library::Container::Yield::BUFFER};
-            vector.functions["begin"] = Library::Container::Function{Library::Container::Action::NO_ACTION,
-                                                                     Library::Container::Yield::START_ITERATOR};
-            set.library.containers["Vector"] = vector;
-            Library::Container string;
-            string.startPattern = "test :: string";
-            string.startPattern2 = "test :: string !!::";
-            string.arrayLike_indexOp = string.stdStringLike = true;
-            set.library.containers["test::string"] = string;
-            ASSERT_EQUALS("signed int", typeOf("Vector<int> v; v[0]=3;", "[", "test.cpp", &set));
-            ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", "test.cpp", &set));
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <container id=\"Vector\" startPattern=\"Vector &lt;\">\n"
+                                       "    <type templateParameter=\"0\"/>\n"
+                                       "    <access indexOperator=\"array-like\">\n"
+                                       "      <function name=\"front\" yields=\"item\"/>\n"
+                                       "      <function name=\"data\" yields=\"buffer\"/>\n"
+                                       "      <function name=\"begin\" yields=\"start-iterator\"/>\n"
+                                       "    </access>\n"
+                                       "  </container>\n"
+                                       "  <container id=\"test::string\" startPattern=\"test :: string\">\n"
+                                       "    <type string=\"std-like\"/>\n"
+                                       "    <access indexOperator=\"array-like\"/>\n"
+                                       "  </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(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", "test.cpp", &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", true, &set));
             ASSERT_EQUALS(
                 "container(test :: string)",
-                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", "test.cpp", &set));
+                typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", true, &set));
             ASSERT_EQUALS("container(test :: string) &",
-                          typeOf("Vector<test::string> v; x = v.front();", "(", "test.cpp", &set));
+                          typeOf("Vector<test::string> v; x = v.front();", "(", true, &set));
             ASSERT_EQUALS("container(test :: string) *",
-                          typeOf("Vector<test::string> v; x = v.data();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = v.front();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int *", typeOf("Vector<int> v; x = v.data();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int * *", typeOf("Vector<int*> v; x = v.data();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("iterator(Vector <)", typeOf("Vector<int> v; x = v.begin();", "(", "test.cpp", &set));
-            ASSERT_EQUALS("signed int &", typeOf("Vector<int> v; x = *v.begin();", "*", "test.cpp", &set));
+                          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));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return \"x\"+s;}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return \"x\"+s;}", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+\"x\";}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return s+\"x\";}", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return 'x'+s;}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return 'x'+s;}", "+", true, &set));
             ASSERT_EQUALS("container(test :: string)",
-                          typeOf("void foo(){test::string s; return s+'x';}", "+", "test.cpp", &set));
+                          typeOf("void foo(){test::string s; return s+'x';}", "+", true, &set));
         }
 
         // new
@@ -8291,34 +9840,36 @@ class TestSymbolDatabase : public TestFixture {
 
         // std::make_shared
         {
-            Settings set;
-            Library::SmartPointer sharedPtr;
-            sharedPtr.name = "std::shared_ptr";
-            set.library.smartPointers["std::shared_ptr"] = sharedPtr;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <smart-pointer class-name=\"std::shared_ptr\"/>\n"
+                                       "</def>";
+            const Settings set = settingsBuilder().libraryxml(xmldata).build();
             ASSERT_EQUALS("smart-pointer(std::shared_ptr)",
-                          typeOf("class C {}; x = std::make_shared<C>();", "(", "test.cpp", &set));
+                          typeOf("class C {}; x = std::make_shared<C>();", "(", true, &set));
         }
 
         // return
         {
             // Container
-            Settings sC;
-            Library::Container c;
-            c.startPattern = "C";
-            c.startPattern2 = "C !!::";
-            sC.library.containers["C"] = c;
-            ASSERT_EQUALS("container(C)", typeOf("C f(char *p) { char data[10]; return data; }", "return", "test.cpp", &sC));
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <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));
         }
         // Smart pointer
         {
-            Settings set;
-            Library::SmartPointer myPtr;
-            myPtr.name = "MyPtr";
-            set.library.smartPointers["MyPtr"] = myPtr;
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def>\n"
+                                       "  <smart-pointer class-name=\"MyPtr\"/>\n"
+                                       "</def>";
+            const Settings set = settingsBuilder().libraryxml(xmldata).build();
             ASSERT_EQUALS("smart-pointer(MyPtr)",
-                          typeOf("void f() { MyPtr<int> p; return p; }", "p ;", "test.cpp", &set));
-            ASSERT_EQUALS("signed int", typeOf("void f() { MyPtr<int> p; return *p; }", "* p ;", "test.cpp", &set));
-            ASSERT_EQUALS("smart-pointer(MyPtr)", typeOf("void f() {return MyPtr<int>();}", "(", "test.cpp", &set));
+                          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));
         }
     }
 
@@ -8371,18 +9922,18 @@ class TestSymbolDatabase : public TestFixture {
                           "    auto& s = v[i][j];\n"
                           "    s.insert(0);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "s .");
             ASSERT(tok && tok->valueType());
-            ASSERT_EQUALS("container(std :: set|unordered_set <)", tok->valueType()->str());
+            ASSERT_EQUALS("container(std :: set|unordered_set <) &", tok->valueType()->str());
         }
         {
             GET_SYMBOL_DB("void f(std::vector<int> v) {\n"
                           "    auto it = std::find(v.begin(), v.end(), 0);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8393,7 +9944,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("void f(std::vector<int>::iterator beg, std::vector<int>::iterator end) {\n"
                           "    auto it = std::find(beg, end, 0);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8410,7 +9961,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (const auto& c : v)\n"
                           "        c->f(i);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8423,7 +9974,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void f(const std::vector<S>& v) {\n"
                           "    auto it = std::find_if(std::begin(v), std::end(v), [](const S& s) { return s.i != 0; });\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8436,7 +9987,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void f(T* t) {\n"
                           "    auto it = std::find(t->s.v.begin(), t->s.v.end(), 0);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8449,7 +10000,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void f(T * t) {\n"
                           "    auto it = std::find(t->s[0].v[0][0].begin(), t->s[0].v[0][0].end(), 0);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8461,7 +10012,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void f() {\n"
                           "    auto it = std::find(g().begin(), g().end(), 0);\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8474,7 +10025,7 @@ class TestSymbolDatabase : public TestFixture {
                           "void f(U* u) {\n"
                           "    for (const auto& str : u->get()->s) {}\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8488,7 +10039,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (auto&& j : v)\n"
                           "        j = 1;\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto &");
@@ -8512,7 +10063,7 @@ class TestSymbolDatabase : public TestFixture {
                           "    for (const auto& p : v)\n"
                           "        if (p == nullptr) {}\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8531,7 +10082,7 @@ class TestSymbolDatabase : public TestFixture {
         }
         {
             GET_SYMBOL_DB("auto a = 1;\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8542,7 +10093,7 @@ class TestSymbolDatabase : public TestFixture {
             GET_SYMBOL_DB("void f(const std::string& s) {\n"
                           "    const auto* const p = s.data();\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto");
@@ -8562,12 +10113,12 @@ class TestSymbolDatabase : public TestFixture {
                           "    auto r = t.substr(1, 2);\n"
                           "    return r;\n"
                           "}\n");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             const Token* tok = tokenizer.tokens();
             tok = Token::findsimplematch(tok, "auto r");
-            ASSERT(tok && tok->valueType());
-            ASSERT_EQUALS("container(std :: string|wstring|u16string|u32string)", tok->valueType()->str());
+            ASSERT(tok);
+            TODO_ASSERT(tok->valueType() && "container(std :: string|wstring|u16string|u32string)" == tok->valueType()->str());
         }
     }
 
@@ -9380,7 +10931,6 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(autoTok && autoTok->valueType());
         ASSERT_EQUALS(autoTok->valueType()->constness, 3);
         ASSERT_EQUALS(autoTok->valueType()->pointer, 1);
-        TODO_ASSERT(autoTok->valueType()->reference == Reference::LValue);
     }
 
     void auto19() { // #11517
@@ -9419,6 +10969,73 @@ class TestSymbolDatabase : public TestFixture {
         }
     }
 
+    void auto20() {
+        GET_SYMBOL_DB("enum A { A0 };\n"
+                      "enum B { B0 };\n"
+                      "const int& g(A a);\n"
+                      "const int& g(B b);\n"
+                      "void f() {\n"
+                      "    const auto& r = g(B::B0);\n"
+                      "}\n");
+        const Token* a = Token::findsimplematch(tokenizer.tokens(), "auto");
+        ASSERT(a && a->valueType());
+        ASSERT_EQUALS(a->valueType()->type, ValueType::INT);
+        const Token* g = Token::findsimplematch(a, "g ( B ::");
+        ASSERT(g && g->function());
+        ASSERT_EQUALS(g->function()->tokenDef->linenr(), 4);
+    }
+
+    void auto21() {
+        GET_SYMBOL_DB("int f(bool b) {\n"
+                      "    std::vector<int> v1(1), v2(2);\n"
+                      "    auto& v = b ? v1 : v2;\n"
+                      "    v.push_back(1);\n"
+                      "    return v.size();\n"
+                      "}\n");
+        ASSERT_EQUALS("", errout_str());
+        const Token* a = Token::findsimplematch(tokenizer.tokens(), "auto");
+        ASSERT(a && a->valueType());
+        ASSERT_EQUALS(a->valueType()->type, ValueType::CONTAINER);
+        const Token* v = Token::findsimplematch(a, "v . size");
+        ASSERT(v && v->valueType());
+        ASSERT_EQUALS(v->valueType()->type, ValueType::CONTAINER);
+        ASSERT(v->variable() && v->variable()->isReference());
+    }
+
+    void auto22() {
+        GET_SYMBOL_DB("void f(std::vector<std::string>& v, bool b) {\n"
+                      "    auto& s = b ? v[0] : v[1];\n"
+                      "    s += \"abc\";\n"
+                      "}\n");
+        ASSERT_EQUALS("", errout_str());
+        const Token* a = Token::findsimplematch(tokenizer.tokens(), "auto");
+        ASSERT(a && a->valueType());
+        ASSERT_EQUALS(a->valueType()->type, ValueType::CONTAINER);
+        const Token* s = Token::findsimplematch(a, "s +=");
+        ASSERT(s && s->valueType());
+        ASSERT_EQUALS(s->valueType()->type, ValueType::CONTAINER);
+        ASSERT(s->valueType()->reference == Reference::LValue);
+        ASSERT(s->variable() && s->variable()->isReference());
+    }
+
+    void auto23() {
+        GET_SYMBOL_DB("struct S { int* p; };\n" // #12168
+                      "void f(const S& s) {\n"
+                      "    auto q = s.p;\n"
+                      "}\n");
+        ASSERT_EQUALS("", errout_str());
+        const Token* a = Token::findsimplematch(tokenizer.tokens(), "auto");
+        ASSERT(a && a->valueType());
+        ASSERT_EQUALS(a->valueType()->type, ValueType::INT);
+        ASSERT_EQUALS(a->valueType()->pointer, 1);
+        ASSERT_EQUALS(a->valueType()->constness, 0);
+        const Token* dot = Token::findsimplematch(a, ".");
+        ASSERT(dot && dot->valueType());
+        ASSERT_EQUALS(dot->valueType()->type, ValueType::INT);
+        ASSERT_EQUALS(dot->valueType()->pointer, 1);
+        ASSERT_EQUALS(dot->valueType()->constness, 2);
+    }
+
     void unionWithConstructor() {
         GET_SYMBOL_DB("union Fred {\n"
                       "    Fred(int x) : i(x) { }\n"
@@ -9427,7 +11044,7 @@ class TestSymbolDatabase : public TestFixture {
                       "    float f;\n"
                       "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         const Token *f = Token::findsimplematch(tokenizer.tokens(), "Fred ( int");
         ASSERT(f && f->function() && f->function()->tokenDef->linenr() == 2);
@@ -9451,7 +11068,328 @@ class TestSymbolDatabase : public TestFixture {
                       "  }\n"
                       "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void exprIds()
+    {
+        {
+            const char code[] = "int f(int a) {\n"
+                                "    return a +\n"
+                                "           a;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "a", 2U, "a", 3U));
+        }
+
+        {
+            const char code[] = "int f(int a, int b) {\n"
+                                "    return a +\n"
+                                "           b;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "a", 2U, "b", 3U));
+        }
+
+        {
+            const char code[] = "int f(int a) {\n"
+                                "    int x = a++;\n"
+                                "    int y = a++;\n"
+                                "    return x + a;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "++", 2U, "++", 3U));
+        }
+
+        {
+            const char code[] = "int f(int a) {\n"
+                                "    int x = a;\n"
+                                "    return x + a;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "x", 3U, "a", 3U));
+        }
+
+        {
+            const char code[] = "int f(int a) {\n"
+                                "    int& x = a;\n"
+                                "    return x + a;\n"
+                                "}\n";
+            TODO_ASSERT_EQUALS("", "x@2 != a@1", testExprIdEqual(code, "x", 3U, "a", 3U));
+        }
+
+        {
+            const char code[] = "int f(int a) {\n"
+                                "    int& x = a;\n"
+                                "    return (x + 1) +\n"
+                                "           (a + 1);\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "+", 3U, "+", 4U));
+        }
+
+        {
+            const char code[] = "int& g(int& x) { return x; }\n"
+                                "int f(int a) {\n"
+                                "    return (g(a) + 1) +\n"
+                                "           (a + 1);\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "+", 3U, "+", 4U));
+        }
+
+        {
+            const char code[] = "int f(int a, int b) {\n"
+                                "    int x = (b-a)-a;\n"
+                                "    int y = (b-a)-a;\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "- a ;", 2U, "- a ;", 3U));
+            ASSERT_EQUALS("", testExprIdEqual(code, "- a )", 2U, "- a )", 3U));
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "- a )", 2U, "- a ;", 3U));
+        }
+
+        {
+            const char code[] = "int f(int a, int b) {\n"
+                                "    int x = a-(b-a);\n"
+                                "    int y = a-(b-a);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "- ( b", 2U, "- ( b", 3U));
+            ASSERT_EQUALS("", testExprIdEqual(code, "- a )", 2U, "- a )", 3U));
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "- a )", 2U, "- ( b", 3U));
+        }
+
+        {
+            const char code[] = "void f(int a, int b) {\n"
+                                "    int x = (b+a)+a;\n"
+                                "    int y = a+(b+a);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "+ a ;", 2U, "+ ( b", 3U));
+            ASSERT_EQUALS("", testExprIdEqual(code, "+ a ) +", 2U, "+ a ) ;", 3U));
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "+ a ;", 2U, "+ a )", 3U));
+        }
+
+        {
+            const char code[] = "void f(int a, int b) {\n"
+                                "    int x = (b+a)+a;\n"
+                                "    int y = a+(a+b);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "+ a ;", 2U, "+ ( a", 3U));
+            ASSERT_EQUALS("", testExprIdEqual(code, "+ a ) +", 2U, "+ b ) ;", 3U));
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "+ a ;", 2U, "+ b", 3U));
+        }
+
+        {
+            const char code[] = "struct A { int x; };\n"
+                                "void f(A a, int b) {\n"
+                                "    int x = (b-a.x)-a.x;\n"
+                                "    int y = (b-a.x)-a.x;\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "- a . x ;", 3U, "- a . x ;", 4U));
+            ASSERT_EQUALS("", testExprIdEqual(code, "- a . x )", 3U, "- a . x )", 4U));
+        }
+
+        {
+            const char code[] = "struct A { int x; };\n"
+                                "void f(A a, int b) {\n"
+                                "    int x = a.x-(b-a.x);\n"
+                                "    int y = a.x-(b-a.x);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "- ( b", 3U, "- ( b", 4U));
+            ASSERT_EQUALS("", testExprIdEqual(code, "- a . x )", 3U, "- a . x )", 4U));
+        }
+
+        {
+            const char code[] = "struct A { int x; };\n"
+                                "void f(A a) {\n"
+                                "    int x = a.x;\n"
+                                "    int y = a.x;\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, ". x", 3U, ". x", 4U));
+        }
+
+        {
+            const char code[] = "struct A { int x; };\n"
+                                "void f(A a, A b) {\n"
+                                "    int x = a.x;\n"
+                                "    int y = b.x;\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, ". x", 3U, ". x", 4U));
+        }
+
+        {
+            const char code[] = "struct A { int y; };\n"
+                                "struct B { A x; }\n"
+                                "void f(B a) {\n"
+                                "    int x = a.x.y;\n"
+                                "    int y = a.x.y;\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, ". x . y", 4U, ". x . y", 5U));
+            ASSERT_EQUALS("", testExprIdEqual(code, ". y", 4U, ". y", 5U));
+        }
+
+        {
+            const char code[] = "struct A { int y; };\n"
+                                "struct B { A x; }\n"
+                                "void f(B a, B b) {\n"
+                                "    int x = a.x.y;\n"
+                                "    int y = b.x.y;\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, ". x . y", 4U, ". x . y", 5U));
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, ". y", 4U, ". y", 5U));
+        }
+
+        {
+            const char code[] = "struct A { int g(); };\n"
+                                "struct B { A x; }\n"
+                                "void f(B a) {\n"
+                                "    int x = a.x.g();\n"
+                                "    int y = a.x.g();\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, ". x . g ( )", 4U, ". x . g ( )", 5U));
+            ASSERT_EQUALS("", testExprIdEqual(code, ". g ( )", 4U, ". g ( )", 5U));
+        }
+
+        {
+            const char code[] = "struct A { int g(int, int); };\n"
+                                "struct B { A x; }\n"
+                                "void f(B a, int b, int c) {\n"
+                                "    int x = a.x.g(b, c);\n"
+                                "    int y = a.x.g(b, c);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, ". x . g ( b , c )", 4U, ". x . g ( b , c )", 5U));
+            ASSERT_EQUALS("", testExprIdEqual(code, ". g ( b , c )", 4U, ". g ( b , c )", 5U));
+        }
+
+        {
+            const char code[] = "int g();\n"
+                                "void f() {\n"
+                                "    int x = g();\n"
+                                "    int y = g();\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "(", 3U, "(", 4U));
+        }
+
+        {
+            const char code[] = "struct A { int g(); };\n"
+                                "void f() {\n"
+                                "    int x = A::g();\n"
+                                "    int y = A::g();\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "(", 3U, "(", 4U));
+        }
+
+        {
+            const char code[] = "int g();\n"
+                                "void f(int a, int b) {\n"
+                                "    int x = g(a, b);\n"
+                                "    int y = g(a, b);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "(", 3U, "(", 4U));
+        }
+
+        {
+            const char code[] = "struct A { int g(); };\n"
+                                "void f() {\n"
+                                "    int x = A::g(a, b);\n"
+                                "    int y = A::g(a, b);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS("", testExprIdEqual(code, "(", 3U, "(", 4U));
+        }
+
+        {
+            const char code[] = "int g();\n"
+                                "void f(int a, int b) {\n"
+                                "    int x = g(a, b);\n"
+                                "    int y = g(b, a);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "(", 3U, "(", 4U));
+        }
+
+        {
+            const char code[] = "struct A { int g(); };\n"
+                                "void f() {\n"
+                                "    int x = A::g(a, b);\n"
+                                "    int y = A::g(b, a);\n"
+                                "    return x + y;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testExprIdNotEqual(code, "(", 3U, "(", 4U));
+        }
+    }
+
+    void testValuetypeOriginalName() {
+        {
+            GET_SYMBOL_DB("typedef void ( *fp16 )( int16_t n );\n"
+                          "typedef void ( *fp32 )( int32_t n );\n"
+                          "void R_11_1 ( void ) {\n"
+                          "   fp16 fp1 = NULL;\n"
+                          "   fp32 fp2 = ( fp32) fp1;\n"
+                          "}\n");
+            const Token* tok = Token::findsimplematch(tokenizer.tokens(), "( void * ) fp1");
+            ASSERT_EQUALS(tok->isCast(), true);
+            ASSERT(tok->valueType());
+            ASSERT(tok->valueType()->originalTypeName == "fp32");
+            ASSERT(tok->valueType()->pointer == 1);
+            ASSERT(tok->valueType()->constness == 0);
+        }
+
+        {
+            GET_SYMBOL_DB("typedef void ( *fp16 )( int16_t n );\n"
+                          "fp16 fp3 = ( fp16 ) 0x8000;");
+            const Token* tok = Token::findsimplematch(tokenizer.tokens(), "( void * ) 0x8000");
+            ASSERT_EQUALS(tok->isCast(), true);
+            ASSERT(tok->valueType());
+            ASSERT(tok->valueType()->originalTypeName == "fp16");
+            ASSERT(tok->valueType()->pointer == 1);
+            ASSERT(tok->valueType()->constness == 0);
+        }
+    }
+
+    void dumpFriend() {
+        GET_SYMBOL_DB("class Foo {\n"
+                      "    Foo();\n"
+                      "    int x{};\n"
+                      "    friend bool operator==(const Foo&lhs, const Foo&rhs) {\n"
+                      "        return lhs.x == rhs.x;\n"
+                      "    }\n"
+                      "};");
+        std::ostringstream ostr;
+        db->printXml(ostr);
+        ASSERT(ostr.str().find(" isFriend=\"true\"") != std::string::npos);
+    }
+
+    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; }");
+
+        ASSERT(db);
+    }
+
+    void stdintFunction() {
+        GET_SYMBOL_DB("a = UINT32_C(60);");
+        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;");
+        const Token *x = Token::findsimplematch(tokenizer.tokens(), "1p");
+        ASSERT(x);
+        ASSERT(!x->varId());
+        ASSERT(!x->variable());
     }
 };
 
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index 69b529a26e6..27d88e1d699 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-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
@@ -16,75 +16,119 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "redirect.h"
-#include "settings.h"
+#include "config.h"
 #include "fixture.h"
+
+#ifdef HAS_THREADING_MODEL_THREAD
+#include "filesettings.h"
 #include "helpers.h"
-#include "library.h"
+#include "redirect.h"
+#include "settings.h"
+#include "standards.h"
+#include "suppressions.h"
 #include "threadexecutor.h"
 #include "timer.h"
 
-#include <algorithm>
-#include <cstddef>
-#include <map>
+#include <cstdlib>
+#include <list>
 #include <memory>
-#include <set>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
+#endif // HAS_THREADING_MODEL_THREAD
 
-class TestThreadExecutor : public TestFixture {
+class TestThreadExecutorBase : public TestFixture {
 public:
-    TestThreadExecutor() : TestFixture("TestThreadExecutor") {}
+    TestThreadExecutorBase(const char * const name, bool useFS)
+        : TestFixture(name)
+#ifdef HAS_THREADING_MODEL_THREAD
+        , useFS(useFS)
+#endif // HAS_THREADING_MODEL_THREAD
+    {
+        (void)useFS;
+    }
 
 private:
-    Settings settings = settingsBuilder().library("std.cfg").build();
+#ifdef HAS_THREADING_MODEL_THREAD
+    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
+    bool useFS;
 
-    static std::string fprefix()
+    std::string fprefix() const
     {
+        if (useFS)
+            return "threadfs";
         return "thread";
     }
 
+    struct CheckOptions
+    {
+        bool quiet = true;
+        ShowTime showtime = ShowTime::NONE;
+        const char* plistOutput = nullptr;
+        std::vector<std::string> filesList;
+    };
+
     /**
      * Execute check using n jobs for y files which are have
      * identical data, given within data.
      */
-    void check(unsigned int jobs, int files, int result, const std::string &data, SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE, const char* const plistOutput = nullptr, const std::vector<std::string>& filesList = {}) {
-        errout.str("");
-        output.str("");
+    void check(unsigned int jobs, int files, int result, const std::string &data, const CheckOptions& opt = make_default_obj{}) {
+        std::list<FileSettings> fileSettings;
 
-        std::map<std::string, std::size_t> filemap;
-        if (filesList.empty()) {
+        std::list<FileWithDetails> filelist;
+        if (opt.filesList.empty()) {
             for (int i = 1; i <= files; ++i) {
-                std::ostringstream oss;
-                oss << fprefix() << "_" << i << ".cpp";
-                filemap[oss.str()] = 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::C, data.size());
+                }
             }
         }
         else {
-            for (const auto& f : filesList)
+            for (const auto& f : opt.filesList)
             {
-                filemap[f] = data.size();
+                filelist.emplace_back(f, Standards::Language::C, data.size());
+                if (useFS) {
+                    fileSettings.emplace_back(f, Standards::Language::C, data.size());
+                }
             }
         }
 
-        Settings settings1 = settings;
-        settings1.jobs = jobs;
-        settings1.showtime = showtime;
-        if (plistOutput)
-            settings1.plistOutput = plistOutput;
-        // TODO: test with settings.project.fileSettings;
-        ThreadExecutor executor(filemap, settings1, *this);
+        /*const*/ Settings s = settings;
+        s.jobs = jobs;
+        s.showtime = opt.showtime;
+        s.quiet = opt.quiet;
+        if (opt.plistOutput)
+            s.plistOutput = opt.plistOutput;
+        s.templateFormat = "{callstack}: ({severity}) {inconclusive:inconclusive: }{message}"; // TODO: remove when we only longer rely on toString() in unique message handling?
+
+        Suppressions supprs;
+        TimerResults timerResults;
+
+        // NOLINTNEXTLINE(performance-unnecessary-value-param)
+        auto executeFn = [](std::string,std::vector<std::string>,std::string,std::string&){
+            return EXIT_SUCCESS;
+        };
+
         std::vector<std::unique_ptr<ScopedFile>> scopedfiles;
-        scopedfiles.reserve(filemap.size());
-        for (std::map<std::string, std::size_t>::const_iterator i = filemap.cbegin(); i != filemap.cend(); ++i)
-            scopedfiles.emplace_back(new ScopedFile(i->first, data));
+        scopedfiles.reserve(filelist.size());
+        for (auto i = filelist.cbegin(); i != filelist.cend(); ++i)
+            scopedfiles.emplace_back(new ScopedFile(i->path(), data));
+
+        // clear files list so only fileSettings are used
+        if (useFS)
+            filelist.clear();
 
+        ThreadExecutor executor(filelist, fileSettings, s, supprs, *this, &timerResults, executeFn);
         ASSERT_EQUALS(result, executor.check());
     }
+#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);
@@ -94,51 +138,64 @@ class TestThreadExecutor : public TestFixture {
         TEST_CASE(no_errors_equal_amount_files);
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
-        TEST_CASE(markup);
+        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";
-        for (int i = 0; i < 500; i++)
-            oss << "  {char *a = malloc(10);}\n";
-
-        oss << "  return 0;\n"
-            << "}\n";
-        check(2, 3, 3, oss.str());
+        const int num_err = 1;
+        for (int i = 0; i < num_err; i++) {
+            oss << "  (void)(*((int*)0));\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"));
     }
 
     void many_threads() {
-        check(16, 100, 100,
-              "int main()\n"
+        const int num_files = 100;
+        check(16, num_files, num_files,
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
+        ASSERT_EQUALS(num_files, cppcheck::count_all_of(errout_str(), "(error) Null pointer dereference: (int*)0"));
     }
 
     // #11249 - reports TSAN errors - only applies to threads not processes though
     void many_threads_showtime() {
         SUPPRESS;
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_SUMMARY);
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions, $.showtime = ShowTime::SUMMARY));
+        // we are not interested in the results - so just consume them
+        ignore_errout();
     }
 
     void many_threads_plist() {
-        const char plistOutput[] = "plist";
-        ScopedFile plistFile("dummy", plistOutput);
+        const std::string plistOutput = "plist_" + fprefix() + "/";
+        ScopedFile plistFile("dummy", "", plistOutput);
 
         check(16, 100, 100,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_NONE, plistOutput);
+              "  (void)(*((int*)0));\n"
+              "}", dinit(CheckOptions, $.plistOutput = plistOutput.c_str()));
+        // we are not interested in the results - so just consume them
+        ignore_errout();
     }
 
     void no_errors_more_files() {
@@ -167,59 +224,124 @@ class TestThreadExecutor : public TestFixture {
 
     void one_error_less_files() {
         check(2, 1, 1,
-              "int main()\n"
+              "void f()\n"
               "{\n"
-              "  {char *a = malloc(10);}\n"
-              "  return 0;\n"
+              "  (void)(*((int*)0));\n"
               "}");
+        ASSERT_EQUALS("[" + fprefix() + "_1.c:3:12]: (error) Null pointer dereference: (int*)0 [nullPointer]\n", errout_str());
     }
 
     void one_error_several_files() {
-        check(2, 20, 20,
-              "int main()\n"
+        const int num_files = 20;
+        check(2, num_files, num_files,
+              "void f()\n"
               "{\n"
-              "  {char *a = malloc(10);}\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 markup() {
-        const Settings settingsOld = settings;
-        settings.library.mMarkupExtensions.emplace(".cp1");
-        settings.library.mProcessAfterCode.emplace(".cp1", true);
+    // TODO: provide data which actually shows values above 0
 
-        const std::vector<std::string> files = {
-            fprefix() + "_1.cp1", fprefix() + "_2.cpp", fprefix() + "_3.cp1", fprefix() + "_4.cpp"
-        };
+    // 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() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::TOP5_FILE));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // for each file: top5 results + newline + overall
+        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
+    }
 
-        // checks are not executed on markup files => expected result is 2
-        check(2, 4, 2,
-              "int main()\n"
+    void showtime_top5_summary() {
+        REDIRECT;
+        check(2, 2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::TOP5_SUMMARY));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // once: top5 results + newline
+        ASSERT_EQUALS(5 + 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);
+    }
+
+    void showtime_file() {
+        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
+        check(2, 2, 0,
+              "int main() {}",
+              dinit(CheckOptions,
+                    $.showtime = ShowTime::FILE));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        ASSERT_EQUALS(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::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);
+    }
+
+    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::FILE_TOTAL));
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        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=".c" reporterrors="false"/></def>)";
+        settings = settingsBuilder().libraryxml(xmldata).build();
+        check(2, 1, 0,
+              "void f()\n"
               "{\n"
-              "  char *a = malloc(10);\n"
-              "  return 0;\n"
-              "}",
-              SHOWTIME_MODES::SHOWTIME_NONE, nullptr, files);
-        // TODO: order of "Checking" and "checked" is affected by thread
-        /*TODO_ASSERT_EQUALS("Checking " + fprefix() + "_2.cpp ...\n"
-                           "1/4 files checked 25% done\n"
-                           "Checking " + fprefix() + "_4.cpp ...\n"
-                           "2/4 files checked 50% done\n"
-                           "Checking " + fprefix() + "_1.cp1 ...\n"
-                           "3/4 files checked 75% done\n"
-                           "Checking " + fprefix() + "_3.cp1 ...\n"
-                           "4/4 files checked 100% done\n",
-                           "Checking " + fprefix() + "_1.cp1 ...\n"
-                           "1/4 files checked 25% done\n"
-                           "Checking " + fprefix() + "_2.cpp ...\n"
-                           "2/4 files checked 50% done\n"
-                           "Checking " + fprefix() + "_3.cp1 ...\n"
-                           "3/4 files checked 75% done\n"
-                           "Checking " + fprefix() + "_4.cpp ...\n"
-                           "4/4 files checked 100% done\n",
-                           output.str());*/
+              "  (void)(*((int*)0));\n"
+              "}");
+        ASSERT_EQUALS("", errout_str());
         settings = settingsOld;
     }
+
+    void unique_errors() {
+        SUPPRESS;
+        ScopedFile inc_h(fprefix() + ".h",
+                         "inline void f()\n"
+                         "{\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: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 {
+public:
+    TestThreadExecutorFiles() : TestThreadExecutorBase("TestThreadExecutorFiles", false) {}
+};
+
+class TestThreadExecutorFS : public TestThreadExecutorBase {
+public:
+    TestThreadExecutorFS() : TestThreadExecutorBase("TestThreadExecutorFS", true) {}
 };
 
-REGISTER_TEST(TestThreadExecutor)
+REGISTER_TEST(TestThreadExecutorFiles)
+REGISTER_TEST(TestThreadExecutorFS)
diff --git a/test/testtimer.cpp b/test/testtimer.cpp
index d9d3c0b690a..75fead13d2d 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-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
@@ -19,8 +19,7 @@
 #include "fixture.h"
 #include "timer.h"
 
-#include <cmath>
-#include <ctime>
+#include <chrono>
 
 class TestTimer : public TestFixture {
 public:
@@ -34,11 +33,10 @@ class TestTimer : public TestFixture {
 
     void result() const {
         TimerResultsData t1;
-        t1.mClocks = ~(std::clock_t)0;
-        ASSERT(t1.seconds() > 100.0);
+        t1.mDuration = std::chrono::milliseconds{1234};
+        ASSERT(t1.getSeconds().count() > 1.233 && t1.getSeconds().count() < 1.235);
 
-        t1.mClocks = CLOCKS_PER_SEC * 5 / 2;
-        ASSERT(std::fabs(t1.seconds()-2.5) < 0.01);
+        // TODO : more tests
     }
 };
 
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index f6c408ad03e..1a94e092ac9 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-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
@@ -16,18 +16,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "settings.h"
-#include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
+#include "settings.h"
+#include "standards.h"
 #include "token.h"
-#include "tokenize.h"
 #include "tokenlist.h"
 #include "vfvalue.h"
 
 #include <algorithm>
-#include <sstream> // IWYU pragma: keep
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 
@@ -36,6 +36,8 @@ class TestToken : public TestFixture {
     TestToken() : TestFixture("TestToken") {}
 
 private:
+    const TokenList list{settingsDefault, Standards::Language::C};
+
     std::vector<std::string> arithmeticalOps;
     std::vector<std::string> logicalOps;
     std::vector<std::string> bitOps;
@@ -106,27 +108,41 @@ class TestToken : public TestFixture {
         TEST_CASE(canFindMatchingBracketsWithTooManyClosing);
         TEST_CASE(canFindMatchingBracketsWithTooManyOpening);
         TEST_CASE(findClosingBracket);
+        TEST_CASE(findClosingBracket2);
+        TEST_CASE(findClosingBracket3);
+        TEST_CASE(findClosingBracket4);
 
         TEST_CASE(expressionString);
 
         TEST_CASE(hasKnownIntValue);
+
+        TEST_CASE(update_property_info);
+        TEST_CASE(update_property_info_evariable);
+        TEST_CASE(update_property_info_ekeyword_c);
+        TEST_CASE(update_property_info_ekeyword_cpp);
+        TEST_CASE(update_property_info_ebracket_link);
+        TEST_CASE(update_property_info_ecomparisonop_link);
+        TEST_CASE(update_property_info_etype_c);
+        TEST_CASE(update_property_info_etype_cpp);
+        TEST_CASE(update_property_info_replace); // #13743
+
+        TEST_CASE(varid_reset);
     }
 
     void nextprevious() const {
-        Token *token = new Token();
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        auto *token = new Token(list, std::move(tokensFrontBack));
         token->str("1");
-        token->insertToken("2");
-        token->next()->insertToken("3");
+        (void)token->insertToken("2");
+        (void)token->next()->insertToken("3");
         Token *last = token->tokAt(2);
         ASSERT_EQUALS(token->str(), "1");
-        ASSERT_EQUALS(token->next()->str(), "2");
-        // cppcheck-suppress redundantNextPrevious - this is intentional
+        ASSERT_EQUALS(token->strAt(1), "2");
         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->previous()->str(), "2");
-        // cppcheck-suppress redundantNextPrevious - this is intentional
+        ASSERT_EQUALS(last->strAt(-1), "2");
         ASSERT_EQUALS(last->tokAt(-2)->str(), "1");
         ASSERT_EQUALS_MSG(true, token->previous() == nullptr, "Null was expected");
 
@@ -134,70 +150,100 @@ 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, unsigned int varid = 0) {
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(";" + code + ";");
+    bool MatchCheck_(const char* file, int line, const std::string& code, const std::string& pattern) {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        const std::string code2 = ";" + code + ";";
         try {
-            ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+            ASSERT_LOC(tokenizer.tokenize(code2), file, line);
         } catch (...) {}
-        return Token::Match(tokenizer.tokens()->next(), pattern.c_str(), varid);
+        return Token::Match(tokenizer.tokens()->next(), pattern.c_str());
     }
 
     void multiCompare() const {
         // Test for found
-        Token one;
-        one.str("one");
-        ASSERT_EQUALS(1, Token::multiCompare(&one, "one|two", 0));
+        {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token one(list, std::move(tokensFrontBack));
+            one.str("one");
+            ASSERT_EQUALS(1, Token::multiCompare(&one, "one|two", 0));
+        }
 
-        Token two;
-        two.str("two");
-        ASSERT_EQUALS(1, Token::multiCompare(&two, "one|two", 0));
-        ASSERT_EQUALS(1, Token::multiCompare(&two, "verybig|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));
+        }
 
         // Test for empty string found
-        Token notfound;
-        notfound.str("notfound");
-        ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one|two|", 0));
-
-        // Test for not found
-        ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&notfound, "one|two", 0)));
+        {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token notfound(list, std::move(tokensFrontBack));
+            notfound.str("notfound");
+            ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one|two|", 0));
+
+            // Test for not found
+            ASSERT_EQUALS(-1, Token::multiCompare(&notfound, "one|two", 0));
+        }
 
-        Token s;
-        s.str("s");
-        ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&s, "verybig|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));
+        }
 
-        Token ne;
-        ne.str("ne");
-        ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&ne, "one|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));
+        }
 
-        Token a;
-        a.str("a");
-        ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&a, "abc|def", 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));
+        }
 
-        Token abcd;
-        abcd.str("abcd");
-        ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&abcd, "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));
+        }
 
-        Token def;
-        def.str("default");
-        ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&def, "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));
+        }
 
         // %op%
-        Token plus;
-        plus.str("+");
-        ASSERT_EQUALS(1, Token::multiCompare(&plus, "one|%op%", 0));
-        ASSERT_EQUALS(1, Token::multiCompare(&plus, "%op%|two", 0));
-        Token x;
-        x.str("x");
-        ASSERT_EQUALS(-1, Token::multiCompare(&x, "one|%op%", 0));
-        ASSERT_EQUALS(-1, Token::multiCompare(&x, "%op%|two", 0));
+        {
+            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));
+        }
+        {
+            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));
+        }
+
     }
 
     void multiCompare2() const { // #3294
         // Original pattern that failed: [[,(=<>+-*|&^] %num% [+-*/] %num% ]|,|)|;|=|%op%
-        givenACodeSampleToTokenize toks("a == 1", true);
-        ASSERT_EQUALS(true, Token::Match(toks.tokens(), "a =|%op%"));
+        const SimpleTokenList toks("a == 1");
+        ASSERT_EQUALS(true, Token::Match(toks.front(), "a =|%op%"));
     }
 
     void multiCompare3() const {
@@ -205,55 +251,56 @@ 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
-        givenACodeSampleToTokenize toks("return a |= b ;", true);
-        ASSERT_EQUALS(false, Token::Match(toks.tokens(), "return %name% xyz|%or% %name% ;"));
-        ASSERT_EQUALS(false, Token::Match(toks.tokens(), "return %name% %or%|xyz %name% ;"));
+        const SimpleTokenList toks("return a |= b ;");
+        ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% xyz|%or% %name% ;"));
+        ASSERT_EQUALS(false, Token::Match(toks.front(), "return %name% %or%|xyz %name% ;"));
 
-        givenACodeSampleToTokenize toks2("return a | b ;", true);
-        ASSERT_EQUALS(true, Token::Match(toks2.tokens(), "return %name% xyz|%or% %name% ;"));
-        ASSERT_EQUALS(true, Token::Match(toks2.tokens(), "return %name% %or%|xyz %name% ;"));
+        const SimpleTokenList toks2("return a | b ;");
+        ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% xyz|%or% %name% ;"));
+        ASSERT_EQUALS(true, Token::Match(toks2.front(), "return %name% %or%|xyz %name% ;"));
 
-        givenACodeSampleToTokenize toks3("return a || b ;", true);
-        ASSERT_EQUALS(false, Token::Match(toks3.tokens(), "return %name% xyz|%or% %name% ;"));
-        ASSERT_EQUALS(false, Token::Match(toks3.tokens(), "return %name% %or%|xyz %name% ;"));
+        const SimpleTokenList toks3("return a || b ;");
+        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.tokens(), "return %name% xyz|%oror% %name% ;"));
-        ASSERT_EQUALS(true, Token::Match(toks3.tokens(), "return %name% %oror%|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% ;"));
 
-        givenACodeSampleToTokenize toks4("a % b ;", true);
-        ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% >>|<<|&|%or%|^|% %name% ;"));
-        ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% %|>>|<<|&|%or%|^ %name% ;"));
-        ASSERT_EQUALS(true, Token::Match(toks4.tokens(), "%name% >>|<<|&|%or%|%|^ %name% ;"));
+        const SimpleTokenList toks4("a % b ;");
+        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
-        givenACodeSampleToTokenize num("100", true);
-        ASSERT_EQUALS(true, Token::Match(num.tokens(), "%num%|%name%"));
-        ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%num%"));
-        ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%num%|%bool%"));
-        ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%bool%|%num%"));
-        ASSERT_EQUALS(true, Token::Match(num.tokens(), "%name%|%bool%|%str%|%num%"));
-        ASSERT_EQUALS(false, Token::Match(num.tokens(), "%bool%|%name%"));
-        ASSERT_EQUALS(false, Token::Match(num.tokens(), "%type%|%bool%|%char%"));
-        ASSERT_EQUALS(true, Token::Match(num.tokens(), "%type%|%bool%|100"));
-
-        givenACodeSampleToTokenize numparen("( 100 )", true);
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %num%|%name% )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%num% )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%num%|%bool% )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%bool%|%num% )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| %name%|%bool%|%str%|%num% )|"));
-        ASSERT_EQUALS(false, Token::Match(numparen.tokens(), "(| %bool%|%name% )|"));
-
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %num%|%name%| )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%num%| )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%num%|%bool%| )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%bool%|%num%| )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %name%|%bool%|%str%|%num%| )|"));
-        ASSERT_EQUALS(true, Token::Match(numparen.tokens(), "(| 100 %bool%|%name%| )|"));
-    }
-
-    void multiCompare4() const {
-        givenACodeSampleToTokenize var("std :: queue < int > foo ;");
+        const SimpleTokenList num("100");
+        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%"));
+        ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%bool%|%num%"));
+        ASSERT_EQUALS(true, Token::Match(num.front(), "%name%|%bool%|%str%|%num%"));
+        ASSERT_EQUALS(false, Token::Match(num.front(), "%bool%|%name%"));
+        ASSERT_EQUALS(false, Token::Match(num.front(), "%type%|%bool%|%char%"));
+        ASSERT_EQUALS(true, Token::Match(num.front(), "%type%|%bool%|100"));
+
+        const SimpleTokenList numparen("( 100 )");
+        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% )|"));
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%bool%|%num% )|"));
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| %name%|%bool%|%str%|%num% )|"));
+        ASSERT_EQUALS(false, Token::Match(numparen.front(), "(| %bool%|%name% )|"));
+
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %num%|%name%| )|"));
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%num%| )|"));
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%num%|%bool%| )|"));
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%bool%|%num%| )|"));
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %name%|%bool%|%str%|%num%| )|"));
+        ASSERT_EQUALS(true, Token::Match(numparen.front(), "(| 100 %bool%|%name%| )|"));
+    }
+
+    void multiCompare4() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("std :: queue < int > foo ;"));
 
         ASSERT_EQUALS(Token::eBracket, var.tokens()->tokAt(3)->tokType());
         ASSERT_EQUALS(Token::eBracket, var.tokens()->tokAt(5)->tokType());
@@ -264,13 +311,15 @@ class TestToken : public TestFixture {
     }
 
     void multiCompare5() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("||");
         ASSERT_EQUALS(true, Token::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
     }
 
     void charTypes() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
 
         tok.str("'a'");
         ASSERT_EQUALS(true, tok.isCChar());
@@ -319,10 +368,35 @@ class TestToken : public TestFixture {
         ASSERT_EQUALS(false, tok.isUtf32());
         ASSERT_EQUALS(false, tok.isLong());
         ASSERT_EQUALS(true, tok.isCMultiChar());
+
+        tok.str("'\\''");
+        ASSERT_EQUALS(true, tok.isCChar());
+        ASSERT_EQUALS(false, tok.isUtf8());
+        ASSERT_EQUALS(false, tok.isUtf16());
+        ASSERT_EQUALS(false, tok.isUtf32());
+        ASSERT_EQUALS(false, tok.isLong());
+        ASSERT_EQUALS(false, tok.isCMultiChar());
+
+        tok.str("'\\r\\n'");
+        ASSERT_EQUALS(false, tok.isCChar());
+        ASSERT_EQUALS(false, tok.isUtf8());
+        ASSERT_EQUALS(false, tok.isUtf16());
+        ASSERT_EQUALS(false, tok.isUtf32());
+        ASSERT_EQUALS(false, tok.isLong());
+        ASSERT_EQUALS(true, tok.isCMultiChar());
+
+        tok.str("'\\x10'");
+        ASSERT_EQUALS(true, tok.isCChar());
+        ASSERT_EQUALS(false, tok.isUtf8());
+        ASSERT_EQUALS(false, tok.isUtf16());
+        ASSERT_EQUALS(false, tok.isUtf32());
+        ASSERT_EQUALS(false, tok.isLong());
+        ASSERT_EQUALS(false, tok.isCMultiChar());
     }
 
     void stringTypes() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
 
         tok.str("\"a\"");
         ASSERT_EQUALS(true, tok.isCChar());
@@ -366,7 +440,8 @@ class TestToken : public TestFixture {
     }
 
     void getStrLength() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
 
         tok.str("\"\"");
         ASSERT_EQUALS(0, Token::getStrLength(&tok));
@@ -394,24 +469,25 @@ class TestToken : public TestFixture {
     }
 
     void getStrSize() const {
-        Token tok;
-        const Settings settings;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
 
         tok.str("\"\"");
-        ASSERT_EQUALS(sizeof(""), Token::getStrSize(&tok, &settings));
+        ASSERT_EQUALS(sizeof(""), Token::getStrSize(&tok, settingsDefault));
 
         tok.str("\"abc\"");
-        ASSERT_EQUALS(sizeof("abc"), Token::getStrSize(&tok, &settings));
+        ASSERT_EQUALS(sizeof("abc"), Token::getStrSize(&tok, settingsDefault));
 
         tok.str("\"\\0abc\"");
-        ASSERT_EQUALS(sizeof("\0abc"), Token::getStrSize(&tok, &settings));
+        ASSERT_EQUALS(sizeof("\0abc"), Token::getStrSize(&tok, settingsDefault));
 
         tok.str("\"\\\\\"");
-        ASSERT_EQUALS(sizeof("\\"), Token::getStrSize(&tok, &settings));
+        ASSERT_EQUALS(sizeof("\\"), Token::getStrSize(&tok, settingsDefault));
     }
 
     void strValue() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
 
         tok.str("\"\"");
         ASSERT_EQUALS("", tok.strValue());
@@ -442,7 +518,8 @@ class TestToken : public TestFixture {
     }
 
     void concatStr() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
 
         tok.str("\"\"");
         tok.concatStr("\"\"");
@@ -481,146 +558,154 @@ class TestToken : public TestFixture {
     }
 
     void deleteLast() const {
-        TokensFrontBack listEnds{ nullptr };
-        Token ** const tokensBack = &(listEnds.back);
-        Token tok(&listEnds);
-        tok.insertToken("aba");
+        auto listEnds = std::make_shared<TokensFrontBack>();
+        Token ** const tokensBack = &(listEnds->back);
+        Token tok(list, listEnds);
+        (void)tok.insertToken("aba");
         ASSERT_EQUALS(true, *tokensBack == tok.next());
         tok.deleteNext();
         ASSERT_EQUALS(true, *tokensBack == &tok);
     }
 
     void deleteFirst() const {
-        TokensFrontBack listEnds{ nullptr };
-        Token ** const tokensFront = &(listEnds.front);
-        Token tok(&listEnds);
+        auto listEnds = std::make_shared<TokensFrontBack>();
+        Token ** const tokensFront = &(listEnds->front);
+        Token tok(list, listEnds);
 
-        tok.insertToken("aba");
+        (void)tok.insertToken("aba");
 
         ASSERT_EQUALS(true, *tokensFront == tok.previous());
         tok.deletePrevious();
         ASSERT_EQUALS(true, *tokensFront == &tok);
     }
 
-    void nextArgument() const {
-        givenACodeSampleToTokenize example1("foo(1, 2, 3, 4);");
+    void nextArgument() {
+        SimpleTokenizer example1(*this);
+        ASSERT(example1.tokenize("foo(1, 2, 3, 4);"));
         ASSERT_EQUALS(true, Token::simpleMatch(example1.tokens()->tokAt(2)->nextArgument(), "2 , 3"));
         ASSERT_EQUALS(true, Token::simpleMatch(example1.tokens()->tokAt(4)->nextArgument(), "3 , 4"));
 
-        givenACodeSampleToTokenize example2("foo();");
+        SimpleTokenizer example2(*this);
+        ASSERT(example2.tokenize("foo();"));
         ASSERT_EQUALS(true, example2.tokens()->tokAt(2)->nextArgument() == nullptr);
 
-        givenACodeSampleToTokenize example3("foo(bar(a, b), 2, 3);");
+        SimpleTokenizer example3(*this);
+        ASSERT(example3.tokenize("foo(bar(a, b), 2, 3);"));
         ASSERT_EQUALS(true, Token::simpleMatch(example3.tokens()->tokAt(2)->nextArgument(), "2 , 3"));
 
-        givenACodeSampleToTokenize example4("foo(x.i[1], \"\", 3);");
+        SimpleTokenizer example4(*this);
+        ASSERT(example4.tokenize("foo(x.i[1], \"\", 3);"));
         ASSERT_EQUALS(true, Token::simpleMatch(example4.tokens()->tokAt(2)->nextArgument(), "\"\" , 3"));
     }
 
     void eraseTokens() const {
-        givenACodeSampleToTokenize code("begin ; { this code will be removed } end", true);
-        Token::eraseTokens(code.tokens()->next(), code.tokens()->tokAt(9));
-        ASSERT_EQUALS("begin ; end", code.tokens()->stringifyList(nullptr, false));
+        SimpleTokenList code("begin ; { this code will be removed } end", Standards::Language::C);
+        Token::eraseTokens(code.front()->next(), code.front()->tokAt(9));
+        ASSERT_EQUALS("begin ; end", code.front()->stringifyList(nullptr, false));
     }
 
 
     void matchAny() const {
-        givenACodeSampleToTokenize varBitOrVar("abc|def", true);
-        ASSERT_EQUALS(true, Token::Match(varBitOrVar.tokens(), "%name% %or% %name%"));
+        const SimpleTokenList varBitOrVar("abc|def");
+        ASSERT_EQUALS(true, Token::Match(varBitOrVar.front(), "%name% %or% %name%"));
 
-        givenACodeSampleToTokenize varLogOrVar("abc||def", true);
-        ASSERT_EQUALS(true, Token::Match(varLogOrVar.tokens(), "%name% %oror% %name%"));
+        const SimpleTokenList varLogOrVar("abc||def");
+        ASSERT_EQUALS(true, Token::Match(varLogOrVar.front(), "%name% %oror% %name%"));
     }
 
     void matchSingleChar() const {
-        givenACodeSampleToTokenize singleChar("a", true);
-        ASSERT_EQUALS(true, Token::Match(singleChar.tokens(), "[a|bc]"));
-        ASSERT_EQUALS(false, Token::Match(singleChar.tokens(), "[d|ef]"));
+        const SimpleTokenList singleChar("a");
+        ASSERT_EQUALS(true, Token::Match(singleChar.front(), "[a|bc]"));
+        ASSERT_EQUALS(false, Token::Match(singleChar.front(), "[d|ef]"));
 
-        Token multiChar;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token multiChar(list, std::move(tokensFrontBack));
         multiChar.str("[ab");
         ASSERT_EQUALS(false, Token::Match(&multiChar, "[ab|def]"));
     }
 
     void matchNothingOrAnyNotElse() const {
-        givenACodeSampleToTokenize empty_String("", true);
-        ASSERT_EQUALS(true, Token::Match(empty_String.tokens(), "!!else"));
-        ASSERT_EQUALS(false, Token::Match(empty_String.tokens(), "!!else something"));
+        const SimpleTokenList empty_String("");
+        ASSERT_EQUALS(true, Token::Match(empty_String.front(), "!!else"));
+        ASSERT_EQUALS(false, Token::Match(empty_String.front(), "!!else something"));
 
-        givenACodeSampleToTokenize ifSemicolon("if ;", true);
-        ASSERT_EQUALS(true, Token::Match(ifSemicolon.tokens(), "if ; !!else"));
+        const SimpleTokenList ifSemicolon("if ;");
+        ASSERT_EQUALS(true, Token::Match(ifSemicolon.front(), "if ; !!else"));
 
-        givenACodeSampleToTokenize ifSemicolonSomething("if ; something", true);
-        ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.tokens(), "if ; !!else"));
+        const SimpleTokenList ifSemicolonSomething("if ; something");
+        ASSERT_EQUALS(true, Token::Match(ifSemicolonSomething.front(), "if ; !!else"));
 
-        givenACodeSampleToTokenize justElse("else", true);
-        ASSERT_EQUALS(false, Token::Match(justElse.tokens(), "!!else"));
+        const SimpleTokenList justElse("else");
+        ASSERT_EQUALS(false, Token::Match(justElse.front(), "!!else"));
 
-        givenACodeSampleToTokenize ifSemicolonElse("if ; else", true);
-        ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.tokens(), "if ; !!else"));
+        const SimpleTokenList ifSemicolonElse("if ; else");
+        ASSERT_EQUALS(false, Token::Match(ifSemicolonElse.front(), "if ; !!else"));
     }
 
-    void matchType() const {
-        givenACodeSampleToTokenize type("abc", true);
-        ASSERT_EQUALS(true, Token::Match(type.tokens(), "%type%"));
+    void matchType() {
+        const SimpleTokenList type("abc");
+        ASSERT_EQUALS(true, Token::Match(type.front(), "%type%"));
 
-        givenACodeSampleToTokenize isVar("int a = 3 ;");
+        SimpleTokenizer isVar(*this);
+        ASSERT(isVar.tokenize("int a = 3 ;"));
         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%"));
 
-        givenACodeSampleToTokenize noType1_cpp("delete", true, true);
-        ASSERT_EQUALS(false, Token::Match(noType1_cpp.tokens(), "%type%"));
+        // TODO: %type% should not match keywords other than fundamental types
+        const SimpleTokenList noType1_cpp("delete");
+        ASSERT_EQUALS(true, Token::Match(noType1_cpp.front(), "%type%"));
 
-        givenACodeSampleToTokenize noType1_c("delete", true, false);
-        ASSERT_EQUALS(true, Token::Match(noType1_c.tokens(), "%type%"));
+        const SimpleTokenList noType1_c("delete", Standards::Language::C);
+        ASSERT_EQUALS(true, Token::Match(noType1_c.front(), "%type%"));
 
-        givenACodeSampleToTokenize noType2("void delete", true);
-        ASSERT_EQUALS(false, Token::Match(noType2.tokens(), "!!foo %type%"));
+        const SimpleTokenList noType2("void delete");
+        ASSERT_EQUALS(true, Token::Match(noType2.front(), "!!foo %type%"));
     }
 
     void matchChar() const {
-        givenACodeSampleToTokenize chr1("'a'", true);
-        ASSERT_EQUALS(true, Token::Match(chr1.tokens(), "%char%"));
+        const SimpleTokenList chr1("'a'");
+        ASSERT_EQUALS(true, Token::Match(chr1.front(), "%char%"));
 
-        givenACodeSampleToTokenize chr2("'1'", true);
-        ASSERT_EQUALS(true, Token::Match(chr2.tokens(), "%char%"));
+        const SimpleTokenList chr2("'1'");
+        ASSERT_EQUALS(true, Token::Match(chr2.front(), "%char%"));
 
-        givenACodeSampleToTokenize noChr("\"10\"", true);
-        ASSERT_EQUALS(false, Token::Match(noChr.tokens(), "%char%"));
+        const SimpleTokenList noChr("\"10\"");
+        ASSERT_EQUALS(false, Token::Match(noChr.front(), "%char%"));
     }
 
     void matchCompOp() const {
-        givenACodeSampleToTokenize comp1("<=", true);
-        ASSERT_EQUALS(true, Token::Match(comp1.tokens(), "%comp%"));
+        const SimpleTokenList comp1("<=");
+        ASSERT_EQUALS(true, Token::Match(comp1.front(), "%comp%"));
 
-        givenACodeSampleToTokenize comp2(">", true);
-        ASSERT_EQUALS(true, Token::Match(comp2.tokens(), "%comp%"));
+        const SimpleTokenList comp2(">");
+        ASSERT_EQUALS(true, Token::Match(comp2.front(), "%comp%"));
 
-        givenACodeSampleToTokenize noComp("=", true);
-        ASSERT_EQUALS(false, Token::Match(noComp.tokens(), "%comp%"));
+        const SimpleTokenList noComp("=");
+        ASSERT_EQUALS(false, Token::Match(noComp.front(), "%comp%"));
     }
 
     void matchStr() const {
-        givenACodeSampleToTokenize noStr1("abc", true);
-        ASSERT_EQUALS(false, Token::Match(noStr1.tokens(), "%str%"));
+        const SimpleTokenList noStr1("abc");
+        ASSERT_EQUALS(false, Token::Match(noStr1.front(), "%str%"));
 
-        givenACodeSampleToTokenize noStr2("'a'", true);
-        ASSERT_EQUALS(false, Token::Match(noStr2.tokens(), "%str%"));
+        const SimpleTokenList noStr2("'a'");
+        ASSERT_EQUALS(false, Token::Match(noStr2.front(), "%str%"));
 
-        givenACodeSampleToTokenize str("\"abc\"", true);
-        ASSERT_EQUALS(true, Token::Match(str.tokens(), "%str%"));
+        const SimpleTokenList str("\"abc\"");
+        ASSERT_EQUALS(true, Token::Match(str.front(), "%str%"));
 
         // Empty string
-        givenACodeSampleToTokenize emptyStr("\"\"", true);
-        ASSERT_EQUALS(true, Token::Match(emptyStr.tokens(), "%str%"));
+        const SimpleTokenList emptyStr("\"\"");
+        ASSERT_EQUALS(true, Token::Match(emptyStr.front(), "%str%"));
     }
 
-    void matchVarid() const {
-        givenACodeSampleToTokenize var("int a ; int b ;");
+    void matchVarid() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("int a ; int b ;"));
 
         // Varid == 0 should throw exception
-        ASSERT_THROW((void)Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 0),InternalError);
+        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_EQUALS(true, Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 1));
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %name% ; %type% %varid%", 2));
@@ -634,98 +719,92 @@ class TestToken : public TestFixture {
     }
 
     void matchNumeric() const {
-        givenACodeSampleToTokenize nonNumeric("abc", true);
-        ASSERT_EQUALS(false, Token::Match(nonNumeric.tokens(), "%num%"));
+        const SimpleTokenList nonNumeric("abc");
+        ASSERT_EQUALS(false, Token::Match(nonNumeric.front(), "%num%"));
 
-        givenACodeSampleToTokenize binary("101010b", true);
-        ASSERT_EQUALS(true, Token::Match(binary.tokens(), "%num%"));
+        const SimpleTokenList msLiteral("5ms"); // #11438
+        ASSERT_EQUALS(false, Token::Match(msLiteral.front(), "%num%"));
 
-        givenACodeSampleToTokenize octal("0123", true);
-        ASSERT_EQUALS(true, Token::Match(octal.tokens(), "%num%"));
+        const SimpleTokenList sLiteral("3s");
+        ASSERT_EQUALS(false, Token::Match(sLiteral.front(), "%num%"));
 
-        givenACodeSampleToTokenize decimal("4567", true);
-        ASSERT_EQUALS(true, Token::Match(decimal.tokens(), "%num%"));
+        const SimpleTokenList octal("0123");
+        ASSERT_EQUALS(true, Token::Match(octal.front(), "%num%"));
 
-        givenACodeSampleToTokenize hexadecimal("0xDEADBEEF", true);
-        ASSERT_EQUALS(true, Token::Match(hexadecimal.tokens(), "%num%"));
+        const SimpleTokenList decimal("4567");
+        ASSERT_EQUALS(true, Token::Match(decimal.front(), "%num%"));
 
-        givenACodeSampleToTokenize floatingPoint("0.0f", true);
-        ASSERT_EQUALS(true, Token::Match(floatingPoint.tokens(), "%num%"));
+        const SimpleTokenList hexadecimal("0xDEADBEEF");
+        ASSERT_EQUALS(true, Token::Match(hexadecimal.front(), "%num%"));
 
-        givenACodeSampleToTokenize doublePrecision("0.0d", true);
-        ASSERT_EQUALS(true, Token::Match(doublePrecision.tokens(), "%num%"));
+        const SimpleTokenList floatingPoint("0.0f");
+        ASSERT_EQUALS(true, Token::Match(floatingPoint.front(), "%num%"));
 
-        givenACodeSampleToTokenize signedLong("0L", true);
-        ASSERT_EQUALS(true, Token::Match(signedLong.tokens(), "%num%"));
+        const SimpleTokenList signedLong("0L");
+        ASSERT_EQUALS(true, Token::Match(signedLong.front(), "%num%"));
 
-        givenACodeSampleToTokenize negativeSignedLong("-0L", true);
-        ASSERT_EQUALS(true, Token::Match(negativeSignedLong.tokens(), "- %num%"));
+        const SimpleTokenList negativeSignedLong("-0L");
+        ASSERT_EQUALS(true, Token::Match(negativeSignedLong.front(), "- %num%"));
 
-        givenACodeSampleToTokenize positiveSignedLong("+0L", true);
-        ASSERT_EQUALS(true, Token::Match(positiveSignedLong.tokens(), "+ %num%"));
+        const SimpleTokenList positiveSignedLong("+0L");
+        ASSERT_EQUALS(true, Token::Match(positiveSignedLong.front(), "+ %num%"));
 
-        givenACodeSampleToTokenize unsignedInt("0U", true);
-        ASSERT_EQUALS(true, Token::Match(unsignedInt.tokens(), "%num%"));
+        const SimpleTokenList unsignedInt("0U");
+        ASSERT_EQUALS(true, Token::Match(unsignedInt.front(), "%num%"));
 
-        givenACodeSampleToTokenize unsignedLong("0UL", true);
-        ASSERT_EQUALS(true, Token::Match(unsignedLong.tokens(), "%num%"));
+        const SimpleTokenList unsignedLong("0UL");
+        ASSERT_EQUALS(true, Token::Match(unsignedLong.front(), "%num%"));
 
-        givenACodeSampleToTokenize unsignedLongLong("0ULL", true);
-        ASSERT_EQUALS(true, Token::Match(unsignedLongLong.tokens(), "%num%"));
+        const SimpleTokenList unsignedLongLong("0ULL");
+        ASSERT_EQUALS(true, Token::Match(unsignedLongLong.front(), "%num%"));
 
-        givenACodeSampleToTokenize positive("+666", true);
-        ASSERT_EQUALS(true, Token::Match(positive.tokens(), "+ %num%"));
+        const SimpleTokenList positive("+666");
+        ASSERT_EQUALS(true, Token::Match(positive.front(), "+ %num%"));
 
-        givenACodeSampleToTokenize negative("-42", true);
-        ASSERT_EQUALS(true, Token::Match(negative.tokens(), "- %num%"));
+        const SimpleTokenList negative("-42");
+        ASSERT_EQUALS(true, Token::Match(negative.front(), "- %num%"));
 
-        givenACodeSampleToTokenize negativeNull("-.0", true);
-        ASSERT_EQUALS(true, Token::Match(negativeNull.tokens(), "- %num%"));
+        const SimpleTokenList negativeNull("-.0");
+        ASSERT_EQUALS(true, Token::Match(negativeNull.front(), "- %num%"));
 
-        givenACodeSampleToTokenize positiveNull("+.0", true);
-        ASSERT_EQUALS(true, Token::Match(positiveNull.tokens(), "+ %num%"));
+        const SimpleTokenList positiveNull("+.0");
+        ASSERT_EQUALS(true, Token::Match(positiveNull.front(), "+ %num%"));
     }
 
 
     void matchBoolean() const {
-        givenACodeSampleToTokenize yes("YES", true);
-        ASSERT_EQUALS(false, Token::Match(yes.tokens(), "%bool%"));
+        const SimpleTokenList yes("YES");
+        ASSERT_EQUALS(false, Token::Match(yes.front(), "%bool%"));
 
-        givenACodeSampleToTokenize positive("true", true);
-        ASSERT_EQUALS(true, Token::Match(positive.tokens(), "%bool%"));
+        const SimpleTokenList positive("true");
+        ASSERT_EQUALS(true, Token::Match(positive.front(), "%bool%"));
 
-        givenACodeSampleToTokenize negative("false", true);
-        ASSERT_EQUALS(true, Token::Match(negative.tokens(), "%bool%"));
+        const SimpleTokenList negative("false");
+        ASSERT_EQUALS(true, Token::Match(negative.front(), "%bool%"));
     }
 
     void matchOr() const {
-        givenACodeSampleToTokenize bitwiseOr(";|;", true);
-        // cppcheck-suppress simplePatternError - this is intentional
-        ASSERT_EQUALS(true,  Token::Match(bitwiseOr.tokens(), "; %or%"));
-        ASSERT_EQUALS(true,  Token::Match(bitwiseOr.tokens(), "; %op%"));
-        // cppcheck-suppress simplePatternError - this is intentional
-        ASSERT_EQUALS(false, Token::Match(bitwiseOr.tokens(), "; %oror%"));
-
-        givenACodeSampleToTokenize bitwiseOrAssignment(";|=;");
-        // cppcheck-suppress simplePatternError - this is intentional
-        ASSERT_EQUALS(false,  Token::Match(bitwiseOrAssignment.tokens(), "; %or%"));
-        ASSERT_EQUALS(true,  Token::Match(bitwiseOrAssignment.tokens(), "; %op%"));
-        // cppcheck-suppress simplePatternError - this is intentional
-        ASSERT_EQUALS(false, Token::Match(bitwiseOrAssignment.tokens(), "; %oror%"));
-
-        givenACodeSampleToTokenize logicalOr(";||;", true);
-        // cppcheck-suppress simplePatternError - this is intentional
-        ASSERT_EQUALS(false, Token::Match(logicalOr.tokens(), "; %or%"));
-        ASSERT_EQUALS(true,  Token::Match(logicalOr.tokens(), "; %op%"));
-        // cppcheck-suppress simplePatternError - this is intentional
-        ASSERT_EQUALS(true,  Token::Match(logicalOr.tokens(), "; %oror%"));
-        ASSERT_EQUALS(true,  Token::Match(logicalOr.tokens(), "; &&|%oror%"));
-        ASSERT_EQUALS(true,  Token::Match(logicalOr.tokens(), "; %oror%|&&"));
-
-        givenACodeSampleToTokenize logicalAnd(";&&;", true);
-        ASSERT_EQUALS(true, Token::simpleMatch(logicalAnd.tokens(), "; &&"));
-        ASSERT_EQUALS(true, Token::Match(logicalAnd.tokens(), "; &&|%oror%"));
-        ASSERT_EQUALS(true, Token::Match(logicalAnd.tokens(), "; %oror%|&&"));
+        const SimpleTokenList bitwiseOr(";|;");
+        ASSERT_EQUALS(true,  Token::Match(bitwiseOr.front(), "; %or%"));
+        ASSERT_EQUALS(true,  Token::Match(bitwiseOr.front(), "; %op%"));
+        ASSERT_EQUALS(false, Token::Match(bitwiseOr.front(), "; %oror%"));
+
+        const SimpleTokenList bitwiseOrAssignment(";|=;");
+        ASSERT_EQUALS(false,  Token::Match(bitwiseOrAssignment.front(), "; %or%"));
+        ASSERT_EQUALS(true,  Token::Match(bitwiseOrAssignment.front(), "; %op%"));
+        ASSERT_EQUALS(false, Token::Match(bitwiseOrAssignment.front(), "; %oror%"));
+
+        const SimpleTokenList logicalOr(";||;");
+        ASSERT_EQUALS(false, Token::Match(logicalOr.front(), "; %or%"));
+        ASSERT_EQUALS(true,  Token::Match(logicalOr.front(), "; %op%"));
+        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(";&&;");
+        ASSERT_EQUALS(true, Token::simpleMatch(logicalAnd.front(), "; &&"));
+        ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; &&|%oror%"));
+        ASSERT_EQUALS(true, Token::Match(logicalAnd.front(), "; %oror%|&&"));
     }
 
     static void append_vector(std::vector<std::string> &dest, const std::vector<std::string> &src) {
@@ -748,8 +827,7 @@ class TestToken : public TestFixture {
         std::vector<std::string> other_ops;
         append_vector(other_ops, extendedOps);
 
-        std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.cend();
-        for (other_op = other_ops.cbegin(); other_op != other_ops_end; ++other_op) {
+        for (auto other_op = other_ops.cbegin(); other_op != other_ops.cend(); ++other_op) {
             ASSERT_EQUALS_MSG(false, MatchCheck(*other_op, "%op%"), "Failing other operator: " + *other_op);
         }
     }
@@ -770,17 +848,16 @@ class TestToken : public TestFixture {
         append_vector(other_ops, extendedOps);
         append_vector(other_ops, assignmentOps);
 
-        std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.cend();
-        for (other_op = other_ops.cbegin(); other_op != other_ops_end; ++other_op) {
+        for (auto other_op = other_ops.cbegin(); other_op != other_ops.cend(); ++other_op) {
             ASSERT_EQUALS_MSG(false, MatchCheck(*other_op, "%cop%"), "Failing other operator: " + *other_op);
         }
     }
 
 
     void isArithmeticalOp() const {
-        std::vector<std::string>::const_iterator test_op, test_ops_end = arithmeticalOps.cend();
-        for (test_op = arithmeticalOps.cbegin(); test_op != test_ops_end; ++test_op) {
-            Token tok;
+        for (auto test_op = arithmeticalOps.cbegin(); test_op != arithmeticalOps.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(true, tok.isArithmeticalOp());
         }
@@ -793,9 +870,9 @@ class TestToken : public TestFixture {
         append_vector(other_ops, extendedOps);
         append_vector(other_ops, assignmentOps);
 
-        std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.cend();
-        for (other_op = other_ops.cbegin(); other_op != other_ops_end; ++other_op) {
-            Token tok;
+        for (auto other_op = other_ops.cbegin(); other_op != other_ops.cend(); ++other_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*other_op);
             ASSERT_EQUALS_MSG(false, tok.isArithmeticalOp(), "Failing arithmetical operator: " + *other_op);
         }
@@ -809,9 +886,9 @@ class TestToken : public TestFixture {
         append_vector(test_ops, logicalOps);
         append_vector(test_ops, assignmentOps);
 
-        std::vector<std::string>::const_iterator test_op, test_ops_end = test_ops.cend();
-        for (test_op = test_ops.cbegin(); test_op != test_ops_end; ++test_op) {
-            Token tok;
+        for (auto test_op = test_ops.cbegin(); test_op != test_ops.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(true, tok.isOp());
         }
@@ -820,9 +897,9 @@ class TestToken : public TestFixture {
         std::vector<std::string> other_ops;
         append_vector(other_ops, extendedOps);
 
-        std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.cend();
-        for (other_op = other_ops.cbegin(); other_op != other_ops_end; ++other_op) {
-            Token tok;
+        for (auto other_op = other_ops.cbegin(); other_op != other_ops.cend(); ++other_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*other_op);
             ASSERT_EQUALS_MSG(false, tok.isOp(), "Failing normal operator: " + *other_op);
         }
@@ -835,9 +912,9 @@ class TestToken : public TestFixture {
         append_vector(test_ops, comparisonOps);
         append_vector(test_ops, logicalOps);
 
-        std::vector<std::string>::const_iterator test_op, test_ops_end = test_ops.cend();
-        for (test_op = test_ops.cbegin(); test_op != test_ops_end; ++test_op) {
-            Token tok;
+        for (auto test_op = test_ops.cbegin(); test_op != test_ops.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(true, tok.isConstOp());
         }
@@ -847,9 +924,9 @@ class TestToken : public TestFixture {
         append_vector(other_ops, extendedOps);
         append_vector(other_ops, assignmentOps);
 
-        std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.cend();
-        for (other_op = other_ops.cbegin(); other_op != other_ops_end; ++other_op) {
-            Token tok;
+        for (auto other_op = other_ops.cbegin(); other_op != other_ops.cend(); ++other_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*other_op);
             ASSERT_EQUALS_MSG(false, tok.isConstOp(), "Failing normal operator: " + *other_op);
         }
@@ -863,26 +940,26 @@ class TestToken : public TestFixture {
         append_vector(test_ops, logicalOps);
         append_vector(test_ops, extendedOps);
 
-        std::vector<std::string>::const_iterator test_op, test_ops_end = test_ops.cend();
-        for (test_op = test_ops.cbegin(); test_op != test_ops_end; ++test_op) {
-            Token tok;
+        for (auto test_op = test_ops.cbegin(); test_op != test_ops.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(true, tok.isExtendedOp());
         }
 
         // Negative test against assignment operators
-        std::vector<std::string>::const_iterator other_op, other_ops_end = assignmentOps.cend();
-        for (other_op = assignmentOps.cbegin(); other_op != other_ops_end; ++other_op) {
-            Token tok;
+        for (auto other_op = assignmentOps.cbegin(); other_op != assignmentOps.cend(); ++other_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*other_op);
             ASSERT_EQUALS_MSG(false, tok.isExtendedOp(), "Failing assignment operator: " + *other_op);
         }
     }
 
     void isAssignmentOp() const {
-        std::vector<std::string>::const_iterator test_op, test_ops_end = assignmentOps.cend();
-        for (test_op = assignmentOps.cbegin(); test_op != test_ops_end; ++test_op) {
-            Token tok;
+        for (auto test_op = assignmentOps.cbegin(); test_op != assignmentOps.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(true, tok.isAssignmentOp());
         }
@@ -895,37 +972,41 @@ class TestToken : public TestFixture {
         append_vector(other_ops, logicalOps);
         append_vector(other_ops, extendedOps);
 
-        std::vector<std::string>::const_iterator other_op, other_ops_end = other_ops.cend();
-        for (other_op = other_ops.cbegin(); other_op != other_ops_end; ++other_op) {
-            Token tok;
+        for (auto other_op = other_ops.cbegin(); other_op != other_ops.cend(); ++other_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*other_op);
             ASSERT_EQUALS_MSG(false, tok.isAssignmentOp(), "Failing assignment operator: " + *other_op);
         }
     }
 
     void operators() const {
-        std::vector<std::string>::const_iterator test_op;
-        for (test_op = extendedOps.cbegin(); test_op != extendedOps.cend(); ++test_op) {
-            Token tok;
+        for (auto test_op = extendedOps.cbegin(); test_op != extendedOps.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(Token::eExtendedOp, tok.tokType());
         }
-        for (test_op = logicalOps.cbegin(); test_op != logicalOps.cend(); ++test_op) {
-            Token tok;
+        for (auto test_op = logicalOps.cbegin(); test_op != logicalOps.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(Token::eLogicalOp, tok.tokType());
         }
-        for (test_op = bitOps.cbegin(); test_op != bitOps.cend(); ++test_op) {
-            Token tok;
+        for (auto test_op = bitOps.cbegin(); test_op != bitOps.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(Token::eBitOp, tok.tokType());
         }
-        for (test_op = comparisonOps.cbegin(); test_op != comparisonOps.cend(); ++test_op) {
-            Token tok;
+        for (auto test_op = comparisonOps.cbegin(); test_op != comparisonOps.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS(Token::eComparisonOp, tok.tokType());
         }
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("++");
         ASSERT_EQUALS(Token::eIncDecOp, tok.tokType());
         tok.str("--");
@@ -933,7 +1014,8 @@ class TestToken : public TestFixture {
     }
 
     void literals() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
 
         tok.str("\"foo\"");
         ASSERT(tok.tokType() == Token::eString);
@@ -962,15 +1044,16 @@ class TestToken : public TestFixture {
         standard_types.emplace_back("double");
         standard_types.emplace_back("size_t");
 
-        std::vector<std::string>::const_iterator test_op, test_ops_end = standard_types.cend();
-        for (test_op = standard_types.cbegin(); test_op != test_ops_end; ++test_op) {
-            Token tok;
+        for (auto test_op = standard_types.cbegin(); test_op != standard_types.cend(); ++test_op) {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
             tok.str(*test_op);
             ASSERT_EQUALS_MSG(true, tok.isStandardType(), "Failing standard type: " + *test_op);
         }
 
         // Negative test
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("string");
         ASSERT_EQUALS(false, tok.isStandardType());
 
@@ -986,7 +1069,8 @@ class TestToken : public TestFixture {
     }
 
     void updateProperties() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("foobar");
 
         ASSERT_EQUALS(true, tok.isName());
@@ -999,76 +1083,87 @@ class TestToken : public TestFixture {
     }
 
     void isNameGuarantees1() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("Name");
         ASSERT_EQUALS(true, tok.isName());
     }
 
     void isNameGuarantees2() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("_name");
         ASSERT_EQUALS(true, tok.isName());
     }
 
     void isNameGuarantees3() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("_123");
         ASSERT_EQUALS(true, tok.isName());
     }
 
     void isNameGuarantees4() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("123456");
         ASSERT_EQUALS(false, tok.isName());
         ASSERT_EQUALS(true, tok.isNumber());
     }
 
     void isNameGuarantees5() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("a123456");
         ASSERT_EQUALS(true, tok.isName());
         ASSERT_EQUALS(false, tok.isNumber());
     }
 
     void isNameGuarantees6() const {
-        Token tok;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
         tok.str("$f");
         ASSERT_EQUALS(true, tok.isName());
     }
 
-    void canFindMatchingBracketsNeedsOpen() const {
-        givenACodeSampleToTokenize var("std::deque<std::set<int> > intsets;");
+    void canFindMatchingBracketsNeedsOpen() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
 
         const Token* const t = var.tokens()->findClosingBracket();
         ASSERT(t == nullptr);
     }
 
-    void canFindMatchingBracketsInnerPair() const {
-        givenACodeSampleToTokenize var("std::deque<std::set<int> > intsets;");
+    void canFindMatchingBracketsInnerPair() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
 
         const Token * const t = var.tokens()->tokAt(7)->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
         ASSERT(var.tokens()->tokAt(9) == t);
     }
 
-    void canFindMatchingBracketsOuterPair() const {
-        givenACodeSampleToTokenize var("std::deque<std::set<int> > intsets;");
+    void canFindMatchingBracketsOuterPair() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("std::deque<std::set<int> > intsets;"));
 
         const Token* const t = var.tokens()->tokAt(3)->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
         ASSERT(var.tokens()->tokAt(10) == t);
     }
 
-    void canFindMatchingBracketsWithTooManyClosing() const {
-        givenACodeSampleToTokenize var("X< 1>2 > x1;");
+    void canFindMatchingBracketsWithTooManyClosing() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("X< 1>2 > x1;"));
 
         const Token* const t = var.tokens()->next()->findClosingBracket();
         ASSERT_EQUALS(">", t->str());
         ASSERT(var.tokens()->tokAt(3) == t);
     }
 
-    void canFindMatchingBracketsWithTooManyOpening() const {
-        givenACodeSampleToTokenize var("X < (2 < 1) > x1;");
+    void canFindMatchingBracketsWithTooManyOpening() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("X < (2 < 1) > x1;"));
 
         const Token* t = var.tokens()->next()->findClosingBracket();
         ASSERT(t != nullptr && t->str() == ">");
@@ -1077,32 +1172,65 @@ class TestToken : public TestFixture {
         ASSERT(t == nullptr);
     }
 
-    void findClosingBracket() const {
-        givenACodeSampleToTokenize var("template<typename X, typename...Y> struct S : public Fred<Wilma<Y...>> {}");
+    void findClosingBracket() {
+        SimpleTokenizer var(*this);
+        ASSERT(var.tokenize("template<typename X, typename...Y> struct S : public Fred<Wilma<Y...>> {}"));
 
         const Token* const t = var.tokens()->next()->findClosingBracket();
         ASSERT(Token::simpleMatch(t, "> struct"));
     }
 
-    void expressionString() const {
-        givenACodeSampleToTokenize var1("void f() { *((unsigned long long *)x) = 0; }");
+    void findClosingBracket2() {
+        SimpleTokenizer var(*this); // #11275
+        ASSERT(var.tokenize("const auto g = []<typename T>() {};\n"));
+
+        const Token* const t = Token::findsimplematch(var.tokens(), "<");
+        ASSERT(t && Token::simpleMatch(t->findClosingBracket(), ">"));
+    }
+
+    void findClosingBracket3() {
+        SimpleTokenizer var(*this); // #12789
+        ASSERT(var.tokenize("template <size_t I = 0, typename... ArgsT, std::enable_if_t<I < sizeof...(ArgsT)>* = nullptr>\n"
+                            "void f();\n"));
+        const Token* const t = Token::findsimplematch(var.tokens(), "<");
+        ASSERT(t && Token::simpleMatch(t->findClosingBracket(), ">"));
+    }
+
+    void findClosingBracket4() {
+        SimpleTokenizer var(*this); // #12923
+        ASSERT(var.tokenize("template<template<class E> class T = std::vector, class U = std::vector<int>, class V = void>\n"
+                            "class C;\n"));
+        const Token *const t = Token::findsimplematch(var.tokens(), "<");
+        ASSERT(t);
+        const Token *const closing = t->findClosingBracket();
+        ASSERT(closing && closing == var.tokens()->tokAt(28));
+    }
+
+    void expressionString() {
+        SimpleTokenizer var1(*this);
+        ASSERT(var1.tokenize("void f() { *((unsigned long long *)x) = 0; }"));
         const Token *const tok1 = Token::findsimplematch(var1.tokens(), "*");
         ASSERT_EQUALS("*((unsigned long long*)x)", tok1->expressionString());
 
-        givenACodeSampleToTokenize var2("typedef unsigned long long u64; void f() { *((u64 *)x) = 0; }");
+        SimpleTokenizer var2(*this);
+        ASSERT(var2.tokenize("typedef unsigned long long u64; void f() { *((u64 *)x) = 0; }"));
         const Token *const tok2 = Token::findsimplematch(var2.tokens(), "*");
         ASSERT_EQUALS("*((unsigned long long*)x)", tok2->expressionString());
 
-        givenACodeSampleToTokenize data3("void f() { return (t){1,2}; }");
+        SimpleTokenizer data3(*this);
+        ASSERT(data3.tokenize("void f() { return (t){1,2}; }"));
         ASSERT_EQUALS("return(t){1,2}", data3.tokens()->tokAt(5)->expressionString());
 
-        givenACodeSampleToTokenize data4("void f() { return L\"a\"; }");
+        SimpleTokenizer data4(*this);
+        ASSERT(data4.tokenize("void f() { return L\"a\"; }"));
         ASSERT_EQUALS("returnL\"a\"", data4.tokens()->tokAt(5)->expressionString());
 
-        givenACodeSampleToTokenize data5("void f() { return U\"a\"; }");
+        SimpleTokenizer data5(*this);
+        ASSERT(data5.tokenize("void f() { return U\"a\"; }"));
         ASSERT_EQUALS("returnU\"a\"", data5.tokens()->tokAt(5)->expressionString());
 
-        givenACodeSampleToTokenize data6("x = \"\\0\\x1\\x2\\x3\\x4\\x5\\x6\\x7\";");
+        SimpleTokenizer data6(*this);
+        ASSERT(data6.tokenize("x = \"\\0\\x1\\x2\\x3\\x4\\x5\\x6\\x7\";"));
         ASSERT_EQUALS("x=\"\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\"", data6.tokens()->next()->expressionString());
     }
 
@@ -1115,11 +1243,278 @@ class TestToken : public TestFixture {
         v2.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
         v2.setKnown();
 
-        Token token;
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token token(list, std::move(tokensFrontBack));
         ASSERT_EQUALS(true, token.addValue(v1));
         ASSERT_EQUALS(true, token.addValue(v2));
         ASSERT_EQUALS(false, token.hasKnownIntValue());
     }
+
+#define assert_tok(...) _assert_tok(__FILE__, __LINE__, __VA_ARGS__)
+    void _assert_tok(const char* file, int line, const Token* tok, Token::Type t, bool l = false, bool std = false, bool ctrl = false) const
+    {
+        ASSERT_LOC_MSG(tok, "tok", file, line);
+        ASSERT_EQUALS_ENUM_LOC_MSG(t, tok->tokType(), "tokType", file, line);
+        ASSERT_EQUALS_LOC_MSG(l, tok->isLong(), "isLong", file, line);
+        ASSERT_EQUALS_LOC_MSG(std, tok->isStandardType(), "isStandardType", file, line);
+        ASSERT_EQUALS_LOC_MSG(ctrl, tok->isControlFlowKeyword(), "isControlFlowKeyword", file, line);
+    }
+
+    void _assert_tok(const char* file, int line, const std::string& s, Token::Type t, bool l = false, bool std = false, bool ctrl = false) const
+    {
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list, std::move(tokensFrontBack));
+        tok.str(s);
+        _assert_tok(file, line, &tok, t, l, std, ctrl);
+    }
+
+    void update_property_info() const
+    {
+        assert_tok("", Token::Type::eNone);
+        assert_tok("true", Token::Type::eBoolean);
+        assert_tok("false", Token::Type::eBoolean);
+        assert_tok("\"\"", Token::Type::eString);
+        assert_tok("L\"\"", Token::Type::eString, /*l=*/ true);
+        assert_tok("'a'", Token::Type::eChar);
+        assert_tok("L'a'", Token::Type::eChar, /*l=*/ true);
+        // eVariable has separate test
+        // eKeyword with specific languages and standards has separate tests
+        assert_tok("sizeof", Token::Type::eKeyword);
+        assert_tok("goto", Token::Type::eKeyword, /*l=*/ false, /*std=*/ false, /*ctrl=*/ true);
+        assert_tok("asm", Token::Type::eKeyword);
+        assert_tok("a", Token::Type::eName);
+        assert_tok("_a", Token::Type::eName);
+        assert_tok("$a", Token::Type::eName);
+        assert_tok("bool2", Token::Type::eName);
+        assert_tok("0", Token::Type::eNumber);
+        assert_tok("-0", Token::Type::eNumber);
+        assert_tok("+0", Token::Type::eNumber);
+        assert_tok("0xa", Token::Type::eNumber);
+        assert_tok("010", Token::Type::eNumber);
+        assert_tok("0b0", Token::Type::eNumber);
+        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::eLiteral); // user literal
+        assert_tok("=", Token::Type::eAssignmentOp);
+        assert_tok("<<=", Token::Type::eAssignmentOp);
+        assert_tok(">>=", Token::Type::eAssignmentOp);
+        assert_tok("+=", Token::Type::eAssignmentOp);
+        assert_tok("-=", Token::Type::eAssignmentOp);
+        assert_tok("*=", Token::Type::eAssignmentOp);
+        assert_tok("/=", Token::Type::eAssignmentOp);
+        assert_tok("%=", Token::Type::eAssignmentOp);
+        assert_tok("&=", Token::Type::eAssignmentOp);
+        assert_tok("|=", Token::Type::eAssignmentOp);
+        assert_tok("^=", Token::Type::eAssignmentOp);
+        assert_tok(",", Token::Type::eExtendedOp);
+        assert_tok("[", Token::Type::eExtendedOp);
+        assert_tok("]", Token::Type::eExtendedOp);
+        assert_tok("(", Token::Type::eExtendedOp);
+        assert_tok(")", Token::Type::eExtendedOp);
+        assert_tok("?", Token::Type::eExtendedOp);
+        assert_tok(":", Token::Type::eExtendedOp);
+        assert_tok("<<", Token::Type::eArithmeticalOp);
+        assert_tok(">>", Token::Type::eArithmeticalOp);
+        assert_tok("+", Token::Type::eArithmeticalOp);
+        assert_tok("-", Token::Type::eArithmeticalOp);
+        assert_tok("*", Token::Type::eArithmeticalOp);
+        assert_tok("/", Token::Type::eArithmeticalOp);
+        assert_tok("%", Token::Type::eArithmeticalOp);
+        assert_tok("&", Token::Type::eBitOp);
+        assert_tok("|", Token::Type::eBitOp);
+        assert_tok("^", Token::Type::eBitOp);
+        assert_tok("~", Token::Type::eBitOp);
+        assert_tok("&&", Token::Type::eLogicalOp);
+        assert_tok("||", Token::Type::eLogicalOp);
+        assert_tok("!", Token::Type::eLogicalOp);
+        assert_tok("==", Token::Type::eComparisonOp);
+        assert_tok("!=", Token::Type::eComparisonOp);
+        assert_tok("<", Token::Type::eComparisonOp);
+        assert_tok("<=", Token::Type::eComparisonOp);
+        assert_tok(">", Token::Type::eComparisonOp);
+        assert_tok(">=", Token::Type::eComparisonOp);
+        // eComparisonOp with link has a separate test
+        assert_tok("<=>", Token::Type::eComparisonOp);
+        assert_tok("++", Token::Type::eIncDecOp);
+        assert_tok("--", Token::Type::eIncDecOp);
+        assert_tok("{", Token::Type::eBracket);
+        assert_tok("}", Token::Type::eBracket);
+        // < and > with link have a separate test
+        assert_tok("...", Token::Type::eEllipsis);
+        assert_tok(";", Token::Type::eOther);
+        // eType with specific languages and standards has separate tests
+        assert_tok("void", Token::Type::eType, /*l=*/ false, /*std=*/ true);
+    }
+
+    void update_property_info_evariable() const
+    {
+        {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, std::move(tokensFrontBack));
+            tok.str("var1");
+            tok.varId(17);
+            assert_tok(&tok, Token::Type::eVariable);
+        }
+    }
+
+    void update_property_info_ekeyword_c() const
+    {
+        {
+            const Settings s = settingsBuilder().c(Standards::cstd_t::C89).build();
+            TokenList list_c{s, Standards::Language::C};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_c, std::move(tokensFrontBack));
+            tok.str("alignas"); // not a C89 keyword
+            assert_tok(&tok, Token::Type::eName);
+        }
+        {
+            TokenList list_c{settingsDefault, Standards::Language::C};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_c, std::move(tokensFrontBack));
+            tok.str("alignas"); // a C23 keyword
+            assert_tok(&tok, Token::Type::eKeyword);
+        }
+        {
+            TokenList list_c{settingsDefault, Standards::Language::C};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_c, std::move(tokensFrontBack));
+            tok.str("and_eq"); // a C++ keyword
+            assert_tok(&tok, Token::Type::eName);
+        }
+    }
+
+    void update_property_info_ekeyword_cpp() const
+    {
+        {
+            const Settings s = settingsBuilder().cpp(Standards::cppstd_t::CPP03).build();
+            TokenList list_cpp{s, Standards::Language::CPP};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_cpp, std::move(tokensFrontBack));
+            tok.str("consteval"); // not a C++03 keyword
+            assert_tok(&tok, Token::Type::eName);
+        }
+        {
+            TokenList list_cpp{settingsDefault, Standards::Language::CPP};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_cpp, std::move(tokensFrontBack));
+            tok.str("consteval"); // a C++20 keyword
+            assert_tok(&tok, Token::Type::eKeyword);
+        }
+        {
+            TokenList list_cpp{settingsDefault, Standards::Language::CPP};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_cpp, std::move(tokensFrontBack));
+            tok.str("typeof_unqual"); // a C keyword
+            assert_tok(&tok, Token::Type::eName);
+        }
+    }
+
+    void update_property_info_ebracket_link() const
+    {
+        {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, tokensFrontBack);
+            tok.str("<");
+
+            Token tok2(list, std::move(tokensFrontBack));
+            tok.link(&tok2);
+            assert_tok(&tok, Token::Type::eBracket);
+        }
+
+        {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, tokensFrontBack);
+
+            Token tok2(list, std::move(tokensFrontBack));
+            tok.link(&tok2);
+
+            tok.str("<");
+            assert_tok(&tok, Token::Type::eBracket);
+        }
+    }
+
+    void update_property_info_ecomparisonop_link() const
+    {
+        {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, tokensFrontBack);
+            tok.str("==");
+
+            Token tok2(list, std::move(tokensFrontBack));
+            tok.link(&tok2); // TODO: does not (and probably should not) update
+            assert_tok(&tok, Token::Type::eComparisonOp);
+        }
+
+        {
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list, tokensFrontBack);
+
+            Token tok2(list, std::move(tokensFrontBack));
+            tok.link(&tok2);
+
+            tok.str("==");
+            assert_tok(&tok, Token::Type::eOther); // TODO: this looks wrong
+        }
+    }
+
+    void update_property_info_etype_c() const
+    {
+        {
+            TokenList list_c{settingsDefault, Standards::Language::C};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_c, std::move(tokensFrontBack));
+            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
+    {
+        {
+            TokenList list_cpp{settingsDefault, Standards::Language::CPP};
+            auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+            Token tok(list_cpp, std::move(tokensFrontBack));
+            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);
+    }
+
+    void varid_reset() const
+    {
+        TokenList list_c{settingsDefault, Standards::Language::C};
+        auto tokensFrontBack = std::make_shared<TokensFrontBack>();
+        Token tok(list_c, std::move(tokensFrontBack));
+        tok.str("int"); // not treated as keyword in TokenList::isKeyword()
+        assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
+        tok.varId(0);
+        assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
+    }
+#undef assert_tok
 };
 
 REGISTER_TEST(TestToken)
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 0ff011e8637..dcbbd0201af 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-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
@@ -16,21 +16,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
 #include "errortypes.h"
+#include "fixture.h"
 #include "helpers.h"
+#include "path.h"
 #include "platform.h"
 #include "preprocessor.h" // usually tests here should not use preprocessor...
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 
+#include <cstdint>
 #include <cstring>
 #include <list>
-#include <map>
 #include <set>
 #include <sstream>
 #include <string>
@@ -39,18 +39,21 @@
 
 #include <simplecpp.h>
 
+class ErrorLogger;
+
 class TestTokenizer : public TestFixture {
 public:
     TestTokenizer() : TestFixture("TestTokenizer") {}
 
 private:
-    // If there are unused templates, keep those
-    const Settings settings0 = settingsBuilder().library("qt.cfg").checkUnusedTemplates().build();
-    const Settings settings1 = settingsBuilder().library("qt.cfg").library("std.cfg").checkUnusedTemplates().build();
-    const Settings settings2 = settingsBuilder().library("qt.cfg").checkUnusedTemplates().build();
-    const Settings settings_windows = settingsBuilder().library("windows.cfg").checkUnusedTemplates().build();
+    const Settings settings0 = settingsBuilder().library("qt.cfg").build();
+    const Settings settings1 = settingsBuilder().library("qt.cfg").library("std.cfg").debugwarnings().build();
+    const Settings settings2 = settingsBuilder(settings1).cpp(Standards::CPP11).c(Standards::C11).build();
+    const Settings settings3 = settingsBuilder(settings0).c(Standards::C89).cpp(Standards::CPP03).build();
+    const Settings settings_windows = settingsBuilder().library("windows.cfg").debugwarnings().cpp(Standards::CPP11).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(tokenize1);
         TEST_CASE(tokenize2);
         TEST_CASE(tokenize4);
@@ -80,6 +83,9 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(tokenize37);  // #8550
         TEST_CASE(tokenize38);  // #9569
         TEST_CASE(tokenize39);  // #9771
+        TEST_CASE(tokenize40);  // #13181
+        TEST_CASE(tokenize41);  // #13847
+        TEST_CASE(tokenize42);  // #13861
 
         TEST_CASE(validate);
 
@@ -177,6 +183,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(removeParentheses25);      // daca@home - a=(b,c)
         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(tokenize_double);
         TEST_CASE(tokenize_strings);
@@ -215,6 +222,9 @@ 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(vardecl_stl_1);
         TEST_CASE(vardecl_stl_2);
         TEST_CASE(vardecl_stl_3);
@@ -266,6 +276,11 @@ 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(cppMaybeUnusedStructuredBinding);
 
         TEST_CASE(splitTemplateRightAngleBrackets);
 
@@ -278,11 +293,14 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(cpp14template); // Ticket #6708
 
         TEST_CASE(arraySize);
+        TEST_CASE(arraySizeAfterValueFlow);
 
         TEST_CASE(labels);
         TEST_CASE(simplifyInitVar);
         TEST_CASE(simplifyInitVar2);
         TEST_CASE(simplifyInitVar3);
+        TEST_CASE(simplifyInitVar4);
+        TEST_CASE(simplifyInitVar5);
 
         TEST_CASE(bitfields1);
         TEST_CASE(bitfields2);
@@ -298,6 +316,11 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(bitfields13); // ticket #3502 (segmentation fault)
         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);
 
@@ -310,7 +333,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyCAlternativeTokens);
 
         // x = ({ 123; });  =>  { x = 123; }
-        TEST_CASE(simplifyRoundCurlyParentheses);
+        TEST_CASE(simplifyCompoundStatements);
 
         TEST_CASE(simplifyOperatorName1);
         TEST_CASE(simplifyOperatorName2);
@@ -341,6 +364,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
@@ -374,8 +398,6 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(simplifyEmptyNamespaces);
 
-        TEST_CASE(compileLimits); // #5592 crash: gcc: testsuit: gcc.c-torture/compile/limits-declparen.c
-
         TEST_CASE(prepareTernaryOpForAST);
 
         // AST data
@@ -387,12 +409,20 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(astunaryop);
         TEST_CASE(astfunction);
         TEST_CASE(asttemplate);
+        TEST_CASE(astrequires);
         TEST_CASE(astcast);
         TEST_CASE(astlambda);
         TEST_CASE(astcase);
         TEST_CASE(astrefqualifier);
+        TEST_CASE(astthrowdelete);
+        TEST_CASE(asttrailingdecltype);
+        TEST_CASE(astnoexcept);
         TEST_CASE(astvardecl);
         TEST_CASE(astnewscoped);
+        TEST_CASE(astdecltypescope);
+        TEST_CASE(astdesignatedinit);
+        TEST_CASE(astrvaluedecl);
+        TEST_CASE(astorkeyword);
 
         TEST_CASE(startOfExecutableScope);
 
@@ -413,6 +443,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(checkRefQualifiers);
         TEST_CASE(checkConditionBlock);
         TEST_CASE(checkUnknownCircularVar);
+        TEST_CASE(checkRequires);
 
         // #9052
         TEST_CASE(noCrash1);
@@ -426,10 +457,10 @@ class TestTokenizer : public TestFixture {
         // --check-config
         TEST_CASE(checkConfiguration);
 
-        TEST_CASE(unknownType); // #8952
-
         TEST_CASE(unknownMacroBeforeReturn);
 
+        TEST_CASE(cppKeywordInCSource);
+
         TEST_CASE(cppcast);
 
         TEST_CASE(checkHeader1);
@@ -438,6 +469,8 @@ class TestTokenizer : public TestFixture {
 
         TEST_CASE(removeAlignas1);
         TEST_CASE(removeAlignas2); // Do not remove alignof in the same way
+        TEST_CASE(removeAlignas3); // remove alignas in C11 code
+        TEST_CASE(dumpAlignas);
 
         TEST_CASE(simplifyCoroutines);
 
@@ -449,93 +482,144 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyIfSwitchForInit4);
         TEST_CASE(simplifyIfSwitchForInit5);
 
+        TEST_CASE(newPlacementArgsCppInit); // #13775
+
         TEST_CASE(cpp20_default_bitfield_initializer);
 
         TEST_CASE(cpp11init);
-    }
 
-#define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeAndStringify_(const char* file, int linenr, const char code[], bool expand = true, cppcheck::Platform::Type platform = cppcheck::Platform::Type::Native, const char* filename = "test.cpp", Standards::cppstd_t std = Standards::CPP11) {
-        errout.str("");
+        TEST_CASE(testDirectiveIncludeTypes);
+        TEST_CASE(testDirectiveIncludeLocations);
+        TEST_CASE(testDirectiveIncludeComments);
+        TEST_CASE(testDirectiveRelativePath);
 
-        const Settings settings = settingsBuilder(settings1).debugwarnings().cpp(std).platform(platform).build();
+        TEST_CASE(funcnameInParenthesis1); // #13554
+        TEST_CASE(funcnameInParenthesis2); // #13578
+        TEST_CASE(funcnameInParenthesis3); // #13585
 
-        // tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, linenr);
+        TEST_CASE(genericInIf); // #13561
 
-        // filter out ValueFlow messages..
-        const std::string debugwarnings = errout.str();
-        errout.str("");
-        std::istringstream istr2(debugwarnings);
-        std::string line;
-        while (std::getline(istr2,line)) {
-            if (line.find("valueflow.cpp") == std::string::npos)
-                errout << line << "\n";
-        }
+        TEST_CASE(preincrementInLambda); // #13312
 
-        if (tokenizer.tokens())
-            return tokenizer.tokens()->stringifyList(false, expand, false, true, false, nullptr, nullptr);
-        return "";
+        TEST_CASE(atomicCast); // #12605
+        TEST_CASE(constFunctionPtrTypedef); // #12135
+
+        TEST_CASE(simplifyPlatformTypes);
+
+        TEST_CASE(dumpFallthrough);
+
+        TEST_CASE(simplifyRedundantParentheses);
+
+        TEST_CASE(simplifyEnum1);
+
+        TEST_CASE(simplifyEnum2);
     }
 
-#define tokenizeAndStringifyWindows(...) tokenizeAndStringifyWindows_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeAndStringifyWindows_(const char* file, int linenr, const char code[], bool expand = true, cppcheck::Platform::Type platform = cppcheck::Platform::Type::Native, const char* filename = "test.cpp", bool cpp11 = true) {
-        errout.str("");
+    class TokenizerTest : public Tokenizer
+    {
+        friend class TestTokenizer;
+    public:
+        TokenizerTest(TokenList tokenList, ErrorLogger &errorLogger)
+            : Tokenizer(std::move(tokenList), errorLogger)
+        {}
+    };
+
+    struct TokenizeOptions
+    {
+        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(settings_windows).debugwarnings().cpp(cpp11 ? Standards::CPP11 : Standards::CPP03).platform(platform).build();
+#define tokenizeAndStringify(...) tokenizeAndStringify_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string tokenizeAndStringify_(const char* file, int linenr, const char (&code)[size], const TokenizeOptions& opt = make_default_obj{}) {
+        const Settings settings = settingsBuilder(settings1).cpp(opt.cppstd).c(opt.cstd).platform(opt.platform).build();
 
         // tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, linenr);
-
-        // filter out ValueFlow messages..
-        const std::string debugwarnings = errout.str();
-        errout.str("");
-        std::istringstream istr2(debugwarnings);
-        std::string line;
-        while (std::getline(istr2,line)) {
-            if (line.find("valueflow.cpp") == std::string::npos)
-                errout << line << "\n";
-        }
+        SimpleTokenizer tokenizer(settings, *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 "";
     }
 
-    std::string tokenizeAndStringify_(const char* file, int line, const char code[], const Settings &settings, const char filename[] = "test.cpp") {
-        errout.str("");
+    // TODO: get rid of this
+    std::string tokenizeAndStringify_(const char* file, int linenr, const std::string& code) {
+        SimpleTokenizer tokenizer(settings2, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
+
+        if (tokenizer.tokens())
+            return tokenizer.tokens()->stringifyList(false, true, 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) {
         // tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        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);
     }
 
-#define tokenizeDebugListing(...) tokenizeDebugListing_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeDebugListing_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        errout.str("");
+#define tokenizeAndStringifyWindows(...) tokenizeAndStringifyWindows_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string tokenizeAndStringifyWindows_(const char* file, int linenr, const char (&code)[size], Platform::Type platform = Platform::Type::Native) {
+        const Settings settings = settingsBuilder(settings_windows).platform(platform).build();
 
-        const Settings settings = settingsBuilder(settings2).c(Standards::C89).cpp(Standards::CPP03).build();
+        // tokenize..
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, linenr);
 
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        if (tokenizer.tokens())
+            return tokenizer.tokens()->stringifyList(false, true, false, true, false, nullptr, nullptr);
+        return "";
+    }
+
+#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) {
+        SimpleTokenizer tokenizer(settings3, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // result..
         return tokenizer.tokens()->stringifyList(true,true,true,true,false);
     }
 
+    template<size_t size>
+    void directiveDump(const char (&code)[size], std::ostream& ostr) {
+        directiveDump(code, "test.c", settingsDefault, ostr);
+    }
+
+    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;
+        simplecpp::TokenList tokens1(code, files, filename, &outputList);
+        Preprocessor preprocessor(tokens1, settings, *this, Path::identify(tokens1.getFiles()[0], false));
+        (void)preprocessor.reportOutput(outputList, true);
+        ASSERT(preprocessor.loadFiles(files));
+        std::list<Directive> directives = preprocessor.createDirectives();
+
+        TokenList tokenlist{settings, Path::identify(filename, false)};
+        Tokenizer tokenizer(std::move(tokenlist), *this);
+        tokenizer.setDirectives(std::move(directives));
+
+        tokenizer.dump(ostr);
+    }
+
     void tokenize1() {
         const char code[] = "void f ( )\n"
                             "{ if ( p . y ( ) > yof ) { } }";
         ASSERT_EQUALS(code, tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:2:20]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable yof [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void tokenize2() {
@@ -554,7 +638,7 @@ class TestTokenizer : public TestFixture {
                       "public:\n"
                       "const int i ;\n"
                       "}", tokenizeAndStringify(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void tokenize5() {
@@ -568,7 +652,7 @@ class TestTokenizer : public TestFixture {
                             "    int x1 = 1;\n"
                             "    int x2(x1);\n"
                             "}\n";
-        ASSERT_EQUALS("void f ( ) {\nint x1 ; x1 = 1 ;\nint x2 ; x2 = x1 ;\n}",
+        ASSERT_EQUALS("void f ( ) {\nint x1 ; x1 = 1 ;\nint x2 ( x1 ) ;\n}",
                       tokenizeAndStringify(code));
     }
 
@@ -578,8 +662,8 @@ class TestTokenizer : public TestFixture {
                             "    int x2(x1);\n"
                             "}\n";
         ASSERT_EQUALS("1: void f ( ) {\n"
-                      "2: int x1@1 ; x1@1 = g ( ) ;\n"
-                      "3: int x2@2 ; x2@2 = x1@1 ;\n"
+                      "2: int x1@1 ( g ( ) ) ;\n"
+                      "3: int x2@2 ( x1@1 ) ;\n"
                       "4: }\n",
                       tokenizeDebugListing(code));
     }
@@ -590,8 +674,8 @@ class TestTokenizer : public TestFixture {
                             "void f() {\n"
                             "    fpp x = (fpp)f();\n"
                             "}";
-        tokenizeAndStringify(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tokenizeAndStringify(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void tokenize11() {
@@ -604,7 +688,7 @@ class TestTokenizer : public TestFixture {
                             "-(Foo *)foo: (Bar *)bar\n"
                             "{ }\n"
                             "@end\n";
-        ASSERT_THROW(tokenizeAndStringify(code), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
     }
 
     // Ticket #2361: 0X10 => 16
@@ -642,7 +726,7 @@ class TestTokenizer : public TestFixture {
 
     void tokenize19() {
         // #3006 - added hasComplicatedSyntaxErrorsInTemplates to avoid segmentation fault
-        ASSERT_THROW(tokenizeAndStringify("x < () <"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("x < () <"), SYNTAX);
 
         // #3496 - make sure hasComplicatedSyntaxErrorsInTemplates works
         ASSERT_EQUALS("void a ( Fred * f ) { for ( ; n < f . x ( ) ; ) { } }",
@@ -663,6 +747,7 @@ class TestTokenizer : public TestFixture {
                                            "        v[dim]->f();\n"
                                            "    }\n"
                                            "};"));
+        ignore_errout(); // we do not care about the output
     }
 
     void tokenize21() { // tokenize 0x0E-7
@@ -679,25 +764,25 @@ class TestTokenizer : public TestFixture {
 
     // #4239 - segfault for "f ( struct { int typedef T x ; } ) { }"
     void tokenize25() {
-        ASSERT_THROW(tokenizeAndStringify("f ( struct { int typedef T x ; } ) { }"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f ( struct { int typedef T x ; } ) { }"), SYNTAX);
     }
 
     // #4245 - segfault
     void tokenize26() {
-        ASSERT_THROW(tokenizeAndStringify("class x { protected : template < int y = } ;"), InternalError); // Garbage code
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class x { protected : template < int y = } ;"), SYNTAX); // Garbage code
     }
 
     void tokenize27() {
         // #4525 - segfault
-        tokenizeAndStringify("struct except_spec_d_good : except_spec_a, except_spec_b {\n"
-                             "~except_spec_d_good();\n"
-                             "};\n"
-                             "struct S { S(); };\n"
-                             "S::S() __attribute((pure)) = default;"
-                             );
+        (void)tokenizeAndStringify("struct except_spec_d_good : except_spec_a, except_spec_b {\n"
+                                   "~except_spec_d_good();\n"
+                                   "};\n"
+                                   "struct S { S(); };\n"
+                                   "S::S() __attribute((pure)) = default;"
+                                   );
 
         // original code: glibc-2.18/posix/bug-regex20.c
-        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));");
     }
 
     // #3503 - don't "simplify" SetFunction member function to a variable
@@ -720,17 +805,17 @@ class TestTokenizer : public TestFixture {
     // #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 ; }";
+        const char code[] = "void f ( ) { int max_x ; max_x = -10000 << 16 ; }";
         ASSERT_EQUALS(code, tokenizeAndStringify(code));
     }
 
     // #5780 Various crashes on valid template code in Tokenizer::setVarId()
     void tokenize33() {
-        const char * code = "template<typename T, typename A = Alloc<T>> struct vector {};\n"
+        const char code[] = "template<typename T, typename A = Alloc<T>> struct vector {};\n"
                             "void z() {\n"
                             "    vector<int> VI;\n"
                             "}\n";
-        tokenizeAndStringify(code);
+        (void)tokenizeAndStringify(code);
     }
 
     void tokenize34() { // #8031
@@ -771,8 +856,8 @@ class TestTokenizer : public TestFixture {
     }
 
     void tokenize35() { // #8361
-        tokenizeAndStringify("typedef int CRCWord; "
-                             "template<typename T> ::CRCWord const Compute(T const t) { return 0; }");
+        ASSERT_NO_THROW(tokenizeAndStringify("typedef int CRCWord; "
+                                             "template<typename T> ::CRCWord const Compute(T const t) { return 0; }"));
     }
 
     void tokenize36() { // #8436
@@ -811,81 +896,137 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
+    void tokenize40() { // #13181
+        const char code[] = "struct A { double eps(double); };\n"
+                            "A operator \"\"_a(long double);\n"
+                            "void f() {\n"
+                            "    double d = 1.23;\n"
+                            "    if (d == 1.2_a .eps(.1)) {}\n"
+                            "}\n";
+        (void) tokenizeAndStringify(code);
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void tokenize41() { // #13847
+        const char code[] = "int main() {\n"
+                            "     using x::a;\n"
+                            "     b = a + 2;\n"
+                            "}\n";
+        ASSERT_EQUALS("int main ( ) {\n"
+                      "\n"
+                      "b = x :: a + 2 ;\n"
+                      "}", tokenizeAndStringify(code));
+        (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 validate() {
         // C++ code in C file
-        ASSERT_THROW(tokenizeAndStringify(";using namespace std;",false,cppcheck::Platform::Type::Native,"test.c"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify(";std::map<int,int> m;",false,cppcheck::Platform::Type::Native,"test.c"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify(";template<class T> class X { };",false,cppcheck::Platform::Type::Native,"test.c"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("int X<Y>() {};",false,cppcheck::Platform::Type::Native,"test.c"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("void foo(int i) { reinterpret_cast<char>(i) };",false,cppcheck::Platform::Type::Native,"test.h"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";using namespace std;",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";std::map<int,int> m;",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(";template<class T> class X { };",dinit(TokenizeOptions, $.expand = false, $.cpp = false)), SYNTAX);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int X<Y>() {};",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) };";
+            tokenlist.appendFileIfNew("test.h");
+            ASSERT(tokenlist.createTokensFromString(code));
+            Tokenizer tokenizer(std::move(tokenlist), *this);
+            ASSERT_THROW_INTERNAL(tokenizer.simplifyTokens1(""), SYNTAX);
+        }
     }
 
     void objectiveC() {
-        ASSERT_THROW(tokenizeAndStringify("void f() { [foo bar]; }"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f() { [foo bar]; }"), SYNTAX);
     }
 
     void syntax_case_default() { // correct syntax
-        tokenizeAndStringify("void f() {switch (n) { case 0: z(); break;}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0: z(); break;}}"));
+        ASSERT_EQUALS("", errout_str());
 
-        tokenizeAndStringify("void f() {switch (n) { case 0:; break;}}");
-        ASSERT_EQUALS("", errout.str());
+        (void)tokenizeAndStringify("void f(int n) {switch (n) { case 0:; break;}}");
+        ASSERT_EQUALS("", errout_str());
 
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f() {switch (n) { case 0?1:2 : z(); break;}}"), InternalError);
-        //ASSERT_EQUALS("", errout.str());
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?1:2 : z(); break;}}"), InternalError);
+        //ASSERT_EQUALS("", errout_str());
 
         // TODO: Do not throw AST validation exception
-        TODO_ASSERT_THROW(tokenizeAndStringify("void f() {switch (n) { case 0?(1?3:4):2 : z(); break;}}"), InternalError);
-        ASSERT_EQUALS("", errout.str());
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?(1?3:4):2 : z(); break;}}"), 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() {switch (n) { case 0?({0;}):1: z(); break;}}"), InternalError);
-        ASSERT_EQUALS("", errout.str());
+        TODO_ASSERT_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case 0?({0;}):1: z(); break;}}"), InternalError);
+        ASSERT_EQUALS("", errout_str());
 
         //'b' can be or a macro or an undefined enum
-        tokenizeAndStringify("void f() {switch (n) { case b: z(); break;}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case b: z(); break;}}"));
+        ASSERT_EQUALS("", errout_str());
 
         //valid, when there's this declaration: 'constexpr int g() { return 2; }'
-        tokenizeAndStringify("void f() {switch (n) { case g(): z(); break;}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g(): z(); break;}}"));
+        ASSERT_EQUALS("", errout_str());
 
         //valid, when there's also this declaration: 'constexpr int g[1] = {0};'
-        tokenizeAndStringify("void f() {switch (n) { case g[0]: z(); break;}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case g[0]: z(); break;}}"));
+        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
-        tokenizeAndStringify("void f() {switch (n) { case *g: z(); break;}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case *g: z(); break;}}"));
+        ASSERT_EQUALS("", errout_str());
 
         //valid, when 'x' and 'y' are constexpr.
-        tokenizeAndStringify("void f() {switch (n) { case sqrt(x+y): z(); break;}}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int n) {switch (n) { case sqrt(x+y): z(); break;}}"));
+        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 Settings s_c89 = settingsBuilder().c(Standards::C89).build();
-        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_c89, "test.c"));
-        const Settings s_clatest = settingsBuilder().c(Standards::CLatest).build();
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_clatest, "test.c"));
+        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_c89, false));
+        const Settings s_clatest;
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_clatest, false));
 
         const Settings s_cpp03 = settingsBuilder().cpp(Standards::CPP03).build();
-        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_cpp03, "test.cpp"));
-        const Settings s_cpplatest = settingsBuilder().cpp(Standards::CPPLatest).build();
-        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_cpplatest, "test.cpp"));
+        ASSERT_EQUALS("_Pragma ( \"abc\" ) int x ;", tokenizeAndStringify(code, s_cpp03, true));
+        const Settings s_cpplatest;
+        ASSERT_EQUALS("int x ;", tokenizeAndStringify(code, s_cpplatest, true));
     }
 
     void foreach () {
         // #3690,#5154
         const char code[] ="void f() { for each ( char c in MyString ) { Console::Write(c); } }";
-        ASSERT_EQUALS("void f ( ) { asm ( \"char c in MyString\" ) { Console :: Write ( c ) ; } }", tokenizeAndStringify(code));
+        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",
+            errout_str());
     }
 
     void ifconstexpr() {
         ASSERT_EQUALS("void f ( ) { if ( FOO ) { bar ( c ) ; } }", tokenizeAndStringify("void f() { if constexpr ( FOO ) { bar(c); } }"));
+        ASSERT_EQUALS(
+            "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable FOO [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void combineOperators() {
@@ -906,13 +1047,15 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("int x [ 2 ] = { -2 , 1 }", tokenizeAndStringify("int x[2] = {-2,1}"));
 
         ASSERT_EQUALS("f ( 123 )", tokenizeAndStringify("f(+123)"));
+
+        ASSERT_EQUALS("std :: extent_v < A > - 1 ;", tokenizeAndStringify("std::extent_v<A> - 1;")); // #11341
     }
 
 
 
     void longtok() {
         const std::string filedata(10000, 'a');
-        ASSERT_EQUALS(filedata, tokenizeAndStringify(filedata.c_str()));
+        ASSERT_EQUALS(filedata, tokenizeAndStringify(filedata));
     }
 
 
@@ -946,14 +1089,13 @@ class TestTokenizer : public TestFixture {
         }
 
         {
-            const Settings s = settingsBuilder().checkUnusedTemplates().build();
             ASSERT_EQUALS("; template < typename T , u_int uBAR = 0 >\n"
                           "class Foo {\n"
                           "public:\n"
                           "void FooBar ( ) {\n"
                           "new ( uBAR ? uBAR : sizeof ( T ) ) T ;\n"
                           "}\n"
-                          "} ;", tokenizeAndStringify(code, s));
+                          "} ;", tokenizeAndStringify(code, settingsDefault));
         }
     }
 
@@ -965,7 +1107,11 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_EQUALS("int x [ 10 ] ;", tokenizeAndStringify("int x[10]@0x100;"));
 
+        ASSERT_EQUALS("void ( * f [ ] ) ( void ) ;", tokenizeAndStringify("void (*f[])(void)@0x100;")); // #13458
+
         ASSERT_EQUALS("interrupt@ f ( ) { }", tokenizeAndStringify("@interrupt f() {}"));
+
+        ASSERT_EQUALS("const short MyVariable = 0xF0F0 ;", tokenizeAndStringify("const short MyVariable @ \"MYOWNSECTION\" = 0xF0F0; ")); // #12602
     }
 
     void inlineasm() {
@@ -984,42 +1130,46 @@ class TestTokenizer : public TestFixture {
         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 volatile (\"mov ax , bx\");"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm goto (\"mov ax , bx\");"));
+        ASSERT_EQUALS("asm ( \"\"mov ax , bx\"\" ) ;", tokenizeAndStringify("asm inline (\"mov ax , bx\");"));
 
         // 'asm ( ) ;' should be in the same line
         ASSERT_EQUALS(";\n\nasm ( \"\"mov ax,bx\"\" ) ;", tokenizeAndStringify(";\n\n__asm__ volatile ( \"mov ax,bx\" );"));
 
         ASSERT_EQUALS("void func1 ( ) ;", tokenizeAndStringify("void func1() __asm__(\"...\") __attribute__();"));
+
+        // #14250 - assembler function
+        const char code[] = "__asm void dostuff(uint32_t x) { "
+                            "%reg x "
+                            "  e_lis r7, (lf)@h "
+                            "%error "
+                            "}";
+        ASSERT_EQUALS("void dostuff ( uint32_t x ) { asm ( \"% reg x e_lis r7 , ( lf ) @ h % error\" ) ; }",
+                      tokenizeAndStringify(code));
     }
 
     // #4725 - ^{}
     void simplifyAsm2() {
-        ASSERT_THROW(ASSERT_EQUALS("void f ( ) { asm ( \"^{}\" ) ; }", tokenizeAndStringify("void f() { ^{} }")), InternalError);
-        ASSERT_THROW(ASSERT_EQUALS("void f ( ) { x ( asm ( \"^{}\" ) ) ; }", tokenizeAndStringify("void f() { x(^{}); }")), InternalError);
-        ASSERT_THROW(ASSERT_EQUALS("void f ( ) { foo ( A ( ) , asm ( \"^{bar();}\" ) ) ; }", tokenizeAndStringify("void f() { foo(A(), ^{ bar(); }); }")), InternalError);
-        ASSERT_THROW(ASSERT_EQUALS("int f0 ( Args args ) { asm ( \"asm(\"return^{returnsizeof...(Args);}()\")+^{returnsizeof...(args);}()\" )\n"
-                                   "2:\n"
-                                   "|\n"
-                                   "5:\n"
-                                   "6: ;\n"
-                                   "} ;", tokenizeAndStringify("int f0(Args args) {\n"
-                                                               "    return ^{\n"
-                                                               "        return sizeof...(Args);\n"
-                                                               "    }() + ^ {\n"
-                                                               "        return sizeof...(args);\n"
-                                                               "    }();\n"
-                                                               "};")), InternalError);
-        ASSERT_THROW(ASSERT_EQUALS("int ( ^ block ) ( void ) = asm ( \"^{staticinttest=0;returntest;}\" )\n\n\n;",
-                                   tokenizeAndStringify("int(^block)(void) = ^{\n"
-                                                        "    static int test = 0;\n"
-                                                        "    return test;\n"
-                                                        "};")), InternalError);
-
-        ASSERT_THROW(ASSERT_EQUALS("; return f ( a [ b = c ] , asm ( \"^{}\" ) ) ;",
-                                   tokenizeAndStringify("; return f(a[b=c],^{});")), InternalError); // #7185
+        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("int f0(Args args) {\n"
+                                                          "    return ^{\n"
+                                                          "        return sizeof...(Args);\n"
+                                                          "    }() + ^ {\n"
+                                                          "        return sizeof...(args);\n"
+                                                          "    }();\n"
+                                                          "};"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int(^block)(void) = ^{\n"
+                                                          "    static int test = 0;\n"
+                                                          "    return test;\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_EQUALS("{ return f ( asm ( \"^(void){somecode}\" ) ) ; }",
                       tokenizeAndStringify("{ return f(^(void){somecode}); }"));
-        ASSERT_THROW(ASSERT_EQUALS("; asm ( \"a?(b?(c,asm(\"^{}\")):0):^{}\" ) ;",
-                                   tokenizeAndStringify(";a?(b?(c,^{}):0):^{};")), InternalError);
+        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 ; "
@@ -1057,6 +1207,9 @@ class TestTokenizer : public TestFixture {
                       "if ( a ) { ; }\n"
                       "else { ; }\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void ifAddBraces2() {
@@ -1068,6 +1221,9 @@ class TestTokenizer : public TestFixture {
                       "{\n"
                       "if ( a ) { if ( b ) { } }\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void ifAddBraces3() {
@@ -1079,6 +1235,9 @@ class TestTokenizer : public TestFixture {
                       "{\n"
                       "if ( a ) { for ( ; ; ) { } }\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void ifAddBraces4() {
@@ -1098,6 +1257,9 @@ class TestTokenizer : public TestFixture {
                       "{ } }\n"
                       "return str ;\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:4:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable somecondition [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void ifAddBraces5() {
@@ -1132,6 +1294,7 @@ class TestTokenizer : public TestFixture {
                       "if ( a ) {\n"
                       "( { a = 4 ; } ) , ( { a = 5 ; } ) ; }\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
     void ifAddBraces9() {
@@ -1141,12 +1304,7 @@ class TestTokenizer : public TestFixture {
             "    for (int k=0; k<VectorSize; k++)"
             "        LOG_OUT(ID_Vector[k])"
             "}";
-        const char expected[] =
-            "void f ( ) { "
-            "for ( int k = 0 ; k < VectorSize ; k ++ ) "
-            "LOG_OUT ( ID_Vector [ k ] ) "
-            "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), UNKNOWN_MACRO);
     }
 
     void ifAddBraces11() {
@@ -1188,6 +1346,9 @@ class TestTokenizer : public TestFixture {
                                 "}";
             ASSERT_EQUALS("void f ( ) { ( void ) ( { if ( * p ) { ( * p ) = x ( ) ; } } ) }",
                           tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                filter_valueflow(errout_str()));
         }
     }
 
@@ -1208,6 +1369,9 @@ class TestTokenizer : public TestFixture {
                       "else {\n"
                       "bar2 ( ) ; }\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void ifAddBraces18() {
@@ -1239,11 +1403,14 @@ class TestTokenizer : public TestFixture {
                       "else {\n"
                       "bar2 ( ) ; } } }\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:3:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void ifAddBraces20() { // #5012 - syntax error 'else }'
         const char code[] = "void f() { if(x) {} else }";
-        ASSERT_THROW(tokenizeAndStringify(code), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
     }
 
     void ifAddBracesLabels() {
@@ -1256,6 +1423,7 @@ class TestTokenizer : public TestFixture {
                                            "  if (x)\n"
                                            "  l1: l2: return x;\n"
                                            "}"));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before {
         ASSERT_EQUALS("int f ( int x ) {\n"
@@ -1266,6 +1434,7 @@ class TestTokenizer : public TestFixture {
                                            "  if (x)\n"
                                            "  l1: l2: { return x; }\n"
                                            "}"));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before try/catch
         ASSERT_EQUALS("int f ( int x ) {\n"
@@ -1280,6 +1449,7 @@ class TestTokenizer : public TestFixture {
                                            "    try { throw 1; }\n"
                                            "    catch(...) { return x; }\n"
                                            "}"));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
     void switchAddBracesLabels() {
@@ -1333,6 +1503,7 @@ class TestTokenizer : public TestFixture {
                                            "  while (x)\n"
                                            "  l1: l2: --x;\n"
                                            "}"));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before {
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1343,6 +1514,7 @@ class TestTokenizer : public TestFixture {
                                            "  while (x)\n"
                                            "  l1: l2: { -- x; }\n"
                                            "}"));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
 
         // Labels before try/catch
         ASSERT_EQUALS("void f ( int x ) {\n"
@@ -1357,6 +1529,7 @@ class TestTokenizer : public TestFixture {
                                            "    try { throw 1; }\n"
                                            "    catch(...) { --x; }\n"
                                            "}"));
+        ASSERT_EQUALS("", filter_valueflow(errout_str()));
     }
 
     void doWhileAddBraces() {
@@ -1365,20 +1538,19 @@ class TestTokenizer : public TestFixture {
             const char result[] = "{ do { ; } while ( 0 ) ; }";
 
             ASSERT_EQUALS(result, tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "{ UNKNOWN_MACRO ( do ) ; while ( a -- ) ; }";
-            const char result[] = "{ UNKNOWN_MACRO ( do ) ; while ( a -- ) { ; } }";
-
-            ASSERT_EQUALS(result, tokenizeAndStringify(code));
+            ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "{ UNKNOWN_MACRO ( do , foo ) ; while ( a -- ) ; }";
-            const char result[] = "{ UNKNOWN_MACRO ( do , foo ) ; while ( a -- ) { ; } }";
-
-            ASSERT_EQUALS(result, tokenizeAndStringify(code));
+            ASSERT_THROW_INTERNAL(tokenizeAndStringify(code), SYNTAX);
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1399,6 +1571,7 @@ class TestTokenizer : public TestFixture {
                                   "return 0 ;\n"
                                   "}";
             ASSERT_EQUALS(result, tokenizeAndStringify(code));
+            ASSERT_EQUALS("", filter_valueflow(errout_str()));
         }
 
         {
@@ -1415,6 +1588,7 @@ class TestTokenizer : public TestFixture {
                                   "return 0 ;\n"
                                   "}";
             ASSERT_EQUALS(result, tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -1426,6 +1600,9 @@ class TestTokenizer : public TestFixture {
                                   "do { while ( x ) { f ( ) ; } } while ( y ) ;\n"
                                   "}";
             ASSERT_EQUALS(result, tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:2:17]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
+                filter_valueflow(errout_str()));
         }
     }
 
@@ -1484,6 +1661,9 @@ class TestTokenizer : public TestFixture {
                                     "else { } }\n"
                                     "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:3:14]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+                filter_valueflow(errout_str()));
         }
 
         {
@@ -1500,6 +1680,9 @@ class TestTokenizer : public TestFixture {
                                     "else { } } }\n"
                                     "}";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:3:14]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+                filter_valueflow(errout_str()));
         }
     }
 
@@ -1551,28 +1734,70 @@ class TestTokenizer : public TestFixture {
 
 
     void simplifyExternC() {
-        ASSERT_EQUALS("int foo ( ) ;", tokenizeAndStringify("extern \"C\" int foo();"));
-        ASSERT_EQUALS("int foo ( ) ;", tokenizeAndStringify("extern \"C\" { int foo(); }"));
+        const char expected[] = "int foo ( ) ;";
+        {
+            const char code[] = "extern \"C\" int foo();";
+            // tokenize..
+            SimpleTokenizer tokenizer(settings0, *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(); }";
+            // tokenize..
+            SimpleTokenizer tokenizer(settings0, *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();";
+            // tokenize..
+            SimpleTokenizer tokenizer(settings0, *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(); }";
+            // tokenize..
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
+            // Expected result..
+            ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
+            ASSERT(!tokenizer.tokens()->next()->isExternC());
+        }
     }
 
     void simplifyFunctionParameters() {
         {
             const char code[] = "char a [ ABC ( DEF ) ] ;";
             ASSERT_EQUALS(code, tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "module ( a , a , sizeof ( a ) , 0444 ) ;";
             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("", errout_str());
         ASSERT_EQUALS("void f ( int x , char y ) { }", tokenizeAndStringify("void f(x,y) int x; char y; { }"));
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("int main ( int argc , char * argv [ ] ) { }", tokenizeAndStringify("int main(argc,argv) int argc; char *argv[]; { }"));
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("int f ( int p , int w , float d ) { }", tokenizeAndStringify("int f(p,w,d) float d; { }"));
+        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("", errout_str());
 
         {
             // This is not a function but the pattern is similar..
@@ -1583,6 +1808,9 @@ class TestTokenizer : public TestFixture {
                                 "    { }"
                                 "}";
             ASSERT_EQUALS("void foo ( ) { if ( x ) { int x ; } { } }", tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:1:20]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable x [valueFlowBailoutIncompleteVar]\n",
+                filter_valueflow(errout_str()));
         }
     }
 
@@ -1628,33 +1856,34 @@ class TestTokenizer : public TestFixture {
         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());
     }
 
     void simplifyFunctionParametersErrors() {
         //same parameters...
-        ASSERT_THROW(tokenizeAndStringify("void foo(x, x)\n"
-                                          " int x;\n"
-                                          " int x;\n"
-                                          "{}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo(x, x)\n"
+                                                   " int x;\n"
+                                                   " int x;\n"
+                                                   "{}\n"), SYNTAX);
 
-        ASSERT_THROW(tokenizeAndStringify("void foo(x, y)\n"
-                                          " int x;\n"
-                                          " int x;\n"
-                                          "{}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo(x, y)\n"
+                                                   " int x;\n"
+                                                   " int x;\n"
+                                                   "{}\n"), SYNTAX);
 
-        tokenizeAndStringify("void foo(int, int)\n"
-                             "{}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_NO_THROW(tokenizeAndStringify("void foo(int, int)\n"
+                                             "{}"));
+        ASSERT_EQUALS("", errout_str());
 
         // #3848 - Don't hang
-        tokenizeAndStringify("sal_Bool ShapeHasText(sal_uLong, sal_uLong) const {\n"
-                             "    return sal_True;\n"
-                             "}\n"
-                             "void CreateSdrOLEFromStorage() {\n"
-                             "    comphelper::EmbeddedObjectContainer aCnt( xDestStorage );\n"
-                             "    { }\n"
-                             "}");
-        ASSERT_EQUALS("", errout.str());
+        (void)tokenizeAndStringify("sal_Bool ShapeHasText(sal_uLong, sal_uLong) const {\n"
+                                   "    return sal_True;\n"
+                                   "}\n"
+                                   "void CreateSdrOLEFromStorage() {\n"
+                                   "    comphelper::EmbeddedObjectContainer aCnt( xDestStorage );\n"
+                                   "    { }\n"
+                                   "}");
+        ignore_errout();
     }
 
     void simplifyFunctionTryCatch() {
@@ -1685,6 +1914,15 @@ class TestTokenizer : public TestFixture {
                                            "  };\n"
                                            "} catch (long) {\n"
                                            "}"));
+
+        ASSERT_EQUALS("struct S { void func ( ) const ; } ;\n"
+                      "void S :: func ( ) const {\n"
+                      "try { f ( ) ; }\n"
+                      "catch ( ... ) { g ( ) ; } }",
+                      tokenizeAndStringify("struct S { void func() const; };\n"
+                                           "void S::func() const\n"
+                                           "try { f(); }\n"
+                                           "catch (...) { g(); }\n"));
     }
 
     // Simplify "((..))" into "(..)"
@@ -1695,6 +1933,9 @@ class TestTokenizer : public TestFixture {
                             "}";
 
         ASSERT_EQUALS("void foo ( ) { free ( ( void * ) p ) ; }", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:1:29]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void removeParentheses3() {
@@ -1730,6 +1971,9 @@ class TestTokenizer : public TestFixture {
                             "    (free(p));"
                             "}";
         ASSERT_EQUALS("void foo ( ) { free ( p ) ; }", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:1:22]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void removeParentheses5() {
@@ -1740,6 +1984,9 @@ class TestTokenizer : public TestFixture {
                                 "    (delete p);"
                                 "}";
             ASSERT_EQUALS("void foo ( ) { delete p ; }", tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:1:24]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                errout_str());
         }
 
         // Simplify "( delete [] x )" into "delete [] x"
@@ -1749,6 +1996,9 @@ class TestTokenizer : public TestFixture {
                                 "    (delete [] p);"
                                 "}";
             ASSERT_EQUALS("void foo ( ) { delete [ ] p ; }", tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:1:27]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+                errout_str());
         }
     }
 
@@ -1774,7 +2024,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, cppcheck::Platform::Type::Win32A));
+        const std::string actual(tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
 
         const char expected[] = "struct foo {\n"
                                 "void operatordelete ( void * obj , unsigned long sz ) ;\n"
@@ -1813,7 +2063,7 @@ class TestTokenizer : public TestFixture {
     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 ? ( 123 ) : c ;", tokenizeAndStringify("a = b ? (123) : c;"));
 
         // #4316
         ASSERT_EQUALS("a = b ? c : ( d = 1 , 0 ) ;", tokenizeAndStringify("a = b ? c : (d=1,0);"));
@@ -1922,6 +2172,12 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS(exp, tokenizeAndStringify(code));
     }
 
+    void removeParentheses28() { // Ticket #12164
+        static char code[] = "temp1 = (value > 100U) ? (value+100U) : (value-50U);";
+        static const char exp[] = "temp1 = ( value > 100U ) ? ( value + 100U ) : ( value - 50U ) ;";
+        ASSERT_EQUALS(exp, tokenizeAndStringify(code));
+    }
+
     void tokenize_double() {
         const char code[] = "void f() {\n"
                             "    double a = 4.2;\n"
@@ -2030,6 +2286,9 @@ class TestTokenizer : public TestFixture {
                       "}", tokenizeAndStringify("void foo(int nX) {\n"
                                                 "    int addI = frontPoint == 2 || frontPoint == 1 ? i = 0, 1 : (i = nX - 2, -1);\n"
                                                 "}"));
+        ASSERT_EQUALS(
+            "[test.cpp:2:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable frontPoint [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void vardecl_stl_1() {
@@ -2071,7 +2330,7 @@ class TestTokenizer : public TestFixture {
         const char res1[]  = "b < 16777216 , 10 , 24 > u ; b < 16777216 , 10 , 24 > v ;";
         ASSERT_EQUALS(res1, tokenizeAndStringify(code1));
         // ticket #3571 (segmentation fault)
-        tokenizeAndStringify("template <int i = (3>4) > class X4 {};");
+        (void)tokenizeAndStringify("template <int i = (3>4) > class X4 {};");
     }
 
     void vardecl_template_2() {
@@ -2270,11 +2529,14 @@ class TestTokenizer : public TestFixture {
                             "    int a = (x < y) ? 1 : 0;\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",
+            errout_str());
     }
 
     void vardecl14() {
         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, cppcheck::Platform::Type::Native, "test.cpp", Standards::CPP03));
+        ASSERT_EQUALS(":: std :: tr1 :: shared_ptr < int > pNum1 ; :: std :: tr1 :: shared_ptr < int > pNum2 ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.expand = false, $.cppstd = Standards::CPP03)));
     }
 
     void vardecl15() {
@@ -2310,6 +2572,9 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("void f ( ) {\n"
                       "g ( ( double ) v1 * v2 , v3 , v4 ) ;\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:2:15]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable v1 [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void vardecl19() {
@@ -2411,6 +2676,7 @@ class TestTokenizer : public TestFixture {
                       "{\n"
                       "const int X = 0 ;\n"
                       "}", tokenizeAndStringify(code));
+        ASSERT_EQUALS("[test.cpp:1:9]: (debug) Executable scope 'b' with unknown function. [symbolDatabaseWarning]\n", errout_str());
     }
 
     void vardecl21() { // type in namespace
@@ -2434,11 +2700,11 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl22() {  // #4211 - segmentation fault
-        tokenizeAndStringify("A<B<C<int>> >* p = 0;");
+        (void)tokenizeAndStringify("A<B<C<int>> >* p = 0;");
     }
 
     void vardecl23() {  // #4276 - segmentation fault
-        ASSERT_THROW(tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("class a { protected : template < class int x = 1 ; public : int f ( ) ; }"), SYNTAX);
     }
 
     void vardecl24() {  // #4187 - variable declaration within lambda function
@@ -2470,27 +2736,29 @@ class TestTokenizer : public TestFixture {
     }
 
     void vardecl25() {  // #4799 - segmentation fault
-        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"
-                             "}");
+        (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"
+                                   "}");
+        ignore_errout();
     }
 
     void vardecl26() { // #5907
         const char code[] = "extern int *new, obj, player;";
         const char expected[] = "extern int * new ; extern int obj ; extern int player ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code, true, cppcheck::Platform::Type::Native, "test.c"));
+        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());
     }
 
-    void vardecl27() { // #7850
+    void vardecl27() { // #7850 (segmentation fault)
         const char code[] = "extern int foo(char);\n"
                             "void* class(char c) {\n"
                             "  if (foo(c))\n"
                             "    return 0;\n"
                             "  return 0;\n"
                             "}";
-        tokenizeAndStringify(code, /*expand=*/ true, cppcheck::Platform::Type::Native, "test.c");
+        (void)tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false));
     }
 
     void vardecl28() {
@@ -2502,37 +2770,66 @@ class TestTokenizer : public TestFixture {
                       "const unsigned short x ; x = 1 ;\n"
                       "return x ;\n"
                       "}",
-                      tokenizeAndStringify(code, /*expand=*/ true, cppcheck::Platform::Type::Native, "test.c"));
+                      tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void vardecl29() { // #9282
-        const char* code = "double f1() noexcept, f2(double) noexcept;";
-        ASSERT_EQUALS("double f1 ( ) noexcept ( true ) ; double f2 ( double ) noexcept ( true ) ;",
-                      tokenizeAndStringify(code));
+        {
+            const char code[] = "double f1() noexcept, f2(double) noexcept;";
+            ASSERT_EQUALS("double f1 ( ) noexcept ( true ) ; double f2 ( double ) noexcept ( true ) ;",
+                          tokenizeAndStringify(code));
+        }
 
-        code = "class C {\n"
-               "    double f1() const noexcept, f2 (double) const noexcept;\n"
-               "};\n";
-        ASSERT_EQUALS("class C {\n"
-                      "double f1 ( ) const noexcept ( true ) ; double f2 ( double ) const noexcept ( true ) ;\n"
-                      "} ;",
-                      tokenizeAndStringify(code));
+        {
+            const char code[] = "class C {\n"
+                                "    double f1() const noexcept, f2 (double) const noexcept;\n"
+                                "};\n";
+            ASSERT_EQUALS("class C {\n"
+                          "double f1 ( ) const noexcept ( true ) ; double f2 ( double ) const noexcept ( true ) ;\n"
+                          "} ;",
+                          tokenizeAndStringify(code));
+        }
     }
 
     void vardecl30() {
         const char code[] = "struct D {} const d;";
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
-                      tokenizeAndStringify(code, true, cppcheck::Platform::Type::Native, "test.cpp"));
+                      tokenizeAndStringify(code));
         ASSERT_EQUALS("struct D { } ; struct D const d ;",
-                      tokenizeAndStringify(code, true, cppcheck::Platform::Type::Native, "test.c"));
+                      tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void vardecl31() {
-        const char code1[] = "void foo() { int (*fptr)() = 0; }";
-        ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( ) ; fptr = 0 ; }", tokenizeAndStringify(code1));
+        {
+            const char code[] = "void foo() { int (*fptr)() = 0; }";
+            ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( ) ; fptr = 0 ; }", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "void foo() { int (*fptr)(int) = 0; }";
+            ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( int ) ; fptr = 0 ; }", tokenizeAndStringify(code));
+        }
+    }
+
+    void vardecl32() {
+        {
+            const char code[] = "static enum { E } f() { return E; }";
+            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; }";
+            ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 * f ( ) { return NULL ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+    }
 
-        const char code2[] = "void foo() { int (*fptr)(int) = 0; }";
-        ASSERT_EQUALS("void foo ( ) { int ( * fptr ) ( int ) ; fptr = 0 ; }", tokenizeAndStringify(code2));
+    void vardecl34() {
+        {
+            const char code[] = "static enum { E } const *f() { return NULL; }";
+            ASSERT_EQUALS("enum Anonymous0 { E } ; static enum Anonymous0 const * f ( ) { return NULL ; }", tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
     }
 
     void volatile_variables() {
@@ -2582,6 +2879,9 @@ class TestTokenizer : public TestFixture {
                 "} ;";
 
             ASSERT_EQUALS(out5, tokenizeAndStringify(in5));
+            ASSERT_EQUALS(
+                "[test.cpp:3:16]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable pos [valueFlowBailoutIncompleteVar]\n",
+                errout_str());
         }
         {
             // Ticket #8679
@@ -2595,15 +2895,15 @@ class TestTokenizer : public TestFixture {
     }
 
     void implicitIntConst() {
-        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("const int x ;", tokenizeAndStringify("const x;", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * x ;", tokenizeAndStringify("const *x;", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void implicitIntExtern() {
-        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("extern int x ;", tokenizeAndStringify("extern x;", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("extern int * x ;", tokenizeAndStringify("extern *x;", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("const int * f ( ) ;", tokenizeAndStringify("const *f();", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     /**
@@ -2831,28 +3131,33 @@ class TestTokenizer : public TestFixture {
         }
         {
             const char code[] = "float complex x;";
-            const char expected[] = "_Complex float x ;";
+            const char expected[] = "float complex x ;";
             ASSERT_EQUALS(expected, tokenizeAndStringify(code));
         }
+        {
+            const char code[] = "float complex x;";
+            const char expected[] = "_Complex float x ;";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
         {
             const char code[] = "complex float x;";
             const char expected[] = "_Complex float x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
             const char code[] = "complex long double x;";
             const char expected[] = "_Complex long double x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
             const char code[] = "long double complex x;";
             const char expected[] = "_Complex long double x ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
         {
             const char code[] = "double complex;";
             const char expected[] = "double complex ;";
-            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
 
@@ -2861,10 +3166,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "class A{\n"
                                 " void f() {}\n"
                                 "};";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // A body {}
             ASSERT_EQUALS(true, tok->linkAt(2) == tok->tokAt(9));
@@ -2878,7 +3181,7 @@ class TestTokenizer : public TestFixture {
             ASSERT_EQUALS(true, tok->linkAt(5) == tok->tokAt(6));
             ASSERT_EQUALS(true, tok->linkAt(6) == tok->tokAt(5));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -2886,10 +3189,8 @@ class TestTokenizer : public TestFixture {
                                 " char a[10];\n"
                                 " char *b ; b = new char[a[0]];\n"
                                 "};";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // a[10]
             ASSERT_EQUALS(true, tok->linkAt(7) == tok->tokAt(9));
@@ -2903,17 +3204,15 @@ class TestTokenizer : public TestFixture {
             ASSERT_EQUALS(true, tok->linkAt(21) == tok->tokAt(23));
             ASSERT_EQUALS(true, tok->linkAt(23) == tok->tokAt(21));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "void f(){\n"
                                 " foo(g());\n"
                                 "};";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // foo(
             ASSERT_EQUALS(true, tok->linkAt(6) == tok->tokAt(10));
@@ -2923,17 +3222,15 @@ class TestTokenizer : public TestFixture {
             ASSERT_EQUALS(true, tok->linkAt(8) == tok->tokAt(9));
             ASSERT_EQUALS(true, tok->linkAt(9) == tok->tokAt(8));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "bool foo(C<z> a, bar<int, x<float>>& f, int b) {\n"
                                 "    return(a<b && b>f);\n"
                                 "}";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             // template<
             ASSERT_EQUALS(true, tok->tokAt(6) == tok->linkAt(4));
@@ -2951,66 +3248,58 @@ class TestTokenizer : public TestFixture {
             ASSERT_EQUALS(true, nullptr == tok->linkAt(28));
             ASSERT_EQUALS(true, nullptr == tok->linkAt(32));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "void foo() {\n"
                                 "    return static_cast<bar>(a);\n"
                                 "}";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             // static_cast<
             ASSERT_EQUALS(true, tok->tokAt(9) == tok->linkAt(7));
             ASSERT_EQUALS(true, tok->tokAt(7) == tok->linkAt(9));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "void foo() {\n"
                                 "    nvwa<(x > y)> ERROR_nnn;\n"
                                 "}";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             // nvwa<(x > y)>
             ASSERT_EQUALS(true, tok->tokAt(12) == tok->linkAt(6));
             ASSERT_EQUALS(true, tok->tokAt(6) == tok->linkAt(12));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             // #4860
             const char code[] = "class A : public B<int> {};";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             // B<..>
             ASSERT_EQUALS(true, tok->tokAt(5) == tok->linkAt(7));
             ASSERT_EQUALS(true, tok->linkAt(5) == tok->tokAt(7));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             // #4860
             const char code[] = "Bar<Typelist< int, Typelist< int, Typelist< int, FooNullType>>>>::set(1, 2, 3);";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->tokAt(1) == tok->linkAt(18));
@@ -3018,16 +3307,14 @@ class TestTokenizer : public TestFixture {
             ASSERT_EQUALS(true, tok->tokAt(7) == tok->linkAt(16));
             ASSERT_EQUALS(true, tok->tokAt(11) == tok->linkAt(15));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             // #5627
             const char code[] = "new Foo<Bar>[10];";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->tokAt(2) == tok->linkAt(4));
@@ -3035,30 +3322,26 @@ class TestTokenizer : public TestFixture {
             ASSERT_EQUALS(true, tok->tokAt(5) == tok->linkAt(7));
             ASSERT_EQUALS(true, tok->tokAt(7) == tok->linkAt(5));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
         {
             // #6242
             const char code[] = "func = integral_<uchar, int, double>;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->tokAt(3) == tok->linkAt(9));
             ASSERT_EQUALS(true, tok->linkAt(3) == tok->tokAt(9));
 
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             // if (a < b || c > d) { }
             const char code[] = "{ if (a < b || c > d); }";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(3) == nullptr);
@@ -3067,10 +3350,8 @@ class TestTokenizer : public TestFixture {
         {
             // bool f = a < b || c > d
             const char code[] = "bool f = a < b || c > d;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(4) == nullptr);
@@ -3079,10 +3360,8 @@ class TestTokenizer : public TestFixture {
         {
             // template
             const char code[] = "a < b || c > d;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(5));
@@ -3091,10 +3370,8 @@ class TestTokenizer : public TestFixture {
         {
             // if (a < ... > d) { }
             const char code[] = "{ if (a < b || c == 3 || d > e); }";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(3) == nullptr);
@@ -3103,10 +3380,8 @@ class TestTokenizer : public TestFixture {
         {
             // template
             const char code[] = "a<b==3 || c> d;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
         }
@@ -3114,20 +3389,16 @@ class TestTokenizer : public TestFixture {
         {
             // template
             const char code[] = "a<b || c==4> d;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *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;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
             ASSERT_EQUALS(true, tok->tokAt(1) == tok->linkAt(7));
@@ -3135,10 +3406,8 @@ class TestTokenizer : public TestFixture {
 
         {
             const char code[] = "struct A : B<c&&d> {};";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(4) == tok->tokAt(8));
             ASSERT_EQUALS(true, tok->tokAt(4) == tok->linkAt(8));
@@ -3146,10 +3415,8 @@ class TestTokenizer : public TestFixture {
 
         {
             const char code[] = "Data<T&&>;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(4));
             ASSERT_EQUALS(true, tok->tokAt(1) == tok->linkAt(4));
@@ -3158,10 +3425,8 @@ class TestTokenizer : public TestFixture {
         {
             // #6601
             const char code[] = "template<class R> struct FuncType<R(&)()> : FuncType<R()> { };";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = tokenizer.tokens();
 
             ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(4)); // <class R>
@@ -3178,10 +3443,8 @@ class TestTokenizer : public TestFixture {
         {
             // #7158
             const char code[] = "enum { value = boost::mpl::at_c<B, C> };";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok = Token::findsimplematch(tokenizer.tokens(), "<");
             ASSERT_EQUALS(true, tok->link() == tok->tokAt(4));
             ASSERT_EQUALS(true, tok->linkAt(4) == tok);
@@ -3192,10 +3455,8 @@ 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";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "struct")->tokAt(2);
             const Token *tok2 = Token::findsimplematch(tokenizer.tokens(), "{")->previous();
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3205,10 +3466,8 @@ class TestTokenizer : public TestFixture {
         {
             // #7975
             const char code[] = "template <class C> X<Y&&Z, C*> copy() {};\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "< Y");
             const Token *tok2 = Token::findsimplematch(tok1, "> copy");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3218,10 +3477,8 @@ class TestTokenizer : public TestFixture {
         {
             // #8006
             const char code[] = "C<int> && a = b;";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = tokenizer.tokens()->next();
             const Token *tok2 = tok1->tokAt(2);
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3231,10 +3488,8 @@ class TestTokenizer : public TestFixture {
         {
             // #8115
             const char code[] = "void Test(C<int> && c);";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "<");
             const Token *tok2 = tok1->tokAt(2);
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3244,30 +3499,25 @@ class TestTokenizer : public TestFixture {
             // #8654
             const char code[] = "template<int N> struct A {}; "
                                 "template<int... Ns> struct foo : A<Ns>... {};";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *A = Token::findsimplematch(tokenizer.tokens(), "A <");
-            ASSERT_EQUALS(true, A->next()->link() == A->tokAt(3));
+            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() {}";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
-            ASSERT_EQUALS(true, Token::simpleMatch(tokenizer.tokens()->next()->link(), "> void"));
+            SimpleTokenizer tokenizer(settings0, *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);";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr == Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
 
@@ -3276,21 +3526,19 @@ class TestTokenizer : public TestFixture {
             const char code[] = "using std::same_as;\n"
                                 "template<same_as<int> T>\n"
                                 "void f();";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token *tok1 = Token::findsimplematch(tokenizer.tokens(), "template <");
             const Token *tok2 = Token ::findsimplematch(tokenizer.tokens(), "same_as <");
-            ASSERT(tok1->next()->link() == tok1->tokAt(7));
-            ASSERT(tok2->next()->link() == tok2->tokAt(3));
+            ASSERT(tok1->linkAt(1) == tok1->tokAt(7));
+            ASSERT(tok2->linkAt(1) == tok2->tokAt(3));
         }
 
         {
             // #9131 - template usage or comparison?
             const char code[] = "using std::list; list<t *> l;";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
 
@@ -3300,9 +3548,8 @@ class TestTokenizer : public TestFixture {
                                 "{\n"
                                 "    for (set<ParticleSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {}\n"
                                 "}";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
         }
 
@@ -3312,9 +3559,8 @@ class TestTokenizer : public TestFixture {
                                 "  a<> b;\n"
                                 "  b.a<>::c();\n"
                                 "}\n";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ::")->link());
         }
 
@@ -3324,9 +3570,8 @@ class TestTokenizer : public TestFixture {
                                 "template <char... b> struct c {\n"
                                 "  void d() { a<b...>[0]; }\n"
                                 "};\n";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> [")->link());
         }
 
@@ -3337,9 +3582,8 @@ 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";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ;")->link());
         }
 
@@ -3352,9 +3596,8 @@ class TestTokenizer : public TestFixture {
                                 "template <int> using c = a;\n"
                                 "template <int d> c<d> e;\n"
                                 "auto f = -e<1> == 0;\n";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ==")->link());
         }
 
@@ -3371,19 +3614,16 @@ class TestTokenizer : public TestFixture {
                                 "constexpr void b<a, d>::operator()(c &&) const {\n"
                                 "  i<3>.f([] {});\n"
                                 "}\n";
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> . f (")->link());
         }
 
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< class");
             const Token* tok2 = Token::findsimplematch(tok1, "> class");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3393,10 +3633,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10491
             const char code[] = "template <template <class> class> struct a;\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< template");
             const Token* tok2 = Token::findsimplematch(tok1, "> struct");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3406,10 +3644,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< QPair");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3419,10 +3655,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10552
             const char code[] = "v.value<QPair<int, int>>()\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *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);
@@ -3432,10 +3666,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10615
             const char code[] = "struct A : public B<__is_constructible()>{};\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< >");
             const Token* tok2 = Token::findsimplematch(tok1, "> { } >");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3445,10 +3677,8 @@ class TestTokenizer : public TestFixture {
         {
             // #10664
             const char code[] = "class C1 : public T1<D2<C2>const> {};\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< C2");
             const Token* tok2 = Token::findsimplematch(tok1, "> const");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3462,10 +3692,8 @@ class TestTokenizer : public TestFixture {
                                 "void f() {\n"
                                 "    if (a<int>[0]) {}\n"
                                 "}\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *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);
@@ -3478,10 +3706,8 @@ class TestTokenizer : public TestFixture {
                                 "    int b[2] = {};\n"
                                 "    if (b[idx<1>]) {}\n"
                                 "}\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< 1");
             const Token* tok2 = Token::findsimplematch(tok1, "> ]");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3492,10 +3718,8 @@ class TestTokenizer : public TestFixture {
             const char code[] = "void f() {\n"
                                 "    []<typename T>() {};\n"
                                 "}\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3506,10 +3730,8 @@ 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";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< A");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
@@ -3522,20 +3744,63 @@ class TestTokenizer : public TestFixture {
                                 "        return [] <typename T> () {};\n"
                                 "    };\n"
                                 "}\n";
-            errout.str("");
-            Tokenizer tokenizer(&settings0, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
             const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< T");
             const Token* tok2 = Token::findsimplematch(tok1, "> (");
             ASSERT_EQUALS(true, tok1->link() == tok2);
             ASSERT_EQUALS(true, tok2->link() == tok1);
         }
+
+        {
+            const char code[] = "struct S {\n" // #11840
+                                "    template<typename T, typename U>\n"
+                                "    void operator() (int);\n"
+                                "};\n"
+                                "void f() {\n"
+                                "    S s;\n"
+                                "    s.operator()<int, int>(1);\n"
+                                "}\n";
+            SimpleTokenizer tokenizer(settings0, *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 T>\n"
+                                "auto f() {\n"
+                                "    return std::integral_constant<\n"
+                                "        bool,\n"
+                                "        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);
+            ASSERT(tokenizer.tokenize(code));
+            const Token* tok1 = Token::findsimplematch(tokenizer.tokens(), "< bool");
+            const Token* tok2 = Token::findsimplematch(tok1, "> (");
+            ASSERT_EQUALS(true, tok1->link() == tok2);
+            ASSERT_EQUALS(true, tok2->link() == tok1);
+        }
+
+        {
+            const char code[] = "double f() {\n"
+                                "    return std::is_same_v<int, double> ? 1e-7 : 1e-3;\n"
+                                "}\n";
+            SimpleTokenizer tokenizer(settings0, *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);
+        }
     }
 
     void simplifyString() {
-        errout.str("");
-        Tokenizer tokenizer(&settings0, this);
+        TokenList tokenlist{settings0, 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\""));
@@ -3593,8 +3858,8 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("void foo ( int i ) { switch ( i ) { case -1 : ; break ; } }",
                       tokenizeAndStringify("void foo (int i) { switch(i) { case -1: break; } }"));
         //ticket #3227
-        ASSERT_EQUALS("void foo ( ) { switch ( n ) { label : ; case 1 : ; label1 : ; label2 : ; break ; } }",
-                      tokenizeAndStringify("void foo(){ switch (n){ label: case 1: label1: label2: break; }}"));
+        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; }}"));
         //ticket #8345
         ASSERT_EQUALS("void foo ( ) { switch ( 0 ) { case 0 : ; default : ; } }",
                       tokenizeAndStringify("void foo () { switch(0) case 0 : default : ; }"));
@@ -3602,42 +3867,46 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("void foo ( ) { enum Anonymous0 : int { Six = 6 } ; return Six ; }",
                       tokenizeAndStringify("void foo () { enum : int { Six = 6 } ; return Six ; }"));
         // ticket #8281
-        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) { "
+                                             "  bool state; "
+                                             "  switch (i) "
+                                             "  while (true) { "
+                                             "     state=false; "
+                                             "   case 1: "
+                                             "      ; "
+                                             "  }"
+                                             "}"));
         // ticket #8417
-        tokenizeAndStringify("void printOwnedAttributes(int mode) { "
-                             "  switch(mode) case 0: { break; } "
-                             "}");
-        ASSERT_THROW(tokenizeAndStringify("void printOwnedAttributes(int mode) { "
-                                          "  switch(mode) case 0: { break; } case 1: ; "
-                                          "}"),
-                     InternalError);
+        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: ; "
+                                                   "}"),
+                              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, cppcheck::Platform::Type::Native, "test.c"));
+                                           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, cppcheck::Platform::Type::Native, "test.c"));
+                                           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, cppcheck::Platform::Type::Native, "test.c"));
+                      tokenizeAndStringify("foo data[100]; something(&foo[0]);", 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]);"));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyFunctionPointers1() {
@@ -3646,7 +3915,7 @@ class TestTokenizer : public TestFixture {
         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];"));
+        ASSERT_EQUALS("void ( * f [ 2 ] ) ( void ) ;", tokenizeAndStringify("typedef void func_t(void); func_t *f[2];")); // #10581
     }
 
     void simplifyFunctionPointers2() {
@@ -3663,12 +3932,15 @@ class TestTokenizer : public TestFixture {
     void simplifyFunctionPointers3() {
         // Related with ticket #2873
         const char code[] = "void f() {\n"
-                            "(void)(xy(*p)(0);)"
+                            "(void)(xy(*p)(0));"
                             "\n}";
         const char expected[] = "void f ( ) {\n"
-                                "( void ) ( xy ( * p ) ( 0 ) ; )\n"
+                                "( void ) ( xy ( * p ) ( 0 ) ) ;\n"
                                 "}";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:2:12]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable p [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void simplifyFunctionPointers4() {
@@ -3758,12 +4030,9 @@ class TestTokenizer : public TestFixture {
                             "void __attribute__((__visibility__(\"default\"))) func6();";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; void func6 ( ) ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3787,12 +4056,9 @@ class TestTokenizer : public TestFixture {
         const char code[] = "extern vas_f *VAS_Fail __attribute__((__noreturn__));";
         const char expected[] = "extern vas_f * VAS_Fail ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
         const Token * VAS_Fail = Token::findsimplematch(tokenizer.tokens(), "VAS_Fail");
@@ -3803,12 +4069,9 @@ class TestTokenizer : public TestFixture {
         const char code[] = "void __attribute__((__noreturn__)) (*func_notret)(void);";
         const char expected[] = "void ( * func_notret ) ( void ) ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
         const Token* func_notret = Token::findsimplematch(tokenizer.tokens(), "func_notret");
@@ -3819,12 +4082,9 @@ class TestTokenizer : public TestFixture {
         const char code[] = "__attribute__((const)) int& foo();";
         const char expected[] = "int & foo ( ) ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
 
         const Token* foo = Token::findsimplematch(tokenizer.tokens(), "foo");
@@ -3835,12 +4095,9 @@ class TestTokenizer : public TestFixture {
         const char code[] = "void __declspec(dllexport) func1();\n";
         const char expected[] = "void func1 ( ) ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3858,12 +4115,9 @@ class TestTokenizer : public TestFixture {
                             "void func5() __attribute__((noreturn));";
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3888,12 +4142,9 @@ class TestTokenizer : public TestFixture {
                             "};";
         const char expected[] = "class foo { public: bool operator== ( const foo & ) ; } ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3914,12 +4165,9 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; "
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3955,12 +4203,9 @@ class TestTokenizer : public TestFixture {
         const char expected[] = "void func1 ( ) ; void func2 ( ) ; void func3 ( ) ; void func4 ( ) ; void func5 ( ) ; "
                                 "void func6 ( ) ; void func7 ( ) ; void func8 ( ) ;";
 
-        errout.str("");
-
         // tokenize..
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         // Expected result..
         ASSERT_EQUALS(expected, tokenizer.tokens()->stringifyList(nullptr, false));
@@ -3984,6 +4229,79 @@ 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(settings0, *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 {};";
+        const char expected[] = "int var { } ;";
+
+        SimpleTokenizer tokenizer(settings0, *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]] {};";
+        const char expected[] = "int var { } ;";
+
+        SimpleTokenizer tokenizer(settings0, *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]];";
+        const char expected[] = "std :: string var ;";
+
+        SimpleTokenizer tokenizer(settings0, *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 cppMaybeUnusedStructuredBinding() {
+        const char code[] = "[[maybe_unused]] auto [var1, var2] = f();";
+        const char expected[] = "auto [ var1 , var2 ] = f ( ) ;";
+
+        SimpleTokenizer tokenizer(settings0, *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 splitTemplateRightAngleBrackets() {
         {
@@ -4003,6 +4321,9 @@ class TestTokenizer : public TestFixture {
                                 "         FFABS ( sprite_delta [ 1 ] [ i ] ) >= INT_MAX >> shift_y ) ;\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",
+                errout_str());
         }
         {
             const char code[] = "struct S { bool vector; };\n"
@@ -4010,33 +4331,33 @@ class TestTokenizer : public TestFixture {
             ASSERT_EQUALS("struct S { bool vector ; } ;\n"
                           "struct T { std :: vector < std :: shared_ptr < int > > v ; } ;",
                           tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
     void cpp03template1() {
         {
-            const char *code = "template<typename> struct extent {};";
+            const char code[] = "template<typename> struct extent {};";
             ASSERT_EQUALS("template < typename > struct extent { } ;", tokenizeAndStringify(code));
         }
         {
-            const char *code = "template<typename> struct extent;";
+            const char code[] = "template<typename> struct extent;";
             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;";
             ASSERT_EQUALS("template < typename , unsigned int = 0 > struct extent ;", tokenizeAndStringify(code));
         }
     }
 
     void cpp0xtemplate1() {
-        const char *code = "template <class T>\n"
-                           "void fn2 (T t = []{return 1;}())\n"
-                           "{}\n"
-                           "int main()\n"
-                           "{\n"
-                           "  fn2<int>();\n"
-                           "}\n";
+        const char code[] = "template <class T>\n"
+                            "void fn2 (T t = []{return 1;}())\n"
+                            "{}\n"
+                            "int main()\n"
+                            "{\n"
+                            "  fn2<int>();\n"
+                            "}\n";
         ASSERT_EQUALS("void fn2<int> ( int t = [ ] { return 1 ; } ( ) ) ;\n"
                       "\n"
                       "int main ( )\n"
@@ -4049,83 +4370,89 @@ class TestTokenizer : public TestFixture {
 
     void cpp0xtemplate2() {
         // tokenize ">>" into "> >"
-        const char *code = "list<list<int>> ints;\n";
+        const char code[] = "list<list<int>> ints;\n";
         ASSERT_EQUALS("list < list < int > > ints ;", tokenizeAndStringify(code));
     }
 
     void cpp0xtemplate3() {
         // #2549
-        const char *code = "template<class T, T t = (T)0>\n"
-                           "struct S\n"
-                           "{};\n"
-                           "S<int> s;\n";
-        ASSERT_EQUALS("struct S<int,(int)0> ;\n"
+        const char code[] = "template<class T, T t = (T)0>\n"
+                            "struct S\n"
+                            "{};\n"
+                            "S<int> s;\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));
     }
 
     void cpp0xtemplate4() { // #6181, #6354, #6414
-        tokenizeAndStringify("class A; "
-                             "template <class T> class Disposer; "
-                             "template <typename T, class D = Disposer<T>> class Shim {}; "
-                             "class B : public Shim<A> {};");
-        tokenizeAndStringify("template <class ELFT> class ELFObjectImage {}; "
-                             "ObjectImage *createObjectImage() { "
-                             "  return new ELFObjectImage<ELFType<little>>(Obj); "
-                             "} "
-                             "void resolveX86_64Relocation() { "
-                             "  reinterpret_cast<int>(0); "
-                             "}");
-        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 {}; "
-                             "}");
+        // #6181
+        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> {};"));
+        // #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); "
+                                   "}");
+        // #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 {}; "
+                                             "}"));
+
+        ignore_errout();
     }
 
     void cpp0xtemplate5() { // #9154
         {
-            const char *code = "struct s<x<u...>>;";
+            const char code[] = "struct s<x<u...>>;";
             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...>>;";
             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...>> { };";
             ASSERT_EQUALS("struct s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
         {
-            const char *code = "struct q : s<x<u...>> { };";
+            const char code[] = "struct q : s<x<u...>> { };";
             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...>> { };";
             ASSERT_EQUALS("struct q : private s < x < u ... > > { } ;",
                           tokenizeAndStringify(code));
         }
     }
 
     void cpp14template() { // Ticket #6708
-        tokenizeAndStringify("template <typename T> "
-                             "decltype(auto) forward(T& t) { return 0; }");
+        (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 arraySize() {
@@ -4135,6 +4462,9 @@ class TestTokenizer : public TestFixture {
         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(
+            "[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 };"));
@@ -4142,6 +4472,11 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("; const char c [ 4 ] = \"abc\" ;", tokenizeAndStringify(";const char c[] = { \"abc\" };"));
     }
 
+    void arraySizeAfterValueFlow() {
+        const char code[] = "enum {X=10}; int a[] = {[X]=1};";
+        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; }"));
         //ticket #3176
@@ -4162,153 +4497,155 @@ class TestTokenizer : public TestFixture {
         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;} }"));
         //with unhandled MACRO() code
-        ASSERT_THROW(tokenizeAndStringify("void f() { MACRO(ab: b=0;, foo)}"), InternalError);
+        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;})}"));
+
+        ignore_errout();
     }
 
     void simplifyInitVar() {
         {
             const char code[] = "int i ; int p(0);";
-            ASSERT_EQUALS("int i ; int p ; p = 0 ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("int i ; int p ( 0 ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int i; int *p(0);";
-            ASSERT_EQUALS("int i ; int * p ; p = 0 ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("int i ; int * p ( 0 ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int p(0);";
-            ASSERT_EQUALS("int p ; p = 0 ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("int p ( 0 ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int *p(0);";
-            ASSERT_EQUALS("int * p ; p = 0 ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("int * p ( 0 ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int i ; int p(i);";
-            ASSERT_EQUALS("int i ; int p ; p = i ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("int i ; int p ( i ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int i; int *p(&i);";
-            ASSERT_EQUALS("int i ; int * p ; p = & i ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("int i ; int * p ( & i ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int i; void *p(&i);";
-            ASSERT_EQUALS("int i ; void * p ; p = & i ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            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);";
-            ASSERT_EQUALS("struct S { } ; struct S s ; struct S * p ; p = & s ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            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);";
-            ASSERT_EQUALS("struct S { } ; S s ; S * p ; p = & s ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            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);";
-            ASSERT_EQUALS("union S { int i ; float f ; } ; union S s ; union S * p ; p = & s ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            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);";
-            ASSERT_EQUALS("union S { int i ; float f ; } ; S s ; S * p ; p = & s ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            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);";
-            ASSERT_EQUALS("class C { } ; class C c ; class C * p ; p = & c ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            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);";
-            ASSERT_EQUALS("class C { } ; C c ; C * p ; p = & c ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            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);";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S s1 ( s ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "struct S { }; S s; S s1(s);";
             ASSERT_EQUALS("struct S { } ; S s ; S s1 ( s ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "struct S { }; struct S s; struct S s1(&s);";
             ASSERT_EQUALS("struct S { } ; struct S s ; struct S s1 ( & s ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "struct S { }; S s; S s1(&s);";
             ASSERT_EQUALS("struct S { } ; S s ; S s1 ( & s ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "class S { int function(); };";
             ASSERT_EQUALS("class S { int function ( ) ; } ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "class S { int function(void); };";
             ASSERT_EQUALS("class S { int function ( ) ; } ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "class S { int function(int); };";
             ASSERT_EQUALS("class S { int function ( int ) ; } ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int function(void);";
             ASSERT_EQUALS("int function ( ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int function(int);";
             ASSERT_EQUALS("int function ( int ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "extern int function(void);";
             ASSERT_EQUALS("extern int function ( ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int function1(void); int function2(void);";
             ASSERT_EQUALS("int function1 ( ) ; int function2 ( ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
@@ -4316,37 +4653,45 @@ class TestTokenizer : public TestFixture {
             // 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));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int i; int function(A);";
             ASSERT_EQUALS("int i ; int function ( A ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "class A { } ; int foo(A);";
             ASSERT_EQUALS("class A { } ; int foo ( A ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "class A { } ; A a; int foo(a);";
-            ASSERT_EQUALS("class A { } ; A a ; int foo ; foo = a ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("class A { } ; A a ; int foo ( a ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "int x(f());";
-            ASSERT_EQUALS("int x ; x = f ( ) ;", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("int x ( f ( ) ) ;", tokenizeAndStringify(code));
+            ASSERT_EQUALS("", errout_str());
         }
 
         {
             const char code[] = "{ return doSomething(X), 0; }";
             ASSERT_EQUALS("{ return doSomething ( X ) , 0 ; }", tokenizeAndStringify(code));
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
+        }
+
+        {
+            // 13893
+            const char code[] = "namespace test { bool foo; }";
+            SimpleTokenizer tokenizer(settings0, *this);
+            ASSERT(tokenizer.tokenize(code));
+            ASSERT(!tokenizer.tokens()->tokAt(2)->isInitBracket());
         }
     }
 
@@ -4356,7 +4701,7 @@ class TestTokenizer : public TestFixture {
                             "    unsigned int a(0),b(0);\n"
                             "}";
         ASSERT_EQUALS("void f ( ) {\n"
-                      "unsigned int a ; a = 0 ; unsigned int b ; b = 0 ;\n"
+                      "unsigned int a ( 0 ) ; unsigned int b ( 0 ) ;\n"
                       "}", tokenizeAndStringify(code));
     }
 
@@ -4365,10 +4710,24 @@ class TestTokenizer : public TestFixture {
                             "    int *a(0),b(0);\n"
                             "}";
         ASSERT_EQUALS("void f ( ) {\n"
-                      "int * a ; a = 0 ; int b ; b = 0 ;\n"
+                      "int * a ( 0 ) ; int b ( 0 ) ;\n"
+                      "}", tokenizeAndStringify(code));
+    }
+
+    void simplifyInitVar4() {
+        const char code[] = "void f() {\n"
+                            "    uint32_t x{0};\n"
+                            "}";
+        ASSERT_EQUALS("void f ( ) {\n"
+                      "uint32_t x { 0 } ;\n"
                       "}", tokenizeAndStringify(code));
     }
 
+    void simplifyInitVar5() { // #14218
+        const char code[] = "int c[1]{}, b;";
+        ASSERT_EQUALS("int c [ 1 ] { } ; int b ;", tokenizeAndStringify(code));
+    }
+
     void bitfields1() {
         const char code1[] = "struct A { bool x : 1; };";
         ASSERT_EQUALS("struct A { bool x ; } ;", tokenizeAndStringify(code1));
@@ -4386,16 +4745,16 @@ class TestTokenizer : public TestFixture {
         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, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { char x ; } ;", tokenizeAndStringifyWindows(code6, Platform::Type::Win32A));
 
         const char code7[] = "struct A { __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringifyWindows(code7, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { short x ; } ;", tokenizeAndStringifyWindows(code7, Platform::Type::Win32A));
 
         const char code8[] = "struct A { __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringifyWindows(code8, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { int x ; } ;", tokenizeAndStringifyWindows(code8, Platform::Type::Win32A));
 
         const char code9[] = "struct A { __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringifyWindows(code9, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { long long x ; } ;", tokenizeAndStringifyWindows(code9, Platform::Type::Win32A));
 
         const char code10[] = "struct A { unsigned char x : 3; };";
         ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringify(code10));
@@ -4410,16 +4769,16 @@ class TestTokenizer : public TestFixture {
         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, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { unsigned char x ; } ;", tokenizeAndStringifyWindows(code14, Platform::Type::Win32A));
 
         const char code15[] = "struct A { unsigned __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringifyWindows(code15, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { unsigned short x ; } ;", tokenizeAndStringifyWindows(code15, Platform::Type::Win32A));
 
         const char code16[] = "struct A { unsigned __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringifyWindows(code16, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { unsigned int x ; } ;", tokenizeAndStringifyWindows(code16, Platform::Type::Win32A));
 
         const char code17[] = "struct A { unsigned __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringifyWindows(code17, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { unsigned long long x ; } ;", tokenizeAndStringifyWindows(code17, Platform::Type::Win32A));
 
         const char code18[] = "struct A { signed char x : 3; };";
         ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringify(code18));
@@ -4434,16 +4793,16 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("struct A { signed long x ; } ;", tokenizeAndStringifyWindows(code21));
 
         const char code22[] = "struct A { signed __int8 x : 3; };";
-        ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringifyWindows(code22, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { signed char x ; } ;", tokenizeAndStringifyWindows(code22, Platform::Type::Win32A));
 
         const char code23[] = "struct A { signed __int16 x : 3; };";
-        ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringifyWindows(code23, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { signed short x ; } ;", tokenizeAndStringifyWindows(code23, Platform::Type::Win32A));
 
         const char code24[] = "struct A { signed __int32 x : 3; };";
-        ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringifyWindows(code24, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { signed int x ; } ;", tokenizeAndStringifyWindows(code24, Platform::Type::Win32A));
 
         const char code25[] = "struct A { signed __int64 x : 3; };";
-        ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringifyWindows(code25, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("struct A { signed long long x ; } ;", tokenizeAndStringifyWindows(code25, Platform::Type::Win32A));
     }
 
     void bitfields2() {
@@ -4517,7 +4876,7 @@ class TestTokenizer : public TestFixture {
         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));
+        ASSERT_EQUALS("struct A { int a ; int anonymous@0 ; int c ; } ;", tokenizeAndStringify(code2));
 
         const char code3[] = "struct A { virtual void f() {} int f1 : 1; };";
         ASSERT_EQUALS("struct A { virtual void f ( ) { } int f1 ; } ;", tokenizeAndStringify(code3));
@@ -4531,7 +4890,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("struct A { bool b ; bool c ; } ;", tokenizeAndStringify(code2));
 
         const char code3[] = "struct A { bool : true; };";
-        ASSERT_EQUALS("struct A { } ;", tokenizeAndStringify(code3));
+        ASSERT_EQUALS("struct A { bool anonymous@0 ; } ;", tokenizeAndStringify(code3));
     }
 
     void bitfields7() { // ticket #1987
@@ -4542,7 +4901,7 @@ class TestTokenizer : public TestFixture {
                                 "unsigned int element_size ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void bitfields8() {
@@ -4557,7 +4916,7 @@ class TestTokenizer : public TestFixture {
                                 "int f ( ) ; "
                                 "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void bitfields9() { // ticket #2706
@@ -4568,8 +4927,8 @@ class TestTokenizer : public TestFixture {
                             "        ;\n"
                             "    }\n"
                             "};";
-        tokenizeAndStringify(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tokenizeAndStringify(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void bitfields10() { // ticket #2737
@@ -4582,7 +4941,7 @@ class TestTokenizer : public TestFixture {
 
     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)
@@ -4602,107 +4961,200 @@ class TestTokenizer : public TestFixture {
                       tokenizeAndStringify("struct AB {\n"
                                            "  enum Foo {A,B} foo : 4;\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; };";
 
-        errout.str("");
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT(tokenizer.tokenize(code));
         const Token *x = Token::findsimplematch(tokenizer.tokens(), "x");
         ASSERT_EQUALS(1, x->bits());
     }
 
-    void simplifyNamespaceStd() {
-        const char *code, *expected;
-
-        code = "map<foo, bar> m;"; // namespace std is not used
-        ASSERT_EQUALS("map < foo , bar > m ;", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "map<foo, bar> m;";
-        ASSERT_EQUALS("std :: map < foo , bar > m ;", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "string s;";
-        ASSERT_EQUALS("std :: string s ;", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "void foo() {swap(a, b); }";
-        ASSERT_EQUALS("void foo ( ) { std :: swap ( a , b ) ; }", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "void search() {}";
-        ASSERT_EQUALS("void search ( ) { }", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "void search();\n"
-               "void dostuff() { search(); }";
-        ASSERT_EQUALS("void search ( ) ;\nvoid dostuff ( ) { search ( ) ; }", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "void foo() {map(a, b); }"; // That's obviously not std::map<>
-        ASSERT_EQUALS("void foo ( ) { map ( a , b ) ; }", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "string<wchar_t> s;"; // That's obviously not std::string
-        TODO_ASSERT_EQUALS("string < wchar_t > s ;", "std :: string < wchar_t > s ;", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "swap s;"; // That's obviously not std::swap
-        ASSERT_EQUALS("swap s ;", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "std::string s;";
-        ASSERT_EQUALS("std :: string s ;", tokenizeAndStringify(code));
-
-        // #4042 (Do not add 'std ::' to variables)
-        code = "using namespace std;\n"
-               "const char * string = \"Hi\";";
-        ASSERT_EQUALS("const char * string ; string = \"Hi\" ;", tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "string f(const char * string) {\n"
-               "    cout << string << endl;\n"
-               "    return string;\n"
-               "}";
-        expected = "std :: string f ( const char * string ) {\n"
-                   "std :: cout << string << std :: endl ;\n"
-                   "return string ;\n"
-                   "}";
-        TODO_ASSERT_EQUALS(expected,
-                           "std :: string f ( const char * string ) {\n"
-                           "cout << string << endl ;\n"
-                           "return string ;\n"
-                           "}",
-                           tokenizeAndStringify(code));
-
-        code = "using namespace std;\n"
-               "void f() {\n"
-               "  try { }\n"
-               "  catch(std::exception &exception) { }\n"
-               "}";
-        expected = "void f ( ) {\n"
-                   "try { }\n"
-                   "catch ( std :: exception & exception ) { }\n"
-                   "}";
+    void bitfields17() {
+        const char code[] = "struct S {\n" // #13722
+                            "    volatile uint32_t a : 10;\n"
+                            "    volatile uint32_t   : 6;\n"
+                            "    volatile uint32_t b : 10;\n"
+                            "    volatile uint32_t   : 6;\n"
+                            "};\n";
+        const char expected[] = "struct S {\n"
+                                "volatile uint32_t a ;\n"
+                                "volatile uint32_t anonymous@0 ;\n"
+                                "volatile uint32_t b ;\n"
+                                "volatile uint32_t anonymous@1 ;\n"
+                                "} ;";
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
 
-        // #5773 (Don't prepend 'std ::' to function definitions)
-        code = "using namespace std;\n"
-               "class C {\n"
-               "    void search() {}\n"
-               "    void search() const {}\n"
-               "    void search() THROW_MACRO {}\n"
-               "};";
-        expected = "class C {\n"
-                   "void search ( ) { }\n"
-                   "void search ( ) const { }\n"
-                   "void search ( ) { }\n"
-                   "} ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        const char code2[] = "struct S {\n"
+                             "    const volatile uint32_t a : 10;\n"
+                             "    const volatile uint32_t   : 6;\n"
+                             "};\n";
+        const char expected2[] = "struct S {\n"
+                                 "const volatile uint32_t a ;\n"
+                                 "const volatile uint32_t anonymous@0 ;\n"
+                                 "} ;";
+        ASSERT_EQUALS(expected2, tokenizeAndStringify(code2));
+    }
+
+    void bitfields18() {
+        const char code[] = "struct S { unsigned int a : 100000; };";
+        (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; };";
+        ASSERT_EQUALS("struct S { volatile std :: uint32_t a ; } ;", tokenizeAndStringify(code));
+    }
+
+    void bitfields20() {
+        const char code[] = "struct S { volatile ::uint32_t a : 10; };";
+        ASSERT_EQUALS("struct S { volatile :: uint32_t a ; } ;", tokenizeAndStringify(code));
+    }
+
+    void bitfields21() {
+        const char code[] = "struct S { uint32_t a : 1, b : 1; };";
+        SimpleTokenizer tokenizer(settings0, *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
+            ASSERT_EQUALS("map < foo , bar > m ;", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "map<foo, bar> m;";
+            ASSERT_EQUALS("std :: map < foo , bar > m ;", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "string s;";
+            ASSERT_EQUALS("std :: string s ;", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "void foo() {swap(a, b); }";
+            ASSERT_EQUALS("void foo ( ) { std :: swap ( a , b ) ; }", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "void search() {}";
+            ASSERT_EQUALS("void search ( ) { }", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "void search();\n"
+                                "void dostuff() { search(); }";
+            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<>
+            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
+            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
+            ASSERT_EQUALS("swap s ;", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "std::string s;";
+            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\";";
+            ASSERT_EQUALS("const char * string ; string = \"Hi\" ;", tokenizeAndStringify(code));
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "string f(const char * string) {\n"
+                                "    cout << string << endl;\n"
+                                "    return string;\n"
+                                "}";
+            expected = "std :: string f ( const char * string ) {\n"
+                       "std :: cout << string << std :: endl ;\n"
+                       "return string ;\n"
+                       "}";
+            TODO_ASSERT_EQUALS(expected,
+                               "std :: string f ( const char * string ) {\n"
+                               "cout << string << endl ;\n"
+                               "return string ;\n"
+                               "}",
+                               tokenizeAndStringify(code));
+            ASSERT_EQUALS(
+                "[test.cpp:3:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable cout [valueFlowBailoutIncompleteVar]\n",
+                errout_str());
+        }
+
+        {
+            const char code[] = "using namespace std;\n"
+                                "void f() {\n"
+                                "  try { }\n"
+                                "  catch(std::exception &exception) { }\n"
+                                "}";
+            expected = "void f ( ) {\n"
+                       "try { }\n"
+                       "catch ( std :: exception & exception ) { }\n"
+                       "}";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        }
+
+        { // #5773 (Don't prepend 'std ::' to function definitions)
+            const char code[] = "using namespace std;\n"
+                                "class C {\n"
+                                "    void search() {}\n"
+                                "    void search() const {}\n"
+                                "    void search() THROW_MACRO {}\n"
+                                "};";
+            expected = "class C {\n"
+                       "void search ( ) { }\n"
+                       "void search ( ) const { }\n"
+                       "void search ( ) { }\n"
+                       "} ;";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        }
 
         // Ticket #8091
         ASSERT_EQUALS("enum Anonymous0 { string } ;",
@@ -4733,114 +5185,120 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_NO_THROW(tokenizeAndStringify("NS_BEGIN(IMAGEIO_2D_DICOM) using namespace std; NS_END")); // #11045
 
-        code = "using namespace std;\n"
-               "void f(const unique_ptr<int>& p) {\n"
-               "    if (!p)\n"
-               "        throw runtime_error(\"abc\");\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));
-
-        code = "using namespace std;\n" // #8454
-               "void f() { string str = to_string(1); }\n";
-        expected = "void f ( ) { std :: string str ; str = std :: to_string ( 1 ) ; }";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        {
+            const char code[] = "using namespace std;\n"
+                                "void f(const unique_ptr<int>& p) {\n"
+                                "    if (!p)\n"
+                                "        throw runtime_error(\"abc\");\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));
+        }
+
+        {
+            const char code[] = "using namespace std;\n" // #8454
+                                "void f() { string str = to_string(1); }\n";
+            expected = "void f ( ) { std :: string str ; str = std :: to_string ( 1 ) ; }";
+            ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        }
 
-        code = "using namespace std;\n"
-               "vector<int>&& f(vector<int>& v) {\n"
-               "    v.push_back(1);\n"
-               "    return move(v);\n"
-               "}\n";
-        expected = "std :: vector < int > && f ( std :: vector < int > & v ) {\n"
-                   "v . push_back ( 1 ) ;\n"
-                   "return std :: move ( v ) ;\n"
-                   "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringify(code));
+        {
+            const char code[] = "using namespace std;\n"
+                                "vector<int>&& f(vector<int>& v) {\n"
+                                "    v.push_back(1);\n"
+                                "    return move(v);\n"
+                                "}\n";
+            expected = "std :: vector < int > && f ( std :: vector < int > & v ) {\n"
+                       "v . push_back ( 1 ) ;\n"
+                       "return std :: move ( v ) ;\n"
+                       "}";
+            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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1a,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1b,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcpy ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code1c,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2a,dinit(TokenizeOptions, $.platform = 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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2b,dinit(TokenizeOptions, $.platform = 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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 255 , sizeof ( a ) ) ; }", tokenizeAndStringify(code2c,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3a,dinit(TokenizeOptions, $.platform = 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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memmove ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code3b,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4a,dinit(TokenizeOptions, $.platform = 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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4b,dinit(TokenizeOptions, $.platform = 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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4c,dinit(TokenizeOptions, $.platform = 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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; memset ( a , 0 , sizeof ( a ) ) ; }", tokenizeAndStringify(code4d,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { int a [ 10 ] ; int b [ 10 ] ; memcmp ( a , b , sizeof ( a ) ) ; }", tokenizeAndStringify(code5,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 0 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code6,dinit(TokenizeOptions, $.platform = Platform::Type::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,cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 255 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code7,dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
     }
 
     void microsoftString() {
         const char code1a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test1\" ) ; }", tokenizeAndStringify(code1a, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test1\" ) ; }", tokenizeAndStringify(code1a, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
         const char code1b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test2\" ) ; }", tokenizeAndStringify(code1b, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test2\" ) ; }", tokenizeAndStringify(code1b, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
         const char code1c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
-        ASSERT_EQUALS("void foo ( ) { printf ( \"test3\" ) ; }", tokenizeAndStringify(code1c, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test3\" ) ; }", tokenizeAndStringify(code1c, dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
 
         const char code2a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, true, cppcheck::Platform::Type::Win32W));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, true, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, dinit(TokenizeOptions, $.platform = Platform::Type::Win32W)));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, dinit(TokenizeOptions, $.platform = Platform::Type::Win64)));
         const char code2b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, true, cppcheck::Platform::Type::Win32W));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, true, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, dinit(TokenizeOptions, $.platform = Platform::Type::Win32W)));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, dinit(TokenizeOptions, $.platform = Platform::Type::Win64)));
         const char code2c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, true, cppcheck::Platform::Type::Win32W));
-        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, true, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, dinit(TokenizeOptions, $.platform = Platform::Type::Win32W)));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, dinit(TokenizeOptions, $.platform = Platform::Type::Win64)));
     }
 
     void borland() {
         // __closure
         ASSERT_EQUALS("int ( * a ) ( ) ;",  // TODO VarId
-                      tokenizeAndStringify("int (__closure *a)();", true, cppcheck::Platform::Type::Win32A));
+                      tokenizeAndStringify("int (__closure *a)();", dinit(TokenizeOptions, $.platform = Platform::Type::Win32A)));
 
         // __property
         ASSERT_EQUALS("class Fred { ; __property ; } ;",
-                      tokenizeAndStringify("class Fred { __property int x = { } };", true, cppcheck::Platform::Type::Win32A));
+                      tokenizeAndStringify("class Fred { __property int x = { } };", dinit(TokenizeOptions, $.platform = Platform::Type::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(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL"), 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;"));
@@ -4849,49 +5307,49 @@ class TestTokenizer : public TestFixture {
         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__;"));
 
-        ASSERT_THROW(tokenizeAndStringify("int f(){ __CPPCHECK_EMBEDDED_SQL_EXEC__ SQL } int a;"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL int f(){"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("__CPPCHECK_EMBEDDED_SQL_EXEC__ SQL END-__CPPCHECK_EMBEDDED_SQL_EXEC__ int a;"), InternalError);
+        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;"));
     }
 
     void simplifyCAlternativeTokens() {
-        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void or ( ) ;", tokenizeAndStringify("void or(void);", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a && b ) { ; } }", tokenizeAndStringify("void f() { if (a and b); }"));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a || b ) { ; } }", tokenizeAndStringify("void f() { if (a or b); }"));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a & b ) { ; } }", tokenizeAndStringify("void f() { if (a bitand b); }"));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a | b ) { ; } }", tokenizeAndStringify("void f() { if (a bitor b); }"));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a ^ b ) { ; } }", tokenizeAndStringify("void f() { if (a xor b); }"));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ~ b ) { ; } }", tokenizeAndStringify("void f() { if (compl b); }"));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { ; } }", tokenizeAndStringify("void f() { if (not b); }"));
+        ASSERT_EQUALS("void f ( ) const { if ( ! b ) { ; } }", tokenizeAndStringify("void f() const { if (not b); }"));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( a != b ) { ; } }", tokenizeAndStringify("void f() { if (a not_eq b); }"));
         // #6201
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", true, cppcheck::Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! c || ! memcmp ( a , b , s ) ) { ; } }", tokenizeAndStringify("void f() { if (!c or !memcmp(a, b, s)); }"));
         // #6029
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", true, cppcheck::Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( ! b ) { } }", tokenizeAndStringify("void f() { if (not b){} }"));
         // #6207
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, cppcheck::Platform::Type::Native, "test.c"));
-        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", true, cppcheck::Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }", dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS("void f ( ) { if ( not = x ) { } }", tokenizeAndStringify("void f() { if (not=x){} }"));
         // #8029
-        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }", true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("void f ( struct S * s ) { x = s . and + 1 ; }", tokenizeAndStringify("void f(struct S *s) { x = s->and + 1; }", dinit(TokenizeOptions, $.cpp = false)));
         // #8745
         ASSERT_EQUALS("void f ( ) { if ( x ) { or = 0 ; } }", tokenizeAndStringify("void f() { if (x) or = 0; }"));
         // #9324
         ASSERT_EQUALS("void f ( const char * str ) { while ( * str == '!' || * str == '[' ) { } }",
                       tokenizeAndStringify("void f(const char *str) { while (*str=='!' or *str=='['){} }"));
         // #9920
-        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';", true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("result = ch != s . end ( ) && * ch == ':' ;", tokenizeAndStringify("result = ch != s.end() and *ch == ':';", dinit(TokenizeOptions, $.cpp = false)));
 
         // #8975
         ASSERT_EQUALS("void foo ( ) {\n"
@@ -4902,14 +5360,29 @@ class TestTokenizer : public TestFixture {
                           "void foo() {\n"
                           "  char *or;\n"
                           "  while ((*or != 0) && (*or != '|')) or++;\n"
-                          "}", true, cppcheck::Platform::Type::Native, "test.c"));
+                          "}", dinit(TokenizeOptions, $.cpp = false)));
         // #10013
-        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }", true, cppcheck::Platform::Type::Native, "test.cpp"));
+        ASSERT_EQUALS("void f ( ) { x = ! 123 ; }", tokenizeAndStringify("void f() { x = not 123; }"));
+
+        { // #12476
+            const char code[] = "struct S { int a, b; };"
+                                "void f(struct S* compl) {"
+                                "    compl->a = compl->b;"
+                                "}";
+            const char exp[] = "struct S { int a ; int b ; } ; void f ( struct S * compl ) { compl . a = compl . b ; }";
+            ASSERT_EQUALS(exp, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
+
+        //ASSERT_EQUALS("", filter_valueflow(errout_str()));
+        ignore_errout();
     }
 
-    void simplifyRoundCurlyParentheses() {
+    void simplifyCompoundStatements() {
         ASSERT_EQUALS("; x = 123 ;", tokenizeAndStringify(";x=({123;});"));
         ASSERT_EQUALS("; x = y ;", tokenizeAndStringify(";x=({y;});"));
+        // #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; });); }"));
     }
 
     void simplifyOperatorName1() {
@@ -4926,7 +5399,7 @@ class TestTokenizer : public TestFixture {
                               "operator ( ) ; "
                               "}";
 
-        ASSERT_EQUALS(result, tokenizeAndStringify(code, /*expand=*/ true, /*platform=*/ cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS(result, tokenizeAndStringify(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void simplifyOperatorName2() {
@@ -4950,7 +5423,7 @@ class TestTokenizer : public TestFixture {
         const char code[] = "void f() {"
                             "static_cast<ScToken*>(xResult.operator->())->GetMatrix();"
                             "}";
-        const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator. ( ) ) . GetMatrix ( ) ; }";
+        const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator-> ( ) ) . GetMatrix ( ) ; }";
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
     }
 
@@ -5022,29 +5495,6 @@ class TestTokenizer : public TestFixture {
         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\noperatorT ( & ( ) ) [ 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 simplifyOperatorName10() { // #8746
         const char code1[] = "using a::operator=;";
         ASSERT_EQUALS("using a :: operator= ;", tokenizeAndStringify(code1));
@@ -5056,18 +5506,23 @@ class TestTokenizer : public TestFixture {
     void simplifyOperatorName11() { // #8889
         const char code[] = "auto operator = (const Fred & other) -> Fred & ;";
         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 & { }";
         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+ >) {}";
         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>) {}";
         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> >) {}";
         ASSERT_EQUALS("template < typename T > void g ( S < & T :: operator- < double > > ) { }", tokenizeAndStringify(code4));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void simplifyOperatorName12() { // #9110
@@ -5234,6 +5689,9 @@ class TestTokenizer : public TestFixture {
                       "return RSLNotEqual ; "
                       "}",
                       tokenizeAndStringify(code));
+        ASSERT_EQUALS(
+            "[test.cpp:1:116]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable RSLEqual [valueFlowBailoutIncompleteVar]\n",
+            filter_valueflow(errout_str()));
     }
 
     void simplifyOperatorName23() {
@@ -5247,6 +5705,7 @@ class TestTokenizer : public TestFixture {
                           "return & ( this . Element [ i ] [ 0 ] ) ; "
                           "}",
                           tokenizeAndStringify(code));
+            ignore_errout();
         }
         {
             const char code[] = "double *vtkMatrix3x3::operator,(const unsigned int i) {"
@@ -5258,6 +5717,7 @@ class TestTokenizer : public TestFixture {
                           "return & ( this . Element [ i ] [ 0 ] ) ; "
                           "}",
                           tokenizeAndStringify(code));
+            ignore_errout();
         }
     }
 
@@ -5286,6 +5746,7 @@ class TestTokenizer : public TestFixture {
                             "}";
         ASSERT_EQUALS("void foo ( ) { x = y . operator* ( ) . z [ 123 ] ; }",
                       tokenizeAndStringify(code));
+        ignore_errout();
     }
 
     void simplifyOperatorName27() {
@@ -5302,6 +5763,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("template < class ... Ts > struct overloaded : Ts ... { using Ts :: operator ( ) ... ; } ;\n"
                       "int main ( ) { }",
                       tokenizeAndStringify(code));
+        ASSERT_EQUALS("[test.cpp:1:61]: (debug) simplifyOperatorName: found unsimplified operator name [debug]\n", errout_str());
     }
 
     void simplifyOperatorName29() {
@@ -5309,6 +5771,43 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("auto operator<=> ( ) ;", tokenizeAndStringify("auto operator<=>();", 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"
+                            "};";
+        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() {
         const char code[] = "struct S { void operator()(int); };\n"
                             "\n"
@@ -5361,13 +5860,13 @@ class TestTokenizer : public TestFixture {
         // 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_EQUALS("namespace { int a ; }", tokenizeAndStringify("ABA() namespace { int a ; }"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("ABA() namespace { int a ; }"), UNKNOWN_MACRO);
 
         // #3750
-        ASSERT_THROW(tokenizeAndStringify("; AB(foo*) foo::foo() { }"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("; AB(foo*) foo::foo() { }"), UNKNOWN_MACRO);
 
         // #4834 - syntax error
-        ASSERT_THROW(tokenizeAndStringify("A(B) foo() {}"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("A(B) foo() {}"), UNKNOWN_MACRO);
 
         // #3855
         ASSERT_EQUALS("; class foo { }",
@@ -5381,14 +5880,14 @@ class TestTokenizer : public TestFixture {
                                              "  int x;\n"
                                              "};"));
 
-        ASSERT_THROW(tokenizeAndStringify("MACRO(test) void test() { }"), InternalError); // #7931
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("MACRO(test) void test() { }"), UNKNOWN_MACRO); // #7931
 
-        ASSERT_THROW(tokenizeAndStringify("BEGIN_MESSAGE_MAP(CSetProgsAdvDlg, CResizableStandAloneDialog)\n"
-                                          "    ON_BN_CLICKED(IDC_ADDTOOL, OnBnClickedAddtool)\n"
-                                          "END_MESSAGE_MAP()\n"
-                                          "\n"
-                                          "BOOL CSetProgsAdvDlg::OnInitDialog() {}"),
-                     InternalError);
+        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() {}"),
+                              UNKNOWN_MACRO);
 
         ASSERT_EQUALS("struct S {\n"
                       "S ( ) : p { new ( malloc ( 4 ) ) int { } } { }\n"
@@ -5575,10 +6074,10 @@ class TestTokenizer : public TestFixture {
                                 "float * ptrToFloat ;";
 
         // These types should be defined the same on all Windows platforms
-        const std::string win32A = tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32A);
+        const std::string win32A = tokenizeAndStringifyWindows(code, Platform::Type::Win32A);
         ASSERT_EQUALS(expected, win32A);
-        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32W));
-        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win64));
+        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
+        ASSERT_EQUALS(win32A, tokenizeAndStringifyWindows(code, Platform::Type::Win64));
     }
 
     void platformWin32A() {
@@ -5595,7 +6094,7 @@ class TestTokenizer : public TestFixture {
                             "    _tcscpy(dst, src);"
                             "    dst[0] = 0;"
                             "    _tcscat(dst, src);"
-                            "    LPTSTR d = _tcsdup(str);"
+                            "    LPTSTR d = _tcsdup(src);"
                             "    _tprintf(_T(\"Hello world!\"));"
                             "    _stprintf(dst, _T(\"Hello!\"));"
                             "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));"
@@ -5616,7 +6115,7 @@ class TestTokenizer : public TestFixture {
                                 "strcpy ( dst , src ) ; "
                                 "dst [ 0 ] = 0 ; "
                                 "strcat ( dst , src ) ; "
-                                "char * d ; d = strdup ( str ) ; "
+                                "char * d ; d = strdup ( src ) ; "
                                 "printf ( \"Hello world!\" ) ; "
                                 "sprintf ( dst , \"Hello!\" ) ; "
                                 "_snprintf ( dst , sizeof ( dst ) / sizeof ( char ) , \"Hello world!\" ) ; "
@@ -5624,7 +6123,13 @@ class TestTokenizer : public TestFixture {
                                 "sscanf ( dst , \"%s\" , dst ) ; "
                                 "} "
                                 "unsigned char tbyte ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32A));
+
+        const char code2[] = "LPCTSTR f(void* p) { return LPCTSTR(p); }\n" // #11430
+                             "LPCTSTR g() { return LPCTSTR{}; }";
+        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, Platform::Type::Win32A));
     }
 
     void platformWin32W() {
@@ -5642,7 +6147,7 @@ class TestTokenizer : public TestFixture {
                             "    _tcscpy(dst, src);"
                             "    dst[0] = 0;"
                             "    _tcscat(dst, src);"
-                            "    LPTSTR d = _tcsdup(str);"
+                            "    LPTSTR d = _tcsdup(src);"
                             "    _tprintf(_T(\"Hello world!\"));"
                             "    _stprintf(dst, _T(\"Hello!\"));"
                             "    _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\"));"
@@ -5663,36 +6168,36 @@ class TestTokenizer : public TestFixture {
                                 "wcscpy ( dst , src ) ; "
                                 "dst [ 0 ] = 0 ; "
                                 "wcscat ( dst , src ) ; "
-                                "wchar_t * d ; d = wcsdup ( str ) ; "
+                                "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 ) ; "
                                 "}";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32W));
+        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
     }
 
     void platformWin32AStringCat() { //#5150
         const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
         const char expected[] = "char text [ 10 ] = \"123456789\" ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32A));
     }
 
     void platformWin32WStringCat() { //#5150
         const char code[] = "TCHAR text[] = _T(\"123\") _T(\"456\") _T(\"789\");";
         const char expected[] = "wchar_t text [ 10 ] = L\"123456789\" ;";
-        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, true, cppcheck::Platform::Type::Win32W));
+        ASSERT_EQUALS(expected, tokenizeAndStringifyWindows(code, Platform::Type::Win32W));
     }
 
     void platformWinWithNamespace() {
         const char code1[] = "UINT32 a; ::UINT32 b; foo::UINT32 c;";
         const char expected1[] = "unsigned int a ; unsigned int b ; foo :: UINT32 c ;";
-        ASSERT_EQUALS(expected1, tokenizeAndStringifyWindows(code1, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS(expected1, tokenizeAndStringifyWindows(code1, Platform::Type::Win32A));
 
         const char code2[] = "LPCVOID a; ::LPCVOID b; foo::LPCVOID c;";
         const char expected2[] = "const void * a ; const void * b ; foo :: LPCVOID c ;";
-        ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, true, cppcheck::Platform::Type::Win32A));
+        ASSERT_EQUALS(expected2, tokenizeAndStringifyWindows(code2, Platform::Type::Win32A));
     }
 
     void isOneNumber() const {
@@ -5775,11 +6280,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("int f ( ) ;",
                       tokenizeAndStringify("[[deprecated]] int f();"));
 
-        ASSERT_EQUALS("[ [ deprecated ] ] int f ( ) ;",
-                      tokenizeAndStringify("[[deprecated]] int f();", true, cppcheck::Platform::Type::Native, "test.cpp", Standards::CPP03));
-
-        ASSERT_EQUALS("[ [ deprecated ] ] int f ( ) ;",
-                      tokenizeAndStringify("[[deprecated]] int f();", true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("[[deprecated]] int f();", dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
 
         ASSERT_EQUALS("template < class T > int f ( ) { }",
                       tokenizeAndStringify("template <class T> [[noreturn]] int f(){}"));
@@ -5787,9 +6288,6 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("int f ( int i ) ;",
                       tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);"));
 
-        ASSERT_EQUALS("[ [ maybe_unused ] ] int f ( [ [ maybe_unused ] ] int i ) ;",
-                      tokenizeAndStringify("[[maybe_unused]] int f([[maybe_unused]] int i);", true, cppcheck::Platform::Type::Native, "test.cpp", Standards::CPP03));
-
         ASSERT_EQUALS("struct a ;",
                       tokenizeAndStringify("struct [[]] a;"));
 
@@ -5843,20 +6341,23 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_EQUALS("int func1 ( ) ;",
                       tokenizeAndStringify("[[clang::optnone]] [[nodiscard]] int func1();"));
+
+        ASSERT_EQUALS("void f ( int i ) { exit ( i ) ; }",
+                      tokenizeAndStringify("[[noreturn]] void f(int i) { exit(i); }", dinit(TokenizeOptions, $.cpp = false, $.cstd = Standards::C23)));
     }
 
     void simplifyCaseRange() {
-        ASSERT_EQUALS("void f ( ) { switch ( x ) { case 1 : case 2 : case 3 : case 4 : ; } }", tokenizeAndStringify("void f() { switch(x) { case 1 ... 4: } }"));
-        ASSERT_EQUALS("void f ( ) { switch ( x ) { case 4 ... 1 : ; } }", tokenizeAndStringify("void f() { switch(x) { case 4 ... 1: } }"));
-        tokenizeAndStringify("void f() { 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: } }"));
+        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 ( ) { switch ( x ) { case 'a' : case 98 : case 'c' : ; } }", tokenizeAndStringify("void f() { switch(x) { case 'a' ... 'c': } }"));
-        ASSERT_EQUALS("void f ( ) { switch ( x ) { case 'c' ... 'a' : ; } }", tokenizeAndStringify("void f() { 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': } }"));
+        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 ( ) { switch ( x ) { case '[' : case 92 : case ']' : ; } }", tokenizeAndStringify("void f() { switch(x) { case '[' ... ']': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '[' : case 92 : case ']' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '[' ... ']': } }"));
 
-        ASSERT_EQUALS("void f ( ) { switch ( x ) { case '&' : case 39 : case '(' : ; } }", tokenizeAndStringify("void f() { switch(x) { case '&' ... '(': } }"));
-        ASSERT_EQUALS("void f ( ) { switch ( x ) { case '\\x61' : case 98 : case '\\x63' : ; } }", tokenizeAndStringify("void f() { 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 '&' ... '(': } }"));
+        ASSERT_EQUALS("void f ( int x ) { switch ( x ) { case '\\x61' : case 98 : case '\\x63' : ; } }", tokenizeAndStringify("void f(int x) { switch(x) { case '\\x61' ... '\\x63': } }"));
     }
 
     void simplifyEmptyNamespaces() {
@@ -5880,50 +6381,53 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("a ? ( b < c ) : d > e", tokenizeAndStringify("a ? b < c : d > e"));
     }
 
-    enum class AstStyle {
+    enum class AstStyle : std :: uint8_t {
         Simple,
         Z3
     };
 
-    std::string testAst(const char code[], AstStyle style = AstStyle::Simple) const {
+    template<size_t size>
+    std::string testAst(const char (&data)[size], AstStyle style = AstStyle::Simple) {
         // tokenize given code..
-        Tokenizer tokenList(&settings0, nullptr);
-        std::istringstream istr(code);
-        if (!tokenList.list.createTokens(istr,"test.cpp"))
+        TokenList tokenlist{settings0, Standards::Language::CPP};
+        tokenlist.appendFileIfNew("test.cpp");
+        if (!tokenlist.createTokensFromString(data))
             return "ERROR";
 
-        tokenList.combineStringAndCharLiterals();
-        tokenList.combineOperators();
-        tokenList.simplifySpaceshipOperator();
-        tokenList.createLinks();
-        tokenList.createLinks2();
-        tokenList.list.front()->assignIndexes();
+        TokenizerTest tokenizer(std::move(tokenlist), *this);
+        tokenizer.combineStringAndCharLiterals();
+        tokenizer.combineOperators();
+        tokenizer.simplifySpaceshipOperator();
+        tokenizer.createLinks();
+        tokenizer.createLinks2();
+        tokenizer.simplifyCAlternativeTokens();
+        tokenizer.list.front()->assignIndexes();
 
         // set varid..
-        for (Token *tok = tokenList.list.front(); tok; tok = tok->next()) {
+        for (Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
             if (tok->str() == "var")
                 tok->varId(1);
         }
 
         // Create AST..
-        tokenList.prepareTernaryOpForAST();
-        tokenList.list.createAst();
+        tokenizer.prepareTernaryOpForAST();
+        tokenizer.list.createAst();
 
-        tokenList.list.validateAst();
+        tokenizer.list.validateAst(false);
 
         // Basic AST validation
-        for (const Token *tok = tokenList.list.front(); tok; tok = tok->next()) {
+        for (const Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
             if (tok->astOperand2() && !tok->astOperand1() && tok->str() != ";" && tok->str() != ":")
                 return "Op2 but no Op1 for token: " + tok->str();
         }
 
         // Return stringified AST
         if (style == AstStyle::Z3)
-            return tokenList.list.front()->astTop()->astStringZ3();
+            return tokenizer.list.front()->astTop()->astStringZ3();
 
         std::string ret;
         std::set<const Token *> astTop;
-        for (const Token *tok = tokenList.list.front(); tok; tok = tok->next()) {
+        for (const Token *tok = tokenizer.list.front(); tok; tok = tok->next()) {
             if (tok->astOperand1() && astTop.find(tok->astTop()) == astTop.end()) {
                 astTop.insert(tok->astTop());
                 if (!ret.empty())
@@ -5934,7 +6438,7 @@ class TestTokenizer : public TestFixture {
         return ret;
     }
 
-    void astexpr() const { // simple expressions with arithmetical ops
+    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"));
@@ -6032,6 +6536,7 @@ class TestTokenizer : public TestFixture {
         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
 
         // for with initializer (c++20)
         ASSERT_EQUALS("forab=ca:;(", testAst("for(a=b;int c:a)"));
@@ -6060,142 +6565,150 @@ class TestTokenizer : public TestFixture {
         // C++17: if (expr1; expr2)
         ASSERT_EQUALS("ifx3=y;(", testAst("if (int x=3; y)"));
 
-
+        ASSERT_EQUALS("xstdstring::decltypes(a::{=", testAst("auto x = std::string{ decltype(s)::a };"));
+        ASSERT_EQUALS("if0decltypest.(X::>(", testAst("if (0 > decltype(s.t)::X) {}"));
     }
 
     void astexpr2() { // limit for large expressions
         // #7724 - wrong AST causes hang
         // Ideally a proper AST is created for this code.
-        const char* code = "const char * a(int type) {\n"
-                           "  return (\n"
-                           "   (type == 1) ? \"\"\n"
-                           " : (type == 2) ? \"\"\n"
-                           " : (type == 3) ? \"\"\n"
-                           " : (type == 4) ? \"\"\n"
-                           " : (type == 5) ? \"\"\n"
-                           " : (type == 6) ? \"\"\n"
-                           " : (type == 7) ? \"\"\n"
-                           " : (type == 8) ? \"\"\n"
-                           " : (type == 9) ? \"\"\n"
-                           " : (type == 10) ? \"\"\n"
-                           " : (type == 11) ? \"\"\n"
-                           " : (type == 12) ? \"\"\n"
-                           " : (type == 13) ? \"\"\n"
-                           " : (type == 14) ? \"\"\n"
-                           " : (type == 15) ? \"\"\n"
-                           " : (type == 16) ? \"\"\n"
-                           " : (type == 17) ? \"\"\n"
-                           " : (type == 18) ? \"\"\n"
-                           " : (type == 19) ? \"\"\n"
-                           " : (type == 20) ? \"\"\n"
-                           " : (type == 21) ? \"\"\n"
-                           " : (type == 22) ? \"\"\n"
-                           " : (type == 23) ? \"\"\n"
-                           " : (type == 24) ? \"\"\n"
-                           " : (type == 25) ? \"\"\n"
-                           " : (type == 26) ? \"\"\n"
-                           " : (type == 27) ? \"\"\n"
-                           " : (type == 28) ? \"\"\n"
-                           " : (type == 29) ? \"\"\n"
-                           " : (type == 30) ? \"\"\n"
-                           " : (type == 31) ? \"\"\n"
-                           " : (type == 32) ? \"\"\n"
-                           " : (type == 33) ? \"\"\n"
-                           " : (type == 34) ? \"\"\n"
-                           " : (type == 35) ? \"\"\n"
-                           " : (type == 36) ? \"\"\n"
-                           " : (type == 37) ? \"\"\n"
-                           " : (type == 38) ? \"\"\n"
-                           " : (type == 39) ? \"\"\n"
-                           " : (type == 40) ? \"\"\n"
-                           " : (type == 41) ? \"\"\n"
-                           " : (type == 42) ? \"\"\n"
-                           " : (type == 43) ? \"\"\n"
-                           " : (type == 44) ? \"\"\n"
-                           " : (type == 45) ? \"\"\n"
-                           " : (type == 46) ? \"\"\n"
-                           " : (type == 47) ? \"\"\n"
-                           " : (type == 48) ? \"\"\n"
-                           " : (type == 49) ? \"\"\n"
-                           " : (type == 50) ? \"\"\n"
-                           " : (type == 51) ? \"\"\n"
-                           " : \"\");\n"
-                           "}\n";
+        const char code1[] = "const char * a(int type) {\n"
+                             "  return (\n"
+                             "   (type == 1) ? \"\"\n"
+                             " : (type == 2) ? \"\"\n"
+                             " : (type == 3) ? \"\"\n"
+                             " : (type == 4) ? \"\"\n"
+                             " : (type == 5) ? \"\"\n"
+                             " : (type == 6) ? \"\"\n"
+                             " : (type == 7) ? \"\"\n"
+                             " : (type == 8) ? \"\"\n"
+                             " : (type == 9) ? \"\"\n"
+                             " : (type == 10) ? \"\"\n"
+                             " : (type == 11) ? \"\"\n"
+                             " : (type == 12) ? \"\"\n"
+                             " : (type == 13) ? \"\"\n"
+                             " : (type == 14) ? \"\"\n"
+                             " : (type == 15) ? \"\"\n"
+                             " : (type == 16) ? \"\"\n"
+                             " : (type == 17) ? \"\"\n"
+                             " : (type == 18) ? \"\"\n"
+                             " : (type == 19) ? \"\"\n"
+                             " : (type == 20) ? \"\"\n"
+                             " : (type == 21) ? \"\"\n"
+                             " : (type == 22) ? \"\"\n"
+                             " : (type == 23) ? \"\"\n"
+                             " : (type == 24) ? \"\"\n"
+                             " : (type == 25) ? \"\"\n"
+                             " : (type == 26) ? \"\"\n"
+                             " : (type == 27) ? \"\"\n"
+                             " : (type == 28) ? \"\"\n"
+                             " : (type == 29) ? \"\"\n"
+                             " : (type == 30) ? \"\"\n"
+                             " : (type == 31) ? \"\"\n"
+                             " : (type == 32) ? \"\"\n"
+                             " : (type == 33) ? \"\"\n"
+                             " : (type == 34) ? \"\"\n"
+                             " : (type == 35) ? \"\"\n"
+                             " : (type == 36) ? \"\"\n"
+                             " : (type == 37) ? \"\"\n"
+                             " : (type == 38) ? \"\"\n"
+                             " : (type == 39) ? \"\"\n"
+                             " : (type == 40) ? \"\"\n"
+                             " : (type == 41) ? \"\"\n"
+                             " : (type == 42) ? \"\"\n"
+                             " : (type == 43) ? \"\"\n"
+                             " : (type == 44) ? \"\"\n"
+                             " : (type == 45) ? \"\"\n"
+                             " : (type == 46) ? \"\"\n"
+                             " : (type == 47) ? \"\"\n"
+                             " : (type == 48) ? \"\"\n"
+                             " : (type == 49) ? \"\"\n"
+                             " : (type == 50) ? \"\"\n"
+                             " : (type == 51) ? \"\"\n"
+                             " : \"\");\n"
+                             "}\n";
         // Ensure that the AST is validated for the simplified token list
-        TODO_ASSERT_THROW(tokenizeAndStringify(code), InternalError); // this should not crash/hang
-
-        code = "template<uint64_t kInput>\n" // #11515
-               "struct ConstCTZ {\n"
-               "    static constexpr uint32_t value =\n"
-               "        (kInput & (uint64_t(1) << 0)) ? 0 :\n"
-               "        (kInput & (uint64_t(1) << 1)) ? 1 :\n"
-               "        (kInput & (uint64_t(1) << 2)) ? 2 :\n"
-               "        (kInput & (uint64_t(1) << 3)) ? 3 :\n"
-               "        (kInput & (uint64_t(1) << 4)) ? 4 :\n"
-               "        (kInput & (uint64_t(1) << 5)) ? 5 :\n"
-               "        (kInput & (uint64_t(1) << 6)) ? 6 :\n"
-               "        (kInput & (uint64_t(1) << 7)) ? 7 :\n"
-               "        (kInput & (uint64_t(1) << 8)) ? 8 :\n"
-               "        (kInput & (uint64_t(1) << 9)) ? 9 :\n"
-               "        (kInput & (uint64_t(1) << 10)) ? 10 :\n"
-               "        (kInput & (uint64_t(1) << 11)) ? 11 :\n"
-               "        (kInput & (uint64_t(1) << 12)) ? 12 :\n"
-               "        (kInput & (uint64_t(1) << 13)) ? 13 :\n"
-               "        (kInput & (uint64_t(1) << 14)) ? 14 :\n"
-               "        (kInput & (uint64_t(1) << 15)) ? 15 :\n"
-               "        (kInput & (uint64_t(1) << 16)) ? 16 :\n"
-               "        (kInput & (uint64_t(1) << 17)) ? 17 :\n"
-               "        (kInput & (uint64_t(1) << 18)) ? 18 :\n"
-               "        (kInput & (uint64_t(1) << 19)) ? 19 :\n"
-               "        (kInput & (uint64_t(1) << 20)) ? 20 :\n"
-               "        (kInput & (uint64_t(1) << 21)) ? 21 :\n"
-               "        (kInput & (uint64_t(1) << 22)) ? 22 :\n"
-               "        (kInput & (uint64_t(1) << 23)) ? 23 :\n"
-               "        (kInput & (uint64_t(1) << 24)) ? 24 :\n"
-               "        (kInput & (uint64_t(1) << 25)) ? 25 :\n"
-               "        (kInput & (uint64_t(1) << 26)) ? 26 :\n"
-               "        (kInput & (uint64_t(1) << 27)) ? 27 :\n"
-               "        (kInput & (uint64_t(1) << 28)) ? 28 :\n"
-               "        (kInput & (uint64_t(1) << 29)) ? 29 :\n"
-               "        (kInput & (uint64_t(1) << 30)) ? 30 :\n"
-               "        (kInput & (uint64_t(1) << 31)) ? 31 :\n"
-               "        (kInput & (uint64_t(1) << 32)) ? 32 :\n"
-               "        (kInput & (uint64_t(1) << 33)) ? 33 :\n"
-               "        (kInput & (uint64_t(1) << 34)) ? 34 :\n"
-               "        (kInput & (uint64_t(1) << 35)) ? 35 :\n"
-               "        (kInput & (uint64_t(1) << 36)) ? 36 :\n"
-               "        (kInput & (uint64_t(1) << 37)) ? 37 :\n"
-               "        (kInput & (uint64_t(1) << 38)) ? 38 :\n"
-               "        (kInput & (uint64_t(1) << 39)) ? 39 :\n"
-               "        (kInput & (uint64_t(1) << 40)) ? 40 :\n"
-               "        (kInput & (uint64_t(1) << 41)) ? 41 :\n"
-               "        (kInput & (uint64_t(1) << 42)) ? 42 :\n"
-               "        (kInput & (uint64_t(1) << 43)) ? 43 :\n"
-               "        (kInput & (uint64_t(1) << 44)) ? 44 :\n"
-               "        (kInput & (uint64_t(1) << 45)) ? 45 :\n"
-               "        (kInput & (uint64_t(1) << 46)) ? 46 :\n"
-               "        (kInput & (uint64_t(1) << 47)) ? 47 :\n"
-               "        (kInput & (uint64_t(1) << 48)) ? 48 :\n"
-               "        (kInput & (uint64_t(1) << 49)) ? 49 :\n"
-               "        (kInput & (uint64_t(1) << 50)) ? 50 :\n"
-               "        (kInput & (uint64_t(1) << 51)) ? 51 :\n"
-               "        (kInput & (uint64_t(1) << 52)) ? 52 :\n"
-               "        (kInput & (uint64_t(1) << 53)) ? 53 :\n"
-               "        (kInput & (uint64_t(1) << 54)) ? 54 :\n"
-               "        (kInput & (uint64_t(1) << 55)) ? 55 :\n"
-               "        (kInput & (uint64_t(1) << 56)) ? 56 :\n"
-               "        (kInput & (uint64_t(1) << 57)) ? 57 :\n"
-               "        (kInput & (uint64_t(1) << 58)) ? 58 :\n"
-               "        (kInput & (uint64_t(1) << 59)) ? 59 :\n"
-               "        (kInput & (uint64_t(1) << 60)) ? 60 :\n"
-               "        (kInput & (uint64_t(1) << 61)) ? 61 :\n"
-               "        (kInput & (uint64_t(1) << 62)) ? 62 :\n"
-               "        (kInput & (uint64_t(1) << 63)) ? 63 : 64;\n"
-               "};\n";
-        ASSERT_NO_THROW(tokenizeAndStringify(code));
+        TODO_ASSERT_THROW(tokenizeAndStringify(code1), InternalError); // this should not crash/hang
+
+        const char code2[] = "template<uint64_t kInput>\n" // #11515
+                             "struct ConstCTZ {\n"
+                             "    static constexpr uint32_t value =\n"
+                             "        (kInput & (uint64_t(1) << 0)) ? 0 :\n"
+                             "        (kInput & (uint64_t(1) << 1)) ? 1 :\n"
+                             "        (kInput & (uint64_t(1) << 2)) ? 2 :\n"
+                             "        (kInput & (uint64_t(1) << 3)) ? 3 :\n"
+                             "        (kInput & (uint64_t(1) << 4)) ? 4 :\n"
+                             "        (kInput & (uint64_t(1) << 5)) ? 5 :\n"
+                             "        (kInput & (uint64_t(1) << 6)) ? 6 :\n"
+                             "        (kInput & (uint64_t(1) << 7)) ? 7 :\n"
+                             "        (kInput & (uint64_t(1) << 8)) ? 8 :\n"
+                             "        (kInput & (uint64_t(1) << 9)) ? 9 :\n"
+                             "        (kInput & (uint64_t(1) << 10)) ? 10 :\n"
+                             "        (kInput & (uint64_t(1) << 11)) ? 11 :\n"
+                             "        (kInput & (uint64_t(1) << 12)) ? 12 :\n"
+                             "        (kInput & (uint64_t(1) << 13)) ? 13 :\n"
+                             "        (kInput & (uint64_t(1) << 14)) ? 14 :\n"
+                             "        (kInput & (uint64_t(1) << 15)) ? 15 :\n"
+                             "        (kInput & (uint64_t(1) << 16)) ? 16 :\n"
+                             "        (kInput & (uint64_t(1) << 17)) ? 17 :\n"
+                             "        (kInput & (uint64_t(1) << 18)) ? 18 :\n"
+                             "        (kInput & (uint64_t(1) << 19)) ? 19 :\n"
+                             "        (kInput & (uint64_t(1) << 20)) ? 20 :\n"
+                             "        (kInput & (uint64_t(1) << 21)) ? 21 :\n"
+                             "        (kInput & (uint64_t(1) << 22)) ? 22 :\n"
+                             "        (kInput & (uint64_t(1) << 23)) ? 23 :\n"
+                             "        (kInput & (uint64_t(1) << 24)) ? 24 :\n"
+                             "        (kInput & (uint64_t(1) << 25)) ? 25 :\n"
+                             "        (kInput & (uint64_t(1) << 26)) ? 26 :\n"
+                             "        (kInput & (uint64_t(1) << 27)) ? 27 :\n"
+                             "        (kInput & (uint64_t(1) << 28)) ? 28 :\n"
+                             "        (kInput & (uint64_t(1) << 29)) ? 29 :\n"
+                             "        (kInput & (uint64_t(1) << 30)) ? 30 :\n"
+                             "        (kInput & (uint64_t(1) << 31)) ? 31 :\n"
+                             "        (kInput & (uint64_t(1) << 32)) ? 32 :\n"
+                             "        (kInput & (uint64_t(1) << 33)) ? 33 :\n"
+                             "        (kInput & (uint64_t(1) << 34)) ? 34 :\n"
+                             "        (kInput & (uint64_t(1) << 35)) ? 35 :\n"
+                             "        (kInput & (uint64_t(1) << 36)) ? 36 :\n"
+                             "        (kInput & (uint64_t(1) << 37)) ? 37 :\n"
+                             "        (kInput & (uint64_t(1) << 38)) ? 38 :\n"
+                             "        (kInput & (uint64_t(1) << 39)) ? 39 :\n"
+                             "        (kInput & (uint64_t(1) << 40)) ? 40 :\n"
+                             "        (kInput & (uint64_t(1) << 41)) ? 41 :\n"
+                             "        (kInput & (uint64_t(1) << 42)) ? 42 :\n"
+                             "        (kInput & (uint64_t(1) << 43)) ? 43 :\n"
+                             "        (kInput & (uint64_t(1) << 44)) ? 44 :\n"
+                             "        (kInput & (uint64_t(1) << 45)) ? 45 :\n"
+                             "        (kInput & (uint64_t(1) << 46)) ? 46 :\n"
+                             "        (kInput & (uint64_t(1) << 47)) ? 47 :\n"
+                             "        (kInput & (uint64_t(1) << 48)) ? 48 :\n"
+                             "        (kInput & (uint64_t(1) << 49)) ? 49 :\n"
+                             "        (kInput & (uint64_t(1) << 50)) ? 50 :\n"
+                             "        (kInput & (uint64_t(1) << 51)) ? 51 :\n"
+                             "        (kInput & (uint64_t(1) << 52)) ? 52 :\n"
+                             "        (kInput & (uint64_t(1) << 53)) ? 53 :\n"
+                             "        (kInput & (uint64_t(1) << 54)) ? 54 :\n"
+                             "        (kInput & (uint64_t(1) << 55)) ? 55 :\n"
+                             "        (kInput & (uint64_t(1) << 56)) ? 56 :\n"
+                             "        (kInput & (uint64_t(1) << 57)) ? 57 :\n"
+                             "        (kInput & (uint64_t(1) << 58)) ? 58 :\n"
+                             "        (kInput & (uint64_t(1) << 59)) ? 59 :\n"
+                             "        (kInput & (uint64_t(1) << 60)) ? 60 :\n"
+                             "        (kInput & (uint64_t(1) << 61)) ? 61 :\n"
+                             "        (kInput & (uint64_t(1) << 62)) ? 62 :\n"
+                             "        (kInput & (uint64_t(1) << 63)) ? 63 : 64;\n"
+                             "};\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code2));
+
+        const char code3[] = "void f(const std::vector<int>& v) {\n" // #12569
+                             "    ::std::for_each(v.begin(), v.end(), [](int i) {\n"
+                             "        int j(i ? i : 5);\n"
+                             "    });\n"
+                             "}\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code3));
     }
 
-    void astnewdelete() const {
+    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);"));
@@ -6225,6 +6738,11 @@ class TestTokenizer : public TestFixture {
         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
 
         // placement new
         ASSERT_EQUALS("X12,3,(new ab,c,", testAst("new (a,b,c) X(1,2,3);"));
@@ -6291,7 +6809,7 @@ class TestTokenizer : public TestFixture {
         // (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("n0=", testAst("TrivialDefCtor{[2][2]}[1][1].n = 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];"));
 
         // Type{data}()
@@ -6382,6 +6900,7 @@ class TestTokenizer : public TestFixture {
                                              "void f(void* p, B* b) {\n"
                                              "    b->hash = (g(b->hash))(p);\n"
                                              "}\n"));
+        ignore_errout();
         ASSERT_NO_THROW(tokenizeAndStringify("struct A;\n"
                                              "struct B { A* hash; };\n"
                                              "A* h(void* p);\n"
@@ -6390,11 +6909,13 @@ class TestTokenizer : public TestFixture {
                                              "void f(void* p, B * b) {\n"
                                              "b->hash = (g(b->hash))(p);\n"
                                              "}\n"));
+        ASSERT_EQUALS("", errout_str());
         ASSERT_NO_THROW(tokenizeAndStringify("struct A;\n"
                                              "struct B { A* hash; };\n"
                                              "void f(void* p, B* b) {\n"
                                              "    b->hash = (decltype(b->hash))(p);\n"
                                              "}\n"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify("void a(int);\n" // #10801
                                              "    struct b {\n"
@@ -6403,23 +6924,31 @@ class TestTokenizer : public TestFixture {
                                              "void f() {\n"
                                              "    (decltype (&a)(d.c))(0);\n"
                                              "}\n"));
+        ASSERT_EQUALS("", errout_str());
 
         // #10334: Do not hang!
-        tokenizeAndStringify("void foo(const std::vector<std::string>& locations = {\"\"}) {\n"
-                             "    for (int i = 0; i <= 123; ++i)\n"
-                             "        x->emplace_back(y);\n"
-                             "}");
+        (void)tokenizeAndStringify("void foo(const std::vector<std::string>& locations = {\"\"}) {\n"
+                                   "    for (int i = 0; i <= 123; ++i)\n"
+                                   "        x->emplace_back(y);\n"
+                                   "}");
+        ignore_errout();
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #10831
                                              "    auto g = [](std::function<void()> h = []() {}) { };\n"
                                              "}"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f() {\n" // #11379
                                              "    auto l = [x = 3](std::string&& v) { };\n"
                                              "}\n"));
+        ASSERT_EQUALS(
+            "[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
     }
 
-    void astbrackets() const { // []
+    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];"));
@@ -6427,7 +6956,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("ab0[1[=", testAst("a=b[0][1];"));
     }
 
-    void astvardecl() const {
+    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];"));
@@ -6441,6 +6970,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("unoRef:: var0(", testAst(code1));
 
         ASSERT_EQUALS("vary=", testAst("std::string var = y;"));
+        ASSERT_EQUALS("vary=", testAst("std::unique_ptr<int> var = y;")); // #14019
 
         ASSERT_EQUALS("", testAst("void *(*var)(int);"));
         ASSERT_EQUALS("", testAst("void *(*var[2])(int);"));
@@ -6459,9 +6989,13 @@ class TestTokenizer : public TestFixture {
         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("", testAst("void f(enum E* var){}"));
+        ASSERT_EQUALS("", testAst("void f(enum E*& var){}"));
+        ASSERT_EQUALS("", testAst("void f(bool& var){}"));
     }
 
-    void astunaryop() const { // unary operators
+    void astunaryop() { // unary operators
         ASSERT_EQUALS("1a--+", testAst("1 + --a"));
         ASSERT_EQUALS("1a--+", testAst("1 + a--"));
         ASSERT_EQUALS("ab+!", testAst("!(a+b)"));
@@ -6487,7 +7021,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("int0{1&return", testAst("int g() { return int{ 0 } & 1; }"));
     }
 
-    void astfunction() const { // function calls
+    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"));
@@ -6499,58 +7033,84 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("", testAst("a::b f();"));
         ASSERT_EQUALS("", testAst("a::b f() {}"));
         ASSERT_EQUALS("", testAst("a::b f() = delete;"));
-        ASSERT_EQUALS("constdelete=", testAst("int f() const = 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((void,", testAst("extern int for_each_commit_graft(int (*)(int*), void *);"));
+        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("(= it (( (. s insert) (, it ({ (, (, (= (. a) i) (= (. b) 2)) (= (. c) 3))))))",
+                      testAst("it = s.insert(it, { .a = i, .b = 2, .c = 3 });", AstStyle::Z3)); // #12815
     }
 
     void asttemplate() { // uninstantiated templates will have <,>,etc..
         ASSERT_EQUALS("a(3==", testAst("a<int>()==3"));
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("ab(== f(", testAst("a == b<c>(); f();"));
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("static_casta(i[", testAst("; static_cast<char*>(a)[i];")); // #6203
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("reinterpret_castreinterpret_castptr(123&(",
                       testAst(";reinterpret_cast<void*>(reinterpret_cast<unsigned>(ptr) & 123);")); // #7253
+        ASSERT_EQUALS("", errout_str());
         ASSERT_EQUALS("bcd.(=", testAst(";a<int> && b = c->d();"));
+        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_EQUALS("", errout_str());
         ASSERT_EQUALS("AB: abc+=", testAst("struct A : public B<C*> { void f() { a=b+c; } };"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("xfts(=", testAst("; auto x = f(ts...);"));
+        ASSERT_EQUALS("", errout_str());
 
-        ASSERT_EQUALS("da((new= ifd(", testAst("template <typename a, typename... b>\n" // #10199
+        ASSERT_EQUALS("dae(new= ifd(", testAst("template <typename a, typename... b>\n" // #10199
                                                "void c(b... e) {\n"
                                                "    a d = new a((e)...);\n"
                                                "    if (d) {}\n"
                                                "}\n"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("ad*astdforward::e((new= ifd(", testAst("struct a {};\n" // #11103
                                                               "template <class... b> void c(b... e) {\n"
                                                               "    a* d = new a(std::forward<b>(e)...);\n"
                                                               "    if (d) {}\n"
                                                               "}\n"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_EQUALS("stddir::Args...&&, dir\"abc\"+= dirconcatstdforward::args((+return",
                       testAst("template <typename ...Args> std::string concat(std::string dir, Args&& ...args) {\n" // #10492
                               "    dir += \"abc\";\n"
                               "    return dir + concat(std::forward<Args>(args)...);\n"
                               "}\n"));
+        ASSERT_EQUALS("", errout_str());
 
         // #11369
         ASSERT_NO_THROW(tokenizeAndStringify("int a;\n"
                                              "template <class> auto b() -> decltype(a) {\n"
                                              "    if (a) {}\n"
                                              "}\n"));
+        ignore_errout();
+    }
+
+    void astrequires()
+    {
+        ASSERT_EQUALS("brequires{ac::||= ac::", testAst("template <class a> concept b = requires { a::c; } || a::c;"));
+        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
     }
 
-    void astcast() const {
+    void astcast() {
         ASSERT_EQUALS("ac&(=", testAst("a = (long)&c;"));
         ASSERT_EQUALS("ac*(=", testAst("a = (Foo*)*c;"));
         ASSERT_EQUALS("ac-(=", testAst("a = (long)-c;"));
@@ -6653,13 +7213,14 @@ class TestTokenizer : public TestFixture {
 
         // #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{[=[", testAst("void a() { [b = [] { ; }] {}; }"));
 
         // Lambda capture expression (C++14)
         ASSERT_EQUALS("a{b1=[= c2=", testAst("a = [b=1]{c=2;};"));
 
         // #9729
         ASSERT_NO_THROW(tokenizeAndStringify("void foo() { bar([]() noexcept { if (0) {} }); }"));
+        ASSERT_EQUALS("", errout_str());
 
         // #11128
         ASSERT_NO_THROW(tokenizeAndStringify("template <typename T>\n"
@@ -6671,7 +7232,8 @@ class TestTokenizer : public TestFixture {
                                              "        return y;\n"
                                              "    else\n"
                                              "        return z;\n"
-                                             "}\n", true, cppcheck::Platform::Type::Native, "test.cpp", Standards::CPP17));
+                                             "}\n", dinit(TokenizeOptions, $.cppstd = Standards::CPP17)));
+        ignore_errout();
 
         // #10079 - createInnerAST bug..
         ASSERT_EQUALS("x{([= yz= switchy(",
@@ -6691,6 +7253,7 @@ class TestTokenizer : public TestFixture {
                                              "        return a < b;\n"
                                              "    });\n"
                                              "}\n"));
+        ignore_errout();
 
         ASSERT_NO_THROW(tokenizeAndStringify("namespace N {\n"
                                              "    enum E : bool { F };\n"
@@ -6705,6 +7268,7 @@ class TestTokenizer : public TestFixture {
                                              "        return a < b;\n"
                                              "    });\n"
                                              "}\n"));
+        ignore_errout();
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f(const std::vector<char>& v) {\n"
                                              "    std::for_each(v.begin(), v.end(), [&](char c) {\n"
@@ -6716,32 +7280,85 @@ class TestTokenizer : public TestFixture {
                                              "        }\n"
                                              "    });\n"
                                              "}\n"));
+        ASSERT_EQUALS("", errout_str());
+
+        ASSERT_NO_THROW(tokenizeAndStringify("struct A { A(int) {} };\n"
+                                             "void g(void (*)(int));\n"
+                                             "void f() {\n"
+                                             "    g([](int i) {\n"
+                                             "        switch (i) {\n"
+                                             "        case static_cast<int>(1): {\n"
+                                             "            A a(i);\n"
+                                             "            if (1) {}\n"
+                                             "        }\n"
+                                             "        }\n"
+                                             "    });\n"
+                                             "}\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("sf.{(i[{={", testAst("void g(int i) { S s{ .f = { [i]() {} } }; }"));
+
+        ASSERT_EQUALS("{([", testAst("void f() { []() {}; }")); // #13471
     }
 
-    void astcase() const {
+    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
     }
 
-    void astrefqualifier() const {
-        ASSERT_EQUALS("b(int.", testAst("class a { auto b() -> int&; };"));
-        ASSERT_EQUALS("b(int.", testAst("class a { auto b() -> int&&; };"));
-        ASSERT_EQUALS("b(", testAst("class a { void b() &&; };"));
-        ASSERT_EQUALS("b(", testAst("class a { void b() &; };"));
-        ASSERT_EQUALS("b(", testAst("class a { void b() && {} };"));
-        ASSERT_EQUALS("b(", testAst("class a { void b() & {} };"));
+    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() & {} };"));
+    }
+
+    void astthrowdelete() {
+        ASSERT_EQUALS("a(", testAst("class a { virtual ~a() throw() = delete; };"));
+    }
+
+    void asttrailingdecltype() {
+        ASSERT_EQUALS("Cc& csize.(", testAst("template<class C> constexpr auto s(const C &c) noexcept -> decltype(c.size()) {}"));
+        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 {}; };"));
+    }
+    void astnoexcept() {
+        ASSERT_EQUALS("noexceptaswap.b((", testAst("void f() noexcept(noexcept(a.swap(b))) {}"));
+        ASSERT_EQUALS("{([ noexceptaswap.b((", testAst("[]() noexcept(noexcept(a.swap(b))) {}"));
     }
 
     //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() const {
+    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));
@@ -6756,39 +7373,27 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("(return (new (( (:: (:: (:: A B) C) D) true)))", testAst("return new A::B::C::D(true);", AstStyle::Z3));
     }
 
-    void compileLimits() {
-        const char raw_code[] = "#define PTR1 (* (* (* (* (* (* (* (* (* (*\n"
-                                "#define PTR2 PTR1 PTR1 PTR1 PTR1 PTR1 PTR1 PTR1 PTR1 PTR1 PTR1\n"
-                                "#define PTR3 PTR2 PTR2 PTR2 PTR2 PTR2 PTR2 PTR2 PTR2 PTR2 PTR2\n"
-                                "#define PTR4 PTR3 PTR3 PTR3 PTR3 PTR3 PTR3 PTR3 PTR3 PTR3 PTR3\n"
-                                "#define PTR5 PTR4 PTR4 PTR4 PTR4 PTR4 PTR4 PTR4 PTR4 PTR4 PTR4\n"
-                                "#define PTR6 PTR5 PTR5 PTR5 PTR5 PTR5 PTR5 PTR5 PTR5 PTR5 PTR5\n"
-                                "\n"
-                                "#define RBR1 ) ) ) ) ) ) ) ) ) )\n"
-                                "#define RBR2 RBR1 RBR1 RBR1 RBR1 RBR1 RBR1 RBR1 RBR1 RBR1 RBR1\n"
-                                "#define RBR3 RBR2 RBR2 RBR2 RBR2 RBR2 RBR2 RBR2 RBR2 RBR2 RBR2\n"
-                                "#define RBR4 RBR3 RBR3 RBR3 RBR3 RBR3 RBR3 RBR3 RBR3 RBR3 RBR3\n"
-                                "#define RBR5 RBR4 RBR4 RBR4 RBR4 RBR4 RBR4 RBR4 RBR4 RBR4 RBR4\n"
-                                "#define RBR6 RBR5 RBR5 RBR5 RBR5 RBR5 RBR5 RBR5 RBR5 RBR5 RBR5\n"
-                                "\n"
-                                "int PTR4 q4_var RBR4 = 0;\n";
-
-        // Preprocess file..
-        Preprocessor preprocessor(settings0);
-        std::list<std::string> configurations;
-        std::string filedata;
-        std::istringstream fin(raw_code);
-        preprocessor.preprocess(fin, filedata, configurations, emptyString, settings0.includePaths);
-        const std::string code = PreprocessorHelper::getcode(preprocessor, filedata, emptyString, emptyString);
-
-        ASSERT_THROW(tokenizeAndStringify(code.c_str()), InternalError);
+    void astdecltypescope() {
+        ASSERT_EQUALS("sizedecltypethism_P.(XSize::::{", testAst("size { decltype(this->m_P)::X::Size };"));
+    }
+
+    void astdesignatedinit() {
+        ASSERT_EQUALS("(( f ({ (= (. x) 1)))", testAst("f({ .x = 1 });", AstStyle::Z3));
+    }
+
+    void astrvaluedecl() {
+        ASSERT_EQUALS("varstdmove::var(=", testAst("std::string&& var = std::move(var);"));
+    }
+
+    void astorkeyword() {
+        ASSERT_EQUALS("ifsp.\"\"==sp.0==||(", testAst("void f() { if (s.p == \"\" or s.p == 0) {} }"));
     }
 
 #define isStartOfExecutableScope(offset, code) isStartOfExecutableScope_(offset, code, __FILE__, __LINE__)
-    bool isStartOfExecutableScope_(int offset, const char code[], const char* file, int line) {
-        Tokenizer tokenizer(&settings0, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+    template<size_t size>
+    bool isStartOfExecutableScope_(int offset, const char (&code)[size], const char* file, int line) {
+        SimpleTokenizer tokenizer(settings0, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         return Tokenizer::startOfExecutableScope(tokenizer.tokens()->tokAt(offset)) != nullptr;
     }
@@ -6821,7 +7426,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class Fred FINAL : Base { } ;"));
         ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class DLLEXPORT Fred final : Base { } ;")); // #11422
         // Regression for C code:
-        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;", true, cppcheck::Platform::Type::Native, "test.c"));
+        ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void sizeofAddParentheses() {
@@ -6835,56 +7440,72 @@ class TestTokenizer : public TestFixture {
     void reportUnknownMacros() {
         const char code1[] = "MY_UNKNOWN_IMP1(IInStream)\n"
                              "STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) { if (ptr); }";
-        ASSERT_THROW(tokenizeAndStringify(code1), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code1), UNKNOWN_MACRO);
 
         const char code2[] = "void foo() { dostuff(x 0); }";
-        ASSERT_THROW(tokenizeAndStringify(code2), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code2), UNKNOWN_MACRO);
 
         const char code3[] = "f(\"1\" __stringify(48) \"1\");";
-        ASSERT_THROW(tokenizeAndStringify(code3), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code3), UNKNOWN_MACRO);
 
         const char code4[] = "struct Foo {\n"
                              "  virtual MACRO(int) f1() {}\n"
                              "  virtual MACRO(int) f2() {}\n"
                              "};";
-        ASSERT_THROW(tokenizeAndStringify(code4), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code4), UNKNOWN_MACRO);
 
         const char code5[] = "void foo() {\n"
                              "  EVALUATE(123, int x=a; int y=b+c;);\n"
                              "}";
-        ASSERT_THROW(tokenizeAndStringify(code5), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code5), UNKNOWN_MACRO);
 
         const char code6[] = "void foo() { dostuff(a, .x=0); }";
-        ASSERT_THROW(tokenizeAndStringify(code6), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code6), UNKNOWN_MACRO);
 
         const char code7[] = "void foo() { dostuff(ZEND_NUM_ARGS() TSRMLS_CC, x, y); }"; // #9476
-        ASSERT_THROW(tokenizeAndStringify(code7), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code7), UNKNOWN_MACRO);
 
         const char code8[] = "void foo() { a = [](int x, decltype(vec) y){}; }";
         ASSERT_NO_THROW(tokenizeAndStringify(code8));
 
         const char code9[] = "void f(std::exception c) { b(M() c.what()); }";
-        ASSERT_THROW(tokenizeAndStringify(code9), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code9), UNKNOWN_MACRO);
 
         const char code10[] = "void f(std::exception c) { b(M() M() + N(c.what())); }";
-        ASSERT_THROW(tokenizeAndStringify(code10), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code10), UNKNOWN_MACRO);
 
         const char code11[] = "struct B { B(B&&) noexcept {} ~B() noexcept {} };";
         ASSERT_NO_THROW(tokenizeAndStringify(code11));
 
         ASSERT_NO_THROW(tokenizeAndStringify("alignas(8) alignas(16) int x;")); // alignas is not unknown macro
 
-        ASSERT_THROW(tokenizeAndStringify("void foo() { if(x) SYSTEM_ERROR }"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("void foo() { dostuff(); SYSTEM_ERROR }"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { if(x) SYSTEM_ERROR }"), UNKNOWN_MACRO);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void foo() { dostuff(); SYSTEM_ERROR }"), UNKNOWN_MACRO);
 
         ASSERT_NO_THROW(tokenizeAndStringify("void f(void* q) {\n"
                                              "    g(&(S) { .p = (int*)q });\n"
-                                             "}\n", /*expand*/ true, cppcheck::Platform::Type::Native, "test.c"));
+                                             "}\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", 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"), UNKNOWN_MACRO);
+
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("static void handle_toggle(void (*proc) PROTO_XT_CALLBACK_ARGS, int var) {}\n"), // #13198
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If PROTO_XT_CALLBACK_ARGS is a macro then please configure it.");
+
+        ignore_errout();
     }
 
     void findGarbageCode() { // Test Tokenizer::findGarbageCode()
         // C++ try/catch in global scope
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("try { }"), InternalError, "syntax error: keyword 'try' is not allowed 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_NO_THROW(tokenizeAndStringify("struct S {\n" // #9716
                                              "    S();\n"
@@ -6906,12 +7527,12 @@ class TestTokenizer : public TestFixture {
         ASSERT_NO_THROW(tokenizeAndStringify("void f() { []() -> int * {}; }"));
         ASSERT_NO_THROW(tokenizeAndStringify("void f() { const char* var = \"1\" \"2\"; }"));
 
-        ASSERT_THROW(tokenizeAndStringify("void f() { MACRO(switch); }"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("void f() { MACRO(x,switch); }"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("void foo() { for_chain( if (!done) done = 1); }"), InternalError);
-        ASSERT_THROW(tokenizeAndStringify("void foo() { for_chain( a, b, if (!done) done = 1); }"), InternalError);
+        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_EQUALS(tokenizeAndStringify("void f() { if (retval==){} }"), InternalError, "syntax error: ==)");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { if (retval==){} }"), SYNTAX, "syntax error: ==)");
 
         // after (expr)
         ASSERT_NO_THROW(tokenizeAndStringify("void f() { switch (a) int b; }"));
@@ -6930,6 +7551,8 @@ class TestTokenizer : public TestFixture {
         // Ticket #9664
         ASSERT_NO_THROW(tokenizeAndStringify("S s = { .x { 2 }, .y[0] { 3 } };"));
 
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("f(0, .x());"), SYNTAX); // #12823
+
         // Ticket #11134
         ASSERT_NO_THROW(tokenizeAndStringify("struct my_struct { int x; }; "
                                              "std::string s; "
@@ -6961,31 +7584,35 @@ class TestTokenizer : public TestFixture {
 
 
         // op op
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("void f() { dostuff (x==>y); }"), InternalError, "syntax error: == >");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { dostuff (x==>y); }"), SYNTAX, "syntax error: == >");
 
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("void f() { assert(a==()); }"), InternalError, "syntax error: ==()");
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("void f() { assert(a+()); }"), InternalError, "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: +()");
 
         // #9445 - typeof is not a keyword in C
-        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }", false, cppcheck::Platform::Type::Native, "test.c"));
-
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("enum : { };"), InternalError, "syntax error: Unexpected token '{'");
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("enum : 3 { };"), InternalError, "syntax error: Unexpected token '3'");
-
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("int a() { b((c)return 0) }"), InternalError, "syntax error");
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("int f() { MACRO(x) return 0; }"),
-                            InternalError,
-                            "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
-
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("void f(int i) {\n" // #11770
-                                                 "    if (i == 0) {}\n"
-                                                 "    else if (i == 1) {}\n"
-                                                 "    else\n"
-                                                 "        MACRO(i)\n"
-                                                 "}\n"
-                                                 "void g() {}\n"),
-                            InternalError,
-                            "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
+        ASSERT_NO_THROW(tokenizeAndStringify("void foo() { char *typeof, *value; }", 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("int a() { b((c)return 0) }"), SYNTAX, "syntax error");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("int f() { MACRO(x) return 0; }"),
+                                     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; }"),
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If unknown is a macro then please configure it.");
+
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f(int i) {\n" // #11770
+                                                          "    if (i == 0) {}\n"
+                                                          "    else if (i == 1) {}\n"
+                                                          "    else\n"
+                                                          "        MACRO(i)\n"
+                                                          "}\n"
+                                                          "void g() {}\n"),
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
         ASSERT_NO_THROW(tokenizeAndStringify("void f(int i) {\n"
                                              "    if (i == 0) {}\n"
                                              "    else if (i == 1) {}\n"
@@ -6994,29 +7621,69 @@ class TestTokenizer : public TestFixture {
                                              "}\n"
                                              "void g() {}\n"));
 
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("class C : public QObject {\n" // #11770
-                                                 "    struct S { static void g() {} };\n"
-                                                 "private Q_SLOTS:\n"
-                                                 "    void f() { S::g(); }\n"
-                                                 "};\n"),
-                            InternalError,
-                            "There is an unknown macro here somewhere. Configuration is required. If Q_SLOTS is a macro then please configure it.");
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("class C : public QObject {\n"
-                                                 "    struct S { static void g() {} };\n"
-                                                 "private slots:\n"
-                                                 "    void f() { S::g(); }\n"
-                                                 "};\n"),
-                            InternalError,
-                            "There is an unknown macro here somewhere. Configuration is required. If slots is a macro then please configure it.");
-
-        ASSERT_THROW_EQUALS(tokenizeAndStringify("namespace U_ICU_ENTRY_POINT_RENAME(icu) { }\n"
-                                                 "namespace icu = U_ICU_ENTRY_POINT_RENAME(icu);\n"
-                                                 "namespace U_ICU_ENTRY_POINT_RENAME(icu) {\n"
-                                                 "    class BreakIterator;\n"
-                                                 "}\n"
-                                                 "typedef int UStringCaseMapper(icu::BreakIterator* iter);\n"),
-                            InternalError,
-                            "There is an unknown macro here somewhere. Configuration is required. If U_ICU_ENTRY_POINT_RENAME is a macro then please configure it.");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("class C : public QObject {\n" // #11770
+                                                          "    struct S { static void g() {} };\n"
+                                                          "private Q_SLOTS:\n"
+                                                          "    void f() { S::g(); }\n"
+                                                          "};\n"),
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If Q_SLOTS is a macro then please configure it.");
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("class C : public QObject {\n"
+                                                          "    struct S { static void g() {} };\n"
+                                                          "private slots:\n"
+                                                          "    void f() { S::g(); }\n"
+                                                          "};\n"),
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If slots is a macro then please configure it.");
+
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("namespace U_ICU_ENTRY_POINT_RENAME(icu) { }\n"
+                                                          "namespace icu = U_ICU_ENTRY_POINT_RENAME(icu);\n"
+                                                          "namespace U_ICU_ENTRY_POINT_RENAME(icu) {\n"
+                                                          "    class BreakIterator;\n"
+                                                          "}\n"
+                                                          "typedef int UStringCaseMapper(icu::BreakIterator* iter);\n"),
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If U_ICU_ENTRY_POINT_RENAME is a macro then please configure it.");
+
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("void f() { MACRO(x(), y(), \"abc\", z(); ok = true); }\n"), // #12006
+                                     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("int (*f) MACRO((void *));\n"), // #12010
+                                     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("struct S { int a[2] PACKED; };\n"),
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If PACKED is a macro then please configure it.");
+
+        ASSERT_THROW_INTERNAL_EQUALS(tokenizeAndStringify("MACRO(a, b,,)\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(tokenizeAndStringify("{ for (()()) }"), SYNTAX); // #11643
+
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void f(const std::vector<std::string>& v) {\n" // #14326
+                                                   "    for (const std::string&s : v)\n"
+                                                   "}"),
+                              SYNTAX);
+
+        ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();")); // #12552
+        ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }"));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("template <typename T, int N>\n" // #12659
+                                             "constexpr void f(T(&&a)[N]) {}"));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { typedef int T; } S;")); // #12700
+
+        ASSERT_NO_THROW(tokenizeAndStringify("class A { bool restrict() const; };\n"
+                                             "bool A::restrict() const { return true; }")); // #12718
+
+        ASSERT_NO_THROW(tokenizeAndStringify("enum { E = sizeof(struct { int i; }) };")); // #13249
+
+        ASSERT_NO_THROW(tokenizeAndStringify("struct S { unsigned u:2, :30; };")); // #14393
+
+        ignore_errout();
     }
 
 
@@ -7027,12 +7694,14 @@ class TestTokenizer : public TestFixture {
                             "    typename std::enable_if<\n"
                             "        std::is_convertible<U, T>{}>::type* = nullptr>\n"
                             "void foo(U x);\n"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify(
                             "template<class t>\n"
                             "T f(const T a, const T b) {\n"
                             "    return a < b ? b : a;\n"
                             "}\n"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify(
                             "template<class T>\n"
@@ -7041,6 +7710,7 @@ class TestTokenizer : public TestFixture {
                             "        return a < b ? b : a;\n"
                             "    }\n"
                             "};\n"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify(
                             "const int a = 1;\n"
@@ -7049,21 +7719,25 @@ class TestTokenizer : public TestFixture {
                             "struct A {\n"
                             "    int x = a < b ? b : a;"
                             "};\n"));
+        ASSERT_EQUALS("", errout_str());
 
         // #10139
         ASSERT_NO_THROW(tokenizeAndStringify("template<typename F>\n"
                                              "void foo(std::enable_if_t<value<F>>* = 0) {}\n"));
+        ASSERT_EQUALS("", errout_str());
 
         // #10001
         ASSERT_NO_THROW(tokenizeAndStringify("struct a {\n"
                                              "  int c;\n"
                                              "  template <class b> void d(b e) const { c < e ? c : e; }\n"
                                              "};\n"));
+        ASSERT_EQUALS("", errout_str());
 
         ASSERT_NO_THROW(tokenizeAndStringify("struct a {\n"
                                              "  int c;\n"
                                              "  template <class b> void d(b e) const { c > e ? c : e; }\n"
                                              "};\n"));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkTemplates() {
@@ -7276,6 +7950,8 @@ class TestTokenizer : public TestFixture {
                                              "using b = c;\n"
                                              "template <> struct d<b> : d<a> {};\n"
                                              "template <> struct d<> : d<a> {};\n"));
+
+        ignore_errout();
     }
 
     void checkNamespaces() {
@@ -7370,6 +8046,13 @@ 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() {
         ASSERT_NO_THROW(tokenizeAndStringify("struct a {\n"
@@ -7435,7 +8118,7 @@ class TestTokenizer : public TestFixture {
                                              "  if (0) {}\n"
                                              "  return 0;\n"
                                              "};\n"));
-
+        ignore_errout();
     }
 
     void checkConditionBlock() {
@@ -7450,12 +8133,25 @@ class TestTokenizer : public TestFixture {
                                              "    const auto &bias = GEMM_CTX_ARG_STORAGE(bias);\n"
                                              "    auto &c = GEMM_CTX_ARG_STORAGE(c);\n"
                                              "}\n"));
+        ignore_errout(); // we do not care about the output
+    }
+
+    void checkRequires()
+    {
+        ASSERT_NO_THROW(tokenizeAndStringify("template<class T, class U>\n"
+                                             "struct X { X(U) requires true {} };\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("template<class T, class U>\n"
+                                             "struct X { X(U) requires bool{std::is_integral<T>{}} {} };\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("template <typename T>\n"
+                                             "struct test { operator int() requires true { return 0; } };\n"));
+        ASSERT_NO_THROW(tokenizeAndStringify("template <typename T>\n"
+                                             "struct test { operator int() requires bool{std::is_integral<T>{}} { return 0; } };\n"));
     }
 
     void noCrash1() {
         ASSERT_NO_THROW(tokenizeAndStringify(
                             "struct A {\n"
-                            "  A( const std::string &name = " " );\n"
+                            "  A( const std::string &name = \" \" );\n"
                             "};\n"
                             "A::A( const std::string &name ) { return; }\n"));
     }
@@ -7475,6 +8171,7 @@ class TestTokenizer : public TestFixture {
                             "template <> d<int>::d(const int &, a::b, double, double);\n"
                             "template <> d<int>::d(const d &) {}\n"
                             "template <> d<c>::d(const d &) {}\n"));
+        ignore_errout(); // we do not care about the output
     }
 
     void noCrash3() {
@@ -7487,6 +8184,7 @@ class TestTokenizer : public TestFixture {
                                              "    p = &(ref).value;\n"
                                              "    return result ;\n"
                                              "}\n"));
+        ignore_errout();
     }
 
     void noCrash5() { // #10603
@@ -7502,51 +8200,32 @@ class TestTokenizer : public TestFixture {
     }
 
     void noCrash7() {
-        ASSERT_THROW(tokenizeAndStringify("void g() {\n"// TODO: don't throw
-                                          "    for (using T = int; (T)false;) {}\n" // C++23 P2360R0: Extend init-statement to allow alias-declaration
-                                          "}\n"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("void g() {\n"// TODO: don't throw
+                                                   "    for (using T = int; (T)false;) {}\n" // C++23 P2360R0: Extend init-statement to allow alias-declaration
+                                                   "}\n"), SYNTAX);
     }
 
-    void checkConfig(const char code[]) {
-        errout.str("");
-
+    template<size_t size>
+    void checkConfig(const char (&code)[size]) {
         const Settings s = settingsBuilder().checkConfiguration().build();
 
         // tokenize..
-        Tokenizer tokenizer(&s, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(s, *this);
+        ASSERT(tokenizer.tokenize(code));
     }
 
     void checkConfiguration() {
-        ASSERT_THROW(checkConfig("void f() { DEBUG(x();y()); }"), InternalError);
-        //ASSERT_EQUALS("[test.cpp:1]: (information) Ensure that 'DEBUG' is defined either using -I, --include or -D.\n", errout.str());
+        ASSERT_THROW_INTERNAL_EQUALS(checkConfig("void f() { DEBUG(x();y()); }"),
+                                     UNKNOWN_MACRO,
+                                     "There is an unknown macro here somewhere. Configuration is required. If DEBUG is a macro then please configure it.");
     }
 
-    void unknownType() { // #8952
-        // Clear the error log
-        errout.str("");
-        const Settings settings = settingsBuilder().debugwarnings().build();
-
-        char code[] = "class A {\n"
-                      "public:\n"
-                      "    enum Type { Null };\n"
-                      "};\n"
-                      "using V = A;\n"
-                      "V::Type value;";
-
-        // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
-
-        tokenizer.printUnknownTypes();
-
-        ASSERT_EQUALS("", errout.str());
+    void unknownMacroBeforeReturn() {
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify("int f() { X return 0; }"), UNKNOWN_MACRO);
     }
 
-    void unknownMacroBeforeReturn() {
-        ASSERT_THROW(tokenizeAndStringify("int f() { X return 0; }"), InternalError);
+    void cppKeywordInCSource() {
+        ASSERT_NO_THROW(tokenizeAndStringify("int throw() {}", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void cppcast() {
@@ -7555,39 +8234,23 @@ class TestTokenizer : public TestFixture {
                             "a = reinterpret_cast<int>(x);\n"
                             "a = static_cast<int>(x);\n";
 
-        const Settings settings;
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT(tokenizer.tokenize(istr, "test.cpp"));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        ASSERT(tokenizer.tokenize(code));
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             ASSERT_EQUALS(tok->str() == "(", tok->isCast());
         }
     }
 
-    std::string checkHeaders(const char code[], bool checkHeadersFlag) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define checkHdrs(...) checkHdrs_(__FILE__, __LINE__, __VA_ARGS__)
+    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();
 
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
-
-        Preprocessor preprocessor(settings0);
-        preprocessor.setDirectives(tokens1);
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenizer..
-        Tokenizer tokenizer(&settings, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         return tokenizer.tokens()->stringifyList();
     }
@@ -7608,14 +8271,14 @@ class TestTokenizer : public TestFixture {
                       "4: void g<int> ( int x ) ;\n"
                       "5: } ;\n"
                       "4: void A :: g<int> ( int x ) { a = 2 ; }\n",
-                      checkHeaders(code, true));
+                      checkHdrs(code, true));
 
         ASSERT_EQUALS("\n\n##file 1\n\n"
                       "1:\n"
                       "|\n"
                       "4:\n"
                       "5: ;\n",
-                      checkHeaders(code, false));
+                      checkHdrs(code, false));
     }
 
     void removeExtraTemplateKeywords() {
@@ -7640,6 +8303,26 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS(expected, tokenizeAndStringify(code));
     }
 
+    void removeAlignas3() {
+        const char code[] = "alignas(16) int x;";
+        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, 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(Token::simpleMatch(tokenizer.tokens(), "int x ;"));
+        std::ostringstream ostr;
+        tokenizer.dump(ostr);
+        const std::string dump = ostr.str();
+        ASSERT(dump.find(" alignas=\"8\" alignas2=\"16\"") != std::string::npos);
+    }
+
     void simplifyCoroutines() {
         const Settings settings = settingsBuilder().cpp(Standards::CPP20).build();
 
@@ -7692,21 +8375,31 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("void f ( ) { if ( [ ] { ; } ) { } }", tokenizeAndStringify(code, settings));
     }
 
+    void newPlacementArgsCppInit() { // #13775
+        const char code[] = "::new(nullptr) int {};";
+        SimpleTokenizer tokenizer(settings1, *this);
+        tokenizer.tokenize(code);
+        const Token *inttok = Token::findsimplematch(tokenizer.tokens(), "int");
+        ASSERT(inttok);
+        const Token *brace = inttok->next();
+        ASSERT(brace);
+        ASSERT_EQUALS(brace->astOperand1(), inttok);
+        ASSERT_EQUALS(brace->astOperand2(), static_cast<const Token*>(nullptr));
+    }
+
     void cpp20_default_bitfield_initializer() {
         const Settings s1 = settingsBuilder().cpp(Standards::CPP20).build();
         const char code[] = "struct S { int a:2 = 0; };";
         ASSERT_EQUALS("struct S { int a ; a = 0 ; } ;", tokenizeAndStringify(code, s1));
         const Settings s2 = settingsBuilder().cpp(Standards::CPP17).build();
-        ASSERT_THROW(tokenizeAndStringify(code, s2), InternalError);
+        ASSERT_THROW_INTERNAL(tokenizeAndStringify(code, s2), SYNTAX);
     }
 
     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) {
-            const Settings settings;
-            Tokenizer tokenizer(&settings, this);
-            std::istringstream istr(code);
-            ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        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.data(), code.size()), file, line);
 
             const Token* tok = Token::findsimplematch(tokenizer.tokens(), find, strlen(find));
             ASSERT_LOC(tok, file, line);
@@ -7715,44 +8408,44 @@ class TestTokenizer : public TestFixture {
 
         testIsCpp11init("class X : public A<int>, C::D {};",
                         "D {",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("auto f() -> void {}",
                         "void {",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
         testIsCpp11init("auto f() & -> void {}",
                         "void {",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
         testIsCpp11init("auto f() const noexcept(false) -> void {}",
                         "void {",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
         testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
                         "{ return",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
         testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
                         "vector",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
         testIsCpp11init("auto f() -> std::vector<int> { return {}; }",
                         "std ::",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("class X{};",
                         "{ }",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
         testIsCpp11init("class X{}", // forgotten ; so not properly recognized as a class
                         "{ }",
-                        TokenImpl::Cpp11init::CPP11INIT);
+                        Token::Cpp11init::CPP11INIT);
 
         testIsCpp11init("namespace abc::def { TEST(a, b) {} }",
                         "{ TEST",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
         testIsCpp11init("namespace { TEST(a, b) {} }", // anonymous namespace
                         "{ TEST",
-                        TokenImpl::Cpp11init::NOINIT);
+                        Token::Cpp11init::NOINIT);
 
         testIsCpp11init("enum { e = decltype(s)::i };",
                         "{ 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"
@@ -7760,7 +8453,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"
@@ -7768,7 +8461,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"
@@ -7778,21 +8471,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"
@@ -7802,26 +8495,390 @@ 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);
 
         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"));
+        ASSERT_EQUALS("[test.cpp:2:22]: (debug) auto token with no type. [autoNoType]\n", errout_str());
         #undef testIsCpp11init
     }
+
+    void testDirectiveIncludeTypes() {
+        const char filedata[] = "#define macro some definition\n"
+                                "#undef macro\n"
+                                "#ifdef macro\n"
+                                "#elif some (complex) condition\n"
+                                "#else\n"
+                                "#endif\n"
+                                "#if some other condition\n"
+                                "#pragma some proprietary content\n"
+                                "#\n" /* may appear in old C code */
+                                "#ident some text\n" /* may appear in old C code */
+                                "#unknownmacro some unpredictable text\n"
+                                "#warning some warning message\n"
+                                "#error some error message\n";
+        const char dumpdata[] = "  <directivelist>\n"
+                                "    <directive file=\"test.c\" linenr=\"1\" str=\"#define macro some definition\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"define\"/>\n"
+                                "      <token column=\"9\" str=\"macro\"/>\n"
+                                "      <token column=\"15\" str=\"some\"/>\n"
+                                "      <token column=\"20\" str=\"definition\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"2\" str=\"#undef macro\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"undef\"/>\n"
+                                "      <token column=\"8\" str=\"macro\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#ifdef macro\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"ifdef\"/>\n"
+                                "      <token column=\"8\" str=\"macro\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"4\" str=\"#elif some (complex) condition\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"elif\"/>\n"
+                                "      <token column=\"7\" str=\"some\"/>\n"
+                                "      <token column=\"12\" str=\"(\"/>\n"
+                                "      <token column=\"13\" str=\"complex\"/>\n"
+                                "      <token column=\"20\" str=\")\"/>\n"
+                                "      <token column=\"22\" str=\"condition\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"5\" str=\"#else\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"else\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"6\" str=\"#endif\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"endif\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"7\" str=\"#if some other condition\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"if\"/>\n"
+                                "      <token column=\"5\" str=\"some\"/>\n"
+                                "      <token column=\"10\" str=\"other\"/>\n"
+                                "      <token column=\"16\" str=\"condition\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"8\" str=\"#pragma some proprietary content\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"pragma\"/>\n"
+                                "      <token column=\"9\" str=\"some\"/>\n"
+                                "      <token column=\"14\" str=\"proprietary\"/>\n"
+                                "      <token column=\"26\" str=\"content\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"9\" str=\"#\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"10\" str=\"#ident some text\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"ident\"/>\n"
+                                "      <token column=\"8\" str=\"some\"/>\n"
+                                "      <token column=\"13\" str=\"text\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"11\" str=\"#unknownmacro some unpredictable text\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"unknownmacro\"/>\n"
+                                "      <token column=\"15\" str=\"some\"/>\n"
+                                "      <token column=\"20\" str=\"unpredictable\"/>\n"
+                                "      <token column=\"34\" str=\"text\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"12\" str=\"#warning some warning message\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"warning\"/>\n"
+                                "      <token column=\"10\" str=\"some warning message\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"13\" str=\"#error some error message\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"error\"/>\n"
+                                "      <token column=\"8\" str=\"some error message\"/>\n"
+                                "    </directive>\n"
+                                "  </directivelist>\n"
+                                "  <tokenlist>\n"
+                                "  </tokenlist>\n";
+
+        std::ostringstream ostr;
+        directiveDump(filedata, ostr);
+        ASSERT_EQUALS(dumpdata, ostr.str());
+    }
+
+    void testDirectiveIncludeLocations() {
+        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"
+                                "#define macro5 val\n";
+        const char dumpdata[] = "  <directivelist>\n"
+                                "    <directive file=\"test.c\" linenr=\"1\" str=\"#define macro1 val\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"define\"/>\n"
+                                "      <token column=\"9\" str=\"macro1\"/>\n"
+                                "      <token column=\"16\" str=\"val\"/>\n"
+                                "    </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"
+                                "    </directive>\n"
+                                "    <directive file=\"inc1.h\" linenr=\"1\" str=\"#define macro2 val\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"define\"/>\n"
+                                "      <token column=\"9\" str=\"macro2\"/>\n"
+                                "      <token column=\"16\" str=\"val\"/>\n"
+                                "    </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"
+                                "    </directive>\n"
+                                "    <directive file=\"inc1.h\" linenr=\"3\" str=\"#define macro4 val\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"define\"/>\n"
+                                "      <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"
+                                "      <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"
+                                "  </directivelist>\n"
+                                "  <tokenlist>\n"
+                                "  </tokenlist>\n";
+        std::ostringstream ostr;
+        directiveDump(filedata, ostr);
+        ASSERT_EQUALS(dumpdata, ostr.str());
+    }
+
+    void testDirectiveIncludeComments() {
+        const char filedata[] = "#ifdef macro2 /* this will be removed */\n"
+                                "#else /* this will be removed too */\n"
+                                "#endif /* this will also be removed */\n";
+        const char dumpdata[] = "  <directivelist>\n"
+                                "    <directive file=\"test.c\" linenr=\"1\" str=\"#ifdef macro2\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"ifdef\"/>\n"
+                                "      <token column=\"8\" str=\"macro2\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"2\" str=\"#else\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"else\"/>\n"
+                                "    </directive>\n"
+                                "    <directive file=\"test.c\" linenr=\"3\" str=\"#endif\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"endif\"/>\n"
+                                "    </directive>\n"
+                                "  </directivelist>\n"
+                                "  <tokenlist>\n"
+                                "  </tokenlist>\n";
+
+        std::ostringstream ostr;
+        directiveDump(filedata, ostr);
+        ASSERT_EQUALS(dumpdata, ostr.str());
+    }
+
+    void testDirectiveRelativePath() {
+        const char filedata[] = "#define macro 1\n";
+        const char dumpdata[] = "  <directivelist>\n"
+                                "    <directive file=\"test.c\" linenr=\"1\" str=\"#define macro 1\">\n"
+                                "      <token column=\"1\" str=\"#\"/>\n"
+                                "      <token column=\"2\" str=\"define\"/>\n"
+                                "      <token column=\"9\" str=\"macro\"/>\n"
+                                "      <token column=\"15\" str=\"1\"/>\n"
+                                "    </directive>\n"
+                                "  </directivelist>\n"
+                                "  <tokenlist>\n"
+                                "  </tokenlist>\n";
+        std::ostringstream ostr;
+        Settings s;
+        s.relativePaths = true;
+        s.basePaths.emplace_back("/some/path");
+        directiveDump(filedata, "/some/path/test.c", s, ostr);
+        ASSERT_EQUALS(dumpdata, ostr.str());
+    }
+
+    void funcnameInParenthesis1() { // #13554
+        const char code[] = "void f(void) {\n"
+                            "  double result = (strtod)(\"NAN\", NULL);\n"
+                            "}\n";
+        SimpleTokenizer tokenizer(settings1, *this, false);
+        ASSERT_LOC(tokenizer.tokenize(code), __FILE__, __LINE__);
+        const Token *f = Token::findsimplematch(tokenizer.tokens(), "strtod");
+        ASSERT(f);
+        ASSERT(!f->previous()->isCast());
+    }
+
+    void funcnameInParenthesis2() { // #13578
+        const char code[] = "int f(double a, double b, double c) {\n"
+                            "    return static_cast<int>(std::ceil((std::min)(a, (std::min)(b, c))));\n"
+                            "}\n";
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), __FILE__, __LINE__);
+        const Token *f = Token::findsimplematch(tokenizer.tokens(), "min");
+        ASSERT(f);
+        const Token *par = f->next();
+        ASSERT(par);
+        ASSERT(Token::simpleMatch(par, "("));
+        ASSERT_EQUALS(par->astOperand1(), f->astParent() /* :: */);
+        ASSERT(Token::simpleMatch(par->astOperand2(), ","));
+    }
+
+    void funcnameInParenthesis3() { // #13585
+        const char code[] = "int f(int a, int b) {\n"
+                            "    return (a != 0) ? 1 : (std::min)(1, b);\n"
+                            "}\n";
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), __FILE__, __LINE__);
+        const Token *f = Token::findsimplematch(tokenizer.tokens(), "min");
+        ASSERT(f);
+        const Token *par = f->next();
+        ASSERT(par);
+        ASSERT(Token::simpleMatch(par, "("));
+        ASSERT_EQUALS(par->astOperand1(), f->astParent() /* :: */);
+        ASSERT(Token::simpleMatch(par->astOperand2(), ","));
+    }
+
+    void genericInIf() { // #13561
+        const char code[] = "  if (_Generic(s, char * : 1, const float * : (a ? b, c : d), volatile int * : 3, default : 0)) {}";
+        const char ast[] = "(( if (( _Generic (, (, (, (, s 1) (? a (: (, b c) d))) 3) 0)))";
+        ASSERT_EQUALS(ast, testAst(code, AstStyle::Z3));
+    }
+
+    void preincrementInLambda() { // #13312
+        const char code[] =
+            "void f(const std::vector<int>& v, int a) {\n"
+            "    std::for_each(v.begin(), v.end(), [&](int i)  {\n"
+            "        switch (i) {\n"
+            "        default:\n"
+            "            ++a;\n"
+            "        }\n"
+            "    });\n"
+            "}\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code));
+    }
+
+    void atomicCast() { // #12605
+        const char code[] = "int atomic_add_int(int *ptr, int v)\n"
+                            "{\n"
+                            "    return atomic_fetch_add((_Atomic(unsigned int) *)ptr, v) + v;\n"
+                            "}\n";
+        ASSERT_NO_THROW(tokenizeAndStringify(code, settingsDefault, false));
+    }
+
+    void constFunctionPtrTypedef() { // #12135
+        const char code[] = "struct S {\n"
+                            "    template<typename T> T g() {\n"
+                            "        return T();\n"
+                            "    }\n"
+                            "};\n"
+                            "void f() {\n"
+                            "    S s;\n"
+                            "    typedef void (*fp_t)();\n"
+                            "    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;"));
+    }
+
+    void simplifyPlatformTypes() {
+        {
+            const char code[] = "size_t f();";
+            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix32)));
+            ASSERT_EQUALS("unsigned long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix64)));
+        }
+        {
+            const char code[] = "ssize_t f();";
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix32)));
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix64)));
+        }
+        {
+            const char code[] = "std::ptrdiff_t f();";
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix32)));
+            ASSERT_EQUALS("long f ( ) ;", tokenizeAndStringify(code, dinit(TokenizeOptions, $.platform = Platform::Type::Unix64)));
+        }
+    }
+
+    void dumpFallthrough() {
+        const char code[] = "void f(int n) {\n"
+                            "    void g(), h(), i();\n"
+                            "    switch (n) {\n"
+                            "        case 1:\n"
+                            "        case 2:\n"
+                            "            g();\n"
+                            "            [[fallthrough]];\n"
+                            "        case 3:\n"
+                            "            h();\n"
+                            "            break;\n"
+                            "        default:\n"
+                            "            i();\n"
+                            "            break;\n"
+                            "    }\n"
+                            "}";
+        SimpleTokenizer tokenizer(settingsDefault, *this, false);
+        ASSERT(tokenizer.tokenize(code));
+        std::ostringstream ostr;
+        tokenizer.dump(ostr);
+        const std::string dump = ostr.str();
+        ASSERT(dump.find(" isAttributeFallthrough=\"true\"") != std::string::npos);
+    }
+
+    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));
+    }
+
+    void simplifyEnum1() {
+        const char code[] = "static enum {A,B} ab;";
+        ASSERT_EQUALS("enum Anonymous0 { A , B } ; static enum Anonymous0 ab ;", tokenizeAndStringify(code));
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        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 simplifyEnum2() {
+        const char code[] = "enum AB {A,B}; enum AB static ab; ";
+        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(TestTokenizer)
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
index 2198036838b..4e658743f92 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-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
@@ -18,40 +18,48 @@
 
 #include "settings.h"
 #include "fixture.h"
+#include "helpers.h"
+#include "path.h"
 #include "platform.h"
+#include "preprocessor.h"
+#include "standards.h"
 #include "token.h"
 #include "tokenlist.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <stack>
 #include <string>
+#include <utility>
+#include <vector>
+
+#include <simplecpp.h>
 
 class TestTokenList : public TestFixture {
 public:
-    TestTokenList() : TestFixture("TestTokenList") {}
+    TestTokenList() : TestFixture("TestTokenList")
+    {}
 
 private:
-    const Settings settings;
-
     void run() override {
         TEST_CASE(testaddtoken1);
         TEST_CASE(testaddtoken2);
         TEST_CASE(inc);
         TEST_CASE(isKeyword);
+        TEST_CASE(notokens);
+        TEST_CASE(ast1);
     }
 
     // inspired by #5895
     void testaddtoken1() const {
         const std::string code = "0x89504e470d0a1a0a";
-        TokenList tokenlist(&settings);
+        TokenList tokenlist(settingsDefault, Standards::Language::CPP);
         tokenlist.addtoken(code, 1, 1, false);
         ASSERT_EQUALS("0x89504e470d0a1a0a", tokenlist.front()->str());
     }
 
     void testaddtoken2() const {
         const std::string code = "0xF0000000";
-        Settings settings1;
-        settings1.platform.int_bit = 32;
-        TokenList tokenlist(&settings1);
+        const Settings settings1 = dinit(Settings, $.platform.int_bit = 32);
+        TokenList tokenlist(settings1, Standards::Language::CPP);
         tokenlist.addtoken(code, 1, 1, false);
         ASSERT_EQUALS("0xF0000000", tokenlist.front()->str());
     }
@@ -59,13 +67,7 @@ class TestTokenList : public TestFixture {
     void inc() const {
         const char code[] = "a++1;1++b;";
 
-        errout.str("");
-
-        // tokenize..
-        TokenList tokenlist(&settings);
-        std::istringstream istr(code);
-        tokenlist.createTokens(istr, "a.cpp");
-
+        const SimpleTokenList tokenlist(code);
         ASSERT(Token::simpleMatch(tokenlist.front(), "a + + 1 ; 1 + + b ;"));
     }
 
@@ -74,9 +76,7 @@ class TestTokenList : public TestFixture {
         const char code[] = "for a int delete true";
 
         {
-            TokenList tokenlist(&settings);
-            std::istringstream istr(code);
-            tokenlist.createTokens(istr, "a.c");
+            const SimpleTokenList tokenlist(code, Standards::Language::C);
 
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
             ASSERT_EQUALS(true, tokenlist.front()->isControlFlowKeyword());
@@ -92,9 +92,7 @@ class TestTokenList : public TestFixture {
             ASSERT_EQUALS(false, tokenlist.front()->tokAt(4)->isControlFlowKeyword());
         }
         {
-            TokenList tokenlist(&settings);
-            std::istringstream istr(code);
-            tokenlist.createTokens(istr, "a.cpp");
+            const SimpleTokenList tokenlist(code);
 
             ASSERT_EQUALS(true, tokenlist.front()->isKeyword());
             ASSERT_EQUALS(true, tokenlist.front()->isControlFlowKeyword());
@@ -109,6 +107,85 @@ class TestTokenList : public TestFixture {
             ASSERT_EQUALS(true, tokenlist.front()->tokAt(4)->isLiteral());
             ASSERT_EQUALS(false, tokenlist.front()->tokAt(4)->isControlFlowKeyword());
         }
+
+        {
+            const char code2[] = "_Generic"; // C11 keyword
+            const SimpleTokenList tokenlist(code2); // default settings use latest standard
+            ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
+        }
+
+        {
+            const char code2[] = "_Generic"; // 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 Settings s = settingsBuilder().c(Standards::C89).build();
+            TokenList tokenlist(s, Standards::Language::C);
+            tokenlist.appendFileIfNew("a.c");
+            ASSERT(tokenlist.createTokensFromString(code2));
+            ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
+        }
+
+        {
+            const char code2[] = "co_return"; // 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 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 Settings s = settingsBuilder().cpp(Standards::CPP03).build();
+            TokenList tokenlist(s, Standards::Language::CPP);
+            tokenlist.appendFileIfNew("a.cpp");
+            ASSERT(tokenlist.createTokensFromString(code2));
+            ASSERT_EQUALS(false, tokenlist.front()->isKeyword());
+        }
+    }
+
+    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::vector<std::string> files;
+        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 char code[] = "('Release|x64' == 'Release|x64');";
+
+        TokenList tokenlist(settingsDefault, Standards::Language::C);
+        ASSERT(tokenlist.createTokensFromString(code));
+        // TODO: put this logic in TokenList
+        // 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();
+                }
+            }
+        }
+        tokenlist.createAst(); // do not crash
     }
 };
 
diff --git a/test/testtokenrange.cpp b/test/testtokenrange.cpp
index 2598c832847..e27e6c5b038 100644
--- a/test/testtokenrange.cpp
+++ b/test/testtokenrange.cpp
@@ -1,6 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2023 Cppcheck team.
+ * 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
@@ -16,11 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "settings.h"
 #include "fixture.h"
+#include "helpers.h"
 #include "token.h"
-#include "tokenize.h"
-#include "tokenlist.h"
 #include "tokenrange.h"
 #include "symboldatabase.h"
 
@@ -69,57 +67,51 @@ class TestTokenRange : public TestFixture {
     }
 
     void enumerationToEnd() const {
-        std::istringstream istr("void a(){} void main(){ if(true){a();} }");
-        TokenList tokenList(nullptr);
-        tokenList.createTokens(istr, "test.cpp");
+        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const SimpleTokenList tokenList(code);
         ASSERT_EQUALS("", testTokenRange(ConstTokenRange{ tokenList.front(), nullptr }, tokenList.front(), nullptr));
     }
 
     void untilHelperToEnd() const {
-        std::istringstream istr("void a(){} void main(){ if(true){a();} }");
-        TokenList tokenList(nullptr);
-        tokenList.createTokens(istr, "test.cpp");
+        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const SimpleTokenList tokenList(code);
         ASSERT_EQUALS("", testTokenRange(tokenList.front()->until(nullptr), tokenList.front(), nullptr));
     }
 
     void untilHelperPartWay() const {
-        std::istringstream istr("void a(){} void main(){ if(true){a();} }");
-        TokenList tokenList(nullptr);
-        tokenList.createTokens(istr, "test.cpp");
+        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const SimpleTokenList tokenList(code);
         const Token* start = tokenList.front()->tokAt(4);
         const Token* end = start->tokAt(8);
         ASSERT_EQUALS("", testTokenRange(start->until(end), start, end));
     }
 
     void partialEnumeration() const {
-        std::istringstream istr("void a(){} void main(){ if(true){a();} }");
-        TokenList tokenList(nullptr);
-        tokenList.createTokens(istr, "test.cpp");
+        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const SimpleTokenList tokenList(code);
         const Token* start = tokenList.front()->tokAt(4);
         const Token* end = tokenList.front()->tokAt(10);
         ASSERT_EQUALS("", testTokenRange(ConstTokenRange{ start, end }, start, end));
     }
 
-    void scopeExample() const {
-        const Settings settings;
-        Tokenizer tokenizer{ &settings, nullptr };
-        std::istringstream sample("void a(){} void main(){ if(true){a();} }");
-        ASSERT(tokenizer.tokenize(sample, "test.cpp"));
+    void scopeExample() {
+        SimpleTokenizer tokenizer(settingsDefault, *this);
+        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        ASSERT(tokenizer.tokenize(code));
 
         const SymbolDatabase* sd = tokenizer.getSymbolDatabase();
         const Scope& scope = *std::next(sd->scopeList.cbegin(), 3); //The scope of the if block
 
-        std::ostringstream contents;
+        std::string contents;
         for (const Token* t : ConstTokenRange{ scope.bodyStart->next(), scope.bodyEnd }) {
-            contents << t->str();
+            contents += t->str();
         }
-        ASSERT_EQUALS("a();", contents.str());
+        ASSERT_EQUALS("a();", contents);
     }
 
     void exampleAlgorithms() const {
-        std::istringstream istr("void a(){} void main(){ if(true){a();} }");
-        TokenList tokenList(nullptr);
-        tokenList.createTokens(istr, "test.cpp");
+        const char code[] = "void a(){} void main(){ if(true){a();} }";
+        const SimpleTokenList tokenList(code);
         ConstTokenRange range{ tokenList.front(), nullptr };
         ASSERT_EQUALS(true, std::all_of(range.begin(), range.end(), [](const Token*) {
             return true;
diff --git a/test/testtype.cpp b/test/testtype.cpp
index b8a60e4c813..bf36182c59a 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-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
@@ -18,14 +18,13 @@
 
 #include "checktype.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <list>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
 
 class TestType : public TestFixture {
@@ -37,46 +36,83 @@ class TestType : public TestFixture {
 
     void run() override {
         TEST_CASE(checkTooBigShift_Unix32);
+        mNewTemplate = true;
         TEST_CASE(checkIntegerOverflow);
         TEST_CASE(signConversion);
         TEST_CASE(longCastAssign);
         TEST_CASE(longCastReturn);
         TEST_CASE(checkFloatToIntegerOverflow);
+        TEST_CASE(integerOverflow); // #11794
+        TEST_CASE(shiftTooManyBits); // #11496
     }
 
+    struct CheckOptions
+    {
+        const Settings* settings = nullptr; // TODO: split from this
+        Standards::cppstd_t standard = Standards::cppstd_t::CPP11;
+    };
+
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], const Settings& settings, const char filename[] = "test.cpp", Standards::cppstd_t standard = Standards::cppstd_t::CPP11) {
-        // Clear the error buffer..
-        errout.str("");
+    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.settings ? *options.settings : settingsDefault).severity(Severity::warning).severity(Severity::portability).cpp(options.standard).build();
+
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
+
+        // Check..
+        runChecks<CheckType>(tokenizer, this);
+    }
 
-        const Settings settings1 = settingsBuilder(settings).severity(Severity::warning).severity(Severity::portability).cpp(standard).build();
+    // TODO: get rid of this
+    void check_(const char* file, int line, const std::string& code, const CheckOptions& options = make_default_obj()) {
+        const Settings settings1 = settingsBuilder(options.settings ? *options.settings : settingsDefault).severity(Severity::warning).severity(Severity::portability).cpp(options.standard).build();
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        SimpleTokenizer tokenizer(settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        runChecks<CheckType>(&tokenizer, &settings1, this);
+        runChecks<CheckType>(tokenizer, this);
+    }
+
+    struct CheckPOptions
+    {
+        const Settings* settings = nullptr;
+        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()) {
+        const Settings settings1 = settingsBuilder(options.settings ? *options.settings : settingsDefault).severity(Severity::warning).severity(Severity::portability).build();
+
+        SimpleTokenizer2 tokenizer(settings1, *this, code, options.cpp ? "test.cpp" : "test.c");
+
+        // Tokenizer..
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
+
+        // Check..
+        runChecks<CheckType>(tokenizer, this);
     }
 
     void checkTooBigShift_Unix32() {
-        const Settings settings0;
-        const Settings settings = settingsBuilder().platform(cppcheck::Platform::Type::Unix32).build();
+        const Settings settings = settingsBuilder().platform(Platform::Type::Unix32).build();
 
         // 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"};
             for (const std::string& type : types) {
-                check((type + " f(" + type +" x) { return x << 31; }").c_str(), settings);
-                ASSERT_EQUALS("", errout.str());
-                check((type + " f(" + type +" x) { return x << 33; }").c_str(), 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); }").c_str(), 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; }").c_str(), settings);
-                ASSERT_EQUALS("", errout.str());
+                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());
             }
         }
         // signed types getting promoted to int sizeof(int) = 4 bytes
@@ -85,84 +121,84 @@ 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; }").c_str(), 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); }").c_str(), 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; }").c_str(), 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; }").c_str(), 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("[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));
+                ASSERT_EQUALS("", errout_str());
 
                 // c++14
-                check((type + " foo(" + type + " x) { return x << 31; }").c_str(), settings, "test.cpp", Standards::cppstd_t::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); }").c_str(), settings, "test.cpp", Standards::cppstd_t::CPP14);
-                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, $.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));
+                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; }",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); }",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; }",settings);
-            ASSERT_EQUALS("", errout.str());
+            check("unsigned long long foo(unsigned long long x) { return x << 64; }",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));
+            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));
+            ASSERT_EQUALS("", errout_str());
             // [signed] long long
-            check("long long foo(long long x) { return x << 64; }",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); }",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; }",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; }",settings);
-            ASSERT_EQUALS("", errout.str());
+            check("long long foo(long long x) { return x << 64; }",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));
+            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));
+            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));
+            ASSERT_EQUALS("", errout_str());
             // signed long long
-            check("signed long long foo(signed long long x) { return x << 64; }",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); }",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; }",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; }",settings);
-            ASSERT_EQUALS("", errout.str());
+            check("signed long long foo(signed long long x) { return x << 64; }",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));
+            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));
+            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));
+            ASSERT_EQUALS("", errout_str());
 
             // c++14
-            check("signed long long foo(signed long long x) { return x << 64; }",settings, "test.cpp", Standards::cppstd_t::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); }",settings, "test.cpp", Standards::cppstd_t::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; }",settings, "test.cpp", Standards::cppstd_t::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; }",settings);
-            ASSERT_EQUALS("", errout.str());
+            check("signed long long foo(signed long long x) { return x << 64; }", 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));
+            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));
+            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));
+            ASSERT_EQUALS("", errout_str());
         }
 
-        check("void f() { int x; x = 1 >> 64; }", settings);
-        ASSERT_EQUALS("[test.cpp:1]: (error) Shifting 32-bit value by 64 bits is undefined behaviour\n", errout.str());
+        check("void f() { int x; x = 1 >> 64; }", 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"
-              "}", settings);
-        ASSERT_EQUALS("", errout.str());
+              "}", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #6793
         check("template<unsigned int I> int foo(unsigned int x) { return x << I; }\n"
               "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);", settings);
+              "const unsigned int h = hoo<100>(0);", 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());
+                      "[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"
-              "}", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         // #8640
         check("int f (void)\n"
@@ -171,9 +207,9 @@ 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"
-              "}", settings0);
+              "}");
         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());
+                      "[test.cpp:5]: (error) Signed integer overflow for expression 'a<<shift[0]'.\n", errout_str());
 
         // #8885
         check("int f(int k, int rm) {\n"
@@ -182,10 +218,10 @@ class TestType : public TestFixture {
               "  if (k > 32)\n"
               "    return 0;\n"
               "  return rm>> k;\n"
-              "}", settings0);
+              "}");
         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());
+            errout_str());
 
         check("int f(int k, int rm) {\n"
               "  if (k == 0 || k == 32)\n"
@@ -194,10 +230,10 @@ class TestType : public TestFixture {
               "    return 0;\n"
               "  else\n"
               "    return rm>> k;\n"
-              "}", settings0);
+              "}");
         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());
+            errout_str());
 
         check("int f(int k, int rm) {\n"
               "  if (k == 0 || k == 32 || k == 31)\n"
@@ -206,21 +242,21 @@ class TestType : public TestFixture {
               "    return 0;\n"
               "  else\n"
               "    return rm>> k;\n"
-              "}", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        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"
-              "}", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("bool f() {\n"
               "    std::ofstream outfile;\n"
               "    outfile << vec_points[0](0) << static_cast<int>(d) << ' ';\n"
-              "}", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "}");
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(unsigned b, int len, unsigned char rem) {\n" // #10773
               "    int bits = 0;\n"
@@ -230,143 +266,210 @@ class TestType : public TestFixture {
               "        if (bits == 512)\n"
               "            len -= 8;\n"
               "    }\n"
-              "}\n", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkIntegerOverflow() {
-        const Settings settings = settingsBuilder().severity(Severity::warning).platform(cppcheck::Platform::Type::Unix32).build();
+        const Settings settings = settingsBuilder().severity(Severity::warning).platform(Platform::Type::Unix32).build();
 
-        check("x = (int)0x10000 * (int)0x10000;", settings);
-        ASSERT_EQUALS("[test.cpp:1]: (error) Signed integer overflow for expression '(int)0x10000*(int)0x10000'.\n", errout.str());
+        check("x = (int)0x10000 * (int)0x10000;", 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;", settings);
-        ASSERT_EQUALS("[test.cpp:1]: (error) Signed integer overflow for expression '(long)0x10000*(long)0x10000'.\n", errout.str());
+        check("x = (long)0x10000 * (long)0x10000;", 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"
-              "}",settings);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Signed integer overflow for expression 'intmax+1'.\n", errout.str());
+              "}",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"
-              "}",settings);
-        ASSERT_EQUALS("", errout.str());
+              "}",dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
         check("int foo(signed int x) {\n"
               "   if (x==123456) {}\n"
               "   return x * x;\n"
-              "}",settings);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'x==123456' is redundant or there is signed integer overflow for expression 'x*x'.\n", errout.str());
+              "}",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"
-              "}",settings);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Either the condition 'x==123456' is redundant or there is signed integer overflow for expression '-123456*x'.\n", errout.str());
+              "}",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"
-              "}",settings);
-        ASSERT_EQUALS("", errout.str());
+              "}",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));
+        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
+              "    int n = 0;\n"
+              "    for (int i = 0; i < 10; i++) {\n"
+              "        n = n * 47163 - 57412;\n"
+              "    }\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());
     }
 
     void signConversion() {
-        const Settings settings0;
-        const Settings settings = settingsBuilder().platform(cppcheck::Platform::Type::Unix64).build();
-        check("x = -4 * (unsigned)y;", settings0);
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Expression '-4' has a negative value. That is converted to an unsigned value and used in an unsigned calculation.\n", errout.str());
+        const Settings settings = settingsBuilder().platform(Platform::Type::Unix64).build();
+        check("x = -4 * (unsigned)y;");
+        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;", settings0);
-        ASSERT_EQUALS("[test.cpp:1]: (warning) Expression '-4' has a negative value. That is converted to an unsigned value and used in an unsigned calculation.\n", errout.str());
+        check("x = (unsigned)y * -4;");
+        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"
-              "}", settings);
-        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:3]: (warning) Expression 'x-1' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation.\n", errout.str());
+              "}", 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); }", settings0);
+              "void f2() { f1(-4,4); }");
         ASSERT_EQUALS(
-            "[test.cpp:1]: (warning) Expression 'x' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation.\n",
-            errout.str());
+            "[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());
 
         check("unsigned int f1(int x) {"
               "  return x * 5U;\n"
               "}\n"
-              "void f2() { f1(-4); }", settings0);
+              "void f2() { f1(-4); }");
         ASSERT_EQUALS(
-            "[test.cpp:1]: (warning) Expression 'x' can have a negative value. That is converted to an unsigned value and used in an unsigned calculation.\n",
-            errout.str());
+            "[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());
 
         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); }", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "void f2() { f1(-4); }");
+        ASSERT_EQUALS("", errout_str());
 
         // Don't warn for + and -
         check("void f1(int x) {"
               "  a = x + 5U;\n"
               "}\n"
-              "void f2() { f1(-4); }", settings0);
-        ASSERT_EQUALS("", errout.str());
+              "void f2() { f1(-4); }");
+        ASSERT_EQUALS("", errout_str());
 
         check("size_t foo(size_t x) {\n"
               " return -2 * x;\n"
-              "}", settings0);
-        ASSERT_EQUALS("[test.cpp:2]: (warning) Expression '-2' has a negative value. That is converted to an unsigned value and used in an unsigned calculation.\n", errout.str());
+              "}");
+        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
+               "    if (LLONG_MIN / (-1)) {}\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void longCastAssign() {
-        const Settings settings = settingsBuilder().severity(Severity::style).platform(cppcheck::Platform::Type::Unix64).build();
+        const Settings settings = settingsBuilder().severity(Severity::style).platform(Platform::Type::Unix64).build();
+        const Settings settingsWin = settingsBuilder().severity(Severity::style).platform(Platform::Type::Win64).build();
+
+        const char code[] = "long f(int x, int y) {\n"
+                            "  const long ret = x * y;\n"
+                            "  return ret;\n"
+                            "}\n";
+        check(code, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:2:18]: (style) int result is assigned to long variable. If the variable is long to avoid loss of information, then you have loss of information. [truncLongCastAssignment]\n", errout_str());
+        check(code, dinit(CheckOptions, $.settings = &settingsWin));
+        ASSERT_EQUALS("", errout_str());
 
         check("long f(int x, int y) {\n"
-              "  const long ret = x * y;\n"
+              "  long ret = x * y;\n"
               "  return ret;\n"
-              "}\n", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (style) int result is assigned to long variable. If the variable is long to avoid loss of information, then you have loss of information.\n", errout.str());
+              "}\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:2:12]: (style) int result is assigned to long variable. If the variable is long to avoid loss of information, then you have loss of information. [truncLongCastAssignment]\n", errout_str());
 
         check("long f() {\n"
               "  const long long ret = 256 * (1 << 10);\n"
               "  return ret;\n"
-              "}\n", settings);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
         // typedef
         check("long f(int x, int y) {\n"
               "  const size_t ret = x * y;\n"
               "  return ret;\n"
-              "}\n", settings);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
 
         // astIsIntResult
         check("long f(int x, int y) {\n"
               "  const long ret = (long)x * y;\n"
               "  return ret;\n"
-              "}\n", settings);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
+
+        check("double g(float f) {\n"
+              "    return f * f;\n"
+              "}\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:2:5]: (style) float result is returned as double value. If the return value is double to avoid loss of information, then you have loss of information. [truncLongCastReturn]\n",
+                      errout_str());
+
+        check("void f(int* p) {\n" // #11862
+              "    long long j = *(p++);\n"
+              "}\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str());
+
+        check("template <class T>\n" // #12393
+              "struct S {\n"
+              "    S& operator=(const S&) { return *this; }\n"
+              "    struct U {\n"
+              "        S<T>* p;\n"
+              "    };\n"
+              "    U u;\n"
+              "};\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("", errout_str()); // don't crash
+
+        check("void f(long& r, long i) {\n"
+              "    r = 1 << i;\n"
+              "}\n", dinit(CheckOptions, $.settings = &settingsWin));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void longCastReturn() {
-        const Settings settings = settingsBuilder().severity(Severity::style).build();
-
-        check("long f(int x, int y) {\n"
-              "  return x * y;\n"
-              "}\n", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (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.\n", errout.str());
+        const Settings settings = settingsBuilder().severity(Severity::style).platform(Platform::Type::Unix64).build();
+        const Settings settingsWin = settingsBuilder().severity(Severity::style).platform(Platform::Type::Win64).build();
+
+        const char code[] = "long f(int x, int y) {\n"
+                            "  return x * y;\n"
+                            "}\n";
+        check(code, dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:2:3]: (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());
+        check(code, dinit(CheckOptions, $.settings = &settingsWin));
+        ASSERT_EQUALS("", errout_str());
+
+        const char code2[] = "long long f(int x, int y) {\n"
+                             "  return x * y;\n"
+                             "}\n";
+        check(code2, dinit(CheckOptions, $.settings = &settings));
+        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());
+        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());
 
         // typedef
         check("size_t f(int x, int y) {\n"
               "  return x * y;\n"
-              "}\n", settings);
-        ASSERT_EQUALS("", errout.str());
+              "}\n", dinit(CheckOptions, $.settings = &settings));
+        ASSERT_EQUALS("[test.cpp:2:3]: (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());
     }
 
     // This function ensure that test works with different compilers. Floats can
@@ -380,44 +483,132 @@ class TestType : public TestFixture {
     }
 
     void checkFloatToIntegerOverflow() {
-        const Settings settings;
-        check("x = (int)1E100;", settings);
-        ASSERT_EQUALS("[test.cpp:1]: (error) Undefined behaviour: float () to integer conversion overflow.\n", removeFloat(errout.str()));
+        check("x = (int)1E100;");
+        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"
-              "}", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Undefined behaviour: float () to integer conversion overflow.\n", removeFloat(errout.str()));
+              "}");
+        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"
-              "}", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Undefined behaviour: float () to integer conversion overflow.\n", removeFloat(errout.str()));
+              "}");
+        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"
-              "}", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Undefined behaviour: float () to integer conversion overflow.\n", removeFloat(errout.str()));
+              "}");
+        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"
-              "}", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Undefined behaviour: float () to integer conversion overflow.\n", removeFloat(errout.str()));
+              "}");
+        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"
-              "}", settings);
-        ASSERT_EQUALS("", removeFloat(errout.str()));
+              "}");
+        ASSERT_EQUALS("", removeFloat(errout_str()));
 
         check("void f(void) {\n"
               "  char c = 1234.5;\n"
-              "}", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Undefined behaviour: float () to integer conversion overflow.\n", removeFloat(errout.str()));
+              "}");
+        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"
-              "}", settings);
-        ASSERT_EQUALS("[test.cpp:2]: (error) Undefined behaviour: float () to integer conversion overflow.\n", removeFloat(errout.str()));
+              "}");
+        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
+               "void f()\n"
+               "{\n"
+               "    unsigned short u = TEST(true, 75000.0);\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("#define TEST(b, f) b ? 5000 : (unsigned short)f\n"
+               "void f()\n"
+               "{\n"
+               "    unsigned short u = TEST(false, 75000.0);\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:4:24]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
+
+        check( "bool f(unsigned short x);\n"
+               "bool g() {\n"
+               "    return false && f((unsigned short)75000.0);\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check( "bool f(unsigned short x);\n"
+               "bool g() {\n"
+               "    return true && f((unsigned short)75000.0);\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:3:22]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
+
+        check( "bool f(unsigned short x);\n"
+               "bool g() {\n"
+               "    return true || f((unsigned short)75000.0);\n"
+               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check( "bool f(unsigned short x);\n"
+               "bool g() {\n"
+               "    return false || f((unsigned short)75000.0);\n"
+               "}\n");
+        ASSERT_EQUALS("[test.cpp:3:23]: (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
+               "void f()\n"
+               "{\n"
+               "    unsigned short u = TEST(true, 75000.0);\n"
+               "}\n", dinit(CheckPOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
+
+        checkP("#define TEST(b, f) b ? 5000 : (unsigned short)f\n"
+               "void f()\n"
+               "{\n"
+               "    unsigned short u = TEST(false, 75000.0);\n"
+               "}\n", dinit(CheckPOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:4:24]: (error) Undefined behaviour: float () to integer conversion overflow. [floatConversionOverflow]\n", removeFloat(errout_str()));
+
+    }
+
+    void integerOverflow() { // #11794
+        // std.cfg for int32_t
+        // Platform::Unix32 for INT_MIN=-2147483648 and INT32_MAX=2147483647
+        const Settings s = settingsBuilder().library("std.cfg").cpp(Standards::CPP11).platform(Platform::Unix32).build();
+
+        checkP("int fun(int x)\n"
+               "{\n"
+               "  if(x < 0) x = -x;\n"
+               "  return x >= 0;\n"
+               "}\n"
+               "int f()\n"
+               "{\n"
+               "    fun(INT_MIN);\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));
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Signed integer overflow for expression 'i<<2'. [integerOverflow]\n", errout_str());
+    }
+
+    void shiftTooManyBits() { // #11496
+        check("template<unsigned int width> struct B {\n"
+              "    unsigned long long f(unsigned int n) const {\n"
+              "        if (width == 1)\n"
+              "            return 1ULL << width;\n"
+              "        return 0;\n"
+              "    }\n"
+              "};\n"
+              "static B<64> b;\n");
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 520336e3899..b3c988e5b00 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-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
@@ -19,17 +19,14 @@
 #include "check.h"
 #include "checkuninitvar.h"
 #include "ctu.h"
-#include "errortypes.h"
-#include "library.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
+#include <cstddef>
 #include <list>
-#include <sstream>
 #include <string>
 
-
 class TestUninitVar : public TestFixture {
 public:
     TestUninitVar() : TestFixture("TestUninitVar") {}
@@ -38,6 +35,7 @@ class TestUninitVar : public TestFixture {
     const Settings settings = settingsBuilder().library("std.cfg").build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(uninitvar1);
         TEST_CASE(uninitvar_warn_once); // only write 1 warning at a time
         TEST_CASE(uninitvar_decl);      // handling various types in C and C++ files
@@ -61,10 +59,12 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(uninitvar3);          // #3844
         TEST_CASE(uninitvar4);          // #3869 (reference)
         TEST_CASE(uninitvar5);          // #3861
+        TEST_CASE(uninitvar6);          // #13227
         TEST_CASE(uninitvar2_func);     // function calls
         TEST_CASE(uninitvar2_value);    // value flow
         TEST_CASE(valueFlowUninit2_value);
         TEST_CASE(valueFlowUninit_uninitvar2);
+        TEST_CASE(valueFlowUninit_functioncall);
         TEST_CASE(uninitStructMember);  // struct members
         TEST_CASE(uninitvar2_while);
         TEST_CASE(uninitvar2_4494);      // #4494
@@ -75,6 +75,7 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(uninitvar11); // ticket #9123
         TEST_CASE(uninitvar12); // #10218 - stream read
         TEST_CASE(uninitvar13); // #9772
+        TEST_CASE(uninitvar14);
         TEST_CASE(uninitvar_unconditionalTry);
         TEST_CASE(uninitvar_funcptr); // #6404
         TEST_CASE(uninitvar_operator); // #6680
@@ -91,6 +92,7 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(valueFlowUninitTest);
         TEST_CASE(valueFlowUninitBreak);
         TEST_CASE(valueFlowUninitStructMembers);
+        TEST_CASE(valueFlowUninitForLoop);
         TEST_CASE(uninitvar_ipa);
         TEST_CASE(uninitvar_memberfunction);
         TEST_CASE(uninitvar_nonmember); // crash in ycmd test
@@ -105,23 +107,37 @@ class TestUninitVar : public TestFixture {
         TEST_CASE(ctuTest);
     }
 
-#define checkUninitVar(...) checkUninitVar_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkUninitVar_(const char* file, int line, const char code[], const char fname[] = "test.cpp", bool debugwarnings = false, const Settings *s = nullptr) {
-        // Clear the error buffer..
-        errout.str("");
+    struct CheckUninitVarOptions
+    {
+        bool cpp = true;
+    };
 
-        const Settings settings1 = settingsBuilder(s ? *s : settings).debugwarnings(debugwarnings).build();
+#define checkUninitVar(...) checkUninitVar_(__FILE__, __LINE__, __VA_ARGS__)
+    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..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, fname), file, line);
+    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..
         CheckUninitVar 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, &settings, this);
+        checkuninitvar.check();
+    }
+
     void uninitvar1() {
         // extracttests.start: int b; int c;
 
@@ -130,13 +146,13 @@ class TestUninitVar : public TestFixture {
                        "    int a;\n"
                        "    b = c - a;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // Ticket #6455 - some compilers allow const variables to be uninitialized
         // extracttests.disable
@@ -144,27 +160,27 @@ class TestUninitVar : public TestFixture {
                        "    const int a;\n"
                        "    b = c - a;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    int *p = NULL;\n"
                        "    realloc(p,10);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // dereferencing uninitialized pointer..
         // extracttests.start: struct Foo { void abcd(); };
@@ -173,7 +189,7 @@ class TestUninitVar : public TestFixture {
                        "    Foo *p;\n"
                        "    p->abcd();\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: template<class T> struct Foo { void abcd(); };
         checkUninitVar("static void foo()\n"
@@ -181,7 +197,7 @@ class TestUninitVar : public TestFixture {
                        "    Foo<int> *p;\n"
                        "    p->abcd();\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Foo { void* a; };
         checkUninitVar("void f(Foo *p)\n"
@@ -189,90 +205,90 @@ class TestUninitVar : public TestFixture {
                        "    int a;\n"
                        "    p->a = malloc(4 * a);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int *x;\n"
                        "    int *&y = x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    int x = xyz::x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a;\n"
                        "    a = 5 + a;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    int a;\n"
                        "    a++;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void bar(int);
         checkUninitVar("void f()\n"
@@ -280,28 +296,28 @@ class TestUninitVar : public TestFixture {
                        "    int a;\n"
                        "    bar(4 * a);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: i\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: i\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:29]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
                        "{\n"
@@ -310,7 +326,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "    i++;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
@@ -318,21 +334,21 @@ class TestUninitVar : public TestFixture {
                        "    int i;\n"
                        "    ar[i] = 0;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:8]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    int x, y;\n"
                        "    x = (y = 10);\n"
                        "    int z = y * 2;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo() {\n"
                        "    int x, y;\n"
                        "    x = ((y) = 10);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #3597
         checkUninitVar("void f() {\n"
@@ -340,27 +356,27 @@ class TestUninitVar : public TestFixture {
                        "    int b = 1;\n"
                        "    (b += a) = 1;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a\n", errout.str());
+        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"
-                       "}", "test.cpp", /*debugwarnings=*/ false);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: c\n", errout.str());
+                       "}");
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo()\n"
                        "{\n"
                        "    Foo p;\n"
                        "    int x = p.abcd();\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown types
         // extracttests.disable
@@ -370,15 +386,15 @@ class TestUninitVar : public TestFixture {
                            "    A ret;\n"
                            "    return ret;\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void a()\n"
                            "{\n"
                            "    A ret;\n"
                            "    return ret;\n"
                            "}\n",
-                           "test.c");
-            ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ret\n", errout.str());
+                           dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("[test.c:4:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
         }
         // extracttests.enable
 
@@ -387,15 +403,15 @@ class TestUninitVar : public TestFixture {
                        "  union lf { long l; float f; } u_lf;\n"
                        "  float hx = (u_lf.f = (x), u_lf.l);\n"
                        "}",
-                       "test.c", false);
-        ASSERT_EQUALS("", errout.str());
+                       dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
                        "    int x[10];\n"
                        "    int *y = x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
@@ -403,8 +419,8 @@ class TestUninitVar : public TestFixture {
                        "    int *y = &x;\n"
                        "    *y = 0;\n"
                        "    x++;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
@@ -412,8 +428,8 @@ class TestUninitVar : public TestFixture {
                        "    char *z = x;\n"
                        "    memset(z, 0, sizeof(x));\n"
                        "    memcpy(y, x, sizeof(x));\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         // Handling >> and <<
         {
@@ -422,54 +438,54 @@ class TestUninitVar : public TestFixture {
                            "    std::cin >> ret;\n"
                            "    ret++;\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f(int b) {\n"
                            "    int a;\n"
                            "    std::cin >> b >> a;\n"
                            "    return a;"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    int ret[2];\n"
                            "    std::cin >> ret[0];\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f(int i) {\n"
                            "    int a;\n"
                            "    i >> a;\n"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:10]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("int a() {\n"
                            "    int ret;\n"
                            "    int a = value >> ret;\n"
                            "}\n",
-                           "test.c");
-            ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: ret\n", errout.str());
+                           dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("[test.c:3:22]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void foo() {\n"   // #3707
                            "    Node node;\n"
                            "    int x;\n"
                            "    node[\"abcd\"] >> x;\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            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"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: p\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("void a() {\n"
                            "    int ret;\n"
                            "    a = value << ret;\n"
                            "}\n",
-                           "test.c");
-            ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: ret\n", errout.str());
+                           dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("[test.c:3:18]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
             // #4320 says this is a FP. << is overloaded.
             checkUninitVar("int f() {\n"
@@ -477,32 +493,32 @@ class TestUninitVar : public TestFixture {
                            "    a << 1;\n"  // <- TODO initialization?
                            "    return a;\n"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+            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"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+            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"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+            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"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+            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"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
             {
                 // #9422
@@ -510,25 +526,25 @@ class TestUninitVar : public TestFixture {
                                "  char *p = new char[10];\n"
                                "  std::cout << (void *)p << 1;\n"
                                "}");
-                ASSERT_EQUALS("", errout.str());
+                ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << (void *)p << 1;\n"
                                "}");
-                ASSERT_EQUALS("", errout.str());
+                ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char *p = new char[10];\n"
                                "  std::cout << p << 1;\n"
                                "}");
-                ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: p\n", errout.str());
+                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"
                                "}");
-                ASSERT_EQUALS("", errout.str());
+                ASSERT_EQUALS("", errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  int i[10];\n"
@@ -538,21 +554,21 @@ class TestUninitVar : public TestFixture {
                                "  wchar_t w[10];\n"
                                "  std::cout << w;\n"
                                "}");
-                ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: c\n"
-                              "[test.cpp:7]: (error) Uninitialized variable: w\n",
-                              errout.str());
+                ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: c [legacyUninitvar]\n"
+                              "[test.cpp:7:16]: (error) Uninitialized variable: w [legacyUninitvar]\n",
+                              errout_str());
 
                 checkUninitVar("void f() {\n"
                                "  char p[10];\n"
                                "  std::cout << p << 1;\n"
                                "}");
-                ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: p\n", errout.str());
+                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"
                                "}");
-                ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: p\n", errout.str());
+                ASSERT_EQUALS("[test.cpp:3:17]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
             }
         }
 
@@ -561,47 +577,47 @@ class TestUninitVar : public TestFixture {
                        "  int x;\n"
                        "  a & x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a) {\n"
                        "  int x;\n"
                        "  a & x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a() {\n"   // asm
                        "    int x;\n"
                        "    asm();\n"
                        "    x++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
                        "    int x[10];\n"
                        "    struct xyz xyz1 = { .x = x };\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a()\n"
                        "{\n"
                        "    struct S *s;\n"
                        "    s->x = 0;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: s\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("class Fred {\n"
                        "public:\n"
@@ -612,7 +628,7 @@ class TestUninitVar : public TestFixture {
                        "{\n"
                        "    fclose(f);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
@@ -620,7 +636,7 @@ class TestUninitVar : public TestFixture {
                        "    ab(sizeof(xyz), &c);\n"
                        "    if (c);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
@@ -628,7 +644,7 @@ class TestUninitVar : public TestFixture {
                        "    a = (f2(&c));\n"
                        "    c++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a)\n"
                        "{\n"
@@ -637,7 +653,7 @@ class TestUninitVar : public TestFixture {
                        "        *p = 0;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // +=
         checkUninitVar("void f()\n"
@@ -645,14 +661,14 @@ class TestUninitVar : public TestFixture {
                        "    int c;\n"
                        "    c += 2;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a[1]\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Uninitialized variable: a[1] [legacyUninitvar]\n", errout_str());
 
         // goto/setjmp/longjmp..
         checkUninitVar("void foo(int x)\n"
@@ -667,8 +683,8 @@ class TestUninitVar : public TestFixture {
                        "\n"
                        "found:\n"
                        "    int a = b;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
                        "{\n"
@@ -680,7 +696,7 @@ class TestUninitVar : public TestFixture {
                        "    a = 1;\n"
                        "    longjmp(env, 1);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // macro_for..
         checkUninitVar("int foo()\n"
@@ -694,7 +710,7 @@ class TestUninitVar : public TestFixture {
                        "    retval = 2;\n"
                        "  return retval;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
                        "{\n"
@@ -702,8 +718,8 @@ class TestUninitVar : public TestFixture {
                        "    goto exit;\n"
                        "    i++;\n"
                        "exit:\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int x,y=0;\n"
@@ -712,8 +728,8 @@ class TestUninitVar : public TestFixture {
                        "    x = a;\n"
                        "    y = 1;\n"
                        "    goto again;\n"
-                       "}", "test.c", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #3873 (false positive)
         checkUninitVar("MachineLoopRange *MachineLoopRanges::getLoopRange(const MachineLoop *Loop) {\n"
@@ -722,7 +738,7 @@ class TestUninitVar : public TestFixture {
                        "    Range = new MachineLoopRange(Loop, Allocator, *Indexes);\n"
                        "  return Range;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4040 - False positive
         checkUninitVar("int f(int x)  {\n"
@@ -737,8 +753,8 @@ class TestUninitVar : public TestFixture {
                        "        iter = x;\n"
                        "    }\n"
                        "    return 1 + iter;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         // C++11 style initialization
         checkUninitVar("int f() {\n"
@@ -746,7 +762,7 @@ class TestUninitVar : public TestFixture {
                        "    int j{ i };\n"
                        "    return j;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #5646
         checkUninitVar("float foo() {\n"
@@ -754,7 +770,7 @@ class TestUninitVar : public TestFixture {
                        "  float (*sink)[2] = &source;\n"
                        "  return (*sink)[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #9296
         checkUninitVar("void f(void)\n"
@@ -762,14 +778,14 @@ class TestUninitVar : public TestFixture {
                        "    int x;\n"
                        "    int z = (x) & ~__round_mask(1, 1);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int __round_mask(int, int);\n"
                        "void f(void)\n"
@@ -777,7 +793,7 @@ class TestUninitVar : public TestFixture {
                        "    int x;\n"
                        "    int* z = &x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_warn_once() {
@@ -788,7 +804,7 @@ class TestUninitVar : public TestFixture {
                        "  a = x;\n"
                        "  b = x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
     }
 
     // Handling of unknown types. Assume they are POD in C.
@@ -799,50 +815,50 @@ class TestUninitVar : public TestFixture {
                             "}";
 
         // Assume dfs is a non POD type if file is C++
-        checkUninitVar(code, "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+        checkUninitVar(code);
+        ASSERT_EQUALS("", errout_str());
 
         // Assume dfs is a POD type if file is C
-        checkUninitVar(code, "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: a\n", errout.str());
+        checkUninitVar(code, dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         const char code2[] = "struct AB { int a,b; };\n"
                              "void f() {\n"
                              "    struct AB ab;\n"
                              "    return ab;\n"
                              "}";
-        checkUninitVar(code2, "test.cpp");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: ab.a\n"
-                      "[test.cpp:4]: (error) Uninitialized struct member: ab.b\n", errout.str());
-        checkUninitVar(code2, "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab\n", errout.str());
+        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());
+        checkUninitVar(code2, dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:4:12]: (error) Uninitialized variable: ab [legacyUninitvar]\n", errout_str());
 
         // Ticket #3890 - False positive for std::map
         checkUninitVar("void f() {\n"
                        "    std::map<int,bool> x;\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         {
             // Ticket #6701 - Variable name is a POD type according to cfg
-            const char xmldata[] = "<?xml version=\"1.0\"?>\n"
-                                   "<def format=\"1\">"
-                                   "  <podtype name=\"_tm\"/>"
-                                   "</def>";
-            const Settings s = settingsBuilder(settings).libraryxml(xmldata, sizeof(xmldata)).build();
+            constexpr char xmldata[] = "<?xml version=\"1.0\"?>\n"
+                                       "<def format=\"1\">"
+                                       "  <podtype name=\"_tm\"/>"
+                                       "</def>";
+            const Settings s = settingsBuilder(settings).libraryxml(xmldata).build();
             checkUninitVar("void f() {\n"
                            "  Fred _tm;\n"
                            "  _tm.dostuff();\n"
-                           "}", "test.cpp", false, &s);
-            ASSERT_EQUALS("", errout.str());
+                           "}", s);
+            ASSERT_EQUALS("", errout_str());
         }
 
         // Ticket #7822 - Array type
@@ -850,8 +866,8 @@ class TestUninitVar : public TestFixture {
                        "    A a,b;\n"
                        "    b[0] = 0;"
                        "    return a;\n"
-                       "}", "test.c", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar3() { // #3844
@@ -868,7 +884,7 @@ class TestUninitVar : public TestFixture {
                        "         : _M_p(__x), _M_mask(__y) { }\n"
                        "    };\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_bitop() {
@@ -878,13 +894,13 @@ class TestUninitVar : public TestFixture {
                        "    int b;\n"
                        "    c = a | b;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: b\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: b [legacyUninitvar]\n", errout_str());
     }
 
     // if..
@@ -897,7 +913,7 @@ class TestUninitVar : public TestFixture {
                        "        p = new Foo;\n"
                        "    p->abcd();\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
                        "{\n"
@@ -906,7 +922,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x==2);\n"
                        "    x = a;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int i;\n"
@@ -914,7 +930,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 11;\n"
                        "    return i;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int bar(int x) {\n"
                        "    int n;\n"
@@ -924,7 +940,7 @@ class TestUninitVar : public TestFixture {
                        "      n = 2;\n"
                        "    return n;\n"
                        "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("int foo()\n"
                        "{\n"
@@ -935,7 +951,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    return i;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(int x)\n" // #5503
                        "{\n"
@@ -946,7 +962,7 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    return i;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
                        "{\n"
@@ -960,7 +976,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    return i;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
                        "{\n"
@@ -975,8 +991,8 @@ class TestUninitVar : public TestFixture {
                        "        i = 33;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void foo(int x)\n"
                        "{\n"
@@ -986,7 +1002,7 @@ class TestUninitVar : public TestFixture {
                        "    if (x)\n"
                        "        p->abcd();\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int a)\n"
                        "{\n"
@@ -1004,7 +1020,7 @@ class TestUninitVar : public TestFixture {
                        "        a=condition;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
@@ -1012,20 +1028,20 @@ class TestUninitVar : public TestFixture {
                        "    if (fun(&c));\n"
                        "    c->Release();\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    C c;\n"
                        "    if (fun(&c.d));\n"
                        "    return c;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "   char a[10];\n"
                        "   if (a[0] = x){}\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(int x)\n"
                        "{\n"
@@ -1036,7 +1052,7 @@ class TestUninitVar : public TestFixture {
                        "        return 3;\n"
                        "    return i;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #2207 - False positive
         checkUninitVar("void foo(int x) {\n"
@@ -1047,7 +1063,7 @@ class TestUninitVar : public TestFixture {
                        "        return;\n"
                        "    b = (c - a);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo()\n"
                        "{\n"
@@ -1058,7 +1074,7 @@ class TestUninitVar : public TestFixture {
                        "        throw 3;\n"
                        "    return ret;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a)\n"
                        "{\n"
@@ -1069,7 +1085,7 @@ class TestUninitVar : public TestFixture {
                        "        XYZ ret = 2;\n"  // XYZ may be an unexpanded macro so bailout the checking of "ret".
                        "    return ret;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: ret\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:12]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f(int a, int b)\n"
                        "{\n"
@@ -1082,7 +1098,7 @@ class TestUninitVar : public TestFixture {
                        "   }\n"
                        "   return x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(long verbose,bool bFlag)\n"
                        "{\n"
@@ -1095,7 +1111,7 @@ class TestUninitVar : public TestFixture {
                        "      std::cout << (12-t);\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int test(int cond1, int cond2) {\n"
                        "  int foo;\n"
@@ -1107,7 +1123,7 @@ class TestUninitVar : public TestFixture {
                        "    int t = foo*foo;\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(int *pix) {\n"
                        "    int dest_x;\n"
@@ -1118,14 +1134,14 @@ class TestUninitVar : public TestFixture {
                        "    if (pix)\n"
                        "        a = dest_x;\n" // <- not uninitialized
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ? :
         checkUninitVar("static void foo(int v) {\n"
                        "    int x;\n"
                        "    x = v <= 0 ? -1 : x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
@@ -1137,19 +1153,19 @@ class TestUninitVar : public TestFixture {
                        "    ret = ret <= 0 ? -1 :\n"
                        "          strcmp(msgid1, msgid2) == 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: y\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ; { .. }
         checkUninitVar("int foo()\n"
@@ -1162,7 +1178,7 @@ class TestUninitVar : public TestFixture {
                        "    retval = 2;\n"
                        "  return retval;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
@@ -1173,7 +1189,7 @@ class TestUninitVar : public TestFixture {
                        "\n"
                        "  { }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ({ .. })
         checkUninitVar("void f() {\n"
@@ -1182,7 +1198,7 @@ class TestUninitVar : public TestFixture {
                        "    else { a = ({b=c;}); x = 456; }\n"
                        "    ++x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #3098 - False negative uninitialized variable
         checkUninitVar("void f()\n"
@@ -1192,8 +1208,8 @@ class TestUninitVar : public TestFixture {
                        "    {\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c1\n"
-                      "[test.cpp:4]: (error) Uninitialized variable: c2\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: c1 [legacyUninitvar]\n"
+                      "[test.cpp:4:19]: (error) Uninitialized variable: c2 [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(char *c1, char *c2)\n"
                        "{\n"
@@ -1201,26 +1217,26 @@ class TestUninitVar : public TestFixture {
                        "    {\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char *c1;\n"
                        "    c1=strcpy(c1,\"test\");\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c1\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  X var;\n"
                        "  memset(var, 0, sizeof(var));\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n" // #8692
                        "    bool b = e();\n"
@@ -1238,7 +1254,36 @@ class TestUninitVar : public TestFixture {
                        "    int v7 = v5;\n"
                        "    return v2 + v4 + v6 + v7;\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:12]: (error) Uninitialized variable: v5\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:14]: (error) Uninitialized variable: v5 [legacyUninitvar]\n", errout_str());
+
+        checkUninitVar("bool set(int *p);\n"
+                       "\n"
+                       "void foo(bool a) {\n"
+                       "    bool flag{false};\n"
+                       "    int x;\n"
+                       "    if (!a) {\n"
+                       "        flag = set(&x);\n"
+                       "    }\n"
+                       "    if (!flag || x == 0) {}\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("void f(int n, int a) {\n" // #12011
+                       "    double x[10];\n"
+                       "    if (n == 1) {\n"
+                       "        if (a)\n"
+                       "            x[0] = 4;\n"
+                       "    }\n"
+                       "    else\n"
+                       "        for (int i = 0; i < n; i++) {\n"
+                       "            if (a)\n"
+                       "                x[i] = 8;\n"
+                       "        }\n"
+                       "    if (n == 1)\n"
+                       "        if (a)\n"
+                       "            (void)x[0];\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -1253,7 +1298,7 @@ class TestUninitVar : public TestFixture {
                        "        b(4*a);\n"
                        "    }"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:13]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int k;\n"
@@ -1261,7 +1306,7 @@ class TestUninitVar : public TestFixture {
                        "        k = k + 2;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: k\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: k [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    gchar sel[10];\n"
@@ -1269,7 +1314,7 @@ class TestUninitVar : public TestFixture {
                        "        int sz = sizeof(sel);\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("enum ABCD { A, B, C, D };\n"
                        "\n"
@@ -1279,7 +1324,7 @@ class TestUninitVar : public TestFixture {
                        "        str[i] = 0;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void x() {\n"
                        "    do  {\n"
@@ -1289,7 +1334,7 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    } while (tok2);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(void) {\n"
                        "    int a = 0;\n"
@@ -1302,7 +1347,7 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(void) {\n"
                        "    int a = 0;\n"
@@ -1314,7 +1359,7 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:24]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo(int n) {\n"
                        "  int one[10];\n"
@@ -1324,7 +1369,7 @@ class TestUninitVar : public TestFixture {
                        "    one[rank] = -1;\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #2226: C++0x loop
         checkUninitVar("void f() {\n"
@@ -1332,7 +1377,7 @@ class TestUninitVar : public TestFixture {
                        "    for (iterator it : c) {\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #2345: False positive in sub-condition in if inside a loop
         checkUninitVar("void f(int x) {\n"
@@ -1343,7 +1388,7 @@ class TestUninitVar : public TestFixture {
                        "        x--;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // extracttests.start: struct PoolItem { bool operator!=(const PoolItem&) const; };
         checkUninitVar("void f(int x, const PoolItem& rPool) {\n"
                        "    const PoolItem* pItem;\n"
@@ -1353,7 +1398,7 @@ class TestUninitVar : public TestFixture {
                        "        x--;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: pItem\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: pItem [legacyUninitvar]\n", errout_str());
 
         // #2231 - conditional initialization in loop..
         checkUninitVar("int foo(char *a) {\n"
@@ -1368,7 +1413,7 @@ class TestUninitVar : public TestFixture {
                        "\n"
                        "    return x;\n"
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:11]: (error) Uninitialized variable: x\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:11]: (error) Uninitialized variable: x\n", "", errout_str());
 
         // Ticket #2796
         checkUninitVar("void foo() {\n"
@@ -1379,7 +1424,7 @@ class TestUninitVar : public TestFixture {
                        "        return x;\n"   // <- x is initialized
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Assignment in for. Ticket #3287
         checkUninitVar("int foo(char* in, bool b) {\n"
@@ -1388,7 +1433,7 @@ class TestUninitVar : public TestFixture {
                        "    else c = in + strlen(in) - 1;\n"
                        "    *c = 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10273 - assignment in conditional code
         // extracttests.start: extern const int PORT_LEARN_DISABLE;
@@ -1399,7 +1444,7 @@ class TestUninitVar : public TestFixture {
                        "            learn = 123;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: learn\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:15]: (error) Uninitialized variable: learn [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: struct Entry { Entry *next; }; Entry *buckets[10];
         checkUninitVar("void foo() {\n"
@@ -1410,7 +1455,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "  }\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "  Entry *entry, *nextEntry;\n"
@@ -1419,7 +1464,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "  }\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: nextEntry\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:52]: (error) Uninitialized variable: nextEntry [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    list *f = NULL;\n"
@@ -1433,7 +1478,7 @@ class TestUninitVar : public TestFixture {
                        "        l = c;\n"
                        "    }\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6952 - do-while-loop
         checkUninitVar("void f(void)\n"
@@ -1450,7 +1495,7 @@ class TestUninitVar : public TestFixture {
                        "        p = new int(9);\n"
                        "    } while (*p != 8);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:11]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:10]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // #6952 - while-loop
         checkUninitVar("void f(void)\n"
@@ -1461,7 +1506,7 @@ class TestUninitVar : public TestFixture {
                        "        p = new int(9);\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // switch in loop
         checkUninitVar("int foo(int *p) {\n"
@@ -1477,7 +1522,7 @@ class TestUninitVar : public TestFixture {
                        "    ++p\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // switch..
@@ -1491,7 +1536,7 @@ class TestUninitVar : public TestFixture {
                        "        break;\n"
                        "    };\n"
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: c\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: c [uninitvar]\n", "", errout_str());
 
         checkUninitVar("char * f()\n"
                        "{\n"
@@ -1504,7 +1549,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    return 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo(const int iVar, unsigned int slot, unsigned int pin)\n"
                        "{\n"
@@ -1527,7 +1572,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    return i;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #1855 - switch(foo(&x))
         checkUninitVar("int a()\n"
@@ -1539,7 +1584,7 @@ class TestUninitVar : public TestFixture {
                        "            return x;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #3231 - ({ switch .. })
         checkUninitVar("void f() {\n"
@@ -1552,8 +1597,8 @@ class TestUninitVar : public TestFixture {
                        "        break;\n"
                        "    };\n"
                        "    })\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     // arrays..
@@ -1563,7 +1608,7 @@ class TestUninitVar : public TestFixture {
                        "    char a[10];\n"
                        "    a[a[0]] = 0;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a[0]\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: a[0] [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f()\n"
                        "{\n"
@@ -1571,59 +1616,59 @@ class TestUninitVar : public TestFixture {
                        "    *a = '\\0';\n"
                        "    int i = strlen(a);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a, b[10];\n"
                        "    a = b[0] = 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a[10], b[10];\n"
                        "    a[0] = b[0] = 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    char a[10], *p;\n"
                        "    *(p = a) = 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char a[10], *p;\n"
                        "    p = &(a[10]);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    char a[10], c;\n"
                        "    c = *(x?a:0);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "  int a[2];\n"
                        "  y *= (x ? 1 : 2);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // passing array to library functions
         checkUninitVar("void f()\n"
@@ -1631,25 +1676,25 @@ class TestUninitVar : public TestFixture {
                        "    char c[50] = \"\";\n"
                        "    strcat(c, \"test\");\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(char *s2) {\n"
                        "    char s[20];\n"
                        "    strcpy(s2, s);\n"
                        "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: s\n", errout.str());
+        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"
                        "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: s\n", errout.str());
+        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"
                        "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: s\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: s [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
@@ -1658,7 +1703,7 @@ class TestUninitVar : public TestFixture {
                        "        GetField( y + 0, y + 1 );\n"
                        "        s = y[0] * y[1];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
@@ -1666,26 +1711,26 @@ class TestUninitVar : public TestFixture {
                        "        init(a - 1);\n"
                        "        int b = a[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "        Fred a[2];\n"
                        "        Fred b = a[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "  char buf[1024];\n"
                        "  char *b = (char *) (((uintptr_t) buf + 63) & ~(uintptr_t) 63);\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "  char buf[1024];\n"
                        "  char x = *(char *) (((uintptr_t) buf + 63) & ~(uintptr_t) 63);\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: buf\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:36]: (error) Uninitialized variable: buf [legacyUninitvar]\n", errout_str());
 
         // Passing array to function
         checkUninitVar("void f(int i);\n"
@@ -1694,40 +1739,40 @@ class TestUninitVar : public TestFixture {
                        "    int a[10];\n"
                        "    f(a[0]);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"   // Ticket #3050
                        "    char a[2];\n"
                        "    printf(\"%s\", a);\n"
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", "", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"    // Ticket #3497
                        "    char header[1];\n"
                        "    *((unsigned char*)(header)) = 0xff;\n"
                        "    return header[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    ABC abc;\n"
@@ -1737,7 +1782,7 @@ class TestUninitVar : public TestFixture {
                        "    init(&abc);\n"
                        "    return a[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #3344
         checkUninitVar("void f(){\n"
@@ -1745,54 +1790,54 @@ class TestUninitVar : public TestFixture {
                        "   char *buffer=(char*)malloc(128*sizeof(char));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: buffer\n", errout.str());
+                       "}");
+        ASSERT_EQUALS("[test.cpp:4:18]: (error) Memory is allocated but not initialized: buffer [uninitdata]\n", errout_str());
 
         checkUninitVar("void f(){\n"
                        "   char *strMsg = \"This is a message\";\n"
                        "   char *buffer=static_cast<char*>(malloc(128*sizeof(char)));\n"
                        "   strcpy(strMsg,buffer);\n"
                        "   free(buffer);\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: buffer\n", errout.str());
+                       "}");
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[2][2] = {{3,4}, {5,6}};\n"
                        "    return a[0][1];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "    int a[1];\n"
                        "    return a[0];\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 4740
         checkUninitVar("void f() {\n"
                        "    int *a[2][19];\n"
                        "    int **b = a[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6869 - FP when passing uninit array to function
         checkUninitVar("void bar(PSTR x);\n"
@@ -1800,7 +1845,7 @@ class TestUninitVar : public TestFixture {
                        "  char x[10];\n"
                        "  bar(x);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // struct
         checkUninitVar("struct Fred { int x; int y; };\n"
@@ -1808,20 +1853,27 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "  struct Fred fred[10];\n"
                        "  fred[1].x = 0;\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("char f() {\n"
                        "    std::array<char, 1> a;\n"
                        "    return a[0];\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("std::string f() {\n"
                        "    std::array<std::string, 1> a;\n"
                        "    return a[0];\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("int f() {\n" // #12355
+                       "    const int x[10](1, 2);\n"
+                       "    if (x[0] == 1) {}\n"
+                       "    return x[0];\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_pointertoarray() {
@@ -1845,15 +1897,15 @@ class TestUninitVar : public TestFixture {
                        "        vertices[i][1][3] = 5.0;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: vertices\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: vertices [legacyUninitvar]\n",
+                      errout_str());
 
         checkUninitVar("void f() {\n"
                        "    std::array<int, 3> *PArr[2] = { p0, p1 };\n"
                        "    (*PArr[0])[2] = 0;\n"
                        "    (*PArr[1])[2] = 0;\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_cpp11ArrayInit() { // #7010
@@ -1861,7 +1913,7 @@ class TestUninitVar : public TestFixture {
                        "    double adIHPoint_local[4][4]{};\n"
                        "    function(*adIHPoint_local);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // alloc..
@@ -1870,96 +1922,96 @@ class TestUninitVar : public TestFixture {
                        "    char *s = (char *)malloc(100);\n"
                        "    strcat(s, \"abc\");\n"
                        "};");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: s\n", errout.str());
+        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"
                        "};");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: s1\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: p[0]\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = malloc(sizeof(Fred));\n"
                        "    x(&fred->f);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    Fred *fred = malloc(sizeof(Fred));\n"
                        "    x(fred->f);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo(char *s)\n"
                        "{\n"
                        "    char *a = malloc(100);\n"
                        "    *a = *s;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    char *a;\n"
                        "    if (a);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a = 123;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    abc->a.word = 123;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
@@ -1967,14 +2019,14 @@ class TestUninitVar : public TestFixture {
                        "    abc->a = 123;\n"
                        "    abc->a += 123;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    ABC *abc = malloc(100);\n"
                        "    free(abc);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
@@ -1983,14 +2035,14 @@ class TestUninitVar : public TestFixture {
                        "        return;\n"
                        "    char c = *s;\n"
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Memory is allocated but not initialized: s\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Memory is allocated but not initialized: s\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
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  z_stream strm;\n"
@@ -1999,7 +2051,7 @@ class TestUninitVar : public TestFixture {
                        "  deflate(&strm, Z_FINISH);\n"
                        "  memcpy(body, buf, 10);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6451 - allocation in subscope
         checkUninitVar("struct StgStrm {\n"
@@ -2015,7 +2067,7 @@ class TestUninitVar : public TestFixture {
                        "        pNewStrm = new StgStrm(rIo);\n"
                        "    pNewStrm->Write();\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6450 - calling a member function is allowed if memory was allocated by new
         checkUninitVar("struct EMFPFont {\n"
@@ -2026,7 +2078,7 @@ class TestUninitVar : public TestFixture {
                        "    EMFPFont *font = new EMFPFont();\n"
                        "    font->Initialize();\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7623 - new can also initialize the memory, don't warn in this case
         checkUninitVar("void foo(){\n"
@@ -2035,20 +2087,20 @@ class TestUninitVar : public TestFixture {
                        "    int* arr = new int[5]();\n"
                        "    std::cout << *p1 << *p2 << arr[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // new in C code does not allocate..
         checkUninitVar("int main() {\n"
                        "    char * pBuf = new(10);\n"
                        "    a = *pBuf;\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("class A {};\n" // #10698
                        "void f() {\n"
                        "    A* a = new A{};\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #1175
         checkUninitVar("void f() {\n"
@@ -2056,7 +2108,7 @@ class TestUninitVar : public TestFixture {
                        "    *((int*)*p) = 42;\n"
                        "    delete p;\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Memory is allocated but not initialized: p [uninitdata]\n", errout_str());
 
         checkUninitVar("int f() {\n" // #10596
                        "    int* a = new int;\n"
@@ -2065,28 +2117,28 @@ class TestUninitVar : public TestFixture {
                        "    delete a;\n"
                        "    return i;\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (error) Memory is allocated but not initialized: a [uninitdata]\n", errout_str());
 
         checkUninitVar("void* f(size_t n, int i) {\n" // #11766
                        "    char* p = (char*)malloc(n);\n"
                        "    *(int*)p = i;\n"
                        "    return p;\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void* f(size_t n, int i) {\n"
                        "    char* p = (char*)malloc(n);\n"
                        "    *(int*)(void*)p = i;\n"
                        "    return p;\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int n) {\n"
                        "    int* p = (int*)malloc(n * sizeof(int));\n"
                        "    for (int i = 0; i < n; ++i)\n"
                        "        *(p + i) = 0;\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // class / struct..
@@ -2096,7 +2148,7 @@ class TestUninitVar : public TestFixture {
                        "    int i;\n"
                        "    int a() { return i; }\n"
                        "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
@@ -2107,16 +2159,16 @@ class TestUninitVar : public TestFixture {
                        "        }\n"
                        "    };\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
                        "    static const struct ab {\n"
                        "        int a,b;\n"
                        "        int get_a() { return a; }"
-                       "    } = { 0, 0 };\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "    } x = { 0, 0 };\n"
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f()\n"
                        "{\n"
@@ -2128,14 +2180,14 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "    }\n"
                        "    return i;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    struct AB ab;\n"
                        "    x = ab.x = 12;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // enum..
@@ -2146,7 +2198,7 @@ class TestUninitVar : public TestFixture {
                        "    AB ab;\n"
                        "    if (ab);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: ab\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (error) Uninitialized variable: ab [legacyUninitvar]\n", errout_str());
     }
 
     // references..
@@ -2157,8 +2209,8 @@ class TestUninitVar : public TestFixture {
                        "    int &b = a;\n"
                        "    b = 0;\n"
                        "    int x = a;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(struct blame_entry *ent)\n"
                        "{\n"
@@ -2166,14 +2218,14 @@ class TestUninitVar : public TestFixture {
                        "    char hex[41];\n"
                        "    strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo()\n"
                        "{\n"
                        "    const std::string s(x());\n"
                        "    strchr(s.c_str(), ',');\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6717
         checkUninitVar("void f() {\n"
@@ -2182,7 +2234,7 @@ class TestUninitVar : public TestFixture {
                        "    int& referenced_int = it.value;\n"
                        "    referenced_int = 123;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_return() {
@@ -2191,19 +2243,19 @@ class TestUninitVar : public TestFixture {
                        "    int ret;\n"
                        "    return ret;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: ret\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: ret\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             checkUninitVar("static int foo() {\n"
@@ -2211,22 +2263,22 @@ class TestUninitVar : public TestFixture {
                            "    cin >> ret;\n"
                            "    return ret;\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("static int foo() {\n"
                            "    int ret;\n"
                            "    return cin >> ret;\n"
-                           "}\n", "test.c");
-            ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: ret\n", errout.str());
+                           "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("[test.c:3:19]: (error) Uninitialized variable: ret [legacyUninitvar]\n", errout_str());
         }
 
         // Ticket #6341- False negative
         {
             checkUninitVar("wchar_t f() { int i; return btowc(i); }");
-            ASSERT_EQUALS("[test.cpp:1]: (error) Uninitialized variable: i\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:1:35]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
             checkUninitVar("wchar_t f(int i) { return btowc(i); }");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             // Avoid a potential false positive (#6341)
             checkUninitVar(
@@ -2238,7 +2290,7 @@ class TestUninitVar : public TestFixture {
                 "  int x;\n"
                 "  return setvalue(x);\n"
                 "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         // Ticket #5412 - False negative
@@ -2251,7 +2303,7 @@ class TestUninitVar : public TestFixture {
                            "    }\n"
                            "    printf (\"%f\",f);\n"
                            "}");
-            ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: f\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:7:18]: (error) Uninitialized variable: f [legacyUninitvar]\n", errout_str());
 
             // Check for potential FP
             checkUninitVar("void f(bool b) {\n"
@@ -2262,7 +2314,7 @@ class TestUninitVar : public TestFixture {
                            "    }\n"
                            "    printf (\"%f\",f);\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         // Ticket #2146 - False negative
@@ -2270,7 +2322,7 @@ class TestUninitVar : public TestFixture {
                        "    int y;\n"
                        "    return x ? 1 : y;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: y\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         // Ticket #3106 - False positive
         {
@@ -2278,13 +2330,13 @@ class TestUninitVar : public TestFixture {
                            "    int i;\n"
                            "    return x(&i) ? i : 0;\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("int f() {\n"
                            "    int i;\n"
                            "    return x() ? i : 0;\n"
                            "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: i\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
         }
     }
 
@@ -2297,7 +2349,7 @@ class TestUninitVar : public TestFixture {
                        "    init(&msg);\n"
                        "    key++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #5660 - False positive
         checkUninitVar("int f() {\n"
@@ -2306,7 +2358,7 @@ class TestUninitVar : public TestFixture {
                        "    foo(res);\n"
                        "    return result;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6873
         checkUninitVar("int f() {\n"
@@ -2315,7 +2367,7 @@ class TestUninitVar : public TestFixture {
                        "    foo(b);\n"
                        "    return atoi(a);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // = { .. }
         checkUninitVar("int f() {\n"
@@ -2324,7 +2376,7 @@ class TestUninitVar : public TestFixture {
                        "    *p[0] = 0;\n"
                        "    return a;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
     }
 
@@ -2339,7 +2391,7 @@ class TestUninitVar : public TestFixture {
                        "    strncpy(a, s, 20);\n"
                        "    strncat(a, s, 20);\n"
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Dangerous usage of 'a' (strncpy doesn't always null-terminate it).\n", "", errout.str());
+        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"
                        "{\n"
@@ -2347,15 +2399,15 @@ class TestUninitVar : public TestFixture {
                        "    strncpy(a, \"hello\", 3);\n"
                        "    strncat(a, \"world\", 20);\n"
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Dangerous usage of 'a' (strncpy doesn't always null-terminate it).\n", "", errout.str());
+        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"
                        "{\n"
                        "    char a[100];\n"
                        "    strncpy(a, \"hello\", sizeof(a));\n"
                        "    strncat(a, \"world\", 20);\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         // #3245 - false positive
         {
@@ -2364,14 +2416,14 @@ class TestUninitVar : public TestFixture {
                            "    strncpy(a,p,10);\n"
                            "    memcmp(a,q,10);\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("void f() {\n"
                            "    char a[100];\n"
                            "    strncpy(a,p,10);\n"
                            "    if (memcmp(a,q,10)==0);\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         // Using strncpy isn't necessarily dangerous usage
@@ -2380,34 +2432,34 @@ class TestUninitVar : public TestFixture {
                        "    strncpy(buf, dev, 10);\n"
                        "    strncpy(str, buf, 10);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  char dst[4];\n"
                        "  const char* source = \"You\";\n"
                        "  strncpy(dst, source, sizeof(dst));\n"
                        "  char value = dst[2];\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        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; }");
 
-        checkUninitVar((funca +
-                        "void b() {\n"
-                        "    int x;\n"
-                        "    a(x);\n"
-                        "}").c_str());
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int x;\n"
+                       "    a(x);\n"
+                       "}");
+        ASSERT_EQUALS("[test.cpp:3: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]: (error) Uninitialized variable: p\n", errout.str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int *p;\n"
+                       "    a(*p);\n"
+                       "}");
+        ASSERT_EQUALS("[test.cpp:3:8]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
 
@@ -2416,20 +2468,20 @@ class TestUninitVar : public TestFixture {
         const std::string funca("void a(int *p) { *p = 0; }");
 
         // ok - initialized pointer
-        checkUninitVar((funca +
-                        "void b() {\n"
-                        "    int buf[10];\n"
-                        "    a(buf);\n"
-                        "}").c_str());
-        ASSERT_EQUALS("", errout.str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int buf[10];\n"
+                       "    a(buf);\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]: (error) Uninitialized variable: p\n", errout.str());
+        checkUninitVar(funca +
+                       "void b() {\n"
+                       "    int *p;\n"
+                       "    a(p);\n"
+                       "}");
+        ASSERT_EQUALS("[test.cpp:3:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
     void uninitvar_typeof() {
@@ -2437,24 +2489,24 @@ class TestUninitVar : public TestFixture {
                        "    struct Fred *fred;\n"
                        "    typeof(fred->x);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct SData * s;\n"
                        "    ab(typeof(s->status));\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct SData * s;\n"
                        "    TYPEOF(s->status);\n"
                        "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:3]: (error) Uninitialized variable: s\n", errout.str());
+        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"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_ignore() {
@@ -2462,25 +2514,25 @@ class TestUninitVar : public TestFixture {
                        "  int i;\n"
                        "  dostuff((int&)i, 0);\n" // <- cast is not use
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "  int i;\n"
                        "  return (int&)i + 2;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: i\n", errout.str());
+        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
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int foo() {\n"
                        "  int i;\n"
                        "  return *&i;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
     }
 
     void uninitvar2() {
@@ -2489,121 +2541,121 @@ class TestUninitVar : public TestFixture {
                        "    int x;\n"
                        "    x++;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: buf\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    x = x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: abc\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    extern int x;\n"
                        "    return ++x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"  // #3926 - weird cast.
                        "    int x;\n"
                        "    *(((char *)&x) + 0) = 0;\n"
-                       "}", "test.c", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}", 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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    char *p = (char*)&x + 1;\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    i=f(), i!=2;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // using uninit var in condition
         checkUninitVar("void f(void) {\n"
                        "    int x;\n"
                        "    if (x) { }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // = ({ .. })
         checkUninitVar("void f() {\n"
                        "    int x = ({ 1 + 2; });\n"
                        "    int y = 1 + (x ? y : y);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: y\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:22]: (error) Uninitialized variable: y [legacyUninitvar]\n", errout_str());
 
         // >> => initialization / usage
         {
@@ -2611,18 +2663,18 @@ class TestUninitVar : public TestFixture {
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
                                 "}";
-            checkUninitVar(code, "test.cpp");
-            ASSERT_EQUALS("", errout.str());
+            checkUninitVar(code);
+            ASSERT_EQUALS("", errout_str());
 
-            checkUninitVar(code, "test.c");
-            ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: x\n", errout.str());
+            checkUninitVar(code, dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("[test.c:3:14]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
         }
 
         checkUninitVar("void f() {\n"
                        "    int i, i2;\n"
                        "    strm >> i >> i2;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unconditional initialization
         checkUninitVar("int f() {\n"
@@ -2631,7 +2683,7 @@ class TestUninitVar : public TestFixture {
                        "    else { {} ret = 2; }\n"
                        "    return ret;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    int ret;\n"
@@ -2639,7 +2691,7 @@ class TestUninitVar : public TestFixture {
                        "    else { s=foo(1,{2,3},4); ret = 2; }\n"
                        "    return ret;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // conditional initialization
         checkUninitVar("void f() {\n"
@@ -2648,7 +2700,7 @@ class TestUninitVar : public TestFixture {
                        "    else { if (y == 2) { x = 1; } }\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
@@ -2657,7 +2709,7 @@ class TestUninitVar : public TestFixture {
                        "    if (y == 3) { }\n"   // <- ignore condition
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // initialization in condition
         checkUninitVar("void f() {\n"
@@ -2665,7 +2717,7 @@ class TestUninitVar : public TestFixture {
                        "    if (init(&a)) { }\n"
                        "    a++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return, break, continue, goto
         checkUninitVar("void f() {\n"
@@ -2674,14 +2726,14 @@ class TestUninitVar : public TestFixture {
                        "    else { x = 1; }\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    if (y == 1) { return; }\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f(int x) {\n"
                        "    int ret;\n"
@@ -2693,8 +2745,8 @@ class TestUninitVar : public TestFixture {
                        "out1:\n"
                        "out2:\n"
                        "    return ret;\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
@@ -2705,7 +2757,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    i++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    int i,x;\n"
@@ -2713,7 +2765,7 @@ class TestUninitVar : public TestFixture {
                        "        if (foo) break;\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    int x;\n"
@@ -2721,7 +2773,7 @@ class TestUninitVar : public TestFixture {
                        "        if (bar) break;\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         // try/catch : don't warn about exception variable
         checkUninitVar("void f() {\n"
@@ -2731,7 +2783,7 @@ class TestUninitVar : public TestFixture {
                        "        e->Delete();\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #5347
                        "    try {\n"
@@ -2739,7 +2791,7 @@ class TestUninitVar : public TestFixture {
                        "        A a = e;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // exit
         checkUninitVar("void f() {\n"
@@ -2748,14 +2800,14 @@ class TestUninitVar : public TestFixture {
                        "    else { x = 1; }\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // strange code.. don't crash (#3415)
         checkUninitVar("void foo() {\n"
                        "    int i;\n"
                        "    ({ if (0); });\n"
                        "    for_each(i) { }\n"
-                       "}", "test.c", false);
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
 
         // if, if
         checkUninitVar("void f(int a) {\n"
@@ -2763,7 +2815,7 @@ class TestUninitVar : public TestFixture {
                        "    if (a) i = 0;\n"
                        "    if (a) i++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int a,b=0;\n"
@@ -2775,7 +2827,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    if (b) a++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int a=0, b;\n"
@@ -2783,41 +2835,41 @@ class TestUninitVar : public TestFixture {
                        "    else { if (y==2) { a=1; b=2; } }\n"
                        "    if (a) { ++b; }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f() {\n"
                        "    int a=0, b;\n"
                        "    if (something) { a = dostuff(&b); }\n"
                        "    if (!a || b) { }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static void f(int x, int y) {\n"
                        "    int a;\n"
                        "    if (x == 0 && (a == 1)) { }\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+                       "}");
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int a;\n"
                        "    if (x) { a = 0; }\n"
                        "    if (x) { if (y) { } else { a++; } }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
@@ -2825,8 +2877,8 @@ class TestUninitVar : public TestFixture {
                        "    if (x) ab = getAB();\n"
                        "    else ab.a = 0;\n"
                        "    if (ab.a == 1) b = ab.b;\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(void) {\n"
                        "    int a;\n"
@@ -2837,7 +2889,7 @@ class TestUninitVar : public TestFixture {
                        "    else { a = 1; }\n"
                        "    return a;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #4560
                        "    int x = 0, y;\n"
@@ -2847,7 +2899,7 @@ class TestUninitVar : public TestFixture {
                        "    else {}\n"
                        "    return y;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #6583
                        "    int x;\n"
@@ -2856,7 +2908,7 @@ class TestUninitVar : public TestFixture {
                        "    else exit(2);\n"
                        "    return x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int a) {\n" // #4560
                        "    int x = 1, y;\n"
@@ -2866,7 +2918,7 @@ class TestUninitVar : public TestFixture {
                        "    else y = 123;\n" // <- y is always initialized
                        "    return y;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n" // #3948
                        "  int value;\n"
@@ -2874,7 +2926,7 @@ class TestUninitVar : public TestFixture {
                        "    value = getvalue();\n"
                        "  if (x == -1 || value > 300) {}\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("enum t_err { ERR_NONE, ERR_BAD_ARGS };\n" // #9649
                        "struct box_t { int value; };\n"
@@ -2887,7 +2939,7 @@ class TestUninitVar : public TestFixture {
                        "    if (ret == ERR_NONE)\n"
                        "        z = x + box2.value;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "  int value;\n"
@@ -2896,7 +2948,7 @@ class TestUninitVar : public TestFixture {
                        "  if (x == 1)\n"
                        "    v = value;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: value\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: value [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "  int value;\n"
@@ -2905,7 +2957,7 @@ class TestUninitVar : public TestFixture {
                        "  if (x == 32) {}\n"
                        "  else v = value;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: value\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12]: (error) Uninitialized variable: value [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("static int x;" // #4773
                        "int f() {\n"
@@ -2915,7 +2967,7 @@ class TestUninitVar : public TestFixture {
                        "    else y = 456;\n"
                        "    return y;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("static int x;" // #4773
                        "int f() {\n"
@@ -2925,7 +2977,7 @@ class TestUninitVar : public TestFixture {
                        "    else y = 456;\n"
                        "    return y;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int a) {\n"
                        "  int x;\n"
@@ -2935,7 +2987,7 @@ class TestUninitVar : public TestFixture {
                        "    else if (x) {}\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // asm
         checkUninitVar("void f() {\n"
@@ -2943,74 +2995,74 @@ class TestUninitVar : public TestFixture {
                        "    asm();\n"
                        "    x++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // sizeof / typeof / offsetof / etc
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    sizeof(i+1);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    if (100 == sizeof(i+1));\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    int i = ARRAY_SIZE(abc.a);"
                        "}");
-        // FP ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    struct ABC *abc;\n"
                        "    return do_something(typeof(*abc));\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    A *a;\n"
                        "    a = malloc(sizeof(*a));\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // &
         checkUninitVar("void f() {\n"  // #4426 - address of uninitialized variable
                        "    int a,b;\n"
                        "    if (&a == &b);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"  // #4439 - cast address of uninitialized variable
                        "    int a;\n"
                        "    x((LPARAM)(RECT*)&a);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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.
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4778 - cast address of uninitialized variable
                        "    long a;\n"
                        "    &a;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n" // #4717 - ({})
                        "    int a = ({ long b = (long)(123); 2 + b; });\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #3869 - reference variable
@@ -3021,7 +3073,7 @@ class TestUninitVar : public TestFixture {
                        "    buf[0] = 0;\n"
                        "    x++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #3861
@@ -3031,14 +3083,30 @@ class TestUninitVar : public TestFixture {
                        "    x<char> c;\n"
                        "    c << 2345;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ensure there is no false negative
         checkUninitVar("void f() {\n"
                        "    char c;\n"
                        "    char a = c << 2;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
+    }
+
+    // #13227
+    void uninitvar6() {
+        checkUninitVar("int foo(int x) {\n"
+                       "    int i;\n"
+                       "    if (x == 1) {\n"
+                       "        i = 3;\n"
+                       "    } else {\n"
+                       "        do {\n"
+                       "            return 2;\n"
+                       "        } while (0);\n"
+                       "    }\n"
+                       "    return i;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar8() {
@@ -3052,8 +3120,8 @@ class TestUninitVar : public TestFixture {
                             "    int syncpos, len;\n"
                             "    Sync(syncpos, type, len);\n"
                             "}";
-        checkUninitVar(code, "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+        checkUninitVar(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar9() { // 6424
@@ -3061,9 +3129,9 @@ class TestUninitVar : public TestFixture {
                             "void f1() { char *p; *p = 0; }\n"
                             "class Ns::C* p;\n"
                             "void f2() { char *p; *p = 0; }";
-        checkUninitVar(code, "test.cpp");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Uninitialized variable: p\n"
-                      "[test.cpp:4]: (error) Uninitialized variable: p\n", errout.str());
+        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());
     }
 
     void uninitvar10() { // 9467
@@ -3081,8 +3149,8 @@ class TestUninitVar : public TestFixture {
                             "    int bar = 1;\n"
                             "    return bar;\n"
                             "}";
-        checkUninitVar(code, "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+        checkUninitVar(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar11() { // 9123
@@ -3091,8 +3159,8 @@ class TestUninitVar : public TestFixture {
                             "    int x;\n"
                             "    x = get(x) && x;\n"
                             "}";
-        checkUninitVar(code, "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+        checkUninitVar(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar12() { // 10218
@@ -3101,7 +3169,7 @@ class TestUninitVar : public TestFixture {
                             "  for (int i; ss >> i;) {}\n"
                             "}";
         checkUninitVar(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar13() { // #9772 - FP
@@ -3123,7 +3191,16 @@ class TestUninitVar : public TestFixture {
                             "  return rez;\n"
                             "}";
         checkUninitVar(code);
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void uninitvar14() { // #11832
+        const char code[] = "void f() {\n"
+                            "    int b;\n"
+                            "    *(&b) = 0;\n"
+                            "}";
+        checkUninitVar(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_unconditionalTry() {
@@ -3134,7 +3211,7 @@ class TestUninitVar : public TestFixture {
                        "        return i;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    int i;\n"
@@ -3142,7 +3219,7 @@ class TestUninitVar : public TestFixture {
                        "        return i;\n"
                        "    } catch(...) {}\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(bool x) {\n"
                        "    bool b;\n"
@@ -3152,7 +3229,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    if (b) {}\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(bool x) {\n"
                        "    bool b;\n"
@@ -3162,7 +3239,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    if (b) {}\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(bool x) {\n"
                        "    bool b;\n"
@@ -3171,7 +3248,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    if (b) {}\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: b [legacyUninitvar]\n", errout_str());
     }
 
     void uninitvar_funcptr() {
@@ -3182,20 +3259,20 @@ class TestUninitVar : public TestFixture {
                        "        = &DocumentDialogLibraryContainer::create;\n"
                        "    rxContainer.set((*Factory)(m_aContext, xDocument));\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void foo() {\n"
                        "    void* x;\n"
                        "    int (*f)(int, int) = x;\n"
                        "    dostuff((*f)(a,b));\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: Factory\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:23]: (error) Uninitialized variable: Factory [legacyUninitvar]\n", errout_str());
 
         // extracttests.enable
     }
@@ -3215,14 +3292,14 @@ class TestUninitVar : public TestFixture {
                        "  int n;\n"
                        "  foo >> s2.v >> n;\n" // Initialized by operator>>
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized struct member: s.v\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // Handling of function calls
@@ -3235,7 +3312,7 @@ class TestUninitVar : public TestFixture {
                        "   bar(a,b);\n" // <<
                        "   return 0;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:8]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
         // non-pointer variable
         checkUninitVar("void a(char);\n"  // value => error
@@ -3243,35 +3320,35 @@ class TestUninitVar : public TestFixture {
                        "    char c;\n"
                        "    a(c);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(pstr s);\n"  // address => no error
                        "void b() {\n"
                        "    char c;\n"
                        "    a(&c);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void a(const char *c);\n"  // const address => data is not changed
                        "void b() {\n"
@@ -3279,7 +3356,7 @@ class TestUninitVar : public TestFixture {
                        "    a(&c);\n"  // <- no warning
                        "    c++;\n"  // <- uninitialized variable
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: c\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: c\n", "", errout_str());
 
         // pointer variable
         checkUninitVar("void a(char c);\n"  // value => error
@@ -3287,7 +3364,7 @@ class TestUninitVar : public TestFixture {
                        "    char *c;\n"
                        "    a(*c);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:8]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
 
         checkUninitVar("void a(char *c);\n"  // address => error
@@ -3295,7 +3372,7 @@ class TestUninitVar : public TestFixture {
                        "    char *c;\n"
                        "    a(c);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: c [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("typedef struct { int a; int b; } AB;\n"
                        "void a(AB *ab);\n"
@@ -3303,42 +3380,42 @@ class TestUninitVar : public TestFixture {
                        "    AB *ab;\n"
                        "    a(ab);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: ab\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: c\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // array
         checkUninitVar("int calc(const int *p, int n);\n"
@@ -3346,14 +3423,14 @@ class TestUninitVar : public TestFixture {
                        "    int x[10];\n"
                        "    calc(x,10);\n"
                        "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n",
-                           "", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ....
         checkUninitVar("struct ABC { int a; };\n"  // struct initialization
@@ -3363,25 +3440,25 @@ class TestUninitVar : public TestFixture {
                        "    clear(abc);\n"
                        "    return abc.a;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    time_t now0;\n"
                        "    time(&now0);\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void write_packet() {\n"
                        "    time_t* now0;\n"
                        "    time(now0);\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: now0\n", errout.str());
+                       "}", 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"
-                       "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: now0\n", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:3:13]: (error) Uninitialized variable: now0 [legacyUninitvar]\n", errout_str());
 
         // #2775 - uninitialized struct pointer in subfunction
         // extracttests.start: struct Fred {int x;};
@@ -3393,7 +3470,7 @@ class TestUninitVar : public TestFixture {
                        "    struct Fred *p;\n"
                        "    a(p);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:7]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         // #2946 - FP array is initialized in subfunction
         checkUninitVar("void a(char *buf) {\n"
@@ -3404,14 +3481,14 @@ class TestUninitVar : public TestFixture {
                        "    a(buf);\n"
                        "    buf[1] = buf[0];\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unknown macro
         checkUninitVar("void f() {\n"
                        "  struct listnode *item;\n"
                        "  list_for_each(item, &key_list) {}\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar2_value() {
@@ -3422,8 +3499,8 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i, y;\n"
@@ -3432,8 +3509,8 @@ class TestUninitVar : public TestFixture {
                        "        if (y != 0) return;\n"
                        "        i++;\n"
                        "    }\n"
-                       "}", "test.cpp", false);
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i, y;\n"
@@ -3442,14 +3519,14 @@ class TestUninitVar : public TestFixture {
                        "    if (y != 0) return;\n" // <- condition is always true if i is uninitialized
                        "    i++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    int i;\n"
@@ -3457,7 +3534,7 @@ class TestUninitVar : public TestFixture {
                        "    else i = 0;\n"
                        "    if (x || i>0) {}\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    int i;\n"
@@ -3465,7 +3542,7 @@ class TestUninitVar : public TestFixture {
                        "    else i = 0;\n"
                        "    if (x || i>0) {}\n" // <- no error
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int x) {\n"
                        "    int y;\n"
@@ -3473,7 +3550,7 @@ class TestUninitVar : public TestFixture {
                        "    if (!x) return 0;\n"
                        "    return y;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int y;
         checkUninitVar("int f(int x) {\n" // FP with ?:
@@ -3482,7 +3559,7 @@ class TestUninitVar : public TestFixture {
                        "        a = y;\n"
                        "    return x ? 2*a : 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(int x) {\n"
                        "    int a;\n"
@@ -3490,12 +3567,12 @@ class TestUninitVar : public TestFixture {
                        "        a = y;\n"
                        "    return y ? 2*a : 3*a;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (error) Uninitialized variable: a [legacyUninitvar]\n", errout_str());
 
-        checkUninitVar("void f() {\n" // Don't crash
-                       "    int a;\n"
-                       "    dostuff(\"ab\" cd \"ef\", x?a:z);\n" // <- No AST is created for ?:
-                       "}");
+        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);
 
         // Unknown => bail out..
         checkUninitVar("void f(int x) {\n"
@@ -3504,7 +3581,7 @@ class TestUninitVar : public TestFixture {
                        "    if (b(x)) return;\n"
                        "    i++;\n" // <- no error if b(x) is always true when a(x) is false
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    int i;\n"
@@ -3513,7 +3590,7 @@ class TestUninitVar : public TestFixture {
                        "        if (x) i++;\n" // <- no error
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(int x) {\n"
                        "    int i;\n"
@@ -3522,10 +3599,21 @@ class TestUninitVar : public TestFixture {
                        "        i++;\n"
                        "    }\n"
                        "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        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..
+        CheckUninitVar checkuninitvar(&tokenizer, &settings, this);
+        (checkuninitvar.valueFlowUninit)();
+    }
+
     void valueFlowUninit2_value()
     {
         valueFlowUninit("void f() {\n"
@@ -3535,9 +3623,8 @@ class TestUninitVar : public TestFixture {
                         "        if (y != 0) return;\n"
                         "        i++;\n"
                         "    }\n"
-                        "}",
-                        "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+                        "}");
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i, y;\n"
@@ -3546,9 +3633,8 @@ class TestUninitVar : public TestFixture {
                         "        if (y != 0) return;\n"
                         "        i++;\n"
                         "    }\n"
-                        "}",
-                        "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+                        "}");
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i, y;\n"
@@ -3557,21 +3643,21 @@ class TestUninitVar : public TestFixture {
                         "    if (y != 0) return;\n" // <- condition is always true if i is uninitialized
                         "    i++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
                         "    if (!x) i = 0;\n"
                         "    if (!x || i>0) {}\n" // <- error
                         "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (warning) Uninitialized variable: i\n", errout.str());
+        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
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
@@ -3579,7 +3665,7 @@ class TestUninitVar : public TestFixture {
                         "    else i = 0;\n"
                         "    if (x || i>0) {}\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (warning) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:14]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
@@ -3587,7 +3673,7 @@ class TestUninitVar : public TestFixture {
                         "    else i = 0;\n"
                         "    if (x || i>0) {}\n" // <- no error
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int x) {\n"
                         "    int y;\n"
@@ -3595,7 +3681,7 @@ class TestUninitVar : public TestFixture {
                         "    if (!x) return 0;\n"
                         "    return y;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int y;
         valueFlowUninit("int f(int x) {\n" // FP with ?:
@@ -3604,20 +3690,20 @@ class TestUninitVar : public TestFixture {
                         "        a = y;\n"
                         "    return x ? 2*a : 0;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
-        valueFlowUninit("int f(int x) {\n"
+        valueFlowUninit("int f(int x, int y) {\n"
                         "    int a;\n"
                         "    if (x)\n"
                         "        a = y;\n"
                         "    return y ? 2*a : 3*a;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:5]: (warning) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:5:18]: (warning) Uninitialized variable: a [uninitvar]\n", errout_str());
 
-        valueFlowUninit("void f() {\n" // Don't crash
-                        "    int a;\n"
-                        "    dostuff(\"ab\" cd \"ef\", x?a:z);\n" // <- No AST is created for ?:
-                        "}");
+        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);
 
         // Unknown => bail out..
         valueFlowUninit("void f(int x) {\n"
@@ -3626,7 +3712,7 @@ class TestUninitVar : public TestFixture {
                         "    if (b(x)) return;\n"
                         "    i++;\n" // <- no error if b(x) is always true when a(x) is false
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
@@ -3635,7 +3721,7 @@ class TestUninitVar : public TestFixture {
                         "        if (x) i++;\n" // <- no error
                         "    }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "    int i;\n"
@@ -3644,13 +3730,13 @@ class TestUninitVar : public TestFixture {
                         "        i++;\n"
                         "    }\n"
                         "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         valueFlowUninit("void f ( void ){\n" // #9313 - FN
                         " int *p;\n"
                         " int a[ 2 ] = { [ 0 ] = *p++, [ 1 ] = 1 };\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:26]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int height) {\n"
                         "    int a[11];\n"
@@ -3661,7 +3747,7 @@ class TestUninitVar : public TestFixture {
                         "    for (int i = 0; i < height; i++)\n"
                         "        if (a[i]) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(void) {\n"
                         "    char *c;\n"
@@ -3671,8 +3757,68 @@ class TestUninitVar : public TestFixture {
                         "        break;\n"
                         "    }\n"
                         "    ++c;\n"
-                        "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        "}", false);
+        ASSERT_EQUALS("", errout_str());
+
+        // #12030
+        valueFlowUninit("int set(int *x);\n"
+                        "void foo(bool a) {\n"
+                        "    bool flag{0};\n"
+                        "    int x;\n"
+                        "    if (!a) {\n"
+                        "        flag = set(&x);\n"
+                        "    }\n"
+                        "    if (!flag || x==3) {}\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("int set(int *x);\n"
+                        "void foo(bool a) {\n"
+                        "    bool flag{0};\n"
+                        "    int x;\n"
+                        "    if (!a) {\n"
+                        "        flag = set(&x);\n"
+                        "    }\n"
+                        "    if (!flag && x==3) {}\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:5:9] -> [test.cpp:8:18]: (warning) Uninitialized variable: x [uninitvar]\n", errout_str());
+
+        valueFlowUninit("int do_something();\n" // #11983
+                        "int set_st(int *x);\n"
+                        "int bar();\n"
+                        "void foo() {\n"
+                        "    int x, y;\n"
+                        "    int status = 1;\n"
+                        "    if (bar() == 1) {\n"
+                        "        status = 0;\n"
+                        "    }\n"
+                        "    if (status == 1) {\n"
+                        "        status = set_st(&x);\n"
+                        "    }\n"
+                        "    for (int i = 0; status == 1 && i < x; i++) {\n"
+                        "        if (do_something() == 0) {\n"
+                        "            status = 0;\n"
+                        "        }\n"
+                        "    }\n"
+                        "    if(status == 1 && x > 0){}\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("int h(bool, bool*);\n" // #11760
+                        "int f(bool t) {\n"
+                        "    int i = 0;\n"
+                        "    bool b;\n"
+                        "    if (t)\n"
+                        "        g();\n"
+                        "    if (i == 0)\n"
+                        "        i = h(t, &b);\n"
+                        "    if (i == 0 && b)\n"
+                        "        i = h(t, &b);\n"
+                        "    if (i == 0 && b)\n"
+                        "        i = h(t, &b);\n"
+                        "    return i;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void valueFlowUninit_uninitvar2()
@@ -3682,123 +3828,122 @@ class TestUninitVar : public TestFixture {
                         "    int x;\n"
                         "    x++;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: buf\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:13]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    x = x;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: abc\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    extern int x;\n"
                         "    return ++x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #3926 - weird cast.
                         "    int x;\n"
                         "    *(((char *)&x) + 0) = 0;\n"
                         "}",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4737 - weird cast.
                         "    int x;\n"
                         "    do_something(&((char*)&x)[0], 1);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    char *p = (char*)&x + 1;\n"
-                        "}",
-                        "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+                        "}");
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    i=f(), i!=2;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // using uninit var in condition
         valueFlowUninit("void f(void) {\n"
                         "    int x;\n"
                         "    if (x) { }\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                         "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:3]: (error) Uninitialized variable: &a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // = ({ .. })
         valueFlowUninit("void f() {\n"
                         "    int x = ({ 1 + 2; });\n"
                         "    int y = 1 + (x ? y : y);\n"
                         "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: y\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3:14]: (error) Uninitialized variable: y [legacyUninitvar]\n", "", errout_str());
 
         // >> => initialization / usage
         {
@@ -3806,18 +3951,18 @@ class TestUninitVar : public TestFixture {
                                 "    int x;\n"
                                 "    if (i >> x) { }\n"
                                 "}";
-            valueFlowUninit(code, "test.cpp");
-            ASSERT_EQUALS("", errout.str());
+            valueFlowUninit(code, true);
+            ASSERT_EQUALS("", errout_str());
 
-            valueFlowUninit(code, "test.c");
-            ASSERT_EQUALS("[test.c:3]: (error) Uninitialized variable: x\n", errout.str());
+            valueFlowUninit(code, false);
+            ASSERT_EQUALS("[test.c:3:14]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
         }
 
         valueFlowUninit("void f() {\n"
                         "    int i, i2;\n"
                         "    strm >> i >> i2;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unconditional initialization
         valueFlowUninit("int f() {\n"
@@ -3826,7 +3971,7 @@ class TestUninitVar : public TestFixture {
                         "    else { {} ret = 2; }\n"
                         "    return ret;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    int ret;\n"
@@ -3834,7 +3979,7 @@ class TestUninitVar : public TestFixture {
                         "    else { s=foo(1,{2,3},4); ret = 2; }\n"
                         "    return ret;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // conditional initialization
         valueFlowUninit("void f() {\n"
@@ -3843,7 +3988,7 @@ class TestUninitVar : public TestFixture {
                         "    else { if (y == 2) { x = 1; } }\n"
                         "    return x;\n"
                         "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: x\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [legacyUninitvar]\n", "", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
@@ -3852,7 +3997,7 @@ class TestUninitVar : public TestFixture {
                         "    if (y == 3) { }\n" // <- ignore condition
                         "    return x;\n"
                         "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: x\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6:24]: (error) Uninitialized variable: x [legacyUninitvar]\n", "", errout_str());
 
         // initialization in condition
         valueFlowUninit("void f() {\n"
@@ -3860,7 +4005,7 @@ class TestUninitVar : public TestFixture {
                         "    if (init(&a)) { }\n"
                         "    a++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return, break, continue, goto
         valueFlowUninit("void f() {\n"
@@ -3869,14 +4014,14 @@ class TestUninitVar : public TestFixture {
                         "    else { x = 1; }\n"
                         "    return x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int x;\n"
                         "    if (y == 1) { return; }\n"
                         "    return x;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f(int x) {\n"
                         "    int ret;\n"
@@ -3889,8 +4034,8 @@ class TestUninitVar : public TestFixture {
                         "out2:\n"
                         "    return ret;\n"
                         "}",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
@@ -3901,7 +4046,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "    i++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    int i,x;\n"
@@ -3909,7 +4054,7 @@ class TestUninitVar : public TestFixture {
                         "        if (foo) break;\n"
                         "    return x;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f() {\n"
                         "    int x;\n"
@@ -3917,7 +4062,7 @@ class TestUninitVar : public TestFixture {
                         "        if (bar) break;\n"
                         "    return x;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // try/catch : don't warn about exception variable
         valueFlowUninit("void f() {\n"
@@ -3927,7 +4072,7 @@ class TestUninitVar : public TestFixture {
                         "        e->Delete();\n"
                         "    }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #5347
                         "    try {\n"
@@ -3935,7 +4080,7 @@ class TestUninitVar : public TestFixture {
                         "        A a = e;\n"
                         "    }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // exit
         valueFlowUninit("void f() {\n"
@@ -3944,7 +4089,7 @@ class TestUninitVar : public TestFixture {
                         "    else { x = 1; }\n"
                         "    return x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // strange code.. don't crash (#3415)
         valueFlowUninit("void foo() {\n"
@@ -3952,7 +4097,7 @@ class TestUninitVar : public TestFixture {
                         "    ({ if (0); });\n"
                         "    for_each(i) { }\n"
                         "}",
-                        "test.c");
+                        false);
 
         // if, if
         valueFlowUninit("void f(int a) {\n"
@@ -3960,7 +4105,7 @@ class TestUninitVar : public TestFixture {
                         "    if (a) i = 0;\n"
                         "    if (a) i++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int a,b=0;\n"
@@ -3972,7 +4117,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "    if (b) a++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int a=0, b;\n"
@@ -3980,42 +4125,42 @@ class TestUninitVar : public TestFixture {
                         "    else { if (y==2) { a=1; b=2; } }\n"
                         "    if (a) { ++b; }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f() {\n"
                         "    int a=0, b;\n"
                         "    if (something) { a = dostuff(&b); }\n"
                         "    if (!a || b) { }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void f(int x, int y) {\n"
                         "    int a;\n"
                         "    if (x == 0 && (a == 1)) { }\n"
                         "}",
-                        "test.cpp");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+                        true);
+        ASSERT_EQUALS("[test.cpp:3:20]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int a;\n"
                         "    if (x) { a = 0; }\n"
                         "    if (x) { if (y) { a++; } }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int a;\n"
                         "    if (x) { a = 0; }\n"
                         "    if (x) { if (y) { } else { a++; } }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void f(void) {\n"
@@ -4024,8 +4169,8 @@ class TestUninitVar : public TestFixture {
                         "    else ab.a = 0;\n"
                         "    if (ab.a == 1) b = ab.b;\n"
                         "}",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(void) {\n"
                         "    int a;\n"
@@ -4036,7 +4181,7 @@ class TestUninitVar : public TestFixture {
                         "    else { a = 1; }\n"
                         "    return a;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n" // #4560
                         "    int x = 0, y;\n"
@@ -4046,7 +4191,7 @@ class TestUninitVar : public TestFixture {
                         "    else {}\n"
                         "    return y;\n"
                         "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:5] -> [test.cpp:7]: (warning) Uninitialized variable: y\n", errout.str());
+        TODO_ASSERT_EQUALS("", "[test.cpp:5:9] -> [test.cpp:7:12]: (warning) Uninitialized variable: y [uninitvar]\n", errout_str());
 
         valueFlowUninit("int f(int a) {\n" // #6583
                         "    int x;\n"
@@ -4055,7 +4200,7 @@ class TestUninitVar : public TestFixture {
                         "    else exit(2);\n"
                         "    return x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int f(int a) {\n" // #4560
                         "    int x = 1, y;\n"
@@ -4065,7 +4210,7 @@ class TestUninitVar : public TestFixture {
                         "    else y = 123;\n" // <- y is always initialized
                         "    return y;\n"
                         "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:5] -> [test.cpp:7]: (warning) Uninitialized variable: y\n", errout.str());
+        TODO_ASSERT_EQUALS("", "[test.cpp:5:9] -> [test.cpp:7:12]: (warning) Uninitialized variable: y [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int x) {\n" // #3948
                         "  int value;\n"
@@ -4073,7 +4218,7 @@ class TestUninitVar : public TestFixture {
                         "    value = getvalue();\n"
                         "  if (x == -1 || value > 300) {}\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("enum t_err { ERR_NONE, ERR_BAD_ARGS };\n" // #9649
                         "struct box_t { int value; };\n"
@@ -4086,7 +4231,7 @@ class TestUninitVar : public TestFixture {
                         "    if (ret == ERR_NONE)\n"
                         "        z = x + box2.value;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "  int value;\n"
@@ -4095,7 +4240,7 @@ class TestUninitVar : public TestFixture {
                         "  if (x == 1)\n"
                         "    v = value;\n"
                         "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: value\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: value [legacyUninitvar]\n", "", errout_str());
 
         valueFlowUninit("void f(int x) {\n"
                         "  int value;\n"
@@ -4104,7 +4249,7 @@ class TestUninitVar : public TestFixture {
                         "  if (x == 32) {}\n"
                         "  else v = value;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) Uninitialized variable: value\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:6:12]: (warning) Uninitialized variable: value [uninitvar]\n", errout_str());
 
         valueFlowUninit("static int x;" // #4773
                         "int f() {\n"
@@ -4114,7 +4259,7 @@ class TestUninitVar : public TestFixture {
                         "    else y = 456;\n"
                         "    return y;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static int x;" // #4773
                         "int f() {\n"
@@ -4124,7 +4269,7 @@ class TestUninitVar : public TestFixture {
                         "    else y = 456;\n"
                         "    return y;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int a) {\n"
                         "  int x;\n"
@@ -4134,7 +4279,7 @@ class TestUninitVar : public TestFixture {
                         "    else if (x) {}\n"
                         "  }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // asm
         valueFlowUninit("void f() {\n"
@@ -4142,76 +4287,135 @@ class TestUninitVar : public TestFixture {
                         "    asm();\n"
                         "    x++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // sizeof / typeof / offsetof / etc
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    sizeof(i+1);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int i;\n"
                         "    if (100 == sizeof(i+1));\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    int i = ARRAY_SIZE(abc.a);"
                         "}");
-        // FP ASSERT_EQUALS("", errout.str());
+        // FP ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int *abc;\n"
                         "    typeof(*abc);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    struct ABC *abc;\n"
                         "    return do_something(typeof(*abc));\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    A *a;\n"
                         "    a = malloc(sizeof(*a));\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // &
         valueFlowUninit("void f() {\n" // #4426 - address of uninitialized variable
                         "    int a,b;\n"
                         "    if (&a == &b);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4439 - cast address of uninitialized variable
                         "    int a;\n"
                         "    x((LPARAM)(RECT*)&a);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        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.
             "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:3]: (error) Uninitialized variable: done\n", errout.str());
+        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"
                         "}");
-        TODO_ASSERT_EQUALS("", "[test.cpp:3]: (error) Uninitialized variable: &a\n", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #4717 - ({})
                         "    int a = ({ long b = (long)(123); 2 + b; });\n"
                         "}",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void valueFlowUninit_functioncall() {
+
+        // #12462 - pointer data is not read
+        valueFlowUninit("struct myst { int a; };\n"
+                        "void bar(const void* p) {}\n"
+                        "void foo() {\n"
+                        "  struct myst item;\n"
+                        "  bar(&item);\n"
+                        "}", false);
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct myst { int a; };\n"
+                        "void bar(const void* p) { a = (p != 0); }\n"
+                        "void foo() {\n"
+                        "  struct myst item;\n"
+                        "  bar(&item);\n"
+                        "  a = item.a;\n" // <- item.a is not initialized
+                        "}", false);
+        ASSERT_EQUALS("[test.c:6:12]: (error) Uninitialized variable: item.a [uninitvar]\n", errout_str());
+
+        valueFlowUninit("struct myst { int a; };\n"
+                        "void bar(struct myst* p) { p->a = 0; }\n"
+                        "void foo() {\n"
+                        "  struct myst item;\n"
+                        "  bar(&item);\n"
+                        "  a = item.a;\n"
+                        "}", false);
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f(int& r) {}\n" // #12536
+                        "void g() {\n"
+                        "    int i;\n"
+                        "    f(i);\n"
+                        "}");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("int f(int& i, int j, int k) {\n" // #12514
+                        "    if (k)\n"
+                        "        i = 2;\n"
+                        "    return i + j;\n"
+                        "}\n"
+                        "int main() {\n"
+                        "    int i;\n"
+                        "    return f(i, 1, 0);\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"
+                        "    if (k)\n"
+                        "        i = 2;\n"
+                        "    return i;\n"
+                        "}\n"
+                        "int main() {\n"
+                        "    int i;\n"
+                        "    return f(i, 0);\n"
+                        "}");
+        ASSERT_EQUALS("[test.cpp:8:14] -> [test.cpp:4:12]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
     }
 
     void uninitStructMember() { // struct members
@@ -4220,21 +4424,21 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    int a = ab.a;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: ab.a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: ab.a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: ab.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void do_something(const struct AB ab);\n"
@@ -4242,16 +4446,16 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:6]: (error) Uninitialized struct member: ab.b\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:6:18]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n" // #4760
                        "void do_something(int a);\n"
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    do_something(ab.a);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.a\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:5:18]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void do_something(const struct AB &ab) { a = ab.a; }\n"
@@ -4260,52 +4464,52 @@ class TestUninitVar : public TestFixture {
                        "    ab.a = 0;\n"
                        "    do_something(ab);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    int a = ab.a;\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Uninitialized struct member: ab.a\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c: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 ab1;\n"
                        "    AB ab2 = { ab1.a, 0 };\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: ab1.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:20]: (error) Uninitialized struct member: ab1.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    buf[ab.a] = 0;\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Uninitialized struct member: ab.a\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:4:9]: (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 = 1;\n"
                        "    x = ab;\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.b\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:5:9]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    ab.a = 1;\n"
                        "    x = *(&ab);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.b\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:5:12]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
 
         checkUninitVar("void f(void) {\n"
                        "    struct AB ab;\n"
                        "    int x;\n"
                        "    ab.a = (addr)&x;\n"
                        "    dostuff(&ab,0);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    static void f() { }\n"
@@ -4313,7 +4517,7 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; element->f();\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    static void f() { }\n"
@@ -4321,7 +4525,7 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; (*element).f();\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    static int v;\n"
@@ -4329,7 +4533,7 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; element->v;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    static int v;\n"
@@ -4337,7 +4541,7 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; (*element).v;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    void f() { }\n"
@@ -4345,7 +4549,7 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; element->f();\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    void f() { }\n"
@@ -4353,7 +4557,7 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; (*element).f();\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    int v;\n"
@@ -4361,7 +4565,7 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; element->v;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct Element {\n"
                        "    int v;\n"
@@ -4369,14 +4573,14 @@ class TestUninitVar : public TestFixture {
                        "void test() {\n"
                        "    Element *element; (*element).v;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        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
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    assign(&ab.a, 0);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct Cstring { char *text; int size, alloc; };\n"
                        "int maybe();\n"
@@ -4385,35 +4589,35 @@ class TestUninitVar : public TestFixture {
                        "    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
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
-            const char argDirectionsTestXmlData[] = "<?xml version=\"1.0\"?>\n"
-                                                    "<def>\n"
-                                                    "  <function name=\"uninitvar_funcArgInTest\">\n"
-                                                    "    <arg nr=\"1\" direction=\"in\"/>\n"
-                                                    "  </function>\n"
-                                                    "  <function name=\"uninitvar_funcArgOutTest\">\n"
-                                                    "    <arg nr=\"1\" direction=\"out\"/>\n"
-                                                    "  </function>\n"
-                                                    "</def>";
-            const Settings s = settingsBuilder(settings).libraryxml(argDirectionsTestXmlData, sizeof(argDirectionsTestXmlData)).build();
+            constexpr char argDirectionsTestXmlData[] = "<?xml version=\"1.0\"?>\n"
+                                                        "<def>\n"
+                                                        "  <function name=\"uninitvar_funcArgInTest\">\n"
+                                                        "    <arg nr=\"1\" direction=\"in\"/>\n"
+                                                        "  </function>\n"
+                                                        "  <function name=\"uninitvar_funcArgOutTest\">\n"
+                                                        "    <arg nr=\"1\" direction=\"out\"/>\n"
+                                                        "  </function>\n"
+                                                        "</def>";
+            const Settings s = settingsBuilder(settings).libraryxml(argDirectionsTestXmlData).build();
 
             checkUninitVar("struct AB { int a; };\n"
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    uninitvar_funcArgInTest(&ab);\n"
                            "    x = ab;\n"
-                           "}\n", "test.c", false, &s);
-            ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.a\n", errout.str());
+                           "}\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"
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    uninitvar_funcArgOutTest(&ab);\n"
                            "    x = ab;\n"
-                           "}\n", "test.c", false, &s);
-            ASSERT_EQUALS("", errout.str());
+                           "}\n", s, false);
+            ASSERT_EQUALS("", errout_str());
         }
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4423,37 +4627,37 @@ class TestUninitVar : public TestFixture {
                        "    ab.a = 0;\n"
                        "    ab.b = 0;\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         {
             checkUninitVar("struct AB { char a[10]; };\n"
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy(ab.a, STR);\n"
-                           "}\n", "test.c");
-            ASSERT_EQUALS("", errout.str());
+                           "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("struct AB { unsigned char a[10]; };\n" // #8999 - cast
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy((char *)ab.a, STR);\n"
-                           "}\n", "test.c");
-            ASSERT_EQUALS("", errout.str());
+                           "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("struct AB { char a[10]; };\n"
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    strcpy(x, ab.a);\n"
-                           "}\n", "test.c");
-            TODO_ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", "", errout.str());
+                           "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+            TODO_ASSERT_EQUALS("[test.c:4:16]: (error) Uninitialized variable: ab.a [uninitvar]\n", "", errout_str());
 
             checkUninitVar("struct AB { int a; };\n"
                            "void f(void) {\n"
                            "    struct AB ab;\n"
                            "    dosomething(ab.a);\n"
-                           "}\n", "test.c");
-            ASSERT_EQUALS("", errout.str());
+                           "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+            ASSERT_EQUALS("", errout_str());
         }
 
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4462,8 +4666,8 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab = getAB();\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         {
             // #6769 - calling method that might assign struct members
@@ -4473,7 +4677,7 @@ class TestUninitVar : public TestFixture {
                            "    ab.set();\n"
                            "    x = ab;\n"
                            "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             checkUninitVar("struct AB { int a; int get() const; };\n"
                            "void f(void) {\n"
@@ -4481,7 +4685,7 @@ class TestUninitVar : public TestFixture {
                            "    ab.get();\n"
                            "    x = ab;\n"
                            "}");
-            ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized struct member: ab.a\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:5:9]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
             checkUninitVar("struct AB { int a; void dostuff() {} };\n"
                            "void f(void) {\n"
@@ -4489,7 +4693,7 @@ class TestUninitVar : public TestFixture {
                            "    ab.dostuff();\n"
                            "    x = ab;\n"
                            "}");
-            TODO_ASSERT_EQUALS("error", "", errout.str());
+            TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
         checkUninitVar("struct AB { int a; struct { int b; int c; } s; };\n"
@@ -4500,8 +4704,8 @@ class TestUninitVar : public TestFixture {
                        "    ab.s.b = 2;\n"
                        "    ab.s.c = 3;\n"
                        "    do_something(ab);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct conf {\n"
                        "    char x;\n"
@@ -4513,8 +4717,8 @@ class TestUninitVar : public TestFixture {
                        "   struct conf c;\n"
                        "   initdata(&c);\n"
                        "   do_something(c);\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct PIXEL {\n"
                        "    union  {\n"
@@ -4528,7 +4732,7 @@ class TestUninitVar : public TestFixture {
                        "    p1.color = 255;\n"
                        "    return p1.red;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "int f() {\n"
@@ -4539,7 +4743,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "int f(int x) {\n"
@@ -4549,7 +4753,7 @@ class TestUninitVar : public TestFixture {
                        "  }\n"
                        "  if (x == 0 && (ab != NULL || ab->a == 0)) { }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct A { int *x; };\n" // declarationId is 0 for "delete"
                        "void foo(void *info, void*p);\n"
@@ -4557,7 +4761,7 @@ class TestUninitVar : public TestFixture {
                        "  struct A *delete = 0;\n"
                        "  foo( info, NULL );\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct ABC { int a; int b; int c; };\n"
                        "void foo(int x, const struct ABC *abc);\n"
@@ -4569,21 +4773,21 @@ class TestUninitVar : public TestFixture {
         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",
-                           "[test.cpp:6]: (error) Uninitialized struct member: abc.b\n",
-                           errout.str());
+                           "[test.cpp:6:10]: (error) Uninitialized struct member: abc.b [uninitStructMember]\n",
+                           errout_str());
 
         checkUninitVar("struct ABC { int a; int b; int c; };\n"
                        "void foo() {\n"
                        "  struct ABC abc;\n"
                        "  dostuff((uint32_t *)&abc.a);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n"
                        "    struct tm t;\n"
                        "    t.tm_year = 123;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4591,16 +4795,16 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    return ab.b;\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.b\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:5:12]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void f(void) {\n"
                        "    struct AB ab;\n"
                        "    ab.a = 0;\n"
                        "    return ab.a;\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct S { int a; int b; };\n" // #8299
                        "void f(void) {\n"
@@ -4608,14 +4812,14 @@ class TestUninitVar : public TestFixture {
                        "    s.a = 0;\n"
                        "    return s;\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized struct member: s.b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized struct member: s.b [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct S { int a; int b; };\n" // #9810
                        "void f(void) {\n"
                        "    struct S s;\n"
                        "    return s.a ? 1 : 2;\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: s.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:12]: (error) Uninitialized struct member: s.a [uninitStructMember]\n", errout_str());
 
         // checkIfForWhileHead
         checkUninitVar("struct FRED {\n"
@@ -4627,8 +4831,8 @@ class TestUninitVar : public TestFixture {
                        "   struct FRED fred;\n"
                        "   fred.a = do_something();\n"
                        "   if (fred.a == 0) { }\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct FRED {\n"
                        "    int a;\n"
@@ -4639,28 +4843,28 @@ class TestUninitVar : public TestFixture {
                        "   struct FRED fred;\n"
                        "   fred.a = do_something();\n"
                        "   if (fred.b == 0) { }\n"
-                       "}\n", "test.c", false);
-        ASSERT_EQUALS("[test.c:9]: (error) Uninitialized struct member: fred.b\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:9:8]: (error) Uninitialized struct member: fred.b [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct Fred { int a; };\n"
                        "void f() {\n"
                        "    struct Fred fred;\n"
                        "    if (fred.a==1) {}\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Uninitialized struct member: fred.a\n", errout.str());
+                       "}", 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"
-                       "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void test2() {\n"
                        "  struct { char type; } s_d;\n"
                        "  if (foo(&s_d.type)){}\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // for
         checkUninitVar("struct AB { int a; };\n"
@@ -4668,21 +4872,21 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    while (x) { clear(ab); z = ab.a; }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized struct member: ab.a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // address of member
         checkUninitVar("struct AB { int a[10]; int b; };\n"
@@ -4690,7 +4894,7 @@ class TestUninitVar : public TestFixture {
                        "    struct AB ab;\n"
                        "    int *p = ab.a;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Reference
         checkUninitVar("struct A { int x; };\n"
@@ -4700,7 +4904,7 @@ class TestUninitVar : public TestFixture {
                        "  x = 0;\n"
                        "  return a.x;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
         checkUninitVar("struct AB { int a=1; int b; };\n"
@@ -4709,7 +4913,7 @@ class TestUninitVar : public TestFixture {
                        "    int a = ab.a;\n"
                        "    int b = ab.b;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized struct member: ab.b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:13]: (error) Uninitialized struct member: ab.b [uninitStructMember]\n", errout_str());
 
         // STL class member
         checkUninitVar("struct A {\n"
@@ -4720,7 +4924,7 @@ class TestUninitVar : public TestFixture {
                        "    A a;\n"
                        "    x = a.m;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C++)
         checkUninitVar("struct A {\n"
@@ -4730,8 +4934,8 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}", "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+                       "}");
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
         checkUninitVar("struct A {\n"
@@ -4741,8 +4945,8 @@ class TestUninitVar : public TestFixture {
                        "void foo() {\n"
                        "    A a;\n"
                        "    x = a.m;\n"
-                       "}", "test.c");
-        ASSERT_EQUALS("[test.c:7]: (error) Uninitialized struct member: a.m\n", errout.str());
+                       "}", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:7:9]: (error) Uninitialized struct member: a.m [uninitStructMember]\n", errout_str());
 
         // Type with constructor
         checkUninitVar("class C { C(); }\n"
@@ -4754,7 +4958,7 @@ class TestUninitVar : public TestFixture {
                        "    A a;\n"
                        "    x = a.m;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11002
         checkUninitVar("struct S { char *p; int len; };\n"
@@ -4763,7 +4967,7 @@ class TestUninitVar : public TestFixture {
                        "    s.p = nullptr;\n"
                        "    char* q = (s).p;\n"
                        "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // if with flag
         checkUninitVar("struct AB { int a; int b; };\n"
@@ -4777,7 +4981,39 @@ class TestUninitVar : public TestFixture {
                        "    a = ab.a;\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("struct S { int x; };\n"
+                       "S h() {\n"
+                       "    S s;\n"
+                       "    S& r = s;\n"
+                       "    r.x = 0;\n"
+                       "    return s;\n"
+                       "}\n"
+                       "S i() {\n"
+                       "    S s;\n"
+                       "    S& r{ s };\n"
+                       "    r.x = 0;\n"
+                       "    return s;\n"
+                       "}");
+        ASSERT_EQUALS("", errout_str());
+
+        checkUninitVar("struct S { int i; };\n" // #12142
+                       "int f() {\n"
+                       "    S s;\n"
+                       "    int S::* p = &S::i;\n"
+                       "    s.*p = 123;\n"
+                       "    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() {
@@ -4790,7 +5026,7 @@ class TestUninitVar : public TestFixture {
                        "        x = x + 1;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:13]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
@@ -4798,18 +5034,18 @@ class TestUninitVar : public TestFixture {
                        "        x = x + 1;\n"
                        "    } while (a);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Uninitialized variable: x\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Uninitialized variable: ptr3\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:26]: (error) Uninitialized variable: ptr3 [legacyUninitvar]\n", errout_str());
 
         // extracttests.start: int a;
         checkUninitVar("void f() {\n"
@@ -4819,7 +5055,7 @@ class TestUninitVar : public TestFixture {
                        "        x++;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
@@ -4828,7 +5064,7 @@ class TestUninitVar : public TestFixture {
                        "        else x = 0;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
@@ -4836,13 +5072,13 @@ class TestUninitVar : public TestFixture {
                        "        x = y;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int x;\n"
                        "    for (int i = 0; i < 10; i += x) { }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:34]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("int f() {\n"
                        "    int i;\n"
@@ -4850,14 +5086,14 @@ class TestUninitVar : public TestFixture {
                        "        if (foo()) return i;\n"
                        "    return 9;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int i;\n"
                        "    do {} while (!getvalue(&i));\n"
                        "    i++;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int f(void) {\n"
                        "   int x;\n"
@@ -4869,7 +5105,7 @@ class TestUninitVar : public TestFixture {
                        "   }\n"
                        "   return x;\n"
                        "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         checkUninitVar("int f(void) {\n"
                        "   int x;\n"
@@ -4880,7 +5116,7 @@ class TestUninitVar : public TestFixture {
                        "   }\n"
                        "   return 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void do_something(int);
         checkUninitVar("void f(void) {\n"
@@ -4890,7 +5126,7 @@ class TestUninitVar : public TestFixture {
                        "       do_something(a);\n"
                        "   }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("struct AB {int a; int b;};\n"
                        "void f(void) {\n"
@@ -4899,8 +5135,8 @@ class TestUninitVar : public TestFixture {
                        "       int a = 1+ab.a;\n"
                        "       do_something(a);\n"
                        "   }\n"
-                       "}\n", "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized struct member: ab.a\n", errout.str());
+                       "}\n", dinit(CheckUninitVarOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:5:18]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("void f(int i) {\n" // #4569 fp
                        "    float *buffer;\n"
@@ -4910,7 +5146,7 @@ class TestUninitVar : public TestFixture {
                        "            buffer[i] = 0;\n" // <- fp
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(){\n" // #4519 - fp: inline assembler in loop
                        "    int x;\n"
@@ -4919,14 +5155,14 @@ class TestUninitVar : public TestFixture {
                        "        if (x & 0xf1) { }\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n" // #4879
                        "    int i;\n"
@@ -4935,7 +5171,7 @@ class TestUninitVar : public TestFixture {
                        "            a[i] = b[i];\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n" // #5658
                        "    struct Foo *foo;\n"
@@ -4944,7 +5180,7 @@ class TestUninitVar : public TestFixture {
                        "            foo->x = 0;\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f(void) {\n"
                        "  int i;\n"
@@ -4952,28 +5188,28 @@ class TestUninitVar : public TestFixture {
                        "    for (i=0,y=i;;){}\n"
                        "  }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "  char *p = (char *)malloc(256);\n"
                        "  while(*p && *p == '_')\n"
                        "    p++;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: *p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int a;
         checkUninitVar("void f() {\n" // No FN
                        "  for (int i;;i++)\n"
                        "    a=i;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:2]: (error) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:15]: (error) Uninitialized variable: i [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("namespace N {\n" // #7377
                        "    template<typename T>\n"
@@ -4986,7 +5222,7 @@ class TestUninitVar : public TestFixture {
                        "        r += x;\n"
                        "    return r;\n"
                        "}\n");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:17]: (error) Uninitialized variable: x [legacyUninitvar]\n", errout_str());
     }
 
     void uninitvar2_4494() {
@@ -5011,11 +5247,11 @@ class TestUninitVar : public TestFixture {
                        "    void fg(void) { char *p; Foo::f1(p); }\n"
                        "    void fh(void) { char *p; Foo::f2(p); }\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: p\n"
-                      "[test.cpp:8]: (error) Uninitialized variable: p\n"
-                      "[test.cpp:13]: (error) Uninitialized variable: p\n"
-                      "[test.cpp:15]: (error) Uninitialized variable: p\n"
-                      "[test.cpp:17]: (error) Uninitialized variable: p\n", errout.str());
+        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"
+                      "[test.cpp:15:43]: (error) Uninitialized variable: p [legacyUninitvar]\n"
+                      "[test.cpp:17:45]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("class Fred {\n"
                        "public:\n"
@@ -5026,7 +5262,7 @@ class TestUninitVar : public TestFixture {
                        "    char *p;\n"
                        "    fred.f1(p);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:13]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
 
         checkUninitVar("class Fred {\n"
                        "public:\n"
@@ -5049,7 +5285,7 @@ class TestUninitVar : public TestFixture {
                        "    char *p;\n"
                        "    fred.wilma.barney.betty.f1(p);\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:20]: (error) Uninitialized variable: p\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:20:32]: (error) Uninitialized variable: p [legacyUninitvar]\n", errout_str());
     }
 
     void uninitvar2_malloc() {
@@ -5057,22 +5293,22 @@ class TestUninitVar : public TestFixture {
                        "    int *p = (int*)malloc(40);\n"
                        "    return *p;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Memory is allocated but not initialized: p\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: ab\n"
-                      "[test.cpp:4]: (error) Uninitialized struct member: ab.a\n",
-                      errout.str());
+        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());
 
         checkUninitVar("struct t_udf_file {  int dir_left; };\n"
                        "\n"
@@ -5081,31 +5317,31 @@ class TestUninitVar : public TestFixture {
                        "  newf = malloc(sizeof(*newf));\n"
                        "  if (!newf) {};\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *s = malloc(100);\n"
                        "    if (s != NULL) { }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = malloc(100);\n"
                        "    p || assert_failed();\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    char *p = malloc(100);\n"
                        "    x = p;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("int* f() {\n"
                        "    int *p = (int*)malloc(40);\n"
                        "    return p;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // function parameter (treat it as initialized until malloc is used)
         checkUninitVar("int f(int *p) {\n"
@@ -5113,7 +5349,7 @@ class TestUninitVar : public TestFixture {
                        "    p = (int*)malloc(256);\n"
                        "    return *p;\n" // error
                        "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Memory is allocated but not initialized: p\n", errout.str());
+        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"
                        "int f(struct AB *ab) {\n"
@@ -5121,7 +5357,7 @@ class TestUninitVar : public TestFixture {
                        "    ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    return ab->a;\n" // error
                        "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized struct member: ab.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized struct member: ab.a [uninitStructMember]\n", errout_str());
 
         checkUninitVar("struct AB { int a; int b; };\n"
                        "void do_something(struct AB *ab);\n" // unknown function
@@ -5129,13 +5365,13 @@ class TestUninitVar : public TestFixture {
                        "    struct AB *ab = (AB*)malloc(sizeof(struct AB));\n"
                        "    do_something(ab);\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_ternaryexpression() { // #4683
@@ -5149,7 +5385,7 @@ class TestUninitVar : public TestFixture {
                        "    }\n"
                        "    return a ? b->asd : 0;\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_rangeBasedFor() {
@@ -5159,19 +5395,19 @@ class TestUninitVar : public TestFixture {
                        "        expr->operate();\n"
                        "    }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int *item;\n"
                        "    for (item: itemList) {}\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    int buf[10];\n"
                        "    for (int &i: buf) { i = 0; }\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_static() { // #8734
@@ -5186,7 +5422,7 @@ class TestUninitVar : public TestFixture {
                        "  P.p = 0; "
                        "  result.push_back(P); "
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_configuration() {
@@ -5198,8 +5434,8 @@ class TestUninitVar : public TestFixture {
                        "        i = 0;\n"
                        "        return i;\n"
                        "    } while (0);\n"
-                       "}\n", "test.cpp", false, &s);
-        ASSERT_EQUALS("", errout.str());
+                       "}\n", s);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void checkExpr() {
@@ -5207,7 +5443,7 @@ class TestUninitVar : public TestFixture {
                        "void f() {\n"
                        "    struct AB *ab = (struct AB*)calloc(1, sizeof(*ab));\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void trac_4871() { // #4871
@@ -5226,7 +5462,7 @@ class TestUninitVar : public TestFixture {
                        "}\n"
                        "if (using_planner_action) {}\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void syntax_error() { // Ticket #5073
@@ -5237,7 +5473,7 @@ class TestUninitVar : public TestFixture {
                             "  struct cgroup_taskset tset = { };\n"
                             "  do { } while_each_thread(leader, tsk);\n"
                             "}";
-        ASSERT_THROW(checkUninitVar(code), InternalError);
+        ASSERT_THROW_INTERNAL(checkUninitVar(code), SYNTAX);
     }
 
     void trac_5970() { // Ticket #5970
@@ -5246,28 +5482,32 @@ class TestUninitVar : public TestFixture {
                        "  char *dp;\n"
                        "  dp=(char *)d;\n"
                        "  init(dp);\n"
-                       "}", "test.c");
-        // FP Unknown type ASSERT_EQUALS("", errout.str());
+                       "}", 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[], const char fname[] = "test.cpp")
-    {
-        // Clear the error buffer..
-        errout.str("");
-
+#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(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        Tokenizer tokenizer(&s, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, fname), file, line);
+        CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check for redundant code..
-        CheckUninitVar checkuninitvar(&tokenizer, &s, this);
-        (checkuninitvar.valueFlowUninit)();
+        // 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;
     }
 
-#define ctu(code) ctu_(__FILE__, __LINE__, code)
     void valueFlowUninitTest() {
         // #9735 - FN
         valueFlowUninit("typedef struct\n"
@@ -5289,20 +5529,20 @@ class TestUninitVar : public TestFixture {
                         "    s.x = 42;\n"
                         "    bar(&s);\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:18] -> [test.cpp:12] -> [test.cpp:8]: (warning) Uninitialized variable: s->flag\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:18:9] -> [test.cpp:12:13] -> [test.cpp:8:15]: (warning) Uninitialized variable: s->flag [uninitvar]\n", errout_str());
 
         // Ticket #2207 - False negative
         valueFlowUninit("void foo() {\n"
                         "    int a;\n"
                         "    b = c - a;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         // Ticket #6455 - some compilers allow const variables to be uninitialized
         // extracttests.disable
@@ -5310,59 +5550,59 @@ class TestUninitVar : public TestFixture {
                         "    const int a;\n"
                         "    b = c - a;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: p\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo() {\n"
                         "    int *p = NULL;\n"
                         "    realloc(p,10);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "  int x;\n"
                         "  switch (x) {}\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        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 ?
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #8172
                         "  char **x;\n"
                         "  if (2 < sizeof(*x)) {}\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo() {\n" // #5259 - False negative
                         "    int a;\n"
                         "    int x[] = {a,2};\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
@@ -5370,20 +5610,20 @@ class TestUninitVar : public TestFixture {
                         "    int *&y = x;\n"
                         "    y = nullptr;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "    int x = xyz::x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
                         "{\n"
                         "    extern int a;\n"
                         "    a++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
                         "{\n"
@@ -5391,27 +5631,27 @@ class TestUninitVar : public TestFixture {
                         "    x = (y = 10);\n"
                         "    int z = y * 2;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo() {\n"
                         "    int x, y;\n"
                         "    x = ((y) = 10);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
                         "{\n"
                         "    Foo p;\n"
                         "    p.abcd();\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void foo()\n"
                         "{\n"
                         "    Foo p;\n"
                         "    int x = p.abcd();\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // struct
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -5420,7 +5660,7 @@ class TestUninitVar : public TestFixture {
                         "  AB *p = &ab;\n"
                         "  p->a = 1;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S {\n"
                         "    S& rIo;\n"
@@ -5433,7 +5673,9 @@ class TestUninitVar : public TestFixture {
                         "        p = new S(io);\n"
                         "    p->Write();\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:10]: (warning) Uninitialized variable: p.rIo\n", errout.str());
+        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());
 
         // Unknown types
         {
@@ -5442,14 +5684,14 @@ class TestUninitVar : public TestFixture {
                             "    A ret;\n"
                             "    return ret;\n"
                             "}");
-            ASSERT_EQUALS("", errout.str());
+            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"
                             "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         valueFlowUninit("void a()\n"
@@ -5457,7 +5699,7 @@ class TestUninitVar : public TestFixture {
                         "    int x[10];\n"
                         "    int *y = x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
                         "{\n"
@@ -5466,7 +5708,7 @@ class TestUninitVar : public TestFixture {
                         "    *y = 0;\n"
                         "    x++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
                         "{\n"
@@ -5475,7 +5717,7 @@ class TestUninitVar : public TestFixture {
                         "    memset(z, 0, sizeof(x));\n"
                         "    memcpy(y, x, sizeof(x));\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Handling >> and <<
         {
@@ -5484,28 +5726,28 @@ class TestUninitVar : public TestFixture {
                             "    std::cin >> ret;\n"
                             "    ret++;\n"
                             "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("void f(int b) {\n"
                             "    int a;\n"
                             "    std::cin >> b >> a;\n"
                             "    return a;"
                             "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("void foo() {\n"   // #3707
                             "    Node node;\n"
                             "    int x;\n"
                             "    node[\"abcd\"] >> x;\n"
                             "}");
-            ASSERT_EQUALS("", errout.str());
+            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"
                             "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: p\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: p [uninitvar]\n", errout_str());
 
             // #4320
             valueFlowUninit("void f() {\n"
@@ -5513,7 +5755,7 @@ class TestUninitVar : public TestFixture {
                             "    a << 1;\n"
                             "    return a;\n"
                             "}");
-            ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
             // #9750
             valueFlowUninit("struct S {\n"
@@ -5525,7 +5767,7 @@ class TestUninitVar : public TestFixture {
                             "    S p;\n"
                             "    in >> p.one >> p.two;\n"
                             "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
 
         valueFlowUninit("struct S { int x; };\n" // #9417
@@ -5533,28 +5775,28 @@ class TestUninitVar : public TestFixture {
                         "    S s;\n"
                         "    return s(1);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a() {\n"   // asm
                         "    int x;\n"
                         "    asm();\n"
                         "    x++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void a()\n"
                         "{\n"
                         "    int x[10];\n"
                         "    struct xyz xyz1 = { .x = x };\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo()\n"
                         "{\n"
                         "   char *buf = malloc(100);\n"
                         "   struct ABC *abc = buf;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("class Fred {\n"
                         "public:\n"
@@ -5565,7 +5807,7 @@ class TestUninitVar : public TestFixture {
                         "{\n"
                         "    fclose(f);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
                         "{\n"
@@ -5573,7 +5815,7 @@ class TestUninitVar : public TestFixture {
                         "    ab(sizeof(xyz), &c);\n"
                         "    if (c);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f()\n"
                         "{\n"
@@ -5581,7 +5823,7 @@ class TestUninitVar : public TestFixture {
                         "    a = (f2(&c));\n"
                         "    c++;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // goto/setjmp/longjmp..
         valueFlowUninit("void foo(int x)\n"
@@ -5597,7 +5839,7 @@ class TestUninitVar : public TestFixture {
                         "found:\n"
                         "    int a = b;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo()\n"
                         "{\n"
@@ -5609,14 +5851,14 @@ class TestUninitVar : public TestFixture {
                         "    a = 1;\n"
                         "    longjmp(env, 1);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // range for..
         valueFlowUninit("void f() {\n"
                         "    X *item;\n"
                         "    for (item: itemList) {}\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("X f() {\n"
                         "    if (!itemList.empty()) {\n"
@@ -5626,7 +5868,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "    return X{};\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // macro_for..
         valueFlowUninit("int foo()\n"
@@ -5640,19 +5882,19 @@ class TestUninitVar : public TestFixture {
                         "    retval = 2;\n"
                         "  return retval;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void foo(struct qb_list_head *list) {\n"
                         "    struct qb_list_head *iter;\n"
                         "    qb_list_for_each(iter, list) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void json_parse_nat_type_flags(json_t *root) {\n"
                         "    int index;\n"
                         "    json_array_foreach(root, index, value) {}\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo()\n"
                         "{\n"
@@ -5661,7 +5903,7 @@ class TestUninitVar : public TestFixture {
                         "    i++;\n"
                         "exit:\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo() {\n"
                         "    int x,y=0;\n"
@@ -5671,7 +5913,7 @@ class TestUninitVar : public TestFixture {
                         "    y = 1;\n"
                         "    goto again;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #4040 - False positive
         valueFlowUninit("int f(int x)  {\n"
@@ -5687,7 +5929,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "    return 1 + iter;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // C++11 style initialization
         valueFlowUninit("int f() {\n"
@@ -5695,7 +5937,7 @@ class TestUninitVar : public TestFixture {
                         "    int j{ i };\n"
                         "    return j;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #5646
         valueFlowUninit("float foo() {\n"
@@ -5703,7 +5945,7 @@ class TestUninitVar : public TestFixture {
                         "  float (*sink)[2] = &source;\n"
                         "  return (*sink)[0];\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Ticket #8755
         valueFlowUninit("void f(int b) {\n"
@@ -5715,14 +5957,14 @@ class TestUninitVar : public TestFixture {
                         "    if (b == 'x') {}\n"
                         "    if (a) {}\n"
                         "}");
-        TODO_ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: a\n", "", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void test(int p) {\n"
                         "    int f;\n"
@@ -5731,7 +5973,7 @@ class TestUninitVar : public TestFixture {
                         "    if (p > 1)\n"
                         "        f += 1;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("unsigned char get();\n"
                         "char f() {\n"
@@ -5741,7 +5983,7 @@ class TestUninitVar : public TestFixture {
                         "    } while (isalpha(c) == 0);\n"
                         "    return static_cast<char>(c);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(int x)\n"
                         "{\n"
@@ -5753,7 +5995,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "    printf(\"\", value);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:9]: (warning) Uninitialized variable: value\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:13] -> [test.cpp:9:16]: (warning) Uninitialized variable: value [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(int x)\n"
                         "{\n"
@@ -5767,7 +6009,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "    printf(\"\", value);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // function pointers
         valueFlowUninit("int f (const struct FileFuncDefs *ffd) {\n" // #10279
@@ -5775,14 +6017,14 @@ class TestUninitVar : public TestFixture {
                         "  (*ffd->zread)(&c, 1);\n"
                         "  return c;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("int foo(unsigned int code) {\n" // #10279
                         "  int res;\n\n"
                         "  (* (utility_table[code])) (&res);\n"
                         "  return (res);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct Archive {\n"
                         "    bool isNull;\n"
@@ -5793,7 +6035,7 @@ class TestUninitVar : public TestFixture {
                         "    ar & isNull;\n"
                         "    if (!isNull) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10119
         valueFlowUninit("struct Foo {\n"
@@ -5805,7 +6047,7 @@ class TestUninitVar : public TestFixture {
                         "    Foo f;\n"
                         "    return f.i;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10326
         valueFlowUninit("void foo() {\n"
@@ -5816,7 +6058,7 @@ class TestUninitVar : public TestFixture {
                         "    while ( 0 ) ;\n"
                         "    if (cnt != 0) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10327 - avoid extra warnings for uninitialized variable
         valueFlowUninit("void dowork( int me ) {\n"
@@ -5827,14 +6069,14 @@ class TestUninitVar : public TestFixture {
                         "    int me;\n"
                         "     dowork(me);\n" // <- me is uninitialized
                         "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: me\n", errout.str());
+        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
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         // #10468
         valueFlowUninit("uint32_t foo(uint32_t in) {\n"
@@ -5843,7 +6085,7 @@ class TestUninitVar : public TestFixture {
                         "        out = in & ~mask;\n"
                         "    return out;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6597
         valueFlowUninit("int f(int b) {\n"
@@ -5855,7 +6097,7 @@ class TestUninitVar : public TestFixture {
                         "    else\n"
                         "        return -1;\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:6]: (warning) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9] -> [test.cpp:6:16]: (warning) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         // #9772
         valueFlowUninit("int func(void) {\n"
@@ -5872,7 +6114,7 @@ class TestUninitVar : public TestFixture {
                         "        free(ccb);\n"
                         "    return rez;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10553
         valueFlowUninit("struct CharDataOnly {\n"
@@ -5883,7 +6125,7 @@ class TestUninitVar : public TestFixture {
                         "   strcpy(testData.data, \"string smaller than size\");\n"
                         "   return testData;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10089
         valueFlowUninit("typedef union {\n"
@@ -5898,7 +6140,7 @@ class TestUninitVar : public TestFixture {
                         "    init(u.v);\n"
                         "    printf(\"%d\\n\", u.x);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #10280
         valueFlowUninit("union U {\n"
@@ -5910,20 +6152,20 @@ class TestUninitVar : public TestFixture {
                         "    is.read(u.c, 2);\n"
                         "    return u.u16;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "  char src, dest;\n"
                         "  std::memcpy(&dest, &src, 1);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: &src\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:22]: (error) Uninitialized variable: &src [uninitvar]\n", errout_str());
 
         // #10988
         valueFlowUninit("void f(const void* ptr, bool* result) {\n"
                         "  int dummy;\n"
                         "  *result = (&dummy < ptr);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n"
                         "    int x;\n"
@@ -5933,7 +6175,7 @@ class TestUninitVar : public TestFixture {
                         "    A* p = &a;\n"
                         "    p->x = 1;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n"
                         "    int x;\n"
@@ -5943,7 +6185,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    g(a.x);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: a.x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:9]: (error) Uninitialized variable: a.x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct A {\n"
                         "    int x;\n"
@@ -5954,13 +6196,13 @@ class TestUninitVar : public TestFixture {
                         "    A* p = &a;\n"
                         "    g(p->x);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:8]: (error) Uninitialized variable: p->x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:10]: (error) Uninitialized variable: p->x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    int a;\n"
                         "    a++;\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         // #11006
         valueFlowUninit("int g(int);\n"
@@ -5971,7 +6213,7 @@ class TestUninitVar : public TestFixture {
                         "    for (int sig = 0; sig < NSIG; sig++)\n"
                         "        if (received[sig]) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void increment(int& i) { ++i; }\n" // #6475
                         "int f() {\n"
@@ -5979,7 +6221,7 @@ class TestUninitVar : public TestFixture {
                         "    increment(n);\n"
                         "    return n;\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (warning) Uninitialized variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:15] -> [test.cpp:1:28]: (warning) Uninitialized variable: i [uninitvar]\n", errout_str());
 
         // #11412
         valueFlowUninit("void f(int n) {\n"
@@ -5990,7 +6232,7 @@ class TestUninitVar : public TestFixture {
                         "	for (int i = 0; i < n; i++)\n"
                         "		(void)p[i];\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11492
         valueFlowUninit("void f() {\n"
@@ -6002,7 +6244,7 @@ class TestUninitVar : public TestFixture {
                         "        if (i) {}\n"
                         "    }\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11624
         valueFlowUninit("const int N = 2;\n"
@@ -6015,7 +6257,7 @@ class TestUninitVar : public TestFixture {
                         "    g(a);\n"
                         "    if (a[0]) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11673
         valueFlowUninit("void f() {\n"
@@ -6024,7 +6266,7 @@ class TestUninitVar : public TestFixture {
                         "        b = true;\n"
                         "    };\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6619
         valueFlowUninit("void f() {\n"
@@ -6035,7 +6277,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "    printf(\"nok = %d\\n\", nok);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: nok\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:26]: (error) Uninitialized variable: nok [uninitvar]\n", errout_str());
 
         // #7475
         valueFlowUninit("struct S {\n"
@@ -6045,7 +6287,7 @@ class TestUninitVar : public TestFixture {
                         "    s_t s;\n"
                         "    printf(\"%d\", s.a);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: s.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:20]: (error) Uninitialized variable: s.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(char* src) {\n" // #11608
                         "    char envar[64], *cp, c;\n"
@@ -6054,7 +6296,7 @@ class TestUninitVar : public TestFixture {
                         "    if (cp != envar)\n"
                         "        if ((cp = getenv(envar)) != NULL) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11459
         valueFlowUninit("struct S {\n"
@@ -6069,7 +6311,7 @@ class TestUninitVar : public TestFixture {
                         "        tmp[i] = 0;\n"
                         "    if (tmp[0]) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11055
         valueFlowUninit("void g(int*);\n"
@@ -6078,7 +6320,7 @@ class TestUninitVar : public TestFixture {
                         "    int* p = b ? &i : nullptr;\n"
                         "    g(p);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct T {};\n" // #11075
                         "struct S {\n"
@@ -6093,8 +6335,8 @@ class TestUninitVar : public TestFixture {
                         "            t[n++] = s->t[i];\n"
                         "    for (int i = 0; i < n; i++)\n"
                         "        t[i];\n"
-                        "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        "}\n", false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("bool g();\n"
                         "void f() {\n"
@@ -6105,7 +6347,290 @@ class TestUninitVar : public TestFixture {
                         "    for (int i = 0; i < idx; i++)\n"
                         "        (void)a[i];\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f() {\n"
+                        "  int x;\n"
+                        "  int *p = 0 ? 0 : &x;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void g() {\n"
+                        "  int y;\n"
+                        "  int *q = 1 ? &y : 0;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f(std::stringstream& ss) {\n" // #11805
+                        "    int x;\n"
+                        "    int* p = &x;\n"
+                        "    ss >> *p;\n"
+                        "}\n"
+                        "void g() {\n"
+                        "    int x;\n"
+                        "    int* p = &x;\n"
+                        "    int& r = *p;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f(std::stringstream& ss) {\n" // #11805
+                        "    int x;\n"
+                        "    int* p = &x;\n"
+                        "    ss >> *p;\n"
+                        "}\n"
+                        "void g() {\n"
+                        "    int x;\n"
+                        "    int* p = &x;\n"
+                        "    int& r = *p;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S1 { char a[10]; };\n" // #11804
+                        "struct S2 { struct S1 s1; };\n"
+                        "void init(char* c);\n"
+                        "void f() {\n"
+                        "    struct S2 s2;\n"
+                        "    init(s2.s1.a);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S { int i; };\n" // #11731
+                        "void f(const S*& p);\n"
+                        "int g() {\n"
+                        "   const S* s;\n"
+                        "   f(s);\n"
+                        "   return s->i;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("int f(int i) {\n"
+                        "    int x;\n"
+                        "    int* p = &x;\n"
+                        "    return i >> *p;\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:4:17]: (error) Uninitialized variable: *p [uninitvar]\n", errout_str());
+
+        valueFlowUninit("void f(int& x) {\n"
+                        "    int i;\n"
+                        "    x = i;\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:3:9]: (error) Uninitialized variable: i [uninitvar]\n", errout_str());
+
+        valueFlowUninit("void f() {\n" // #11890
+                        "    int x;\n"
+                        "    int* a[] = { &x };\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #11992
+        valueFlowUninit("void foo(const int &x) {\n"
+                        "    if(x==42) {;}\n"
+                        "}\n"
+                        "void test(void) {\n"
+                        "    int t;\n"
+                        "    int &p = t;\n"
+                        "    int &s = p;\n"
+                        "    int &q = s;\n"
+                        "    foo(q);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:9:9]: (error) Uninitialized variable: q [uninitvar]\n", errout_str());
+
+        valueFlowUninit("int g();\n" // #12082
+                        "void f() {\n"
+                        "    int a[1], b[1];\n"
+                        "    while (a[0] = g()) {}\n"
+                        "    if ((b[0] = g()) == 0) {}\n"
+                        "}");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f(const char *x, char *y);\n" // #4527
+                        "void g(char* b) {\n"
+                        "    char a[1000];\n"
+                        "    f(a, b);\n"
+                        "    printf(\"%s\", a);\n"
+                        "}");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
+
+        valueFlowUninit("void usage(const char *);\n" // #10330
+                        "int main(int argc, char* argv[]) {\n"
+                        "    int user = 0;\n"
+                        "    struct passwd* pwd;\n"
+                        "    while (1) {\n"
+                        "        int c = getc();\n"
+                        "        if (c == -1)\n"
+                        "            break;\n"
+                        "        switch (c) {\n"
+                        "        case 'u': user = 123; break;\n"
+                        "        }\n"
+                        "    }\n"
+                        "    if (argc == 1)\n"
+                        "        usage(argv[0]);\n"
+                        "    if (user)\n"
+                        "        pwd = getpwnam(user);\n"
+                        "    if (pwd == NULL) {}\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
+                        "void f() {\n"
+                        "    const int N = 100;\n"
+                        "    uint8_t data[N];\n"
+                        "    size_t data_size = 0;\n"
+                        "    for (int i = 0; i < 10; i++) {\n"
+                        "        if (!data_size)\n"
+                        "            data_size = Read(data, N);\n"
+                        "        if (!data_size)\n"
+                        "            return;\n"
+                        "        if (data[0] == 0x47) {}\n"
+                        "    }\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #12033
+        valueFlowUninit("void g(const char*p);\n"
+                        "void f() {\n"
+                        "    char buf[10];\n"
+                        "    g(buf);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: buf [uninitvar]\n", errout_str());
+
+        valueFlowUninit("void f() {\n" // #12288
+                        "    char buf[100];\n"
+                        "    char* p = new (buf) char[100];\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #12355
+        valueFlowUninit("int f() {\n"
+                        "    const int x[10](1, 2);\n"
+                        "    if (x[0] == 1) {}\n"
+                        "    return x[0];\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f(bool* p) {\n" // #12287
+                        "    if (p)\n"
+                        "        *p = true; \n"
+                        "}\n"
+                        "void g() {\n"
+                        "    bool b;\n"
+                        "    f(&b);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S { int x; };\n" // #12394
+                        "int f() {\n"
+                        "    struct S s[1];\n"
+                        "    s->x = 0;\n"
+                        "    return s[0].x;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S { int* p; };\n" // #12473
+                        "void f() {\n"
+                        "    struct S s;\n"
+                        "    s.p[0] = 0;\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7]: (error) Uninitialized variable: s.p [uninitvar]\n", errout_str());
+
+        // #12460
+        valueFlowUninit("typedef struct {\n"
+                        "  int a;\n"
+                        "} st;\n"
+                        "void foo(int* p, bool success) {\n"
+                        "  st myst;\n"
+                        "  if (success == 1) {\n"
+                        "    myst.a = 5;\n"
+                        "  }\n"
+                        "  if ((success == 1) && (myst.a != 0)) {}\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #12606
+        valueFlowUninit("void f(int& r) { if (r) {} }\n"
+                        "void g() {\n"
+                        "    int i;\n"
+                        "    f(i);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:4:7] -> [test.cpp:1:22]: (warning) Uninitialized variable: r [uninitvar]\n", errout_str());
+
+        // #12197
+        valueFlowUninit("void f() {\n"
+                        "    char a[N];\n"
+                        "    for (int i = 0; i < N; i++)\n"
+                        "        a[i] = 1;\n"
+                        "    const int* p = a;\n"
+                        "    for (int i = 0; i < N; i++) {\n"
+                        "        if (p[i]) {}\n"
+                        "    }\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #12247
+        valueFlowUninit("void f() {\n"
+                        "    char a[10], *p = &a[0];\n"
+                        "    p = getenv(\"abc\");\n"
+                        "    printf(\"%\", p);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("void f(char *q) {\n"
+                        "    char a[1];\n"
+                        "    char *p = a;\n"
+                        "    p = q;\n"
+                        "    printf(\"%s\", p);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("std::string f() {\n" // #12922
+                        "    std::string a[2];\n"
+                        "    std::array<std::string, 2> b;\n"
+                        "    return a[1] + b.at(1);\n" // don't warn
+                        "}\n"
+                        "struct S { int i; };\n"
+                        "struct T { int i = 0; };\n"
+                        "int g() {\n"
+                        "    std::array<int, 2> a;\n"
+                        "    std::array<S, 2> b;\n"
+                        "    std::array<T, 2> c;\n" // don't warn
+                        "    return a.at(1) + b.at(1).i + c.at(1).i;\n"
+                        "}\n"
+                        "int h() {\n"
+                        "    std::array<int, 2> a;\n"
+                        "    return a[1];\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:12:12]: (error) Uninitialized variable: a [uninitvar]\n"
+                      "[test.cpp:12:22]: (error) Uninitialized variable: b [uninitvar]\n"
+                      "[test.cpp:16:12]: (error) Uninitialized variable: a [uninitvar]\n",
+                      errout_str());
+
+        valueFlowUninit("void f() {\n" // # 12932
+                        "    std::array<int, 0> a;\n"
+                        "    if (a.begin() == a.end()) {}\n"
+                        "    std::array<int, 1> b;\n"
+                        "    auto it = b.begin();\n"
+                        "    *it = 0;\n"
+                        "    std::array<int, 1> c;\n"
+                        "    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());
     }
 
     void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value
@@ -6118,7 +6643,7 @@ class TestUninitVar : public TestFixture {
                         "    memcpy(wcsin, x, sizeof(wcsstruct));\n" // <- warning
                         "    x->wcsprm = NULL;\n" // <- no warning
                         "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:19]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct wcsstruct {\n"
                         "    int *wcsprm;\n"
@@ -6129,7 +6654,7 @@ class TestUninitVar : public TestFixture {
                         "    sizeof(x);\n"
                         "    x->wcsprm = NULL;\n" // <- Warn
                         "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct wcsstruct {\n"
                         "    int *wcsprm;\n"
@@ -6142,7 +6667,7 @@ class TestUninitVar : public TestFixture {
                         "    x->wcsprm = NULL;\n" // <- warn here
                         "    init_wcs(x);\n" // <- no warning
                         "}");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:5]: (error) Uninitialized variable: x [uninitvar]\n", errout_str());
     }
 
     void uninitvar_ipa() {
@@ -6157,7 +6682,7 @@ class TestUninitVar : public TestFixture {
                         "    someType_t gVar;\n"
                         "    bar(&gVar);\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:5]: (warning) Uninitialized variable: p->flags\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:9]: (error) Uninitialized variable: &gVar [uninitvar]\n", errout_str());
 
         valueFlowUninit("typedef struct\n"
                         "{\n"
@@ -6168,7 +6693,7 @@ class TestUninitVar : public TestFixture {
                         "        if(gVar.flags[1] == 42){}\n"
                         "}");
         // TODO : find bugs for member arrays
-        TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: gVar.flags\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: gVar.flags\n", "", errout_str());
 
         valueFlowUninit("void foo() {\n" // #10293
                         "  union {\n"
@@ -6177,7 +6702,7 @@ class TestUninitVar : public TestFixture {
                         "  } u;\n"
                         "  char *x = u.control;\n" // <- no error
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct pc_data {\n"
                         "    struct {\n"
@@ -6188,7 +6713,7 @@ class TestUninitVar : public TestFixture {
                         "    struct pc_data *pcdata;\n"
                         "    if ( *pcdata->wampiryzm.strefa == '\\0' ) { }\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:8]: (error) Uninitialized variable: pcdata\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:11]: (error) Uninitialized variable: pcdata [uninitvar]\n", errout_str());
 
         // # 9293
         valueFlowUninit("struct S {\n"
@@ -6201,7 +6726,7 @@ class TestUninitVar : public TestFixture {
                         "    int * x = &s1.x;\n"
                         "    struct S s2 = {*x, 0};\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:9]: (error) Uninitialized variable: *x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:20]: (error) Uninitialized variable: *x [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct S {\n"
                         "  int x;\n"
@@ -6214,7 +6739,7 @@ class TestUninitVar : public TestFixture {
                         "    int * x = &s1.x;\n"
                         "    s2.x = *x;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:9] -> [test.cpp:10]: (error) Uninitialized variable: *x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:12]: (error) Uninitialized variable: *x [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(bool * x) {\n"
                         "    *x = false;\n"
@@ -6223,7 +6748,7 @@ class TestUninitVar : public TestFixture {
                         "    bool b;\n"
                         "    f(&b);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(bool * x) {\n"
                         "    if (x != nullptr)\n"
@@ -6233,7 +6758,7 @@ class TestUninitVar : public TestFixture {
                         "    bool x;\n"
                         "    f(&x);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    bool b;\n"
@@ -6241,7 +6766,7 @@ class TestUninitVar : public TestFixture {
                         "    if (x != nullptr)\n"
                         "        x = 1;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A { bool b; };"
                         "void f(A * x) {\n"
@@ -6251,14 +6776,14 @@ class TestUninitVar : public TestFixture {
                         "    A b;\n"
                         "    f(&b);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("std::string f() {\n"
                         "    std::ostringstream ostr;\n"
                         "    ostr << \"\";\n"
                         "    return ostr.str();\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // #9281
         valueFlowUninit("struct s {\n"
                         "    char a[20];\n"
@@ -6273,7 +6798,7 @@ class TestUninitVar : public TestFixture {
                         "    struct s s1;\n"
                         "    b(&s1);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 9290
         valueFlowUninit("struct A {\n"
@@ -6284,8 +6809,8 @@ class TestUninitVar : public TestFixture {
                         "    c->x = 42;\n"
                         "    return c->x;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: c\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:6:5]: (error) Uninitialized variable: c [uninitvar]\n",
+                      errout_str());
 
         valueFlowUninit("struct A {\n"
                         "    double x;\n"
@@ -6295,7 +6820,7 @@ class TestUninitVar : public TestFixture {
                         "    c.x = 42;\n"
                         "    return c.x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n"
                         "    double x;\n"
@@ -6308,7 +6833,7 @@ class TestUninitVar : public TestFixture {
                         "    A c;\n"
                         "    return d(&c);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 9302
         valueFlowUninit("struct VZ   {\n"
@@ -6321,7 +6846,7 @@ class TestUninitVar : public TestFixture {
                         "    if (pvz->typ == 0)\n"
                         "        return;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 9305
         valueFlowUninit("struct kf {\n"
@@ -6337,7 +6862,7 @@ class TestUninitVar : public TestFixture {
                         "    if (pb->x)\n"
                         "        return;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 9348
         valueFlowUninit("void f(int *a) {\n"
@@ -6348,7 +6873,7 @@ class TestUninitVar : public TestFixture {
                         "  int i;\n"
                         "  f(&i);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // # 9631
         valueFlowUninit("static void g(bool * result, int num, int num2, size_t * buflen) {\n"
@@ -6359,7 +6884,7 @@ class TestUninitVar : public TestFixture {
                         "  bool copied_all = true;\n"
                         "  g(&copied_all, 5, 6, &bytesCopied);\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:2]: (warning) Uninitialized variable: *buflen\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:24] -> [test.cpp:2:18]: (warning) Uninitialized variable: *buflen [uninitvar]\n", errout_str());
 
         // # 9953
         valueFlowUninit("uint32_t f(uint8_t *mem) {\n"
@@ -6368,7 +6893,7 @@ class TestUninitVar : public TestFixture {
                         "    buf[0] = mem[0];\n"
                         "    return(*(uint32_t *)buf);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void valueFlowUninitStructMembers()
@@ -6379,7 +6904,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 1;\n"
                         "    if (ab.b == 2) {}\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: ab.b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void do_something(const struct AB &ab) { a = ab.a; }\n"
@@ -6388,7 +6913,7 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 0;\n"
                         "    do_something(ab);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void do_something(const struct AB &ab) { a = ab.b; }\n"
@@ -6397,30 +6922,30 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 0;\n"
                         "    do_something(ab);\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:2]: (warning) Uninitialized variable: ab.b\n", errout.str());
+        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"
                         "void f(void) {\n"
                         "    struct AB ab;\n"
                         "    int a = ab.a;\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:4:16]: (error) Uninitialized variable: ab.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void f(void) {\n"
                         "    AB ab1;\n"
                         "    AB ab2 = { ab1.a, 0 };\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: ab1.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:20]: (error) Uninitialized variable: ab1.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void f(void) {\n"
                         "    struct AB ab;\n"
                         "    buf[ab.a] = 0;\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:4:12]: (error) Uninitialized variable: ab.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void f(void) {\n"
@@ -6428,8 +6953,8 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 1;\n"
                         "    x = ab;\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized variable: ab.b\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:5:9]: (error) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void f(void) {\n"
@@ -6437,8 +6962,8 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 1;\n"
                         "    x = *(&ab);\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized variable: *(&ab).b\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:5:9]: (error) Uninitialized variable: *(&ab).b [uninitvar]\n", errout_str());
 
         valueFlowUninit("void f(void) {\n"
                         "    struct AB ab;\n"
@@ -6446,8 +6971,8 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = (void*)&x;\n"
                         "    dostuff(&ab,0);\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    static void f() { }\n"
@@ -6455,7 +6980,7 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; element->f();\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    static void f() { }\n"
@@ -6463,7 +6988,7 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; (*element).f();\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    static int v;\n"
@@ -6471,7 +6996,7 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; element->v;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    static int v;\n"
@@ -6479,7 +7004,7 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; (*element).v;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    void f() { }\n"
@@ -6487,7 +7012,7 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; element->f();\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    void f() { }\n"
@@ -6495,7 +7020,7 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; (*element).f();\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:25]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    int v;\n"
@@ -6503,7 +7028,7 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; element->v;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: element [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Element {\n"
                         "    int v;\n"
@@ -6511,15 +7036,15 @@ class TestUninitVar : public TestFixture {
                         "void test() {\n"
                         "    Element *element; (*element).v;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: element\n", errout.str());
+        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
                         "void f(void) {\n"
                         "    struct AB ab;\n"
                         "    assign(&ab.a, 0);\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit(
             "struct Cstring { char *text; int size, alloc; };\n"
@@ -6529,7 +7054,7 @@ class TestUninitVar : public TestFixture {
             "    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
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void do_something(const struct AB ab);\n"
@@ -6539,8 +7064,8 @@ class TestUninitVar : public TestFixture {
                         "    ab.b = 0;\n"
                         "    do_something(ab);\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         {
             valueFlowUninit("struct AB { char a[10]; };\n"
@@ -6548,32 +7073,32 @@ class TestUninitVar : public TestFixture {
                             "    struct AB ab;\n"
                             "    strcpy(ab.a, STR);\n"
                             "}\n",
-                            "test.c");
-            ASSERT_EQUALS("", errout.str());
+                            false);
+            ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("struct AB { unsigned char a[10]; };\n" // #8999 - cast
                             "void f(void) {\n"
                             "    struct AB ab;\n"
                             "    strcpy((char *)ab.a, STR);\n"
                             "}\n",
-                            "test.c");
-            ASSERT_EQUALS("", errout.str());
+                            false);
+            ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("struct AB { char a[10]; };\n"
                             "void f(void) {\n"
                             "    struct AB ab;\n"
                             "    strcpy(x, ab.a);\n"
                             "}\n",
-                            "test.c");
-            TODO_ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: ab.a\n", "", errout.str());
+                            false);
+            TODO_ASSERT_EQUALS("[test.c:4:16]: (error) Uninitialized variable: ab.a [uninitvar]\n", "", errout_str());
 
             valueFlowUninit("struct AB { int a; };\n"
                             "void f(void) {\n"
                             "    struct AB ab;\n"
                             "    dosomething(ab.a);\n"
                             "}\n",
-                            "test.c");
-            ASSERT_EQUALS("", errout.str());
+                            false);
+            ASSERT_EQUALS("", errout_str());
         }
 
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6583,8 +7108,8 @@ class TestUninitVar : public TestFixture {
                         "    ab = getAB();\n"
                         "    do_something(ab);\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         {
             // #6769 - calling method that might assign struct members
@@ -6594,7 +7119,7 @@ class TestUninitVar : public TestFixture {
                             "    ab.set();\n"
                             "    x = ab;\n"
                             "}");
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             valueFlowUninit("struct AB { int a; int get() const; };\n"
                             "void f(void) {\n"
@@ -6602,7 +7127,7 @@ class TestUninitVar : public TestFixture {
                             "    ab.get();\n"
                             "    x = ab;\n"
                             "}");
-            ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: ab\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:4:5]: (error) Uninitialized variable: ab [uninitvar]\n", errout_str());
 
             valueFlowUninit("struct AB { int a; void dostuff() {} };\n"
                             "void f(void) {\n"
@@ -6610,7 +7135,7 @@ class TestUninitVar : public TestFixture {
                             "    ab.dostuff();\n"
                             "    x = ab;\n"
                             "}");
-            TODO_ASSERT_EQUALS("error", "", errout.str());
+            TODO_ASSERT_EQUALS("error", "", errout_str());
         }
 
         valueFlowUninit("struct AB { int a; struct { int b; int c; } s; };\n"
@@ -6622,8 +7147,8 @@ class TestUninitVar : public TestFixture {
                         "    ab.s.c = 3;\n"
                         "    do_something(ab);\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct conf {\n"
                         "    char x;\n"
@@ -6636,8 +7161,8 @@ class TestUninitVar : public TestFixture {
                         "   initdata(&c);\n"
                         "   do_something(c);\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct PIXEL {\n"
                         "    union  {\n"
@@ -6651,7 +7176,7 @@ class TestUninitVar : public TestFixture {
                         "    p1.color = 255;\n"
                         "    return p1.red;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "int f() {\n"
@@ -6662,7 +7187,7 @@ class TestUninitVar : public TestFixture {
                         "    }\n"
                         "  }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "int f(int x) {\n"
@@ -6672,7 +7197,7 @@ class TestUninitVar : public TestFixture {
                         "  }\n"
                         "  if (x == 0 && (ab != NULL || ab->a == 0)) { }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A { int *x; };\n" // declarationId is 0 for "delete"
                         "void foo(void *info, void*p);\n"
@@ -6680,7 +7205,7 @@ class TestUninitVar : public TestFixture {
                         "  struct A *delete = 0;\n"
                         "  foo( info, NULL );\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct ABC { int a; int b; int c; };\n"
                         "void foo(int x, const struct ABC *abc);\n"
@@ -6689,20 +7214,20 @@ class TestUninitVar : public TestFixture {
                         "  foo(123, &abc);\n"
                         "  return abc.b;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: abc.b\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f(void) {\n"
                         "    struct tm t;\n"
                         "    t.tm_year = 123;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return
         valueFlowUninit("struct AB { int a; int b; };\n"
@@ -6711,8 +7236,8 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 0;\n"
                         "    return ab.b;\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:5]: (error) Uninitialized variable: ab.b\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:5:15]: (error) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct AB { int a; int b; };\n"
                         "void f(void) {\n"
@@ -6720,8 +7245,8 @@ class TestUninitVar : public TestFixture {
                         "    ab.a = 0;\n"
                         "    return ab.a;\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S { int a; int b; };\n" // #8299
                         "void f(void) {\n"
@@ -6729,14 +7254,14 @@ class TestUninitVar : public TestFixture {
                         "    s.a = 0;\n"
                         "    return s;\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: s.b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:12]: (error) Uninitialized variable: s.b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct S { int a; int b; };\n" // #9810
                         "void f(void) {\n"
                         "    struct S s;\n"
                         "    return s.a ? 1 : 2;\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: s.a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14]: (error) Uninitialized variable: s.a [uninitvar]\n", errout_str());
 
         // checkIfForWhileHead
         valueFlowUninit("struct FRED {\n"
@@ -6749,8 +7274,8 @@ class TestUninitVar : public TestFixture {
                         "   fred.a = do_something();\n"
                         "   if (fred.a == 0) { }\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct FRED {\n"
                         "    int a;\n"
@@ -6762,30 +7287,30 @@ class TestUninitVar : public TestFixture {
                         "   fred.a = do_something();\n"
                         "   if (fred.b == 0) { }\n"
                         "}\n",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:9]: (error) Uninitialized variable: fred.b\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:9:13]: (error) Uninitialized variable: fred.b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct Fred { int a; };\n"
                         "void f() {\n"
                         "    struct Fred fred;\n"
                         "    if (fred.a==1) {}\n"
                         "}",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:4]: (error) Uninitialized variable: fred.a\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:4:14]: (error) Uninitialized variable: fred.a [uninitvar]\n", errout_str());
 
         valueFlowUninit("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"
                         "}",
-                        "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        false);
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void test2() {\n"
                         "  struct { char type; } s_d;\n"
                         "  if (foo(&s_d.type)){}\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // for
         valueFlowUninit("struct AB { int a; };\n"
@@ -6793,21 +7318,21 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    while (x) { clear(ab); z = ab.a; }\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: ab.a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // address of member
         valueFlowUninit("struct AB { int a[10]; int b; };\n"
@@ -6815,7 +7340,7 @@ class TestUninitVar : public TestFixture {
                         "    struct AB ab;\n"
                         "    int *p = ab.a;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Reference
         valueFlowUninit("struct A { int x; };\n"
@@ -6825,7 +7350,7 @@ class TestUninitVar : public TestFixture {
                         "  x = 0;\n"
                         "  return a.x;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // non static data-member initialization
         valueFlowUninit("struct AB { int a=1; int b; };\n"
@@ -6834,7 +7359,7 @@ class TestUninitVar : public TestFixture {
                         "    int a = ab.a;\n"
                         "    int b = ab.b;\n"
                         "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: ab.b\n", "", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: ab.b [uninitvar]\n", errout_str());
 
         // STL class member
         valueFlowUninit("struct A {\n"
@@ -6845,7 +7370,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    x = a.m;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C++)
         valueFlowUninit("struct A {\n"
@@ -6855,9 +7380,8 @@ class TestUninitVar : public TestFixture {
                         "void foo() {\n"
                         "    A a;\n"
                         "    x = a.m;\n"
-                        "}",
-                        "test.cpp");
-        ASSERT_EQUALS("", errout.str());
+                        "}");
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown type (C)
         valueFlowUninit("struct A {\n"
@@ -6868,8 +7392,8 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    x = a.m;\n"
                         "}",
-                        "test.c");
-        ASSERT_EQUALS("[test.c:7]: (error) Uninitialized variable: a.m\n", errout.str());
+                        false);
+        ASSERT_EQUALS("[test.c:7:11]: (error) Uninitialized variable: a.m [uninitvar]\n", errout_str());
 
         // Type with constructor
         valueFlowUninit("class C { C(); }\n"
@@ -6881,7 +7405,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    x = a.m;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S {\n"
                         "   int t[1];\n"
@@ -6894,7 +7418,7 @@ class TestUninitVar : public TestFixture {
                         "   s.t[0] = 1;\n"
                         "   f(&s);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S {\n"
                         "   int t[1];\n"
@@ -6911,7 +7435,7 @@ class TestUninitVar : public TestFixture {
                         "   s.t[0] = 1;\n"
                         "   f(&s);\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct X {\n"
                         "   int a, b;\n"
@@ -6927,7 +7451,7 @@ class TestUninitVar : public TestFixture {
                         "   s.t.a = 1;\n"
                         "   f(&s);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("typedef struct { int a; int b; int c; } ABC;\n" // #5777
                         "void setabc(int x, const ABC* const abc) {\n"
@@ -6938,7 +7462,7 @@ class TestUninitVar : public TestFixture {
                         "    abc.a = 1;\n"
                         "    setabc(123, &abc);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:8] -> [test.cpp:3]: (warning) Uninitialized variable: abc->b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:17] -> [test.cpp:3:25]: (warning) Uninitialized variable: abc->b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct S { int* p; };\n" // #10463
                         "void f(S* in) {\n"
@@ -6946,8 +7470,7 @@ class TestUninitVar : public TestFixture {
                         "    memcpy(in, s, sizeof(S));\n"
                         "    s->p = NULL;\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: s\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:16]: (error) Uninitialized variable: s [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct S {\n" // #11321
                         "    int a = 0;\n"
@@ -6958,7 +7481,7 @@ class TestUninitVar : public TestFixture {
                         "    s1.b = 1;\n"
                         "    S s2 = s1;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11460
         valueFlowUninit("struct B { int i; };\n"
@@ -6970,7 +7493,7 @@ class TestUninitVar : public TestFixture {
                         "    H h;\n"
                         "    h.e();\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11597
         valueFlowUninit("void f(size_t f) {\n"
@@ -6980,7 +7503,7 @@ class TestUninitVar : public TestFixture {
                         "    } s;\n"
                         "    if (f < s.offset + sizeof(s)) {}\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #11776 - function call initialises struct array member
         valueFlowUninit("typedef struct {\n"
@@ -6997,7 +7520,7 @@ class TestUninitVar : public TestFixture {
                         "  init(my_st.arr, 12);\n" // <- assume that my_st.arr is written
                         "  foo(&my_st);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("typedef struct {\n"
                         "  int arr[1];\n"
@@ -7015,7 +7538,187 @@ class TestUninitVar : public TestFixture {
                         "  init(my_st.arr, 12);\n" // <- assume that my_st.arr is written
                         "  foo(&my_st);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S {\n" // #12188
+                        "    int i;\n"
+                        "    struct T { int j; } t;\n"
+                        "};\n"
+                        "void f() {\n"
+                        "    S s;\n"
+                        "    ++s.i;\n"
+                        "}\n"
+                        "void g() {\n"
+                        "    S s;\n"
+                        "    s.i--;\n"
+                        "}\n"
+                        "void h() {\n"
+                        "    S s;\n"
+                        "    s.i &= 3;\n"
+                        "}\n"
+                        "void k() {\n"
+                        "    S s;\n"
+                        "    if (++s.i < 3) {}\n"
+                        "}\n"
+                        "void m() {\n"
+                        "    S s;\n"
+                        "    ++s.t.j;\n"
+                        "}\n"
+                        "void n() {\n"
+                        "    S s;\n"
+                        "    if (s.t.j-- < 3) {}\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:7:9]: (error) Uninitialized variable: s.i [uninitvar]\n"
+                      "[test.cpp:11:7]: (error) Uninitialized variable: s.i [uninitvar]\n"
+                      "[test.cpp:15:7]: (error) Uninitialized variable: s.i [uninitvar]\n"
+                      "[test.cpp:19:13]: (error) Uninitialized variable: s.i [uninitvar]\n"
+                      "[test.cpp:23:11]: (error) Uninitialized variable: s.t.j [uninitvar]\n"
+                      "[test.cpp:27:13]: (error) Uninitialized variable: s.t.j [uninitvar]\n",
+                      errout_str());
+
+        valueFlowUninit("struct S { int x; };\n" // #6933
+                        "void f() {\n"
+                        "    int i;\n"
+                        "    S s(i);\n"
+                        "}\n"
+                        "void g() {\n"
+                        "    int i;\n"
+                        "    S t{ i };\n"
+                        "}\n"
+                        "void h() {\n"
+                        "    int i;\n"
+                        "    std::vector<int> v(i);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:4:9]: (error) Uninitialized variable: i [uninitvar]\n"
+                      "[test.cpp:8:10]: (error) Uninitialized variable: i [uninitvar]\n"
+                      "[test.cpp:12:24]: (error) Uninitialized variable: i [uninitvar]\n",
+                      errout_str());
+
+        valueFlowUninit("struct S {\n"
+                        "    S(char**);\n"
+                        "    int i;\n"
+                        "};\n"
+                        "void f() {\n"
+                        "    char* p;\n"
+                        "    S s(&p);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S {\n" // #12354
+                        "    int i{};\n"
+                        "    void f();\n"
+                        "};\n"
+                        "void f(bool b) {\n"
+                        "    S* p;\n"
+                        "    if (b)\n"
+                        "        p = new S();\n"
+                        "    p->f();\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:7:9] -> [test.cpp:9:5]: (warning) Uninitialized variable: p [uninitvar]\n", errout_str());
+
+        // #12461
+        valueFlowUninit("struct stry_type {\n"
+                        "  void *out;\n"
+                        "};\n"
+                        "void bar(str_type *items);\n"
+                        "void foo() {\n"
+                        "  str_type st_arr[1];\n"
+                        "  char arr[5];\n"
+                        "  st_arr[0].out = &arr;\n"
+                        "  bar(st_arr);\n"
+                        "  int len = strlen(arr);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct stry_type {\n"
+                        "  void *out;\n"
+                        "};\n"
+                        "void foo() {\n"
+                        "  str_type st_arr[1];\n"
+                        "  char arr[5];\n"
+                        "  st_arr[0].out = &arr;\n"
+                        "  int len = strlen(arr);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:8:20]: (error) Uninitialized variable: arr [uninitvar]\n", errout_str());
+
+        valueFlowUninit("struct S {\n"
+                        "  void *out;\n"
+                        "};\n"
+                        "void bar(S* s);\n"
+                        "void foo() {\n"
+                        "  S s[1][1];\n"
+                        "  char arr[5];\n"
+                        "  s[0][0].out = &arr;\n"
+                        "  bar(s[0]);\n"
+                        "  int len = strlen(arr);\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S1 { int x; };\n" // #12401
+                        "struct S2 { struct S1 s1; };\n"
+                        "struct S2 f() {\n"
+                        "    struct S2 s2;\n"
+                        "    struct S1* s1 = &s2.s1;\n"
+                        "    s1->x = 0;\n"
+                        "    return s2;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S {\n" // #12685
+                        "    explicit S(double v);\n"
+                        "    double m;\n"
+                        "};\n"
+                        "void f() {\n"
+                        "    double d;\n"
+                        "    S s(d);\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:7:9]: (error) Uninitialized variable: d [uninitvar]\n", errout_str());
+
+        valueFlowUninit("struct S {\n"
+                        "    explicit S(double v) : m(v) {}\n"
+                        "    double m;\n"
+                        "};\n"
+                        "void f() {\n"
+                        "    double d;\n"
+                        "    S s{ d };\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:7:10]: (error) Uninitialized variable: d [uninitvar]\n", errout_str());
+
+        valueFlowUninit("struct S { int x; int y; };\n"
+                        "int f() {\n"
+                        "  S s;\n"
+                        "  s.x = 0;\n"
+                        "  return (&s)->x;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        valueFlowUninit("struct S { int x; int y; };\n"
+                        "int f() {\n"
+                        "  S s;\n"
+                        "  s.x = 0;\n"
+                        "  return (&s)->y;\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:5:16]: (error) Uninitialized variable: s.y [uninitvar]\n", errout_str());
+    }
+
+    void valueFlowUninitForLoop()
+    {
+        valueFlowUninit("void f() {\n" // #9924
+                        "    for (unsigned int a = 0, b; a < 42; a++) {\n"
+                        "        std::cout << ++b << std::endl;\n"
+                        "    }\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() {
@@ -7027,7 +7730,7 @@ class TestUninitVar : public TestFixture {
                         "    C *c;\n"
                         "    if (c->x() == 4) {}\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:6]: (error) Uninitialized variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:9]: (error) Uninitialized variable: c [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct A { \n"
                         "    int i; \n"
@@ -7037,7 +7740,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    a.f();\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_nonmember() {
@@ -7049,7 +7752,7 @@ class TestUninitVar : public TestFixture {
                         "  Foo* foo;\n"
                         "  foo->bar = 3;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: foo\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:3]: (error) Uninitialized variable: foo [uninitvar]\n", errout_str());
     }
 
     void uninitvarDesignatedInitializers() {
@@ -7059,7 +7762,7 @@ class TestUninitVar : public TestFixture {
                        "  extern int f(struct a *);\n"
                        "  return f(&(struct a){.b = 0});\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("struct a { int b, c; };\n"
                        "int main() {\n"
@@ -7067,7 +7770,7 @@ class TestUninitVar : public TestFixture {
                        "  extern int f(struct a *);\n"
                        "  return f(&(struct a){.b = 0, .c = 0});\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void isVariableUsageDeref() {
@@ -7076,32 +7779,32 @@ class TestUninitVar : public TestFixture {
                        "    char a[10];\n"
                        "    char c = *a;\n"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: a\n", errout.str());
+        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"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkUninitVar("void f() {\n"
                        "    void (*fp[1]) (void) = {function1};\n"
                        "    (*fp[0])();\n"
                        "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void isVariableUsageDerefValueflow()
@@ -7111,32 +7814,32 @@ class TestUninitVar : public TestFixture {
                         "    char a[10];\n"
                         "    char c = *a;\n"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: *a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: *a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: *a\n", errout.str());
+        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"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n"
                         "    void (*fp[1]) (void) = {function1};\n"
                         "    (*fp[0])();\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("template <typename T, int value> T Get() {return value;}\n"
                         "char f() {\n"
@@ -7145,7 +7848,7 @@ class TestUninitVar : public TestFixture {
                         "     buf[i] = 0;\n"
                         "  return buf[0];\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("static void Foo(double* p) {\n"
                         " p[0] = 0;\n"
@@ -7158,13 +7861,13 @@ class TestUninitVar : public TestFixture {
                         "  Foo(*L);\n"
                         "  return L[0][0];\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("void f() {\n" // #11305
                         "    type_t a;\n"
                         "    a[0] = 0;\n"
-                        "}\n", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                        "}\n", false);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void uninitvar_memberaccess() {
@@ -7174,7 +7877,7 @@ class TestUninitVar : public TestFixture {
                         "    ((&a)->bar) =  reinterpret_cast<char*>(*p);\n"
                         "    if ((&a)->bar) ;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct foo{char *bar;};\n"
                         "void f(unsigned long long *p) {\n"
@@ -7182,7 +7885,7 @@ class TestUninitVar : public TestFixture {
                         "    ((&(a))->bar) =  reinterpret_cast<char*>(*p);\n"
                         "    if ((&a)->bar) ;\n"
                         "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n" // #10200
                         "    struct B {\n"
@@ -7195,7 +7898,7 @@ class TestUninitVar : public TestFixture {
                         "    b.i = 123;\n"
                         "    x.push_back(b);\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct A {\n"
                         "    struct B {\n"
@@ -7207,7 +7910,7 @@ class TestUninitVar : public TestFixture {
                         "    A::B b;\n"
                         "    x.push_back(b);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:17]: (error) Uninitialized variable: b [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct A {\n"
                         "    struct B {\n"
@@ -7231,7 +7934,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    x.push_back(a);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:17]: (error) Uninitialized variable: a [uninitvar]\n", errout_str());
 
         valueFlowUninit("struct S { struct T { int* p; } t[2]; };\n" // #11018
                         "void f() {\n"
@@ -7242,7 +7945,7 @@ class TestUninitVar : public TestFixture {
                         "    S s;\n"
                         "    ((*&(*&s.t[0].p))) = 0;\n"
                         "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         valueFlowUninit("struct S { int i; };\n" // #6323
                         "void f() {\n"
@@ -7250,30 +7953,30 @@ class TestUninitVar : public TestFixture {
                         "    int x = -3;\n"
                         "    int y = x < (1, s.i);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (error) Uninitialized variable: s.i\n", errout.str());
-    }
-
-    void ctu_(const char* file, int line, const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
+        ASSERT_EQUALS("[test.cpp:5:23]: (error) Uninitialized variable: s.i [uninitvar]\n", errout_str());
 
-        // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
-
-        CTU::FileInfo *ctu = CTU::getFileInfo(&tokenizer);
+        valueFlowUninit("struct S { int x; };\n" // #11353
+                        "struct S f() {\n"
+                        "    struct S s;\n"
+                        "    int* p = &s.x;\n"
+                        "    *p = 0;\n"
+                        "    return s;\n"
+                        "}\n");
+        ASSERT_EQUALS("", errout_str());
 
-        // Check code..
-        std::list<Check::FileInfo*> fileInfo;
-        CheckUninitVar check(&tokenizer, &settings, this);
-        fileInfo.push_back(check.getFileInfo(&tokenizer, &settings));
-        check.analyseWholeProgram(ctu, fileInfo, settings, *this);
-        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() {
@@ -7284,7 +7987,7 @@ class TestUninitVar : public TestFixture {
             "  int x;\n"
             "  f(&x);\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:2]: (error) Using argument p that points at uninitialized variable x\n", errout.str());
+        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"
             "void call(int x, int *p) { x++; use(p); }\n"
@@ -7292,7 +7995,7 @@ class TestUninitVar : public TestFixture {
             "  int x;\n"
             "  call(4,&x);\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:5] -> [test.cpp:2] -> [test.cpp:1]: (error) Using argument p that points at uninitialized variable x\n", errout.str());
+        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"
             "  if (!var)\n"
@@ -7304,7 +8007,7 @@ class TestUninitVar : public TestFixture {
             "  int x;\n"
             "  dostuff(a, &x);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("void dostuff(int *x, int *y) {\n"
             "  if (cond)\n"
@@ -7316,7 +8019,7 @@ class TestUninitVar : public TestFixture {
             "  int x;\n"
             "  dostuff(a, &x);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("void f(int *p) {\n"
             "    a = sizeof(*p);\n"
@@ -7325,7 +8028,7 @@ class TestUninitVar : public TestFixture {
             "  int x;\n"
             "  f(&x);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("void f(int *v) {\n"
             "  std::cin >> *v;\n"
@@ -7334,7 +8037,7 @@ class TestUninitVar : public TestFixture {
             "  int x;\n"
             "  f(&x);\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         ctu("void increment(int& i) { ++i; }\n" // #6475
             "int f() {\n"
@@ -7342,7 +8045,7 @@ class TestUninitVar : public TestFixture {
             "    increment(n);\n"
             "    return n;\n"
             "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Using argument i that points at uninitialized variable n\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14] -> [test.cpp:1:28]: (error) Using argument i that points at uninitialized variable n [ctuuninitvar]\n", errout_str());
 
         ctu("void increment(int* i) { ++(*i); }\n"
             "int f() {\n"
@@ -7350,7 +8053,7 @@ class TestUninitVar : public TestFixture {
             "    increment(&n);\n"
             "    return n;\n"
             "}\n");
-        ASSERT_EQUALS("[test.cpp:4] -> [test.cpp:1]: (error) Using argument i that points at uninitialized variable n\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:14] -> [test.cpp:1:30]: (error) Using argument i that points at uninitialized variable n [ctuuninitvar]\n", errout_str());
 
         ctu("typedef struct { int type; int id; } Stem;\n"
             "void lookupStem(recodeCtx h, Stem *stem) {\n"
@@ -7361,7 +8064,15 @@ class TestUninitVar : public TestFixture {
             "    stem.type = 0;\n"
             "    lookupStem(h, &stem);\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        ctu("void increment(int& i) { ++i; }\n" // #6475
+            "int f() {\n"
+            "    int n;\n"
+            "    increment(n);\n"
+            "    return n;\n"
+            "}\n");
+        ASSERT_EQUALS("[test.cpp:4:14] -> [test.cpp:1:28]: (error) Using argument i that points at uninitialized variable n [ctuuninitvar]\n", errout_str());
     }
 };
 
diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp
index 0eed7a68fd6..cf027e01d79 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-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
@@ -18,12 +18,12 @@
 
 #include "checkunusedfunctions.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
 
-#include <sstream>
+#include <cstddef>
 #include <string>
 
 class TestUnusedFunctions : public TestFixture {
@@ -34,6 +34,7 @@ class TestUnusedFunctions : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::style).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(incondition);
         TEST_CASE(return1);
         TEST_CASE(return2);
@@ -51,6 +52,7 @@ class TestUnusedFunctions : public TestFixture {
         TEST_CASE(template7); // #9766 crash
         TEST_CASE(template8);
         TEST_CASE(template9);
+        TEST_CASE(template10);
         TEST_CASE(throwIsNotAFunction);
         TEST_CASE(unusedError);
         TEST_CASE(unusedMain);
@@ -63,6 +65,7 @@ class TestUnusedFunctions : public TestFixture {
         TEST_CASE(member_function_ternary);
         TEST_CASE(boost);
         TEST_CASE(enumValues);
+        TEST_CASE(recursive);
 
         TEST_CASE(multipleFiles);   // same function name in multiple files
 
@@ -75,29 +78,52 @@ class TestUnusedFunctions : public TestFixture {
         TEST_CASE(entrypointsWin);
         TEST_CASE(entrypointsWinU);
         TEST_CASE(entrypointsUnix);
+
+        TEST_CASE(virtualFunc);
+        TEST_CASE(parensInit);
+        TEST_CASE(typeInCast);
+        TEST_CASE(attributeCleanup);
+        TEST_CASE(attributeUnused);
+        TEST_CASE(attributeMaybeUnused);
+        TEST_CASE(staticFunction);
     }
 
+    struct CheckOptions
+    {
+        Platform::Type platform = Platform::Type::Native;
+        bool cpp = true;
+    };
+
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], cppcheck::Platform::Type platform = cppcheck::Platform::Type::Native, const Settings *s = nullptr) {
-        // Clear the error buffer..
-        errout.str("");
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
+        // TODO: avoid copy
+        const Settings settings1 = (options.platform == Platform::Type::Native) ? settings : settingsBuilder(settings).platform(options.platform).build();
+
+        check_(file, line, code, settings1, options.cpp);
+    }
 
-        const Settings settings1 = settingsBuilder(s ? *s : settings).platform(platform).build();
+    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
+    }
+
+    // TODO: get rid of this
+    void check_(const char* file, int line, const std::string& code ) {
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused functions..
-        CheckUnusedFunctions checkUnusedFunctions(&tokenizer, &settings1, this);
-        checkUnusedFunctions.parseTokens(tokenizer, "someFile.c", &settings1);
-        // check() returns error if and only if errout is not empty.
-        if ((checkUnusedFunctions.check)(this, settings1)) {
-            ASSERT(!errout.str().empty());
-        } else {
-            ASSERT_EQUALS("", errout.str());
-        }
+        CheckUnusedFunctions checkUnusedFunctions;
+        checkUnusedFunctions.parseTokens(tokenizer, settings);
+        (checkUnusedFunctions.check)(settings, *this); // TODO: check result
     }
 
     void incondition() {
@@ -106,7 +132,7 @@ class TestUnusedFunctions : public TestFixture {
               "    if (f1())\n"
               "    { }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:5]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
     void return1() {
@@ -114,15 +140,15 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    return f1();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
+              "    return foo();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:8]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
     void return3() {
@@ -140,7 +166,7 @@ class TestUnusedFunctions : public TestFixture {
               "int main() {\n"
               "  indirectHello();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void callback1() {
@@ -148,7 +174,7 @@ class TestUnusedFunctions : public TestFixture {
               "{\n"
               "    void (*f)() = cond ? f1 : NULL;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
     void callback2() { // #8677
@@ -161,7 +187,7 @@ class TestUnusedFunctions : public TestFixture {
               "void C::callback() {}\n" // <- not unused
               "\n"
               "void C::start() { ev.set<C, &C::callback>(this); }");
-        ASSERT_EQUALS("[test.cpp:9]: (style) The function 'start' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:9]: (style) The function 'start' is never used. [unusedFunction]\n", errout_str());
     }
 
     void else1() {
@@ -170,7 +196,7 @@ class TestUnusedFunctions : public TestFixture {
               "    if (cond) ;\n"
               "    else f1();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f1' is never used. [unusedFunction]\n", errout_str());
     }
 
     void functionpointer() {
@@ -179,14 +205,14 @@ class TestUnusedFunctions : public TestFixture {
               "    f(&foo);\n"
               "    return 0\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void foo() { }\n"
               "int main() {\n"
               "    f(&::foo);\n"
               "    return 0\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
               "    void foo() { }\n"
@@ -195,7 +221,7 @@ class TestUnusedFunctions : public TestFixture {
               "    f(&abc::foo);\n"
               "    return 0\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
               "    void foo() { }\n"
@@ -204,7 +230,7 @@ class TestUnusedFunctions : public TestFixture {
               "    f = &abc::foo;\n"
               "    return 0\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"
               "    void foo() { }\n"
@@ -213,7 +239,7 @@ class TestUnusedFunctions : public TestFixture {
               "    f = &::abc::foo;\n"
               "    return 0\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("namespace abc {\n"  // #3875
               "    void foo() { }\n"
@@ -222,7 +248,18 @@ class TestUnusedFunctions : public TestFixture {
               "    f(abc::foo);\n"
               "    return 0\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("template <class T> T f()\n" // #13117
+              "{\n"
+              "    return T(1);\n"
+              "}\n"
+              "int main(void)\n"
+              "{\n"
+              "    auto *ptr = &f<int>;\n"
+              "    return ptr();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template1() {
@@ -233,7 +270,7 @@ class TestUnusedFunctions : public TestFixture {
               "    foo<int>();\n"
               "    return 0\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template2() {
@@ -245,7 +282,7 @@ class TestUnusedFunctions : public TestFixture {
               "}\n"
               "\n"
               "void h() { g<int>(); h(); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:6]: (style) The function 'h' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template3() { // #4701
@@ -256,7 +293,7 @@ class TestUnusedFunctions : public TestFixture {
               "    template<typename T> void foo( T t ) const;\n"
               "};\n"
               "template<typename T> void X::foo( T t ) const { }");
-        ASSERT_EQUALS("[test.cpp:3]: (style) The function 'bar' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The function 'bar' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template4() { // #9805
@@ -276,7 +313,7 @@ class TestUnusedFunctions : public TestFixture {
               "        test();\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:10]: (style) The function 'test' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template5() { // #9220
@@ -288,13 +325,13 @@ class TestUnusedFunctions : public TestFixture {
               "void g() { fun(); }\n"
               "\n"
               "int main() { g<f>(); return 0;}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template6() { // #10475
         check("template<template<typename...> class Ref, typename... Args>\n"
               "struct Foo<Ref<Args...>, Ref> : std::true_type {};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template7()
@@ -302,7 +339,7 @@ class TestUnusedFunctions : public TestFixture {
         check("void f() {\n"
               "    std::array<std::array<double,3>,3> array;\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The function 'f' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
 
     void template8() { // #11485
@@ -310,9 +347,9 @@ class TestUnusedFunctions : public TestFixture {
               "    template<typename T>\n"
               "    void tf(const T&) { }\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) The function 'tf' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) The function 'tf' is never used. [unusedFunction]\n", errout_str());
 
-        check("struct S {\n"
+        check("struct C {\n"
               "    template<typename T>\n"
               "    void tf(const T&) { }\n"
               "};\n"
@@ -320,9 +357,9 @@ class TestUnusedFunctions : public TestFixture {
               "    C c;\n"
               "    c.tf(1.5);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
-        check("struct S {\n"
+        check("struct C {\n"
               "    template<typename T>\n"
               "    void tf(const T&) { }\n"
               "};\n"
@@ -330,7 +367,7 @@ class TestUnusedFunctions : public TestFixture {
               "    C c;\n"
               "    c.tf<int>(1);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template9() {
@@ -346,56 +383,65 @@ class TestUnusedFunctions : public TestFixture {
               "    g(2);\n"
               "    g(3.14);\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("template <typename T> T f(T);\n" // #9222
               "template <typename T> T f(T i) { return i; }\n"
               "template int f<int>(int);\n"
               "int main() { return f(int(2)); }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void template10() {
+        check("template<typename T>\n" // #12013, don't crash
+              "struct S {\n"
+              "    static const int digits = std::numeric_limits<T>::digits;\n"
+              "    using type = std::conditional<digits < 32, std::int32_t, std::int64_t>::type;\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void throwIsNotAFunction() {
         check("struct A {void f() const throw () {}}; int main() {A a; a.f();}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unusedError() {
         check("void foo() {}\n"
               "int main()");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The function 'foo' is never used.\n", errout.str());
+        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]: (style) The function 'foo' is never used.\n", errout.str());
+        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]: (style) The function 'foo' is never used.\n", errout.str());
+        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]: (style) The function 'foo' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'foo' is never used. [unusedFunction]\n", errout_str());
     }
 
     void unusedMain() {
         check("int main() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initializationIsNotAFunction() {
         check("struct B: N::A {\n"
               "  B(): N::A() {};\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operator1() {
         check("struct Foo { void operator()(int a) {} };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Foo { operator std::string(int a) {} };");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operator2() { // #7974
@@ -408,56 +454,56 @@ class TestUnusedFunctions : public TestFixture {
               "int main(event a, event b) {\n"
               "    return a == b;\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void returnRef() {
         check("int& foo() {return x;}");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The function 'foo' is never used.\n", errout.str());
+        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() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void __attribute__((constructor(1000))) f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void __attribute__((destructor)) f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void __attribute__((destructor(1000))) f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // alternate syntax
         check("__attribute__((constructor)) void f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("__attribute__((constructor(1000))) void f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("__attribute__((destructor)) void f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("__attribute__((destructor(1000))) void f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // alternate syntax
         check("void f() __attribute__((constructor));\n"
               "void f() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((constructor(1000)));\n"
               "void f() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((destructor));\n"
               "void f() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f() __attribute__((destructor(1000)));\n"
               "void f() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Don't crash on wrong syntax
         check("int x __attribute__((constructor));\n"
@@ -465,7 +511,11 @@ class TestUnusedFunctions : public TestFixture {
 
         // #10661
         check("extern \"C\" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataSize) { return 0; }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        check("[[maybe_unused]] void f() {}\n" // #13268
+              "__attribute__((unused)) void g() {}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void initializer_list() {
@@ -475,7 +525,7 @@ class TestUnusedFunctions : public TestFixture {
               "    {}\n"
               "int m_i;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #8580
         check("int foo() { return 12345; }\n"
@@ -486,7 +536,7 @@ class TestUnusedFunctions : public TestFixture {
               "  A() : a(bar([] { return foo(); })) {}\n"
               "  const int a;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void member_function_ternary() {
@@ -500,14 +550,15 @@ class TestUnusedFunctions : public TestFixture {
               "    ptr = (argc > 1 && !strcmp(argv[1], \"F2\")) ? &Foo::F2 : &Foo::F1;\n"
               "    (foo.*ptr)();\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void boost() {
-        check("static void _xy(const char *b, const char *e)\n"
-              "{}\n"
-              "parse(line, blanks_p >> ident[&_xy] >> blanks_p >> eol_p).full");
-        ASSERT_EQUALS("", errout.str());
+        check("static void _xy(const char *b, const char *e) {}\n"
+              "void f() {\n"
+              "    parse(line, blanks_p >> ident[&_xy] >> blanks_p >> eol_p).full;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:6]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
 
     void enumValues() { // #11486
@@ -517,55 +568,63 @@ class TestUnusedFunctions : public TestFixture {
               "    void Break() {}\n"
               "    void Break1() {}\n"
               "};\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) The function 'Break' is never used.\n"
-                      "[test.cpp:5]: (style) The function 'Break1' is never used.\n",
-                      errout.str());
+        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
+              "    void f() {}\n"
+              "};\n"
+              "enum E { f };\n"
+              "int main() {\n"
+              "    E e{ f };\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'f' is never used. [unusedFunction]\n", errout_str());
     }
 
-    void multipleFiles() {
-        Tokenizer tokenizer(&settings, this);
-        CheckUnusedFunctions c(&tokenizer, &settings, nullptr);
+    void recursive() {
+        check("void f() {\n" // #8159
+              "    f();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:1:6]: (style) The function 'f' is never used. [unusedFunction]\n",
+                      errout_str());
+    }
 
-        // Clear the error buffer..
-        errout.str("");
+    void multipleFiles() {
+        CheckUnusedFunctions c;
 
         const char code[] = "static void f() { }";
 
         for (int i = 1; i <= 2; ++i) {
-            std::ostringstream fname;
-            fname << "test" << i << ".cpp";
-
-            // Clear the error buffer..
-            errout.str("");
+            const std::string fname = "test" + std::to_string(i) + ".cpp";
 
-            Tokenizer tokenizer2(&settings, this);
-            std::istringstream istr(code);
-            ASSERT(tokenizer2.tokenize(istr, fname.str().c_str()));
+            SimpleTokenizer tokenizer{settings, *this, fname};
+            ASSERT(tokenizer.tokenize(code));
 
-            c.parseTokens(tokenizer2, "someFile.c", &settings);
+            c.parseTokens(tokenizer, settings);
         }
 
         // Check for unused functions..
-        (c.check)(this, settings);
+        (c.check)(settings, *this); // TODO: check result
 
-        ASSERT_EQUALS("[test1.cpp:1]: (style) The function 'f' is never used.\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]: (style) The function 'bar' is never used.\n", errout.str());
+        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]: (style) The function 'f' is never used.\n", errout.str());
+        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}");
-        ASSERT_EQUALS("", errout.str());
+              "void (*list[])(void) = {f};");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void operatorOverload() {
@@ -576,7 +635,7 @@ class TestUnusedFunctions : public TestFixture {
               "std::ostream & operator<<(std::ostream &os, const A&) {\n"
               "    os << \"This is class A\";\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A{};\n"
               "A operator + (const A &, const A &){ return A(); }\n"
@@ -613,7 +672,7 @@ class TestUnusedFunctions : public TestFixture {
               "A operator -- (const A &, const int){ return A(); }\n"
               "A operator -- (const A &){ return A(); }\n"
               "A operator , (const A &, const A &){ return A(); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         check("class A {\n"
@@ -627,52 +686,146 @@ class TestUnusedFunctions : public TestFixture {
               "void * A::operator new[](std::size_t s) {\n"
               "    return malloc(s);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsWin() {
         check("int WinMain() { }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The function 'WinMain' is never used.\n", errout.str());
+        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]: (style) The function '_tmain' is never used.\n", errout.str());
+        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() { }", cppcheck::Platform::Type::Native, &s);
-        ASSERT_EQUALS("", errout.str());
+        check("int WinMain() { }", s);
+        ASSERT_EQUALS("", errout_str());
 
-        check("int _tmain() { }", cppcheck::Platform::Type::Native, &s);
-        ASSERT_EQUALS("", errout.str());
+        check("int _tmain() { }", s);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsWinU() {
         check("int wWinMain() { }");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The function 'wWinMain' is never used.\n", errout.str());
+        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]: (style) The function '_tmain' is never used.\n", errout.str());
+        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() { }", cppcheck::Platform::Type::Native, &s);
-        ASSERT_EQUALS("", errout.str());
+        check("int wWinMain() { }", s);
+        ASSERT_EQUALS("", errout_str());
 
-        check("int _tmain() { }", cppcheck::Platform::Type::Native, &s);
-        ASSERT_EQUALS("", errout.str());
+        check("int _tmain() { }", s);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void entrypointsUnix() {
         check("int _init() { }\n"
               "int _fini() { }\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) The function '_init' is never used.\n"
-                      "[test.cpp:2]: (style) The function '_fini' is never used.\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", cppcheck::Platform::Type::Native, &s);
-        ASSERT_EQUALS("", errout.str());
+              "int _fini() { }\n", s);
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void virtualFunc()
+    {
+        check("struct D : public B {\n" // #10660
+              "    virtual void f() {}\n"
+              "    void g() override {}\n"
+              "    void h() final {}\n"
+              "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("struct B {\n"
+              "    virtual void f() = 0;\n"
+              "    void g();\n"
+              "};\n"
+              "struct D : B {\n"
+              "    void f() override {}\n"
+              "};\n"
+              "int main() {\n"
+              "    D d;\n"
+              "    d.g();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void parensInit()
+    {
+        check("struct S {\n" // #12898
+              "    void url() {}\n"
+              "};\n"
+              "int main() {\n"
+              "    const int url(0);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'url' is never used. [unusedFunction]\n", errout_str());
+    }
+
+    void typeInCast()
+    {
+        check("struct S {\n" // #12901
+              "    void Type() {}\n"
+              "};\n"
+              "int main() {\n"
+              "    struct Type {} t;\n"
+              "    Type t2{ (Type)t };\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) The function 'Type' is never used. [unusedFunction]\n", errout_str());
+    }
+
+    void attributeCleanup()
+    {
+        check("void clean(void *ptr) {}\n"
+              "int main() {\n"
+              "    void * __attribute__((cleanup(clean))) p;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void attributeUnused()
+    {
+        check("[[unused]] void f() {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("[[gnu::unused]] void f() {}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("__attribute__((unused)) void f() {}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void attributeMaybeUnused()
+    {
+        check("[[__maybe_unused__]] void f() {}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
+
+        check("[[maybe_unused]] void f() {}\n", dinit(CheckOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
+
+        check("[[maybe_unused]] void f() {}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void staticFunction()
+    {
+        check("void f(void) {}\n"
+              "int main() {\n"
+              "    f();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        check("void f(void) {}\n"
+              "int main() {\n"
+              "    f();\n"
+              "}\n", dinit(CheckOptions, $.cpp = false));
+        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());
     }
 };
 
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index d3b56339f1b..5a364347163 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-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
@@ -18,18 +18,13 @@
 
 #include "checkclass.h"
 #include "errortypes.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
 
-#include <map>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
-#include <utility>
-#include <vector>
-
-#include <simplecpp.h>
 
 class TestUnusedPrivateFunction : public TestFixture {
 public:
@@ -39,6 +34,7 @@ class TestUnusedPrivateFunction : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::style).build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(test1);
         TEST_CASE(test2);
         TEST_CASE(test3);
@@ -58,6 +54,7 @@ class TestUnusedPrivateFunction : public TestFixture {
 
         TEST_CASE(ctor);
         TEST_CASE(ctor2);
+        TEST_CASE(ctor3);
 
         TEST_CASE(classInClass);
         TEST_CASE(sameFunctionNames);
@@ -87,37 +84,30 @@ class TestUnusedPrivateFunction : public TestFixture {
 
         TEST_CASE(templateSimplification); //ticket #6183
         TEST_CASE(maybeUnused);
+        TEST_CASE(attributeUnused); // #14129
+        TEST_CASE(trailingReturn);
     }
 
+    struct CheckOptions
+    {
+        Platform::Type platform = Platform::Type::Native;
+    };
 
-    void check(const char code[], cppcheck::Platform::Type platform = cppcheck::Platform::Type::Native) {
-        // Clear the error buffer..
-        errout.str("");
-
-        const Settings settings1 = settingsBuilder(settings).platform(platform).build();
+#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).platform(options.platform).build();
 
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+        SimpleTokenizer2 tokenizer(settings1, *this, code, "test.cpp");
 
         // Tokenize..
-        Tokenizer tokenizer(&settings1, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused private functions..
         CheckClass checkClass(&tokenizer, &settings1, this);
         checkClass.privateFunctions();
     }
 
-
-
     void test1() {
         check("class Fred\n"
               "{\n"
@@ -133,7 +123,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "unsigned int Fred::f()\n"
               "{ }");
 
-        ASSERT_EQUALS("[test.cpp:4]: (style) Unused private function: 'Fred::f'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:18] -> [test.cpp:12:20]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
         check("#line 1 \"p.h\"\n"
               "class Fred\n"
@@ -151,7 +141,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "unsigned int Fred::f()\n"
               "{ }");
 
-        ASSERT_EQUALS("[p.h:4]: (style) Unused private function: 'Fred::f'\n", errout.str());
+        ASSERT_EQUALS("[p.h:4:18] -> [p.cpp:4:20]: (style) Unused private function: 'Fred::f' [unusedPrivateFunction]\n", errout_str());
 
         check("#line 1 \"p.h\"\n"
               "class Fred\n"
@@ -166,7 +156,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "void Fred::f()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("[p.h:4]: (style) Unused private function: 'Fred::f'\n", errout.str());
+        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
         check("#line 1 \"p.h\"\n"
@@ -182,7 +172,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "int main()\n"
               "{\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -200,7 +190,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "A::A()\n"
               "{ }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -215,7 +205,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "A::~A()\n"
               "{ B(); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -230,7 +220,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "A::A() : _owner(false)\n"
               "{ b(); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -241,14 +231,14 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    { }\n"
               "    Lock *lock;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test6() { // ticket #2602 segmentation fault
         check("class A {\n"
               "    A& operator=(const A&);\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void test7() { // ticket #9282
@@ -258,7 +248,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "double C::f1() const noexcept { f3(); }\n"
               "void C::f3() const noexcept {}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -286,7 +276,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "Fred::Fred()\n"
               "{}");
 
-        ASSERT_EQUALS("[test.cpp:6]: (style) Unused private function: 'Fred::get'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12] -> [test.cpp:6:12]: (style) Unused private function: 'Fred::get' [unusedPrivateFunction]\n", errout_str());
     }
 
 
@@ -304,7 +294,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "\n"
               "    Observer<UnusedPrivateFunctionMemberPointer, unsigned> mObserver;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -318,7 +308,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void f1() const {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -332,7 +322,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "myclass::myclass() { fptr = &f; }\n"
               "void myclass::f() {}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -344,7 +334,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    static void func() { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -357,7 +347,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "        f(\"test\");\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void func_pointer7() { // #10516
@@ -365,25 +355,25 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    static void f() {}\n"
               "    static constexpr void(*p)() = f;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
               "    static void f() {}\n"
               "    static constexpr void(*p)() = &f;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
               "    static void f() {}\n"
               "    static constexpr void(*p)() = C::f;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class C {\n"
               "    static void f() {}\n"
               "    static constexpr void(*p)() = &C::f;\n"
               "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
 
@@ -399,7 +389,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    int numOfThreads;\n"
               "};");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void ctor2() {
@@ -411,7 +401,15 @@ class TestUnusedPrivateFunction : public TestFixture {
               "public:\n"
               "  double totalWeighting_;\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void ctor3() {
+        check("class C {\n"
+              "    C() = default;\n"
+              "    void f() const { (void)this; }\n"
+              "};");
+        ASSERT_EQUALS("[test.cpp:3:10] -> [test.cpp:3:10]: (style) Unused private function: 'C::f' [unusedPrivateFunction]\n", errout_str());
     }
 
 
@@ -428,7 +426,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    static void f()\n"
               "    { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Unused private function: 'A::f'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:17] -> [test.cpp:10:17]: (style) Unused private function: 'A::f' [unusedPrivateFunction]\n", errout_str());
 
         check("class A\n"
               "{\n"
@@ -447,18 +445,24 @@ class TestUnusedPrivateFunction : public TestFixture {
               "        { a->f(); }\n"
               "    };\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class A {\n"  // #6968 - outer definition
               "public:\n"
               "  class B;\n"
               "private:\n"
               "  void f() {}\n"
-              "}\n"
+              "};\n"
               "class A::B {"
               "  B() { A a; a.f(); }\n"
-              "}");
-        ASSERT_EQUALS("", errout.str());
+              "};");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class C {\n" // #13790
+              "    class I { I() = 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());
     }
 
 
@@ -475,7 +479,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void f() { }\n"
               "    void f(int) { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void incompleteImplementation() {
@@ -493,7 +497,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "#endfile\n"
               "A::A() { }\n"
               "void A::b() { }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void derivedClass() {
@@ -505,7 +509,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void f();\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class base {\n"
               "public:\n"
@@ -517,7 +521,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void foo() {}\n" // Skip for overrides of virtual functions of base
               "    void bar() {}\n" // Don't skip if no function is overridden
               "};");
-        ASSERT_EQUALS("[test.cpp:9]: (style) Unused private function: 'derived::bar'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9:10] -> [test.cpp:9:10]: (style) Unused private function: 'derived::bar' [unusedPrivateFunction]\n", errout_str());
 
         check("class Base {\n"
               "private:\n"
@@ -536,7 +540,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "private:\n"
               "    void func() {}\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Base {\n"
               "public:\n"
@@ -554,7 +558,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "      return 0;\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void friendClass() {
@@ -564,7 +568,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    friend Bar;\n" // Unknown friend class
               "    void f() { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Bar {\n"
               "    void g() { f(); }\n" // Friend class seen, but f not seen
@@ -574,7 +578,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    friend Bar;\n"
               "    void f();\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("struct Bar {\n"
               "    void g() { f(); }\n" // Friend class seen, but f() used in it
@@ -584,7 +588,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    friend Bar;\n"
               "    void f() { }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Bar {\n" // Friend class seen, f() not used in it
               "};\n"
@@ -592,7 +596,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    friend Bar;\n"
               "    void f() { }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Unused private function: 'Foo::f'\n", errout.str());
+        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
               "struct S {\n"
@@ -606,7 +610,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "        return lhs.f() < rhs.f();\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void borland1() {
@@ -619,8 +623,8 @@ class TestUnusedPrivateFunction : public TestFixture {
               "public:\n"
               "    Foo() { }\n"
               "    __property int x = {read=getx}\n"
-              "};", cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void borland2() {
@@ -632,8 +636,8 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    }\n"
               "public:\n"
               "    Foo() { }\n"
-              "};", cppcheck::Platform::Type::Win32A);
-        ASSERT_EQUALS("", errout.str());
+              "};", dinit(CheckOptions, $.platform = Platform::Type::Win32A));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void template1() {
@@ -651,7 +655,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "T A::getVal() const {\n"
               "    return internalGetVal();\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void fp_operator() {
@@ -667,7 +671,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void startListening() {\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Fred\n"
               "{\n"
@@ -679,20 +683,20 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    void startListening() {\n"
               "    }\n"
               "};");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Unused private function: 'Fred::startListening'\n", errout.str());
+        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"
               "};");
-        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
+        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"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsFirstFunctionArgument() {
@@ -719,7 +723,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    MountOperation aExample(10);"
               "}"
               );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsMiddleFunctionArgument() {
@@ -746,7 +750,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    MountOperation aExample(10);"
               "}"
               );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void testDoesNotIdentifyMethodAsLastFunctionArgument() {
@@ -773,7 +777,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    MountOperation aExample(10);"
               "}"
               );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void multiFile() { // ticket #2567
@@ -792,7 +796,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "{\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unknownBaseTemplate() { // ticket #2580
@@ -804,7 +808,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "void Bla::F() const { }");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void hierarchy_loop() {
@@ -823,7 +827,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    C a;\n"
               "}");
 
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void staticVariable() {
@@ -832,7 +836,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    static int F() const { return 1; }\n"
               "};\n"
               "int Foo::i = Foo::F();");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
               "    static int i;\n"
@@ -840,7 +844,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "Foo f;\n"
               "int Foo::i = f.F();");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("class Foo {\n"
               "    static int i;\n"
@@ -848,7 +852,7 @@ class TestUnusedPrivateFunction : public TestFixture {
               "};\n"
               "int Foo::i = sth();"
               "int i = F();");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused private function: 'Foo::F'\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:16] -> [test.cpp:3:16]: (style) Unused private function: 'Foo::F' [unusedPrivateFunction]\n", errout_str());
     }
 
     void templateSimplification() { //ticket #6183
@@ -871,14 +875,45 @@ class TestUnusedPrivateFunction : public TestFixture {
               "    CTest::Greeting<bool>(true);\n"
               "    return 0;\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void maybeUnused() {
         check("class C {\n"
               "    [[maybe_unused]] int f() { return 42; }\n"
               "};");
-        ASSERT_EQUALS("", errout.str());
+        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"
+              "};");
+        ASSERT_EQUALS("", errout_str());
+
+        check("class C {\n"
+              "    __attribute__((unused)) int f();\n"
+              "};\n"
+              "int C::f() { return 42; }\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void trailingReturn() {
+        check("struct B { virtual void f(); };\n"
+              "struct D : B {\n"
+              "    auto f() -> void override;\n"
+              "private:\n"
+              "    auto g() -> void;\n"
+              "};\n"
+              "auto D::f() -> void { g(); }\n"
+              "auto D::g() -> void {}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 };
 
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
index 49c024c3af1..741f9b70b24 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-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
@@ -18,17 +18,14 @@
 
 #include "checkunusedvar.h"
 #include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "fixture.h"
-#include "tokenize.h"
 
+#include <cstddef>
 #include <list>
-#include <map>
-#include <sstream> // IWYU pragma: keep
 #include <string>
-#include <utility>
-#include <vector>
 
 #include <simplecpp.h>
 
@@ -40,6 +37,7 @@ class TestUnusedVar : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::style).checkLibrary().library("std.cfg").build();
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(isRecordTypeWithoutSideEffects);
         TEST_CASE(cleanFunction);
 
@@ -72,8 +70,17 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(structmember22); // #11016
         TEST_CASE(structmember23);
         TEST_CASE(structmember24); // #10847
+        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(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
 
         TEST_CASE(localvar1);
         TEST_CASE(localvar2);
@@ -143,6 +150,8 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvar67); // #9946
         TEST_CASE(localvar68);
         TEST_CASE(localvar69);
+        TEST_CASE(localvar70);
+        TEST_CASE(localvar71);
         TEST_CASE(localvarloops); // loops
         TEST_CASE(localvaralias1);
         TEST_CASE(localvaralias2); // ticket #1637
@@ -178,12 +187,14 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvararray3);  // ticket #3980
         TEST_CASE(localvararray4);  // ticket #4839
         TEST_CASE(localvararray5);  // ticket #7092
+        TEST_CASE(localvararray6);
         TEST_CASE(localvarstring1);
         TEST_CASE(localvarstring2); // ticket #2929
         TEST_CASE(localvarconst1);
         TEST_CASE(localvarconst2);
         TEST_CASE(localvarreturn); // ticket #9167
         TEST_CASE(localvarmaybeunused);
+        TEST_CASE(localvarrvalue); // ticket #13977
 
         TEST_CASE(localvarthrow); // ticket #3687
 
@@ -204,6 +215,7 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(localvarStruct11); // 10095
         TEST_CASE(localvarStruct12); // #10495
         TEST_CASE(localvarStruct13); // #10398
+        TEST_CASE(localvarStruct14);
         TEST_CASE(localvarStructArray);
         TEST_CASE(localvarUnion1);
 
@@ -242,6 +254,7 @@ class TestUnusedVar : public TestFixture {
 
         TEST_CASE(crash1);
         TEST_CASE(crash2);
+        TEST_CASE(crash3);
         TEST_CASE(usingNamespace);     // #4585
 
         TEST_CASE(lambdaFunction); // #5078
@@ -253,79 +266,66 @@ class TestUnusedVar : public TestFixture {
         TEST_CASE(escapeAlias); // #9150
         TEST_CASE(volatileData); // #9280
         TEST_CASE(globalData);
+
+        TEST_CASE(structuredBinding); // #13269
     }
 
+    struct FunctionVariableUsageOptions
+    {
+        bool cpp = true;
+    };
+
 #define functionVariableUsage(...) functionVariableUsage_(__FILE__, __LINE__, __VA_ARGS__)
-#define checkStructMemberUsage(...) checkStructMemberUsage_(__FILE__, __LINE__, __VA_ARGS__)
-    void checkStructMemberUsage_(const char* file, int line, const char code[], const std::list<Directive>* directives = nullptr, const Settings *s = nullptr) {
-        // Clear the error buffer..
-        errout.str("");
+    void functionVariableUsage_(const char* file, int line, const char code[], const FunctionVariableUsageOptions& options = make_default_obj()) {
+        // Tokenize..
+        SimpleTokenizer tokenizer(settings, *this, options.cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        Preprocessor preprocessor(settings);
-        if (directives)
-            preprocessor.setDirectives(*directives);
+        // Check for unused variables..
+        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
+        checkUnusedVar.checkFunctionVariableUsage();
+    }
 
-        const Settings *settings1 = s ? s : &settings;
+    struct CheckStructMemberUsageOptions
+    {
+        const std::list<Directive>* directives = nullptr;
+        bool cpp = true;
+    };
 
+#define checkStructMemberUsage(...) checkStructMemberUsage_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkStructMemberUsage_(const char* file, int line, const char (&code)[size], const CheckStructMemberUsageOptions& options = make_default_obj()) {
         // Tokenize..
-        Tokenizer tokenizer(settings1, this, &preprocessor);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this, options.cpp);
+        if (options.directives)
+            tokenizer.setDirectives(*options.directives);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, settings1, this);
+        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
         (checkUnusedVar.checkStructMemberUsage)();
     }
 
-    void checkStructMemberUsageP(const char code[]) {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Raw tokens..
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
-
-        Preprocessor preprocessor(settings);
-        preprocessor.setDirectives(tokens1);
+#define checkStructMemberUsageP(...) checkStructMemberUsageP_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkStructMemberUsageP_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenizer..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused variables..
         CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
         (checkUnusedVar.checkStructMemberUsage)();
     }
 
-
-    void checkFunctionVariableUsageP(const char code[], const char* filename = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
-
-        // Raw tokens..
-        std::vector<std::string> files(1, filename);
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        // Preprocess..
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
-
-        Preprocessor preprocessor(settings);
-        preprocessor.setDirectives(tokens1);
+#define checkFunctionVariableUsageP(...) checkFunctionVariableUsageP_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void checkFunctionVariableUsageP_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
         // Tokenizer..
-        Tokenizer tokenizer(&settings, this, &preprocessor);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // Check for unused variables..
         CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
@@ -339,7 +339,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   A a;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:6]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "class A {};\n"
@@ -350,7 +350,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   B b;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Unused variable: b\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: b [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "class C {\n"
@@ -360,7 +360,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "class D {\n"
@@ -370,7 +370,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   D d;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Unused variable: d\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: d [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "class E {\n"
@@ -380,7 +380,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   E e;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Unused variable: e\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:6]: (style) Unused variable: e [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "class F {\n"
@@ -391,7 +391,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Unused variable: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "class F {\n"
@@ -402,7 +402,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Unused variable: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "int y = 0;\n"
@@ -414,7 +414,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Unused variable: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "int y = 0;"
@@ -426,7 +426,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Unused variable: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "int y = 0;"
@@ -438,7 +438,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Unused variable: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "int y = 0;"
@@ -450,7 +450,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Unused variable: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "int y = 0;"
@@ -462,7 +462,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Unused variable: f\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:6]: (style) Unused variable: f [unusedVariable]\n", errout_str());
 
         // non-empty constructor
         functionVariableUsage(
@@ -476,7 +476,21 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
+
+        // constructor with hidden definition
+        functionVariableUsage(
+            "class B {\n"
+            "public:\n"
+            "   B();\n"
+            "};\n"
+            "class A {\n"
+            "   B* b = new B;\n"
+            "};\n"
+            "int main() {\n"
+            "   A a;\n"
+            "}");
+        ASSERT_EQUALS("", errout_str());
 
         // side-effect variable
         functionVariableUsage(
@@ -494,7 +508,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   G g;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // side-effect variable in initialization list
         functionVariableUsage(
@@ -513,7 +527,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   G g;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unknown variable type
         functionVariableUsage(
@@ -524,7 +538,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   H h;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unknown variable type in initialization list
         functionVariableUsage(
@@ -537,7 +551,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   H h;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unknown variable type used for initialization
         functionVariableUsage(
@@ -550,7 +564,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int sideEffectFunc();\n"
@@ -562,7 +576,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "class F {\n"
@@ -573,7 +587,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "class F {\n"
@@ -584,7 +598,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "class F {\n"
@@ -595,7 +609,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "class F {\n"
@@ -606,7 +620,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "struct S {\n"
@@ -616,7 +630,7 @@ class TestUnusedVar : public TestFixture {
             "void g() {\n"
             "    S s;\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage( // #11109
             "class D { public: D(); };\n"
@@ -631,7 +645,7 @@ class TestUnusedVar : public TestFixture {
             "    E e;\n"
             "    F f;\n"
             "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void cleanFunction() {
@@ -645,7 +659,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   F f;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // function forward declaration
         functionVariableUsage(
@@ -658,7 +672,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return literal
         functionVariableUsage(
@@ -671,7 +685,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:8]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:8:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // return variable without side effects
         functionVariableUsage(
@@ -687,7 +701,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:11]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // return variable with side effects
         functionVariableUsage(
@@ -703,7 +717,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return unknown variable
         functionVariableUsage(
@@ -718,7 +732,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // return variable is global, but not changed
         functionVariableUsage(
@@ -734,7 +748,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:11]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // changing global variable in return
         functionVariableUsage(
@@ -750,7 +764,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // changing global variable in function body
         functionVariableUsage(
@@ -767,7 +781,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x = 1;\n"
@@ -783,7 +797,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x = 1;\n"
@@ -799,7 +813,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x = 1;\n"
@@ -815,7 +829,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // global variable use in function body without change
         functionVariableUsage(
@@ -832,7 +846,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:12]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // changing global array variable in function body
         functionVariableUsage(
@@ -849,7 +863,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x[] = {0, 1, 3};\n"
@@ -865,7 +879,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x[] = {0, 1, 3};\n"
@@ -881,7 +895,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // pointer arithmetic on global array
         functionVariableUsage(
@@ -898,7 +912,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x[][] = {{0, 1}, {2, 3}};\n"
@@ -914,7 +928,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x[] = {0, 1, 3};\n"
@@ -931,7 +945,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:13]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "int x[] = {0, 1, 3};\n"
@@ -948,7 +962,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:13]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage(
             "int x[] = {0, 1, 3};\n"
@@ -964,7 +978,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "int x[] = {0, 1, 3};\n"
@@ -979,7 +993,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // changing local variable
         functionVariableUsage(
@@ -997,7 +1011,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:13]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // variable of user-defined class without side effects
         functionVariableUsage(
@@ -1014,7 +1028,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:12]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // variable of user-defined class with side effects
         functionVariableUsage(
@@ -1034,7 +1048,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unknown type variable
         functionVariableUsage(
@@ -1050,7 +1064,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // nested clean function call
         functionVariableUsage(
@@ -1067,7 +1081,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:12]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // nested side-effects function call
         functionVariableUsage(
@@ -1087,7 +1101,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // unknown nested function
         functionVariableUsage(
@@ -1103,7 +1117,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // clean function recursion
         functionVariableUsage(
@@ -1122,7 +1136,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:14]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:14:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // indirect clean function recursion
         functionVariableUsage(
@@ -1144,7 +1158,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:17]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:17:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // side-effect function recursion
         functionVariableUsage(
@@ -1165,7 +1179,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // multiple returns (side-effect & clean)
         functionVariableUsage(
@@ -1181,7 +1195,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // multiple clean returns
         functionVariableUsage(
@@ -1197,7 +1211,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:11]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:11:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // multiple side-effect returns
         functionVariableUsage(
@@ -1213,7 +1227,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // argument return
         functionVariableUsage(
@@ -1228,7 +1242,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global variable modifying through function argument
         functionVariableUsage(
@@ -1245,7 +1259,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // global variable modifying through local pointer
         functionVariableUsage(
@@ -1263,7 +1277,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // global variable assigning to local pointer, but not modifying
         functionVariableUsage(
@@ -1281,7 +1295,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:13]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global struct variable modification
         functionVariableUsage(
@@ -1298,7 +1312,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // global struct variable without modification
         functionVariableUsage(
@@ -1315,7 +1329,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:12]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:12:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         // global pointer to struct variable modification
         functionVariableUsage(
@@ -1333,7 +1347,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // global pointer to struct variable without modification
         functionVariableUsage(
@@ -1351,7 +1365,7 @@ class TestUnusedVar : public TestFixture {
             "void f() {\n"
             "   C c;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:13]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:13:6]: (style) Unused variable: c [unusedVariable]\n", errout_str());
     }
 
     // #5355 - False positive: Variable is not assigned a value.
@@ -1364,7 +1378,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred fred;\n"
                               "    throw fred;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // #5355 - False positive: Variable is not assigned a value.
@@ -1375,7 +1389,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred fred;\n"
                               "    throw fred;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember1() {
@@ -1385,9 +1399,9 @@ class TestUnusedVar : public TestFixture {
                                "    int b;\n"
                                "    int c;\n"
                                "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'abc::a' is never used.\n"
-                      "[test.cpp:4]: (style) struct member 'abc::b' is never used.\n"
-                      "[test.cpp:5]: (style) struct member 'abc::c' is never used.\n", errout.str());
+        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());
 
         checkStructMemberUsage("union abc\n"
                                "{\n"
@@ -1395,9 +1409,25 @@ class TestUnusedVar : public TestFixture {
                                "    int b;\n"
                                "    int c;\n"
                                "};");
-        ASSERT_EQUALS("[test.cpp:3]: (style) union member 'abc::a' is never used.\n"
-                      "[test.cpp:4]: (style) union member 'abc::b' is never used.\n"
-                      "[test.cpp:5]: (style) union member 'abc::c' is never used.\n", errout.str());
+        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"
+                               "}");
+        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() {
@@ -1415,7 +1445,7 @@ class TestUnusedVar : public TestFixture {
                                "    int b = abc.b;\n"
                                "    int c = abc.c;\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember3() {
@@ -1434,7 +1464,7 @@ class TestUnusedVar : public TestFixture {
                                "    int b = abc[0].b;\n"
                                "    int c = abc[0].c;\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember4() {
@@ -1448,7 +1478,7 @@ class TestUnusedVar : public TestFixture {
                                "    ABC abc;\n"
                                "    if (abc.a == 2);\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember5() {
@@ -1468,7 +1498,7 @@ class TestUnusedVar : public TestFixture {
                                "    struct AB ab;\n"
                                "    ab.reset();\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember6() {
@@ -1482,7 +1512,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    struct AB *ab = (struct AB *)&buf[10];\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct AB\n"
                                "{\n"
@@ -1494,7 +1524,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    struct AB *ab = (AB *)&buf[10];\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember7() {
@@ -1508,7 +1538,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ab->a = 0;\n"
                                "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) struct member 'AB::b' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) struct member 'AB::b' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct AB\n"
                                "{\n"
@@ -1520,7 +1550,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ab->a = 0;\n"
                                "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) struct member 'AB::b' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) struct member 'AB::b' is never used. [unusedStructMember]\n", errout_str());
     }
 
     void structmember8() {
@@ -1534,7 +1564,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ((AB *)ab)->b = 0;\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember9() {
@@ -1544,7 +1574,7 @@ class TestUnusedVar : public TestFixture {
                                "\n"
                                "struct derived : public base {"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember10() {
@@ -1552,19 +1582,19 @@ class TestUnusedVar : public TestFixture {
         checkStructMemberUsage("struct abc {\n"
                                "    Fred fred;\n"
                                "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember11() { // #4168
         checkStructMemberUsage("struct abc { int x; };\n"
                                "struct abc s = {0};\n"
                                "void f() { do_something(&s); }");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct abc { int x; };\n"
                                "struct abc s = {0};\n"
                                "void f() { }");
-        TODO_ASSERT_EQUALS("abc::x is not used", "", errout.str());
+        TODO_ASSERT_EQUALS("abc::x is not used", "", errout_str());
     }
 
     void structmember12() { // #7179
@@ -1584,14 +1614,14 @@ class TestUnusedVar : public TestFixture {
                                "    printf(\"var.struct1.a = %d\", var.struct1.a);\n"
                                "    return 1;\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember13() { // #3088 - struct members required by hardware
         checkStructMemberUsage("struct S {\n"
                                "  int x;\n"
                                "} __attribute__((packed));");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember14() { // #6508
@@ -1599,14 +1629,18 @@ class TestUnusedVar : public TestFixture {
                                "struct bstr bstr0(void) {\n"
                                "  return (struct bstr){\"hello\",6};\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        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; };", &directives);
-        ASSERT_EQUALS("", errout.str());
+        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; };", dinit(CheckStructMemberUsageOptions, $.directives = &directives));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember_extern() {
@@ -1621,7 +1655,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ab.b = 0;\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // global linkage => no false positive
         checkStructMemberUsage("struct AB\n"
@@ -1634,7 +1668,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ab.b = 0;\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // static linkage => error message
         checkStructMemberUsage("static struct AB\n"
@@ -1647,7 +1681,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    ab.b = 0;\n"
                                "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'AB::a' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) struct member 'AB::a' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct A\n"
                                "{\n"
@@ -1658,7 +1692,7 @@ class TestUnusedVar : public TestFixture {
                                "{\n"
                                "    return A::a;\n"
                                "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember_sizeof() {
@@ -1667,14 +1701,14 @@ class TestUnusedVar : public TestFixture {
                                "}\n"
                                "\n"
                                "input.skip(sizeof(Header));");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct Header {\n"
                                "  uint8_t message_type;\n"
                                "}\n"
                                "\n"
                                "input.skip(sizeof(struct Header));");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a, b, c; };\n" // #6561
                                "int f(FILE * fp) {\n"
@@ -1682,7 +1716,7 @@ class TestUnusedVar : public TestFixture {
                                "    ::fread(&s, sizeof(S), 1, fp);\n"
                                "    return s.b;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember16() {
@@ -1690,7 +1724,7 @@ class TestUnusedVar : public TestFixture {
                                "  static const int N = 128;\n" // <- used
                                "  char E[N];\n" // <- not used
                                "};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'S::E' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (style) struct member 'S::E' is never used. [unusedStructMember]\n", errout_str());
     }
 
     void structmember17() { // #10591
@@ -1700,7 +1734,7 @@ class TestUnusedVar : public TestFixture {
                                "    t.i = 0;\n" // <- used
                                "    g(t);\n"
                                "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("typedef struct tagT { int i; } typeT;\n"
                                "void f() {\n"
@@ -1708,7 +1742,7 @@ class TestUnusedVar : public TestFixture {
                                "    t.i = 0;\n" // <- used
                                "    g(t);\n"
                                "};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct T { int i; };\n"
                                "void f() {\n"
@@ -1716,7 +1750,7 @@ class TestUnusedVar : public TestFixture {
                                "    t.i = 0;\n" // <- used
                                "    g(t);\n"
                                "};\n");
-        ASSERT_EQUALS("", errout.str()); // due to removeMacroInClassDef()
+        ASSERT_EQUALS("", errout_str()); // due to removeMacroInClassDef()
     }
 
     void structmember18() { // #10684
@@ -1726,7 +1760,7 @@ class TestUnusedVar : public TestFixture {
                                "    uint8_t* p = (uint8_t*)&s;\n"
                                "    return p[10];\n"
                                "};\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'S::padding' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:20]: (style) struct member 'S::padding' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct S { uint8_t padding[500]; };\n"
                                "uint8_t f(const S& s) {\n"
@@ -1734,14 +1768,14 @@ class TestUnusedVar : public TestFixture {
                                "    auto p = reinterpret_cast<const uint8_t*>(&s);\n"
                                "    return p[10];\n"
                                "};\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'S::padding' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:20]: (style) struct member 'S::padding' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("struct S { int i, j; };\n" // #11577
                                "void f(S s) {\n"
                                "  void* p = (void*)&s;\n"
                                "  if (s.i) {}\n"
                                "}\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'S::j' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:1:19]: (style) struct member 'S::j' is never used. [unusedStructMember]\n", errout_str());
     }
 
     void structmember19() {
@@ -1752,10 +1786,10 @@ class TestUnusedVar : public TestFixture {
                                "    C c;\n"
                                "};\n"
                                "void f(S* s) {}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'S::p' is never used.\n"
-                      "[test.cpp:4]: (style) struct member 'S::str' is never used.\n"
-                      "[test.cpp:5]: (style) struct member 'S::c' is never used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) struct member 'S::p' is never used. [unusedStructMember]\n"
+                      "[test.cpp:4:17]: (style) struct member 'S::str' is never used. [unusedStructMember]\n"
+                      "[test.cpp:5:7]: (style) struct member 'S::c' is never used. [unusedStructMember]\n",
+                      errout_str());
 
         checkStructMemberUsage("class C {};\n"
                                "struct S {\n"
@@ -1764,10 +1798,10 @@ class TestUnusedVar : public TestFixture {
                                "    C c;\n"
                                "};\n"
                                "void f(S& s) {}\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) struct member 'S::p' is never used.\n"
-                      "[test.cpp:4]: (style) struct member 'S::str' is never used.\n"
-                      "[test.cpp:5]: (style) struct member 'S::c' is never used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) struct member 'S::p' is never used. [unusedStructMember]\n"
+                      "[test.cpp:4:17]: (style) struct member 'S::str' is never used. [unusedStructMember]\n"
+                      "[test.cpp:5:7]: (style) struct member 'S::c' is never used. [unusedStructMember]\n",
+                      errout_str());
 
         checkStructMemberUsage("struct S {\n" // #10848
                                "    struct T {\n"
@@ -1778,44 +1812,44 @@ class TestUnusedVar : public TestFixture {
                                "int f() {\n"
                                "    return s[0].t[1].i;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a; };\n"
                                "struct T { S s; };\n"
                                "int f(const T** tp) {\n"
                                "    return tp[0]->s.a;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a; };\n"
                                "int f(const S* sp) {\n"
                                "    return (*sp).a; \n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a; };\n"
                                "int f(const S** spp) {\n"
                                "    return spp[0]->a;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a; };\n"
                                "int f(const S** spp) {\n"
                                "    return spp[0][0].a;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a; };\n"
                                "int f(const S* sp) {\n"
                                "    return sp[0].a;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int a; };\n"
                                "int f(const S* sp) {\n"
                                "    return sp->a;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("typedef struct { int i; } A;\n"
                                "typedef struct { std::vector<A> v; } B;\n"
@@ -1823,11 +1857,9 @@ class TestUnusedVar : public TestFixture {
                                "    const A& a = b[0]->v[idx];\n"
                                "    return a;\n"
                                "}\n");
-        ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'A::i' is never used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:1:22]: (style) struct member 'A::i' is never used. [unusedStructMember]\n",
+                      errout_str());
 
-        Settings s = settings;
-        s.enforcedLang = Settings::C;
         checkStructMemberUsage("struct A {\n" // #10852
                                "    struct B {\n"
                                "        int x;\n"
@@ -1836,8 +1868,8 @@ class TestUnusedVar : public TestFixture {
                                "void f() {\n"
                                "    struct B* pb = &a.b;\n"
                                "    pb->x = 1;\n"
-                               "}\n", nullptr, &s);
-        ASSERT_EQUALS("", errout.str());
+                               "}\n", dinit(CheckStructMemberUsageOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("union U {\n"
                                "    struct A {\n"
@@ -1854,8 +1886,8 @@ class TestUnusedVar : public TestFixture {
                                "    pb->x = 1;\n"
                                "    struct C* pc = &u.c;\n"
                                "    pc->s[0] = 1;\n"
-                               "}\n", nullptr, &s);
-        ASSERT_EQUALS("", errout.str());
+                               "}\n", dinit(CheckStructMemberUsageOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember20() { // #10737
@@ -1870,7 +1902,7 @@ class TestUnusedVar : public TestFixture {
                                "        }\n"
                                "    }\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember21() { // #4759
@@ -1885,13 +1917,13 @@ class TestUnusedVar : public TestFixture {
                                "struct S {\n"
                                "    int f;\n"
                                "};\n");
-        ASSERT_EQUALS("[test.cpp:10]: (style) struct member 'S::f' is never used.\n", errout.str());
+        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; };");
-        ASSERT_EQUALS("[test.cpp:1]: (style) struct member 'A::i' is never used.\n"
-                      "[test.cpp:2]: (style) struct member 'B::pA' is never used.\n",
-                      errout.str());
+        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());
     }
 
     void structmember22() { // #11016
@@ -1900,7 +1932,7 @@ class TestUnusedVar : public TestFixture {
                                "    std::vector<A>::const_iterator it = b.begin();\n"
                                "    if (it->b) {}\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember23() {
@@ -1911,7 +1943,7 @@ class TestUnusedVar : public TestFixture {
                                "    std::map<int, N::S> m = { { 0, { \"abc\" } } };\n"
                                "    return m[0].s;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void structmember24() { // #10847
@@ -1920,21 +1952,21 @@ class TestUnusedVar : public TestFixture {
                                "std::map<int, S*>::iterator f() {\n"
                                "    return u.find(0)->second->m.begin();\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { int i; };\n"
                                "void f() {\n"
                                "    std::map<int, S> m = { { 0, S() } };\n"
                                "    m[0].i = 1;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct S { bool b; };\n"
                                "std::vector<S> v;\n"
                                "bool f() {\n"
                                "    return v.begin()->b;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("int f(int s) {\n" // #10587
                                "    const struct S { int a, b; } Map[] = { { 0, 1 }, { 2, 3 } };\n"
@@ -1943,7 +1975,7 @@ class TestUnusedVar : public TestFixture {
                                "        return it->b;\n"
                                "    return 0;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("int f(int s) {\n"
                                "    const struct S { int a, b; } Map[] = { { 0, 1 }, { 2, 3 } };\n"
@@ -1952,69 +1984,169 @@ class TestUnusedVar : public TestFixture {
                                "            return m.b;\n"
                                "    return 0;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkStructMemberUsage("struct R { bool b{ false }; };\n" // #11539
                                "void f(std::optional<R> r) {\n"
                                "    if (r.has_value())\n"
                                "        std::cout << r->b;\n"
                                "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void structmember25() {
+        checkStructMemberUsage("struct S {\n" // #12485
+                               "    S* p;\n"
+                               "    int i;\n"
+                               "};\n"
+                               "struct T {\n"
+                               "    S s;\n"
+                               "    int j;\n"
+                               "};\n");
+        ASSERT_EQUALS("[test.cpp:2:8]: (style) struct member 'S::p' is never used. [unusedStructMember]\n"
+                      "[test.cpp:3:9]: (style) struct member 'S::i' is never used. [unusedStructMember]\n"
+                      "[test.cpp:6:7]: (style) struct member 'T::s' is never used. [unusedStructMember]\n"
+                      "[test.cpp:7:9]: (style) struct member 'T::j' is never used. [unusedStructMember]\n",
+                      errout_str());
+    }
+
+    void structmember26() { // #13345
+        checkStructMemberUsage("struct foobar {\n"
+                               "   char unused;\n"
+                               "};\n"
+                               "size_t offset_unused = offsetof(struct foobar, unused);\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void structmember27() { // #13367
+        checkStructMemberUsage("typedef struct pathNode_s {\n"
+                               "    struct pathNode_s*  next;\n"
+                               "} pathNode_t;\n"
+                               "void f() {\n"
+                               "    x<pathNode_t, offsetof( pathNode_t, next )> y;\n"
+                               "}\n");
+        ASSERT_EQUALS("", // don't crash
+                      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 structmember_macro() {
         checkStructMemberUsageP("#define S(n) struct n { int a, b, c; };\n"
                                 "S(unused);\n");
-        ASSERT_EQUALS("", errout.str());
+        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
+                               "};");
+        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"
                                "};\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) class member 'C::i' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) class member 'C::i' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("class C {\n"
                                "    int i{}, j{};\n"
                                "public:\n"
                                "    int& get() { return i; }\n"
                                "};\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) class member 'C::j' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:14]: (style) class member 'C::j' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("class C {\n"
                                "private:\n"
                                "    int i;\n"
                                "};\n"
                                "class D : public C {};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) class member 'C::i' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) class member 'C::i' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("class C {\n"
                                "public:\n"
                                "    int i;\n"
                                "};\n"
                                "class D : C {};\n");
-        ASSERT_EQUALS("[test.cpp:3]: (style) class member 'C::i' is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) class member 'C::i' is never used. [unusedStructMember]\n", errout_str());
 
         checkStructMemberUsage("class C {\n"
                                "public:\n"
                                "    int i;\n"
                                "};\n"
                                "class D : public C {};\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
-    void functionVariableUsage_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        // Clear the error buffer..
-        errout.str("");
+    void structmemberStructuredBinding() { // #13107
+        checkStructMemberUsage("struct S { int a, b; };\n"
+                               "void f(S &s) {\n"
+                               "    auto& [x, y] = s;\n"
+                               "    x = y;\n"
+                               "}\n");
+        ASSERT_EQUALS("", errout_str());
 
-        // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
+        checkStructMemberUsage("struct S { int a, b; };\n"
+                               "struct T { S s; };\n"
+                               "void f(T &t) {\n"
+                               "    auto& [x, y] = t.s;\n"
+                               "    x = y;\n"
+                               "}\n");
+        ASSERT_EQUALS("", errout_str());
 
-        // Check for unused variables..
-        CheckUnusedVar checkUnusedVar(&tokenizer, &settings, this);
-        checkUnusedVar.checkFunctionVariableUsage();
+        checkStructMemberUsage("struct S { int a, b; };\n"
+                               "void f(std::vector<S> &sv) {\n"
+                               "    for (auto& [x, y] : sv)\n"
+                               "        x = y;\n"
+                               "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        // #13551 - don't crash
+        checkStructMemberUsage("struct S {};\n"
+                               "void f(vector<std::pair<int, int>> p) {\n"
+                               "    for (auto [a, _] : p) {\n"
+                               "        if (a == 0) {}\n"
+                               "    }\n"
+                               "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar1() {
@@ -2023,13 +2155,16 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i(0);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
         // * variable declaration
@@ -2038,14 +2173,14 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i(a);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "{\n"
@@ -2053,7 +2188,7 @@ class TestUnusedVar : public TestFixture {
                               "    int & i = j;\n"
                               "    x(j);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "{\n"
@@ -2061,7 +2196,7 @@ class TestUnusedVar : public TestFixture {
                               "    const int & i = j;\n"
                               "    x(j);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "{\n"
@@ -2069,7 +2204,7 @@ class TestUnusedVar : public TestFixture {
                               "    int & i(j);\n"
                               "    x(j);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
@@ -2077,145 +2212,184 @@ class TestUnusedVar : public TestFixture {
                               "    const int & i(j);\n"
                               "    x(j);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    bool i = true;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char *i;\n"
                               "    i = fgets();\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        // ? ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:17]: (information) --check-library: Provide <type-checks><unusedvar> configuration for undefined [checkLibraryCheckType]\n", errout_str());
 
         functionVariableUsage("undefined foo()\n"
                               "{\n"
                               "    undefined i = 0;\n"
                               "}\n",
-                              "test.c");
-        ASSERT_EQUALS("[test.c:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+                              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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = undefined;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int * i = Data;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i = Data;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i = Data;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct S * i = DATA;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct S * i = DATA;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct S & i = j;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    int j = i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'j' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i[10] = { 0 };\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2225,7 +2399,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2236,9 +2410,9 @@ class TestUnusedVar : public TestFixture {
                               "        d = code;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'd' is assigned a value that is never used.\n"
-                      "[test.cpp:7]: (style) Variable 'd' is assigned a value that is never used.\n",
-                      errout.str());
+        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());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2250,7 +2424,7 @@ class TestUnusedVar : public TestFixture {
                               "        d = code;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2264,7 +2438,7 @@ class TestUnusedVar : public TestFixture {
                               "        d = code;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2276,7 +2450,7 @@ class TestUnusedVar : public TestFixture {
                               "        b=tmp;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2286,7 +2460,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2297,8 +2471,8 @@ class TestUnusedVar : public TestFixture {
                               "        d += code;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'd' is assigned a value that is never used.\n"
-                      "[test.cpp:7]: (style) Variable 'd' is assigned a value that is never used.\n", errout.str());
+        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());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2310,7 +2484,7 @@ class TestUnusedVar : public TestFixture {
                               "        d += code;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2324,7 +2498,7 @@ class TestUnusedVar : public TestFixture {
                               "        d += code;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2336,7 +2510,7 @@ class TestUnusedVar : public TestFixture {
                               "        b=tmp;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2346,7 +2520,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "    } while(code < 20);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2357,8 +2531,8 @@ class TestUnusedVar : public TestFixture {
                               "        d += code;\n"
                               "    } while(code < 20);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'd' is assigned a value that is never used.\n"
-                      "[test.cpp:7]: (style) Variable 'd' is assigned a value that is never used.\n", errout.str());
+        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());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2370,7 +2544,7 @@ class TestUnusedVar : public TestFixture {
                               "        d += code;\n"
                               "    } while(code < 20);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2384,7 +2558,7 @@ class TestUnusedVar : public TestFixture {
                               "        d += code;\n"
                               "    } while(code < 20);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2396,7 +2570,7 @@ class TestUnusedVar : public TestFixture {
                               "        b=tmp;\n"
                               "    } while( a!=30 );\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2408,7 +2582,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2420,7 +2594,7 @@ class TestUnusedVar : public TestFixture {
                               "        code += 2;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2432,7 +2606,7 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2444,12 +2618,15 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    } while(code < 20);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int j = 0) {\n" // #5985 - default function parameters should not affect checking results
                               "    int i = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
         // extracttests.enable
     }
 
@@ -2461,14 +2638,14 @@ class TestUnusedVar : public TestFixture {
                               "    int i;\n"
                               "    return i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+        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
         functionVariableUsage("undefined foo()\n"
@@ -2476,50 +2653,50 @@ class TestUnusedVar : public TestFixture {
                               "    undefined i;\n"
                               "    return i;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("undefined foo()\n"
                               "{\n"
                               "    undefined i;\n"
                               "    return i;\n"
                               "}\n",
-                              "test.c");
-        ASSERT_EQUALS("[test.c:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+                              dinit(FunctionVariableUsageOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:3:15]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         functionVariableUsage("undefined *foo()\n"
                               "{\n"
                               "    undefined * i;\n"
                               "    return i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is not assigned a value.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:22]: (style) Variable 'i' is not assigned a value. [unassignedVariable]\n", errout_str());
 
         // assume f() can write a
         functionVariableUsage("void foo()\n"
@@ -2527,7 +2704,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    f(a[0]);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
         functionVariableUsage("void foo()\n"
@@ -2535,7 +2712,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    f(a[0], 0);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
         functionVariableUsage("void foo()\n"
@@ -2543,7 +2720,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    f(0, a[0]);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // assume f() can write a
         functionVariableUsage("void foo()\n"
@@ -2551,7 +2728,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    f(0, a[0], 0);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // f() can not write a (not supported yet)
         functionVariableUsage("void f(const int & i) { }\n"
@@ -2561,7 +2738,7 @@ class TestUnusedVar : public TestFixture {
                               "    f(a[0]);\n"
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'a' is not assigned a value.\n",
-                           "", errout.str());
+                           "", errout_str());
 
         // f() writes a
         functionVariableUsage("void f(int & i) { }\n"
@@ -2570,7 +2747,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    f(a[0]);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int * i);\n"
                               "void foo()\n"
@@ -2578,7 +2755,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a[10];\n"
                               "    f(a+1);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
         // extracttests.enable
     }
 
@@ -2590,7 +2767,7 @@ class TestUnusedVar : public TestFixture {
                               "        ;\n"
                               "    else i = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:6:12]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar4() {
@@ -2599,14 +2776,14 @@ class TestUnusedVar : public TestFixture {
                               "    int i = 0;\n"
                               "    f(i);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i = 0;\n"
                               "    f(&i);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar5() {
@@ -2615,7 +2792,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 0;\n"
                               "    b = (char)a;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar6() {
@@ -2624,7 +2801,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (int i=0;i<10;++i)\n"
                               "        b[i] = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'b[i]' is assigned a value that is never used.\n", errout.str());
+        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"
                               "    int a = 0;\n"
@@ -2632,14 +2809,20 @@ class TestUnusedVar : public TestFixture {
                               "    for (int i=0;i<10;++i)\n"
                               "        b[i] = ++a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'b[i]' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable '*(b+i)' is assigned a value that is never used.\n", "", errout.str());
+        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
+                              "    int b;\n"
+                              "    *(&b) = 0;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable '*(&b)' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar8() {
@@ -2647,25 +2830,25 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i[2];\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:18]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         // extracttests.start: struct A {int x;};
 
@@ -2673,78 +2856,78 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    A * i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct A * i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:16]: (style) Unused variable: i [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const struct A * i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        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]: (style) Unused variable: i\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const int * i[2];\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    void * i[2];\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    const void * i[2];\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    struct A * i[2];\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", "", errout.str());
+        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"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", "", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'j' is assigned a value that is never used.\n"
-                      "[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n",
-                      errout.str());
+        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());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int i;\n"
                               "    int &j = i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'j' is assigned a value that is never used.\n"
-                      "[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        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());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2754,7 +2937,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'i' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("double foo()\n"
                               "{\n"
@@ -2762,35 +2945,35 @@ class TestUnusedVar : public TestFixture {
                               "    const double j = i;\n"
                               "    return j;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    A * i;\n"
                               "    i->f();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i;\n"
                               "    if (i);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i = 0;\n"
                               "    if (i);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    char * i = new char[10];\n"
                               "    if (i);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2803,7 +2986,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    return &a;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
                               "void foo()\n"
@@ -2812,7 +2995,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (int i = 0; i < 10; i++)\n"
                               "        p[i] = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
                               "void foo()\n"
@@ -2821,7 +3004,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (int i = 0; i < 10; i++)\n"
                               "        p[i] = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2830,7 +3013,7 @@ class TestUnusedVar : public TestFixture {
                               "    a[0] = 0;\n"
                               "    x = a[0];\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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();
         functionVariableUsage("void foo()\n"
@@ -2838,16 +3021,16 @@ class TestUnusedVar : public TestFixture {
                               "    int a, b, c;\n"
                               "    a = b = c = f();\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'a' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Variable 'b' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Variable 'c' is assigned a value that is never used.\n",
-                      errout.str());
+        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",
+                      errout_str());
 
         functionVariableUsage("int * foo()\n"
                               "{\n"
                               "    return &undefined[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar9() {
@@ -2858,9 +3041,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (int i = 0; i < 10; )\n"
                               "        a[i++] = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
-                           "",
-                           errout.str());
+        ASSERT_EQUALS("[test.cpp:5:16]: (style) Variable 'a[i++]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar10() {
@@ -2873,9 +3054,9 @@ class TestUnusedVar : public TestFixture {
                               "        int i;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n"
-                      "[test.cpp:5]: (style) Unused variable: i\n"
-                      "[test.cpp:7]: (style) Unused variable: i\n", errout.str());
+        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());
 
         functionVariableUsage("void foo(int x)\n"
                               "{\n"
@@ -2885,9 +3066,9 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        int i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n"
-                      "[test.cpp:5]: (style) Unused variable: i\n"
-                      "[test.cpp:7]: (style) Unused variable: i\n", errout.str());
+        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());
 
         functionVariableUsage("void foo(int x)\n"
                               "{\n"
@@ -2898,9 +3079,11 @@ class TestUnusedVar : public TestFixture {
                               "        int i = 0;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'i' is assigned a value that is never used.\n"
-                      "[test.cpp:3]: (style) Unused variable: i\n"
-                      "[test.cpp:5]: (style) Unused variable: i\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("void foo(int x)\n"
                               "{\n"
@@ -2912,9 +3095,9 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    i = 1;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (style) Variable 'i' is assigned a value that is never used.\n"
-                      "[test.cpp:5]: (style) Unused variable: i\n"
-                      "[test.cpp:7]: (style) Unused variable: i\n", errout.str());
+        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());
     }
 
     void localvar11() {
@@ -2928,8 +3111,8 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    x = a;\n"  // redundant assignment
                               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'a' is assigned a value that is never used.\n"
-                      "[test.cpp:9]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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());
 
         // The variable 'a' is initialized. But the initialized value is
         // never used. It is only initialized for security reasons.
@@ -2944,7 +3127,7 @@ class TestUnusedVar : public TestFixture {
                               "        return;\n"
                               "    x = a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar12() {
@@ -2955,13 +3138,13 @@ class TestUnusedVar : public TestFixture {
                               "    a = b = c = d = e = f = 15;\n"
                               "}");
         ASSERT_EQUALS(
-            "[test.cpp:4]: (style) Variable 'a' is assigned a value that is never used.\n"
-            "[test.cpp:4]: (style) Variable 'b' is assigned a value that is never used.\n"
-            "[test.cpp:4]: (style) Variable 'c' is assigned a value that is never used.\n"
-            "[test.cpp:4]: (style) Variable 'd' is assigned a value that is never used.\n"
-            "[test.cpp:4]: (style) Variable 'e' is assigned a value that is never used.\n"
-            "[test.cpp:4]: (style) Variable 'f' is assigned a value that is never used.\n",
-            errout.str());
+            "[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"
+            "[test.cpp:4:19]: (style) Variable 'd' is assigned a value that is never used. [unreadVariable]\n"
+            "[test.cpp:4:23]: (style) Variable 'e' is assigned a value that is never used. [unreadVariable]\n"
+            "[test.cpp:4:27]: (style) Variable 'f' is assigned a value that is never used. [unreadVariable]\n",
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2971,13 +3154,13 @@ class TestUnusedVar : public TestFixture {
                               "}");
 
         TODO_ASSERT_EQUALS(
-            "[test.cpp:4]: (style) Variable 'a' is assigned a value that is never used.\n"
-            "[test.cpp:4]: (style) Variable 'b' is assigned a value that is never used.\n"
-            "[test.cpp:3]: (style) Variable 'c' is assigned a value that is never used.\n",
+            "[test.cpp:4:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
+            "[test.cpp:4:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n"
+            "[test.cpp:3]: (style) Variable 'c' is assigned a value that is never used. [unreadVariable]\n",
 
-            "[test.cpp:4]: (style) Variable 'a' is assigned a value that is never used.\n"
-            "[test.cpp:4]: (style) Variable 'b' is assigned a value that is never used.\n",
-            errout.str());
+            "[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",
+            errout_str());
     }
 
     void localvar13() { // ticket #1640
@@ -2987,7 +3170,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x;\n"
                               "    x = obj->ySize / 8;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar14() {
@@ -2996,7 +3179,7 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int a[10];\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
     void localvar15() {
@@ -3007,7 +3190,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = 0;\n"
                               "    return b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
@@ -3016,7 +3199,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &c;\n"
                               "    return *b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int * foo()\n"
                               "{\n"
@@ -3025,7 +3208,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct B * foo()\n"
                               "{\n"
@@ -3034,7 +3217,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("const struct B * foo()\n"
                               "{\n"
@@ -3043,7 +3226,7 @@ class TestUnusedVar : public TestFixture {
                               "    b[0] = &c;\n"
                               "    return b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar16() { // ticket #1709
@@ -3053,7 +3236,7 @@ class TestUnusedVar : public TestFixture {
                               "    char *ptr = buf;\n"
                               "    *(ptr++) = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'buf' is assigned a value that is never used.\n", "", errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'buf' is assigned a value that is never used.\n", "", errout_str());
 
         // #3910
         functionVariableUsage("void foo() {\n"
@@ -3062,7 +3245,7 @@ class TestUnusedVar : public TestFixture {
                               "    data[0] = buf;\n"
                               "    do_something(data);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    char buf1[5];\n"
@@ -3072,7 +3255,7 @@ class TestUnusedVar : public TestFixture {
                               "    data[1] = buf2;\n"
                               "    do_something(data);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar17() { // ticket #1720
@@ -3089,7 +3272,7 @@ class TestUnusedVar : public TestFixture {
                               "    data->info = k;\n"
                               "    line_start = ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Variable 'line_start' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:16]: (style) Variable 'line_start' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         // extracttests.enable
     }
 
@@ -3098,7 +3281,7 @@ class TestUnusedVar : public TestFixture {
                               "    UserDefinedException* pe = new UserDefinedException();\n"
                               "    throw pe;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar19() { // ticket #1776
@@ -3107,8 +3290,8 @@ class TestUnusedVar : public TestFixture {
                               "    int c;\n"
                               "    c = *(a);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'c' is assigned a value that is never used.\n"
-                      "[test.cpp:2]: (style) Variable 'a' is not assigned a value.\n", errout.str());
+        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());
     }
 
     void localvar20() { // ticket #1799
@@ -3118,7 +3301,7 @@ class TestUnusedVar : public TestFixture {
                               "    char c2[] = { c1 };\n"
                               "    a(c2);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar21() { // ticket #1807
@@ -3127,7 +3310,7 @@ class TestUnusedVar : public TestFixture {
                               "    char buffer[1024];\n"
                               "    bar((void *)buffer);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar22() { // ticket #1811
@@ -3138,7 +3321,7 @@ class TestUnusedVar : public TestFixture {
                               "    i = 1 ? u : v;\n"
                               "    return h + i;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar23() { // ticket #1808
@@ -3149,7 +3332,7 @@ class TestUnusedVar : public TestFixture {
                               "    a = b[c] = 0;\n"
                               "    return a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'b[c]' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (style) Variable 'b[c]' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar24() { // ticket #1803
@@ -3160,7 +3343,7 @@ class TestUnusedVar : public TestFixture {
                               "        throw *this;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar25() { // ticket #1729
@@ -3171,7 +3354,7 @@ class TestUnusedVar : public TestFixture {
                               "    printf(\"This should be a '+' -> %s\\n\", edge);\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar26() { // ticket #1894
@@ -3180,7 +3363,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *p = fred.x();\n"
                               "    *p = 0;"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar27() { // ticket #2160
@@ -3188,7 +3371,7 @@ class TestUnusedVar : public TestFixture {
                               "    int param = 1;\n"
                               "    ptr->param = param++;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'param' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:23]: (style) Variable 'param' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar28() { // ticket #2205
@@ -3197,7 +3380,7 @@ class TestUnusedVar : public TestFixture {
                               "    int size = value;\n"
                               "    *(int*)pos = size;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar29() { // ticket #2206
@@ -3206,7 +3389,7 @@ class TestUnusedVar : public TestFixture {
                               "    float* ranges[] = { s_ranges };\n"
                               "    cout << ranges[0][0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar30() { // ticket #2264
@@ -3214,7 +3397,7 @@ class TestUnusedVar : public TestFixture {
                               "    Engine *engine = e;\n"
                               "    x->engine = engine->clone();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar31() { // ticket #2286
@@ -3222,7 +3405,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x = 0;\n"
                               "    a.x = x - b;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar32() {
@@ -3232,33 +3415,33 @@ class TestUnusedVar : public TestFixture {
                               "    fstream &f = getfile();\n"
                               "    f >> x;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (information) --check-library: Provide <type-checks><unusedvar> configuration for C\n", errout.str());
+        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"
-                              "}", "test.c");
-        ASSERT_EQUALS("[test.c:3]: (style) Variable 'c' is assigned a value that is never used.\n", errout.str());
+                              "}", 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"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // ticket #8494
         functionVariableUsage("void f(C c) {\n"
                               "  int x;\n"
                               "  c & x;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar33() { // ticket #2345
@@ -3268,7 +3451,7 @@ class TestUnusedVar : public TestFixture {
                               "        ++nOldNum;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar34() { // ticket #2368
@@ -3279,7 +3462,7 @@ class TestUnusedVar : public TestFixture {
                               "        j -= i;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar35() { // ticket #2535
@@ -3287,7 +3470,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a, b;\n"
                               "    x(1,a,b);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar36() { // ticket #2805
@@ -3296,32 +3479,32 @@ class TestUnusedVar : public TestFixture {
                               "    a = 2 * (b = 3);\n"
                               "    return a + b;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // ticket #6147
                               "    int a = 0;\n"
                               "    bar(a=a+2);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // ticket #6147
                               "    int a = 0;\n"
                               "    bar(a=2);\n"
                               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
 
         functionVariableUsage("void bar(int);\n"
                               "int foo() {\n"
                               "    int a = 0;\n"
                               "    bar(a=a+2);\n"
                               "}");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        TODO_ASSERT_EQUALS("error", "", errout_str());
     }
 
     void localvar37() { // ticket #3078
@@ -3329,7 +3512,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 2;\n"
                               "    ints.at(a) = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar38() {
@@ -3339,7 +3522,7 @@ class TestUnusedVar : public TestFixture {
                               "    const std::string s2 = sizeof_(code);\n"
                               "    return(s1+s2);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar39() {
@@ -3347,7 +3530,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 1;\n"
                               "    foo(x*a);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar40() {
@@ -3355,7 +3538,7 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 1;\n"
                               "    return x & a;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar41() {
@@ -3365,7 +3548,7 @@ class TestUnusedVar : public TestFixture {
                               "    int y = FOO::VALUE * x;\n"
                               "    return y;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar42() { // #3742
@@ -3377,7 +3560,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatTot = g_float * floatA;\n"
                               "    SomeTestFunc(floatTot);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("float g_float = 1;\n"
                               "extern void SomeTestFunc(float);\n"
@@ -3387,7 +3570,7 @@ class TestUnusedVar : public TestFixture {
                               "    const float floatTot = floatB * g_float;\n"
                               "    SomeTestFunc(floatTot);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("float g_float = 1;\n"
                               "extern void SomeTestFunc(float);\n"
@@ -3397,7 +3580,7 @@ class TestUnusedVar : public TestFixture {
                               "    float floatTot = g_float * floatC;\n"
                               "    SomeTestFunc(floatTot);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar43() { // ticket #3602 (false positive)
@@ -3423,7 +3606,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    delete [] piArray;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // #9877
                               "    const std::vector<int> x = get();\n"
@@ -3431,7 +3614,7 @@ class TestUnusedVar : public TestFixture {
                               "    int i = 0;\n"
                               "    return i;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar44() { // #4020 - FP
@@ -3439,7 +3622,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *sp_mem[2] = { global1, global2 };\n"
                               "    sp_mem[0][3] = 123;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar45() { // #4899 - FP
@@ -3448,7 +3631,7 @@ class TestUnusedVar : public TestFixture {
                               "    int b = (short)-a;;\n"
                               "    return b;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar46() { // #5491/#5494/#6301
@@ -3457,7 +3640,7 @@ class TestUnusedVar : public TestFixture {
                               "    int j{i};\n"
                               "    return j;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(bool b, bool c, double& r) {\n"
                               "    double d{};\n"
@@ -3470,35 +3653,35 @@ class TestUnusedVar : public TestFixture {
                               "      r += d;\n"
                               "    }\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int func() {\n"
                               "    std::mutex m;\n"
                               "    std::unique_lock<std::mutex> l{ m };\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int func() {\n"
                               "    std::shared_lock<std::shared_timed_mutex> lock( m );\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #10490
                               "    std::shared_lock lock = GetLock();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    auto&& g = std::lock_guard<std::mutex> { mutex };\n"
                               "}\n");
-        TODO_ASSERT_EQUALS("", "[test.cpp:2]: (style) Variable 'g' is assigned a value that is never used.\n", errout.str());
+        TODO_ASSERT_EQUALS("", "[test.cpp:2:14]: (style) Variable 'g' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    auto a = RAII();\n"
                               "    auto b { RAII() };\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct RAIIWrapper {\n" // #10894
                               "    RAIIWrapper();\n"
@@ -3508,7 +3691,7 @@ class TestUnusedVar : public TestFixture {
                               "    auto const guard = RAIIWrapper();\n"
                               "    auto const& guard2 = RAIIWrapper();\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar47() { // #6603
@@ -3517,7 +3700,7 @@ class TestUnusedVar : public TestFixture {
                               "    int (SfxUndoManager::*retrieveCount)(bool) const\n"
                               "        = (flag) ? &SfxUndoManager::foo : &SfxUndoManager::bar;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'retrieveCount' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Variable 'retrieveCount' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         // extracttests.enable
     }
 
@@ -3525,7 +3708,7 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void foo() {\n"
                               "  long (*pKoeff)[256] = new long[9][256];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar49() { // #7594
@@ -3546,7 +3729,10 @@ class TestUnusedVar : public TestFixture {
                               "void A::DoSomething(void) {\n"
                               "    const std::string x = Bar();\n"  // <- warning
                               "}");
-        ASSERT_EQUALS("[test.cpp:16]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
     }
 
     void localvar50() { // #6261, #6542
@@ -3555,13 +3741,13 @@ class TestUnusedVar : public TestFixture {
                               "  char buf1[10];\n"
                               "  dostuff(cond?buf1:buf2);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "  char buf1[10];\n"
                               "  dostuff(cond?buf2:buf1);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6542 - ternary operator
         functionVariableUsage("void foo(int c) {\n"
@@ -3569,7 +3755,7 @@ class TestUnusedVar : public TestFixture {
                               "  char *p = c ? buf1 : buf2;\n"
                               "  dostuff(p);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar51() { // #8128 FN
@@ -3578,13 +3764,13 @@ class TestUnusedVar : public TestFixture {
                               "  const Token *tok = nameToken();\n"
                               "  tok = tok->next();\n"  // read+write
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'tok' is assigned a value that is never used.\n", errout.str());
+        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
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:5]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar52() {
@@ -3593,7 +3779,7 @@ class TestUnusedVar : public TestFixture {
                               "  data[2] = 32;\n"
                               "  return data;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar53() {
@@ -3606,7 +3792,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "  }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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"
                               "  bool x = false;\n"
@@ -3618,7 +3804,7 @@ class TestUnusedVar : public TestFixture {
                               "  }\n"
                               "  return x;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar54() {
@@ -3626,7 +3812,7 @@ class TestUnusedVar : public TestFixture {
                               "  Distance d = DISTANCE;\n"
                               "  return (Padding){ d, d, d, d };\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar55() {
@@ -3642,9 +3828,9 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' is assigned a value that is never used.\n"
-                      "[test.cpp:6]: (style) Variable 'x' is assigned a value that is never used.\n",
-                      errout.str());
+        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());
     }
 
     void localvar56() {
@@ -3653,7 +3839,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x = 31;\n"
                               "    mask[x] |= 123;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar57() {
@@ -3662,7 +3848,7 @@ class TestUnusedVar : public TestFixture {
                               "    int x = 0;\n"
                               "    x++;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:6]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar58() { // #9901 - increment false positive
@@ -3670,13 +3856,13 @@ class TestUnusedVar : public TestFixture {
                               "    int x = 0;\n"
                               "    if (--x > 0) {}\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    int x = 0;\n"
                               "    if (x-- > 0) {}\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar59() { // #9737
@@ -3684,7 +3870,7 @@ class TestUnusedVar : public TestFixture {
                               "    const std::vector<char> cmanifest = z;\n"
                               "    return {.a = cmanifest, .b =0};\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar60() {
@@ -3694,13 +3880,13 @@ class TestUnusedVar : public TestFixture {
                               "        p += scale;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int c[]) {\n" // #10597
                               "    int& cc = c[0];\n"
                               "    cc &= ~0xff;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar61() { // #9407
@@ -3710,36 +3896,42 @@ class TestUnusedVar : public TestFixture {
                               "    g(var);\n"
                               "    var = 2;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'var' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (style) Variable 'var' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar62() {
         functionVariableUsage("void f() {\n" // #10824
                               "    S* s = nullptr;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:8]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    S* s{};\n"
                               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's' is assigned a value that is never used.\n", "", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("int f() {\n"
                               "    int i = 0, j = 1;\n"
                               "    return i;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'j' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("int f() {\n"
                               "    int i = 0, j = 1;\n"
                               "    return j;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'i' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void f() {\n" // #10846
                               "    int i = 1; while (i) { i = g(); }\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar63() { // #6928
@@ -3748,7 +3940,7 @@ class TestUnusedVar : public TestFixture {
                               "  goto y;\n"
                               "  y:return;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:7]: (style) Variable 'x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar64() { // #9997
@@ -3767,10 +3959,10 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        q = s;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:10]: (style) Variable 'p' is assigned a value that is never used.\n"
-                      "[test.cpp:11]: (style) Variable 'q' is assigned a value that is never used.\n"
-                      "[test.cpp:14]: (style) Variable 'q' is assigned a value that is never used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:10:11]: (style) Variable 'p' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:11:11]: (style) Variable 'q' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:14:11]: (style) Variable 'q' is assigned a value that is never used. [unreadVariable]\n",
+                      errout_str());
     }
 
     void localvar65() {
@@ -3782,14 +3974,14 @@ class TestUnusedVar : public TestFixture {
                               "            continue;\n"
                               "    }\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 't' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:18]: (style) Variable 't' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n" // #10006
                               "    std::string s = \"\";\n"
                               "    try {}\n"
                               "    catch (...) {}\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvar66() { // #11143
@@ -3797,7 +3989,7 @@ class TestUnusedVar : public TestFixture {
                               "    double phi = 42.0;\n"
                               "    std::cout << pow(sin(phi), 2) + pow(cos(phi), 2) << std::endl;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar67() { // #9946
@@ -3819,17 +4011,17 @@ class TestUnusedVar : public TestFixture {
                               "    d2();\n"
                               "        B() {}\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar68() {
         checkFunctionVariableUsageP("#define X0 int x = 0\n"
                                     "void f() { X0; }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         checkFunctionVariableUsageP("#define X0 int (*x)(int) = 0\n"
                                     "void f() { X0; }\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvar69() {
@@ -3839,7 +4031,22 @@ class TestUnusedVar : public TestFixture {
                               "    int i = g();\n"
                               "    return (::h)(i);\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void localvar70() {
+        functionVariableUsage("struct S { int i = 0; };\n" // #12176
+                              "void f(S s) {\n"
+                              "    S s1;\n"
+                              "    if (s == s1) {}\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void localvar71() {
+        functionVariableUsage("struct A { explicit A(int i); };\n" // #12363
+                              "void f() { A a(0); }\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarloops() {
@@ -3848,7 +4055,7 @@ class TestUnusedVar : public TestFixture {
                               "  int x;\n"
                               "  while (c) { x=10; }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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"
                               "void fun(int y, int c) {\n"
@@ -3858,7 +4065,7 @@ class TestUnusedVar : public TestFixture {
                               "    if (y) { x=10; break; }\n"
                               "  }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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"
                               "void fun() {\n"
@@ -3868,7 +4075,7 @@ class TestUnusedVar : public TestFixture {
                               "    if (y) { x=10; break; }\n"
                               "  }\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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"
                               "  int x = 0;\n"
@@ -3877,13 +4084,13 @@ class TestUnusedVar : public TestFixture {
                               "    x = 10;\n"
                               "  }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void fun() {\n"
                               "  int x = 0;\n"
                               "  while (x < 10) { x = x + 1; }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void fun()\n"
                               "{\n"
@@ -3891,7 +4098,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (ind = 0; ((ind < nrArgs) && (status < 10)); ind++)\n"
                               "        status = x;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f()\n"
                               "{\n"
@@ -3899,8 +4106,8 @@ class TestUnusedVar : public TestFixture {
                               "    for (i = 0U; i < 2U; i++)\n"
                               "        sum += 123;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'sum' is assigned a value that is never used.\n"
-                      "[test.cpp:5]: (style) Variable 'sum' is assigned a value that is never used.\n", errout.str());
+        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());
 
         functionVariableUsage("void f(int c) {\n" // #7908
                               "    int b = 0;\n"
@@ -3912,7 +4119,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    h(b);\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'a' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7:15]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         functionVariableUsage("void f(const std::vector<int>& v) {\n"
                               "    while (g()) {\n"
@@ -3920,7 +4127,7 @@ class TestUnusedVar : public TestFixture {
                               "        if (std::vector<int>{ 1, 2, 3 }.size() > v2.size()) {}\n"
                               "    }\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(const std::vector<int>& v) {\n"
                               "    while (g()) {\n"
@@ -3928,7 +4135,7 @@ class TestUnusedVar : public TestFixture {
                               "        if (std::vector<int>({ 1, 2, 3 }).size() > v2.size()) {}\n"
                               "    }\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(const std::string &c) {\n"
                               "    std::string s = str();\n"
@@ -3936,7 +4143,7 @@ class TestUnusedVar : public TestFixture {
                               "        s[0] = '<';\n"
                               "    if (s == c) {}\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(bool b) {\n"
                               "    std::map<std::string, std::vector<std::string>> m;\n"
@@ -3947,7 +4154,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    j(m);\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { int i; };\n"
                               "S f(S s, bool b) {\n"
@@ -3955,7 +4162,7 @@ class TestUnusedVar : public TestFixture {
                               "        s.i = 1;\n"
                               "    return s;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias1() {
@@ -3964,16 +4171,20 @@ class TestUnusedVar : public TestFixture {
                               "    int a;\n"
                               "    int *b = &a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'b' is assigned a value that is never used.\n"
-                      "[test.cpp:3]: (style) Unused variable: a\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int a[10];\n"
                               "    int *b = a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'b' is assigned a value that is never used.\n"
-                      "[test.cpp:3]: (style) Unused variable: a\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -3981,9 +4192,9 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -3991,9 +4202,9 @@ class TestUnusedVar : public TestFixture {
                               "    char *b = (char *)&a;\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4001,9 +4212,9 @@ class TestUnusedVar : public TestFixture {
                               "    char *b = (char *)(&a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4011,9 +4222,9 @@ class TestUnusedVar : public TestFixture {
                               "    const char *b = (const char *)&a;\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4021,9 +4232,9 @@ class TestUnusedVar : public TestFixture {
                               "    const char *b = (const char *)(&a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4031,9 +4242,9 @@ class TestUnusedVar : public TestFixture {
                               "    char *b = static_cast<char *>(&a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4041,9 +4252,9 @@ class TestUnusedVar : public TestFixture {
                               "    const char *b = static_cast<const char *>(&a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         // a is not a local variable and b is aliased to it
         functionVariableUsage("int a;\n"
@@ -4051,14 +4262,20 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int *b = &a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'b' is assigned a value that is never used.\n", errout.str());
+        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
+            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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'b' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         // a is not a local variable and b is aliased to it
         functionVariableUsage("class A\n"
@@ -4069,7 +4286,10 @@ class TestUnusedVar : public TestFixture {
                               "        int *b = &a;\n"
                               "    }\n"
                               "};");
-        ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'b' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("int a;\n"
                               "void foo()\n"
@@ -4077,14 +4297,14 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int a)\n"
                               "{\n"
                               "    int *b = &a;\n"
                               "    *b = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A\n"
                               "{\n"
@@ -4095,7 +4315,7 @@ class TestUnusedVar : public TestFixture {
                               "        *b = 0;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4103,9 +4323,9 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4113,9 +4333,9 @@ class TestUnusedVar : public TestFixture {
                               "    char *b = (char *)a;\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4123,9 +4343,9 @@ class TestUnusedVar : public TestFixture {
                               "    char *b = (char *)(a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4133,9 +4353,9 @@ class TestUnusedVar : public TestFixture {
                               "    const char *b = (const char *)a;\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4143,9 +4363,9 @@ class TestUnusedVar : public TestFixture {
                               "    const char *b = (const char *)(a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4153,9 +4373,9 @@ class TestUnusedVar : public TestFixture {
                               "    char *b = static_cast<char *>(a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4163,9 +4383,9 @@ class TestUnusedVar : public TestFixture {
                               "    const char *b = static_cast<const char *>(a);\n"
                               "    *b = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:5:13]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("int a[10];\n"
                               "void foo()\n"
@@ -4173,7 +4393,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = a;\n"
                               "    *b = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
                               "void foo()\n"
@@ -4182,7 +4402,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *c = b;\n"
                               "    *c = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4190,7 +4410,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *c = b;\n"
                               "    *c = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4198,7 +4418,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *c = b;\n"
                               "    *c = b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: int a[10];
         functionVariableUsage("void foo()\n"
@@ -4207,7 +4427,7 @@ class TestUnusedVar : public TestFixture {
                               "    int c = b[0];\n"
                               "    x(c);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4215,7 +4435,7 @@ class TestUnusedVar : public TestFixture {
                               "    int c = b[0];\n"
                               "    x(c);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int a[10];\n"
                               "void foo()\n"
@@ -4223,28 +4443,28 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = &a[0];\n"
                               "    a[0] = b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int *b = &a[0];\n"
                               "    a[0] = b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    int *b = a;\n"
                               "    a[0] = b[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int a[10])\n"
                               "{\n"
                               "    int *b = a;\n"
                               "    *b = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A\n"
                               "{\n"
@@ -4255,7 +4475,7 @@ class TestUnusedVar : public TestFixture {
                               "        *b = 0;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4266,7 +4486,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'a' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4276,9 +4496,10 @@ class TestUnusedVar : public TestFixture {
                               "    int *d = b;\n"
                               "    *d = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'c' is assigned a value that is never used.\n"
-                      "[test.cpp:3]: (style) Unused variable: a\n",
-                      errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4288,9 +4509,8 @@ class TestUnusedVar : public TestFixture {
                               "    c = b;\n"
                               "    *c = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: a\n"
-                      "",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: a [unusedVariable]\n",
+                      errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4305,7 +4525,7 @@ class TestUnusedVar : public TestFixture {
         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",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4314,7 +4534,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'b[-10]' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4322,8 +4542,11 @@ class TestUnusedVar : public TestFixture {
                               "    b[-10] = 0;\n"
                               "    int * c = b - 10;\n"
                               "}");
-        ASSERT_EQUALS(// TODO "[test.cpp:4]: (style) Variable 'a' is assigned a value that is never used.\n"
-            "[test.cpp:5]: (style) Variable 'c' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4333,7 +4556,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'c[1]' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4343,7 +4566,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'c[1]' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo() {\n" // #4022 - FP (a is assigned a value that is never used)
                               "    int a[2], *b[2];\n"
@@ -4352,7 +4575,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *d = b[0];\n"
                               "    return *d;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n" // #4022 - FP (a is assigned a value that is never used)
                               "    entry a[2], *b[2];\n"
@@ -4361,7 +4584,7 @@ class TestUnusedVar : public TestFixture {
                               "    int d = b[0].value;\n"
                               "    return d;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
                               "void foo()\n"
@@ -4370,7 +4593,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct S * s = (struct S *)a;\n"
                               "    s->c[0] = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
                               "void foo()\n"
@@ -4378,8 +4601,10 @@ class TestUnusedVar : public TestFixture {
                               "    char a[100];\n"
                               "    struct S * s = (struct S *)a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 's' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Unused variable: a\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
                               "void foo()\n"
@@ -4387,8 +4612,10 @@ class TestUnusedVar : public TestFixture {
                               "    char a[100];\n"
                               "    const struct S * s = (const struct S *)a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 's' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Unused variable: a\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
                               "void foo()\n"
@@ -4396,8 +4623,10 @@ class TestUnusedVar : public TestFixture {
                               "    char a[100];\n"
                               "    struct S * s = static_cast<struct S *>(a);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 's' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Unused variable: a\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("struct S { char c[100]; };\n"
                               "void foo()\n"
@@ -4405,8 +4634,10 @@ class TestUnusedVar : public TestFixture {
                               "    char a[100];\n"
                               "    const struct S * s = static_cast<const struct S *>(a);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 's' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Unused variable: a\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("int a[10];\n"
                               "void foo()\n"
@@ -4419,8 +4650,8 @@ class TestUnusedVar : public TestFixture {
                               "    d = c;\n"
                               "    *d = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Unused variable: b\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4:9]: (style) Unused variable: b [unusedVariable]\n",
+                      errout_str());
 
         functionVariableUsage("int a[10];\n"
                               "void foo()\n"
@@ -4435,7 +4666,7 @@ class TestUnusedVar : public TestFixture {
         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",
                            "",
-                           errout.str());
+                           errout_str());
     }
 
     void localvaralias2() { // ticket 1637
@@ -4444,7 +4675,7 @@ class TestUnusedVar : public TestFixture {
                               "    int * a;\n"
                               "    x(a);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias3() { // ticket 1639
@@ -4455,7 +4686,7 @@ class TestUnusedVar : public TestFixture {
                               "    info.pszDisplayName = szDisplayName;\n"
                               "    SHBrowseForFolder(&info);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias4() { // ticket 1643
@@ -4464,7 +4695,10 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int * a = &ab.a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'a' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("struct AB { int a; int b; } ab;\n"
                               "void foo()\n"
@@ -4472,7 +4706,7 @@ class TestUnusedVar : public TestFixture {
                               "    int * a = &ab.a;\n"
                               "    *a = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct AB { int a; int b; };\n"
                               "void foo()\n"
@@ -4480,8 +4714,10 @@ class TestUnusedVar : public TestFixture {
                               "    struct AB ab;\n"
                               "    int * a = &ab.a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Variable 'ab' is not assigned a value.\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("struct AB { int a; int b; };\n"
                               "void foo()\n"
@@ -4490,7 +4726,7 @@ class TestUnusedVar : public TestFixture {
                               "    int * a = &ab.a;\n"
                               "    *a = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias5() { // ticket 1647
@@ -4501,7 +4737,7 @@ class TestUnusedVar : public TestFixture {
                               "    *p++ = 0;\n"
                               "    return buf[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
                               "{\n"
@@ -4510,7 +4746,7 @@ class TestUnusedVar : public TestFixture {
                               "    *p-- = 0;\n"
                               "    return buf[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
                               "{\n"
@@ -4519,7 +4755,7 @@ class TestUnusedVar : public TestFixture {
                               "    *++p = 0;\n"
                               "    return buf[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("char foo()\n"
                               "{\n"
@@ -4528,7 +4764,7 @@ class TestUnusedVar : public TestFixture {
                               "    *--p = 0;\n"
                               "    return buf[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias6() { // ticket 1729
@@ -4545,7 +4781,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    b(srcdata);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4560,7 +4796,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4575,7 +4811,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo(char *vdata)\n"
                               "{\n"
@@ -4587,7 +4823,7 @@ class TestUnusedVar : public TestFixture {
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: buf\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: buf [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4599,7 +4835,7 @@ class TestUnusedVar : public TestFixture {
                               "    srcdata = buf;\n"
                               "    b(srcdata);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4614,7 +4850,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    b(srcdata);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4630,7 +4866,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4646,7 +4882,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'buf' is assigned a value that is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4659,7 +4895,7 @@ class TestUnusedVar : public TestFixture {
                               "    srcdata = vdata;\n"
                               "    b(srcdata);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: buf\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:10]: (style) Unused variable: buf [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4672,7 +4908,7 @@ class TestUnusedVar : public TestFixture {
                               "    srcdata = buf;\n"
                               "    b(srcdata);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Unused variable: vdata\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:10]: (style) Unused variable: vdata [unusedVariable]\n", errout_str());
     }
 
     void localvaralias7() { // ticket 1732
@@ -4683,7 +4919,7 @@ class TestUnusedVar : public TestFixture {
                               "    cp = c;\n"
                               "    *cp = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias8() {
@@ -4704,7 +4940,7 @@ class TestUnusedVar : public TestFixture {
                               "        pb = b4;\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4725,7 +4961,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4748,7 +4984,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         functionVariableUsage("void foo()\n"
@@ -4767,9 +5003,9 @@ class TestUnusedVar : public TestFixture {
                               "    pb = b4;\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: b1\n"
-                      "[test.cpp:4]: (style) Unused variable: b2\n"
-                      "[test.cpp:5]: (style) Unused variable: b3\n", errout.str());
+        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());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4792,7 +5028,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4817,7 +5053,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4844,7 +5080,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -4866,9 +5102,9 @@ class TestUnusedVar : public TestFixture {
                               "    pb = b4;\n"
                               "    b(pb);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: b1\n"
-                      "[test.cpp:4]: (style) Unused variable: b2\n"
-                      "[test.cpp:5]: (style) Unused variable: b3\n", errout.str());
+        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());
     }
 
     void localvaralias9() { // ticket 1996
@@ -4878,7 +5114,7 @@ class TestUnusedVar : public TestFixture {
                               "    Foo &ref = foo;\n"
                               "    ref[0] = 123;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias10() { // ticket 2004
@@ -4888,7 +5124,7 @@ class TestUnusedVar : public TestFixture {
                               "    int *x = &ref.x();\n"
                               "    *x = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias11() { // #4423 - iterator
@@ -4896,7 +5132,7 @@ class TestUnusedVar : public TestFixture {
                               "    std::set<int>::iterator x = foo.dostuff();\n"
                               "    *(x) = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias12() { // #4394
@@ -4905,14 +5141,14 @@ class TestUnusedVar : public TestFixture {
                               "    int *b = (int*)((int*)a+1);\n"
                               "    x(b);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f(void) {\n" // #4628
                               "    int x=1,y;\n"
                               "    y = (x * a) / 100;\n"
                               "    return y;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias13() { // #4487
@@ -4921,14 +5157,14 @@ class TestUnusedVar : public TestFixture {
                               "    p = a;\n"
                               "    strcpy(p, \"x\");\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(char *p) {\n"
                               "    char a[4];\n"
                               "    p = a;\n"
                               "    strcpy(p, \"x\");\n"
                               "}");
-        TODO_ASSERT_EQUALS("a is assigned value that is never used", "", errout.str());
+        TODO_ASSERT_EQUALS("a is assigned value that is never used", "", errout_str());
     }
 
     void localvaralias14() { // #5619
@@ -4937,20 +5173,20 @@ class TestUnusedVar : public TestFixture {
                               "    char a[4], *p=a;\n"
                               "    p = dostuff(p);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'p' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("", errout.str()); // TODO: we can warn in this special case; variable is local and there are no function calls after the assignment
+        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"
                               "}");
-        ASSERT_EQUALS("", errout.str()); // TODO: we can warn in this special case; variable is local and there are no function calls after the assignment
+        ASSERT_EQUALS("", errout_str()); // TODO: we can warn in this special case; variable is local and there are no function calls after the assignment
     }
 
     void localvaralias15() { // #6315
@@ -4960,7 +5196,7 @@ class TestUnusedVar : public TestFixture {
                               "  int *p2[1] = {p};\n"
                               "  dostuff(p2);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias16() {
@@ -4969,7 +5205,7 @@ class TestUnusedVar : public TestFixture {
                               "  p = x;\n"
                               "  x->data[0] = 9;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias17() {
@@ -4977,8 +5213,8 @@ class TestUnusedVar : public TestFixture {
                               "  int x;\n"
                               "  unknown_type p = &x;\n"
                               "  *p = 9;\n"
-                              "}", "test.c");
-        ASSERT_EQUALS("", errout.str());
+                              "}", dinit(FunctionVariableUsageOptions, $.cpp = false));
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias18() {
@@ -4994,7 +5230,14 @@ class TestUnusedVar : public TestFixture {
                               "        }\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        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
@@ -5009,7 +5252,7 @@ class TestUnusedVar : public TestFixture {
                               "        if (m.pb && *m.pb)\n"
                               "            m.val = 1;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias20() { // #10966
@@ -5021,10 +5264,9 @@ class TestUnusedVar : public TestFixture {
                               "    const auto&& c = g();\n"
                               "    auto&& d = c;\n"
                               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'b' is assigned a value that is never used.\n"
-                           "[test.cpp:7]: (style) Variable 'd' is assigned a value that is never used.\n",
-                           "[test.cpp:7]: (style) Variable 'd' is assigned a value that is never used.\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
@@ -5036,7 +5278,7 @@ class TestUnusedVar : public TestFixture {
                               "        b = false;\n"
                               "    if (*p) {}\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:10]: (style) Variable 'j' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvaralias22() { // #11139
@@ -5055,7 +5297,7 @@ class TestUnusedVar : public TestFixture {
                               "    x[0] = 42;\n"
                               "    return *p;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvaralias23() { // #11817
@@ -5066,7 +5308,7 @@ class TestUnusedVar : public TestFixture {
                               "    else if (b)\n"
                               "        e = 1;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarasm() {
@@ -5077,7 +5319,7 @@ class TestUnusedVar : public TestFixture {
                               "    asm();\n"
                               "    b = a;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct1() {
@@ -5086,7 +5328,7 @@ class TestUnusedVar : public TestFixture {
                               "    static const struct{ int x, y, w, h; } bounds = {1,2,3,4};\n"
                               "    return bounds.x + bounds.y + bounds.w + bounds.h;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct2() {
@@ -5095,7 +5337,10 @@ class TestUnusedVar : public TestFixture {
                               "    struct ABC { int a, b, c; };\n"
                               "    struct ABC abc = { 1, 2, 3 };\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'abc' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
     }
 
     void localvarStruct3() {
@@ -5108,7 +5353,7 @@ class TestUnusedVar : public TestFixture {
                               "    } while(a--);\n"
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Unused variable: x\n"
-                           "[test.cpp:4]: (style) Unused variable: z\n", "", errout.str());
+                           "[test.cpp:4]: (style) Unused variable: z\n", "", errout_str());
     }
 
     void localvarStruct5() {
@@ -5117,20 +5362,20 @@ class TestUnusedVar : public TestFixture {
                               "    A a;\n"
                               "    return a.i;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
                               "}\n",
-                              "test.c");
-        ASSERT_EQUALS("[test.c:2]: (style) Unused variable: a\n", errout.str());
+                              dinit(FunctionVariableUsageOptions, $.cpp = false));
+        ASSERT_EQUALS("[test.c:2:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
         // extracttests.enable
 
         functionVariableUsage("struct A { int i; };\n"
@@ -5138,7 +5383,7 @@ class TestUnusedVar : public TestFixture {
                               "    A a;\n"
                               "    return a.i;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
                               "int foo() {\n"
@@ -5146,14 +5391,17 @@ class TestUnusedVar : public TestFixture {
                               "    a.i = 0;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'a.i' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'a' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         // extracttests.disable
         functionVariableUsage("class A { int i; };\n"
@@ -5161,50 +5409,53 @@ class TestUnusedVar : public TestFixture {
                               "    A a = { 0 };\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'a' is assigned a value that is never used.\n", errout.str());
-        // extracttests.enable
+        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
+            errout_str());
 
+        // extracttests.enable
         functionVariableUsage("class A { int i; public: A(); { } };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct A { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: a\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: a\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A { unknown i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A : public Fred { int i; };\n"
                               "int foo() {\n"
                               "    A a;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred {char c;};\n"
                               "class A : public Fred { int i; };\n"
@@ -5212,7 +5463,7 @@ class TestUnusedVar : public TestFixture {
                               "    A a;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Unused variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:7]: (style) Unused variable: a [unusedVariable]\n", errout_str());
     }
 
     void localvarStruct6() {
@@ -5223,7 +5474,7 @@ class TestUnusedVar : public TestFixture {
                               "private:\n"
                               "    Type t;\n"
                               "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct7() {
@@ -5237,7 +5488,7 @@ class TestUnusedVar : public TestFixture {
                               "  aatt.text = tmp;\n"
                               "  dostuff(args);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.start: void dostuff(int*);
         functionVariableUsage("struct ARG {\n"
@@ -5251,7 +5502,7 @@ class TestUnusedVar : public TestFixture {
                               "  aatt.a = 123;\n"
                               "  dostuff(p);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:9]: (style) Variable 'aatt.a' is assigned a value that is never used.\n", errout.str());
+        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"
                               "  int a;\n"
@@ -5264,7 +5515,7 @@ class TestUnusedVar : public TestFixture {
                               "  ab.a = 123;\n"
                               "  dostuff(a);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct8() {
@@ -5283,7 +5534,7 @@ class TestUnusedVar : public TestFixture {
                               "      test.raw = 0x100;\n"
                               "      dostuff(test.fld1, test.fld2);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct9() {
@@ -5293,7 +5544,7 @@ class TestUnusedVar : public TestFixture {
                               "      struct XY xy(get());\n"
                               "      return xy.x + xy.y;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct10() { // #6766
@@ -5304,7 +5555,7 @@ class TestUnusedVar : public TestFixture {
                               "    s.x = 3;\n"
                               "    memcpy (&s, &s2, sizeof (S));\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 's.x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:9]: (style) Variable 's.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvarStruct11() { // #10095
@@ -5316,7 +5567,7 @@ class TestUnusedVar : public TestFixture {
                               "    p.x = 42;\n"
                               "    return scale(&p).y;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct12() { // #10495
@@ -5326,7 +5577,7 @@ class TestUnusedVar : public TestFixture {
                               "    S s;\n"
                               "    s.Ref() = true;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStruct13() { // #10398
@@ -5343,7 +5594,18 @@ class TestUnusedVar : public TestFixture {
                               "        Mode[i] = \"abc\";\n"
                               "    return Save(&Block);\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+    }
+
+    void localvarStruct14() { // #12142
+        functionVariableUsage("struct S { int i; };\n"
+                              "int f() {\n"
+                              "    S s;\n"
+                              "    int S::* p = &S::i;\n"
+                              "    s.*p = 123;\n"
+                              "    return s.i;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarStructArray() {
@@ -5354,7 +5616,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct X x[10];\n"
                               "    x[0].a = 5;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x[0].a' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:12]: (style) Variable 'x[0].a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvarUnion1() {
@@ -5366,11 +5628,11 @@ class TestUnusedVar : public TestFixture {
                               "    x.c[1] = fgetuc(fp);\n"
                               "    return x.s;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarOp() {
-        const char op[] = "+-*/%&|^";
+        constexpr char op[] = "+-*/%&|^";
         for (const char *p = op; *p; ++p) {
             std::string code("int main()\n"
                              "{\n"
@@ -5378,7 +5640,7 @@ class TestUnusedVar : public TestFixture {
                              "    return 123 " + std::string(1, *p) + " tmp;\n"
                              "}");
             functionVariableUsage(code.c_str());
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
         }
     }
 
@@ -5388,7 +5650,7 @@ class TestUnusedVar : public TestFixture {
                               "    int tmp = 10;\n"
                               "    return ~tmp;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarIf() {
@@ -5399,7 +5661,24 @@ class TestUnusedVar : public TestFixture {
                               "        return 1;\n"
                               "    return 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("bool argsMatch(const Token *first, const Token *second) {\n" // #6145
+                              "    if (first->str() == \")\")\n"
+                              "        return true;\n"
+                              "    else if (first->next()->str() == \"=\")\n"
+                              "        first = first->nextArgument();\n"
+                              "    else if (second->next()->str() == \"=\") {\n"
+                              "        second = second->nextArgument();\n"
+                              "        if (second)\n"
+                              "            second = second->tokAt(-2);\n"
+                              "        if (!first || !second) {\n"
+                              "            return !first && !second;\n"
+                              "        }\n"
+                              "    }\n"
+                              "    return false;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:5:15]: (style) Variable 'first' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvarIfElse() {
@@ -5410,7 +5689,7 @@ class TestUnusedVar : public TestFixture {
                               "    int tmp3 = 3;\n"
                               "    return tmp1 ? tmp2 : tmp3;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarDeclaredInIf() {
@@ -5421,7 +5700,10 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        return 1;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'y' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("int foo(int x)\n"
                               "{\n"
@@ -5430,7 +5712,7 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        return 1;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo(int x)\n"
                               "{\n"
@@ -5439,7 +5721,38 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        return y;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int f(int i) {\n" // #11788
+                              "    if (int x = i) {\n"
+                              "        return x;\n"
+                              "    }\n"
+                              "    else {\n"
+                              "        x = 12;\n"
+                              "        return x;\n"
+                              "    }\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("void f(int i) {\n"
+                              "    if (int x = i) {\n"
+                              "        while (x < 100) {\n"
+                              "            if (x % 2 == 0) {\n"
+                              "                x += 3;\n"
+                              "            }\n"
+                              "            else if (x % 3 == 0) {\n"
+                              "                x += 5;\n"
+                              "            }\n"
+                              "            else {\n"
+                              "                x += 7;\n"
+                              "            }\n"
+                              "            x += 6;\n"
+                              "        }\n"
+                              "        return x;\n"
+                              "    }\n"
+                              "    return i;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarOpAssign() {
@@ -5449,14 +5762,14 @@ class TestUnusedVar : public TestFixture {
                               "    int b = 2;\n"
                               "    a |= b;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'a' is assigned a value that is never used.\n"
-                      "[test.cpp:5]: (style) Variable 'a' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    int a=1, b[10];\n"
@@ -5464,7 +5777,7 @@ class TestUnusedVar : public TestFixture {
                               "    a += b[0];\n"
                               "    return a;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int *start, int *stop) {\n"
                               "  int length = *start - *stop;\n"
@@ -5472,14 +5785,14 @@ class TestUnusedVar : public TestFixture {
                               "    length = 10000;\n"
                               "  *stop -= length;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(int a) {\n"
                               "  int x = 3;\n"
                               "  a &= ~x;\n"
                               "  return a;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // extracttests.disable
         functionVariableUsage("void f() {\n"  // unknown class => library configuration is needed
@@ -5487,14 +5800,14 @@ class TestUnusedVar : public TestFixture {
                               "  int *a; a = b;\n"
                               "  fred += a;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (information) --check-library: Provide <type-checks><unusedvar> configuration for Fred\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'fred' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:8]: (style) Variable 'fred' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvarFor() {
@@ -5503,13 +5816,13 @@ class TestUnusedVar : public TestFixture {
                               "    int a = 1;\n"
                               "    for (;a;);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    for (int i = 0; (pci = cdi_list_get(pciDevices, i)); i++)\n"
                               "    {}\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarForEach() { // #4155 - foreach
@@ -5521,7 +5834,7 @@ class TestUnusedVar : public TestFixture {
                               "        i = x;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #5154 - MSVC 'for each'
         functionVariableUsage("void f() {\n"
@@ -5529,7 +5842,7 @@ class TestUnusedVar : public TestFixture {
                               "  ints[0]= 1;\n"
                               "  for each(std::pair<int,int> i in ints) { x += i.first; }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarShift1() {
@@ -5538,7 +5851,7 @@ class TestUnusedVar : public TestFixture {
                               "    int var = 1;\n"
                               "    return 1 >> var;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarShift3() {  // #3509
@@ -5547,14 +5860,14 @@ class TestUnusedVar : public TestFixture {
                               "    QList<int *> ints;\n"
                               "    ints << 1;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n" // #4320
                               "    int x;\n"
                               "    x << 1;\n"
                               "    return x;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarCast() {
@@ -5564,7 +5877,7 @@ class TestUnusedVar : public TestFixture {
                               "    int b = static_cast<int>(a);\n"
                               "    return b;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarClass() {
@@ -5575,7 +5888,7 @@ class TestUnusedVar : public TestFixture {
                               "        int f() { return a; }\n"
                               "    } b;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarUnused() {
@@ -5583,37 +5896,44 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    bool test __attribute__((unused));\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((unused)) = true;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((unused)) test;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((unused)) test = true;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool test __attribute__((used));\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo()\n"
                               "{\n"
                               "    bool __attribute__((used)) test;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int foo()\n"
+                              "{\n"
+                              "    char a[1] __attribute__((unused));\n"
+                              "    char b[1][2] __attribute__((unused));\n"
+                              "}");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarFunction() {
@@ -5624,7 +5944,7 @@ class TestUnusedVar : public TestFixture {
                               "  fn = reinterpret_cast<function_type>(dlsym(h, \"try_allocation\"));\n"
                               "  fn();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarstatic() {
@@ -5635,36 +5955,35 @@ class TestUnusedVar : public TestFixture {
                               "    static std::string s;\n"
                               "    static const std::string cs;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: i\n"
-                      "[test.cpp:4]: (style) Unused variable: ci\n"
-                      "[test.cpp:5]: (style) Unused variable: s\n"
-                      "[test.cpp:6]: (style) Unused variable: cs\n",
-                      errout.str());
+        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"
+                      "[test.cpp:6:30]: (style) Unused variable: cs [unusedVariable]\n",
+                      errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    static int i = 0;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n",
-                           "",
-                           errout.str());
+        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"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
                               "    static int j = 0;\n"
                               "    static int i(j);\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:4:10]: (style) Variable 'i' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("int * foo(int x)\n"
                               "{\n"
@@ -5674,9 +5993,9 @@ class TestUnusedVar : public TestFixture {
                               "    b[1] = 1;\n"
                               "    return x ? a : c;\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:6]: (style) Variable 'b' is assigned a value that is never used.\n",
+        TODO_ASSERT_EQUALS("[test.cpp:6:16]: (style) Variable 'b' is assigned a value that is never used. [unreadVariable]\n",
                            "",
-                           errout.str());
+                           errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -5684,7 +6003,7 @@ class TestUnusedVar : public TestFixture {
                               "    if(i < foo())\n"
                               "        i += 5;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo() {\n"
                               "    static int x = 0;\n"
@@ -5694,21 +6013,31 @@ class TestUnusedVar : public TestFixture {
                               "    else\n"
                               "        x++;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(int value) {\n"
                               "    static int array[16] = {0};\n"
                               "    if(array[value]) {}\n"
                               "    array[value] = 1;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int fun() {\n" // #11310
                               "    static int k;\n"
                               "    k++;\n"
                               "    return k;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int& f() {\n" // #12935
+                              "    static int i;\n"
+                              "    return i;\n"
+                              "}\n"
+                              "int* g() {\n"
+                              "    static int j;\n"
+                              "    return &j;\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarextern() {
@@ -5716,7 +6045,7 @@ class TestUnusedVar : public TestFixture {
                               "    extern int i;\n"
                               "    i = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvardynamic1() {
@@ -5725,14 +6054,14 @@ class TestUnusedVar : public TestFixture {
                               "    void* ptr = malloc(16);\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.disable
 
@@ -5741,14 +6070,14 @@ class TestUnusedVar : public TestFixture {
                               "    char* ptr = new ( nothrow ) char[16];\n"
                               "    delete[] ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.enable
 
@@ -5757,7 +6086,7 @@ class TestUnusedVar : public TestFixture {
                               "    char* ptr = new char;\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
@@ -5765,7 +6094,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr[0] = 123;\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -5773,7 +6102,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr[0] = 123;\n"
                               "    delete[] ptr;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -5781,7 +6110,7 @@ class TestUnusedVar : public TestFixture {
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int a; };\n"
                               "void foo()\n"
@@ -5790,7 +6119,7 @@ class TestUnusedVar : public TestFixture {
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'fred' is allocated memory that is never used.\n", errout.str());
+        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"
                               "void foo()\n"
@@ -5799,7 +6128,7 @@ class TestUnusedVar : public TestFixture {
                               "    std::cout << \"test\" << std::endl;\n"
                               "    delete fred;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'fred' is allocated memory that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -5807,7 +6136,7 @@ class TestUnusedVar : public TestFixture {
                               "    std::cout << \"test\" << std::endl;\n"
                               "    free(fred);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'fred' is allocated memory that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:18]: (style) Variable 'fred' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
 
         functionVariableUsage("void foo()\n"
@@ -5815,7 +6144,7 @@ class TestUnusedVar : public TestFixture {
                               "    char* ptr = names[i];\n"
                               "    delete[] ptr;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvardynamic2() {
@@ -5825,7 +6154,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "void foo()\n"
@@ -5834,7 +6163,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
                               "void foo()\n"
@@ -5842,7 +6171,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "void foo()\n"
@@ -5851,7 +6180,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
                               "void foo()\n"
@@ -5859,7 +6188,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.disable
 
@@ -5869,7 +6198,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new (nothrow ) Fred();\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "void foo()\n"
@@ -5877,7 +6206,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new (std::nothrow) Fred();\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4:11]: (style) Variable 'ptr' is allocated memory that is never used. [unusedAllocatedMemory]\n", errout_str());
 
         // extracttests.enable
 
@@ -5888,7 +6217,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr->i = 0;\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct Fred { int i; };\n"
                               "void foo()\n"
@@ -5896,7 +6225,7 @@ class TestUnusedVar : public TestFixture {
                               "    struct Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "void foo()\n"
@@ -5905,7 +6234,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
                               "void foo()\n"
@@ -5913,7 +6242,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = (Fred*)malloc(sizeof(Fred));\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "void foo()\n"
@@ -5922,7 +6251,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr->i = 0;\n"
                               "    free(ptr);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class Fred { public: int i; };\n"
                               "void foo()\n"
@@ -5930,7 +6259,7 @@ class TestUnusedVar : public TestFixture {
                               "    Fred* ptr = new Fred();\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'ptr' is allocated memory that is never used.\n", errout.str());
+        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"
                               "void foo()\n"
@@ -5939,7 +6268,7 @@ class TestUnusedVar : public TestFixture {
                               "    ptr->i = 0;\n"
                               "    delete ptr;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvardynamic3() {
@@ -5952,7 +6281,7 @@ class TestUnusedVar : public TestFixture {
                               "}");
         TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'p' is modified but its new value is never used.\n",
                            "",
-                           errout.str());
+                           errout_str());
     }
 
     void localvararray1() {
@@ -5960,7 +6289,7 @@ class TestUnusedVar : public TestFixture {
                               "    int p[5];\n"
                               "    *p = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvararray2() {
@@ -5969,7 +6298,7 @@ class TestUnusedVar : public TestFixture {
                               "    p[0][0] = 0;\n"
                               "    return p[0][0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvararray3() {
@@ -5978,7 +6307,7 @@ class TestUnusedVar : public TestFixture {
                               "    *((int*)p[0]) = 0;\n"
                               "    return p[0][0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvararray4() {
@@ -5988,7 +6317,7 @@ class TestUnusedVar : public TestFixture {
                               "    p[0] = 1;\n"
                               "    *pp[0] = p[0];\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvararray5() {
@@ -5996,52 +6325,86 @@ class TestUnusedVar : public TestFixture {
                               "    int p[5][5];\n"
                               "    dostuff(*p);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int foo() {\n"
+                              "    int p[5];\n"
+                              "    dostuff(*p);\n"
+                              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int foo() {\n"
+                              "    int p[5][5][5];\n"
+                              "    dostuff(**p);\n"
+                              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("void f() {\n" // #11872
+                              "    char v[1][2];\n"
+                              "}");
+        ASSERT_EQUALS("[test.cpp:2:10]: (style) Unused variable: v [unusedVariable]\n", errout_str());
+    }
+
+    void localvararray6() {
+        functionVariableUsage("struct S { int* p; };\n" // #11012
+                              "void g(struct S* ps);\n"
+                              "void f() {\n"
+                              "    int i[2];\n"
+                              "    struct S s = { i };\n"
+                              "    g(&s);\n"
+                              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarstring1() { // ticket #1597
         functionVariableUsage("void foo() {\n"
                               "    std::string s;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: s\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 's' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void foo() {\n" // #8901
                               "    const std::string s = \"foo\";\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("std::string foo() {\n"
                               "    std::string s;\n" // Class instances are initialized. Assignment is not necessary
                               "    return s;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("std::string foo() {\n"
                               "    std::string s = \"foo\";\n"
                               "    return s;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::string s(\"foo\");\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvarstring2() { // ticket #2929
@@ -6049,15 +6412,18 @@ class TestUnusedVar : public TestFixture {
                               "    std::string s;\n"
                               "    int i;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: s\n"
-                      "[test.cpp:3]: (style) Unused variable: i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:17]: (style) Unused variable: s [unusedVariable]\n"
+                      "[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", errout_str());
     }
 
     void localvarconst1() {
         functionVariableUsage("void foo() {\n"
                               "    const bool b = true;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'b' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
     }
 
     void localvarconst2() {
@@ -6065,7 +6431,7 @@ class TestUnusedVar : public TestFixture {
                               "    const int N = 10;\n"
                               "    struct X { int x[N]; };\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarreturn() { // ticket #9167
@@ -6080,27 +6446,27 @@ class TestUnusedVar : public TestFixture {
                               "    };\n"
                               "    return MyInt;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarmaybeunused() {
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int x;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
                               "int main() {\n"
                               "    [[maybe_unused]] int x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
                               "int main() {\n"
                               "    [[maybe_unused]] int x = getX();\n"
                               "    x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[nodiscard]] int getX() { return 4; }\n"
                               "int main() {\n"
@@ -6108,60 +6474,81 @@ class TestUnusedVar : public TestFixture {
                               "    x = getX();\n"
                               "    std::cout << x;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int& x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] const int* x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int& x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int* x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] auto x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] auto&& x = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] int x[] = getX();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] constexpr volatile static int x = 1;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("[[maybe_unused]] inline int x = 1;");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    [[maybe_unused]] [[anotherattribute]] const int* = 1;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int main() {\n"
+                              "    [[maybe_unused]] char a[1];\n"
+                              "    [[maybe_unused]] char b[1][2];\n"
+                              "}");
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("int main() {\n"
+                              "    std::string a [[maybe_unused]];\n"
+                              "    f();\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 localvarthrow() { // ticket #3687
@@ -6169,7 +6556,7 @@ class TestUnusedVar : public TestFixture {
                               "    try {}"
                               "    catch(Foo& bar) {}\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localVarStd() {
@@ -6178,38 +6565,41 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f() {\n"
                               "    std::string x = foo();\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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
+            errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<int> x;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: x\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:22]: (style) Unused variable: x [unusedVariable]\n", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::vector<int> x(100);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'x' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: x\n", errout.str());
+        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
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    pLocker = std::shared_ptr<jfxLocker>(new jfxLocker(m_lock, true));\n" // Could have side-effects (#4355)
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::mutex m;\n"
                               "    std::unique_lock<std::mutex> lock(m);\n" // #4624
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #7732
                               "    const std::pair<std::string, std::string> p(\"a\", \"b\");\n"
@@ -6217,18 +6607,18 @@ class TestUnusedVar : public TestFixture {
                               "    auto r = std::pair<std::string, std::string>(\"a\", \"b\");\n"
                               "    auto s = std::pair<std::string, std::string>{ \"a\", \"b\" };\n"
                               "}\n");
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'p' is assigned a value that is never used.\n"
-                           "[test.cpp:3]: (style) Variable 'q' is assigned a value that is never used.\n"
-                           "[test.cpp:4]: (style) Variable 'r' is assigned a value that is never used.\n"
-                           "[test.cpp:5]: (style) Variable 's' is assigned a value that is never used.\n",
-                           "[test.cpp:2]: (style) Variable 'p' is assigned a value that is never used.\n"
-                           "[test.cpp:3]: (style) Variable 'q' is assigned a value that is never used.\n",
-                           errout.str());
+        TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'p' is assigned a value that is never used. [unreadVariable]\n"
+                           "[test.cpp:2:48]: (style) Variable 'p' is assigned a value that is never used. [unreadVariable]\n"
+                           "[test.cpp:4]: (style) Variable 'r' is assigned a value that is never used. [unreadVariable]\n"
+                           "[test.cpp:5:18]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n",
+                           "[test.cpp:2:48]: (style) Variable 'p' is assigned a value that is never used. [unreadVariable]\n"
+                           "[test.cpp:3:42]: (style) Variable 'q' is assigned a value that is never used. [unreadVariable]\n",
+                           errout_str());
 
         functionVariableUsage("void f(std::span<int> s) {\n" // #11545
                               "    s[0] = 0;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S {\n"
                               "    std::mutex m;\n"
@@ -6237,20 +6627,29 @@ class TestUnusedVar : public TestFixture {
                               "void S::f() {\n"
                               "    const ::std::lock_guard g(m);\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
+
+        functionVariableUsage("void f(const std::string& str, int i) {\n" // #11879
+                              "    const std::string s = str;\n"
+                              "    switch (i) {\n"
+                              "    default:\n"
+                              "        break;\n"
+                              "    }\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:23]: (style) Variable 's' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localVarClass() {
         functionVariableUsage("void f() {\n"
                               "    Fred f;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class C { int x; };\n"
                               "void f() {\n"
                               "    C c;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Unused variable: c\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) Unused variable: c [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class ExampleClass\n" // #10000
                               "{\n"
@@ -6273,13 +6672,13 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "   ExampleClass ex(1, 2, 3, 4);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:20]: (style) Variable 'ex' is assigned a value that is never used.\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localVarSmartPtr() {
@@ -6297,7 +6696,7 @@ class TestUnusedVar : public TestFixture {
                               "    auto a = std::make_shared<A>();\n"
                               "    auto a2 = std::unique_ptr<A>(new A());\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("class A {\n"
                               "public:\n"
@@ -6308,8 +6707,9 @@ class TestUnusedVar : public TestFixture {
                               "    auto a = std::make_shared<A>();\n"
                               "    auto a2 = std::unique_ptr<A>(new A());\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:7]: (style) Variable 'a' is assigned a value that is never used.\n"
-                      "[test.cpp:8]: (style) Variable 'a2' is assigned a value that is never used.\n", errout.str());
+        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
+                      errout_str());
 
         functionVariableUsage("void g();\n" // #11094
                               "void f() {\n"
@@ -6317,7 +6717,7 @@ class TestUnusedVar : public TestFixture {
                               "    p = nullptr;\n"
                               "    g();\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f(int *p) {\n" // #10703
                               "    std::unique_ptr<int> up(p);\n"
@@ -6327,13 +6727,13 @@ class TestUnusedVar : public TestFixture {
                               "    auto up = std::unique_ptr<int>(p);\n"
                               "    return *p;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("struct S { S(); };\n" // #11108
                               "void f(std::unique_ptr<S> p) {\n"
                               "    p = nullptr;\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     // ticket #3104 - false positive when variable is read with "if (NOT var)"
@@ -6342,7 +6742,7 @@ class TestUnusedVar : public TestFixture {
                               "    bool x = foo();\n"
                               "    if (NOT x) { }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarAnd() { // #3672
@@ -6352,7 +6752,7 @@ class TestUnusedVar : public TestFixture {
                               "        return 1;\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarSwitch() { // #3744 - false positive when used in switch
@@ -6366,7 +6766,7 @@ class TestUnusedVar : public TestFixture {
                               "    }\n"
                               "    return ptr;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str()); // Don't write an error that "a" is not used
+        ASSERT_EQUALS("", errout_str()); // Don't write an error that "a" is not used
 
         functionVariableUsage("void x() {\n"
                               "    unsigned char* pcOctet = NULL;\n"
@@ -6384,7 +6784,7 @@ class TestUnusedVar : public TestFixture {
                               "        *pcData = gacHexChar[(*pcOctet >> 4) & 0x0F];\n"
                               "    }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str()); // Don't write an error that "fValeur" is not used
+        ASSERT_EQUALS("", errout_str()); // Don't write an error that "fValeur" is not used
     }
 
     void localvarNULL() { // #4203 - Setting NULL value is not redundant - it is safe
@@ -6394,13 +6794,13 @@ class TestUnusedVar : public TestFixture {
                               "    free(p);\n"
                               "    p = NULL;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f(Foo *p) {\n"
                               "    free(p);\n"
                               "    p = (Foo *)NULL;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #11079
                               "    std::string s1{ nullptr };\n"
@@ -6415,15 +6815,15 @@ class TestUnusedVar : public TestFixture {
                               "    A a4(nullptr);\n"
                               "    A a5(NULL);\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's1' is assigned a value that is never used.\n"
-                      "[test.cpp:3]: (style) Variable 's2' is assigned a value that is never used.\n"
-                      "[test.cpp:4]: (style) Variable 's4' is assigned a value that is never used.\n"
-                      "[test.cpp:5]: (style) Variable 's5' is assigned a value that is never used.\n"
-                      "[test.cpp:9]: (style) Variable 'a1' is assigned a value that is never used.\n"
-                      "[test.cpp:10]: (style) Variable 'a2' is assigned a value that is never used.\n"
-                      "[test.cpp:11]: (style) Variable 'a4' is assigned a value that is never used.\n"
-                      "[test.cpp:12]: (style) Variable 'a5' is assigned a value that is never used.\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:2:19]: (style) Variable 's1' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:3:19]: (style) Variable 's2' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:4:19]: (style) Variable 's4' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:5:19]: (style) Variable 's5' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:9:9]: (style) Variable 'a1' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:10:9]: (style) Variable 'a2' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:11:9]: (style) Variable 'a4' is assigned a value that is never used. [unreadVariable]\n"
+                      "[test.cpp:12:9]: (style) Variable 'a5' is assigned a value that is never used. [unreadVariable]\n",
+                      errout_str());
     }
 
     void localvarUnusedGoto() {
@@ -6441,7 +6841,7 @@ class TestUnusedVar : public TestFixture {
                               " }\n"
                               " return false;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'X' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5:7]: (style) Variable 'X' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
         // #4558
         functionVariableUsage("int f() {\n"
@@ -6454,7 +6854,7 @@ class TestUnusedVar : public TestFixture {
                               "     goto start;\n"
                               " return i;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarLambda() {
@@ -6462,14 +6862,14 @@ class TestUnusedVar : public TestFixture {
                               "    auto f = []{return 1};\n"
                               "    return f();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    auto f = []{return 1};\n"
                               "    auto g = []{return 1};\n"
                               "    return f() + g();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void foo(std::vector<int>& v) {\n"
                               "    int n = 0;\n"
@@ -6479,14 +6879,33 @@ class TestUnusedVar : public TestFixture {
                               "        return r;\n"
                               "    });\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int f() {\n" // #8433
                               "    float a;\n"
                               "    auto lambda = []() {};\n"
                               "    return 0;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Unused variable: a [unusedVariable]\n", errout_str());
+
+        functionVariableUsage("void f() {\n" // #9823
+                              "    auto cb = []() {\n"
+                              "        int i;\n"
+                              "    };\n"
+                              "    (void)cb;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:13]: (style) Unused variable: i [unusedVariable]\n", errout_str());
+
+        functionVariableUsage("void f() {\n" // #9822
+                              "    int i;\n"
+                              "    auto cb = []() {\n"
+                              "        int i;\n"
+                              "    };\n"
+                              "    (void)cb;\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Unused variable: i [unusedVariable]\n"
+                      "[test.cpp:4:13]: (style) Unused variable: i [unusedVariable]\n",
+                      errout_str());
     }
 
 
@@ -6496,7 +6915,7 @@ class TestUnusedVar : public TestFixture {
                               "    m[2] = 2.0;\n"
                               "    for (auto& [k, v] : m) {}\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarCppInitialization() {
@@ -6504,7 +6923,7 @@ class TestUnusedVar : public TestFixture {
                               "    int buf[6];\n"
                               "    Data data(buf);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (information) --check-library: Provide <type-checks><unusedvar> configuration for Data\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:3:14]: (information) --check-library: Provide <type-checks><unusedvar> configuration for Data [checkLibraryCheckType]\n", errout_str());
     }
 
     void localvarCpp11Initialization() {
@@ -6513,17 +6932,17 @@ class TestUnusedVar : public TestFixture {
                               "    int myNewValue{ 3u };\n"
                               "    myManager.theDummyTable.addRow(UnsignedIndexValue{ myNewValue }, DummyRowData{ false });\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "    std::list<std::list<int>>::value_type a{ 1, 2, 3, 4 };\n"
                               "}\n");
-        TODO_ASSERT_EQUALS("", "[test.cpp:2]: (information) --check-library: Provide <type-checks><unusedvar> configuration for std::list::value_type\n", errout.str());
+        TODO_ASSERT_EQUALS("", "[test.cpp:2:44]: (information) --check-library: Provide <type-checks><unusedvar> configuration for std::list::value_type [checkLibraryCheckType]\n", errout_str());
 
         functionVariableUsage("void f(int* p) {\n"
                               "    int* q{ p };\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'q' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:11]: (style) Variable 'q' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void localvarRangeBasedFor() {
@@ -6532,7 +6951,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (auto & e : array)\n"
                               "        e = 0;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarAssignInWhile() {
@@ -6540,15 +6959,15 @@ class TestUnusedVar : public TestFixture {
                               "  int a = 0;\n"
                               "  do {\n"
                               "    dostuff(a);\n"
-                              "  } while((a + = x) < 30);\n"
+                              "  } while((a += x) < 30);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int foo() {\n"
                               "    int var = 1;\n"
                               "    while (var = var >> 1) { }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarTemplate() {
@@ -6557,18 +6976,18 @@ class TestUnusedVar : public TestFixture {
                               "  const int x = 0;\n"
                               "  f<x>();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "  constexpr std::size_t ArraySize(5);\n"
                               "  std::array<int, ArraySize> X; X.dostuff();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n" // #10686
                               "    std::array<int, 1> a;\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: a\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:24]: (style) Unused variable: a [unusedVariable]\n", errout_str());
 
         functionVariableUsage("class A {};\n" // #9471
                               "    namespace std {\n"
@@ -6579,31 +6998,40 @@ class TestUnusedVar : public TestFixture {
                               "    std::string hash = \"-\";\n"
                               "    return hash[0];\n"
                               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        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());
     }
 
     void localvarFuncPtr() {
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void)(x);\n"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'funcPtr' is assigned a value never used.\n", "", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Unused variable: funcPtr\n", errout.str());
+        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"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("int main() {\n"
                               "    void(*funcPtr)(void) = x;\n"
                               "    funcPtr();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarAddr() { // #7747
@@ -6612,14 +7040,14 @@ class TestUnusedVar : public TestFixture {
                               "  dostuff(&x);\n"
                               "  x = 1;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage("void f() {\n"
                               "  int x = 0;\n"
                               "  dostuff(std::ref(x));\n"
                               "  x = 1;\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void localvarDelete() { // #8339
@@ -6633,7 +7061,7 @@ class TestUnusedVar : public TestFixture {
                               ""
                               "    delete [] buf;"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void chainedAssignment() {
@@ -6643,7 +7071,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (int i = 0; i<n; ++i)\n"
                               "        pdD[i] = (sum += pdD[i]);\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void crash1() {
@@ -6663,6 +7091,14 @@ class TestUnusedVar : public TestFixture {
                               "}"); // #4695
     }
 
+    void crash3() {
+        functionVariableUsage("void f(int a, int b, const int* p) {\n" // #12531
+                              "    const int* s[] = { p, p + 1, p + 2 };\n"
+                              "    a = *(s[a] + b);\n"
+                              "}\n");
+        ASSERT_EQUALS("[test.cpp:3:7]: (style) Variable 'a' is assigned a value that is never used. [unreadVariable]\n", errout_str());
+    }
+
     void usingNamespace() {
         functionVariableUsage("int foo() {\n"
                               "   using namespace ::com::sun::star::i18n;\n"
@@ -6676,7 +7112,7 @@ class TestUnusedVar : public TestFixture {
                               "   }\n"
                               "   return j;\n"
                               "}"); // #4585
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void lambdaFunction() {
@@ -6694,7 +7130,7 @@ class TestUnusedVar : public TestFixture {
                               "  do_something();\n"
                               "  do_something();\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
 
         // #4956 - assignment in for_each
@@ -6702,13 +7138,20 @@ class TestUnusedVar : public TestFixture {
                               "  int x = 0;\n"
                               "  std::for_each(ints.begin(), ints.end(), [&x](int i){ dostuff(x); x = i; });\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        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"
                               "}");
-        TODO_ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'x' is assigned a value that is never used.\n", "", errout.str());
+        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"
+                              "}");
+        ASSERT_EQUALS("[test.cpp:3:56]: (style) Unused variable: exprs [unusedVariable]\n", errout_str());
     }
 
     void namespaces() { // #7557
@@ -6726,7 +7169,7 @@ class TestUnusedVar : public TestFixture {
                               "     return value;\n"
                               "  }\n"
                               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void bracesInitCpp11() {
@@ -6736,7 +7179,7 @@ class TestUnusedVar : public TestFixture {
             " const int var{fpUnread++};\n"
             " return var;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void argument() {
@@ -6744,20 +7187,20 @@ class TestUnusedVar : public TestFixture {
             "void fun(Value value) {\n"
             " value[10] = 123;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         functionVariableUsage(
             "void fun(std::string s) {\n"
             " s[10] = 123;\n"
             "}");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 's[10]' is assigned a value that is never used.\n", errout.str());
+        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"
             "}"
             );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // Unknown argument type
         functionVariableUsage(
@@ -6765,7 +7208,7 @@ class TestUnusedVar : public TestFixture {
             "  result = 12;\n"
             "}"
             );
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         {
             // #8914
@@ -6774,15 +7217,15 @@ class TestUnusedVar : public TestFixture {
                 "  result.x = 12;\n"
                 "}"
                 );
-            ASSERT_EQUALS("", errout.str());
+            ASSERT_EQUALS("", errout_str());
 
             functionVariableUsage( // there is no reference type in C
                 "void fun(Date result) {"
                 "  result.x = 12;\n"
                 "}",
-                "test.c"
+                dinit(FunctionVariableUsageOptions, $.cpp = false)
                 );
-            ASSERT_EQUALS("[test.c:1]: (style) Variable 'result.x' is assigned a value that is never used.\n", errout.str());
+            ASSERT_EQUALS("[test.c:1:35]: (style) Variable 'result.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
 
             functionVariableUsage(
                 "struct Date { int x; };\n"
@@ -6790,7 +7233,7 @@ class TestUnusedVar : public TestFixture {
                 "  result.x = 12;\n"
                 "}"
                 );
-            ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'result.x' is assigned a value that is never used.\n", errout.str());
+            ASSERT_EQUALS("[test.cpp:2:35]: (style) Variable 'result.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
         }
 
         // Unknown struct type
@@ -6800,7 +7243,7 @@ class TestUnusedVar : public TestFixture {
             "  foo.x = 123;\n"
             "}"
             );
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'foo.x' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:2:9]: (style) Variable 'foo.x' is assigned a value that is never used. [unreadVariable]\n", errout_str());
     }
 
     void argumentClass() {
@@ -6808,7 +7251,7 @@ class TestUnusedVar : public TestFixture {
             "void foo(std::insert_iterator<C> it) {\n"
             "  it = 123;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void escapeAlias() {
@@ -6823,7 +7266,7 @@ class TestUnusedVar : public TestFixture {
             "            (*pos).second = number;\n"
             "    }\n"
             "};");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void volatileData() {
@@ -6832,7 +7275,7 @@ class TestUnusedVar : public TestFixture {
             "int main() {\n"
             "  (*(volatile struct Data*)0x4200).n = 1;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void globalData() {
@@ -6841,7 +7284,43 @@ class TestUnusedVar : public TestFixture {
             "void f(void) {\n"
             "    ((uint8_t *) (uint16_t)0x1000)[0] = 0x42;\n"
             "}");
-        ASSERT_EQUALS("", errout.str());
+        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());
     }
 };
 
diff --git a/test/testutils.cpp b/test/testutils.cpp
index 6b61634822a..37c1030000d 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-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
@@ -16,14 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "helpers.h"
 #include "fixture.h"
-#include "settings.h"
 #include "utils.h"
 
 #include <cstddef>
 #include <cstdint>
 #include <limits>
+#include <stdexcept>
 #include <string>
 
 class TestUtils : public TestFixture {
@@ -37,6 +36,14 @@ class TestUtils : public TestFixture {
         TEST_CASE(isStringLiteral);
         TEST_CASE(isCharLiteral);
         TEST_CASE(strToInt);
+        TEST_CASE(id_string);
+        TEST_CASE(startsWith);
+        TEST_CASE(trim);
+        TEST_CASE(findAndReplace);
+        TEST_CASE(replaceEscapeSequences);
+        TEST_CASE(splitString);
+        TEST_CASE(as_const);
+        TEST_CASE(memoize);
     }
 
     void isValidGlobPattern() const {
@@ -45,18 +52,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 {
@@ -69,11 +90,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 {
@@ -331,6 +367,202 @@ class TestUtils : public TestFixture {
             ASSERT_EQUALS("out of range (stoull)", err);
         }
     }
+
+    void id_string() const
+    {
+        ASSERT_EQUALS("0", id_string_i(0));
+        ASSERT_EQUALS("f1", id_string_i(0xF1));
+        ASSERT_EQUALS("123", id_string_i(0x123));
+        ASSERT_EQUALS("1230", id_string_i(0x1230));
+        ASSERT_EQUALS(std::string(8,'f'), id_string_i(0xffffffffU));
+        if (sizeof(void*) == 8) {
+            ASSERT_EQUALS(std::string(16,'f'), id_string_i(~0ULL));
+        }
+    }
+
+    void startsWith() const
+    {
+        ASSERT(::startsWith("test", "test"));
+        ASSERT(::startsWith("test2", "test"));
+        ASSERT(::startsWith("test test", "test"));
+        ASSERT(::startsWith("test", "t"));
+        ASSERT(!::startsWith("2test", "test"));
+        ASSERT(!::startsWith("", "test"));
+        ASSERT(!::startsWith("tes", "test"));
+        ASSERT(!::startsWith("2test", "t"));
+        ASSERT(!::startsWith("t", "test"));
+    }
+
+    void trim() const
+    {
+        ASSERT_EQUALS("test", ::trim("test"));
+        ASSERT_EQUALS("test", ::trim(" test"));
+        ASSERT_EQUALS("test", ::trim("test "));
+        ASSERT_EQUALS("test", ::trim(" test "));
+        ASSERT_EQUALS("test", ::trim("  test"));
+        ASSERT_EQUALS("test", ::trim("test  "));
+        ASSERT_EQUALS("test", ::trim("  test  "));
+        ASSERT_EQUALS("test", ::trim("\ttest"));
+        ASSERT_EQUALS("test", ::trim("test\t"));
+        ASSERT_EQUALS("test", ::trim("\ttest\t"));
+        ASSERT_EQUALS("test", ::trim("\t\ttest"));
+        ASSERT_EQUALS("test", ::trim("test\t\t"));
+        ASSERT_EQUALS("test", ::trim("\t\ttest\t\t"));
+        ASSERT_EQUALS("test", ::trim(" \ttest"));
+        ASSERT_EQUALS("test", ::trim("test\t "));
+        ASSERT_EQUALS("test", ::trim(" \ttest\t"));
+        ASSERT_EQUALS("test", ::trim("\t \ttest"));
+        ASSERT_EQUALS("test", ::trim("test\t \t"));
+        ASSERT_EQUALS("test", ::trim("\t \ttest\t \t"));
+
+        ASSERT_EQUALS("test test", ::trim("test test"));
+        ASSERT_EQUALS("test test", ::trim(" test test"));
+        ASSERT_EQUALS("test test", ::trim("test test "));
+        ASSERT_EQUALS("test test", ::trim(" test test "));
+        ASSERT_EQUALS("test\ttest", ::trim(" test\ttest"));
+        ASSERT_EQUALS("test\ttest", ::trim("test\ttest "));
+        ASSERT_EQUALS("test\ttest", ::trim(" test\ttest "));
+
+        ASSERT_EQUALS("test", ::trim("\ntest", "\n"));
+        ASSERT_EQUALS("test", ::trim("test\n", "\n"));
+        ASSERT_EQUALS("test", ::trim("\ntest\n", "\n"));
+    }
+
+    void findAndReplace() const {
+        {
+            std::string s{"test"};
+            ::findAndReplace(s, "test", "tset");
+            ASSERT_EQUALS("tset", s);
+        }
+        {
+            std::string s{"testtest"};
+            ::findAndReplace(s, "test", "tset");
+            ASSERT_EQUALS("tsettset", s);
+        }
+        {
+            std::string s{"1test1test1"};
+            ::findAndReplace(s, "test", "tset");
+            ASSERT_EQUALS("1tset1tset1", s);
+        }
+        {
+            std::string s{"1test1test1"};
+            ::findAndReplace(s, "test", "");
+            ASSERT_EQUALS("111", s);
+        }
+        {
+            std::string s{"111"};
+            ::findAndReplace(s, "test", "tset");
+            ASSERT_EQUALS("111", s);
+        }
+        {
+            std::string s;
+            ::findAndReplace(s, "test", "tset");
+            ASSERT_EQUALS("", s);
+        }
+    }
+
+    void replaceEscapeSequences() const {
+        ASSERT_EQUALS("\x30", ::replaceEscapeSequences("\\x30"));
+        ASSERT_EQUALS("\030", ::replaceEscapeSequences("\\030"));
+        ASSERT_EQUALS("\r", ::replaceEscapeSequences("\\r"));
+        ASSERT_EQUALS("\n", ::replaceEscapeSequences("\\n"));
+        ASSERT_EQUALS("\t", ::replaceEscapeSequences("\\t"));
+        ASSERT_EQUALS("\\", ::replaceEscapeSequences("\\\\"));
+        ASSERT_EQUALS("\"", ::replaceEscapeSequences("\\\""));
+    }
+
+    void splitString() const {
+        {
+            const auto l = ::splitString("test", ',');
+            ASSERT_EQUALS(1, l.size());
+            ASSERT_EQUALS("test", *l.cbegin());
+        }
+        {
+            const auto l = ::splitString("test,test", ';');
+            ASSERT_EQUALS(1, l.size());
+            ASSERT_EQUALS("test,test", *l.cbegin());
+        }
+        {
+            const auto l = ::splitString("test,test", ',');
+            ASSERT_EQUALS(2, l.size());
+            auto it = l.cbegin();
+            ASSERT_EQUALS("test", *it++);
+            ASSERT_EQUALS("test", *it);
+        }
+        {
+            const auto l = ::splitString("test,test,", ',');
+            ASSERT_EQUALS(3, l.size());
+            auto it = l.cbegin();
+            ASSERT_EQUALS("test", *it++);
+            ASSERT_EQUALS("test", *it++);
+            ASSERT_EQUALS("", *it);
+        }
+        {
+            const auto l = ::splitString("test,,test", ',');
+            ASSERT_EQUALS(3, l.size());
+            auto it = l.cbegin();
+            ASSERT_EQUALS("test", *it++);
+            ASSERT_EQUALS("", *it++);
+            ASSERT_EQUALS("test", *it);
+        }
+        {
+            const auto l = ::splitString(",test,test", ',');
+            ASSERT_EQUALS(3, l.size());
+            auto it = l.cbegin();
+            ASSERT_EQUALS("", *it++);
+            ASSERT_EQUALS("test", *it++);
+            ASSERT_EQUALS("test", *it);
+        }
+    }
+
+    void as_const() const {
+        struct C {
+            bool written = false;
+            void f() {
+                written = true;
+            }
+            void f() const {}
+        };
+
+        {
+            C c;
+            c.f();
+            ASSERT(c.written);
+        }
+        {
+            C c;
+            utils::as_const(c).f();
+            ASSERT(!c.written);
+        }
+        {
+            C c;
+            C* cp = &c;
+            cp->f();
+            ASSERT(c.written);
+        }
+        {
+            C c;
+            C* cp = &c;
+            utils::as_const(cp)->f(); // (correctly) calls non-const version
+            ASSERT(c.written);
+        }
+    }
+
+    void memoize() const {
+        int count = 0;
+        auto f = [&count]() {
+            ++count;
+            return count;
+        };
+        const auto callF = utils::memoize([&]() {
+            return f();
+        });
+        ASSERT_EQUALS(0, count);
+        ASSERT_EQUALS(1, callF());
+        ASSERT_EQUALS(1, count);
+        ASSERT_EQUALS(1, callF());
+        ASSERT_EQUALS(1, count);
+    }
 };
 
 REGISTER_TEST(TestUtils)
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
index b4307c32d6e..36e1d2cb038 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-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
@@ -16,15 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "checkvaarg.h"
 #include "errortypes.h"
-#include "settings.h"
 #include "fixture.h"
-#include "tokenize.h"
+#include "helpers.h"
+#include "settings.h"
 
-#include <list>
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 
 class TestVaarg : public TestFixture {
 public:
@@ -33,21 +31,19 @@ class TestVaarg : public TestFixture {
 private:
     const Settings settings = settingsBuilder().severity(Severity::warning).build();
 
-#define check(code) check_(code, __FILE__, __LINE__)
-    void check_(const char code[], const char* file, int line) {
-        // Clear the error buffer..
-        errout.str("");
-
+#define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void check_(const char* file, int line, const char (&code)[size]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check..
-        runChecks<CheckVaarg>(&tokenizer, &settings, this);
+        runChecks<CheckVaarg>(tokenizer, this);
     }
 
     void run() override {
+        mNewTemplate = true;
         TEST_CASE(wrongParameterTo_va_start);
         TEST_CASE(referenceAs_va_start);
         TEST_CASE(va_end_missing);
@@ -62,21 +58,21 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szFormat);\n"
               "    va_end(arg_ptr);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) 'szFormat' given to va_start() is not last named argument of the function. Did you intend to pass 'nSize'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (warning) 'szBuffer' given to va_start() is not last named argument of the function. Did you intend to pass 'nSize'?\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("int main(int argc, char *argv[]) {\n"
               "    long(^addthem)(const char *, ...) = ^long(const char *format, ...) {\n"
@@ -85,14 +81,14 @@ class TestVaarg : public TestFixture {
               "        c = va_arg(argp, int);\n"
               "    };\n"
               "}"); // Don't crash (#6032)
-        ASSERT_EQUALS("[test.cpp:6]: (error) va_list 'argp' was opened but not closed by va_end().\n", errout.str());
+        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.
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void assertf_fail(const char *assertion, const char *file, int line, const char *func, const char* msg, ...) {\n"
               "    struct A {\n"
@@ -104,7 +100,7 @@ class TestVaarg : public TestFixture {
               "        }\n"
               "    };\n"
               "}"); // Inner class (#6453)
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void referenceAs_va_start() {
@@ -113,14 +109,14 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) Using reference 'szBuffer' as parameter for va_start() results in undefined behaviour.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void va_end_missing() {
@@ -129,7 +125,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6186
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
@@ -141,13 +137,13 @@ class TestVaarg : public TestFixture {
               "        va_end(arg_ptr);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void Format(char* szFormat, char (*szBuffer)[_Size], ...) {\n"
               "    va_list arg_ptr;\n"
               "    va_start(arg_ptr, szBuffer);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) va_list 'arg_ptr' was opened but not closed by va_end().\n", errout.str());
+        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"
               "    va_list arg_ptr;\n"
@@ -155,7 +151,7 @@ class TestVaarg : public TestFixture {
               "    if(sth) return;\n"
               "    va_end(arg_ptr);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) va_list 'arg_ptr' was opened but not closed by va_end().\n", errout.str());
+        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
         check("void f(int n, ...)\n"
@@ -169,7 +165,7 @@ class TestVaarg : public TestFixture {
               "    });\n"
               "    va_end(ap);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(int n, ...)\n"
               "{\n"
@@ -181,7 +177,7 @@ class TestVaarg : public TestFixture {
               "        return va_arg(ap, const char*);\n"
               "    });\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:10]: (error) va_list 'ap' was opened but not closed by va_end().\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:10:1]: (error) va_list 'ap' was opened but not closed by va_end(). [va_end_missing]\n", errout_str());
     }
 
     void va_list_usedBeforeStarted() {
@@ -189,19 +185,19 @@ class TestVaarg : public TestFixture {
               "    va_list arg_ptr;\n"
               "    return va_arg(arg_ptr, float);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) va_list 'arg_ptr' used before va_start() was called.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) va_list 'arg_ptr' used before va_start() was called.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) va_list 'arg_ptr' used before va_start() was called.\n", errout.str());
+        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"
               "    va_list arg_ptr;\n"
@@ -209,13 +205,13 @@ class TestVaarg : public TestFixture {
               "    va_end(arg_ptr);\n"
               "    return va_arg(arg_ptr, float);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (error) va_list 'arg_ptr' used before va_start() was called.\n", errout.str());
+        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"
               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (error) va_list 'arg_ptr' used before va_start() was called.\n", errout.str());
+        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"
@@ -226,7 +222,7 @@ class TestVaarg : public TestFixture {
               "    foo(va_arg(arg_ptr, float));\n"
               "    va_end(arg_ptr);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #6066
         check("void Format(va_list v1) {\n"
@@ -235,7 +231,7 @@ class TestVaarg : public TestFixture {
               "    foo(va_arg(v1, float));\n"
               "    va_end(v2);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7527
         check("void foo(int flag1, int flag2, ...) {\n"
@@ -251,7 +247,7 @@ class TestVaarg : public TestFixture {
               "        va_end(vargs);\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7533
         check("void action_push(int type, ...) {\n"
@@ -267,7 +263,7 @@ class TestVaarg : public TestFixture {
               "    }\n"
               "    va_end(args);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void action_push(int type, ...) {\n"
               "    va_list args;\n"
@@ -283,7 +279,7 @@ class TestVaarg : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void action_push(int type, ...) {\n"
               "    va_list args;\n"
@@ -298,7 +294,7 @@ class TestVaarg : public TestFixture {
               "        break;\n"
               "    }\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:13]: (error) va_list 'args' was opened but not closed by va_end().\n", errout.str());
+        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
         check("void redisvFormatCommand(char *format, va_list ap, bool flag) {\n"
@@ -313,7 +309,7 @@ class TestVaarg : public TestFixture {
               "    va_end(_cpy);\n"
               "format_err:\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void va_start_subsequentCalls() {
@@ -323,7 +319,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) va_start() or va_copy() called subsequently on 'arg_ptr' without va_end() in between.\n", errout.str());
+        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"
               "    va_list vl1;\n"
@@ -331,7 +327,7 @@ class TestVaarg : public TestFixture {
               "    va_copy(vl1, vl1);\n"
               "    va_end(vl1);\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (error) va_start() or va_copy() called subsequently on 'vl1' without va_end() in between.\n", errout.str());
+        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"
               "    va_list arg_ptr;\n"
@@ -340,7 +336,7 @@ class TestVaarg : public TestFixture {
               "    va_start(arg_ptr, szBuffer);\n"
               "    va_end(arg_ptr);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void unknownFunctionScope() {
@@ -349,7 +345,7 @@ class TestVaarg : public TestFixture {
               "  va_start(args,f);\n"
               "  BG_TString result(f);\n"
               "}");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         // #7559
         check("void mowgli_object_message_broadcast(mowgli_object_t *self, const char *name, ...) {\n"
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 0115c58487d..79ad6e45b30 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-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
@@ -16,13 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "library.h"
+#include "errortypes.h"
+#include "fixture.h"
+#include "helpers.h"
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
-#include "fixture.h"
+#include "standards.h"
 #include "token.h"
-#include "tokenize.h"
 #include "vfvalue.h"
 
 #include <algorithm>
@@ -32,33 +33,31 @@
 #include <cstring>
 #include <functional>
 #include <list>
-#include <map>
 #include <set>
 #include <sstream>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include <simplecpp.h>
-
 class TestValueFlow : public TestFixture {
 public:
     TestValueFlow() : TestFixture("TestValueFlow") {}
 
 private:
-    Settings settings = settingsBuilder().library("std.cfg").build();
+    /*const*/ Settings settings = settingsBuilder().library("std.cfg").build();
 
     void run() override {
         // strcpy, abort cfg
-        const 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>";
-        ASSERT_EQUALS(true, settings.library.loadxmldata(cfg, sizeof(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);
         TEST_CASE(valueFlowString);
+        TEST_CASE(valueFlowTypeTraits);
         TEST_CASE(valueFlowPointerAlias);
         TEST_CASE(valueFlowLifetime);
         TEST_CASE(valueFlowArrayElement);
@@ -78,10 +77,14 @@ class TestValueFlow : public TestFixture {
         TEST_CASE(valueFlowBeforeConditionAssignIncDec);
         TEST_CASE(valueFlowBeforeConditionFunctionCall);
         TEST_CASE(valueFlowBeforeConditionGlobalVariables);
+        mNewTemplate = false;
         TEST_CASE(valueFlowBeforeConditionGoto);
+        mNewTemplate = true;
         TEST_CASE(valueFlowBeforeConditionIfElse);
         TEST_CASE(valueFlowBeforeConditionLoop);
+        mNewTemplate = false;
         TEST_CASE(valueFlowBeforeConditionMacro);
+        mNewTemplate = true;
         TEST_CASE(valueFlowBeforeConditionSizeof);
         TEST_CASE(valueFlowBeforeConditionSwitch);
         TEST_CASE(valueFlowBeforeConditionTernaryOp);
@@ -140,6 +143,8 @@ class TestValueFlow : public TestFixture {
 
         TEST_CASE(valueFlowSafeFunctionParameterValues);
         TEST_CASE(valueFlowUnknownFunctionReturn);
+        TEST_CASE(valueFlowUnknownFunctionReturnRand);
+        TEST_CASE(valueFlowUnknownFunctionReturnMalloc);
 
         TEST_CASE(valueFlowPointerAliasDeref);
 
@@ -154,16 +159,26 @@ class TestValueFlow : public TestFixture {
         TEST_CASE(valueFlowIdempotent);
         TEST_CASE(valueFlowUnsigned);
         TEST_CASE(valueFlowMod);
+        TEST_CASE(valueFlowIncDec);
         TEST_CASE(valueFlowNotNull);
         TEST_CASE(valueFlowSymbolic);
         TEST_CASE(valueFlowSymbolicIdentity);
         TEST_CASE(valueFlowSymbolicStrlen);
         TEST_CASE(valueFlowSmartPointer);
         TEST_CASE(valueFlowImpossibleMinMax);
+        TEST_CASE(valueFlowImpossibleIncDec);
         TEST_CASE(valueFlowImpossibleUnknownConstant);
         TEST_CASE(valueFlowContainerEqual);
 
+        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) {
@@ -198,9 +213,8 @@ class TestValueFlow : public TestFixture {
 #define testValueOfXKnown(...) testValueOfXKnown_(__FILE__, __LINE__, __VA_ARGS__)
     bool testValueOfXKnown_(const char* file, int line, const char code[], unsigned int linenr, int value) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -220,9 +234,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfXKnown_(const char* file, int line, const char code[], unsigned int linenr, const std::string& expr, int value) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token* tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -243,9 +256,8 @@ class TestValueFlow : public TestFixture {
 #define testValueOfXImpossible(...) testValueOfXImpossible_(__FILE__, __LINE__, __VA_ARGS__)
     bool testValueOfXImpossible_(const char* file, int line, const char code[], unsigned int linenr, int value) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -266,9 +278,8 @@ class TestValueFlow : public TestFixture {
     bool testValueOfXImpossible_(const char* file, int line, const char code[], unsigned int linenr, const std::string& expr, int value)
     {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token* tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -286,12 +297,11 @@ 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..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -314,9 +324,8 @@ class TestValueFlow : public TestFixture {
         const Settings *settings1 = s ? s : &settings;
 
         // Tokenize..
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(*settings1, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -333,9 +342,8 @@ class TestValueFlow : public TestFixture {
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, const std::string& expr, int value)
     {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token* tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -349,11 +357,10 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, float value, float diff) {
+    bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, double value, double diff) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -367,12 +374,11 @@ 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..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() != "x" || tok->linenr() != linenr)
@@ -380,7 +386,7 @@ class TestValueFlow : public TestFixture {
 
             std::ostringstream ostr;
             for (const ValueFlow::Value &v : tok->values()) {
-                for (const ValueFlow::Value::ErrorPathItem &ep : v.errorPath) {
+                for (const ErrorPathItem &ep : v.errorPath) {
                     const Token *eptok = ep.first;
                     const std::string &msg = ep.second;
                     ostr << eptok->linenr() << ',' << msg << '\n';
@@ -394,9 +400,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, const char value[], ValueFlow::Value::ValueType type) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         const std::size_t len = strlen(value);
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -412,17 +417,17 @@ class TestValueFlow : public TestFixture {
     }
 
 #define testLifetimeOfX(...) testLifetimeOfX_(__FILE__, __LINE__, __VA_ARGS__)
-    bool testLifetimeOfX_(const char* file, int line, const char code[], unsigned int linenr, const char value[], ValueFlow::Value::LifetimeScope lifetimeScope = ValueFlow::Value::LifetimeScope::Local) {
+    template<size_t size>
+    bool testLifetimeOfX_(const char* file, int line, const char (&code)[size], unsigned int linenr, const char value[]) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         const std::size_t len = strlen(value);
         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;
             }
@@ -433,9 +438,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, int value, ValueFlow::Value::ValueType type) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -451,9 +455,8 @@ class TestValueFlow : public TestFixture {
 
     bool testValueOfX_(const char* file, int line, const char code[], unsigned int linenr, ValueFlow::Value::MoveKind moveKind) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -467,12 +470,12 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-#define testConditionalValueOfX(code, linenr, value) testConditionalValueOfX_(code, linenr, value, __FILE__, __LINE__)
-    bool testConditionalValueOfX_(const char code[], unsigned int linenr, int value, const char* file, int line) {
+#define testConditionalValueOfX(...) testConditionalValueOfX_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    bool testConditionalValueOfX_(const char* file, int line, const char (&code)[size], unsigned int linenr, int value) {
         // Tokenize..
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
             if (tok->str() == "x" && tok->linenr() == linenr) {
@@ -486,36 +489,27 @@ class TestValueFlow : public TestFixture {
         return false;
     }
 
-    void bailout(const char code[]) {
+#define bailout(...) bailout_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    void bailout_(const char* file, int line, const char (&code)[size]) {
         const Settings s = settingsBuilder().debugwarnings().build();
-        errout.str("");
 
-        std::vector<std::string> files(1, "test.cpp");
-        std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
-
-        simplecpp::TokenList tokens2(files);
-        std::map<std::string, simplecpp::TokenList*> filedata;
-        simplecpp::preprocess(tokens2, tokens1, files, filedata, simplecpp::DUI());
+        SimpleTokenizer2 tokenizer(s, *this, code, "test.cpp");
 
         // Tokenize..
-        Tokenizer tokenizer(&s, this);
-        tokenizer.createTokens(std::move(tokens2));
-        tokenizer.simplifyTokens1("");
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
     }
 
 #define tokenValues(...) tokenValues_(__FILE__, __LINE__, __VA_ARGS__)
-    std::list<ValueFlow::Value> tokenValues_(const char* file, int line, const char code[], const char tokstr[], const Settings *s = nullptr) {
-        Tokenizer tokenizer(s ? s : &settings, this);
-        std::istringstream istr(code);
-        errout.str("");
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+    std::list<ValueFlow::Value> tokenValues_(const char* file, int line, const char code[], const char tokstr[], const Settings *s = nullptr, bool cpp = true) {
+        SimpleTokenizer tokenizer(s ? *s : settings, *this, cpp);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token *tok = Token::findmatch(tokenizer.tokens(), tokstr);
         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;
         });
@@ -523,12 +517,11 @@ class TestValueFlow : public TestFixture {
     }
 
 #define lifetimeValues(...) lifetimeValues_(__FILE__, __LINE__, __VA_ARGS__)
-    std::vector<std::string> lifetimeValues_(const char* file, int line, const char code[], const char tokstr[], const Settings *s = nullptr) {
+    template<size_t size>
+    std::vector<std::string> lifetimeValues_(const char* file, int line, const char (&code)[size], const char tokstr[]) {
         std::vector<std::string> result;
-        Tokenizer tokenizer(s ? s : &settings, this);
-        std::istringstream istr(code);
-        errout.str("");
-        ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
+        SimpleTokenizer tokenizer(settings, *this);
+        ASSERT_LOC(tokenizer.tokenize(code), file, line);
         const Token *tok = Token::findmatch(tokenizer.tokens(), tokstr);
         if (!tok)
             return result;
@@ -542,12 +535,25 @@ class TestValueFlow : public TestFixture {
         return result;
     }
 
-#define valueOfTok(code, tokstr) valueOfTok_(code, tokstr, __FILE__, __LINE__)
-    ValueFlow::Value valueOfTok_(const char code[], const char tokstr[], const char* file, int line) {
-        std::list<ValueFlow::Value> values = removeImpossible(tokenValues_(file, line, code, tokstr));
+#define valueOfTok(...) valueOfTok_(__FILE__, __LINE__, __VA_ARGS__)
+    ValueFlow::Value valueOfTok_(const char* file, int line, const char code[], const char tokstr[], const Settings *s = nullptr, bool cpp = true) {
+        std::list<ValueFlow::Value> values = removeImpossible(tokenValues_(file, line, code, tokstr, s, cpp));
         return values.size() == 1U && !values.front().isTokValue() ? values.front() : ValueFlow::Value();
     }
 
+#define testKnownValueOfTok(...) testKnownValueOfTok_(__FILE__, __LINE__, __VA_ARGS__)
+    bool testKnownValueOfTok_(const char* file,
+                              int line,
+                              const char code[],
+                              const char tokstr[],
+                              int value)
+    {
+        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;
+        });
+    }
+
     static std::list<ValueFlow::Value> removeSymbolicTok(std::list<ValueFlow::Value> values)
     {
         values.remove_if([](const ValueFlow::Value& v) {
@@ -565,23 +571,33 @@ 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.5f) < 0.1f);
+        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((int)('a'), valueOfTok("x='a';", "'a'").intvalue);
-        ASSERT_EQUALS((int)('\n'), valueOfTok("x='\\n';", "'\\n'").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);
 
+        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);
+
+        const Settings settingsC17 = settingsBuilder().c(Standards::C17).build();
+        ASSERT(!valueOfTok("x=true;", "true", &settingsC17, false).isKnown());
+        ASSERT(!valueOfTok("x=false;", "false", &settingsC17, false).isKnown());
+
         // scope
         {
             const char code[] = "namespace N { enum E {e0,e1}; }\n"
                                 "void foo() { x = N::e1; }";
             ASSERT_EQUALS(1, valueOfTok(code, "::").intvalue);
         }
+
+        ASSERT_EQUALS(63, valueOfTok("x = 3 * uint32_t{21};", "*").intvalue);
     }
 
     void valueFlowString() {
@@ -604,6 +620,136 @@ class TestValueFlow : public TestFixture {
         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));
+
+        // 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));
+
+        // 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));
+
+        // 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));
+
+        // 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));
+
+        {
+            const char* code;
+            code = "void bar();\n"
+                   "void foo() { std::is_void<decltype(bar())>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "int bar();\n"
+                   "void foo() { std::is_void<decltype(bar())>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "void bar();\n"
+                   "void foo() { std::is_void<decltype(bar)>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "class A;\n"
+                   "void foo() { std::is_lvalue_reference<A>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "class A;\n"
+                   "void foo() { std::is_lvalue_reference<A&>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "class A;\n"
+                   "void foo() { std::is_lvalue_reference<A&&>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "class A;\n"
+                   "void foo() { std::is_rvalue_reference<A>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "class A;\n"
+                   "void foo() { std::is_rvalue_reference<A&>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "class A;\n"
+                   "void foo() { std::is_rvalue_reference<A&&>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "class A;\n"
+                   "void foo() { std::is_reference<A>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "class A;\n"
+                   "void foo() { std::is_reference<A&>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "class A;\n"
+                   "void foo() { std::is_reference<A&&>::value; }";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "void foo() {\n"
+                   "    int bar;\n"
+                   "    std::is_void<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "void foo(int bar) {\n"
+                   "    std::is_lvalue_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "void foo(int& bar) {\n"
+                   "    std::is_lvalue_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "void foo(int&& bar) {\n"
+                   "    std::is_lvalue_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "void foo(int bar) {\n"
+                   "    std::is_rvalue_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "void foo(int& bar) {\n"
+                   "    std::is_rvalue_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "void foo(int&& bar) {\n"
+                   "    std::is_rvalue_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "void foo(int bar) {\n"
+                   "    std::is_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 0));
+
+            code = "void foo(int& bar) {\n"
+                   "    std::is_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+
+            code = "void foo(int&& bar) {\n"
+                   "    std::is_reference<decltype(bar)>::value;\n"
+                   "}\n";
+            ASSERT_EQUALS(true, testKnownValueOfTok(code, ":: value", 1));
+        }
+    }
+
     void valueFlowPointerAlias() {
         const char *code;
         std::list<ValueFlow::Value> values;
@@ -638,100 +784,130 @@ class TestValueFlow : public TestFixture {
     }
 
     void valueFlowLifetime() {
-        const char *code;
         std::vector<std::string> lifetimes;
 
-        LOAD_LIB_2(settings.library, "std.cfg");
+        {
+            const char code[] = "void f() {\n"
+                                "    int a = 1;\n"
+                                "    auto x = [&]() { return a + 1; };\n"
+                                "    auto b = x;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "a + 1"));
+        }
 
-        code  = "void f() {\n"
-                "    int a = 1;\n"
-                "    auto x = [&]() { return a + 1; };\n"
-                "    auto b = x;\n"
-                "}\n";
-        ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "a + 1"));
+        {
+            const char code[] = "void f() {\n"
+                                "    int a = 1;\n"
+                                "    auto x = [=]() { return a + 1; };\n"
+                                "    auto b = x;\n"
+                                "}\n";
+            ASSERT_EQUALS(false, testLifetimeOfX(code, 4, "a ;"));
+        }
 
-        code  = "void f() {\n"
-                "    int a = 1;\n"
-                "    auto x = [=]() { return a + 1; };\n"
-                "    auto b = x;\n"
-                "}\n";
-        ASSERT_EQUALS(false, testLifetimeOfX(code, 4, "a ;"));
+        {
+            const char code[] = "void f(int v) {\n"
+                                "    int a = v;\n"
+                                "    int * p = &a;\n"
+                                "    auto x = [=]() { return p + 1; };\n"
+                                "    auto b = x;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testLifetimeOfX(code, 5, "a ;"));
+        }
 
-        code  = "void f(int v) {\n"
-                "    int a = v;\n"
-                "    int * p = &a;\n"
-                "    auto x = [=]() { return p + 1; };\n"
-                "    auto b = x;\n"
-                "}\n";
-        ASSERT_EQUALS(true, testLifetimeOfX(code, 5, "a ;"));
+        {
+            const char code[] = "void f() {\n"
+                                "    std::vector<int> v;\n"
+                                "    auto x = v.begin();\n"
+                                "    auto it = x;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . begin"));
+        }
 
-        code  = "void f() {\n"
-                "    std::vector<int> v;\n"
-                "    auto x = v.begin();\n"
-                "    auto it = x;\n"
-                "}\n";
-        ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . begin"));
+        {
+            const char code[] = "void f() {\n"
+                                "    std::vector<int> v;\n"
+                                "    auto x = v.begin() + 1;\n"
+                                "    auto it = x;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . begin"));
+        }
 
-        code  = "void f() {\n"
-                "    std::vector<int> v;\n"
-                "    auto x = v.begin() + 1;\n"
-                "    auto it = x;\n"
-                "}\n";
-        ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . begin"));
+        {
+            const char code[] = "int* f() {\n"
+                                "    std::vector<int> v;\n"
+                                "    int * x = v.data();\n"
+                                "    return x;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . data"));
+        }
 
-        code  = "int* f() {\n"
-                "    std::vector<int> v;\n"
-                "    int * x = v.data();\n"
-                "    return x;\n"
-                "}\n";
-        ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . data"));
+        {
+            const char code[] = "int* f() {\n"
+                                "    std::vector<int> v;\n"
+                                "    int * x = v.data() + 1;\n"
+                                "    return x;\n"
+                                "}\n";
+            ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . data"));
+        }
 
-        code  = "int* f() {\n"
-                "    std::vector<int> v;\n"
-                "    int * x = v.data() + 1;\n"
-                "    return x;\n"
-                "}\n";
-        ASSERT_EQUALS(true, testLifetimeOfX(code, 4, "v . data"));
+        {
+            const char code[] = "int f(int* a) {\n"
+                                "    int **p = &a;\n"
+                                "    int * x = *p;\n"
+                                "    return x; \n"
+                                "}\n";
+            ASSERT_EQUALS(false, testLifetimeOfX(code, 4, "a"));
+        }
 
-        code  = "int f(int* a) {\n"
-                "    int **p = &a;\n"
-                "    int * x = *p;\n"
-                "    return x; \n"
-                "}\n";
-        ASSERT_EQUALS(false, testLifetimeOfX(code, 4, "a"));
+        {
+            const char code[] = "void f() {\n"
+                                "    int i = 0;\n"
+                                "    void* x = (void*)&i;\n"
+                                "}\n";
+            lifetimes = lifetimeValues(code, "( void * )");
+            ASSERT_EQUALS(true, lifetimes.size() == 1);
+            ASSERT_EQUALS(true, lifetimes.front() == "i");
+        }
 
-        code  = "void f() {\n"
-                "    int i = 0;\n"
-                "    void* x = (void*)&i;\n"
-                "}\n";
-        lifetimes = lifetimeValues(code, "( void * )");
-        ASSERT_EQUALS(true, lifetimes.size() == 1);
-        ASSERT_EQUALS(true, lifetimes.front() == "i");
-
-        code  = "struct T {\n" // #10810
-                "    static int g() { return 0; }\n"
-                "};\n"
-                "T t;\n"
-                "struct S { int i; };\n"
-                "S f() {\n"
-                "    S s = { decltype(t)::g() };\n"
-                "    return s;\n"
-                "};\n";
-        lifetimes = lifetimeValues(code, "=");
-        ASSERT_EQUALS(true, lifetimes.empty());
-
-        code  = "struct T {\n" // #10838
-                "     void f();\n"
-                "     double d[4][4];\n"
-                "};\n"
-                "void T::f() {\n"
-                "    auto g = [this]() -> double(&)[4] {\n"
-                "        double(&q)[4] = d[0];\n"
-                "        return q;\n"
-                "    };\n"
-                "}\n";
-        lifetimes = lifetimeValues(code, "return"); // don't crash
-        ASSERT_EQUALS(true, lifetimes.empty());
+        {
+            const char code[] = "struct T {\n" // #10810
+                                "    static int g() { return 0; }\n"
+                                "};\n"
+                                "T t;\n"
+                                "struct S { int i; };\n"
+                                "S f() {\n"
+                                "    S s = { decltype(t)::g() };\n"
+                                "    return s;\n"
+                                "};\n";
+            lifetimes = lifetimeValues(code, "=");
+            ASSERT_EQUALS(true, lifetimes.empty());
+        }
+
+        {
+            const char code[] = "struct T {\n" // #10838
+                                "     void f();\n"
+                                "     double d[4][4];\n"
+                                "};\n"
+                                "void T::f() {\n"
+                                "    auto g = [this]() -> double(&)[4] {\n"
+                                "        double(&q)[4] = d[0];\n"
+                                "        return q;\n"
+                                "    };\n"
+                                "}\n";
+            lifetimes = lifetimeValues(code, "return"); // don't crash
+            ASSERT_EQUALS(true, lifetimes.empty());
+        }
+
+        {
+            const char code[] = "void f() {\n" // #13076
+                                "    char a[10];\n"
+                                "    struct S s = { sizeof(a), 0 };\n"
+                                "    s.p = a;\n"
+                                "}\n";
+            lifetimes = lifetimeValues(code, "= a");
+            ASSERT_EQUALS(true, lifetimes.size() == 1);
+            ASSERT_EQUALS(true, lifetimes.front() == "a");
+        }
     }
 
     void valueFlowArrayElement() {
@@ -766,7 +942,7 @@ class TestValueFlow : public TestFixture {
                 "    const char *x = \"abcd\";\n"
                 "    return x[0];\n"
                 "}";
-        ASSERT_EQUALS((int)('a'), valueOfTok(code, "[").intvalue);
+        ASSERT_EQUALS(static_cast<int>('a'), valueOfTok(code, "[").intvalue);
 
         code  = "char f() {\n"
                 "    const char *x = \"\";\n"
@@ -884,6 +1060,23 @@ class TestValueFlow : public TestFixture {
                "   y=x;\n"
                "}";
         ASSERT_EQUALS(false, testValueOfX(code, 3U, ValueFlow::Value::MoveKind::MovedVariable));
+
+        code = "void g(std::string);\n"
+               "void foo(std::string x) {\n"
+               "  g(std::move(x));\n"
+               "  int counter = 0;\n"
+               "\n"
+               "  for (int i = 0; i < 5; i++) {\n"
+               "    if (i % 2 == 0) {\n"
+               "      x = std::to_string(i);\n"
+               "      counter++;\n"
+               "    }\n"
+               "  }\n"
+               "  for (int i = 0; i < counter; i++) {\n"
+               "      if(x > 5) {}\n"
+               "  }\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 13U, ValueFlow::Value::MoveKind::MovedVariable));
     }
 
     void valueFlowCalculations() {
@@ -912,13 +1105,35 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(10, valueOfTok("x = static_cast<int>(10);", "( 10 )").intvalue);
         ASSERT_EQUALS(0, valueOfTok("x = sizeof (struct {int a;}) * 0;", "*").intvalue);
 
-        // Don't calculate if there is UB
+        // 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
 
         code = "float f(const uint16_t& value) {\n"
                "    const uint16_t uVal = value; \n"
@@ -1001,7 +1216,6 @@ class TestValueFlow : public TestFixture {
 
         // ~
         code  = "x = ~0U;";
-        PLATFORM(settings.platform, cppcheck::Platform::Type::Native); // ensure platform is native
         values = tokenValues(code,"~");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(~0U, values.back().intvalue);
@@ -1122,7 +1336,7 @@ class TestValueFlow : public TestFixture {
                 "auto operator<=>(const X & a, const X & b) -> decltype(1 <=> 2) {\n"
                 "    return std::strong_ordering::less;\n"
                 "}\n";
-        tokenValues(code, "<=>"); // don't throw
+        ASSERT_NO_THROW(tokenValues(code, "<=>"));
 
         // Comparison of string
         values = removeImpossible(tokenValues("f(\"xyz\" == \"xyz\");", "==")); // implementation defined
@@ -1197,10 +1411,10 @@ class TestValueFlow : public TestFixture {
 
         // string/char literals
         CHECK("\"asdf\"", 5);
-        CHECK("L\"asdf\"", 5 * settings.platform.sizeof_wchar_t);
+        CHECK("L\"asdf\"", 5LL * settings.platform.sizeof_wchar_t);
         CHECK("u8\"asdf\"", 5); // char8_t
-        CHECK("u\"asdf\"", 5 * 2); // char16_t
-        CHECK("U\"asdf\"", 5 * 4); // char32_t
+        CHECK("u\"asdf\"", 5LL * 2); // char16_t
+        CHECK("U\"asdf\"", 5LL * 4); // char32_t
         CHECK("'a'", 1U);
         CHECK("'ab'", settings.platform.sizeof_int);
         CHECK("L'a'", settings.platform.sizeof_wchar_t);
@@ -1312,7 +1526,7 @@ class TestValueFlow : public TestFixture {
                "}";                                   \
         values = tokenValues(code,"( arrE )");        \
         ASSERT_EQUALS(1U, values.size());             \
-        ASSERT_EQUALS(B * 2U, values.back().intvalue); \
+        ASSERT_EQUALS(B * 2ULL, values.back().intvalue); \
     } while (false)
 
         // enum array
@@ -1347,7 +1561,7 @@ class TestValueFlow : public TestFixture {
                "}";                                   \
         values = tokenValues(code,"( arrE )");        \
         ASSERT_EQUALS(1U, values.size());             \
-        ASSERT_EQUALS(B * 2U, values.back().intvalue); \
+        ASSERT_EQUALS(B * 2ULL, values.back().intvalue); \
     } while (false)
 
         // enum array
@@ -1383,6 +1597,151 @@ class TestValueFlow : public TestFixture {
         values = tokenValues(code, "=");
         ASSERT_EQUALS(1U, values.size());
         ASSERT_EQUALS(sizeof(std::int32_t) * 10 * 20, values.back().intvalue);
+
+        code = "struct X { float a; float b; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "}";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(8, values.back().intvalue);
+
+        code = "struct X { char a; char b; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "}";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(2, values.back().intvalue);
+
+        code = "struct X { char a; float b; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "}";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(8, values.back().intvalue);
+
+        code = "struct X { char a; char b; float c; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "}";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(8, values.back().intvalue);
+
+        code = "struct X { float a; char b; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "}";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(8, values.back().intvalue);
+
+        code = "struct X { float a; char b; char c; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\n"
+               "}";
+        values = tokenValues(code, "( X )");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(8, values.back().intvalue);
+
+        code = "struct A { float a; char b; };\n"
+               "struct X { A a; char b; };\n"
+               "void f() {\n"
+               "    x = sizeof(X);\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"
+               "}";
+        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"
+               "}";
+        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"
+               "void f() {\n"
+               "    sizeof(T) == sizeof(void*);\n"
+               "}\n";
+        values = tokenValues(code, "==");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(1LL, values.back().intvalue);
+
+        code = "struct S { int32_t a[2][10] };\n" // #12479
+               "void f() {\n"
+               "    x = sizeof(S);\n"
+               "}\n";
+        values = tokenValues(code, "=");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(4LL * 2 * 10, values.back().intvalue);
+
+        code = "struct S {\n"
+               "    int a[10];\n"
+               "    int b[20];\n"
+               "    int c[30];\n"
+               "};\n"
+               "void f() {\n"
+               "    x = sizeof(S);\n"
+               "}\n";
+        values = tokenValues(code, "=");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(4LL * (10 + 20 + 30), values.back().intvalue);
+
+        code = "struct S {\n"
+               "    char c;\n"
+               "    int a[4];\n"
+               "};\n"
+               "void f() {\n"
+               "    x = sizeof(S);\n"
+               "}\n";
+        values = tokenValues(code, "=");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(4LL * 5, values.back().intvalue);
+
+        // #13734
+        code = "void f() {\n"
+               "    int a[N + 1];"
+               "    x = sizeof(a) / sizeof(a[0]);\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"
+               "}";
+        values = tokenValues(code, "( D )");
+        ASSERT_EQUALS(1U, values.size());
+        TODO_ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, 1, values.back().intvalue);
     }
 
     void valueFlowComma()
@@ -1466,7 +1825,7 @@ class TestValueFlow : public TestFixture {
                "    int a = x;\n"
                "    if (x >= 1) {}\n"
                "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 2U, 1));
+        TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 2U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 0));
 
         code = "void f(unsigned int x) {\n"
@@ -1579,9 +1938,9 @@ class TestValueFlow : public TestFixture {
                 "    x = y;\n"
                 "    if (x == 123) {}\n"
                 "}");
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:2]: (debug) valueflow.cpp::valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y\n",
-            errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:9]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void valueFlowBeforeConditionAndAndOrOrGuard() { // guarding by &&
@@ -1695,6 +2054,23 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "}";
         ASSERT_EQUALS(false, testValueOfX(code, 2U, 0));
+
+        code = "struct S {\n" // #12848
+               "    S* next;\n"
+               "    int a;\n"
+               "};\n"
+               "void f(S* x, int i) {\n"
+               "    while (x) {\n"
+               "        if (x->a == 0) {\n"
+               "            x = x->next;\n"
+               "            continue;\n"
+               "        }\n"
+               "        if (i == 0)\n"
+               "            break;\n"
+               "        x->a = i--;\n"
+               "    }\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 13U, 0));
     }
 
     void valueFlowBeforeConditionTernaryOp() { // bailout: ?:
@@ -1703,9 +2079,9 @@ class TestValueFlow : public TestFixture {
         bailout("void f(int x) {\n"
                 "    y = ((x<0) ? x : ((x==2)?3:4));\n"
                 "}");
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:2]: (debug) valueflow.cpp::valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y\n",
-            errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:5]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable y [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
 
         bailout("int f(int x) {\n"
                 "  int r = x ? 1 / x : 0;\n"
@@ -1768,9 +2144,9 @@ class TestValueFlow : public TestFixture {
                 "    if (x != 123) { b = x; }\n"
                 "    if (x == 123) {}\n"
                 "}");
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:2]: (debug) valueflow.cpp::valueFlowConditionExpressions bailout: Skipping function due to incomplete variable b\n",
-            errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:2:21]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable b [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
 
         code = "void f(int x, bool abc) {\n"
                "  a = x;\n"
@@ -1817,9 +2193,9 @@ class TestValueFlow : public TestFixture {
                 "    case 2: if (x==5) {} break;\n"
                 "    };\n"
                 "}");
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:3]: (debug) valueflow.cpp::valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n",
-            errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
 
         bailout("void f(int x, int y) {\n"
                 "    switch (y) {\n"
@@ -1827,9 +2203,9 @@ class TestValueFlow : public TestFixture {
                 "    case 2: if (x==5) {} break;\n"
                 "    };\n"
                 "}");
-        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:3]: (debug) valueflow.cpp::valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n",
-            errout.str());
+        ASSERT_EQUALS(
+            "[test.cpp:3:13]: (debug) valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a [valueFlowBailoutIncompleteVar]\n",
+            errout_str());
     }
 
     void valueFlowBeforeConditionMacro() {
@@ -1840,9 +2216,10 @@ class TestValueFlow : public TestFixture {
                 "    M;\n"
                 "}");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:3]: (debug) valueflow.cpp::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",
-            errout.str());
+            "[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"
+            "[test.cpp:4]: (debug) valueflow.cpp:1260:(valueFlow) bailout: variable 'x', condition is defined in macro\n", // duplicate
+            errout_str());
 
         bailout("#define FREE(obj) ((obj) ? (free((char *) (obj)), (obj) = 0) : 0)\n" // #8349
                 "void f(int *x) {\n"
@@ -1850,9 +2227,10 @@ class TestValueFlow : public TestFixture {
                 "    FREE(x);\n"
                 "}");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:3]: (debug) valueflow.cpp::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",
-            errout.str());
+            "[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"
+            "[test.cpp:4]: (debug) valueflow.cpp:1260:(valueFlow) bailout: variable 'x', condition is defined in macro\n", // duplicate
+            errout_str());
     }
 
     void valueFlowBeforeConditionGoto() {
@@ -1864,9 +2242,10 @@ class TestValueFlow : public TestFixture {
                 "    if (x==123){}\n"
                 "}");
         ASSERT_EQUALS_WITHOUT_LINENUMBERS(
-            "[test.cpp:3]: (debug) valueflow.cpp::valueFlowConditionExpressions bailout: Skipping function due to incomplete variable a\n"
-            "[test.cpp:2]: (debug) valueflow.cpp::(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n",
-            errout.str());
+            "[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"
+            "[test.cpp:2]: (debug) valueflow.cpp::(valueFlow) bailout: valueFlowAfterCondition: bailing in conditional block\n", // duplicate
+            errout_str());
 
         // #5721 - FP
         bailout("static void f(int rc) {\n"
@@ -1879,6 +2258,10 @@ class TestValueFlow : public TestFixture {
                 "out:\n"
                 "    if (abc) {}\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
+            errout_str());
     }
 
     void valueFlowBeforeConditionForward() {
@@ -2696,6 +3079,39 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 3));
         ASSERT_EQUALS(false, testValueOfXKnown(code, 4U, 3));
+
+        code = "void f() {\n"
+               "    constexpr int x(123);\n"
+               "    constexpr int y(x*x);\n"
+               "    return x;\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"
+               "}";
+        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"
+               "}";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 123));
+
+        code = "bool f() {\n" // #13208
+               "    struct S {\n"
+               "        bool b = true;\n"
+               "        bool get() const { return b; }\n"
+               "    };\n"
+               "    S s;\n"
+               "    s.b = false;\n"
+               "    bool x = s.get();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 9U, 1));
     }
 
     void valueFlowAfterSwap()
@@ -3309,6 +3725,13 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(false, testValueOfXKnown(code, 9U, 0));
         ASSERT_EQUALS(true, testValueOfX(code, 9U, 0));
+
+        code = "int f(int a, int b) {\n"
+               "    if (a > 0 && b > 0) {}\n"
+               "    int x = a * b;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 0));
     }
 
     void valueFlowAfterConditionTernary()
@@ -3491,7 +3914,7 @@ class TestValueFlow : public TestFixture {
     void valueFlowForwardCompoundAssign() {
         const char *code;
 
-        code = "void f() {\n"
+        code = "int f() {\n"
                "    int x = 123;\n"
                "    x += 43;\n"
                "    return x;\n"
@@ -3501,19 +3924,26 @@ class TestValueFlow : public TestFixture {
                       "3,Compound assignment '+=', assigned value is 166\n",
                       getErrorPathForX(code, 4U));
 
-        code = "void f() {\n"
+        code = "int f() {\n"
                "    int x = 123;\n"
                "    x /= 0;\n" // don't crash when evaluating x/=0
                "    return x;\n"
                "}";
         ASSERT_EQUALS(false, testValueOfX(code, 4U, 123));
 
-        code = "void f() {\n"
-               "    float x = 123.45;\n"
+        code = "float f() {\n"
+               "    float x = 123.45f;\n"
                "    x += 67;\n"
                "    return x;\n"
                "}";
-        ASSERT_EQUALS(true, testValueOfX(code, 4U, 123.45F + 67, 0.01F));
+        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"
+               "}";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 123.45 + 67, 0.01));
 
         code = "void f() {\n"
                "    int x = 123;\n"
@@ -3522,7 +3952,7 @@ class TestValueFlow : public TestFixture {
                "}";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 61));
 
-        code = "void f() {\n"
+        code = "int f() {\n"
                "    int x = 123;\n"
                "    x <<= 1;\n"
                "    return x;\n"
@@ -3639,7 +4069,7 @@ class TestValueFlow : public TestFixture {
                "  if (p) return;\n"
                "  x = *p ? : 1;\n" // <- no explicit expr0
                "}";
-        testValueOfX(code, 1U, 0); // do not crash
+        (void)testValueOfX(code, 1U, 0); // do not crash
 
         code = "void f(int a) {\n" // #8784
                "    int x = 13;\n"
@@ -3868,7 +4298,7 @@ class TestValueFlow : public TestFixture {
     void valueFlowRightShift() {
         const char *code;
         /* Set some temporary fixed values to simplify testing */
-        Settings s = settings;
+        /*const*/ Settings s = settings;
         s.platform.int_bit = 32;
         s.platform.long_bit = 64;
         s.platform.long_long_bit = MathLib::bigint_bits * 2;
@@ -4019,7 +4449,7 @@ class TestValueFlow : public TestFixture {
                "    do {\n"
                "        if (pvd.descr_type == 0xff) {}\n"
                "        dostuff(&pvd);\n"
-               "    } while (condition)\n"
+               "    } while (condition);\n"
                "}";
         values = removeImpossible(tokenValues(code, "=="));
         ASSERT_EQUALS(1, values.size());
@@ -4039,14 +4469,13 @@ class TestValueFlow : public TestFixture {
     }
 
     void valueFlowSwitchVariable() {
-        const char *code;
-        code = "void f(int x) {\n"
-               "    a = x - 1;\n"  // <- x can be 14
-               "    switch (x) {\n"
-               "    case 14: a=x+2; break;\n"  // <- x is 14
-               "    };\n"
-               "    a = x;\n"  // <- x can be 14
-               "}";
+        const char code[] = "void f(int x) {\n"
+                            "    a = x - 1;\n"  // <- x can be 14
+                            "    switch (x) {\n"
+                            "    case 14: a=x+2; break;\n"  // <- x is 14
+                            "    };\n"
+                            "    a = x;\n"  // <- x can be 14
+                            "}";
         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));
@@ -4293,7 +4722,7 @@ class TestValueFlow : public TestFixture {
                "  for(int i = 0; i < 20; i++)\n"
                "    n = (int)(i < 10 || abs(negWander) < abs(negTravel));\n"
                "}";
-        testValueOfX(code,0,0); // <- don't hang
+        (void)testValueOfX(code,0,0); // <- don't hang
 
         // crash (daca@home)
         code = "void foo(char *z, int n) {\n"
@@ -4306,7 +4735,7 @@ class TestValueFlow : public TestFixture {
                "        }\n"
                "    }\n"
                "}";
-        testValueOfX(code,0,0); // <- don't crash
+        (void)testValueOfX(code,0,0); // <- don't crash
 
         // conditional code in loop
         code = "void f(int mask) {\n" // #6000
@@ -4375,7 +4804,7 @@ class TestValueFlow : public TestFixture {
                "    for (*&t.s.a[0] = 1;;)\n"
                "        if (0) {}\n"
                "}\n";
-        testValueOfX(code, 0, 0); // <- don't throw
+        ASSERT_NO_THROW(testValueOfX(code, 0, 0));
 
         code = "void f() {\n"
                "    int p[2];\n"
@@ -4383,7 +4812,7 @@ class TestValueFlow : public TestFixture {
                "        for (p[1] = 0; p[1] <= 2 - p[0]; p[1]++) {}\n"
                "    }\n"
                "}\n";
-        testValueOfX(code, 0, 0); // <- don't throw
+        ASSERT_NO_THROW(testValueOfX(code, 0, 0));
 
         code = "struct C {\n" // #10828
                "    int& v() { return i; }\n"
@@ -4396,7 +4825,7 @@ class TestValueFlow : public TestFixture {
                "        for (c.v() = 0; c.v() < 24; c.v()++) {}\n"
                "    }\n"
                "}\n";
-        testValueOfX(code, 0, 0); // <- don't throw
+        ASSERT_NO_THROW(testValueOfX(code, 0, 0));
 
         // #11072
         code = "struct a {\n"
@@ -4413,6 +4842,86 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(true, values.empty());
         values = tokenValues(code, "[ f . b");
         ASSERT_EQUALS(true, values.empty());
+
+        code = "void f() {\n" // #13109
+               "    const int a[10] = {};\n"
+               "    for (int n = 0; 1; ++n) {\n"
+               "        (void)a[n];\n"
+               "        break;\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "n ]");
+        ASSERT_EQUALS(2, values.size());
+        auto it = values.begin();
+        ASSERT_EQUALS(-1, it->intvalue);
+        ASSERT(it->isImpossible());
+        ++it;
+        ASSERT_EQUALS(0, it->intvalue);
+        ASSERT(it->isPossible());
+
+        code = "void f() {\n"
+               "    const int a[10] = {};\n"
+               "    for (int n = 0; 1; ++n) {\n"
+               "        if (a[n] < 1)\n"
+               "            break;\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "n ]");
+        ASSERT_EQUALS(2, values.size());
+        it = values.begin();
+        ASSERT_EQUALS(-1, it->intvalue);
+        ASSERT(it->isImpossible());
+        ++it;
+        ASSERT_EQUALS(0, it->intvalue);
+        ASSERT(it->isPossible());
+
+        code = "void f() {\n"
+               "    const int a[10] = {};\n"
+               "    for (int n = 0; 1; ++n) {\n"
+               "        if (a[n] < 1)\n"
+               "            throw 0;\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "n ]");
+        ASSERT_EQUALS(2, values.size());
+        it = values.begin();
+        ASSERT_EQUALS(-1, it->intvalue);
+        ASSERT(it->isImpossible());
+        ++it;
+        ASSERT_EQUALS(0, it->intvalue);
+        ASSERT(it->isPossible());
+
+        code = "void f() {\n"
+               "    const int a[10] = {};\n"
+               "    for (int n = 0; 1; ++n) {\n"
+               "        (void)a[n];\n"
+               "        exit(1);\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "n ]");
+        ASSERT_EQUALS(2, values.size());
+        it = values.begin();
+        ASSERT_EQUALS(-1, it->intvalue);
+        ASSERT(it->isImpossible());
+        ++it;
+        ASSERT_EQUALS(0, it->intvalue);
+        ASSERT(it->isPossible());
+
+        code = "void f() {\n"
+               "    const int a[10] = {};\n"
+               "    for (int n = 0; 1; ++n) {\n"
+               "        if (a[n] < 1)\n"
+               "            exit(1);\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "n ]");
+        ASSERT_EQUALS(2, values.size());
+        it = values.begin();
+        ASSERT_EQUALS(-1, it->intvalue);
+        ASSERT(it->isImpossible());
+        ++it;
+        ASSERT_EQUALS(0, it->intvalue);
+        ASSERT(it->isPossible());
     }
 
     void valueFlowSubFunction() {
@@ -4523,7 +5032,21 @@ class TestValueFlow : public TestFixture {
                "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "void foo(int* p, int* x) {\n"
+               "    bool b1 = (p != NULL);\n"
+               "    bool b2 = b1 && (x != NULL);\n"
+               "    if (b2) {\n"
+               "        *x = 3;\n"
+               "    }\n"
+               "}\n"
+               "\n"
+               "void bar() {\n"
+               "    foo(NULL, NULL);\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
     }
+
     void valueFlowFunctionReturn() {
         const char *code;
 
@@ -4720,7 +5243,7 @@ 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"
                "};";
-        testValueOfX(code, 2U, 2); // Don't crash (#6494)
+        (void)testValueOfX(code, 2U, 2); // Don't crash (#6494)
     }
 
     bool isNotKnownValues(const char code[], const char str[]) {
@@ -5122,11 +5645,35 @@ class TestValueFlow : public TestFixture {
         value = valueOfTok(code, "1");
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT_EQUALS(false, value.isKnown());
+
+        code = "void f(char c, struct T* t) {\n" // #11894
+               "    (*t->func)(&c, 1, t->ptr);\n"
+               "}\n";
+        value = valueOfTok(code, ", 1");
+        ASSERT_EQUALS(0, value.intvalue);
+        ASSERT_EQUALS(false, value.isKnown());
+
+        // #13959
+        const Settings settingsOld = settings;
+        settings.standards.c = Standards::C23;
+        code = "void f(int* p) {\n"
+               "    if (p == nullptr)\n"
+               "        return;\n"
+               "    if (p) {}\n"
+               "}\n";
+        value = valueOfTok(code, "p ) { }", &settings, /*cpp*/ false);
+        ASSERT_EQUALS(1, value.intvalue);
+        ASSERT_EQUALS(true, value.isKnown());
+
+        settings.standards.c = Standards::C17;
+        value = valueOfTok(code, "p ) { }", &settings, /*cpp*/ false);
+        ASSERT(value == ValueFlow::Value());
+        settings = settingsOld;
     }
 
     void valueFlowSizeofForwardDeclaredEnum() {
         const char *code = "enum E; sz=sizeof(E);";
-        valueOfTok(code, "="); // Don't crash (#7775)
+        (void)valueOfTok(code, "="); // Don't crash (#7775)
     }
 
     void valueFlowGlobalVar() {
@@ -5565,6 +6112,106 @@ class TestValueFlow : public TestFixture {
                "}";
         values = tokenValues(code, "x + 1", ValueFlow::Value::ValueType::UNINIT);
         ASSERT_EQUALS(0, values.size());
+
+        code = "void g() {\n"
+               "  int y;\n"
+               "  int *q = 1 ? &y : 0;\n"
+               "}\n";
+        values = tokenValues(code, "y :", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(1, values.size());
+        ASSERT_EQUALS(true, values.front().isUninitValue());
+        values = tokenValues(code, "& y :", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(1, values.size());
+        ASSERT_EQUALS(true, values.front().isUninitValue());
+
+        // #12012 - function init variable
+        code = "void init(uintptr_t p);\n"
+               "void fp() {\n"
+               "  int x;\n"
+               "  init((uintptr_t)&x);\n"
+               "  if (x > 0) {}\n"
+               "}\n";
+        values = tokenValues(code, "x >", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(0, values.size());
+
+        // #12031
+        code = "bool g(int *p);\n"
+               "bool h();\n"
+               "void f(bool b, int y) {\n"
+               "    int x;\n"
+               "    if (b && y > 0) {\n"
+               "        b = g(&x);\n"
+               "    }\n"
+               "    while (b && y > 0) {\n"
+               "        if (x < 0) {}\n"
+               "        break;\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "x <", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(0, values.size());
+
+        code = "bool do_something(int *p);\n"
+               "int getY();\n"
+               "bool bar();\n"
+               "void foo() {\n"
+               "    bool flag{true};\n"
+               "    int x;\n"
+               "    int y = getY();\n"
+               "    if (flag == true) {\n"
+               "        flag = bar();\n"
+               "    }\n"
+               "    if ((flag == true) && y > 0) {\n"
+               "        flag = do_something(&x);\n"
+               "    }\n"
+               "    for (int i = 0; (flag == true) && i < y; i++) {\n"
+               "        if (x < 0) {}\n"
+               "    }\n"
+               "}\n";
+        values = tokenValues(code, "x <", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(0, values.size());
+
+        code = "void getX(int *p);\n"
+               "bool do_something();\n"
+               "void foo() {\n"
+               "  int x;\n"
+               "  bool flag;\n"
+               "  bool success;\n"
+               "  success = do_something();\n"
+               "  flag = success;\n"
+               "  if (success == true) {\n"
+               "    getX(&x);\n"
+               "  }\n"
+               "  for (int i = 0; (flag == true) && (i < x); ++i) {}\n"
+               "}\n";
+        values = tokenValues(code, "x ) ; ++ i", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(0, values.size());
+
+        code = "void g(bool *result, size_t *buflen) {\n" // #12091
+               "    if (*result && *buflen >= 5) {}\n" // <- *buflen might not be initialized
+               "}\n"
+               "void f() {\n"
+               "    size_t bytesCopied;\n"
+               "    bool copied_all = true;\n"
+               "    g(&copied_all, &bytesCopied);\n"
+               "}";
+        values = tokenValues(code, "buflen >=", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(1, values.size());
+
+        code = "void foo() {\n"
+               "  int counter = 0;\n"
+               "  int x;\n"
+               "  for (int i = 0; i < 5; i++) {\n"
+               "    if (i % 2 == 0) {\n"
+               "      x = i;\n"
+               "      counter++;\n"
+               "    }\n"
+               "  }\n"
+               "  for (int i = 0; i < counter; i++) {\n"
+               "      if(x > 5) {}\n"
+               "  }\n"
+               "}\n";
+        values = tokenValues(code, "x > 5", ValueFlow::Value::ValueType::UNINIT);
+        ASSERT_EQUALS(0, values.size());
     }
 
     void valueFlowConditionExpressions() {
@@ -5796,6 +6443,14 @@ class TestValueFlow : public TestFixture {
                "    return false;\n"
                "}\n";
         ASSERT_EQUALS(true, testValueOfXKnown(code, 6U, 0));
+
+        code = "bool f(bool b1, bool b2) {\n"
+               "    if (b1 && b2)\n"
+               "        return;\n"
+               "    int x = b1 && b2;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 0));
     }
 
     static std::string isPossibleContainerSizeValue(std::list<ValueFlow::Value> values,
@@ -5871,8 +6526,6 @@ class TestValueFlow : public TestFixture {
     void valueFlowContainerSize() {
         const char *code;
 
-        LOAD_LIB_2(settings.library, "std.cfg");
-
         // condition
         code = "void f(const std::list<int> &ints) {\n"
                "  if (!static_cast<bool>(ints.empty()))\n"
@@ -6036,7 +6689,7 @@ class TestValueFlow : public TestFixture {
                "  std::array<int,10> ints;\n" // Array size is 10
                "  ints.front();\n"
                "}";
-        ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 10));
+        ASSERT_EQUALS("values.size():2", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 10)); // uninit value
 
         code = "void f() {\n"
                "  std::string s;\n"
@@ -6534,6 +7187,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"
@@ -6598,7 +7260,7 @@ class TestValueFlow : public TestFixture {
                "  if (a.empty() && b.empty()) {}\n"
                "  else if (a.empty() == false && b.empty() == false) {}\n"
                "}\n";
-        ASSERT("" != isImpossibleContainerSizeValue(tokenValues(code, "a . empty ( ) == false"), 0));
+        ASSERT(!isImpossibleContainerSizeValue(tokenValues(code, "a . empty ( ) == false"), 0).empty());
 
         code = "bool g(std::vector<int>& v) {\n"
                "    v.push_back(1);\n"
@@ -6618,14 +7280,138 @@ class TestValueFlow : public TestFixture {
 
         code = "int f() { auto a = std::array<int, 2>{}; return a[1]; }";
         ASSERT_EQUALS("values.size():0", isKnownContainerSizeValue(tokenValues(code, "a ["), 0));
+
+        code = "void g(std::vector<int>* w) {\n"
+               "  std::vector<int> &r = *w;\n"
+               "  r.push_back(0);\n"
+               "}\n"
+               "int f() {\n"
+               "  std::vector<int> v;\n"
+               "  g(&v);\n"
+               "  return v[0];\n"
+               "}\n";
+        ASSERT(!isKnownContainerSizeValue(tokenValues(code, "v ["), 0).empty());
+        ASSERT(!isPossibleContainerSizeValue(tokenValues(code, "v ["), 0).empty());
+
+        code = "template<typename T>\n" // #12052
+               "std::vector<T> g(T);\n"
+               "int f() {\n"
+               "    const std::vector<int> v{ g(3) };\n"
+               "    auto x = v.size();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 6U, 1));
+
+        code = "template<typename T>\n"
+               "std::vector<T> g(const std::stack<T>& s);\n"
+               "int f() {\n"
+               "    std::stack<int> s{};\n"
+               "    s.push(42);\n"
+               "    s.push(43);\n"
+               "    const std::vector<int> r{ g(s) };\n"
+               "    auto x = r.size();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 9U, 1));
+
+        code = "int f() {\n" // #12987
+               "    std::string s{\"0\"};\n"
+               "    auto x = s.size();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 4U, 1));
+
+        code = "int f() {\n"
+               "    std::string s;\n"
+               "    s.append(\"0\");\n"
+               "    auto x = s.size();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 1));
+
+        code = "int f() {\n"
+               "    std::string s;\n"
+               "    s = std::string(\"0\");\n"
+               "    auto x = s.size();\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXKnown(code, 5U, 1));
+
+        code = "std::string f() {\n" // #12993
+               "    std::string a[1];\n"
+               "    a->clear();\n"
+               "    return a[0];\n"
+               "}\n";
+        ASSERT(!isKnownContainerSizeValue(tokenValues(code, "a [ 0"), 0).empty());
+
+        code = "void f(const std::string& a) {\n" // #12994
+               "    std::string b = a + \"123\";\n"
+               "    if (b.empty()) {}\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"
+               "}";
+        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"
+               "}";
+        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"
+               "}";
+        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"
+               "}";
+        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"
+               "}";
+        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"
+               "}";
+        ASSERT_EQUALS("", isPossibleContainerSizeValue(tokenValues(code, "s . empty"), 0));
+
+        code = "int f(const std::string& str) {\n"
+               "    std::istringstream iss(str);\n"
+               "    std::vector<std::string> v{ std::istream_iterator<std::string>(iss), {} };\n"
+               "    auto x = v.size();\n"
+               "    return x;\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"
+               "}";
+        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"
+               "}";
+        ASSERT(!isKnownContainerSizeValue(tokenValues(code, "a ["), 6).empty());
     }
 
     void valueFlowContainerElement()
     {
         const char* code;
 
-        LOAD_LIB_2(settings.library, "std.cfg");
-
         code = "int f() {\n"
                "    std::vector<int> v = {1, 2, 3, 4};\n"
                "    int x = v[1];\n"
@@ -6651,8 +7437,8 @@ class TestValueFlow : public TestFixture {
     void valueFlowDynamicBufferSize() {
         const char *code;
 
-        LOAD_LIB_2(settings.library, "std.cfg");
-        LOAD_LIB_2(settings.library, "posix.cfg");
+        const Settings settingsOld = settings; // TODO: get rid of this
+        settings = settingsBuilder(settings).library("posix.cfg").library("bsd.cfg").build();
 
         code = "void* f() {\n"
                "  void* x = malloc(10);\n"
@@ -6686,12 +7472,40 @@ class TestValueFlow : public TestFixture {
                "  return x;\n"
                "}";
         ASSERT_EQUALS(true, testValueOfX(code, 4U, 100,  ValueFlow::Value::ValueType::BUFFER_SIZE));
+
+        code = "struct A {};\n" // #14305
+               "void* f() {\n"
+               "  A* x = new A();\n"
+               "  return x;\n"
+               "}";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 1, ValueFlow::Value::ValueType::BUFFER_SIZE));
+
+        code = "struct A {};\n"
+               "void* f() {\n"
+               "  void* x = new A;\n"
+               "  return x;\n"
+               "}";
+        {
+            auto values = tokenValues(code, "x ; }");
+            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"
+               "}";
+        ASSERT_EQUALS(true, testValueOfX(code, 4U, 4, ValueFlow::Value::ValueType::BUFFER_SIZE));
+
+        settings = settingsOld;
     }
 
     void valueFlowSafeFunctionParameterValues() {
         const char *code;
         std::list<ValueFlow::Value> values;
-        Settings s = settingsBuilder().library("std.cfg").build();
+        /*const*/ Settings s = settingsBuilder().library("std.cfg").build();
         s.safeChecks.classes = s.safeChecks.externalFunctions = s.safeChecks.internalFunctions = true;
 
         code = "short f(short x) {\n"
@@ -6738,11 +7552,19 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(100, values.back().intvalue);
     }
 
-
     void valueFlowUnknownFunctionReturn() {
+        const char code[] = "template <typename T>\n" // #13409
+                            "struct S {\n"
+                            "    std::max_align_t T::* m;\n"
+                            "    S(std::max_align_t T::* p) : m(p) {}\n"
+                            "};\n";
+        (void)valueOfTok(code, ":"); // don't crash
+    }
+
+    void valueFlowUnknownFunctionReturnRand() {
         const char *code;
         std::list<ValueFlow::Value> values;
-        Settings s = settingsBuilder().library("std.cfg").build();
+        /*const*/ Settings s = settingsBuilder().library("std.cfg").build();
         s.checkUnknownFunctionReturn.insert("rand");
 
         code = "x = rand();";
@@ -6752,6 +7574,18 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(INT_MAX, values.back().intvalue);
     }
 
+    void valueFlowUnknownFunctionReturnMalloc() { // #4626
+        const char *code;
+
+        code = "ptr = malloc(10);";
+        const auto& values = tokenValues(code, "(");
+        ASSERT_EQUALS(1, values.size());
+        ASSERT_EQUALS(true, values.front().isIntValue());
+        ASSERT_EQUALS(true, values.front().isPossible());
+        ASSERT_EQUALS(0, values.front().intvalue);
+    }
+
+
     void valueFlowPointerAliasDeref() {
         const char* code;
 
@@ -6772,7 +7606,7 @@ class TestValueFlow : public TestFixture {
                "    if (x >= -1)\n"
                "        state = x;\n"
                "}\n";
-        valueOfTok(code, "=");
+        (void)valueOfTok(code, "=");
 
         code = "void a() {\n"
                "  auto b = [b = 0] {\n"
@@ -6780,7 +7614,7 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "  };\n"
                "}\n";
-        valueOfTok(code, "0");
+        (void)valueOfTok(code, "0");
 
         code = "namespace juce {\n"
                "PopupMenu::Item& PopupMenu::Item::operator= (Item&&) = default;\n"
@@ -6790,7 +7624,7 @@ class TestValueFlow : public TestFixture {
                "    o.isWatchingForDeletion = true;\n"
                "    return o;\n"
                "}}\n";
-        valueOfTok(code, "return");
+        (void)valueOfTok(code, "return");
 
         code = "class dummy_resource : public instrument_resource {\n"
                "public:\n"
@@ -6800,7 +7634,20 @@ class TestValueFlow : public TestFixture {
                "void dummy_reader_reset() {\n"
                "    dummy_resource::log.clear();\n"
                "}\n";
-        valueOfTok(code, "log");
+        (void)valueOfTok(code, "log");
+
+        code = "struct D : B<int> {\n"
+               "    D(int i, const std::string& s) : B<int>(i, s) {}\n"
+               "};\n"
+               "template<> struct B<int>::S {\n"
+               "    int j;\n"
+               "};\n";
+        (void)valueOfTok(code, "B");
+
+        code = "void f(int& r) {\n" // #13515
+               "    [0].p = &r;\n"
+               "}\n";
+        (void)valueOfTok(code, "=");
     }
 
     void valueFlowCrash() {
@@ -6809,7 +7656,7 @@ class TestValueFlow : public TestFixture {
         code = "void f(int x) {\n"
                "    if (0 * (x > 2)) {}\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "struct a {\n"
                "  void b();\n"
@@ -6820,7 +7667,7 @@ class TestValueFlow : public TestFixture {
                "    e = &child;\n"
                "  (*e).b();\n"
                "}\n";
-        valueOfTok(code, "e");
+        (void)valueOfTok(code, "e");
 
         code = "const int& f(int, const int& y = 0);\n"
                "const int& f(int, const int& y) {\n"
@@ -6830,7 +7677,7 @@ class TestValueFlow : public TestFixture {
                "    const int& r = f(x);\n"
                "    return r;\n"
                "}\n";
-        valueOfTok(code, "0");
+        (void)valueOfTok(code, "0");
 
         code = "void fa(int &colors) {\n"
                "  for (int i = 0; i != 6; ++i) {}\n"
@@ -6838,7 +7685,7 @@ class TestValueFlow : public TestFixture {
                "void fb(not_null<int*> parent, int &&colors2) {\n"
                "  dostuff(1);\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "void a() {\n"
                "  static int x = 0;\n"
@@ -6846,7 +7693,7 @@ class TestValueFlow : public TestFixture {
                "    c(c &&) { ++x; }\n"
                "  };\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "void f(){\n"
                "      struct dwarf_data **pp;\n"
@@ -6855,7 +7702,7 @@ class TestValueFlow : public TestFixture {
                "       pp = &(*pp)->next)\n"
                "    ;\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "void *foo(void *x);\n"
                "void *foo(void *x)\n"
@@ -6865,7 +7712,7 @@ class TestValueFlow : public TestFixture {
                "        return &&yes;\n"
                "    return x;\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "void f() {\n"
                "    std::string a = b[c->d()];\n"
@@ -6874,7 +7721,7 @@ class TestValueFlow : public TestFixture {
                "        INFO(std::string{\"b\"} + a);\n"
                "    }\n"
                "}\n";
-        valueOfTok(code, "a");
+        (void)valueOfTok(code, "a");
 
         code = "class A{\n"
                "  void f() {\n"
@@ -6884,7 +7731,7 @@ class TestValueFlow : public TestFixture {
                "    return \"\";\n"
                "  }\n"
                "};\n";
-        valueOfTok(code, "c");
+        (void)valueOfTok(code, "c");
 
         code = "void f() {\n"
                "   char* p = 0;\n"
@@ -6898,7 +7745,7 @@ class TestValueFlow : public TestFixture {
                "   int *i2 = 0;\n"
                "   if (i2) { }\n"
                "}\n";
-        valueOfTok(code, "p");
+        (void)valueOfTok(code, "p");
 
         code = "struct a;\n"
                "namespace e {\n"
@@ -6917,7 +7764,7 @@ class TestValueFlow : public TestFixture {
                "    if (c.h)\n"
                "      a *const d = arguments[c.arg];\n"
                "}\n";
-        valueOfTok(code, "c");
+        (void)valueOfTok(code, "c");
 
         code = "void h(char* p, int s) {\n"
                "  char *q = p+s;\n"
@@ -6927,14 +7774,14 @@ class TestValueFlow : public TestFixture {
                "  if (p < q && buf < b)\n"
                "    diff = (buf-b);\n"
                "}\n";
-        valueOfTok(code, "diff");
+        (void)valueOfTok(code, "diff");
 
         code = "void foo() {\n" // #10462
                "  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"
                "}";
-        valueOfTok(code, "<=");
+        (void)valueOfTok(code, "<=");
 
         code = "void f() {\n"
                "    unsigned short Xoff = 10;\n"
@@ -6946,7 +7793,7 @@ class TestValueFlow : public TestFixture {
                "            Nx = last - Xoff;\n"
                "    } while (last > 0);\n"
                "}\n";
-        valueOfTok(code, "last");
+        (void)valueOfTok(code, "last");
 
         code = "struct a {\n"
                "  void clear();\n"
@@ -6958,7 +7805,7 @@ class TestValueFlow : public TestFixture {
                "  a e;\n"
                "};\n"
                "void d::c(int) { e.clear(); }\n";
-        valueOfTok(code, "e");
+        (void)valueOfTok(code, "e");
 
         code = "struct a {\n"
                "  int b;\n"
@@ -6972,7 +7819,7 @@ class TestValueFlow : public TestFixture {
                "  if (g && f.c)\n"
                "    e.d.b = g - f.c;\n"
                "}\n";
-        valueOfTok(code, "e");
+        (void)valueOfTok(code, "e");
 
         code = "struct a {\n"
                "  std::vector<a> b;\n"
@@ -6985,7 +7832,7 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "  }\n"
                "};\n";
-        valueOfTok(code, "e");
+        (void)valueOfTok(code, "e");
 
         code = "struct a {\n"
                "  struct b {\n"
@@ -7000,7 +7847,7 @@ class TestValueFlow : public TestFixture {
                "      h->c.get();\n"
                "  }\n"
                "};\n";
-        valueOfTok(code, "f.c");
+        (void)valueOfTok(code, "f.c");
 
         code = "void d(fmpz_t a, fmpz_t b) {\n"
                "  if (fmpz_sgn(0)) {}\n"
@@ -7010,7 +7857,7 @@ class TestValueFlow : public TestFixture {
                "  f->b;\n"
                "  d(&f->a, c);\n"
                "}\n";
-        valueOfTok(code, "f");
+        (void)valueOfTok(code, "f");
 
         code = "struct bo {\n"
                "  int b, c, a, d;\n"
@@ -7027,29 +7874,29 @@ class TestValueFlow : public TestFixture {
                "    return;\n"
                "  s;\n"
                "}\n";
-        valueOfTok(code, "s");
+        (void)valueOfTok(code, "s");
 
         code = "int f(int value) { return 0; }\n"
                "std::shared_ptr<Manager> g() {\n"
                "    static const std::shared_ptr<Manager> x{ new M{} };\n"
                "    return x;\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "int* g();\n"
                "void f() {\n"
                "    std::cout << (void*)(std::shared_ptr<int>{ g() }.get());\n"
                "}\n";
-        valueOfTok(code, ".");
+        (void)valueOfTok(code, ".");
 
         code = "class T;\n"
                "struct S {\n"
                "    void f(std::array<T*, 2>& a);\n"
                "};\n";
-        valueOfTok(code, "a");
+        (void)valueOfTok(code, "a");
 
         code = "void f(const char * const x) { !!system(x); }\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "struct struct1 {\n"
                "    int i1;\n"
@@ -7063,7 +7910,7 @@ class TestValueFlow : public TestFixture {
                "void f() {\n"
                "    struct2 a = { 1, 2, 3, {4,5,6,7} }; \n"
                "}\n";
-        valueOfTok(code, "a");
+        (void)valueOfTok(code, "a");
 
         code = "void setDeltas(int life, int age, int multiplier) {\n"
                "    int dx = 0;\n"
@@ -7077,7 +7924,7 @@ class TestValueFlow : public TestFixture {
                "        else dy = 0;\n"
                "    }\n"
                "}\n";
-        valueOfTok(code, "age");
+        (void)valueOfTok(code, "age");
 
         code = "void a() {\n"
                "  struct b {\n"
@@ -7085,7 +7932,7 @@ class TestValueFlow : public TestFixture {
                "  };\n"
                "  for (b c : {b{}, {}}) {}\n"
                "}\n";
-        valueOfTok(code, "c");
+        (void)valueOfTok(code, "c");
 
         code = "class T {\n"
                "private:\n"
@@ -7094,13 +7941,13 @@ class TestValueFlow : public TestFixture {
                "private:\n"
                "    std::shared_ptr<B> m;\n"
                "};\n";
-        valueOfTok(code, "r");
+        (void)valueOfTok(code, "r");
 
         code = "void g(int);\n"
                "void f(int x, int y) {\n"
                "    g(x < y ? : 1);\n"
                "};\n";
-        valueOfTok(code, "?");
+        (void)valueOfTok(code, "?");
 
         code = "struct C {\n"
                "    explicit C(bool);\n"
@@ -7109,17 +7956,88 @@ class TestValueFlow : public TestFixture {
                "void f(bool b) {\n"
                "    const C& c = C(b) ? : C(false);\n"
                "};\n";
-        valueOfTok(code, "?");
+        (void)valueOfTok(code, "?");
 
         code = "struct S {\n"
                "    void g(std::vector<int> (*f) () = nullptr);\n"
                "};\n";
-        valueOfTok(code, "=");
+        (void)valueOfTok(code, "=");
 
         code = "void f(bool b) {\n" // #11627
                "    (*printf)(\"%s %i\", strerror(errno), b ? 0 : 1);\n"
                "};\n";
-        valueOfTok(code, "?");
+        (void)valueOfTok(code, "?");
+
+        code = "void f(int i) {\n" // #11914
+               "    int& r = i;\n"
+               "    int& q = (&r)[0];\n"
+               "}\n";
+        (void)valueOfTok(code, "&");
+
+        code = "bool a(int *);\n"
+               "void fn2(int b) {\n"
+               "  if (b) {\n"
+               "    bool c, d, e;\n"
+               "    if (c && d)\n"
+               "      return;\n"
+               "    if (e && a(&b)) {\n"
+               "    }\n"
+               "  }\n"
+               "}\n";
+        (void)valueOfTok(code, "e");
+
+        code = "void f(int a, int b, int c) {\n"
+               "  if (c && (a || a && b))\n"
+               "    if (a && b) {}\n"
+               "}\n";
+        (void)valueOfTok(code, "a");
+
+        code = "void g(const char* fmt, ...);\n" // #12255
+               "void f(const char* fmt, const char* msg) {\n"
+               "    const char* p = msg;\n"
+               "    g(\"%s\", msg);\n"
+               "}\n"
+               "void g(const char* fmt, ...) {\n"
+               "    const char* q = fmt;\n"
+               "    if (*q > 0 && *q < 100) {}\n"
+               "}\n";
+        (void)valueOfTok(code, "&&");
+
+        code = "void f() { int& a = *&a; }\n"; // #12511
+        (void)valueOfTok(code, "=");
+
+        code = "void g(int*);\n" // #12716
+               "void f(int a) {\n"
+               "    do {\n"
+               "        if (a)\n"
+               "            break;\n"
+               "        g((int[256]) { 0 });\n"
+               "    } while (true);\n"
+               "}\n";
+        (void)valueOfTok(code, "0");
+
+        code = "bool f() {\n"
+               "    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");
     }
 
     void valueFlowHang() {
@@ -7162,7 +8080,7 @@ class TestValueFlow : public TestFixture {
                "       arr2[3][3] == 0.0\n"
                "       ) {}\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "namespace {\n"
                "struct a {\n"
@@ -7176,7 +8094,7 @@ class TestValueFlow : public TestFixture {
                "     {{&b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b},\n"
                "      {&b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b}}}};\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "namespace {\n"
                "struct a {\n"
@@ -7192,7 +8110,7 @@ class TestValueFlow : public TestFixture {
                "      {&b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b, &b,\n"
                "       &b}}}};\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "int &a(int &);\n"
                "int &b(int &);\n"
@@ -7233,7 +8151,7 @@ class TestValueFlow : public TestFixture {
                "    return d(e);\n"
                "  return e;\n"
                "}\n";
-        valueOfTok(code, "x");
+        (void)valueOfTok(code, "x");
 
         code = "void a() {\n"
                "  int b = 0;\n"
@@ -7242,7 +8160,7 @@ class TestValueFlow : public TestFixture {
                "      break;\n"
                "  } while (b < 1);\n"
                "}\n";
-        valueOfTok(code, "b");
+        (void)valueOfTok(code, "b");
 
         code = "void ParseEvent(tinyxml2::XMLDocument& doc, std::set<Item*>& retItems) {\n"
                "    auto ParseAddItem = [&](Item* item) {\n"
@@ -7265,7 +8183,7 @@ class TestValueFlow : public TestFixture {
                "    for (auto *el = root->FirstChildElement(\"Result\"); el && !ParseAddItem(GetItem(el)); el = el->NextSiblingElement(\"Result\")) ;\n"
                "    for (auto *el = root->FirstChildElement(\"Result\"); el && !ParseAddItem(GetItem(el)); el = el->NextSiblingElement(\"Result\")) ;\n"
                "}\n";
-        valueOfTok(code, "root");
+        (void)valueOfTok(code, "root");
 
         code = "bool isCharPotentialOperator(char ch)  {\n"
                "    return (ispunct((unsigned char) ch)\n"
@@ -7276,7 +8194,7 @@ class TestValueFlow : public TestFixture {
                "            && ch != '#' && ch != '\\\\'\n"
                "            && ch != '\\\'' && ch != '\\\"');\n"
                "}\n";
-        valueOfTok(code, "return");
+        (void)valueOfTok(code, "return");
 
         code = "void heapSort() {\n"
                "    int n = m_size;\n"
@@ -7284,12 +8202,12 @@ class TestValueFlow : public TestFixture {
                "        swap(0, n - 1);\n"
                "    }\n"
                "}\n";
-        valueOfTok(code, "swap");
+        (void)valueOfTok(code, "swap");
 
         code = "double a;\n"
                "int b, c, d, e, f, g;\n"
                "void h() { double i, j = i = g = f = e = d = c = b = a; }\n";
-        valueOfTok(code, "a");
+        (void)valueOfTok(code, "a");
 
         code = "double a, c;\n"
                "double *b;\n"
@@ -7299,7 +8217,7 @@ class TestValueFlow : public TestFixture {
                "  b[1] = a;\n"
                "  a;\n"
                "}\n";
-        valueOfTok(code, "a");
+        (void)valueOfTok(code, "a");
 
         code = "void f(int i, int j, int n) {\n"
                "    if ((j == 0) != (i == 0)) {}\n"
@@ -7310,7 +8228,7 @@ class TestValueFlow : public TestFixture {
                "            n = j;\n"
                "    }\n"
                "}\n";
-        valueOfTok(code, "i");
+        (void)valueOfTok(code, "i");
 
         code = "void f() {\n" // #11701
                "    std::vector<int> v(500);\n"
@@ -7327,7 +8245,23 @@ class TestValueFlow : public TestFixture {
                "            v[i] = 0;\n"
                "    }\n"
                "}\n";
-        valueOfTok(code, "i");
+        (void)valueOfTok(code, "i");
+
+        code = "void f() {\n"
+               "    if (llabs(0x80000000ffffffffL) == 0x7fffffff00000001L) {}\n"
+               "}\n";
+        (void)valueOfTok(code, "f");
+
+        code = "struct T {\n"
+               "    T();\n"
+               "    static T a[6][64];\n"
+               "    static T b[2][64];\n"
+               "    static T c[64][64];\n"
+               "    static T d[2][64];\n"
+               "    static T e[64];\n"
+               "    static T f[64];\n"
+               "};\n";
+        (void)valueOfTok(code, "(");
     }
 
     void valueFlowCrashConstructorInitialization() { // #9577
@@ -7342,7 +8276,7 @@ class TestValueFlow : public TestFixture {
                "    {\n"
                "    }\n"
                "}";
-        valueOfTok(code, "path");
+        (void)valueOfTok(code, "path");
 
         code = "void Error()\n"
                "{\n"
@@ -7354,7 +8288,28 @@ class TestValueFlow : public TestFixture {
                "    {\n"
                "    }\n"
                "}";
-        valueOfTok(code, "path");
+        (void)valueOfTok(code, "path");
+
+        code = "struct S {\n"
+               "    std::string to_string() const {\n"
+               "        return { this->p , (size_t)this->n };\n"
+               "    }\n"
+               "    const char* p;\n"
+               "    int n;\n"
+               "};\n"
+               "void f(S s, std::string& str) {\n"
+               "    str += s.to_string();\n"
+               "}\n";
+        (void)valueOfTok(code, "s");
+
+        code = "void a(int e, int d, int c, int h) {\n"
+               "  std::vector<int> b;\n"
+               "  std::vector<int> f;\n"
+               "  if (b == f && h)\n"
+               "    return;\n"
+               "  if (b == f && b == f && c && e < d) {}\n"
+               "}\n";
+        (void)valueOfTok(code, "b");
     }
 
     void valueFlowUnknownMixedOperators() {
@@ -7541,6 +8496,40 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(false, testValueOfXImpossible(code, 3U, 1));
     }
 
+    void valueFlowIncDec() {
+        const char *code;
+        std::list<ValueFlow::Value> values;
+
+        // #11591
+        code = "int f() {\n"
+               "    const int a[1] = {};\n"
+               "    unsigned char i = 255;\n"
+               "    ++i;\n"
+               "    return a[i];\n"
+               "}\n";
+        values = tokenValues(code, "i ]");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(0LLU, values.back().intvalue);
+
+        code = "int f() {\n"
+               "    const int a[1] = {};\n"
+               "    unsigned char i = 255;\n"
+               "    return a[++i];\n"
+               "}\n";
+        values = tokenValues(code, "++");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(0LLU, values.back().intvalue);
+
+        code = "int f() {\n"
+               "     const int a[128] = {};\n"
+               "     char b = -128;\n"
+               "     return a[--b];\n"
+               "}\n";
+        values = tokenValues(code, "--");
+        ASSERT_EQUALS(1U, values.size());
+        ASSERT_EQUALS(127LLU, values.back().intvalue);
+    }
+
     void valueFlowNotNull()
     {
         const char* code;
@@ -8029,6 +9018,31 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(true, testValueOfXImpossible(code, 3U, -1));
     }
 
+    void valueFlowImpossibleIncDec()
+    {
+        const char* code;
+
+        code = "int f() {\n"
+               "    for(int i = 0; i < 5; i++) {\n"
+               "        int x = i;\n"
+               "        return x;\n"
+               "    }\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXImpossible(code, 4U, -1));
+
+        code = "void f(int N, int z) {\n"
+               "  std::vector<int> a(N);\n"
+               "  int m = -1;\n"
+               "  m = 0;\n"
+               "  for (int k = 0; k < N; k++) {\n"
+               "    int x = m + k;\n"
+               "    if (z == a[x]) {}\n"
+               "  }\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfXImpossible(code, 7U, -1));
+        ASSERT_EQUALS(false, testValueOfXKnown(code, 7U, -1));
+    }
+
     void valueFlowImpossibleUnknownConstant()
     {
         const char* code;
@@ -8094,9 +9108,42 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
     }
 
+    void valueFlowBailoutIncompleteVar() {
+        bailout( // #12526
+            "int f1() {\n"
+            "    return VALUE_1;\n"
+            "}\n"
+            "\n"
+            "int f2() {\n"
+            "    return VALUE_2;\n"
+            "}\n"
+            );
+        ASSERT_EQUALS_WITHOUT_LINENUMBERS(
+            "[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() {
-        Settings s(settings);
-        s.performanceValueFlowMaxIfCount = 1;
+        /*const*/ Settings s(settings);
+        s.vfOptions.maxIfCount = 1;
 
         const char *code;
 
@@ -8120,6 +9167,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);";
+        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 1fdd495e782..de8a58cfa61 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-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
@@ -16,25 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "errortypes.h"
-#include "mathlib.h"
+#include "helpers.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
 #include "fixture.h"
 #include "token.h"
-#include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <cstddef>
 #include <string>
 
-
 class TestVarID : public TestFixture {
 public:
     TestVarID() : TestFixture("TestVarID") {}
 
 private:
-    Settings settings = settingsBuilder().c(Standards::C89).cpp(Standards::CPPLatest).checkUnusedTemplates().platform(cppcheck::Platform::Type::Unix64).build();
+    const Settings settings = settingsBuilder().c(Standards::C89).platform(Platform::Type::Unix64).build();
     void run() override {
         TEST_CASE(varid1);
         TEST_CASE(varid2);
@@ -45,6 +42,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid7);
         TEST_CASE(varidReturn1);
         TEST_CASE(varidReturn2);
+        TEST_CASE(varidReturn3);
         TEST_CASE(varid8);
         TEST_CASE(varid9);
         TEST_CASE(varid10);
@@ -95,15 +93,22 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid61); // #4988 inline function
         TEST_CASE(varid62);
         TEST_CASE(varid63);
-        TEST_CASE(varid64); // #9928 - extern const char (*x[256])
+        TEST_CASE(varid64); // #9922 - extern const char (*x[256])
         TEST_CASE(varid65); // #10936
         TEST_CASE(varid66);
         TEST_CASE(varid67); // #11711 - NOT function pointer
         TEST_CASE(varid68); // #11740 - switch (str_chars(&strOut)[0])
+        TEST_CASE(varid69);
+        TEST_CASE(varid70); // #12660 - function
+        TEST_CASE(varid71); // #12676 - wrong varid in uninstantiated templated constructor
+        TEST_CASE(varid72);
         TEST_CASE(varid_for_1);
         TEST_CASE(varid_for_2);
+        TEST_CASE(varid_for_3);
         TEST_CASE(varid_cpp_keywords_in_c_code);
         TEST_CASE(varid_cpp_keywords_in_c_code2); // #5373: varid=0 for argument called "delete"
+        TEST_CASE(varid_cpp_keywords_in_c_code3);
+        TEST_CASE(varid_cpp_keywords_in_c_code4);
         TEST_CASE(varidFunctionCall1);
         TEST_CASE(varidFunctionCall2);
         TEST_CASE(varidFunctionCall3);
@@ -141,11 +146,15 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid_in_class23);    // #11293
         TEST_CASE(varid_in_class24);
         TEST_CASE(varid_in_class25);
+        TEST_CASE(varid_in_class26);
+        TEST_CASE(varid_in_class27);
+        TEST_CASE(varid_in_class28);
         TEST_CASE(varid_namespace_1);   // #7272
         TEST_CASE(varid_namespace_2);   // #7000
         TEST_CASE(varid_namespace_3);   // #8627
         TEST_CASE(varid_namespace_4);
         TEST_CASE(varid_namespace_5);
+        TEST_CASE(varid_namespace_6);
         TEST_CASE(varid_initList);
         TEST_CASE(varid_initListWithBaseTemplate);
         TEST_CASE(varid_initListWithScope);
@@ -232,21 +241,56 @@ 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);
+        TEST_CASE(exprid4);
+        TEST_CASE(exprid5);
+        TEST_CASE(exprid6);
+        TEST_CASE(exprid7);
+        TEST_CASE(exprid8);
+        TEST_CASE(exprid9);
+        TEST_CASE(exprid10);
+        TEST_CASE(exprid11);
+        TEST_CASE(exprid12);
+        TEST_CASE(exprid13);
+        TEST_CASE(exprid14);
 
         TEST_CASE(structuredBindings);
     }
 
+    struct TokenizeOptions
+    {
+        bool cpp = true;
+    };
+
 #define tokenize(...) tokenize_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenize_(const char* file, int line, const char code[], const char filename[] = "test.cpp", const Settings *s = nullptr) {
-        errout.str("");
+    template<size_t size>
+    std::string tokenize_(const char* file, int line, const char (&code)[size], const TokenizeOptions& options = make_default_obj()) {
+        return tokenize_(file, line, code, settings, options.cpp);
+    }
 
-        const Settings *settings1 = s ? s : &settings;
+    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);
 
-        Tokenizer tokenizer(settings1, this);
-        std::istringstream istr(code);
-        ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
+        // result..
+        Token::stringifyOptions str_options = Token::stringifyOptions::forDebugVarId();
+        str_options.files = false;
+        return tokenizer.tokens()->stringifyList(str_options);
+    }
+
+#define tokenizeHeader(...) tokenizeHeader_(__FILE__, __LINE__, __VA_ARGS__)
+    template<size_t size>
+    std::string tokenizeHeader_(const char* file, int line, const char (&code)[size], const char filename[]) {
+        SimpleTokenizer tokenizer{settings, *this, std::string(filename)};
+        ASSERT_LOC((tokenizer.tokenize)(code), file, line);
 
         // result..
         Token::stringifyOptions options = Token::stringifyOptions::forDebugVarId();
@@ -255,12 +299,11 @@ class TestVarID : public TestFixture {
     }
 
 #define tokenizeExpr(...) tokenizeExpr_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string tokenizeExpr_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
-        errout.str("");
+    template<size_t size>
+    std::string tokenizeExpr_(const char* file, int line, const char (&code)[size]) {
+        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
 
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
+        ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
         // result..
         Token::stringifyOptions options = Token::stringifyOptions::forDebugExprId();
@@ -269,12 +312,10 @@ class TestVarID : public TestFixture {
     }
 
 #define compareVaridsForVariable(...) compareVaridsForVariable_(__FILE__, __LINE__, __VA_ARGS__)
-    std::string compareVaridsForVariable_(const char* file, int line, const char code[], const char varname[], const char filename[] = "test.cpp") {
-        errout.str("");
-
-        Tokenizer tokenizer(&settings, this);
-        std::istringstream istr(code);
-        ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
+    template<size_t size>
+    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;
         for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) {
@@ -299,7 +340,7 @@ class TestVarID : public TestFixture {
                 "    for (int i = 0; i < 10; ++i)\n"
                 "        i = 3;\n"
                 "    i = 4;\n"
-                "}\n", "test.c");
+                "}\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: static int i@1 = 1 ;\n"
                                     "2: void f ( )\n"
@@ -324,7 +365,7 @@ class TestVarID : public TestFixture {
                 "      i = 3;\n"
                 "    }\n"
                 "    i = 4;\n"
-                "}\n", "test.c");
+                "}\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: static int i@1 = 1 ;\n"
                                     "2: void f ( )\n"
@@ -348,7 +389,7 @@ class TestVarID : public TestFixture {
             "    struct ABC abc;\n"
             "    abc.a = 3;\n"
             "    i = abc.a;\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -367,7 +408,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    char str[10];\n"
             "    str[0] = 0;\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: static char str@1 [ 4 ] ;\n"
                                 "2: void f ( )\n"
@@ -384,7 +425,7 @@ class TestVarID : public TestFixture {
             "void f(const unsigned int a[])\n"
             "{\n"
             "    int i = *(a+10);\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void f ( const unsigned int a@1 [ ] )\n"
                                 "2: {\n"
@@ -399,7 +440,7 @@ class TestVarID : public TestFixture {
             "void f()\n"
             "{\n"
             "    int a,b;\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -415,7 +456,7 @@ class TestVarID : public TestFixture {
             "int f(int a, int b)\n"
             "{\n"
             "    return a+b;\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: int f ( int a@1 , int b@2 )\n"
                                 "2: {\n"
@@ -433,7 +474,7 @@ class TestVarID : public TestFixture {
             "    {\n"
             "        char b[256] = \"test\";\n"
             "    }\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void func ( ) {\n"
                                 "2: char a@1 [ 256 ] = \"test\" ;\n"
@@ -451,7 +492,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int a;\n"
             "    return a;\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: int f ( )\n"
                                 "2: {\n"
@@ -468,7 +509,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    unsigned long mask = (1UL << size_) - 1;\n"
             "    return (abits_val_ & mask);\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -479,6 +520,21 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, actual);
     }
 
+    void varidReturn3() {
+        const std::string actual = tokenize(
+            "struct S { int i; };\n"
+            "int f(S s) {\n"
+            "    return (&s)->i;\n"
+            "}\n");
+
+        const char expected[] = "1: struct S { int i@1 ; } ;\n"
+                                "2: int f ( S s@2 ) {\n"
+                                "3: return s@2 . i@3 ;\n"
+                                "4: }\n";
+
+        ASSERT_EQUALS(expected, actual);
+    }
+
     void varid8() {
         const std::string actual = tokenize(
             "void func()\n"
@@ -498,7 +554,7 @@ class TestVarID : public TestFixture {
 
     void varid9() {
         const std::string actual = tokenize(
-            "typedef int INT32;\n", "test.c");
+            "typedef int INT32;\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: ;\n";
 
@@ -511,7 +567,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int abc;\n"
             "    struct abc abc1;\n"
-            "}", "test.c");
+            "}", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -551,7 +607,7 @@ class TestVarID : public TestFixture {
             "{\n"
             "    int a; int b;\n"
             "    a = a;\n"
-            "}\n", "test.c");
+            "}\n", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void f ( )\n"
                                 "2: {\n"
@@ -570,7 +626,7 @@ class TestVarID : public TestFixture {
             "A a;\n"
             "B b;\n"
             "b * a;\n"
-            "}", "test.c");
+            "}", dinit(TokenizeOptions, $.cpp = false));
 
         const char expected[] = "1: void foo ( )\n"
                                 "2: {\n"
@@ -588,7 +644,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "} s;", "test.c");
+                "} s;", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -603,7 +659,7 @@ class TestVarID : public TestFixture {
                 "struct S {\n"
                 "    struct T {\n"
                 "    } t;\n"
-                "};", "test.c");
+                "};", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: struct S {\n"
                                     "2: struct T {\n"
@@ -627,7 +683,7 @@ class TestVarID : public TestFixture {
                                 "4: y = z * x@1 ;\n"
                                 "5: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid17() { // ticket #1810
@@ -643,7 +699,7 @@ class TestVarID : public TestFixture {
                                 "4: return c@1 ;\n"
                                 "5: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid18() {
@@ -743,7 +799,7 @@ class TestVarID : public TestFixture {
     }
 
     void varid28() { // ticket #2630 (segmentation fault)
-        ASSERT_THROW(tokenize("template <typedef A>\n"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenize("template <typedef A>\n"), SYNTAX);
     }
 
     void varid29() {
@@ -767,7 +823,7 @@ class TestVarID : public TestFixture {
                                  "3: EventPtr event@3 ; event@3 = * eventP@1 ;\n"
                                  "4: * actionsP@2 = & event@3 . actions@4 ;\n"
                                  "5: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.c"));
+        ASSERT_EQUALS(expected1, tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
 
         const char code2[] = "void f(int b, int c) {\n"
                              "    x(a*b*c,10);\n"
@@ -775,7 +831,7 @@ class TestVarID : public TestFixture {
         const char expected2[] = "1: void f ( int b@1 , int c@2 ) {\n"
                                  "2: x ( a * b@1 * c@2 , 10 ) ;\n"
                                  "3: }\n";
-        ASSERT_EQUALS(expected2, tokenize(code2, "test.c"));
+        ASSERT_EQUALS(expected2, tokenize(code2, dinit(TokenizeOptions, $.cpp = false)));
 
         const char code3[] = "class Nullpointer : public ExecutionPath\n"
                              " {\n"
@@ -810,7 +866,7 @@ class TestVarID : public TestFixture {
                                 "6: int a@1 ;\n"
                                 "7: } ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varid35() { // function declaration inside function body
@@ -849,8 +905,8 @@ class TestVarID : public TestFixture {
     void varid36() { // ticket #2980 (segmentation fault)
         const char code[] ="#elif A\n"
                             "A,a<b<x0\n";
-        tokenize(code);
-        ASSERT_EQUALS("", errout.str());
+        (void)tokenize(code);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void varid37() {
@@ -886,7 +942,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] = "static int const SZ = 22;\n";
             ASSERT_EQUALS("1: static const int SZ@1 = 22 ;\n",
-                          tokenize(code, "test.c"));
+                          tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
         }
     }
 
@@ -900,12 +956,12 @@ class TestVarID : public TestFixture {
         const char code1[] = "union evt; void f(const evt & event);";
         ASSERT_EQUALS("1: union evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code1));
-        ASSERT_THROW(tokenize(code1, "test.c"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenize(code1, dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
 
         const char code2[] = "struct evt; void f(const evt & event);";
         ASSERT_EQUALS("1: struct evt ; void f ( const evt & event@1 ) ;\n",
                       tokenize(code2));
-        ASSERT_THROW(tokenize(code2, "test.c"), InternalError);
+        ASSERT_THROW_INTERNAL(tokenize(code2, dinit(TokenizeOptions, $.cpp = false)), SYNTAX);
     }
 
     void varid42() {
@@ -925,7 +981,7 @@ class TestVarID : public TestFixture {
     void varid43() {
         const char code[] ="int main(int flag) { if(a & flag) { return 1; } }";
         ASSERT_EQUALS("1: int main ( int flag@1 ) { if ( a & flag@1 ) { return 1 ; } }\n",
-                      tokenize(code, "test.c"));
+                      tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid44() {
@@ -943,7 +999,7 @@ class TestVarID : public TestFixture {
     void varid46() { // #3756
         const char code[] ="void foo() { int t; x = (struct t *)malloc(); f(t); }";
         ASSERT_EQUALS("1: void foo ( ) { int t@1 ; x = ( struct t * ) malloc ( ) ; f ( t@1 ) ; }\n",
-                      tokenize(code, "test.c"));
+                      tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid47() { // function parameters
@@ -951,7 +1007,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] ="void f(std::string &string, std::string &len) {}";
             ASSERT_EQUALS("1: void f ( std :: string & string@1 , std :: string & len@2 ) { }\n",
-                          tokenize(code, "test.cpp"));
+                          tokenize(code));
         }
 
         // #4729
@@ -975,19 +1031,19 @@ class TestVarID : public TestFixture {
     void varid49() {  // #3799 - void f(std::vector<int>)
         const char code[] ="void f(std::vector<int>)";
         ASSERT_EQUALS("1: void f ( std :: vector < int > )\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code));
     }
 
     void varid50() {  // #3760 - explicit
         const char code[] ="class A { explicit A(const A&); };";
         ASSERT_EQUALS("1: class A { explicit A ( const A & ) ; } ;\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code));
     }
 
     void varid51() {  // don't set varid on template function
         const char code[] ="T t; t.x<0>();";
         ASSERT_EQUALS("1: T t@1 ; t@1 . x < 0 > ( ) ;\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code));
     }
 
     void varid52() {
@@ -997,17 +1053,17 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS("1: A < B < C > :: D > e@1 ;\n"
                       "2: B < C < > > b@2 [ 10 ] ;\n"
                       "3: B < C < > > c@3 [ 10 ] ;\n",
-                      tokenize(code, "test.cpp"));
+                      tokenize(code));
     }
 
     void varid53() { // #4172 - Template instantiation: T<&functionName> list[4];
         ASSERT_EQUALS("1: A < & f > list@1 [ 4 ] ;\n",
-                      tokenize("A<&f> list[4];", "test.cpp"));
+                      tokenize("A<&f> list[4];"));
     }
 
     void varid54() { // hang
         // Original source code: libgc
-        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); }");
     }
 
     void varid55() { // Ticket #5868
@@ -1026,7 +1082,7 @@ class TestVarID : public TestFixture {
                                 "void baz2 ( struct foo & foo@4 ) { } "
                                 "void bar3 ( struct foo * foo@5 ) { } "
                                 "void baz3 ( struct foo * foo@6 ) { }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid56() { // Ticket #6548 - function with a throw()
@@ -1035,42 +1091,42 @@ class TestVarID : public TestFixture {
         const char expected1[] = "1: "
                                  "void fred ( int x@1 ) throw ( ) { } "
                                  "void wilma ( ) { x ++ ; }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        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";
-        ASSERT_EQUALS(expected2, tokenize(code2, "test.cpp"));
+        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";
-        ASSERT_EQUALS(expected3, tokenize(code3, "test.cpp"));
+        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";
-        ASSERT_EQUALS(expected4, tokenize(code4, "test.cpp"));
+        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";
-        ASSERT_EQUALS(expected5, tokenize(code5, "test.cpp"));
+        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";
-        ASSERT_EQUALS(expected6, tokenize(code6, "test.cpp"));
+        ASSERT_EQUALS(expected6, tokenize(code6));
     }
 
     void varid57() { // #6636: new scope by {}
@@ -1100,7 +1156,7 @@ class TestVarID : public TestFixture {
                                  "11: }\n"
                                  "12:\n"
                                  "13: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1));
     }
 
     void varid58() { // #6638: for loop in for condition
@@ -1118,7 +1174,7 @@ class TestVarID : public TestFixture {
                                  "5: i@1 ++ ;\n"
                                  "6: }\n"
                                  "7: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1));
     }
 
     void varid59() { // #6696
@@ -1134,7 +1190,7 @@ class TestVarID : public TestFixture {
                               "2: struct B {\n"
                               "3: ~ B ( ) { }\n"
                               "4: } ;\n";
-        TODO_ASSERT_EQUALS(wanted, expected, tokenize(code, "test.cpp"));
+        TODO_ASSERT_EQUALS(wanted, expected, tokenize(code));
     }
 
     void varid60() { // #7267 - cast
@@ -1223,7 +1279,7 @@ class TestVarID : public TestFixture {
                              "_Generic(*x, int: foo, default: bar)();";
         const char expected1[] = "1: int * x@1 ;\n"
                                  "2: _Generic ( * x@1 , int : foo , default : bar ) ( ) ;\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.c"));
+        ASSERT_EQUALS(expected1, tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid68() { // #11740
@@ -1237,8 +1293,117 @@ class TestVarID : public TestFixture {
                                  "3: void f ( struct S strOut@2 ) {\n"
                                  "4: switch ( str_chars ( & strOut@2 ) [ 0 ] ) { }\n"
                                  "5: }\n";
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.c"));
-        ASSERT_EQUALS(expected1, tokenize(code1, "test.cpp"));
+        ASSERT_EQUALS(expected1, tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
+        ASSERT_EQUALS(expected1, tokenize(code1));
+    }
+
+    void varid69() {
+        const char code1[] = "void f() {\n"
+                             "    auto g = [](int&, int& r, int i) {};\n"
+                             "}";
+        const char expected1[] = "1: void f ( ) {\n"
+                                 "2: auto g@1 ; g@1 = [ ] ( int & , int & r@2 , int i@3 ) { } ;\n"
+                                 "3: }\n";
+        ASSERT_EQUALS(expected1, tokenize(code1));
+    }
+
+    void varid70() {
+        // isFunctionHead
+        const char code1[] = "int x = 1 ? (1 << 0) : 0;\n"
+                             "void foo(bool init);\n"
+                             "void init();\n";
+        const char expected1[] = "1: int x@1 ; x@1 = 1 ? ( 1 << 0 ) : 0 ;\n"
+                                 "2: void foo ( bool init@2 ) ;\n"
+                                 "3: void init ( ) ;\n";
+        ASSERT_EQUALS(expected1, tokenize(code1));
+
+        const char code2[] = "int x = 1 ? f(1 << 0) : 0;\n"
+                             "void foo(bool init);\n"
+                             "void init();\n";
+        const char expected2[] = "1: int x@1 ; x@1 = 1 ? f ( 1 << 0 ) : 0 ;\n"
+                                 "2: void foo ( bool init@2 ) ;\n"
+                                 "3: void init ( ) ;\n";
+        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";
+        ASSERT_EQUALS(expected3, tokenize(code3));
+
+        const char code4[] = "_Static_assert(sizeof((struct S){0}.i) == 4);\n"; // #12729
+        const char expected4[] = "1: _Static_assert ( sizeof ( ( struct S ) { 0 } . i ) == 4 ) ;\n";
+        ASSERT_EQUALS(expected4, tokenize(code4, dinit(TokenizeOptions, $.cpp = false)));
+    }
+
+    void varid71() {
+        const char code[] = "namespace myspace {\n"
+                            "\n"
+                            "template <typename T>\n"
+                            "class CounterTest {\n"
+                            "public:\n"
+                            "  CounterTest(T _obj);\n"
+                            "  template <typename T2>\n"
+                            "  CounterTest(const CounterTest<T2>& ptr);\n"
+                            "  T obj;\n"
+                            "  int count;\n"
+                            "};\n"
+                            "\n"
+                            "template <typename T>\n"
+                            "CounterTest<T>::CounterTest(T _obj) : obj(_obj) {\n"
+                            "  count = 0;\n"
+                            "}\n"
+                            "\n"
+                            "template <typename T>\n"
+                            "template <typename T2>\n"
+                            "CounterTest<T>::CounterTest(const CounterTest<T2>& p) : obj(0) {\n"
+                            "  count = p.count;\n"
+                            "}\n"
+                            "\n"
+                            "}\n"
+                            "\n"
+                            "using namespace myspace;\n"
+                            "CounterTest<int> myobj(0);\n";
+        const char expected[] = "1: namespace myspace {\n"
+                                "2:\n"
+                                "3: class CounterTest<int> ;\n"
+                                "4:\n"
+                                "|\n"
+                                "17:\n"
+                                "18: template < typename T >\n"
+                                "19: template < typename T2 >\n"
+                                "20: CounterTest < T > :: CounterTest ( const CounterTest < T2 > & p@1 ) : obj ( 0 ) {\n"
+                                "21: count = p@1 . count@2 ;\n"
+                                "22: }\n"
+                                "23:\n"
+                                "24: }\n"
+                                "25:\n"
+                                "26: using namespace myspace ;\n"
+                                "27: myspace :: CounterTest<int> myobj@3 ( 0 ) ;\n"
+                                "4: class myspace :: CounterTest<int> {\n"
+                                "5: public:\n"
+                                "6: CounterTest<int> ( int _obj@4 ) ;\n"
+                                "7: template < typename T2 >\n"
+                                "8: CounterTest<int> ( const myspace :: CounterTest < T2 > & ptr@5 ) ;\n"
+                                "9: int obj@6 ;\n"
+                                "10: int count@7 ;\n"
+                                "11: } ;\n"
+                                "12:\n"
+                                "13:\n"
+                                "14: myspace :: CounterTest<int> :: CounterTest<int> ( int _obj@8 ) : obj@6 ( _obj@8 ) {\n"
+                                "15: count@7 = 0 ;\n"
+                                "16: }\n"
+                                "17:\n"
+                                "18:\n"
+                                "19:\n"
+                                "20: myspace :: CounterTest<int> :: CounterTest<int> ( const myspace :: CounterTest < T2 > & p@9 ) : obj@6 ( 0 ) {\n"
+                                "21: count@7 = p@9 . count@10 ;\n"
+                                "22: }\n";
+        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 varid_for_1() {
@@ -1261,6 +1426,28 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varid_for_3() {
+        const char code[] = "void f(int w, int h) {\n" // #13670
+                            "    for (int a[2] = { 2, w / 2 }, b = 2; a[1] && a[0] <= h; a[1] /= 2, a[0] *= 2) {}\n"
+                            "}\n";
+        const char expected[] = "1: void f ( int w@1 , int h@2 ) {\n"
+                                "2: for ( int a@3 [ 2 ] = { 2 , w@1 / 2 } , b@4 = 2 ; a@3 [ 1 ] && a@3 [ 0 ] <= h@2 ; a@3 [ 1 ] /= 2 , a@3 [ 0 ] *= 2 ) { }\n"
+                                "3: }\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+
+        const char code2[] = "void f() {\n"
+                             "    for (int a(1), b{ 2 }, c = 3; a < b + c; ++a) {}\n"
+                             "    for (int a{ 1 }, b(2), c = 3; a < b + c; ++a) {}\n"
+                             "    for (int a = 1, b{ 2 }, c(3); a < b + c; ++a) {}\n"
+                             "}\n";
+        const char expected2[] = "1: void f ( ) {\n"
+                                 "2: for ( int a@1 ( 1 ) , b@2 { 2 } , c@3 = 3 ; a@1 < b@2 + c@3 ; ++ a@1 ) { }\n"
+                                 "3: for ( int a@4 { 1 } , b@5 ( 2 ) , c@6 = 3 ; a@4 < b@5 + c@6 ; ++ a@4 ) { }\n"
+                                 "4: for ( int a@7 = 1 , b@8 { 2 } , c@9 ( 3 ) ; a@7 < b@8 + c@9 ; ++ a@7 ) { }\n"
+                                 "5: }\n";
+        ASSERT_EQUALS(expected2, tokenize(code2));
+    }
+
     void varid_cpp_keywords_in_c_code() {
         const char code[] = "void f() {\n"
                             "    delete d;\n"
@@ -1272,7 +1459,7 @@ class TestVarID : public TestFixture {
                                 "3: throw t@2 ;\n"
                                 "4: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid_cpp_keywords_in_c_code2() { // #5373
@@ -1285,7 +1472,24 @@ class TestVarID : public TestFixture {
                             "  return clear_extent_bit(tree, start, end, EXTENT_DIRTY | EXTENT_DELALLOC | "
                             "                          EXTENT_DO_ACCOUNTING, 0, 0, NULL, mask);\n"
                             "}";
-        tokenize(code, "test.c");
+        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 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;";
+            ASSERT_THROW_INTERNAL_EQUALS(tokenize(code, dinit(TokenizeOptions, $.cpp = true)), INTERNAL, "Internal error. VarId set for bool literal.");
+        }
+        {
+            const char code[] = "int false = 0;";
+            ASSERT_EQUALS("1: int false@1 ; false@1 = 0 ;\n", tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
+        }
     }
 
     void varidFunctionCall1() {
@@ -1297,7 +1501,7 @@ class TestVarID : public TestFixture {
                                 "2: int x@1 ;\n"
                                 "3: x@1 = a ( y * x@1 , 10 ) ;\n"
                                 "4: }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varidFunctionCall2() {
@@ -1309,7 +1513,7 @@ class TestVarID : public TestFixture {
                                     "2: x ( a * b");
         const std::string expected2(" , 10 ) ;\n"
                                     "3: }\n");
-        ASSERT_EQUALS(expected1+"@1"+expected2, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected1+"@1"+expected2, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varidFunctionCall3() {
@@ -1331,16 +1535,16 @@ class TestVarID : public TestFixture {
         // Ticket #3280
         const char code1[] = "void f() { int x; fun(a,b*x); }";
         ASSERT_EQUALS("1: void f ( ) { int x@1 ; fun ( a , b * x@1 ) ; }\n",
-                      tokenize(code1, "test.c"));
+                      tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
         const char code2[] = "void f(int a) { int x; fun(a,b*x); }";
         ASSERT_EQUALS("1: void f ( int a@1 ) { int x@2 ; fun ( a@1 , b * x@2 ) ; }\n",
-                      tokenize(code2, "test.c"));
+                      tokenize(code2, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varidFunctionCall5() {
         const char code[] = "void foo() { (f(x[2]))(x[2]); }";
         ASSERT_EQUALS("1: void foo ( ) { f ( x [ 2 ] ) ( x [ 2 ] ) ; }\n",
-                      tokenize(code, "test.c"));
+                      tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varidStl() {
@@ -1402,7 +1606,7 @@ class TestVarID : public TestFixture {
         {
             const std::string actual = tokenize(
                 "void f();\n"
-                "void f(){}\n", "test.c");
+                "void f(){}\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: void f ( ) ;\n"
                                     "2: void f ( ) { }\n";
@@ -1415,7 +1619,7 @@ class TestVarID : public TestFixture {
                 "A f(3);\n"
                 "A f2(true);\n"
                 "A g();\n"
-                "A e(int c);\n", "test.c");
+                "A e(int c);\n", dinit(TokenizeOptions, $.cpp = false));
 
             const char expected[] = "1: A f@1 ( 3 ) ;\n"
                                     "2: A f2@2 ( true ) ;\n"
@@ -1457,22 +1661,52 @@ class TestVarID : public TestFixture {
         }
 
         {
-            const std::string actual = tokenize("void f(struct foobar);", "test.c");
+            const std::string actual = tokenize("void f(struct foobar);", 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);", "test.cpp");
+            const std::string actual = tokenize("bool f(X x, int=3);");
             const char expected[] = "1: bool f ( X x@1 , int = 3 ) ;\n";
             ASSERT_EQUALS(expected, actual);
         }
+
+        {
+            const std::string actual = tokenize("int main() {\n"
+                                                "    int a[2];\n"
+                                                "    extern void f(int a[2]);\n"
+                                                "    f(a);\n"
+                                                "    a[0] = 0;\n"
+                                                "}\n");
+            const char expected[] = "1: int main ( ) {\n"
+                                    "2: int a@1 [ 2 ] ;\n"
+                                    "3: extern void f ( int a [ 2 ] ) ;\n"
+                                    "4: f ( a@1 ) ;\n"
+                                    "5: a@1 [ 0 ] = 0 ;\n"
+                                    "6: }\n";
+            ASSERT_EQUALS(expected, actual);
+        }
+
+        {
+            const std::string actual = tokenize("void f(int n) {\n" // #12537
+                                                "    int n1;\n"
+                                                "    void g(int is, int n1);\n"
+                                                "    n1 = n - 1;\n"
+                                                "}\n");
+            const char expected[] = "1: void f ( int n@1 ) {\n"
+                                    "2: int n1@2 ;\n"
+                                    "3: void g ( int is , int n1 ) ;\n"
+                                    "4: n1@2 = n@1 - 1 ;\n"
+                                    "5: }\n";
+            ASSERT_EQUALS(expected, actual);
+        }
     }
 
     void varid_sizeof() {
         const char code[] = "x = sizeof(a*b);";
         const char expected[] = "1: x = sizeof ( a * b ) ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid_reference_to_containers() {
@@ -1786,15 +2020,15 @@ class TestVarID : public TestFixture {
     void varid_in_class13() {
         const char code1[] = "struct a { char typename; };";
         ASSERT_EQUALS("1: struct a { char typename@1 ; } ;\n",
-                      tokenize(code1, "test.c"));
+                      tokenize(code1, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("1: struct a { char typename ; } ;\n",  // not valid C++ code
-                      tokenize(code1, "test.cpp"));
+                      tokenize(code1));
 
         const char code2[] = "struct a { char typename[2]; };";
         ASSERT_EQUALS("1: struct a { char typename@1 [ 2 ] ; } ;\n",
-                      tokenize(code2, "test.c"));
+                      tokenize(code2, dinit(TokenizeOptions, $.cpp = false)));
         ASSERT_EQUALS("1: struct a { char typename [ 2 ] ; } ;\n",  // not valid C++ code
-                      tokenize(code2, "test.cpp"));
+                      tokenize(code2));
     }
 
     void varid_in_class14() {
@@ -1811,7 +2045,7 @@ class TestVarID : public TestFixture {
                       "4: std :: list < int > x@2 ;\n"
                       "5: list@1 . do_something ( ) ;\n"
                       "6: Tokenizer :: list@1 . do_something ( ) ;\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code));
     }
 
     void varid_in_class15() { // #5533 - functions
@@ -1822,7 +2056,7 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS("1: class Fred {\n"
                       "2: void x ( int a@1 ) const ;\n"
                       "3: void y ( ) { a = 0 ; }\n"
-                      "4: }\n", tokenize(code, "test.cpp"));
+                      "4: }\n", tokenize(code));
     }
 
     void varid_in_class16() { // Set varId for inline member functions
@@ -1834,7 +2068,7 @@ class TestVarID : public TestFixture {
             ASSERT_EQUALS("1: class Fred {\n"
                           "2: int x@1 ;\n"
                           "3: void foo ( int x@2 ) { this . x@1 = x@2 ; }\n"
-                          "4: } ;\n", tokenize(code, "test.cpp"));
+                          "4: } ;\n", tokenize(code));
         }
         {
             const char code[] = "class Fred {\n"
@@ -1844,7 +2078,7 @@ class TestVarID : public TestFixture {
             ASSERT_EQUALS("1: class Fred {\n"
                           "2: void foo ( int x@1 ) { this . x@2 = x@1 ; }\n"
                           "3: int x@2 ;\n"
-                          "4: } ;\n", tokenize(code, "test.cpp"));
+                          "4: } ;\n", tokenize(code));
         }
         {
             const char code[] = "class Fred {\n"
@@ -1854,7 +2088,7 @@ class TestVarID : public TestFixture {
             ASSERT_EQUALS("1: class Fred {\n"
                           "2: void foo ( int x@1 ) { ( * this ) . x@2 = x@1 ; }\n"
                           "3: int x@2 ;\n"
-                          "4: } ;\n", tokenize(code, "test.cpp"));
+                          "4: } ;\n", tokenize(code));
         }
     }
 
@@ -1882,7 +2116,7 @@ class TestVarID : public TestFixture {
                       "9: FOO Set ( BAR ) ;\n"
                       "10: int method_with_class ( B < B > b@3 ) ;\n"
                       "11: bool function ( std :: map < int , int , MYless > & m@4 ) ;\n"
-                      "12: } ;\n", tokenize(code1, "test.cpp"));
+                      "12: } ;\n", tokenize(code1));
 
         const char code2[] = "int i;\n"
                              "SomeType someVar1(i, i);\n"
@@ -1893,7 +2127,7 @@ class TestVarID : public TestFixture {
                       "2: SomeType someVar1@2 ( i@1 , i@1 ) ;\n"
                       "3: SomeType someVar2 ( j , j ) ;\n" // This one could be a function
                       "4: SomeType someVar3@3 ( j , 1 ) ;\n"
-                      "5: SomeType someVar4@4 ( new bar ) ;\n", tokenize(code2, "test.cpp"));
+                      "5: SomeType someVar4@4 ( new bar ) ;\n", tokenize(code2));
     }
 
     void varid_in_class18() {
@@ -1916,7 +2150,7 @@ class TestVarID : public TestFixture {
                       "7: } ;\n"
                       "8: A :: B :: B ( ) :\n"
                       "9: i@1 ( 0 )\n"
-                      "10: { }\n", tokenize(code, "test.cpp"));
+                      "10: { }\n", tokenize(code));
     }
 
     void varid_in_class19() {
@@ -1933,7 +2167,7 @@ class TestVarID : public TestFixture {
                       "4: } ;\n"
                       "5: Fred :: ~ Fred ( ) {\n"
                       "6: free ( str1@1 ) ;\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code));
     }
 
     void varid_in_class20() {
@@ -1953,7 +2187,7 @@ class TestVarID : public TestFixture {
                       "5: cacheEntry ( ) ;\n"
                       "6: } ;\n"
                       "7:\n"
-                      "8: template < class C > cacheEntry < C > :: cacheEntry ( ) : m_key@1 ( ) { }\n", tokenize(code, "test.cpp"));
+                      "8: template < class C > cacheEntry < C > :: cacheEntry ( ) : m_key@1 ( ) { }\n", tokenize(code));
     }
 
     void varid_in_class21() {
@@ -1975,7 +2209,7 @@ class TestVarID : public TestFixture {
                                 "7: template < typename t1 , typename t2 >\n"
                                 "8: A :: B < t1 , t2 > :: B ( ) : x@1 ( 9 ) { }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid_in_class22() {
@@ -1999,7 +2233,7 @@ class TestVarID : public TestFixture {
                                 "8: for ( std :: vector < data > :: const_iterator i@3 = std@1 . begin ( ) ; i@3 != end@2 ; ++ i@3 ) { }\n"
                                 "9: }\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid_in_class23() { // #11293
@@ -2021,68 +2255,129 @@ class TestVarID : public TestFixture {
                                 "7: void f ( ) { b@1 = false ; }\n"
                                 "8: } ;\n";
 
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid_in_class24() {
-        const char *code{}, *expected{};
-
-        code = "class A {\n"
-               "    Q_OBJECT\n"
-               "public:\n"
-               "    using QPtr = QPointer<A>;\n"
-               "};\n";
-        expected = "1: class A {\n"
-                   "2: Q_OBJECT\n"
-                   "3: public:\n"
-                   "4:\n"
-                   "5: } ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
-
-        code = "class A {\n"
-               "    Q_OBJECT\n"
-               "    using QPtr = QPointer<A>;\n"
-               "};\n";
-        expected = "1: class A {\n"
-                   "2: Q_OBJECT\n"
-                   "3:\n"
-                   "4: } ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
+        const char *expected{};
+
+        {
+            const char code[] = "class A {\n"
+                                "    Q_OBJECT\n"
+                                "public:\n"
+                                "    using QPtr = QPointer<A>;\n"
+                                "};\n";
+            expected = "1: class A {\n"
+                       "2: Q_OBJECT\n"
+                       "3: public:\n"
+                       "4:\n"
+                       "5: } ;\n";
+            ASSERT_EQUALS(expected, tokenize(code));
+        }
+
+        {
+            const char code[] = "class A {\n"
+                                "    Q_OBJECT\n"
+                                "    using QPtr = QPointer<A>;\n"
+                                "};\n";
+            expected = "1: class A {\n"
+                       "2: Q_OBJECT\n"
+                       "3:\n"
+                       "4: } ;\n";
+            ASSERT_EQUALS(expected, tokenize(code));
+        }
     }
 
     void varid_in_class25() {
         const Settings s = settingsBuilder(settings).library("std.cfg").build();
 
-        const char *code{}, *expected{};
-        code = "struct F {\n" // #11497
-               "    int i;\n"
-               "    void f(const std::vector<F>&v) {\n"
-               "        if (v.front().i) {}\n"
-               "    }\n"
-               "};\n";
-        expected = "1: struct F {\n"
-                   "2: int i@1 ;\n"
-                   "3: void f ( const std :: vector < F > & v@2 ) {\n"
-                   "4: if ( v@2 . front ( ) . i@3 ) { }\n"
-                   "5: }\n"
-                   "6: } ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.cpp", &s));
-
-        code = "struct T { };\n" // 11533
-               "struct U { T t; };\n"
-               "std::vector<U*>* g();\n"
-               "void f() {\n"
-               "    std::vector<U*>* p = g();\n"
-               "    auto t = p->front()->t;\n"
-               "}\n";
-        expected = "1: struct T { } ;\n"
-                   "2: struct U { T t@1 ; } ;\n"
-                   "3: std :: vector < U * > * g ( ) ;\n"
-                   "4: void f ( ) {\n"
-                   "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, "test.cpp", &s));
+        const char *expected{};
+        {
+            const char code[] = "struct F {\n" // #11497
+                                "    int i;\n"
+                                "    void f(const std::vector<F>&v) {\n"
+                                "        if (v.front().i) {}\n"
+                                "    }\n"
+                                "};\n";
+            expected = "1: struct F {\n"
+                       "2: int i@1 ;\n"
+                       "3: void f ( const std :: vector < F > & v@2 ) {\n"
+                       "4: if ( v@2 . front ( ) . i@3 ) { }\n"
+                       "5: }\n"
+                       "6: } ;\n";
+            ASSERT_EQUALS(expected, tokenize(code, s));
+        }
+
+        {
+            const char code[] = "struct T { };\n" // 11533
+                                "struct U { T t; };\n"
+                                "std::vector<U*>* g();\n"
+                                "void f() {\n"
+                                "    std::vector<U*>* p = g();\n"
+                                "    auto t = p->front()->t;\n"
+                                "}\n";
+            expected = "1: struct T { } ;\n"
+                       "2: struct U { T t@1 ; } ;\n"
+                       "3: std :: vector < U * > * g ( ) ;\n"
+                       "4: void f ( ) {\n"
+                       "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, s));
+        }
+    }
+
+    void varid_in_class26() {
+        const char *expected{}; // #11334
+        const char code[] = "struct S {\n"
+                            "    union {\n"
+                            "        uint8_t u8[4];\n"
+                            "        uint32_t u32;\n"
+                            "    };\n"
+                            "    void f();\n"
+                            "};\n"
+                            "void S::f() {\n"
+                            "    u8[0] = 0;\n"
+                            "}\n";
+        expected = "1: struct S {\n"
+                   "2: union {\n"
+                   "3: uint8_t u8@1 [ 4 ] ;\n"
+                   "4: uint32_t u32@2 ;\n"
+                   "5: } ;\n"
+                   "6: void f ( ) ;\n"
+                   "7: } ;\n"
+                   "8: void S :: f ( ) {\n"
+                   "9: u8@1 [ 0 ] = 0 ;\n"
+                   "10: }\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void varid_in_class27() {
+        const char code[] = "struct S {\n" // #13291
+                            "    int** pp;\n"
+                            "    void f() { int x(*pp[0]); }\n"
+                            "};\n";
+        const char expected[] = "1: struct S {\n"
+                                "2: int * * pp@1 ;\n"
+                                "3: void f ( ) { int x@2 ( * pp@1 [ 0 ] ) ; }\n"
+                                "4: } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
+    void varid_in_class28() {
+        const char code[] = "struct S {\n" // 13725
+                            "    struct T {\n"
+                            "        bool b();\n"
+                            "    };\n"
+                            "    bool b = false;\n"
+                            "};\n";
+        const char expected[] = "1: struct S {\n"
+                                "2: struct T {\n"
+                                "3: bool b ( ) ;\n"
+                                "4: } ;\n"
+                                "5: bool b@1 ; b@1 = false ;\n"
+                                "6: } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
     }
 
     void varid_namespace_1() { // #7272
@@ -2099,7 +2394,7 @@ class TestVarID : public TestFixture {
                       "4: int x@2 ;\n"
                       "5: union { char y@3 ; } ;\n"
                       "6: } ;\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code));
     }
 
     void varid_namespace_2() { // #7000
@@ -2116,13 +2411,13 @@ class TestVarID : public TestFixture {
                             "   X = 0;\n"  // X@2
                             "}";
 
-        const std::string actual = tokenize(code, "test.cpp");
+        const std::string actual = tokenize(code);
 
         ASSERT(actual.find("X@2 = 0") != std::string::npos);
     }
 
     static std::string getLine(const std::string &code, int lineNumber) {
-        std::string nr = MathLib::toString(lineNumber);
+        std::string nr = std::to_string(lineNumber);
         const std::string::size_type pos1 = code.find('\n' + nr + ": ");
         if (pos1 == std::string::npos)
             return "";
@@ -2147,7 +2442,7 @@ class TestVarID : public TestFixture {
                             "}\n"
                             "}";
 
-        const std::string actual = tokenize(code, "test.cpp");
+        const std::string actual = tokenize(code);
 
         ASSERT_EQUALS("5: int type@2 ;", getLine(actual,5));
         ASSERT_EQUALS("11: type@2 = 0 ;", getLine(actual,11));
@@ -2167,7 +2462,7 @@ class TestVarID : public TestFixture {
                       "4: void dostuff ( ) ;\n"
                       "5: } ;\n"
                       "6: void bar :: dostuff ( ) { int x2@2 ; x2@2 = x@1 * 2 ; }\n"
-                      "7: }\n", tokenize(code, "test.cpp"));
+                      "7: }\n", tokenize(code));
     }
 
     void varid_namespace_5() {
@@ -2188,7 +2483,30 @@ class TestVarID : public TestFixture {
                       "6: } ;\n"
                       "7: void bar :: dostuff ( ) { int x2@2 ; x2@2 = x@1 * 2 ; }\n"
                       "8: }\n"
-                      "9: }\n", tokenize(code, "test.cpp"));
+                      "9: }\n", tokenize(code));
+    }
+
+    void varid_namespace_6() {
+        const char code[] = "namespace N {\n" // #12077
+                            "    namespace O {\n"
+                            "        U::U(int* map) : id(0) {\n"
+                            "            this->p = map;\n"
+                            "        }\n"
+                            "        void U::f() {\n"
+                            "            std::map<Vec2i, int>::iterator iter;\n"
+                            "        }\n"
+                            "    }\n"
+                            "}";
+        ASSERT_EQUALS("1: namespace N {\n"
+                      "2: namespace O {\n"
+                      "3: U :: U ( int * map@1 ) : id ( 0 ) {\n"
+                      "4: this . p = map@1 ;\n"
+                      "5: }\n"
+                      "6: void U :: f ( ) {\n"
+                      "7: std :: map < Vec2i , int > :: iterator iter@2 ;\n"
+                      "8: }\n"
+                      "9: }\n"
+                      "10: }\n", tokenize(code));
     }
 
     void varid_initList() {
@@ -2299,6 +2617,60 @@ class TestVarID : public TestFixture {
                       "5: A :: A ( const Matrix & m@3 ) throw ( e ) : work@1 ( 0 )\n"
                       "6: { }\n",
                       tokenize(code10));
+
+        const char code11[] = "struct S {\n" // #12733
+                              "    explicit S(int& r) : a{ int{ 1 } }, b{ r } {}\n"
+                              "    int a, &b;\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"
+                      "4: } ;\n",
+                      tokenize(code11));
+
+        const char code12[] = "template<typename... T>\n" // # 13070
+                              "    struct S1 : T... {\n"
+                              "    constexpr S1(const T& ... p) : T{ p } {}\n"
+                              "};\n"
+                              "namespace p { struct S2 {}; }\n"
+                              "struct S3 {\n"
+                              "    S3() {}\n"
+                              "    bool f(p::S2& c);\n"
+                              "};\n";
+        ASSERT_EQUALS("1: template < typename ... T >\n"
+                      "2: struct S1 : T ... {\n"
+                      "3: constexpr S1 ( const T & ... p@1 ) : T { p@1 } { }\n"
+                      "4: } ;\n"
+                      "5: namespace p { struct S2 { } ; }\n"
+                      "6: struct S3 {\n"
+                      "7: S3 ( ) { }\n"
+                      "8: bool f ( p :: S2 & c@2 ) ;\n"
+                      "9: } ;\n",
+                      tokenize(code12));
+
+        const char code13[] = "template <typename... T>\n" // #13088
+                              "struct B {};\n"
+                              "template <typename... T>\n"
+                              "struct D : B<T>... {\n"
+                              "    template <typename... P>\n"
+                              "    D(P&&... p) : B<T>(std::forward<P>(p))... {}\n"
+                              "};\n"
+                              "template <typename... T>\n"
+                              "struct S {\n"
+                              "    D<T...> d;\n"
+                              "};\n";
+        ASSERT_EQUALS("1: template < typename ... T >\n"
+                      "2: struct B { } ;\n"
+                      "3: template < typename ... T >\n"
+                      "4: struct D : B < T > ... {\n"
+                      "5: template < typename ... P >\n"
+                      "6: D ( P && ... p@1 ) : B < T > ( std :: forward < P > ( p@1 ) ) ... { }\n"
+                      "7: } ;\n"
+                      "8: template < typename ... T >\n"
+                      "9: struct S {\n"
+                      "10: D < T ... > d@2 ;\n"
+                      "11: } ;\n",
+                      tokenize(code13));
     }
 
     void varid_initListWithBaseTemplate() {
@@ -2426,7 +2798,7 @@ class TestVarID : public TestFixture {
                                 "3: AAA\n"
                                 "4: a@1 [ 0 ] = 0 ;\n"
                                 "5: }\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varid_using() {
@@ -2737,14 +3109,30 @@ class TestVarID : public TestFixture {
     }
 
     void varid_header() {
+        ASSERT_EQUALS("1: class A@1 ;\n"
+                      "2: struct B {\n"
+                      "3: void setData ( const A@1 & a ) ;\n"
+                      "4: } ;\n",
+                      tokenizeHeader("class A;\n"
+                                     "struct B {\n"
+                                     "    void setData(const A & a);\n"
+                                     "}; ", "test.h"));
         ASSERT_EQUALS("1: class A ;\n"
                       "2: struct B {\n"
                       "3: void setData ( const A & a@1 ) ;\n"
                       "4: } ;\n",
-                      tokenize("class A;\n"
-                               "struct B {\n"
-                               "    void setData(const A & a);\n"
-                               "}; ", "test.h"));
+                      tokenizeHeader("class A;\n"
+                                     "struct B {\n"
+                                     "    void setData(const A & a);\n"
+                                     "}; ", "test.hpp"));
+        ASSERT_EQUALS("1: void f ( )\n"
+                      "2: {\n"
+                      "3: int class@1 ;\n"
+                      "4: }\n",
+                      tokenizeHeader("void f()\n"
+                                     "{\n"
+                                     "    int class;\n"
+                                     "}", "test.h"));
     }
 
     void varid_rangeBasedFor() {
@@ -2784,7 +3172,18 @@ class TestVarID : public TestFixture {
                                "        delta = 1;\n"
                                "        break;\n"
                                "    }\n"
-                               "}", "test.c"));
+                               "}", dinit(TokenizeOptions, $.cpp = false)));
+
+        ASSERT_EQUALS("1: int * f ( ) {\n" // #11838
+                      "2: int * label@1 ; label@1 = 0 ;\n"
+                      "3: label : ;\n"
+                      "4: return label@1 ;\n"
+                      "5: }\n",
+                      tokenize("int* f() {\n"
+                               "    int* label = 0;\n"
+                               "label:\n"
+                               "    return label;\n"
+                               "}"));
     }
 
     void varid_structinit() { // #6406
@@ -2808,10 +3207,38 @@ class TestVarID : public TestFixture {
                       tokenize("void foo() {\n"
                                "  struct ABC abc = {.a { abc.a },.b= { abc.b } };\n"
                                "}"));
+
+        ASSERT_EQUALS("1: struct T { int a@1 ; } ;\n" // #13123
+                      "2: void f ( int a@2 ) {\n"
+                      "3: struct T t@3 ; t@3 = { . a@4 = 1 } ;\n"
+                      "4: }\n",
+                      tokenize("struct T { int a; };\n"
+                               "void f(int a) {\n"
+                               "    struct T t = { .a = 1 };\n"
+                               "}\n"));
+
+        ASSERT_EQUALS("1: struct S { int x@1 ; } ;\n" // TODO: set some varid for designated initializer?
+                      "2: void f0 ( S s@2 ) ;\n"
+                      "3: void f1 ( int n@3 ) {\n"
+                      "4: if ( int x@4 = n@3 ) {\n"
+                      "5: f0 ( S { . x = x@4 } ) ;\n"
+                      "6: }\n"
+                      "7: }\n",
+                      tokenize("struct S { int x; };\n"
+                               "void f0(S s);\n"
+                               "void f1(int n) {\n"
+                               "    if (int x = n) {\n"
+                               "        f0(S{ .x = x });\n"
+                               "    }\n"
+                               "}\n"));
     }
 
-    void varid_arrayinit() { // #7579 - no variable declaration in rhs
+    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] }; }"));
+
+        // #12402
+        ASSERT_EQUALS("1: void f ( ) { void ( * p@1 [ 1 ] ) ( int ) = { [ ] ( int i@2 ) { } } ; }\n", tokenize("void f() { void (*p[1])(int) = { [](int i) {} }; }"));
     }
 
     void varid_lambda_arg() {
@@ -2893,31 +3320,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"
+                            "}";
+        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 {}";
+        const char exp[] = "1: auto func ( int arg@1 ) . bar :: quux { }\n";
+        ASSERT_EQUALS(exp, tokenize(code));
     }
 
     void varid_trailing_return3() { // #11423
@@ -2933,15 +3360,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() {
@@ -2951,23 +3378,23 @@ class TestVarID : public TestFixture {
                             "  }\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));
+        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"
+                            "}";
+        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() {
@@ -3015,29 +3442,38 @@ class TestVarID : public TestFixture {
                                "  else x;\n"
                                "  x;\n"
                                "}"));
+
+        ASSERT_EQUALS("1: const char * f ( int * ) ;\n" // #12924
+                      "2: void g ( int i@1 ) {\n"
+                      "3: if ( f ( & i@1 ) [ 0 ] == 'm' ) { }\n"
+                      "4: }\n",
+                      tokenize("const char *f(int*);\n"
+                               "void g(int i) {\n"
+                               "    if (f(&i)[0] == 'm') {}\n"
+                               "}\n", dinit(TokenizeOptions, $.cpp = false)));
     }
 
     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 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"
+                            "}";
 
-        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 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() {
@@ -3068,7 +3504,7 @@ class TestVarID : public TestFixture {
                             "alignas(16) int x;";
         const char expected[] = "1: extern alignas ( 16 ) int x@1 ;\n"
                                 "2: alignas ( 16 ) int x@2 ;\n";
-        ASSERT_EQUALS(expected, tokenize(code, "test.c"));
+        ASSERT_EQUALS(expected, tokenize(code, dinit(TokenizeOptions, $.cpp = false)));
     }
 
     void varidclass1() {
@@ -3456,10 +3892,22 @@ class TestVarID : public TestFixture {
         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"
-                                "4: int j@3 ; j@3 = i@2 ;\n"
+                                "4: int j@3 ( i@2 ) ;\n"
                                 "5: }\n"
                                 "6: } ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
+
+        const char code2[] = "struct S {\n" // #11411
+                             "    std::vector<int> v;\n"
+                             "    int i;\n"
+                             "    S(int i) : v({ 0 }), i(i) {}\n"
+                             "};";
+        const char expected2[] = "1: struct S {\n"
+                                 "2: std :: vector < int > v@1 ;\n"
+                                 "3: int i@2 ;\n"
+                                 "4: S ( int i@3 ) : v@1 ( { 0 } ) , i@2 ( i@3 ) { }\n"
+                                 "5: } ;\n";
+        ASSERT_EQUALS(expected2, tokenize(code2));
     }
 
     void varidclass18() {
@@ -3509,11 +3957,11 @@ class TestVarID : public TestFixture {
     void varidenum1() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"
-                            "  A = eStart;\n"
+                            "  A = eStart\n"
                             "};\n";
         const char expected[] = "1: const int eStart@1 = 6 ;\n"
                                 "2: enum myEnum {\n"
-                                "3: A = eStart@1 ;\n"
+                                "3: A = eStart@1\n"
                                 "4: } ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
@@ -3521,11 +3969,11 @@ class TestVarID : public TestFixture {
     void varidenum2() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"
-                            "  A = f(eStart);\n"
+                            "  A = f(eStart)\n"
                             "};\n";
         const char expected[] = "1: const int eStart@1 = 6 ;\n"
                                 "2: enum myEnum {\n"
-                                "3: A = f ( eStart@1 ) ;\n"
+                                "3: A = f ( eStart@1 )\n"
                                 "4: } ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
@@ -3533,11 +3981,11 @@ class TestVarID : public TestFixture {
     void varidenum3() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"
-                            "  A = f(eStart, x);\n"
+                            "  A = f(eStart, x)\n"
                             "};\n";
         const char expected[] = "1: const int eStart@1 = 6 ;\n"
                                 "2: enum myEnum {\n"
-                                "3: A = f ( eStart@1 , x ) ;\n"
+                                "3: A = f ( eStart@1 , x )\n"
                                 "4: } ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
@@ -3545,11 +3993,11 @@ class TestVarID : public TestFixture {
     void varidenum4() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"
-                            "  A = f(x, eStart);\n"
+                            "  A = f(x, eStart)\n"
                             "};\n";
         const char expected[] = "1: const int eStart@1 = 6 ;\n"
                                 "2: enum myEnum {\n"
-                                "3: A = f ( x , eStart@1 ) ;\n"
+                                "3: A = f ( x , eStart@1 )\n"
                                 "4: } ;\n";
         ASSERT_EQUALS(expected, tokenize(code));
     }
@@ -3557,15 +4005,15 @@ class TestVarID : public TestFixture {
     void varidenum5() {
         const char code[] = "const int eStart = 6;\n"
                             "enum myEnum {\n"
-                            "  A = f(x, eStart, y);\n"
+                            "  A = f(x, eStart, y)\n"
                             "};\n";
         const char expected[] = "1: const int eStart@1 = 6 ;\n"
                                 "2: enum myEnum {\n"
-                                "3: A = f ( x , eStart@1 , y ) ;\n"
+                                "3: A = f ( x , eStart@1 , y )\n"
                                 "4: } ;\n";
         const char current[] = "1: const int eStart@1 = 6 ;\n"
                                "2: enum myEnum {\n"
-                               "3: A = f ( x , eStart , y ) ;\n"
+                               "3: A = f ( x , eStart , y )\n"
                                "4: } ;\n";
         TODO_ASSERT_EQUALS(expected, current, tokenize(code));
     }
@@ -3754,6 +4202,32 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void typeof1() {
+        const char code[] = "int x; typeof(x) y;";
+        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;";
+        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;";
+        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;";
+        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"
@@ -3770,9 +4244,9 @@ class TestVarID : public TestFixture {
             "2: int x ; int y ;\n"
             "3: } ;\n"
             "4: int f ( A a , A b ) {\n"
-            "5: int x@5 ; x@5 =@9 a@3 .@10 x@6 +@11 b@4 .@12 x@7 ;\n"
-            "6: int y@8 ; y@8 =@1073741837 b@4 .@12 x@7 +@11 a@3 .@10 x@6 ;\n"
-            "7: return x@5 +@1073741841 y@8 +@1073741842 a@3 .@1073741843 y@9 +@1073741844 b@4 .@1073741845 y@10 ;\n"
+            "5: int x@5 ; x@5 =@UNIQUE a@3 .@11 x@6 +@13 b@4 .@12 x@7 ;\n"
+            "6: int y@8 ; y@8 =@UNIQUE b@4 .@12 x@7 +@13 a@3 .@11 x@6 ;\n"
+            "7: return x@5 +@UNIQUE y@8 +@UNIQUE a@3 .@UNIQUE y@9 +@UNIQUE b@4 .@UNIQUE y@10 ;\n"
             "8: }\n";
 
         ASSERT_EQUALS(expected, actual);
@@ -3789,14 +4263,215 @@ class TestVarID : public TestFixture {
 
         const char expected[] = "1: struct S { std :: unique_ptr < int > u ; } ;\n"
                                 "2: auto f ; f = [ ] ( const S & s ) . std :: unique_ptr < int > {\n"
-                                "3: if (@5 auto p@4 =@1073741830 s@3 .@1073741831 u@5 .@1073741832 get (@1073741833 ) ) {\n"
-                                "4: return std ::@1073741834 make_unique < int > (@1073741835 *@1073741836 p@4 ) ; }\n"
+                                "3: if ( auto p@4 =@UNIQUE s@3 .@UNIQUE u@5 .@UNIQUE get (@UNIQUE ) ) {\n"
+                                "4: return std ::@UNIQUE make_unique < int > (@UNIQUE *@UNIQUE p@4 ) ; }\n"
                                 "5: return nullptr ;\n"
                                 "6: } ;\n";
 
         ASSERT_EQUALS(expected, actual);
     }
 
+    void exprid3() {
+        const char code[] = "void f(bool b, int y) {\n"
+                            "    if (b && y > 0) {}\n"
+                            "    while (b && y > 0) {}\n"
+                            "}\n";
+        const char expected[] = "1: void f ( bool b , int y ) {\n"
+                                "2: if ( b@1 &&@5 y@2 >@4 0 ) { }\n"
+                                "3: while ( b@1 &&@5 y@2 >@4 0 ) { }\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
+    void exprid4() {
+        // expanded macro..
+        const char code[] = "#define ADD(x,y)  x+y\n"
+                            "int f(int a, int b) {\n"
+                            "    return ADD(a,b) + ADD(a,b);\n"
+                            "}\n";
+        const char expected[] = "2: int f ( int a , int b ) {\n"
+                                "3: return a@1 $+@UNIQUE b@2 +@UNIQUE a@1 $+@UNIQUE b@2 ;\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
+    void exprid5() {
+        // references..
+        const char code[] = "int foo(int a) {\n"
+                            "    int& r = a;\n"
+                            "    return (a+a)*(r+r);\n"
+                            "}\n";
+        const char expected[] = "1: int foo ( int a ) {\n"
+                                "2: int & r@2 =@UNIQUE a@1 ;\n"
+                                "3: return ( a@1 +@4 a@1 ) *@UNIQUE ( r@2 +@4 r@2 ) ;\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
+    void exprid6() {
+        // ++ and -- should have UNIQUE exprid
+        const char code[] = "void foo(int *a) {\n"
+                            "    *a++ = 0;\n"
+                            "    if (*a++ == 32) {}\n"
+                            "}\n";
+        const char expected[] = "1: void foo ( int * a ) {\n"
+                                "2: *@UNIQUE a@1 ++@UNIQUE = 0 ;\n"
+                                "3: if ( *@UNIQUE a@1 ++@UNIQUE ==@UNIQUE 32 ) { }\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
+    void exprid7() {
+        // different casts
+        const char code[] = "void foo(int a) {\n"
+                            "    if ((char)a == (short)a) {}\n"
+                            "    if ((char)a == (short)a) {}\n"
+                            "}\n";
+        const char expected[] = "1: void foo ( int a ) {\n"
+                                "2: if ( (@2 char ) a@1 ==@4 (@3 short ) a@1 ) { }\n"
+                                "3: if ( (@2 char ) a@1 ==@4 (@3 short ) a@1 ) { }\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
+    void exprid8() {
+        const char code[] = "void f() {\n" // #12249
+                            "    std::string s;\n"
+                            "    (((s += \"--\") += std::string()) += \"=\");\n"
+                            "}\n";
+        const char expected[] = "1: void f ( ) {\n"
+                                "2: std ::@UNIQUE string s@1 ;\n"
+                                "3: ( ( s@1 +=@UNIQUE \"--\"@UNIQUE ) +=@UNIQUE std ::@UNIQUE string (@UNIQUE ) ) +=@UNIQUE \"=\"@UNIQUE ;\n"
+                                "4: }\n";
+        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()}; }";
+        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));
+
+        const char code3[] = "struct S { int* p; };\n"
+                             "S f() { return S{ std::make_unique<int>([]() { return 4; }()).release()}; }\n";
+        const char expected3[] = "1: struct S { int * p ; } ;\n"
+                                 "2: S f ( ) { return S@UNIQUE {@UNIQUE std ::@UNIQUE make_unique < int > (@UNIQUE [ ] ( ) { return 4 ; } ( ) ) .@UNIQUE release (@UNIQUE ) } ; }\n";
+        ASSERT_EQUALS(expected3, tokenizeExpr(code3));
+
+        const char code4[] = "std::unique_ptr<int> g(int i) { return std::make_unique<int>(i); }\n"
+                             "void h(int*);\n"
+                             "void f() {\n"
+                             "    h(g({}).get());\n"
+                             "}\n";
+        const char expected4[] = "1: std :: unique_ptr < int > g ( int i ) { return std ::@UNIQUE make_unique < int > (@UNIQUE i@1 ) ; }\n"
+                                 "2: void h ( int * ) ;\n"
+                                 "3: void f ( ) {\n"
+                                 "4: h (@UNIQUE g (@UNIQUE { } ) .@UNIQUE get (@UNIQUE ) ) ;\n"
+                                 "5: }\n";
+        ASSERT_EQUALS(expected4, tokenizeExpr(code4));
+
+        const char code5[] = "int* g(std::map<int, std::unique_ptr<int>>& m) {\n"
+                             "    return m[{0}].get();\n"
+                             "}\n";
+        const char expected5[] = "1: int * g ( std :: map < int , std :: unique_ptr < int > > & m ) {\n"
+                                 "2: return m@1 [@UNIQUE { 0 } ] .@UNIQUE get (@UNIQUE ) ;\n"
+                                 "3: }\n";
+        ASSERT_EQUALS(expected5, tokenizeExpr(code5));
+    }
+
+    void exprid9()
+    {
+        const char code[] = "void f(const std::type_info& type) {\n" // #12340
+                            "    if (type == typeid(unsigned int)) {}\n"
+                            "    else if (type == typeid(int)) {}\n"
+                            "}\n";
+        const char expected[] = "1: void f ( const std :: type_info & type ) {\n"
+                                "2: if ( type@1 ==@UNIQUE typeid (@UNIQUE unsigned int@UNIQUE ) ) { }\n"
+                                "3: else { if ( type@1 ==@UNIQUE typeid (@UNIQUE int@UNIQUE ) ) { } }\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
+    void exprid10()
+    {
+        const char code[] = "void f(const std::string& p) {\n" // #12350
+                            "    std::string s;\n"
+                            "    ((s = \"abc\") += p) += \"def\";\n"
+                            "}\n";
+        const char expected[] = "1: void f ( const std :: string & p ) {\n"
+                                "2: std ::@UNIQUE string s@2 ;\n"
+                                "3: ( ( s@2 =@UNIQUE \"abc\" ) +=@UNIQUE p@1 ) +=@UNIQUE \"def\"@UNIQUE ;\n"
+                                "4: }\n";
+        ASSERT_EQUALS(expected, tokenizeExpr(code));
+    }
+
+    void exprid11()
+    {
+        const char code[] = "struct S { void f(); };\n" // #12713
+                            "int g(int, S*);\n"
+                            "int h(void (*)(), S*);\n"
+                            "void S::f() {\n"
+                            "    std::make_unique<int>(g({}, this)).release();\n"
+                            "    std::make_unique<int>(h([]() {}, this)).release();\n"
+                            "}\n";
+        const char* exp = "1: struct S { void f ( ) ; } ;\n"
+                          "2: int g ( int , S * ) ;\n"
+                          "3: int h ( void ( * ) ( ) , S * ) ;\n"
+                          "4: void S :: f ( ) {\n"
+                          "5: std ::@UNIQUE make_unique < int > (@UNIQUE g (@UNIQUE { } ,@6 this ) ) .@UNIQUE release (@UNIQUE ) ;\n"
+                          "6: std ::@UNIQUE make_unique < int > (@UNIQUE h (@UNIQUE [ ] ( ) { } ,@6 this ) ) .@UNIQUE release (@UNIQUE ) ;\n"
+                          "7: }\n";
+        ASSERT_EQUALS(exp, tokenizeExpr(code));
+    }
+
+    void exprid12()
+    {
+        const char code[] = "struct S { std::unique_ptr<int> p; };\n" // #12765
+                            "namespace N {\n"
+                            "    struct T { void (*f)(S*); };\n"
+                            "    const T t = {\n"
+                            "        [](S* s) { s->p.release(); }\n"
+                            "    };\n"
+                            "}\n";
+        const char* exp = "1: struct S { std :: unique_ptr < int > p ; } ;\n"
+                          "2: namespace N {\n"
+                          "3: struct T { void ( * f@2 ) ( S * ) ; } ;\n"
+                          "4: const T t@3 = {\n"
+                          "5: [ ] ( S * s@4 ) { s@4 .@UNIQUE p@5 .@UNIQUE release (@UNIQUE ) ; }\n"
+                          "6: } ;\n"
+                          "7: }\n";
+        ASSERT_EQUALS(exp, tokenizeExpr(code));
+    }
+
+    void exprid13()
+    {
+        const char code[] = "struct S { int s; };\n" // #11488
+                            "struct T { struct S s; };\n"
+                            "struct U { struct T t; };\n"
+                            "void f() {\n"
+                            "    struct U u = { .t = { .s = { .s = 1 } } };\n"
+                            "}\n";
+        const char* exp = "1: struct S { int s ; } ;\n"
+                          "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"
+                          "6: }\n";
+        ASSERT_EQUALS(exp, tokenizeExpr(code));
+    }
+
+    void exprid14()
+    {
+        const Settings s = settingsBuilder(settings).library("std.cfg").build();
+
+        const char code[] = "int f(double a, double b, double c) {\n" // #13578
+                            "    return static_cast<int>(std::ceil((std::min)(a, (std::min)(b, c))));\n"
+                            "}\n";
+        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, s)); // don't crash
+    }
+
     void structuredBindings() {
         const char code[] = "int foo() { auto [x,y] = xy(); return x+y; }";
         ASSERT_EQUALS("1: int foo ( ) { auto [ x@1 , y@2 ] = xy ( ) ; return x@1 + y@2 ; }\n",
diff --git a/test/testvfvalue.cpp b/test/testvfvalue.cpp
new file mode 100644
index 00000000000..e2b7e499877
--- /dev/null
+++ b/test/testvfvalue.cpp
@@ -0,0 +1,48 @@
+/*
+ * 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 "fixture.h"
+#include "vfvalue.h"
+
+class TestValueFlowValue : public TestFixture {
+public:
+    TestValueFlowValue() : TestFixture("TestValueFlowValue") {}
+
+private:
+    void run() override {
+        TEST_CASE(toString);
+    }
+
+    void toString() const {
+        {
+            ValueFlow::Value v;
+            ASSERT_EQUALS("0", v.toString());
+            v.intvalue = -1;
+            ASSERT_EQUALS("-1", v.toString());
+        }
+        {
+            ValueFlow::Value v;
+            v.valueType = ValueFlow::Value::ValueType::FLOAT;
+            ASSERT_EQUALS("0.0", v.toString());
+            v.floatValue = 0.0000000000001;
+            ASSERT_EQUALS("1e-13", v.toString());
+        }
+    }
+};
+
+REGISTER_TEST(TestValueFlowValue)
diff --git a/test/tools/donate_cpu_lib_test.py b/test/tools/donate_cpu_lib_test.py
new file mode 100644
index 00000000000..e00a3d296a0
--- /dev/null
+++ b/test/tools/donate_cpu_lib_test.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python
+#
+# Cppcheck - A tool for static C/C++ code analysis
+# Copyright (C) 2007-2022 Cppcheck team.
+#
+# This 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/>.
+
+from donate_cpu_lib import *
+
+def _test_library_includes(tmpdir, libs, content, libinc_obj=None):
+    if libinc_obj is None:
+        library_includes = LibraryIncludes()
+    else:
+        library_includes = libinc_obj
+
+    src_file = os.path.join(str(tmpdir), "file.cpp")
+    with open(src_file, 'w') as f:
+        f.write(content)
+    libs.sort()
+    libs_found = library_includes.get_libraries(str(tmpdir))
+    libs_found.sort()
+    assert libs == libs_found
+
+def test_library_includes(tmpdir):
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd'], '')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd'], '#include <stdio.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'boost'], '#include <boost/regex.hpp>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'python'], '#include "Python.h"')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'libcerror', 'lua', 'opengl', 'qt'], '#include <QApplication>\n#include <GL/gl.h>\r#include "lua.h"\r\n#include <libcerror.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'microsoft_sal'], '  #include <sal.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'googletest'], '\t#include <gtest/gtest.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'microsoft_atl'], '  \t  #include <atlbase.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'cairo'], '\t  #include <cairo.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'gtk'], '  \t#include <glib-object.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'gtk'], '  \t #include <glib.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'gtk'], ' # include <glib/gi18n.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'gtk'], '#include <gdk/gdkkeysyms.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'bsd'], '#include <sys/uio.h>\r\n')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'libcurl'], '#include <curl/curl.h>\r')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'sqlite3'], '#include <sqlite3.h>\n')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'openmp'], '#  include <omp.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'mfc'], '#\tinclude <afxwin.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'ruby'], '#  \tinclude "ruby.h"')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'zlib'], '#\t  include <zlib.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'pcre'], '#include<pcre.h>')
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'pcre'], '#include  "pcre.h"')
+    _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>')
+
+def test_match_multiple_time(tmpdir):
+    libinc = LibraryIncludes()
+
+    # there was a bug that we would only match each library once successfully
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'zlib'], '#include <zlib.h>', libinc)
+    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd', 'zlib'], '#include <zlib.h>', libinc)
diff --git a/tools/test_donate_cpu_server.py b/test/tools/donate_cpu_server_test.py
similarity index 100%
rename from tools/test_donate_cpu_server.py
rename to test/tools/donate_cpu_server_test.py
diff --git a/test/tools/htmlreport/check.sh b/test/tools/htmlreport/check.sh
new file mode 100755
index 00000000000..d3945eea532
--- /dev/null
+++ b/test/tools/htmlreport/check.sh
@@ -0,0 +1,73 @@
+#!/bin/bash -ex
+
+# Command for checking HTML syntax with HTML Tidy, see http://www.html-tidy.org/
+tidy_cmd='tidy -o /dev/null -eq --drop-empty-elements no'
+
+function validate_html {
+    if [ ! -f "$1" ]; then
+        echo "File $1 does not exist!"
+	      exit 1
+    fi
+    if ! ${tidy_cmd} "$1"; then
+        echo "HTML validation failed!"
+        exit 1
+    fi
+}
+
+if [ -z "$PYTHON" ]; then
+    PYTHON=python3
+fi
+
+SCRIPT_DIR="$(dirname ${BASH_SOURCE[0]})"
+ABSOLUTE_SCRIPT_DIR="$(cd -- ${SCRIPT_DIR} ; pwd -P)"
+PROJECT_ROOT_DIR="$(cd -- ${SCRIPT_DIR}/../../../ ; pwd -P)"
+REPORT_DIR=$(mktemp -d -t htmlreport-XXXXXXXXXX)
+INDEX_HTML="$REPORT_DIR/index.html"
+STATS_HTML="$REPORT_DIR/stats.html"
+GUI_TEST_XML="$REPORT_DIR/gui_test.xml"
+ERRORLIST_XML="$REPORT_DIR/errorlist.xml"
+UNMATCHEDSUPPR_XML="$REPORT_DIR/unmatchedSuppr.xml"
+
+$PYTHON ${PROJECT_ROOT_DIR}/htmlreport/cppcheck-htmlreport --file ${PROJECT_ROOT_DIR}/gui/test/data/xmlfiles/xmlreport_v2.xml --title "xml2 test" --report-dir "$REPORT_DIR" --source-dir ${PROJECT_ROOT_DIR}/test/
+echo -e "\n"
+# Check HTML syntax
+validate_html "$INDEX_HTML"
+validate_html "$STATS_HTML"
+
+
+${PROJECT_ROOT_DIR}/cppcheck ${PROJECT_ROOT_DIR}/samples --enable=all --inconclusive --xml-version=2 2> "$GUI_TEST_XML"
+xmllint --noout "$GUI_TEST_XML"
+$PYTHON ${PROJECT_ROOT_DIR}/htmlreport/cppcheck-htmlreport --file "$GUI_TEST_XML" --title "xml2 + inconclusive test" --report-dir "$REPORT_DIR"
+echo ""
+# Check HTML syntax
+validate_html "$INDEX_HTML"
+validate_html "$STATS_HTML"
+
+
+${PROJECT_ROOT_DIR}/cppcheck ${PROJECT_ROOT_DIR}/samples --enable=all --inconclusive --verbose --xml-version=2 2> "$GUI_TEST_XML"
+xmllint --noout "$GUI_TEST_XML"
+$PYTHON ${PROJECT_ROOT_DIR}/htmlreport/cppcheck-htmlreport --file "$GUI_TEST_XML" --title "xml2 + inconclusive + verbose test" --report-dir "$REPORT_DIR"
+echo -e "\n"
+# Check HTML syntax
+validate_html "$INDEX_HTML"
+validate_html "$STATS_HTML"
+
+
+${PROJECT_ROOT_DIR}/cppcheck --errorlist --inconclusive --xml-version=2 > "$ERRORLIST_XML"
+xmllint --noout "$ERRORLIST_XML"
+$PYTHON ${PROJECT_ROOT_DIR}/htmlreport/cppcheck-htmlreport --file "$ERRORLIST_XML" --title "errorlist" --report-dir "$REPORT_DIR"
+# Check HTML syntax
+validate_html "$INDEX_HTML"
+validate_html "$STATS_HTML"
+
+
+${PROJECT_ROOT_DIR}/cppcheck ${PROJECT_ROOT_DIR}/samples/memleak/good.c ${PROJECT_ROOT_DIR}/samples/resourceLeak/good.c  --xml-version=2 --enable=information --suppressions-list="${ABSOLUTE_SCRIPT_DIR}/test_suppressions.txt" --xml 2> "$UNMATCHEDSUPPR_XML"
+xmllint --noout "$UNMATCHEDSUPPR_XML"
+$PYTHON ${PROJECT_ROOT_DIR}/htmlreport/cppcheck-htmlreport --file "$UNMATCHEDSUPPR_XML" --title "unmatched Suppressions" --report-dir="$REPORT_DIR"
+grep "unmatchedSuppression<.*>information<.*>Unmatched suppression: variableScope*<" "$INDEX_HTML"
+grep ">unmatchedSuppression</.*>information<.*>Unmatched suppression: uninitstring<" "$INDEX_HTML"
+# Check HTML syntax
+validate_html "$INDEX_HTML"
+validate_html "$STATS_HTML"
+
+rm -rf "$REPORT_DIR"
diff --git a/test/tools/htmlreport/example-checkers.txt b/test/tools/htmlreport/example-checkers.txt
new file mode 100644
index 00000000000..5a3259713e2
--- /dev/null
+++ b/test/tools/htmlreport/example-checkers.txt
@@ -0,0 +1 @@
+Just a few random words..
diff --git a/htmlreport/example.cc b/test/tools/htmlreport/example.cc
similarity index 100%
rename from htmlreport/example.cc
rename to test/tools/htmlreport/example.cc
diff --git a/htmlreport/example.xml b/test/tools/htmlreport/example.xml
similarity index 100%
rename from htmlreport/example.xml
rename to test/tools/htmlreport/example.xml
diff --git a/htmlreport/test_htmlreport.py b/test/tools/htmlreport/test_htmlreport.py
similarity index 53%
rename from htmlreport/test_htmlreport.py
rename to test/tools/htmlreport/test_htmlreport.py
index 4fd6cf6c256..6f8713f4f55 100755
--- a/htmlreport/test_htmlreport.py
+++ b/test/tools/htmlreport/test_htmlreport.py
@@ -3,22 +3,22 @@
 
 import os
 import contextlib
-import shutil
 import subprocess
 import sys
 import tempfile
 
-if sys.version_info < (2, 7):
-    # For TestCase.assertIn().
-    import unittest2 as unittest
-else:
-    import unittest
+import unittest
+import time
 
-ROOT_DIR = os.path.split(os.path.abspath(os.path.dirname(__file__)))[0]
+TEST_TOOLS_DIR = os.path.abspath(os.path.dirname(__file__))
+ROOT_DIR = os.path.split(os.path.dirname(os.path.dirname(TEST_TOOLS_DIR)))[0]
+HTMLREPORT_DIR = os.path.join(ROOT_DIR, 'htmlreport')
 CPPCHECK_BIN = os.path.join(ROOT_DIR, 'cppcheck')
 
-HTML_REPORT_BIN = os.path.join(os.path.abspath(os.path.dirname(__file__)),
-                               'cppcheck-htmlreport')
+if os.getenv("PIP_PACKAGE_TEST") is not None:
+    HTML_REPORT_BIN = ['cppcheck-htmlreport']
+else:
+    HTML_REPORT_BIN = [sys.executable, os.path.join(HTMLREPORT_DIR, 'cppcheck-htmlreport')]
 
 
 class TestHTMLReport(unittest.TestCase):
@@ -37,7 +37,7 @@ def checkReportError(self, xml_version):
             self.assertIn('Memory leak:', report)
             self.assertIn('bad.c', report)
 
-            detail_filename = os.path.join(output_directory, '0.html')
+            detail_filename = os.path.join(output_directory.name, '0.html')
             self.assertTrue(
                 os.path.exists(detail_filename))
 
@@ -46,6 +46,8 @@ def checkReportError(self, xml_version):
                 self.assertIn('<html', detail_contents)
                 self.assertIn('Memory leak:', detail_contents)
 
+            output_directory.cleanup()
+
     def testReportNoError(self):
         for xml_version in ['2']:
             self.checkReportNoError(xml_version)
@@ -61,11 +63,13 @@ def checkReportNoError(self, xml_version):
             self.assertNotIn('good.c', report)
 
             self.assertFalse(
-                os.path.exists(os.path.join(output_directory, '0.html')))
+                os.path.exists(os.path.join(output_directory.name, '0.html')))
+
+            output_directory.cleanup()
 
     def testMissingInclude(self):
         with runCheck(
-            xml_filename=os.path.join(ROOT_DIR, 'htmlreport', 'example.xml'),
+            xml_filename=os.path.join(TEST_TOOLS_DIR, 'example.xml'),
         ) as (report, output_directory):
             self.assertIn('<html', report)
 
@@ -73,21 +77,49 @@ def testMissingInclude(self):
             self.assertIn('example.cc', report)
 
             self.assertTrue(
-                os.path.exists(os.path.join(output_directory, '0.html')))
+                os.path.exists(os.path.join(output_directory.name, '0.html')))
+
+            output_directory.cleanup()
+
+    def testAddCheckersReport(self):
+        with runCheck(
+            xml_filename=os.path.join(TEST_TOOLS_DIR, 'example.xml'),
+            checkers_filename=os.path.join(TEST_TOOLS_DIR, 'example-checkers.txt')
+        ) as (report, output_directory):
+            self.assertIn('<html', report)
+
+            self.assertIn('<a href="checkers.html"', report)
+
+            self.assertTrue(
+                os.path.exists(os.path.join(output_directory.name, 'checkers.html')))
+
+            output_directory.cleanup()
+
+    def testAddTimestamp(self):
+        with runCheck(
+            xml_filename=os.path.join(TEST_TOOLS_DIR, 'example.xml'),
+        ) as (report, output_directory):
+            xml_file = os.path.join(TEST_TOOLS_DIR, 'example.xml')
+            t = os.path.getmtime(xml_file)
+            t_s = time.ctime(t)
+
+            self.assertIn(t_s, report)
+
+            output_directory.cleanup()
 
 
 @contextlib.contextmanager
-def runCheck(source_filename=None, xml_version='1', xml_filename=None):
+def runCheck(source_filename=None, xml_version='1', xml_filename=None, checkers_filename=None):
     """Run cppcheck and cppcheck-htmlreport.
 
     Yield a tuple containing the resulting HTML report index and the directory
     path.
 
     """
-    output_directory = tempfile.mkdtemp(dir='.')
+    output_directory = tempfile.TemporaryDirectory(dir='.')
     if xml_filename is None:
         assert source_filename
-        xml_filename = os.path.join(output_directory, 'output.xml')
+        xml_filename = os.path.join(output_directory.name, 'output.xml')
 
         with open(xml_filename, 'w') as output_file:
             subprocess.check_call(
@@ -97,19 +129,21 @@ def runCheck(source_filename=None, xml_version='1', xml_filename=None):
 
     assert os.path.exists(xml_filename)
 
-    subprocess.check_call(
-        [sys.executable, HTML_REPORT_BIN,
+    args = [*HTML_REPORT_BIN,
          '--file=' + os.path.realpath(xml_filename),
-         '--report-dir=' + os.path.realpath(output_directory)],
-        cwd=os.path.join(ROOT_DIR, 'htmlreport'))
+         '--report-dir=' + os.path.realpath(output_directory.name)]
+    if checkers_filename:
+        args.append('--checkers-report-file=' + os.path.realpath(checkers_filename))
 
-    with open(os.path.join(output_directory, 'index.html')) as index_file:
+    subprocess.check_call(
+        args,
+        cwd=TEST_TOOLS_DIR)
+
+    with open(os.path.join(output_directory.name, 'index.html')) as index_file:
         index_contents = index_file.read()
 
     yield index_contents, output_directory
 
-    shutil.rmtree(output_directory)
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/tools/htmlreport/test_suppressions.txt b/test/tools/htmlreport/test_suppressions.txt
new file mode 100644
index 00000000000..eb580524e33
--- /dev/null
+++ b/test/tools/htmlreport/test_suppressions.txt
@@ -0,0 +1,3 @@
+variableScope:*/samples/memleak/good.c
+*:*/samples/resourceLeak/notexisting.c*
+uninitstring:*
diff --git a/tools/test_reduce.py b/test/tools/reduce_test.py
similarity index 94%
rename from tools/test_reduce.py
rename to test/tools/reduce_test.py
index 6ea01d28d58..aaeec7a87e3 100644
--- a/tools/test_reduce.py
+++ b/test/tools/reduce_test.py
@@ -3,8 +3,8 @@
 
 
 class ReduceTest(Reduce):
+    # pylint: disable-next=super-init-not-called - we do not want the super __init__ to be called
     def __init__(self):
-        # we do not want the super __init__ to be called
         # super().__init__('', '', '')
         pass
 
@@ -125,9 +125,10 @@ def test_combinelines_chunk_2():
         's,\n',
         't;\n'
     ]
+    filedata_exp = filedata
 
     filedata2 = reduce.combinelines(filedata)
-    assert filedata == filedata
+    assert filedata == filedata_exp
     assert filedata2 == ['int i,j,\n',
                          '',
                          'l,\n',
diff --git a/tools/test_matchcompiler.py b/test/tools/test_matchcompiler.py
similarity index 100%
rename from tools/test_matchcompiler.py
rename to test/tools/test_matchcompiler.py
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index ce5eb2821df..6dd119c6e8f 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,31 +1,2 @@
-# 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)
-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}
-        ${CMAKE_SOURCE_DIR}/lib/utils.cpp
-        $<TARGET_OBJECTS:simplecpp_objs>
-)
-target_include_directories(dmake PRIVATE ${CMAKE_SOURCE_DIR}/cli ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/externals/simplecpp)
-if (WIN32 AND NOT BORLAND)
-    if(NOT MINGW)
-        target_link_libraries(dmake Shlwapi.lib)
-    else()
-        target_link_libraries(dmake shlwapi)
-    endif()
-endif()
-
-add_custom_target(run-dmake $<TARGET_FILE:dmake>
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        DEPENDS dmake)
+add_subdirectory(dmake)
+add_subdirectory(triage)
\ No newline at end of file
diff --git a/tools/MT-Unsafe.py b/tools/MT-Unsafe.py
index a30395ff011..965a6261db8 100755
--- a/tools/MT-Unsafe.py
+++ b/tools/MT-Unsafe.py
@@ -59,7 +59,7 @@ def man_search(manpage):
             MANPAGE = open(manpage, 'r')
     except OSError as filename:
         print('cannot open %s' % filename, file=sys.stderr)
-        return None, None
+        return  # None, None
 
     vprint(1, '%s opened' % (manpage))
 
@@ -95,7 +95,7 @@ def man_search(manpage):
         if res:
             apis.add(res.group(1))
             dprint(1, 'found api %s in %s' % (res.group(1), lineread))
-            next
+            continue
 
         if 'MT-Unsafe' in lineread:
             resUnsafe = re.search("MT-Unsafe\\s+(.*)(\\n\'|$)", lineread)
@@ -114,7 +114,7 @@ def man_search(manpage):
             dprint(1, 'new apis %s' % list(apis))
             for api in apis:
                 unsafe_apis.add(api)
-                next
+                continue
 
         #  if lineread.startswith('.TE'):
         if re.search('.TE', lineread):
@@ -147,9 +147,10 @@ def do_man_dir(directory):
     """Recursively process a directory of man-pages."""
     dprint(1, 'do_man_dir(%s)' % (directory))
     if os.path.isfile(directory):
-        return do_man_page(directory)
+        do_man_page(directory)
+        return
 
-    for path, directories, files in os.walk(directory):
+    for path, _, files in os.walk(directory):
         for file in files:
             dprint(2, 'calling do_man_page(%s)' % (
                 os.path.join(path, file)))
@@ -162,7 +163,7 @@ def do_man_dir(directory):
         if re.match('^-+debug', arg):
             debug = debug+1
             dprint(1, 'debug %d' % debug)
-            next
+            continue
     else:
         if os.access(arg, os.R_OK):
             manpages.add(arg)
diff --git a/tools/bisect/README.md b/tools/bisect/README.md
index 49d79838d73..79faa951cdc 100644
--- a/tools/bisect/README.md
+++ b/tools/bisect/README.md
@@ -93,6 +93,16 @@ To bisect these kinds of regressions you currently need to adjust the `bisect.sh
 `1` - find the commit which started the hang<br/>
 `2` - find the commit which resolved the hang<br/>
 
+# Bisecting crashes
+
+To bisect when a crash was introduced just do the same as you would for a regular error.
+
+But if you want to find the commit which fixes a crash you need to add `-j2` to the options so the crash will generate an error instead of terminating the process and check for the expected string `crashed`.
+
+```
+./bisect.sh <hash-good> <hash-bad> "<cppcheck-options> -j2" "crashed"
+```
+
 ### General notes
 
 As we are currently using the process exitcode to pass the elapsed time to the script it will not work properly with vey long runtime (>= 255 seconds) as it will overflow.
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/bisect/bisect_hang.py b/tools/bisect/bisect_hang.py
index 4a185a473d9..ad0497396c9 100644
--- a/tools/bisect/bisect_hang.py
+++ b/tools/bisect/bisect_hang.py
@@ -12,18 +12,18 @@ def run(cppcheck_path, options, elapsed_time=None):
     cmd = options.split()
     cmd.insert(0, cppcheck_path)
     print('running {}'.format(cppcheck_path))
-    p = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    try:
-        p.communicate(timeout=timeout)
-        if p.returncode != 0:
-            print('error')
-            return None
-        print('done')
-    except subprocess.TimeoutExpired:
-        print('timeout')
-        p.kill()
-        p.communicate()
-        return False
+    with subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) as p:
+        try:
+            p.communicate(timeout=timeout)
+            if p.returncode != 0:
+                print('error')
+                return None
+            print('done')
+        except subprocess.TimeoutExpired:
+            print('timeout')
+            p.kill()
+            p.communicate()
+            return False
 
     return True
 
diff --git a/tools/bisect/bisect_res.py b/tools/bisect/bisect_res.py
index 5d7effedd56..68550d00815 100644
--- a/tools/bisect/bisect_res.py
+++ b/tools/bisect/bisect_res.py
@@ -8,18 +8,19 @@ def run(cppcheck_path, options):
     cmd = options.split()
     cmd.insert(0, cppcheck_path)
     print('running {}'.format(cppcheck_path))
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
-    stdout, stderr = p.communicate()
+    with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) as p:
+        stdout, stderr = p.communicate()
+        rc = p.returncode
     # only 0 and 1 are well-defined in this case
-    if p.returncode > 1:
+    if rc > 1:
         print('error')
         return None, None, None
     # signals are reported as negative exitcode (e.g. SIGSEGV -> -11)
-    if p.returncode < 0:
+    if rc < 0:
         print('crash')
-        return p.returncode, stderr, stdout
+        return rc, stderr, stdout
     print('done')
-    return p.returncode, stderr, stdout
+    return rc, stderr, stdout
 
 
 # TODO: check arguments
diff --git a/tools/check-errorids.sh b/tools/check-errorids.sh
new file mode 100755
index 00000000000..ffef62fea42
--- /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 27d0f871874..00000000000
--- a/tools/ci.py
+++ /dev/null
@@ -1,90 +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):
-    p = subprocess.Popen(['file', '-i', filename],
-                         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    comm = p.communicate()
-    if 'charset=iso-8859-1' in comm[0]:
-        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)
-    subprocess.call(
-        ["git", "commit", "-a", "-m", '"automatic conversion from iso-8859-1 formatting to utf-8"'])
-    gitpush()
-
-    subprocess.call(["rm", "-rf", "devinfo"])
-    subprocess.call(['nice', "./webreport.sh"])
-    upload('-r devinfo', 'htdocs/')
-    subprocess.call(["make", "clean"])
-    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
new file mode 100755
index 00000000000..11b7cf87d42
--- /dev/null
+++ b/tools/compare-valueflow-options.py
@@ -0,0 +1,205 @@
+#!/usr/bin/env python3
+
+# Compare results and timings of different valueflow options
+# Example usage:
+# 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
+import argparse
+import glob
+import os
+import re
+import sys
+import random
+
+
+# Do not report execution times below this limit, short execution time measurements are flaky
+TIME_LIMIT = 2
+
+
+def format_float(a, b=1):
+    if a > 0 and b > 0:
+        return '{:.2f}'.format(a / b)
+    return 'N/A'
+
+
+def count_errors(errout:str, c:set):
+    for line in errout.split('\n'):
+        if not line.endswith(']'):
+            continue
+        res = re.match(r'^[^:]+:[0-9]+:[0-9]+: (error|warning|style|portability|performance):.*\[([a-zA-Z0-9_\-]+)\]$', line)
+        if res is None:
+            print('No warning? ' + line)
+            continue
+        severity = res.group(1)
+        c[severity] = c.get(severity, 0) + 1
+        error_id = res.group(2)
+        c[error_id] = c.get(error_id, 0) + 1
+
+
+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='Compare --check-level=normal and --check-level=exhaustive output')
+    parser.add_argument('-j', default=1, type=int, help='Concurency execution threads')
+    parser.add_argument('--cppcheck-path', default=None, type=str, help='Path to Cppcheck binary, if not given then clone and compile')
+    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')
+
+    language_group = parser.add_mutually_exclusive_group()
+    language_group.add_argument('--c-only', dest='c_only', help='Only process c packages', action='store_true')
+    language_group.add_argument('--cpp-only', dest='cpp_only', help='Only process c++ packages', action='store_true')
+    parser.add_argument('--work-path', '--work-path=', default=__work_path, type=str, help='Working directory for reference repo')
+    args = parser.parse_args()
+
+    print(args)
+
+    if not lib.check_requirements():
+        print("Error: Check requirements")
+        sys.exit(1)
+
+    work_path = os.path.abspath(args.work_path)
+    if not os.path.exists(work_path):
+        os.makedirs(work_path)
+
+    lib.set_jobs('-j' + str(args.j))
+
+    results_file = os.path.join(work_path, args.o)
+    summary_file = os.path.join(work_path, 'summary.log')
+
+    for f in (results_file, summary_file):
+        if os.path.exists(f):
+            os.remove(f)
+
+    opts = {'0': '--check-level=exhaustive --suppress=valueFlow*',
+            'it2': '--check-level=exhaustive --performance-valueflow-max-iterations=2 --suppress=valueFlow*',
+            'it1': '--check-level=exhaustive --performance-valueflow-max-iterations=1 --suppress=valueFlow*',
+            'if8': '--check-level=exhaustive --performance-valueflow-max-if-count=8 --suppress=valueFlow*'}
+
+    cppcheck_path = args.cppcheck_path
+
+    if cppcheck_path is None:
+        cppcheck_path = os.path.join(work_path, 'cppcheck')
+        try:
+            lib.clone_cppcheck(cppcheck_path, '')
+        except Exception as e:
+            print('Failed to clone Cppcheck repository ({}), retry later'.format(e))
+            sys.exit(1)
+
+        if not lib.compile_cppcheck(cppcheck_path):
+            print('Failed to compile 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
+    summary_results = {}
+    for id in opts.keys():
+        summary_results[id] = {}
+
+    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())
+
+        if package.startswith('ftp://') or package.startswith('http://'):
+            tgz = lib.download_package(work_path, package, None)
+            if tgz is None:
+                print("No package downloaded")
+                continue
+        else:
+            print('Package: ' + package)
+            tgz = package
+
+        source_path, source_found = lib.unpack_package(work_path, tgz, c_only=args.c_only, cpp_only=args.cpp_only)
+        if not source_found:
+            print("No files to process")
+            continue
+
+        results0 = None
+        time0 = None
+
+        enable = 'style'
+        debug_warnings = False
+
+        libraries = lib.library_includes.get_libraries(source_path)
+
+        with open(results_file, 'at') as myfile:
+            myfile.write('package:' + package + '\n')
+            myfile.write('libraries:' + ','.join(libraries) +'\n')
+
+        for id, extra_args in opts.items():
+            print('scan:' + id)
+            c, errout, info, time, cppcheck_options, timing_info = lib.scan_package(cppcheck_path, source_path, libraries, enable=enable, extra_args=extra_args)
+            error_text = None
+            if c < 0:
+                if c == -101 and 'error: could not find or open any of the paths given.' in errout:
+                    # No sourcefile found (for example only headers present)
+                    error_text = f'{id} ERR no source file'
+                elif c == lib.RETURN_CODE_TIMEOUT:
+                    error_text = f'{id} timeout'
+                else:
+                    error_text = f'{id} crash code={c}'
+
+            with open(results_file, 'at') as myfile:
+                if error_text is not None:
+                    myfile.write(f'{error_text}\n')
+                else:
+                    results = {}
+                    count_errors(errout, results)
+                    count_errors(errout, summary_results[id])
+                    if results0 is None:
+                        results0 = results
+                        time0 = time
+                    else:
+                        for error_id, count in results0.items():
+                            current_count = results.get(error_id, 0)
+                            if count > current_count:
+                                myfile.write(f'{id}: FN {error_id}: {current_count} of {count}\n')
+                        if time > TIME_LIMIT or time0 > TIME_LIMIT:
+                            myfile.write(f'{id}: Time: %.1f\n' % time)
+                            time_factor = time / time0
+                            myfile.write(f'{id}: Timefactor: %.3f\n' % time_factor)
+
+        with open(summary_file, 'wt') as myfile:
+            all = {}
+            for id, c in summary_results.items():
+                for error_id, count in c.items():
+                    if error_id not in all:
+                        all[error_id] = {}
+                        for id2 in opts.keys():
+                            all[error_id][id2] = 0
+                    all[error_id][id] += count
+
+            for error_id, id_count in all.items():
+                myfile.write(f'{error_id}:')
+                for id, count in id_count.items():
+                    myfile.write(f' {id}:{count}')
+                myfile.write('\n')
+
+        packages_processed += 1
+        print(str(packages_processed) + ' of ' + str(args.p) + ' packages processed\n')
+
+    print('Result saved to: ' + results_file)
diff --git a/tools/compare_ast_symdb.py b/tools/compare_ast_symdb.py
index e4421e9757f..5437c38853b 100644
--- a/tools/compare_ast_symdb.py
+++ b/tools/compare_ast_symdb.py
@@ -14,9 +14,10 @@
 def run_cppcheck(cppcheck_parameters:str, clang:str):
     cmd = '{} {} {} --debug --verbose'.format(CPPCHECK, cppcheck_parameters, clang)
     #print(cmd)
-    p = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    comm = p.communicate()
-    return comm[0].decode('utf-8', 'ignore')
+    with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE) as p:
+        # TODO: handle p.returncode?
+        stdout, _ = p.communicate()
+    return stdout.decode('utf-8', 'ignore')
 
 
 def get_ast(debug):
diff --git a/tools/creduce.py b/tools/creduce.py
index 0ab9f5b9986..f6f9c7d8e47 100644
--- a/tools/creduce.py
+++ b/tools/creduce.py
@@ -1,4 +1,10 @@
-import argparse, contextlib, multiprocessing, os, tempfile, shutil, subprocess
+import argparse
+import contextlib
+import multiprocessing
+import os
+import tempfile
+import shutil
+import subprocess
 
 @contextlib.contextmanager
 def mkdtemp():
diff --git a/tools/daca2-download.py b/tools/daca2-download.py
index 8a05332abda..ee02a26f186 100755
--- a/tools/daca2-download.py
+++ b/tools/daca2-download.py
@@ -23,6 +23,7 @@ def wget(filepath):
     if '/' in filepath:
         filename = filename[filename.rfind('/') + 1:]
     for d in DEBIAN:
+        # TODO: handle exitcode?
         subprocess.call(
             ['nice', 'wget', '--tries=10', '--timeout=300', '-O', filename, d + filepath])
         if os.path.isfile(filename):
@@ -40,10 +41,11 @@ def latestvername(names):
 def getpackages():
     if not wget('ls-lR.gz'):
         return []
+    # TODO: handle exitcode?
     subprocess.call(['nice', 'gunzip', 'ls-lR.gz'])
-    f = open('ls-lR', 'rt')
-    lines = f.readlines()
-    f.close()
+    with open('ls-lR', 'rt') as f:
+        lines = f.readlines()
+    # TODO: handle exitcode?
     subprocess.call(['rm', 'ls-lR'])
 
     path = None
@@ -64,9 +66,6 @@ def getpackages():
             filename = line[1 + line.rfind(' '):]
             filenames.append(filename)
 
-    for a in archives:
-        print(a)
-
     return archives
 
 
@@ -90,6 +89,7 @@ def removeAll():
         try:
             for filename in filenames:
                 if os.path.isdir(filename):
+                    # pylint: disable=deprecated-argument - FIXME: onerror was deprecated in Python 3.12
                     shutil.rmtree(filename, onerror=handleRemoveReadonly)
                 else:
                     os.remove(filename)
@@ -111,6 +111,17 @@ def removeAll():
         count = 0
 
 
+def accept_filename(filename:str):
+    if '.' not in filename:
+        return False
+    ext = filename[filename.rfind('.'):]
+    if ext == '.proto' and ('--protobuf' in sys.argv):
+        print('accept_filename:' + filename)
+        return True
+    return ext in ('.C', '.c', '.H', '.h', '.cc',
+                   '.cpp', '.cxx', '.c++', '.hpp', '.tpp', '.t++')
+
+
 def removeLargeFiles(path):
     for g in glob.glob(path + '*'):
         if g == '.' or g == '..':
@@ -126,8 +137,7 @@ def removeLargeFiles(path):
                 os.remove(g)
 
             # remove non-source files
-            elif g[-2:] not in {'.C', '.c', '.H', '.h'} and g[-3:] != '.cc' and\
-                    g[-4:] not in {'.cpp', '.cxx', '.c++', '.hpp', '.tpp', '.t++'}:
+            elif not accept_filename(g):
                 os.remove(g)
 
 
@@ -141,11 +151,14 @@ def downloadpackage(filepath, outpath):
 
     filename = filepath[filepath.rfind('/') + 1:]
     if filename[-3:] == '.gz':
-        subprocess.call(['tar', 'xzvf', filename])
+        # TODO: handle exitcode?
+        subprocess.call(['tar', 'xzf', filename])
     elif filename[-3:] == '.xz':
-        subprocess.call(['tar', 'xJvf', filename])
+        # TODO: handle exitcode?
+        subprocess.call(['tar', 'xJf', filename])
     elif filename[-4:] == '.bz2':
-        subprocess.call(['tar', 'xjvf', filename])
+        # TODO: handle exitcode?
+        subprocess.call(['tar', 'xjf', filename])
     else:
         return
 
@@ -153,7 +166,8 @@ def downloadpackage(filepath, outpath):
 
     for g in glob.glob('[#_A-Za-z0-9]*'):
         if os.path.isdir(g):
-            subprocess.call(['tar', '-cJvf', outpath + filename[:filename.rfind('.')] + '.xz', g])
+            # TODO: handle exitcode?
+            subprocess.call(['tar', '-cJf', outpath + filename[:filename.rfind('.')] + '.xz', g])
             break
 
 workdir = os.path.expanduser('~/daca2-packages/tmp/')
diff --git a/tools/daca2-getpackages.py b/tools/daca2-getpackages.py
index 3d0d8341b89..992921082c1 100755
--- a/tools/daca2-getpackages.py
+++ b/tools/daca2-getpackages.py
@@ -24,6 +24,7 @@ def wget(filepath):
     if '/' in filepath:
         filename = filename[filename.rfind('/') + 1:]
     for d in DEBIAN:
+        # TODO: handle exitcode?
         subprocess.call(
             ['nice', 'wget', '--tries=10', '--timeout=300', '-O', filename, d + filepath])
         if os.path.isfile(filename):
@@ -41,12 +42,13 @@ def latestvername(names):
 def getpackages():
     if not wget('ls-lR.gz'):
         sys.exit(1)
+    # TODO: handle exitcode?
     subprocess.call(['nice', 'gunzip', 'ls-lR.gz'])
     if not os.path.isfile('ls-lR'):
         sys.exit(1)
-    f = open('ls-lR', 'rt')
-    lines = f.readlines()
-    f.close()
+    with open('ls-lR', 'rt') as f:
+        lines = f.readlines()
+    # TODO: handle exitcode?
     subprocess.call(['rm', 'ls-lR'])
 
     # Example content in ls-lR:
diff --git a/tools/defines/create_platform_cfg.sh b/tools/defines/create_platform_cfg.sh
new file mode 100755
index 00000000000..1d9f23cd738
--- /dev/null
+++ b/tools/defines/create_platform_cfg.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+if [ -n "$1" ]; then
+  compiler_cmd=$1
+else
+  compiler_cmd="gcc"
+fi
+
+compiler_defs=$($compiler_cmd -dM -E - < /dev/null)
+
+char_bit=$(echo "$compiler_defs" | grep __CHAR_BIT__ | cut -d' ' -f3)
+# only set by compiler if -funsigned-char is specified
+char_unsigned=$(echo "$compiler_defs" | grep __CHAR_UNSIGNED__ | cut -d' ' -f3)
+if [ -n "$char_unsigned" ] && [ "$char_unsigned" -eq 1 ]; then
+  default_sign="unsigned"
+else
+  default_sign="signed"
+fi
+# TODO
+size_of_bool=
+size_of_short=$(echo "$compiler_defs" | grep __SIZEOF_SHORT__ | cut -d' ' -f3)
+size_of_int=$(echo "$compiler_defs" | grep __SIZEOF_INT__ | cut -d' ' -f3)
+size_of_long=$(echo "$compiler_defs" | grep __SIZEOF_LONG__ | cut -d' ' -f3)
+size_of_long_long=$(echo "$compiler_defs" | grep __SIZEOF_LONG_LONG__ | cut -d' ' -f3)
+size_of_float=$(echo "$compiler_defs" | grep __SIZEOF_FLOAT__ | cut -d' ' -f3)
+size_of_double=$(echo "$compiler_defs" | grep __SIZEOF_DOUBLE__ | cut -d' ' -f3)
+size_of_long_double=$(echo "$compiler_defs" | grep __SIZEOF_LONG_DOUBLE__ | cut -d' ' -f3)
+size_of_pointer=$(echo "$compiler_defs" | grep __SIZEOF_POINTER__ | cut -d' ' -f3)
+size_of_size_t=$(echo "$compiler_defs" | grep __SIZEOF_SIZE_T__ | cut -d' ' -f3)
+size_of_wchar_t=$(echo "$compiler_defs" | grep __SIZEOF_WCHAR_T__ | cut -d' ' -f3)
+
+echo "<?xml version=\"1.0\"?>
+<platform>
+  <char_bit>$char_bit</char_bit>
+  <default-sign>$default_sign</default-sign>
+  <sizeof>
+    <bool>$size_of_bool</bool>
+    <short>$size_of_short</short>
+    <int>$size_of_int</int>
+    <long>$size_of_long</long>
+    <long-long>$size_of_long_long</long-long>
+    <float>$size_of_float</float>
+    <double>$size_of_double</double>
+    <long-double>$size_of_long_double</long-double>
+    <pointer>$size_of_pointer</pointer>
+    <size_t>$size_of_size_t</size_t>
+    <wchar_t>$size_of_wchar_t</wchar_t>
+  </sizeof>
+</platform>"
diff --git a/tools/defines/defines.sh b/tools/defines/defines.sh
new file mode 100755
index 00000000000..51696171c5a
--- /dev/null
+++ b/tools/defines/defines.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+gcc -Wall -Wextra limits.c
+./a.out
+gcc -Wall -Wextra float.c
+./a.out
+gcc -Wall -Wextra stdint.c
+./a.out
+
+clang -Weverything limits.c
+./a.out
+clang -Weverything float.c
+./a.out
+clang -Weverything stdint.c
+./a.out
\ No newline at end of file
diff --git a/tools/defines/float.c b/tools/defines/float.c
new file mode 100644
index 00000000000..31887414740
--- /dev/null
+++ b/tools/defines/float.c
@@ -0,0 +1,43 @@
+#include "float.h"
+#include "stdio.h"
+
+#define PRINT_DEF(d, f) \
+    fprintf(stdout, ";"#d "=%"#f, d)
+
+int main(void)
+{
+    PRINT_DEF(FLT_RADIX, d);
+    PRINT_DEF(FLT_MANT_DIG, d);
+    PRINT_DEF(DBL_MANT_DIG, d);
+    PRINT_DEF(LDBL_MANT_DIG, d);
+    PRINT_DEF(FLT_DIG, d);
+    PRINT_DEF(DBL_DIG, d);
+    PRINT_DEF(LDBL_DIG, d);
+    PRINT_DEF(FLT_MIN_EXP, d);
+    PRINT_DEF(DBL_MIN_EXP, d);
+    PRINT_DEF(LDBL_MIN_EXP, d);
+    PRINT_DEF(FLT_MIN_10_EXP, d);
+    PRINT_DEF(DBL_MIN_10_EXP, d);
+    PRINT_DEF(LDBL_MIN_10_EXP, d);
+    PRINT_DEF(FLT_MAX_EXP, d);
+    PRINT_DEF(DBL_MAX_EXP, d);
+    PRINT_DEF(LDBL_MAX_EXP, d);
+    PRINT_DEF(FLT_MAX_10_EXP, d);
+    PRINT_DEF(DBL_MAX_10_EXP, d);
+    PRINT_DEF(LDBL_MAX_10_EXP, d);
+    PRINT_DEF(FLT_MAX, f); // TODO: float-to-double
+    PRINT_DEF(DBL_MAX, f);
+    PRINT_DEF(LDBL_MAX, Lf);
+    PRINT_DEF(FLT_EPSILON, f); // TODO: float-to-double
+    PRINT_DEF(DBL_EPSILON, f);
+    PRINT_DEF(LDBL_EPSILON, Lf);
+    PRINT_DEF(FLT_MIN, f); // TODO: float-to-double
+    PRINT_DEF(DBL_MIN, f);
+    PRINT_DEF(LDBL_MIN, Lf);
+#if (__STDC_VERSION__ >= 199901L) || (__cplusplus >= 201103L)
+    PRINT_DEF(FLT_EVAL_METHOD, d);
+    PRINT_DEF(DECIMAL_DIG, d);
+#endif
+
+    return 0;
+}
diff --git a/tools/defines/limits.c b/tools/defines/limits.c
new file mode 100644
index 00000000000..0407aefac22
--- /dev/null
+++ b/tools/defines/limits.c
@@ -0,0 +1,32 @@
+#include "limits.h"
+#include "stdio.h"
+
+#define PRINT_DEF(d, f) \
+    fprintf(stdout, ";"#d "=%"#f, d)
+
+int main(void)
+{
+    PRINT_DEF(CHAR_BIT, d);
+    PRINT_DEF(SCHAR_MIN, d);
+    PRINT_DEF(SCHAR_MAX, d);
+    PRINT_DEF(UCHAR_MAX, d);
+    PRINT_DEF(CHAR_MIN, d);
+    PRINT_DEF(CHAR_MAX, d);
+    PRINT_DEF(MB_LEN_MAX, d);
+    PRINT_DEF(SHRT_MIN, d);
+    PRINT_DEF(SHRT_MAX, d);
+    PRINT_DEF(USHRT_MAX, d);
+    PRINT_DEF(INT_MIN, d);
+    PRINT_DEF(INT_MAX, d);
+    PRINT_DEF(UINT_MAX, u);
+    PRINT_DEF(LONG_MIN, ld);
+    PRINT_DEF(LONG_MAX, ld);
+    PRINT_DEF(ULONG_MAX, ld);
+#if (__STDC_VERSION__ >= 199901L) || (__cplusplus >= 201103L)
+    PRINT_DEF(LLONG_MIN, lld);
+    PRINT_DEF(LLONG_MAX, lld);
+    PRINT_DEF(ULLONG_MAX, llu);
+#endif
+
+    return 0;
+}
diff --git a/tools/defines/readme.md b/tools/defines/readme.md
new file mode 100644
index 00000000000..ed9d372c091
--- /dev/null
+++ b/tools/defines/readme.md
@@ -0,0 +1,22 @@
+# Compiler defines
+
+NOTE: this is preliminary.
+
+This folder contains scripts to extract compiler-specific defines and definitions for use with a Cppcheck scan.
+
+Specifying these will get rid of `` warnings (which are reported when `--debug-warnings` is specified) which allows for increased coverage of the ValueFlow.
+
+## Files
+
+- `define.sh`
+Invokes the compilation and execution of the various programs which output the compiler-specific defines.
+- `float.c`
+Outputs the defines provided by `float.h`/`cfloat`.
+- `limits.c`
+Outputs the defines provided by `limits.h`/`climits`.
+- `stdint.c`
+Outputs the defines provided by `stdint.h`/`cstdint`.
+- `create_platform_cfg.sh`
+Generates a platform file from the given compiler which can be given to Cppcheck via `--platform`.
+- `run_cppcheck.sh`
+Generates the compiler-specific configurations for the given compiler and runs Cppcheck with them.
\ No newline at end of file
diff --git a/tools/defines/run_cppcheck.sh b/tools/defines/run_cppcheck.sh
new file mode 100644
index 00000000000..af0567c5832
--- /dev/null
+++ b/tools/defines/run_cppcheck.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# TODO: use temporary filename
+./create_platform_cfg.sh > platform.cfg
+
+# TODO: add option to pass define to cppcheck
+./defines.sh > defines.txt
+
+./cppcheck --platform=platform.cfg "$@"
\ No newline at end of file
diff --git a/tools/defines/stdint.c b/tools/defines/stdint.c
new file mode 100644
index 00000000000..72fc6c6ead8
--- /dev/null
+++ b/tools/defines/stdint.c
@@ -0,0 +1,44 @@
+#include "stdint.h"
+#include "stdio.h"
+
+#define PRINT_DEF(d, f) \
+    fprintf(stdout, ";"#d "=%"#f, d)
+
+#define PRINT_DEF_N(d1, d2, f) \
+    do { \
+        PRINT_DEF(d1 ## 8 ## d2, f); \
+        PRINT_DEF(d1 ## 16 ## d2, f); \
+        PRINT_DEF(d1 ## 32 ## d2, f); \
+        PRINT_DEF(d1 ## 64 ## d2, l ## f); \
+    } while (0)
+
+// TODO: fix all format specifiers
+int main(void)
+{
+    PRINT_DEF(INTMAX_MIN, ld);
+    PRINT_DEF(INTMAX_MAX, ld);
+    PRINT_DEF(UINTMAX_MAX, lu);
+    PRINT_DEF_N(INT, _MIN, d);
+    PRINT_DEF_N(INT, _MAX, d);
+    PRINT_DEF_N(UINT, _MAX, u);
+    PRINT_DEF_N(INT_LEAST, _MIN, d);
+    PRINT_DEF_N(INT_LEAST, _MAX, d);
+    PRINT_DEF_N(UINT_LEAST, _MAX, u);
+    PRINT_DEF_N(INT_FAST, _MIN, d);
+    PRINT_DEF_N(INT_FAST, _MAX, d);
+    PRINT_DEF_N(UINT_FAST, _MAX, u);
+    PRINT_DEF(INTPTR_MIN, ld);
+    PRINT_DEF(INTPTR_MAX, ld);
+    PRINT_DEF(UINTPTR_MAX, lu);
+    PRINT_DEF(SIZE_MAX, lu);
+    PRINT_DEF(PTRDIFF_MIN, ld);
+    PRINT_DEF(PTRDIFF_MAX, ld);
+    PRINT_DEF(SIG_ATOMIC_MIN, d);
+    PRINT_DEF(SIG_ATOMIC_MAX, d);
+    PRINT_DEF(WCHAR_MIN, d);
+    PRINT_DEF(WCHAR_MAX, d);
+    PRINT_DEF(WINT_MIN, d);
+    PRINT_DEF(WINT_MAX, d);
+
+    return 0;
+}
diff --git a/tools/dmake.vcxproj b/tools/dmake.vcxproj
deleted file mode 100644
index 5c50dcb32b5..00000000000
--- a/tools/dmake.vcxproj
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" 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="Globals">
-    <ProjectGuid>{19EC86CD-0004-4917-B852-E6BD110B6E6F}</ProjectGuid>
-    <RootNamespace>dmake</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\Build\$(Configuration)\</OutDir>
-    <IntDir>..\BuildTmp\$(TargetName)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\Build\$(Configuration)\</OutDir>
-    <IntDir>..\BuildTmp\$(TargetName)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\lib;..\externals\simplecpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader />
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)dmake.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\lib;..\externals\simplecpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)dmake.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\externals\simplecpp\simplecpp.cpp" />
-    <ClCompile Include="..\lib\pathmatch.cpp" />
-    <ClCompile Include="..\lib\utils.cpp" />
-    <ClCompile Include="dmake.cpp" />
-    <ClCompile Include="..\cli\filelister.cpp" />
-    <ClCompile Include="..\lib\path.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\cli\filelister.h" />
-    <ClInclude Include="..\lib\path.h" />
-    <ClInclude Include="..\lib\utils.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/tools/dmake/CMakeLists.txt b/tools/dmake/CMakeLists.txt
new file mode 100644
index 00000000000..cbe7040ef2f
--- /dev/null
+++ b/tools/dmake/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+add_executable(dmake EXCLUDE_FROM_ALL
+        dmake.cpp
+)
+target_link_libraries(dmake cppcheck-core cli simplecpp)
+if (WIN32 AND NOT BORLAND)
+    if(NOT MINGW)
+        target_link_libraries(dmake Shlwapi.lib)
+    else()
+        target_link_libraries(dmake shlwapi)
+    endif()
+endif()
+
+add_custom_target(run-dmake $<TARGET_FILE:dmake>
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        DEPENDS dmake)
diff --git a/tools/dmake.cpp b/tools/dmake/dmake.cpp
similarity index 63%
rename from tools/dmake.cpp
rename to tools/dmake/dmake.cpp
index e2571fa8764..100e32b6b5b 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake/dmake.cpp
@@ -20,32 +20,40 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstdlib>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <functional>
 #include <iostream>
+#include <list>
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include "config.h"
-
 #include "../cli/filelister.h"
+#include "../lib/filesettings.h"
+#include "../lib/path.h"
 #include "../lib/pathmatch.h"
 #include "../lib/utils.h"
 
 static std::string builddir(std::string filename)
 {
-    if (filename.compare(0,4,"lib/") == 0)
+    if (startsWith(filename,"lib/"))
         filename = "$(libcppdir)" + filename.substr(3);
+    else if (startsWith(filename, "../lib/")) // oss-fuzz
+        filename = "$(libcppdir)" + filename.substr(6);
+
     return filename;
 }
 
 static std::string objfile(std::string cppfile)
 {
     cppfile.erase(cppfile.rfind('.'));
+    if (startsWith(cppfile, "../externals/simplecpp/")) // oss-fuzz
+        cppfile = cppfile.substr(23);
+    else if (startsWith(cppfile, "../externals/tinyxml2/")) // oss-fuzz
+        cppfile = cppfile.substr(22);
     return builddir(cppfile + ".o");
 }
 
@@ -62,14 +70,19 @@ static std::string objfiles(const std::vector<std::string> &files)
     return allObjfiles;
 }
 
-static void getDeps(const std::string &filename, std::vector<std::string> &depfiles)
+static void getDeps(std::string filename, std::vector<std::string> &depfiles)
 {
     static const std::array<std::string, 3> externalfolders{"externals/picojson", "externals/simplecpp", "externals/tinyxml2"};
+    static const std::array<std::string, 3> externalfolders_rel{"../externals/picojson", "../externals/simplecpp", "../externals/tinyxml2"};
 
     // Is the dependency already included?
     if (std::find(depfiles.cbegin(), depfiles.cend(), filename) != depfiles.cend())
         return;
 
+    const bool relative = startsWith(filename, "../"); // oss-fuzz
+    if (relative)
+        filename = filename.substr(3);
+
     std::ifstream f(filename.c_str());
     if (!f.is_open()) {
         /*
@@ -77,20 +90,28 @@ static void getDeps(const std::string &filename, std::vector<std::string> &depfi
          * Files are searched according to the following priority:
          * [test, tools] -> cli -> lib -> externals
          */
-        if (filename.compare(0, 4, "cli/") == 0)
+        if (startsWith(filename, "frontend/"))
+            getDeps("lib" + filename.substr(filename.find('/')), depfiles);
+        if (startsWith(filename, "cli/"))
             getDeps("lib" + filename.substr(filename.find('/')), depfiles);
-        else if (filename.compare(0, 5, "test/") == 0)
+        else if (startsWith(filename, "test/"))
             getDeps("cli" + filename.substr(filename.find('/')), depfiles);
-        else if (filename.compare(0, 6, "tools/") == 0)
+        else if (startsWith(filename, "tools"))
             getDeps("cli" + filename.substr(filename.find('/')), depfiles);
-        else if (filename.compare(0, 4, "lib/") == 0) {
-            for (const std::string & external : externalfolders)
+        else if (startsWith(filename, "lib/")) {
+            const auto& extfolders = relative ? externalfolders_rel : externalfolders;
+            for (const std::string & external : extfolders)
                 getDeps(external + filename.substr(filename.find('/')), depfiles);
         }
         return;
     }
     if (filename.find(".c") == std::string::npos)
-        depfiles.push_back(filename);
+    {
+        if (relative)
+            depfiles.push_back("../" + filename);
+        else
+            depfiles.push_back(filename);
+    }
 
     std::string path(filename);
     if (path.find('/') != std::string::npos)
@@ -119,6 +140,8 @@ static void getDeps(const std::string &filename, std::vector<std::string> &depfi
         // no need to look up extension-less headers
         if (!endsWith(hfile, ".h"))
             continue;
+        if (relative)
+            hfile = "../" + hfile;
         getDeps(hfile, depfiles);
     }
 }
@@ -126,31 +149,37 @@ static void getDeps(const std::string &filename, std::vector<std::string> &depfi
 static void compilefiles(std::ostream &fout, const std::vector<std::string> &files, const std::string &args)
 {
     for (const std::string &file : files) {
-        const bool external(file.compare(0,10,"externals/") == 0);
+        const bool external(startsWith(file,"externals/") || startsWith(file,"../externals/"));
+        const bool tinyxml2(startsWith(file,"externals/tinyxml2/") || startsWith(file,"../externals/tinyxml2/"));
         fout << objfile(file) << ": " << file;
         std::vector<std::string> depfiles;
         getDeps(file, depfiles);
         std::sort(depfiles.begin(), depfiles.end());
         for (const std::string &depfile : depfiles)
             fout << " " << depfile;
-        fout << "\n\t$(CXX) " << args << " $(CPPFLAGS) $(CXXFLAGS)" << (external?" -w":"") << " -c -o $@ " << builddir(file) << "\n\n";
+        std::string additional;
+        if (external)
+            additional += " -w"; // do not show any warnings for external
+        if (tinyxml2)
+            additional += " -D_LARGEFILE_SOURCE"; // required for fseeko() and ftello() (on Cygwin)
+        fout << "\n\t$(CXX) " << args << " $(CPPFLAGS) $(CXXFLAGS)" << additional << " -c -o $@ " << builddir(file) << "\n\n";
     }
 }
 
 static std::string getCppFiles(std::vector<std::string> &files, const std::string &path, bool recursive)
 {
-    std::map<std::string,size_t> filemap;
+    std::list<FileWithDetails> filelist;
     const std::set<std::string> extra;
     const std::vector<std::string> masks;
-    const PathMatch matcher(masks);
-    std::string err = FileLister::addFiles(filemap, path, extra, recursive, matcher);
+    const PathMatch matcher(masks, Path::getCurrentPath());
+    std::string err = FileLister::addFiles(filelist, path, extra, recursive, matcher);
     if (!err.empty())
         return err;
 
     // add *.cpp files to the "files" vector..
-    for (const std::pair<const std::string&, size_t> file : filemap) {
-        if (endsWith(file.first, ".cpp"))
-            files.push_back(file.first);
+    for (const auto& file : filelist) {
+        if (endsWith(file.path(), ".cpp"))
+            files.push_back(file.path());
     }
     return "";
 }
@@ -221,7 +250,7 @@ static int write_vcxproj(const std::string &proj_name, const std::function<void(
     return EXIT_SUCCESS;
 }
 
-enum ClType { Compile, Include, Precompile };
+enum ClType : std::uint8_t { Compile, Include, Precompile };
 
 static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
 {
@@ -233,14 +262,6 @@ static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
         outstr += "\r\n";
         outstr += R"(      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>)";
         outstr += "\r\n";
-        outstr += R"(      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>)";
-        outstr += "\r\n";
-        outstr += R"(      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'">Create</PrecompiledHeader>)";
-        outstr += "\r\n";
-        outstr += R"(      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'">Create</PrecompiledHeader>)";
-        outstr += "\r\n";
-        outstr += R"(      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>)";
-        outstr += "\r\n";
         outstr += R"(      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>)";
         outstr += "\r\n";
         outstr += R"(      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">Create</PrecompiledHeader>)";
@@ -259,6 +280,147 @@ static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
     return outstr;
 }
 
+static std::vector<std::string> prioritizelib(const std::vector<std::string>& libfiles)
+{
+    std::map<std::string, std::size_t> priorities;
+    std::size_t prio = libfiles.size();
+    for (const auto &l : libfiles) {
+        priorities.emplace(l, prio--);
+    }
+    priorities["lib/valueflow.cpp"] = 1000;
+    priorities["lib/tokenize.cpp"] = 900;
+    priorities["lib/symboldatabase.cpp"] = 800;
+    std::vector<std::string> libfiles_prio = libfiles;
+    std::sort(libfiles_prio.begin(), libfiles_prio.end(), [&](const std::string &l1, const std::string &l2) {
+        const auto p1 = priorities.find(l1);
+        const auto p2 = priorities.find(l2);
+        return (p1 != priorities.end() ? p1->second : 0) > (p2 != priorities.end() ? p2->second : 0);
+    });
+    return libfiles_prio;
+}
+
+static void makeMatchcompiler(std::ostream& fout, const std::string& toolsPrefix, std::string args)
+{
+    if (!args.empty())
+        args = " " + args;
+
+    // avoid undefined variable
+    fout << "ifndef MATCHCOMPILER\n"
+         << "    MATCHCOMPILER=\n"
+         << "endif\n";
+    // TODO: bail out when matchcompiler.py fails (i.e. invalid PYTHON_INTERPRETER specified)
+    // TODO: handle "PYTHON_INTERPRETER="
+    // use match compiler..
+    fout << "# use match compiler\n";
+    fout << "ifeq ($(MATCHCOMPILER),yes)\n"
+         << "    # Find available Python interpreter\n"
+         << "    ifeq ($(PYTHON_INTERPRETER),)\n"
+         << "        PYTHON_INTERPRETER := $(shell which python3)\n"
+         << "    endif\n"
+         << "    ifeq ($(PYTHON_INTERPRETER),)\n"
+         << "        PYTHON_INTERPRETER := $(shell which python)\n"
+         << "    endif\n"
+         << "    ifeq ($(PYTHON_INTERPRETER),)\n"
+         << "        $(error Did not find a Python interpreter)\n"
+         << "    endif\n"
+         << "    ifdef VERIFY\n"
+         << "        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) " << toolsPrefix << "tools/matchcompiler.py" << args << " --verify)\n"
+         << "    else\n"
+         << "        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) " << toolsPrefix << "tools/matchcompiler.py" << args << ")\n"
+         << "    endif\n"
+         << "    libcppdir:=build\n"
+         << "else ifeq ($(MATCHCOMPILER),)\n"
+         << "    libcppdir:=lib\n"
+         << "else\n"
+         << "    $(error invalid MATCHCOMPILER value '$(MATCHCOMPILER)')\n"
+         << "endif\n\n";
+}
+
+static void write_ossfuzz_makefile(std::vector<std::string> libfiles_prio, std::vector<std::string> extfiles)
+{
+    for (auto& l : libfiles_prio)
+    {
+        l = "../" + l;
+    }
+
+    for (auto& e : extfiles)
+    {
+        e = "../" + e;
+    }
+
+    std::ofstream fout("oss-fuzz/Makefile");
+
+    fout << "# This file is generated by dmake, do not edit.\n";
+    fout << '\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 << '\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} ${CXXFLAGS} -o $@ $^ ${LIB_FUZZING_ENGINE}\n";
+    fout << '\n';
+    fout << "no-fuzz: $(EXTOBJ) $(LIBOBJ) main_nofuzz.o type2.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";
+    fout << '\n';
+    fout << "clean:\n";
+    fout << "\trm -f *.o build/*.o oss-fuzz-client no-fuzz translate\n";
+    fout << '\n';
+    fout << "preprare-samples:\n";
+    fout << "\trm -rf samples\n";
+    fout << "\tmkdir -p samples\n";
+    fout << "\tcp -R ../samples .\n";
+    fout << "\tfind ./samples -type f -name '*.txt' -exec rm -vf {} \\;\n";
+    fout << '\n';
+    fout << "do-fuzz: oss-fuzz-client preprare-samples\n";
+    fout << "\tmkdir -p corpus\n";
+    fout << "\t./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 corpus samples ../test/cli/fuzz-crash ../test/cli/fuzz-crash_c ../test/cli/fuzz-timeout\n";
+    fout << '\n';
+    fout << "dedup-corpus: oss-fuzz-client preprare-samples\n";
+    fout << "\tmv corpus corpus_\n";
+    fout << "\tmkdir -p corpus\n";
+    fout << "\t./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 corpus corpus_ samples ../test/cli/fuzz-crash ../test/cli/fuzz-crash_c ../test/cli/fuzz-timeout -merge=1\n";
+    fout << '\n';
+    fout << "# jobs:\n";
+    fout << "# ./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 corpus samples ../test/cli/fuzz-crash ../test/cli/fuzz-crash_c ../test/cli/fuzz-timeout -workers=12 -jobs=9\n";
+    fout << '\n';
+    fout << "# minimize:\n";
+    fout << "# ./oss-fuzz-client -only_ascii=1 -timeout=5 -detect_leaks=0 -minimize_crash=1 crash-0123456789abcdef\n";
+    fout << '\n';
+
+    compilefiles(fout, extfiles, "${LIB_FUZZING_ENGINE}");
+    compilefiles(fout, libfiles_prio, "${LIB_FUZZING_ENGINE}");
+
+    fout << '\n';
+    fout << "type2.o: type2.cpp type2.h\n";
+    fout << "\t$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ type2.cpp\n";
+    fout << '\n';
+    fout << "translate.o: translate.cpp type2.h\n";
+    fout << "\t$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ translate.cpp\n";
+    fout << '\n';
+    fout << "main.o: main.cpp type2.h\n";
+    fout << "\t$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ main.cpp\n";
+    fout << '\n';
+    fout << "main_nofuzz.o: main.cpp type2.h\n";
+    fout << "\t$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -DNO_FUZZ -c -o $@ main.cpp\n";
+}
+
 int main(int argc, char **argv)
 {
     const bool release(argc >= 2 && std::string(argv[1]) == "--release");
@@ -270,6 +432,7 @@ int main(int argc, char **argv)
         std::cerr << err << std::endl;
         return EXIT_FAILURE;
     }
+    const std::vector<std::string> libfiles_prio = prioritizelib(libfiles);
 
     std::vector<std::string> extfiles;
     err = getCppFiles(extfiles, "externals/", true);
@@ -278,6 +441,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()) {
@@ -293,34 +463,46 @@ int main(int argc, char **argv)
     }
 
     std::vector<std::string> toolsfiles;
-    err = getCppFiles(toolsfiles, "tools/", false);
+    err = getCppFiles(toolsfiles, "tools/dmake/", false);
     if (!err.empty()) {
         std::cerr << err << std::endl;
         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;
     }
 
     // TODO: add files without source via parsing
-    std::vector<std::string> libfiles_h;
+    std::set<std::string> libfiles_h;
     for (const std::string &libfile : libfiles) {
         std::string fname(libfile.substr(4));
         fname.erase(fname.find(".cpp"));
-        libfiles_h.emplace_back(fname + ".h");
+        libfiles_h.emplace(fname + ".h");
+    }
+    libfiles_h.emplace("analyzer.h");
+    libfiles_h.emplace("calculate.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("smallvector.h");
+    libfiles_h.emplace("sourcelocation.h");
+    libfiles_h.emplace("tokenrange.h");
+    libfiles_h.emplace("valueptr.h");
+    libfiles_h.emplace("version.h");
+    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");
     }
-    libfiles_h.emplace_back("analyzer.h");
-    libfiles_h.emplace_back("calculate.h");
-    libfiles_h.emplace_back("config.h");
-    libfiles_h.emplace_back("precompiled.h");
-    libfiles_h.emplace_back("smallvector.h");
-    libfiles_h.emplace_back("standards.h");
-    libfiles_h.emplace_back("tokenrange.h");
-    libfiles_h.emplace_back("valueptr.h");
-    libfiles_h.emplace_back("version.h");
-    std::sort(libfiles_h.begin(), libfiles_h.end());
 
     std::vector<std::string> clifiles_h;
     for (const std::string &clifile : clifiles) {
@@ -331,13 +513,12 @@ int main(int argc, char **argv)
         clifiles_h.emplace_back(fname + ".h");
     }
 
-    std::vector<std::string> testfiles_h;
-    testfiles_h.emplace_back("fixture.h");
-    testfiles_h.emplace_back("helpers.h");
-    testfiles_h.emplace_back("options.h");
-    testfiles_h.emplace_back("precompiled.h");
-    testfiles_h.emplace_back("redirect.h");
-    std::sort(testfiles_h.begin(), testfiles_h.end());
+    std::set<std::string> testfiles_h;
+    testfiles_h.emplace("fixture.h");
+    testfiles_h.emplace("helpers.h");
+    testfiles_h.emplace("options.h");
+    testfiles_h.emplace("precompiled.h");
+    testfiles_h.emplace("redirect.h");
 
     // TODO: write filter files
     // Visual Studio projects
@@ -346,17 +527,25 @@ 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);
 
-        for (const std::string &libfile: libfiles) {
+        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);
         }
@@ -377,6 +566,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);
@@ -387,36 +581,17 @@ 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);
         }
     });
 
-    // QMAKE - lib/lib.pri
-    {
-        std::ofstream fout1("lib/lib.pri");
-        if (fout1.is_open()) {
-            fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
-            fout1 << "include($$PWD/pcrerules.pri)\n";
-            fout1 << "include($$PWD/../externals/externals.pri)\n";
-            fout1 << "INCLUDEPATH += $$PWD\n";
-            fout1 << "HEADERS += ";
-            for (const std::string &libfile_h : libfiles_h) {
-                fout1 << "$${PWD}/" << libfile_h;
-                if (libfile_h != libfiles_h.back())
-                    fout1 << " \\\n" << std::string(11, ' ');
-            }
-            fout1 << "\n\nSOURCES += ";
-            for (const std::string &libfile : libfiles) {
-                fout1 << "$${PWD}/" << libfile.substr(4);
-                if (libfile != libfiles.back())
-                    fout1 << " \\\n" << std::string(11, ' ');
-            }
-            fout1 << "\n";
-        }
-    }
-
-    static const char makefile[] = "Makefile";
+    static constexpr char makefile[] = "Makefile";
     std::ofstream fout(makefile, std::ios_base::trunc);
     if (!fout.is_open()) {
         std::cerr << "An error occurred while trying to open "
@@ -425,46 +600,16 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
-    fout << "# This file is generated by tools/dmake, do not edit.\n\n";
+    fout << "# This file is generated by dmake, do not edit.\n\n";
 
     fout << "ifndef VERBOSE\n"
          << "    VERBOSE=\n"
          << "endif\n";
 
     fout << "# To compile with rules, use 'make HAVE_RULES=yes'\n";
-    makeConditionalVariable(fout, "HAVE_RULES", "no");
+    makeConditionalVariable(fout, "HAVE_RULES", "");
 
-    fout << "ifdef SRCDIR\n"
-         << "    $(error Usage of SRCDIR to activate match compiler has been removed. Use MATCHCOMPILER=yes instead.)\n"
-         << "endif\n";
-    // avoid undefined variable
-    fout << "ifndef MATCHCOMPILER\n"
-         << "    MATCHCOMPILER=\n"
-         << "endif\n";
-    // TODO: bail out when matchcompiler.py fails (i.e. invalid PYTHON_INTERPRETER specified)
-    // TODO: handle "PYTHON_INTERPRETER="
-    // use match compiler..
-    fout << "# use match compiler\n";
-    fout << "ifeq ($(MATCHCOMPILER),yes)\n"
-         << "    # Find available Python interpreter\n"
-         << "    ifeq ($(PYTHON_INTERPRETER),)\n"
-         << "        PYTHON_INTERPRETER := $(shell which python3)\n"
-         << "    endif\n"
-         << "    ifeq ($(PYTHON_INTERPRETER),)\n"
-         << "        PYTHON_INTERPRETER := $(shell which python)\n"
-         << "    endif\n"
-         << "    ifeq ($(PYTHON_INTERPRETER),)\n"
-         << "        $(error Did not find a Python interpreter)\n"
-         << "    endif\n"
-         << "    ifdef VERIFY\n"
-         << "        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) tools/matchcompiler.py --verify)\n"
-         << "    else\n"
-         << "        matchcompiler_S := $(shell $(PYTHON_INTERPRETER) tools/matchcompiler.py)\n"
-         << "    endif\n"
-         << "    libcppdir:=build\n"
-         << "else\n"
-         << "    libcppdir:=lib\n"
-         << "endif\n\n";
+    makeMatchcompiler(fout, "", "");
 
     // avoid undefined variable
     fout << "ifndef CPPFLAGS\n"
@@ -473,11 +618,11 @@ int main(int argc, char **argv)
 
     // explicit files dir..
     fout << "ifdef FILESDIR\n"
-         << "    CPPFLAGS+=-DFILESDIR=\\\"$(FILESDIR)\\\"\n"
+         << "    override CPPFLAGS+=-DFILESDIR=\\\"$(FILESDIR)\\\"\n"
          << "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"
@@ -552,16 +697,11 @@ int main(int argc, char **argv)
          << "endif # WINNT\n"
          << "\n";
 
-    // tinymxl2 requires __STRICT_ANSI__ to be undefined to compile under CYGWIN.
     fout << "ifdef CYGWIN\n"
          << "    ifeq ($(VERBOSE),1)\n"
          << "        $(info CYGWIN found)\n"
          << "    endif\n"
          << "\n"
-         << "    # Set the flag to address compile time warnings\n"
-         << "    # with tinyxml2 and Cygwin.\n"
-         << "    CPPFLAGS+=-U__STRICT_ANSI__\n"
-         << "    \n"
          << "    # Increase stack size for Cygwin builds to avoid segmentation fault in limited recursive tests.\n"
          << "    CXXFLAGS+=-Wl,--stack,8388608\n"
          << "endif # CYGWIN\n"
@@ -575,49 +715,32 @@ int main(int argc, char **argv)
 
     // Makefile settings..
     if (release) {
-        makeConditionalVariable(fout, "CXXFLAGS", "-std=c++0x -O2 -DNDEBUG -Wall -Wno-sign-compare");
+        makeConditionalVariable(fout, "CXXFLAGS", "-O2 -Wall -Wno-sign-compare -Wno-multichar");
+        fout << "override CPPFLAGS += -DNDEBUG\n\n";
     } else {
-        // TODO: add more compiler warnings.
-        // -Wlogical-op       : doesn't work on older GCC
-        // -Wsign-conversion  : too many warnings
-        // -Wunreachable-code : some GCC versions report lots of warnings
         makeConditionalVariable(fout, "CXXFLAGS",
                                 "-pedantic "
                                 "-Wall "
                                 "-Wextra "
                                 "-Wcast-qual "
-//                                "-Wconversion "  // danmar: gives fp. for instance: unsigned int sizeof_pointer = sizeof(void *);
-                                "-Wno-deprecated-declarations "
                                 "-Wfloat-equal "
-//                                "-Wlogical-op "
                                 "-Wmissing-declarations "
                                 "-Wmissing-format-attribute "
                                 "-Wno-long-long "
-//                                "-Woverloaded-virtual "  // danmar: we get fp when overloading analyseWholeProgram()
                                 "-Wpacked "
                                 "-Wredundant-decls "
                                 "-Wundef "
-                                "-Wno-shadow "
-//                                "-Wsign-conversion "
-//                                "-Wsign-promo "
-                                "-Wno-missing-field-initializers "
-                                "-Wno-missing-braces "
-//                                "-Wunreachable-code "
-                                "-Wno-sign-compare "  // danmar: I don't like this warning, it's very rarely a bug
+                                "-Wno-sign-compare "
                                 "-Wno-multichar "
-                                "$(CPPCHK_GLIBCXX_DEBUG) "
+                                "-Woverloaded-virtual "
                                 "-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"
-         << "    override CXXFLAGS += -std=gnu++0x -pipe\n"
-         << "else ifeq (clang++, $(findstring clang++,$(CXX)))\n"
-         << "    override CXXFLAGS += -std=c++0x\n"
-         << "else ifeq ($(CXX), c++)\n"
-         << "    ifeq ($(shell uname -s), Darwin)\n"
-         << "        override CXXFLAGS += -std=c++0x\n"
-         << "    endif\n"
+         << "    override CXXFLAGS += -pipe\n"
          << "endif\n"
+         << "override CXXFLAGS += -std=c++11"
          << "\n";
 
     fout << "ifeq ($(HAVE_RULES),yes)\n"
@@ -625,18 +748,28 @@ int main(int argc, char **argv)
          << "    ifeq ($(PCRE_CONFIG),)\n"
          << "        $(error Did not find pcre-config)\n"
          << "    endif\n"
-         << "    override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(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"
          << "        LIBS=$(shell $(PCRE_CONFIG) --libs)\n"
          << "    endif\n"
+         << "else ifneq ($(HAVE_RULES),)\n"
+         << "    $(error invalid HAVE_RULES value '$(HAVE_RULES)')\n"
          << "endif\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/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";
@@ -645,31 +778,39 @@ int main(int argc, char **argv)
     fout << "MAN_SOURCE=man/cppcheck.1.xml\n\n";
 
     fout << "\n###### Object Files\n\n";
-    fout << "LIBOBJ =      " << objfiles(libfiles) << "\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: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\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";
-    // TODO: generate from clifiles
-    fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/executor.o cli/processexecutor.o cli/singleexecutor.o cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/cppcheckexecutorseh.o cli/cppcheckexecutorsig.o cli/stacktrace.o cli/filelister.o\n";
-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+    std::string testrunner_clifiles_o;
+    for (const std::string &clifile: clifiles) {
+        if (clifile == "cli/main.cpp")
+            continue;
+        testrunner_clifiles_o += ' ';
+        const std::string o = clifile.substr(0, clifile.length()-3) + 'o';
+        testrunner_clifiles_o += o;
+    }
+    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";
     fout << "\t./testrunner -q\n\n";
     fout << "checkcfg:\tcppcheck validateCFG\n";
     fout << "\t./test/cfg/runtests.sh\n\n";
-    fout << "dmake:\ttools/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path.o $(libcppdir)/utils.o externals/simplecpp/simplecpp.o\n";
+    fout << "dmake:\ttools/dmake/dmake.o cli/filelister.o $(libcppdir)/pathmatch.o $(libcppdir)/path.o $(libcppdir)/utils.o externals/simplecpp/simplecpp.o\n";
     fout << "\t$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)\n\n";
     fout << "run-dmake: dmake\n";
-    fout << "\t./dmake\n\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/*.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";
@@ -682,6 +823,7 @@ int main(int argc, char **argv)
     fout << "ifdef FILESDIR\n";
     fout << "\tinstall -d ${DESTDIR}${FILESDIR}\n";
     fout << "\tinstall -d ${DESTDIR}${FILESDIR}/addons\n";
+    fout << "\tinstall -m 644 addons/*.json ${DESTDIR}${FILESDIR}/addons\n";
     fout << "\tinstall -m 644 addons/*.py ${DESTDIR}${FILESDIR}/addons\n";
     fout << "\tinstall -d ${DESTDIR}${FILESDIR}/cfg\n";
     fout << "\tinstall -m 644 cfg/*.cfg ${DESTDIR}${FILESDIR}/cfg\n";
@@ -703,15 +845,6 @@ int main(int argc, char **argv)
     fout << "\t  rm -rf ${DESTDIR}${FILESDIR}; \\\n";
     fout << "\tfi\n";
     fout << "endif\n";
-    fout << "ifdef CFGDIR \n";
-    fout << "\t@if test -d ${DESTDIR}${CFGDIR}; then \\\n";
-    fout << "\t  files=\"`cd cfg 2>/dev/null && ls`\"; \\\n";
-    fout << "\t  if test -n \"$$files\"; then \\\n";
-    fout << "\t    echo '(' cd ${DESTDIR}${CFGDIR} '&&' rm -f $$files ')'; \\\n";
-    fout << "\t    ( cd ${DESTDIR}${CFGDIR} && rm -f $$files ); \\\n";
-    fout << "\t  fi; \\\n";
-    fout << "\tfi\n";
-    fout << "endif\n\n";
     fout << "# Validation of library files:\n";
     fout << "ConfigFiles := $(wildcard cfg/*.cfg)\n";
     fout << "ConfigFilesCHECKED := $(patsubst %.cfg,%.checked,$(ConfigFiles))\n";
@@ -749,14 +882,21 @@ 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, "${INCLUDE_FOR_LIB}");
+    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, extfiles, emptyString);
+    compilefiles(fout, testfiles, "${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST}");
+    compilefiles(fout, extfiles, "");
     compilefiles(fout, toolsfiles, "${INCLUDE_FOR_LIB}");
 
+    write_ossfuzz_makefile(libfiles_prio, extfiles);
+
     return 0;
 }
diff --git a/tools/donate-cpu-requirements.txt b/tools/donate-cpu-requirements.txt
new file mode 100644
index 00000000000..1d1077372cf
--- /dev/null
+++ b/tools/donate-cpu-requirements.txt
@@ -0,0 +1,2 @@
+psutil
+packaging
diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py
index 21ca925a2f0..d8afaba2be3 100755
--- a/tools/donate-cpu-server.py
+++ b/tools/donate-cpu-server.py
@@ -26,9 +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.40"
+SERVER_VERSION = "1.3.67"
 
-OLD_VERSION = '2.11'
+# TODO: fetch from GitHub tags
+OLD_VERSION = '2.19.0'
 
 HEAD_MARKER = 'head results:'
 INFO_MARKER = 'info messages:'
@@ -76,6 +77,10 @@ def dateTimeFromStr(datestr: str) -> datetime.datetime:
     return datetime.datetime.strptime(datestr, '%Y-%m-%d %H:%M')
 
 
+def pkg_from_file(filename: str) -> str:
+    return filename[filename.rfind('/')+1:]
+
+
 def overviewReport() -> str:
     html = '<!DOCTYPE html>\n'
     html += '<html><head><title>daca@home</title></head><body>\n'
@@ -85,7 +90,7 @@ def overviewReport() -> str:
     html += '<a href="stale.html">Stale report</a><br>\n'
     html += '<a href="diff.html">Diff report</a><br>\n'
     html += '<a href="head.html">HEAD report</a><br>\n'
-    html += '<a href="headinfo.html">HEAD (info) report</a><br>\n'
+    html += '<a href="headinfo.html">HEAD (information) report</a><br>\n'
     html += '<a href="latest.html">Latest results</a><br>\n'
     html += '<a href="time_lt.html">Time report (improved)</a><br>\n'
     html += '<a href="time_gt.html">Time report (regressed)</a> - <a href="time_gt.html?pkgs=1">packages.txt</a><br>\n'
@@ -111,15 +116,21 @@ def overviewReport() -> str:
     #html += '<a href="head-valueFlowBailout">valueFlowBailout</a><br>\n'
     #html += '<a href="head-bailoutUninitVar">bailoutUninitVar</a><br>\n'
     #html += '<a href="head-symbolDatabaseWarning">symbolDatabaseWarning</a><br>\n'
-    #html += '<a href="head-valueFlowBailoutIncompleteVar">valueFlowBailoutIncompleteVar</a><br>\n'
+    html += '<br>\n'
+    html += 'Custom reports:<br>\n'
+    html += '<a href="value_flow_bailout_incomplete_var.html">valueFlowBailoutIncompleteVar report</a><br>\n'
+    html += '<a href="unknown_macro.html">unknownMacro report</a><br>\n'
     html += '<br>\n'
     html += 'Important errors:<br>\n'
     html += '<a href="head-cppcheckError">cppcheckError</a><br>\n'
+    html += '<a href="head-internalError">internalError</a><br>\n'
     html += '<a href="head-internalAstError">internalAstError</a><br>\n'
     html += '<a href="head-syntaxError">syntaxError</a><br>\n'
     html += '<a href="head-DacaWrongData">DacaWrongData</a><br>\n'
     html += '<a href="head-dacaWrongSplitTemplateRightAngleBrackets">dacaWrongSplitTemplateRightAngleBrackets</a><br>\n'
     html += '<br>\n'
+    html += '<a href="clients.html">clients</a><br>\n'
+    html += '<br>\n'
     html += 'version ' + SERVER_VERSION + '\n'
     html += '</body></html>'
     return html
@@ -160,7 +171,7 @@ def latestReport(latestResults: list) -> str:
     for filename in latestResults:
         if not os.path.isfile(filename):
             continue
-        package = filename[filename.rfind('/')+1:]
+        package = pkg_from_file(filename)
         current_year = datetime.date.today().year
 
         datestr = None
@@ -212,9 +223,8 @@ def crashReport(results_path: str, query_params: dict):
                     if OLD_VERSION not in line:
                         # Package results seem to be too old, skip
                         break
-                    else:
-                        # Current package, parse on
-                        continue
+                    # Current package, parse on
+                    continue
                 if datestr is None and line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
                     datestr = line
                 elif pkgs is not None and package_url is None and line.startswith('ftp://'):
@@ -222,7 +232,7 @@ def crashReport(results_path: str, query_params: dict):
                 elif line.startswith('count:'):
                     if line.find('Crash') < 0:
                         break
-                    package = filename[filename.rfind('/')+1:]
+                    package = pkg_from_file(filename)
                     counts = line.split(' ')
                     c_version = ''
                     if counts[2] == 'Crash!':
@@ -313,15 +323,14 @@ def timeoutReport(results_path: str) -> str:
                     if OLD_VERSION not in line:
                         # Package results seem to be too old, skip
                         break
-                    else:
-                        # Current package, parse on
-                        continue
+                    # Current package, parse on
+                    continue
                 if datestr is None and line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
                     datestr = line
                 elif line.startswith('count:'):
                     if line.find('TO!') < 0:
                         break
-                    package = filename[filename.rfind('/')+1:]
+                    package = pkg_from_file(filename)
                     counts = line.split(' ')
                     c2 = ''
                     if counts[2] == 'TO!':
@@ -337,29 +346,33 @@ def timeoutReport(results_path: str) -> str:
     return html
 
 
-def staleReport(results_path: str) -> str:
+def staleReport(results_path: str, query_params: dict) -> str:
+    thresh_d = query_params.get('days')
+    if thresh_d is None:
+        thresh_d = 30
+    else:
+        thresh_d = int(thresh_d)
+
     html = '<!DOCTYPE html>\n'
     html += '<html><head><title>Stale report</title></head><body>\n'
     html += '<h1>Stale report</h1>\n'
     html += '<pre>\n'
     html += '<b>' + fmt('Package', 'Date       Time', link=False) + '</b>\n'
-    current_year = datetime.date.today().year
     for filename in sorted(glob.glob(os.path.expanduser(results_path + '/*'))):
-        if not os.path.isfile(filename) or filename.endswith('.diff'):
+        if filename.endswith('.diff') or not os.path.isfile(filename):
             continue
-        for line in open(filename, 'rt'):
-            line = line.strip()
-            if line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
-                datestr = line
-            else:
-                continue
-            dt = dateTimeFromStr(datestr)
-            diff = datetime.datetime.now() - dt
-            if diff.days < 30:
-                continue
-            package = filename[filename.rfind('/')+1:]
-            html += fmt(package, datestr) + '\n'
-            break
+        with open(filename, 'rt') as f:
+            # first line is datetime string
+            datestr = f.readline().strip()
+            try:
+                dt = dateTimeFromStr(datestr)
+                diff = datetime.datetime.now() - dt
+            except:
+                # there might be very outdated files which still might have an invalid timestamp
+                diff = datetime.timedelta(days=thresh_d)
+            if diff.days >= thresh_d:
+                package = pkg_from_file(filename)
+                html += fmt(package, datestr) + '\n'
     html += '</pre>\n'
 
     html += '</body></html>\n'
@@ -418,7 +431,7 @@ def diffReport(resultsPath: str) -> str:
         for messageId in data['sums']:
             sums = data['sums'][messageId]
             if OLD_VERSION not in sums:
-                continue
+                break
             if messageId not in out:
                 out[messageId] = [0, 0]
             out[messageId][0] += sums[OLD_VERSION]
@@ -450,7 +463,7 @@ def generate_package_diff_statistics(filename: str) -> None:
         if line == 'diff:':
             is_diff = True
             continue
-        elif not is_diff:
+        if not is_diff:
             continue
         if not line.endswith(']'):
             continue
@@ -486,9 +499,12 @@ def diffMessageIdReport(resultPath: str, messageId: str) -> str:
         if not os.path.isfile(filename):
             continue
         with open(filename, 'rt') as f:
-            diff_stats = f.read()
-        if messageId not in diff_stats:
+            diff_stats = json.loads(f.read())
+        if messageId not in diff_stats['sums']:
+            continue
+        if OLD_VERSION not in diff_stats['sums'][messageId]:
             continue
+
         url = None
         diff = False
         for line in open(filename[:-5], 'rt'):
@@ -514,11 +530,14 @@ def diffMessageIdTodayReport(resultPath: str, messageId: str) -> str:
         if not os.path.isfile(filename):
             continue
         with open(filename, 'rt') as f:
-            diff_stats = f.read()
-        if messageId not in diff_stats:
+            diff_stats = json.loads(f.read())
+        if messageId not in diff_stats['sums']:
+            continue
+        if OLD_VERSION not in diff_stats['sums'][messageId]:
             continue
-        if today not in diff_stats:
+        if today not in diff_stats["date"]:
             continue
+
         url = None
         diff = False
         firstLine = True
@@ -591,17 +610,15 @@ def summaryReport(resultsPath: str, name: str, prefix: str, marker: str) -> str:
                 if OLD_VERSION not in line:
                     # Package results seem to be too old, skip
                     break
-                else:
-                    # Current package, parse on
-                    continue
+                # Current package, parse on
+                continue
             if line.startswith(marker):
                 inResults = True
                 continue
-            if line.startswith('diff:'):
-                if inResults:
-                    break
             if not inResults:
                 continue
+            if line.startswith('diff:'):
+                break
             if not line.endswith(']'):
                 continue
             if ': note: ' in line:
@@ -624,7 +641,7 @@ def summaryReport(resultsPath: str, name: str, prefix: str, marker: str) -> str:
                 outToday[messageId] += 1
 
     html = '<!DOCTYPE html>\n'
-    html += '<html><head><title>HEAD report</title></head><body>\n'
+    html += '<html><head><title>{} report</title></head><body>\n'.format(name)
     html += '<h1>HEAD report</h1>\n'
     html += '<h2>Uploaded today</h2>'
     html += summaryReportFromDict(outToday, prefix, 'today')
@@ -639,7 +656,7 @@ def headReport(resultsPath: str) -> str:
 
 
 def infoReport(resultsPath: str) -> str:
-    return summaryReport(resultsPath, 'HEAD (info)', 'headinfo', INFO_MARKER)
+    return summaryReport(resultsPath, 'HEAD (information)', 'headinfo', INFO_MARKER)
 
 
 def messageIdReport(resultPath: str, marker: str, messageId: str, query_params: dict) -> str:
@@ -652,15 +669,22 @@ def messageIdReport(resultPath: str, marker: str, messageId: str, query_params:
         url = None
         inResults = False
         for line in open(filename, 'rt'):
+            if line.startswith('cppcheck: '):
+                if OLD_VERSION not in line:
+                    # Package results seem to be too old, skip
+                    break
+                # Current package, parse on
+                continue
             if line.startswith('ftp://'):
                 url = line
-            elif line.startswith(marker):
-                inResults = True
-            elif not inResults:
                 continue
-            elif inResults and line.startswith('diff:'):
+            if not inResults:
+                if line.startswith(marker):
+                    inResults = True
+                continue
+            if line.startswith('diff:'):
                 break
-            elif line.endswith(e):
+            if line.endswith(e):
                 if url:
                     text += url
                     if pkgs is not None:
@@ -697,13 +721,14 @@ def messageIdTodayReport(resultPath: str, messageId: str, marker: str) -> str:
                     break
             if line.startswith('ftp://'):
                 url = line
-            elif line.startswith(marker):
-                inResults = True
-            elif not inResults:
                 continue
-            elif inResults and line.startswith('diff:'):
+            if not inResults:
+                if line.startswith(marker):
+                    inResults = True
+                continue
+            if line.startswith('diff:'):
                 break
-            elif line.endswith(e):
+            if line.endswith(e):
                 if url:
                     text += url
                     url = None
@@ -754,13 +779,12 @@ def timeReport(resultPath: str, show_gt: bool, query_params: dict):
                 if OLD_VERSION not in line:
                     # Package results seem to be too old, skip
                     break
-                else:
-                    # Current package, parse on
-                    continue
+                # Current package, parse on
+                continue
             if datestr is None and line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
                 datestr = line
                 continue
-            elif pkgs is not None and package_url is None and line.startswith('ftp://'):
+            if pkgs is not None and package_url is None and line.startswith('ftp://'):
                 package_url = line
             if not line.startswith('elapsed-time:'):
                 continue
@@ -855,13 +879,12 @@ def timeReportSlow(resultPath: str) -> str:
                 if OLD_VERSION not in line:
                     # Package results seem to be too old, skip
                     break
-                else:
-                    # Current package, parse on
-                    continue
+                # Current package, parse on
+                continue
             if datestr is None and line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
                 datestr = line
                 continue
-            elif line.startswith('count:'):
+            if line.startswith('count:'):
                 count_head = line.split()[1]
                 if count_head == 'TO!':
                     # ignore results with timeouts
@@ -896,17 +919,31 @@ def timeReportSlow(resultPath: str) -> str:
 
 
 def check_library_report(result_path: str, message_id: str) -> str:
-    if message_id not in ('checkLibraryNoReturn', 'checkLibraryFunction', 'checkLibraryUseIgnore', 'checkLibraryCheckType'):
+    if message_id not in ('checkLibraryNoReturn', 'checkLibraryFunction', 'checkLibraryUseIgnore', 'checkLibraryCheckType', 'valueFlowBailoutIncompleteVar', 'unknownMacro'):
         error_message = 'Invalid value ' + message_id + ' for message_id parameter.'
         print_ts(error_message)
         return error_message
 
-    if message_id == 'checkLibraryCheckType':
+    if message_id == 'unknownMacro':
+        metric = 'macros'
+        m_column = 'macro'
+        metric_link = 'unknown_macro'
+        start_marker = HEAD_MARKER
+    elif message_id == 'valueFlowBailoutIncompleteVar':
+        metric = 'variables'
+        m_column = 'Variable'
+        metric_link = 'incomplete_var'
+        start_marker = HEAD_MARKER
+    elif message_id == 'checkLibraryCheckType':
         metric = 'types'
         m_column = 'Type'
+        metric_link = 'check_library'
+        start_marker = INFO_MARKER
     else:
         metric = 'functions'
         m_column = 'Function'
+        metric_link = 'check_library'
+        start_marker = INFO_MARKER
 
     functions_shown_max = 5000
     html = '<!DOCTYPE html>\n'
@@ -923,26 +960,36 @@ def check_library_report(result_path: str, message_id: str) -> str:
     for filename in glob.glob(result_path + '/*'):
         if not os.path.isfile(filename) or filename.endswith('.diff'):
             continue
-        info_messages = False
+        in_results = False
         for line in open(filename, 'rt'):
             if line.startswith('cppcheck: '):
                 if OLD_VERSION not in line:
                     # Package results seem to be too old, skip
                     break
-                else:
-                    # Current package, parse on
-                    continue
-            if line == 'info messages:\n':
-                info_messages = True
-            if not info_messages:
+                # Current package, parse on
+                continue
+            if not in_results:
+                if line.startswith(start_marker):
+                    in_results = True
                 continue
+            if line.startswith('diff:'):
+                break
             if line.endswith('[' + message_id + ']\n'):
-                if message_id == 'checkLibraryFunction':
-                    function_name = line[(line.find('for function ') + len('for function ')):line.rfind('[') - 1]
+                if message_id == 'unknownMacro':
+                    marker = 'required. If '
+                    function_name = line[(line.find(marker) + len(marker)):line.rfind('is a macro') - 1]
+                elif message_id == 'valueFlowBailoutIncompleteVar':
+                    marker = 'incomplete variable '
+                    function_name = line[(line.find(marker) + len(marker)):line.rfind('[') - 1]
+                elif message_id == 'checkLibraryFunction':
+                    marker = 'for function '
+                    function_name = line[(line.find(marker) + len(marker)):line.rfind('[') - 1]
                 elif message_id == 'checkLibraryCheckType':
-                    function_name = line[(line.find('configuration for ') + len('configuration for ')):line.rfind('[') - 1]
+                    marker = 'configuration for '
+                    function_name = line[(line.find(marker) + len(marker)):line.rfind('[') - 1]
                 else:
-                    function_name = line[(line.find(': Function ') + len(': Function ')):line.rfind('should have') - 1]
+                    marker = ': Function '
+                    function_name = line[(line.find(marker) + len(marker)):line.rfind('should have') - 1]
                 function_counts[function_name] = function_counts.setdefault(function_name, 0) + 1
 
     function_details_list = []
@@ -950,7 +997,7 @@ def check_library_report(result_path: str, message_id: str) -> str:
         if len(function_details_list) >= functions_shown_max:
             break
         function_details_list.append(str(count).rjust(column_widths[0]) + ' ' +
-                '<a href="check_library-' + urllib.parse.quote_plus(function_name) + '">' + function_name + '</a>\n')
+                '<a href="' + metric_link + '-' + urllib.parse.quote_plus(function_name) + '">' + function_name + '</a>\n')
 
     html += ''.join(function_details_list)
     html += '</pre>\n'
@@ -960,41 +1007,137 @@ def check_library_report(result_path: str, message_id: str) -> str:
 
 
 # Lists all checkLibrary* messages regarding the given function name
-def check_library_function_name(result_path: str, function_name: str) -> str:
+def check_library_function_name(result_path: str, function_name: str, query_params: dict, nonfunc_id: str='') -> str:
+    pkgs = '' if query_params.get('pkgs') == '1' else None
     function_name = urllib.parse.unquote_plus(function_name)
-    if function_name.endswith('()'):
-        id = '[checkLibrary'
+    if nonfunc_id:
+        id = '[' + nonfunc_id
+        marker = HEAD_MARKER
     else:
-        id = '[checkLibraryCheckType]'
+        if function_name.endswith('()'):
+            id = '[checkLibrary'
+        else:
+            id = '[checkLibraryCheckType]'
+        marker = INFO_MARKER
     output_lines_list = []
     for filename in glob.glob(result_path + '/*'):
         if not os.path.isfile(filename) or filename.endswith('.diff'):
             continue
-        info_messages = False
-        url = None
+        in_results = False
+        package_url = None
         cppcheck_options = None
         for line in open(filename, 'rt'):
+            if line.startswith('cppcheck: '):
+                if OLD_VERSION not in line:
+                    # Package results seem to be too old, skip
+                    break
+                # Current package, parse on
+                continue
             if line.startswith('ftp://'):
-                url = line
-            elif line.startswith('cppcheck-options:'):
+                package_url = line
+                continue
+            if line.startswith('cppcheck-options:'):
                 cppcheck_options = line
-            elif line == 'info messages:\n':
-                info_messages = True
-            if not info_messages:
                 continue
-            if id in line:
-                if (' ' + function_name + ' ') in line:
-                    if url:
-                        output_lines_list.append(url)
-                        url = None
-                    if cppcheck_options:
-                        output_lines_list.append(cppcheck_options)
-                        cppcheck_options = None
-                    output_lines_list.append(line)
+            if not in_results:
+                if line.startswith(marker):
+                    in_results = True
+                continue
+            if line.startswith('diff:'):
+                break
+            if id not in line:
+                continue
+            if not (' ' + function_name + ' ') in line:
+                continue
+            if pkgs is not None and package_url is not None:
+                pkgs += '{}\n'.format(package_url.strip())
+                break
+            if package_url:
+                output_lines_list.append(package_url)
+                package_url = None
+            if cppcheck_options:
+                output_lines_list.append(cppcheck_options)
+                cppcheck_options = None
+            output_lines_list.append(line)
 
+    if pkgs is not None:
+        return pkgs
     return ''.join(output_lines_list)
 
 
+def clientsReport(results_path: str):
+    html = '<!DOCTYPE html>\n'
+    html += '<html><head><title>Clients report</title></head><body>\n'
+    html += '<h1>Clients report</h1>\n'
+    current_year = datetime.date.today().year
+    # TODO: use full profiles?
+    # TODO: add jobs
+    platforms = {}
+    py_versions = {}
+    client_versions = {}
+    compilers = {}
+    for filename in sorted(glob.glob(os.path.expanduser(results_path + '/*'))):
+        if not os.path.isfile(filename) or filename.endswith('.diff'):
+            continue
+        with open(filename, 'rt') as file_:
+            datestr = None
+            platform = None
+            py_version = None
+            client_version = None
+            compiler = None
+            for line in file_:
+                line = line.strip()
+                if line.startswith('cppcheck: '):
+                    if OLD_VERSION not in line:
+                        # Package results seem to be too old, skip
+                        break
+                    if not datestr:
+                        break
+
+                    dt = dateTimeFromStr(datestr)
+
+                    if platform and not platform in platforms or dt < dateTimeFromStr(platforms[platform]):
+                        platforms[platform] = datestr
+                    if py_version and not py_version in py_versions or dt < dateTimeFromStr(py_versions[py_version]):
+                        py_versions[py_version] = datestr
+                    if client_version and not client_version in client_versions or dt < dateTimeFromStr(client_versions[client_version]):
+                        client_versions[client_version] = datestr
+                    if compiler and not compiler in compilers or dt < dateTimeFromStr(compilers[compiler]):
+                        compilers[compiler] = datestr
+                    break #  stop processing
+
+                if datestr is None and line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
+                    datestr = line
+                elif line.startswith('platform:'):
+                    platform = line.split(' ', 1)[1]
+                elif line.startswith('python:'):
+                    py_version = line.split(' ',1 )[1]
+                elif line.startswith('client-version:'):
+                    client_version = line.split(' ', 1)[1]
+                elif line.startswith('compiler:'):
+                    compiler = line.split(' ', 1)[1]
+
+    html += '<pre>\n'
+    html += 'Client versions:\n'
+    for clv in client_versions:
+        html += clv + ' - ' + client_versions[clv] + '\n'
+    html += '\n'
+    html += 'Python versions:\n'
+    for pyv in py_versions:
+        html += pyv + ' - ' + py_versions[pyv] + '\n'
+    html += '\n'
+    html += 'Platforms:\n'
+    for pl in platforms:
+        html += pl + ' - ' + platforms[pl] + '\n'
+    html += '\n'
+    html += 'Compilers:\n'
+    for cmp in compilers:
+        html += cmp + ' - ' + compilers[cmp] + '\n'
+    html += '</pre>\n'
+    html += '</body></html>\n'
+    return html
+
+
 def sendAll(connection: socket.socket, text: str) -> None:
     data = text.encode('utf-8', 'ignore')
     while data:
@@ -1018,7 +1161,7 @@ class HttpClientThread(Thread):
     def __init__(self, connection: socket.socket, cmd: str, resultPath: str, latestResults: list) -> None:
         Thread.__init__(self)
         self.connection = connection
-        self.cmd = cmd[:cmd.find('\r\n')]
+        self.cmd = cmd
         self.resultPath = resultPath
         self.infoPath = os.path.join(self.resultPath, 'info_output')
         self.latestResults = latestResults
@@ -1035,12 +1178,12 @@ def parse_req(cmd):
     def run(self):
         try:
             cmd = self.cmd
-            print_ts(cmd)
             url, queryParams = self.parse_req(cmd)
             if url is None:
                 print_ts('invalid request: {}'.format(cmd))
                 self.connection.close()
                 return
+            t_start = time.perf_counter()
             if url == '/':
                 html = overviewReport()
                 httpGetResponse(self.connection, html, 'text/html')
@@ -1054,7 +1197,7 @@ def run(self):
                 html = timeoutReport(self.resultPath)
                 httpGetResponse(self.connection, html, 'text/html')
             elif url == '/stale.html':
-                html = staleReport(self.resultPath)
+                html = staleReport(self.resultPath, queryParams)
                 httpGetResponse(self.connection, html, 'text/html')
             elif url == '/diff.html':
                 html = diffReport(self.resultPath)
@@ -1112,10 +1255,27 @@ def run(self):
                 httpGetResponse(self.connection, text, 'text/html')
             elif url.startswith('/check_library-'):
                 function_name = url[len('/check_library-'):]
-                text = check_library_function_name(self.infoPath, function_name)
+                text = check_library_function_name(self.infoPath, function_name, queryParams)
+                httpGetResponse(self.connection, text, 'text/plain')
+            elif url == '/value_flow_bailout_incomplete_var.html':
+                text = check_library_report(self.resultPath, message_id='valueFlowBailoutIncompleteVar')
+                httpGetResponse(self.connection, text, 'text/html')
+            elif url == '/unknown_macro.html':
+                text = check_library_report(self.resultPath, message_id='unknownMacro')
+                httpGetResponse(self.connection, text, 'text/html')
+            elif url.startswith('/incomplete_var-'):
+                var_name = url[len('/incomplete_var-'):]
+                text = check_library_function_name(self.resultPath, var_name, queryParams, nonfunc_id='valueFlowBailoutIncompleteVar')
+                httpGetResponse(self.connection, text, 'text/plain')
+            elif url.startswith('/unknown_macro-'):
+                var_name = url[len('/unknown_macro-'):]
+                text = check_library_function_name(self.resultPath, var_name, queryParams, nonfunc_id='unknownMacro')
                 httpGetResponse(self.connection, text, 'text/plain')
+            elif url.startswith('/clients.html'):
+                text = clientsReport(self.resultPath)
+                httpGetResponse(self.connection, text, 'text/html')
             else:
-                filename = resultPath + url
+                filename = self.resultPath + url
                 if not os.path.isfile(filename):
                     print_ts('HTTP/1.1 404 Not Found')
                     self.connection.send(b'HTTP/1.1 404 Not Found\r\n\r\n')
@@ -1123,6 +1283,7 @@ def run(self):
                     with open(filename, 'rt') as f:
                         data = f.read()
                     httpGetResponse(self.connection, data, 'text/plain')
+            print_ts('{} finished in {}s'.format(url, (time.perf_counter() - t_start)))
         except:
             tb = "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2]))
             print_ts(tb)
@@ -1140,7 +1301,7 @@ def read_data(connection, cmd, pos_nl, max_data_size, check_done, cmd_name, time
             bytes_received = connection.recv(1024)
             if bytes_received:
                 try:
-                    text_received = bytes_received.decode('utf-8', 'ignore')
+                    text_received = bytes_received.decode('ascii', 'ignore')
                 except UnicodeDecodeError as e:
                     print_ts('Error: Decoding failed ({}): {}'.format(cmd_name, e))
                     data = None
@@ -1152,15 +1313,23 @@ def read_data(connection, cmd, pos_nl, max_data_size, check_done, cmd_name, time
             else:
                 time.sleep(0.2)
                 t += 0.2
-        connection.close()
     except socket.error as e:
         print_ts('Socket error occurred ({}): {}'.format(cmd_name, e))
         data = None
 
-    if timeout > 0 and t >= timeout:
+    connection.close()
+
+    if (timeout > 0) and (t >= timeout):
         print_ts('Timeout occurred ({}).'.format(cmd_name))
         data = None
 
+    if data and (len(data) >= max_data_size):
+        print_ts('Maximum allowed data ({} bytes) exceeded ({}).'.format(max_data_size, cmd_name))
+
+    elif data and check_done and not data.endswith('\nDONE'):
+        print_ts('Incomplete data received ({}).'.format(cmd_name))
+        data = None
+
     return data
 
 def server(server_address_port: int, packages: list, packageIndex: int, resultPath: str) -> None:
@@ -1183,20 +1352,22 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
     while True:
         # wait for a connection
         print_ts('waiting for a connection')
-        connection, client_address = sock.accept()
+        connection, _ = sock.accept()
         try:
             bytes_received = connection.recv(128)
             cmd = bytes_received.decode('utf-8', 'ignore')
-        except socket.error:
+        except socket.error as e:
+            print_ts('Error: Recv error: ' + str(e))
             connection.close()
             continue
         except UnicodeDecodeError as e:
-            connection.close()
             print_ts('Error: Decoding failed: ' + str(e))
+            connection.close()
             continue
         pos_nl = cmd.find('\n')
         if pos_nl < 1:
-            print_ts('No newline found in data.')
+            print_ts("No newline found in data: '{}'".format(cmd))
+            connection.close()
             continue
         firstLine = cmd[:pos_nl]
         if re.match('[a-zA-Z0-9./ ]+', firstLine) is None:
@@ -1204,14 +1375,18 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
             connection.close()
             continue
         if cmd.startswith('GET /'):
+            cmd = cmd[:cmd.find('\r\n')]
+            print_ts(cmd)
             newThread = HttpClientThread(connection, cmd, resultPath, latestResults)
             newThread.start()
-        elif cmd == 'GetCppcheckVersions\n':
+            continue
+        if cmd == 'GetCppcheckVersions\n':
             reply = 'head ' + OLD_VERSION
             print_ts('GetCppcheckVersions: ' + reply)
             connection.send(reply.encode('utf-8', 'ignore'))
             connection.close()
-        elif cmd == 'get\n':
+            continue
+        if cmd == 'get\n':
             while True:
                 pkg = packages[packageIndex]
                 packageIndex += 1
@@ -1226,10 +1401,13 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
             print_ts('get:' + pkg)
             connection.send(pkg.encode('utf-8', 'ignore'))
             connection.close()
-        elif cmd.startswith('write\nftp://') or cmd.startswith('write\nhttp://'):
-            data = read_data(connection, cmd, pos_nl, max_data_size=2 * 1024 * 1024, check_done=True, cmd_name='write')
+            continue
+        if cmd.startswith('write\nftp://') or cmd.startswith('write\nhttp://'):
+            t_start = time.perf_counter()
+            data = read_data(connection, cmd, pos_nl, max_data_size=1024 * 1024, check_done=True, cmd_name='write')
             if data is None:
                 continue
+            truncated_data = len(data) >= 1024 * 1024
 
             pos = data.find('\n')
             if pos == -1:
@@ -1268,8 +1446,12 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
             if old_version_wrong:
                 print_ts('Unexpected old version. Ignoring result data.')
                 continue
-            print_ts('results added for package ' + res.group(1))
             filename = os.path.join(resultPath, res.group(1))
+            if truncated_data:
+                print_ts('Data is too large. Removing result.')
+                if os.path.exists(filename):
+                    os.remove(filename)
+                continue
             with open(filename, 'wt') as f:
                 f.write(strDateTime() + '\n' + data)
             # track latest added results..
@@ -1280,10 +1462,14 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
                 f.write(' '.join(latestResults))
             # generate package.diff..
             generate_package_diff_statistics(filename)
-        elif cmd.startswith('write_info\nftp://') or cmd.startswith('write_info\nhttp://'):
-            data = read_data(connection, cmd, pos_nl, max_data_size=1024 * 1024, check_done=True, cmd_name='write_info')
+            print_ts('write finished for {} ({} bytes / {}s)'.format(res.group(1), len(data), (time.perf_counter() - t_start)))
+            continue
+        if cmd.startswith('write_info\nftp://') or cmd.startswith('write_info\nhttp://'):
+            t_start = time.perf_counter()
+            data = read_data(connection, cmd, pos_nl, max_data_size=7 * 1024 * 1024, check_done=True, cmd_name='write_info')
             if data is None:
                 continue
+            truncated_data = len(data) >= 7 * 1024 * 1024
 
             pos = data.find('\n')
             if pos == -1:
@@ -1305,31 +1491,36 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
             if url not in packages:
                 print_ts('Url is not in packages. Ignoring information data.')
                 continue
-            print_ts('adding info output for package ' + res.group(1))
             info_path = resultPath + '/' + 'info_output'
             if not os.path.exists(info_path):
                 os.mkdir(info_path)
             filename = info_path + '/' + res.group(1)
+            if truncated_data:
+                print_ts('Data is too large. Removing result.')
+                if os.path.exists(filename):
+                    os.remove(filename)
+                continue
             with open(filename, 'wt') as f:
                 f.write(strDateTime() + '\n' + data)
-        elif cmd == 'getPackagesCount\n':
+            print_ts('write_info finished for {} ({} bytes / {}s)'.format(res.group(1), len(data), (time.perf_counter() - t_start)))
+            continue
+        if cmd == 'getPackagesCount\n':
             packages_count = str(len(packages))
             connection.send(packages_count.encode('utf-8', 'ignore'))
-            connection.close()
             print_ts('getPackagesCount: ' + packages_count)
+            connection.close()
             continue
-        elif cmd.startswith('getPackageIdx'):
+        if cmd.startswith('getPackageIdx'):
             request_idx = abs(int(cmd[len('getPackageIdx:'):]))
             if request_idx < len(packages):
                 pkg = packages[request_idx]
                 connection.send(pkg.encode('utf-8', 'ignore'))
-                connection.close()
                 print_ts('getPackageIdx: ' + pkg)
             else:
-                connection.close()
-                print_ts('getPackageIdx: index is out of range')
+                print_ts('getPackageIdx: index {} is out of range'.format(request_idx))
+            connection.close()
             continue
-        elif cmd.startswith('write_nodata\nftp://'):
+        if cmd.startswith('write_nodata\nftp://'):
             data = read_data(connection, cmd, pos_nl, max_data_size=8 * 1024, check_done=False, cmd_name='write_nodata')
             if data is None:
                 continue
@@ -1360,18 +1551,18 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
                 if currentIdx == startIdx:
                     print_ts('write_nodata:' + url + ' - package not found')
                     break
+            continue
 
-            connection.close()
+        if pos_nl < 0:
+            print_ts('invalid command: "' + firstLine + '"')
         else:
-            if pos_nl < 0:
-                print_ts('invalid command: "' + firstLine + '"')
-            else:
-                lines = cmd.split('\n')
-                s = '\\n'.join(lines[:2])
-                if len(lines) > 2:
-                    s += '...'
-                print_ts('invalid command: "' + s + '"')
-            connection.close()
+            lines = cmd.split('\n')
+            s = '\\n'.join(lines[:2])
+            if len(lines) > 2:
+                s += '...'
+            print_ts('invalid command: "' + s + '"')
+        connection.close()
+        continue
 
 
 if __name__ == "__main__":
@@ -1397,7 +1588,7 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
 
         print_ts('packages_nodata: {}'.format(len(packages_nodata)))
 
-        print_ts('removing packages with no files to process'.format(len(packages_nodata)))
+        print_ts('removing packages with no files to process')
         packages_nodata_clean = []
         for pkg_n in packages_nodata:
             if pkg_n in packages:
diff --git a/tools/donate-cpu.py b/tools/donate-cpu.py
index afef1f0fb61..81c752b141f 100755
--- a/tools/donate-cpu.py
+++ b/tools/donate-cpu.py
@@ -125,10 +125,10 @@
         print('Unhandled argument: ' + arg)
         sys.exit(1)
 
-if sys.version_info.major < 3 or (sys.version_info.major == 3 and sys.version_info.minor < 4):
+if sys.version_info.major < 3 or (sys.version_info.major == 3 and sys.version_info.minor < 7):
     print("#" * 80)
     print("IMPORTANT")
-    print("Please run the client with at least Python 3.4, thanks!")
+    print("Please run the client with at least Python 3.7, thanks!")
     print("#" * 80)
     time.sleep(2)
     sys.exit(1)
@@ -182,14 +182,17 @@
         if ver == 'head':
             ver = 'main'
         current_cppcheck_dir = os.path.join(work_path, 'tree-'+ver)
-        print('Fetching Cppcheck-{}..'.format(ver))
+        if ver != 'main' and lib.has_binary(current_cppcheck_dir):
+            print('No need to check Cppcheck-{} for changes - binary already exists'.format(ver))
+            continue
+        print('Checking Cppcheck-{} for changes..'.format(ver))
         try:
             has_changes = lib.try_retry(lib.checkout_cppcheck_version, fargs=(repo_path, ver, current_cppcheck_dir), max_tries=3, sleep_duration=30.0, sleep_factor=1.0)
         except KeyboardInterrupt as e:
             # Passthrough for user abort
             raise e
         except Exception as e:
-            print('Failed to update Cppcheck ({}), retry later'.format(e))
+            print('Failed to update Cppcheck-{} ({}), retry later'.format(ver, e))
             sys.exit(1)
         if ver == 'main':
             if (has_changes or not lib.has_binary(current_cppcheck_dir)) and not lib.compile_cppcheck(current_cppcheck_dir):
@@ -218,9 +221,10 @@
     source_path, source_found = lib.unpack_package(work_path, tgz, skip_files=skip_files)
     if not source_found:
         print("No files to process")
-        lib.upload_nodata(package)
-        print('Sleep 5 seconds..')
-        time.sleep(5)
+        if do_upload:
+            lib.upload_nodata(package)
+            print('Sleep 5 seconds..')
+            time.sleep(5)
         continue
     crash = False
     timeout = False
@@ -243,16 +247,17 @@
             cppcheck_head_info = lib.get_cppcheck_info(tree_path)
             capture_callstack = True
 
-            def get_client_version_head():
-                cmd = 'python3' + ' ' + os.path.join(tree_path, 'tools', 'donate-cpu.py') + ' ' + '--version'
-                p = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, universal_newlines=True)
-                try:
-                    comm = p.communicate()
-                    return comm[0].strip()
-                except:
-                    return None
+            def get_client_version_head(path):
+                cmd = 'python3' + ' ' + os.path.join(path, 'tools', 'donate-cpu.py') + ' ' + '--version'
+                with subprocess.Popen(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, universal_newlines=True) as p:
+                    try:
+                        # TODO: handle p.returncode?
+                        stdout, _ = p.communicate()
+                    except:
+                        return None
+                return stdout.strip()
 
-            client_version_head = get_client_version_head()
+            client_version_head = get_client_version_head(tree_path)
         c, errout, info, t, cppcheck_options, timing_info = lib.scan_package(tree_path, source_path, libraries, capture_callstack)
         if c < 0:
             if c == -101 and 'error: could not find or open any of the paths given.' in errout:
@@ -268,6 +273,7 @@ def get_client_version_head():
         else:
             count += ' ' + str(c)
         elapsed_time += " {:.1f}".format(t)
+        errout = errout.replace(work_path, '[...]')
         results_to_diff.append(errout)
         if ver == 'head':
             head_info_msg = info
diff --git a/tools/donate_cpu_lib.py b/tools/donate_cpu_lib.py
index 278118160f0..2f2cea803ae 100644
--- a/tools/donate_cpu_lib.py
+++ b/tools/donate_cpu_lib.py
@@ -10,12 +10,13 @@
 import signal
 import tarfile
 import shlex
+import copy
 
 
 # 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.46"
+CLIENT_VERSION = "1.3.69"
 
 # Timeout for analysis with Cppcheck in seconds
 CPPCHECK_TIMEOUT = 30 * 60
@@ -36,10 +37,8 @@ def detect_make():
 
     for m in make_cmds:
         try:
-            #print('{} --version'.format(m))
             subprocess.check_call([m, '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        except OSError as e:
-            #print("'{}' not found ({})".format(m, e))
+        except OSError:
             continue
 
         print("using '{}'".format(m))
@@ -71,6 +70,7 @@ def check_requirements():
             result = False
 
     try:
+        # pylint: disable-next=unused-import - intentional
         import psutil
     except ImportError as e:
         print("Error: {}. Module is required.".format(e))
@@ -80,6 +80,7 @@ def check_requirements():
 
 
 # Try and retry with exponential backoff if an exception is raised
+# pylint: disable-next=inconsistent-return-statements
 def try_retry(fun, fargs=(), max_tries=5, sleep_duration=5.0, sleep_factor=2.0):
     for i in range(max_tries):
         try:
@@ -93,6 +94,7 @@ def try_retry(fun, fargs=(), max_tries=5, sleep_duration=5.0, sleep_factor=2.0):
                 print("Trying {} again in {} seconds".format(fun.__name__, sleep_duration))
                 time.sleep(sleep_duration)
                 sleep_duration *= sleep_factor
+                # do not return - re-try
             else:
                 print("Maximum number of tries reached for {}".format(fun.__name__))
                 raise e
@@ -131,7 +133,10 @@ 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))
-        subprocess.check_call(['git', 'pull'], cwd=cppcheck_path)
+        # --rebase is a workaround for a dropped commit - see https://github.com/danmar/cppcheck/pull/6904
+        # TODO: drop the commit in question
+        # TOD: remove --rebase
+        subprocess.check_call(['git', 'pull', '--rebase'], cwd=cppcheck_path)
 
         hash_new = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=cppcheck_path).strip()
 
@@ -139,15 +144,15 @@ def checkout_cppcheck_version(repo_path, version, cppcheck_path):
         if not has_changes:
             print('No changes detected')
         return has_changes
-    else:
-        if version != 'main':
-            print('Fetching {}'.format(version))
-            # Since this is a shallow clone, explicitly fetch the remote version tag
-            refspec = 'refs/tags/' + version + ':ref/tags/' + version
-            subprocess.check_call(['git', 'fetch', '--depth=1', 'origin', refspec], cwd=repo_path)
-        print('Adding worktree \'{}\' for {}'.format(cppcheck_path, version))
-        subprocess.check_call(['git', 'worktree', 'add', cppcheck_path,  version], cwd=repo_path)
-        return True
+
+    if version != 'main':
+        print('Fetching {}'.format(version))
+        # Since this is a shallow clone, explicitly fetch the remote version tag
+        refspec = 'refs/tags/' + version + ':ref/tags/' + version
+        subprocess.check_call(['git', 'fetch', '--depth=1', 'origin', refspec], cwd=repo_path)
+    print('Adding worktree \'{}\' for {}'.format(cppcheck_path, version))
+    subprocess.check_call(['git', 'worktree', 'add', cppcheck_path,  version], cwd=repo_path)
+    return True
 
 
 def get_cppcheck_info(cppcheck_path):
@@ -212,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':
@@ -299,6 +305,7 @@ def __remove_tree(folder_name):
         return
 
     def rmtree_func():
+        # pylint: disable=deprecated-argument - FIXME: onerror was deprecated in Python 3.12
         shutil.rmtree(folder_name, onerror=__handle_remove_readonly)
 
     print('Removing existing temporary data...')
@@ -397,13 +404,12 @@ def __run_command(cmd, print_cmd=True):
     if print_cmd:
         print(cmd)
     time_start = time.time()
-    comm = None
     if sys.platform == 'win32':
         p = subprocess.Popen(shlex.split(cmd, comments=False, posix=False), stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, errors='surrogateescape')
     else:
         p = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, errors='surrogateescape', preexec_fn=os.setsid)
     try:
-        comm = p.communicate(timeout=CPPCHECK_TIMEOUT)
+        stdout, stderr = p.communicate(timeout=CPPCHECK_TIMEOUT)
         return_code = p.returncode
         p = None
     except subprocess.TimeoutExpired:
@@ -416,21 +422,21 @@ def __run_command(cmd, print_cmd=True):
                 child.terminate()
             try:
                 # call with timeout since it might get stuck e.g. gcc-arm-none-eabi
-                comm = p.communicate(timeout=5)
+                stdout, stderr = p.communicate(timeout=5)
                 p = None
             except subprocess.TimeoutExpired:
                 pass
     finally:
         if p:
             os.killpg(os.getpgid(p.pid), signal.SIGTERM)  # Send the signal to all the process groups
-            comm = p.communicate()
+            stdout, stderr = p.communicate()
+            p = None
     time_stop = time.time()
-    stdout, stderr = comm
     elapsed_time = time_stop - time_start
     return return_code, stdout, stderr, elapsed_time
 
 
-def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True):
+def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True, enable='style,information', debug_warnings=True, check_level=None, extra_args=None):
     print('Analyze..')
     libs = ''
     for library in libraries:
@@ -439,10 +445,19 @@ def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True):
 
     dir_to_scan = source_path
 
-    # TODO: remove missingInclude disabling when it no longer is implied by --enable=information
+    # TODO: temporarily disabled timing information - use --showtime=top5_summary when next version is released
     # Reference for GNU C: https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
-    options = libs + ' --showtime=top5 --check-library --inconclusive --enable=style,information --inline-suppr --disable=missingInclude --suppress=unmatchedSuppression --template=daca2'
-    options += ' --debug-warnings --suppress=autoNoType --suppress=valueFlowBailout --suppress=bailoutUninitVar --suppress=symbolDatabaseWarning --suppress=valueFlowBailoutIncompleteVar'
+    options = '{} --inconclusive --enable={} --inline-suppr --template=daca2'.format(libs, enable)
+    if 'information' in enable:
+        # TODO: remove missingInclude disabling after 2.16 has been released
+        options += ' --disable=missingInclude --suppress=unmatchedSuppression'
+    if check_level:
+        options += ' --check-level=' + check_level
+    if extra_args:
+        options += ' ' + extra_args
+    if debug_warnings:
+        options += ' --check-library --debug-warnings --suppress=autoNoType --suppress=valueFlowBailout' \
+                   ' --suppress=bailoutUninitVar --suppress=symbolDatabaseWarning --suppress=normalCheckLevelConditionExpressions'
     options += ' -D__GNUC__ --platform=unix64'
     options_rp = options + ' -rp={}'.format(dir_to_scan)
     if __make_cmd == 'msbuild.exe':
@@ -504,7 +519,7 @@ def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True):
                 sig_num = int(ie_line[sig_start_pos:ie_line.find(' ', sig_start_pos)])
             # break on the first signalled file for now
             break
-    print('cppcheck finished with ' + str(returncode) + ('' if sig_num == -1 else ' (signal ' + str(sig_num) + ')'))
+    print('cppcheck finished with ' + str(returncode) + ('' if sig_num == -1 else ' (signal ' + str(sig_num) + ')') + ' in {:.1f}s'.format(elapsed_time))
 
     options_j = options + ' ' + __jobs
 
@@ -530,7 +545,7 @@ def scan_package(cppcheck_path, source_path, libraries, capture_callstack=True):
                 cmd += dir_to_scan
             _, st_stdout, _, _ = __run_command(cmd)
             gdb_pos = st_stdout.find(" received signal")
-            if not gdb_pos == -1:
+            if gdb_pos != -1:
                 last_check_pos = st_stdout.rfind('Checking ', 0, gdb_pos)
                 if last_check_pos == -1:
                     stacktrace = st_stdout[gdb_pos:]
@@ -606,25 +621,6 @@ def diff_results(ver1, results1, ver2, results2):
         ret += ver2 + ' ' + r2[i2] + '\n'
         i2 += 1
 
-    # if there are syntaxError/unknownMacro/etc then analysis stops.
-    # diffing normal checker warnings will not make much sense
-    bailout_ids = ('[syntaxError]', '[unknownMacro]')
-    has_bailout_id = False
-    for id in bailout_ids:
-        if (id in results1) or (id in results1):
-            has_bailout_id = True
-    if has_bailout_id:
-        def check_bailout(line):
-            for id in bailout_ids:
-                if line.endswith(id):
-                    return True
-            return False
-        out = ''
-        for line in ret.split('\n'):
-            if check_bailout(line):
-                out += line + '\n'
-        ret = out
-
     return ret
 
 
@@ -653,7 +649,7 @@ def upload_results(package, results):
 
     print('Uploading results.. ' + str(len(results)) + ' bytes')
     try:
-        try_retry(__upload, fargs=('write\n' + package, results + '\nDONE', 'Result'), max_tries=4, sleep_duration=30, sleep_factor=1)
+        try_retry(__upload, fargs=('write\n' + package, results + '\nDONE', 'Result'), max_tries=20, sleep_duration=15, sleep_factor=1)
     except Exception as e:
         print('Result upload failed ({})!'.format(e))
         return False
@@ -668,7 +664,7 @@ def upload_info(package, info_output):
 
     print('Uploading information output.. ' + str(len(info_output)) + ' bytes')
     try:
-        try_retry(__upload, fargs=('write_info\n' + package, info_output + '\nDONE', 'Information'), max_tries=3, sleep_duration=30, sleep_factor=1)
+        try_retry(__upload, fargs=('write_info\n' + package, info_output + '\nDONE', 'Information'), max_tries=20, sleep_duration=15, sleep_factor=1)
     except Exception as e:
         print('Information upload failed ({})!'.format(e))
         return False
@@ -692,11 +688,12 @@ def __init__(self):
                             'bsd': ['<sys/queue.h>', '<sys/tree.h>', '<sys/uio.h>','<bsd/', '<fts.h>', '<db.h>', '<err.h>', '<vis.h>'],
                             'cairo': ['<cairo.h>'],
                             'cppunit': ['<cppunit/'],
+                            'emscripten': ['<emscripten.h>'],
                             'icu': ['<unicode/', '"unicode/'],
                             'ginac': ['<ginac/', '"ginac/'],
                             'googletest': ['<gtest/gtest.h>'],
-                            'gtk': ['<gtk', '<glib.h>', '<glib-', '<glib/', '<gnome'],
-                            'kde': ['<KGlobal>', '<KApplication>', '<KDE/'],
+                            'gtk': ['<gtk', '<glib.h>', '<glib-', '<glib/', '<gdk/', '<gnome'],
+                            'kde': ['<KGlobal>', '<KApplication>', '<KLocalizedString>', '<KDE/', '<klocalizedstring.h>'],
                             'libcerror': ['<libcerror.h>'],
                             'libcurl': ['<curl/curl.h>'],
                             'libsigc++': ['<sigc++/'],
@@ -716,6 +713,7 @@ 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/'],
                             'sqlite3': ['<sqlite3.h>', '"sqlite3.h"'],
                             'tinyxml2': ['<tinyxml2', '"tinyxml2'],
                             'wxsqlite3': ['<wx/wxsqlite3', '"wx/wxsqlite3'],
@@ -744,9 +742,10 @@ def __iterate_files(self, path, has_include_cb):
 
     def get_libraries(self, folder):
         print('Detecting library usage...')
-        libraries = ['posix', 'gnu']
+        libraries = ['posix', 'gnu', 'bsd']
 
-        library_includes_re = self.__library_includes_re
+        # explicitly copy as assignments in python are references
+        library_includes_re = copy.copy(self.__library_includes_re)
 
         def has_include(filedata):
             lib_del = []
@@ -766,10 +765,10 @@ def has_include(filedata):
 def get_compiler_version():
     if __make_cmd == 'msbuild.exe':
         _, _, stderr, _ = __run_command('cl.exe', False)
-        return stderr.split('\n')[0]
+        return stderr.split('\n', maxsplit=1)[0]
 
     _, stdout, _, _ = __run_command('g++ --version', False)
-    return stdout.split('\n')[0]
+    return stdout.split('\n', maxsplit=1)[0]
 
 
 def get_client_version():
diff --git a/tools/get_checkers.py b/tools/get_checkers.py
new file mode 100644
index 00000000000..e2c9719bbfd
--- /dev/null
+++ b/tools/get_checkers.py
@@ -0,0 +1,958 @@
+import datetime
+import glob
+import os
+import re
+import requests
+
+
+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
+ * Copyright (C) 2007-%i Cppcheck team.
+ *
+ * This 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/>.
+ */
+
+// This file is auto-generated by tools/get_checkers.py:
+// python3 tools/get_checkers.py > lib/checkers.cpp
+
+#include "checkers.h"
+
+namespace checkers {
+    const std::map<std::string, std::string> allCheckers{""" % (datetime.date.today().year,))
+print_checkers(os.path.expanduser('~/cppchecksolutions/cppcheck/lib/*.cpp'))
+print("    };\n")
+
+print('    const std::map<std::string, std::string> premiumCheckers{')
+print_checkers(os.path.expanduser('~/cppchecksolutions/addon/src/*.cpp'))
+print('    };')
+
+
+print("""
+    const char Req[] = "Required";
+    const char Adv[] = "Advisory";
+    const char Man[] = "Mandatory";
+    const char Doc[] = "Document";
+    const char Dis[] = "Disapplied";""")
+
+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()
+
+    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 = {}
+
+    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},
+        {0,1,2,Req},
+        {0,1,3,Req},
+        {0,1,4,Req},
+        {0,1,5,Req},
+        {0,1,6,Req},
+        {0,1,7,Req},
+        {0,1,8,Req},
+        {0,1,9,Req},
+        {0,1,10,Req},
+        {0,1,11,Req},
+        {0,1,12,Req},
+        {0,2,1,Req},
+        {0,3,1,Doc},
+        {0,3,2,Req},
+        {0,4,1,Doc},
+        {0,4,2,Doc},
+        {0,4,3,Doc},
+        {1,0,1,Req},
+        {1,0,2,Doc},
+        {1,0,3,Doc},
+        {2,2,1,Doc},
+        {2,3,1,Req},
+        {2,5,1,Adv},
+        {2,7,1,Req},
+        {2,7,2,Req},
+        {2,7,3,Adv},
+        {2,10,1,Req},
+        {2,10,2,Req},
+        {2,10,3,Req},
+        {2,10,4,Req},
+        {2,10,5,Adv},
+        {2,10,6,Req},
+        {2,13,1,Req},
+        {2,13,2,Req},
+        {2,13,3,Req},
+        {2,13,4,Req},
+        {2,13,5,Req},
+        {3,1,1,Req},
+        {3,1,2,Req},
+        {3,1,3,Req},
+        {3,2,1,Req},
+        {3,2,2,Req},
+        {3,2,3,Req},
+        {3,2,4,Req},
+        {3,3,1,Req},
+        {3,3,2,Req},
+        {3,4,1,Req},
+        {3,9,1,Req},
+        {3,9,2,Adv},
+        {3,9,3,Req},
+        {4,5,1,Req},
+        {4,5,2,Req},
+        {4,5,3,Req},
+        {4,10,1,Req},
+        {4,10,2,Req},
+        {5,0,1,Req},
+        {5,0,2,Adv},
+        {5,0,3,Req},
+        {5,0,4,Req},
+        {5,0,5,Req},
+        {5,0,6,Req},
+        {5,0,7,Req},
+        {5,0,8,Req},
+        {5,0,9,Req},
+        {5,0,10,Req},
+        {5,0,11,Req},
+        {5,0,12,Req},
+        {5,0,13,Req},
+        {5,0,14,Req},
+        {5,0,15,Req},
+        {5,0,16,Req},
+        {5,0,17,Req},
+        {5,0,18,Req},
+        {5,0,19,Req},
+        {5,0,20,Req},
+        {5,0,21,Req},
+        {5,2,1,Req},
+        {5,2,2,Req},
+        {5,2,3,Adv},
+        {5,2,4,Req},
+        {5,2,5,Req},
+        {5,2,6,Req},
+        {5,2,7,Req},
+        {5,2,8,Req},
+        {5,2,9,Adv},
+        {5,2,10,Adv},
+        {5,2,11,Req},
+        {5,2,12,Req},
+        {5,3,1,Req},
+        {5,3,2,Req},
+        {5,3,3,Req},
+        {5,3,4,Req},
+        {5,8,1,Req},
+        {5,14,1,Req},
+        {5,17,1,Req},
+        {5,18,1,Req},
+        {5,19,1,Adv},
+        {6,2,1,Req},
+        {6,2,2,Req},
+        {6,2,3,Req},
+        {6,3,1,Req},
+        {6,4,1,Req},
+        {6,4,2,Req},
+        {6,4,3,Req},
+        {6,4,4,Req},
+        {6,4,5,Req},
+        {6,4,6,Req},
+        {6,4,7,Req},
+        {6,4,8,Req},
+        {6,5,1,Req},
+        {6,5,2,Req},
+        {6,5,3,Req},
+        {6,5,4,Req},
+        {6,5,5,Req},
+        {6,5,6,Req},
+        {6,6,1,Req},
+        {6,6,2,Req},
+        {6,6,3,Req},
+        {6,6,4,Req},
+        {6,6,5,Req},
+        {7,1,1,Req},
+        {7,1,2,Req},
+        {7,2,1,Req},
+        {7,3,1,Req},
+        {7,3,2,Req},
+        {7,3,3,Req},
+        {7,3,4,Req},
+        {7,3,5,Req},
+        {7,3,6,Req},
+        {7,4,1,Doc},
+        {7,4,2,Req},
+        {7,4,3,Req},
+        {7,5,1,Req},
+        {7,5,2,Req},
+        {7,5,3,Req},
+        {7,5,4,Adv},
+        {8,4,1,Req},
+        {8,4,2,Req},
+        {8,4,3,Req},
+        {8,4,4,Req},
+        {8,5,1,Req},
+        {8,5,2,Req},
+        {8,5,3,Req},
+        {9,3,1,Req},
+        {9,3,2,Req},
+        {9,3,3,Req},
+        {9,5,1,Req},
+        {9,6,1,Doc},
+        {9,6,2,Req},
+        {9,6,3,Req},
+        {9,6,4,Req},
+        {10,1,1,Adv},
+        {10,1,2,Req},
+        {10,1,3,Req},
+        {10,2,1,Adv},
+        {10,3,1,Req},
+        {10,3,2,Req},
+        {10,3,3,Req},
+        {11,0,1,Req},
+        {12,1,1,Req},
+        {12,1,2,Adv},
+        {12,1,3,Req},
+        {12,8,1,Req},
+        {12,8,2,Req},
+        {14,5,1,Req},
+        {14,5,2,Req},
+        {14,5,3,Req},
+        {14,6,1,Req},
+        {14,6,2,Req},
+        {14,7,1,Req},
+        {14,7,2,Req},
+        {14,7,3,Req},
+        {14,8,1,Req},
+        {14,8,2,Req},
+        {15,0,1,Req},
+        {15,0,2,Req},
+        {15,0,3,Req},
+        {15,1,1,Req},
+        {15,1,2,Req},
+        {15,1,3,Req},
+        {15,3,1,Req},
+        {15,3,2,Adv},
+        {15,3,3,Req},
+        {15,3,4,Req},
+        {15,3,5,Req},
+        {15,3,6,Req},
+        {15,3,7,Req},
+        {15,4,1,Req},
+        {15,5,1,Req},
+        {15,5,2,Req},
+        {15,5,3,Req},
+        {16,0,1,Req},
+        {16,0,2,Req},
+        {16,0,3,Req},
+        {16,0,4,Req},
+        {16,0,5,Req},
+        {16,0,6,Req},
+        {16,0,7,Req},
+        {16,0,8,Req},
+        {16,1,1,Req},
+        {16,1,2,Req},
+        {16,2,1,Req},
+        {16,2,2,Req},
+        {16,2,3,Req},
+        {16,2,4,Req},
+        {16,2,5,Adv},
+        {16,2,6,Req},
+        {16,3,1,Req},
+        {16,3,2,Adv},
+        {16,6,1,Doc},
+        {17,0,1,Req},
+        {17,0,2,Req},
+        {17,0,3,Req},
+        {17,0,4,Doc},
+        {17,0,5,Req},
+        {18,0,1,Req},
+        {18,0,2,Req},
+        {18,0,3,Req},
+        {18,0,4,Req},
+        {18,0,5,Req},
+        {18,2,1,Req},
+        {18,4,1,Req},
+        {18,7,1,Req},
+        {19,3,1,Req},
+        {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},
+        {0,0,2,Adv},
+        {0,1,1,Adv},
+        {0,1,2,Req},
+        {0,2,1,Adv},
+        {0,2,2,Req},
+        {0,2,3,Adv},
+        {0,2,4,Adv},
+        {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,3,Req},
+        {5,10,1,Req},
+        {5,13,1,Req},
+        {5,13,2,Req},
+        {5,13,3,Req},
+        {5,13,4,Req},
+        {5,13,5,Req},
+        {5,13,6,Req},
+        {5,13,7,Req},
+        {6,0,1,Req},
+        {6,0,2,Adv},
+        {6,0,3,Adv},
+        {6,0,4,Req},
+        {6,2,1,Req},
+        {6,2,2,Req},
+        {6,2,3,Req},
+        {6,2,4,Req},
+        {6,4,1,Req},
+        {6,4,2,Req},
+        {6,4,3,Req},
+        {6,5,1,Adv},
+        {6,5,2,Adv},
+        {6,7,1,Req},
+        {6,7,2,Req},
+        {6,8,1,Req},
+        {6,8,2,Man},
+        {6,8,3,Req},
+        {6,8,4,Adv},
+        {6,9,1,Req},
+        {6,9,2,Adv},
+        {7,0,1,Req},
+        {7,0,2,Req},
+        {7,0,3,Req},
+        {7,0,4,Req},
+        {7,0,5,Req},
+        {7,0,6,Req},
+        {7,11,1,Req},
+        {7,11,2,Req},
+        {7,11,3,Req},
+        {8,0,1,Adv},
+        {8,1,1,Req},
+        {8,1,2,Adv},
+        {8,2,1,Req},
+        {8,2,2,Req},
+        {8,2,3,Req},
+        {8,2,4,Req},
+        {8,2,5,Req},
+        {8,2,6,Req},
+        {8,2,7,Adv},
+        {8,2,8,Req},
+        {8,2,9,Req},
+        {8,2,10,Req},
+        {8,2,11,Req},
+        {8,3,1,Adv},
+        {8,3,2,Adv},
+        {8,7,1,Req},
+        {8,7,2,Req},
+        {8,9,1,Req},
+        {8,14,1,Adv},
+        {8,18,1,Man},
+        {8,18,2,Adv},
+        {8,19,1,Adv},
+        {8,20,1,Adv},
+        {9,2,1,Req},
+        {9,3,1,Req},
+        {9,4,1,Req},
+        {9,4,2,Req},
+        {9,5,2,Adv},
+        {9,5,3,Req},
+        {9,6,1,Adv},
+        {9,6,2,Req},
+        {9,6,3,Req},
+        {9,6,4,Req},
+        {9,6,5,Req},
+        {10,0,1,Adv},
+        {10,1,1,Adv},
+        {10,1,2,Req},
+        {10,2,1,Req},
+        {10,2,2,Adv},
+        {10,2,3,Req},
+        {10,3,1,Adv},
+        {10,4,1,Req},
+        {11,3,1,Adv},
+        {11,3,2,Adv},
+        {11,6,1,Adv},
+        {11,6,2,Man},
+        {11,6,3,Req},
+        {12,2,1,Adv},
+        {12,2,2,Req},
+        {12,2,3,Req},
+        {12,3,1,Req},
+        {13,1,1,Adv},
+        {13,1,2,Req},
+        {13,3,1,Req},
+        {13,3,2,Req},
+        {13,3,3,Req},
+        {13,3,4,Req},
+        {14,1,1,Adv},
+        {15,0,1,Req},
+        {15,0,2,Adv},
+        {15,1,1,Req},
+        {15,1,2,Adv},
+        {15,1,3,Req},
+        {15,1,4,Adv},
+        {15,1,5,Req},
+        {16,5,2,Req},
+        {16,6,1,Adv},
+        {17,8,1,Req},
+        {18,1,1,Req},
+        {18,1,2,Req},
+        {18,3,1,Adv},
+        {18,3,2,Req},
+        {18,3,3,Req},
+        {18,4,1,Req},
+        {18,5,1,Adv},
+        {18,5,2,Adv},
+        {19,0,1,Req},
+        {19,0,2,Req},
+        {19,0,3,Adv},
+        {19,0,4,Adv},
+        {19,1,1,Req},
+        {19,1,2,Req},
+        {19,1,3,Req},
+        {19,2,1,Req},
+        {19,2,2,Req},
+        {19,2,3,Req},
+        {19,3,1,Adv},
+        {19,3,2,Req},
+        {19,3,3,Req},
+        {19,3,4,Req},
+        {19,3,5,Req},
+        {19,6,1,Adv},
+        {21,2,1,Req},
+        {21,2,2,Req},
+        {21,2,3,Req},
+        {21,2,4,Req},
+        {21,6,1,Adv},
+        {21,6,2,Req},
+        {21,6,3,Req},
+        {21,6,4,Req},
+        {21,6,5,Req},
+        {21,10,1,Req},
+        {21,10,2,Req},
+        {21,10,3,Req},
+        {22,3,1,Req},
+        {22,4,1,Req},
+        {23,11,1,Adv},
+        {24,5,1,Req},
+        {24,5,2,Req},
+        {25,5,1,Req},
+        {25,5,2,Man},
+        {25,5,3,Man},
+        {26,3,1,Adv},
+        {28,3,1,Req},
+        {28,6,1,Req},
+        {28,6,2,Req},
+        {28,6,3,Req},
+        {28,6,4,Req},
+        {30,0,1,Req},
+        {30,0,2,Req}
+    };
+}
+
+std::vector<checkers::Info> checkers::autosarInfo{
+    {"m0-1-1", checkers::Req},
+    {"m0-1-2", checkers::Req},
+    {"m0-1-3", checkers::Req},
+    {"m0-1-4", checkers::Req},
+    {"a0-1-1", checkers::Req},
+    {"a0-1-2", checkers::Req},
+    {"m0-1-8", checkers::Req},
+    {"m0-1-9", checkers::Req},
+    {"m0-1-10", checkers::Adv},
+    {"a0-1-3", checkers::Req},
+    {"a0-1-4", checkers::Req},
+    {"a0-1-5", checkers::Req},
+    {"a0-1-6", checkers::Adv},
+    {"m0-2-1", checkers::Req},
+    {"a0-4-2", checkers::Req},
+    {"a0-4-3", checkers::Req},
+    {"a0-4-4", checkers::Req},
+    {"a1-1-1", checkers::Req},
+    {"a1-4-3", checkers::Adv},
+    {"a2-3-1", checkers::Req},
+    {"a2-5-1", checkers::Req},
+    {"a2-5-2", checkers::Req},
+    {"m2-7-1", checkers::Req},
+    {"a2-7-1", checkers::Req},
+    {"a2-7-3", checkers::Req},
+    {"a2-8-2", checkers::Adv},
+    {"m2-10-1", checkers::Req},
+    {"a2-10-1", checkers::Req},
+    {"a2-10-6", checkers::Req},
+    {"a2-10-4", checkers::Req},
+    {"a2-10-5", checkers::Adv},
+    {"a2-11-1", checkers::Req},
+    {"a2-13-1", checkers::Req},
+    {"a2-13-6", checkers::Req},
+    {"a2-13-5", checkers::Adv},
+    {"m2-13-2", checkers::Req},
+    {"m2-13-3", checkers::Req},
+    {"m2-13-4", checkers::Req},
+    {"a2-13-2", checkers::Req},
+    {"a2-13-3", checkers::Req},
+    {"a2-13-4", checkers::Req},
+    {"a3-1-1", checkers::Req},
+    {"a3-1-2", checkers::Req},
+    {"a3-1-3", checkers::Adv},
+    {"m3-1-2", checkers::Req},
+    {"a3-1-4", checkers::Req},
+    {"a3-1-6", checkers::Adv},
+    {"m3-2-1", checkers::Req},
+    {"m3-2-2", checkers::Req},
+    {"m3-2-3", checkers::Req},
+    {"m3-2-4", checkers::Req},
+    {"a3-3-1", checkers::Req},
+    {"a3-3-2", checkers::Req},
+    {"m3-3-2", checkers::Req},
+    {"m3-4-1", checkers::Req},
+    {"m3-9-1", checkers::Req},
+    {"a3-9-1", checkers::Req},
+    {"m3-9-3", checkers::Req},
+    {"m4-5-1", checkers::Req},
+    {"a4-5-1", checkers::Req},
+    {"m4-5-3", checkers::Req},
+    {"a4-7-1", checkers::Req},
+    {"m4-10-1", checkers::Req},
+    {"a4-10-1", checkers::Req},
+    {"m4-10-2", checkers::Req},
+    {"a5-0-1", checkers::Req},
+    {"m5-0-2", checkers::Adv},
+    {"m5-0-3", checkers::Req},
+    {"m5-0-4", checkers::Req},
+    {"m5-0-5", checkers::Req},
+    {"m5-0-6", checkers::Req},
+    {"m5-0-7", checkers::Req},
+    {"m5-0-8", checkers::Req},
+    {"m5-0-9", checkers::Req},
+    {"m5-0-10", checkers::Req},
+    {"m5-0-11", checkers::Req},
+    {"m5-0-12", checkers::Req},
+    {"a5-0-2", checkers::Req},
+    {"m5-0-14", checkers::Req},
+    {"m5-0-15", checkers::Req},
+    {"m5-0-16", checkers::Req},
+    {"m5-0-17", checkers::Req},
+    {"a5-0-4", checkers::Req},
+    {"m5-0-18", checkers::Req},
+    {"a5-0-3", checkers::Req},
+    {"m5-0-20", checkers::Req},
+    {"m5-0-21", checkers::Req},
+    {"a5-1-1", checkers::Req},
+    {"a5-1-2", checkers::Req},
+    {"a5-1-3", checkers::Req},
+    {"a5-1-4", checkers::Req},
+    {"a5-1-6", checkers::Adv},
+    {"a5-1-7", checkers::Req},
+    {"a5-1-8", checkers::Adv},
+    {"a5-1-9", checkers::Adv},
+    {"m5-2-2", checkers::Req},
+    {"m5-2-3", checkers::Adv},
+    {"a5-2-1", checkers::Adv},
+    {"a5-2-2", checkers::Req},
+    {"a5-2-3", checkers::Req},
+    {"m5-2-6", checkers::Req},
+    {"a5-2-4", checkers::Req},
+    {"a5-2-6", checkers::Req},
+    {"m5-2-8", checkers::Req},
+    {"m5-2-9", checkers::Req},
+    {"m5-2-10", checkers::Req},
+    {"m5-2-11", checkers::Req},
+    {"a5-2-5", checkers::Req},
+    {"m5-2-12", checkers::Req},
+    {"m5-3-1", checkers::Req},
+    {"m5-3-2", checkers::Req},
+    {"m5-3-3", checkers::Req},
+    {"m5-3-4", checkers::Req},
+    {"a5-3-1", checkers::Req},
+    {"a5-3-2", checkers::Req},
+    {"a5-3-3", checkers::Req},
+    {"a5-5-1", checkers::Req},
+    {"a5-6-1", checkers::Req},
+    {"m5-8-1", checkers::Req},
+    {"a5-10-1", checkers::Req},
+    {"m5-14-1", checkers::Req},
+    {"a5-16-1", checkers::Req},
+    {"m5-18-1", checkers::Req},
+    {"m5-19-1", checkers::Req},
+    {"m6-2-1", checkers::Req},
+    {"a6-2-1", checkers::Req},
+    {"a6-2-2", checkers::Req},
+    {"m6-2-2", checkers::Req},
+    {"m6-2-3", checkers::Req},
+    {"m6-3-1", checkers::Req},
+    {"m6-4-1", checkers::Req},
+    {"m6-4-2", checkers::Req},
+    {"m6-4-3", checkers::Req},
+    {"m6-4-4", checkers::Req},
+    {"m6-4-5", checkers::Req},
+    {"m6-4-6", checkers::Req},
+    {"m6-4-7", checkers::Req},
+    {"a6-4-1", checkers::Req},
+    {"a6-5-1", checkers::Req},
+    {"a6-5-2", checkers::Req},
+    {"m6-5-2", checkers::Req},
+    {"m6-5-3", checkers::Req},
+    {"m6-5-4", checkers::Req},
+    {"m6-5-5", checkers::Req},
+    {"m6-5-6", checkers::Req},
+    {"a6-5-3", checkers::Adv},
+    {"a6-5-4", checkers::Adv},
+    {"a6-6-1", checkers::Req},
+    {"m6-6-1", checkers::Req},
+    {"m6-6-2", checkers::Req},
+    {"m6-6-3", checkers::Req},
+    {"a7-1-1", checkers::Req},
+    {"a7-1-2", checkers::Req},
+    {"m7-1-2", checkers::Req},
+    {"a7-1-3", checkers::Req},
+    {"a7-1-4", checkers::Req},
+    {"a7-1-5", checkers::Req},
+    {"a7-1-6", checkers::Req},
+    {"a7-1-7", checkers::Req},
+    {"a7-1-8", checkers::Req},
+    {"a7-1-9", checkers::Req},
+    {"a7-2-1", checkers::Req},
+    {"a7-2-2", checkers::Req},
+    {"a7-2-3", checkers::Req},
+    {"a7-2-4", checkers::Req},
+    {"m7-3-1", checkers::Req},
+    {"m7-3-2", checkers::Req},
+    {"m7-3-3", checkers::Req},
+    {"m7-3-4", checkers::Req},
+    {"a7-3-1", checkers::Req},
+    {"m7-3-6", checkers::Req},
+    {"a7-4-1", checkers::Req},
+    {"m7-4-2", checkers::Req},
+    {"m7-4-3", checkers::Req},
+    {"a7-5-1", checkers::Req},
+    {"a7-5-2", checkers::Req},
+    {"a7-6-1", checkers::Req},
+    {"m8-0-1", checkers::Req},
+    {"a8-2-1", checkers::Req},
+    {"m8-3-1", checkers::Req},
+    {"a8-4-1", checkers::Req},
+    {"m8-4-2", checkers::Req},
+    {"a8-4-2", checkers::Req},
+    {"m8-4-4", checkers::Req},
+    {"a8-4-4", checkers::Adv},
+    {"a8-4-5", checkers::Req},
+    {"a8-4-6", checkers::Req},
+    {"a8-4-7", checkers::Req},
+    {"a8-4-8", checkers::Req},
+    {"a8-4-9", checkers::Req},
+    {"a8-4-10", checkers::Req},
+    {"a8-4-11", checkers::Req},
+    {"a8-4-12", checkers::Req},
+    {"a8-4-13", checkers::Req},
+    {"a8-4-14", checkers::Req},
+    {"a8-5-0", checkers::Req},
+    {"a8-5-1", checkers::Req},
+    {"m8-5-2", checkers::Req},
+    {"a8-5-2", checkers::Req},
+    {"a8-5-3", checkers::Req},
+    {"a8-5-4", checkers::Adv},
+    {"m9-3-1", checkers::Req},
+    {"a9-3-1", checkers::Req},
+    {"m9-3-3", checkers::Req},
+    {"a9-5-1", checkers::Req},
+    {"a9-6-1", checkers::Req},
+    {"m9-6-4", checkers::Req},
+    {"a10-1-1", checkers::Req},
+    {"m10-1-1", checkers::Adv},
+    {"m10-1-2", checkers::Req},
+    {"m10-1-3", checkers::Req},
+    {"m10-2-1", checkers::Adv},
+    {"a10-2-1", checkers::Req},
+    {"a10-3-1", checkers::Req},
+    {"a10-3-2", checkers::Req},
+    {"a10-3-3", checkers::Req},
+    {"a10-3-5", checkers::Req},
+    {"m10-3-3", checkers::Req},
+    {"a10-4-1", checkers::Req},
+    {"m11-0-1", checkers::Req},
+    {"a11-0-1", checkers::Adv},
+    {"a11-0-2", checkers::Req},
+    {"a11-3-1", checkers::Req},
+    {"a12-0-1", checkers::Req},
+    {"a12-0-2", checkers::Req},
+    {"a12-1-1", checkers::Req},
+    {"m12-1-1", checkers::Req},
+    {"a12-1-2", checkers::Req},
+    {"a12-1-3", checkers::Req},
+    {"a12-1-4", checkers::Req},
+    {"a12-1-5", checkers::Req},
+    {"a12-1-6", checkers::Req},
+    {"a12-4-1", checkers::Req},
+    {"a12-4-2", checkers::Adv},
+    {"a12-6-1", checkers::Req},
+    {"a12-7-1", checkers::Req},
+    {"a12-8-1", checkers::Req},
+    {"a12-8-2", checkers::Adv},
+    {"a12-8-3", checkers::Req},
+    {"a12-8-4", checkers::Req},
+    {"a12-8-5", checkers::Req},
+    {"a12-8-6", checkers::Req},
+    {"a12-8-7", checkers::Adv},
+    {"a13-1-2", checkers::Req},
+    {"a13-1-3", checkers::Req},
+    {"a13-2-1", checkers::Req},
+    {"a13-2-2", checkers::Req},
+    {"a13-2-3", checkers::Req},
+    {"a13-3-1", checkers::Req},
+    {"a13-5-1", checkers::Req},
+    {"a13-5-2", checkers::Req},
+    {"a13-5-3", checkers::Adv},
+    {"a13-5-4", checkers::Req},
+    {"a13-5-5", checkers::Req},
+    {"a13-6-1", checkers::Req},
+    {"a14-1-1", checkers::Adv},
+    {"a14-5-1", checkers::Req},
+    {"a14-5-2", checkers::Req},
+    {"a14-5-3", checkers::Req},
+    {"m14-5-3", checkers::Req},
+    {"m14-6-1", checkers::Req},
+    {"a14-7-1", checkers::Req},
+    {"a14-7-2", checkers::Req},
+    {"a14-8-2", checkers::Req},
+    {"a15-0-2", checkers::Req},
+    {"a15-1-2", checkers::Req},
+    {"m15-0-3", checkers::Req},
+    {"m15-1-1", checkers::Req},
+    {"m15-1-2", checkers::Req},
+    {"m15-1-3", checkers::Req},
+    {"a15-1-3", checkers::Adv},
+    {"a15-1-4", checkers::Req},
+    {"a15-2-1", checkers::Req},
+    {"a15-2-2", checkers::Req},
+    {"m15-3-1", checkers::Req},
+    {"a15-3-2", checkers::Req},
+    {"a15-3-3", checkers::Req},
+    {"m15-3-3", checkers::Req},
+    {"m15-3-4", checkers::Req},
+    {"a15-3-5", checkers::Req},
+    {"m15-3-6", checkers::Req},
+    {"m15-3-7", checkers::Req},
+    {"a15-4-1", checkers::Req},
+    {"a15-4-2", checkers::Req},
+    {"a15-4-3", checkers::Req},
+    {"a15-4-4", checkers::Req},
+    {"a15-4-5", checkers::Req},
+    {"a15-5-1", checkers::Req},
+    {"a15-5-2", checkers::Req},
+    {"a15-5-3", checkers::Req},
+    {"a16-0-1", checkers::Req},
+    {"m16-0-1", checkers::Req},
+    {"m16-0-2", checkers::Req},
+    {"m16-0-5", checkers::Req},
+    {"m16-0-6", checkers::Req},
+    {"m16-0-7", checkers::Req},
+    {"m16-0-8", checkers::Req},
+    {"m16-1-1", checkers::Req},
+    {"m16-1-2", checkers::Req},
+    {"m16-2-3", checkers::Req},
+    {"a16-2-1", checkers::Req},
+    {"a16-2-2", checkers::Req},
+    {"a16-2-3", checkers::Req},
+    {"m16-3-1", checkers::Req},
+    {"m16-3-2", checkers::Adv},
+    {"a16-6-1", checkers::Req},
+    {"a16-7-1", checkers::Req},
+    {"a17-0-1", checkers::Req},
+    {"m17-0-2", checkers::Req},
+    {"m17-0-3", checkers::Req},
+    {"m17-0-5", checkers::Req},
+    {"a17-1-1", checkers::Req},
+    {"a17-6-1", checkers::Req},
+    {"a18-0-1", checkers::Req},
+    {"a18-0-2", checkers::Req},
+    {"m18-0-3", checkers::Req},
+    {"m18-0-4", checkers::Req},
+    {"m18-0-5", checkers::Req},
+    {"a18-0-3", checkers::Req},
+    {"a18-1-1", checkers::Req},
+    {"a18-1-2", checkers::Req},
+    {"a18-1-3", checkers::Req},
+    {"a18-1-4", checkers::Req},
+    {"a18-1-6", checkers::Req},
+    {"m18-2-1", checkers::Req},
+    {"a18-5-1", checkers::Req},
+    {"a18-5-2", checkers::Req},
+    {"a18-5-3", checkers::Req},
+    {"a18-5-4", checkers::Req},
+    {"a18-5-5", checkers::Req},
+    {"a18-5-6", checkers::Req},
+    {"a18-5-7", checkers::Req},
+    {"a18-5-8", checkers::Req},
+    {"a18-5-9", checkers::Req},
+    {"a18-5-10", checkers::Req},
+    {"a18-5-11", checkers::Req},
+    {"m18-7-1", checkers::Req},
+    {"a18-9-1", checkers::Req},
+    {"a18-9-2", checkers::Req},
+    {"a18-9-3", checkers::Req},
+    {"a18-9-4", checkers::Req},
+    {"m19-3-1", checkers::Req},
+    {"a20-8-1", checkers::Req},
+    {"a20-8-2", checkers::Req},
+    {"a20-8-3", checkers::Req},
+    {"a20-8-4", checkers::Req},
+    {"a20-8-5", checkers::Req},
+    {"a20-8-6", checkers::Req},
+    {"a20-8-7", checkers::Req},
+    {"a21-8-1", checkers::Req},
+    {"a23-0-1", checkers::Req},
+    {"a23-0-2", checkers::Req},
+    {"a25-1-1", checkers::Req},
+    {"a25-4-1", checkers::Req},
+    {"a26-5-1", checkers::Req},
+    {"a26-5-2", checkers::Req},
+    {"m27-0-1", checkers::Req},
+    {"a27-0-1", checkers::Req},
+    {"a27-0-4", checkers::Req},
+    {"a27-0-2", checkers::Adv},
+    {"a27-0-3", checkers::Req},
+};
+""")
+
+
+def getCertCInfo(main_url:str):
+    """Fetches CERT C rules information."""
+    # Fetching the CERT C rules page
+    r = requests.get(main_url, timeout=30)
+    mainpage = r.text
+    for line in mainpage.split('\n'):
+        res = re.search(r'<a href="(/confluence/[^"]+)">(Rule|Rec.) \d\d[.] [A-Za-z ]+ [(][A-Z][A-Z][A-Z][)]', line)
+        if res is None:
+            continue
+        r = requests.get('https://wiki.sei.cmu.edu' + res.group(1), timeout=30)
+        text = r.text.replace('\n', '').replace('<tr>', '\n').replace('</tr>', '\n')
+        rules = []
+        for line in text.split('\n'):
+            if not line.startswith('<td'):
+                continue
+            #print(line)
+            res = re.match(r'[^>]+>([A-Z][A-Z][A-Z][0-9][0-9]-CP*)<.*>(L[1-3])<.+', line)
+            if res:
+                if res.group(1) == 'EXP40-C' and 'EXP39-C' not in rules:
+                    print('    {"EXP39-C", "L2"},')
+                print('    {"%s", "%s"},' % (res.group(1), res.group(2)))
+                rules.append(res.group(1))
+        if 'EXP45-C' in rules:
+            if 'EXP46-C' not in rules:
+                print('    {"EXP46-C", "L2"},')
+            if 'EXP47-C' not in rules:
+                print('    {"EXP47-C", "L2"},')
+
+
+print('std::vector<checkers::Info> checkers::certCInfo{')
+getCertCInfo('https://wiki.sei.cmu.edu/confluence/display/c/2+Rules')
+print('    // Recommendations')
+getCertCInfo('https://wiki.sei.cmu.edu/confluence/display/c/3+Recommendations')
+print('};')
+print('')
+print('std::vector<checkers::Info> checkers::certCppInfo{')
+getCertCInfo('https://wiki.sei.cmu.edu/confluence/pages/viewpage.action?pageId=88046682')
+print('};')
+print('')
+
+
diff --git a/tools/matchcompiler.py b/tools/matchcompiler.py
index 2544366965a..bb03b6822e2 100755
--- a/tools/matchcompiler.py
+++ b/tools/matchcompiler.py
@@ -158,35 +158,35 @@ def _insertMatchFunctionId(
     def _compileCmd(tok):
         if tok == '%any%':
             return 'true'
-        elif tok == '%assign%':
+        if tok == '%assign%':
             return 'tok->isAssignmentOp()'
-        elif tok == '%bool%':
+        if tok == '%bool%':
             return 'tok->isBoolean()'
-        elif tok == '%char%':
+        if tok == '%char%':
             return '(tok->tokType() == Token::eChar)'
-        elif tok == '%comp%':
+        if tok == '%comp%':
             return 'tok->isComparisonOp()'
-        elif tok == '%num%':
+        if tok == '%num%':
             return 'tok->isNumber()'
-        elif tok == '%cop%':
+        if tok == '%cop%':
             return 'tok->isConstOp()'
-        elif tok == '%op%':
+        if tok == '%op%':
             return 'tok->isOp()'
-        elif tok == '%or%':
+        if tok == '%or%':
             return '(tok->tokType() == Token::eBitOp && tok->str() == MatchCompiler::makeConstString("|") )'
-        elif tok == '%oror%':
+        if tok == '%oror%':
             return '(tok->tokType() == Token::eLogicalOp && tok->str() == MatchCompiler::makeConstString("||"))'
-        elif tok == '%str%':
+        if tok == '%str%':
             return '(tok->tokType() == Token::eString)'
-        elif tok == '%type%':
-            return '(tok->isName() && tok->varId() == 0U && (tok->str() != MatchCompiler::makeConstString("delete") || !tok->isKeyword()))'
-        elif tok == '%name%':
+        if tok == '%type%':
+            return '(tok->isName() && tok->varId() == 0U)'
+        if tok == '%name%':
             return 'tok->isName()'
-        elif tok == '%var%':
+        if tok == '%var%':
             return '(tok->varId() != 0)'
-        elif tok == '%varid%':
+        if tok == '%varid%':
             return '(tok->isName() && tok->varId() == varid)'
-        elif (len(tok) > 2) and (tok[0] == "%"):
+        if (len(tok) > 2) and (tok[0] == "%"):
             print("unhandled:" + tok)
         elif tok in tokTypes:
             cond = ' || '.join(['tok->tokType() == Token::{}'.format(tokType) for tokType in tokTypes[tok]])
@@ -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'
@@ -679,11 +679,10 @@ def _replaceCStrings(self, line):
     def convertFile(self, srcname, destname, line_directive):
         self._reset()
 
-        fin = io.open(srcname, "rt", encoding="utf-8")
-        srclines = fin.readlines()
-        fin.close()
+        with io.open(srcname, "rt", encoding="utf-8") as fin:
+            srclines = fin.readlines()
 
-        code = u''
+        code = ''
 
         modified = False
 
@@ -691,6 +690,8 @@ def convertFile(self, srcname, destname, line_directive):
         for line in srclines:
             if not modified:
                 line_orig = line
+            else:
+                line_orig = None
 
             linenr += 1
             # Compile Token::Match and Token::simpleMatch
@@ -708,28 +709,41 @@ def convertFile(self, srcname, destname, line_directive):
             code += line
 
         # Compute matchFunctions
-        strFunctions = u''
-        for function in self._rawMatchFunctions:
-            strFunctions += function
+        strFunctions = ''.join(self._rawMatchFunctions)
 
-        lineno = u''
+        lineno = ''
         if line_directive:
-            lineno = u'#line 1 "' + srcname + '"\n'
+            lineno = '#line 1 "' + srcname + '"\n'
 
-        header = u'#include "matchcompiler.h"\n'
-        header += u'#include <string>\n'
-        header += u'#include <cstring>\n'
+        header = '#include "matchcompiler.h"\n'
+        header += '#include <string>\n'
+        header += '#include <cstring>\n'
+        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):
-            header += u'#include "errorlogger.h"\n'
-            header += u'#include "token.h"\n'
+            footer += '#if defined(__clang__)\n'
+            footer += 'SUPPRESS_WARNING_CLANG_POP\n'
+            footer += '#endif\n'
+            footer += '#undef MAYBE_UNUSED\n'
 
-        fout = io.open(destname, 'wt', encoding="utf-8")
-        if modified or len(self._rawMatchFunctions):
-            fout.write(header)
-            fout.write(strFunctions)
-        fout.write(lineno)
-        fout.write(code)
-        fout.close()
+        with io.open(destname, 'wt', encoding="utf-8") as fout:
+            if modified or len(self._rawMatchFunctions):
+                fout.write(header)
+                fout.write(strFunctions)
+            fout.write(lineno)
+            fout.write(code)
+            if modified or len(self._rawMatchFunctions):
+                fout.write(footer)
 
 
 def main():
@@ -760,7 +774,7 @@ def main():
 
     # Check if we are invoked from the right place
     if not os.path.exists(lib_dir):
-        print('Directory "' + lib_dir + '"not found.')
+        print('Directory "' + lib_dir + '" not found.')
         sys.exit(-1)
 
     # Create build directory if needed
diff --git a/tools/parse-glibc.py b/tools/parse-glibc.py
index a56c4c96550..6aaef2be32c 100644
--- a/tools/parse-glibc.py
+++ b/tools/parse-glibc.py
@@ -33,17 +33,14 @@ def checknonnull(cfg, functionName, nonnull):
 
 
 def parseheader(cppcheckpath, filename):
-    f = open(filename, 'rt')
-    data = f.read()
-    f.close()
+    with open(filename, 'rt') as f:
+        data = f.read()
 
-    f = open(cppcheckpath + '/cfg/std.cfg', 'rt')
-    stdcfg = f.read()
-    f.close()
+    with open(cppcheckpath + '/cfg/std.cfg', 'rt') as f:
+        stdcfg = f.read()
 
-    f = open(cppcheckpath + '/cfg/posix.cfg', 'rt')
-    posixcfg = f.read()
-    f.close()
+    with open(cppcheckpath + '/cfg/posix.cfg', 'rt') as f:
+        posixcfg = f.read()
 
     while '/*' in data:
         pos1 = data.find('/*')
diff --git a/tools/readme.md b/tools/readme.md
index 8a160f552a1..4f914b3cce6 100644
--- a/tools/readme.md
+++ b/tools/readme.md
@@ -49,7 +49,7 @@ void f2() {
 ```
 From this we can see that the usage of `Token::Match()` in `f1()` has been optimized, whereas the one in `f2()` couldn't be optimized (the string wasn't inline on the `Token::Match()` call). **The developer doesn't need to use this tool during development but should be aware of these optimizations**. *Building with this optimization, cppcheck can get a boost of 2x of speed-up.*
 
-### * tools/dmake.cpp
+### * tools/dmake/dmake.cpp
 
 Automatically generates the main `Makefile` for Cppcheck (**the main `Makefile` should not be modified manually**). To build and run the `dmake` tool execute:
 ```shell
@@ -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/reduce.py b/tools/reduce.py
index 595aaff18c8..472dff7d98e 100755
--- a/tools/reduce.py
+++ b/tools/reduce.py
@@ -1,24 +1,40 @@
+"""
+usage: reduce.py [-h] -exe EXE -exe_args EXE_ARGS -expected EXPECTED -file FILE [-segfault]
+
+options:
+  -h, --help            show this help message and exit
+  -exe EXE, --exe EXE   cppcheck executable
+  -exe_args EXE_ARGS, --exe_args EXE_ARGS
+                        cppcheck executable commands
+  -expected EXPECTED, --expected EXPECTED
+                        expected text output
+  -file FILE, --file FILE
+                        source file
+  -segfault, --segfault
+"""
+
 #!/usr/bin/env python3
 import subprocess
 import sys
 import time
+import argparse
 
 
 class Reduce:
     def __init__(self, cmd, expected, file, segfault=None):
-        if cmd is None:
+        if not "".join(cmd):
             raise RuntimeError('Abort: No --cmd')
 
-        if not segfault and expected is None:
+        if not segfault and not expected:
             raise RuntimeError('Abort: No --expected')
 
-        if file is None:
+        if not file:
             raise RuntimeError('Abort: No --file')
 
         # need to add '--error-exitcode=0' so detected issues will not be interpreted as a crash
         if segfault and '--error-exitcode=0' not in cmd:
             print("Adding '--error-exitcode=0' to --cmd")
-            self.__cmd = cmd + ' --error-exitcode=0'
+            self.__cmd = cmd + ['--error-exitcode=0']
         else:
             self.__cmd = cmd
         self.__expected = expected
@@ -30,7 +46,7 @@ def __init__(self, cmd, expected, file, segfault=None):
         self.__elapsed_time = None
 
     def print_info(self):
-        print('CMD=' + self.__cmd)
+        print('CMD=', " ".join(self.__cmd))
         if self.__segfault:
             print('EXPECTED=SEGFAULT')
         else:
@@ -38,24 +54,17 @@ def print_info(self):
         print('FILE=' + self.__file)
 
     def __communicate(self, p, timeout=None, **kwargs):
-        if sys.version_info[0] < 3:
-            return p.communicate(**kwargs)
-        else:
-            return p.communicate(timeout=timeout)
+        return p.communicate(timeout=timeout)
 
     def runtool(self, filedata=None):
-        if sys.version_info[0] < 3:
-            class TimeoutExpired(Exception):
-                pass
-        else:
-            TimeoutExpired = subprocess.TimeoutExpired
+        TimeoutExpired = subprocess.TimeoutExpired
 
         timeout = None
         if self.__elapsed_time:
             timeout = self.__elapsed_time * 2
-        p = subprocess.Popen(self.__cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+        p = subprocess.Popen(self.__cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
         try:
-            comm = self.__communicate(p, timeout=timeout)
+            stdout, stderr = self.__communicate(p, timeout=timeout)
         except TimeoutExpired:
             print('timeout')
             p.kill()
@@ -69,20 +78,19 @@ class TimeoutExpired(Exception):
             if p.returncode != 0:
                 return True
         elif p.returncode == 0:
-            out = comm[0] + '\n' + comm[1]
+            out = stdout + '\n' + stderr
             if self.__expected in out:
                 return True
         else:
             # Something could be wrong, for example the command line for Cppcheck (CMD).
             # Print the output to give a hint how to fix it.
-            print('Error: {}\n{}'.format(comm[0], comm[1]))
+            print('Error: {}\n{}'.format(stdout, stderr))
         return False
 
     def __writefile(self, filename, filedata):
-        f = open(filename, 'wt')
-        for line in filedata:
-            f.write(line)
-        f.close()
+        with open(filename, 'wt') as f:
+            for line in filedata:
+                f.write(line)
 
     def replaceandrun(self, what, filedata, i, line):
         print(what + ' ' + str(i + 1) + '/' + str(len(filedata)) + '..')
@@ -164,8 +172,7 @@ def combinelines(self, filedata):
                 i1 = i
                 i2 = i + chunksize
                 i = i2
-                if i2 > len(lines):
-                    i2 = len(lines)
+                i2 = min(i2, len(lines))
 
                 filedata2 = list(filedata)
                 for line in lines[i1:i2]:
@@ -250,10 +257,7 @@ def removeline(self, filedata):
             elif stmt and '{' in strippedline and strippedline.find('}') == len(strippedline) - 1:
                 self.replaceandrun('remove line', filedata, i, '')
 
-            if strippedline[-1] in ';{}':
-                stmt = True
-            else:
-                stmt = False
+            stmt = strippedline[-1] in ';{}'
 
     def set_elapsed_time(self, elapsed_time):
         self.__elapsed_time = elapsed_time
@@ -275,31 +279,27 @@ def main():
     # TODO: add --hang option to detect code which impacts the analysis time
     def show_syntax():
         print('Syntax:')
-        print('  reduce.py --cmd=<full command> --expected=<expected text output> --file=<source file> [--segfault]')
+        print('  reduce.py --exe <cppcheck executable> --exe_args <full command> --expected <expected text output> --file <source file> [--segfault]')
         print('')
         print("Example. source file = foo/bar.c")
         print(
-            "  reduce.py --cmd='./cppcheck --enable=style foo/bar.c' --expected=\"Variable 'x' is reassigned\" --file=foo/bar.c")
+            '  reduce.py --exe ./cppcheck --exe_args " --enable=style" --expected "Variable \'x\' is reassigned" --file foo/bar.c')
         sys.exit(1)
 
     if len(sys.argv) == 1:
         show_syntax()
-
-    arg_cmd = None
-    arg_expected = None
-    arg_file = None
-    arg_segfault = False
-
-    for arg in sys.argv[1:]:
-        if arg.startswith('--cmd='):
-            arg_cmd = arg[arg.find('=') + 1:]
-        elif arg.startswith('--expected='):
-            arg_expected = arg[arg.find('=') + 1:]
-        elif arg.startswith('--file='):
-            arg_file = arg[arg.find('=') + 1:]
-        elif arg == '--segfault':
-            arg_segfault = True
-
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-exe', '--exe', required=True, help="cppcheck executable")
+    parser.add_argument('-exe_args', '--exe_args', required=False, default="", help="cppcheck executable commands")
+    parser.add_argument('-expected', '--expected', required=True, help="expected text output")
+    parser.add_argument('-file', '--file', required=True, help="source file")
+    parser.add_argument('-segfault', '--segfault', required=False, action='store_true')
+    args = parser.parse_args()
+
+    arg_file = args.file
+    arg_cmd = [args.exe] + args.exe_args.split() + [arg_file]
+    arg_expected = args.expected
+    arg_segfault = args.segfault
     try:
         reduce = Reduce(arg_cmd, arg_expected, arg_file, arg_segfault)
     except RuntimeError as e:
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 715df3297bb..4a40f544ee1 100755
--- a/tools/test-my-pr.py
+++ b/tools/test-my-pr.py
@@ -52,7 +52,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])))
@@ -64,21 +64,18 @@ def format_float(a, b=1):
 
     try:
         lib.clone_cppcheck(repo_dir, old_repo_dir)
-        pass
     except Exception as e:
         print('Failed to clone Cppcheck repository ({}), retry later'.format(e))
         sys.exit(1)
 
     try:
         lib.checkout_cppcheck_version(repo_dir, 'main', main_dir)
-        pass
     except Exception as e:
         print('Failed to checkout main ({}), retry later'.format(e))
         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'
@@ -87,7 +84,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:
@@ -146,7 +142,7 @@ def format_float(a, b=1):
             print("No files to process")
             continue
 
-        results_to_diff = list()
+        results_to_diff = []
 
         main_crashed = False
         your_crashed = False
diff --git a/tools/test_donate_cpu_lib.py b/tools/test_donate_cpu_lib.py
deleted file mode 100644
index c8290767071..00000000000
--- a/tools/test_donate_cpu_lib.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-#
-# Cppcheck - A tool for static C/C++ code analysis
-# Copyright (C) 2007-2022 Cppcheck team.
-#
-# This 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/>.
-
-from donate_cpu_lib import *
-
-def _test_library_includes(tmpdir, libs, content):
-    library_includes = LibraryIncludes()
-
-    src_file = os.path.join(str(tmpdir), "file.cpp")
-    with open(src_file, 'w') as f:
-        f.write(content)
-    libs.sort()
-    libs_found = library_includes.get_libraries(str(tmpdir))
-    libs_found.sort()
-    assert libs == libs_found
-
-def test_library_includes(tmpdir):
-    _test_library_includes(tmpdir, ['posix', 'gnu'], '')
-    _test_library_includes(tmpdir, ['posix', 'gnu'], '#include <stdio.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'boost'], '#include <boost/regex.hpp>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'python'], '#include "Python.h"')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'libcerror', 'lua', 'opengl', 'qt'], '#include <QApplication>\n#include <GL/gl.h>\r#include "lua.h"\r\n#include <libcerror.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'microsoft_sal'], '  #include <sal.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'googletest'], '\t#include <gtest/gtest.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'microsoft_atl'], '  \t  #include <atlbase.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'cairo'], '\t  #include <cairo.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'gtk'], '  \t#include <glib-object.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'bsd'], '#include <sys/uio.h>\r\n')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'libcurl'], '#include <curl/curl.h>\r')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'sqlite3'], '#include <sqlite3.h>\n')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'openmp'], '#  include <omp.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'mfc'], '#\tinclude <afxwin.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'ruby'], '#  \tinclude "ruby.h"')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'zlib'], '#\t  include <zlib.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'pcre'], '#include<pcre.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'pcre'], '#include  "pcre.h"')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'opengl'], '#include\t  <GL/glut.h>')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'nspr'], '#include\t"prtypes.h"')
-    _test_library_includes(tmpdir, ['posix', 'gnu', 'lua'], '#include  \t<lua.h>')
diff --git a/tools/test_showtimetop5.sh b/tools/test_showtimetop5.sh
deleted file mode 100755
index 81315dd2767..00000000000
--- a/tools/test_showtimetop5.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# "gwc" is a GNU compatible of "wc" on MacOS
-WC_CMD=$(command -v gwc || command -v wc)
-output=$(./cppcheck --showtime=top5 cli/cmdlineparser.h --language=c++ --quiet)
-echo "$output"
-if  [[ "$(echo "$output" | $WC_CMD -l)" != 7 ]] ; then
-    false
-fi
diff --git a/tools/trac-keywords.py b/tools/trac-keywords.py
index 3c0027a9f62..7a8f9473517 100644
--- a/tools/trac-keywords.py
+++ b/tools/trac-keywords.py
@@ -7,9 +7,10 @@
 
 def readdb():
     cmds = ['sqlite3', TRACDB, 'SELECT id,keywords FROM ticket WHERE status<>"closed";']
-    p = subprocess.Popen(cmds, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    comm = p.communicate()
-    data = comm[0]
+    with subprocess.Popen(cmds, stdout=subprocess.PIPE, stderr=subprocess.PIPE) as p:
+        # TODO: handle p.returncode?
+        stdout, _ = p.communicate()
+    data = stdout
     ret = {}
     for line in data.splitlines():
         pos1 = line.find('|')
diff --git a/tools/triage/.clang-tidy b/tools/triage/.clang-tidy
new file mode 100644
index 00000000000..8a62240d85a
--- /dev/null
+++ b/tools/triage/.clang-tidy
@@ -0,0 +1,5 @@
+---
+Checks: >
+        -readability-convert-member-functions-to-static,
+        -readability-redundant-access-specifiers
+InheritParentConfig: true
diff --git a/tools/triage/.gitignore b/tools/triage/.gitignore
deleted file mode 100644
index c26029fd705..00000000000
--- a/tools/triage/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-moc_*.cpp
-moc_*.h
-ui_*.h
-.qmake.stash
-Makefile
-triage
diff --git a/tools/triage/CMakeLists.txt b/tools/triage/CMakeLists.txt
index c244144f83c..d0f9fce1599 100644
--- a/tools/triage/CMakeLists.txt
+++ b/tools/triage/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (BUILD_GUI AND BUILD_TESTS)
+if (BUILD_GUI AND BUILD_TRIAGE)
     # disable all clang-tidy checks for Qt generated files
     file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/.clang-tidy"
 "---
@@ -8,11 +8,6 @@ CheckOptions:
   - { key: HeaderFileExtensions,          value: 'x' }
 ")
 
-    add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
-    add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
-    add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
-    add_compile_definitions($<$<CONFIG:Debug>:QT_DEBUG>)
-
     file(GLOB hdrs "*.h")
     file(GLOB srcs "*.cpp")
     file(GLOB uis  "*.ui")
@@ -27,12 +22,27 @@ CheckOptions:
         ${PROJECT_SOURCE_DIR}/gui/codeeditorstyle.cpp
         ${PROJECT_SOURCE_DIR}/gui/codeeditor.cpp)
     set_target_properties(triage PROPERTIES AUTOMOC ON)
+    set_target_properties(triage PROPERTIES WIN32_EXECUTABLE ON)
     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")
-        # Q_UNUSED() in generated code
-        target_compile_options_safe(triage -Wno-extra-semi-stmt)
-        # caused by Qt generated moc code
-        target_compile_options_safe(triage -Wno-redundant-parens)
+        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)
+        endif()
+    endif()
+    if(QT_VERSION VERSION_GREATER_EQUAL "6.9.0")
+        # 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_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)
+
+    target_compile_definitions(triage PRIVATE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
+    target_compile_definitions(triage PRIVATE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
+    target_compile_definitions(triage PRIVATE $<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
+    target_compile_definitions(triage PRIVATE $<$<CONFIG:Debug>:QT_DEBUG>)
 endif()
diff --git a/tools/triage/mainwindow.cpp b/tools/triage/mainwindow.cpp
index d816bc00521..ce95ff82d8d 100644
--- a/tools/triage/mainwindow.cpp
+++ b/tools/triage/mainwindow.cpp
@@ -58,13 +58,16 @@
 #include <QTextStream>
 #include <QTreeView>
 #include <QtCore>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+#include <QtLogging>
+#endif
 
 class QWidget;
 
-const QString WORK_FOLDER(QDir::homePath() + "/triage");
-const QString DACA2_PACKAGES(QDir::homePath() + "/daca2-packages");
+static const QString WORK_FOLDER(QDir::homePath() + "/triage");
+static const QString DACA2_PACKAGES(QDir::homePath() + "/daca2-packages");
 
-const int MAX_ERRORS = 100;
+static constexpr int MAX_ERRORS = 100;
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -109,7 +112,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);
 }
@@ -359,6 +362,7 @@ void MainWindow::findInFilesClicked()
     ui->inFilesResult->clear();
     const QString text = ui->filterEdit->text();
 
+    // cppcheck-suppress shadowFunction - TODO: fix this
     QStringList filter;
     if (ui->hFilesFilter->isChecked())
         filter.append(hFiles);
diff --git a/tools/triage/mainwindow.h b/tools/triage/mainwindow.h
index 6c5085b4d1d..999740fb59d 100644
--- a/tools/triage/mainwindow.h
+++ b/tools/triage/mainwindow.h
@@ -1,4 +1,4 @@
-/*
+/* -*- C++ -*-
  * Cppcheck - A tool for static C/C++ code analysis
  * Copyright (C) 2007-2021 Cppcheck team.
  *
@@ -62,7 +62,7 @@ public slots:
     bool runProcess(const QString &programName, const QStringList & arguments);
     bool wget(const QString &url);
     bool unpackArchive(const QString &archiveName);
-    void showSrcFile(const QString &fileName, const QString &url, const int lineNumber);
+    void showSrcFile(const QString &fileName, const QString &url, int lineNumber);
 
     QStringList mAllErrors;
     QFileSystemModel mFSmodel;
diff --git a/tools/triage/triage.pro b/tools/triage/triage.pro
index dc32e70bec8..213022968cd 100644
--- a/tools/triage/triage.pro
+++ b/tools/triage/triage.pro
@@ -1,24 +1,16 @@
-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
+QMAKE_CXXFLAGS += -std=c++17
 INCLUDEPATH += ../../gui
-
 MOC_DIR = temp
 OBJECTS_DIR = temp
 UI_DIR = temp
-
 SOURCES += main.cpp\
         mainwindow.cpp \
         ../../gui/codeeditorstyle.cpp \
         ../../gui/codeeditor.cpp
-
 HEADERS  += mainwindow.h \
         ../../gui/codeeditorstyle.h \
         ../../gui/codeeditor.h
-
 FORMS    += mainwindow.ui
diff --git a/tools/triage_py/triage_version.py b/tools/triage_py/triage_version.py
index 8454580771f..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')
@@ -28,9 +30,10 @@
 
 def sort_commit_hashes(commits):
     git_cmd = 'git rev-list --abbrev-commit --topo-order --no-walk=sorted --reverse ' + ' '.join(commits)
-    p = subprocess.Popen(git_cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=git_repo, universal_newlines=True)
-    stdout, stderr = p.communicate()
-    if p.returncode != 0:
+    with subprocess.Popen(git_cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=git_repo, universal_newlines=True) as p:
+        stdout, stderr = p.communicate()
+        rc = p.returncode
+    if rc != 0:
         print('error: sorting commit hashes failed')
         print(stderr)
         sys.exit(1)
@@ -89,6 +92,17 @@ def sort_commit_hashes(commits):
     # this is the commit hash for the 2.9 release tag. it does not exist in the main branch so the version for it cannot be determined
     if versions.count('aca3f6fef'):
         versions.remove('aca3f6fef')
+    # 2.8 tags
+    if versions.count('61f846073'):
+        versions.remove('61f846073')
+    if versions.count('f998703a5'):
+        versions.remove('f998703a5')
+    # ???
+    if versions.count('d4505827b'):
+        versions.remove('d4505827b')
+    # 2.6 tag
+    if versions.count('d873b8e77'):
+        versions.remove('d873b8e77')
     len_in = len(versions)
     versions = sort_commit_hashes(versions)
     if len(versions) != len_in:
@@ -98,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')
@@ -120,10 +136,15 @@ def sort_commit_hashes(commits):
     else:
         # get version string
         version_cmd = exe + ' ' + '--version'
-        version = subprocess.Popen(version_cmd.split(), stdout=subprocess.PIPE, universal_newlines=True).stdout.read().strip()
+        with subprocess.Popen(version_cmd.split(), stdout=subprocess.PIPE, universal_newlines=True) as p:
+            # TODO: handle p.returncode?
+            version = p.stdout.read().strip()
         # sanitize version
         version = version.replace('Cppcheck ', '').replace(' dev', '')
 
+    if version == 'CPPCHECK_MAJOR.CPPCHECK_DEVMINOR':
+        continue
+
     cmd = [exe]
     if do_compare and not args.no_quiet:
         cmd.append('-q')
@@ -154,6 +175,8 @@ def sort_commit_hashes(commits):
         else:
             # TODO: re-add inconclusive: {callstack}: ({severity}{inconclusive:, inconclusive}) {message
             cmd.append('--template={callstack}: ({severity}) {message} [{id}]')
+    if Version(version) >= Version('2.13'):
+        cmd.append('--suppress=checkersReport')
     # TODO: how to pass additional options?
     if args.perf:
         cmd.append('--error-exitcode=0')
@@ -164,22 +187,23 @@ def sort_commit_hashes(commits):
         start = time.time_ns()
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=exe_path, universal_newlines=True)
     try:
-        comm = p.communicate(timeout=args.timeout)
+        stdout, stderr = p.communicate(timeout=args.timeout)
         if args.perf:
             end = time.time_ns()
         out = ''
         if not args.no_stdout:
-            out += comm[0]
+            out += stdout
         if not args.no_stdout and not args.no_stderr:
             out += '\n'
         if not args.no_stderr:
-            out += comm[1]
+            out += stderr
     except subprocess.TimeoutExpired:
         out = "timeout"
         p.kill()
-        comm = p.communicate()
+        p.communicate()
 
     ec = p.returncode
+    p = None
 
     if not do_compare:
         if not use_hashes:
@@ -189,7 +213,7 @@ def sort_commit_hashes(commits):
         if args.perf:
             if out == "timeout":
                 data_str = "0.0" # TODO: how to handle these properly?
-            elif not ec == 0:
+            elif ec != 0:
                 continue # skip errors
             else:
                 data_str = '{}'.format((end - start) / 1000.0 / 1000.0 / 1000.0)
@@ -227,6 +251,7 @@ def sort_commit_hashes(commits):
         continue
 
     do_print = False
+    udiff = None
 
     if last_ec != ec:
         if verbose:
@@ -237,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:
@@ -251,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/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 6a6883bea18..7bc613d1669 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -9,11 +9,6 @@
   <?define AddonsDir = "files\addons" ?>
   <?define QtDllDir = "files" ?>
 
-  <?if $(var.Platform) = x64 ?>
-    <?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x64.msm" ?>
-    <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
-  <?else?>
-    <?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_CRT_x86.msm" ?>
-    <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
-  <?endif?>
+  <?define CrtMergeModule = "$(env.VCINSTALLDIR)Redist\MSVC\v143\MergeModules\Microsoft_VC143_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 3324a11f824..7b5cc45614a 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -13,6 +13,7 @@
     <Media Id='1' Cabinet='Cppcheck.cab' EmbedCab='yes' CompressionLevel='high' DiskPrompt='CD-ROM 1' />
     <Property Id='DiskPrompt' Value='Cppcheck installation [1]' />
 
+    <!-- TODO: what is DiskId for? It is used inconsistently -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='System32' FileSource='SystemFolder' />
       <Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
@@ -36,18 +37,18 @@
             </File>
             <File Id='onlinehelpqhc' Name='online-help.qhc' Source='$(var.GuiHelpDir)\online-help.qhc' />
             <File Id='onlinehelpqch' Name='online-help.qch' Source='$(var.GuiHelpDir)\online-help.qch' />
-            <File Id='Qt5Coredll' Name='Qt5Core.dll' Source='$(var.QtDllDir)\Qt5Core.dll' />
-            <File Id='Qt5Guidll' Name='Qt5Gui.dll' Source='$(var.QtDllDir)\Qt5Gui.dll' />
-            <File Id='Qt5Helpdll' Name='Qt5Help.dll' Source='$(var.QtDllDir)\Qt5Help.dll' />
-            <File Id='Qt5Sqldll' Name='Qt5Sql.dll' Source='$(var.QtDllDir)\Qt5Sql.dll' />
-            <File Id='Qt5Widgetsdll' Name='Qt5Widgets.dll' Source='$(var.QtDllDir)\Qt5Widgets.dll' />
-            <File Id='Qt5PrintSupportdll' Name='Qt5PrintSupport.dll' Source='$(var.QtDllDir)\Qt5PrintSupport.dll' />
-            <?if $(var.Platform) = x64 ?>
-              <File Id='Qt5Chartsdll' Name='Qt5Charts.dll' Source='$(var.QtDllDir)\Qt5Charts.dll' />
-            <?endif?>
-            <File Id='Qt5Network.dll' Name='Qt5Network.dll' DiskId='1' Source='$(var.QtDllDir)\Qt5Network.dll' />
-            <File Id='libcrypto.dll' Name='libcrypto-1_1-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libcrypto-1_1-x64.dll' />
-            <File Id='libssl.dll' Name='libssl-1_1-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-1_1-x64.dll' />
+            <File Id='Qt6Coredll' Name='Qt6Core.dll' Source='$(var.QtDllDir)\Qt6Core.dll' />
+            <File Id='Qt6Guidll' Name='Qt6Gui.dll' Source='$(var.QtDllDir)\Qt6Gui.dll' />
+            <File Id='Qt6Helpdll' Name='Qt6Help.dll' Source='$(var.QtDllDir)\Qt6Help.dll' />
+            <File Id='Qt6Sqldll' Name='Qt6Sql.dll' Source='$(var.QtDllDir)\Qt6Sql.dll' />
+            <File Id='Qt6Widgetsdll' Name='Qt6Widgets.dll' Source='$(var.QtDllDir)\Qt6Widgets.dll' />
+            <File Id='Qt6PrintSupportdll' Name='Qt6PrintSupport.dll' Source='$(var.QtDllDir)\Qt6PrintSupport.dll' />
+            <File Id='Qt6Chartsdll' Name='Qt6Charts.dll' Source='$(var.QtDllDir)\Qt6Charts.dll' />
+            <File Id='Qt6Network.dll' Name='Qt6Network.dll' DiskId='1' Source='$(var.QtDllDir)\Qt6Network.dll' />
+            <File Id='Qt6OpenGL.dll' Name='Qt6OpenGL.dll' DiskId='1' Source='$(var.QtDllDir)\Qt6OpenGL.dll' />
+            <File Id='Qt6OpenGLWidgets.dll' Name='Qt6OpenGLWidgets.dll' DiskId='1' Source='$(var.QtDllDir)\Qt6OpenGLWidgets.dll' />
+            <File Id='libcrypto.dll' Name='libcrypto-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libcrypto-3-x64.dll' />
+            <File Id='libssl.dll' Name='libssl-3-x64.dll' DiskId='1' Source='$(var.QtDllDir)\libssl-3-x64.dll' />
           </Component>
           <Directory Id='QtPlatformsFolder' Name='platforms'>
             <Component Id='QtPlatforms' DiskId='1' Guid='$(var.qtplatformsGUID)'>
@@ -56,14 +57,7 @@
           </Directory>
           <Directory Id='QtStylesFolder' Name='styles'>
             <Component Id='QtStyles' DiskId='1' Guid='$(var.qtstylesGUID)'>
-              <File Id='qwindowsvistastyledll' Name='qwindowsvistastyle.dll' Source='$(var.QtDllDir)\styles\qwindowsvistastyle.dll' />
-            </Component>
-          </Directory>
-          <Directory Id='QtSqlDriversFolder' Name='sqldrivers'>
-            <Component Id='QtSqlDrivers' DiskId='1' Guid='$(var.qtsqldriversGUID)'>
-              <File Id='qsqlitedll' Name='qsqlite.dll' Source='$(var.QtDllDir)\sqldrivers\qsqlite.dll' />
-              <File Id='qsqlodbcdll' Name='qsqlodbc.dll' Source='$(var.QtDllDir)\sqldrivers\qsqlodbc.dll' />
-              <File Id='qsqlpsqldll' Name='qsqlpsql.dll' Source='$(var.QtDllDir)\sqldrivers\qsqlpsql.dll' />
+              <File Id='qmodernwindowsstyledll' Name='qmodernwindowsstyle.dll' Source='$(var.QtDllDir)\styles\qmodernwindowsstyle.dll' />
             </Component>
           </Directory>
           <Directory Id='TranslationsFolder' Name='lang'>
@@ -74,6 +68,7 @@
               <File Id='cppcheck_fr.qm' Name='cppcheck_fr.qm' Source='$(var.TranslationsDir)\cppcheck_fr.qm' />
               <File Id='cppcheck_it.qm' Name='cppcheck_it.qm' Source='$(var.TranslationsDir)\cppcheck_it.qm' />
               <File Id='cppcheck_ja.qm' Name='cppcheck_ja.qm' Source='$(var.TranslationsDir)\cppcheck_ja.qm' />
+              <File Id='cppcheck_ka.qm' Name='cppcheck_ka.qm' Source='$(var.TranslationsDir)\cppcheck_ka.qm' />
               <File Id='cppcheck_ko.qm' Name='cppcheck_ko.qm' Source='$(var.TranslationsDir)\cppcheck_ko.qm' />
               <File Id='cppcheck_nl.qm' Name='cppcheck_nl.qm' Source='$(var.TranslationsDir)\cppcheck_nl.qm' />
               <File Id='cppcheck_ru.qm' Name='cppcheck_ru.qm' Source='$(var.TranslationsDir)\cppcheck_ru.qm' />
@@ -86,6 +81,7 @@
           <Directory Id='CfgsFolder' Name='cfg'>
             <Component Id='MandatoryCfgs' Guid='$(var.mandatoryCfgsGUID)'>
               <File Id='std.cfg' Name='std.cfg' Source='$(var.CfgsDir)\std.cfg' />
+              <File Id='posix.cfg' Name='posix.cfg' Source='$(var.CfgsDir)\posix.cfg' />
               <File Id='windows.cfg' Name='windows.cfg' Source='$(var.CfgsDir)\windows.cfg' />
             </Component>
             <Component Id='OptionalCfgs' Guid='$(var.optionalCfgsGUID)'>
@@ -94,12 +90,16 @@
               <File Id='boost.cfg' Name='boost.cfg' Source='$(var.CfgsDir)\boost.cfg' />
               <File Id='bsd.cfg' Name='bsd.cfg' Source='$(var.CfgsDir)\bsd.cfg' />
               <File Id='cairo.cfg' Name='cairo.cfg' Source='$(var.CfgsDir)\cairo.cfg' />
+              <File Id='cppcheck_lib.cfg' Name='cppcheck-lib.cfg' Source='$(var.CfgsDir)\cppcheck-lib.cfg' />
               <File Id='cppunit.cfg' Name='cppunit.cfg' Source='$(var.CfgsDir)\cppunit.cfg' />
               <File Id='dpdk.cfg' Name='dpdk.cfg' Source='$(var.CfgsDir)\dpdk.cfg' />
               <File Id='embedded_sql.cfg' Name='embedded_sql.cfg' Source='$(var.CfgsDir)\embedded_sql.cfg' />
+              <File Id='emscripten.cfg' Name='emscripten.cfg' Source='$(var.CfgsDir)\emscripten.cfg' />
+              <File Id='ginac.cfg' Name='ginac.cfg' Source='$(var.CfgsDir)\ginac.cfg' />
               <File Id='gnu.cfg' Name='gnu.cfg' Source='$(var.CfgsDir)\gnu.cfg' />
               <File Id='googletest.cfg' Name='googletest.cfg' Source='$(var.CfgsDir)\googletest.cfg' />
               <File Id='gtk.cfg' Name='gtk.cfg' Source='$(var.CfgsDir)\gtk.cfg' />
+              <File Id='icu.cfg' Name='icu.cfg' Source='$(var.CfgsDir)\icu.cfg' />
               <File Id='kde.cfg' Name='kde.cfg' Source='$(var.CfgsDir)\kde.cfg' />
               <File Id='libcerror.cfg' Name='libcerror.cfg' Source='$(var.CfgsDir)\libcerror.cfg' />
               <File Id='libcurl.cfg' Name='libcurl.cfg' Source='$(var.CfgsDir)\libcurl.cfg' />
@@ -111,20 +111,26 @@
               <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' />
               <File Id='nspr.cfg' Name='nspr.cfg' Source='$(var.CfgsDir)\nspr.cfg' />
+              <File Id='ntl.cfg' Name='ntl.cfg' Source='$(var.CfgsDir)\ntl.cfg' />
               <File Id='opencv2.cfg' Name='opencv2.cfg' Source='$(var.CfgsDir)\opencv2.cfg' />
               <File Id='opengl.cfg' Name='opengl.cfg' Source='$(var.CfgsDir)\opengl.cfg' />
               <File Id='openmp.cfg' Name='openmp.cfg' Source='$(var.CfgsDir)\openmp.cfg' />
               <File Id='openssl.cfg' Name='openssl.cfg' Source='$(var.CfgsDir)\openssl.cfg' />
-              <File Id='posix.cfg' Name='posix.cfg' Source='$(var.CfgsDir)\posix.cfg' />
+              <File Id='pcre.cfg' Name='pcre.cfg' Source='$(var.CfgsDir)\pcre.cfg' />
+              <File Id='protobuf.cfg' Name='protobuf.cfg' Source='$(var.CfgsDir)\protobuf.cfg' />
               <File Id='python.cfg' Name='python.cfg' Source='$(var.CfgsDir)\python.cfg' />
               <File Id='qt.cfg' Name='qt.cfg' Source='$(var.CfgsDir)\qt.cfg' />
               <File Id='ruby.cfg' Name='ruby.cfg' Source='$(var.CfgsDir)\ruby.cfg' />
               <File Id='sdl.cfg' Name='sdl.cfg' Source='$(var.CfgsDir)\sdl.cfg' />
+              <File Id='selinux.cfg' Name='selinux.cfg' Source='$(var.CfgsDir)\selinux.cfg' />
               <File Id='sfml.cfg' Name='sfml.cfg' Source='$(var.CfgsDir)\sfml.cfg' />
               <File Id='sqlite3.cfg' Name='sqlite3.cfg' Source='$(var.CfgsDir)\sqlite3.cfg' />
               <File Id='tinyxml2.cfg' Name='tinyxml2.cfg' Source='$(var.CfgsDir)\tinyxml2.cfg' />
               <File Id='vcl.cfg' Name='vcl.cfg' Source='$(var.CfgsDir)\vcl.cfg' />
+              <File Id='wxsqlite3.cfg' Name='wxsqlite3.cfg' Source='$(var.CfgsDir)\wxsqlite3.cfg' />
+              <File Id='wxsvg.cfg' Name='wxsvg.cfg' Source='$(var.CfgsDir)\wxsvg.cfg' />
               <File Id='wxwidgets.cfg' Name='wxwidgets.cfg' Source='$(var.CfgsDir)\wxwidgets.cfg' />
+              <File Id='zephyr.cfg' Name='zephyr.cfg' Source='$(var.CfgsDir)\zephyr.cfg' />
               <File Id='zlib.cfg' Name='zlib.cfg' Source='$(var.CfgsDir)\zlib.cfg' />
             </Component>
           </Directory>
@@ -143,27 +149,29 @@
               <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' />
             </Component>
           </Directory>
           <Directory Id='AddonsFolder' Name='addons'>
             <Component Id='Addons' Guid='$(var.addonsGUID)'>
+              <File Id='__init__.py' Name='__init__.py' Source='$(var.AddonsDir)\__init__.py' />
+              <File Id='cppcheck.py' Name='cppcheck.py' Source='$(var.AddonsDir)\cppcheck.py' />
               <File Id='cppcheckdata.py' Name='cppcheckdata.py' Source='$(var.AddonsDir)\cppcheckdata.py' />
               <File Id='findcasts.py' Name='findcasts.py' Source='$(var.AddonsDir)\findcasts.py' />
               <File Id='misc.py' Name='misc.py' Source='$(var.AddonsDir)\misc.py' />
               <File Id='misra.py' Name='misra.py' Source='$(var.AddonsDir)\misra.py' />
               <File Id='misra_9.py' Name='misra_9.py' Source='$(var.AddonsDir)\misra_9.py' />
               <File Id='naming.py' Name='naming.py' Source='$(var.AddonsDir)\naming.py' />
+              <File Id='namingng.json' Name='namingng.json' Source='$(var.AddonsDir)\namingng.json' />
+              <File Id='namingng.config.json' Name='namingng.config.json' Source='$(var.AddonsDir)\namingng.config.json' />
               <File Id='namingng.py' Name='namingng.py' Source='$(var.AddonsDir)\namingng.py' />
               <File Id='ROS_naming.json' Name='ROS_naming.json' Source='$(var.AddonsDir)\ROS_naming.json' />
+              <File Id='runaddon.py' Name='runaddon.py' Source='$(var.AddonsDir)\runaddon.py' />
               <File Id='threadsafety.py' Name='threadsafety.py' Source='$(var.AddonsDir)\threadsafety.py' />
               <File Id='y2038.py' Name='y2038.py' Source='$(var.AddonsDir)\y2038.py' />
             </Component>
           </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' />
@@ -200,7 +208,6 @@
         <ComponentRef Id='GuiExecutable' />
         <ComponentRef Id='QtPlatforms' />
         <ComponentRef Id='QtStyles' />
-        <ComponentRef Id='QtSqlDrivers' />
         <Feature Id='Translations' Title='GUI Translations' AllowAdvertise='no' Description='Translations for graphical user interface' Level='1'>
           <ComponentRef Id='GuiTranslations' />
         </Feature>
@@ -221,6 +228,7 @@
     </Feature>
 
     <MajorUpgrade DowngradeErrorMessage='Downgrade is not allowed'/>
+    <!-- TODO: remove old workarounds -->
     <!--Remove some pre 1.57 versions which can't be upgraded with MajorUpgrade-->
     <InstallExecuteSequence>
       <Custom Action='UninstallOld152' After='InstallFinalize'>NOT Installed</Custom>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index f7942ec0a67..d07ce1136c9 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.12 dev" ?>
+  <?define ProductName = "Cppcheck $(var.Platform) 2.19 dev" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "2.11.99" ?>
+  <?define ProductVersion = "2.18.99" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>
@@ -14,7 +14,6 @@
   <?define guiGUID = "D7D3FF8E-1D82-4215-B59B-4715A748C540" ?>
   <?define qtplatformsGUID = "E2C326DF-11F1-4C05-A955-2E2D2A3B0515" ?>
   <?define qtstylesGUID = "A9CC70D0-52BA-4A8E-9EAF-FABF8DDEB200" ?>
-  <?define qtsqldriversGUID = "619FF989-BA0B-48D7-BE49-CE48C6E899E8" ?>
   <?define guiTranslationsGUID = "24738151-890D-4fcc-824C-DA7FF63E0D7F" ?>
   <?define mandatoryCfgsGUID = "EE95621C-25E7-491A-8DE9-EA6E6967C176" ?>
   <?define optionalCfgsGUID = "3A8AE067-5F41-4D29-A35C-CC0FAB648608" ?>